From: Paul Mackerras <paulus@samba.org>
Date: Wed, 26 Apr 2006 06:32:59 +0000 (+1000)
Subject: Merge branch 'new'
X-Git-Tag: v1.4.0-rc1~21^2~11
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=cb303a949f0a6eaa32125b6a52acb9476f71632f;hp=d16c0812a9472794175b2543c2aa2df45a927202;p=git.git

Merge branch 'new'
---

diff --git a/gitk b/gitk
index a33a1e8a..7c25d2ef 100755
--- a/gitk
+++ b/gitk
@@ -293,10 +293,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
@@ -2088,6 +2094,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]