Commit Graph

276 Commits

Author SHA1 Message Date
Paul Mackerras
f3a2469b25 Merge branch 'master' into new 2006-04-23 22:47:07 +10:00
Paul Mackerras
a8aaf19c41 gitk: Use git-rev-parse only to identify file/dir names on cmd line
This uses git-rev-parse --no-revs --no-flags to give us just the
file and directory names on the command line, so that we can create
the "Command line" view if any were specified.  All other arguments
just get passed to git-rev-list (without a pass through git-rev-parse).

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-23 22:45:55 +10:00
Paul Mackerras
61e56c8823 gitk: Let git-rev-list do the argument list parsing
This is a fix for a problem reported by Jim Radford where an argument
list somewhere overflows on repositories with lots of tags.  In fact
it's now unnecessary to use git-rev-parse since git-rev-list can take
all the arguments that git-rev-parse can.  This is inspired by but not
the same as the solutions suggested by Jim Radford and Linus Torvalds.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-23 18:00:24 +10:00
Paul Mackerras
2516dae2f6 gitk: Remember the view in the history list
When moving backwards or forwards through the history list, this
automatically switches the view so that each point that we jump to
is shown in the same view that it was originally displayed in.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-21 10:35:31 +10:00
Paul Mackerras
e7da347520 gitk: Fix bug caused by missing commitlisted elements
This bug was reported by Yann Dirson, and results in an 'Error:
expected boolean value but got ""' dialog when scrolling to the bottom
of the graph under some circumstances.  The issue is that git-rev-list
isn't outputting all the boundary commits when it is asked for commits
affecting only certain files.  We already cope with that by adding the
missing boundary commits in addextraid, but there we weren't adding a
0 to the end of the commitlisted list when we added the extra id to
the end of the displayorder list.

This fixes it by appending 0 to commitlisted in addextraid, thus keeping
commitlisted and displayorder in sync.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-17 10:27:59 +10:00
Paul Mackerras
22626ef4fd gitk: Don't reread git-rev-list output from scratch on view switch
Previously, if we switched away from a view before we had finished
reading the git-rev-list output for it and laying out the graph, we
would discard the partially-laid-out graph and reread it from
scratch if we switched back to the view.  With this, we preserve the
state of the partially-laid-out graph in viewdata($view) and restore
it if we switch back.  The pipe to git-rev-list remains open but we
just don't read from it any more until we switch back to that view.

This also makes linesegends a list rather than an array, which turns
out to be slightly faster, as well as being easier to save and restore.

