Mercurial > emacs
annotate lisp/diff.el @ 1110:f165d900e06e
*** empty log message ***
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 13 Sep 1992 06:01:19 +0000 |
parents | 48ca3bf4b5f8 |
children | 1dba066c1e0a |
rev | line source |
---|---|
894 | 1 ;;; diff.el --- Run `diff' in compilation-mode. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
2 |
894 | 3 ;; Copyright (C) 1992 Free Software Foundation, Inc. |
4 | |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
5 ;; Keyword: unix, tools |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
6 |
349 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
11 ;; the Free Software Foundation; either version 2, or (at your option) |
349 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
21 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
22 | |
894 | 23 ;;; Code: |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
24 |
894 | 25 (require 'compile) |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
26 |
349 | 27 (defvar diff-switches nil |
894 | 28 "*A string or list of strings specifying switches to be be passed to diff.") |
29 | |
30 (defvar diff-regexp-alist | |
31 '( | |
32 ;; -u format: @@ -OLDSTART,OLDEND +NEWSTART,NEWEND @@ | |
33 ("^@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@$" 1 2) | |
34 | |
35 ;; -c format: *** OLDSTART,OLDEND **** | |
36 ("^\\*\\*\\* \\([0-9]+\\),[0-9]+ \\*\\*\\*\\*$" 1 nil) | |
37 ;; --- NEWSTART,NEWEND ---- | |
38 ("^--- \\([0-9]+\\),[0-9]+ ----$" nil 1) | |
39 | |
40 ;; plain diff format: OLDSTART[,OLDEND]{a,d,c}NEWSTART[,NEWEND] | |
41 ("^\\([0-9]+\\)\\(,[0-9]+\\)?[adc]\\([0-9]+\\)\\(,[0-9]+\\)?$" 1 3) | |
42 | |
43 ;; -e (ed) format: OLDSTART[,OLDEND]{a,d,c} | |
44 ("^\\([0-9]+\\)\\(,[0-9]+\\)?[adc]$" 1) | |
349 | 45 |
894 | 46 ;; -f format: {a,d,c}OLDSTART[ OLDEND] |
47 ;; -n format: {a,d,c}OLDSTART LINES-CHANGED | |
48 ("^[adc]\\([0-9]+\\)\\( [0-9]+\\)?$" 1) | |
49 ) | |
50 "Alist (REGEXP OLD-IDX NEW-IDX) of regular expressions to match difference | |
51 sections in \\[diff] output. If REGEXP matches, the OLD-IDX'th | |
52 subexpression gives the line number in the old file, and NEW-IDX'th | |
53 subexpression gives the line number in the new file. If OLD-IDX or NEW-IDX | |
54 is nil, REGEXP matches only half a section.") | |
349 | 55 |
894 | 56 ;; See compilation-parse-errors-function (compile.el). |
907 | 57 (defun diff-parse-differences (limit-search find-at-least) |
894 | 58 (setq compilation-error-list nil) |
59 (message "Parsing differences...") | |
60 | |
61 ;; Don't reparse diffs already seen at last parse. | |
62 (goto-char compilation-parsing-end) | |
474 | 63 |
894 | 64 ;; Construct in REGEXP a regexp composed of all those in dired-regexp-alist. |
65 (let ((regexp (mapconcat (lambda (elt) | |
66 (concat "\\(" (car elt) "\\)")) | |
67 diff-regexp-alist | |
68 "\\|")) | |
69 ;; (GROUP-IDX OLD-IDX NEW-IDX) | |
70 (groups (let ((subexpr 1)) | |
71 (mapcar (lambda (elt) | |
72 (prog1 | |
73 (cons subexpr | |
74 (mapcar (lambda (n) | |
75 (and n | |
76 (+ subexpr n))) | |
77 (cdr elt))) | |
78 (setq subexpr (+ subexpr 1 | |
79 (count-regexp-groupings | |
80 (car elt)))))) | |
81 diff-regexp-alist))) | |
82 | |
83 (new-error | |
84 (function (lambda (file subexpr) | |
85 (setq compilation-error-list | |
86 (cons | |
87 (cons (set-marker (make-marker) | |
88 (match-beginning subexpr) | |
89 (current-buffer)) | |
90 (let ((line (string-to-int | |
91 (buffer-substring | |
92 (match-beginning subexpr) | |
93 (match-end subexpr))))) | |
94 (save-excursion | |
95 (set-buffer (find-file-noselect file)) | |
96 (save-excursion | |
97 (goto-line line) | |
98 (point-marker))))) | |
99 compilation-error-list))))) | |
100 | |
101 (found-desired nil) | |
102 g) | |
103 | |
104 (while (and (not found-desired) | |
105 ;; We don't just pass LIMIT-SEARCH to re-search-forward | |
106 ;; because we want to find matches containing LIMIT-SEARCH | |
107 ;; but which extend past it. | |
108 (re-search-forward regexp nil t)) | |
109 | |
110 ;; Find which individual regexp matched. | |
111 (setq g groups) | |
112 (while (and g (null (match-beginning (car (car g))))) | |
113 (setq g (cdr g))) | |
114 (setq g (car g)) | |
115 | |
116 (if (nth 1 g) ;OLD-IDX | |
117 (funcall new-error diff-old-file (nth 1 g))) | |
118 (if (nth 2 g) ;NEW-IDX | |
119 (funcall new-error diff-new-file (nth 2 g))) | |
120 | |
907 | 121 (if (or (and find-at-least (>= nfound find-at-least)) |
122 (and limit-search (>= (point) limit-search))) | |
123 ;; We have found as many new errors as the user wants, | |
124 ;; or the user wanted a specific diff, and we're past it. | |
125 (setq found-desired t))) | |
894 | 126 (if found-desired |
127 (setq compilation-parsing-end (point)) | |
128 ;; Set to point-max, not point, so we don't perpetually | |
129 ;; parse the last bit of text when it isn't a diff header. | |
130 (setq compilation-parsing-end (point-max)) | |
131 (message "Parsing differences...done"))) | |
132 (setq compilation-error-list (nreverse compilation-error-list))) | |
349 | 133 |
134 ;;;###autoload | |
894 | 135 (defun diff (old new &optional switches) |
349 | 136 "Find and display the differences between OLD and NEW files. |
669
4c64c671426f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
662
diff
changeset
|
137 Interactively the current buffer's file name is the default for for NEW |
894 | 138 and a backup file for NEW is the default for OLD. |
139 With prefix arg, prompt for diff switches." | |
349 | 140 (interactive |
894 | 141 (nconc |
142 (let (oldf newf) | |
143 (nreverse | |
144 (list | |
145 (setq newf (buffer-file-name) | |
146 newf (if (and newf (file-exists-p newf)) | |
147 (read-file-name | |
148 (concat "Diff new file: (" | |
149 (file-name-nondirectory newf) ") ") | |
150 nil newf t) | |
151 (read-file-name "Diff new file: " nil nil t))) | |
152 (setq oldf (file-newest-backup newf) | |
153 oldf (if (and oldf (file-exists-p oldf)) | |
154 (read-file-name | |
155 (concat "Diff original file: (" | |
156 (file-name-nondirectory oldf) ") ") | |
157 (file-name-directory oldf) oldf t) | |
158 (read-file-name "Diff original file: " | |
159 (file-name-directory newf) nil t)))))) | |
160 (if current-prefix-arg | |
161 (list (read-string "Diff switches: " | |
162 (if (stringp diff-switches) | |
163 diff-switches | |
164 (mapconcat 'identity diff-switches " ")))) | |
165 nil))) | |
349 | 166 (message "Comparing files %s %s..." new old) |
167 (setq new (expand-file-name new) | |
168 old (expand-file-name old)) | |
1110
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
169 (let ((old-alt (diff-prepare old new)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
170 (new-alt (diff-prepare new old)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
171 buf) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
172 (unwind-protect |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
173 (let ((command |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
174 (mapconcat 'identity |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
175 (append '("diff") |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
176 (if (consp diff-switches) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
177 diff-switches |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
178 (list diff-switches)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
179 (if (or old-alt new-alt) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
180 (list "-L" old "-L" new)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
181 (list (or old-alt old)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
182 (list (or new-alt new))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
183 " "))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
184 (setq buf |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
185 (compile-internal command |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
186 "No more differences" "Diff" |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
187 'diff-parse-differences))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
188 (save-excursion |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
189 (set-buffer buf) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
190 (set (make-local-variable 'diff-old-file) old) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
191 (set (make-local-variable 'diff-new-file) new)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
192 buf) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
193 (if old-alt (delete-file old-alt)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
194 (if new-alt (delete-file new-alt))))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
195 |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
196 ;; Copy the file FILE into a temporary file if that is necessary |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
197 ;; for comparison. (This is only necessary if the file name has a handler.) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
198 ;; OTHER is the other file to be compared. |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
199 (defun diff-prepare (file other) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
200 (let (handler handlers) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
201 (setq handlers file-name-handler-alist) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
202 (while (and (consp handlers) (null handler)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
203 (if (and (consp (car handlers)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
204 (stringp (car (car handlers))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
205 (string-match (car (car handlers)) file)) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
206 (setq handler (cdr (car handlers)))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
207 (setq handlers (cdr handlers))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
208 (if handler |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
209 (funcall handler 'diff-prepare file other) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
210 nil))) |
474 | 211 |
894 | 212 ;;;###autoload |
213 (defun diff-backup (file &optional switches) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
214 "Diff this file with its backup file or vice versa. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
215 Uses the latest backup, if there are several numerical backups. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
216 If this file is a backup, diff it with its original. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
217 The backup file is the first file given to `diff'." |
894 | 218 (interactive (list (read-file-name "Diff (file with backup): ") |
219 (if current-prefix-arg | |
220 (read-string "Diff switches: " | |
221 (if (stringp diff-switches) | |
222 diff-switches | |
223 (mapconcat 'identity | |
224 diff-switches " "))) | |
225 nil))) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
226 (let (bak ori) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
227 (if (backup-file-name-p file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
228 (setq bak file |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
229 ori (file-name-sans-versions file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
230 (setq bak (or (diff-latest-backup-file file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
231 (error "No backup found for %s" file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
232 ori file)) |
894 | 233 (diff bak ori switches))) |
474 | 234 |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
235 (defun diff-latest-backup-file (fn) ; actually belongs into files.el |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
236 "Return the latest existing backup of FILE, or nil." |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
237 ;; First try simple backup, then the highest numbered of the |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
238 ;; numbered backups. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
239 ;; Ignore the value of version-control because we look for existing |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
240 ;; backups, which maybe were made earlier or by another user with |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
241 ;; a different value of version-control. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
242 (setq fn (expand-file-name fn)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
243 (or |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
244 (let ((bak (make-backup-file-name fn))) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
245 (if (file-exists-p bak) bak)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
246 (let* ((dir (file-name-directory fn)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
247 (base-versions (concat (file-name-nondirectory fn) ".~")) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
248 (bv-length (length base-versions))) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
249 (concat dir |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
250 (car (sort |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
251 (file-name-all-completions base-versions dir) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
252 ;; bv-length is a fluid var for backup-extract-version: |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
253 (function |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
254 (lambda (fn1 fn2) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
255 (> (backup-extract-version fn1) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
256 (backup-extract-version fn2)))))))))) |
474 | 257 |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
474
diff
changeset
|
258 ;;; diff.el ends here |