[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes 2364faef93 32/48: Have 'vc-prepare-patch' handl
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes 2364faef93 32/48: Have 'vc-prepare-patch' handle prefix arguments. |
Date: |
Wed, 16 Nov 2022 04:50:06 -0500 (EST) |
branch: scratch/package-vc-fixes
commit 2364faef93b3a5787c3e5509fcbb7216eb3ec0be
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Have 'vc-prepare-patch' handle prefix arguments.
* lisp/emacs-lisp/package-vc.el (package-vc-prepare-patch): Use
'vc-prepare-patch-prompt-revisions'.
* lisp/vc/vc.el (vc-prepare-patch-prompt-revisions): Extract common
function and handle prefix arguments.
(vc-prepare-patch): Pull logic out to
'vc-prepare-patch-prompt-revisions'.
---
lisp/emacs-lisp/package-vc.el | 18 ++++++++--------
lisp/vc/vc.el | 48 +++++++++++++++++++++++++++++--------------
2 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 664629d156..156e7576f6 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -731,20 +731,20 @@ prompt for the name of the package to rebuild."
(package-vc--unpack-1 pkg-desc (package-desc-dir pkg-desc)))
;;;###autoload
-(defun package-vc-prepare-patch (pkg subject revisions)
+(defun package-vc-prepare-patch (pkg-desc subject revisions)
"Send patch for REVISIONS to maintainer of the package PKG using SUBJECT.
-SUBJECT and REVISIONS are passed on to `vc-prepare-patch', which see.
-PKG must be a package description.
-Interactively, prompt for PKG, SUBJECT, and REVISIONS. However,
-if the current buffer has marked commit log entries, REVISIONS
-are the tags of the marked entries, see `log-view-get-marked'."
+The function uses `vc-prepare-patch', passing SUBJECT and
+REVISIONS directly. PKG-DESC must be a package description.
+Interactively, prompt for PKG-DESC, SUBJECT, and REVISIONS. When
+invoked with a numerical prefix argument, use the last N
+revisions. When invoked interactively in a Log View buffer with
+marked revisions, use those."
(interactive
(list (package-vc--read-package-desc "Package to prepare a patch for: " t)
(and (not vc-prepare-patches-separately)
(read-string "Subject: " "[PATCH] " nil nil t))
- (or (log-view-get-marked)
- (vc-read-multiple-revisions "Revisions: "))))
- (vc-prepare-patch (package-maintainers pkg t)
+ (vc-prepare-patch-prompt-revisions)))
+ (vc-prepare-patch (package-maintainers pkg-desc t)
subject revisions))
(provide 'package-vc)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 513fbb23fe..2314672bb8 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3384,25 +3384,43 @@ If nil, no default will be used. This option may be
set locally."
(vc-root-dir))))
:buffer (current-buffer)))))
+(defun vc-prepare-patch-prompt-revisions ()
+ "Prompt the user for a list revisions.
+Prepare a default value, depending on the current context. With
+a numerical prefix argument, use the last N revisions as the
+default value. If the current buffer is a log-view buffer, use
+the marked commits. Otherwise fall back to the working revision
+of the current file."
+ (vc-read-multiple-revisions
+ "Revisions: " nil nil nil
+ (or (and-let* ((arg current-prefix-arg)
+ (fs (vc-deduce-fileset t)))
+ (cl-loop with file = (caadr fs)
+ repeat (prefix-numeric-value arg)
+ for rev = (vc-working-revision file)
+ then (vc-call-backend
+ (car fs) 'previous-revision
+ file rev)
+ when rev collect it into revs
+ finally return (mapconcat #'identity revs ",")))
+ (and-let* ((revs (log-view-get-marked)))
+ (mapconcat #'identity revs ","))
+ (and-let* ((file (buffer-file-name)))
+ (vc-working-revision file)))))
+
;;;###autoload
(defun vc-prepare-patch (addressee subject revisions)
"Compose an Email sending patches for REVISIONS to ADDRESSEE.
-If `vc-prepare-patches-separately' is nil, SUBJECT will be used
-as the default subject for the message (and it will be prompted
-for when called interactively). Otherwise a separate message
-will be composed for each revision, with SUBJECT derived from the
-invidividual commits.
-
-When invoked interactively in a Log View buffer with marked
-revisions, those revisions will be used."
+If `vc-prepare-patches-separately' is nil, use SUBJECT as the
+default subject for the message, or prompt a subject when invoked
+interactively. Otherwise compose a separate message for each
+revision, with SUBJECT derived from each revision subject.
+When invoked with a numerical prefix argument, use the last N
+revisions.
+When invoked interactively in a Log View buffer with
+marked revisions, use those these."
(interactive
- (let ((revs (vc-read-multiple-revisions
- "Revisions: " nil nil nil
- (or (and-let* ((revs (log-view-get-marked)))
- (mapconcat #'identity revs ","))
- (and-let* ((file (buffer-file-name)))
- (vc-working-revision file)))))
- to)
+ (let ((revs (vc-prepare-patch-prompt-revisions)) to)
(require 'message)
(while (null (setq to (completing-read-multiple
(format-prompt
- branch scratch/package-vc-fixes created (now 18ee1e728a), Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 5132a2b0d0 02/48: Handle strings as keys in 'package-vc-ensure-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2364faef93 32/48: Have 'vc-prepare-patch' handle prefix arguments.,
Philip Kaludercic <=
- scratch/package-vc-fixes aca27e0905 10/48: Expand 'package-vc--unpack-1' documentation, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 685b4b274b 08/48: Fix the docstring for 'package-vc--version', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes c29189587b 07/48: Fix 'package-vc-selected-packages' documentation, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 6a46e7d3ee 17/48: Move package spec documentation to 'package-vc-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 58b2a64225 23/48: Fix edebug spec for 'package--with-response-buffer', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes b45d2fb4b2 29/48: * lisp/emacs-lisp/package-vc.el (package-vc-update-all): Add command, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes a10cd1b927 36/48: Fix accidental generation of circular lists, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bc9c7aee30 34/48: Improve robustness of 'package-vc-update', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes a89f7bc1dc 27/48: Raise 'wrong-type-argument' when installing package nil, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4730409de9 38/48: Fix the behaviour or 'byte-compile-ignore-files', Philip Kaludercic, 2022/11/16