unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Sean Whitton <spwhitton@spwhitton.name>, 73387@debbugs.gnu.org
Cc: monnier@iro.umontreal.ca, juri@linkov.net
Subject: bug#73387: 30.0.90; C-x v v in diff-mode doesn't work after C-c C-n
Date: Tue, 24 Sep 2024 01:41:00 +0300	[thread overview]
Message-ID: <8d0b046e-4b29-4551-b421-e98e212a7b40@yandex.ru> (raw)
In-Reply-To: <87zfo28fzu.fsf@zephyr.silentflame.com>

Hi!

On 20/09/2024 19:08, Sean Whitton wrote:
> X-debbugs-cc: monnier@iro.umontreal.ca, dgutov@yandex.ru, juri@linkov.net
> 
> Hello,
> 
> If you do C-c C-n in a diff-mode buffer with multiple hunks, a
> subsequent C-x v v signals a user-error from diff-file-next.  I think
> that the bug is in how diff-vc-deduce-fileset invokes diff-file-next.
> I'm not sure exactly how to rework diff-vc-deduce-fileset.
> 
> It would be nice to fix this because then C-c C-n C-x v v would be a
> convenient way to commit just a single hunk.

This seems to work:

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 4810b9ce01c..dc59621200c 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -3133,11 +3133,16 @@ diff-syntax-fontify-props
  ;;;###autoload
  (defun diff-vc-deduce-fileset ()
    (let ((backend (vc-responsible-backend default-directory))
+        (start (point-min))
+        (end (point-max))
          files)
      (save-excursion
-      (goto-char (point-min))
-      (while (progn (diff-file-next) (not (eobp)))
-        (push (diff-find-file-name nil t) files)))
+      (save-restriction
+        (widen)
+        (goto-char start)
+        (diff-beginning-of-file-and-junk)
+        (while (progn (diff-file-next) (<= (point) end))
+          (push (diff-find-file-name nil t) files))))
      (list backend (delete nil (nreverse files)) nil nil 'patch)))

  (defun diff--filter-substring (str)


But to really commit the narrowed diff I think you'll need to do 
something about this line in vc-next-action

      ((eq model 'patch)
       (vc-checkin files backend nil nil nil (buffer-string)))

...to specify altered buffer contents as the diff to use.





  parent reply	other threads:[~2024-09-23 22:41 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20 16:08 bug#73387: 30.0.90; C-x v v in diff-mode doesn't work after C-c C-n Sean Whitton
2024-09-22 12:46 ` Sean Whitton
2024-09-23 22:41   ` Dmitry Gutov
2024-09-23 22:41 ` Dmitry Gutov [this message]
2024-09-24  6:32   ` Juri Linkov
2024-09-24 15:54     ` Sean Whitton
2024-09-24 17:36       ` Dmitry Gutov
2024-09-25  6:34         ` Sean Whitton
2024-09-25 23:46           ` Dmitry Gutov
2024-09-27 11:55             ` Sean Whitton
2024-09-27 19:13               ` Dmitry Gutov
2024-09-29 23:46                 ` Sean Whitton
2024-09-30  0:27                   ` Dmitry Gutov
2024-09-30  9:38                     ` Sean Whitton
2024-09-30 10:11                       ` Dmitry Gutov
2024-09-30 13:10                         ` Sean Whitton
2024-09-30 13:25                           ` Sean Whitton
2024-09-30 14:15                           ` Eli Zaretskii
2024-10-01  0:50                             ` Sean Whitton
2024-10-01 15:51                               ` Eli Zaretskii
2024-10-01 19:13                                 ` Dmitry Gutov
2024-10-02  6:17                                   ` Eli Zaretskii
2024-10-02  1:26                                 ` Sean Whitton
2024-10-02  7:15                                   ` Eli Zaretskii
2024-10-03  0:50                                     ` Sean Whitton
2024-10-03  6:33                                       ` Eli Zaretskii
2024-10-03  7:06                                         ` Sean Whitton
2024-10-03 11:07                                           ` Eli Zaretskii
2024-10-03 11:15                                             ` Dmitry Gutov
2024-10-03 11:36                                             ` Sean Whitton
2024-10-03 12:15                                               ` Eli Zaretskii
2024-10-04  1:41                                                 ` Sean Whitton
2024-10-01  0:27                           ` Dmitry Gutov
2024-10-01  0:57                             ` Sean Whitton
2024-10-01  0:39                           ` Dmitry Gutov
2024-10-01  1:01                             ` Sean Whitton
2024-10-01  1:15                               ` Dmitry Gutov
2024-10-01  1:40                                 ` Sean Whitton
2024-10-01  1:57                                   ` Dmitry Gutov
2024-10-01  2:41                                     ` Sean Whitton
2024-10-01 13:55                                       ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-02  1:24                                     ` Sean Whitton

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=8d0b046e-4b29-4551-b421-e98e212a7b40@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=73387@debbugs.gnu.org \
    --cc=juri@linkov.net \
    --cc=monnier@iro.umontreal.ca \
    --cc=spwhitton@spwhitton.name \
    /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).