* bug#25524: 26.0.50; diff-mode is broken
@ 2017-01-25 6:42 Dima Kogan
2017-01-25 16:32 ` Tino Calancha
0 siblings, 1 reply; 6+ messages in thread
From: Dima Kogan @ 2017-01-25 6:42 UTC (permalink / raw)
To: 25524
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
I'm using a very recent build from git: 0a49f158f15. I see diff-mode
being broken in 2 ways.
I'm attaching a diff file, produced by C-x v D in a project using
subversion (then cut down and de-contented).
Breakage 1:
1. emacs -Q /tmp/tst.patch
2. M-k
I would expect this to kill the first hunk. Instead emacs barfs:
Args out of range: something something
Breakage 2:
1. emacs -Q /tmp/tst.patch
2. M-g g 13 RET move point to the start of the 2nd hunk
3. M-k I would expect this to kill the hunk at point (2nd
hunk). I would then expect the point to remain at
the 2nd hunk
4. M-k Same as before. Should kill 2nd hunk
5. M-k Same as before. Should kill 2nd hunk
Instead, M-k #2 kills the 2nd hunk and then moves the point to the 1st
hunk. So that subsequent M-k #3 kills the 1st hunk.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: tst.patch --]
[-- Type: text/x-diff, Size: 621 bytes --]
Index: Makefile.1
===================================================================
--- Makefile.1 (revision 81382)
+++ Makefile.1 (working copy)
@@ -220,2 +220,3 @@
# 1111
+# 2222
# 3333
Index: Makefile.2
===================================================================
--- Makefile.2 (revision 81382)
+++ Makefile.2 (working copy)
@@ -220,2 +220,3 @@
# 2222
+# 3333
# 4444
@@ -330,2 +330,3 @@
# 3333
+# 4444
# 5555
Index: Makefile.3
===================================================================
--- Makefile.3 (revision 81382)
+++ Makefile.3 (working copy)
@@ -220,2 +220,3 @@
# 4444
+# 5555
# 6666
^ permalink raw reply [flat|nested] 6+ messages in thread* bug#25524: 26.0.50; diff-mode is broken 2017-01-25 6:42 bug#25524: 26.0.50; diff-mode is broken Dima Kogan @ 2017-01-25 16:32 ` Tino Calancha 2017-01-25 20:47 ` Noam Postavsky 0 siblings, 1 reply; 6+ messages in thread From: Tino Calancha @ 2017-01-25 16:32 UTC (permalink / raw) To: Dima Kogan; +Cc: 25524, tino.calancha Dima Kogan <dima@secretsauce.net> writes: > I'm using a very recent build from git: 0a49f158f15. I see diff-mode > being broken in 2 ways. Thank you for report this. I confirm your observations. > I'm attaching a diff file, produced by C-x v D in a project using > subversion (then cut down and de-contented). > > Breakage 1: > > 1. emacs -Q /tmp/tst.patch > 2. M-k > > I would expect this to kill the first hunk. Instead emacs barfs: > Args out of range: something something `diff-beginning-of-hunk' must return the pos of the beginning of the hunk as stated in its docstring. > > Breakage 2: > > 1. emacs -Q /tmp/tst.patch > 2. M-g g 13 RET move point to the start of the 2nd hunk > 3. M-k I would expect this to kill the hunk at point (2nd > hunk). I would then expect the point to remain at > the 2nd hunk > 4. M-k Same as before. Should kill 2nd hunk > 5. M-k Same as before. Should kill 2nd hunk > > Instead, M-k #2 kills the 2nd hunk and then moves the point to the 1st > hunk. So that subsequent M-k #3 kills the 1st hunk. After recent changes `diff-file-junk-re' must be updated; currently, it just contains Git diff keywords, i.e. `diff--at-diff-header-p' with point in the first line of your example returns nil. Following patch fix 1) and 2): ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From 91351edff90628a1c134d79e13f3062467612478 Mon Sep 17 00:00:00 2001 From: Tino Calancha <tino.calancha@gmail.com> Date: Thu, 26 Jan 2017 01:16:31 +0900 Subject: [PATCH] Fix Bug#25524 * lisp/vc/diff-mode.el (diff-beginning-of-hunk): Return pos at beginning of hunk. (diff-file-junk-re): Add SVN keywords. --- lisp/vc/diff-mode.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index b7ad8e8ebd..0de314df2d 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -499,9 +499,11 @@ diff-end-of-hunk (goto-char (or end (point-max))))) ;; "index ", "old mode", "new mode", "new file mode" and -;; "deleted file mode" are output by git-diff. +;; "deleted file mode" are output by git-diff; "Index: " and +;; "========..." by SVN. (defconst diff-file-junk-re - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") + (concat "Index: \\|" (make-string 67 ?=) "\\|" + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) ;; If point is in a diff header, then return beginning ;; of hunk position otherwise return nil. @@ -545,7 +547,8 @@ diff-beginning-of-hunk (error "Can't find the beginning of the hunk"))) ((re-search-backward regexp nil t)) ; In the middle of a hunk. ((re-search-forward regexp nil t) ; At first hunk header. - (forward-line 0)) + (forward-line 0) + (point)) (t (error "Can't find the beginning of the hunk")))))) (defun diff-unified-hunk-p () -- 2.11.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.6) of 2017-01-26 Repository revision: 6bfa9e9abca17290bc393d90aedb5abef83a3e06 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#25524: 26.0.50; diff-mode is broken 2017-01-25 16:32 ` Tino Calancha @ 2017-01-25 20:47 ` Noam Postavsky 2017-01-25 21:25 ` Dima Kogan 2017-01-26 4:29 ` Tino Calancha 0 siblings, 2 replies; 6+ messages in thread From: Noam Postavsky @ 2017-01-25 20:47 UTC (permalink / raw) To: Tino Calancha; +Cc: 25524, Dima Kogan On Wed, Jan 25, 2017 at 11:32 AM, Tino Calancha <tino.calancha@gmail.com> wrote: > ;; "index ", "old mode", "new mode", "new file mode" and > -;; "deleted file mode" are output by git-diff. > +;; "deleted file mode" are output by git-diff; "Index: " and > +;; "========..." by SVN. > (defconst diff-file-junk-re > - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") > + (concat "Index: \\|" (make-string 67 ?=) "\\|" > + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) Is it safe to assume exactly 67 "="? Maybe it would be better to use something like "=\\{20,\\}", i.e. a sequence of 20 or more "=". ^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#25524: 26.0.50; diff-mode is broken 2017-01-25 20:47 ` Noam Postavsky @ 2017-01-25 21:25 ` Dima Kogan 2017-01-26 4:29 ` Tino Calancha 1 sibling, 0 replies; 6+ messages in thread From: Dima Kogan @ 2017-01-25 21:25 UTC (permalink / raw) To: Noam Postavsky; +Cc: 25524, Tino Calancha Noam Postavsky <npostavs@users.sourceforge.net> writes: > On Wed, Jan 25, 2017 at 11:32 AM, Tino Calancha <tino.calancha@gmail.com> wrote: >> ;; "index ", "old mode", "new mode", "new file mode" and >> -;; "deleted file mode" are output by git-diff. >> +;; "deleted file mode" are output by git-diff; "Index: " and >> +;; "========..." by SVN. >> (defconst diff-file-junk-re >> - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") >> + (concat "Index: \\|" (make-string 67 ?=) "\\|" >> + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) > > Is it safe to assume exactly 67 "="? Maybe it would be better to use > something like "=\\{20,\\}", i.e. a sequence of 20 or more "=". More broadly, are we sure we need to be touching this? The previous approach and the one before that worked with the stock regexes. ^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#25524: 26.0.50; diff-mode is broken 2017-01-25 20:47 ` Noam Postavsky 2017-01-25 21:25 ` Dima Kogan @ 2017-01-26 4:29 ` Tino Calancha 2017-01-29 9:53 ` Tino Calancha 1 sibling, 1 reply; 6+ messages in thread From: Tino Calancha @ 2017-01-26 4:29 UTC (permalink / raw) To: Noam Postavsky; +Cc: 25524, Dima Kogan, tino.calancha Noam Postavsky <npostavs@users.sourceforge.net> writes: > On Wed, Jan 25, 2017 at 11:32 AM, Tino Calancha <tino.calancha@gmail.com> wrote: >> ;; "index ", "old mode", "new mode", "new file mode" and >> -;; "deleted file mode" are output by git-diff. >> +;; "deleted file mode" are output by git-diff; "Index: " and >> +;; "========..." by SVN. >> (defconst diff-file-junk-re >> - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") >> + (concat "Index: \\|" (make-string 67 ?=) "\\|" >> + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) > > Is it safe to assume exactly 67 "="? Maybe it would be better to use > something like "=\\{20,\\}", i.e. a sequence of 20 or more "=". Humm probably 20 is OK, but i am not using SVN in a while: i ignore if such '====...' might be coustomizable. Updated the patch to use >=20 ?=. Dima Kogan <dima@secretsauce.net> writes: > More broadly, are we sure we need to be touching this? The previous > approach and the one before that worked with the stock regexes. 1) The previous approach touch more things that just and already existant regexp: it caused several problems already well discussed in Bug#25105. 2) In the original approach, the mere existance of 'diff-file-junk-re' as it is, it looks weird. The file want to support all kind VCS, not just Git, so it's unnatural that the regexp just contains words from Git diff headers. Indeed, you can see that there are some hardcoded "^Index: " around the file to handle SVN. IMO, it's more readable adding the necessary stuff to `diff-file-junk-re' and perform such operations uniformly just with same function and regexp. Then, if later turns out that we need more keyword to handle other VCS we just need to change on line of code, i.e., add those words into `diff-file-junk-re'. That said, you are very welcome to improve current implementation so that any `diff-file-junk-re' is required at all, without changing other desirable functionality of the file. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From c3788c73140af02d6fc2b414ddcdbaf273890cdf Mon Sep 17 00:00:00 2001 From: Tino Calancha <tino.calancha@gmail.com> Date: Thu, 26 Jan 2017 13:22:46 +0900 Subject: [PATCH] Fix Bug#25524 * lisp/vc/diff-mode.el (diff-beginning-of-hunk): Return pos at beginning of hunk. (diff-file-junk-re): Add SVN keywords. --- lisp/vc/diff-mode.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index b7ad8e8ebd..e609ca9f94 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -501,7 +501,8 @@ diff-end-of-hunk ;; "index ", "old mode", "new mode", "new file mode" and ;; "deleted file mode" are output by git-diff. (defconst diff-file-junk-re - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") + (concat "Index: \\|=\\{20,\\}\\|" ; SVN + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) ;; If point is in a diff header, then return beginning ;; of hunk position otherwise return nil. @@ -545,7 +546,8 @@ diff-beginning-of-hunk (error "Can't find the beginning of the hunk"))) ((re-search-backward regexp nil t)) ; In the middle of a hunk. ((re-search-forward regexp nil t) ; At first hunk header. - (forward-line 0)) + (forward-line 0) + (point)) (t (error "Can't find the beginning of the hunk")))))) (defun diff-unified-hunk-p () -- 2.11.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.6) of 2017-01-26 built Repository revision: 44765de2005fb56c5930383d6bd1e959a0102a45 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#25524: 26.0.50; diff-mode is broken 2017-01-26 4:29 ` Tino Calancha @ 2017-01-29 9:53 ` Tino Calancha 0 siblings, 0 replies; 6+ messages in thread From: Tino Calancha @ 2017-01-29 9:53 UTC (permalink / raw) To: 25524-done Tino Calancha <tino.calancha@gmail.com> writes: > Noam Postavsky <npostavs@users.sourceforge.net> writes: > >> On Wed, Jan 25, 2017 at 11:32 AM, Tino Calancha <tino.calancha@gmail.com> wrote: >>> ;; "index ", "old mode", "new mode", "new file mode" and >>> -;; "deleted file mode" are output by git-diff. >>> +;; "deleted file mode" are output by git-diff; "Index: " and >>> +;; "========..." by SVN. >>> (defconst diff-file-junk-re >>> - "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file") >>> + (concat "Index: \\|" (make-string 67 ?=) "\\|" >>> + "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) >> >> Is it safe to assume exactly 67 "="? Maybe it would be better to use >> something like "=\\{20,\\}", i.e. a sequence of 20 or more "=". > Humm probably 20 is OK, but i am not using SVN in a while: i ignore if > such '====...' might be coustomizable. > Updated the patch to use >=20 ?=. Pushed fix to master branch as commit 0073223c23749ffd6bd3f882bc30a82cc37efd2a ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-29 9:53 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-01-25 6:42 bug#25524: 26.0.50; diff-mode is broken Dima Kogan 2017-01-25 16:32 ` Tino Calancha 2017-01-25 20:47 ` Noam Postavsky 2017-01-25 21:25 ` Dima Kogan 2017-01-26 4:29 ` Tino Calancha 2017-01-29 9:53 ` Tino Calancha
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.