gitweb.git
gitk: Make commitdata an array rather than a listPaul Mackerras Fri, 17 Mar 2006 23:04:48 +0000 (10:04 +1100)

gitk: Make commitdata an array rather than a list

This turns out to be slightly simpler and faster, and will make
things a little easier when we do multiple view support.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix display of diff lines beginning with ---... Paul Mackerras Tue, 7 Mar 2006 22:15:32 +0000 (09:15 +1100)

gitk: Fix display of diff lines beginning with --- or +++

Lines in a diff beginning with --- or +++ were not being displayed
at all. Thanks to Robert Fitzsimons for pointing out the obvious
fix, that lines beginning with --- or +++ are only to be suppressed
in the diff header. I also took the opportunity to replace a regexp
call with a couple of string compare calls, which should be faster.

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: Make error_popup react to ReturnMartin Mares Thu, 2 Mar 2006 12:15:05 +0000 (13:15 +0100)

[PATCH] gitk: Make error_popup react to Return

The error popup window can be now closed not only by clicking
the button, but also by pressing Return.

Signed-Off-By: Martin Mares <mj@ucw.cz>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix a bug in drawing the selected line as a thick... Paul Mackerras Thu, 2 Mar 2006 12:00:44 +0000 (23:00 +1100)

gitk: Fix a bug in drawing the selected line as a thick line

If you clicked on a line, so that it was drawn double-thickness,
and then scrolled to bring on-screen a child that hadn't previously
been drawn, the lines from it to the selected line were drawn
single-thickness. This fixes it so they are drawn double-thickness.
This also removes an unnecessary setting of phase in drawrest.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Further speedupsPaul Mackerras Thu, 2 Mar 2006 11:56:44 +0000 (22:56 +1100)

gitk: Further speedups

Now we don't parse the commits as we are reading them, we just put
commit data on a list as a blob, and instead parse the commit when
we need the various parts of it, such as when a commit is drawn on
the canvas. This makes searching a bit more interesting: now we
scan through the commit blobs doing a string or regexp match to find
commits that might match, then for those that might match, we parse
the commit info (if it isn't already parsed) and do the matching
for the various fields as before.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Various speed improvementsPaul Mackerras Tue, 28 Feb 2006 11:10:19 +0000 (22:10 +1100)

gitk: Various speed improvements

This rearranges the code a little to eliminate some procedure calls
and reduce the number of globals accessed. It makes rowidlist and
rowoffsets lists rather than arrays, and removes the lineid array,
since $lineid($l) was the same as [lindex $displayorder $l], and the
latter is a little faster.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix Update menu itemPaul Mackerras Tue, 28 Feb 2006 00:27:12 +0000 (11:27 +1100)

gitk: Fix Update menu item

This just does the simple thing of resetting everything, reading all
the commits, and redoing the whole layout from scratch. Hopefully
things are now fast enough that this simple approach is acceptable.
Also, this fits in better with future plans for adding the ability
to restrict the tree to just a few files and then expand back to
the whole tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix clicks on arrows on line endsPaul Mackerras Mon, 27 Feb 2006 23:02:03 +0000 (10:02 +1100)

gitk: Fix clicks on arrows on line ends

With the new representation of the graph lines, this turns out
much simpler now.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: New improved gitkPaul Mackerras Sun, 19 Feb 2006 11:44:47 +0000 (22:44 +1100)

gitk: New improved gitk

This is a new version of gitk which is much faster and has much better
graph layout. It achieves the speed by only drawing the parts of the
canvases that are actually visible. It also draws the commits in the
order that git-rev-list produces them, so if you use -d, you need to
have a recent enough git-rev-list that understands the --date-order
flag.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Make "find" on "Files" work again.Paul Mackerras Thu, 9 Feb 2006 23:29:26 +0000 (10:29 +1100)

gitk: Make "find" on "Files" work again.

It was broken by the change to supply just the child id to
git-diff-tree rather than both child and parent.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Use git-diff-tree --cc for showing the diffs... Paul Mackerras Mon, 6 Feb 2006 22:13:52 +0000 (09:13 +1100)

gitk: Use git-diff-tree --cc for showing the diffs for merges

This replaces a lot of code that used the result from several 2-way
diffs to generate a combined diff for a merge. Now we just use
git-diff-tree --cc and colorize the output a bit, which is a lot
simpler, and has the enormous advantage that if the diff doesn't
show quite what someone thinks it should show, I can deflect the
blame to someone else. :)

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Add braces around if expressionsPaul Mackerras Mon, 6 Feb 2006 22:10:18 +0000 (09:10 +1100)

