From: Juri Linkov <juri@linkov.net>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 52349@debbugs.gnu.org
Subject: bug#52349: 29.0.50; vc-git and diff-mode: stage hunks
Date: Sat, 27 Aug 2022 23:07:12 +0300 [thread overview]
Message-ID: <86ler9labz.fsf@mail.linkov.net> (raw)
In-Reply-To: <b4b3c29e-26fb-1e51-13ed-e12785cfb5d5@yandex.ru> (Dmitry Gutov's message of "Wed, 24 Aug 2022 23:20:59 +0300")
[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]
>> @@ -944,6 +944,8 @@ vc-git-checkin
>> (let ((default-directory (file-name-directory file1)))
>> (make-nearby-temp-file "git-msg")))))
>> (when vc-git-patch-string
>> + (unless (eq (vc-git-command nil t nil "diff" "--cached" "--quiet") 0)
>> + (error "Index not empty"))
>
> user-error, maybe?
Will be fixed.
>> (let ((patch-file (make-temp-file "git-patch")))
>> (with-temp-file patch-file
>> (insert vc-git-patch-string))
>
> Looking great otherwise. Please install whenever you think it's ready.
Not yet great :) I tried to fix another long-standing problem
because its solution should also define the names of new functions here.
The problem is that currently using 'C-c C-d' (log-edit-show-diff)
in the *vc-log* buffer doesn't show the same diff that will be really
committed when different files were marked in *vc-dir* parent buffer
before typing 'C-c C-c' in *vc-log*.
This is because currently log-edit-diff-function is set to vc-diff
that is not suitable here since it tries to deduce fileset again
from *vc-dir*, but files to commit are set in the buffer-local
'vc-log-fileset' in *vc-log*. So I added a new function
'log-edit-diff-fileset' that shows the diff from 'vc-log-fileset'.
Using the same naming scheme, I renamed 'vc-diff-patch' to
'log-edit-diff-patch'.
This shows the difference from the previous patch,
but later these changes could be committed separately:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: log-edit-diff-patch.patch --]
[-- Type: text/x-diff, Size: 3049 bytes --]
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index e958673fea..5290616302 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -664,6 +664,19 @@ log-edit-set-common-indentation
(indent-rigidly (point) (point-max)
(- log-edit-common-indent common)))))
+(defvar vc-patch-string)
+
+(autoload 'vc-diff-patch-string "vc")
+(defun log-edit-diff-patch ()
+ (vc-diff-patch-string vc-patch-string))
+
+(defvar vc-log-fileset)
+
+(defun log-edit-diff-fileset ()
+ "Display diffs for the files to be committed."
+ (interactive)
+ (vc-diff nil nil (list log-edit-vc-backend vc-log-fileset)))
+
(defun log-edit-show-diff ()
"Show the diff for the files to be committed."
(interactive)
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 74e624999f..36a6f27891 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -656,7 +656,7 @@ vc-log-edit
(lambda (file) (file-relative-name file root))
fileset))))
(log-edit-diff-function
- . ,(if vc-patch-string 'vc-diff-patch 'vc-diff))
+ . ,(if vc-patch-string 'log-edit-diff-patch 'log-edit-diff-fileset))
(log-edit-vc-backend . ,backend)
(vc-log-fileset . ,fileset)
(vc-patch-string . ,vc-patch-string))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index cce692f7ea..51ae10ae5c 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1795,18 +1795,16 @@ vc-diff-added-files
(defvar vc-patch-string nil)
-(defun vc-diff-patch ()
- (let ((buffer "*vc-diff*")
- (patch-string vc-patch-string))
+(defun vc-diff-patch-string (patch-string)
+ (let ((buffer "*vc-diff*"))
(vc-setup-buffer buffer)
- (set-buffer buffer)
(let ((buffer-undo-list t)
(inhibit-read-only t))
(insert patch-string))
(setq buffer-read-only t)
(diff-mode)
(setq-local diff-vc-backend (vc-responsible-backend default-directory))
- (setq-local revert-buffer-function (lambda (_ _) (vc-diff-patch)))
+ (setq-local revert-buffer-function (lambda (_ _) (vc-diff-patch-string)))
(setq-local vc-patch-string patch-string)
(pop-to-buffer (current-buffer))
(vc-run-delayed (vc-diff-finish (current-buffer) nil))))
@@ -2000,7 +1998,7 @@ vc-maybe-buffer-sync
(when buffer-file-name (vc-buffer-sync not-urgent))))
;;;###autoload
-(defun vc-diff (&optional historic not-urgent)
+(defun vc-diff (&optional historic not-urgent fileset)
"Display diffs between file revisions.
Normally this compares the currently selected fileset with their
working revisions. With a prefix argument HISTORIC, it reads two revision
@@ -2012,7 +2010,7 @@ vc-diff
(if historic
(call-interactively 'vc-version-diff)
(vc-maybe-buffer-sync not-urgent)
- (let ((fileset (vc-deduce-fileset t)))
+ (let ((fileset (or fileset (vc-deduce-fileset t))))
(vc-buffer-sync-fileset fileset not-urgent)
(vc-diff-internal t fileset nil nil
(called-interactively-p 'interactive)))))
next prev parent reply other threads:[~2022-08-27 20:07 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 8:59 bug#52349: 29.0.50; vc-git and diff-mode: stage hunks Manuel Uberti via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-12-07 17:03 ` Juri Linkov
2021-12-07 17:08 ` Manuel Uberti via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-12-07 19:04 ` Juri Linkov
2021-12-07 17:10 ` Dmitry Gutov
2021-12-07 19:06 ` Juri Linkov
2021-12-08 2:29 ` Dmitry Gutov
2021-12-08 18:57 ` Juri Linkov
2021-12-09 23:17 ` Dmitry Gutov
2022-02-08 19:57 ` Juri Linkov
2022-02-12 1:43 ` Dmitry Gutov
2022-02-12 19:42 ` Juri Linkov
2022-02-13 1:32 ` Dmitry Gutov
2022-02-13 19:48 ` Juri Linkov
2022-02-13 22:51 ` Dmitry Gutov
2022-02-13 19:56 ` Juri Linkov
2022-02-13 22:41 ` Dmitry Gutov
2022-08-21 16:07 ` Juri Linkov
2022-02-13 22:37 ` Dmitry Gutov
2022-08-21 18:53 ` Juri Linkov
2022-08-24 2:06 ` Dmitry Gutov
2022-08-24 18:20 ` Juri Linkov
2022-08-24 20:20 ` Dmitry Gutov
2022-08-27 20:07 ` Juri Linkov [this message]
2022-08-28 0:40 ` Dmitry Gutov
2022-08-28 19:45 ` Juri Linkov
2022-08-28 23:34 ` Dmitry Gutov
2022-09-08 19:29 ` Juri Linkov
2022-09-08 22:48 ` Sean Whitton
2022-09-10 1:36 ` Dmitry Gutov
2022-09-11 15:05 ` Juri Linkov
2022-09-11 21:57 ` Dmitry Gutov
2022-09-12 18:19 ` Juri Linkov
2022-09-19 2:09 ` Dmitry Gutov
2022-09-19 6:50 ` Juri Linkov
2022-09-19 12:57 ` Dmitry Gutov
2022-10-02 18:51 ` Juri Linkov
2022-11-04 1:32 ` Dmitry Gutov
2022-08-26 17:11 ` Filipp Gunbin
2022-08-27 19:56 ` Juri Linkov
2021-12-07 20:07 ` Lars Ingebrigtsen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86ler9labz.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=52349@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.