[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#57400: 29.0.50; Support sending patches from VC directly
From: |
Philip Kaludercic |
Subject: |
bug#57400: 29.0.50; Support sending patches from VC directly |
Date: |
Mon, 03 Oct 2022 18:59:09 +0000 |
Antoine Kalmbach <ane@iki.fi> writes:
> Philip Kaludercic <philipk@posteo.net> writes:
>
>> Yes, and I began implementing a different approach (as mentioned on the
>> emacs-devel thread), which I have since abandoned. If you haven't
>> written anything yet, and don't insist on it, I could propose to start
>> sketching out your suggestions.
>
> Sure! I was thinking we could start from a very basic command, call it
> `vc-prepare-patch` as per your suggestion. Since VC uses generics, we
> can dispatch to backend-specific implementations, something like this,
> with Git:
>
> 1. `M-x vc-prepare-patch`
> 2. Dispatch to `vc-git-prepare-patch`
> 3. Git wants a revision range, so interactively prompt for that
> (e.g. `HEAD^`, `abcd1234..ghjk5678`, or `-1`)
> 4. `call-process` to `git format-patch $REV`, and so forth, get the
> list of files.
> 5. Loop each file in `message-mode`. `C-c C-c` sends and goes to the
> next patch, `C-c C-k` cancels the whole thing.
Sorry for the delay, here is a first approximation of this idea:
>From a350b7cbd1b61925c687b501c6251a8ef4fb5549 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 3 Oct 2022 20:54:38 +0200
Subject: [PATCH] Add a command to send patches
* lisp/vc/vc-git.el (vc-git-prepare-patch): Add Git implementation.
* lisp/vc/vc.el (vc-read-revision): Add a MULTIPLE argument.
(vc-read-multiple-revisions): Add an auxiliary function that always
calls 'vc-read-revision' with a non-nil value for MULTIPLE.
(vc-compose-patches-inline): Add user option.
(message-goto-body): Declare function.
(message--name-table): Declare function.
(vc-compose-patch): Add command. (bug#57400)
---
lisp/vc/vc-git.el | 27 ++++++++++++++++++
lisp/vc/vc.el | 70 ++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f5ac43f536..439e82b12e 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1705,6 +1705,33 @@ vc-git-extra-status-menu
(defun vc-git-root (file)
(vc-find-root file ".git"))
+(defun vc-git-prepare-patch (rev)
+ (with-temp-buffer
+ (call-process vc-git-program nil t nil "format-patch"
+ "--no-numbered" "--stdout"
+ ;; From gitrevisions(7): ^<n> means the <n>th parent
+ ;; (i.e. <rev>^ is equivalent to <rev>^1). As a
+ ;; special rule, <rev>^0 means the commit itself and
+ ;; is used when <rev> is the object name of a tag
+ ;; object that refers to a commit object.
+ (concat rev "^0"))
+ (let (filename subject body)
+ ;; Save the patch in a temporary file if required
+ (when (bound-and-true-p vc-compose-patches-inline)
+ (setq filename (make-temp-file "vc-git-prepare-patch"))
+ (write-region nil nil filename)) ;FIXME: Clean up
+ ;; Extract the subject line
+ (goto-char (point-min))
+ (search-forward-regexp "^Subject: \\(.+\\)")
+ (setq subject (match-string 1))
+ ;; Extract the patch body
+ (search-forward-regexp "\n\n")
+ (setq body (buffer-substring (point) (point-max)))
+ ;; Return the extracted data
+ (list :filename filename
+ :subject subject
+ :body body))))
+
;; grep-compute-defaults autoloads grep.
(declare-function grep-read-regexp "grep" ())
(declare-function grep-read-files "grep" (regexp))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 24300e014a..e990f51a91 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -574,6 +574,14 @@
;; containing FILE-OR-DIR. The optional REMOTE-NAME specifies the
;; remote (in Git parlance) whose URL is to be returned. It has
;; only a meaning for distributed VCS and is ignored otherwise.
+;;
+;; - prepare-patch (rev)
+;;
+;; Prepare a patch and return a property list with the keys
+;; `:subject' indicating the patch message as a string, `:body'
+;; containing the contents of the patch as a string (excluding the
+;; header) and `:filename' pointing to a file where the patch has
+;; been stored.
;;; Changes from the pre-25.1 API:
;;
@@ -1910,7 +1918,7 @@ vc-diff-internal
(defvar vc-revision-history nil
"History for `vc-read-revision'.")
-(defun vc-read-revision (prompt &optional files backend default initial-input)
+(defun vc-read-revision (prompt &optional files backend default initial-input
multiple)
(cond
((null files)
(let ((vc-fileset (vc-deduce-fileset t))) ;FIXME: why t? --Stef
@@ -1920,9 +1928,16 @@ vc-read-revision
(let ((completion-table
(vc-call-backend backend 'revision-completion-table files)))
(if completion-table
- (completing-read prompt completion-table
- nil nil initial-input 'vc-revision-history default)
- (read-string prompt initial-input nil default))))
+ (funcall
+ (if multiple #'completing-read-multiple #'completing-read)
+ prompt completion-table nil nil initial-input 'vc-revision-history
default)
+ (let ((answer (read-string prompt initial-input nil default)))
+ (if multiple
+ (split-string answer "[ \t]*,[ \t]*")
+ answer)))))
+
+(defun vc-read-multiple-revisions (prompt &optional files backend default
initial-input)
+ (vc-read-revision prompt files backend default initial-input t))
(defun vc-diff-build-argument-list-internal (&optional fileset)
"Build argument list for calling internal diff functions."
@@ -3243,6 +3258,53 @@ vc-update-change-log
(vc-call-backend (vc-responsible-backend default-directory)
'update-changelog args))
+(defcustom vc-compose-patches-inline nil
+ "Non-nil means that `vc-compose-patch' creates a single message."
+ :type 'boolean
+ :safe #'booleanp)
+
+(declare-function message-goto-body "message" (&optional interactive))
+(declare-function message--name-table "message" (orig-string))
+
+;;;###autoload
+(defun vc-compose-patch (addressee subject revisions)
+ "Compose a message sending REVISIONS to ADDRESSEE with SUBJECT."
+ (interactive (save-current-buffer
+ (require 'message)
+ (vc-ensure-vc-buffer)
+ (let ((revs (vc-read-multiple-revisions "Revisions: ")) to)
+ (while (null (setq to (completing-read-multiple
+ "Whom to send: "
+ (message--name-table ""))))
+ (message "At least one addressee required.")
+ (sit-for 1))
+ (list (string-join to ", ")
+ (read-string "Subject: " "[PATCH] " nil nil t)
+ revs))))
+ (require 'message)
+ (save-current-buffer
+ (vc-ensure-vc-buffer)
+ (let ((patches (mapcar (lambda (rev)
+ (vc-call-backend
+ (vc-responsible-backend default-directory)
+ 'prepare-patch rev))
+ revisions)))
+ (if (not vc-compose-patches-inline)
+ (dolist (patch patches)
+ (compose-mail addressee (plist-get patch :subject)
+ nil nil nil nil
+ `((exit-recursive-edit)))
+ (message-goto-body)
+ (save-excursion ;don't jump to the end
+ (insert (plist-get patch :body)))
+ (recursive-edit))
+ (compose-mail addressee subject)
+ (message-goto-body)
+ (dolist (patch patches)
+ (mml-attach-file (plist-get patch :filename) "text/x-patch"))
+ (message-goto-body)
+ (open-line 2)))))
+
(defun vc-default-responsible-p (_backend _file)
"Indicate whether BACKEND is responsible for FILE.
The default is to return nil always."
--
2.37.3
The documentation is not complete yet, and I haven't tested it yet
extensively, but it fundamentally does the right thing. I am not too
sure about the generic interface and the plist that `prepare-patch'
returns. There might be a better way to do this, generating less
garbage, but I'm stuck between trying to be VC-generic and MUA-generic
which is unsurprisingly tricky.
> Once the file opens in message-mode, most likely we need to strip the
> magic From <sha> <date> header from the beginning of the mail. Then we ensure
> don't do any nasty whitespace removal or wrapping.
>
> Most likely, depending on the backend, we should not require any
> parameters besides the "set of changes". For instance, in Git you can
> configure `git-format-patch` in the git configuration for several
> attributes, like --to=, --annotate, --prefix, etc.
>
> I don't remember how Mercurial works with this. Probably similar. It
> should generate mbox entries as well, I think.
- bug#57400: 29.0.50; Support sending patches from VC directly,
Philip Kaludercic <=