Commit Graph

242 Commits

Author SHA1 Message Date
Paul Mackerras
43c2507438 gitk: Cope with commit messages with carriage-returns and initial blank lines
In some repositories imported from other systems we can get carriage
return characters in the commit message, which leads to a multi-line
headline being displayed in the summary window, which looks bad.
Also some commit messages start with one or more blank lines, which
leads to an empty headline.  This fixes these problems.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:43 +10:00
Paul Mackerras
7eb3cb9c68 gitk: Implement a simple scheduler for the compute-intensive stuff
This allows us to do compute-intensive processing, such as laying out
the graph, relatively efficiently while also having the GUI be
reasonably responsive.  The problem previously was that file events
were serviced before X events, so reading from another process which
supplies data quickly (hi git rev-list :) could mean that X events
didn't get processed for a long time.

With this, gitk finishes laying out the graph slightly sooner and
still responds to the GUI while doing so.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:38 +10:00
Paul Mackerras
e507fd4871 gitk: Improve the behaviour of the initial selection
It used to be that if you clicked on a line while gitk was still drawing
stuff, it would immediately re-select the first line of the display.
This fixes that.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:34 +10:00
Paul Mackerras
3fc4279a14 gitk: Add some more comments to the optimize_rows procedure
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:30 +10:00
Paul Mackerras
0a4dd8b855 gitk: Don't try to list large numbers of tags or heads in the details pane
With some large repositories, a commit can end up on thousands of
branches, which results in an extremely long "Branches:" line in the
details window, and that results in the window being extremely slow
to scroll.

This fixes it by just showing "many (N)" after "Branches:", "Follows:"
or "Precedes:", where N is the number of heads or tags.  The limit
is currently set at 20 but could be made configurable (and the "many"
could be a link to pop up a window listing them all in case anyone
really wants to know).

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:26 +10:00
Paul Mackerras
e11f123315 gitk: New infrastructure for working out branches & previous/next tags
Instead of working out descendent heads and descendent & ancestor
branches in a two-pass algorithm, this reads and stores a simplified
version of the graph topology, and works out descendent/ancestor
tags and descendent heads on demand (with a bit of caching).

The advantages of this are, first, that we now don't have to use
--topo-order on the git rev-list process.  Secondly, we don't have
to re-read the whole graph when tags or heads change or even when
the graph changes.  Since we can cope with parents coming before
children, we can update the graph by running a git rev-list with
arguments that just give us the new commits, and merge the new
commits into the simplified graph.

The graph is simplified in the sense that commits with exactly one
parent and one child (which is >90% of them in most cases) are grouped
together into arcs joining nodes or 'branch/merge points', which are
the commits that don't have exactly 1 parent and 1 child.  This reduces
the size of the graph substantially and decreases the time to traverse
it correspondingly.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-06-23 20:55:22 +10:00
Mark Levedahl
7e12f1a629 [PATCH] gitk: Allow specifying tabstop as other than default 8 characters.
Not all projects use the convention that one tabstop = 8 characters, and
a common convention is to use one tabstop = one level of indent.  For such
projects, using 8 characters per tabstop often shows too much whitespace
per indent.  This allows the user to configure the number of characters
to use per tabstop.

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-05-22 10:07:05 +10:00
Mark Levedahl
59ddaf3d19 [PATCH] gitk: Update fontsize in patch / tree list
When adjusting fontsize (using ctrl+/-), all panes except the lower right
were updated. This fixes that.

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-05-22 10:07:05 +10:00
Mark Levedahl
60378c0c09 [PATCH] gitk: Make selection highlight color configurable
Cygwin's tk by default uses a very dark selection background color that
makes the currently selected text almost unreadable.  On linux, the default
selection background is a light gray which is very usable. This makes the
default a light gray everywhere but allows the user to configure the
color as well.

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-05-22 10:07:05 +10:00
Paul Mackerras
696cf493f7 gitk: Use the -q flag to git checkout
This avoids having gitk think that an error has occurred in the checkout.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-05-22 10:06:39 +10:00
Paul Mackerras
a8d610a2a3 gitk: Allow user to choose whether to see the diff, old file, or new file
This adds a set of radiobuttons that select between displaying the full
diff (both - and + lines), the old file (suppressing the + lines) and the
new file (suppressing the - lines) in the diff display window.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-04-19 11:39:12 +10:00
Eygene Ryabinkin
3a950e9a9c [PATCH] Improve look-and-feel of the gitk tool.
Made the default buttons on the dialog active and focused upon the
dialog appearence.

Bound 'Escape' and 'Return' keys to the dialog dismissal where it
was appropriate: mainly for dialogs with only one button and no
editable fields.

Unified the look of the "About gitk" and "Key bindings" dialogs.

Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-04-01 12:47:06 +10:00
Eygene Ryabinkin
d59c4b6fb7 [PATCH] Teach gitk to use the user-defined UI font everywhere.
Some parts of gitk were not respecting the default GUI font. Most
of them were catched and fixed.

Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-04-01 12:47:06 +10:00
Brandon Casey
1ce09dd678 [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk
Preferring git _space_ COMMAND over git _dash_ COMMAND allows the
user to have only git and gitk in their path. e.g. when git and gitk
are symbolic links in a personal bin directory to the real git and gitk.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-21 22:02:19 +11:00
Eric Wong
e7a0919115 [PATCH] gitk: bind <F5> key to Update (reread commits)
I chose <F5> because it's also the key to reload the current
page in web browsers such as Konqueror and Firefox, so users
are more likely to be familiar with it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-12 20:13:02 +11:00
Mark Levedahl
9ca72f4f60 Make gitk save and restore window pane position on Linux and Cygwin.
Subtle bugs remained on both Cygwin and Linux that caused the various
window panes to be restored in positions different than where the user
last placed them. Sergey Vlasov posed a pair of suggested fixes to this,
what is done here is slightly different. The basic fix here involves
a) explicitly remembering and restoring the sash positions for the upper
window, and b) using paneconfigure to redundantly set height and width of
other elements. This redundancy is needed as Cygwin Tcl has a nasty habit
of setting pane sizes to zero if their slaves are not configured with a
specific size, but Linux Tcl does not honor the specific size given.

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-15 09:13:14 +11:00
Mark Levedahl
b6047c5a81 Make gitk save and restore the user set window position.
gitk was saving widget sizes and positions when the main window was
destroyed, which is after all child widgets are destroyed. The cure
is to trap the WM_DELETE_WINDOW event before the gui is torn down. Also,
the saved geometry was captured using "winfo geometry .", rather than
"wm geometry ." Under Linux, these two return different answers and the
latter one is correct.

[jc: credit goes to Brett Schwarz for suggesting the use of "wm protocol";
 I also squashed the follow-up patch to remove extraneous -0
 from expressions.]

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-15 09:12:53 +11:00
Junio C Hamano
7426eb7469 [PATCH] gitk: Use show-ref instead of ls-remote
It used to be ls-remote on self was the only easy way to grab
the ref information.  Now we have show-ref which does not
involve fork and IPC, so use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-02-15 09:01:59 +11:00
Junio C Hamano
e9937d2a03 [PATCH] Make gitk work reasonably well on Cygwin.
The gitk gui layout was completely broken on Cygwin. If gitk was started
without previous geometry in ~/.gitk, the user could drag the window sashes
to get a useable layout. However, if ~/.gitk existed, this was not possible
at all.

The fix was to rewrite makewindow, changing the toplevel containers and
the particular geometry information saved between sessions. Numerous bugs
in both the Cygwin and the Linux Tk versions make this a delicate
balancing act: the version here works in both but many subtle variants
are competely broken in one or the other environment.

Three user visible changes result:
1 - The viewer is fully functional under Cygwin.
2 - The search bar moves from the bottom to the top of the lower left
    pane. This was necessary to get around a layout problem on Cygwin.
3 - The window size and position is saved and restored between sessions.
    Again, this is necessary to get around a layout problem on Cygwin.

Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-02-15 08:57:14 +11:00
Mark Levedahl
40b87ff877 [PATCH] gitk - remove trailing whitespace from a few lines.
Signed-off-by: Mark Levedahl <mdl123@verizon.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-02-15 08:57:14 +11:00
Paul Mackerras
27cb61ca14 Change git repo-config to git config
This is the gitk part of e0d10e1c63
from Tom Prince.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-02-15 08:54:34 +11:00
Peter Baumann
5024baa437 [PATCH] Make gitk work when launched in a subdirectory
Make gitk use git-rev-parse --git-dir to find the repository.

Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-01-13 16:15:09 +11:00
Doug Maxey
6c2833284d [PATCH] gitk: add current directory to main window title
This can help people keep track of which gitk is which, when they
have several on the screen.

