path: root/gitk
AgeCommit message (Collapse)Author
2006-05-26gitk: show_error fixPaul Mackerras
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 <>
2006-05-26[PATCH] gitk: start-up bugfixJunio C Hamano
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 <> Signed-off-by: Paul Mackerras <>
2006-05-26[PATCH] gitk: Replace "git-" commands with "git "Timo Hirvonen
git-* commands work only if gitexecdir is in PATH. Signed-off-by: Timo Hirvonen <> Signed-off-by: Paul Mackerras <>
2006-05-20[PATCH] gitk: Display commit messages with word wrapSergey Vlasov
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 <> Signed-off-by: Paul Mackerras <>
2006-05-19gitk: Fix bug where page-up/down wouldn't always work properlyPaul Mackerras
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 <>
2006-05-14gitk: Fix display of "(...)" for parents/children we haven't drawnPaul Mackerras
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 <>
2006-05-02gitk: Allow view to specify arbitrary arguments to git-rev-listPaul Mackerras
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 <>
2006-05-02gitk: Fix file list display when files are renamedPaul Mackerras
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 <>
2006-05-02gitk: Basic support for highlighting one view within anotherPaul Mackerras
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 <>
2006-04-30gitk: Add a tree-browsing modePaul Mackerras
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 <>
2006-04-27gitk: Use a text widget for the file listPaul Mackerras
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 <>
2006-04-26Merge branch 'new'Paul Mackerras
2006-04-25[PATCH] gitk: Add a visual tag for remote refsJosef Weidendorfer
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 <> Signed-off-by: Paul Mackerras <>
2006-04-25gitk: add menu item for editing the current viewPaul Mackerras
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 <>
2006-04-25gitk: Implement "permanent" views (stored in ~/.gitk)Paul Mackerras
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 <>
2006-04-23Merge branch 'master' into newPaul Mackerras
2006-04-23gitk: Use git-rev-parse only to identify file/dir names on cmd linePaul Mackerras
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 <>
2006-04-23gitk: Let git-rev-list do the argument list parsingPaul Mackerras
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 <>
2006-04-21gitk: Remember the view in the history listPaul Mackerras
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 <>
2006-04-17gitk: Fix bug caused by missing commitlisted elementsPaul Mackerras
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 <>
2006-04-16gitk: Don't reread git-rev-list output from scratch on view switchPaul Mackerras
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 <>
2006-04-06gitk: Fix various bugs in the view supportPaul Mackerras
- 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 <>
2006-04-06Merge branch 'master' into newPaul Mackerras
2006-04-06gitk: Fix incorrect invocation of getmergedifflinePaul Mackerras
Signed-off-by: Paul Mackerras <>
2006-04-06[PATCH] gitk: Fix searching for filenames in gitkPavel Roskin
findcont should not accept any arguments. Signed-off-by: Pavel Roskin <> Signed-off-by: Paul Mackerras <>
2006-04-06gitk: Make File->Update work properly againPaul Mackerras
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 <>
2006-04-05[PATCH] Provide configurable UI font for gitkKeith Packard
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 <> Acked-by: Junio C Hamano <> Signed-off-by: Paul Mackerras <>
2006-04-05[PATCH] gitk: Use git wrapper to run git-ls-remote.Mark Wooding
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 <> Acked-by: Junio C Hamano <> Signed-off-by: Paul Mackerras <>
2006-04-05[PATCH] gitk: add key bindings for selecting first and last commitRutger Nijlunsing
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 <> and with some cleanups and simplifications... Signed-off-by: Paul Mackerras <>
2006-04-04gitk: Add a help menu item to display key bindingsPaul Mackerras
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 <>
2006-04-04[PATCH] gitk: allow goto headsStephen Rothwell
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 <> Signed-off-by: Paul Mackerras <>
2006-04-04gitk: Implement multiple viewsPaul Mackerras
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 <>
2006-04-02gitk: replace parent and children arrays with listsPaul Mackerras
This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <>
2006-03-30gitk: Better workaround for arrows on diagonal line segmentsPaul Mackerras
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 <>
2006-03-30gitk: Allow top panes to scroll horizontally with mouse button 2Paul Mackerras
Signed-off-by: Paul Mackerras <>
2006-03-30gitk: Prevent parent link from overwriting commit headlinePaul Mackerras
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 <>
2006-03-30gitk: Show diffs for boundary commitsPaul Mackerras
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 <>
2006-03-30gitk: Use the new --boundary flag to git-rev-listPaul Mackerras
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 <>
2006-03-21gitk: Fix two bugs reported by usersPaul Mackerras
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 <>
2006-03-18gitk: Improve appearance of first child linksPaul Mackerras
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 <>
2006-03-18gitk: Make downward-pointing arrows end in vertical line segmentPaul Mackerras
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 <>
2006-03-18gitk: Don't change cursor at end of layout if find in progressPaul Mackerras
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 <>
2006-03-17gitk: Make commitdata an array rather than a listPaul Mackerras
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 <>
2006-03-07gitk: Fix display of diff lines beginning with --- or +++Paul Mackerras
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 <>
2006-03-02[PATCH] gitk: Make error_popup react to ReturnMartin Mares
The error popup window can be now closed not only by clicking the button, but also by pressing Return. Signed-Off-By: Martin Mares <> Signed-off-by: Paul Mackerras <>
2006-03-02gitk: Fix a bug in drawing the selected line as a thick linePaul Mackerras
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 <>
2006-03-02gitk: Further speedupsPaul Mackerras
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 <>
2006-02-28gitk: Various speed improvementsPaul Mackerras
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 <>
2006-02-28gitk: Fix Update menu itemPaul Mackerras
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 <>
2006-02-27gitk: Fix clicks on arrows on line endsPaul Mackerras
With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <>