This patch partly changes the background color for remote refs.
It makes it easy to quickly distinguish remote refs from local
developer branches.
I ignore remote HEADs, as these really should be drawn as
aliases to other heads. But there is no simple way to
detect that HEADs really are aliases for other refs via
"git-ls-remote".
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@xxxxxx>
---
To see the effect of this patch, you need remote refs in your
repository. Such refs are created when using "--use-separate-remote"
with git-clone.
IMHO showing HEAD refs as aliases to real refs would be nice to
have in gitk (What is the current branch?). Unfortunately,
"git-ls-remote", which is used in gitk, does not give the info
whether a ref is a symbolic link to another.
So for this time, I ignore remote HEADs, too. They are only confusing
as they would have been drawn now.
Josef
gitk | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
f073dd11d6f2d473797b4c85cd4ac9758b6141b6
diff --git a/gitk b/gitk
index 87e7162..b642326 100755
--- a/gitk
+++ b/gitk
@@ -290,10 +290,16 @@ proc readrefs {} {
match id path]} {
continue
}
+ if {[regexp {^remotes/.*/HEAD$} $path match]} {
+ continue
+ }
if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
set type others
set name $path
}
+ if {[regexp {^remotes/} $path match]} {
+ set type heads
+ }
if {$type == "tags"} {
set tagids($name) $id
lappend idtags($id) $name
@@ -1718,6 +1724,14 @@ 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/.*/|remotes/)} $tag match remoteprefix]} {
+ set rwid [font measure $mainfont $remoteprefix]
+ set xi [expr {$x + 1}]
+ set yti [expr {$yt + 1}]
+ set xri [expr {$x + $rwid}]
+ $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
+ -width 0 -fill "#ffddaa" -tags tag.$id
+ }
}
set t [$canv create text $xl $y1 -anchor w -text $tag \
-font $mainfont -tags tag.$id]
--
1.3.0.rc4.g8060-dirty
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html