The text value that it also provides to its caller is not used yet, but
it will be soon.
Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
---
gitk | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 84a5326..51ebaf5 100755
--- a/gitk
+++ b/gitk
@@ -6551,6 +6551,22 @@ proc totalwidth {l font extra} {
return $tot
}
+# Set textName to the text that should be shown in the label for the
+# specified head and prefixName to the prefix text that should be
+# highlighted in $remotebgcolor. Return 1 iff $head is a remote head.
+proc remotereftext {head textName prefixName} {
+ upvar $textName text
+ upvar $prefixName prefix
+
+ if {[regexp {^((remotes/(.*/|)).*)} $head match text prefix]} {
+ return 1
+ } else {
+ set text $head
+ set prefix ""
+ return 0
+ }
+}
+
proc drawtags {id x xt y1} {
global idtags idheads idotherrefs mainhead
global linespc lthickness
@@ -6654,7 +6670,7 @@ proc drawtags {id x xt y1} {
set xl [expr {$xl - $delta/2}]
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-width 1 -outline black -fill $col -tags tag.$id
- if {[regexp {^(remotes/(.*/|))} $tag match remoteprefix]} {
+ if {[remotereftext $tag text remoteprefix]} {
set rwid [font measure mainfont $remoteprefix]
set xi [expr {$x + 1}]
set yti [expr {$yt + 1}]
--
2.9.3