aboutsummaryrefslogtreecommitdiff
path: root/gitk
Commit message (Collapse)AuthorAge
* gitk: Make "find" on "Files" work again.Paul Mackerras2006-02-10
| | | | | | | 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>
* gitk: Use git-diff-tree --cc for showing the diffs for mergesPaul Mackerras2006-02-07
| | | | | | | | | | | 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>
* gitk: Add braces around if expressionsPaul Mackerras2006-02-07
| | | | | | | | 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>
* gitk: Work around Tcl's non-standard names for encodingsPaul Mackerras2005-12-07
| | | | | | | | 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>
* gitk: Some improvements for the code for updating the displayPaul Mackerras2005-12-06
| | | | | | | | 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>
* gitk: Factored out some common code into a new start_rev_list procedurePaul Mackerras2005-12-01
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] gitk: add Update menu item.Sven Verdoolaege2005-12-01
| | | | | | | | 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>
* gitk: Add a preferences dialog with some basic stuffPaul Mackerras2005-11-30
| | | | | | | 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>
* [PATCH] gitk: Use i18n.commitencoding configuration item.Junio C Hamano2005-11-28
| | | | | | | | 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>
* gitk: Fix diff this->selected and selected->this functionsPaul Mackerras2005-11-28
| | | | | | | | | | | | | | | | | | | | 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>
* [PATCH] gitk: UTF-8 supportPavel Roskin2005-11-23
| | | | | | | | 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>
* [PATCH] gitk: put braces around exprsJeff Hobbs2005-11-23
| | | | | | This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
* gitk: Disable fastdate stuff for nowPaul Mackerras2005-11-21
| | | | | | | | | 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>
* gitk: Fix some bugs introduced by speedup changesPaul Mackerras2005-11-20
| | | | | | | | | | 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>
* gitk: moving all three panes if clicking on an arrow.Stefan-W. Hahn2005-11-19
| | | | | Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitk: use git-diff-tree --no-commit-idPavel Roskin2005-11-19
| | | | | | | | | | | | | | | | 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>
* gitk: Specify line hover fontFrank Sorenson2005-11-18
| | | | | | | | | | 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>
* readrefs: grab all refs with one call to ls-remote.Junio C Hamano2005-11-18
| | | | | | | | | 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>
* Add -r flag and some speedupsPaul Mackerras2005-11-15
| | | | | | | | | | | | | | | | 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>
* [PATCH] Make "gitk" work better with dense revlistsLinus Torvalds2005-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Use "$@" rather than "${1+$@}" when invoking wish.Paul Mackerras2005-09-27
|
* Change wish8.4 back to wishPaul Mackerras2005-09-26
| | | | | | 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.
* [PATCH] Add new keybindingsRobert Suetterlin2005-09-22
| | | | | | | | | 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>
* Draw selected graph line thicker and make arrowheads active.Paul Mackerras2005-08-30
|
* Display the contents of a tag when the user clicks on it.Paul Mackerras2005-08-19
| | | | | | | This just displays the result of git-cat-file on the tag in the details pane. If the tag is a "direct" tag (the tag file contains the SHA1 ID of a commit rather than a tag), we show the tag name and SHA1 ID.
* Added re-read refs command, and display all refs.Paul Mackerras2005-08-19
| | | | | | | | | | These are features requested by Junio. Any plain file under .git/refs whose contents start with 40 hex characters is taken as a reference and displayed like a head but with a light blue background (unless it is in .git/refs/tags or .git/refs/heads, in which case it is displayed as before). There is now a "Reread references" menu item in the File menu which re-reads all the plain files under .git/refs and redisplays any references that have changed.
* Save the maxwidth setting in the ~/.gitk file.Paul Mackerras2005-08-19
|
* Fix a bug where commits with no children weren't marked as on-screen.Paul Mackerras2005-08-19
| | | | | This problem was revealed by running gitk --all on Wolfgang Denk's u-boot repository.
* Use the --parents flag to git-rev-list.Paul Mackerras2005-08-18
| | | | | | | With --parents, git-rev-list gives us the list of parents on the first line of each commit. We use that rather than looking for the parent: lines in the commit body, since this way we get to know about the grafts for free.
* Allow graph lines to jump through hyperspace.Paul Mackerras2005-08-18
| | | | | | | | | | | | | | | When the graph gets too wide (as defined by the maxwidth variable, which can be set in ~/.gitk), we can now terminate graph lines with an arrow pointing downwards, and reintroduce them later with an arrow pointing upwards when we need them. This makes the graph much less cluttered on large repositories such as the linux kernel. Unfortunately this has made it slower; it takes about 10 seconds user time on the linux-2.6 repository on my machine now, compared to 6 seconds before. I'll have to work on optimizing that. Also on the todo list are making the arrow heads active (so if you click on them you jump to the other end) and improving the placement of the null entry.
* Add graft support.Paul Mackerras2005-08-17
| | | | | | We read .git/info/grafts and use the information in there to override the list of parents we get from git-rev-list or git-cat-file.
* Refine the update heuristic to improve responsiveness a bit.Paul Mackerras2005-08-11
| | | | | | | | | | | The previous commit improved performance a lot but also meant that we waited longer to see something drawn. This refines the heuristics for when to call update so that (1) when we have finished processing a bufferfull of information from git-rev-list, we call update if enough time has elapsed, regardless of how many commits we've drawn, and (2) the number of commits drawn between updates scales with the total number of commits drawn: 1 for 1-99 commits, 10 for 100-9999 commits, or 100 for >= 10000 commits.
* Only do an update every 100 commits when drawing the graph.Paul Mackerras2005-08-10
| | | | | | | | | | | | On a large repository with > 60,000 commits, each call to the Tk update primitive (which gives Tk a chance to respond to events and redraw the screen) was taking up to 0.2 seconds. Because the logic was to call update after drawing a commit if 0.1 seconds had passed since the last update call, we were calling it for every commit, which was slowing us down enormously. Now we also require that we have drawn 100 commits since the last update (as well as it being at least 0.1 seconds since the last update). Drawing 100 commits takes around 0.1 - 0.2 seconds (even in this large repo) on my G5.
* [PATCH] "Child" information in commit window - and cleanupsLinus Torvalds2005-08-09
| | | | | | | | | | | | | This adds "Child: " lines to the commit window, which tells what children a commit has. It also cleans things up: it marks the text widget as no-wrap, which means that it doesn't need to truncate the commit description arbitrarily by hand. Also, the description itself is now done by a common helper routine that handles both the parent and the children. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Better graph line details display and expand history coverage.Paul Mackerras2005-08-08
| | | | | | | | | | Now the history remembers when we have clicked on a graph line and when we have asked for a diff between two commits, as well as when we have displayed a commit. The display when you click on a graph line now uses clickable SHA1 IDs instead of the embedded "Go" buttons. Also made the IDs clickable in the header for a diff between two commits.
* [PATCH] gitk "parent information" in commit windowLinus Torvalds2005-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a useful "Parent:" line to the git commit information window. It looks something like this (from the infamous octopus merge): Author: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54 Committer: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54 Parent: fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc (Update git-apply-patch-script ...) Parent: 9e30dd7c0ecc9f10372f31539d0122db97418353 (Make git-prune-script executa ...) Parent: c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a (Do not write out new index if ...) Parent: 660265909fc178581ef327076716dfd3550e6e7b (diff-cache shows differences ...) Parent: b28858bf65d4fd6d8bb070865518ec43817fe7f3 (Update diff engine for symlin ...) Octopus merge of the following five patches. Update git-apply-patch-script for symbolic links. Make git-prune-script executable again. Do not write out new index if nothing has changed. diff-cache shows differences for unmerged paths without --cache. Update diff engine for symlinks stored in the cache. Signed-off-by: Junio C Hamano <junkio@cox.net> where all the parent commit ID's are clickable, because the new lines are added as part of the "comment" string, and thus the regular clickability thing will match them automatically. I think this is good. And my random-tcl-monkey-skills are clearly getting better (although it's perfectly possible that somebody who actually knows what he is doing would have done things differently). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Use lf translation rather than binary when reading commit data.Paul Mackerras2005-08-07
| | | | | | | The effect of this is that it allows Tcl to do the locale-specific conversion of the input data to its internal unicode representation. That means that commit messages in Russian or other languages should be displayed correctly now (according to the locale that is in effect.)
* Change cursor to a hand cursor when over a SHA1 ID link.Paul Mackerras2005-08-07
| | | | | | | | | This is based on suggestions by Jeff Epler and Linus Torvalds, but extended so that we do the switching between the watch cursor and the normal cursor correctly as well. Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing the link number (duh!).
* Add forward and back buttons and make SHA1 IDs clickable links.Paul Mackerras2005-08-06
| | | | | | | | | | When we display the commit message in the details pane, any string of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we know about gets turned into a clickable link, and displayed in blue and underlined. We now keep a history of commits that we have looked at, and we have forward and back buttons for moving within the history list.
* Compress the graph horizontally if it gets too wide.Paul Mackerras2005-08-05
| | | | | | | | | If the graph gets to use more than a certain percentage (default 50%) of the width of the top-left pane, we now reduce the amount of space allowed for each graph line. This means it doesn't look quite as nice but you can still see the headline for the commit. (Currently the only way to customize the percentage is to edit your ~/.gitk file manually.)
* Fix some bugs causing application error popups.Paul Mackerras2005-07-31
| | | | | | | | Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
* Improve the merge display when the result differs from all parents.Paul Mackerras2005-07-29
| | | | | | | Now we see if the result is quite similar to one of the parents, and if it is, display the result as a diff from that parent. If the result is similar to more than one parent, pick the one that it's most similar to.
* [PATCH] gitk: Use GIT_DIR where appropriate.Junio C Hamano2005-07-28
| | | | | | | | | | | | Some places assumed .git is the GIT_DIR, resulting heads and tags not showing when it was run like "GIT_DIR=. gitk --all". This is not a contrived example --- I rely on it to verify my private copy of git.git repository before pushing it out. Define a single procedure "gitdir" and use it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Import the --topo-order change and fix the writing of ~/.gitk.Paul Mackerras2005-07-27
|
* Display the diffs for a merge in a unified fashion.Paul Mackerras2005-07-27
| | | | | | | | | Stuff that ended up in the result is shown in bold with a "+" at the beginning of the line; stuff that didn't is in the normal font with a "-" at the beginning of the line. The color shows which parent the stuff was in; red for the first parent, blue for the second, then green, purple, brown, and the rest are grey. If the result is different from all of the parents it is shown in black (and bold).
* Handle the rename cases reported by git-diff-tree -C correctly.Paul Mackerras2005-07-20
|
* Calculate the list of interesting files for a merge.Paul Mackerras2005-07-20
| | | | | | | | | | | If there is a GCA for the parents of the merge, then a file is interesting if some parent has a version that is different from both the child and the GCA. If there is no GCA (e.g. for a merge that pulls in an external project) then a file is interesting if the child's version is different from all of the parents. Next step is to actually show the differences for the interesting files...
* Make the diff display less gaudy.Paul Mackerras2005-07-18
| | | | | The old style is still available as an option (we still need a preferences window so we can set/clear it though).
* Allow short SHA1 IDs in the SHA1 entry field.Paul Mackerras2005-07-18
|
* Fix display of mode changes in details pane.Paul Mackerras2005-07-17
| | | | | Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.