Signed-off-by: Doug Maxey <dwm@enoyolf.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-01-13 16:15:09 +11:00
Paul Mackerras
3cd204e518 gitk: Fix enabling/disabling of menu items on Mac OS X
It seems that under Mac OS X, the menus get some extra entries (or
possibly fewer entries), leading to references to entries by an
absolute number being off.  This leads to an error when invoking
gitk --all under Mac OS X, because the "Edit view" and "Delete view"
entries aren't were gitk expects them, and so enabling them gives an
error.

This changes the code so it refers to menu entries by their content,
which should solve the problem.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-23 21:06:16 +11:00
OGAWA Hirofumi
67c22874cf [PATCH] gitk: Fix nextfile() and add prevfile()
The current nextfile() jumps to last hunk, but I think this is not
intention, probably, it's forgetting to add "break;". And this
patch also adds prevfile(), it jumps to previous hunk.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-10-19 10:10:11 +10:00
Paul Mackerras
561d038ab8 gitk: Fix some bugs in the new cherry-picking code
When inserting the new commit row for the cherry-picked commit, we weren't
advancing the selected line (if there is one), and we weren't updating
commitlisted properly.
2006-08-28 22:41:09 +10:00
Paul Mackerras
d1e46756d3 gitk: Improve responsiveness while reading and layout out the graph
This restructures layoutmore so that it can take a time limit and do
limited amounts of graph layout and graph optimization, and return 1
if it exceeded the time limit before finishing everything it could do.
Also getcommitlines reads at most half a megabyte each time, to limit
the time it spends parsing the commits to about a tenth of a second.

Also got rid of the unused ncmupdate variable while I was at it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-16 20:02:32 +10:00
Paul Mackerras
ceadfe90c6 gitk: Update preceding/following tag info when creating a tag
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-08 20:55:36 +10:00
Paul Mackerras
ca6d8f58a1 gitk: Add a menu item for cherry-picking commits
This does a git-cherry-pick -r to cherry-pick the commit that was
right-clicked on to the head of the current branch.  This would work
better with some minor changes to the git-cherry-pick script.

Along the way, this changes desc_heads to record the names of the
descendent heads rather than their IDs.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-06 21:08:05 +10:00
Paul Mackerras
53cda8d97e gitk: Fix a couple of buglets in the branch head menu items
This fixes a silly typo (an extra a) and fixes the condition for
asking for confirmation of removing a branch.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-02 19:43:34 +10:00
Paul Mackerras
10299152ca gitk: Add a context menu for heads
This menu allows you to check out a branch and to delete a branch.
If you ask to delete a branch that has commits that aren't on any
other branch, gitk will prompt for confirmation before doing the
deletion.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-02 09:52:01 +10:00
Paul Mackerras
d6ac1a86e9 gitk: Add a row context-menu item for creating a new branch
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-02 09:41:04 +10:00
Paul Mackerras
cec7bece83 gitk: Recompute ancestor/descendent heads/tags when rereading refs
We weren't updating the desc_heads, desc_tags and anc_tags arrays when
rereading the set of heads/tags/etc.  The tricky thing to get right
here is restarting the computation correctly when we are only half-way
through it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-08-02 09:38:10 +10:00
Paul Mackerras
e1a7c81f6a gitk: Minor cleanups
Removed some unnecessary quotes and globals, updated copyright notice.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-07-18 01:52:14 +10:00
Paul Mackerras
8a48571ce5 gitk: Show the currently checked-out head in bold font
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-07-06 10:21:23 +10:00
Paul Mackerras
f8a2c0d14f gitk: Allow the user to set some colors
This makes the colors for the diff old/new lines and hunk headers
configurable, as well as the background and foreground (text color)
of the various panes.  There is now a GUI in the edit->preferences
window to set them.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-07-05 22:56:37 +10:00
Junio C Hamano
2e1ded44f7 [PATCH] gitk: rereadrefs needs listrefs
The listrefs procedure was inadvertently removed during the course of
development, but there is still a user of it, so resurrect it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-12 09:37:44 +10:00
Paul Mackerras
2d71bcccc8 gitk: Re-read the descendent/ancestor tag & head info on update
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-07 09:19:45 +10:00
Paul Mackerras
ef030b8547 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
This is a small extension to the code that reads the complete commit
graph, to make it compute descendent heads as well as descendent tags.
We don't exclude descendent heads that are descendents of other
descendent heads as we do for tags, since it is useful to know all the
branches that a commit is on.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-04 11:50:38 +10:00
Paul Mackerras
b8ab2e177a gitk: Show nearby tags
This adds a feature to the diff display window where it will show
the tags that this commit follows (is a descendent of) and precedes
(is an ancestor of).  Specifically, it will show the tags for all
tagged descendents that are not a descendent of another tagged
descendent of this commit, and the tags for all tagged ancestors
that are not ancestors of another tagged ancestor of this commit.

