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