[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#65854: Multi-file replacement diff
From: |
Juri Linkov |
Subject: |
bug#65854: Multi-file replacement diff |
Date: |
Fri, 15 Sep 2023 09:40:21 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) |
> I don't know if users will find this too annoying, maybe not,
> but probably this is what should be done to solve such dilemma that
> the same diff can be used in two ways: by applying the diff to the
> buffers with 'C-c C-a', or by applying to the files with 'git apply'.
> Without saving the buffers before running the command, either
> will fail: 'C-c C-a' will fail on changes produced from files,
> 'git apply' will fail on changes produced from unsaved buffers.
Here is a new customizable option 'multi-file-diff-unsaved'
that defines what to do with unsaved changes. When it is
'use-buffer' then it handles the case Eshel demonstrated
where changes are applied over unsaved buffers. But when
the value is 'save-buffers', then 'save-some-buffers' is
called before producing the diff.
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 9ac28c26c48..23872335c2d 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -387,6 +387,160 @@ multi-isearch-files-regexp
(goto-char (if isearch-forward (point-min) (point-max)))
(isearch-forward-regexp nil t)))
+
+;;; Global multi-file and multi-buffer replacements as diff
+
+(defcustom multi-file-diff-unsaved 'use-file
+ "A choice defining what to do with unsaved changes.
+If the value is `use-file', use text from the file.
+If the value is `use-buffer', use text from the file-visiting buffer
+to be able to use unsaved changes. However, when the file is
+not visited in a buffer, read contents from the file.
+If the value is `save-buffers', save unsaved buffers before creating diff."
+ :type '(choice
+ (const :tag "Use file" use-file)
+ (const :tag "Use buffer" use-buffer)
+ (const :tag "Save buffers" save-buffers))
+ :version "30.1")
+
+(defun multi-file-replace-as-diff (files-or-buffers from-string replacements
regexp-flag delimited-flag)
+ (require 'diff)
+ (let ((inhibit-message t)
+ (diff-buffer (get-buffer-create "*replace-diff*")))
+ (when (eq multi-file-diff-unsaved 'save-buffers)
+ (save-some-buffers t (lambda ()
+ (seq-some (lambda (f-or-b)
+ (if (bufferp f-or-b)
+ (eq f-or-b (current-buffer))
+ (equal f-or-b (buffer-file-name))))
+ files-or-buffers))))
+ (with-current-buffer diff-buffer
+ (setq-local buffer-read-only t)
+ (erase-buffer)
+ (diff-mode)
+ (setq-local buffer-read-only nil)
+ (buffer-disable-undo (current-buffer)))
+ (dolist (file-or-buffer files-or-buffers)
+ (let ((file-name (if (bufferp file-or-buffer) buffer-file-name
file-or-buffer)))
+ (when file-name
+ (with-temp-buffer
+ (if (bufferp file-or-buffer)
+ (insert-buffer-substring file-or-buffer)
+ (if (or (eq multi-file-diff-unsaved 'use-file)
+ (not (find-buffer-visiting file-or-buffer)))
+ (insert-file-contents file-or-buffer)
+ (insert-buffer-substring (find-buffer-visiting
file-or-buffer))))
+ (goto-char (point-min))
+ (perform-replace from-string replacements nil regexp-flag
delimited-flag)
+ (multi-file-diff-no-select file-or-buffer (current-buffer) nil
diff-buffer
+ (concat file-name "~") file-name)))))
+ (with-current-buffer diff-buffer
+ (diff-setup-whitespace)
+ (font-lock-ensure)
+ (buffer-enable-undo (current-buffer))
+ (setq-local buffer-read-only t)
+ (setq-local revert-buffer-function
+ (lambda (_ignore-auto _noconfirm)
+ (multi-file-replace-as-diff
+ files-or-buffers from-string replacements regexp-flag
delimited-flag)))
+ (goto-char (point-min)))
+ (pop-to-buffer diff-buffer)))
+
+(defun multi-file-diff-no-select (old new &optional switches buf label-old
label-new)
+ ;; Based on `diff-no-select' tailored to multi-file diffs.
+ "Compare the OLD and NEW file/buffer.
+If the optional SWITCHES is nil, the switches specified in the
+variable `diff-switches' are passed to the diff command,
+otherwise SWITCHES is used. SWITCHES can be a string or a list
+of strings. BUF should be non-nil. LABEL-OLD and LABEL-NEW
+specify labels to use for file names."
+ (unless (bufferp new) (setq new (expand-file-name new)))
+ (unless (bufferp old) (setq old (expand-file-name old)))
+ (or switches (setq switches diff-switches)) ; If not specified, use default.
+ (setq switches (ensure-list switches))
+ (diff-check-labels)
+ (let* ((old-alt (diff-file-local-copy old))
+ (new-alt (diff-file-local-copy new))
+ (command
+ (mapconcat #'identity
+ `(,diff-command
+ ;; Use explicitly specified switches
+ ,@switches
+ ,@(mapcar #'shell-quote-argument
+ (nconc
+ (and (or old-alt new-alt)
+ (eq diff-use-labels t)
+ (list "--label"
+ (cond ((stringp label-old)
label-old)
+ ((stringp old) old)
+ ((prin1-to-string old)))
+ "--label"
+ (cond ((stringp label-new)
label-new)
+ ((stringp new) new)
+ ((prin1-to-string new)))))
+ (list (or old-alt old)
+ (or new-alt new)))))
+ " ")))
+ (with-current-buffer buf
+ (insert command "\n")
+ (call-process shell-file-name nil buf nil
+ shell-command-switch command)
+ (if old-alt (delete-file old-alt))
+ (if new-alt (delete-file new-alt)))))
+
+;;;###autoload
+(defun multi-file-replace-regexp-as-diff (files regexp to-string &optional
delimited)
+ "Show replacements in FILES matching REGEXP with TO-STRING as diff.
+With a prefix argument, ask for a wildcard, and replace in files
+whose file names match the specified wildcard."
+ (interactive
+ (let ((files (if current-prefix-arg
+ (multi-isearch-read-matching-files)
+ (multi-isearch-read-files)))
+ (common
+ (query-replace-read-args
+ (concat "Replace"
+ (if current-prefix-arg " word" "")
+ " regexp as diff in files")
+ t t)))
+ (list files (nth 0 common) (nth 1 common) (nth 2 common))))
+ (multi-file-replace-as-diff files regexp to-string t delimited))
+
+;;;###autoload
+(defun multi-buffer-replace-regexp-as-diff (buffers regexp to-string &optional
delimited)
+ "Show replacements in file BUFFERS matching REGEXP with TO-STRING as diff.
+With a prefix argument, ask for a regexp, and replace in file buffers
+whose names match the specified regexp."
+ (interactive
+ (let ((buffers (if current-prefix-arg
+ (multi-isearch-read-matching-buffers)
+ (multi-isearch-read-buffers)))
+ (common
+ (query-replace-read-args
+ (concat "Replace"
+ (if current-prefix-arg " word" "")
+ " regexp as diff in buffers")
+ t t)))
+ (list buffers (nth 0 common) (nth 1 common) (nth 2 common))))
+ (multi-file-replace-as-diff buffers regexp to-string t delimited))
+
+;;;###autoload
+(defun replace-regexp-as-diff (regexp to-string &optional delimited)
+ "Show replacements in the current file buffer matching REGEXP with TO-STRING
as diff.
+With a prefix argument, ask for a regexp, and replace in file buffers
+whose names match the specified regexp."
+ (interactive
+ (let ((common
+ (query-replace-read-args
+ (concat "Replace"
+ (if current-prefix-arg " word" "")
+ " regexp as diff in buffers")
+ t t)))
+ (list (nth 0 common) (nth 1 common) (nth 2 common))))
+ (multi-file-replace-as-diff
+ (list (current-buffer)) regexp to-string t delimited))
+
+
(defvar unload-function-defs-list)
(defun multi-isearch-unload-function ()
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/10
- bug#65854: Multi-file replacement diff, Eshel Yaron, 2023/09/10
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/11
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/11
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/12
- bug#65854: Multi-file replacement diff,
Juri Linkov <=
- bug#65854: Multi-file replacement diff, Eshel Yaron, 2023/09/15
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/15
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/22
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/22
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/22
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/22
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/23
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/23
- bug#65854: Multi-file replacement diff, Juri Linkov, 2023/09/24
- bug#65854: Multi-file replacement diff, Eli Zaretskii, 2023/09/24