From: Juri Linkov <juri@linkov.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: me@eshelyaron.com, 65854@debbugs.gnu.org
Subject: bug#65854: Multi-file replacement diff
Date: Mon, 25 Sep 2023 21:18:49 +0300 [thread overview]
Message-ID: <86r0mmxf5a.fsf@mail.linkov.net> (raw)
In-Reply-To: <831qeo3s70.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 24 Sep 2023 11:12:51 +0300")
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
>> >> >> >> + However, when the file
>> >> >> >> +is not visited in a buffer, or the buffer is not modified, still read
>> >> >> >> +contents from the file."
>> >> >> >
>> >> >> > Seems to describe an implementation detail, and I don't think it
>> >> >> > should be there. E.g., what if the file visited by the buffer no
>> >> >> > longer exists?
>> >> >>
>> >> >> If the file visited by the buffer no longer exists, then
>> >> >> the standard error is signaled.
>> >> >
>> >> > Which means in that case it is better to use the buffer text, no?
>> >>
>> >> Since replacement diffs are not supported in non-file buffers,
>> >> better to signal an error for heads up.
>> >
>> > But it _is_ a file-visiting buffer. It's just that its file was
>> > deleted meanwhile.
>>
>> The generated diff could not be applied to the deleted file.
>> So generating a diff to the deleted file makes no sense anyway.
>
> I suggest not to second-guess what the user wants to do with the
> generated diffs. What if they just want to email it or something?
>
> The basic rule of the least surprise is pertinent here: we have the
> data, so why not generate the diffs when we can?
>
> But if you feel strongly about signaling an error in that case, I
> won't object.
I don't disagree. My only concern was extra complexity and
performance of file-exists-p for such rare case. But if this
is not a problem, here is a patch over the previous patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: multi-file-replace-as-diff.patch --]
[-- Type: text/x-diff, Size: 1606 bytes --]
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 25d1b115af8..06bb6f57777 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -427,17 +427,24 @@ multi-file-replace-as-diff
(setq buffer-read-only t)
(diff-mode))
(dolist (file-name files)
- (let ((file-buffer (when (eq multi-file-diff-unsaved 'use-modified-buffer)
- (find-buffer-visiting file-name))))
+ (let* ((file-exists (file-exists-p file-name))
+ (file-buffer
+ (when (or (not file-exists)
+ (eq multi-file-diff-unsaved 'use-modified-buffer))
+ (find-buffer-visiting file-name))))
(when file-name
(with-temp-buffer
- (if (and file-buffer (buffer-modified-p file-buffer))
+ (if (and file-buffer
+ (or (not file-exists)
+ (buffer-modified-p file-buffer)))
(insert-buffer-substring file-buffer)
(insert-file-contents file-name))
(goto-char (point-min))
(perform-replace from-string replacements nil regexp-flag delimited-flag)
- (multi-file-diff-no-select file-name (current-buffer) nil diff-buffer
- (concat file-name "~") file-name)))))
+ (multi-file-diff-no-select
+ (if file-exists file-name file-buffer)
+ (current-buffer) nil diff-buffer
+ (concat file-name "~") file-name)))))
(with-current-buffer diff-buffer
(diff-setup-whitespace)
(diff-setup-buffer-type)
next prev parent reply other threads:[~2023-09-25 18:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-10 17:18 bug#65854: Multi-file replacement diff Juri Linkov
2023-09-10 17:58 ` Eshel Yaron via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-11 6:33 ` Juri Linkov
2023-09-11 7:23 ` Eshel Yaron via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-11 7:38 ` Juri Linkov
2023-09-12 6:49 ` Juri Linkov
2023-09-11 12:35 ` Eli Zaretskii
2023-09-12 6:52 ` Juri Linkov
2023-09-15 6:40 ` Juri Linkov
2023-09-15 7:02 ` Eshel Yaron via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-15 7:38 ` Eli Zaretskii
2023-09-22 6:55 ` Juri Linkov
2023-09-22 7:25 ` Eli Zaretskii
2023-09-22 16:02 ` Juri Linkov
2023-09-22 16:06 ` Eli Zaretskii
2023-09-23 17:36 ` Juri Linkov
2023-09-23 18:56 ` Eli Zaretskii
2023-09-24 7:37 ` Juri Linkov
2023-09-24 8:12 ` Eli Zaretskii
2023-09-25 18:18 ` Juri Linkov [this message]
2023-09-24 1:43 ` Dmitry Gutov
2023-09-24 7:36 ` Juri Linkov
2023-09-24 11:09 ` Dmitry Gutov
2023-09-25 17:58 ` Juri Linkov
2023-09-26 21:39 ` Dmitry Gutov
2023-09-27 17:21 ` Juri Linkov
2023-09-30 17:42 ` Juri Linkov
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=86r0mmxf5a.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=65854@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=me@eshelyaron.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).