1 ;;; ediff-ptch.el --- Ediff's patch support
3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 ;; 2003, 2004, 2005 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
8 ;; This file is part of GNU Emacs.
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)
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.
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., 51 Franklin Street, Fifth Floor,
23 ;; Boston, MA 02110-1301, USA.
31 (defgroup ediff-ptch nil
32 "Ediff patch support."
38 (defvar ediff-window-A)
39 (defvar ediff-window-B)
40 (defvar ediff-window-C)
41 (defvar ediff-use-last-dir)
45 (let ((load-path (cons (expand-file-name ".") load-path)))
46 (or (featurep 'ediff-init)
47 (load "ediff-init.el" nil nil 'nosuffix))
48 (or (featurep 'ediff-mult)
49 (load "ediff-mult.el" nil nil 'nosuffix))
51 (load "ediff.el" nil nil 'nosuffix))
57 (defcustom ediff-patch-program "patch"
58 "*Name of the program that applies patches.
59 It is recommended to use GNU-compatible versions."
62 (defcustom ediff-patch-options "-f"
63 "*Options to pass to ediff-patch-program.
65 Note: the `-b' option should be specified in `ediff-backup-specs'.
67 It is recommended to pass the `-f' option to the patch program, so it won't ask
68 questions. However, some implementations don't accept this option, in which
69 case the default value for this variable should be changed."
73 (defvar ediff-last-dir-patch nil
74 "Last directory used by an Ediff command for file to patch.")
76 ;; the default backup extension
77 (defconst ediff-default-backup-extension
78 (if (memq system-type '(vax-vms axp-vms emx ms-dos))
82 (defcustom ediff-backup-extension ediff-default-backup-extension
83 "Backup extension used by the patch program.
84 See also `ediff-backup-specs'."
88 (defun ediff-test-patch-utility ()
90 (cond ((eq 0 (call-process ediff-patch-program nil nil nil "-z." "-b"))
91 ;; GNU `patch' v. >= 2.2
93 ((eq 0 (call-process ediff-patch-program nil nil nil "-b"))
98 (defcustom ediff-backup-specs
99 (let ((type (ediff-test-patch-utility)))
100 (cond ((eq type 'gnu)
101 ;; GNU `patch' v. >= 2.2
102 (format "-z%s -b" ediff-backup-extension))
104 ;; POSIX `patch' -- ediff-backup-extension must be ".orig"
105 (setq ediff-backup-extension ediff-default-backup-extension)
108 ;; traditional `patch'
109 (format "-b %s" ediff-backup-extension))))
110 "*Backup directives to pass to the patch program.
111 Ediff requires that the old version of the file \(before applying the patch\)
112 be saved in a file named `the-patch-file.extension'. Usually `extension' is
113 `.orig', but this can be changed by the user and may depend on the system.
114 Therefore, Ediff needs to know the backup extension used by the patch program.
116 Some versions of the patch program let you specify `-b backup-extension'.
117 Other versions only permit `-b', which assumes the extension `.orig'
118 \(in which case ediff-backup-extension MUST be also `.orig'\). The latest
119 versions of GNU patch require `-b -z backup-extension'.
121 Note that both `ediff-backup-extension' and `ediff-backup-specs'
122 must be set properly. If your patch program takes the option `-b',
123 but not `-b extension', the variable `ediff-backup-extension' must
124 still be set so Ediff will know which extension to use.
126 Ediff tries to guess the appropriate value for this variables. It is believed
127 to be working for `traditional' patch, all versions of GNU patch, and for POSIX
128 patch. So, don't change these variables, unless the default doesn't work."
133 (defcustom ediff-patch-default-directory nil
134 "*Default directory to look for patches."
135 :type '(choice (const nil) string)
138 (defcustom ediff-context-diff-label-regexp
139 (concat "\\(" ; context diff 2-liner
140 "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)"
141 "\\|" ; GNU unified format diff 2-liner
142 "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)"
144 "*Regexp matching filename 2-liners at the start of each context diff.
145 You probably don't want to change that, unless you are using an obscure patch
150 ;; The buffer of the patch file. Local to control buffer.
151 (ediff-defvar-local ediff-patchbufer nil "")
153 ;; The buffer where patch displays its diagnostics.
154 (ediff-defvar-local ediff-patch-diagnostics nil "")
156 ;; Map of patch buffer. Has the form:
157 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...)
158 ;; where filenames are files to which patch would have applied the patch;
159 ;; marker1 delimits the beginning of the corresponding patch and marker2 does
161 (ediff-defvar-local ediff-patch-map nil "")
163 ;; strip prefix from filename
164 ;; returns /dev/null, if can't strip prefix
165 (defsubst ediff-file-name-sans-prefix (filename prefix)
168 (if (string-match (concat "^" (if (stringp prefix)
169 (regexp-quote prefix)
172 (substring filename (match-end 0))
173 (concat "/null/" filename)))
180 ;; return the number of matches of regexp in buf starting from the beginning
181 (defun ediff-count-matches (regexp buf)
182 (ediff-with-current-buffer buf
183 (let ((count 0) opoint)
185 (goto-char (point-min))
186 (while (and (not (eobp))
187 (progn (setq opoint (point))
188 (re-search-forward regexp nil t)))
189 (if (= opoint (point))
191 (setq count (1+ count)))))
194 ;; Scan BUF (which is supposed to contain a patch) and make a list of the form
195 ;; ((nil nil filename-spec1 marker1 marker2)
196 ;; (nil nil filename-spec2 marker1 marker2) ...)
197 ;; where filename-spec[12] are files to which the `patch' program would
198 ;; have applied the patch.
199 ;; nin, nil are placeholders. See ediff-make-new-meta-list-element in
200 ;; ediff-meta.el for the explanations.
201 ;; In the beginning we don't know exactly which files need to be patched.
202 ;; We usually come up with two candidates and ediff-file-name-sans-prefix
203 ;; resolves this later.
205 ;; The marker `marker1' delimits the beginning of the corresponding patch and
206 ;; `marker2' does it for the end.
207 ;; The result of ediff-map-patch-buffer is a list, which is then assigned
208 ;; to ediff-patch-map.
209 ;; The function returns the number of elements in the list ediff-patch-map
210 (defun ediff-map-patch-buffer (buf)
211 (ediff-with-current-buffer buf
213 (mark1 (move-marker (make-marker) (point-min)))
214 (mark1-end (point-min))
215 (possible-file-names '("/dev/null" . "/dev/null"))
216 mark2-end mark2 filenames
220 (goto-char (point-min))
221 (setq opoint (point))
222 (while (and (not (eobp))
223 (re-search-forward ediff-context-diff-label-regexp nil t))
224 (if (= opoint (point))
225 (forward-char 1) ; ensure progress towards the end
226 (setq mark2 (move-marker (make-marker) (match-beginning 0))
227 mark2-end (match-end 0)
228 beg1 (or (match-beginning 2) (match-beginning 4))
229 end1 (or (match-end 2) (match-end 4))
230 beg2 (or (match-beginning 3) (match-beginning 5))
231 end2 (or (match-end 3) (match-end 5)))
232 ;; possible-file-names is holding the new file names until we
233 ;; insert the old file name in the patch map
235 ;; (filename-from-1st-header-line . fn from 2nd line)
236 (setq possible-file-names
237 (cons (if (and beg1 end1)
238 (buffer-substring beg1 end1)
241 (buffer-substring beg2 end2)
243 ;; check for any `Index:' or `Prereq:' lines, but don't use them
244 (if (re-search-backward "^Index:" mark1-end 'noerror)
245 (move-marker mark2 (match-beginning 0)))
246 (if (re-search-backward "^Prereq:" mark1-end 'noerror)
247 (move-marker mark2 (match-beginning 0)))
249 (goto-char mark2-end)
253 (cons (ediff-make-new-meta-list-element
254 filenames mark1 mark2)
258 filenames possible-file-names))
261 (setq mark2 (point-max-marker)
262 patch-map (cons (ediff-make-new-meta-list-element
263 possible-file-names mark1 mark2)
265 (setq ediff-patch-map (nreverse patch-map))
268 ;; Fix up the file names in the list using the argument FILENAME
269 ;; Algorithm: find the files' directories in the patch and, if a directory is
270 ;; absolute, cut it out from the corresponding file name in the patch.
271 ;; Relative directories are not cut out.
272 ;; Prepend the directory of FILENAME to each resulting file (which came
273 ;; originally from the patch).
274 ;; In addition, the first file in the patch document is replaced by FILENAME.
275 ;; Each file is actually a pair of files found in the context diff header
276 ;; In the end, for each pair, we ask the user which file to patch.
277 ;; Note: Ediff doesn't recognize multi-file patches that are separated
278 ;; with the `Index:' line. It treats them as a single-file patch.
280 ;; Executes inside the patch buffer
281 (defun ediff-fixup-patch-map (filename)
282 (setq filename (expand-file-name filename))
283 (let ((actual-dir (if (file-directory-p filename)
284 ;; directory part of filename
285 (file-name-as-directory filename)
286 (file-name-directory filename)))
287 ;; In case 2 files are possible patch targets, the user will be offered
288 ;; to choose file1 or file2. In a multifile patch, if the user chooses
289 ;; 1 or 2, this choice is preserved to decide future alternatives.
293 ;; chop off base-dirs
294 (mapcar (lambda (session-info)
295 (let* ((proposed-file-names
296 ;; Filename-spec is objA; it is represented as
297 ;; (file1 . file2). Get it using ediff-get-session-objA.
298 (ediff-get-session-objA-name session-info))
299 ;; base-dir1 is the dir part of the 1st file in the patch
300 (base-dir1 (file-name-directory (car proposed-file-names)))
301 ;; directory part of the 2nd file in the patch
302 (base-dir2 (file-name-directory (cdr proposed-file-names)))
304 ;; If both base-dir1 and base-dir2 are relative, assume that
305 ;; these dirs lead to the actual files starting at the present
306 ;; directory. So, we don't strip these relative dirs from the
307 ;; file names. This is a heuristic intended to improve guessing
308 (unless (or (file-name-absolute-p base-dir1)
309 (file-name-absolute-p base-dir2))
312 (or (string= (car proposed-file-names) "/dev/null")
313 (setcar proposed-file-names
314 (ediff-file-name-sans-prefix
315 (car proposed-file-names) base-dir1)))
317 (cdr proposed-file-names) "/dev/null")
318 (setcdr proposed-file-names
319 (ediff-file-name-sans-prefix
320 (cdr proposed-file-names) base-dir2)))
324 ;; take the given file name into account
325 (or (file-directory-p filename)
326 (string= "/dev/null" filename)
327 (setcar (ediff-get-session-objA (car ediff-patch-map))
328 (cons (file-name-nondirectory filename)
329 (file-name-nondirectory filename))))
331 ;; prepend actual-dir
332 (mapcar (lambda (session-info)
333 (let ((proposed-file-names
334 (ediff-get-session-objA-name session-info)))
335 (if (and (string-match "^/null/" (car proposed-file-names))
336 (string-match "^/null/" (cdr proposed-file-names)))
337 ;; couldn't intuit the file name to patch, so
338 ;; something is amiss
340 (with-output-to-temp-buffer ediff-msg-buffer
341 (ediff-with-current-buffer standard-output
345 The patch file contains a context diff for
348 However, Ediff cannot infer the name of the actual file
349 to be patched on your system. If you know the correct file name,
352 If you don't know and still would like to apply patches to
353 other files, enter /dev/null
355 (substring (car proposed-file-names) 6)
356 (substring (cdr proposed-file-names) 6))))
362 "Please enter file name: "
363 actual-dir actual-dir t))
364 (if (not (file-directory-p user-file))
368 (message "%s is a directory" user-file)
370 (setcar (ediff-get-session-objA session-info)
371 (cons user-file user-file))))
372 (setcar proposed-file-names
374 (concat actual-dir (car proposed-file-names))))
375 (setcdr proposed-file-names
377 (concat actual-dir (cdr proposed-file-names)))))
380 ;; check for the shorter existing file in each pair and discard the other
382 (mapcar (lambda (session-info)
383 (let* ((file1 (car (ediff-get-session-objA-name session-info)))
384 (file2 (cdr (ediff-get-session-objA-name session-info)))
386 (ediff-get-session-objA session-info))
387 (f1-exists (file-exists-p file1))
388 (f2-exists (file-exists-p file2)))
391 ;; The patch program prefers the shortest file as the patch
392 ;; target. However, this is a questionable heuristic. In an
393 ;; interactive program, like ediff, we can offer the user a
395 ;; (< (length file2) (length file1))
398 ;; replace file-pair with the winning file2
399 (setcar session-file-object file2))
401 ;; (< (length file1) (length file2))
404 ;; replace file-pair with the winning file1
405 (setcar session-file-object file1))
406 ((and f1-exists f2-exists
407 (string= file1 file2))
408 (setcar session-file-object file1))
409 ((and f1-exists f2-exists (eq chosen-alternative 1))
410 (setcar session-file-object file1))
411 ((and f1-exists f2-exists (eq chosen-alternative 2))
412 (setcar session-file-object file2))
413 ((and f1-exists f2-exists)
414 (with-output-to-temp-buffer ediff-msg-buffer
415 (ediff-with-current-buffer standard-output
418 Ediff has inferred that
421 are two possible targets for applying the patch.
422 Both files seem to be plausible alternatives.
425 Type `y' to use %s as the target;
426 Type `n' to use %s as the target.
428 file1 file2 file1 file2)))
429 (setcar session-file-object
430 (if (y-or-n-p (format "Use %s ? " file1))
432 (setq chosen-alternative 1)
434 (setq chosen-alternative 2)
437 (f2-exists (setcar session-file-object file2))
438 (f1-exists (setcar session-file-object file1))
440 (with-output-to-temp-buffer ediff-msg-buffer
441 (ediff-with-current-buffer standard-output
443 (princ "\nEdiff has inferred that")
444 (if (string= file1 file2)
447 is assumed to be the target for this patch. However, this file does not exist."
452 are two possible targets for this patch. However, these files do not exist."
455 \nPlease enter an alternative patch target ...\n"))
459 (setq target (read-file-name
460 "Please enter a patch target: "
461 actual-dir actual-dir t))
462 (if (not (file-directory-p target))
465 (message "%s is a directory" target)
467 (setcar session-file-object target))))))
471 (defun ediff-show-patch-diagnostics ()
473 (cond ((window-live-p ediff-window-A)
474 (set-window-buffer ediff-window-A ediff-patch-diagnostics))
475 ((window-live-p ediff-window-B)
476 (set-window-buffer ediff-window-B ediff-patch-diagnostics))
477 (t (display-buffer ediff-patch-diagnostics 'not-this-window))))
479 ;; prompt for file, get the buffer
480 (defun ediff-prompt-for-patch-file ()
481 (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch)
482 (ediff-patch-default-directory) ; try patch default dir
483 (t default-directory)))
484 (coding-system-for-read ediff-coding-system-for-read)
486 (setq patch-file-name
488 (format "Patch is in file%s: "
489 (cond ((and buffer-file-name
490 (equal (expand-file-name dir)
491 (file-name-directory buffer-file-name)))
494 (file-name-nondirectory buffer-file-name)
497 dir buffer-file-name 'must-match))
498 (if (file-directory-p patch-file-name)
499 (error "Patch file cannot be a directory: %s" patch-file-name)
500 (find-file-noselect patch-file-name))
504 ;; Try current buffer, then the other window's buffer. Else, give up.
505 (defun ediff-prompt-for-patch-buffer ()
508 "Buffer that holds the patch: "
509 (cond ((save-excursion
510 (goto-char (point-min))
511 (re-search-forward ediff-context-diff-label-regexp nil t))
513 ((save-window-excursion
516 (goto-char (point-min))
517 (and (re-search-forward ediff-context-diff-label-regexp nil t)
519 ((save-window-excursion
522 (goto-char (point-min))
523 (and (re-search-forward ediff-context-diff-label-regexp nil t)
525 (t (ediff-other-buffer (current-buffer))))
529 (defun ediff-get-patch-buffer (&optional arg patch-buf)
530 "Obtain patch buffer. If patch is already in a buffer---use it.
531 Else, read patch file into a new buffer. If patch buffer is passed as an
532 optional argument, then use it."
533 (let ((last-nonmenu-event t) ; Emacs: don't use dialog box
534 last-command-event) ; XEmacs: don't use dialog box
536 (cond ((ediff-buffer-live-p patch-buf))
537 ;; even prefix arg: patch in buffer
538 ((and (integerp arg) (eq 0 (mod arg 2)))
539 (setq patch-buf (ediff-prompt-for-patch-buffer)))
540 ;; odd prefix arg: get patch from a file
541 ((and (integerp arg) (eq 1 (mod arg 2)))
542 (setq patch-buf (ediff-prompt-for-patch-file)))
544 (if (y-or-n-p "Is the patch already in a buffer? ")
545 (ediff-prompt-for-patch-buffer)
546 (ediff-prompt-for-patch-file)))))
548 (ediff-with-current-buffer patch-buf
549 (goto-char (point-min))
550 (or (ediff-get-visible-buffer-window patch-buf)
552 (pop-to-buffer patch-buf 'other-window)
553 (select-window (previous-window)))))
554 (ediff-map-patch-buffer patch-buf)
557 ;; Dispatch the right patch file function: regular or meta-level,
558 ;; depending on how many patches are in the patch file.
559 ;; At present, there is no support for meta-level patches.
560 ;; Should return either the ctl buffer or the meta-buffer
561 (defun ediff-dispatch-file-patching-job (patch-buf filename
562 &optional startup-hooks)
563 (ediff-with-current-buffer patch-buf
564 ;; relativize names in the patch with respect to source-file
565 (ediff-fixup-patch-map filename)
566 (if (< (length ediff-patch-map) 2)
567 (ediff-patch-file-internal
569 (if (and ediff-patch-map
572 ;; this is the file to patch
573 (ediff-get-session-objA-name (car ediff-patch-map))))
575 (ediff-get-session-objA-name (car ediff-patch-map)))
577 (ediff-get-session-objA-name (car ediff-patch-map))
580 (ediff-multi-patch-internal patch-buf startup-hooks))
584 ;; When patching a buffer, never change the orig file. Instead, create a new
585 ;; buffer, ***_patched, even if the buff visits a file.
586 ;; Users who want to actually patch the buffer should use
587 ;; ediff-patch-file, not ediff-patch-buffer.
588 (defun ediff-patch-buffer-internal (patch-buf
590 &optional startup-hooks)
591 (let* ((buf-to-patch (get-buffer buf-to-patch-name))
592 (visited-file (if buf-to-patch (buffer-file-name buf-to-patch)))
593 (buf-mod-status (buffer-modified-p buf-to-patch))
594 (multifile-patch-p (> (length (ediff-with-current-buffer patch-buf
595 ediff-patch-map)) 1))
596 default-dir file-name ctl-buf)
597 (if multifile-patch-p
599 "To apply multi-file patches, please use `ediff-patch-file'"))
601 ;; create a temp file to patch
602 (ediff-with-current-buffer buf-to-patch
603 (setq default-dir default-directory)
604 (setq file-name (ediff-make-temp-file buf-to-patch))
605 ;; temporarily switch visited file name, if any
606 (set-visited-file-name file-name)
607 ;; don't create auto-save file, if buff was visiting a file
609 (setq buffer-auto-save-file-name nil))
610 ;; don't confuse the user with a new bufname
611 (rename-buffer buf-to-patch-name)
612 (set-buffer-modified-p nil)
613 (set-visited-file-modtime) ; sync buffer and temp file
614 (setq default-directory default-dir)
617 ;; dispatch a patch function
618 (setq ctl-buf (ediff-dispatch-file-patching-job
619 patch-buf file-name startup-hooks))
621 (ediff-with-current-buffer ctl-buf
622 (delete-file (buffer-file-name ediff-buffer-A))
623 (delete-file (buffer-file-name ediff-buffer-B))
624 (ediff-with-current-buffer ediff-buffer-A
625 (if default-dir (setq default-directory default-dir))
626 (set-visited-file-name visited-file) ; visited-file might be nil
627 (rename-buffer buf-to-patch-name)
628 (set-buffer-modified-p buf-mod-status))
629 (ediff-with-current-buffer ediff-buffer-B
630 (setq buffer-auto-save-file-name nil) ; don't create auto-save file
631 (if default-dir (setq default-directory default-dir))
632 (set-visited-file-name nil)
633 (rename-buffer (ediff-unique-buffer-name
634 (concat buf-to-patch-name "_patched") ""))
635 (set-buffer-modified-p t)))
639 ;; Traditional patch has weird return codes.
640 ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble.
641 ;; 0 is a good code in all cases.
642 ;; We'll do the concervative thing.
643 (defun ediff-patch-return-code-ok (code)
645 ;;; (if (eq (ediff-test-patch-utility) 'traditional)
647 ;;; (not (eq code 2))))
649 (defun ediff-patch-file-internal (patch-buf source-filename
650 &optional startup-hooks)
651 (setq source-filename (expand-file-name source-filename))
653 (let* ((shell-file-name ediff-shell)
654 (patch-diagnostics (get-buffer-create "*ediff patch diagnostics*"))
655 ;; ediff-find-file may use a temp file to do the patch
656 ;; so, we save source-filename and true-source-filename as a var
657 ;; that initially is source-filename but may be changed to a temp
658 ;; file for the purpose of patching.
659 (true-source-filename source-filename)
660 (target-filename source-filename)
661 ;; this ensures that the patch process gets patch buffer in the
662 ;; encoding that Emacs thinks is right for that type of text
663 (coding-system-for-write
664 (if (boundp 'buffer-file-coding-system) buffer-file-coding-system))
665 target-buf buf-to-patch file-name-magic-p
666 patch-return-code ctl-buf backup-style aux-wind)
668 (if (string-match "V" ediff-patch-options)
670 "Ediff doesn't take the -V option in `ediff-patch-options'--sorry"))
672 ;; Make a temp file, if source-filename has a magic file handler (or if
673 ;; it is handled via auto-mode-alist and similar magic).
674 ;; Check if there is a buffer visiting source-filename and if they are in
675 ;; sync; arrange for the deletion of temp file.
676 (ediff-find-file 'true-source-filename 'buf-to-patch
677 'ediff-last-dir-patch 'startup-hooks)
679 ;; Check if source file name has triggered black magic, such as file name
680 ;; handlers or auto mode alist, and make a note of it.
681 ;; true-source-filename should be either the original name or a
682 ;; temporary file where we put the after-product of the file handler.
683 (setq file-name-magic-p (not (equal (file-truename true-source-filename)
684 (file-truename source-filename))))
686 ;; Checkout orig file, if necessary, so that the patched file
687 ;; could be checked back in.
688 (ediff-maybe-checkout buf-to-patch)
690 (ediff-with-current-buffer patch-diagnostics
691 (insert-buffer-substring patch-buf)
692 (message "Applying patch ... ")
693 ;; fix environment for gnu patch, so it won't make numbered extensions
694 (setq backup-style (getenv "VERSION_CONTROL"))
695 (setenv "VERSION_CONTROL" nil)
696 (setq patch-return-code
698 (point-min) (point-max)
700 t ; delete region (which contains the patch
701 t ; insert output (patch diagnostics) in current buffer
702 nil ; don't redisplay
703 shell-command-switch ; usually -c
704 (format "%s %s %s %s"
708 (expand-file-name true-source-filename))
711 ;; restore environment for gnu patch
712 (setenv "VERSION_CONTROL" backup-style))
714 (message "Applying patch ... done")
717 (switch-to-buffer patch-diagnostics)
718 (sit-for 0) ; synchronize - let the user see diagnostics
720 (or (and (ediff-patch-return-code-ok patch-return-code)
722 (concat true-source-filename ediff-backup-extension)))
724 (with-output-to-temp-buffer ediff-msg-buffer
725 (ediff-with-current-buffer standard-output
728 "Patch program has failed due to a bad patch file,
729 it couldn't apply all hunks, OR
730 it couldn't create the backup for the file being patched.
732 The former could be caused by a corrupt patch file or because the %S
733 program doesn't understand the format of the patch file in use.
735 The second problem might be due to an incompatibility among these settings:
736 ediff-patch-program = %S ediff-patch-options = %S
737 ediff-backup-extension = %S ediff-backup-specs = %S
739 See Ediff on-line manual for more details on these variables.
740 In particular, check the documentation for `ediff-backup-specs'.
742 In any of the above cases, Ediff doesn't compare files automatically.
743 However, if the patch was applied partially and the backup file was created,
744 you can still examine the changes via M-x ediff-files"
748 ediff-backup-extension
752 (if (setq aux-wind (get-buffer-window ediff-msg-buffer))
754 (select-window aux-wind)
755 (goto-char (point-max))))
756 (switch-to-buffer-other-window patch-diagnostics)
757 (error "Patch appears to have failed")))
759 ;; If black magic is involved, apply patch to a temp copy of the
760 ;; file. Otherwise, apply patch to the orig copy. If patch is applied
761 ;; to temp copy, we name the result old-name_patched for local files
762 ;; and temp-copy_patched for remote files. The orig file name isn't
763 ;; changed, and the temp copy of the original is later deleted.
764 ;; Without magic, the original file is renamed (usually into
765 ;; old-name_orig) and the result of patching will have the same name as
767 (if (not file-name-magic-p)
768 (ediff-with-current-buffer buf-to-patch
769 (set-visited-file-name
770 (concat source-filename ediff-backup-extension))
771 (set-buffer-modified-p nil))
773 ;; Black magic in effect.
774 ;; If orig file was remote, put the patched file in the temp directory.
775 ;; If orig file is local, put the patched file in the directory of
777 (setq target-filename
779 (if (ediff-file-remote-p (file-truename source-filename))
784 (rename-file true-source-filename target-filename t)
786 ;; arrange that the temp copy of orig will be deleted
787 (rename-file (concat true-source-filename ediff-backup-extension)
788 true-source-filename t))
790 ;; make orig buffer read-only
792 (cons 'ediff-set-read-only-in-buf-A startup-hooks))
794 ;; set up a buf for the patched file
795 (setq target-buf (find-file-noselect target-filename))
798 (ediff-buffers-internal
799 buf-to-patch target-buf nil
800 startup-hooks 'epatch))
801 (ediff-with-current-buffer ctl-buf
802 (setq ediff-patchbufer patch-buf
803 ediff-patch-diagnostics patch-diagnostics))
805 (bury-buffer patch-diagnostics)
806 (message "Type `P', if you need to see patch diagnostics")
809 (defun ediff-multi-patch-internal (patch-buf &optional startup-hooks)
812 ;; this sets various vars in the meta buffer inside
813 ;; ediff-prepare-meta-buffer
815 ;; tell what to do if the user clicks on a session record
816 (setq ediff-session-action-function
817 'ediff-patch-file-form-meta
818 ediff-meta-patchbufer patch-buf) )
820 (setq meta-buf (ediff-prepare-meta-buffer
821 'ediff-filegroup-action
822 (ediff-with-current-buffer patch-buf
823 (cons (ediff-make-new-meta-list-header
825 (format "%S" patch-buf) ; obj A
826 nil nil ; objects B,C
827 nil ; merge-auto-store-dir
828 nil ; comparison-func
831 "*Ediff Session Group Panel"
832 'ediff-redraw-directory-group-buffer
833 'ediff-multifile-patch
835 (ediff-show-meta-buffer meta-buf)
842 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
843 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
844 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
847 ;;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b
848 ;;; ediff-ptch.el ends here