[PATCH 6/6] Rename 'remotes/' to 'r../' in heads
Signed-off-by: Pierre Dumuid <pmdumuid@gmail.com>
---
gitk | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/gitk b/gitk
index 0903d2d..6f50b06 100755
--- a/gitk
+++ b/gitk
@@ -6731,22 +6731,28 @@ proc drawtags {id x xt y1} {
set yb [expr {$yt + $linespc - 1}]
set xvals {}
set wvals {}
+ set newTags {}
+
set i -1
foreach tag $marks {
incr i
+ set newTag $tag
+ regsub {^remotes} $newTag "r.." newTag
+
if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
- set wid [font measure mainfontbold $tag]
+ set wid [font measure mainfontbold $newTag]
} else {
- set wid [font measure mainfont $tag]
+ set wid [font measure mainfont $newTag]
}
lappend xvals $xt
lappend wvals $wid
+ lappend newTags $newTag
set xt [expr {$xt + $wid + $extra}]
}
set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-width $lthickness -fill $reflinecolor -tags tag.$id]
$canv lower $t
- foreach tag $marks x $xvals wid $wvals {
+ foreach tag $marks x $xvals wid $wvals newTag $newTags {
set tag_quoted [string map {% %%} $tag]
set xl [expr {$x + $delta}]
set xr [expr {$x + $delta + $wid + $lthickness}]
@@ -6778,7 +6784,10 @@ proc drawtags {id x xt y1} {
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-width 1 -outline black -fill $col -tags tag.$id
if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
- set rwid [font measure mainfont $remoteprefix]
+ set newRemotePrefix $remoteprefix
+ regsub {^remotes} $newRemotePrefix "r.." newRemotePrefix
+
+ set rwid [font measure mainfont $newRemotePrefix]
set xi [expr {$x + 1}]
set yti [expr {$yt + 1}]
set xri [expr {$x + $rwid}]
@@ -6786,7 +6795,7 @@ proc drawtags {id x xt y1} {
-width 0 -fill $remotebgcolor -tags tag.$id
}
}
- set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
+ set t [$canv create text $xl $y1 -anchor w -text $newTag -fill $headfgcolor \
-font $font -tags [list tag.$id text]]
if {$ntags >= 0} {
$canv bind $t <1> $tagclick
--
2.10.2
Pierre Dumuid <pmdumuid@gmail.com>