gitk: Add braces around if expressions

Apparently this simplifies things for the parser/compiler and makes
it go slightly faster (since without the braces, it potentially has
to do two levels of substitutions rather than one).

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Work around Tcl's non-standard names for encodingsPaul Mackerras Wed, 7 Dec 2005 12:28:22 +0000 (23:28 +1100)

gitk: Work around Tcl's non-standard names for encodings

This uses a table of encoding names and aliases distilled from
http://www.iana.org/assignments/character-sets plus some heuristics
to convert standard encoding names to ones that Tcl recognizes.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Some improvements for the code for updating the... Paul Mackerras Mon, 5 Dec 2005 22:46:23 +0000 (09:46 +1100)

gitk: Some improvements for the code for updating the display

This should be more robust in the case that some does "Update" before
the initial drawing is finished. It also avoids having to reset the
list of children for each commit and reconstruct it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Factored out some common code into a new start_re... Paul Mackerras Thu, 1 Dec 2005 11:42:46 +0000 (22:42 +1100)

gitk: Factored out some common code into a new start_rev_list procedure

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: add Update menu item.Sven Verdoolaege Tue, 29 Nov 2005 21:15:51 +0000 (22:15 +0100)

[PATCH] gitk: add Update menu item.

Update will redraw the commits if any commits have been added to any
of the selected heads. The new commits appear on the top.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Add a preferences dialog with some basic stuffPaul Mackerras Tue, 29 Nov 2005 22:28:16 +0000 (09:28 +1100)

gitk: Add a preferences dialog with some basic stuff

There is a lot more that could be put in, such as a selector for
the font family etc., but this is a start.

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: Use i18n.commitencoding configuration... Junio C Hamano Mon, 28 Nov 2005 00:12:51 +0000 (16:12 -0800)

[PATCH] gitk: Use i18n.commitencoding configuration item.

Hardcoding "utf-8" in the script breaks projects that use local
encoding, so allow setting i18n.commitEncoding.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix diff this->selected and selected->this functionsPaul Mackerras Mon, 28 Nov 2005 09:41:56 +0000 (20:41 +1100)

gitk: Fix diff this->selected and selected->this functions

The change in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3, which makes
a couple of git-diff-tree calls supply only one id rather than two,
fixes the display when showing what a single commit did with dense
revlists, but broke the diff this->selected and diff selected->this
right-click menu functions.

Yann Dirson pointed this out and had a patch that fixed the diff
menu functions by passing a "singlecommit" flag around. This fixes
it a bit differently, by making the ids and diffids variables be
either a single id, in the case of showing what a commit did, or
{oldid newid}, in the case of the diff menu functions. That way
we can just pass $ids to git-diff-tree as is. Most of the changes
in fact are just reversing the order of ids in $ids and $diffids,
because they used to be {child parent}, but git-diff-tree requires
old id before new id.

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: UTF-8 supportPavel Roskin Wed, 23 Nov 2005 04:15:01 +0000 (23:15 -0500)

[PATCH] gitk: UTF-8 support

Add gitencoding variable and set it to "utf-8". Use it for converting
git-rev-list output.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] gitk: put braces around exprsJeff Hobbs Wed, 23 Nov 2005 01:39:53 +0000 (17:39 -0800)

[PATCH] gitk: put braces around exprs

This braces all exprs. It just seemed to be a few that were missed.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Disable fastdate stuff for nowPaul Mackerras Sun, 20 Nov 2005 22:56:07 +0000 (09:56 +1100)

gitk: Disable fastdate stuff for now

It has a fatal flaw in that it only handles timezones that are a
multiple of an hour. It's really only needed with Tk8.5, where
the clock format command has been reimplemented in Tcl and is much
slower than in Tk8.4.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix some bugs introduced by speedup changesPaul Mackerras Sun, 20 Nov 2005 12:08:22 +0000 (23:08 +1100)

gitk: Fix some bugs introduced by speedup changes

Commits that weren't read from git-rev-list, i.e. the ones displayed
with an open circle, were displayed incorrectly: the headline was
null if there was only one line, and the commit comment was put all
on one line. Also, the terminal commits weren't displayed when -r
was used.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: moving all three panes if clicking on an arrow.Stefan-W. Hahn Sat, 5 Nov 2005 19:55:29 +0000 (20:55 +0100)

gitk: moving all three panes if clicking on an arrow.

Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: use git-diff-tree --no-commit-idPavel Roskin Fri, 11 Nov 2005 15:09:12 +0000 (10:09 -0500)

gitk: use git-diff-tree --no-commit-id

