unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Po Lu <luangruo@yahoo.com>
Cc: "Alfred M. Szmidt" <ams@gnu.org>,
	eliz@gnu.org, larsi@gnus.org, juri@jurta.org,
	emacs-devel@gnu.org
Subject: Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349)
Date: Wed, 31 Aug 2022 05:32:42 +0300	[thread overview]
Message-ID: <b3720e34-048f-a206-7e4b-767e8d88075e@yandex.ru> (raw)
In-Reply-To: <877d2pnqup.fsf@yahoo.com>

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

On 31.08.2022 04:28, Po Lu wrote:
> Dmitry Gutov<dgutov@yandex.ru>  writes:
> 
>> I can look into adapting this approach for other VCS if nobody beats
>> me to it. As long as we fundamentally agree on the behavior.
> Thank you.

This seems to work.

Might use some extra polish, though, if people also encounter the one 
weird error about "buffer already killed" that I saw a few times but 
then stopped after a restart.

[-- Attachment #2: vc-default-checkin-patch.diff --]
[-- Type: text/x-patch, Size: 1704 bytes --]

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index d93be951a3..d6eda2b688 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1667,6 +1667,41 @@ vc-checkin
    backend
    patch-string))
 
+(declare-function diff-apply-hunk "diff-mode" (&optional reverse))
+
+(defun vc-default-checkin-patch (backend patch-string comment)
+  (with-current-buffer (get-buffer-create " *vc-checkin-patch*")
+    (erase-buffer)
+    (insert patch-string)
+    (diff-mode)
+    (pcase-let ((`(,backend ,files) (diff-vc-deduce-fileset))
+                (root (vc-call-backend backend 'root default-directory))
+                (tmpdir (make-temp-file "vc-checkin-patch" t)))
+      (dolist (f files)
+        (copy-file (expand-file-name f root)
+                   (expand-file-name f tmpdir)))
+      (unwind-protect
+          (let ((default-directory root))
+            (dolist (f files)
+              (with-current-buffer (get-file-buffer f)
+                (vc-revert-file f)
+                (revert-buffer t t t)))
+            (goto-char (point-min))
+            (while (not (eobp))
+              (diff-apply-hunk))
+            (dolist (f files)
+              (with-current-buffer (get-file-buffer f)
+                (save-buffer 0)))
+            (vc-checkin files backend comment))
+        (dolist (f files)
+          (copy-file (expand-file-name f tmpdir)
+                     (expand-file-name f root)
+                     t)
+          (with-current-buffer (get-file-buffer f)
+            (revert-buffer t t t))
+          (delete-directory tmpdir t))
+        (bury-buffer)))))
+
 ;;; Additional entry points for examining version histories
 
 ;; (defun vc-default-diff-tree (backend dir rev1 rev2)

  reply	other threads:[~2022-08-31  2:32 UTC|newest]

Thread overview: 95+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <166171593185.16640.41619657947456727@vcs2.savannah.gnu.org>
     [not found] ` <20220828194533.23A6BC00889@vcs2.savannah.gnu.org>
2022-08-28 21:18   ` master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349) Sean Whitton
2022-08-29  4:50     ` Manuel Uberti
2022-08-29 16:40     ` Daniel Martín
2022-08-29 14:48   ` Lars Ingebrigtsen
2022-08-29 16:46     ` Eli Zaretskii
2022-08-29 17:05       ` Dmitry Gutov
2022-08-29 17:41         ` Eli Zaretskii
2022-08-29 19:03           ` Tassilo Horn
2022-08-29 19:31             ` Eli Zaretskii
2022-08-29 20:36           ` Dmitry Gutov
2022-08-30 11:25             ` Eli Zaretskii
2022-08-30 12:35               ` Dmitry Gutov
2022-08-30 13:01                 ` Eli Zaretskii
2022-08-30 13:52                   ` Dmitry Gutov
2022-08-30 16:20                     ` Eli Zaretskii
2022-08-30 17:33                       ` Dmitry Gutov
2022-08-30 16:47                 ` Juri Linkov
2022-08-30 17:05                   ` Eli Zaretskii
2022-08-30 17:11                     ` Dmitry Gutov
2022-08-30 17:37                       ` Eli Zaretskii
2022-08-30 17:39                         ` Dmitry Gutov
2022-08-30 17:18                     ` Juri Linkov
2022-08-30  7:20         ` Juri Linkov
2022-08-30 11:54           ` Eli Zaretskii
2022-08-30 14:49             ` Sean Whitton
2022-08-30 16:39               ` Juri Linkov
2022-08-30 16:45               ` Eli Zaretskii
2022-08-31  2:38                 ` Richard Stallman
2022-08-31 15:48                 ` Jonas Bernoulli
2022-08-31  2:38               ` Richard Stallman
2022-09-01  0:32                 ` Sean Whitton
2022-09-01  0:33                   ` Sean Whitton
2022-08-30 11:56           ` Eli Zaretskii
2022-08-30 12:03           ` Dmitry Gutov
2022-09-01 20:13             ` Dmitry Gutov
2022-08-30 13:25       ` Alfred M. Szmidt
2022-08-30 13:42         ` Po Lu
2022-08-30 14:02           ` Alfred M. Szmidt
2022-10-25 19:22           ` Dmitry Gutov
2022-08-30 14:08         ` Dmitry Gutov
2022-08-30 14:20           ` Alfred M. Szmidt
2022-08-30 14:38             ` Dmitry Gutov
2022-08-30 15:16               ` Stefan Monnier
2022-08-30 15:26                 ` Dmitry Gutov
2022-08-30 15:33                   ` Lars Ingebrigtsen
2022-08-30 15:45                     ` Dmitry Gutov
2022-08-30 15:53                       ` Lars Ingebrigtsen
2022-08-30 18:36                   ` Stefan Monnier
2022-08-30 20:59                     ` Dmitry Gutov
2022-08-30 16:50                 ` Eli Zaretskii
2022-08-31  6:51                   ` Alfred M. Szmidt
2022-08-30 16:37               ` Eli Zaretskii
2022-08-30 16:45                 ` Lars Ingebrigtsen
2022-08-30 17:02                   ` Eli Zaretskii
2022-08-30 17:11                     ` Lars Ingebrigtsen
2022-08-30 17:34                       ` Eli Zaretskii
2022-08-30 17:38                         ` Lars Ingebrigtsen
2022-08-30 19:23                       ` Sean Whitton
2022-08-30 17:10                 ` Dmitry Gutov
2022-08-31  1:28               ` Po Lu
2022-08-31  2:32                 ` Dmitry Gutov [this message]
2022-08-31  6:53                   ` Juri Linkov
2022-08-31  9:55                     ` Lars Ingebrigtsen
2022-08-31 10:35                       ` Dmitry Gutov
2022-08-31 10:37                         ` Lars Ingebrigtsen
2022-08-31 11:09                           ` Dmitry Gutov
2022-08-31 15:42                             ` Lars Ingebrigtsen
2022-08-31 16:24                               ` Dmitry Gutov
2022-08-31 16:39                                 ` Lars Ingebrigtsen
2022-08-31 18:02                                   ` Dmitry Gutov
2022-09-01 10:16                                     ` Lars Ingebrigtsen
2022-09-01 11:31                                       ` Dmitry Gutov
2022-09-01 11:45                                         ` Lars Ingebrigtsen
2022-09-01 11:48                                           ` Dmitry Gutov
2022-09-01 11:57                                             ` Eli Zaretskii
2022-10-17  0:11                                             ` Dmitry Gutov
2022-10-17 19:17                                               ` Juri Linkov
2022-09-01 13:26                                           ` Robert Pluim
2022-09-01 13:28                                             ` Dmitry Gutov
2022-09-01 13:32                                               ` Robert Pluim
2022-09-03  2:51                                             ` Richard Stallman
2022-09-04 12:27                                               ` Alfred M. Szmidt
2022-08-31 11:11                     ` Dmitry Gutov
2022-08-31 16:06                       ` Juri Linkov
2022-08-31 16:21                         ` Dmitry Gutov
2022-08-31 16:36                           ` Eli Zaretskii
2022-10-16 23:53                             ` Dmitry Gutov
2022-10-16 23:54                               ` Dmitry Gutov
2022-08-31 16:41                           ` Dmitry Gutov
2022-08-31 11:23                   ` Eli Zaretskii
2022-08-31 11:57                     ` Dmitry Gutov
2022-08-31 12:36                       ` Eli Zaretskii
2022-09-04  7:26         ` Philip Kaludercic
2022-09-04 12:27           ` Alfred M. Szmidt
2022-09-04 17:07             ` Philip Kaludercic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b3720e34-048f-a206-7e4b-767e8d88075e@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=ams@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=juri@jurta.org \
    --cc=larsi@gnus.org \
    --cc=luangruo@yahoo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).