From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#66114: [PATCH] Fix interactive prompt for selecting checkout directory Date: Fri, 22 Sep 2023 08:21:41 +0000 Message-ID: <87h6nmvcru.fsf@posteo.net> References: <87h6npfhoa.fsf@breatheoutbreathe.in> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35282"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 66114@debbugs.gnu.org To: Joseph Turner Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 22 10:22:02 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qjbQI-0008yL-6S for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Sep 2023 10:22:02 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjbQC-0004Kj-LF; Fri, 22 Sep 2023 04:21:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjbQ8-0004KZ-Os for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:21:52 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjbQ8-0006LX-4z for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:21:52 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjbQI-0001va-Im for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Sep 2023 08:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66114 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 66114-submit@debbugs.gnu.org id=B66114.16953709217403 (code B ref 66114); Fri, 22 Sep 2023 08:22:02 +0000 Original-Received: (at 66114) by debbugs.gnu.org; 22 Sep 2023 08:22:01 +0000 Original-Received: from localhost ([127.0.0.1]:35270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjbQG-0001vK-N1 for submit@debbugs.gnu.org; Fri, 22 Sep 2023 04:22:01 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:42359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjbQE-0001uz-LS for 66114@debbugs.gnu.org; Fri, 22 Sep 2023 04:21:59 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0AE58240103 for <66114@debbugs.gnu.org>; Fri, 22 Sep 2023 10:21:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695370902; bh=Vd4SdsLU6R0kDMTXqRnGuOCQuLfXnvMjK8NV2fPbsNo=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=XuBUtmTlNuY3+ZmPRJqDMpv5zW2j/podo1W5yxy1702pc52d4QvqlhmA2T57d9XdA 4o3ZkcmY2E9N9aGbqBAi/uJf8qfRf8ukBeR7sN7X3ND/aSwSlUzW+iUsE1Gp1lKu0t KTMTY3mcsMSvLAnf1bDRU86998PGwDRAOYaV9GFbXPdiTwulasooFV03hW/V7F2Jml 7vv1P3uJnan0G3ZLVQbItjA/HjFWK2yhA00qoNoUgqGQhMWEctpYMlDzwTUritG0qh FJz8ubQ+z8/kTuQaGUh8IzpmXp5R/hgFZZKJJ/gcZ+c+UvhkrKfzjIxU3MeuOPj9Ud Pvb5IyZTgcp6g== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RsQGY4T9mz9rxD; Fri, 22 Sep 2023 10:21:41 +0200 (CEST) In-Reply-To: <87h6npfhoa.fsf@breatheoutbreathe.in> (Joseph Turner's message of "Wed, 20 Sep 2023 00:02:43 -0700") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:271051 Archived-At: Joseph Turner writes: > Tags: patch > > This patch fixes the interactive prompt in package-vc-checkout. See > commit message for details. > > From 70061d76542968575555f247d4715d18ed3c4e75 Mon Sep 17 00:00:00 2001 > From: Joseph Turner > Date: Tue, 19 Sep 2023 23:58:43 -0700 > Subject: [PATCH] Fix interactive prompt for selecting checkout directory > > * lisp/emacs-lisp/package-vc.el (package-vc-checkout): Use > read-directory-name instead of read-file-name with > predicate. Previously, it was impossible to interactively navigate to > a nested subdirectory. I can "navigate" into whatever directory I want, but I don't get completion. > --- > lisp/emacs-lisp/package-vc.el | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el > index c7a30736e32..29b540d86b8 100644 > --- a/lisp/emacs-lisp/package-vc.el > +++ b/lisp/emacs-lisp/package-vc.el > @@ -823,12 +823,17 @@ repository. If REV has the special value > `:last-release' (interactively, the prefix argument), that stands > for the last released version of the package." > (interactive > - (let* ((name (package-vc--read-package-name "Fetch package source: "))) > - (list (cadr (assoc name package-archive-contents #'string=)) > - (read-file-name "Clone into new or empty directory: " nil nil t nil > - (lambda (dir) (or (not (file-exists-p dir)) > - (directory-empty-p dir)))) > - (and current-prefix-arg :last-release)))) > + (let* ((name (package-vc--read-package-name "Fetch package source: ")) > + (desc (cadr (assoc name package-archive-contents #'string=))) > + (dir (read-directory-name "Clone into new or empty directory: "))) > + (unless (or (not (file-exists-p dir)) > + (directory-empty-p dir)) > + (let ((subdir (expand-file-name (package-desc-full-name desc) dir))) > + (if (and (not (file-exists-p subdir)) > + (y-or-n-p (format "Create new directory %s ?" subdir))) > + (setf dir subdir) I'd prefer to use a setq here. > + (user-error "Directory not empty: %S" (expand-file-name dir))))) This seems like an anti-feature to me, because you need to know what directory is empty before confirming your choice, and if it is not empty, you have to restart the entire command again. > + (list desc dir (and current-prefix-arg :last-release)))) > (package-vc--archives-initialize) > (let ((pkg-spec (or (package-vc--desc->spec pkg-desc) > (and-let* ((extras (package-desc-extras pkg-desc))