/[emacs]/emacs/lisp/diff-mode.el
ViewVC logotype

Contents of /emacs/lisp/diff-mode.el

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.45.4.11 - (show annotations) (download)
Tue Jul 6 10:10:47 2004 UTC (19 years, 10 months ago) by miles
Branch: lexbind
Changes since 1.45.4.10: +6 -3 lines
Revision: miles@gnu.org--gnu-2004/emacs--lexbind--0--patch-44

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
   More build-in-place tweaking of arch tagging

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403
   Yet more build-in-place tweaking of arch tagging

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-406
   Update from CVS

1 ;;; diff-mode.el --- a mode for viewing/editing context diffs
2
3 ;; Copyright (C) 1998,1999,2000,01,02,03,2004 Free Software Foundation, Inc.
4
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
6 ;; Keywords: convenience patch diff
7
8 ;; This file is part of GNU Emacs.
9
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
13 ;; any later version.
14
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
19
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 ;; Boston, MA 02111-1307, USA.
24
25 ;;; Commentary:
26
27 ;; Provides support for font-lock, outline, navigation
28 ;; commands, editing and various conversions as well as jumping
29 ;; to the corresponding source file.
30
31 ;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
32 ;; Some efforts were spent to have it somewhat compatible with XEmacs'
33 ;; diff-mode as well as with compilation-minor-mode
34
35 ;; Bugs:
36
37 ;; - Reverse doesn't work with normal diffs.
38
39 ;; Todo:
40
41 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
42 ;; Also allow C-c C-a to delete already-applied hunks.
43 ;;
44 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location
45 ;; of a hunk. Show then the changes between <file> and <hunk> and make it
46 ;; possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
47 ;; Or maybe just make it into a ".rej to diff3-markers converter".
48 ;;
49 ;; - Refine hunk on a word-by-word basis.
50 ;;
51 ;; - Handle `diff -b' output in context->unified.
52
53 ;;; Code:
54
55 (eval-when-compile (require 'cl))
56
57
58 (defgroup diff-mode ()
59 "Major mode for viewing/editing diffs"
60 :version "21.1"
61 :group 'tools
62 :group 'diff)
63
64 (defcustom diff-default-read-only nil
65 "If non-nil, `diff-mode' buffers default to being read-only."
66 :type 'boolean
67 :group 'diff-mode)
68
69 (defcustom diff-jump-to-old-file nil
70 "*Non-nil means `diff-goto-source' jumps to the old file.
71 Else, it jumps to the new file."
72 :type '(boolean))
73
74 (defcustom diff-update-on-the-fly t
75 "*Non-nil means hunk headers are kept up-to-date on-the-fly.
76 When editing a diff file, the line numbers in the hunk headers
77 need to be kept consistent with the actual diff. This can
78 either be done on the fly (but this sometimes interacts poorly with the
79 undo mechanism) or whenever the file is written (can be slow
80 when editing big diffs)."
81 :type '(boolean))
82
83 (defcustom diff-advance-after-apply-hunk t
84 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
85 :type 'boolean)
86
87
88 (defcustom diff-mode-hook nil
89 "Run after setting up the `diff-mode' major mode."
90 :type 'hook
91 :options '(diff-delete-empty-files diff-make-unified))
92
93 (defvar diff-outline-regexp
94 "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
95
96 ;;;;
97 ;;;; keymap, menu, ...
98 ;;;;
99
100 (easy-mmode-defmap diff-mode-shared-map
101 '(;; From Pavel Machek's patch-mode.
102 ("n" . diff-hunk-next)
103 ("N" . diff-file-next)
104 ("p" . diff-hunk-prev)
105 ("P" . diff-file-prev)
106 ("k" . diff-hunk-kill)
107 ("K" . diff-file-kill)
108 ;; From compilation-minor-mode.
109 ("}" . diff-file-next)
110 ("{" . diff-file-prev)
111 ("\C-m" . diff-goto-source)
112 ([mouse-2] . diff-goto-source)
113 ;; From XEmacs' diff-mode.
114 ("W" . widen)
115 ;;("." . diff-goto-source) ;display-buffer
116 ;;("f" . diff-goto-source) ;find-file
117 ("o" . diff-goto-source) ;other-window
118 ;;("w" . diff-goto-source) ;other-frame
119 ;;("N" . diff-narrow)
120 ;;("h" . diff-show-header)
121 ;;("j" . diff-show-difference) ;jump to Nth diff
122 ;;("q" . diff-quit)
123 (" " . scroll-up)
124 ("\177" . scroll-down)
125 ;; Our very own bindings.
126 ("A" . diff-ediff-patch)
127 ("r" . diff-restrict-view)
128 ("R" . diff-reverse-direction)
129 ("U" . diff-context->unified)
130 ("C" . diff-unified->context)
131 ("q" . quit-window))
132 "Basic keymap for `diff-mode', bound to various prefix keys.")
133
134 (easy-mmode-defmap diff-mode-map
135 `(("\e" . ,diff-mode-shared-map)
136 ;; From compilation-minor-mode.
137 ("\C-c\C-c" . diff-goto-source)
138 ;; Misc operations.
139 ("\C-c\C-r" . diff-refine-hunk)
140 ("\C-c\C-s" . diff-split-hunk)
141 ("\C-c\C-a" . diff-apply-hunk)
142 ("\C-c\C-t" . diff-test-hunk))
143 "Keymap for `diff-mode'. See also `diff-mode-shared-map'.")
144
145 (easy-menu-define diff-mode-menu diff-mode-map
146 "Menu for `diff-mode'."
147 '("Diff"
148 ["Jump to Source" diff-goto-source t]
149 ["Apply hunk" diff-apply-hunk t]
150 ["Apply diff with Ediff" diff-ediff-patch t]
151 ["-----" nil nil]
152 ["Reverse direction" diff-reverse-direction t]
153 ["Context -> Unified" diff-context->unified t]
154 ["Unified -> Context" diff-unified->context t]
155 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
156 ))
157
158 (defcustom diff-minor-mode-prefix "\C-c="
159 "Prefix key for `diff-minor-mode' commands."
160 :type '(choice (string "\e") (string "C-c=") string))
161
162 (easy-mmode-defmap diff-minor-mode-map
163 `((,diff-minor-mode-prefix . ,diff-mode-shared-map))
164 "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
165
166
167 ;;;;
168 ;;;; font-lock support
169 ;;;;
170
171 (defface diff-header-face
172 '((((class color) (min-colors 88) (background light))
173 (:background "grey85"))
174 (((class color) (min-colors 88) (background dark))
175 (:background "grey45"))
176 (((class color) (background light))
177 (:foreground "blue1" :weight bold))
178 (((class color) (background dark))
179 (:foreground "green" :weight bold))
180 (t (:weight bold)))
181 "`diff-mode' face inherited by hunk and index header faces.")
182 (defvar diff-header-face 'diff-header-face)
183
184 (defface diff-file-header-face
185 '((((class color) (min-colors 88) (background light))
186 (:background "grey70" :weight bold))
187 (((class color) (min-colors 88) (background dark))
188 (:background "grey60" :weight bold))
189 (((class color) (background light))
190 (:foreground "yellow" :weight bold))
191 (((class color) (background dark))
192 (:foreground "cyan" :weight bold))
193 (t (:weight bold))) ; :height 1.3
194 "`diff-mode' face used to highlight file header lines.")
195 (defvar diff-file-header-face 'diff-file-header-face)
196
197 (defface diff-index-face
198 '((t (:inherit diff-file-header-face)))
199 "`diff-mode' face used to highlight index header lines.")
200 (defvar diff-index-face 'diff-index-face)
201
202 (defface diff-hunk-header-face
203 '((t (:inherit diff-header-face)))
204 "`diff-mode' face used to highlight hunk header lines.")
205 (defvar diff-hunk-header-face 'diff-hunk-header-face)
206
207 (defface diff-removed-face
208 '((t (:inherit diff-changed-face)))
209 "`diff-mode' face used to highlight removed lines.")
210 (defvar diff-removed-face 'diff-removed-face)
211
212 (defface diff-added-face
213 '((t (:inherit diff-changed-face)))
214 "`diff-mode' face used to highlight added lines.")
215 (defvar diff-added-face 'diff-added-face)
216
217 (defface diff-changed-face
218 '((((type tty pc) (class color) (background light))
219 (:foreground "magenta" :weight bold :slant italic))
220 (((type tty pc) (class color) (background dark))
221 (:foreground "yellow" :weight bold :slant italic))
222 (t ()))
223 "`diff-mode' face used to highlight changed lines.")
224 (defvar diff-changed-face 'diff-changed-face)
225
226 (defface diff-function-face
227 '((t (:inherit diff-context-face)))
228 "`diff-mode' face used to highlight function names produced by \"diff -p\".")
229 (defvar diff-function-face 'diff-function-face)
230
231 (defface diff-context-face
232 '((((class color) (background light))
233 (:foreground "grey50"))
234 (((class color) (background dark))
235 (:foreground "grey70"))
236 (t ))
237 "`diff-mode' face used to highlight context and other side-information.")
238 (defvar diff-context-face 'diff-context-face)
239
240 (defface diff-nonexistent-face
241 '((t (:inherit diff-file-header-face)))
242 "`diff-mode' face used to highlight nonexistent files in recursive diffs.")
243 (defvar diff-nonexistent-face 'diff-nonexistent-face)
244
245 (defconst diff-yank-handler '(diff-yank-function))
246 (defun diff-yank-function (text)
247 ;; FIXME: the yank-handler is now called separately on each piece of text
248 ;; with a yank-handler property, so the next-single-property-change call
249 ;; below will always return nil :-( --stef
250 (let ((mixed (next-single-property-change 0 'yank-handler text))
251 (start (point)))
252 ;; First insert the text.
253 (insert text)
254 ;; If the text does not include any diff markers and if we're not
255 ;; yanking back into a diff-mode buffer, get rid of the prefixes.
256 (unless (or mixed (derived-mode-p 'diff-mode))
257 (undo-boundary) ; Just in case the user wanted the prefixes.
258 (let ((re (save-excursion
259 (if (re-search-backward "^[><!][ \t]" start t)
260 (if (eq (char-after) ?!)
261 "^[!+- ][ \t]" "^[<>][ \t]")
262 "^[ <>!+-]"))))
263 (save-excursion
264 (while (re-search-backward re start t)
265 (replace-match "" t t)))))))
266
267
268 (defvar diff-font-lock-keywords
269 `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
270 (1 diff-hunk-header-face)
271 (2 diff-function-face))
272 ("^--- .+ ----$" . diff-hunk-header-face) ;context
273 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context
274 (1 diff-hunk-header-face)
275 (2 diff-function-face))
276 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context
277 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)\\(.*[^*-]\\)?\n"
278 (0 diff-header-face) (2 diff-file-header-face prepend))
279 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face)
280 ("^!.*\n" (0 diff-changed-face))
281 ("^[+>].*\n" (0 diff-added-face))
282 ("^[-<].*\n" (0 diff-removed-face))
283 ("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend))
284 ("^Only in .*\n" . diff-nonexistent-face)
285 ("^#.*" . font-lock-string-face)
286 ("^[^-=+*!<>].*\n" (0 diff-context-face))))
287
288 (defconst diff-font-lock-defaults
289 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))
290
291 (defvar diff-imenu-generic-expression
292 ;; Prefer second name as first is most likely to be a backup or
293 ;; version-control name. The [\t\n] at the end of the unidiff pattern
294 ;; catches Debian source diff files (which lack the trailing date).
295 '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)[\t\n]" 1) ; unidiffs
296 (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs
297
298 ;;;;
299 ;;;; Movement
300 ;;;;
301
302 (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
303 (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* .+\n---\\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
304 (defvar diff-narrowed-to nil)
305
306 (defun diff-end-of-hunk (&optional style)
307 (when (looking-at diff-hunk-header-re)
308 (unless style
309 ;; Especially important for unified (because headers are ambiguous).
310 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
311 (goto-char (match-end 0)))
312 (let ((end (and (re-search-forward (case style
313 ;; A `unified' header is ambiguous.
314 (unified (concat "^[^-+# \\]\\|"
315 diff-file-header-re))
316 (context "^[^-+#! \\]")
317 (normal "^[^<>#\\]")
318 (t "^[^-+#!<> \\]"))
319 nil t)
320 (match-beginning 0))))
321 ;; The return value is used by easy-mmode-define-navigation.
322 (goto-char (or end (point-max)))))
323
324 (defun diff-beginning-of-hunk ()
325 (beginning-of-line)
326 (unless (looking-at diff-hunk-header-re)
327 (forward-line 1)
328 (condition-case ()
329 (re-search-backward diff-hunk-header-re)
330 (error (error "Can't find the beginning of the hunk")))))
331
332 (defun diff-beginning-of-file ()
333 (beginning-of-line)
334 (unless (looking-at diff-file-header-re)
335 (forward-line 2)
336 (condition-case ()
337 (re-search-backward diff-file-header-re)
338 (error (error "Can't find the beginning of the file")))))
339
340 (defun diff-end-of-file ()
341 (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
342 (re-search-forward (concat "^[^-+#!<>0-9@* \\]\\|" diff-file-header-re)
343 nil 'move)
344 (if (match-beginning 1)
345 (goto-char (match-beginning 1))
346 (beginning-of-line)))
347
348 ;; Define diff-{hunk,file}-{prev,next}
349 (easy-mmode-define-navigation
350 diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view)
351 (easy-mmode-define-navigation
352 diff-file diff-file-header-re "file" diff-end-of-hunk)
353
354 (defun diff-restrict-view (&optional arg)
355 "Restrict the view to the current hunk.
356 If the prefix ARG is given, restrict the view to the current file instead."
357 (interactive "P")
358 (save-excursion
359 (if arg (diff-beginning-of-file) (diff-beginning-of-hunk))
360 (narrow-to-region (point)
361 (progn (if arg (diff-end-of-file) (diff-end-of-hunk))
362 (point)))
363 (set (make-local-variable 'diff-narrowed-to) (if arg 'file 'hunk))))
364
365
366 (defun diff-hunk-kill ()
367 "Kill current hunk."
368 (interactive)
369 (diff-beginning-of-hunk)
370 (let* ((start (point))
371 (nexthunk (when (re-search-forward diff-hunk-header-re nil t)
372 (match-beginning 0)))
373 (firsthunk (ignore-errors
374 (goto-char start)
375 (diff-beginning-of-file) (diff-hunk-next) (point)))
376 (nextfile (ignore-errors (diff-file-next) (point))))
377 (goto-char start)
378 (if (and firsthunk (= firsthunk start)
379 (or (null nexthunk)
380 (and nextfile (> nexthunk nextfile))))
381 ;; It's the only hunk for this file, so kill the file.
382 (diff-file-kill)
383 (diff-end-of-hunk)
384 (kill-region start (point)))))
385
386 (defun diff-file-kill ()
387 "Kill current file's hunks."
388 (interactive)
389 (diff-beginning-of-file)
390 (let* ((start (point))
391 (prevhunk (save-excursion
392 (ignore-errors
393 (diff-hunk-prev) (point))))
394 (index (save-excursion
395 (re-search-backward "^Index: " prevhunk t))))
396 (when index (setq start index))
397 (diff-end-of-file)
398 (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs.
399 (kill-region start (point))))
400
401 (defun diff-kill-junk ()
402 "Kill spurious empty diffs."
403 (interactive)
404 (save-excursion
405 (let ((inhibit-read-only t))
406 (goto-char (point-min))
407 (while (re-search-forward (concat "^\\(Index: .*\n\\)"
408 "\\([^-+!* <>].*\n\\)*?"
409 "\\(\\(Index:\\) \\|"
410 diff-file-header-re "\\)")
411 nil t)
412 (delete-region (if (match-end 4) (match-beginning 0) (match-end 1))
413 (match-beginning 3))
414 (beginning-of-line)))))
415
416 (defun diff-count-matches (re start end)
417 (save-excursion
418 (let ((n 0))
419 (goto-char start)
420 (while (re-search-forward re end t) (incf n))
421 n)))
422
423 (defun diff-split-hunk ()
424 "Split the current (unified diff) hunk at point into two hunks."
425 (interactive)
426 (beginning-of-line)
427 (let ((pos (point))
428 (start (progn (diff-beginning-of-hunk) (point))))
429 (unless (looking-at "@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@")
430 (error "diff-split-hunk only works on unified context diffs"))
431 (forward-line 1)
432 (let* ((start1 (string-to-number (match-string 1)))
433 (start2 (string-to-number (match-string 2)))
434 (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos)))
435 (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))))
436 (goto-char pos)
437 ;; Hopefully the after-change-function will not screw us over.
438 (insert "@@ -" (number-to-string newstart1) ",1 +"
439 (number-to-string newstart2) ",1 @@\n")
440 ;; Fix the original hunk-header.
441 (diff-fixup-modifs start pos))))
442
443
444 ;;;;
445 ;;;; jump to other buffers
446 ;;;;
447
448 (defvar diff-remembered-files-alist nil)
449
450 (defun diff-filename-drop-dir (file)
451 (when (string-match "/" file) (substring file (match-end 0))))
452
453 (defun diff-merge-strings (ancestor from to)
454 "Merge the diff between ANCESTOR and FROM into TO.
455 Returns the merged string if successful or nil otherwise.
456 The strings are assumed not to contain any \"\\n\" (i.e. end of line).
457 If ANCESTOR = FROM, returns TO.
458 If ANCESTOR = TO, returns FROM.
459 The heuristic is simplistic and only really works for cases
460 like \(diff-merge-strings \"b/foo\" \"b/bar\" \"/a/c/foo\")."
461 ;; Ideally, we want:
462 ;; AMB ANB CMD -> CND
463 ;; but that's ambiguous if `foo' or `bar' is empty:
464 ;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1
465 (let ((str (concat ancestor "\n" from "\n" to)))
466 (when (and (string-match (concat
467 "\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n"
468 "\\1\\(.*\\)\\3\n"
469 "\\(.*\\(\\2\\).*\\)\\'") str)
470 (equal to (match-string 5 str)))
471 (concat (substring str (match-beginning 5) (match-beginning 6))
472 (match-string 4 str)
473 (substring str (match-end 6) (match-end 5))))))
474
475 (defun diff-tell-file-name (old name)
476 "Tell Emacs where the find the source file of the current hunk.
477 If the OLD prefix arg is passed, tell the file NAME of the old file."
478 (interactive
479 (let* ((old current-prefix-arg)
480 (fs (diff-hunk-file-names current-prefix-arg)))
481 (unless fs (error "No file name to look for"))
482 (list old (read-file-name (format "File for %s: " (car fs))
483 nil (diff-find-file-name old) t))))
484 (let ((fs (diff-hunk-file-names old)))
485 (unless fs (error "No file name to look for"))
486 (push (cons fs name) diff-remembered-files-alist)))
487
488 (defun diff-hunk-file-names (&optional old)
489 "Give the list of file names textually mentioned for the current hunk."
490 (save-excursion
491 (unless (looking-at diff-file-header-re)
492 (or (ignore-errors (diff-beginning-of-file))
493 (re-search-forward diff-file-header-re nil t)))
494 (let ((limit (save-excursion
495 (condition-case ()
496 (progn (diff-hunk-prev) (point))
497 (error (point-min)))))
498 (header-files
499 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)")
500 (list (if old (match-string 1) (match-string 3))
501 (if old (match-string 3) (match-string 1)))
502 (forward-line 1) nil)))
503 (delq nil
504 (append
505 (when (and (not old)
506 (save-excursion
507 (re-search-backward "^Index: \\(.+\\)" limit t)))
508 (list (match-string 1)))
509 header-files
510 (when (re-search-backward
511 "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?"
512 nil t)
513 (list (if old (match-string 2) (match-string 4))
514 (if old (match-string 4) (match-string 2)))))))))
515
516 (defun diff-find-file-name (&optional old)
517 "Return the file corresponding to the current patch.
518 Non-nil OLD means that we want the old file."
519 (save-excursion
520 (unless (looking-at diff-file-header-re)
521 (or (ignore-errors (diff-beginning-of-file))
522 (re-search-forward diff-file-header-re nil t)))
523 (let ((fs (diff-hunk-file-names old)))
524 (or
525 ;; use any previously used preference
526 (cdr (assoc fs diff-remembered-files-alist))
527 ;; try to be clever and use previous choices as an inspiration
528 (dolist (rf diff-remembered-files-alist)
529 (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
530 (if (and newfile (file-exists-p newfile)) (return newfile))))
531 ;; look for each file in turn. If none found, try again but
532 ;; ignoring the first level of directory, ...
533 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
534 (file nil nil))
535 ((or (null files)
536 (setq file (do* ((files files (cdr files))
537 (file (car files) (car files)))
538 ((or (null file) (file-exists-p file))
539 file))))
540 file))
541 ;; <foo>.rej patches implicitly apply to <foo>
542 (and (string-match "\\.rej\\'" (or buffer-file-name ""))
543 (let ((file (substring buffer-file-name 0 (match-beginning 0))))
544 (when (file-exists-p file) file)))
545 ;; if all else fails, ask the user
546 (let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
547 nil (first fs) t (first fs))))
548 (set (make-local-variable 'diff-remembered-files-alist)
549 (cons (cons fs file) diff-remembered-files-alist))
550 file)))))
551
552
553 (defun diff-ediff-patch ()
554 "Call `ediff-patch-file' on the current buffer."
555 (interactive)
556 (condition-case err
557 (ediff-patch-file nil (current-buffer))
558 (wrong-number-of-arguments (ediff-patch-file))))
559
560 ;;;;
561 ;;;; Conversion functions
562 ;;;;
563
564 ;;(defvar diff-inhibit-after-change nil
565 ;; "Non-nil means inhibit `diff-mode's after-change functions.")
566
567 (defun diff-unified->context (start end)
568 "Convert unified diffs to context diffs.
569 START and END are either taken from the region (if a prefix arg is given) or
570 else cover the whole bufer."
571 (interactive (if current-prefix-arg
572 (list (mark) (point))
573 (list (point-min) (point-max))))
574 (unless (markerp end) (setq end (copy-marker end)))
575 (let (;;(diff-inhibit-after-change t)
576 (inhibit-read-only t))
577 (save-excursion
578 (goto-char start)
579 (while (and (re-search-forward "^\\(\\(---\\) .+\n\\(\\+\\+\\+\\) .+\\|@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\\)$" nil t)
580 (< (point) end))
581 (combine-after-change-calls
582 (if (match-beginning 2)
583 ;; we matched a file header
584 (progn
585 ;; use reverse order to make sure the indices are kept valid
586 (replace-match "---" t t nil 3)
587 (replace-match "***" t t nil 2))
588 ;; we matched a hunk header
589 (let ((line1 (match-string 4))
590 (lines1 (match-string 5))
591 (line2 (match-string 6))
592 (lines2 (match-string 7)))
593 (replace-match
594 (concat "***************\n*** " line1 ","
595 (number-to-string (+ (string-to-number line1)
596 (string-to-number lines1)
597 -1)) " ****"))
598 (forward-line 1)
599 (save-restriction
600 (narrow-to-region (point)
601 (progn (diff-end-of-hunk 'unified) (point)))
602 (let ((hunk (buffer-string)))
603 (goto-char (point-min))
604 (if (not (save-excursion (re-search-forward "^-" nil t)))
605 (delete-region (point) (point-max))
606 (goto-char (point-max))
607 (let ((modif nil) last-pt)
608 (while (progn (setq last-pt (point))
609 (= (forward-line -1) 0))
610 (case (char-after)
611 (? (insert " ") (setq modif nil) (backward-char 1))
612 (?+ (delete-region (point) last-pt) (setq modif t))
613 (?- (if (not modif)
614 (progn (forward-char 1)
615 (insert " "))
616 (delete-char 1)
617 (insert "! "))
618 (backward-char 2))
619 (?\\ (when (save-excursion (forward-line -1)
620 (= (char-after) ?+))
621 (delete-region (point) last-pt) (setq modif t)))
622 (t (setq modif nil))))))
623 (goto-char (point-max))
624 (save-excursion
625 (insert "--- " line2 ","
626 (number-to-string (+ (string-to-number line2)
627 (string-to-number lines2)
628 -1)) " ----\n" hunk))
629 ;;(goto-char (point-min))
630 (forward-line 1)
631 (if (not (save-excursion (re-search-forward "^+" nil t)))
632 (delete-region (point) (point-max))
633 (let ((modif nil) (delete nil))
634 (while (not (eobp))
635 (case (char-after)
636 (? (insert " ") (setq modif nil) (backward-char 1))
637 (?- (setq delete t) (setq modif t))
638 (?+ (if (not modif)
639 (progn (forward-char 1)
640 (insert " "))
641 (delete-char 1)
642 (insert "! "))
643 (backward-char 2))
644 (?\\ (when (save-excursion (forward-line 1)
645 (not (eobp)))
646 (setq delete t) (setq modif t)))
647 (t (setq modif nil)))
648 (let ((last-pt (point)))
649 (forward-line 1)
650 (when delete
651 (delete-region last-pt (point))
652 (setq delete nil)))))))))))))))
653
654 (defun diff-context->unified (start end)
655 "Convert context diffs to unified diffs.
656 START and END are either taken from the region (if a prefix arg is given) or
657 else cover the whole bufer."
658 (interactive (if current-prefix-arg
659 (list (mark) (point))
660 (list (point-min) (point-max))))
661 (unless (markerp end) (setq end (copy-marker end)))
662 (let (;;(diff-inhibit-after-change t)
663 (inhibit-read-only t))
664 (save-excursion
665 (goto-char start)
666 (while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t)
667 (< (point) end))
668 (combine-after-change-calls
669 (if (match-beginning 2)
670 ;; we matched a file header
671 (progn
672 ;; use reverse order to make sure the indices are kept valid
673 (replace-match "+++" t t nil 3)
674 (replace-match "---" t t nil 2))
675 ;; we matched a hunk header
676 (let ((line1s (match-string 4))
677 (line1e (match-string 5))
678 (pt1 (match-beginning 0)))
679 (replace-match "")
680 (unless (re-search-forward
681 "^--- \\([0-9]+\\),\\(-?[0-9]+\\) ----$" nil t)
682 (error "Can't find matching `--- n1,n2 ----' line"))
683 (let ((line2s (match-string 1))
684 (line2e (match-string 2))
685 (pt2 (progn
686 (delete-region (progn (beginning-of-line) (point))
687 (progn (forward-line 1) (point)))
688 (point-marker))))
689 (goto-char pt1)
690 (forward-line 1)
691 (while (< (point) pt2)
692 (case (char-after)
693 ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
694 (?\ ;merge with the other half of the chunk
695 (let* ((endline2
696 (save-excursion
697 (goto-char pt2) (forward-line 1) (point)))
698 (c (char-after pt2)))
699 (case c
700 ((?! ?+)
701 (insert "+"
702 (prog1 (buffer-substring (+ pt2 2) endline2)
703 (delete-region pt2 endline2))))
704 (?\ ;FIXME: check consistency
705 (delete-region pt2 endline2)
706 (delete-char 1)
707 (forward-line 1))
708 (?\\ (forward-line 1))
709 (t (delete-char 1) (forward-line 1)))))
710 (t (forward-line 1))))
711 (while (looking-at "[+! ] ")
712 (if (/= (char-after) ?!) (forward-char 1)
713 (delete-char 1) (insert "+"))
714 (delete-char 1) (forward-line 1))
715 (save-excursion
716 (goto-char pt1)
717 (insert "@@ -" line1s ","
718 (number-to-string (- (string-to-number line1e)
719 (string-to-number line1s)
720 -1))
721 " +" line2s ","
722 (number-to-string (- (string-to-number line2e)
723 (string-to-number line2s)
724 -1)) " @@"))))))))))
725
726 (defun diff-reverse-direction (start end)
727 "Reverse the direction of the diffs.
728 START and END are either taken from the region (if a prefix arg is given) or
729 else cover the whole bufer."
730 (interactive (if current-prefix-arg
731 (list (mark) (point))
732 (list (point-min) (point-max))))
733 (unless (markerp end) (setq end (copy-marker end)))
734 (let (;;(diff-inhibit-after-change t)
735 (inhibit-read-only t))
736 (save-excursion
737 (goto-char start)
738 (while (and (re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil t)
739 (< (point) end))
740 (combine-after-change-calls
741 (cond
742 ;; a file header
743 ((match-beginning 2) (replace-match "\\2\\5\n\\4\\3" nil))
744 ;; a context-diff hunk header
745 ((match-beginning 6)
746 (let ((pt-lines1 (match-beginning 6))
747 (lines1 (match-string 6)))
748 (replace-match "" nil nil nil 6)
749 (forward-line 1)
750 (let ((half1s (point)))
751 (while (looking-at "[-! \\][ \t]\\|#")
752 (when (= (char-after) ?-) (delete-char 1) (insert "+"))
753 (forward-line 1))
754 (let ((half1 (delete-and-extract-region half1s (point))))
755 (unless (looking-at "^--- \\([0-9]+,-?[0-9]+\\) ----$")
756 (insert half1)
757 (error "Can't find matching `--- n1,n2 ----' line"))
758 (let ((str1 (match-string 1)))
759 (replace-match lines1 nil nil nil 1)
760 (forward-line 1)
761 (let ((half2s (point)))
762 (while (looking-at "[!+ \\][ \t]\\|#")
763 (when (= (char-after) ?+) (delete-char 1) (insert "-"))
764 (forward-line 1))
765 (let ((half2 (delete-and-extract-region half2s (point))))
766 (insert (or half1 ""))
767 (goto-char half1s)
768 (insert (or half2 ""))))
769 (goto-char pt-lines1)
770 (insert str1))))))
771 ;; a unified-diff hunk header
772 ((match-beginning 7)
773 (replace-match "@@ -\\8 +\\7 @@" nil)
774 (forward-line 1)
775 (let ((c (char-after)) first last)
776 (while (case (setq c (char-after))
777 (?- (setq first (or first (point)))
778 (delete-char 1) (insert "+") t)
779 (?+ (setq last (or last (point)))
780 (delete-char 1) (insert "-") t)
781 ((?\\ ?#) t)
782 (t (when (and first last (< first last))
783 (insert (delete-and-extract-region first last)))
784 (setq first nil last nil)
785 (equal ?\ c)))
786 (forward-line 1))))))))))
787
788 (defun diff-fixup-modifs (start end)
789 "Fixup the hunk headers (in case the buffer was modified).
790 START and END are either taken from the region (if a prefix arg is given) or
791 else cover the whole bufer."
792 (interactive (if current-prefix-arg
793 (list (mark) (point))
794 (list (point-min) (point-max))))
795 (let ((inhibit-read-only t))
796 (save-excursion
797 (goto-char end) (diff-end-of-hunk)
798 (let ((plus 0) (minus 0) (space 0) (bang 0))
799 (while (and (= (forward-line -1) 0) (<= start (point)))
800 (if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] .+ [-*][-*][-*][-*]\\)$"))
801 (case (char-after)
802 (?\ (incf space))
803 (?+ (incf plus))
804 (?- (incf minus))
805 (?! (incf bang))
806 ((?\\ ?#) nil)
807 (t (setq space 0 plus 0 minus 0 bang 0)))
808 (cond
809 ((looking-at "@@ -[0-9]+,\\([0-9]*\\) \\+[0-9]+,\\([0-9]*\\) @@.*$")
810 (let* ((old1 (match-string 1))
811 (old2 (match-string 2))
812 (new1 (number-to-string (+ space minus)))
813 (new2 (number-to-string (+ space plus))))
814 (unless (string= new2 old2) (replace-match new2 t t nil 2))
815 (unless (string= new1 old1) (replace-match new1 t t nil 1))))
816 ((looking-at "--- \\([0-9]+\\),\\([0-9]*\\) ----$")
817 (when (> (+ space bang plus) 0)
818 (let* ((old1 (match-string 1))
819 (old2 (match-string 2))
820 (new (number-to-string
821 (+ space bang plus -1 (string-to-number old1)))))
822 (unless (string= new old2) (replace-match new t t nil 2)))))
823 ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$")
824 (when (> (+ space bang minus) 0)
825 (let* ((old (match-string 1))
826 (new (format
827 (concat "%0" (number-to-string (length old)) "d")
828 (+ space bang minus -1 (string-to-number old)))))
829 (unless (string= new old) (replace-match new t t nil 2))))))
830 (setq space 0 plus 0 minus 0 bang 0)))))))
831
832 ;;;;
833 ;;;; Hooks
834 ;;;;
835
836 (defun diff-write-contents-hooks ()
837 "Fixup hunk headers if necessary."
838 (if (buffer-modified-p) (diff-fixup-modifs (point-min) (point-max)))
839 nil)
840
841 ;; It turns out that making changes in the buffer from within an
842 ;; *-change-function is asking for trouble, whereas making them
843 ;; from a post-command-hook doesn't pose much problems
844 (defvar diff-unhandled-changes nil)
845 (defun diff-after-change-function (beg end len)
846 "Remember to fixup the hunk header.
847 See `after-change-functions' for the meaning of BEG, END and LEN."
848 ;; Ignoring changes when inhibit-read-only is set is strictly speaking
849 ;; incorrect, but it turns out that inhibit-read-only is normally not set
850 ;; inside editing commands, while it tends to be set when the buffer gets
851 ;; updated by an async process or by a conversion function, both of which
852 ;; would rather not be uselessly slowed down by this hook.
853 (when (and (not undo-in-progress) (not inhibit-read-only))
854 (if diff-unhandled-changes
855 (setq diff-unhandled-changes
856 (cons (min beg (car diff-unhandled-changes))
857 (max end (cdr diff-unhandled-changes))))
858 (setq diff-unhandled-changes (cons beg end)))))
859
860 (defun diff-post-command-hook ()
861 "Fixup hunk headers if necessary."
862 (when (consp diff-unhandled-changes)
863 (ignore-errors
864 (save-excursion
865 (goto-char (car diff-unhandled-changes))
866 ;; Maybe we've cut the end of the hunk before point.
867 (if (and (bolp) (not (bobp))) (backward-char 1))
868 ;; We used to fixup modifs on all the changes, but it turns out
869 ;; that it's safer not to do it on big changes, for example
870 ;; when yanking a big diff, since we might then screw up perfectly
871 ;; correct values. -stef
872 ;; (unless (ignore-errors
873 ;; (diff-beginning-of-hunk)
874 ;; (save-excursion
875 ;; (diff-end-of-hunk)
876 ;; (> (point) (car diff-unhandled-changes))))
877 ;; (goto-char (car diff-unhandled-changes))
878 ;; (re-search-forward diff-hunk-header-re (cdr diff-unhandled-changes))
879 ;; (diff-beginning-of-hunk))
880 ;; (diff-fixup-modifs (point) (cdr diff-unhandled-changes))
881 (diff-beginning-of-hunk)
882 (when (save-excursion
883 (diff-end-of-hunk)
884 (>= (point) (cdr diff-unhandled-changes)))
885 (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
886 (setq diff-unhandled-changes nil)))
887
888 (defun diff-next-error (arg reset)
889 ;; Select a window that displays the current buffer so that point
890 ;; movements are reflected in that window. Otherwise, the user might
891 ;; never see the hunk corresponding to the source she's jumping to.
892 (pop-to-buffer (current-buffer))
893 (if reset (goto-char (point-min)))
894 (diff-hunk-next arg)
895 (diff-goto-source))
896
897 ;;;###autoload
898 (define-derived-mode diff-mode fundamental-mode "Diff"
899 "Major mode for viewing/editing context diffs.
900 Supports unified and context diffs as well as (to a lesser extent)
901 normal diffs.
902 When the buffer is read-only, the ESC prefix is not necessary.
903 IF you edit the buffer manually, diff-mode will try to update the hunk
904 headers for you on-the-fly.
905
906 You can also switch between context diff and unified diff with \\[diff-context->unified],
907 or vice versa with \\[diff-unified->context] and you can also revert the direction of
908 a diff with \\[diff-reverse-direction]."
909 (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
910 (set (make-local-variable 'outline-regexp) diff-outline-regexp)
911 (set (make-local-variable 'imenu-generic-expression)
912 diff-imenu-generic-expression)
913 ;; These are not perfect. They would be better done separately for
914 ;; context diffs and unidiffs.
915 ;; (set (make-local-variable 'paragraph-start)
916 ;; (concat "@@ " ; unidiff hunk
917 ;; "\\|\\*\\*\\* " ; context diff hunk or file start
918 ;; "\\|--- [^\t]+\t")) ; context or unidiff file
919 ;; ; start (first or second line)
920 ;; (set (make-local-variable 'paragraph-separate) paragraph-start)
921 ;; (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
922 ;; compile support
923 (set (make-local-variable 'next-error-function) 'diff-next-error)
924
925 (when (and (> (point-max) (point-min)) diff-default-read-only)
926 (toggle-read-only t))
927 ;; setup change hooks
928 (if (not diff-update-on-the-fly)
929 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
930 (make-local-variable 'diff-unhandled-changes)
931 (add-hook 'after-change-functions 'diff-after-change-function nil t)
932 (add-hook 'post-command-hook 'diff-post-command-hook nil t))
933 ;; Neat trick from Dave Love to add more bindings in read-only mode:
934 (let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
935 (add-to-list 'minor-mode-overriding-map-alist ro-bind)
936 ;; Turn off this little trick in case the buffer is put in view-mode.
937 (add-hook 'view-mode-hook
938 `(lambda ()
939 (setq minor-mode-overriding-map-alist
940 (delq ',ro-bind minor-mode-overriding-map-alist)))
941 nil t))
942 ;; add-log support
943 (set (make-local-variable 'add-log-current-defun-function)
944 'diff-current-defun)
945 (set (make-local-variable 'add-log-buffer-file-name-function)
946 'diff-find-file-name))
947
948 ;;;###autoload
949 (define-minor-mode diff-minor-mode
950 "Minor mode for viewing/editing context diffs.
951 \\{diff-minor-mode-map}"
952 nil " Diff" nil
953 ;; FIXME: setup font-lock
954 ;; setup change hooks
955 (if (not diff-update-on-the-fly)
956 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
957 (make-local-variable 'diff-unhandled-changes)
958 (add-hook 'after-change-functions 'diff-after-change-function nil t)
959 (add-hook 'post-command-hook 'diff-post-command-hook nil t)))
960
961 ;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
962
963 (defun diff-delete-if-empty ()
964 ;; An empty diff file means there's no more diffs to integrate, so we
965 ;; can just remove the file altogether. Very handy for .rej files if we
966 ;; remove hunks as we apply them.
967 (when (and buffer-file-name
968 (eq 0 (nth 7 (file-attributes buffer-file-name))))
969 (delete-file buffer-file-name)))
970
971 (defun diff-delete-empty-files ()
972 "Arrange for empty diff files to be removed."
973 (add-hook 'after-save-hook 'diff-delete-if-empty nil t))
974
975 (defun diff-make-unified ()
976 "Turn context diffs into unified diffs if applicable."
977 (if (save-excursion
978 (goto-char (point-min))
979 (and (looking-at diff-hunk-header-re) (eq (char-after) ?*)))
980 (let ((mod (buffer-modified-p)))
981 (unwind-protect
982 (diff-context->unified (point-min) (point-max))
983 (restore-buffer-modified-p mod)))))
984
985 ;;;
986 ;;; Misc operations that have proved useful at some point.
987 ;;;
988
989 (defun diff-next-complex-hunk ()
990 "Jump to the next \"complex\" hunk.
991 \"Complex\" is approximated by \"the hunk changes the number of lines\".
992 Only works for unified diffs."
993 (interactive)
994 (while
995 (and (re-search-forward "^@@ [-0-9]+,\\([0-9]+\\) [+0-9]+,\\([0-9]+\\) @@"
996 nil t)
997 (equal (match-string 1) (match-string 2)))))
998
999 (defun diff-hunk-text (hunk destp char-offset)
1000 "Return the literal source text from HUNK as (TEXT . OFFSET).
1001 if DESTP is nil TEXT is the source, otherwise the destination text.
1002 CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding
1003 char-offset in TEXT."
1004 (with-temp-buffer
1005 (insert hunk)
1006 (goto-char (point-min))
1007 (let ((src-pos nil)
1008 (dst-pos nil)
1009 (divider-pos nil)
1010 (num-pfx-chars 2))
1011 ;; Set the following variables:
1012 ;; SRC-POS buffer pos of the source part of the hunk or nil if none
1013 ;; DST-POS buffer pos of the destination part of the hunk or nil
1014 ;; DIVIDER-POS buffer pos of any divider line separating the src & dst
1015 ;; NUM-PFX-CHARS number of line-prefix characters used by this format"
1016 (cond ((looking-at "^@@")
1017 ;; unified diff
1018 (setq num-pfx-chars 1)
1019 (forward-line 1)
1020 (setq src-pos (point) dst-pos (point)))
1021 ((looking-at "^\\*\\*")
1022 ;; context diff
1023 (forward-line 2)
1024 (setq src-pos (point))
1025 (re-search-forward "^--- " nil t)
1026 (forward-line 0)
1027 (setq divider-pos (point))
1028 (forward-line 1)
1029 (setq dst-pos (point)))
1030 ((looking-at "^[0-9]+a[0-9,]+$")
1031 ;; normal diff, insert
1032 (forward-line 1)
1033 (setq dst-pos (point)))
1034 ((looking-at "^[0-9,]+d[0-9]+$")
1035 ;; normal diff, delete
1036 (forward-line 1)
1037 (setq src-pos (point)))
1038 ((looking-at "^[0-9,]+c[0-9,]+$")
1039 ;; normal diff, change
1040 (forward-line 1)
1041 (setq src-pos (point))
1042 (re-search-forward "^---$" nil t)
1043 (forward-line 0)
1044 (setq divider-pos (point))
1045 (forward-line 1)
1046 (setq dst-pos (point)))
1047 (t
1048 (error "Unknown diff hunk type")))
1049
1050 (if (if destp (null dst-pos) (null src-pos))
1051 ;; Implied empty text
1052 (if char-offset '("" . 0) "")
1053
1054 ;; For context diffs, either side can be empty, (if there's only
1055 ;; added or only removed text). We should then use the other side.
1056 (cond ((equal src-pos divider-pos) (setq src-pos dst-pos))
1057 ((equal dst-pos (point-max)) (setq dst-pos src-pos)))
1058
1059 (when char-offset (goto-char (+ (point-min) char-offset)))
1060
1061 ;; Get rid of anything except the desired text.
1062 (save-excursion
1063 ;; Delete unused text region
1064 (let ((keep (if destp dst-pos src-pos)))
1065 (when (and divider-pos (> divider-pos keep))
1066 (delete-region divider-pos (point-max)))
1067 (delete-region (point-min) keep))
1068 ;; Remove line-prefix characters, and unneeded lines (unified diffs).
1069 (let ((kill-char (if destp ?- ?+)))
1070 (goto-char (point-min))
1071 (while (not (eobp))
1072 (if (eq (char-after) kill-char)
1073 (delete-region (point) (progn (forward-line 1) (point)))
1074 (delete-char num-pfx-chars)
1075 (forward-line 1)))))
1076
1077 (let ((text (buffer-substring-no-properties (point-min) (point-max))))
1078 (if char-offset (cons text (- (point) (point-min))) text))))))
1079
1080
1081 (defun diff-find-text (text)
1082 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
1083 If TEXT isn't found, nil is returned."
1084 (let* ((orig (point))
1085 (forw (and (search-forward text nil t)
1086 (cons (match-beginning 0) (match-end 0))))
1087 (back (and (goto-char (+ orig (length text)))
1088 (search-backward text nil t)
1089 (cons (match-beginning 0) (match-end 0)))))
1090 ;; Choose the closest match.
1091 (if (and forw back)
1092 (if (> (- (car forw) orig) (- orig (car back))) back forw)
1093 (or back forw))))
1094
1095 (defun diff-find-approx-text (text)
1096 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
1097 Whitespace differences are ignored."
1098 (let* ((orig (point))
1099 (re (concat "^[ \t\n ]*"
1100 (mapconcat 'regexp-quote (split-string text) "[ \t\n ]+")
1101 "[ \t\n ]*\n"))
1102 (forw (and (re-search-forward re nil t)
1103 (cons (match-beginning 0) (match-end 0))))
1104 (back (and (goto-char (+ orig (length text)))
1105 (re-search-backward re nil t)
1106 (cons (match-beginning 0) (match-end 0)))))
1107 ;; Choose the closest match.
1108 (if (and forw back)
1109 (if (> (- (car forw) orig) (- orig (car back))) back forw)
1110 (or back forw))))
1111
1112 (defsubst diff-xor (a b) (if a (not b) b))
1113
1114 (defun diff-find-source-location (&optional other-file reverse)
1115 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED).
1116 BUF is the buffer corresponding to the source file.
1117 LINE-OFFSET is the offset between the expected and actual positions
1118 of the text of the hunk or nil if the text was not found.
1119 POS is a pair (BEG . END) indicating the position of the text in the buffer.
1120 SRC and DST are the two variants of text as returned by `diff-hunk-text'.
1121 SRC is the variant that was found in the buffer.
1122 SWITCHED is non-nil if the patch is already applied."
1123 (save-excursion
1124 (let* ((other (diff-xor other-file diff-jump-to-old-file))
1125 (char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
1126 (hunk (buffer-substring (point)
1127 (save-excursion (diff-end-of-hunk) (point))))
1128 (old (diff-hunk-text hunk reverse char-offset))
1129 (new (diff-hunk-text hunk (not reverse) char-offset))
1130 ;; Find the location specification.
1131 (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
1132 (error "Can't find the hunk header")
1133 (if other (match-string 1)
1134 (if (match-end 3) (match-string 3)
1135 (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
1136 (error "Can't find the hunk separator"))
1137 (match-string 1)))))
1138 (file (or (diff-find-file-name other) (error "Can't find the file")))
1139 (buf (find-file-noselect file)))
1140 ;; Update the user preference if he so wished.
1141 (when (> (prefix-numeric-value other-file) 8)
1142 (setq diff-jump-to-old-file other))
1143 (with-current-buffer buf
1144 (goto-line (string-to-number line))
1145 (let* ((orig-pos (point))
1146 (switched nil)
1147 ;; FIXME: Check for case where both OLD and NEW are found.
1148 (pos (or (diff-find-text (car old))
1149 (progn (setq switched t) (diff-find-text (car new)))
1150 (progn (setq switched nil)
1151 (condition-case nil
1152 (diff-find-approx-text (car old))
1153 (invalid-regexp nil))) ;Regex too big.
1154 (progn (setq switched t)
1155 (condition-case nil
1156 (diff-find-approx-text (car new))
1157 (invalid-regexp nil))) ;Regex too big.
1158 (progn (setq switched nil) nil))))
1159 (nconc
1160 (list buf)
1161 (if pos
1162 (list (count-lines orig-pos (car pos)) pos)
1163 (list nil (cons orig-pos (+ orig-pos (length (car old))))))
1164 (if switched (list new old t) (list old new))))))))
1165
1166
1167 (defun diff-hunk-status-msg (line-offset reversed dry-run)
1168 (let ((msg (if dry-run
1169 (if reversed "already applied" "not yet applied")
1170 (if reversed "undone" "applied"))))
1171 (message (cond ((null line-offset) "Hunk text not found")
1172 ((= line-offset 0) "Hunk %s")
1173 ((= line-offset 1) "Hunk %s at offset %d line")
1174 (t "Hunk %s at offset %d lines"))
1175 msg line-offset)))
1176
1177
1178 (defun diff-apply-hunk (&optional reverse)
1179 "Apply the current hunk to the source file and go to the next.
1180 By default, the new source file is patched, but if the variable
1181 `diff-jump-to-old-file' is non-nil, then the old source file is
1182 patched instead (some commands, such as `diff-goto-source' can change
1183 the value of this variable when given an appropriate prefix argument).
1184
1185 With a prefix argument, REVERSE the hunk."
1186 (interactive "P")
1187 (destructuring-bind (buf line-offset pos old new &optional switched)
1188 ;; If REVERSE go to the new file, otherwise go to the old.
1189 (diff-find-source-location (not reverse) reverse)
1190 (cond
1191 ((null line-offset)
1192 (error "Can't find the text to patch"))
1193 ((and switched
1194 ;; A reversed patch was detected, perhaps apply it in reverse.
1195 (not (save-window-excursion
1196 (pop-to-buffer buf)
1197 (goto-char (+ (car pos) (cdr old)))
1198 (y-or-n-p
1199 (if reverse
1200 "Hunk hasn't been applied yet; apply it now? "
1201 "Hunk has already been applied; undo it? ")))))
1202 (message "(Nothing done)"))
1203 (t
1204 ;; Apply the hunk
1205 (with-current-buffer buf
1206 (goto-char (car pos))
1207 (delete-region (car pos) (cdr pos))
1208 (insert (car new)))
1209 ;; Display BUF in a window
1210 (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))
1211 (diff-hunk-status-msg line-offset (diff-xor switched reverse) nil)
1212 (when diff-advance-after-apply-hunk
1213 (diff-hunk-next))))))
1214
1215
1216 (defun diff-test-hunk (&optional reverse)
1217 "See whether it's possible to apply the current hunk.
1218 With a prefix argument, try to REVERSE the hunk."
1219 (interactive "P")
1220 (destructuring-bind (buf line-offset pos src dst &optional switched)
1221 ;; If REVERSE go to the new file, otherwise go to the old.
1222 (diff-find-source-location (not reverse) reverse)
1223 (set-window-point (display-buffer buf) (+ (car pos) (cdr src)))
1224 (diff-hunk-status-msg line-offset (diff-xor reverse switched) t)))
1225
1226
1227 (defalias 'diff-mouse-goto-source 'diff-goto-source)
1228
1229 (defun diff-goto-source (&optional other-file event)
1230 "Jump to the corresponding source line.
1231 `diff-jump-to-old-file' (or its opposite if the OTHER-FILE prefix arg
1232 is given) determines whether to jump to the old or the new file.
1233 If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument])
1234 then `diff-jump-to-old-file' is also set, for the next invocations."
1235 (interactive (list current-prefix-arg last-input-event))
1236 ;; When pointing at a removal line, we probably want to jump to
1237 ;; the old location, and else to the new (i.e. as if reverting).
1238 ;; This is a convenient detail when using smerge-diff.
1239 (if event (posn-set-point (event-end event)))
1240 (let ((rev (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
1241 (destructuring-bind (buf line-offset pos src dst &optional switched)
1242 (diff-find-source-location other-file rev)
1243 (pop-to-buffer buf)
1244 (goto-char (+ (car pos) (cdr src)))
1245 (diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
1246
1247
1248 (defun diff-current-defun ()
1249 "Find the name of function at point.
1250 For use in `add-log-current-defun-function'."
1251 (save-excursion
1252 (when (looking-at diff-hunk-header-re)
1253 (forward-line 1)
1254 (while (and (looking-at " ") (not (zerop (forward-line 1))))))
1255 (destructuring-bind (buf line-offset pos src dst &optional switched)
1256 (diff-find-source-location)
1257 (beginning-of-line)
1258 (or (when (memq (char-after) '(?< ?-))
1259 ;; Cursor is pointing at removed text. This could be a removed
1260 ;; function, in which case, going to the source buffer will
1261 ;; not help since the function is now removed. Instead,
1262 ;; try to figure out the function name just from the code-fragment.
1263 (let ((old (if switched dst src)))
1264 (with-temp-buffer
1265 (insert (car old))
1266 (funcall (with-current-buffer buf major-mode))
1267 (goto-char (+ (point-min) (cdr old)))
1268 (add-log-current-defun))))
1269 (with-current-buffer buf
1270 (goto-char (+ (car pos) (cdr src)))
1271 (add-log-current-defun))))))
1272
1273 (defun diff-refine-hunk ()
1274 "Refine the current hunk by ignoring space differences."
1275 (interactive)
1276 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
1277 (opts (case (char-after) (?@ "-bu") (?* "-bc") (t "-b")))
1278 (line-nb (and (or (looking-at "[^0-9]+\\([0-9]+\\)")
1279 (error "Can't find line number"))
1280 (string-to-number (match-string 1))))
1281 (hunk (delete-and-extract-region
1282 (point) (save-excursion (diff-end-of-hunk) (point))))
1283 (lead (make-string (1- line-nb) ?\n)) ;Line nums start at 1.
1284 (file1 (make-temp-file "diff1"))
1285 (file2 (make-temp-file "diff2"))
1286 (coding-system-for-read buffer-file-coding-system)
1287 old new)
1288 (unwind-protect
1289 (save-excursion
1290 (setq old (diff-hunk-text hunk nil char-offset))
1291 (setq new (diff-hunk-text hunk t char-offset))
1292 (write-region (concat lead (car old)) nil file1 nil 'nomessage)
1293 (write-region (concat lead (car new)) nil file2 nil 'nomessage)
1294 (with-temp-buffer
1295 (let ((status
1296 (call-process diff-command nil t nil
1297 opts file1 file2)))
1298 (case status
1299 (0 nil) ;Nothing to reformat.
1300 (1 (goto-char (point-min))
1301 ;; Remove the file-header.
1302 (when (re-search-forward diff-hunk-header-re nil t)
1303 (delete-region (point-min) (match-beginning 0))))
1304 (t (goto-char (point-max))
1305 (unless (bolp) (insert "\n"))
1306 (insert hunk)))
1307 (setq hunk (buffer-string))
1308 (unless (memq status '(0 1))
1309 (error "Diff returned: %s" status)))))
1310 ;; Whatever happens, put back some equivalent text: either the new
1311 ;; one or the original one in case some error happened.
1312 (insert hunk)
1313 (delete-file file1)
1314 (delete-file file2))))
1315
1316 ;; provide the package
1317 (provide 'diff-mode)
1318
1319 ;;; Old Change Log from when diff-mode wasn't part of Emacs:
1320 ;; Revision 1.11 1999/10/09 23:38:29 monnier
1321 ;; (diff-mode-load-hook): dropped.
1322 ;; (auto-mode-alist): also catch *.diffs.
1323 ;; (diff-find-file-name, diff-mode): add smarts to find the right file
1324 ;; for *.rej files (that lack any file name indication).
1325 ;;
1326 ;; Revision 1.10 1999/09/30 15:32:11 monnier
1327 ;; added support for "\ No newline at end of file".
1328 ;;
1329 ;; Revision 1.9 1999/09/15 00:01:13 monnier
1330 ;; - added basic `compile' support.
1331 ;; - have diff-kill-hunk call diff-kill-file if it's the only hunk.
1332 ;; - diff-kill-file now tries to kill the leading garbage as well.
1333 ;;
1334 ;; Revision 1.8 1999/09/13 21:10:09 monnier
1335 ;; - don't use CL in the autoloaded code
1336 ;; - accept diffs using -T
1337 ;;
1338 ;; Revision 1.7 1999/09/05 20:53:03 monnier
1339 ;; interface to ediff-patch
1340 ;;
1341 ;; Revision 1.6 1999/09/01 20:55:13 monnier
1342 ;; (ediff=patch-file): add bindings to call ediff-patch.
1343 ;; (diff-find-file-name): taken out of diff-goto-source.
1344 ;; (diff-unified->context, diff-context->unified, diff-reverse-direction,
1345 ;; diff-fixup-modifs): only use the region if a prefix arg is given.
1346 ;;
1347 ;; Revision 1.5 1999/08/31 19:18:52 monnier
1348 ;; (diff-beginning-of-file, diff-prev-file): fixed wrong parenthesis.
1349 ;;
1350 ;; Revision 1.4 1999/08/31 13:01:44 monnier
1351 ;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
1352 ;;
1353
1354 ;;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66
1355 ;;; diff-mode.el ends here

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26