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