aboutsummaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-08-08 20:04:20 -0700
committerPaul Mackerras <paulus@samba.org>2005-08-09 21:09:27 +1000
commitb1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69 (patch)
treed1b9f2cb213aac30e71e14d1d41a2648392b1e72 /gitk
parentfa4da7b32e1197fa5032db6a2de7749868253f8b (diff)
downloadgit-b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69.tar.gz
git-b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69.tar.xz
[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>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk29
1 files changed, 19 insertions, 10 deletions
diff --git a/gitk b/gitk
index edf94bf4c..1bc0d881e 100755
--- a/gitk
+++ b/gitk
@@ -387,7 +387,7 @@ proc makewindow {} {
set ctext .ctop.cdet.left.ctext
text $ctext -bg white -state disabled -font $textfont \
-width $geometry(ctextw) -height $geometry(ctexth) \
- -yscrollcommand ".ctop.cdet.left.sb set"
+ -yscrollcommand ".ctop.cdet.left.sb set" -wrap none
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
@@ -1704,10 +1704,19 @@ proc selcanvline {w x y} {
selectline $l 1
}
+proc commit_descriptor {p} {
+ global commitinfo
+ set l "..."
+ if {[info exists commitinfo($p)]} {
+ set l [lindex $commitinfo($p) 0]
+ }
+ return "$p ($l)"
+}
+
proc selectline {l isnew} {
global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
- global canvy0 linespc parents nparents
+ global canvy0 linespc parents nparents children nchildren
global cflist currentid sha1entry
global commentend idtags idline
@@ -1790,15 +1799,15 @@ proc selectline {l isnew} {
set commentstart [$ctext index "end - 1c"]
set comment {}
- foreach p $parents($id) {
- set l "..."
- if {[info exists commitinfo($p)]} {
- set l [lindex $commitinfo($p) 0]
- if {[string length $l] > 32} {
- set l "[string range $l 0 28] ..."
- }
+ 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"
}
- append comment "Parent: $p ($l)\n"
}
append comment "\n"
append comment [lindex $info 5]