| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
|
findcont should not accept any arguments.
Signed-off-by: Pavel Roskin <proski@gnu.org>
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
With the new representation of the graph lines, this turns out
much simpler now.
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
|
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>
|
|
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>
|
|
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>
|
|
The change in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3, which makes
a couple of git-diff-tree calls supply only one id rather than two,
fixes the display when showing what a single commit did with dense
revlists, but broke the diff this->selected and diff selected->this
right-click menu functions.
Yann Dirson pointed this out and had a patch that fixed the diff
menu functions by passing a "singlecommit" flag around. This fixes
it a bit differently, by making the ids and diffids variables be
either a single id, in the case of showing what a commit did, or
{oldid newid}, in the case of the diff menu functions. That way
we can just pass $ids to git-diff-tree as is. Most of the changes
in fact are just reversing the order of ids in $ids and $diffids,
because they used to be {child parent}, but git-diff-tree requires
old id before new id.
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
|
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>
|
|
This braces all exprs. It just seemed to be a few that were missed.
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
|
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>
|
|
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>
|
|
Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
|
|
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.
|
|
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>
|
|
|
