| blob | a06c861e3a688b79638c0b39263ed14b30999d30 |
1 ;;; ediff-ptch.el --- Ediff's patch support
3 ;; Copyright (C) 1996 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
7 ;; This file is part of GNU Emacs.
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
10 ;; it under the terms of the GNU General Public License as published by
11 ;; the Free Software Foundation; either version 2, or (at your option)
12 ;; any later version.
14 ;; GNU Emacs is distributed in the hope that it will be useful,
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 ;; GNU General Public License for more details.
19 ;; You should have received a copy of the GNU General Public License
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA.
25 ;;; Code:
53 ;; The buffer of the patch file. Local to control buffer.
56 ;; The buffer where patch displays its diagnostics.
59 ;; Map of patch buffer. Has the form:
60 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...)
61 ;; where filenames are files to which patch would have applied the patch;
62 ;; marker1 delimits the beginning of the corresponding patch and marker2 does
63 ;; it for the end.
66 ;; strip prefix from filename
67 ;; returns /dev/null, if can't strip prefix
76 ;; no longer used
77 ;; return the number of matches of regexp in buf starting from the beginning
89 count)))
91 ;; Scan BUF (which is supposed to contain a patch) and make a list of the form
92 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...)
93 ;; where filenames are files to which patch would have applied the patch;
94 ;; marker1 delimits the beginning of the corresponding patch and marker2 does
95 ;; it for the end. This list is then assigned to ediff-patch-map.
96 ;; Returns the number of elements in the list ediff-patch-map
103 mark2-end mark2 filenames
104 beg1 beg2 end1 end2
105 patch-map opoint)
119 ;; possible-file-names is holding the new file names until we
120 ;; insert the old file name in the patch map
121 ;; It is a pair (filename from 1st header line . fn from 2nd line)
129 ;; check for any `Index:' or `Prereq:' lines, but don't use them
140 mark1-end mark2-end
141 filenames possible-file-names))
147 count)))
149 ;; Fix up the file names in the list using the argument FILENAME
150 ;; Algorithm: find the first file's directory and cut it out from each file
151 ;; name in the patch. Prepend the directory of FILENAME to each file in the
152 ;; patch. In addition, the first file in the patch is replaced by FILENAME.
153 ;; Each file is actually a file-pair of files found in the context diff header
154 ;; In the end, for each pair, we select the shortest existing file.
155 ;; Note: Ediff doesn't recognize multi-file patches that are separated
156 ;; with the `Index:' line. It treats them as a single-file patch.
157 ;;
158 ;; Executes inside the patch buffer
162 ;; directory part of filename
165 ;; directory part of the first file in the patch
168 )
170 ;; chop off base-dirs
180 ))
181 ediff-patch-map)
183 ;; take the given file name into account
191 ;; prepend actual-dir
195 ;; couldn't strip base-dir1 and base-dir2
196 ;; hence, something wrong
201 The patch file contains a context diff for
202 %s
203 %s
205 However, Ediff cannot infer the name of the actual file
206 to be patched on your system. If you know the correct file name,
207 please enter it now.
209 If you don't know and still would like to apply patches to
210 other files, enter /dev/null
211 "
215 user-file)
219 "Please enter file name: "
220 actual-dir actual-dir t))
234 ))
235 ediff-patch-map)
236 ;; check for the shorter existing file in each pair and discard the other
237 ;; one
245 f2-exists)
248 f1-exists)
256 Ediff has inferred that
257 %s
258 %s
259 are possible targets for applying the patch.
260 Both files seem to be plausible alternatives.
262 Please advice:
263 Type `y' to use %s as the target;
264 Type `n' to use %s as the target.
265 "
266 file1 file2 file2 file1)))
269 file2 file1)))
275 Ediff inferred that
276 %s
277 %s
278 are possible alternative targets for this patch.
280 However, these files do not exist.
282 Please enter an alternative patch target ...
283 "
284 file1 file2)))
286 target)
289 "Please enter a patch target: "
290 actual-dir actual-dir t))
297 ediff-patch-map)
298 ))
309 "Obtain patch buffer. If patch is already in a buffer---use it.
310 Else, read patch file into a new buffer."
314 patch-buf)
319 "Which buffer contains the patch? "
332 patch-buf))
334 ;; Dispatch the right patch file function: regular or meta-level,
335 ;; depending on how many patches are in the patch file.
336 ;; At present, there is no support for meta-level patches.
337 ;; Should return either the ctl buffer or the meta-buffer
341 ;; relativize names in the patch with respect to source-file
345 patch-buf
349 filename)
350 startup-hooks)
352 ))
362 default-dir file-name ctl-buf)
373 ;;don't confuse the user with a new bufname
378 ))
380 ;; dispatch a patch function
382 patch-buf file-name startup-hooks))
385 ()
386 ;; buffer wasn't visiting any file,
387 ;; so we will not run meta-level ediff here
403 ))
410 ;; if the user specified a -b option, extract the backup
411 ;; extension from there; else use ediff-backup-extension
419 ;; ediff-find-file may use a temp file to do the patch
420 ;; so, we save source-filename and true-source-filename as a var
421 ;; that initially is source-filename but may be changed to a temp
422 ;; file for the purpose of patching.
425 target-buf buf-to-patch file-name-magic-p ctl-buf backup-style)
427 ;; if the user didn't specify a backup extension, use
428 ;; ediff-backup-extension
435 ;; Make a temp file, if source-filename has a magic file handler (or if
436 ;; it is handled via auto-mode-alist and similar magic).
437 ;; Check if there is a buffer visiting source-filename and if they are in
438 ;; sync; arrange for the deletion of temp file.
442 ;; Check if source file name has triggered black magic, such as file name
443 ;; handlers or auto mode alist, and make a note of it.
444 ;; true-source-filename should be either the original name or a
445 ;; temporary file where we put the after-product of the file handler.
449 ;; Checkout orig file, if necessary, so that the patched file could be
450 ;; checked back in.
457 ;; fix environment for gnu patch, so it won't make numbered extensions
460 ;; always pass patch the -f option, so it won't ask any questions
464 ediff-patch-program ediff-patch-options
465 backup-extension
467 t)
468 ;; restore environment for gnu patch
480 ;; If black magic is involved, apply patch to a temp copy of the
481 ;; file. Otherwise, apply patch to the orig copy. If patch is applied
482 ;; to temp copy, we name the result old-name_patched for local files
483 ;; and temp-copy_patched for remote files. The orig file name isn't
484 ;; changed, and the temp copy of the original is later deleted.
485 ;; Without magic, the original file is renamed (usually into
486 ;; old-name_orig) and the result of patching will have the same name as
487 ;; the original.
493 ;; Black magic in effect.
494 ;; If orig file was remote, put the patched file in the temp directory.
495 ;; If orig file is local, put the patched file in the directory of
496 ;; the orig file.
500 true-source-filename
501 source-filename)
506 ;; arrange that the temp copy of orig will be deleted
508 true-source-filename t))
510 ;; make orig buffer read-only
514 ;; set up a buf for the patched file
519 buf-to-patch target-buf nil
523 ediff-patch-diagnostics patch-diagnostics))
527 ctl-buf))
532 ;; this sets various vars in the meta buffer inside
533 ;; ediff-prepare-meta-buffer
535 ;; tell what to do if the user clicks on a session record
537 'ediff-patch-file-form-meta
538 ediff-meta-patchbufer patch-buf)
539 ))
540 startup-hooks))
542 'ediff-filegroup-action
544 ;; nil replaces a regular expression
546 ediff-patch-map))
547 "*Ediff Session Group Panel"
548 'ediff-redraw-directory-group-buffer
549 'ediff-multifile-patch
550 startup-hooks))
552 ))
557 ;;; Local Variables:
558 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
559 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
560 ;;; End:
564 ;;; ediff-ptch.el ends here