If a reference has the form
refs/remotes/origin/foo
, then use the label
origin/foo
^^^^^^^
, where the indicated part is displayed in `$remotebgcolor`. The old
code would have displayed such a reference as
remotes/origin/foo
^^^^^^^^^^^^^^^
, which wastes horizontal space displaying `remote/` for every remote
reference. However, if a remote-tracking reference has only two slashes,
like
refs/remotes/baz
, render the label the same as before, namely
remotes/baz
^^^^^^^^
Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
---
gitk | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gitk b/gitk
index c146a15..d22ce5f 100755
--- a/gitk
+++ b/gitk
@@ -6558,7 +6558,9 @@ proc remotereftext {head textName prefixName} {
upvar $textName text
upvar $prefixName prefix
- if {[regexp {^((remotes/([^/]+/|)).*)} $head match text prefix]} {
+ if {[regexp {^remotes/(([^/]+/).*)} $head match text prefix]} {
+ return 1
+ } elseif {[regexp {^((remotes/).*)} $head match text prefix]} {
return 1
} else {
set text $head
@@ -6613,7 +6615,8 @@ proc drawtags {id x xt y1} {
lappend wvals [font measure mainfontbold $head]
} else {
lappend types head
- lappend wvals [font measure mainfont $head]
+ remotereftext $head text remoteprefix
+ lappend wvals [font measure mainfont $text]
}
lappend marks $head
}
@@ -6644,6 +6647,7 @@ proc drawtags {id x xt y1} {
set xl [expr {$x + $delta}]
set xr [expr {$x + $delta + $wid + $lthickness}]
set font mainfont
+ set text $tag
if {$type eq "tag" || $type eq "tags"} {
# draw a tag
set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
@@ -6679,7 +6683,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 $text -fill $headfgcolor \
-font $font -tags [list tag.$id text]]
if {$type eq "tag" || $type eq "tags"} {
$canv bind $t <1> $tagclick
--
2.9.3