microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
git/gitk

3203 строки
84 KiB
Plaintext
Исходник Обычный вид История

Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "${1+$@}"
# 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 11:28:44 +04:00
proc gitdir {} {
global env
if {[info exists env(GIT_DIR)]} {
return $env(GIT_DIR)
} else {
return ".git"
}
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
proc getcommits {rargs} {
Check for the existence of the git directory on startup. Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory. This means we can give a more informative error message if the user runs gitk somewhere that isn't a git repository.
2005-06-27 04:37:11 +04:00
global commits commfd phase canv mainfont env
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 16:50:28 +04:00
global startmsecs nextupdate ncmupdate
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 04:25:38 +04:00
global ctext maincursor textcursor leftover
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
Check for the existence of the git directory on startup. Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory. This means we can give a more informative error message if the user runs gitk somewhere that isn't a git repository.
2005-06-27 04:37:11 +04:00
# check that we can find a .git directory somewhere...
[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 11:28:44 +04:00
set gitdir [gitdir]
Check for the existence of the git directory on startup. Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory. This means we can give a more informative error message if the user runs gitk somewhere that isn't a git repository.
2005-06-27 04:37:11 +04:00
if {![file isdirectory $gitdir]} {
error_popup "Cannot find the git directory \"$gitdir\"."
exit 1
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set commits {}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set phase getcommits
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
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 16:50:28 +04:00
set ncmupdate 0
Pass arguments through git-rev-parse. This allows the user to specify ranges more flexibly; for instance the user can now do "gitk v2.6.12.." and see all the changes since 2.6.12.
2005-06-21 04:20:04 +04:00
if [catch {
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 04:25:38 +04:00
set parse_args [concat --default HEAD $rargs]
Pass arguments through git-rev-parse. This allows the user to specify ranges more flexibly; for instance the user can now do "gitk v2.6.12.." and see all the changes since 2.6.12.
2005-06-21 04:20:04 +04:00
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
}] {
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 04:25:38 +04:00
# if git-rev-parse failed for some reason...
Pass arguments through git-rev-parse. This allows the user to specify ranges more flexibly; for instance the user can now do "gitk v2.6.12.." and see all the changes since 2.6.12.
2005-06-21 04:20:04 +04:00
if {$rargs == {}} {
set rargs HEAD
}
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 04:25:38 +04:00
set parsed_args $rargs
Pass arguments through git-rev-parse. This allows the user to specify ranges more flexibly; for instance the user can now do "gitk v2.6.12.." and see all the changes since 2.6.12.
2005-06-21 04:20:04 +04:00
}
if [catch {
Import the --topo-order change and fix the writing of ~/.gitk.
2005-07-28 07:16:51 +04:00
set commfd [open "|git-rev-list --header --topo-order $parsed_args" r]
Pass arguments through git-rev-parse. This allows the user to specify ranges more flexibly; for instance the user can now do "gitk v2.6.12.." and see all the changes since 2.6.12.
2005-06-21 04:20:04 +04: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 16:14:42 +04: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 16:55:47 +04: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 04:25:38 +04:00
set leftover {}
Use lf translation rather than binary when reading commit data. The effect of this is that it allows Tcl to do the locale-specific conversion of the input data to its internal unicode representation. That means that commit messages in Russian or other languages should be displayed correctly now (according to the locale that is in effect.)
2005-08-07 14:01:24 +04:00
fconfigure $commfd -blocking 0 -translation lf
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 16:50:28 +04:00
fileevent $commfd readable [list getcommitlines $commfd]
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
Fix operation without libreadobj.so.0.0 Display a watch cursor when reading the commits initially
2005-06-16 14:54:04 +04: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 09:27:57 +04:00
settextcursor watch
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 04:25:38 +04:00
proc getcommitlines {commfd} {
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 04:01:38 +04:00
global commits parents cdate children nchildren
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global commitlisted phase commitinfo nextupdate
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 04:25:38 +04:00
global stopped redisplaying leftover
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 16:50:28 +04:00
global numcommits ncmupdate
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 04:25:38 +04: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 16:55:47 +04: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-18 22:29:03 +04: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 03:23:07 +04:00
fconfigure $commfd -blocking 1
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
if {![catch {close $commfd} err]} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
after idle finishcommits
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 03:46:16 +04:00
if {[string range $err 0 4] == "usage"} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set err \
{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 03:46:16 +04: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 03:23:07 +04: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 03:46:16 +04: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 03:23:07 +04:00
error_popup $err
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 03:46:16 +04: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 04:25:38 +04:00
set start 0
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 14:04:26 +04:00
append leftover [string range $stuff $start end]
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 04:25:38 +04:00
return
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 04:25:38 +04:00
set cmit [string range $stuff $start [expr {$i - 1}]]
if {$start == 0} {
set cmit "$leftover$cmit"
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 14:04:26 +04:00
set leftover {}
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 04:25:38 +04:00
}
set start [expr {$i + 1}]
if {![regexp {^([0-9a-f]{40})\n} $cmit match id]} {
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 14:04:26 +04: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 04:25:38 +04:00
exit 1
}
set cmit [string range $cmit 41 end]
lappend commits $id
set commitlisted($id) 1
parsecommit $id $cmit 1
drawcommit $id
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 16:50:28 +04:00
if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
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 04:25:38 +04:00
doupdate
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 16:50:28 +04:00
set ncmupdate $numcommits
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 04:25:38 +04:00
}
while {$redisplaying} {
set redisplaying 0
if {$stopped == 1} {
set stopped 0
set phase "getcommits"
foreach id $commits {
drawcommit $id
if {$stopped} break
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 16:50:28 +04:00
if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
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 04:25:38 +04:00
doupdate
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 16:50:28 +04:00
set ncmupdate $numcommits
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 04:25:38 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
}
}
}
}
proc doupdate {} {
global commfd nextupdate
incr nextupdate 100
fileevent $commfd readable {}
update
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 16:50:28 +04:00
fileevent $commfd readable [list getcommitlines $commfd]
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
proc readcommit {id} {
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 04:25:38 +04:00
if [catch {set contents [exec git-cat-file commit $id]}] return
parsecommit $id $contents 0
}
proc parsecommit {id contents listed} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global commitinfo children nchildren parents nparents cdate ncleft
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set inhdr 1
set comment {}
set headline {}
set auname {}
set audate {}
set comname {}
set 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 16:14:42 +04:00
if {![info exists nchildren($id)]} {
set children($id) {}
set nchildren($id) 0
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set ncleft($id) 0
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 16:14:42 +04:00
}
set parents($id) {}
set nparents($id) 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 03:23:07 +04:00
foreach line [split $contents "\n"] {
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
if {$inhdr} {
if {$line == {}} {
set inhdr 0
} else {
set tag [lindex $line 0]
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 16:14:42 +04:00
if {$tag == "parent"} {
set p [lindex $line 1]
if {![info exists nchildren($p)]} {
set children($p) {}
set nchildren($p) 0
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set ncleft($p) 0
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 16:14:42 +04:00
}
lappend parents($id) $p
incr nparents($id)
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 04:01:38 +04:00
# sometimes we get a commit that lists a parent twice...
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 04:25:38 +04:00
if {$listed && [lsearch -exact $children($p) $id] < 0} {
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 16:14:42 +04:00
lappend children($p) $id
incr nchildren($p)
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
incr ncleft($p)
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 16:14:42 +04:00
}
} elseif {$tag == "author"} {
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set x [expr {[llength $line] - 2}]
set audate [lindex $line $x]
set auname [lrange $line 1 [expr {$x - 1}]]
} elseif {$tag == "committer"} {
set x [expr {[llength $line] - 2}]
set comdate [lindex $line $x]
set comname [lrange $line 1 [expr {$x - 1}]]
}
}
} else {
if {$comment == {}} {
Account for indentation of the checkin comments by git-rev-list This involves adding indentation when we read a commit with git-cat-file and trimming the whitespace from the headline.
2005-06-22 12:15:15 +04:00
set headline [string trim $line]
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
} else {
append comment "\n"
}
Account for indentation of the checkin comments by git-rev-list This involves adding indentation when we read a commit with git-cat-file and trimming the whitespace from the headline.
2005-06-22 12:15:15 +04:00
if {!$listed} {
# git-rev-list indents the comment by 4 spaces;
# if we got this via git-cat-file, add the indentation
append comment " "
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
append comment $line
}
}
if {$audate != {}} {
set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"]
}
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 16:14:42 +04:00
set cdate($id) $comdate
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
}
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 03:44:54 +04:00
set commitinfo($id) [list $headline $auname $audate \
$comname $comdate $comment]
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 11:35:37 +04:00
proc readrefs {} {
Show heads as well as tags
2005-06-10 11:54:49 +04:00
global tagids idtags headids idheads
[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 11:28:44 +04:00
set tags [glob -nocomplain -types f [gitdir]/refs/tags/*]
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 11:35:37 +04:00
foreach f $tags {
catch {
set fd [open $f r]
set line [read $fd]
if {[regexp {^[0-9a-f]{40}} $line id]} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set direct [file tail $f]
set tagids($direct) $id
lappend idtags($id) $direct
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 11:35:37 +04:00
set contents [split [exec git-cat-file tag $id] "\n"]
set obj {}
set type {}
set tag {}
foreach l $contents {
if {$l == {}} break
switch -- [lindex $l 0] {
"object" {set obj [lindex $l 1]}
"type" {set type [lindex $l 1]}
"tag" {set tag [string range $l 4 end]}
}
}
if {$obj != {} && $type == "commit" && $tag != {}} {
set tagids($tag) $obj
lappend idtags($obj) $tag
}
}
Show heads as well as tags
2005-06-10 11:54:49 +04:00
close $fd
}
}
[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 11:28:44 +04:00
set heads [glob -nocomplain -types f [gitdir]/refs/heads/*]
Show heads as well as tags
2005-06-10 11:54:49 +04:00
foreach f $heads {
catch {
set fd [open $f r]
set line [read $fd 40]
if {[regexp {^[0-9a-f]{40}} $line id]} {
set head [file tail $f]
set headids($head) $line
lappend idheads($line) $head
}
close $fd
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 11:35:37 +04: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 03:23:07 +04: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"
tkwait window $w
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
proc makewindow {} {
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 03:44:54 +04:00
global canv canv2 canv3 linespc charspc ctext cflist textfont
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 15:46:13 +04: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 11:35:37 +04: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 09:27:57 +04:00
global maincursor textcursor curtextcursor
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 07:15:47 +04:00
global rowctxmenu gaudydiff 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 03:46:16 +04:00
menu .bar
.bar add cascade -label "File" -menu .bar.file
menu .bar.file
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
.bar.file add command -label "Quit" -command doquit
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 03:46:16 +04:00
menu .bar.help
.bar add cascade -label "Help" -menu .bar.help
.bar.help add command -label "About gitk" -command about
. configure -menu .bar
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04:00
if {![info exists geometry(canv1)]} {
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]
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 04:23:42 +04:00
panedwindow .ctop -orient vertical
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04: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 02:51:00 +04: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 03:54:58 +04: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 09:56:51 +04: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 03:54:58 +04: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 16:08:22 +04:00
-bg white -bd 0 \
-yscrollincr $linespc -yscrollcommand "$cscroll set"
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 09:56:51 +04: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 03:54:58 +04: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 16:08:22 +04: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 09:56:51 +04: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 03:54:58 +04: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 16:08:22 +04: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 09:56:51 +04: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 03:19:18 +04: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 09:56:51 +04: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 11:35:37 +04:00
set entries $sha1entry
set sha1but .ctop.top.bar.sha1label
button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
-command gotocommit -width 8
$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 09:56:51 +04: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 11:35:37 +04: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 09:56:51 +04: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 16:06:06 +04: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
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 09:56:51 +04:00
button .ctop.top.bar.findbut -text "Find" -command dofind
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 03:23:07 +04: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 11:35:37 +04:00
lappend entries $fstring
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 03:23:07 +04:00
entry $fstring -width 30 -font $textfont -textvariable findstring
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 09:56:51 +04: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 15:46:13 +04:00
set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
findtype Exact IgnCase Regexp]
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 09:56:51 +04: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 15:46:13 +04:00
Comments Author Committer Files Pickaxe
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 09:56:51 +04: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 15:46:13 +04: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 16:08:22 +04:00
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04:00
panedwindow .ctop.cdet -orient horizontal
.ctop add .ctop.cdet
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
frame .ctop.cdet.left
set ctext .ctop.cdet.left.ctext
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04: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 07:04:20 +04:00
-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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-18 22:29:03 +04:00
$ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
if {$gaudydiff} {
$ctext tag conf hunksep -back blue -fore white
$ctext tag conf d0 -back "#ff8080"
$ctext tag conf d1 -back green
} else {
$ctext tag conf hunksep -fore blue
$ctext tag conf d0 -fore red
$ctext tag conf d1 -fore "#00a000"
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 07:15:47 +04:00
$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
$ctext tag conf mmax -fore darkgrey
set mergemax 5
$ctext tag conf mresult -font [concat $textfont bold]
$ctext tag conf msep -font [concat $textfont bold]
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-18 22:29:03 +04:00
$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 03:44:54 +04:00
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 02:51:00 +04:00
listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
-yscrollcommand ".ctop.cdet.right.sb set"
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 03:54:58 +04:00
bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
Use a panedwindow Make it cope with commits having parents that aren't listed.
2005-05-10 04:23:42 +04:00
pack .ctop -side top -fill both -expand 1
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 09:39:21 +04: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 16:14:42 +04:00
bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
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 16:08:22 +04:00
bindall <2> "allcanvs scan mark 0 %y"
bindall <B2-Motion> "allcanvs scan dragto 0 %y"
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 02:51:00 +04:00
bind . <Key-Up> "selnextline -1"
bind . <Key-Down> "selnextline 1"
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 16:14:42 +04:00
bind . <Key-Prior> "allcanvs yview scroll -1 pages"
bind . <Key-Next> "allcanvs yview scroll 1 pages"
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 03:23:07 +04:00
bindkey p "selnextline -1"
bindkey n "selnextline 1"
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 16:14:42 +04: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 15:46:13 +04: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 03:23:07 +04:00
bindkey ? findprev
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 16:35:53 +04:00
bindkey f nextfile
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 09:56:51 +04: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 15:46:13 +04: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 09:56:51 +04:00
bind . <Control-r> findprev
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 03:44:54 +04:00
bind $cflist <<ListboxSelect>> listboxsel
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04: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 03:23:07 +04: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 02:51:00 +04: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 11:35:37 +04: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 10:37:13 +04:00
bind $sha1entry <<PasteSelection>> clearsha1
Fix operation without libreadobj.so.0.0 Display a watch cursor when reading the commits initially
2005-06-16 14:54:04 +04: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 09:27:57 +04: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 04:12:26 +04: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 09:39:21 +04: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 13:27:32 +04:00
$rowctxmenu add command -label "Make patch" -command mkpatch
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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 03:47:48 +04: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 03:23:07 +04: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 11:35:37 +04: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 03:23:07 +04: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 11:35:37 +04: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 03:23:07 +04: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 11:35:37 +04: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 03:23:07 +04: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 11:35:37 +04: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 03:23:07 +04: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 11:35:37 +04:00
focus .
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04:00
}
proc savestuff {w} {
global canv canv2 canv3 ctext cflist mainfont textfont
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 03:52:16 +04:00
global stuffsaved findmergefiles gaudydiff maxgraphpct
Import the --topo-order change and fix the writing of ~/.gitk.
2005-07-28 07:16:51 +04:00
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04: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 03:23:07 +04:00
if {![winfo viewable .]} return
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04: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-18 22:29:03 +04:00
puts $f [list set mainfont $mainfont]
puts $f [list set textfont $textfont]
puts $f [list set findmergefiles $findmergefiles]
puts $f [list set gaudydiff $gaudydiff]
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 03:52:16 +04:00
puts $f [list set maxgraphpct $maxgraphpct]
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04:00
puts $f "set geometry(width) [winfo width .ctop]"
puts $f "set geometry(height) [winfo height .ctop]"
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 03:23:07 +04: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 03:54:58 +04: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 08:08:39 +04: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 03:19:18 +04:00
proc resizeclistpanes {win w} {
global oldwidth
if [info exists oldwidth($win)] {
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} {
set sash1 [expr $sash0 + 20]
}
if {$sash1 > $w - 10} {
set sash1 [expr $w - 10]
if {$sash0 > $sash1 - 20} {
set sash0 [expr $sash1 - 20]
}
}
}
$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
if [info exists oldwidth($win)] {
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} {
set sash0 [expr $w - 15]
}
}
$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 16:08:22 +04: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 03:46:16 +04:00
proc about {} {
set w .about
if {[winfo exists $w]} {
raise $w
return
}
toplevel $w
wm title $w "About gitk"
message $w.m -text {
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 09:39:21 +04:00
Gitk version 1.2
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 03:46:16 +04:00
Copyright <20> 2005 Paul Mackerras
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 09:39:21 +04: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 03:46:16 +04: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
}
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 03:44:54 +04:00
proc assigncolor {id} {
global commitinfo colormap commcolors colors nextcolor
global parents nparents children nchildren
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 13:53:32 +04:00
global cornercrossings crossings
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 03:44:54 +04:00
if [info exists colormap($id)] return
set ncolors [llength $colors]
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 04:25:38 +04:00
if {$nparents($id) <= 1 && $nchildren($id) == 1} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set child [lindex $children($id) 0]
if {[info exists colormap($child)]
&& $nparents($child) == 1} {
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 03:44:54 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 13:53:32 +04: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 03:44:54 +04: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 13:53:32 +04: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 03:44:54 +04: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 13:53:32 +04: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 03:44:54 +04: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 13:53:32 +04:00
set origbad $badcolors
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 13:53:32 +04:00
if {[llength $badcolors] < $ncolors - 1} {
foreach child $children($id) {
if {[info exists colormap($child)]
&& [lsearch -exact $badcolors $colormap($child)] < 0} {
lappend badcolors $colormap($child)
}
if {[info exists parents($child)]} {
foreach p $parents($child) {
if {[info exists colormap($p)]
&& [lsearch -exact $badcolors $colormap($p)] < 0} {
lappend badcolors $colormap($p)
}
}
}
}
if {[llength $badcolors] >= $ncolors} {
set badcolors $origbad
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 03:44:54 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 03:44:54 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 03:44:54 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
proc initgraph {} {
global canvy canvy0 lineno numcommits lthickness nextcolor linespc
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 04:25:38 +04:00
global mainline sidelines
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global nchildren ncleft
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
allcanvs delete all
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set nextcolor 0
set canvy $canvy0
set lineno -1
set numcommits 0
set lthickness [expr {int($linespc / 9) + 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 04:25:38 +04:00
catch {unset mainline}
catch {unset sidelines}
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 03:23:07 +04:00
foreach id [array names nchildren] {
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set ncleft($id) $nchildren($id)
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 04:01:38 +04: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 03:47:22 +04: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 04:01:38 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
proc drawcommitline {level} {
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 04:01:38 +04:00
global parents children nparents nchildren todo
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 03:52:16 +04:00
global canv canv2 canv3 mainfont namefont canvy linespc
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global lineid linehtag linentag linedtag commitinfo
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 04:01:38 +04:00
global colormap numcommits currentparents dupparents
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global oldlevel oldnlines oldtodo
global idtags idline idheads
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 04:25:38 +04:00
global lineno lthickness mainline sidelines
Add a menu item for creating tags.
2005-06-27 16:56:40 +04:00
global commitlisted rowtextx idpos
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
incr numcommits
incr lineno
set id [lindex $todo $level]
set lineid($lineno) $id
set idline($id) $lineno
set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
if {![info exists commitinfo($id)]} {
readcommit $id
if {![info exists commitinfo($id)]} {
set commitinfo($id) {"No commit information available"}
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 03:23:07 +04:00
set nparents($id) 0
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 04:25:38 +04:00
assigncolor $id
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set currentparents {}
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 04:01:38 +04:00
set dupparents {}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {[info exists commitlisted($id)] && [info exists parents($id)]} {
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 04:01:38 +04:00
foreach p $parents($id) {
if {[lsearch -exact $currentparents $p] < 0} {
lappend currentparents $p
} else {
# remember that this parent was listed twice
lappend dupparents $p
}
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
}
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 03:52:16 +04:00
set x [xcoord $level $level $lineno]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set y1 $canvy
set canvy [expr $canvy + $linespc]
allcanvs conf -scrollregion \
[list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
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 04:25:38 +04:00
if {[info exists mainline($id)]} {
lappend mainline($id) $x $y1
set t [$canv create line $mainline($id) \
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
-width $lthickness -fill $colormap($id)]
$canv lower $t
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 04:01:38 +04:00
bindline $t $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 09:56:51 +04: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 04:25:38 +04:00
if {[info exists sidelines($id)]} {
foreach ls $sidelines($id) {
set coords [lindex $ls 0]
set thick [lindex $ls 1]
set t [$canv create line $coords -fill $colormap($id) \
-width [expr {$thick * $lthickness}]]
$canv lower $t
bindline $t $id
}
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set orad [expr {$linespc / 3}]
set t [$canv create oval [expr $x - $orad] [expr $y1 - $orad] \
[expr $x + $orad - 1] [expr $y1 + $orad - 1] \
-fill $ofill -outline black -width 1]
$canv raise $t
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 09:39:21 +04:00
$canv bind $t <1> {selcanvline {} %x %y}
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 03:52:16 +04:00
set xt [xcoord [llength $todo] $level $lineno]
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 04:25:38 +04:00
if {[llength $currentparents] > 2} {
set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 09:39:21 +04:00
set rowtextx($lineno) $xt
Add a menu item for creating tags.
2005-06-27 16:56:40 +04:00
set idpos($id) [list $x $xt $y1]
if {[info exists idtags($id)] || [info exists idheads($id)]} {
set xt [drawtags $id $x $xt $y1]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
set headline [lindex $commitinfo($id) 0]
set name [lindex $commitinfo($id) 1]
set date [lindex $commitinfo($id) 2]
set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
-text $headline -font $mainfont ]
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 09:39:21 +04:00
$canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
-text $name -font $namefont]
set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
-text $date -font $mainfont]
}
Add a menu item for creating tags.
2005-06-27 16:56:40 +04:00
proc drawtags {id x xt y1} {
global idtags idheads
global linespc lthickness
global canv mainfont
set marks {}
set ntags 0
if {[info exists idtags($id)]} {
set marks $idtags($id)
set ntags [llength $marks]
}
if {[info exists idheads($id)]} {
set marks [concat $marks $idheads($id)]
}
if {$marks eq {}} {
return $xt
}
set delta [expr {int(0.5 * ($linespc - $lthickness))}]
set yt [expr $y1 - 0.5 * $linespc]
set yb [expr $yt + $linespc - 1]
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 {
set xl [expr $x + $delta]
set xr [expr $x + $delta + $wid + $lthickness]
if {[incr ntags -1] >= 0} {
# draw a tag
$canv create polygon $x [expr $yt + $delta] $xl $yt\
$xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
-width 1 -outline black -fill yellow -tags tag.$id
} else {
# draw a head
set xl [expr $xl - $delta/2]
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-width 1 -outline black -fill green -tags tag.$id
}
$canv create text $xl $y1 -anchor w -text $tag \
-font $mainfont -tags tag.$id
}
return $xt
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
proc updatetodo {level noshortcut} {
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 04:25:38 +04:00
global currentparents ncleft todo
global mainline oldlevel oldtodo oldnlines
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 03:52:16 +04:00
global canvy linespc mainline
global commitinfo lineno xspc1
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 04:25:38 +04:00
set oldlevel $level
set oldtodo $todo
set oldnlines [llength $todo]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {!$noshortcut && [llength $currentparents] == 1} {
set p [lindex $currentparents 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 04:25:38 +04:00
if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
set ncleft($p) 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 03:52:16 +04:00
set x [xcoord $level $level $lineno]
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 04:25:38 +04:00
set y [expr $canvy - $linespc]
set mainline($p) [list $x $y]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set todo [lreplace $todo $level $level $p]
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 03:52:16 +04:00
set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
return 0
Show heads as well as tags
2005-06-10 11:54:49 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
set todo [lreplace $todo $level $level]
set i $level
foreach p $currentparents {
incr ncleft($p) -1
set k [lsearch -exact $todo $p]
if {$k < 0} {
set todo [linsert $todo $i $p]
incr i
Show heads as well as tags
2005-06-10 11:54:49 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
return 1
}
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 13:53:32 +04:00
proc notecrossings {id lo hi corner} {
global oldtodo crossings cornercrossings
for {set i $lo} {[incr i] < $hi} {} {
set p [lindex $oldtodo $i]
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 03:52:16 +04: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 04:27:23 +04:00
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 03:52:16 +04:00
proc drawslants {level} {
global canv mainline sidelines canvx0 canvy xspc1 xspc2 lthickness
global oldlevel oldtodo todo currentparents dupparents
global lthickness linespc canvy colormap lineno geometry
global maxgraphpct
# decide on the line spacing for the next line
set lj [expr {$lineno + 1}]
set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
set n [llength $todo]
if {$n <= 1 || $canvx0 + $n * $xspc2 <= $maxw} {
set xspc1($lj) $xspc2
} else {
set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($n - 1)}]
if {$xspc1($lj) < $lthickness} {
set xspc1($lj) $lthickness
}
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set y1 [expr $canvy - $linespc]
set y2 $canvy
set i -1
foreach id $oldtodo {
incr i
if {$id == {}} continue
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 03:52:16 +04:00
set xi [xcoord $i $oldlevel $lineno]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$i == $oldlevel} {
foreach p $currentparents {
set j [lsearch -exact $todo $p]
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 04:01:38 +04:00
set coords [list $xi $y1]
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 03:52:16 +04:00
set xj [xcoord $j $level $lj]
if {$xj < $xi - $linespc} {
lappend coords [expr {$xj + $linespc}] $y1
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 13:53:32 +04:00
notecrossings $p $j $i [expr {$j + 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 03:52:16 +04:00
} elseif {$xj > $xi + $linespc} {
lappend coords [expr {$xj - $linespc}] $y1
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 13:53:32 +04:00
notecrossings $p $i $j [expr {$j - 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 04:01:38 +04:00
}
if {[lsearch -exact $dupparents $p] >= 0} {
# draw a double-width line to indicate the doubled parent
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
lappend coords $xj $y2
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 04:25:38 +04:00
lappend sidelines($p) [list $coords 2]
if {![info exists mainline($p)]} {
set mainline($p) [list $xj $y2]
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 04:01:38 +04:00
}
} else {
# normal case, no parent duplicated
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 03:52:16 +04:00
set yb $y2
set dx [expr {abs($xi - $xj)}]
if {0 && $dx < $linespc} {
set yb [expr {$y1 + $dx}]
}
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 04:25:38 +04:00
if {![info exists mainline($p)]} {
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 03:52:16 +04:00
if {$xi != $xj} {
lappend coords $xj $yb
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 04:01:38 +04: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 04:25:38 +04:00
set mainline($p) $coords
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 04:12:26 +04:00
} else {
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 03:52:16 +04:00
lappend coords $xj $yb
if {$yb < $y2} {
lappend coords $xj $y2
}
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 04:25:38 +04:00
lappend sidelines($p) [list $coords 1]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
Show heads as well as tags
2005-06-10 11:54:49 +04: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 11:35:37 +04:00
}
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 03:52:16 +04:00
} else {
set j $i
if {[lindex $todo $i] != $id} {
set j [lsearch -exact $todo $id]
}
if {$j != $i || $xspc1($lineno) != $xspc1($lj)
|| ($oldlevel <= $i && $i <= $level)
|| ($level <= $i && $i <= $oldlevel)} {
set xj [xcoord $j $level $lj]
set dx [expr {abs($xi - $xj)}]
set yb $y2
if {0 && $dx < $linespc} {
set yb [expr {$y1 + $dx}]
}
lappend mainline($id) $xi $y1 $xj $yb
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
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 07:38:29 +04:00
proc decidenext {{noread 0}} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global parents children nchildren ncleft todo
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 03:52:16 +04:00
global canv canv2 canv3 mainfont namefont canvy linespc
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global datemode cdate
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 07:38:29 +04:00
global commitinfo
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global currentparents oldlevel oldnlines oldtodo
global lineno lthickness
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
# remove the null entry if present
set nullentry [lsearch -exact $todo {}]
if {$nullentry >= 0} {
set todo [lreplace $todo $nullentry $nullentry]
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
# choose which one to do next time around
set todol [llength $todo]
set level -1
set latest {}
for {set k $todol} {[incr k -1] >= 0} {} {
set p [lindex $todo $k]
if {$ncleft($p) == 0} {
if {$datemode} {
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 07:38:29 +04:00
if {![info exists commitinfo($p)]} {
if {$noread} {
return {}
}
readcommit $p
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$latest == {} || $cdate($p) > $latest} {
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set level $k
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set latest $cdate($p)
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
} else {
set level $k
break
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
if {$level < 0} {
if {$todo != {}} {
puts "ERROR: none of the pending commits can be done yet:"
foreach p $todo {
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 04:25:38 +04:00
puts " $p ($ncleft($p))"
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
return -1
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
# If we are reducing, put in a null entry
if {$todol < $oldnlines} {
if {$nullentry >= 0} {
set i $nullentry
while {$i < $todol
&& [lindex $oldtodo $i] == [lindex $todo $i]} {
incr i
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
} else {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set i $oldlevel
if {$level >= $i} {
incr i
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$i < $todol} {
set todo [linsert $todo $i {}]
if {$level >= $i} {
incr level
}
}
}
return $level
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
proc drawcommit {id} {
global phase todo nchildren datemode nextupdate
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 16:50:28 +04:00
global startcommits numcommits ncmupdate
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$phase != "incrdraw"} {
set phase incrdraw
set todo $id
set startcommits $id
initgraph
drawcommitline 0
updatetodo 0 $datemode
} else {
if {$nchildren($id) == 0} {
lappend todo $id
lappend startcommits $id
}
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 07:38:29 +04:00
set level [decidenext 1]
if {$level == {} || $id != [lindex $todo $level]} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
return
}
while 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 03:52:16 +04:00
drawslants $level
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
drawcommitline $level
if {[updatetodo $level $datemode]} {
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 07:38:29 +04:00
set level [decidenext 1]
if {$level == {}} break
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set id [lindex $todo $level]
if {![info exists commitlisted($id)]} {
break
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
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 16:50:28 +04:00
if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate} {
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
doupdate
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 16:50:28 +04:00
set ncmupdate $numcommits
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$stopped} break
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
}
}
proc finishcommits {} {
global phase
global startcommits
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 07:38:29 +04:00
global canv mainfont ctext maincursor textcursor
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$phase != "incrdraw"} {
$canv delete all
$canv create text 3 3 -anchor nw -text "No commits selected" \
-font $mainfont -tags textitems
set 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 07:38:29 +04:00
} else {
set level [decidenext]
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 03:52:16 +04:00
drawslants $level
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 07:38:29 +04:00
drawrest $level [llength $startcommits]
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
Fix operation without libreadobj.so.0.0 Display a watch cursor when reading the commits initially
2005-06-16 14:54:04 +04:00
. 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 09:27:57 +04:00
settextcursor $textcursor
}
# 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 04:27:23 +04:00
}
proc drawgraph {} {
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 16:50:28 +04:00
global nextupdate startmsecs startcommits todo ncmupdate
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$startcommits == {}} return
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
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 16:50:28 +04:00
set ncmupdate 0
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
initgraph
set todo [lindex $startcommits 0]
drawrest 0 1
}
proc drawrest {level startix} {
global phase stopped redisplaying selectedline
global datemode currentparents todo
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 16:50:28 +04:00
global numcommits ncmupdate
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global nextupdate startmsecs startcommits idline
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 04:01:38 +04:00
if {$level >= 0} {
set phase drawgraph
set startid [lindex $startcommits $startix]
set startline -1
if {$startid != {}} {
set startline $idline($startid)
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04: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 04:01:38 +04:00
while 1 {
if {$stopped} break
drawcommitline $level
set hard [updatetodo $level $datemode]
if {$numcommits == $startline} {
lappend todo $startid
set hard 1
incr startix
set startid [lindex $startcommits $startix]
set startline -1
if {$startid != {}} {
set startline $idline($startid)
}
}
if {$hard} {
set level [decidenext]
if {$level < 0} break
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 03:52:16 +04:00
drawslants $level
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 04:01:38 +04:00
}
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 16:50:28 +04:00
if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
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 04:01:38 +04:00
update
incr nextupdate 100
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 16:50:28 +04:00
set ncmupdate $numcommits
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 04:01:38 +04:00
}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set phase {}
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
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 04:12:26 +04:00
#puts "overall $drawmsecs ms for $numcommits commits"
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
if {$redisplaying} {
if {$stopped == 0 && [info exists selectedline]} {
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 16:06:06 +04:00
selectline $selectedline 0
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
}
if {$stopped == 1} {
set stopped 0
after idle drawgraph
} else {
set redisplaying 0
}
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 03:23:07 +04: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} {
lappend matches [list $j [expr $j+$foundstrlen-1]]
set i [expr $j + $foundstrlen]
}
}
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 09:56:51 +04:00
proc dofind {} {
global findtype findloc findstring markedmatches commitinfo
global numcommits lineid linehtag linentag linedtag
global mainfont namefont canv canv2 canv3 selectedline
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
global matchinglines foundstring foundstrlen
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 15:46:13 +04: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 09:56:51 +04: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 03:23:07 +04: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 09:56:51 +04: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 15:46:13 +04: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 09:56:51 +04: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 03:23:07 +04: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 09:56:51 +04: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 03:23:07 +04: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 09:56:51 +04: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 03:23:07 +04:00
set foundstrlen [string length $findstring]
if {$foundstrlen == 0} return
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 15:46:13 +04: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 09:56:51 +04: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 15:46:13 +04:00
set fldtypes {Headline Author Date Committer CDate Comment}
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 09:56:51 +04:00
for {set l 0} {$l < $numcommits} {incr l} {
set id $lineid($l)
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 03:23:07 +04: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 09:56:51 +04:00
if {$matches == {}} continue
set doesmatch 1
if {$ty == "Headline"} {
markmatches $canv $l $f $linehtag($l) $matches $mainfont
} elseif {$ty == "Author"} {
markmatches $canv2 $l $f $linentag($l) $matches $namefont
} elseif {$ty == "Date"} {
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 03:23:07 +04: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 09:56:51 +04: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 03:23:07 +04: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 16:06:06 +04: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 03:23:07 +04: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]
set end [expr [lindex $match 1] + 1]
$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 09:56:51 +04: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 15:46:13 +04: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 09:56:51 +04: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 15:46:13 +04: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 09:56:51 +04: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 03:23:07 +04: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 09:56:51 +04: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 03:23:07 +04: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 09:56:51 +04: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 15:46:13 +04: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 09:27:57 +04: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 15:46:13 +04:00
}
}
}
proc findpatches {} {
global findstring selectedline numcommits
global findprocpid findprocfile
global finddidsel ctext lineid 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 05:53:55 +04: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 15:46:13 +04: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
}
append inputids $lineid($l) "\n"
}
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 05:53:55 +04: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 15:46:13 +04: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 09:27:57 +04: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 15:46:13 +04:00
set findinprogress 1
}
proc readfindproc {} {
global findprocfile finddidsel
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 05:53:55 +04:00
global idline 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 15:46:13 +04: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
}
if {![info exists idline($id)]} {
puts stderr "spurious id: $id"
return
}
set l $idline($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 05:53:55 +04: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 15:46:13 +04:00
if {!$finddidsel} {
findselectline $l
set finddidsel 1
}
}
proc findfiles {} {
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 05:53:55 +04:00
global selectedline numcommits lineid ctext
global ffileline finddidsel parents nparents
global findinprogress findstartline findinsertpos
global treediffs fdiffids fdiffsneeded fdiffpos
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 15:46:13 +04: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 05:53:55 +04:00
set diffsneeded {}
set fdiffsneeded {}
while 1 {
set id $lineid($l)
if {$findmergefiles || $nparents($id) == 1} {
foreach p $parents($id) {
if {![info exists treediffs([list $id $p])]} {
append diffsneeded "$id $p\n"
lappend fdiffsneeded [list $id $p]
}
}
}
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
}
catch {unset fdiffids}
set fdiffpos 0
fconfigure $df -blocking 0
fileevent $df readable [list readfilediffs $df]
}
set finddidsel 0
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 15:46:13 +04:00
set id $lineid($l)
set p [lindex $parents($id) 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 09:27:57 +04: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 15:46:13 +04:00
set findinprogress 1
findcont [list $id $p]
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 05:53:55 +04:00
update
}
proc readfilediffs {df} {
global findids fdiffids fdiffs
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"
} elseif {[info exists findids]} {
set ids $findids
stopfindproc
bell
error_popup "Couldn't find diffs for {$ids}"
}
}
return
}
if {[regexp {^([0-9a-f]{40}) \(from ([0-9a-f]{40})\)} $line match id p]} {
# start of a new string of diffs
donefilediff
set fdiffids [list $id $p]
set fdiffs {}
} elseif {[string match ":*" $line]} {
lappend fdiffs [lindex $line 5]
}
}
proc donefilediff {} {
global fdiffids fdiffs treediffs findids
global fdiffsneeded fdiffpos
if {[info exists fdiffids]} {
while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
&& $fdiffpos < [llength $fdiffsneeded]} {
# git-diff-tree doesn't output anything for a commit
# which doesn't change anything
set nullids [lindex $fdiffsneeded $fdiffpos]
set treediffs($nullids) {}
if {[info exists findids] && $nullids eq $findids} {
unset findids
findcont $nullids
}
incr fdiffpos
}
incr fdiffpos
if {![info exists treediffs($fdiffids)]} {
set treediffs($fdiffids) $fdiffs
}
if {[info exists findids] && $fdiffids eq $findids} {
unset findids
findcont $fdiffids
}
}
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 15:46:13 +04:00
}
proc findcont {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 17:13:46 +04:00
global findids treediffs parents nparents
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 15:46:13 +04:00
global ffileline findstartline finddidsel
global lineid numcommits matchinglines findinprogress
global findmergefiles
set id [lindex $ids 0]
set p [lindex $ids 1]
set pi [lsearch -exact $parents($id) $p]
set l $ffileline
while 1 {
if {$findmergefiles || $nparents($id) == 1} {
if {![info exists treediffs($ids)]} {
set findids $ids
set ffileline $l
return
}
set doesmatch 0
foreach f $treediffs($ids) {
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 05:53:55 +04: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 15:46:13 +04:00
set pi $nparents($id)
}
} else {
set pi $nparents($id)
}
if {[incr pi] >= $nparents($id)} {
set pi 0
if {[incr l] >= $numcommits} {
set l 0
}
if {$l == $findstartline} break
set id $lineid($l)
}
set p [lindex $parents($id) $pi]
set ids [list $id $p]
}
stopfindproc
if {!$finddidsel} {
bell
}
}
# mark a commit as matching by putting a yellow background
# behind the headline
proc markheadline {l id} {
global canv mainfont linehtag commitinfo
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 09:56:51 +04: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
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 \
-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 15:46:13 +04: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 09:56:51 +04: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 15:46:13 +04: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 09:56:51 +04: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 09:39:21 +04: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 03:47:22 +04:00
global canv canvy0 ctext linespc
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 09:39:21 +04:00
global lineid linehtag linentag linedtag rowtextx
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 16:14:42 +04:00
if {$ymax == {}} return
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 09:39:21 +04: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 09:56:51 +04: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 16:06:06 +04:00
selectline $l 1
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04: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 07:04:20 +04:00
proc commit_descriptor {p} {
global commitinfo
set l "..."
if {[info exists commitinfo($p)]} {
set l [lindex $commitinfo($p) 0]
}
return "$p ($l)"
}
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 16:06:06 +04:00
proc selectline {l isnew} {
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
[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 07:04:20 +04:00
global canvy0 linespc parents nparents children nchildren
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 05:53:55 +04:00
global cflist currentid sha1entry
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 16:06:06 +04:00
global commentend idtags idline
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 04:12:26 +04:00
$canv delete hover
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
$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
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04: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 02:51:00 +04: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 14:56:42 +04: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 05:02:55 +04:00
set wnow [$canv yview]
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 14:56:42 +04:00
set wtop [expr [lindex $wnow 0] * $ymax]
set wbot [expr [lindex $wnow 1] * $ymax]
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 02:51:00 +04: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 14:56:42 +04: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 02:51:00 +04: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 14:56:42 +04: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 02:51:00 +04: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 14:56:42 +04:00
}
if {$newtop != $wtop} {
if {$newtop < 0} {
set newtop 0
}
allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04: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 16:06:06 +04: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 03:47:22 +04: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 16:06:06 +04:00
}
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04:00
set selectedline $l
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
set id $lineid($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 11:35:37 +04: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 09:56:51 +04: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 05:02:55 +04:00
$ctext conf -state normal
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
$ctext delete 0.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 09:39:21 +04: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 08:08:39 +04:00
set info $commitinfo($id)
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
$ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
$ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\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 11:35:37 +04: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 00:58:56 +04: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 16:06:06 +04:00
set commentstart [$ctext index "end - 1c"]
[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 00:58:56 +04:00
set comment {}
[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 07:04:20 +04:00
if {[info exists parents($id)]} {
foreach p $parents($id) {
append comment "Parent: [commit_descriptor $p]\n"
}
}
if {[info exists children($id)]} {
foreach c $children($id) {
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 00:58:56 +04: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 16:06:06 +04:00
$ctext insert end $comment
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 03:44:54 +04:00
$ctext insert end "\n"
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 16:06:06 +04:00
# make anything that looks like a SHA1 ID be a clickable link
set links [regexp -indices -all -inline {[0-9a-f]{40}} $comment]
set i 0
foreach l $links {
set s [lindex $l 0]
set e [lindex $l 1]
set linkid [string range $comment $s $e]
if {![info exists idline($linkid)]} continue
incr e
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 09:27:57 +04:00
$ctext tag add link "$commentstart + $s c" "$commentstart + $e c"
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 16:06:06 +04:00
$ctext tag add link$i "$commentstart + $s c" "$commentstart + $e c"
$ctext tag bind link$i <1> [list selectline $idline($linkid) 1]
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 09:27:57 +04:00
incr i
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 16:06:06 +04:00
}
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 09:27:57 +04: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 }
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 16:06:06 +04: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 03:44:54 +04: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 03:23:07 +04:00
$ctext tag remove found 1.0 end
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04: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 03:23:07 +04:00
set commentend [$ctext index "end - 1c"]
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04: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 09:39:21 +04:00
$cflist insert end "Comments"
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 17:13:46 +04:00
if {$nparents($id) == 1} {
startdiff [concat $id $parents($id)]
} elseif {$nparents($id) > 1} {
mergediff $id
}
}
proc selnextline {dir} {
global selectedline
if {![info exists selectedline]} return
set l [expr $selectedline + $dir]
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 16:06:06 +04:00
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 03:47:22 +04: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 16:06:06 +04: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 03:47:22 +04: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 16:06:06 +04: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 03:47:22 +04: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 16:06:06 +04: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 03:47:22 +04: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 16:06:06 +04: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 11:39:44 +04: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 17:13:46 +04:00
proc mergediff {id} {
global parents diffmergeid diffmergegca mergefilelist diffpindex
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 11:39:44 +04: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 17:13:46 +04:00
set diffmergeid $id
set diffpindex -1
set diffmergegca [findgca $parents($id)]
if {[info exists mergefilelist($id)]} {
Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
2005-07-31 15:35:21 +04:00
if {$mergefilelist($id) ne {}} {
showmergediff
}
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 17:13:46 +04:00
} else {
contmergediff {}
}
}
proc findgca {ids} {
set gca {}
foreach id $ids {
if {$gca eq {}} {
set gca $id
} else {
if {[catch {
set gca [exec git-merge-base $gca $id]
} err]} {
return {}
}
}
}
return $gca
}
proc contmergediff {ids} {
global diffmergeid diffpindex parents nparents diffmergegca
Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
2005-07-31 15:35:21 +04:00
global treediffs mergefilelist diffids 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 17:13:46 +04:00
# diff the child against each of the parents, and diff
# each of the parents against the GCA.
while 1 {
if {[lindex $ids 0] == $diffmergeid && $diffmergegca ne {}} {
set ids [list [lindex $ids 1] $diffmergegca]
} else {
if {[incr diffpindex] >= $nparents($diffmergeid)} break
set p [lindex $parents($diffmergeid) $diffpindex]
set ids [list $diffmergeid $p]
}
if {![info exists treediffs($ids)]} {
set diffids $ids
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 07:15:47 +04:00
if {![info exists treepending]} {
gettreediffs $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 17:13:46 +04:00
return
}
}
# If a file in some parent is different from the child and also
# different from the GCA, then it's interesting.
# If we don't have a GCA, then a file is interesting if it is
# different from the child in all the parents.
if {$diffmergegca ne {}} {
set files {}
foreach p $parents($diffmergeid) {
set gcadiffs $treediffs([list $p $diffmergegca])
foreach f $treediffs([list $diffmergeid $p]) {
if {[lsearch -exact $files $f] < 0
&& [lsearch -exact $gcadiffs $f] >= 0} {
lappend files $f
}
}
}
set files [lsort $files]
} else {
set p [lindex $parents($diffmergeid) 0]
set files $treediffs([list $diffmergeid $p])
for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
set p [lindex $parents($diffmergeid) $i]
set df $treediffs([list $diffmergeid $p])
set nf {}
foreach f $files {
if {[lsearch -exact $df $f] >= 0} {
lappend nf $f
}
}
set files $nf
}
}
set mergefilelist($diffmergeid) $files
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 07:15:47 +04:00
if {$files ne {}} {
showmergediff
}
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 17:13:46 +04:00
}
proc showmergediff {} {
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 07:15:47 +04:00
global cflist diffmergeid mergefilelist parents
Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
2005-07-31 15:35:21 +04:00
global diffopts diffinhunk currentfile currenthunk filelines
global diffblocked groupfilelast mergefds groupfilenum grouphunks
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 17:13:46 +04:00
set files $mergefilelist($diffmergeid)
foreach f $files {
$cflist insert end $f
}
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 07:15:47 +04:00
set env(GIT_DIFF_OPTS) $diffopts
set flist {}
catch {unset currentfile}
catch {unset currenthunk}
catch {unset filelines}
Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
2005-07-31 15:35:21 +04:00
catch {unset groupfilenum}
catch {unset grouphunks}
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 07:15:47 +04:00
set groupfilelast -1
foreach p $parents($diffmergeid) {
set cmd [list | git-diff-tree -p $p $diffmergeid]
set cmd [concat $cmd $mergefilelist($diffmergeid)]
if {[catch {set f [open $cmd r]} err]} {
error_popup "Error getting diffs: $err"
foreach f $flist {
catch {close $f}
}
return
}
lappend flist $f
set ids [list $diffmergeid $p]
set mergefds($ids) $f
set diffinhunk($ids) 0
set diffblocked($ids) 0
fconfigure $f -blocking 0
fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
}
}
proc getmergediffline {f ids id} {
global diffmergeid diffinhunk diffoldlines diffnewlines
global currentfile currenthunk
global diffoldstart diffnewstart diffoldlno diffnewlno
global diffblocked mergefilelist
global noldlines nnewlines difflcounts filelines
set n [gets $f line]
if {$n < 0} {
if {![eof $f]} return
}
if {!([info exists diffmergeid] && $diffmergeid == $id)} {
if {$n < 0} {
close $f
}
return
}
if {$diffinhunk($ids) != 0} {
set fi $currentfile($ids)
if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
# continuing an existing hunk
set line [string range $line 1 end]
set p [lindex $ids 1]
if {$match eq "-" || $match eq " "} {
set filelines($p,$fi,$diffoldlno($ids)) $line
incr diffoldlno($ids)
}
if {$match eq "+" || $match eq " "} {
set filelines($id,$fi,$diffnewlno($ids)) $line
incr diffnewlno($ids)
}
if {$match eq " "} {
if {$diffinhunk($ids) == 2} {
lappend difflcounts($ids) \
[list $noldlines($ids) $nnewlines($ids)]
set noldlines($ids) 0
set diffinhunk($ids) 1
}
incr noldlines($ids)
} elseif {$match eq "-" || $match eq "+"} {
if {$diffinhunk($ids) == 1} {
lappend difflcounts($ids) [list $noldlines($ids)]
set noldlines($ids) 0
set nnewlines($ids) 0
set diffinhunk($ids) 2
}
if {$match eq "-"} {
incr noldlines($ids)
} else {
incr nnewlines($ids)
}
}
# and if it's \ No newline at end of line, then what?
return
}
# end of a hunk
if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
lappend difflcounts($ids) [list $noldlines($ids)]
} elseif {$diffinhunk($ids) == 2
&& ($noldlines($ids) != 0 || $nnewlines($ids) != 0)} {
lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
}
set currenthunk($ids) [list $currentfile($ids) \
$diffoldstart($ids) $diffnewstart($ids) \
$diffoldlno($ids) $diffnewlno($ids) \
$difflcounts($ids)]
set diffinhunk($ids) 0
# -1 = need to block, 0 = unblocked, 1 = is blocked
set diffblocked($ids) -1
processhunks
if {$diffblocked($ids) == -1} {
fileevent $f readable {}
set diffblocked($ids) 1
}
}
if {$n < 0} {
# eof
if {!$diffblocked($ids)} {
close $f
set currentfile($ids) [llength $mergefilelist($diffmergeid)]
set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
processhunks
}
} elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
# start of a new file
set currentfile($ids) \
[lsearch -exact $mergefilelist($diffmergeid) $fname]
} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} {
if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
# start of a new hunk
if {$f1l == 0 && $f1c == 0} {
set f1l 1
}
if {$f2l == 0 && $f2c == 0} {
set f2l 1
}
set diffinhunk($ids) 1
set diffoldstart($ids) $f1l
set diffnewstart($ids) $f2l
set diffoldlno($ids) $f1l
set diffnewlno($ids) $f2l
set difflcounts($ids) {}
set noldlines($ids) 0
set nnewlines($ids) 0
}
}
}
proc processhunks {} {
global diffmergeid parents nparents currenthunk
global mergefilelist diffblocked mergefds
global grouphunks grouplinestart grouplineend groupfilenum
set nfiles [llength $mergefilelist($diffmergeid)]
while 1 {
set fi $nfiles
set lno 0
# look for the earliest hunk
foreach p $parents($diffmergeid) {
set ids [list $diffmergeid $p]
if {![info exists currenthunk($ids)]} return
set i [lindex $currenthunk($ids) 0]
set l [lindex $currenthunk($ids) 2]
if {$i < $fi || ($i == $fi && $l < $lno)} {
set fi $i
set lno $l
set pi $p
}
}
if {$fi < $nfiles} {
set ids [list $diffmergeid $pi]
set hunk $currenthunk($ids)
unset currenthunk($ids)
if {$diffblocked($ids) > 0} {
fileevent $mergefds($ids) readable \
[list getmergediffline $mergefds($ids) $ids $diffmergeid]
}
set diffblocked($ids) 0
if {[info exists groupfilenum] && $groupfilenum == $fi
&& $lno <= $grouplineend} {
# add this hunk to the pending group
lappend grouphunks($pi) $hunk
set endln [lindex $hunk 4]
if {$endln > $grouplineend} {
set grouplineend $endln
}
continue
}
}
# succeeding stuff doesn't belong in this group, so
# process the group now
if {[info exists groupfilenum]} {
processgroup
unset groupfilenum
unset grouphunks
}
if {$fi >= $nfiles} break
# start a new group
set groupfilenum $fi
set grouphunks($pi) [list $hunk]
set grouplinestart $lno
set grouplineend [lindex $hunk 4]
}
}
proc processgroup {} {
global groupfilelast groupfilenum difffilestart
global mergefilelist diffmergeid ctext filelines
global parents diffmergeid diffoffset
global grouphunks grouplinestart grouplineend nparents
global mergemax
$ctext conf -state normal
set id $diffmergeid
set f $groupfilenum
if {$groupfilelast != $f} {
$ctext insert end "\n"
set here [$ctext index "end - 1c"]
set difffilestart($f) $here
set mark fmark.[expr {$f + 1}]
$ctext mark set $mark $here
$ctext mark gravity $mark left
set header [lindex $mergefilelist($id) $f]
set l [expr {(78 - [string length $header]) / 2}]
set pad [string range "----------------------------------------" 1 $l]
$ctext insert end "$pad $header $pad\n" filesep
set groupfilelast $f
foreach p $parents($id) {
set diffoffset($p) 0
}
}
$ctext insert end "@@" msep
set nlines [expr {$grouplineend - $grouplinestart}]
set events {}
set pnum 0
foreach p $parents($id) {
set startline [expr {$grouplinestart + $diffoffset($p)}]
set ol $startline
set nl $grouplinestart
if {[info exists grouphunks($p)]} {
foreach h $grouphunks($p) {
set l [lindex $h 2]
if {$nl < $l} {
for {} {$nl < $l} {incr nl} {
set filelines($p,$f,$ol) $filelines($id,$f,$nl)
incr ol
}
}
foreach chunk [lindex $h 5] {
if {[llength $chunk] == 2} {
set olc [lindex $chunk 0]
set nlc [lindex $chunk 1]
set nnl [expr {$nl + $nlc}]
lappend events [list $nl $nnl $pnum $olc $nlc]
incr ol $olc
set nl $nnl
} else {
incr ol [lindex $chunk 0]
incr nl [lindex $chunk 0]
}
}
}
}
if {$nl < $grouplineend} {
for {} {$nl < $grouplineend} {incr nl} {
set filelines($p,$f,$ol) $filelines($id,$f,$nl)
incr ol
}
}
set nlines [expr {$ol - $startline}]
$ctext insert end " -$startline,$nlines" msep
incr pnum
}
set nlines [expr {$grouplineend - $grouplinestart}]
$ctext insert end " +$grouplinestart,$nlines @@\n" msep
set events [lsort -integer -index 0 $events]
set nevents [llength $events]
set nmerge $nparents($diffmergeid)
set l $grouplinestart
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 18:23:03 +04:00
for {set i 0} {$i < $nevents} {set i $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 07:15:47 +04:00
set nl [lindex $events $i 0]
while {$l < $nl} {
$ctext insert end " $filelines($id,$f,$l)\n"
incr l
}
set e [lindex $events $i]
set enl [lindex $e 1]
set j $i
set active {}
while 1 {
set pnum [lindex $e 2]
set olc [lindex $e 3]
set nlc [lindex $e 4]
if {![info exists delta($pnum)]} {
set delta($pnum) [expr {$olc - $nlc}]
lappend active $pnum
} else {
incr delta($pnum) [expr {$olc - $nlc}]
}
if {[incr j] >= $nevents} break
set e [lindex $events $j]
if {[lindex $e 0] >= $enl} break
if {[lindex $e 1] > $enl} {
set enl [lindex $e 1]
}
}
set nlc [expr {$enl - $l}]
set ncol mresult
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 18:23:03 +04:00
set bestpn -1
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 07:15:47 +04:00
if {[llength $active] == $nmerge - 1} {
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 18:23:03 +04:00
# no diff for one of the parents, i.e. it's identical
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 07:15:47 +04:00
for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
if {![info exists delta($pnum)]} {
if {$pnum < $mergemax} {
lappend ncol m$pnum
} else {
lappend ncol mmax
}
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 18:23:03 +04:00
} elseif {[llength $active] == $nmerge} {
# all parents are different, see if one is very similar
set bestsim 30
for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
set sim [similarity $pnum $l $nlc $f \
[lrange $events $i [expr {$j-1}]]]
if {$sim > $bestsim} {
set bestsim $sim
set bestpn $pnum
}
}
if {$bestpn >= 0} {
lappend ncol m$bestpn
}
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 07:15:47 +04:00
}
set pnum -1
foreach p $parents($id) {
incr pnum
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 18:23:03 +04:00
if {![info exists delta($pnum)] || $pnum == $bestpn} continue
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 07:15:47 +04:00
set olc [expr {$nlc + $delta($pnum)}]
set ol [expr {$l + $diffoffset($p)}]
incr diffoffset($p) $delta($pnum)
unset delta($pnum)
for {} {$olc > 0} {incr olc -1} {
$ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
incr ol
}
}
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 18:23:03 +04:00
set endl [expr {$l + $nlc}]
if {$bestpn >= 0} {
# show this pretty much as a normal diff
set p [lindex $parents($id) $bestpn]
set ol [expr {$l + $diffoffset($p)}]
incr diffoffset($p) $delta($bestpn)
unset delta($bestpn)
for {set k $i} {$k < $j} {incr k} {
set e [lindex $events $k]
if {[lindex $e 2] != $bestpn} continue
set nl [lindex $e 0]
set ol [expr {$ol + $nl - $l}]
for {} {$l < $nl} {incr l} {
$ctext insert end "+$filelines($id,$f,$l)\n" $ncol
}
set c [lindex $e 3]
for {} {$c > 0} {incr c -1} {
$ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
incr ol
}
set nl [lindex $e 1]
for {} {$l < $nl} {incr l} {
$ctext insert end "+$filelines($id,$f,$l)\n" mresult
}
}
}
for {} {$l < $endl} {incr l} {
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 07:15:47 +04:00
$ctext insert end "+$filelines($id,$f,$l)\n" $ncol
}
}
while {$l < $grouplineend} {
$ctext insert end " $filelines($id,$f,$l)\n"
incr l
}
$ctext conf -state disabled
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 03:44:54 +04:00
}
Display the list of changed files in a listbox pane.
2005-05-10 05:02:55 +04:00
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 18:23:03 +04:00
proc similarity {pnum l nlc f events} {
global diffmergeid parents diffoffset filelines
set id $diffmergeid
set p [lindex $parents($id) $pnum]
set ol [expr {$l + $diffoffset($p)}]
set endl [expr {$l + $nlc}]
set same 0
set diff 0
foreach e $events {
if {[lindex $e 2] != $pnum} continue
set nl [lindex $e 0]
set ol [expr {$ol + $nl - $l}]
for {} {$l < $nl} {incr l} {
incr same [string length $filelines($id,$f,$l)]
incr same
}
set oc [lindex $e 3]
for {} {$oc > 0} {incr oc -1} {
incr diff [string length $filelines($p,$f,$ol)]
incr diff
incr ol
}
set nl [lindex $e 1]
for {} {$l < $nl} {incr l} {
incr diff [string length $filelines($id,$f,$l)]
incr diff
}
}
for {} {$l < $endl} {incr l} {
incr same [string length $filelines($id,$f,$l)]
incr same
}
if {$same == 0} {
return 0
}
return [expr {200 * $same / (2 * $same + $diff)}]
}
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 17:13:46 +04: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 09:39:21 +04: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 19:11:44 +04: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 17:13:46 +04: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 05:53:55 +04: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 09:39:21 +04: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 05:53:55 +04: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 09:39:21 +04: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 05:53:55 +04: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 09:39:21 +04: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 17:13:46 +04: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 09:39:21 +04:00
foreach f $treediffs($ids) {
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 09:39:21 +04:00
getblobdiffs $ids
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 09:39:21 +04:00
proc gettreediffs {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 17:13:46 +04:00
global treediff parents 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 09:39:21 +04: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 17:13:46 +04:00
set treediff {}
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 09:39:21 +04:00
set id [lindex $ids 0]
set p [lindex $ids 1]
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
if [catch {set gdtf [open "|git-diff-tree -r $p $id" r]}] return
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 17:13:46 +04:00
fileevent $gdtf readable [list gettreediffline $gdtf $ids]
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 09:39:21 +04: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 17:13:46 +04:00
global treediff treediffs treepending diffids diffmergeid
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 17:13:46 +04:00
set treediffs($ids) $treediff
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 17:13:46 +04:00
if {$ids != $diffids} {
gettreediffs $diffids
} else {
if {[info exists diffmergeid]} {
contmergediff $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 15:46:13 +04:00
} else {
addtocflist $ids
}
}
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04:00
return
}
cope with changed git-diff-tree output format
2005-06-01 04:02:13 +04: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 17:13:46 +04:00
lappend treediff $file
Make getting file lists asynchronous Add some scrollbars
2005-05-11 04:45:38 +04: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 09:39:21 +04: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 17:13:46 +04:00
global diffopts blobdifffd diffids env curdifftag curtagstart
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04: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 09:39:21 +04:00
set id [lindex $ids 0]
set p [lindex $ids 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 03:44:54 +04:00
set env(GIT_DIFF_OPTS) $diffopts
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 17:13:46 +04:00
set cmd [list | git-diff-tree -r -p -C $p $id]
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 03:44:54 +04: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 19:11:44 +04: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 03:44:54 +04: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 09:39:21 +04: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 17:13:46 +04: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 09:39:21 +04: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 03:44:54 +04: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 09:39:21 +04: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 19:11:44 +04:00
global diffids blobdifffd ctext curdifftag curtagstart
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04:00
global diffnexthead diffnextnote difffilestart
global nextupdate diffinhdr treediffs
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-18 22:29:03 +04:00
global gaudydiff
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 09:39:21 +04: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 03:44:54 +04: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 11:39:44 +04: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 03:44:54 +04: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 11:39:44 +04: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 03:44:54 +04:00
return
}
$ctext conf -state normal
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04: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 03:44:54 +04: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-20 20:25:54 +04: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 09:39:21 +04:00
set here [$ctext index "end - 1c"]
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04: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 03:44:54 +04: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 14:56:42 +04: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 03:44:54 +04: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 14:56:42 +04: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 19:11:44 +04:00
set diffinhdr 1
} elseif {[regexp {^(---|\+\+\+)} $line]} {
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 03:44:54 +04:00
} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} {
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-18 22:29:03 +04:00
if {$gaudydiff} {
$ctext insert end "\t" hunksep
$ctext insert end " $f1l " d0 " $f2l " d1
$ctext insert end " $rest \n" hunksep
} else {
$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 19:11:44 +04: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 03:44:54 +04:00
} else {
set x [string range $line 0 0]
if {$x == "-" || $x == "+"} {
set tag [expr {$x == "+"}]
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-18 22:29:03 +04:00
if {$gaudydiff} {
set line [string range $line 1 end]
}
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 03:44:54 +04:00
$ctext insert end "$line\n" d$tag
} elseif {$x == " "} {
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-18 22:29:03 +04:00
if {$gaudydiff} {
set line [string range $line 1 end]
}
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 03:44:54 +04:00
$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 19:11:44 +04: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 14:56:42 +04: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 03:44:54 +04: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 09:39:21 +04: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 03:44:54 +04:00
}
Accommodate new git-diff-tree output format Add 'f' key for moving to next file
2005-05-19 16:35:53 +04: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-20 20:25:54 +04: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 16:35:53 +04:00
}
}
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04: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 16:35:53 +04: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 03:44:54 +04:00
proc listboxsel {} {
Handle the rename cases reported by git-diff-tree -C correctly.
2005-07-20 20:25:54 +04: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 03:46:16 +04: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 09:39:21 +04: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 08:08:39 +04:00
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
proc setcoords {} {
global linespc charspc canvx0 canvy0 mainfont
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 03:52:16 +04:00
global xspc1 xspc2
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set linespc [font metrics $mainfont -linespace]
set charspc [font measure $mainfont "m"]
set canvy0 [expr 3 + 0.5 * $linespc]
set canvx0 [expr 3 + 0.5 * $linespc]
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 03:52:16 +04: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 03:46:16 +04:00
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
proc redisplay {} {
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 03:47:22 +04:00
global stopped redisplaying phase
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
if {$stopped > 1} return
if {$phase == "getcommits"} return
set redisplaying 1
Restructure to do incremental drawing Some speedups from not doing update so often
2005-06-16 04:27:23 +04:00
if {$phase == "drawgraph" || $phase == "incrdraw"} {
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set stopped 1
} else {
drawgraph
}
}
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 03:47:22 +04: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 16:14:42 +04:00
global stopped entries
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 11:35:37 +04: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 16:55:47 +04:00
if {$phase == "getcommits"} {
$canv itemconf textitems -font $mainfont
}
redisplay
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04: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 10:37:13 +04: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 11:35:37 +04: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 {} {
global sha1string currentid idline tagids
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-18 20:16:35 +04:00
global lineid numcommits
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 11:35:37 +04:00
if {$sha1string == {}
|| ([info exists currentid] && $sha1string == $currentid)} return
if {[info exists tagids($sha1string)]} {
set id $tagids($sha1string)
} else {
set id [string tolower $sha1string]
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-18 20:16:35 +04:00
if {[regexp {^[0-9a-f]{4,39}$} $id]} {
set matches {}
for {set l 0} {$l < $numcommits} {incr l} {
if {[string match $id* $lineid($l)]} {
lappend matches $lineid($l)
}
}
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 11:35:37 +04:00
}
if {[info exists idline($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 16:06:06 +04:00
selectline $idline($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 11:35:37 +04:00
return
}
Allow short SHA1 IDs in the SHA1 entry field.
2005-07-18 20:16:35 +04: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 11:35:37 +04:00
set type "SHA1 id"
} else {
set type "Tag"
}
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 04:12:26 +04:00
proc lineenter {x y id} {
global hoverx hovery hoverid hovertimer
global commitinfo canv
if {![info exists commitinfo($id)]} return
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
set t [$canv create text $x $y -anchor nw -text $text -tags hover]
$canv raise $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 03:47:22 +04:00
proc lineclick {x y id isnew} {
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 09:39:21 +04:00
global ctext commitinfo children cflist canv
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 03:47:22 +04:00
unselectline
if {$isnew} {
addtohistory [list lineclick $x $x $id 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 09:39:21 +04:00
$canv delete hover
# 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 03:47:22 +04: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 09:39:21 +04: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 03:47:22 +04: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 09:39:21 +04:00
$ctext insert end "\tAuthor:\t[lindex $info 1]\n"
$ctext insert end "\tDate:\t[lindex $info 2]\n"
if {[info exists children($id)]} {
$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 03:47:22 +04:00
set i 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 09:39:21 +04:00
foreach child $children($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 03:47:22 +04:00
incr i
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 09:39:21 +04: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 03:47:22 +04: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]"
$ctext insert end "\n\tDate:\t[lindex $info 2]\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 09:39:21 +04:00
}
}
$ctext conf -state disabled
$cflist delete 0 end
}
proc selbyid {id} {
global idline
if {[info exists idline($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 16:06:06 +04:00
selectline $idline($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 09:39:21 +04: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} {
global rowctxmenu idline selectedline rowmenuid
if {![info exists selectedline] || $idline($id) eq $selectedline} {
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 13:27:32 +04: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 09:39:21 +04:00
set rowmenuid $id
tk_popup $rowctxmenu $x $y
}
proc diffvssel {dirn} {
global rowmenuid selectedline lineid
if {![info exists selectedline]} return
if {$dirn} {
set oldid $lineid($selectedline)
set newid $rowmenuid
} else {
set oldid $rowmenuid
set newid $lineid($selectedline)
}
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 03:47:22 +04: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 09:39:21 +04: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 03:47:22 +04: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 09:39:21 +04: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 03:47:22 +04: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 09:39:21 +04: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
Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
2005-07-31 15:35:21 +04:00
startdiff [list $newid $oldid]
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 09:39:21 +04:00
}
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 03:47:48 +04:00
grid $top.title - -pady 10
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 03:47:48 +04:00
entry $top.fromsha1 -width 40 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 03:47:48 +04:00
entry $top.fromhead -width 60 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 03:47:48 +04:00
entry $top.tosha1 -width 40 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 03:47:48 +04:00
entry $top.tohead -width 60 -relief flat
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 16:56:40 +04:00
grid $top.flab $top.fname -sticky w
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 16:56:40 +04:00
focus $top.fname
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04: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 16:56:40 +04: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 03:47:48 +04:00
grid $top.title - -pady 10
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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 03:47:48 +04:00
entry $top.sha1 -width 40 -relief flat
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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 03:47:48 +04:00
entry $top.head -width 60 -relief flat
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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 03:47:48 +04:00
entry $top.tag -width 60
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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
global idpos idline linehtag canv selectedline
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 11:28:44 +04:00
set dir [gitdir]
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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
$canv delete tag.$id
set xt [eval drawtags $id $idpos($id)]
$canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
if {[info exists selectedline] && $selectedline == $idline($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 16:06:06 +04:00
selectline $selectedline 0
Add a menu item for creating tags.
2005-06-27 16:56:40 +04: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 03:47:48 +04: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
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
proc doquit {} {
global stopped
set stopped 100
destroy .
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
# defaults...
set datemode 0
set boldnames 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 03:47:48 +04:00
set wrcomcmd "git-diff-tree --stdin -p --pretty"
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set mainfont {Helvetica 9}
set textfont {Courier 9}
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 15:46:13 +04:00
set findmergefiles 0
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-18 22:29:03 +04:00
set gaudydiff 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 03:52:16 +04:00
set maxgraphpct 50
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 02:51:00 +04:00
set namefont $mainfont
if {$boldnames} {
lappend namefont bold
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set revtreeargs {}
foreach arg $argv {
switch -regexp -- $arg {
"^$" { }
"^-b" { set boldnames 1 }
"^-d" { set datemode 1 }
default {
lappend revtreeargs $arg
}
}
Add initial version of gitk to the CVS repository
2005-05-09 08:08:39 +04:00
}
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04: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 16:06:06 +04:00
set history {}
set historyindex 0
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
set stopped 0
set redisplaying 0
save window geometry on exit, and restore it on startup
2005-05-17 03:54:58 +04:00
set stuffsaved 0
Add a menu entry for generating a patch between any two commits.
2005-06-27 13:27:32 +04:00
set patchnum 0
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
setcoords
makewindow
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 11:35:37 +04:00
readrefs
Made commit list reading asynchronous Added control+/- to increase/decrease font sizes Rearranged code a little.
2005-05-15 16:55:47 +04:00
getcommits $revtreeargs