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