Commit graph

180 commits

Author SHA1 Message Date
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