Commit abe731ee authored by Tino Calancha's avatar Tino Calancha

epatch: Save right backups in Git multipatches

Multipatches on N Git files save wrong backups for
N-1 files; only the last one has a correct backup (Bug#26084).
* lisp/vc/diff-mode.el (diff-file-junk-re): Add 'Prereq: '
* lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Use 'diff-file-junk-re'.
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug25010):
Rename from ibuffer-test-bug25010.
(ediff-ptch-test-bug26084): New test.
parent 205223f4
......@@ -504,7 +504,7 @@ See")
;; "index ", "old mode", "new mode", "new file mode" and
;; "deleted file mode" are output by git-diff.
(defconst diff-file-junk-re
(concat "Index: \\|=\\{20,\\}\\|" ; SVN
(concat "Index: \\|Prereq: \\|=\\{20,\\}\\|" ; SVN
"diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file"))
;; If point is in a diff header, then return beginning
......@@ -25,6 +25,8 @@
;;; Code:
(require 'diff-mode) ; For `diff-file-junk-re'.
(provide 'ediff-ptch)
(defgroup ediff-ptch nil
......@@ -225,14 +227,11 @@ program."
(if (and beg2 end2)
(buffer-substring beg2 end2)
;; check for any `Index:' or `Prereq:' lines, but don't use them
(if (re-search-backward "^Index:" mark1-end 'noerror)
(move-marker mark2 (match-beginning 0)))
(if (re-search-backward "^Prereq:" mark1-end 'noerror)
(move-marker mark2 (match-beginning 0)))
;; Remove file junk (Bug#26084).
(while (re-search-backward
(concat "^" diff-file-junk-re) mark1-end t)
(move-marker mark2 (match-beginning 0)))
(goto-char mark2-end)
(if filenames
(setq patch-map
(cons (ediff-make-new-meta-list-element
......@@ -22,7 +22,7 @@
(require 'ert)
(require 'ediff-ptch)
(ert-deftest ibuffer-test-bug25010 ()
(ert-deftest ediff-ptch-test-bug25010 ()
"Test for ."
(insert "diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
......@@ -38,5 +38,62 @@ index 6a07f80..6e8e947 100644
(match-string 1))))
(should-not (string-suffix-p "@@" filename)))))
(ert-deftest ediff-ptch-test-bug26084 ()
"Test for ."
(let* ((tmpdir temporary-file-directory)
(foo (expand-file-name "foo" tmpdir))
(patch (expand-file-name "foo.diff" tmpdir))
(qux (expand-file-name "qux.txt" foo))
(bar (expand-file-name "bar.txt" foo))
(cmd "
mkdir -p foo
cd foo
echo 'qux here' > qux.txt
echo 'bar here' > bar.txt
git init
git add . && git commit -m 'Test repository.'
echo 'foo here' > qux.txt
echo 'foo here' > bar.txt
git diff > ../foo.diff
git reset --hard HEAD
(setq default-directory tmpdir)
(call-process-shell-command cmd)
(find-file patch)
(let* ((info
(progn (ediff-map-patch-buffer (current-buffer)) ediff-patch-map))
(car (nth 3 (car info)))
(car (nth 4 (car info)))))
(car (nth 3 (cadr info)))
(car (nth 4 (cadr info))))))
;; Apply both patches.
(dolist (x (list (cons patch1 bar) (cons patch2 qux)))
(insert (car x))
(call-shell-region (point-min)
(format "%s %s %s %s"
(cdr x)))))
;; Check backup files were saved correctly.
(dolist (x (list qux bar))
(should-not (string= (with-temp-buffer
(insert-file-contents x)
(insert-file-contents (concat x ediff-backup-extension))
(delete-directory foo 'recursive)
(delete-file patch))))
(provide 'ediff-ptch-tests)
;;; ediff-ptch-tests.el ends here
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment