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