The `update' menu item now kills the git-rev-list process if there is
one still running when we do the update.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-17 09:56:02 +10:00
Paul Mackerras
fdedbcfb0d gitk: Fix various bugs in the view support
- don't re-read refs when switching views, it's too slow; just do
  it if the user did File->Update
- make the view menu use the uifont
- if we have a graph line selected, unselect it before changing the view
- if a row is selected and appears in the new view, but we have to
  read in the new view, select that row when we come across it
- if no row was previously selected, or if we don't find the previously
  selected row in the new view, select the first row

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 21:22:52 +10:00
Paul Mackerras
f916ee427f Merge branch 'master' into new 2006-04-06 10:22:18 +10:00
Paul Mackerras
c5a4c4debe gitk: Fix incorrect invocation of getmergediffline
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 10:20:03 +10:00
Pavel Roskin
3754354125 [PATCH] gitk: Fix searching for filenames in gitk
findcont should not accept any arguments.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 10:19:23 +10:00
Paul Mackerras
d94f8cd6ad gitk: Make File->Update work properly again
If a view is selected it will now just update that view.

Also fixed a few other things - if you switch away from a view while
gitk is still reading it in, then switch back, gitk will re-read it
from scratch.  We now re-read the references when switching views.
If something was selected before a view change, and we need to read
in the new view, we now select the previously-selected commit when
we come across it.

Fixed a bug in setting of rowrangelist plus a couple of other minor
things.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 10:18:23 +10:00
Keith Packard
4840be66b1 [PATCH] Provide configurable UI font for gitk
This makes the font used in the UI elements of gitk configurable in the
same way the other fonts are. The default fonts used in the Xft build of
tk8.5 are particularily horrific, making this change more important
there.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05 10:29:47 +10:00
Mark Wooding
ce08872259 [PATCH] gitk: Use git wrapper to run git-ls-remote.
For some reason, the Cygwin Tcl's `exec' command has trouble running
scripts.  Fix this by using the C `git' wrapper.  Other GIT programs run
by gitk are written in C already, so we don't need to incur a
performance hit of going via the wrapper (which I'll bet isn't pretty
under Cygwin).

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05 10:28:34 +10:00
Rutger Nijlunsing
6e5f7203de [PATCH] gitk: add key bindings for selecting first and last commit
For a keyboard addict like me some keys are still missing from
gitk. Especially a key to select a commit when no commit is selected,
like just after startup. While we're at it, complete the bindings for
moving the view seperately from the selected line. Currently, the up
and down keys act on the selected line while pageup and pagedown act
on the commits viewed.

The idea is to have to normal keys change the selected line:
  - Home selects first commit
  - End selects last commit
  - Up selects previous commit
  - Down selects next commit
  - PageUp moves selected line one page up
  - PageDown moves selected line one page down
...and together with the Control key, it moves the commits view:
  - Control-Home views first page of commits
  - Control-End views last page of commits
  - Control-Up moves commit view one line up
  - Control-Down moves commit view one line down
  - Control-PageUp moves commit view one page up
  - Control-PageDown moves commit view one page down

Signed-off-By: Rutger Nijlunsing <gitk@tux.tmfweb.nl>

and with some cleanups and simplifications...
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05 10:24:03 +10:00
Paul Mackerras
4e95e1f738 gitk: Add a help menu item to display key bindings
Suggested by Paul Schulz.  I made it a separate entry under the Help
menu rather than putting it in the About box, though.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05 09:39:51 +10:00
Stephen Rothwell
e100712968 [PATCH] gitk: allow goto heads
This patch allows you to enter a head name in the SHA1 id: field.

It also removes some unnecessary global declarations.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-05 09:14:02 +10:00
Paul Mackerras
50b44eceed gitk: Implement multiple views
With this, gitk can know about the graphs for multiple sets of files
and directories of interest.  Each set of files/dirs and its graph is
called a "view".  There is always the "All files" view, which is the
complete graph showing all commits.  If files or dirs are specified
on the command line, a "Command line" view is automatically created.
Users can create new views and switch between them, and can delete
any view except the "All files" view.

This required a bit of reengineering.  In particular, some more things
that were arrays have now become lists.  The idrowranges array is still
used while the graph is being laid out, but for rows that have been laid
out we use the rowrangelist list instead.  The cornercrossings and
crossings arrays no longer exist, and instead we compute the crossings
when needed (in assigncolor).

Still to be done: make the back/forward buttons switch views as necessary;
make the updatecommits function work right; preserve the selection if
possible when the new view has to be read in; fix the case when the user
switches away from the current view while we are still reading it in
and laying it out; further optimizations.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-04 10:16:22 +10:00
Paul Mackerras
79b2c75e04 gitk: replace parent and children arrays with lists
This will make it easier to switch between views efficiently, and
turns out to be slightly faster as well.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 20:47:40 +10:00
Paul Mackerras
879e8b1aad gitk: Better workaround for arrows on diagonal line segments
Instead of adding extra padding to create a vertical line segment at
the lower end of a line that has an arrow, this now just draws a very
short vertical line segment at the lower end.  This alternative
workaround for the Tk8.4 behaviour (not drawing arrows on diagonal
line segments) doesn't have the problem of making the graph very wide
when people do a lot of merges in a row (hi Junio :).

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 10:45:14 +11:00
Paul Mackerras
be0cd0981f gitk: Allow top panes to scroll horizontally with mouse button 2
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 09:55:11 +11:00
Paul Mackerras
f340844962 gitk: Prevent parent link from overwriting commit headline
When I made drawlineseg responsible for drawing the link to the first
child rather than drawparentlinks, that meant that the right-most X
value computed by drawparentlinks didn't include those first-child
links, and thus the first-child link could go over the top of the
commit headline.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 09:54:24 +11:00
Paul Mackerras
7b5ff7e7d7 gitk: Show diffs for boundary commits
With this we run git-diff-tree on a commit even if we think it has
no parents, either because it really has no parents or because it
is a boundary commit.  This means that gitk shows the diff for a
boundary commit when it is selected.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-30 20:50:40 +11:00
Paul Mackerras
16c1ff968a gitk: Use the new --boundary flag to git-rev-list
With this, we can show the boundary (open-circle) commits immediately
after their last child, which looks much better than putting all the
boundary commits at the bottom of the graph.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-30 18:43:51 +11:00
Paul Mackerras
7a1d9d14c8 gitk: Fix two bugs reported by users
The first was a simple typo where I put $yc instead of [yc $row].
The second was that I broke the logic for keeping up with fast
movement through the commits, e.g. when you select a commit and then
press down-arrow and let it autorepeat.  That got broken when I
changed the merge diff display to use git-diff-tree --cc.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-22 10:21:45 +11:00
Paul Mackerras
eb447a126c gitk: Improve appearance of first child links
The point where the line for a parent joins to the first child
shown is visually different from the lines to the other children,
because the line doesn't branch, but terminates at the child.
Because of this, we now treat the first child a little differently
in the optimizer, and we draw its link in drawlineseg rather
than drawparentlinks.  This improves the appearance of the graph.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-18 23:11:37 +11:00
Paul Mackerras
d8d2df08f6 gitk: Make downward-pointing arrows end in vertical line segment
It seems Tk 8.4 can't draw arrows on diagonal line segments.  This
adds code to the optimizer to make the last bit of a line go vertically
before being terminated with an arrow pointing downwards, so that
it will be drawn correctly by Tk 8.4.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-18 20:42:46 +11:00
Paul Mackerras
f4171a19f0 gitk: Don't change cursor at end of layout if find in progress
If the user is doing a find in files or patches, which changed the
cursor to a watch, don't change it back to a pointer when we reach
the end of laying out the graph.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-18 16:02:51 +11:00
Paul Mackerras
f7a3e8d254 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>
2006-03-18 10:04:48 +11:00
Paul Mackerras
b06bc2a078 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>
2006-03-08 09:15:32 +11:00
Martin Mares
9f841cf1fb [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>
2006-03-03 09:56:32 +11:00
Paul Mackerras
c934a8a3a3 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>
2006-03-02 23:00:44 +11:00
Paul Mackerras
8ed1648415 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>
2006-03-02 22:56:44 +11:00
Paul Mackerras
8f7d0cecf4 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>
2006-02-28 22:10:19 +11:00
Paul Mackerras
aa81d97476 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>
2006-02-28 11:27:12 +11:00
Paul Mackerras
f634248052 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>
2006-02-28 10:02:03 +11:00
Paul Mackerras
9f1afe05c3 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>
2006-02-19 22:44:47 +11:00
Paul Mackerras
69d47bdd6c 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>
2006-02-10 10:29:26 +11:00
Paul Mackerras
b77b02785d 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>
2006-02-07 09:13:52 +11:00
Paul Mackerras
418c4c7bce 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>
2006-02-07 09:10:18 +11:00
Paul Mackerras
fd8ccbec4f 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>
2005-12-07 23:28:22 +11:00
Paul Mackerras
4dd5d0d9eb 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>
2005-12-06 09:46:23 +11:00
Paul Mackerras
38ad0910a0 gitk: Factored out some common code into a new start_rev_list procedure
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-12-01 22:42:46 +11:00
Sven Verdoolaege
b5c2f30689 [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>
2005-12-01 20:01:51 +11:00
Paul Mackerras
712fcc08c7 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>
2005-11-30 09:28:16 +11:00
Junio C Hamano
671bc1538a [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>
2005-11-28 20:46:49 +11:00
Paul Mackerras
d327244a84 gitk: Fix diff this->selected and selected->this functions
The change in 8b7e5d76e8, 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>
2005-11-28 20:41:56 +11:00
Pavel Roskin
495473c08a [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>
2005-11-23 21:21:33 +11:00
Jeff Hobbs
2ed49d5424 [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>
2005-11-23 21:21:27 +11:00
Paul Mackerras
757f17bca5 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>
2005-11-21 09:56:07 +11:00
Paul Mackerras
f6e2869f48 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>
2005-11-20 23:08:22 +11:00
Stefan-W. Hahn
e3fe532ddc 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>
2005-11-19 00:24:40 -08:00
Pavel Roskin
fd913b3910 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>
2005-11-19 00:00:37 -08:00
Frank Sorenson
e246483dc5 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>
2005-11-18 23:55:50 -08:00
Junio C Hamano
36a7cad6e4 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>
2005-11-18 23:54:17 -08:00
Paul Mackerras
232475d382 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>
2005-11-15 10:34:03 +11:00
Linus Torvalds
8b7e5d76e8 [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>
2005-10-27 16:01:15 +10:00
Paul Mackerras
9e026d3967 Use "$@" rather than "${1+$@}" when invoking wish. 2005-09-27 10:29:41 +10:00
Paul Mackerras
a69875318b 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.
2005-09-26 10:22:43 +10:00
Robert Suetterlin
6e2dda35c2 [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>
2005-09-22 10:07:36 +10:00
Paul Mackerras
9843c3074d Draw selected graph line thicker and make arrowheads active. 2005-08-30 10:57:11 +10:00
Paul Mackerras
106288cb02 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.
2005-08-19 23:11:39 +10:00
Paul Mackerras
f1d83ba34c 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.
2005-08-19 22:14:28 +10:00
Paul Mackerras
04c13d3877 Save the maxwidth setting in the ~/.gitk file. 2005-08-19 10:22:24 +10:00
Paul Mackerras
022bc2ac74 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.
2005-08-19 10:22:04 +10:00
Paul Mackerras
e5ea701b8e 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.
2005-08-18 20:40:39 +10:00
Paul Mackerras
f6075ebadb 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.
2005-08-18 09:30:10 +10:00
Paul Mackerras
244edd1241 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.
2005-08-17 21:27:55 +10:00
Paul Mackerras
b664550c06 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.
2005-08-11 09:56:23 +10:00
Paul Mackerras
466e4fdd66 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.
2005-08-10 22:50:28 +10:00
Linus Torvalds
b1ba39e7e8 [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>
2005-08-09 21:09:27 +10:00
Paul Mackerras
fa4da7b32e 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.
2005-08-08 09:47:22 +10:00
Linus Torvalds
8b19280930 [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: fc54a9c30c  (Update git-apply-patch-script ...)
	Parent: 9e30dd7c0e  (Make git-prune-script executa ...)
	Parent: c4b83e618f  (Do not write out new index if ...)
	Parent: 660265909f  (diff-cache shows differences  ...)
	Parent: b28858bf65  (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>
2005-08-08 08:40:24 +10:00
Paul Mackerras
d6e8149bc5 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.)
2005-08-07 20:01:24 +10:00
Paul Mackerras
94a2eede68 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!).
2005-08-07 15:27:57 +10:00
Paul Mackerras
d698206c12 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.
2005-08-06 22:06:06 +10:00
Paul Mackerras
8d858d1a3a 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.)
2005-08-05 09:52:16 +10:00
Paul Mackerras
1115fb38df 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
2005-07-31 21:35:21 +10:00
Paul Mackerras
c8a4acbf4a 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.
2005-07-29 09:23:03 -05:00
Junio C Hamano
73b6a6cbda [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>
2005-07-28 07:29:59 -05:00
Paul Mackerras
4ef1753763 Import the --topo-order change and fix the writing of ~/.gitk. 2005-07-27 22:16:51 -05:00
Paul Mackerras
9d2a52eca1 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).
2005-07-27 22:15:47 -05:00
Paul Mackerras
7eab29339b Handle the rename cases reported by git-diff-tree -C correctly. 2005-07-20 12:25:54 -04:00
Paul Mackerras
3c461ffe88 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...
2005-07-20 09:13:46 -04:00
Paul Mackerras
f06548617d 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).
2005-07-18 14:29:03 -04:00
Paul Mackerras
f3b8b3ce3e Allow short SHA1 IDs in the SHA1 entry field. 2005-07-18 12:16:35 -04:00
Paul Mackerras
4f2c2642ca 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.
2005-07-17 11:11:44 -04:00
Paul Mackerras
e2ed4324b0 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).
2005-07-17 03:39:44 -04:00
Paul Mackerras
14c9dbd69b 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.
2005-07-16 21:53:55 -04:00
Paul Mackerras
b74fd57966 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.
2005-07-16 07:46:13 -04:00
Paul Mackerras
4a2139f52f 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.
2005-06-29 09:47:48 +10:00
Paul Mackerras
bdbfbe3dc9 Add a menu item for creating tags. 2005-06-27 22:56:40 +10:00
Paul Mackerras
7e952e797c 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.
2005-06-27 20:04:26 +10:00
Paul Mackerras
74daedb62c Add a menu entry for generating a patch between any two commits. 2005-06-27 19:27:32 +10:00
Paul Mackerras
8a0a74ad77 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.
2005-06-27 13:38:29 +10:00
Paul Mackerras
e2ede2b9f5 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.
2005-06-27 10:37:11 +10:00
Paul Mackerras
ee3dc72e30 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.
2005-06-25 16:37:13 +10:00
Paul Mackerras
c8dfbcf995 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.
2005-06-25 15:39:21 +10:00
Paul Mackerras
6c20ff3423 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.
2005-06-22 19:53:32 +10:00
Paul Mackerras
806ce09718 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.
2005-06-22 18:15:15 +10:00
Paul Mackerras
b490a99176 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.
2005-06-22 10:25:38 +10:00
Paul Mackerras
2efef4b9b5 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.
2005-06-21 10:20:04 +10:00
Paul Mackerras
a823a91131 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.
2005-06-21 10:01:38 +10:00
Paul Mackerras
84ba734580 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
2005-06-17 00:12:26 +00:00
Paul Mackerras
ea13cba175 Fix operation without libreadobj.so.0.0
Display a watch cursor when reading the commits initially
2005-06-16 10:54:04 +00:00
Paul Mackerras
9ccbdfbfbc Restructure to do incremental drawing
Some speedups from not doing update so often
2005-06-16 00:27:23 +00:00
Paul Mackerras
c2f6a02251 Show heads as well as tags 2005-06-10 07:54:49 +00:00
Paul Mackerras
d4e95cb6cf cope with changed git-diff-tree output format 2005-06-01 00:02:13 +00:00
Paul Mackerras
cfb4563c83 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.
2005-05-31 12:14:42 +00:00
Paul Mackerras
887fe3c474 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.
2005-05-21 07:35:37 +00:00
Paul Mackerras
39ad85705c Accommodate new git-diff-tree output format
Add 'f' key for moving to next file
2005-05-19 12:35:53 +00:00
Paul Mackerras
5842215ee9 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
2005-05-19 10:56:42 +00:00
Paul Mackerras
173860663e 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
2005-05-18 22:51:00 +00:00
Paul Mackerras
df3d83b143 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
2005-05-17 23:23:07 +00:00
Paul Mackerras
0fba86b3a9 save window geometry on exit, and restore it on startup 2005-05-16 23:54:58 +00:00
Paul Mackerras
43bddeb43d 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.
2005-05-15 23:19:18 +00:00
Paul Mackerras
e47120cb93 Fix stder -> stderr 2005-05-15 21:49:26 +00:00
Paul Mackerras
276819b35b Bumped version number 2005-05-15 12:57:02 +00:00
Paul Mackerras
1d10f36d7f Made commit list reading asynchronous
Added control+/- to increase/decrease font sizes
Rearranged code a little.
2005-05-15 12:55:47 +00:00
Paul Mackerras
98f350e501 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.
2005-05-15 05:56:51 +00:00
Paul Mackerras
9a40c50c1e 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
2005-05-12 23:46:16 +00:00
Paul Mackerras
e5c2d85644 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
2005-05-11 23:44:54 +00:00
Paul Mackerras
d2610d110e Make getting file lists asynchronous
Add some scrollbars
2005-05-11 00:45:38 +00:00
Paul Mackerras
b5721c72b7 source ~/.gitk for user-specific option settings
use a panedwindow for the main list with three panes,
and make them scroll together
2005-05-10 12:08:22 +00:00
Paul Mackerras
5ad588de72 Display the list of changed files in a listbox pane. 2005-05-10 01:02:55 +00:00
Paul Mackerras
0327d27a18 Use a panedwindow
Make it cope with commits having parents that aren't listed.
2005-05-10 00:23:42 +00:00
Paul Mackerras
1db95b00a2 Add initial version of gitk to the CVS repository 2005-05-09 04:08:39 +00:00