Mercurial > emacs
annotate lisp/ediff-ptch.el @ 18398:3c18aa006200
(LD_SWITCH_SYSTEM) [__mips__]: Alternate definition.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 23 Jun 1997 01:54:03 +0000 |
parents | 0b9d9cbf3cd4 |
children | 1405083241e8 |
rev | line source |
---|---|
15479 | 1 ;;; ediff-ptch.el --- Ediff's patch support |
2 | |
18054 | 3 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. |
15479 | 4 |
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
6 | |
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 | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
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 the | |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
23 | |
24 | |
25 ;;; Code: | |
18054 | 26 |
27 (provide 'ediff-ptch) | |
28 | |
29 (defgroup ediff-ptch nil | |
30 "Ediff patch support" | |
31 :tag "Patch" | |
32 :prefix "ediff-" | |
33 :group 'ediff) | |
34 | |
35 ;; compiler pacifier | |
36 (defvar ediff-window-A) | |
37 (defvar ediff-window-B) | |
38 (defvar ediff-window-C) | |
39 (defvar ediff-use-last-dir) | |
40 (defvar ediff-shell) | |
41 | |
42 (eval-when-compile | |
43 (let ((load-path (cons (expand-file-name ".") load-path))) | |
44 (or (featurep 'ediff-init) | |
45 (load "ediff-init.el" nil nil 'nosuffix)) | |
46 (or (featurep 'ediff) | |
47 (load "ediff.el" nil nil 'nosuffix)) | |
48 )) | |
49 ;; end pacifier | |
15479 | 50 |
15987 | 51 (require 'ediff-init) |
52 | |
15479 | 53 (defvar ediff-last-dir-patch nil |
54 "Last directory used by an Ediff command for file to patch.") | |
55 | |
56 (defvar ediff-backup-extension | |
57 (if (memq system-type '(vax-vms axp-vms emx ms-dos windows-nt windows-95)) | |
58 "_orig" ".orig") | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
59 "Backup extension used by the patch program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
60 See also `ediff-backup-specs'.") |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
61 |
18054 | 62 (defcustom ediff-backup-specs (format "-b %s" ediff-backup-extension) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
63 "*Backup directives to pass to the patch program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
64 Ediff requires that the old version of the file \(before applying the patch\) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
65 is saved in a file named `the-patch-file.extension'. Usually `extension' is |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
66 `.orig', but this can be changed by the user and may depend on the system. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
67 Therefore, Ediff needs to know the backup extension used by the patch program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
68 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
69 Some versions of the patch program let you specify `-b backup-extension'. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
70 Other versions only permit `-b', which assumes some canned extension |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
71 \(usually `.orig'\). |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
72 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
73 Note that both `ediff-backup-extension' and `ediff-backup-specs' |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
74 must be properly set. If your patch program takes the option `-b', |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
75 but not `-b extension', the variable `ediff-backup-extension' must |
18054 | 76 still be set so Ediff will know which extension to use." |
77 :type 'string | |
78 :group 'ediff-ptch) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
79 |
15479 | 80 |
18054 | 81 (defcustom ediff-patch-default-directory nil |
82 "*Default directory to look for patches." | |
83 :type '(choice (const nil) string) | |
84 :group 'ediff-ptch) | |
15479 | 85 |
18054 | 86 (defcustom ediff-context-diff-label-regexp |
15479 | 87 (concat "\\(" ; context diff 2-liner |
88 "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)" | |
89 "\\|" ; GNU unified format diff 2-liner | |
16168
587b9c438823
(ediff-context-diff-label-regexp): Recognize -u format better.
Richard M. Stallman <rms@gnu.org>
parents:
15987
diff
changeset
|
90 "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)" |
15479 | 91 "\\)") |
18054 | 92 "*Regexp matching filename 2-liners at the start of each context diff." |
93 :type 'regexp | |
94 :group 'ediff-ptch) | |
15479 | 95 |
18054 | 96 (defcustom ediff-patch-program "patch" |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
97 "*Name of the program that applies patches. |
18054 | 98 It is recommended to use GNU-compatible versions." |
99 :type 'string | |
100 :group 'ediff-ptch) | |
101 (defcustom ediff-patch-options "-f" | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
102 "*Options to pass to ediff-patch-program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
103 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
104 Note: the `-b' option should be specified in `ediff-backup-specs'. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
105 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
106 It is recommended to pass the `-f' option to the patch program, so it won't ask |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
107 questions. However, some implementations don't accept this option, in which |
18054 | 108 case the default value for this variable should be changed." |
109 :type 'string | |
110 :group 'ediff-ptch) | |
15479 | 111 |
112 ;; The buffer of the patch file. Local to control buffer. | |
113 (ediff-defvar-local ediff-patchbufer nil "") | |
114 | |
115 ;; The buffer where patch displays its diagnostics. | |
116 (ediff-defvar-local ediff-patch-diagnostics nil "") | |
117 | |
118 ;; Map of patch buffer. Has the form: | |
119 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...) | |
120 ;; where filenames are files to which patch would have applied the patch; | |
121 ;; marker1 delimits the beginning of the corresponding patch and marker2 does | |
122 ;; it for the end. | |
123 (ediff-defvar-local ediff-patch-map nil "") | |
124 | |
125 ;; strip prefix from filename | |
126 ;; returns /dev/null, if can't strip prefix | |
127 (defsubst ediff-file-name-sans-prefix (filename prefix) | |
128 (save-match-data | |
129 (if (string-match (concat "^" prefix) filename) | |
130 (substring filename (match-end 0)) | |
131 (concat "/null/" filename)))) | |
132 | |
133 | |
134 | |
135 ;; no longer used | |
136 ;; return the number of matches of regexp in buf starting from the beginning | |
137 (defun ediff-count-matches (regexp buf) | |
138 (ediff-eval-in-buffer buf | |
139 (let ((count 0) opoint) | |
140 (save-excursion | |
141 (goto-char (point-min)) | |
142 (while (and (not (eobp)) | |
143 (progn (setq opoint (point)) | |
144 (re-search-forward regexp nil t))) | |
145 (if (= opoint (point)) | |
146 (forward-char 1) | |
147 (setq count (1+ count))))) | |
148 count))) | |
149 | |
150 ;; Scan BUF (which is supposed to contain a patch) and make a list of the form | |
151 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...) | |
152 ;; where filenames are files to which patch would have applied the patch; | |
153 ;; marker1 delimits the beginning of the corresponding patch and marker2 does | |
154 ;; it for the end. This list is then assigned to ediff-patch-map. | |
155 ;; Returns the number of elements in the list ediff-patch-map | |
156 (defun ediff-map-patch-buffer (buf) | |
157 (ediff-eval-in-buffer buf | |
158 (let ((count 0) | |
159 (mark1 (move-marker (make-marker) (point-min))) | |
160 (mark1-end (point-min)) | |
161 (possible-file-names '("/dev/null" . "/dev/null")) | |
162 mark2-end mark2 filenames | |
163 beg1 beg2 end1 end2 | |
164 patch-map opoint) | |
165 (save-excursion | |
166 (goto-char (point-min)) | |
167 (setq opoint (point)) | |
168 (while (and (not (eobp)) | |
169 (re-search-forward ediff-context-diff-label-regexp nil t)) | |
170 (if (= opoint (point)) | |
171 (forward-char 1) ; ensure progress towards the end | |
172 (setq mark2 (move-marker (make-marker) (match-beginning 0)) | |
173 mark2-end (match-end 0) | |
16168
587b9c438823
(ediff-context-diff-label-regexp): Recognize -u format better.
Richard M. Stallman <rms@gnu.org>
parents:
15987
diff
changeset
|
174 beg1 (or (match-beginning 2) (match-beginning 4)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
175 end1 (or (match-end 2) (match-end 4)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
176 beg2 (or (match-beginning 3) (match-beginning 5)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
177 end2 (or (match-end 3) (match-end 5))) |
15479 | 178 ;; possible-file-names is holding the new file names until we |
179 ;; insert the old file name in the patch map | |
180 ;; It is a pair (filename from 1st header line . fn from 2nd line) | |
181 (setq possible-file-names | |
182 (cons (if (and beg1 end1) | |
183 (buffer-substring beg1 end1) | |
184 "/dev/null") | |
185 (if (and beg2 end2) | |
186 (buffer-substring beg2 end2) | |
187 "/dev/null"))) | |
188 ;; check for any `Index:' or `Prereq:' lines, but don't use them | |
189 (if (re-search-backward "^Index:" mark1-end 'noerror) | |
190 (move-marker mark2 (match-beginning 0))) | |
191 (if (re-search-backward "^Prereq:" mark1-end 'noerror) | |
192 (move-marker mark2 (match-beginning 0))) | |
193 | |
194 (goto-char mark2-end) | |
195 | |
196 (if filenames | |
197 (setq patch-map (cons (list filenames mark1 mark2) patch-map))) | |
198 (setq mark1 mark2 | |
199 mark1-end mark2-end | |
200 filenames possible-file-names)) | |
201 (setq opoint (point) | |
202 count (1+ count)))) | |
203 (setq mark2 (point-max-marker) | |
204 patch-map (cons (list possible-file-names mark1 mark2) patch-map)) | |
205 (setq ediff-patch-map (nreverse patch-map)) | |
206 count))) | |
207 | |
208 ;; Fix up the file names in the list using the argument FILENAME | |
209 ;; Algorithm: find the first file's directory and cut it out from each file | |
210 ;; name in the patch. Prepend the directory of FILENAME to each file in the | |
211 ;; patch. In addition, the first file in the patch is replaced by FILENAME. | |
212 ;; Each file is actually a file-pair of files found in the context diff header | |
213 ;; In the end, for each pair, we select the shortest existing file. | |
214 ;; Note: Ediff doesn't recognize multi-file patches that are separated | |
215 ;; with the `Index:' line. It treats them as a single-file patch. | |
216 ;; | |
217 ;; Executes inside the patch buffer | |
218 (defun ediff-fixup-patch-map (filename) | |
219 (setq filename (expand-file-name filename)) | |
220 (let ((actual-dir (if (file-directory-p filename) | |
221 ;; directory part of filename | |
222 (file-name-as-directory filename) | |
223 (file-name-directory filename))) | |
224 ;; directory part of the first file in the patch | |
225 (base-dir1 (file-name-directory (car (car (car ediff-patch-map))))) | |
226 (base-dir2 (file-name-directory (cdr (car (car ediff-patch-map))))) | |
227 ) | |
228 | |
229 ;; chop off base-dirs | |
230 (mapcar (function (lambda (triple) | |
231 (or (string= (car (car triple)) "/dev/null") | |
232 (setcar (car triple) | |
233 (ediff-file-name-sans-prefix | |
234 (car (car triple)) base-dir1))) | |
235 (or (string= (cdr (car triple)) "/dev/null") | |
236 (setcdr (car triple) | |
237 (ediff-file-name-sans-prefix | |
238 (cdr (car triple)) base-dir2))) | |
239 )) | |
240 ediff-patch-map) | |
241 | |
242 ;; take the given file name into account | |
243 (or (file-directory-p filename) | |
244 (string= "/dev/null" filename) | |
245 (progn | |
246 (setcar (car ediff-patch-map) | |
247 (cons (file-name-nondirectory filename) | |
248 (file-name-nondirectory filename))))) | |
249 | |
250 ;; prepend actual-dir | |
251 (mapcar (function (lambda (triple) | |
252 (if (and (string-match "^/null/" (car (car triple))) | |
253 (string-match "^/null/" (cdr (car triple)))) | |
254 ;; couldn't strip base-dir1 and base-dir2 | |
255 ;; hence, something wrong | |
256 (progn | |
257 (with-output-to-temp-buffer ediff-msg-buffer | |
258 (princ | |
259 (format " | |
260 The patch file contains a context diff for | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
261 |
15479 | 262 %s |
263 %s | |
264 | |
265 However, Ediff cannot infer the name of the actual file | |
266 to be patched on your system. If you know the correct file name, | |
267 please enter it now. | |
268 | |
269 If you don't know and still would like to apply patches to | |
270 other files, enter /dev/null | |
271 " | |
272 (substring (car (car triple)) 6) | |
273 (substring (cdr (car triple)) 6)))) | |
274 (let ((directory t) | |
275 user-file) | |
276 (while directory | |
277 (setq user-file | |
278 (read-file-name | |
279 "Please enter file name: " | |
280 actual-dir actual-dir t)) | |
281 (if (not (file-directory-p user-file)) | |
282 (setq directory nil) | |
283 (setq directory t) | |
284 (beep) | |
285 (message "%s is a directory" user-file) | |
286 (sit-for 2))) | |
287 (setcar triple (cons user-file user-file)))) | |
288 (setcar (car triple) | |
289 (expand-file-name | |
290 (concat actual-dir (car (car triple))))) | |
291 (setcdr (car triple) | |
292 (expand-file-name | |
293 (concat actual-dir (cdr (car triple)))))) | |
294 )) | |
295 ediff-patch-map) | |
296 ;; check for the shorter existing file in each pair and discard the other | |
297 ;; one | |
298 (mapcar (function (lambda (triple) | |
299 (let* ((file1 (car (car triple))) | |
300 (file2 (cdr (car triple))) | |
301 (f1-exists (file-exists-p file1)) | |
302 (f2-exists (file-exists-p file2))) | |
303 (cond | |
304 ((and (< (length file2) (length file1)) | |
305 f2-exists) | |
306 (setcar triple file2)) | |
307 ((and (< (length file1) (length file2)) | |
308 f1-exists) | |
309 (setcar triple file1)) | |
310 ((and f1-exists f2-exists | |
311 (string= file1 file2)) | |
312 (setcar triple file1)) | |
313 ((and f1-exists f2-exists) | |
314 (with-output-to-temp-buffer ediff-msg-buffer | |
315 (princ (format " | |
316 Ediff has inferred that | |
317 %s | |
318 %s | |
319 are possible targets for applying the patch. | |
320 Both files seem to be plausible alternatives. | |
321 | |
322 Please advice: | |
323 Type `y' to use %s as the target; | |
324 Type `n' to use %s as the target. | |
325 " | |
326 file1 file2 file2 file1))) | |
327 (setcar triple | |
328 (if (y-or-n-p (format "Use %s ? " file2)) | |
329 file2 file1))) | |
330 (f2-exists (setcar triple file2)) | |
331 (f1-exists (setcar triple file1)) | |
332 (t | |
333 (with-output-to-temp-buffer ediff-msg-buffer | |
334 (princ (format " | |
335 Ediff inferred that | |
336 %s | |
337 %s | |
338 are possible alternative targets for this patch. | |
339 | |
340 However, these files do not exist. | |
341 | |
342 Please enter an alternative patch target ... | |
343 " | |
344 file1 file2))) | |
345 (let ((directory t) | |
346 target) | |
347 (while directory | |
348 (setq target (read-file-name | |
349 "Please enter a patch target: " | |
350 actual-dir actual-dir t)) | |
351 (if (not (file-directory-p target)) | |
352 (setq directory nil) | |
353 (beep) | |
354 (message "%s is a directory" target) | |
355 (sit-for 2))) | |
356 (setcar triple target))))))) | |
357 ediff-patch-map) | |
358 )) | |
359 | |
360 (defun ediff-show-patch-diagnostics () | |
361 (interactive) | |
362 (cond ((window-live-p ediff-window-A) | |
363 (set-window-buffer ediff-window-A ediff-patch-diagnostics)) | |
364 ((window-live-p ediff-window-B) | |
365 (set-window-buffer ediff-window-B ediff-patch-diagnostics)) | |
366 (t (display-buffer ediff-patch-diagnostics 'not-this-window)))) | |
367 | |
368 (defun ediff-get-patch-buffer () | |
369 "Obtain patch buffer. If patch is already in a buffer---use it. | |
370 Else, read patch file into a new buffer." | |
371 (let ((dir (cond (ediff-patch-default-directory) ; try patch default dir | |
372 (ediff-use-last-dir ediff-last-dir-patch) | |
373 (t default-directory))) | |
374 patch-buf) | |
375 (if (y-or-n-p "Is the patch already in a buffer? ") | |
376 (setq patch-buf | |
377 (get-buffer | |
378 (read-buffer | |
379 "Which buffer contains the patch? " | |
380 (current-buffer) 'must-match))) | |
381 (setq patch-buf | |
382 (find-file-noselect | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
383 (read-file-name "Which file contains the patch? " |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
384 dir nil 'must-match)))) |
15479 | 385 |
386 (ediff-eval-in-buffer patch-buf | |
387 (goto-char (point-min)) | |
388 (or (ediff-get-visible-buffer-window patch-buf) | |
389 (progn | |
390 (pop-to-buffer patch-buf 'other-window) | |
391 (select-window (previous-window))))) | |
392 (ediff-map-patch-buffer patch-buf) | |
393 patch-buf)) | |
394 | |
395 ;; Dispatch the right patch file function: regular or meta-level, | |
396 ;; depending on how many patches are in the patch file. | |
397 ;; At present, there is no support for meta-level patches. | |
398 ;; Should return either the ctl buffer or the meta-buffer | |
399 (defun ediff-dispatch-file-patching-job (patch-buf filename | |
400 &optional startup-hooks) | |
401 (ediff-eval-in-buffer patch-buf | |
402 ;; relativize names in the patch with respect to source-file | |
403 (ediff-fixup-patch-map filename) | |
404 (if (< (length ediff-patch-map) 2) | |
405 (ediff-patch-file-internal | |
406 patch-buf | |
407 (if (and (not (string-match "^/dev/null" (car (car ediff-patch-map)))) | |
408 (> (length (car (car ediff-patch-map))) 1)) | |
409 (car (car ediff-patch-map)) | |
410 filename) | |
411 startup-hooks) | |
412 (ediff-multi-patch-internal patch-buf startup-hooks)) | |
413 )) | |
414 | |
415 | |
416 (defun ediff-patch-buffer-internal (patch-buf buf-to-patch-name | |
417 &optional startup-hooks) | |
418 (let* ((buf-to-patch (get-buffer buf-to-patch-name)) | |
419 (file-name-ok (if buf-to-patch (buffer-file-name buf-to-patch))) | |
420 (buf-mod-status (buffer-modified-p buf-to-patch)) | |
421 (multifile-patch-p (> (length (ediff-eval-in-buffer patch-buf | |
422 ediff-patch-map)) 1)) | |
423 default-dir file-name ctl-buf) | |
424 (if file-name-ok | |
425 (setq file-name file-name-ok) | |
426 (if multifile-patch-p | |
427 (error | |
428 "Can't apply multi-file patches to buffers that visit no files")) | |
429 (ediff-eval-in-buffer buf-to-patch | |
430 (setq default-dir default-directory) | |
431 (setq file-name (ediff-make-temp-file buf-to-patch)) | |
432 (set-visited-file-name file-name) | |
433 (setq buffer-auto-save-file-name nil) ; don't create auto-save file | |
434 ;;don't confuse the user with a new bufname | |
435 (rename-buffer buf-to-patch-name) | |
436 (set-buffer-modified-p nil) | |
437 (set-visited-file-modtime) ; sync buffer and temp file | |
438 (setq default-directory default-dir) | |
439 )) | |
440 | |
441 ;; dispatch a patch function | |
442 (setq ctl-buf (ediff-dispatch-file-patching-job | |
443 patch-buf file-name startup-hooks)) | |
444 | |
445 (if file-name-ok | |
446 () | |
447 ;; buffer wasn't visiting any file, | |
448 ;; so we will not run meta-level ediff here | |
449 (ediff-eval-in-buffer ctl-buf | |
450 (delete-file (buffer-file-name ediff-buffer-A)) | |
451 (delete-file (buffer-file-name ediff-buffer-B)) | |
452 (ediff-eval-in-buffer ediff-buffer-A | |
453 (if default-dir (setq default-directory default-dir)) | |
454 (set-visited-file-name nil) | |
455 (rename-buffer buf-to-patch-name) | |
456 (set-buffer-modified-p buf-mod-status)) | |
457 (ediff-eval-in-buffer ediff-buffer-B | |
458 (setq buffer-auto-save-file-name nil) ; don't create auto-save file | |
459 (if default-dir (setq default-directory default-dir)) | |
460 (set-visited-file-name nil) | |
461 (rename-buffer (ediff-unique-buffer-name | |
462 (concat buf-to-patch-name "_patched") "")) | |
463 (set-buffer-modified-p t)))) | |
464 )) | |
465 | |
466 (defun ediff-patch-file-internal (patch-buf source-filename | |
467 &optional startup-hooks) | |
468 (setq source-filename (expand-file-name source-filename)) | |
469 | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
470 (let* ((shell-file-name ediff-shell) |
15479 | 471 (patch-diagnostics (get-buffer-create "*ediff patch diagnostics*")) |
472 ;; ediff-find-file may use a temp file to do the patch | |
473 ;; so, we save source-filename and true-source-filename as a var | |
474 ;; that initially is source-filename but may be changed to a temp | |
475 ;; file for the purpose of patching. | |
476 (true-source-filename source-filename) | |
477 (target-filename source-filename) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
478 target-buf buf-to-patch file-name-magic-p |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
479 patch-return-code ctl-buf backup-style aux-wind) |
15479 | 480 |
481 (if (string-match "-V" ediff-patch-options) | |
482 (error | |
483 "Ediff doesn't take the -V option in `ediff-patch-options'--sorry")) | |
484 | |
485 ;; Make a temp file, if source-filename has a magic file handler (or if | |
486 ;; it is handled via auto-mode-alist and similar magic). | |
487 ;; Check if there is a buffer visiting source-filename and if they are in | |
488 ;; sync; arrange for the deletion of temp file. | |
489 (ediff-find-file 'true-source-filename 'buf-to-patch | |
490 'ediff-last-dir-patch 'startup-hooks) | |
491 | |
492 ;; Check if source file name has triggered black magic, such as file name | |
493 ;; handlers or auto mode alist, and make a note of it. | |
494 ;; true-source-filename should be either the original name or a | |
495 ;; temporary file where we put the after-product of the file handler. | |
496 (setq file-name-magic-p (not (equal (file-truename true-source-filename) | |
497 (file-truename source-filename)))) | |
498 | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
499 ;; Checkout orig file, if necessary, so that the patched file |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
500 ;; could be checked back in. |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
501 (ediff-maybe-checkout buf-to-patch) |
15479 | 502 |
503 (ediff-eval-in-buffer patch-diagnostics | |
504 (insert-buffer patch-buf) | |
505 (message "Applying patch ... ") | |
506 ;; fix environment for gnu patch, so it won't make numbered extensions | |
507 (setq backup-style (getenv "VERSION_CONTROL")) | |
508 (setenv "VERSION_CONTROL" nil) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
509 (setq patch-return-code |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
510 (call-process-region |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
511 (point-min) (point-max) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
512 shell-file-name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
513 t ; delete region (which contains the patch |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
514 t ; insert output (patch diagnostics) in current buffer |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
515 nil ; don't redisplay |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
516 shell-command-switch ; usually -c |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
517 (format "%s %s %s %s" |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
518 ediff-patch-program |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
519 ediff-patch-options |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
520 ediff-backup-specs |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
521 (expand-file-name true-source-filename)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
522 )) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
523 |
15479 | 524 ;; restore environment for gnu patch |
525 (setenv "VERSION_CONTROL" backup-style)) | |
526 | |
527 (message "Applying patch ... done") | |
528 (message "") | |
529 | |
530 (switch-to-buffer patch-diagnostics) | |
531 (sit-for 0) ; synchronize - let the user see diagnostics | |
532 | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
533 (or (and (eq patch-return-code 0) ; patch reported success |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
534 (file-exists-p |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
535 (concat true-source-filename ediff-backup-extension))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
536 (progn |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
537 (with-output-to-temp-buffer ediff-msg-buffer |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
538 (princ (format " |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
539 Patch has failed OR the backup version of the patched file was not created by |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
540 the patch program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
541 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
542 One reason may be that the values of the variables |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
543 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
544 ediff-patch-options = %S |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
545 ediff-backup-extension = %S |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
546 ediff-backup-specs = %S |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
547 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
548 are not appropriate for the program specified in the variable |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
549 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
550 ediff-patch-program = %S |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
551 |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
552 Another reason could be that the %S program doesn't understand |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
553 the format of the patch file you used. |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
554 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
555 See Ediff on-line manual for more details on these variables. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
556 \(Or use a GNU-compatible patch program and stay out of trouble.\) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
557 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
558 Type any key to continue... |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
559 " |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
560 ediff-patch-options |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
561 ediff-backup-extension |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
562 ediff-backup-specs |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
563 ediff-patch-program |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
564 ediff-patch-program))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
565 (beep 1) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
566 (if (setq aux-wind (get-buffer-window ediff-msg-buffer)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
567 (progn |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
568 (select-window aux-wind) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
569 (goto-char (point-max)))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
570 (read-char-exclusive) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
571 (if aux-wind (bury-buffer)) ; ediff-msg-buffer |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
572 (if (setq aux-wind (get-buffer-window patch-diagnostics)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
573 (progn |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
574 (select-window aux-wind) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
575 (bury-buffer))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
576 (error "Patch appears to have failed"))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
577 |
15479 | 578 ;; If black magic is involved, apply patch to a temp copy of the |
579 ;; file. Otherwise, apply patch to the orig copy. If patch is applied | |
580 ;; to temp copy, we name the result old-name_patched for local files | |
581 ;; and temp-copy_patched for remote files. The orig file name isn't | |
582 ;; changed, and the temp copy of the original is later deleted. | |
583 ;; Without magic, the original file is renamed (usually into | |
584 ;; old-name_orig) and the result of patching will have the same name as | |
585 ;; the original. | |
586 (if (not file-name-magic-p) | |
587 (ediff-eval-in-buffer buf-to-patch | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
588 (set-visited-file-name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
589 (concat source-filename ediff-backup-extension)) |
15479 | 590 (set-buffer-modified-p nil)) |
591 | |
592 ;; Black magic in effect. | |
593 ;; If orig file was remote, put the patched file in the temp directory. | |
594 ;; If orig file is local, put the patched file in the directory of | |
595 ;; the orig file. | |
596 (setq target-filename | |
597 (concat | |
598 (if (ediff-file-remote-p (file-truename source-filename)) | |
599 true-source-filename | |
600 source-filename) | |
601 "_patched")) | |
602 | |
603 (rename-file true-source-filename target-filename t) | |
604 | |
605 ;; arrange that the temp copy of orig will be deleted | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
606 (rename-file (concat true-source-filename ediff-backup-extension) |
15479 | 607 true-source-filename t)) |
608 | |
609 ;; make orig buffer read-only | |
610 (setq startup-hooks | |
611 (cons 'ediff-set-read-only-in-buf-A startup-hooks)) | |
612 | |
613 ;; set up a buf for the patched file | |
614 (setq target-buf (find-file-noselect target-filename)) | |
615 | |
616 (setq ctl-buf | |
617 (ediff-buffers-internal | |
618 buf-to-patch target-buf nil | |
619 startup-hooks 'epatch)) | |
620 (ediff-eval-in-buffer ctl-buf | |
621 (setq ediff-patchbufer patch-buf | |
622 ediff-patch-diagnostics patch-diagnostics)) | |
623 | |
624 (bury-buffer patch-diagnostics) | |
625 (message "Type `P', if you need to see patch diagnostics") | |
626 ctl-buf)) | |
627 | |
628 (defun ediff-multi-patch-internal (patch-buf &optional startup-hooks) | |
629 (let (meta-buf) | |
630 (setq startup-hooks | |
631 ;; this sets various vars in the meta buffer inside | |
632 ;; ediff-prepare-meta-buffer | |
633 (cons (` (lambda () | |
634 ;; tell what to do if the user clicks on a session record | |
635 (setq ediff-session-action-function | |
636 'ediff-patch-file-form-meta | |
637 ediff-meta-patchbufer patch-buf) | |
638 )) | |
639 startup-hooks)) | |
640 (setq meta-buf (ediff-prepare-meta-buffer | |
641 'ediff-filegroup-action | |
642 (ediff-eval-in-buffer patch-buf | |
643 ;; nil replaces a regular expression | |
644 (cons (list nil (format "%S" patch-buf)) | |
645 ediff-patch-map)) | |
646 "*Ediff Session Group Panel" | |
647 'ediff-redraw-directory-group-buffer | |
648 'ediff-multifile-patch | |
649 startup-hooks)) | |
650 (ediff-show-meta-buffer meta-buf) | |
651 )) | |
652 | |
653 | |
654 | |
655 | |
656 ;;; Local Variables: | |
657 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
658 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
659 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) |
15479 | 660 ;;; End: |
661 | |
662 ;;; ediff-ptch.el ends here |