summaryrefslogtreecommitdiff
path: root/gitk
Commit message (Collapse)AuthorAgeFilesLines
* gitk: Allow user to choose whether to see the diff, old file, or new filePaul Mackerras2007-04-191-0/+17
| | | | | | | 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>
* [PATCH] Improve look-and-feel of the gitk tool.Eygene Ryabinkin2007-04-011-8/+15
| | | | | | | | | | | | | | 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>
* [PATCH] Teach gitk to use the user-defined UI font everywhere.Eygene Ryabinkin2007-04-011-6/+23
| | | | | | | | 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>
* [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitkBrandon Casey2007-03-211-2/+2
| | | | | | | | 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>
* [PATCH] gitk: bind <F5> key to Update (reread commits)Eric Wong2007-03-121-0/+2
| | | | | | | | | 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>
* Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl2007-02-151-10/+13
| | | | | | | | | | | | | | | 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>
* Make gitk save and restore the user set window position.Mark Levedahl2007-02-151-5/+6
| | | | | | | | | | | | | | | | 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>
* [PATCH] gitk: Use show-ref instead of ls-remoteJunio C Hamano2007-02-151-2/+2
| | | | | | | | | 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>
* [PATCH] Make gitk work reasonably well on Cygwin.Junio C Hamano2007-02-151-126/+150
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* [PATCH] gitk - remove trailing whitespace from a few lines.Mark Levedahl2007-02-151-4/+4
| | | | | | 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>
* Change git repo-config to git configPaul Mackerras2007-02-151-1/+1
| | | | | | This is the gitk part of e0d10e1c63bc52b37bbec99b07deee794058d9b4 from Tom Prince. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] Make gitk work when launched in a subdirectoryPeter Baumann2007-01-131-1/+1
| | | | | | | 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>
* [PATCH] gitk: add current directory to main window titleDoug Maxey2007-01-131-0/+1
| | | | | | | | 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>
* gitk: Fix enabling/disabling of menu items on Mac OS XPaul Mackerras2006-11-231-10/+10
| | | | | | | | | | | | | | 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>
* [PATCH] gitk: Fix nextfile() and add prevfile()OGAWA Hirofumi2006-10-191-0/+15
| | | | | | | | | 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>
* gitk: Fix some bugs in the new cherry-picking codePaul Mackerras2006-08-281-2/+6
| | | | | 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.
* gitk: Improve responsiveness while reading and layout out the graphPaul Mackerras2006-08-161-24/+34
| | | | | | | | | | | | 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>
* gitk: Update preceding/following tag info when creating a tagPaul Mackerras2006-08-081-0/+77
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Add a menu item for cherry-picking commitsPaul Mackerras2006-08-061-43/+210
| | | | | | | | | | | 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>
* gitk: Fix a couple of buglets in the branch head menu itemsPaul Mackerras2006-08-021-2/+2
| | | | | | | 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>
* gitk: Add a context menu for headsPaul Mackerras2006-08-021-0/+118
| | | | | | | | | 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>
* gitk: Add a row context-menu item for creating a new branchPaul Mackerras2006-08-021-0/+80
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Recompute ancestor/descendent heads/tags when rereading refsPaul Mackerras2006-08-021-47/+85
| | | | | | | | | 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>
* gitk: Minor cleanupsPaul Mackerras2006-07-181-7/+5
| | | | | | Removed some unnecessary quotes and globals, updated copyright notice. Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Show the currently checked-out head in bold fontPaul Mackerras2006-07-061-5/+22
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Allow the user to set some colorsPaul Mackerras2006-07-051-23/+101
| | | | | | | | | 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>
* [PATCH] gitk: rereadrefs needs listrefsJunio C Hamano2006-06-121-0/+18
| | | | | | | | 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>
* gitk: Re-read the descendent/ancestor tag & head info on updatePaul Mackerras2006-06-071-1/+17
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Show branch name(s) as well, if "show nearby tags" is enabledPaul Mackerras2006-06-041-11/+43
| | | | | | | | | | 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>
* gitk: Show nearby tagsPaul Mackerras2006-06-031-23/+247
| | | | | | | | | | | | | | | | 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>
* Merge branch 'master' into newPaul Mackerras2006-05-301-41/+43
|\ | | | | | | | | | | Conflicts: gitk
| * gitk: show_error fixPaul Mackerras2006-05-261-8/+8
| | | | | | | | | | | | | | | | | | 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>
| * [PATCH] gitk: start-up bugfixJunio C Hamano2006-05-261-1/+1
| | | | | | | | | | | | | | | | | | 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>
| * [PATCH] gitk: Replace "git-" commands with "git "Timo Hirvonen2006-05-261-26/+26
| | | | | | | | | | | | | | 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>
| * [PATCH] gitk: Display commit messages with word wrapSergey Vlasov2006-05-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | gitk: Add a goto next/previous highlighted commit functionPaul Mackerras2006-05-301-52/+144
| | | | | | | | | | | | | | | | | | 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>
* | gitk: Provide ability to highlight based on relationship to selected commitPaul Mackerras2006-05-291-2/+150
| | | | | | | | | | | | | | | | 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>
* | gitk: Fix bug in highlight stuff when no line is selectedPaul Mackerras2006-05-261-3/+2
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | gitk: Move "pickaxe" find function to highlight facilityPaul Mackerras2006-05-261-309/+59
| | | | | | | | | | | | | | | | | | | | 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>
* | gitk: Improve the text window search functionPaul Mackerras2006-05-251-19/+69
| | | | | | | | | | | | | | 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>
* | gitk: First cut at a search function in the patch/file display windowPaul Mackerras2006-05-241-6/+101
| | | | | | | | | | | | | | 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>
* | gitk: Highlight paths of interest in tree view as wellPaul Mackerras2006-05-201-26/+38
| | | | | | | | | | | | | | 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>
* | gitk: Highlight entries in the file list as wellPaul Mackerras2006-05-201-5/+66
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'master' into newPaul Mackerras2006-05-201-0/+1
|\ \ | |/
| * gitk: Fix bug where page-up/down wouldn't always work properlyPaul Mackerras2006-05-201-0/+1
| | | | | | | | | | | | | | | | 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>
* | gitk: Make a row of controls for controlling highlightingPaul Mackerras2006-05-201-67/+298
|/ | | | | | | | | | | | 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>
* gitk: Fix display of "(...)" for parents/children we haven't drawnPaul Mackerras2006-05-151-1/+4
| | | | | | | | | 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>
* gitk: Allow view to specify arbitrary arguments to git-rev-listPaul Mackerras2006-05-031-51/+196
| | | | | | | | | | | | | | | | | | 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>
* gitk: Fix file list display when files are renamedPaul Mackerras2006-05-021-62/+29
| | | | | | | | | | | | | | | | 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>
* gitk: Basic support for highlighting one view within anotherPaul Mackerras2006-05-021-221/+343
| | | | | | | | | | | | | | | 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>
View Lorry Controller Status