diff options
| author | Philip Oakley <philipoakley@iee.org> | 2015-12-14 10:42:04 +0000 |
|---|---|---|
| committer | Philip Oakley <philipoakley@iee.org> | 2017-01-20 21:10:28 +0000 |
| commit | e670fce17f79f6305f17f2a91732565909c678dd (patch) | |
| tree | 4796d613afb5a31b9eb2232518932e9d03f85e48 | |
| parent | 3202c68ee0060d3a1f3b6f73b4932c6e8b263abb (diff) | |
| download | git-e670fce17f79f6305f17f2a91732565909c678dd.tar.gz | |
git gui: de-dup selected repo from recentrepo history
When the gui/user selects a repo for display, that repo is brought to
the end of the recentrepo config list. The logic can fail if there are
duplicate old entries for the repo (you cannot unset a single config
entry when duplicates are present).
Similarly, the maxrecentrepo logic could fail if older duplicate entries
are present.
The first commit of this series ({this}~2) fixed the config unsetting
issue. Rather than manipulating a local copy of the $recent list (one
cannot know how many entries were removed), simply re-read it.
We must also catch the error when the attempt to remove the second copy
from the re-read list is performed.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
| -rw-r--r-- | lib/choose_repository.tcl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index aa87bcc344..f39636f989 100644 --- a/lib/choose_repository.tcl +++ b/lib/choose_repository.tcl @@ -247,7 +247,7 @@ proc _get_recentrepos {} { proc _unset_recentrepo {p} { regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p - git config --global --unset-all gui.recentrepo "^$p\$" + catch {git config --global --unset-all gui.recentrepo "^$p\$"} load_config 1 } @@ -262,12 +262,11 @@ proc _append_recentrepos {path} { set i [lsearch $recent $path] if {$i >= 0} { _unset_recentrepo $path - set recent [lreplace $recent $i $i] } - lappend recent $path git config --global --add gui.recentrepo $path load_config 1 + set recent [get_config gui.recentrepo] if {[set maxrecent [get_config gui.maxrecentrepo]] eq {}} { set maxrecent 10 @@ -275,7 +274,7 @@ proc _append_recentrepos {path} { while {[llength $recent] > $maxrecent} { _unset_recentrepo [lindex $recent 0] - set recent [lrange $recent 1 end] + set recent [get_config gui.recentrepo] } } |