git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philip Oakley <philipoakley@iee.org>
To: Git List <git@vger.kernel.org>,
	Pat Thoyts <patthoyts@users.sourceforge.net>
Cc: Alexey Astakhov <asstv7@gmail.com>, sender <philipoakley@iee.org>
Subject: [PATCH v1 2/4] git gui: cope with duplicates in _get_recentrepo
Date: Mon, 14 Dec 2015 15:09:01 +0000	[thread overview]
Message-ID: <1450105743-2432-3-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1450105743-2432-1-git-send-email-philipoakley@iee.org>

_get_recentrepo will fail if duplicate invalid entries are present
in the recentrepo config list. The previous commit fixed the
'git config' limitations in _unset_recentrepo by unsetting all config
entries, however this code would fail on the second attempt to unset it.

Refactor the code to pre-sort and de-duplicate the recentrepo list to
avoid a potential second unset attempt.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
 git-gui/lib/choose_repository.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 133ca0a..aa87bcc 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -235,14 +235,14 @@ method _invoke_next {} {
 
 proc _get_recentrepos {} {
 	set recent [list]
-	foreach p [get_config gui.recentrepo] {
+	foreach p [lsort -unique [get_config gui.recentrepo]] {
 		if {[_is_git [file join $p .git]]} {
 			lappend recent $p
 		} else {
 			_unset_recentrepo $p
 		}
 	}
-	return [lsort $recent]
+	return $recent
 }
 
 proc _unset_recentrepo {p} {
-- 
2.5.2.windows.2

  parent reply	other threads:[~2015-12-14 15:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-13 12:59 git gui: fail on dual entries in recent repo list Philip Oakley
2015-12-14 15:08 ` [PATCH v1 0/4] Fix git-gui when recentrepo list has duplicates Philip Oakley
2015-12-14 15:09   ` [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo Philip Oakley
2015-12-14 22:31     ` Eric Sunshine
2015-12-16 23:41       ` Philip Oakley
2015-12-17  7:45         ` Eric Sunshine
2015-12-14 15:09   ` Philip Oakley [this message]
2015-12-14 15:09   ` [PATCH v1 3/4] git gui: de-dup selected repo from recentrepo history Philip Oakley
2015-12-14 15:09   ` [PATCH v1 4/4] git gui: allow for a long recentrepo list Philip Oakley
2015-12-14 22:36     ` Eric Sunshine
2015-12-15  0:04       ` Philip Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450105743-2432-3-git-send-email-philipoakley@iee.org \
    --to=philipoakley@iee.org \
    --cc=asstv7@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=patthoyts@users.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).