+18
-7
gitk
+18
-7
gitk
···
1903
1903
global otherrefids idotherrefs mainhead mainheadid
1904
1904
global selecthead selectheadid
1905
1905
global hideremotes
1906
+
global hidecustomrefs
1906
1907
global tclencoding
1907
1908
1908
1909
foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
···
1939
1940
set tagids($name) $id
1940
1941
lappend idtags($id) $name
1941
1942
} else {
1943
+
if {$hidecustomrefs} {
1944
+
if {![string match "stash" $ref] ||
1945
+
![string match "replace/*" $ref]} continue
1946
+
}
1942
1947
set otherrefids($name) $id
1943
1948
lappend idotherrefs($id) $name
1944
1949
}
···
11696
11701
global NS maxwidth maxgraphpct showneartags showlocalchanges
11697
11702
global tabstop wrapcomment wrapdefault limitdiffs
11698
11703
global autocopy autoselect autosellen extdifftool perfile_attrs
11699
-
global hideremotes want_ttk have_ttk maxrefs web_browser
11704
+
global hideremotes hidecustomrefs want_ttk have_ttk maxrefs web_browser
11700
11705
11701
11706
set page [create_prefs_page $notebook.general]
11702
11707
···
11716
11721
${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
11717
11722
-variable hideremotes
11718
11723
grid x $page.hideremotes -sticky w
11724
+
${NS}::checkbutton $page.hidecustomrefs -text [mc "Hide custom refs"] \
11725
+
-variable hidecustomrefs
11726
+
grid x $page.hidecustomrefs -sticky w
11719
11727
11720
11728
${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
11721
11729
-variable autocopy
···
11863
11871
global oldprefs prefstop showneartags showlocalchanges
11864
11872
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11865
11873
global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
11866
-
global hideremotes want_ttk have_ttk wrapcomment wrapdefault
11874
+
global hideremotes hidecustomrefs want_ttk have_ttk wrapcomment wrapdefault
11867
11875
11868
11876
set top .gitkprefs
11869
11877
set prefstop $top
···
11872
11880
return
11873
11881
}
11874
11882
foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
11875
-
limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
11883
+
limitdiffs tabstop perfile_attrs hideremotes hidecustomrefs \
11884
+
want_ttk wrapcomment wrapdefault} {
11876
11885
set oldprefs($v) [set $v]
11877
11886
}
11878
11887
ttk_toplevel $top
···
11998
12007
global oldprefs prefstop
11999
12008
12000
12009
foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
12001
-
limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
12010
+
limitdiffs tabstop perfile_attrs hideremotes hidecustomrefs \
12011
+
want_ttk wrapcomment wrapdefault} {
12002
12012
global $v
12003
12013
set $v $oldprefs($v)
12004
12014
}
···
12012
12022
global oldprefs prefstop showneartags showlocalchanges
12013
12023
global fontpref mainfont textfont uifont
12014
12024
global limitdiffs treediffs perfile_attrs
12015
-
global hideremotes wrapcomment wrapdefault
12025
+
global hideremotes hidecustomrefs wrapcomment wrapdefault
12016
12026
global ctext
12017
12027
12018
12028
catch {destroy $prefstop}
···
12059
12069
$limitdiffs != $oldprefs(limitdiffs)} {
12060
12070
reselectline
12061
12071
}
12062
-
if {$hideremotes != $oldprefs(hideremotes)} {
12072
+
if {$hideremotes != $oldprefs(hideremotes) || $hidecustomrefs != $oldprefs(hidecustomrefs)} {
12063
12073
rereadrefs
12064
12074
}
12065
12075
if {$wrapcomment != $oldprefs(wrapcomment)} {
···
12539
12549
set wrapdefault "none"
12540
12550
set showneartags 1
12541
12551
set hideremotes 0
12552
+
set hidecustomrefs 0
12542
12553
set maxrefs 20
12543
12554
set visiblerefs {"master"}
12544
12555
set maxlinelen 200
···
12645
12656
mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
12646
12657
cmitmode wrapcomment wrapdefault autocopy autoselect autosellen
12647
12658
showneartags maxrefs visiblerefs
12648
-
hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
12659
+
hideremotes hidecustomrefs showlocalchanges datetimeformat limitdiffs uicolor want_ttk
12649
12660
bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
12650
12661
markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor
12651
12662
extdifftool perfile_attrs headbgcolor headfgcolor headoutlinecolor