summaryrefslogtreecommitdiffstats
path: root/gitk
diff options
context:
space:
mode:
authorPaul Wise <pabs3@bonedaddy.net>2019-03-21 08:05:32 +0100
committerPaul Mackerras <paulus@ozlabs.org>2019-09-14 01:35:43 +0200
commitd7cc4fb0018e247cb5a05cbe55057bc70d3455af (patch)
tree36558134d53542cbe1b0be05b1d30d0c378665ce /gitk
parentgitk: Add Chinese (zh_CN) translation (diff)
downloadgit-d7cc4fb0018e247cb5a05cbe55057bc70d3455af.tar.xz
git-d7cc4fb0018e247cb5a05cbe55057bc70d3455af.zip
gitk: Use right colour for remote refs in the "Tags and heads" dialog
Makes it easier to see which refs are local and which refs are remote. Adds consistency with the remote background colour in the graph display. Signed-off-by: Paul Wise <pabs3@bonedaddy.net> Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to '')
-rwxr-xr-xgitk9
1 files changed, 8 insertions, 1 deletions
diff --git a/gitk b/gitk
index 5b1d8987eb..5c6db3d6c4 100755
--- a/gitk
+++ b/gitk
@@ -3404,6 +3404,8 @@ set rectmask {
}
image create bitmap reficon-H -background black -foreground "#00ff00" \
-data $rectdata -maskdata $rectmask
+image create bitmap reficon-R -background black -foreground "#ffddaa" \
+ -data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
@@ -10057,6 +10059,7 @@ proc sel_reflist {w x y} {
set n [lindex $ref 0]
switch -- [lindex $ref 1] {
"H" {selbyid $headids($n)}
+ "R" {selbyid $headids($n)}
"T" {selbyid $tagids($n)}
"o" {selbyid $otherrefids($n)}
}
@@ -10086,7 +10089,11 @@ proc refill_reflist {} {
foreach n [array names headids] {
if {[string match $reflistfilter $n]} {
if {[commitinview $headids($n) $curview]} {
- lappend refs [list $n H]
+ if {[string match "remotes/*" $n]} {
+ lappend refs [list $n R]
+ } else {
+ lappend refs [list $n H]
+ }
} else {
interestedin $headids($n) {run refill_reflist}
}