From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#66114: [PATCH] Fix interactive prompt for selecting checkout directory Date: Wed, 20 Sep 2023 00:02:43 -0700 Message-ID: <87h6npfhoa.fsf@breatheoutbreathe.in> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28125"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Philip Kaludercic To: 66114@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 20 09:07:25 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 1qirIz-000751-Mm for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 20 Sep 2023 09:07:25 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qirIY-0002fK-1T; Wed, 20 Sep 2023 03:06:58 -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 1qirIU-0002f9-9F for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2023 03:06:54 -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 1qirIT-0007Ry-Q7 for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2023 03:06:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qirIc-0002Pd-G5; Wed, 20 Sep 2023 03:07:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: philipk@posteo.net, bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Sep 2023 07:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66114 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Philip Kaludercic Original-Received: via spool by submit@debbugs.gnu.org id=B.16951935749180 (code B ref -1); Wed, 20 Sep 2023 07:07:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Sep 2023 07:06:14 +0000 Original-Received: from localhost ([127.0.0.1]:58159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qirHp-0002Ny-NF for submit@debbugs.gnu.org; Wed, 20 Sep 2023 03:06:14 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:56958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qirHm-0002Nf-Bg for submit@debbugs.gnu.org; Wed, 20 Sep 2023 03:06:12 -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 1qirHW-0002KB-7o for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2023 03:05:54 -0400 Original-Received: from out-226.mta1.migadu.com ([95.215.58.226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qirHS-0007C6-6p for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2023 03:05:53 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1695193547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=fuggQz6FwHsVQY2dCqI6L/P9u7BMurlFmD1zQRDEya8=; b=YzIScB77S5JN3rqVd4dReAxhKziBvLznviUw7C36S8JFLktvT0WrxydnRxlw4Y8WtWOCMb 01cfXXbVD/+mfCjxlGTBm8DGvLmgPMsUGDK6D+Jz7QwtyxaQQmRMq+3Hq3QuA58Ogpu/sM 0zDSbJ7puQk74cUnMOgsT74sOmikcxk= X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=95.215.58.226; envelope-from=joseph@breatheoutbreathe.in; helo=out-226.mta1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:270905 Archived-At: --=-=-= Content-Type: text/plain Tags: patch This patch fixes the interactive prompt in package-vc-checkout. See commit message for details. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-interactive-prompt-for-selecting-checkout-direct.patch >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. --- 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) + (user-error "Directory not empty: %S" (expand-file-name dir))))) + (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)) -- 2.41.0 --=-=-=--