annotate lisp/ediff-ptch.el @ 68055:63366306c117

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