summaryrefslogtreecommitdiff
path: root/gitk
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-08-121-26/+121
|\ | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Show the currently checked-out head in bold font gitk: Allow the user to set some colors
| * 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>
* | fixed variable declaration in gitkMichael2006-08-031-1/+1
|/ | | | | Signed-off-by: Michael <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [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>
* gitk: Add a tree-browsing modePaul Mackerras2006-05-011-20/+358
| | | | | | | | | 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>
* gitk: Use a text widget for the file listPaul Mackerras2006-04-271-59/+131
| | | | | | | | | 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>
* Merge branch 'new'Paul Mackerras2006-04-261-156/+555
|\
| * gitk: add menu item for editing the current viewPaul Mackerras2006-04-251-37/+90
| | | | | | | | | | | | | | 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>
| * gitk: Implement "permanent" views (stored in ~/.gitk)Paul Mackerras2006-04-251-13/+48
| | | | | | | | | | | | | | | | | | | | 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>
| * Merge branch 'master' into newPaul Mackerras2006-04-231-2/+3
| |\
| * | gitk: Use git-rev-parse only to identify file/dir names on cmd linePaul Mackerras2006-04-231-50/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | gitk: Remember the view in the history listPaul Mackerras2006-04-211-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | gitk: Don't reread git-rev-list output from scratch on view switchPaul Mackerras2006-04-171-41/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | gitk: Fix various bugs in the view supportPaul Mackerras2006-04-061-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | Merge branch 'master' into newPaul Mackerras2006-04-061-14/+131
| |\ \
| * | | gitk: Make File->Update work properly againPaul Mackerras2006-04-061-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | gitk: Implement multiple viewsPaul Mackerras2006-04-041-118/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | [PATCH] gitk: Add a visual tag for remote refsJosef Weidendorfer2006-04-251-0/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | gitk: Let git-rev-list do the argument list parsingPaul Mackerras2006-04-231-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | gitk: Fix bug caused by missing commitlisted elementsPaul Mackerras2006-04-171-2/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | gitk: Fix incorrect invocation of getmergedifflinePaul Mackerras2006-04-061-1/+1
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] gitk: Fix searching for filenames in gitkPavel Roskin2006-04-061-1/+1
| | | | | | | | | | | | | | findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] Provide configurable UI font for gitkKeith Packard2006-04-051-6/+17
| | | | | | | | | | | | | | | | | | | | | | 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>
* | [PATCH] gitk: Use git wrapper to run git-ls-remote.Mark Wooding2006-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | [PATCH] gitk: add key bindings for selecting first and last commitRutger Nijlunsing2006-04-051-6/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | gitk: Add a help menu item to display key bindingsPaul Mackerras2006-04-051-1/+43
| | | | | | | | | | | | | | 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>
View Lorry Controller Status