# HG changeset patch # User Patrick Mezard # Date 1180990602 -7200 # Node ID d6b9c3a032680fd8cc107f6602fd70ef791bb036 # Parent eb26f8f703649492d0ac1cddead7bba905512785# Parent 1774c037fbd2dcd1b04bc257886470a50fab32c7 Merge with crew-stable diff --git a/contrib/hgk b/contrib/hgk --- a/contrib/hgk +++ b/contrib/hgk @@ -264,9 +264,8 @@ proc readrefs {} { regsub -all "\r\n" $tags "\n" tags set lines [split $tags "\n"] foreach f $lines { - set f [regexp -all -inline {\S+} $f] - set direct [lindex $f 0] - set full [lindex $f 1] + regexp {(\S+)$} $f full + regsub {\s+(\S+)$} $f "" direct set sha [split $full ':'] set tag [lindex $sha 1] lappend tagids($direct) $tag @@ -356,15 +355,15 @@ proc makewindow {} { set canv .ctop.top.clist.canv canvas $canv -height $geometry(canvh) -width $geometry(canv1) \ -bg white -bd 0 \ - -yscrollincr $linespc -yscrollcommand "$cscroll set" + -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground grey .ctop.top.clist add $canv set canv2 .ctop.top.clist.canv2 canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \ - -bg white -bd 0 -yscrollincr $linespc + -bg white -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv2 set canv3 .ctop.top.clist.canv3 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \ - -bg white -bd 0 -yscrollincr $linespc + -bg white -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv3 bind .ctop.top.clist {resizeclistpanes %W %w}