mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-18 06:14:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
0032d548db
git/gitk

3947 lines
108 KiB
Plaintext
Raw Normal View History

Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
Use "$@" rather than "${1+$@}" when invoking wish.
2005-09-27 08:29:41 +08:00
exec wish "$0" -- "$@"
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
# Copyright (C) 2005 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
[PATCH] gitk: Use GIT_DIR where appropriate. 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>
2005-07-28 15:28:44 +08:00
proc gitdir {} {
global env
if {[info exists env(GIT_DIR)]} {
return $env(GIT_DIR)
} else {
return ".git"
}
}
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
proc parse_args {rargs} {
global parsed_args
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[catch {
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
set parse_args [concat --default HEAD $rargs]
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
}]} {
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
# if git-rev-parse failed for some reason...
if {$rargs == {}} {
set rargs HEAD
}
set parsed_args $rargs
}
return $parsed_args
}
gitk: Factored out some common code into a new start_rev_list procedure Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-12-01 19:42:46 +08:00
proc start_rev_list {rlargs} {
Only do an update every 100 commits when drawing the graph. 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.
2005-08-10 20:50:28 +08:00
global startmsecs nextupdate ncmupdate
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global commfd leftover tclencoding datemode
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
set startmsecs [clock clicks -milliseconds]
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set nextupdate [expr {$startmsecs + 100}]
Refine the update heuristic to improve responsiveness a bit. 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.
2005-08-11 07:56:23 +08:00
set ncmupdate 1
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
initlayout
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set order "--topo-order"
if {$datemode} {
set order "--date-order"
}
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[catch {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set commfd [open [concat | git-rev-list --header $order \
gitk: Use the new --boundary flag to git-rev-list 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 <paulus@samba.org>
2006-03-30 15:43:51 +08:00
--parents --boundary $rlargs] r]
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
} err]} {
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
puts stderr "Error executing git-rev-list: $err"
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
exit 1
}
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
set leftover {}
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
fconfigure $commfd -blocking 0 -translation lf
if {$tclencoding != {}} {
fconfigure $commfd -encoding $tclencoding
}
Only do an update every 100 commits when drawing the graph. 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.
2005-08-10 20:50:28 +08:00
fileevent $commfd readable [list getcommitlines $commfd]
gitk: Factored out some common code into a new start_rev_list procedure Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-12-01 19:42:46 +08:00
. config -cursor watch
settextcursor watch
}
proc getcommits {rargs} {
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
global phase canv mainfont
gitk: Factored out some common code into a new start_rev_list procedure Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-12-01 19:42:46 +08:00
set phase getcommits
start_rev_list [parse_args $rargs]
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
}
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
proc getcommitlines {commfd} {
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
global commitlisted nextupdate
global leftover
global displayorder commitidx commitrow commitdata
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global parentlist childlist children
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
set stuff [read $commfd]
if {$stuff == {}} {
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
if {![eof $commfd]} return
Make the diff display less gaudy. The old style is still available as an option (we still need a preferences window so we can set/clear it though).
2005-07-19 02:29:03 +08:00
# set it blocking so we wait for the process to terminate
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
fconfigure $commfd -blocking 1
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
if {![catch {close $commfd} err]} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
after idle finishcommits
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
return
}
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
if {[string range $err 0 4] == "usage"} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
set err \
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
"Gitk: error reading commits: bad arguments to git-rev-list.\
(Note: arguments to gitk are passed to git-rev-list\
to allow selection of commits to be displayed.)"
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
} else {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set err "Error reading commits: $err"
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
error_popup $err
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
exit 1
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
}
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
set start 0
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set gotsome 0
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
while 1 {
set i [string first "\0" $stuff $start]
if {$i < 0} {
Fix a bug where we would corrupt the stuff read from git-rev-list. If we have a very long commit message, and we end up getting a bufferfull of data from git-rev-list that all belongs to one commit, we ended up throwing away the data from a previous read that should have been included. The result was a error message about not being able to parse the output of git-rev-list. Also, if the git-rev-list output that we can't parse is long, only put the first 80 chars in the error message. Otherwise we end up with an enormous error window.
2005-06-27 18:04:26 +08:00
append leftover [string range $stuff $start end]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
break
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
if {$start == 0} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set cmit $leftover
append cmit [string range $stuff 0 [expr {$i - 1}]]
Fix a bug where we would corrupt the stuff read from git-rev-list. If we have a very long commit message, and we end up getting a bufferfull of data from git-rev-list that all belongs to one commit, we ended up throwing away the data from a previous read that should have been included. The result was a error message about not being able to parse the output of git-rev-list. Also, if the git-rev-list output that we can't parse is long, only put the first 80 chars in the error message. Otherwise we end up with an enormous error window.
2005-06-27 18:04:26 +08:00
set leftover {}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
} else {
set cmit [string range $stuff $start [expr {$i - 1}]]
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
}
set start [expr {$i + 1}]
Use the --parents flag to git-rev-list. 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.
2005-08-18 18:40:39 +08:00
set j [string first "\n" $cmit]
set ok 0
gitk: Use the new --boundary flag to git-rev-list 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 <paulus@samba.org>
2006-03-30 15:43:51 +08:00
set listed 1
Use the --parents flag to git-rev-list. 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.
2005-08-18 18:40:39 +08:00
if {$j >= 0} {
set ids [string range $cmit 0 [expr {$j - 1}]]
gitk: Use the new --boundary flag to git-rev-list 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 <paulus@samba.org>
2006-03-30 15:43:51 +08:00
if {[string range $ids 0 0] == "-"} {
set listed 0
set ids [string range $ids 1 end]
}
Use the --parents flag to git-rev-list. 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.
2005-08-18 18:40:39 +08:00
set ok 1
foreach id $ids {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
if {[string length $id] != 40} {
Use the --parents flag to git-rev-list. 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.
2005-08-18 18:40:39 +08:00
set ok 0
break
}
}
}
if {!$ok} {
Fix a bug where we would corrupt the stuff read from git-rev-list. If we have a very long commit message, and we end up getting a bufferfull of data from git-rev-list that all belongs to one commit, we ended up throwing away the data from a previous read that should have been included. The result was a error message about not being able to parse the output of git-rev-list. Also, if the git-rev-list output that we can't parse is long, only put the first 80 chars in the error message. Otherwise we end up with an enormous error window.
2005-06-27 18:04:26 +08:00
set shortcmit $cmit
if {[string length $shortcmit] > 80} {
set shortcmit "[string range $shortcmit 0 80]..."
}
error_popup "Can't parse git-rev-list output: {$shortcmit}"
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
exit 1
}
Use the --parents flag to git-rev-list. 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.
2005-08-18 18:40:39 +08:00
set id [lindex $ids 0]
gitk: Use the new --boundary flag to git-rev-list 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 <paulus@samba.org>
2006-03-30 15:43:51 +08:00
if {$listed} {
set olds [lrange $ids 1 end]
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
if {[llength $olds] > 1} {
set olds [lsort -unique $olds]
}
foreach p $olds {
lappend children($p) $id
}
gitk: Use the new --boundary flag to git-rev-list 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 <paulus@samba.org>
2006-03-30 15:43:51 +08:00
} else {
set olds {}
}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
lappend parentlist $olds
if {[info exists children($id)]} {
lappend childlist $children($id)
} else {
lappend childlist {}
}
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
set commitdata($id) [string range $cmit [expr {$j + 1}] end]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set commitrow($id) $commitidx
incr commitidx
lappend displayorder $id
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
lappend commitlisted $listed
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set gotsome 1
}
if {$gotsome} {
layoutmore
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
if {[clock clicks -milliseconds] >= $nextupdate} {
doupdate 1
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
}
Refine the update heuristic to improve responsiveness a bit. 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.
2005-08-11 07:56:23 +08:00
proc doupdate {reading} {
global commfd nextupdate numcommits ncmupdate
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
Refine the update heuristic to improve responsiveness a bit. 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.
2005-08-11 07:56:23 +08:00
if {$reading} {
fileevent $commfd readable {}
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
update
Refine the update heuristic to improve responsiveness a bit. 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.
2005-08-11 07:56:23 +08:00
set nextupdate [expr {[clock clicks -milliseconds] + 100}]
if {$numcommits < 100} {
set ncmupdate [expr {$numcommits + 1}]
} elseif {$numcommits < 10000} {
set ncmupdate [expr {$numcommits + 10}]
} else {
set ncmupdate [expr {$numcommits + 100}]
}
if {$reading} {
fileevent $commfd readable [list getcommitlines $commfd]
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
proc readcommit {id} {
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[catch {set contents [exec git-cat-file commit $id]}]} return
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
parsecommit $id $contents 0
Use git-rev-list --header. With --header, git-rev-list gives us the contents of the commit in-line, so we don't need to exec a git-cat-file to get it, and we don't need the readobj command either. Also fixed a residual problem with handling the commit that has a parent listed twice.
2005-06-22 08:25:38 +08:00
}
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
proc updatecommits {rargs} {
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
stopfindproc
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach v {colormap selectedline matchinglines treediffs
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
mergefilelist currentid rowtextx commitrow
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
rowidlist rowoffsets idrowranges idrangedrawn iddrawn
linesegends crossings cornercrossings} {
global $v
catch {unset $v}
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
}
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
allcanvs delete all
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
readrefs
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
getcommits $rargs
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
proc parsecommit {id contents listed} {
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
global commitinfo cdate
set inhdr 1
set comment {}
set headline {}
set auname {}
set audate {}
set comname {}
set comdate {}
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set hdrend [string first "\n\n" $contents]
if {$hdrend < 0} {
# should never happen...
set hdrend [string length $contents]
}
set header [string range $contents 0 [expr {$hdrend - 1}]]
set comment [string range $contents [expr {$hdrend + 2}] end]
foreach line [split $header "\n"] {
set tag [lindex $line 0]
if {$tag == "author"} {
set audate [lindex $line end-1]
set auname [lrange $line 1 end-2]
} elseif {$tag == "committer"} {
set comdate [lindex $line end-1]
set comname [lrange $line 1 end-2]
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
}
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set headline {}
# take the first line of the comment as the headline
set i [string first "\n" $comment]
if {$i >= 0} {
set headline [string trim [string range $comment 0 $i]]
gitk: Fix some bugs introduced by speedup changes 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>
2005-11-20 20:08:22 +08:00
} else {
set headline $comment
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
}
if {!$listed} {
# git-rev-list indents the comment by 4 spaces;
# if we got this via git-cat-file, add the indentation
set newcomment {}
foreach line [split $comment "\n"] {
append newcomment " "
append newcomment $line
gitk: Fix some bugs introduced by speedup changes 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>
2005-11-20 20:08:22 +08:00
append newcomment "\n"
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
}
set comment $newcomment
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
if {$comdate != {}} {
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
set cdate($id) $comdate
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set commitinfo($id) [list $headline $auname $audate \
$comname $comdate $comment]
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
proc getcommit {id} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global commitdata commitinfo
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
if {[info exists commitdata($id)]} {
parsecommit $id $commitdata($id) 1
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
} else {
readcommit $id
if {![info exists commitinfo($id)]} {
set commitinfo($id) {"No commit information available"}
}
}
return 1
}
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
proc readrefs {} {
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
global tagids idtags headids idheads tagcontents
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
global otherrefids idotherrefs
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
catch {unset $v}
}
[PATCH] gitk: Use git wrapper to run git-ls-remote. 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>
2006-04-04 14:24:55 +08:00
set refd [open [list | git ls-remote [gitdir]] r]
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
while {0 <= [set n [gets $refd line]]} {
if {![regexp {^([0-9a-f]{40}) refs/([^^]*)$} $line \
match id path]} {
continue
Show heads as well as tags
2005-06-10 15:54:49 +08:00
}
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
set type others
set name $path
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
}
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
if {$type == "tags"} {
set tagids($name) $id
lappend idtags($id) $name
set obj {}
set type {}
set tag {}
catch {
set commit [exec git-rev-parse "$id^0"]
if {"$commit" != "$id"} {
set tagids($name) $commit
lappend idtags($commit) $name
}
}
catch {
set tagcontents($name) [exec git-cat-file tag "$id"]
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
}
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
} elseif { $type == "heads" } {
set headids($name) $id
lappend idheads($id) $name
} else {
set otherrefids($name) $id
lappend idotherrefs($id) $name
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
}
}
readrefs: grab all refs with one call to ls-remote. 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>
2005-11-19 15:54:17 +08:00
close $refd
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
proc error_popup msg {
set w .error
toplevel $w
wm transient $w .
message $w.m -text $msg -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
button $w.ok -text OK -command "destroy $w"
pack $w.ok -side bottom -fill x
bind $w <Visibility> "grab $w; focus $w"
[PATCH] gitk: Make error_popup react to Return The error popup window can be now closed not only by clicking the button, but also by pressing Return. Signed-Off-By: Martin Mares <mj@ucw.cz> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-02 20:15:05 +08:00
bind $w <Key-Return> "destroy $w"
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
tkwait window $w
}
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
proc makewindow {rargs} {
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
global canv canv2 canv3 linespc charspc ctext cflist textfont mainfont uifont
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
global findtype findtypemenu findloc findstring fstring geometry
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
global entries sha1entry sha1string sha1but
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
global maincursor textcursor curtextcursor
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
global rowctxmenu mergemax
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
menu .bar
.bar add cascade -label "File" -menu .bar.file
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.bar configure -font $uifont
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
menu .bar.file
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
.bar.file add command -label "Update" -command [list updatecommits $rargs]
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
.bar.file add command -label "Reread references" -command rereadrefs
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
.bar.file add command -label "Quit" -command doquit
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.bar.file configure -font $uifont
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
menu .bar.edit
.bar add cascade -label "Edit" -menu .bar.edit
.bar.edit add command -label "Preferences" -command doprefs
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.bar.edit configure -font $uifont
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
menu .bar.help
.bar add cascade -label "Help" -menu .bar.help
.bar.help add command -label "About gitk" -command about
gitk: Add a help menu item to display key bindings 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>
2006-04-05 07:39:51 +08:00
.bar.help add command -label "Key bindings" -command keys
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.bar.help configure -font $uifont
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
. configure -menu .bar
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
if {![info exists geometry(canv1)]} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set geometry(canv1) [expr {45 * $charspc}]
set geometry(canv2) [expr {30 * $charspc}]
set geometry(canv3) [expr {15 * $charspc}]
set geometry(canvh) [expr {25 * $linespc + 4}]
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
set geometry(ctextw) 80
set geometry(ctexth) 30
set geometry(cflistw) 30
}
Use a panedwindow Make it cope with commits having parents that aren't listed.
2005-05-10 08:23:42 +08:00
panedwindow .ctop -orient vertical
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
if {[info exists geometry(width)]} {
.ctop conf -width $geometry(width) -height $geometry(height)
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
set geometry(ctexth) [expr {($texth - 8) /
[font metrics $textfont -linespace]}]
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
frame .ctop.top
frame .ctop.top.bar
pack .ctop.top.bar -side bottom -fill x
set cscroll .ctop.top.csb
scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
pack $cscroll -side right -fill y
panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
pack .ctop.top.clist -side top -fill both -expand 1
.ctop add .ctop.top
set canv .ctop.top.clist.canv
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
source ~/.gitk for user-specific option settings use a panedwindow for the main list with three panes, and make them scroll together
2005-05-10 20:08:22 +08:00
-bg white -bd 0 \
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
.ctop.top.clist add $canv
set canv2 .ctop.top.clist.canv2
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
source ~/.gitk for user-specific option settings use a panedwindow for the main list with three panes, and make them scroll together
2005-05-10 20:08:22 +08:00
-bg white -bd 0 -yscrollincr $linespc
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
.ctop.top.clist add $canv2
set canv3 .ctop.top.clist.canv3
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
source ~/.gitk for user-specific option settings use a panedwindow for the main list with three panes, and make them scroll together
2005-05-10 20:08:22 +08:00
-bg white -bd 0 -yscrollincr $linespc
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
.ctop.top.clist add $canv3
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set sha1entry .ctop.top.bar.sha1
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
set entries $sha1entry
set sha1but .ctop.top.bar.sha1label
button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
-command gotocommit -width 8 -font $uifont
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
$sha1but conf -disabledforeground [$sha1but cget -foreground]
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
pack .ctop.top.bar.sha1label -side left
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
entry $sha1entry -width 40 -font $textfont -textvariable sha1string
trace add variable sha1string write sha1change
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
pack $sha1entry -side left -pady 2
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
image create bitmap bm-left -data {
#define left_width 16
#define left_height 16
static unsigned char left_bits[] = {
0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
}
image create bitmap bm-right -data {
#define right_width 16
#define right_height 16
static unsigned char right_bits[] = {
0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
}
button .ctop.top.bar.leftbut -image bm-left -command goback \
-state disabled -width 26
pack .ctop.top.bar.leftbut -side left -fill y
button .ctop.top.bar.rightbut -image bm-right -command goforw \
-state disabled -width 26
pack .ctop.top.bar.rightbut -side left -fill y
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
button .ctop.top.bar.findbut -text "Find" -command dofind -font $uifont
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
pack .ctop.top.bar.findbut -side left
set findstring {}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set fstring .ctop.top.bar.findstring
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
lappend entries $fstring
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
entry $fstring -width 30 -font $textfont -textvariable findstring -font $textfont
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
pack $fstring -side left -expand 1 -fill x
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set findtype Exact
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
findtype Exact IgnCase Regexp]
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.ctop.top.bar.findtype configure -font $uifont
.ctop.top.bar.findtype.menu configure -font $uifont
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set findloc "All fields"
tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
Comments Author Committer Files Pickaxe
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
.ctop.top.bar.findloc configure -font $uifont
.ctop.top.bar.findloc.menu configure -font $uifont
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
pack .ctop.top.bar.findloc -side right
pack .ctop.top.bar.findtype -side right
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
# for making sure type==Exact whenever loc==Pickaxe
trace add variable findloc write findlocchange
source ~/.gitk for user-specific option settings use a panedwindow for the main list with three panes, and make them scroll together
2005-05-10 20:08:22 +08:00
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
panedwindow .ctop.cdet -orient horizontal
.ctop add .ctop.cdet
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
frame .ctop.cdet.left
set ctext .ctop.cdet.left.ctext
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
text $ctext -bg white -state disabled -font $textfont \
-width $geometry(ctextw) -height $geometry(ctexth) \
[PATCH] "Child" information in commit window - and cleanups 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>
2005-08-09 11:04:20 +08:00
-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
scrollbar .ctop.cdet.left.sb -command "$ctext yview"
pack .ctop.cdet.left.sb -side right -fill y
pack $ctext -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.left
Make the diff display less gaudy. The old style is still available as an option (we still need a preferences window so we can set/clear it though).
2005-07-19 02:29:03 +08:00
$ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
$ctext tag conf hunksep -fore blue
$ctext tag conf d0 -fore red
$ctext tag conf d1 -fore "#00a000"
$ctext tag conf m0 -fore red
$ctext tag conf m1 -fore blue
$ctext tag conf m2 -fore green
$ctext tag conf m3 -fore purple
$ctext tag conf m4 -fore brown
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
$ctext tag conf m5 -fore "#009090"
$ctext tag conf m6 -fore magenta
$ctext tag conf m7 -fore "#808000"
$ctext tag conf m8 -fore "#009000"
$ctext tag conf m9 -fore "#ff0080"
$ctext tag conf m10 -fore cyan
$ctext tag conf m11 -fore "#b07070"
$ctext tag conf m12 -fore "#70b0f0"
$ctext tag conf m13 -fore "#70f0b0"
$ctext tag conf m14 -fore "#f0b070"
$ctext tag conf m15 -fore "#ff70b0"
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
$ctext tag conf mmax -fore darkgrey
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set mergemax 16
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
$ctext tag conf mresult -font [concat $textfont bold]
$ctext tag conf msep -font [concat $textfont bold]
$ctext tag conf found -back yellow
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
frame .ctop.cdet.right
set cflist .ctop.cdet.right.cfiles
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
-yscrollcommand ".ctop.cdet.right.sb set" -font $mainfont
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
scrollbar .ctop.cdet.right.sb -command "$cflist yview"
pack .ctop.cdet.right.sb -side right -fill y
pack $cflist -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.right
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
Use a panedwindow Make it cope with commits having parents that aren't listed.
2005-05-10 08:23:42 +08:00
pack .ctop -side top -fill both -expand 1
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
bindall <1> {selcanvline %W %x %y}
#bindall <B1-Motion> {selcanvline %W %x %y}
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
bindall <2> "canvscan mark %W %x %y"
bindall <B2-Motion> "canvscan dragto %W %x %y"
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
bindkey <Home> selfirstline
bindkey <End> sellastline
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
bind . <Key-Up> "selnextline -1"
bind . <Key-Down> "selnextline 1"
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
bindkey <Key-Right> "goforw"
bindkey <Key-Left> "goback"
bind . <Key-Prior> "selnextpage -1"
bind . <Key-Next> "selnextpage 1"
bind . <Control-Home> "allcanvs yview moveto 0.0"
bind . <Control-End> "allcanvs yview moveto 1.0"
bind . <Control-Key-Up> "allcanvs yview scroll -1 units"
bind . <Control-Key-Down> "allcanvs yview scroll 1 units"
bind . <Control-Key-Prior> "allcanvs yview scroll -1 pages"
bind . <Control-Key-Next> "allcanvs yview scroll 1 pages"
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
bindkey <Key-Delete> "$ctext yview scroll -1 pages"
bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
bindkey <Key-space> "$ctext yview scroll 1 pages"
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
bindkey p "selnextline -1"
bindkey n "selnextline 1"
[PATCH] Add new keybindings 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>
2005-09-22 08:07:36 +08:00
bindkey z "goback"
bindkey x "goforw"
bindkey i "selnextline -1"
bindkey k "selnextline 1"
bindkey j "goback"
bindkey l "goforw"
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
bindkey b "$ctext yview scroll -1 pages"
bindkey d "$ctext yview scroll 18 units"
bindkey u "$ctext yview scroll -18 units"
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
bindkey / {findnext 1}
bindkey <Key-Return> {findnext 0}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
bindkey ? findprev
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 20:35:53 +08:00
bindkey f nextfile
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
bind . <Control-q> doquit
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
bind . <Control-f> dofind
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
bind . <Control-g> {findnext 0}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
bind . <Control-r> findprev
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
bind . <Control-equal> {incrfont 1}
bind . <Control-KP_Add> {incrfont 1}
bind . <Control-minus> {incrfont -1}
bind . <Control-KP_Subtract> {incrfont -1}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
bind $cflist <<ListboxSelect>> listboxsel
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
bind . <Destroy> {savestuff %W}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
bind . <Button-1> "click %W"
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
bind $fstring <Key-Return> dofind
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
bind $sha1entry <Key-Return> gotocommit
Clear the SHA1 entry field when we go to paste something into it If the user pastes in the selection (with the middle mouse button) and it already has 40 characters in it, clear it before pasting.
2005-06-25 14:37:13 +08:00
bind $sha1entry <<PasteSelection>> clearsha1
Fix operation without libreadobj.so.0.0 Display a watch cursor when reading the commits initially
2005-06-16 18:54:04 +08:00
set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor]
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
set curtextcursor $textcursor
Draw graph lines as one continuous line where possible Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
2005-06-17 08:12:26 +08:00
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set rowctxmenu .rowctxmenu
menu $rowctxmenu -tearoff 0
$rowctxmenu add command -label "Diff this -> selected" \
-command {diffvssel 0}
$rowctxmenu add command -label "Diff selected -> this" \
-command {diffvssel 1}
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$rowctxmenu add command -label "Make patch" -command mkpatch
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
$rowctxmenu add command -label "Create tag" -command mktag
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
$rowctxmenu add command -label "Write commit to file" -command writecommit
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
}
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
# mouse-2 makes all windows scan vertically, but only the one
# the cursor is in scans horizontally
proc canvscan {op w x y} {
global canv canv2 canv3
foreach c [list $canv $canv2 $canv3] {
if {$c == $w} {
$c scan $op $x $y
} else {
$c scan $op 0 $y
}
}
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
proc scrollcanv {cscroll f0 f1} {
$cscroll set $f0 $f1
drawfrac $f0 $f1
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
# when we make a key binding for the toplevel, make sure
# it doesn't get triggered when that key is pressed in the
# find string entry widget.
proc bindkey {ev script} {
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
global entries
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
bind . $ev $script
set escript [bind Entry $ev]
if {$escript == {}} {
set escript [bind Entry <Key>]
}
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
foreach e $entries {
bind $e $ev "$escript; break"
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
}
# set the focus back to the toplevel for any click outside
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
# the entry widgets
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
proc click {w} {
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
global entries
foreach e $entries {
if {$w == $e} return
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
}
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
focus .
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
}
proc savestuff {w} {
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
global canv canv2 canv3 ctext cflist mainfont textfont uifont
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
global stuffsaved findmergefiles maxgraphpct
Save the maxwidth setting in the ~/.gitk file.
2005-08-19 08:22:24 +08:00
global maxwidth
Import the --topo-order change and fix the writing of ~/.gitk.
2005-07-28 11:16:51 +08:00
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
if {$stuffsaved} return
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
if {![winfo viewable .]} return
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
catch {
set f [open "~/.gitk-new" w]
Make the diff display less gaudy. The old style is still available as an option (we still need a preferences window so we can set/clear it though).
2005-07-19 02:29:03 +08:00
puts $f [list set mainfont $mainfont]
puts $f [list set textfont $textfont]
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
puts $f [list set uifont $uifont]
Make the diff display less gaudy. The old style is still available as an option (we still need a preferences window so we can set/clear it though).
2005-07-19 02:29:03 +08:00
puts $f [list set findmergefiles $findmergefiles]
Compress the graph horizontally if it gets too wide. 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.)
2005-08-05 07:52:16 +08:00
puts $f [list set maxgraphpct $maxgraphpct]
Save the maxwidth setting in the ~/.gitk file.
2005-08-19 08:22:24 +08:00
puts $f [list set maxwidth $maxwidth]
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
puts $f "set geometry(width) [winfo width .ctop]"
puts $f "set geometry(height) [winfo height .ctop]"
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
puts $f "set geometry(canv2) [expr {[winfo width $canv2]-2}]"
puts $f "set geometry(canv3) [expr {[winfo width $canv3]-2}]"
puts $f "set geometry(canvh) [expr {[winfo height $canv]-2}]"
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
set wid [expr {([winfo width $ctext] - 8) \
/ [font measure $textfont "0"]}]
puts $f "set geometry(ctextw) $wid"
set wid [expr {([winfo width $cflist] - 11) \
/ [font measure [$cflist cget -font] "0"]}]
puts $f "set geometry(cflistw) $wid"
close $f
file rename -force "~/.gitk-new" "~/.gitk"
}
set stuffsaved 1
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
proc resizeclistpanes {win w} {
global oldwidth
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[info exists oldwidth($win)]} {
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
set s0 [$win sash coord 0]
set s1 [$win sash coord 1]
if {$w < 60} {
set sash0 [expr {int($w/2 - 2)}]
set sash1 [expr {int($w*5/6 - 2)}]
} else {
set factor [expr {1.0 * $w / $oldwidth($win)}]
set sash0 [expr {int($factor * [lindex $s0 0])}]
set sash1 [expr {int($factor * [lindex $s1 0])}]
if {$sash0 < 30} {
set sash0 30
}
if {$sash1 < $sash0 + 20} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set sash1 [expr {$sash0 + 20}]
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
}
if {$sash1 > $w - 10} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set sash1 [expr {$w - 10}]
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
if {$sash0 > $sash1 - 20} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set sash0 [expr {$sash1 - 20}]
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
}
}
}
$win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 1]
}
set oldwidth($win) $w
}
proc resizecdetpanes {win w} {
global oldwidth
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[info exists oldwidth($win)]} {
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
set s0 [$win sash coord 0]
if {$w < 60} {
set sash0 [expr {int($w*3/4 - 2)}]
} else {
set factor [expr {1.0 * $w / $oldwidth($win)}]
set sash0 [expr {int($factor * [lindex $s0 0])}]
if {$sash0 < 45} {
set sash0 45
}
if {$sash0 > $w - 15} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set sash0 [expr {$w - 15}]
Resize the panes in the paned windows (commit list and details) to keep the proportionality of the pane widths as the overall window is resized.
2005-05-16 07:19:18 +08:00
}
}
$win sash place 0 $sash0 [lindex $s0 1]
}
set oldwidth($win) $w
}
source ~/.gitk for user-specific option settings use a panedwindow for the main list with three panes, and make them scroll together
2005-05-10 20:08:22 +08:00
proc allcanvs args {
global canv canv2 canv3
eval $canv $args
eval $canv2 $args
eval $canv3 $args
}
proc bindall {event action} {
global canv canv2 canv3
bind $canv $event $action
bind $canv2 $event $action
bind $canv3 $event $action
}
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
proc about {} {
set w .about
if {[winfo exists $w]} {
raise $w
return
}
toplevel $w
wm title $w "About gitk"
message $w.m -text {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
Gitk - a commit viewer for git
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
Copyright <20> 2005-2006 Paul Mackerras
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
Use and redistribute under the terms of the GNU General Public License} \
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
-justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
button $w.ok -text Close -command "destroy $w"
pack $w.ok -side bottom
}
gitk: Add a help menu item to display key bindings 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>
2006-04-05 07:39:51 +08:00
proc keys {} {
set w .keys
if {[winfo exists $w]} {
raise $w
return
}
toplevel $w
wm title $w "Gitk key bindings"
message $w.m -text {
Gitk key bindings:
<Ctrl-Q> Quit
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
<Home> Move to first commit
<End> Move to last commit
gitk: Add a help menu item to display key bindings 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>
2006-04-05 07:39:51 +08:00
<Up>, p, i Move up one commit
<Down>, n, k Move down one commit
<Left>, z, j Go back in history list
<Right>, x, l Go forward in history list
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
<PageUp> Move up one page in commit list
<PageDown> Move down one page in commit list
<Ctrl-Home> Scroll to top of commit list
<Ctrl-End> Scroll to bottom of commit list
<Ctrl-Up> Scroll commit list up one line
<Ctrl-Down> Scroll commit list down one line
<Ctrl-PageUp> Scroll commit list up one page
<Ctrl-PageDown> Scroll commit list down one page
gitk: Add a help menu item to display key bindings 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>
2006-04-05 07:39:51 +08:00
<Delete>, b Scroll diff view up one page
<Backspace> Scroll diff view up one page
<Space> Scroll diff view down one page
u Scroll diff view up 18 lines
d Scroll diff view down 18 lines
<Ctrl-F> Find
<Ctrl-G> Move to next find hit
<Ctrl-R> Move to previous find hit
<Return> Move to next find hit
/ Move to next find hit, or redo find
? Move to previous find hit
f Scroll diff view to next file
<Ctrl-KP+> Increase font size
<Ctrl-plus> Increase font size
<Ctrl-KP-> Decrease font size
<Ctrl-minus> Decrease font size
} \
-justify left -bg white -border 2 -relief sunken
pack $w.m -side top -fill both
button $w.ok -text Close -command "destroy $w"
pack $w.ok -side bottom
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
proc shortids {ids} {
set res {}
foreach id $ids {
if {[llength $id] > 1} {
lappend res [shortids $id]
} elseif {[regexp {^[0-9a-f]{40}$} $id]} {
lappend res [string range $id 0 7]
} else {
lappend res $id
}
}
return $res
}
proc incrange {l x o} {
set n [llength $l]
while {$x < $n} {
set e [lindex $l $x]
if {$e ne {}} {
lset l $x [expr {$e + $o}]
}
incr x
}
return $l
}
proc ntimes {n o} {
set ret {}
for {} {$n > 0} {incr n -1} {
lappend ret $o
}
return $ret
}
proc usedinrange {id l1 l2} {
global children commitrow
if {[info exists commitrow($id)]} {
set r $commitrow($id)
if {$l1 <= $r && $r <= $l2} {
return [expr {$r - $l1 + 1}]
}
}
foreach c $children($id) {
if {[info exists commitrow($c)]} {
set r $commitrow($c)
if {$l1 <= $r && $r <= $l2} {
return [expr {$r - $l1 + 1}]
}
}
}
return 0
}
proc sanity {row {full 0}} {
global rowidlist rowoffsets
set col -1
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set ids [lindex $rowidlist $row]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
foreach id $ids {
incr col
if {$id eq {}} continue
if {$col < [llength $ids] - 1 &&
[lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set o [lindex $rowoffsets $row $col]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set y $row
set x $col
while {$o ne {}} {
incr y -1
incr x $o
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
if {[lindex $rowidlist $y $x] != $id} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
puts "oops: rowoffsets wrong at row [expr {$y+1}] col [expr {$x-$o}]"
puts " id=[shortids $id] check started at row $row"
for {set i $row} {$i >= $y} {incr i -1} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
puts " row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
break
}
if {!$full} break
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set o [lindex $rowoffsets $y $x]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
}
}
proc makeuparrow {oid x y z} {
global rowidlist rowoffsets uparrowlen idrowranges
for {set i 1} {$i < $uparrowlen && $y > 1} {incr i} {
incr y -1
incr x $z
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set off0 [lindex $rowoffsets $y]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
for {set x0 $x} {1} {incr x0} {
if {$x0 >= [llength $off0]} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
break
}
set z [lindex $off0 $x0]
if {$z ne {}} {
incr x0 $z
break
}
}
set z [expr {$x0 - $x}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
lappend idrowranges($oid) $y
}
proc initlayout {} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global rowidlist rowoffsets displayorder commitlisted
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global rowlaidout rowoptim
global idinlist rowchk
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
global commitidx numcommits canvxmax canv
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global nextcolor
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global parentlist childlist children
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set commitidx 0
set numcommits 0
set displayorder {}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set commitlisted {}
set parentlist {}
set childlist {}
catch {unset children}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set nextcolor 0
set rowidlist {{}}
set rowoffsets {{}}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
catch {unset idinlist}
catch {unset rowchk}
set rowlaidout 0
set rowoptim 0
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
set canvxmax [$canv cget -width]
}
proc setcanvscroll {} {
global canv canv2 canv3 numcommits linespc canvxmax canvy0
set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
$canv conf -scrollregion [list 0 0 $canvxmax $ymax]
$canv2 conf -scrollregion [list 0 0 0 $ymax]
$canv3 conf -scrollregion [list 0 0 0 $ymax]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
proc visiblerows {} {
global canv numcommits linespc
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {} || $ymax == 0} return
set f [$canv yview]
set y0 [expr {int([lindex $f 0] * $ymax)}]
set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
if {$r0 < 0} {
set r0 0
}
set y1 [expr {int([lindex $f 1] * $ymax)}]
set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
if {$r1 >= $numcommits} {
set r1 [expr {$numcommits - 1}]
}
return [list $r0 $r1]
}
proc layoutmore {} {
global rowlaidout rowoptim commitidx numcommits optim_delay
global uparrowlen
set row $rowlaidout
set rowlaidout [layoutrows $row $commitidx 0]
set orow [expr {$rowlaidout - $uparrowlen - 1}]
if {$orow > $rowoptim} {
checkcrossings $rowoptim $orow
optimize_rows $rowoptim 0 $orow
set rowoptim $orow
}
set canshow [expr {$rowoptim - $optim_delay}]
if {$canshow > $numcommits} {
showstuff $canshow
}
}
proc showstuff {canshow} {
global numcommits
global linesegends idrowranges idrangedrawn
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
if {$numcommits == 0} {
global phase
set phase "incrdraw"
allcanvs delete all
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set row $numcommits
set numcommits $canshow
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
setcanvscroll
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set rows [visiblerows]
set r0 [lindex $rows 0]
set r1 [lindex $rows 1]
for {set r $row} {$r < $canshow} {incr r} {
if {[info exists linesegends($r)]} {
foreach id $linesegends($r) {
set i -1
foreach {s e} $idrowranges($id) {
incr i
if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
&& ![info exists idrangedrawn($id,$i)]} {
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
drawlineseg $id $i
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set idrangedrawn($id,$i) 1
}
}
}
}
}
if {$canshow > $r1} {
set canshow $r1
}
while {$row < $canshow} {
drawcmitrow $row
incr row
}
}
proc layoutrows {row endrow last} {
global rowidlist rowoffsets displayorder
global uparrowlen downarrowlen maxwidth mingaplen
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global childlist parentlist
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global idrowranges linesegends
global commitidx
global idinlist rowchk
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set idlist [lindex $rowidlist $row]
set offs [lindex $rowoffsets $row]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
while {$row < $endrow} {
set id [lindex $displayorder $row]
set oldolds {}
set newolds {}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach p [lindex $parentlist $row] {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists idinlist($p)]} {
lappend newolds $p
} elseif {!$idinlist($p)} {
lappend oldolds $p
}
}
set nev [expr {[llength $idlist] + [llength $newolds]
+ [llength $oldolds] - $maxwidth + 1}]
if {$nev > 0} {
if {!$last && $row + $uparrowlen + $mingaplen >= $commitidx} break
for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
set i [lindex $idlist $x]
if {![info exists rowchk($i)] || $row >= $rowchk($i)} {
set r [usedinrange $i [expr {$row - $downarrowlen}] \
[expr {$row + $uparrowlen + $mingaplen}]]
if {$r == 0} {
set idlist [lreplace $idlist $x $x]
set offs [lreplace $offs $x $x]
set offs [incrange $offs $x 1]
set idinlist($i) 0
gitk: Make downward-pointing arrows end in vertical line segment 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 <paulus@samba.org>
2006-03-18 17:42:46 +08:00
set rm1 [expr {$row - 1}]
lappend linesegends($rm1) $i
lappend idrowranges($i) $rm1
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {[incr nev -1] <= 0} break
continue
}
set rowchk($id) [expr {$row + $r}]
}
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $row $idlist
lset rowoffsets $row $offs
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
set col [lsearch -exact $idlist $id]
if {$col < 0} {
set col [llength $idlist]
lappend idlist $id
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $row $idlist
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set z {}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
if {[lindex $childlist $row] ne {}} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
unset idinlist($id)
}
lappend offs $z
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowoffsets $row $offs
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$z ne {}} {
makeuparrow $id $col $row $z
}
} else {
unset idinlist($id)
}
if {[info exists idrowranges($id)]} {
lappend idrowranges($id) $row
}
incr row
set offs [ntimes [llength $idlist] 0]
set l [llength $newolds]
set idlist [eval lreplace \$idlist $col $col $newolds]
set o 0
if {$l != 1} {
set offs [lrange $offs 0 [expr {$col - 1}]]
foreach x $newolds {
lappend offs {}
incr o -1
}
incr o
set tmp [expr {[llength $idlist] - [llength $offs]}]
if {$tmp > 0} {
set offs [concat $offs [ntimes $tmp $o]]
}
} else {
lset offs $col {}
}
foreach i $newolds {
set idinlist($i) 1
set idrowranges($i) $row
}
incr col $l
foreach oid $oldolds {
set idinlist($oid) 1
set idlist [linsert $idlist $col $oid]
set offs [linsert $offs $col $o]
makeuparrow $oid $col $row $o
incr col
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lappend rowidlist $idlist
lappend rowoffsets $offs
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
return $row
}
proc addextraid {id row} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global displayorder commitrow commitinfo
gitk: Fix bug caused by missing commitlisted elements 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>
2006-04-17 08:27:59 +08:00
global commitidx commitlisted
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global parentlist childlist children
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
incr commitidx
lappend displayorder $id
gitk: Fix bug caused by missing commitlisted elements 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>
2006-04-17 08:27:59 +08:00
lappend commitlisted 0
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
lappend parentlist {}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set commitrow($id) $row
readcommit $id
if {![info exists commitinfo($id)]} {
set commitinfo($id) {"No commit information available"}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
}
if {[info exists children($id)]} {
lappend childlist $children($id)
} else {
lappend childlist {}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
}
proc layouttail {} {
global rowidlist rowoffsets idinlist commitidx
gitk: Make downward-pointing arrows end in vertical line segment 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 <paulus@samba.org>
2006-03-18 17:42:46 +08:00
global idrowranges
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set row $commitidx
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set idlist [lindex $rowidlist $row]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
while {$idlist ne {}} {
set col [expr {[llength $idlist] - 1}]
set id [lindex $idlist $col]
addextraid $id $row
unset idinlist($id)
lappend idrowranges($id) $row
incr row
set offs [ntimes $col 0]
set idlist [lreplace $idlist $col $col]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lappend rowidlist $idlist
lappend rowoffsets $offs
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
foreach id [array names idinlist] {
addextraid $id $row
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $row [list $id]
lset rowoffsets $row 0
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
makeuparrow $id 0 $row 0
lappend idrowranges($id) $row
incr row
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lappend rowidlist {}
lappend rowoffsets {}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
}
proc insert_pad {row col npad} {
global rowidlist rowoffsets
set pad [ntimes $npad {}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $row [eval linsert [list [lindex $rowidlist $row]] $col $pad]
set tmp [eval linsert [list [lindex $rowoffsets $row]] $col $pad]
lset rowoffsets $row [incrange $tmp [expr {$col + $npad}] [expr {-$npad}]]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
proc optimize_rows {row col endrow} {
gitk: Make downward-pointing arrows end in vertical line segment 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 <paulus@samba.org>
2006-03-18 17:42:46 +08:00
global rowidlist rowoffsets idrowranges linesegends displayorder
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
for {} {$row < $endrow} {incr row} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set idlist [lindex $rowidlist $row]
set offs [lindex $rowoffsets $row]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set haspad 0
for {} {$col < [llength $offs]} {incr col} {
if {[lindex $idlist $col] eq {}} {
set haspad 1
continue
}
set z [lindex $offs $col]
if {$z eq {}} continue
set isarrow 0
set x0 [expr {$col + $z}]
set y0 [expr {$row - 1}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set z0 [lindex $rowoffsets $y0 $x0]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$z0 eq {}} {
set id [lindex $idlist $col]
if {[info exists idrowranges($id)] &&
$y0 > [lindex $idrowranges($id) 0]} {
set isarrow 1
}
}
if {$z < -1 || ($z < 0 && $isarrow)} {
set npad [expr {-1 - $z + $isarrow}]
set offs [incrange $offs $col $npad]
insert_pad $y0 $x0 $npad
if {$y0 > 0} {
optimize_rows $y0 $x0 $row
}
set z [lindex $offs $col]
set x0 [expr {$col + $z}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set z0 [lindex $rowoffsets $y0 $x0]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
} elseif {$z > 1 || ($z > 0 && $isarrow)} {
set npad [expr {$z - 1 + $isarrow}]
set y1 [expr {$row + 1}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set offs2 [lindex $rowoffsets $y1]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set x1 -1
foreach z $offs2 {
incr x1
if {$z eq {} || $x1 + $z < $col} continue
if {$x1 + $z > $col} {
incr npad
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
break
}
set pad [ntimes $npad {}]
set idlist [eval linsert \$idlist $col $pad]
set tmp [eval linsert \$offs $col $pad]
incr col $npad
set offs [incrange $tmp $col [expr {-$npad}]]
set z [lindex $offs $col]
set haspad 1
}
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
if {$z0 eq {} && !$isarrow} {
# this line links to its first child on row $row-2
set rm2 [expr {$row - 2}]
set id [lindex $displayorder $rm2]
set xc [lsearch -exact [lindex $rowidlist $rm2] $id]
if {$xc >= 0} {
set z0 [expr {$xc - $x0}]
}
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$z0 ne {} && $z < 0 && $z0 > 0} {
insert_pad $y0 $x0 1
set offs [incrange $offs $col 1]
optimize_rows $y0 [expr {$x0 + 1}] $row
}
}
if {!$haspad} {
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
set o {}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
set o [lindex $offs $col]
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
if {$o eq {}} {
# check if this is the link to the first child
set id [lindex $idlist $col]
if {[info exists idrowranges($id)] &&
$row == [lindex $idrowranges($id) 0]} {
# it is, work out offset to child
set y0 [expr {$row - 1}]
set id [lindex $displayorder $y0]
set x0 [lsearch -exact [lindex $rowidlist $y0] $id]
if {$x0 >= 0} {
set o [expr {$x0 - $col}]
}
}
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$o eq {} || $o <= 0} break
}
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
if {$o ne {} && [incr col] < [llength $idlist]} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set y1 [expr {$row + 1}]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set offs2 [lindex $rowoffsets $y1]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set x1 -1
foreach z $offs2 {
incr x1
if {$z eq {} || $x1 + $z < $col} continue
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowoffsets $y1 [incrange $offs2 $x1 1]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
break
}
set idlist [linsert $idlist $col {}]
set tmp [linsert $offs $col {}]
incr col
set offs [incrange $tmp $col -1]
}
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
lset rowidlist $row $idlist
lset rowoffsets $row $offs
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set col 0
}
}
proc xc {row col} {
global canvx0 linespc
return [expr {$canvx0 + $col * $linespc}]
}
proc yc {row} {
global canvy0 linespc
return [expr {$canvy0 + $row * $linespc}]
}
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
proc linewidth {id} {
global thickerline lthickness
set wid $lthickness
if {[info exists thickerline] && $id eq $thickerline} {
set wid [expr {2 * $lthickness}]
}
return $wid
}
proc drawlineseg {id i} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global rowoffsets rowidlist idrowranges
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
global displayorder
gitk: Better workaround for arrows on diagonal line segments 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 <paulus@samba.org>
2006-03-31 07:45:14 +08:00
global canv colormap linespc
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set startrow [lindex $idrowranges($id) [expr {2 * $i}]]
set row [lindex $idrowranges($id) [expr {2 * $i + 1}]]
if {$startrow == $row} return
assigncolor $id
set coords {}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set col [lsearch -exact [lindex $rowidlist $row] $id]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$col < 0} {
puts "oops: drawline: id $id not on row $row"
return
}
set lasto {}
set ns 0
while {1} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set o [lindex $rowoffsets $row $col]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$o eq {}} break
if {$o ne $lasto} {
# changing direction
set x [xc $row $col]
set y [yc $row]
lappend coords $x $y
set lasto $o
}
incr col $o
incr row -1
}
set x [xc $row $col]
set y [yc $row]
lappend coords $x $y
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
if {$i == 0} {
# draw the link to the first child as part of this line
incr row -1
set child [lindex $displayorder $row]
set ccol [lsearch -exact [lindex $rowidlist $row] $child]
if {$ccol >= 0} {
set x [xc $row $ccol]
set y [yc $row]
if {$ccol < $col - 1} {
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
lappend coords [xc $row [expr {$col - 1}]] [yc $row]
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
} elseif {$ccol > $col + 1} {
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
lappend coords [xc $row [expr {$col + 1}]] [yc $row]
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
}
lappend coords $x $y
}
}
if {[llength $coords] < 4} return
set last [expr {[llength $idrowranges($id)] / 2 - 1}]
gitk: Better workaround for arrows on diagonal line segments 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 <paulus@samba.org>
2006-03-31 07:45:14 +08:00
if {$i < $last} {
# This line has an arrow at the lower end: check if the arrow is
# on a diagonal segment, and if so, work around the Tk 8.4
# refusal to draw arrows on diagonal lines.
set x0 [lindex $coords 0]
set x1 [lindex $coords 2]
if {$x0 != $x1} {
set y0 [lindex $coords 1]
set y1 [lindex $coords 3]
if {$y0 - $y1 <= 2 * $linespc && $x1 == [lindex $coords 4]} {
# we have a nearby vertical segment, just trim off the diag bit
set coords [lrange $coords 2 end]
} else {
set slope [expr {($x0 - $x1) / ($y0 - $y1)}]
set xi [expr {$x0 - $slope * $linespc / 2}]
set yi [expr {$y0 - $linespc / 2}]
set coords [lreplace $coords 0 1 $xi $y0 $xi $yi]
}
}
}
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
set arrow [expr {2 * ($i > 0) + ($i < $last)}]
set arrow [lindex {none first last both} $arrow]
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
set t [$canv create line $coords -width [linewidth $id] \
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
-fill $colormap($id) -tags lines.$id -arrow $arrow]
$canv lower $t
bindline $t $id
}
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
proc drawparentlinks {id row col olds} {
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
global rowidlist canv colormap idrowranges
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set row2 [expr {$row + 1}]
set x [xc $row $col]
set y [yc $row]
set y2 [yc $row2]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set ids [lindex $rowidlist $row2]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
# rmx = right-most X coord used
set rmx 0
foreach p $olds {
gitk: Prevent parent link from overwriting commit headline 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 <paulus@samba.org>
2006-03-31 06:54:24 +08:00
set i [lsearch -exact $ids $p]
if {$i < 0} {
puts "oops, parent $p of $id not in list"
continue
}
set x2 [xc $row2 $i]
if {$x2 > $rmx} {
set rmx $x2
}
gitk: Improve appearance of first child links 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 <paulus@samba.org>
2006-03-18 20:11:37 +08:00
if {[info exists idrowranges($p)] &&
$row2 == [lindex $idrowranges($p) 0] &&
$row2 < [lindex $idrowranges($p) 1]} {
# drawlineseg will do this one for us
continue
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
assigncolor $p
# should handle duplicated parents here...
set coords [list $x $y]
if {$i < $col - 1} {
lappend coords [xc $row [expr {$i + 1}]] $y
} elseif {$i > $col + 1} {
lappend coords [xc $row [expr {$i - 1}]] $y
}
lappend coords $x2 $y2
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
set t [$canv create line $coords -width [linewidth $p] \
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
-fill $colormap($p) -tags lines.$p]
$canv lower $t
bindline $t $p
}
return $rmx
}
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
proc drawlines {id} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global colormap canv
global idrowranges idrangedrawn
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global childlist iddrawn commitrow rowidlist
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
$canv delete lines.$id
set nr [expr {[llength $idrowranges($id)] / 2}]
for {set i 0} {$i < $nr} {incr i} {
if {[info exists idrangedrawn($id,$i)]} {
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
drawlineseg $id $i
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach child [lindex $childlist $commitrow($id)] {
if {[info exists iddrawn($child)]} {
set row $commitrow($child)
set col [lsearch -exact [lindex $rowidlist $row] $child]
if {$col >= 0} {
drawparentlinks $child $row $col [list $id]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
}
}
}
proc drawcmittext {id row col rmx} {
global linespc canv canv2 canv3 canvy0
global commitlisted commitinfo rowidlist
global rowtextx idpos idtags idheads idotherrefs
global linehtag linentag linedtag
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
global mainfont namefont canvxmax
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set x [xc $row $col]
set y [yc $row]
set orad [expr {$linespc / 3}]
set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
[expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
-fill $ofill -outline black -width 1]
$canv raise $t
$canv bind $t <1> {selcanvline {} %x %y}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set xt [xc $row [llength [lindex $rowidlist $row]]]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$xt < $rmx} {
set xt $rmx
}
set rowtextx($row) $xt
set idpos($id) [list $x $xt $y]
if {[info exists idtags($id)] || [info exists idheads($id)]
|| [info exists idotherrefs($id)]} {
set xt [drawtags $id $x $xt $y]
}
set headline [lindex $commitinfo($id) 0]
set name [lindex $commitinfo($id) 1]
set date [lindex $commitinfo($id) 2]
set date [formatdate $date]
set linehtag($row) [$canv create text $xt $y -anchor w \
-text $headline -font $mainfont ]
$canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
set linentag($row) [$canv2 create text 3 $y -anchor w \
-text $name -font $namefont]
set linedtag($row) [$canv3 create text 3 $y -anchor w \
-text $date -font $mainfont]
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
set xr [expr {$xt + [font measure $mainfont $headline]}]
if {$xr > $canvxmax} {
set canvxmax $xr
setcanvscroll
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
proc drawcmitrow {row} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global displayorder rowidlist
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global idrowranges idrangedrawn iddrawn
gitk: Fix bug caused by missing commitlisted elements 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>
2006-04-17 08:27:59 +08:00
global commitinfo parentlist numcommits
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
if {$row >= $numcommits} return
foreach id [lindex $rowidlist $row] {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists idrowranges($id)]} continue
set i -1
foreach {s e} $idrowranges($id) {
incr i
if {$row < $s} continue
if {$e eq {}} break
if {$row <= $e} {
if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
drawlineseg $id $i
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set idrangedrawn($id,$i) 1
}
break
}
}
}
set id [lindex $displayorder $row]
if {[info exists iddrawn($id)]} return
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set col [lsearch -exact [lindex $rowidlist $row] $id]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$col < 0} {
puts "oops, row $row id $id not in list"
return
}
if {![info exists commitinfo($id)]} {
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
getcommit $id
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
}
assigncolor $id
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set olds [lindex $parentlist $row]
if {$olds ne {}} {
set rmx [drawparentlinks $id $row $col $olds]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
} else {
set rmx 0
}
drawcmittext $id $row $col $rmx
set iddrawn($id) 1
}
proc drawfrac {f0 f1} {
global numcommits canv
global linespc
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {} || $ymax == 0} return
set y0 [expr {int($f0 * $ymax)}]
set row [expr {int(($y0 - 3) / $linespc) - 1}]
if {$row < 0} {
set row 0
}
set y1 [expr {int($f1 * $ymax)}]
set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
if {$endrow >= $numcommits} {
set endrow [expr {$numcommits - 1}]
}
for {} {$row <= $endrow} {incr row} {
drawcmitrow $row
}
}
proc drawvisible {} {
global canv
eval drawfrac [$canv yview]
}
proc clear_display {} {
global iddrawn idrangedrawn
allcanvs delete all
catch {unset iddrawn}
catch {unset idrangedrawn}
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
proc assigncolor {id} {
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
global colormap colors nextcolor
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global commitrow parentlist children childlist
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
global cornercrossings crossings
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[info exists colormap($id)]} return
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set ncolors [llength $colors]
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
if {[info exists commitrow($id)]} {
set kids [lindex $childlist $commitrow($id)]
} elseif {[info exists children($id)]} {
set kids $children($id)
} else {
set kids {}
}
if {[llength $kids] == 1} {
set child [lindex $kids 0]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
if {[info exists colormap($child)]
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
&& [llength [lindex $parentlist $commitrow($child)]] == 1} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
set colormap($id) $colormap($child)
return
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
set badcolors {}
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {[info exists cornercrossings($id)]} {
foreach x $cornercrossings($id) {
if {[info exists colormap($x)]
&& [lsearch -exact $badcolors $colormap($x)] < 0} {
lappend badcolors $colormap($x)
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {[llength $badcolors] >= $ncolors} {
set badcolors {}
}
}
set origbad $badcolors
if {[llength $badcolors] < $ncolors - 1} {
if {[info exists crossings($id)]} {
foreach x $crossings($id) {
if {[info exists colormap($x)]
&& [lsearch -exact $badcolors $colormap($x)] < 0} {
lappend badcolors $colormap($x)
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
}
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {[llength $badcolors] >= $ncolors} {
set badcolors $origbad
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
set origbad $badcolors
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {[llength $badcolors] < $ncolors - 1} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach child $kids {
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {[info exists colormap($child)]
&& [lsearch -exact $badcolors $colormap($child)] < 0} {
lappend badcolors $colormap($child)
}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach p [lindex $parentlist $commitrow($child)] {
if {[info exists colormap($p)]
&& [lsearch -exact $badcolors $colormap($p)] < 0} {
lappend badcolors $colormap($p)
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
}
}
}
if {[llength $badcolors] >= $ncolors} {
set badcolors $origbad
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
for {set i 0} {$i <= $ncolors} {incr i} {
set c [lindex $colors $nextcolor]
if {[incr nextcolor] >= $ncolors} {
set nextcolor 0
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
if {[lsearch -exact $badcolors $c]} break
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
set colormap($id) $c
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Handle the case of a parent being listed twice in a merge. This happens in the linux-2.6 tree. We draw the graph line double-thick to show that this happened. Also fix a bug where we got a bogus "No commit information available" line at the end on simple repositories like this one.
2005-06-21 08:01:38 +08:00
proc bindline {t id} {
global canv
$canv bind $t <Enter> "lineenter %x %y $id"
$canv bind $t <Motion> "linemotion %x %y $id"
$canv bind $t <Leave> "lineleave $id"
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$canv bind $t <Button-1> "lineclick %x %y $id 1"
Handle the case of a parent being listed twice in a merge. This happens in the linux-2.6 tree. We draw the graph line double-thick to show that this happened. Also fix a bug where we got a bogus "No commit information available" line at the end on simple repositories like this one.
2005-06-21 08:01:38 +08:00
}
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
proc drawtags {id x xt y1} {
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
global idtags idheads idotherrefs
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
global linespc lthickness
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global canv mainfont commitrow rowtextx
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
set marks {}
set ntags 0
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
set nheads 0
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
if {[info exists idtags($id)]} {
set marks $idtags($id)
set ntags [llength $marks]
}
if {[info exists idheads($id)]} {
set marks [concat $marks $idheads($id)]
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
set nheads [llength $idheads($id)]
}
if {[info exists idotherrefs($id)]} {
set marks [concat $marks $idotherrefs($id)]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
}
if {$marks eq {}} {
return $xt
}
set delta [expr {int(0.5 * ($linespc - $lthickness))}]
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set yt [expr {$y1 - 0.5 * $linespc}]
set yb [expr {$yt + $linespc - 1}]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
set xvals {}
set wvals {}
foreach tag $marks {
set wid [font measure $mainfont $tag]
lappend xvals $xt
lappend wvals $wid
set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
}
set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-width $lthickness -fill black -tags tag.$id]
$canv lower $t
foreach tag $marks x $xvals wid $wvals {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set xl [expr {$x + $delta}]
set xr [expr {$x + $delta + $wid + $lthickness}]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
if {[incr ntags -1] >= 0} {
# draw a tag
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
$xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
-width 1 -outline black -fill yellow -tags tag.$id]
$canv bind $t <1> [list showtag $tag 1]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set rowtextx($commitrow($id)) [expr {$xr + $linespc}]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
} else {
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
# draw a head or other ref
if {[incr nheads -1] >= 0} {
set col green
} else {
set col "#ddddff"
}
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set xl [expr {$xl - $delta/2}]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
-width 1 -outline black -fill $col -tags tag.$id
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
}
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
set t [$canv create text $xl $y1 -anchor w -text $tag \
-font $mainfont -tags tag.$id]
if {$ntags >= 0} {
$canv bind $t <1> [list showtag $tag 1]
}
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
}
return $xt
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
proc checkcrossings {row endrow} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global displayorder parentlist rowidlist
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
for {} {$row < $endrow} {incr row} {
set id [lindex $displayorder $row]
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set i [lsearch -exact [lindex $rowidlist $row] $id]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {$i < 0} continue
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set idlist [lindex $rowidlist [expr {$row+1}]]
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach p [lindex $parentlist $row] {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set j [lsearch -exact $idlist $p]
if {$j > 0} {
if {$j < $i - 1} {
notecrossings $row $p $j $i [expr {$j+1}]
} elseif {$j > $i + 1} {
notecrossings $row $p $i $j [expr {$j-1}]
}
}
}
}
}
proc notecrossings {row id lo hi corner} {
global rowidlist crossings cornercrossings
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
for {set i $lo} {[incr i] < $hi} {} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set p [lindex [lindex $rowidlist $row] $i]
Try to assign colors so crossing lines have different colors In particular try hard to give different colors to lines that cross at a corner in one of the lines.
2005-06-22 17:53:32 +08:00
if {$p == {}} continue
if {$i == $corner} {
if {![info exists cornercrossings($id)]
|| [lsearch -exact $cornercrossings($id) $p] < 0} {
lappend cornercrossings($id) $p
}
if {![info exists cornercrossings($p)]
|| [lsearch -exact $cornercrossings($p) $id] < 0} {
lappend cornercrossings($p) $id
}
} else {
if {![info exists crossings($id)]
|| [lsearch -exact $crossings($id) $p] < 0} {
lappend crossings($id) $p
}
if {![info exists crossings($p)]
|| [lsearch -exact $crossings($p) $id] < 0} {
lappend crossings($p) $id
}
}
}
}
Compress the graph horizontally if it gets too wide. 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.)
2005-08-05 07:52:16 +08:00
proc xcoord {i level ln} {
global canvx0 xspc1 xspc2
set x [expr {$canvx0 + $i * $xspc1($ln)}]
if {$i > 0 && $i == $level} {
set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
} elseif {$i > $level} {
set x [expr {$x + $xspc2 - $xspc1($ln)}]
}
return $x
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
proc finishcommits {} {
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
global commitidx phase
Fix behaviour in the case where we have no commits to display. I had code in there to put "No commits selected" on the canvas but it needed some globals.
2005-06-27 11:38:29 +08:00
global canv mainfont ctext maincursor textcursor
gitk: Don't change cursor at end of layout if find in progress 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 <paulus@samba.org>
2006-03-18 13:02:51 +08:00
global findinprogress
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
if {$commitidx > 0} {
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
drawrest
} else {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
$canv delete all
$canv create text 3 3 -anchor nw -text "No commits selected" \
-font $mainfont -tags textitems
}
gitk: Don't change cursor at end of layout if find in progress 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 <paulus@samba.org>
2006-03-18 13:02:51 +08:00
if {![info exists findinprogress]} {
. config -cursor $maincursor
settextcursor $textcursor
}
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
set phase {}
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
}
# Don't change the text pane cursor if it is currently the hand cursor,
# showing that we are over a sha1 ID link.
proc settextcursor {c} {
global ctext curtextcursor
if {[$ctext cget -cursor] == $curtextcursor} {
$ctext config -cursor $c
}
set curtextcursor $c
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 08:27:23 +08:00
}
Allow graph lines to jump through hyperspace. 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.
2005-08-18 07:30:10 +08:00
proc drawrest {} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global numcommits
global startmsecs
global canvy0 numcommits linespc
global rowlaidout commitidx
set row $rowlaidout
layoutrows $rowlaidout $commitidx 1
layouttail
optimize_rows $row 0 $commitidx
showstuff $commitidx
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
gitk: Add a help menu item to display key bindings 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>
2006-04-05 07:39:51 +08:00
#puts "overall $drawmsecs ms for $numcommits commits"
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
proc findmatches {f} {
global findtype foundstring foundstrlen
if {$findtype == "Regexp"} {
set matches [regexp -indices -all -inline $foundstring $f]
} else {
if {$findtype == "IgnCase"} {
set str [string tolower $f]
} else {
set str $f
}
set matches {}
set i 0
while {[set j [string first $foundstring $str $i]] >= 0} {
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
lappend matches [list $j [expr {$j+$foundstrlen-1}]]
set i [expr {$j + $foundstrlen}]
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
}
}
return $matches
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
proc dofind {} {
global findtype findloc findstring markedmatches commitinfo
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global numcommits displayorder linehtag linentag linedtag
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
global mainfont namefont canv canv2 canv3 selectedline
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
global matchinglines foundstring foundstrlen matchstring
global commitdata
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
stopfindproc
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
unmarkmatches
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
focus .
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set matchinglines {}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {$findloc == "Pickaxe"} {
findpatches
return
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
if {$findtype == "IgnCase"} {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set foundstring [string tolower $findstring]
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
} else {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set foundstring $findstring
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set foundstrlen [string length $findstring]
if {$foundstrlen == 0} return
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
set matchstring "*$matchstring*"
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {$findloc == "Files"} {
findfiles
return
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
if {![info exists selectedline]} {
set oldsel -1
} else {
set oldsel $selectedline
}
set didsel 0
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set fldtypes {Headline Author Date Committer CDate Comment}
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
set l -1
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
foreach id $displayorder {
set d $commitdata($id)
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
incr l
if {$findtype == "Regexp"} {
set doesmatch [regexp $foundstring $d]
} elseif {$findtype == "IgnCase"} {
set doesmatch [string match -nocase $matchstring $d]
} else {
set doesmatch [string match $matchstring $d]
}
if {!$doesmatch} continue
if {![info exists commitinfo($id)]} {
gitk: Make commitdata an array rather than a list 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 <paulus@samba.org>
2006-03-18 07:04:48 +08:00
getcommit $id
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set info $commitinfo($id)
set doesmatch 0
foreach f $info ty $fldtypes {
if {$findloc != "All fields" && $findloc != $ty} {
continue
}
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set matches [findmatches $f]
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
if {$matches == {}} continue
set doesmatch 1
if {$ty == "Headline"} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
drawcmitrow $l
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
markmatches $canv $l $f $linehtag($l) $matches $mainfont
} elseif {$ty == "Author"} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
drawcmitrow $l
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
markmatches $canv2 $l $f $linentag($l) $matches $namefont
} elseif {$ty == "Date"} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
drawcmitrow $l
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
}
}
if {$doesmatch} {
lappend matchinglines $l
if {!$didsel && $l > $oldsel} {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
findselectline $l
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
set didsel 1
}
}
}
if {$matchinglines == {}} {
bell
} elseif {!$didsel} {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
findselectline [lindex $matchinglines 0]
}
}
proc findselectline {l} {
global findloc commentend ctext
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
selectline $l 1
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
if {$findloc == "All fields" || $findloc == "Comments"} {
# highlight the matches in the comments
set f [$ctext get 1.0 $commentend]
set matches [findmatches $f]
foreach match $matches {
set start [lindex $match 0]
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set end [expr {[lindex $match 1] + 1}]
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
$ctext tag add found "1.0 + $start c" "1.0 + $end c"
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
}
}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
proc findnext {restart} {
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
global matchinglines selectedline
if {![info exists matchinglines]} {
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {$restart} {
dofind
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
return
}
if {![info exists selectedline]} return
foreach l $matchinglines {
if {$l > $selectedline} {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
findselectline $l
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
return
}
}
bell
}
proc findprev {} {
global matchinglines selectedline
if {![info exists matchinglines]} {
dofind
return
}
if {![info exists selectedline]} return
set prev {}
foreach l $matchinglines {
if {$l >= $selectedline} break
set prev $l
}
if {$prev != {}} {
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
findselectline $prev
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
} else {
bell
}
}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
proc findlocchange {name ix op} {
global findloc findtype findtypemenu
if {$findloc == "Pickaxe"} {
set findtype Exact
set state disabled
} else {
set state normal
}
$findtypemenu entryconf 1 -state $state
$findtypemenu entryconf 2 -state $state
}
proc stopfindproc {{done 0}} {
global findprocpid findprocfile findids
global ctext findoldcursor phase maincursor textcursor
global findinprogress
catch {unset findids}
if {[info exists findprocpid]} {
if {!$done} {
catch {exec kill $findprocpid}
}
catch {close $findprocfile}
unset findprocpid
}
if {[info exists findinprogress]} {
unset findinprogress
if {$phase != "incrdraw"} {
. config -cursor $maincursor
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
settextcursor $textcursor
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
}
}
proc findpatches {} {
global findstring selectedline numcommits
global findprocpid findprocfile
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global finddidsel ctext displayorder findinprogress
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
global findinsertpos
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {$numcommits == 0} return
# make a list of all the ids to search, starting at the one
# after the selected line (if any)
if {[info exists selectedline]} {
set l $selectedline
} else {
set l -1
}
set inputids {}
for {set i 0} {$i < $numcommits} {incr i} {
if {[incr l] >= $numcommits} {
set l 0
}
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
append inputids [lindex $displayorder $l] "\n"
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
if {[catch {
set f [open [list | git-diff-tree --stdin -s -r -S$findstring \
<< $inputids] r]
} err]} {
error_popup "Error starting search process: $err"
return
}
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
set findinsertpos end
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set findprocfile $f
set findprocpid [pid $f]
fconfigure $f -blocking 0
fileevent $f readable readfindproc
set finddidsel 0
. config -cursor watch
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
settextcursor watch
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set findinprogress 1
}
proc readfindproc {} {
global findprocfile finddidsel
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global commitrow matchinglines findinsertpos
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set n [gets $findprocfile line]
if {$n < 0} {
if {[eof $findprocfile]} {
stopfindproc 1
if {!$finddidsel} {
bell
}
}
return
}
if {![regexp {^[0-9a-f]{40}} $line id]} {
error_popup "Can't parse git-diff-tree output: $line"
stopfindproc
return
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists commitrow($id)]} {
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
puts stderr "spurious id: $id"
return
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set l $commitrow($id)
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
insertmatch $l $id
}
proc insertmatch {l id} {
global matchinglines findinsertpos finddidsel
if {$findinsertpos == "end"} {
if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
set matchinglines [linsert $matchinglines 0 $l]
set findinsertpos 1
} else {
lappend matchinglines $l
}
} else {
set matchinglines [linsert $matchinglines $findinsertpos $l]
incr findinsertpos
}
markheadline $l $id
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {!$finddidsel} {
findselectline $l
set finddidsel 1
}
}
proc findfiles {} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global selectedline numcommits displayorder ctext
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global ffileline finddidsel parentlist
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
global findinprogress findstartline findinsertpos
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
global treediffs fdiffid fdiffsneeded fdiffpos
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
global findmergefiles
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
if {$numcommits == 0} return
if {[info exists selectedline]} {
set l [expr {$selectedline + 1}]
} else {
set l 0
}
set ffileline $l
set findstartline $l
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
set diffsneeded {}
set fdiffsneeded {}
while 1 {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set id [lindex $displayorder $l]
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {![info exists treediffs($id)]} {
append diffsneeded "$id\n"
lappend fdiffsneeded $id
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
}
}
if {[incr l] >= $numcommits} {
set l 0
}
if {$l == $findstartline} break
}
# start off a git-diff-tree process if needed
if {$diffsneeded ne {}} {
if {[catch {
set df [open [list | git-diff-tree -r --stdin << $diffsneeded] r]
} err ]} {
error_popup "Error starting search process: $err"
return
}
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
catch {unset fdiffid}
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
set fdiffpos 0
fconfigure $df -blocking 0
fileevent $df readable [list readfilediffs $df]
}
set finddidsel 0
set findinsertpos end
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set id [lindex $displayorder $l]
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
. config -cursor watch
Change cursor to a hand cursor when over a SHA1 ID link. 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!).
2005-08-07 13:27:57 +08:00
settextcursor watch
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set findinprogress 1
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
findcont
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
update
}
proc readfilediffs {df} {
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
global findid fdiffid fdiffs
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
set n [gets $df line]
if {$n < 0} {
if {[eof $df]} {
donefilediff
if {[catch {close $df} err]} {
stopfindproc
bell
error_popup "Error in git-diff-tree: $err"
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
} elseif {[info exists findid]} {
set id $findid
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
stopfindproc
bell
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
error_popup "Couldn't find diffs for $id"
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
}
}
return
}
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {[regexp {^([0-9a-f]{40})$} $line match id]} {
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
# start of a new string of diffs
donefilediff
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
set fdiffid $id
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
set fdiffs {}
} elseif {[string match ":*" $line]} {
lappend fdiffs [lindex $line 5]
}
}
proc donefilediff {} {
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
global fdiffid fdiffs treediffs findid
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
global fdiffsneeded fdiffpos
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {[info exists fdiffid]} {
while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
&& $fdiffpos < [llength $fdiffsneeded]} {
# git-diff-tree doesn't output anything for a commit
# which doesn't change anything
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
set nullid [lindex $fdiffsneeded $fdiffpos]
set treediffs($nullid) {}
if {[info exists findid] && $nullid eq $findid} {
unset findid
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
findcont
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
}
incr fdiffpos
}
incr fdiffpos
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {![info exists treediffs($fdiffid)]} {
set treediffs($fdiffid) $fdiffs
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
}
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {[info exists findid] && $fdiffid eq $findid} {
unset findid
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
findcont
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
}
}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
[PATCH] gitk: Fix searching for filenames in gitk findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 07:02:50 +08:00
proc findcont {} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global findid treediffs parentlist
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
global ffileline findstartline finddidsel
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global displayorder numcommits matchinglines findinprogress
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
global findmergefiles
set l $ffileline
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
while {1} {
set id [lindex $displayorder $l]
if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {![info exists treediffs($id)]} {
set findid $id
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set ffileline $l
return
}
set doesmatch 0
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
foreach f $treediffs($id) {
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set x [findmatches $f]
if {$x != {}} {
set doesmatch 1
break
}
}
if {$doesmatch} {
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
insertmatch $l $id
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
}
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {[incr l] >= $numcommits} {
set l 0
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
gitk: Make "find" on "Files" work again. 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>
2006-02-10 07:29:26 +08:00
if {$l == $findstartline} break
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
stopfindproc
if {!$finddidsel} {
bell
}
}
# mark a commit as matching by putting a yellow background
# behind the headline
proc markheadline {l id} {
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
global canv mainfont linehtag
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
drawcmitrow $l
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set bbox [$canv bbox $linehtag($l)]
set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
$canv lower $t
}
# mark the bits of a headline, author or date that match a find string
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
proc markmatches {canv l str tag matches font} {
set bbox [$canv bbox $tag]
set x0 [lindex $bbox 0]
set y0 [lindex $bbox 1]
set y1 [lindex $bbox 3]
foreach match $matches {
set start [lindex $match 0]
set end [lindex $match 1]
if {$start > $end} continue
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
set xlen [font measure $font [string range $str 0 [expr {$end}]]]
set t [$canv create rect [expr {$x0+$xoff}] $y0 \
[expr {$x0+$xlen+2}] $y1 \
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
-outline {} -tags matches -fill yellow]
$canv lower $t
}
}
proc unmarkmatches {} {
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
global matchinglines findids
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
allcanvs delete matches
catch {unset matchinglines}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
catch {unset findids}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc selcanvline {w x y} {
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
global canv canvy0 ctext linespc
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global rowtextx
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
set ymax [lindex [$canv cget -scrollregion] 3]
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
if {$ymax == {}} return
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
if {$l < 0} {
set l 0
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
if {$w eq $canv} {
if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
}
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
unmarkmatches
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
selectline $l 1
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
}
[PATCH] "Child" information in commit window - and cleanups 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>
2005-08-09 11:04:20 +08:00
proc commit_descriptor {p} {
global commitinfo
set l "..."
if {[info exists commitinfo($p)]} {
set l [lindex $commitinfo($p) 0]
}
return "$p ($l)"
}
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
proc appendwithlinks {text} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global ctext commitrow linknum
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
set start [$ctext index "end - 1c"]
$ctext insert end $text
$ctext insert end "\n"
set links [regexp -indices -all -inline {[0-9a-f]{40}} $text]
foreach l $links {
set s [lindex $l 0]
set e [lindex $l 1]
set linkid [string range $text $s $e]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists commitrow($linkid)]} continue
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
incr e
$ctext tag add link "$start + $s c" "$start + $e c"
$ctext tag add link$linknum "$start + $s c" "$start + $e c"
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
$ctext tag bind link$linknum <1> [list selectline $commitrow($linkid) 1]
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
incr linknum
}
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
}
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
proc viewnextline {dir} {
global canv linespc
$canv delete hover
set ymax [lindex [$canv cget -scrollregion] 3]
set wnow [$canv yview]
set wtop [expr {[lindex $wnow 0] * $ymax}]
set newtop [expr {$wtop + $dir * $linespc}]
if {$newtop < 0} {
set newtop 0
} elseif {$newtop > $ymax} {
set newtop $ymax
}
allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
}
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
proc selectline {l isnew} {
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
global canv canv2 canv3 ctext commitinfo selectedline
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global displayorder linehtag linentag linedtag
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global canvy0 linespc parentlist childlist
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
global cflist currentid sha1entry
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global commentend idtags linknum
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global mergemax numcommits
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
Draw graph lines as one continuous line where possible Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
2005-06-17 08:12:26 +08:00
$canv delete hover
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
normalline
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
if {$l < 0 || $l >= $numcommits} return
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
set y [expr {$canvy0 + $l * $linespc}]
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
set ymax [lindex [$canv cget -scrollregion] 3]
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
set ytop [expr {$y - $linespc - 1}]
set ybot [expr {$y + $linespc + 1}]
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
set wnow [$canv yview]
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set wtop [expr {[lindex $wnow 0] * $ymax}]
set wbot [expr {[lindex $wnow 1] * $ymax}]
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
set wh [expr {$wbot - $wtop}]
set newtop $wtop
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
if {$ytop < $wtop} {
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
if {$ybot < $wtop} {
set newtop [expr {$y - $wh / 2.0}]
} else {
set newtop $ytop
if {$newtop > $wtop - $linespc} {
set newtop [expr {$wtop - $linespc}]
}
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
}
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
} elseif {$ybot > $wbot} {
if {$ytop > $wbot} {
set newtop [expr {$y - $wh / 2.0}]
} else {
set newtop [expr {$ybot - $wh}]
if {$newtop < $wtop + $linespc} {
set newtop [expr {$wtop + $linespc}]
}
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
}
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
}
if {$newtop != $wtop} {
if {$newtop < 0} {
set newtop 0
}
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
drawvisible
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
}
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists linehtag($l)]} return
$canv delete secsel
set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
-tags secsel -fill [$canv cget -selectbackground]]
$canv lower $t
$canv2 delete secsel
set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
-tags secsel -fill [$canv2 cget -selectbackground]]
$canv2 lower $t
$canv3 delete secsel
set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
-tags secsel -fill [$canv3 cget -selectbackground]]
$canv3 lower $t
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
if {$isnew} {
addtohistory [list selectline $l 0]
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
}
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
set selectedline $l
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set id [lindex $displayorder $l]
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
set currentid $id
Add a widget to show the SHA1 ID of the current commit Add a find facility to search within the commits Cope with multiple starting points.
2005-05-15 13:56:51 +08:00
$sha1entry delete 0 end
$sha1entry insert 0 $id
$sha1entry selection from 0
$sha1entry selection to end
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
$ctext conf -state normal
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
$ctext delete 0.0 end
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
set linknum 0
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext mark set fmark.0 0.0
$ctext mark gravity fmark.0 left
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
set info $commitinfo($id)
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set date [formatdate [lindex $info 2]]
$ctext insert end "Author: [lindex $info 1] $date\n"
set date [formatdate [lindex $info 4]]
$ctext insert end "Committer: [lindex $info 3] $date\n"
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
if {[info exists idtags($id)]} {
$ctext insert end "Tags:"
foreach tag $idtags($id) {
$ctext insert end " $tag"
}
$ctext insert end "\n"
}
[PATCH] gitk "parent information" in commit window 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>
2005-08-08 04:58:56 +08:00
set comment {}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set olds [lindex $parentlist $l]
if {[llength $olds] > 1} {
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set np 0
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach p $olds {
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
if {$np >= $mergemax} {
set tag mmax
} else {
set tag m$np
}
$ctext insert end "Parent: " $tag
appendwithlinks [commit_descriptor $p]
incr np
}
} else {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach p $olds {
append comment "Parent: [commit_descriptor $p]\n"
[PATCH] "Child" information in commit window - and cleanups 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>
2005-08-09 11:04:20 +08:00
}
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach c [lindex $childlist $l] {
append comment "Child: [commit_descriptor $c]\n"
[PATCH] gitk "parent information" in commit window 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>
2005-08-08 04:58:56 +08:00
}
append comment "\n"
append comment [lindex $info 5]
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
# make anything that looks like a SHA1 ID be a clickable link
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
appendwithlinks $comment
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
$ctext tag delete Comments
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
$ctext tag remove found 1.0 end
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
$ctext conf -state disabled
Error popups on error conditions rather than stderr msgs Stop . bindings firing on find string entry keypresses Fix geometry saving/restoring a bit Show the terminal commits Highlight comment matches in the comment window
2005-05-18 07:23:07 +08:00
set commentend [$ctext index "end - 1c"]
Display the list of changed files in a listbox pane.
2005-05-10 09:02:55 +08:00
$cflist delete 0 end
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$cflist insert end "Comments"
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
if {[llength $olds] <= 1} {
gitk: Fix diff this->selected and selected->this functions 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>
2005-11-28 17:41:56 +08:00
startdiff $id
gitk: Show diffs for boundary commits 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 <paulus@samba.org>
2006-03-30 17:50:40 +08:00
} else {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
mergediff $id $l
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
}
}
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
proc selfirstline {} {
unmarkmatches
selectline 0 1
}
proc sellastline {} {
global numcommits
unmarkmatches
set l [expr {$numcommits - 1}]
selectline $l 1
}
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
proc selnextline {dir} {
global selectedline
if {![info exists selectedline]} return
[PATCH] gitk: put braces around exprs This braces all exprs. It just seemed to be a few that were missed. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-23 09:39:53 +08:00
set l [expr {$selectedline + $dir}]
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
unmarkmatches
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
selectline $l 1
}
[PATCH] gitk: add key bindings for selecting first and last commit 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>
2006-04-05 08:24:03 +08:00
proc selnextpage {dir} {
global canv linespc selectedline numcommits
set lpp [expr {([winfo height $canv] - 2) / $linespc}]
if {$lpp < 1} {
set lpp 1
}
allcanvs yview scroll [expr {$dir * $lpp}] units
if {![info exists selectedline]} return
set l [expr {$selectedline + $dir * $lpp}]
if {$l < 0} {
set l 0
} elseif {$l >= $numcommits} {
set l [expr $numcommits - 1]
}
unmarkmatches
selectline $l 1
}
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
proc unselectline {} {
global selectedline
catch {unset selectedline}
allcanvs delete secsel
}
proc addtohistory {cmd} {
global history historyindex
if {$historyindex > 0
&& [lindex $history [expr {$historyindex - 1}]] == $cmd} {
return
}
if {$historyindex < [llength $history]} {
set history [lreplace $history $historyindex end $cmd]
} else {
lappend history $cmd
}
incr historyindex
if {$historyindex > 1} {
.ctop.top.bar.leftbut conf -state normal
} else {
.ctop.top.bar.leftbut conf -state disabled
}
.ctop.top.bar.rightbut conf -state disabled
}
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
proc goback {} {
global history historyindex
if {$historyindex > 1} {
incr historyindex -1
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
set cmd [lindex $history [expr {$historyindex - 1}]]
eval $cmd
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
.ctop.top.bar.rightbut conf -state normal
}
if {$historyindex <= 1} {
.ctop.top.bar.leftbut conf -state disabled
}
}
proc goforw {} {
global history historyindex
if {$historyindex < [llength $history]} {
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
set cmd [lindex $history $historyindex]
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
incr historyindex
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
eval $cmd
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
.ctop.top.bar.leftbut conf -state normal
}
if {$historyindex >= [llength $history]} {
.ctop.top.bar.rightbut conf -state disabled
}
First cut at displaying the diffs for a merge. We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).
2005-07-17 15:39:44 +08:00
}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
proc mergediff {id l} {
global diffmergeid diffopts mdifffd
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
global difffilestart diffids
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global parentlist
First cut at displaying the diffs for a merge. We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).
2005-07-17 15:39:44 +08:00
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
set diffmergeid $id
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
set diffids $id
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
catch {unset difffilestart}
# this doesn't seem to actually affect anything...
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
set env(GIT_DIFF_OPTS) $diffopts
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set cmd [concat | git-diff-tree --no-commit-id --cc $id]
if {[catch {set mdf [open $cmd r]} err]} {
error_popup "Error getting merge diffs: $err"
return
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
fconfigure $mdf -blocking 0
set mdifffd($id) $mdf
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set np [llength [lindex $parentlist $l]]
fileevent $mdf readable [list getmergediffline $mdf $id $np]
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set nextupdate [expr {[clock clicks -milliseconds] + 100}]
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
proc getmergediffline {mdf id np} {
global diffmergeid ctext cflist nextupdate mergemax
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
global difffilestart mdifffd
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set n [gets $mdf line]
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
if {$n < 0} {
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
if {[eof $mdf]} {
close $mdf
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
return
}
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
if {![info exists diffmergeid] || $id != $diffmergeid
|| $mdf != $mdifffd($id)} {
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
return
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
$ctext conf -state normal
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
if {[regexp {^diff --cc (.*)} $line match fname]} {
# start of a new file
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
$ctext insert end "\n"
set here [$ctext index "end - 1c"]
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set i [$cflist index end]
$ctext mark set fmark.$i $here
$ctext mark gravity fmark.$i left
set difffilestart([expr {$i-1}]) $here
$cflist insert end $fname
set l [expr {(78 - [string length $fname]) / 2}]
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
set pad [string range "----------------------------------------" 1 $l]
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
$ctext insert end "$pad $fname $pad\n" filesep
} elseif {[regexp {^@@} $line]} {
$ctext insert end "$line\n" hunksep
} elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
# do nothing
} else {
# parse the prefix - one ' ', '-' or '+' for each parent
set spaces {}
set minuses {}
set pluses {}
set isbad 0
for {set j 0} {$j < $np} {incr j} {
set c [string range $line $j $j]
if {$c == " "} {
lappend spaces $j
} elseif {$c == "-"} {
lappend minuses $j
} elseif {$c == "+"} {
lappend pluses $j
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
} else {
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set isbad 1
break
Improve the merge display when the result differs from all parents. 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.
2005-07-29 22:23:03 +08:00
}
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
set tags {}
set num {}
if {!$isbad && $minuses ne {} && $pluses eq {}} {
# line doesn't appear in result, parents in $minuses have the line
set num [lindex $minuses 0]
} elseif {!$isbad && $pluses ne {} && $minuses eq {}} {
# line appears in result, parents in $pluses don't have the line
lappend tags mresult
set num [lindex $spaces 0]
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
if {$num ne {}} {
if {$num >= $mergemax} {
set num "max"
Improve the merge display when the result differs from all parents. 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.
2005-07-29 22:23:03 +08:00
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
lappend tags m$num
Improve the merge display when the result differs from all parents. 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.
2005-07-29 22:23:03 +08:00
}
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
$ctext insert end "$line\n" $tags
Display the diffs for a merge in a unified fashion. 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).
2005-07-28 11:15:47 +08:00
}
$ctext conf -state disabled
gitk: Use git-diff-tree --cc for showing the diffs for merges 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>
2006-02-07 06:13:52 +08:00
if {[clock clicks -milliseconds] >= $nextupdate} {
incr nextupdate 100
fileevent $mdf readable {}
update
gitk: Fix incorrect invocation of getmergediffline Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-06 08:20:03 +08:00
fileevent $mdf readable [list getmergediffline $mdf $id $np]
Improve the merge display when the result differs from all parents. 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.
2005-07-29 22:23:03 +08:00
}
}
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
proc startdiff {ids} {
global treediffs diffids treepending diffmergeid
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
set diffids $ids
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
catch {unset diffmergeid}
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
if {![info exists treediffs($ids)]} {
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
if {![info exists treepending]} {
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
gettreediffs $ids
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
} else {
Make searching in files changed faster, and fix some bugs. We now kick off a single git-diff-tree -r --stdin and feed it all the commit pairs we want to know about, instead of doing a separate git-diff-tree invocation for each.
2005-07-17 09:53:55 +08:00
addtocflist $ids
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
}
proc addtocflist {ids} {
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
global treediffs cflist
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
foreach f $treediffs($ids) {
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
$cflist insert end $f
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
getblobdiffs $ids
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc gettreediffs {ids} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global treediff treepending
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set treepending $ids
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
set treediff {}
gitk: Add braces around if expressions 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>
2006-02-07 06:10:18 +08:00
if {[catch \
{set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
]} return
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
fconfigure $gdtf -blocking 0
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
fileevent $gdtf readable [list gettreediffline $gdtf $ids]
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc gettreediffline {gdtf ids} {
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
global treediff treediffs treepending diffids diffmergeid
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
set n [gets $gdtf line]
if {$n < 0} {
if {![eof $gdtf]} return
close $gdtf
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
set treediffs($ids) $treediff
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
unset treepending
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
if {$ids != $diffids} {
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
if {![info exists diffmergeid]} {
gettreediffs $diffids
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
gitk: Fix two bugs reported by users 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 <paulus@samba.org>
2006-03-22 07:21:45 +08:00
} else {
addtocflist $ids
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
}
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
return
}
cope with changed git-diff-tree output format
2005-06-01 08:02:13 +08:00
set file [lindex $line 5]
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
lappend treediff $file
Make getting file lists asynchronous Add some scrollbars
2005-05-11 08:45:38 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc getblobdiffs {ids} {
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
global diffopts blobdifffd diffids env curdifftag curtagstart
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
global difffilestart nextupdate diffinhdr treediffs
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set env(GIT_DIFF_OPTS) $diffopts
gitk: Fix diff this->selected and selected->this functions 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>
2005-11-28 17:41:56 +08:00
set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
if {[catch {set bdf [open $cmd r]} err]} {
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
puts "error getting diffs: $err"
return
}
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
set diffinhdr 0
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
fconfigure $bdf -blocking 0
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set blobdifffd($ids) $bdf
Calculate the list of interesting files for a merge. 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...
2005-07-20 21:13:46 +08:00
set curdifftag Comments
set curtagstart 0.0
catch {unset difffilestart}
fileevent $bdf readable [list getblobdiffline $bdf $diffids]
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set nextupdate [expr {[clock clicks -milliseconds] + 100}]
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc getblobdiffline {bdf ids} {
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
global diffids blobdifffd ctext curdifftag curtagstart
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
global diffnexthead diffnextnote difffilestart
global nextupdate diffinhdr treediffs
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set n [gets $bdf line]
if {$n < 0} {
if {[eof $bdf]} {
close $bdf
First cut at displaying the diffs for a merge. We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).
2005-07-17 15:39:44 +08:00
if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
$ctext tag add $curdifftag $curtagstart end
}
}
return
}
First cut at displaying the diffs for a merge. We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).
2005-07-17 15:39:44 +08:00
if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
return
}
$ctext conf -state normal
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
# start of a new file
$ctext insert end "\n"
$ctext tag add $curdifftag $curtagstart end
set curtagstart [$ctext index "end - 1c"]
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
set header $newname
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set here [$ctext index "end - 1c"]
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
set i [lsearch -exact $treediffs($diffids) $fname]
if {$i >= 0} {
set difffilestart($i) $here
incr i
$ctext mark set fmark.$i $here
$ctext mark gravity fmark.$i left
}
if {$newname != $fname} {
set i [lsearch -exact $treediffs($diffids) $newname]
if {$i >= 0} {
set difffilestart($i) $here
incr i
$ctext mark set fmark.$i $here
$ctext mark gravity fmark.$i left
}
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set curdifftag "f:$fname"
$ctext tag delete $curdifftag
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
set l [expr {(78 - [string length $header]) / 2}]
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
set pad [string range "----------------------------------------" 1 $l]
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
$ctext insert end "$pad $header $pad\n" filesep
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
set diffinhdr 1
gitk: Fix display of diff lines beginning with --- or +++ 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 <paulus@samba.org>
2006-03-08 06:15:32 +08:00
} elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
# do nothing
} elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
set diffinhdr 0
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} {
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
$ctext insert end "$line\n" hunksep
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
set diffinhdr 0
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
} else {
set x [string range $line 0 0]
if {$x == "-" || $x == "+"} {
set tag [expr {$x == "+"}]
$ctext insert end "$line\n" d$tag
} elseif {$x == " "} {
$ctext insert end "$line\n"
Fix display of mode changes in details pane. Also simplified the parsing of the git-diff-tree -p output and got rid of the unused 'seenfile' variable.
2005-07-17 23:11:44 +08:00
} elseif {$diffinhdr || $x == "\\"} {
Handle \ No newline at end of line lines in diff Put (deleted) or (created, mode xxx) in header lines Fix scrolling to bring lines on screen
2005-05-19 18:56:42 +08:00
# e.g. "\ No newline at end of file"
$ctext insert end "$line\n" filesep
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
} else {
# Something else we don't recognize
if {$curdifftag != "Comments"} {
$ctext insert end "\n"
$ctext tag add $curdifftag $curtagstart end
set curtagstart [$ctext index "end - 1c"]
set curdifftag Comments
}
$ctext insert end "$line\n" filesep
}
}
$ctext conf -state disabled
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
if {[clock clicks -milliseconds] >= $nextupdate} {
incr nextupdate 100
fileevent $bdf readable {}
update
fileevent $bdf readable "getblobdiffline $bdf {$ids}"
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
}
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 20:35:53 +08:00
proc nextfile {} {
global difffilestart ctext
set here [$ctext index @0,0]
for {set i 0} {[info exists difffilestart($i)]} {incr i} {
if {[$ctext compare $difffilestart($i) > $here]} {
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
if {![info exists pos]
|| [$ctext compare $difffilestart($i) < $pos]} {
set pos $difffilestart($i)
}
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 20:35:53 +08:00
}
}
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
if {[info exists pos]} {
$ctext yview $pos
}
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 20:35:53 +08:00
}
Show the diffs when a commit is selected Selecting in the listbox reduces the text view to just the diff for the file(s) selected Added -c option for color-by-committer Added some more key bindings
2005-05-12 07:44:54 +08:00
proc listboxsel {} {
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-21 00:25:54 +08:00
global ctext cflist currentid
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
if {![info exists currentid]} return
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set sel [lsort [$cflist curselection]]
if {$sel eq {}} return
set first [lindex $sel 0]
catch {$ctext yview fmark.$first}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
proc setcoords {} {
global linespc charspc canvx0 canvy0 mainfont
Allow graph lines to jump through hyperspace. 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.
2005-08-18 07:30:10 +08:00
global xspc1 xspc2 lthickness
Compress the graph horizontally if it gets too wide. 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.)
2005-08-05 07:52:16 +08:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
set linespc [font metrics $mainfont -linespace]
set charspc [font measure $mainfont "m"]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set canvy0 [expr {int(3 + 0.5 * $linespc)}]
set canvx0 [expr {int(3 + 0.5 * $linespc)}]
Allow graph lines to jump through hyperspace. 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.
2005-08-18 07:30:10 +08:00
set lthickness [expr {int($linespc / 9) + 1}]
Compress the graph horizontally if it gets too wide. 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.)
2005-08-05 07:52:16 +08:00
set xspc1(0) $linespc
set xspc2 $linespc
Make behaviour when git-rev-tree fails nicer Fix crash benh saw with currentid undefined Add menu with file/quit and help/about items Add ^Q for quit
2005-05-13 07:46:16 +08:00
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
proc redisplay {} {
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
global canv
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global selectedline
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {} || $ymax == 0} return
set span [$canv yview]
clear_display
gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-31 06:55:11 +08:00
setcanvscroll
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
allcanvs yview moveto [lindex $span 0]
drawvisible
if {[info exists selectedline]} {
selectline $selectedline 0
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
}
}
proc incrfont {inc} {
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
global mainfont namefont textfont ctext canv phase
Use git-rev-list instead of git-rev-tree. Fix bug in changing font size in entry widgets. Fix bug with B1 click before anything has been drawn. Use "units" and "pages" instead of "u" and "p" for tk8.5.
2005-05-31 20:14:42 +08:00
global stopped entries
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
unmarkmatches
set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
setcoords
$ctext conf -font $textfont
$ctext tag conf filesep -font [concat $textfont bold]
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
foreach e $entries {
$e conf -font $mainfont
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
if {$phase == "getcommits"} {
$canv itemconf textitems -font $mainfont
}
redisplay
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
Clear the SHA1 entry field when we go to paste something into it If the user pastes in the selection (with the middle mouse button) and it already has 40 characters in it, clear it before pasting.
2005-06-25 14:37:13 +08:00
proc clearsha1 {} {
global sha1entry sha1string
if {[string length $sha1string] == 40} {
$sha1entry delete 0 end
}
}
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
proc sha1change {n1 n2 op} {
global sha1string currentid sha1but
if {$sha1string == {}
|| ([info exists currentid] && $sha1string == $currentid)} {
set state disabled
} else {
set state normal
}
if {[$sha1but cget -state] == $state} return
if {$state == "normal"} {
$sha1but conf -state normal -relief raised -text "Goto: "
} else {
$sha1but conf -state disabled -relief flat -text "SHA1 ID: "
}
}
proc gotocommit {} {
[PATCH] gitk: allow goto heads 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 <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-30 13:13:12 +08:00
global sha1string currentid commitrow tagids headids
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global displayorder numcommits
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-19 00:16:35 +08:00
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
if {$sha1string == {}
|| ([info exists currentid] && $sha1string == $currentid)} return
if {[info exists tagids($sha1string)]} {
set id $tagids($sha1string)
[PATCH] gitk: allow goto heads 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 <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-30 13:13:12 +08:00
} elseif {[info exists headids($sha1string)]} {
set id $headids($sha1string)
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
} else {
set id [string tolower $sha1string]
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-19 00:16:35 +08:00
if {[regexp {^[0-9a-f]{4,39}$} $id]} {
set matches {}
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
foreach i $displayorder {
if {[string match $id* $i]} {
lappend matches $i
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-19 00:16:35 +08:00
}
}
if {$matches ne {}} {
if {[llength $matches] > 1} {
error_popup "Short SHA1 id $id is ambiguous"
return
}
set id [lindex $matches 0]
}
}
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
}
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {[info exists commitrow($id)]} {
selectline $commitrow($id) 1
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
return
}
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-19 00:16:35 +08:00
if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
set type "SHA1 id"
} else {
[PATCH] gitk: allow goto heads 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 <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-03-30 13:13:12 +08:00
set type "Tag/Head"
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
}
error_popup "$type $sha1string is not known"
}
Draw graph lines as one continuous line where possible Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
2005-06-17 08:12:26 +08:00
proc lineenter {x y id} {
global hoverx hovery hoverid hovertimer
global commitinfo canv
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
if {![info exists commitinfo($id)] && ![getcommit $id]} return
Draw graph lines as one continuous line where possible Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
2005-06-17 08:12:26 +08:00
set hoverx $x
set hovery $y
set hoverid $id
if {[info exists hovertimer]} {
after cancel $hovertimer
}
set hovertimer [after 500 linehover]
$canv delete hover
}
proc linemotion {x y id} {
global hoverx hovery hoverid hovertimer
if {[info exists hoverid] && $id == $hoverid} {
set hoverx $x
set hovery $y
if {[info exists hovertimer]} {
after cancel $hovertimer
}
set hovertimer [after 500 linehover]
}
}
proc lineleave {id} {
global hoverid hovertimer canv
if {[info exists hoverid] && $id == $hoverid} {
$canv delete hover
if {[info exists hovertimer]} {
after cancel $hovertimer
unset hovertimer
}
unset hoverid
}
}
proc linehover {} {
global hoverx hovery hoverid hovertimer
global canv linespc lthickness
global commitinfo mainfont
set text [lindex $commitinfo($hoverid) 0]
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax == {}} return
set yfrac [lindex [$canv yview] 0]
set x [expr {$hoverx + 2 * $linespc}]
set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
set x0 [expr {$x - 2 * $lthickness}]
set y0 [expr {$y - 2 * $lthickness}]
set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
set y1 [expr {$y + $linespc + 2 * $lthickness}]
set t [$canv create rectangle $x0 $y0 $x1 $y1 \
-fill \#ffff80 -outline black -width 1 -tags hover]
$canv raise $t
gitk: Specify line hover font 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>
2005-10-30 17:06:46 +08:00
set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
Draw graph lines as one continuous line where possible Added context menu on lines Added headline display when the mouse hovers over a line Removed some debug messages
2005-06-17 08:12:26 +08:00
$canv raise $t
}
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
proc clickisonarrow {id y} {
gitk: Fix clicks on arrows on line ends With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-28 07:02:03 +08:00
global lthickness idrowranges
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
set thresh [expr {2 * $lthickness + 6}]
gitk: Fix clicks on arrows on line ends With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-28 07:02:03 +08:00
set n [expr {[llength $idrowranges($id)] - 1}]
for {set i 1} {$i < $n} {incr i} {
set row [lindex $idrowranges($id) $i]
if {abs([yc $row] - $y) < $thresh} {
return $i
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
}
}
return {}
}
gitk: Fix clicks on arrows on line ends With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-28 07:02:03 +08:00
proc arrowjump {id n y} {
global idrowranges canv
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
gitk: Fix clicks on arrows on line ends With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-28 07:02:03 +08:00
# 1 <-> 2, 3 <-> 4, etc...
set n [expr {(($n - 1) ^ 1) + 1}]
set row [lindex $idrowranges($id) $n]
set yt [yc $row]
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {} || $ymax <= 0} return
set view [$canv yview]
set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
set yfrac [expr {$yt / $ymax - $yspan / 2}]
if {$yfrac < 0} {
set yfrac 0
}
gitk: Fix clicks on arrows on line ends With the new representation of the graph lines, this turns out much simpler now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-28 07:02:03 +08:00
allcanvs yview moveto $yfrac
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
}
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
proc lineclick {x y id isnew} {
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
global ctext commitinfo childlist commitrow cflist canv thickerline
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
if {![info exists commitinfo($id)] && ![getcommit $id]} return
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
unmarkmatches
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
unselectline
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
normalline
$canv delete hover
# draw this line thicker than normal
set thickerline $id
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
drawlines $id
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
if {$isnew} {
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {}} return
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
}
set dirn [clickisonarrow $id $y]
if {$dirn ne {}} {
arrowjump $id $dirn $y
return
}
if {$isnew} {
addtohistory [list lineclick $x $y $id 0]
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
# fill the details pane with info about this line
$ctext conf -state normal
$ctext delete 0.0 end
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext insert end "Parent:\t"
$ctext insert end $id [list link link0]
$ctext tag bind link0 <1> [list selbyid $id]
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set info $commitinfo($id)
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$ctext insert end "\n\t[lindex $info 0]\n"
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext insert end "\tAuthor:\t[lindex $info 1]\n"
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set date [formatdate [lindex $info 2]]
$ctext insert end "\tDate:\t$date\n"
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
set kids [lindex $childlist $commitrow($id)]
if {$kids ne {}} {
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext insert end "\nChildren:"
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
set i 0
gitk: replace parent and children arrays with lists This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-02 18:47:40 +08:00
foreach child $kids {
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
incr i
gitk: Further speedups 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 <paulus@samba.org>
2006-03-02 19:56:44 +08:00
if {![info exists commitinfo($child)] && ![getcommit $child]} continue
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set info $commitinfo($child)
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$ctext insert end "\n\t"
$ctext insert end $child [list link link$i]
$ctext tag bind link$i <1> [list selbyid $child]
$ctext insert end "\n\t[lindex $info 0]"
$ctext insert end "\n\tAuthor:\t[lindex $info 1]"
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set date [formatdate [lindex $info 2]]
$ctext insert end "\n\tDate:\t$date\n"
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
}
$ctext conf -state disabled
$cflist delete 0 end
}
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
proc normalline {} {
global thickerline
if {[info exists thickerline]} {
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
set id $thickerline
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
unset thickerline
gitk: Fix a bug in drawing the selected line as a thick line 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 <paulus@samba.org>
2006-03-02 20:00:44 +08:00
drawlines $id
Draw selected graph line thicker and make arrowheads active.
2005-08-30 08:57:11 +08:00
}
}
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
proc selbyid {id} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global commitrow
if {[info exists commitrow($id)]} {
selectline $commitrow($id) 1
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
}
proc mstime {} {
global startmstime
if {![info exists startmstime]} {
set startmstime [clock clicks -milliseconds]
}
return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
}
proc rowmenu {x y id} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global rowctxmenu commitrow selectedline rowmenuid
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists selectedline] || $commitrow($id) eq $selectedline} {
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set state disabled
} else {
set state normal
}
$rowctxmenu entryconfigure 0 -state $state
$rowctxmenu entryconfigure 1 -state $state
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$rowctxmenu entryconfigure 2 -state $state
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set rowmenuid $id
tk_popup $rowctxmenu $x $y
}
proc diffvssel {dirn} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
global rowmenuid selectedline displayorder
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
if {![info exists selectedline]} return
if {$dirn} {
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set oldid [lindex $displayorder $selectedline]
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
set newid $rowmenuid
} else {
set oldid $rowmenuid
gitk: Various speed improvements 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 <paulus@samba.org>
2006-02-28 19:10:19 +08:00
set newid [lindex $displayorder $selectedline]
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
addtohistory [list doseldiff $oldid $newid]
doseldiff $oldid $newid
}
proc doseldiff {oldid newid} {
global ctext cflist
global commitinfo
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext conf -state normal
$ctext delete 0.0 end
$ctext mark set fmark.0 0.0
$ctext mark gravity fmark.0 left
$cflist delete 0 end
$cflist insert end "Top"
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$ctext insert end "From "
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext tag bind link0 <1> [list selbyid $oldid]
$ctext insert end $oldid [list link link0]
$ctext insert end "\n "
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext insert end [lindex $commitinfo($oldid) 0]
Better graph line details display and expand history coverage. 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.
2005-08-08 07:47:22 +08:00
$ctext insert end "\n\nTo "
$ctext tag bind link1 <1> [list selbyid $newid]
$ctext insert end $newid [list link link1]
$ctext insert end "\n "
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
$ctext insert end [lindex $commitinfo($newid) 0]
$ctext insert end "\n"
$ctext conf -state disabled
$ctext tag delete Comments
$ctext tag remove found 1.0 end
gitk: Fix diff this->selected and selected->this functions 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>
2005-11-28 17:41:56 +08:00
startdiff [list $oldid $newid]
Add commit row context menu and handle left-click on graph lines Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
2005-06-25 13:39:21 +08:00
}
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
proc mkpatch {} {
global rowmenuid currentid commitinfo patchtop patchnum
if {![info exists currentid]} return
set oldid $currentid
set oldhead [lindex $commitinfo($oldid) 0]
set newid $rowmenuid
set newhead [lindex $commitinfo($newid) 0]
set top .patch
set patchtop $top
catch {destroy $top}
toplevel $top
label $top.title -text "Generate patch"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
grid $top.title - -pady 10
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
label $top.from -text "From:"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.fromsha1 -width 40 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$top.fromsha1 insert 0 $oldid
$top.fromsha1 conf -state readonly
grid $top.from $top.fromsha1 -sticky w
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.fromhead -width 60 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$top.fromhead insert 0 $oldhead
$top.fromhead conf -state readonly
grid x $top.fromhead -sticky w
label $top.to -text "To:"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.tosha1 -width 40 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$top.tosha1 insert 0 $newid
$top.tosha1 conf -state readonly
grid $top.to $top.tosha1 -sticky w
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.tohead -width 60 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
$top.tohead insert 0 $newhead
$top.tohead conf -state readonly
grid x $top.tohead -sticky w
button $top.rev -text "Reverse" -command mkpatchrev -padx 5
grid $top.rev x -pady 10
label $top.flab -text "Output file:"
entry $top.fname -width 60
$top.fname insert 0 [file normalize "patch$patchnum.patch"]
incr patchnum
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
grid $top.flab $top.fname -sticky w
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
frame $top.buts
button $top.buts.gen -text "Generate" -command mkpatchgo
button $top.buts.can -text "Cancel" -command mkpatchcan
grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
focus $top.fname
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
}
proc mkpatchrev {} {
global patchtop
set oldid [$patchtop.fromsha1 get]
set oldhead [$patchtop.fromhead get]
set newid [$patchtop.tosha1 get]
set newhead [$patchtop.tohead get]
foreach e [list fromsha1 fromhead tosha1 tohead] \
v [list $newid $newhead $oldid $oldhead] {
$patchtop.$e conf -state normal
$patchtop.$e delete 0 end
$patchtop.$e insert 0 $v
$patchtop.$e conf -state readonly
}
}
proc mkpatchgo {} {
global patchtop
set oldid [$patchtop.fromsha1 get]
set newid [$patchtop.tosha1 get]
set fname [$patchtop.fname get]
if {[catch {exec git-diff-tree -p $oldid $newid >$fname &} err]} {
error_popup "Error creating patch: $err"
}
catch {destroy $patchtop}
unset patchtop
}
proc mkpatchcan {} {
global patchtop
catch {destroy $patchtop}
unset patchtop
}
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
proc mktag {} {
global rowmenuid mktagtop commitinfo
set top .maketag
set mktagtop $top
catch {destroy $top}
toplevel $top
label $top.title -text "Create tag"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
grid $top.title - -pady 10
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
label $top.id -text "ID:"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.sha1 -width 40 -relief flat
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
$top.sha1 insert 0 $rowmenuid
$top.sha1 conf -state readonly
grid $top.id $top.sha1 -sticky w
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.head -width 60 -relief flat
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
$top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
$top.head conf -state readonly
grid x $top.head -sticky w
label $top.tlab -text "Tag name:"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
entry $top.tag -width 60
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
grid $top.tlab $top.tag -sticky w
frame $top.buts
button $top.buts.gen -text "Create" -command mktaggo
button $top.buts.can -text "Cancel" -command mktagcan
grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
focus $top.tag
}
proc domktag {} {
global mktagtop env tagids idtags
set id [$mktagtop.sha1 get]
set tag [$mktagtop.tag get]
if {$tag == {}} {
error_popup "No tag name specified"
return
}
if {[info exists tagids($tag)]} {
error_popup "Tag \"$tag\" already exists"
return
}
if {[catch {
[PATCH] gitk: Use GIT_DIR where appropriate. 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>
2005-07-28 15:28:44 +08:00
set dir [gitdir]
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
set fname [file join $dir "refs/tags" $tag]
set f [open $fname w]
puts $f $id
close $f
} err]} {
error_popup "Error creating tag: $err"
return
}
set tagids($tag) $id
lappend idtags($id) $tag
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
redrawtags $id
}
proc redrawtags {id} {
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
global canv linehtag commitrow idpos selectedline
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
if {![info exists commitrow($id)]} return
drawcmitrow $commitrow($id)
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
$canv delete tag.$id
set xt [eval drawtags $id $idpos($id)]
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
$canv coords $linehtag($commitrow($id)) $xt [lindex $idpos($id) 2]
if {[info exists selectedline] && $selectedline == $commitrow($id)} {
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
selectline $selectedline 0
Add a menu item for creating tags.
2005-06-27 20:56:40 +08:00
}
}
proc mktagcan {} {
global mktagtop
catch {destroy $mktagtop}
unset mktagtop
}
proc mktaggo {} {
domktag
mktagcan
}
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
proc writecommit {} {
global rowmenuid wrcomtop commitinfo wrcomcmd
set top .writecommit
set wrcomtop $top
catch {destroy $top}
toplevel $top
label $top.title -text "Write commit to file"
grid $top.title - -pady 10
label $top.id -text "ID:"
entry $top.sha1 -width 40 -relief flat
$top.sha1 insert 0 $rowmenuid
$top.sha1 conf -state readonly
grid $top.id $top.sha1 -sticky w
entry $top.head -width 60 -relief flat
$top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
$top.head conf -state readonly
grid x $top.head -sticky w
label $top.clab -text "Command:"
entry $top.cmd -width 60 -textvariable wrcomcmd
grid $top.clab $top.cmd -sticky w -pady 10
label $top.flab -text "Output file:"
entry $top.fname -width 60
$top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
grid $top.flab $top.fname -sticky w
frame $top.buts
button $top.buts.gen -text "Write" -command wrcomgo
button $top.buts.can -text "Cancel" -command wrcomcan
grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
focus $top.fname
}
proc wrcomgo {} {
global wrcomtop
set id [$wrcomtop.sha1 get]
set cmd "echo $id | [$wrcomtop.cmd get]"
set fname [$wrcomtop.fname get]
if {[catch {exec sh -c $cmd >$fname &} err]} {
error_popup "Error writing commit: $err"
}
catch {destroy $wrcomtop}
unset wrcomtop
}
proc wrcomcan {} {
global wrcomtop
catch {destroy $wrcomtop}
unset wrcomtop
}
Added re-read refs command, and display all refs. 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.
2005-08-19 20:14:28 +08:00
proc listrefs {id} {
global idtags idheads idotherrefs
set x {}
if {[info exists idtags($id)]} {
set x $idtags($id)
}
set y {}
if {[info exists idheads($id)]} {
set y $idheads($id)
}
set z {}
if {[info exists idotherrefs($id)]} {
set z $idotherrefs($id)
}
return [list $x $y $z]
}
proc rereadrefs {} {
global idtags idheads idotherrefs
set refids [concat [array names idtags] \
[array names idheads] [array names idotherrefs]]
foreach id $refids {
if {![info exists ref($id)]} {
set ref($id) [listrefs $id]
}
}
readrefs
set refids [lsort -unique [concat $refids [array names idtags] \
[array names idheads] [array names idotherrefs]]]
foreach id $refids {
set v [listrefs $id]
if {![info exists ref($id)] || $ref($id) != $v} {
redrawtags $id
}
}
}
Display the contents of a tag when the user clicks on it. 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.
2005-08-19 21:11:39 +08:00
proc showtag {tag isnew} {
global ctext cflist tagcontents tagids linknum
if {$isnew} {
addtohistory [list showtag $tag 0]
}
$ctext conf -state normal
$ctext delete 0.0 end
set linknum 0
if {[info exists tagcontents($tag)]} {
set text $tagcontents($tag)
} else {
set text "Tag: $tag\nId: $tagids($tag)"
}
appendwithlinks $text
$ctext conf -state disabled
$cflist delete 0 end
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
proc doquit {} {
global stopped
set stopped 100
destroy .
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
proc doprefs {} {
global maxwidth maxgraphpct diffopts findmergefiles
global oldprefs prefstop
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
set top .gitkprefs
set prefstop $top
if {[winfo exists $top]} {
raise $top
return
gitk: Disable fastdate stuff for now 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>
2005-11-21 06:56:07 +08:00
}
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
set oldprefs($v) [set $v]
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
}
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
toplevel $top
wm title $top "Gitk preferences"
label $top.ldisp -text "Commit list display options"
grid $top.ldisp - -sticky w -pady 10
label $top.spacer -text " "
label $top.maxwidthl -text "Maximum graph width (lines)" \
-font optionfont
spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
label $top.maxpctl -text "Maximum graph width (% of pane)" \
-font optionfont
spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
grid x $top.maxpctl $top.maxpct -sticky w
checkbutton $top.findm -variable findmergefiles
label $top.findml -text "Include merges for \"Find\" in \"Files\"" \
-font optionfont
grid $top.findm $top.findml - -sticky w
label $top.ddisp -text "Diff display options"
grid $top.ddisp - -sticky w -pady 10
label $top.diffoptl -text "Options for diff program" \
-font optionfont
entry $top.diffopt -width 20 -textvariable diffopts
grid x $top.diffoptl $top.diffopt -sticky w
frame $top.buts
button $top.buts.ok -text "OK" -command prefsok
button $top.buts.can -text "Cancel" -command prefscan
grid $top.buts.ok $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - - -pady 10 -sticky ew
}
proc prefscan {} {
global maxwidth maxgraphpct diffopts findmergefiles
global oldprefs prefstop
foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
set $v $oldprefs($v)
}
catch {destroy $prefstop}
unset prefstop
}
proc prefsok {} {
global maxwidth maxgraphpct
global oldprefs prefstop
catch {destroy $prefstop}
unset prefstop
if {$maxwidth != $oldprefs(maxwidth)
|| $maxgraphpct != $oldprefs(maxgraphpct)} {
redisplay
}
}
proc formatdate {d} {
return [clock format $d -format "%Y-%m-%d %H:%M:%S"]
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
}
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
# This list of encoding names and aliases is distilled from
# http://www.iana.org/assignments/character-sets.
# Not all of them are supported by Tcl.
set encoding_aliases {
{ ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
ISO646-US US-ASCII us IBM367 cp367 csASCII }
{ ISO-10646-UTF-1 csISO10646UTF1 }
{ ISO_646.basic:1983 ref csISO646basic1983 }
{ INVARIANT csINVARIANT }
{ ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
{ BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
{ NATS-SEFI iso-ir-8-1 csNATSSEFI }
{ NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
{ NATS-DANO iso-ir-9-1 csNATSDANO }
{ NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
{ SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
{ SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
{ KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
{ ISO-2022-KR csISO2022KR }
{ EUC-KR csEUCKR }
{ ISO-2022-JP csISO2022JP }
{ ISO-2022-JP-2 csISO2022JP2 }
{ JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
csISO13JISC6220jp }
{ JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
{ IT iso-ir-15 ISO646-IT csISO15Italian }
{ PT iso-ir-16 ISO646-PT csISO16Portuguese }
{ ES iso-ir-17 ISO646-ES csISO17Spanish }
{ greek7-old iso-ir-18 csISO18Greek7Old }
{ latin-greek iso-ir-19 csISO19LatinGreek }
{ DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
{ NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
{ Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
{ ISO_5427 iso-ir-37 csISO5427Cyrillic }
{ JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
{ BS_viewdata iso-ir-47 csISO47BSViewdata }
{ INIS iso-ir-49 csISO49INIS }
{ INIS-8 iso-ir-50 csISO50INIS8 }
{ INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
{ ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
{ ISO_5428:1980 iso-ir-55 csISO5428Greek }
{ GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
{ GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
{ NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
csISO60Norwegian1 }
{ NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
{ NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
{ videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
{ PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
{ ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
{ MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
{ JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
{ greek7 iso-ir-88 csISO88Greek7 }
{ ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
{ iso-ir-90 csISO90 }
{ JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
{ JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
csISO92JISC62991984b }
{ JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
{ JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
{ JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
csISO95JIS62291984handadd }
{ JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
{ ISO_2033-1983 iso-ir-98 e13b csISO2033 }
{ ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
{ ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
CP819 csISOLatin1 }
{ ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
{ T.61-7bit iso-ir-102 csISO102T617bit }
{ T.61-8bit T.61 iso-ir-103 csISO103T618bit }
{ ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
{ ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
{ ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
{ CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
{ CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
{ CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
{ ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
arabic csISOLatinArabic }
{ ISO_8859-6-E csISO88596E ISO-8859-6-E }
{ ISO_8859-6-I csISO88596I ISO-8859-6-I }
{ ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
greek greek8 csISOLatinGreek }
{ T.101-G2 iso-ir-128 csISO128T101G2 }
{ ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
csISOLatinHebrew }
{ ISO_8859-8-E csISO88598E ISO-8859-8-E }
{ ISO_8859-8-I csISO88598I ISO-8859-8-I }
{ CSN_369103 iso-ir-139 csISO139CSN369103 }
{ JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
{ ISO_6937-2-add iso-ir-142 csISOTextComm }
{ IEC_P27-1 iso-ir-143 csISO143IECP271 }
{ ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
csISOLatinCyrillic }
{ JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
{ JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
{ ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
{ greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
{ NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
{ ISO_6937-2-25 iso-ir-152 csISO6937Add }
{ GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
{ ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
{ ISO_10367-box iso-ir-155 csISO10367Box }
{ ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
{ latin-lap lap iso-ir-158 csISO158Lap }
{ JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
{ DS_2089 DS2089 ISO646-DK dk csISO646Danish }
{ us-dk csUSDK }
{ dk-us csDKUS }
{ JIS_X0201 X0201 csHalfWidthKatakana }
{ KSC5636 ISO646-KR csKSC5636 }
{ ISO-10646-UCS-2 csUnicode }
{ ISO-10646-UCS-4 csUCS4 }
{ DEC-MCS dec csDECMCS }
{ hp-roman8 roman8 r8 csHPRoman8 }
{ macintosh mac csMacintosh }
{ IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
csIBM037 }
{ IBM038 EBCDIC-INT cp038 csIBM038 }
{ IBM273 CP273 csIBM273 }
{ IBM274 EBCDIC-BE CP274 csIBM274 }
{ IBM275 EBCDIC-BR cp275 csIBM275 }
{ IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
{ IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
{ IBM280 CP280 ebcdic-cp-it csIBM280 }
{ IBM281 EBCDIC-JP-E cp281 csIBM281 }
{ IBM284 CP284 ebcdic-cp-es csIBM284 }
{ IBM285 CP285 ebcdic-cp-gb csIBM285 }
{ IBM290 cp290 EBCDIC-JP-kana csIBM290 }
{ IBM297 cp297 ebcdic-cp-fr csIBM297 }
{ IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
{ IBM423 cp423 ebcdic-cp-gr csIBM423 }
{ IBM424 cp424 ebcdic-cp-he csIBM424 }
{ IBM437 cp437 437 csPC8CodePage437 }
{ IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
{ IBM775 cp775 csPC775Baltic }
{ IBM850 cp850 850 csPC850Multilingual }
{ IBM851 cp851 851 csIBM851 }
{ IBM852 cp852 852 csPCp852 }
{ IBM855 cp855 855 csIBM855 }
{ IBM857 cp857 857 csIBM857 }
{ IBM860 cp860 860 csIBM860 }
{ IBM861 cp861 861 cp-is csIBM861 }
{ IBM862 cp862 862 csPC862LatinHebrew }
{ IBM863 cp863 863 csIBM863 }
{ IBM864 cp864 csIBM864 }
{ IBM865 cp865 865 csIBM865 }
{ IBM866 cp866 866 csIBM866 }
{ IBM868 CP868 cp-ar csIBM868 }
{ IBM869 cp869 869 cp-gr csIBM869 }
{ IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
{ IBM871 CP871 ebcdic-cp-is csIBM871 }
{ IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
{ IBM891 cp891 csIBM891 }
{ IBM903 cp903 csIBM903 }
{ IBM904 cp904 904 csIBBM904 }
{ IBM905 CP905 ebcdic-cp-tr csIBM905 }
{ IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
{ IBM1026 CP1026 csIBM1026 }
{ EBCDIC-AT-DE csIBMEBCDICATDE }
{ EBCDIC-AT-DE-A csEBCDICATDEA }
{ EBCDIC-CA-FR csEBCDICCAFR }
{ EBCDIC-DK-NO csEBCDICDKNO }
{ EBCDIC-DK-NO-A csEBCDICDKNOA }
{ EBCDIC-FI-SE csEBCDICFISE }
{ EBCDIC-FI-SE-A csEBCDICFISEA }
{ EBCDIC-FR csEBCDICFR }
{ EBCDIC-IT csEBCDICIT }
{ EBCDIC-PT csEBCDICPT }
{ EBCDIC-ES csEBCDICES }
{ EBCDIC-ES-A csEBCDICESA }
{ EBCDIC-ES-S csEBCDICESS }
{ EBCDIC-UK csEBCDICUK }
{ EBCDIC-US csEBCDICUS }
{ UNKNOWN-8BIT csUnknown8BiT }
{ MNEMONIC csMnemonic }
{ MNEM csMnem }
{ VISCII csVISCII }
{ VIQR csVIQR }
{ KOI8-R csKOI8R }
{ IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
{ IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
{ IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
{ IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
{ IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
{ IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
{ IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
{ IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
{ IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
{ IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
{ IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
{ IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
{ IBM1047 IBM-1047 }
{ PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
{ Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
{ UNICODE-1-1 csUnicode11 }
{ CESU-8 csCESU-8 }
{ BOCU-1 csBOCU-1 }
{ UNICODE-1-1-UTF-7 csUnicode11UTF7 }
{ ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
l8 }
{ ISO-8859-15 ISO_8859-15 Latin-9 }
{ ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
{ GBK CP936 MS936 windows-936 }
{ JIS_Encoding csJISEncoding }
{ Shift_JIS MS_Kanji csShiftJIS }
{ Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
EUC-JP }
{ Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
{ ISO-10646-UCS-Basic csUnicodeASCII }
{ ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
{ ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
{ ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
{ ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
{ ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
{ ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
{ ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
{ ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
{ ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
{ ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
{ Adobe-Standard-Encoding csAdobeStandardEncoding }
{ Ventura-US csVenturaUS }
{ Ventura-International csVenturaInternational }
{ PC8-Danish-Norwegian csPC8DanishNorwegian }
{ PC8-Turkish csPC8Turkish }
{ IBM-Symbols csIBMSymbols }
{ IBM-Thai csIBMThai }
{ HP-Legal csHPLegal }
{ HP-Pi-font csHPPiFont }
{ HP-Math8 csHPMath8 }
{ Adobe-Symbol-Encoding csHPPSMath }
{ HP-DeskTop csHPDesktop }
{ Ventura-Math csVenturaMath }
{ Microsoft-Publishing csMicrosoftPublishing }
{ Windows-31J csWindows31J }
{ GB2312 csGB2312 }
{ Big5 csBig5 }
}
proc tcl_encoding {enc} {
global encoding_aliases
set names [encoding names]
set lcnames [string tolower $names]
set enc [string tolower $enc]
set i [lsearch -exact $lcnames $enc]
if {$i < 0} {
# look for "isonnn" instead of "iso-nnn" or "iso_nnn"
if {[regsub {^iso[-_]} $enc iso encx]} {
set i [lsearch -exact $lcnames $encx]
}
}
if {$i < 0} {
foreach l $encoding_aliases {
set ll [string tolower $l]
if {[lsearch -exact $ll $enc] < 0} continue
# look through the aliases for one that tcl knows about
foreach e $ll {
set i [lsearch -exact $lcnames $e]
if {$i < 0} {
if {[regsub {^iso[-_]} $e iso ex]} {
set i [lsearch -exact $lcnames $ex]
}
}
if {$i >= 0} break
}
break
}
}
if {$i >= 0} {
return [lindex $names $i]
}
return {}
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
# defaults...
set datemode 0
set diffopts "-U 5 -p"
Add a menu item for writing out a commit to a file. This just invokes git-diff-tree. Also changed the readonly entry widgets in the "write patch" and "generate tag" windows to have flat relief, so it doesn't look like you should be able to modify what's in them.
2005-06-29 07:47:48 +08:00
set wrcomcmd "git-diff-tree --stdin -p --pretty"
[PATCH] gitk: Use i18n.commitencoding configuration item. 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>
2005-11-28 08:12:51 +08:00
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
set gitencoding {}
[PATCH] gitk: Use i18n.commitencoding configuration item. 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>
2005-11-28 08:12:51 +08:00
catch {
set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
gitk: Work around Tcl's non-standard names for encodings 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>
2005-12-07 20:28:22 +08:00
set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
[PATCH] gitk: Use i18n.commitencoding configuration item. 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>
2005-11-28 08:12:51 +08:00
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
set mainfont {Helvetica 9}
set textfont {Courier 9}
[PATCH] Provide configurable UI font for gitk 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>
2006-04-04 15:19:45 +08:00
set uifont {Helvetica 9 bold}
Add "Files" and "Pickaxe" to the find menu. "Files" matches the find string against each of the files modified by each commit, and can do exact, case-ignoring or regexp matching. "Pickaxe" uses git-diff-tree -S'string' and can only do exact matching. I called it "pickaxe" rather than "find within patch" since it only finds commits where the string is present in the child but not the parents or vice versa, and "pickaxe" is what the author of that feature calls it.
2005-07-16 19:46:13 +08:00
set findmergefiles 0
Compress the graph horizontally if it gets too wide. 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.)
2005-08-05 07:52:16 +08:00
set maxgraphpct 50
Allow graph lines to jump through hyperspace. 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.
2005-08-18 07:30:10 +08:00
set maxwidth 16
Add -r flag and some speedups 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>
2005-11-15 07:34:03 +08:00
set revlistorder 0
gitk: Disable fastdate stuff for now 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>
2005-11-21 06:56:07 +08:00
set fastdate 0
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
set colors {green red blue magenta darkgrey brown orange}
catch {source ~/.gitk}
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
set namefont $mainfont
gitk: Add a preferences dialog with some basic stuff 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>
2005-11-30 06:28:16 +08:00
font create optionfont -family sans-serif -size -12
More fixes for geometry restoration Make up/down/pgup/pgdn work again Return in find string entry does find Scale circles and lines with font size Fix scrolling to make entire selected line visible Use white circle for commits not listed but put in to terminate lines Fix diff parsing for created and deleted files
2005-05-19 06:51:00 +08:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
set revtreeargs {}
foreach arg $argv {
switch -regexp -- $arg {
"^$" { }
"^-d" { set datemode 1 }
default {
lappend revtreeargs $arg
}
}
Add initial version of gitk to the CVS repository
2005-05-09 12:08:39 +08:00
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
gitk: Fix Update menu item 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 <paulus@samba.org>
2006-02-28 08:27:12 +08:00
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
error_popup "Cannot find the git directory \"$gitdir\"."
exit 1
}
Add forward and back buttons and make SHA1 IDs clickable links. 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.
2005-08-06 20:06:06 +08:00
set history {}
set historyindex 0
gitk: New improved gitk This is a new version of gitk which is much faster and has much better graph layout. It achieves the speed by only drawing the parts of the canvases that are actually visible. It also draws the commits in the order that git-rev-list produces them, so if you use -d, you need to have a recent enough git-rev-list that understands the --date-order flag. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-02-19 19:44:47 +08:00
set optim_delay 16
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
set stopped 0
save window geometry on exit, and restore it on startup
2005-05-17 07:54:58 +08:00
set stuffsaved 0
Add a menu entry for generating a patch between any two commits.
2005-06-27 17:27:32 +08:00
set patchnum 0
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
setcoords
[PATCH] gitk: add Update menu item. 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>
2005-11-30 05:15:51 +08:00
makewindow $revtreeargs
Read tags from .git/refs/tags/* and mark commits with tags with a label. Allow SHA1 ids or tags to be entered in the SHA1 ID field.
2005-05-21 15:35:37 +08:00
readrefs
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 20:55:47 +08:00
getcommits $revtreeargs
Reference in New Issue Copy Permalink