From: Joachim B Haga <jobh@xxxxxxxxx> Tools such as branchless (https://github.com/arxanas/git-branchless) add a lot of refs under the "refs/branchless" prefix. By default, these are filtered out from `git log` using the `log.excludeDecoration` config directive. However, gitk applies decoration itself from the output of `git show-ref`, so these refs clutter up the UI. This patch adds a setting to gitk to exclude all unknown refs - which is considerably simpler than trying to honour the `excludeDecoration` pattern. Note that this also hides f.x. the `git bisect` refs, which I think is fine given that this behaviour is opt-in (it defaults to not hide anything). Signed-off-by: Joachim B Haga <jobh@xxxxxxxxx> --- gitk: add setting to hide unknown refs Tools such as branchless (https://github.com/arxanas/git-branchless) add a lot of refs under the "refs/branchless" prefix. By default, these are filtered out from git log using the log.excludeDecoration config directive. However, gitk applies decoration itself from the output of git show-ref, so these refs clutter up the UI. This patch adds a setting to gitk to exclude all unknown refs - which is considerably simpler than trying to honour the excludeDecoration pattern. Note that this also hides f.x. the git bisect refs, which I think is fine given that this behaviour is opt-in (defaults to not hide anything). Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1619%2Fjobh%2Fmaster-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1619/jobh/master-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1619 gitk-git/gitk | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index df3ba2ea99b..e91856b33a0 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -1798,7 +1798,7 @@ proc readrefs {} { global tagids idtags headids idheads tagobjid global otherrefids idotherrefs mainhead mainheadid global selecthead selectheadid - global hideremotes + global hideremotes hideunknown global tclencoding foreach v {tagids idtags headids idheads otherrefids idotherrefs} { @@ -1835,8 +1835,10 @@ proc readrefs {} { set tagids($name) $id lappend idtags($id) $name } else { - set otherrefids($name) $id - lappend idotherrefs($id) $name + if {[string match "stash" $name] || !$hideunknown} { + set otherrefids($name) $id + lappend idotherrefs($id) $name + } } } catch {close $refd} @@ -11577,7 +11579,7 @@ proc create_prefs_page {w} { proc prefspage_general {notebook} { global NS maxwidth maxgraphpct showneartags showlocalchanges global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs - global hideremotes want_ttk have_ttk maxrefs web_browser + global hideremotes hideunknown want_ttk have_ttk maxrefs web_browser set page [create_prefs_page $notebook.general] @@ -11601,6 +11603,9 @@ proc prefspage_general {notebook} { ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ -variable hideremotes grid x $page.hideremotes -sticky w + ${NS}::checkbutton $page.hideunknown -text [mc "Hide unknown refs"] \ + -variable hideunknown + grid x $page.hideunknown -sticky w ${NS}::label $page.ddisp -text [mc "Diff display options"] grid $page.ddisp - -sticky w -pady 10 @@ -11725,7 +11730,7 @@ proc doprefs {} { global oldprefs prefstop showneartags showlocalchanges global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs - global hideremotes want_ttk have_ttk + global hideremotes hideunknown want_ttk have_ttk set top .gitkprefs set prefstop $top @@ -11734,7 +11739,7 @@ proc doprefs {} { return } foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { + limitdiffs tabstop perfile_attrs hideremotes hideunknown want_ttk} { set oldprefs($v) [set $v] } ttk_toplevel $top @@ -11860,7 +11865,7 @@ proc prefscan {} { global oldprefs prefstop foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { + limitdiffs tabstop perfile_attrs hideremotes hideunknown want_ttk} { global $v set $v $oldprefs($v) } @@ -11874,7 +11879,7 @@ proc prefsok {} { global oldprefs prefstop showneartags showlocalchanges global fontpref mainfont textfont uifont global limitdiffs treediffs perfile_attrs - global hideremotes + global hideremotes hideunknown catch {destroy $prefstop} unset prefstop @@ -11920,7 +11925,7 @@ proc prefsok {} { $limitdiffs != $oldprefs(limitdiffs)} { reselectline } - if {$hideremotes != $oldprefs(hideremotes)} { + if {$hideremotes != $oldprefs(hideremotes) || $hideunknown != $oldprefs(hideunknown)} { rereadrefs } } @@ -12394,6 +12399,7 @@ set cmitmode "patch" set wrapcomment "none" set showneartags 1 set hideremotes 0 +set hideunknown 0 set maxrefs 20 set visiblerefs {"master"} set maxlinelen 200 @@ -12498,7 +12504,7 @@ config_check_tmp_exists 50 set config_variables { mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs - hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk + hideremotes hideunknown showlocalchanges datetimeformat limitdiffs uicolor want_ttk bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor extdifftool perfile_attrs headbgcolor headfgcolor headoutlinecolor base-commit: 564d0252ca632e0264ed670534a51d18a689ef5d -- gitgitgadget
