Merge branch 'oa/hide-more-refs'

* oa/hide-more-refs:
  gitk: Add user preference to hide specific references

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

diff --cc gitk
index 039189cad12ecc27b0265bac610008c5cae30750,e7a848597d882fa4fbc18ef85618765fcf3f9d01..e4ef45c17d485b693139492cd82594cd180f4686
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -11649,7 -11719,14 +11651,14 @@@ proc prefspage_general {notebook} 
          -variable hideremotes
      grid x $page.hideremotes -sticky w
  
 -    ${NS}::entry $page.refstohide -textvariable refstohide
 -    ${NS}::frame $page.refstohidef
 -    ${NS}::label $page.refstohidef.l -text [mc "Refs to hide (space-separated)" ]
++    ttk::entry $page.refstohide -textvariable refstohide
++    ttk::frame $page.refstohidef
++    ttk::label $page.refstohidef.l -text [mc "Refs to hide (space-separated)" ]
+     pack $page.refstohidef.l -side left
+     pack configure $page.refstohidef.l -padx 10
+     grid x $page.refstohidef $page.refstohide -sticky ew
+ 
 -    ${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
 +    ttk::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
          -variable autocopy
      grid x $page.autocopy -sticky w
      if {[haveselectionclipboard]} {
@@@ -12467,7 -12567,7 +12493,8 @@@ set wrapcomment "none
  set wrapdefault "none"
  set showneartags 1
  set hideremotes 0
+ set refstohide ""
 +set sortrefsbytype 1
  set maxrefs 20
  set visiblerefs {"master"}
  set maxlinelen 200
@@@ -12571,66 -12671,19 +12598,67 @@@ catch 
  config_check_tmp_exists 50
  
  set config_variables {
 -    mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
 -    cmitmode wrapcomment wrapdefault autocopy autoselect autosellen
 -    showneartags maxrefs visiblerefs
 -    hideremotes refstohide showlocalchanges datetimeformat limitdiffs uicolor want_ttk
 -    bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
 -    markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor
 -    extdifftool perfile_attrs headbgcolor headfgcolor headoutlinecolor
 -    remotebgcolor tagbgcolor tagfgcolor tagoutlinecolor reflinecolor
 -    filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
 -    linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
 -    indexcirclecolor circlecolors linkfgcolor circleoutlinecolor diffbgcolors
 +    autocopy
 +    autoselect
 +    autosellen
 +    bgcolor
 +    circlecolors
 +    circleoutlinecolor
 +    cmitmode
 +    colors
 +    currentsearchhitbgcolor
 +    datetimeformat
 +    diffbgcolors
 +    diffcolors
 +    diffcontext
 +    extdifftool
 +    fgcolor
 +    filesepbgcolor
 +    filesepfgcolor
 +    findmergefiles
 +    foundbgcolor
 +    headbgcolor
 +    headfgcolor
 +    headoutlinecolor
 +    hideremotes
 +    indexcirclecolor
 +    kscroll
 +    limitdiffs
 +    linehoverbgcolor
 +    linehoverfgcolor
 +    linehoveroutlinecolor
 +    linkfgcolor
 +    mainfont
 +    mainheadcirclecolor
 +    markbgcolor
 +    maxgraphpct
 +    maxrefs
 +    maxwidth
 +    mergecolors
 +    perfile_attrs
 +    reflinecolor
++    refstohide
 +    remotebgcolor
 +    selectbgcolor
 +    showlocalchanges
 +    showneartags
 +    sortrefsbytype
 +    tabstop
 +    tagbgcolor
 +    tagfgcolor
 +    tagoutlinecolor
 +    textfont
 +    uicolor
 +    uifgcolor
 +    uifgdisabledcolor
 +    uifont
 +    visiblerefs
      web_browser
 +    workingfilescirclecolor
 +    wrapcomment
 +    wrapdefault
  }
 +
  foreach var $config_variables {
      config_init_trace $var
      trace add variable $var write config_variable_change_cb