mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01: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>
This commit is contained in:
parent
fa4da7b32e
commit
b1ba39e7e8
1 changed files with 19 additions and 10 deletions
29
gitk
29
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]
|
||||
|
|
Loading…
Reference in a new issue