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: Sun, 24 Sep 2023 14:27:53 -0700 Message-ID: <87v8bzi7iz.fsf@breatheoutbreathe.in> References: <87h6npfhoa.fsf@breatheoutbreathe.in> <87h6nmvcru.fsf@posteo.net> <87bkdsp2ns.fsf@breatheoutbreathe.in> <87lecvbpt4.fsf@posteo.net> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2632"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 66114@debbugs.gnu.org To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 24 23:31:06 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 1qkWgz-0000Uc-J6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Sep 2023 23:31:06 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkWgn-0006h1-CO; Sun, 24 Sep 2023 17:30:53 -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 1qkWgk-0006gY-AY for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 17:30:51 -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 1qkWgk-0006QP-1u for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 17:30:50 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkWgw-0003Co-0S for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2023 17:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 24 Sep 2023 21:31:01 +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.169559105912311 (code B ref 66114); Sun, 24 Sep 2023 21:31:01 +0000 Original-Received: (at 66114) by debbugs.gnu.org; 24 Sep 2023 21:30:59 +0000 Original-Received: from localhost ([127.0.0.1]:43692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkWgs-0003CV-J1 for submit@debbugs.gnu.org; Sun, 24 Sep 2023 17:30:59 -0400 Original-Received: from out-204.mta1.migadu.com ([2001:41d0:203:375::cc]:45347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkWgm-0003CF-Ih for 66114@debbugs.gnu.org; Sun, 24 Sep 2023 17:30:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1695591038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y0sT1TppzMQRcsvijevtxe6RWxDf3Ppl0Wa80tBDW6g=; b=OXE4uazoYXjGD8Q4Cufwz2kDru38DC5rxcpR0L9DQ4VoOkAvyRtcb+B7Cy82YY8hIo0KFz qUO55KVf57zUVor0jfirLQwR04bT7AUSEjqQH9/l6Z1WEdktCW62+65SDKyhvqyuFttMV3 6nYjyfcitB11Sc18ryTbUzzxntUkL6o= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: <87lecvbpt4.fsf@posteo.net> X-Migadu-Flow: FLOW_OUT 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:271274 Archived-At: Philip Kaludercic writes: > Joseph Turner writes: > >> Philip Kaludercic writes: >> >>> 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. >> >> You're right. >> >>>> --- >>>> 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. >> >> Yes, I agree. >> >> IIUC, we want to read from the user a directory which is either >> nonexistent or empty. However, we also want the completions to >> include >> non-empty directories so that the user can easily select a deeply >> nested >> directory. The current solution does not offer non-empty directories >> for >> completions, meaning that users must manually type in a potentially >> long >> path to a nested empty or nonexistent directory. > > It is funny to me, that I probably never noticed this issue because I > have the habit of using hippie-expand to complete partial file names, > including in the minibuffer :) Ah, that makes sense :) >> Here's a different idea I tried: >> >> (read-file-name "Clone into new or empty directory: " nil nil >> ;; Must match a nonexistent or empty directory >> (lambda (dir) (or (not (file-exists-p dir)) >> (directory-empty-p dir))) >> nil >> ;; `read-directory-name' accepts no PREDICATE >> ;; argument: hack `read-file-name' instead. >> (lambda (file-name) (file-directory-p file-name))) >> >> but this erroneously returns the default filename, which might be >> buffer-file-name or whatever string is currently in the minibuffer. > > An issue I am observing, is that it allows selecting non-empty > directories. > >> I would have expected that when MUSTMATCH is a function and it >> returns >> nil, a "[Match required]" message would appear. > > For the record, what completion system are you using. I don't appear > to > see this message at all. I also do not see the message, but I expect to see it. I am using vertico + orderless. >> However, the behavior of >> read-file-name is unspecified when a MUSTMATCH function returns nil: >> >> - a function, which will be called with the input as the >> argument. If the function returns a non-nil value, the >> minibuffer is exited with that argument as the value. >> >> Is this a bug, a case of under-documentation, or do I misunderstand something? >> >> I'm happy to post this in a separate bug thread if you think it's worth it. > > Perhaps that would be worth doing, that way the people who know more > about completion than I do would be more likely to see it and help > out. Okay, thanks! I'll do that. >> >> Joseph >> >>>> + (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))