To do this, gitk reads the complete commit graph using git rev-list
and performs a couple of traversals of the tree.  This is done in
the background, but since it can be time-consuming, there is an option
to turn it off in the `edit preferences' window.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-03 19:11:13 +10:00
Paul Mackerras
96535e615d Merge branch 'master' into new
Conflicts:

	gitk
2006-05-30 21:35:07 +10:00
Paul Mackerras
4e7d677949 gitk: Add a goto next/previous highlighted commit function
This is invoked by shift-down/shift-up.  It relies on a patch to
git-diff-tree that has recently gone into the git repository, commit
ID e0c97ca6 (without this it may just sit there doing waiting for
git-diff-tree when looking for the next/previous highlight).

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-30 21:33:07 +10:00
Paul Mackerras
164ff275ad gitk: Provide ability to highlight based on relationship to selected commit
This provides a way to highlight commits that are, or are not,
descendents or ancestors of the currently selected commit.  It's
still rough around the edges but seems to be useful even so.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-29 19:50:02 +10:00
Paul Mackerras
e54be9e30f gitk: show_error fix
Bug noted by Junio C Hamano: show_error can be passed "." (root
window) as its $w argument, but appending ".m" and ".ok" results in
creating "..m" and "..ok" as window paths, which were invalid.
This fixes it in a slightly different way from Junio's patch, though.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-26 22:34:30 +10:00
Junio C Hamano
b5e096337c [PATCH] gitk: start-up bugfix
The code to extract a message part from the error message was
not passing the error message to [string range], and resulted
in the show_error not getting called.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-26 22:25:26 +10:00
Timo Hirvonen
8974c6f93e [PATCH] gitk: Replace "git-" commands with "git "
git-* commands work only if gitexecdir is in PATH.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-26 22:25:26 +10:00
Paul Mackerras
5864c08f89 gitk: Fix bug in highlight stuff when no line is selected
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-26 22:22:48 +10:00
Paul Mackerras
60f7a7dc49 gitk: Move "pickaxe" find function to highlight facility
This removes the "Files" and "Pickaxe" parts of the "Find" function,
so Find is now just about searching the commit data.  We now highlight
the commits that match the Find string (without having to press Find),
and have a drop-down menu for selecting whether the git-diff-tree based
highlighting is done on paths or on adding/removing a given string.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-26 10:43:47 +10:00
Paul Mackerras
1902c2705e gitk: Improve the text window search function
This makes it work a bit more smoothly, and adds a reverse-search
function, for which I stole the ^R binding from the find function.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-25 21:25:13 +10:00
Paul Mackerras
3ea06f9f7e gitk: First cut at a search function in the patch/file display window
This does incremental highlighting of matches to the search string
but doesn't do true incremental search a la emacs.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-24 10:16:03 +10:00
Paul Mackerras
45a9d5054d gitk: Highlight paths of interest in tree view as well
With this, when the file list window is in tree view mode, we highlight
the paths of interest.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-20 22:56:27 +10:00
Paul Mackerras
63b7919121 gitk: Highlight entries in the file list as well
This applies a bold highlight to entries in the file list pane in the
bottom right corner when it is displaying the list of changed files.
This doesn't yet highlight file list entries when it is in tree view
mode.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-20 21:31:52 +10:00
Sergey Vlasov
f1b8629453 [PATCH] gitk: Display commit messages with word wrap
Some people put very long strings into commit messages, which then
become invisible in gitk (word wrapping in the commit details window is
turned off, and there is no horizontal scroll bar).  Enabling word wrap
for just the commit message looks much better.

Wrapping is controlled by the "wrapcomment" option in ~/.gitk.  By
default this option is set to "none", which disables wrapping; setting
it to "word" enables word wrap for commit messages.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-20 20:15:28 +10:00
Paul Mackerras
6d80f3ce78 Merge branch 'master' into new 2006-05-20 09:59:10 +10:00
Paul Mackerras
e72ee5ebc8 gitk: Fix bug where page-up/down wouldn't always work properly
If the user pressed page up or page down and the new page wasn't
already drawn, we failed to select the line we wanted in the new
page.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-20 09:58:49 +10:00
Paul Mackerras
908c35850a gitk: Make a row of controls for controlling highlighting
Now there is a bar across the middle (just below the bar containing
the sha1 ID, find string etc.) which controls highlighting.  There are
three ways to highlight: the user can highlight commits affecting
a list of paths, commits in a view, or commits where the author or
committer matches any of a list of strings (case-insensitive).  The
elements of the list of paths and list of names are delimited by
whitespace with shell quoting rules.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-20 09:38:11 +10:00
Paul Mackerras
b093448910 gitk: Fix display of "(...)" for parents/children we haven't drawn
In the commit details window, we were displaying "(...)" for the
headlines of parents and children that haven't been drawn, without
making any attempt to get those headlines.  This adds a call to
getcommit to commit_descriptor so we get those headlines.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-15 09:56:08 +10:00
Paul Mackerras
098dd8a34b gitk: Allow view to specify arbitrary arguments to git-rev-list
The list of arguments to git-rev-list, including arguments that
select the range of commits, is now a part of the view specification.
If any arguments are given to gitk, they become part of the
"Command line" view, and the non-file arguments become the default
for any new views created.

Getting an error from git-rev-list is no longer fatal; instead the
error window pops up, and when you press OK, the main window just
shows "No commits selected".

The git-rev-list arguments are entered in an entry widget in the
view editor window using shell quoting conventions, not Tcl quoting
conventions.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-03 09:32:53 +10:00
Paul Mackerras
89b11d3ba5 gitk: Fix file list display when files are renamed
The conversion of the file list to use a text widget assumed incorrectly
that the list of files from git-diff-tree -r would correspond 1-1 with
the diff sections in the output of git-diff-tree -r -p -C, which is
not true when renames are detected.  This fixes it by keeping the
elements in the difffilestart list in the order they appear in the
file list window.

Since this means that the elements of difffilestart are no longer
necessarily in ascending order, it's somewhat hard to do the dynamic
highlighting in the file list as the diff window is scrolled, so I
have taken that out for now.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-02 19:55:31 +10:00
Paul Mackerras
da7c24dd9c gitk: Basic support for highlighting one view within another
With this, one view can be used as a highlight for another, so that
the commits that are in the highlight view are displayed in bold.
This required some fairly major changes to how the list of ids,
parents, children, and id to row mapping were stored for each view.
We can now be reading in several views at once; for all except the
current view, we just update the displayorder and the lists of parents
and children for the view.

This also creates a little bit of infrastructure for handling the
watch cursor.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-02 11:15:29 +10:00
Paul Mackerras
f8b28a4078 gitk: Add a tree-browsing mode
You can now select whether you want to see the patch for a commit
or the whole tree.  If you select the tree, gitk will now display
the commit message plus the contents of one file in the bottom-left
pane, when you click on the name of the file in the bottom-right pane.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-01 09:50:57 +10:00
Paul Mackerras
7fcceed7a0 gitk: Use a text widget for the file list
This lets us do things like highlighting all the entries for which
the corresponding part of the diff is at least partly visible in the
commit/patch display window, and in future it will let us display
the file list in a hierarchical form rather than as a flat file list.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-27 19:21:49 +10:00
Paul Mackerras
cb303a949f Merge branch 'new' 2006-04-26 16:32:59 +10:00
Josef Weidendorfer
a970fcf249 [PATCH] gitk: Add a visual tag for remote refs
This patch partly changes the background color for remote refs.
It makes it easy to quickly distinguish remote refs from local
developer branches.

I ignore remote HEADs, as these really should be drawn as
aliases to other heads. But there is no simple way to
detect that HEADs really are aliases for other refs via
"git-ls-remote".

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-25 22:44:47 +10:00
Paul Mackerras
d16c0812a9 gitk: add menu item for editing the current view
This allows the user to change the name of the view, whether it is
permanent, and the list of files/directories for the view.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-25 21:21:10 +10:00
Paul Mackerras
a90a6d249b gitk: Implement "permanent" views (stored in ~/.gitk)
With this the user can now mark a view as "permanent" and it will
appear in the list every time gitk is started (until it is deleted).
Also tidied up the view definition window, and changed the view
menu to use radiobuttons for the view selections so there is some
feedback as to which is the current view.

Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-25 17:12:46 +10:00
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