gitk switched to use git-diff-tree with one argument in gettreediffs and
getblobdiffs. git-diff-tree with one argument outputs commit ID in from
of the patch. This causes an empty line after "Comments" in the lower
right pane. Also, the diff in the lower left pane has the commit ID,
which is useless there.

This patch makes git use the newly added -no-commit-id option for
git-diff-tree to suppress commit ID. It also removes the p variable in
both functions, since it has become useless after switching to the
one-argument invocation for git-diff-tree.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitk: Specify line hover fontFrank Sorenson Sun, 30 Oct 2005 09:06:46 +0000 (02:06 -0700)

gitk: Specify line hover font

Hovering over a line in gitk displays the commit one-liner in a
box, but the text usually overflows the box. The box size is
computed with a specified font, so this patch sets the text font
as well.

Signed-off-by: Frank Sorenson <frank@tuxrocks.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

readrefs: grab all refs with one call to ls-remote.Junio C Hamano Sat, 19 Nov 2005 07:54:17 +0000 (23:54 -0800)

readrefs: grab all refs with one call to ls-remote.

Instead of reading refs/heads/* and refs/tags/* files ourselves
and missing files in subdirectories of heads/ and tags/, use
ls-remote on local repository and grab all of them. This lets us
also remove the procedure readotherrefs.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add -r flag and some speedupsPaul Mackerras Mon, 14 Nov 2005 23:34:03 +0000 (10:34 +1100)

Add -r flag and some speedups

The -r flag means "rev-list order", i.e. just display the commits
in the order they come from git-rev-list.

The speedups include:
- don't process the whole commit line-by-line, only the header
- don't convert dates when reading the commits, rather do it when
needed
- don't do the $canv delete lines.$id in drawlines when drawing the
graph initially (it was taking a lot of the total time)
- cache the date conversion for each hour (more important with tk8.5,
since [clock format] is a lot slower in 8.5 than in 8.4).

Signed-off-by: Paul Mackerras <paulus@samba.org>

[PATCH] Make "gitk" work better with dense revlistsLinus Torvalds Tue, 25 Oct 2005 20:01:42 +0000 (13:01 -0700)

[PATCH] Make "gitk" work better with dense revlists

To generate the diff for a commit, gitk used to do

git-diff-tree -p -C $p $id

(and same thing to generate filenames, except using just "-r" there) which
does actually generate the diff from the parent to the $id, exactly like
it meant to do.

However, that really sucks with --dense, where the "parent" information
has all been rewritten to point to the previous commit. The diff actually
works exactly right, but now it's the diff of the _whole_ sequence of
commits all the way to the previous commit that last changed the file(s)
that we are looking at.

And that's really not what we want 99.9% of the time, even if it may be
perfectly sensible. Not only will the diff not actually match the commit
message, but it will usually be _huge_, and all of it will be totally
uninteresting to us, since we were only interested in a particular set of
files.

It also doesn't match what we do when we write the patch to a file.

So this makes gitk just show the diff of _that_ commit.

We might even want to have some way to limit the diff to only the
filenames we're interested in, but it's often nice to see what else
changed at the same time, so that's secondary.

The merge diff handling is left alone, although I think that should also
be changed to only look at what that _particular_ merge did, not what it
did when compared to the faked-out parents.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Use "$@" rather than "${1+$@}" when invoking wish.Paul Mackerras Tue, 27 Sep 2005 00:29:41 +0000 (10:29 +1000)

Use "$@" rather than "${1+$@}" when invoking wish.

Change wish8.4 back to wishPaul Mackerras Mon, 26 Sep 2005 00:22:43 +0000 (10:22 +1000)

Change wish8.4 back to wish

Checking in the change from wish to wish8.4 was a mistake; I had
changed it for a test but forgot to change it back before checking
in a patch.

[PATCH] Add new keybindingsRobert Suetterlin Thu, 22 Sep 2005 00:07:36 +0000 (10:07 +1000)

[PATCH] Add new keybindings

This adds several new keybindings to allow history and selectline
navigation. I basically added Opera-like history traversal, as well
as left-right-cursor history traversal and vi-like motion commands.

Signed-off-by: Robert Suetterlin <robert@mpe.mpg.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Draw selected graph line thicker and make arrowheads... Paul Mackerras Tue, 30 Aug 2005 00:57:11 +0000 (10:57 +1000)

Draw selected graph line thicker and make arrowheads active.

Display the contents of a tag when the user clicks... Paul Mackerras Fri, 19 Aug 2005 13:11:39 +0000 (23:11 +1000)

Display the contents of a tag when the user clicks on it.

This just displays the result of git-cat-file on the tag in the
details pane. If the tag is a "direct" tag (the tag file contains
the SHA1 ID of a commit rather than a tag), we show the tag name
and SHA1 ID.

Added re-read refs command, and display all refs.Paul Mackerras Fri, 19 Aug 2005 12:14:28 +0000 (22:14 +1000)

Added re-read refs command, and display all refs.

These are features requested by Junio. Any plain file under .git/refs
whose contents start with 40 hex characters is taken as a reference
and displayed like a head but with a light blue background (unless it
is in .git/refs/tags or .git/refs/heads, in which case it is displayed
as before). There is now a "Reread references" menu item in the File
menu which re-reads all the plain files under .git/refs and redisplays
any references that have changed.

Save the maxwidth setting in the ~/.gitk file.Paul Mackerras Fri, 19 Aug 2005 00:22:24 +0000 (10:22 +1000)

Save the maxwidth setting in the ~/.gitk file.

Fix a bug where commits with no children weren't marked... Paul Mackerras Fri, 19 Aug 2005 00:22:04 +0000 (10:22 +1000)

Fix a bug where commits with no children weren't marked as on-screen.

This problem was revealed by running gitk --all on Wolfgang Denk's
u-boot repository.

Use the --parents flag to git-rev-list.Paul Mackerras Thu, 18 Aug 2005 10:40:39 +0000 (20:40 +1000)

Use the --parents flag to git-rev-list.

With --parents, git-rev-list gives us the list of parents on the
first line of each commit. We use that rather than looking for
the parent: lines in the commit body, since this way we get to
know about the grafts for free.

Allow graph lines to jump through hyperspace.Paul Mackerras Wed, 17 Aug 2005 23:30:10 +0000 (09:30 +1000)

Allow graph lines to jump through hyperspace.

When the graph gets too wide (as defined by the maxwidth variable,
which can be set in ~/.gitk), we can now terminate graph lines with
an arrow pointing downwards, and reintroduce them later with an
arrow pointing upwards when we need them. This makes the graph much
less cluttered on large repositories such as the linux kernel.

Unfortunately this has made it slower; it takes about 10 seconds
user time on the linux-2.6 repository on my machine now, compared
to 6 seconds before. I'll have to work on optimizing that. Also
on the todo list are making the arrow heads active (so if you click
on them you jump to the other end) and improving the placement of
the null entry.

Add graft support.Paul Mackerras Wed, 17 Aug 2005 11:27:55 +0000 (21:27 +1000)

Add graft support.

We read .git/info/grafts and use the information in there to
override the list of parents we get from git-rev-list or
git-cat-file.

Refine the update heuristic to improve responsiveness... Paul Mackerras Wed, 10 Aug 2005 23:56:23 +0000 (09:56 +1000)

Refine the update heuristic to improve responsiveness a bit.

The previous commit improved performance a lot but also meant that
we waited longer to see something drawn. This refines the heuristics
for when to call update so that (1) when we have finished processing
a bufferfull of information from git-rev-list, we call update if
enough time has elapsed, regardless of how many commits we've drawn,
and (2) the number of commits drawn between updates scales with the
total number of commits drawn: 1 for 1-99 commits, 10 for 100-9999
commits, or 100 for >= 10000 commits.

Only do an update every 100 commits when drawing the... Paul Mackerras Wed, 10 Aug 2005 12:50:28 +0000 (22:50 +1000)

Only do an update every 100 commits when drawing the graph.

On a large repository with > 60,000 commits, each call to the Tk
update primitive (which gives Tk a chance to respond to events and
redraw the screen) was taking up to 0.2 seconds. Because the logic
was to call update after drawing a commit if 0.1 seconds had passed
since the last update call, we were calling it for every commit,
which was slowing us down enormously. Now we also require that we
have drawn 100 commits since the last update (as well as it being
at least 0.1 seconds since the last update). Drawing 100 commits
takes around 0.1 - 0.2 seconds (even in this large repo) on my G5.

[PATCH] "Child" information in commit window - and... Linus Torvalds Tue, 9 Aug 2005 03:04:20 +0000 (20:04 -0700)

[PATCH] "Child" information in commit window - and cleanups

This adds "Child: " lines to the commit window, which tells what children
a commit has.

It also cleans things up: it marks the text widget as no-wrap, which means
that it doesn't need to truncate the commit description arbitrarily by
hand. Also, the description itself is now done by a common helper routine
that handles both the parent and the children.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Better graph line details display and expand history... Paul Mackerras Sun, 7 Aug 2005 23:47:22 +0000 (09:47 +1000)

Better graph line details display and expand history coverage.

Now the history remembers when we have clicked on a graph line
and when we have asked for a diff between two commits, as well
as when we have displayed a commit.

The display when you click on a graph line now uses clickable
SHA1 IDs instead of the embedded "Go" buttons. Also made the
IDs clickable in the header for a diff between two commits.

[PATCH] gitk "parent information" in commit windowLinus Torvalds Sun, 7 Aug 2005 20:58:56 +0000 (13:58 -0700)

[PATCH] gitk "parent information" in commit window

This adds a useful "Parent:" line to the git commit information window.

It looks something like this (from the infamous octopus merge):

Author: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Committer: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Parent: fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc (Update git-apply-patch-script ...)
Parent: 9e30dd7c0ecc9f10372f31539d0122db97418353 (Make git-prune-script executa ...)
Parent: c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a (Do not write out new index if ...)
Parent: 660265909fc178581ef327076716dfd3550e6e7b (diff-cache shows differences ...)
Parent: b28858bf65d4fd6d8bb070865518ec43817fe7f3 (Update diff engine for symlin ...)

Octopus merge of the following five patches.

Update git-apply-patch-script for symbolic links.
Make git-prune-script executable again.
Do not write out new index if nothing has changed.
diff-cache shows differences for unmerged paths without --cache.
Update diff engine for symlinks stored in the cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
where all the parent commit ID's are clickable, because the new lines are
added as part of the "comment" string, and thus the regular clickability
thing will match them automatically.

I think this is good. And my random-tcl-monkey-skills are clearly getting
better (although it's perfectly possible that somebody who actually knows
what he is doing would have done things differently).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Use lf translation rather than binary when reading... Paul Mackerras Sun, 7 Aug 2005 10:01:24 +0000 (20:01 +1000)

Use lf translation rather than binary when reading commit data.

The effect of this is that it allows Tcl to do the locale-specific
conversion of the input data to its internal unicode representation.
That means that commit messages in Russian or other languages should
be displayed correctly now (according to the locale that is in effect.)

Change cursor to a hand cursor when over a SHA1 ID... Paul Mackerras Sun, 7 Aug 2005 05:27:57 +0000 (15:27 +1000)

Change cursor to a hand cursor when over a SHA1 ID link.

This is based on suggestions by Jeff Epler and Linus Torvalds, but
extended so that we do the switching between the watch cursor and
the normal cursor correctly as well.

Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing
the link number (duh!).

Add forward and back buttons and make SHA1 IDs clickabl... Paul Mackerras Sat, 6 Aug 2005 12:06:06 +0000 (22:06 +1000)

Add forward and back buttons and make SHA1 IDs clickable links.

When we display the commit message in the details pane, any string
of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we
know about gets turned into a clickable link, and displayed in
blue and underlined.

We now keep a history of commits that we have looked at, and we
have forward and back buttons for moving within the history list.

Compress the graph horizontally if it gets too wide.Paul Mackerras Thu, 4 Aug 2005 23:52:16 +0000 (09:52 +1000)

Compress the graph horizontally if it gets too wide.

If the graph gets to use more than a certain percentage (default 50%)
of the width of the top-left pane, we now reduce the amount of space
allowed for each graph line. This means it doesn't look quite as
nice but you can still see the headline for the commit. (Currently
the only way to customize the percentage is to edit your ~/.gitk
file manually.)

Fix some bugs causing application error popups.Paul Mackerras Sun, 31 Jul 2005 11:35:21 +0000 (21:35 +1000)

Fix some bugs causing application error popups.

Specifically this should fix the following errors:

wrong # args: should be "startdiff ids" (fix from Junio Hamano)
can't read "filelines(....)": no such element in array
can't unset "treepending": no such variable

Improve the merge display when the result differs from... Paul Mackerras Fri, 29 Jul 2005 14:23:03 +0000 (09:23 -0500)

Improve the merge display when the result differs from all parents.

Now we see if the result is quite similar to one of the parents, and
if it is, display the result as a diff from that parent. If the result
is similar to more than one parent, pick the one that it's most
similar to.

[PATCH] gitk: Use GIT_DIR where appropriate.Junio C Hamano Thu, 28 Jul 2005 07:28:44 +0000 (00:28 -0700)

[PATCH] gitk: Use GIT_DIR where appropriate.

Some places assumed .git is the GIT_DIR, resulting heads and
tags not showing when it was run like "GIT_DIR=. gitk --all".
This is not a contrived example --- I rely on it to verify
my private copy of git.git repository before pushing it out.

Define a single procedure "gitdir" and use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Import the --topo-order change and fix the writing... Paul Mackerras Thu, 28 Jul 2005 03:16:51 +0000 (22:16 -0500)

Import the --topo-order change and fix the writing of ~/.gitk.

Display the diffs for a merge in a unified fashion.Paul Mackerras Thu, 28 Jul 2005 03:15:47 +0000 (22:15 -0500)

Display the diffs for a merge in a unified fashion.

Stuff that ended up in the result is shown in bold with a "+" at the
beginning of the line; stuff that didn't is in the normal font with
a "-" at the beginning of the line. The color shows which parent
the stuff was in; red for the first parent, blue for the second, then
green, purple, brown, and the rest are grey. If the result is different
from all of the parents it is shown in black (and bold).

Handle the rename cases reported by git-diff-tree ... Paul Mackerras Wed, 20 Jul 2005 16:25:54 +0000 (12:25 -0400)

Handle the rename cases reported by git-diff-tree -C correctly.

Calculate the list of interesting files for a merge.Paul Mackerras Wed, 20 Jul 2005 13:13:46 +0000 (09:13 -0400)

Calculate the list of interesting files for a merge.

If there is a GCA for the parents of the merge, then a file is
interesting if some parent has a version that is different from both
the child and the GCA. If there is no GCA (e.g. for a merge that
pulls in an external project) then a file is interesting if the child's
version is different from all of the parents.

Next step is to actually show the differences for the interesting
files...

Make the diff display less gaudy.Paul Mackerras Mon, 18 Jul 2005 18:29:03 +0000 (14:29 -0400)

Make the diff display less gaudy.

The old style is still available as an option (we still need a
preferences window so we can set/clear it though).

Allow short SHA1 IDs in the SHA1 entry field.Paul Mackerras Mon, 18 Jul 2005 16:16:35 +0000 (12:16 -0400)

Allow short SHA1 IDs in the SHA1 entry field.

Fix display of mode changes in details pane.Paul Mackerras Sun, 17 Jul 2005 15:11:44 +0000 (11:11 -0400)

Fix display of mode changes in details pane.

Also simplified the parsing of the git-diff-tree -p output and got
rid of the unused 'seenfile' variable.

First cut at displaying the diffs for a merge.Paul Mackerras Sun, 17 Jul 2005 07:39:44 +0000 (03:39 -0400)

First cut at displaying the diffs for a merge.

We display the files where the child differs from the first parent
first in black in the file list window, followed by the second parent
in blue, and so on using different colors for each parent (provided
you don't have more than 6 parents; if you do we cycle around).

Make searching in files changed faster, and fix some... Paul Mackerras Sun, 17 Jul 2005 01:53:55 +0000 (21:53 -0400)

Make searching in files changed faster, and fix some bugs.

We now kick off a single git-diff-tree -r --stdin and feed it all
the commit pairs we want to know about, instead of doing a separate
git-diff-tree invocation for each.

Add "Files" and "Pickaxe" to the find menu.Paul Mackerras Sat, 16 Jul 2005 11:46:13 +0000 (07:46 -0400)

Add "Files" and "Pickaxe" to the find menu.

"Files" matches the find string against each of the files modified
by each commit, and can do exact, case-ignoring or regexp matching.

"Pickaxe" uses git-diff-tree -S'string' and can only do exact
matching. I called it "pickaxe" rather than "find within patch"
since it only finds commits where the string is present in the child
but not the parents or vice versa, and "pickaxe" is what the author
of that feature calls it.

Add a menu item for writing out a commit to a file.Paul Mackerras Tue, 28 Jun 2005 23:47:48 +0000 (09:47 +1000)

Add a menu item for writing out a commit to a file.

This just invokes git-diff-tree. Also changed the readonly entry
widgets in the "write patch" and "generate tag" windows to have
flat relief, so it doesn't look like you should be able to modify
what's in them.

Add a menu item for creating tags.Paul Mackerras Mon, 27 Jun 2005 12:56:40 +0000 (22:56 +1000)

Add a menu item for creating tags.

Fix a bug where we would corrupt the stuff read from... Paul Mackerras Mon, 27 Jun 2005 10:04:26 +0000 (20:04 +1000)

Fix a bug where we would corrupt the stuff read from git-rev-list.

If we have a very long commit message, and we end up getting a
bufferfull of data from git-rev-list that all belongs to one commit,
we ended up throwing away the data from a previous read that should
have been included. The result was a error message about not being
able to parse the output of git-rev-list.

Also, if the git-rev-list output that we can't parse is long, only put
the first 80 chars in the error message. Otherwise we end up with an
enormous error window.

Add a menu entry for generating a patch between any... Paul Mackerras Mon, 27 Jun 2005 09:27:32 +0000 (19:27 +1000)

Add a menu entry for generating a patch between any two commits.

Fix behaviour in the case where we have no commits... Paul Mackerras Mon, 27 Jun 2005 03:38:29 +0000 (13:38 +1000)

Fix behaviour in the case where we have no commits to display.

I had code in there to put "No commits selected" on the canvas
but it needed some globals.

Check for the existence of the git directory on startup.Paul Mackerras Mon, 27 Jun 2005 00:37:11 +0000 (10:37 +1000)

Check for the existence of the git directory on startup.

Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory.
This means we can give a more informative error message if the user
runs gitk somewhere that isn't a git repository.

Clear the SHA1 entry field when we go to paste somethin... Paul Mackerras Sat, 25 Jun 2005 06:37:13 +0000 (16:37 +1000)

Clear the SHA1 entry field when we go to paste something into it

If the user pastes in the selection (with the middle mouse button) and
it already has 40 characters in it, clear it before pasting.

Add commit row context menu and handle left-click on... Paul Mackerras Sat, 25 Jun 2005 05:39:21 +0000 (15:39 +1000)

Add commit row context menu and handle left-click on graph lines

Right-click on a context row now brings up a menu allowing the user to
generate a diff between that row and the selected row. Left-click on
a graph line shows the parent and children connected by the line in
the details pane. Left-click on a circle in the graph selects that
commit. Left-click elsewhere in the graph does nothing.

When displaying a diff, the bottom-right file list box behaves
slightly differently now; instead of eliding all other files' diffs,
it now just scrolls the details pane so that the selected file's diff
starts at the top of the pane.

Since the diffs can be rather large, arrange for an update to be done
every 100ms while reading diffs.

Also removed the CVS revision keywords and bumped the version number
to 1.2.

Try to assign colors so crossing lines have different... Paul Mackerras Wed, 22 Jun 2005 09:53:32 +0000 (19:53 +1000)

Try to assign colors so crossing lines have different colors

In particular try hard to give different colors to lines that cross
at a corner in one of the lines.

Account for indentation of the checkin comments by... Paul Mackerras Wed, 22 Jun 2005 08:15:15 +0000 (18:15 +1000)

Account for indentation of the checkin comments by git-rev-list

This involves adding indentation when we read a commit with
git-cat-file and trimming the whitespace from the headline.

Use git-rev-list --header.Paul Mackerras Wed, 22 Jun 2005 00:25:38 +0000 (10:25 +1000)

Use git-rev-list --header.

With --header, git-rev-list gives us the contents of the commit
in-line, so we don't need to exec a git-cat-file to get it, and we
don't need the readobj command either.
Also fixed a residual problem with handling the commit that
has a parent listed twice.

Pass arguments through git-rev-parse.Paul Mackerras Tue, 21 Jun 2005 00:20:04 +0000 (10:20 +1000)

Pass arguments through git-rev-parse.

This allows the user to specify ranges more flexibly; for instance
the user can now do "gitk v2.6.12.." and see all the changes since
2.6.12.

Handle the case of a parent being listed twice in a... Paul Mackerras Tue, 21 Jun 2005 00:01:38 +0000 (10:01 +1000)

Handle the case of a parent being listed twice in a merge.

This happens in the linux-2.6 tree. We draw the graph line
double-thick to show that this happened.

Also fix a bug where we got a bogus "No commit information available"
line at the end on simple repositories like this one.

Draw graph lines as one continuous line where possiblePaul Mackerras Fri, 17 Jun 2005 00:12:26 +0000 (00:12 +0000)

Draw graph lines as one continuous line where possible
Added context menu on lines
Added headline display when the mouse hovers over a line
Removed some debug messages

Fix operation without libreadobj.so.0.0Paul Mackerras Thu, 16 Jun 2005 10:54:04 +0000 (10:54 +0000)

Fix operation without libreadobj.so.0.0
Display a watch cursor when reading the commits initially

Restructure to do incremental drawingPaul Mackerras Thu, 16 Jun 2005 00:27:23 +0000 (00:27 +0000)

Restructure to do incremental drawing
Some speedups from not doing update so often

Show heads as well as tagsPaul Mackerras Fri, 10 Jun 2005 07:54:49 +0000 (07:54 +0000)

Show heads as well as tags

cope with changed git-diff-tree output formatPaul Mackerras Wed, 1 Jun 2005 00:02:13 +0000 (00:02 +0000)

cope with changed git-diff-tree output format

Use git-rev-list instead of git-rev-tree.Paul Mackerras Tue, 31 May 2005 12:14:42 +0000 (12:14 +0000)

Use git-rev-list instead of git-rev-tree.
Fix bug in changing font size in entry widgets.
Fix bug with B1 click before anything has been drawn.
Use "units" and "pages" instead of "u" and "p" for tk8.5.

Read tags from .git/refs/tags/* and mark commits with... Paul Mackerras Sat, 21 May 2005 07:35:37 +0000 (07:35 +0000)

Read tags from .git/refs/tags/* and mark commits with tags
with a label.
Allow SHA1 ids or tags to be entered in the SHA1 ID field.

Accommodate new git-diff-tree output formatPaul Mackerras Thu, 19 May 2005 12:35:53 +0000 (12:35 +0000)

Accommodate new git-diff-tree output format
Add 'f' key for moving to next file

Handle \ No newline at end of line lines in diffPaul Mackerras Thu, 19 May 2005 10:56:42 +0000 (10:56 +0000)

Handle \ No newline at end of line lines in diff
Put (deleted) or (created, mode xxx) in header lines
Fix scrolling to bring lines on screen

More fixes for geometry restorationPaul Mackerras Wed, 18 May 2005 22:51:00 +0000 (22:51 +0000)

More fixes for geometry restoration
Make up/down/pgup/pgdn work again
Return in find string entry does find
Scale circles and lines with font size
Fix scrolling to make entire selected line visible
Use white circle for commits not listed but put in to terminate lines
Fix diff parsing for created and deleted files

Error popups on error conditions rather than stderr... Paul Mackerras Tue, 17 May 2005 23:23:07 +0000 (23:23 +0000)

Error popups on error conditions rather than stderr msgs
Stop . bindings firing on find string entry keypresses
Fix geometry saving/restoring a bit
Show the terminal commits
Highlight comment matches in the comment window

save window geometry on exit, and restore it on startupPaul Mackerras Mon, 16 May 2005 23:54:58 +0000 (23:54 +0000)

save window geometry on exit, and restore it on startup

Resize the panes in the paned windows (commit list... Paul Mackerras Sun, 15 May 2005 23:19:18 +0000 (23:19 +0000)

Resize the panes in the paned windows (commit list and details)
to keep the proportionality of the pane widths as the overall
window is resized.

Fix stder -> stderrPaul Mackerras Sun, 15 May 2005 21:49:26 +0000 (21:49 +0000)

Fix stder -> stderr

Bumped version numberPaul Mackerras Sun, 15 May 2005 12:57:02 +0000 (12:57 +0000)

Bumped version number

Made commit list reading asynchronousPaul Mackerras Sun, 15 May 2005 12:55:47 +0000 (12:55 +0000)

Made commit list reading asynchronous
Added control+/- to increase/decrease font sizes
Rearranged code a little.

Add a widget to show the SHA1 ID of the current commitPaul Mackerras Sun, 15 May 2005 05:56:51 +0000 (05:56 +0000)

Add a widget to show the SHA1 ID of the current commit
Add a find facility to search within the commits
Cope with multiple starting points.

Make behaviour when git-rev-tree fails nicerPaul Mackerras Thu, 12 May 2005 23:46:16 +0000 (23:46 +0000)

Make behaviour when git-rev-tree fails nicer
Fix crash benh saw with currentid undefined
Add menu with file/quit and help/about items
Add ^Q for quit

Show the diffs when a commit is selectedPaul Mackerras Wed, 11 May 2005 23:44:54 +0000 (23:44 +0000)

Show the diffs when a commit is selected
Selecting in the listbox reduces the text view to just the
diff for the file(s) selected
Added -c option for color-by-committer
Added some more key bindings

Make getting file lists asynchronousPaul Mackerras Wed, 11 May 2005 00:45:38 +0000 (00:45 +0000)

Make getting file lists asynchronous
Add some scrollbars

source ~/.gitk for user-specific option settingsPaul Mackerras Tue, 10 May 2005 12:08:22 +0000 (12:08 +0000)

source ~/.gitk for user-specific option settings
use a panedwindow for the main list with three panes,
and make them scroll together

Display the list of changed files in a listbox pane.Paul Mackerras Tue, 10 May 2005 01:02:55 +0000 (01:02 +0000)

Display the list of changed files in a listbox pane.

Use a panedwindowPaul Mackerras Tue, 10 May 2005 00:23:42 +0000 (00:23 +0000)

Use a panedwindow
Make it cope with commits having parents that aren't listed.

Add initial version of gitk to the CVS repositoryPaul Mackerras Mon, 9 May 2005 04:08:39 +0000 (04:08 +0000)

Add initial version of gitk to the CVS repository