From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#65854: Multi-file replacement diff Date: Fri, 22 Sep 2023 19:02:33 +0300 Organization: LINKOV.NET Message-ID: <86o7hunqyu.fsf@mail.linkov.net> References: <86sf7mgd54.fsf@mail.linkov.net> <86bke943tp.fsf@mail.linkov.net> <83jzswrios.fsf@gnu.org> <86o7i7oo9t.fsf@mail.linkov.net> <86sf7g548a.fsf@mail.linkov.net> <83pm2jkhsg.fsf@gnu.org> <86msxeu1q3.fsf@mail.linkov.net> <83zg1e7jq3.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18613"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: me@eshelyaron.com, 65854@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 22 18:05:54 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qjif9-0004d0-PE for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Sep 2023 18:05:51 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjidR-0005zX-NX; Fri, 22 Sep 2023 12:04:06 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjidE-0005jA-LP for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 12:03:52 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjidE-000711-CA for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 12:03:52 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjidO-0005IP-I9 for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 12:04:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Sep 2023 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65854 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65854-submit@debbugs.gnu.org id=B65854.169539861320306 (code B ref 65854); Fri, 22 Sep 2023 16:04:02 +0000 Original-Received: (at 65854) by debbugs.gnu.org; 22 Sep 2023 16:03:33 +0000 Original-Received: from localhost ([127.0.0.1]:37169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjicu-0005HS-QP for submit@debbugs.gnu.org; Fri, 22 Sep 2023 12:03:33 -0400 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:57187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjice-0005GW-IU for 65854@debbugs.gnu.org; Fri, 22 Sep 2023 12:03:17 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id B285C240005; Fri, 22 Sep 2023 16:02:58 +0000 (UTC) In-Reply-To: <83zg1e7jq3.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 22 Sep 2023 10:25:24 +0300") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:271112 Archived-At: --=-=-= Content-Type: text/plain >> +(defcustom multi-file-diff-unsaved 'save-buffers >> + "What to do with unsaved edits when showing multi-file replacements as diffs. >> +If the value is `save-buffers', save unsaved buffers before creating diff. >> +If the value is `use-file', use text from the file even when the visiting >> +file buffer is modified. >> +If the value is `use-modified-buffer', use text from the file-visiting >> +modified buffer to be able to use unsaved changes. However, when the file >> +is not visited in a buffer, or the buffer is not modified, still read >> +contents from the file." > > Please use consistent wording to describe the same entities. If you > use "file-visiting buffer", use it everywhere, when you sometimes use > that and sometimes "visiting file buffer", you are already half way to > confusing the reader. Ok, fixed below. > Also, this part: > >> + 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=multi-file-diff-unsaved.patch diff --git a/lisp/misearch.el b/lisp/misearch.el index 9ac28c26c48..25d1b115af8 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -387,6 +387,150 @@ 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 'save-buffers + "What to do with unsaved edits when showing multi-file replacements as diffs. +If the value is `save-buffers', save unsaved buffers before creating diff. +If the value is `use-file', use text from the file even when the +file-visiting buffer is modified. +If the value is `use-modified-buffer', use text from the file-visiting +modified buffer to be able to use unsaved changes." + :type '(choice + (const :tag "Save buffers" save-buffers) + (const :tag "Use file" use-file) + (const :tag "Use modified buffer" use-modified-buffer)) + :version "30.1") + +(declare-function diff-setup-whitespace "diff-mode" ()) +(declare-function diff-setup-buffer-type "diff-mode" ()) + +(defun multi-file-replace-as-diff (files from-string replacements regexp-flag delimited-flag) + "Show as diffs replacements of FROM-STRING with REPLACEMENTS. +FILES is a list of file names. REGEXP-FLAG and DELIMITED-FLAG have +the same meaning as in `perform-replace'." + (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) + (equal f-or-b buffer-file-name)) + files)))) + (with-current-buffer diff-buffer + (buffer-disable-undo (current-buffer)) + (let ((inhibit-read-only t)) + (erase-buffer)) + ;; Make the *vc-diff* buffer read only, the diff-mode key + ;; bindings are nicer for read only buffers. + (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)))) + (when file-name + (with-temp-buffer + (if (and file-buffer (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))))) + (with-current-buffer diff-buffer + (diff-setup-whitespace) + (diff-setup-buffer-type) + (buffer-enable-undo (current-buffer)) + (setq-local revert-buffer-function + (lambda (_ignore-auto _noconfirm) + (multi-file-replace-as-diff + files from-string replacements regexp-flag delimited-flag))) + (goto-char (point-min))) + (pop-to-buffer diff-buffer))) + +;;;###autoload +(defun multi-file-replace-regexp-as-diff (files regexp to-string &optional delimited) + "Show as diffs replacements of REGEXP with TO-STRING in FILES. +DELIMITED has the same meaning as in `replace-regexp'. +With a prefix argument, ask for a wildcard, and show diffs for 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 replace-regexp-as-diff (regexp to-string &optional delimited) + "Show as diffs replacements of REGEXP with TO-STRING in the current buffer. +DELIMITED has the same meaning as in `replace-regexp'." + (interactive + (let ((common + (query-replace-read-args + (concat "Replace" + (if current-prefix-arg " word" "") + " regexp as diff") + t t))) + (list (nth 0 common) (nth 1 common) (nth 2 common)))) + (multi-file-replace-as-diff + (list buffer-file-name) regexp to-string t delimited)) + +(defvar diff-use-labels) +(declare-function diff-check-labels "diff" (&optional force)) +(declare-function diff-file-local-copy "diff" (file-or-buf)) + +(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 + (let ((inhibit-read-only t)) + (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))))) + + (defvar unload-function-defs-list) (defun multi-isearch-unload-function () --=-=-=--