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