Mercurial > emacs
annotate lisp/ediff-ptch.el @ 74253:6d9077dbc31a
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 27 Nov 2006 16:00:37 +0000 |
parents | 6169b51037af |
children | e3694f1cb928 d1c5430c5bff |
rev | line source |
---|---|
15479 | 1 ;;; ediff-ptch.el --- Ediff's patch support |
2 | |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64215
diff
changeset
|
3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
65856
diff
changeset
|
4 ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
15479 | 5 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
15479 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
15479 | 24 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
34860
diff
changeset
|
25 ;;; Commentary: |
15479 | 26 |
27 ;;; Code: | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
28 |
18054 | 29 |
30 (defgroup ediff-ptch nil | |
64009
86c9b411a34d
(ediff-ptch): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
53477
diff
changeset
|
31 "Ediff patch support." |
18054 | 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")) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
79 |
18839 | 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 () |
46332
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
88 (condition-case nil |
53477
79093b308520
* progmodes/idlwave.el (idlwave-make-tags):
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
89 (cond ((eq 0 (call-process ediff-patch-program nil nil nil "-z." "-b")) |
46332
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
90 ;; GNU `patch' v. >= 2.2 |
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
91 'gnu) |
53477
79093b308520
* progmodes/idlwave.el (idlwave-make-tags):
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
92 ((eq 0 (call-process ediff-patch-program nil nil nil "-b")) |
46332
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
93 'posix) |
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
94 (t 'traditional)) |
4079bb42ddae
(ediff-test-patch-utility): Catch error and return nil.
Richard M. Stallman <rms@gnu.org>
parents:
44028
diff
changeset
|
95 (file-error nil))) |
19774 | 96 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
97 (defcustom ediff-backup-specs |
19774 | 98 (let ((type (ediff-test-patch-utility))) |
99 (cond ((eq type 'gnu) | |
100 ;; GNU `patch' v. >= 2.2 | |
101 (format "-z%s -b" ediff-backup-extension)) | |
102 ((eq type 'posix) | |
103 ;; POSIX `patch' -- ediff-backup-extension must be ".orig" | |
104 (setq ediff-backup-extension ediff-default-backup-extension) | |
105 "-b") | |
106 (t | |
107 ;; traditional `patch' | |
108 (format "-b %s" ediff-backup-extension)))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
109 "*Backup directives to pass to the patch program. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
110 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
|
111 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
|
112 `.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
|
113 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
|
114 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
115 Some versions of the patch program let you specify `-b backup-extension'. |
18839 | 116 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
|
117 \(in which case ediff-backup-extension MUST be also `.orig'\). The latest |
18839 | 118 versions of GNU patch require `-b -z backup-extension'. |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
119 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
120 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
|
121 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
|
122 but not `-b extension', the variable `ediff-backup-extension' must |
19774 | 123 still be set so Ediff will know which extension to use. |
124 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
125 Ediff tries to guess the appropriate value for this variables. It is believed |
19774 | 126 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
|
127 patch. So, don't change these variables, unless the default doesn't work." |
18054 | 128 :type 'string |
129 :group 'ediff-ptch) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
130 |
15479 | 131 |
18054 | 132 (defcustom ediff-patch-default-directory nil |
133 "*Default directory to look for patches." | |
134 :type '(choice (const nil) string) | |
135 :group 'ediff-ptch) | |
15479 | 136 |
18054 | 137 (defcustom ediff-context-diff-label-regexp |
15479 | 138 (concat "\\(" ; context diff 2-liner |
139 "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)" | |
140 "\\|" ; 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
|
141 "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)" |
15479 | 142 "\\)") |
18839 | 143 "*Regexp matching filename 2-liners at the start of each context diff. |
144 You probably don't want to change that, unless you are using an obscure patch | |
145 program." | |
18054 | 146 :type 'regexp |
147 :group 'ediff-ptch) | |
15479 | 148 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
149 ;; The buffer of the patch file. Local to control buffer. |
15479 | 150 (ediff-defvar-local ediff-patchbufer nil "") |
151 | |
152 ;; The buffer where patch displays its diagnostics. | |
153 (ediff-defvar-local ediff-patch-diagnostics nil "") | |
154 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
155 ;; Map of patch buffer. Has the form: |
15479 | 156 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...) |
157 ;; where filenames are files to which patch would have applied the patch; | |
158 ;; marker1 delimits the beginning of the corresponding patch and marker2 does | |
159 ;; it for the end. | |
160 (ediff-defvar-local ediff-patch-map nil "") | |
161 | |
162 ;; strip prefix from filename | |
163 ;; returns /dev/null, if can't strip prefix | |
164 (defsubst ediff-file-name-sans-prefix (filename prefix) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
165 (if prefix |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
166 (save-match-data |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
167 (if (string-match (concat "^" (if (stringp prefix) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
168 (regexp-quote prefix) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
169 "")) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
170 filename) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
171 (substring filename (match-end 0)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
172 (concat "/null/" filename))) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
173 filename) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
174 ) |
15479 | 175 |
176 | |
177 | |
178 ;; no longer used | |
179 ;; return the number of matches of regexp in buf starting from the beginning | |
180 (defun ediff-count-matches (regexp buf) | |
19047 | 181 (ediff-with-current-buffer buf |
15479 | 182 (let ((count 0) opoint) |
183 (save-excursion | |
184 (goto-char (point-min)) | |
185 (while (and (not (eobp)) | |
186 (progn (setq opoint (point)) | |
187 (re-search-forward regexp nil t))) | |
188 (if (= opoint (point)) | |
189 (forward-char 1) | |
190 (setq count (1+ count))))) | |
191 count))) | |
192 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
193 ;; 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
|
194 ;; ((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
|
195 ;; (nil nil filename-spec2 marker1 marker2) ...) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
196 ;; where filename-spec[12] are files to which the `patch' program would |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
197 ;; 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
|
198 ;; 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
|
199 ;; 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
|
200 ;; 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
|
201 ;; 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
|
202 ;; resolves this later. |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
203 ;; |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
204 ;; 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
|
205 ;; `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
|
206 ;; 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
|
207 ;; 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
|
208 ;; The function returns the number of elements in the list ediff-patch-map |
15479 | 209 (defun ediff-map-patch-buffer (buf) |
19047 | 210 (ediff-with-current-buffer buf |
15479 | 211 (let ((count 0) |
212 (mark1 (move-marker (make-marker) (point-min))) | |
213 (mark1-end (point-min)) | |
214 (possible-file-names '("/dev/null" . "/dev/null")) | |
215 mark2-end mark2 filenames | |
216 beg1 beg2 end1 end2 | |
217 patch-map opoint) | |
218 (save-excursion | |
219 (goto-char (point-min)) | |
220 (setq opoint (point)) | |
221 (while (and (not (eobp)) | |
222 (re-search-forward ediff-context-diff-label-regexp nil t)) | |
223 (if (= opoint (point)) | |
224 (forward-char 1) ; ensure progress towards the end | |
225 (setq mark2 (move-marker (make-marker) (match-beginning 0)) | |
226 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
|
227 beg1 (or (match-beginning 2) (match-beginning 4)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
228 end1 (or (match-end 2) (match-end 4)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
229 beg2 (or (match-beginning 3) (match-beginning 5)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
230 end2 (or (match-end 3) (match-end 5))) |
15479 | 231 ;; possible-file-names is holding the new file names until we |
232 ;; 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
|
233 ;; 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
|
234 ;; (filename-from-1st-header-line . fn from 2nd line) |
15479 | 235 (setq possible-file-names |
236 (cons (if (and beg1 end1) | |
237 (buffer-substring beg1 end1) | |
238 "/dev/null") | |
239 (if (and beg2 end2) | |
240 (buffer-substring beg2 end2) | |
241 "/dev/null"))) | |
242 ;; check for any `Index:' or `Prereq:' lines, but don't use them | |
243 (if (re-search-backward "^Index:" mark1-end 'noerror) | |
244 (move-marker mark2 (match-beginning 0))) | |
245 (if (re-search-backward "^Prereq:" mark1-end 'noerror) | |
246 (move-marker mark2 (match-beginning 0))) | |
247 | |
248 (goto-char mark2-end) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
249 |
15479 | 250 (if filenames |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
251 (setq patch-map |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
252 (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
|
253 filenames mark1 mark2) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
254 patch-map))) |
15479 | 255 (setq mark1 mark2 |
256 mark1-end mark2-end | |
257 filenames possible-file-names)) | |
258 (setq opoint (point) | |
259 count (1+ count)))) | |
260 (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
|
261 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
|
262 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
|
263 patch-map)) |
15479 | 264 (setq ediff-patch-map (nreverse patch-map)) |
265 count))) | |
266 | |
267 ;; Fix up the file names in the list using the argument FILENAME | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
268 ;; Algorithm: find the files' directories in the patch and, if a directory is |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
269 ;; absolute, cut it out from the corresponding file name in the patch. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
270 ;; Relative directories are not cut out. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
271 ;; Prepend the directory of FILENAME to each resulting file (which came |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
272 ;; originally from the patch). |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
273 ;; In addition, the first file in the patch document is replaced by FILENAME. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
274 ;; Each file is actually a pair of files found in the context diff header |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
275 ;; In the end, for each pair, we ask the user which file to patch. |
15479 | 276 ;; 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
|
277 ;; with the `Index:' line. It treats them as a single-file patch. |
15479 | 278 ;; |
279 ;; Executes inside the patch buffer | |
280 (defun ediff-fixup-patch-map (filename) | |
281 (setq filename (expand-file-name filename)) | |
282 (let ((actual-dir (if (file-directory-p filename) | |
283 ;; directory part of filename | |
284 (file-name-as-directory filename) | |
285 (file-name-directory filename))) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
286 ;; In case 2 files are possible patch targets, the user will be offered |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
287 ;; to choose file1 or file2. In a multifile patch, if the user chooses |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
288 ;; 1 or 2, this choice is preserved to decide future alternatives. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
289 chosen-alternative |
15479 | 290 ) |
291 | |
292 ;; 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
|
293 (mapcar (lambda (session-info) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
294 (let* ((proposed-file-names |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
295 ;; Filename-spec is objA; it is represented as |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
296 ;; (file1 . file2). Get it using ediff-get-session-objA. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
297 (ediff-get-session-objA-name session-info)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
298 ;; base-dir1 is the dir part of the 1st file in the patch |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
299 (base-dir1 |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
300 (or (file-name-directory (car proposed-file-names)) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
301 "")) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
302 ;; directory part of the 2nd file in the patch |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
303 (base-dir2 |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
304 (or (file-name-directory (cdr proposed-file-names)) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
305 "")) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
306 ) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
307 ;; If both base-dir1 and base-dir2 are relative and exist, |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
308 ;; assume that |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
309 ;; these dirs lead to the actual files starting at the present |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
310 ;; directory. So, we don't strip these relative dirs from the |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
311 ;; file names. This is a heuristic intended to improve guessing |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
312 (unless (or (file-name-absolute-p base-dir1) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
313 (file-name-absolute-p base-dir2) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
314 (not (file-exists-p base-dir1)) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
315 (not (file-exists-p base-dir2))) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
316 (setq base-dir1 "" |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
317 base-dir2 "")) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
318 (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
|
319 (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
|
320 (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
|
321 (car proposed-file-names) base-dir1))) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
322 (or (string= |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
323 (cdr proposed-file-names) "/dev/null") |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
324 (setcdr proposed-file-names |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
325 (ediff-file-name-sans-prefix |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
326 (cdr proposed-file-names) base-dir2))) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
327 )) |
15479 | 328 ediff-patch-map) |
329 | |
330 ;; take the given file name into account | |
331 (or (file-directory-p filename) | |
332 (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
|
333 (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
|
334 (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
|
335 (file-name-nondirectory filename)))) |
15479 | 336 |
337 ;; 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
|
338 (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
|
339 (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
|
340 (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
|
341 (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
|
342 (string-match "^/null/" (cdr proposed-file-names))) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
343 ;; couldn't intuit the file name to patch, so |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
344 ;; something is amiss |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
345 (progn |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
346 (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
|
347 (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
|
348 (fundamental-mode)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
349 (princ |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
350 (format " |
15479 | 351 The patch file contains a context diff for |
352 %s | |
353 %s | |
354 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
|
355 to be patched on your system. If you know the correct file name, |
15479 | 356 please enter it now. |
357 | |
358 If you don't know and still would like to apply patches to | |
359 other files, enter /dev/null | |
360 " | |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
361 (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
|
362 (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
|
363 (let ((directory t) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
364 user-file) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
365 (while directory |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
366 (setq user-file |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
367 (read-file-name |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
368 "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
|
369 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
|
370 (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
|
371 (setq directory nil) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
372 (setq directory t) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
373 (beep) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
374 (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
|
375 (sit-for 2))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
376 (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
|
377 (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
|
378 (setcar proposed-file-names |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
379 (expand-file-name |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
380 (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
|
381 (setcdr proposed-file-names |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
382 (expand-file-name |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
383 (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
|
384 )) |
15479 | 385 ediff-patch-map) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
386 ;; Check for the existing files in each pair and discard the nonexisting |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65786
diff
changeset
|
387 ;; ones. If both exist, ask the user. |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
388 (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
|
389 (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
|
390 (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
|
391 (session-file-object |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
392 (ediff-get-session-objA session-info)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
393 (f1-exists (file-exists-p file1)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
394 (f2-exists (file-exists-p file2))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
395 (cond |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
396 ((and |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
397 ;; The patch program prefers the shortest file as the patch |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
398 ;; target. However, this is a questionable heuristic. In an |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
399 ;; interactive program, like ediff, we can offer the user a |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
400 ;; choice. |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
401 ;; (< (length file2) (length file1)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
402 (not f1-exists) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
403 f2-exists) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
404 ;; 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
|
405 (setcar session-file-object file2)) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
406 ((and |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
407 ;; (< (length file1) (length file2)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
408 (not f2-exists) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
409 f1-exists) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
410 ;; 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
|
411 (setcar session-file-object file1)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
412 ((and f1-exists f2-exists |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
413 (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
|
414 (setcar session-file-object file1)) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
415 ((and f1-exists f2-exists (eq chosen-alternative 1)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
416 (setcar session-file-object file1)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
417 ((and f1-exists f2-exists (eq chosen-alternative 2)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
418 (setcar session-file-object file2)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
419 ((and f1-exists f2-exists) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
420 (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
|
421 (ediff-with-current-buffer standard-output |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
422 (fundamental-mode)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
423 (princ (format " |
15479 | 424 Ediff has inferred that |
425 %s | |
426 %s | |
19774 | 427 are two possible targets for applying the patch. |
15479 | 428 Both files seem to be plausible alternatives. |
429 | |
430 Please advice: | |
431 Type `y' to use %s as the target; | |
432 Type `n' to use %s as the target. | |
433 " | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
434 file1 file2 file1 file2))) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
435 (setcar session-file-object |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
436 (if (y-or-n-p (format "Use %s ? " file1)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
437 (progn |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
438 (setq chosen-alternative 1) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
439 file1) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
440 (setq chosen-alternative 2) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
441 file2)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
442 ) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
443 (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
|
444 (f1-exists (setcar session-file-object file1)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
445 (t |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
446 (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
|
447 (ediff-with-current-buffer standard-output |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
448 (fundamental-mode)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
449 (princ "\nEdiff has inferred that") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
450 (if (string= file1 file2) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
451 (princ (format " |
19774 | 452 %s |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
453 is assumed to be the target for this patch. However, this file does not exist." |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
454 file1)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
455 (princ (format " |
15479 | 456 %s |
457 %s | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
458 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
|
459 file1 file2))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
460 (princ " |
19774 | 461 \nPlease enter an alternative patch target ...\n")) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
462 (let ((directory t) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
463 target) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
464 (while directory |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
465 (setq target (read-file-name |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
466 "Please enter a patch target: " |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
467 actual-dir actual-dir t)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
468 (if (not (file-directory-p target)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
469 (setq directory nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
470 (beep) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
471 (message "%s is a directory" target) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
472 (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
|
473 (setcar session-file-object target)))))) |
15479 | 474 ediff-patch-map) |
475 )) | |
476 | |
477 (defun ediff-show-patch-diagnostics () | |
478 (interactive) | |
479 (cond ((window-live-p ediff-window-A) | |
480 (set-window-buffer ediff-window-A ediff-patch-diagnostics)) | |
481 ((window-live-p ediff-window-B) | |
482 (set-window-buffer ediff-window-B ediff-patch-diagnostics)) | |
483 (t (display-buffer ediff-patch-diagnostics 'not-this-window)))) | |
484 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
485 ;; prompt for file, get the buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
486 (defun ediff-prompt-for-patch-file () |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
487 (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
488 (ediff-patch-default-directory) ; try patch default dir |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
489 (t default-directory))) |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
490 (coding-system-for-read ediff-coding-system-for-read) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
491 patch-file-name) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
492 (setq patch-file-name |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
493 (read-file-name |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
494 (format "Patch is in file%s: " |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
495 (cond ((and buffer-file-name |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
496 (equal (expand-file-name dir) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
497 (file-name-directory buffer-file-name))) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
498 (concat |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
499 " (default " |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
500 (file-name-nondirectory buffer-file-name) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
501 ")")) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
502 (t ""))) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
503 dir buffer-file-name 'must-match)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
504 (if (file-directory-p patch-file-name) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
505 (error "Patch file cannot be a directory: %s" patch-file-name) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
506 (find-file-noselect patch-file-name)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
507 )) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
508 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
509 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
510 ;; 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
|
511 (defun ediff-prompt-for-patch-buffer () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
512 (get-buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
513 (read-buffer |
34860
fdb5d08ced13
2000-12-25 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33393
diff
changeset
|
514 "Buffer that holds the patch: " |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
515 (cond ((save-excursion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
516 (goto-char (point-min)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
517 (re-search-forward ediff-context-diff-label-regexp nil t)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
518 (current-buffer)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
519 ((save-window-excursion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
520 (other-window 1) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
521 (save-excursion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
522 (goto-char (point-min)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
523 (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
|
524 (current-buffer))))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
525 ((save-window-excursion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
526 (other-window -1) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
527 (save-excursion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
528 (goto-char (point-min)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
529 (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
|
530 (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
|
531 (t (ediff-other-buffer (current-buffer)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
532 'must-match))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
533 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
534 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
535 (defun ediff-get-patch-buffer (&optional arg patch-buf) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
536 "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
|
537 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
|
538 optional argument, then use it." |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
539 (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
|
540 last-command-event) ; XEmacs: don't use dialog box |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
541 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
542 (cond ((ediff-buffer-live-p patch-buf)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
543 ;; even prefix arg: patch in buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
544 ((and (integerp arg) (eq 0 (mod arg 2))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
545 (setq patch-buf (ediff-prompt-for-patch-buffer))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
546 ;; odd prefix arg: get patch from a file |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
547 ((and (integerp arg) (eq 1 (mod arg 2))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
548 (setq patch-buf (ediff-prompt-for-patch-file))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
549 (t (setq patch-buf |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
550 (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
|
551 (ediff-prompt-for-patch-buffer) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
552 (ediff-prompt-for-patch-file))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
553 |
19047 | 554 (ediff-with-current-buffer patch-buf |
15479 | 555 (goto-char (point-min)) |
556 (or (ediff-get-visible-buffer-window patch-buf) | |
557 (progn | |
558 (pop-to-buffer patch-buf 'other-window) | |
559 (select-window (previous-window))))) | |
560 (ediff-map-patch-buffer patch-buf) | |
561 patch-buf)) | |
562 | |
563 ;; Dispatch the right patch file function: regular or meta-level, | |
564 ;; depending on how many patches are in the patch file. | |
565 ;; At present, there is no support for meta-level patches. | |
566 ;; Should return either the ctl buffer or the meta-buffer | |
567 (defun ediff-dispatch-file-patching-job (patch-buf filename | |
568 &optional startup-hooks) | |
19047 | 569 (ediff-with-current-buffer patch-buf |
15479 | 570 ;; relativize names in the patch with respect to source-file |
571 (ediff-fixup-patch-map filename) | |
572 (if (< (length ediff-patch-map) 2) | |
573 (ediff-patch-file-internal | |
574 patch-buf | |
33393
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
575 (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
|
576 (not (string-match |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
577 "^/dev/null" |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
578 ;; 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
|
579 (ediff-get-session-objA-name (car ediff-patch-map)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
580 (> (length |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
581 (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
|
582 1)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
583 (ediff-get-session-objA-name (car ediff-patch-map)) |
15479 | 584 filename) |
585 startup-hooks) | |
586 (ediff-multi-patch-internal patch-buf startup-hooks)) | |
587 )) | |
588 | |
589 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
590 ;; When patching a buffer, never change the orig file. Instead, create a new |
19774 | 591 ;; buffer, ***_patched, even if the buff visits a file. |
592 ;; Users who want to actually patch the buffer should use | |
593 ;; ediff-patch-file, not ediff-patch-buffer. | |
594 (defun ediff-patch-buffer-internal (patch-buf | |
595 buf-to-patch-name | |
596 &optional startup-hooks) | |
15479 | 597 (let* ((buf-to-patch (get-buffer buf-to-patch-name)) |
19774 | 598 (visited-file (if buf-to-patch (buffer-file-name buf-to-patch))) |
15479 | 599 (buf-mod-status (buffer-modified-p buf-to-patch)) |
19047 | 600 (multifile-patch-p (> (length (ediff-with-current-buffer patch-buf |
15479 | 601 ediff-patch-map)) 1)) |
602 default-dir file-name ctl-buf) | |
19774 | 603 (if multifile-patch-p |
604 (error | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
19774
diff
changeset
|
605 "To apply multi-file patches, please use `ediff-patch-file'")) |
19774 | 606 |
607 ;; create a temp file to patch | |
608 (ediff-with-current-buffer buf-to-patch | |
609 (setq default-dir default-directory) | |
610 (setq file-name (ediff-make-temp-file buf-to-patch)) | |
611 ;; temporarily switch visited file name, if any | |
612 (set-visited-file-name file-name) | |
613 ;; don't create auto-save file, if buff was visiting a file | |
614 (or visited-file | |
615 (setq buffer-auto-save-file-name nil)) | |
616 ;; don't confuse the user with a new bufname | |
617 (rename-buffer buf-to-patch-name) | |
618 (set-buffer-modified-p nil) | |
619 (set-visited-file-modtime) ; sync buffer and temp file | |
620 (setq default-directory default-dir) | |
621 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
622 |
15479 | 623 ;; dispatch a patch function |
624 (setq ctl-buf (ediff-dispatch-file-patching-job | |
625 patch-buf file-name startup-hooks)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
626 |
19774 | 627 (ediff-with-current-buffer ctl-buf |
628 (delete-file (buffer-file-name ediff-buffer-A)) | |
629 (delete-file (buffer-file-name ediff-buffer-B)) | |
630 (ediff-with-current-buffer ediff-buffer-A | |
631 (if default-dir (setq default-directory default-dir)) | |
632 (set-visited-file-name visited-file) ; visited-file might be nil | |
633 (rename-buffer buf-to-patch-name) | |
634 (set-buffer-modified-p buf-mod-status)) | |
635 (ediff-with-current-buffer ediff-buffer-B | |
636 (setq buffer-auto-save-file-name nil) ; don't create auto-save file | |
637 (if default-dir (setq default-directory default-dir)) | |
638 (set-visited-file-name nil) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
639 (rename-buffer (ediff-unique-buffer-name |
19774 | 640 (concat buf-to-patch-name "_patched") "")) |
641 (set-buffer-modified-p t))) | |
15479 | 642 )) |
643 | |
19774 | 644 |
645 ;; Traditional patch has weird return codes. | |
646 ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble. | |
647 ;; 0 is a good code in all cases. | |
648 ;; We'll do the concervative thing. | |
649 (defun ediff-patch-return-code-ok (code) | |
650 (eq code 0)) | |
651 ;;; (if (eq (ediff-test-patch-utility) 'traditional) | |
652 ;;; (eq code 0) | |
653 ;;; (not (eq code 2)))) | |
654 | |
15479 | 655 (defun ediff-patch-file-internal (patch-buf source-filename |
656 &optional startup-hooks) | |
657 (setq source-filename (expand-file-name source-filename)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
658 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
659 (let* ((shell-file-name ediff-shell) |
15479 | 660 (patch-diagnostics (get-buffer-create "*ediff patch diagnostics*")) |
661 ;; ediff-find-file may use a temp file to do the patch | |
662 ;; so, we save source-filename and true-source-filename as a var | |
663 ;; that initially is source-filename but may be changed to a temp | |
664 ;; file for the purpose of patching. | |
665 (true-source-filename source-filename) | |
666 (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
|
667 ;; 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
|
668 ;; encoding that Emacs thinks is right for that type of text |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
669 (coding-system-for-write |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
670 (if (boundp 'buffer-file-coding-system) buffer-file-coding-system)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
671 target-buf buf-to-patch file-name-magic-p |
19047 | 672 patch-return-code ctl-buf backup-style aux-wind) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
673 |
19774 | 674 (if (string-match "V" ediff-patch-options) |
15479 | 675 (error |
676 "Ediff doesn't take the -V option in `ediff-patch-options'--sorry")) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
677 |
15479 | 678 ;; Make a temp file, if source-filename has a magic file handler (or if |
679 ;; it is handled via auto-mode-alist and similar magic). | |
680 ;; Check if there is a buffer visiting source-filename and if they are in | |
681 ;; sync; arrange for the deletion of temp file. | |
682 (ediff-find-file 'true-source-filename 'buf-to-patch | |
683 'ediff-last-dir-patch 'startup-hooks) | |
684 | |
685 ;; Check if source file name has triggered black magic, such as file name | |
686 ;; handlers or auto mode alist, and make a note of it. | |
687 ;; true-source-filename should be either the original name or a | |
688 ;; temporary file where we put the after-product of the file handler. | |
689 (setq file-name-magic-p (not (equal (file-truename true-source-filename) | |
690 (file-truename source-filename)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
691 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
692 ;; Checkout orig file, if necessary, so that the patched file |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
693 ;; could be checked back in. |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
694 (ediff-maybe-checkout buf-to-patch) |
15479 | 695 |
19047 | 696 (ediff-with-current-buffer patch-diagnostics |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
697 (insert-buffer-substring patch-buf) |
15479 | 698 (message "Applying patch ... ") |
699 ;; fix environment for gnu patch, so it won't make numbered extensions | |
700 (setq backup-style (getenv "VERSION_CONTROL")) | |
701 (setenv "VERSION_CONTROL" nil) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
702 (setq patch-return-code |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
703 (call-process-region |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
704 (point-min) (point-max) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
705 shell-file-name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
706 t ; delete region (which contains the patch |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
707 t ; insert output (patch diagnostics) in current buffer |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
708 nil ; don't redisplay |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
709 shell-command-switch ; usually -c |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
710 (format "%s %s %s %s" |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
711 ediff-patch-program |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
712 ediff-patch-options |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
713 ediff-backup-specs |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
714 (expand-file-name true-source-filename)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
715 )) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
716 |
15479 | 717 ;; restore environment for gnu patch |
718 (setenv "VERSION_CONTROL" backup-style)) | |
719 | |
720 (message "Applying patch ... done") | |
721 (message "") | |
722 | |
723 (switch-to-buffer patch-diagnostics) | |
724 (sit-for 0) ; synchronize - let the user see diagnostics | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
725 |
19774 | 726 (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
|
727 (file-exists-p |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
728 (concat true-source-filename ediff-backup-extension))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
729 (progn |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
730 (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
|
731 (ediff-with-current-buffer standard-output |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
732 (fundamental-mode)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
733 (princ (format |
19774 | 734 "Patch program has failed due to a bad patch file, |
735 it couldn't apply all hunks, OR | |
736 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
|
737 |
18839 | 738 The former could be caused by a corrupt patch file or because the %S |
739 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
|
740 |
18839 | 741 The second problem might be due to an incompatibility among these settings: |
19774 | 742 ediff-patch-program = %S ediff-patch-options = %S |
743 ediff-backup-extension = %S ediff-backup-specs = %S | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
744 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
745 See Ediff on-line manual for more details on these variables. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
746 In particular, check the documentation for `ediff-backup-specs'. |
19774 | 747 |
748 In any of the above cases, Ediff doesn't compare files automatically. | |
749 However, if the patch was applied partially and the backup file was created, | |
750 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
|
751 ediff-patch-program |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
752 ediff-patch-program |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
753 ediff-patch-options |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
754 ediff-backup-extension |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
755 ediff-backup-specs |
a0ee9eabfff3
(ediff-dispatch-file-patching-job): Check
Dave Love <fx@gnu.org>
parents:
26585
diff
changeset
|
756 ))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
757 (beep 1) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
758 (if (setq aux-wind (get-buffer-window ediff-msg-buffer)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
759 (progn |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
760 (select-window aux-wind) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
761 (goto-char (point-max)))) |
18839 | 762 (switch-to-buffer-other-window patch-diagnostics) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
763 (error "Patch appears to have failed"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
764 |
15479 | 765 ;; 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
|
766 ;; file. Otherwise, apply patch to the orig copy. If patch is applied |
15479 | 767 ;; 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
|
768 ;; and temp-copy_patched for remote files. The orig file name isn't |
15479 | 769 ;; changed, and the temp copy of the original is later deleted. |
770 ;; Without magic, the original file is renamed (usually into | |
771 ;; old-name_orig) and the result of patching will have the same name as | |
772 ;; the original. | |
773 (if (not file-name-magic-p) | |
19047 | 774 (ediff-with-current-buffer buf-to-patch |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
775 (set-visited-file-name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16168
diff
changeset
|
776 (concat source-filename ediff-backup-extension)) |
15479 | 777 (set-buffer-modified-p nil)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
778 |
15479 | 779 ;; Black magic in effect. |
780 ;; If orig file was remote, put the patched file in the temp directory. | |
781 ;; If orig file is local, put the patched file in the directory of | |
782 ;; the orig file. | |
783 (setq target-filename | |
784 (concat | |
785 (if (ediff-file-remote-p (file-truename source-filename)) | |
786 true-source-filename | |
787 source-filename) | |
788 "_patched")) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
789 |
15479 | 790 (rename-file true-source-filename target-filename t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
791 |
15479 | 792 ;; 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
|
793 (rename-file (concat true-source-filename ediff-backup-extension) |
15479 | 794 true-source-filename t)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
795 |
15479 | 796 ;; make orig buffer read-only |
797 (setq startup-hooks | |
798 (cons 'ediff-set-read-only-in-buf-A startup-hooks)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
799 |
15479 | 800 ;; set up a buf for the patched file |
801 (setq target-buf (find-file-noselect target-filename)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
802 |
15479 | 803 (setq ctl-buf |
804 (ediff-buffers-internal | |
805 buf-to-patch target-buf nil | |
806 startup-hooks 'epatch)) | |
19047 | 807 (ediff-with-current-buffer ctl-buf |
15479 | 808 (setq ediff-patchbufer patch-buf |
809 ediff-patch-diagnostics patch-diagnostics)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
810 |
15479 | 811 (bury-buffer patch-diagnostics) |
812 (message "Type `P', if you need to see patch diagnostics") | |
813 ctl-buf)) | |
814 | |
815 (defun ediff-multi-patch-internal (patch-buf &optional startup-hooks) | |
816 (let (meta-buf) | |
817 (setq startup-hooks | |
818 ;; this sets various vars in the meta buffer inside | |
819 ;; ediff-prepare-meta-buffer | |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
820 (cons `(lambda () |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
821 ;; 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
|
822 (setq ediff-session-action-function |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
823 'ediff-patch-file-form-meta |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
824 ediff-meta-patchbufer patch-buf) ) |
15479 | 825 startup-hooks)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
826 (setq meta-buf (ediff-prepare-meta-buffer |
15479 | 827 'ediff-filegroup-action |
19047 | 828 (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
|
829 (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
|
830 nil ; regexp |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
831 (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
|
832 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
|
833 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
|
834 nil ; comparison-func |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
835 ) |
15479 | 836 ediff-patch-map)) |
837 "*Ediff Session Group Panel" | |
838 'ediff-redraw-directory-group-buffer | |
839 'ediff-multifile-patch | |
840 startup-hooks)) | |
841 (ediff-show-meta-buffer meta-buf) | |
842 )) | |
843 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
844 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46332
diff
changeset
|
845 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
846 (provide 'ediff-ptch) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
847 |
15479 | 848 |
849 ;;; Local Variables: | |
850 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
19047 | 851 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
852 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
15479 | 853 ;;; End: |
854 | |
52401 | 855 ;;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b |
15479 | 856 ;;; ediff-ptch.el ends here |