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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
- 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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Paul Mackerras