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