annotate lisp/ediff-ptch.el @ 16248:b2fae8abc5b0

*** empty log message ***
author Michael Kifer <kifer@cs.stonybrook.edu>
date Fri, 20 Sep 1996 01:10:05 +0000
parents 587b9c438823
children beb94a5271e2
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
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3 ;; Copyright (C) 1996 Free Software Foundation, Inc.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
6
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
8
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
10 ;; 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
11 ;; the Free Software Foundation; either version 2, or (at your option)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
12 ;; any later version.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
13
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
17 ;; GNU General Public License for more details.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
18
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
22 ;; Boston, MA 02111-1307, USA.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
23
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
24
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
25 ;;; Code:
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
26
15987
22da4beb0631 Require ediff-init.
Richard M. Stallman <rms@gnu.org>
parents: 15479
diff changeset
27 (require 'ediff-init)
22da4beb0631 Require ediff-init.
Richard M. Stallman <rms@gnu.org>
parents: 15479
diff changeset
28
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
29 (defvar ediff-last-dir-patch nil
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
30 "Last directory used by an Ediff command for file to patch.")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
31
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
32 (defvar ediff-backup-extension
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
33 (if (memq system-type '(vax-vms axp-vms emx ms-dos windows-nt windows-95))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
34 "_orig" ".orig")
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
35 "Backup extension used by the patch program.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
36 See also `ediff-backup-specs'.")
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
37
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
38 (defvar ediff-backup-specs (format "-b %s" ediff-backup-extension)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
39 "*Backup directives to pass to the patch program.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
40 Ediff requires that the old version of the file \(before applying the patch\)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
41 is saved in a file named `the-patch-file.extension'. Usually `extension' is
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
42 `.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
43 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
44
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
45 Some versions of the patch program let you specify `-b backup-extension'.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
46 Other versions only permit `-b', which assumes some canned extension
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
47 \(usually `.orig'\).
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
48
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
49 Note that both `ediff-backup-extension' and `ediff-backup-specs'
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
50 must be properly set. If your patch program takes the option `-b',
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
51 but not `-b extension', the variable `ediff-backup-extension' must
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
52 still be set so Ediff will know which extension to use.")
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
53
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
54
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
55 (defvar ediff-patch-default-directory nil
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
56 "*Default directory to look for patches.")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
57
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
58 (defvar ediff-context-diff-label-regexp
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
59 (concat "\\(" ; context diff 2-liner
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
60 "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)"
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
61 "\\|" ; 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
62 "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)"
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
63 "\\)")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
64 "*Regexp matching filename 2-liners at the start of each context diff.")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
65
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
66 (defvar ediff-patch-program "patch"
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
67 "*Name of the program that applies patches.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
68 It is recommended to use GNU-compatible versions.")
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
69 (defvar ediff-patch-options "-f"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
70 "*Options to pass to ediff-patch-program.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
71
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
72 Note: the `-b' option should be specified in `ediff-backup-specs'.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
73
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
74 It is recommended to pass the `-f' option to the patch program, so it won't ask
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
75 questions. However, some implementations don't accept this option, in which
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
76 case the default value for this variable should be changed.")
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
77
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
78 ;; The buffer of the patch file. Local to control buffer.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
79 (ediff-defvar-local ediff-patchbufer nil "")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
80
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
81 ;; The buffer where patch displays its diagnostics.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
82 (ediff-defvar-local ediff-patch-diagnostics nil "")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
83
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
84 ;; Map of patch buffer. Has the form:
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
85 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
86 ;; where filenames are files to which patch would have applied the patch;
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
87 ;; marker1 delimits the beginning of the corresponding patch and marker2 does
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
88 ;; it for the end.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
89 (ediff-defvar-local ediff-patch-map nil "")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
90
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
91 ;; strip prefix from filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
92 ;; returns /dev/null, if can't strip prefix
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
93 (defsubst ediff-file-name-sans-prefix (filename prefix)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
94 (save-match-data
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
95 (if (string-match (concat "^" prefix) filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
96 (substring filename (match-end 0))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
97 (concat "/null/" filename))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
98
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
99
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
100
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
101 ;; no longer used
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
102 ;; 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
103 (defun ediff-count-matches (regexp buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
104 (ediff-eval-in-buffer buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
105 (let ((count 0) opoint)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
106 (save-excursion
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
107 (goto-char (point-min))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
108 (while (and (not (eobp))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
109 (progn (setq opoint (point))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
110 (re-search-forward regexp nil t)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
111 (if (= opoint (point))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
112 (forward-char 1)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
113 (setq count (1+ count)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
114 count)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
115
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
116 ;; Scan BUF (which is supposed to contain a patch) and make a list of the form
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
117 ;; ((filename1 marker1 marker2) (filename2 marker1 marker2) ...)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
118 ;; where filenames are files to which patch would have applied the patch;
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
119 ;; marker1 delimits the beginning of the corresponding patch and marker2 does
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
120 ;; it for the end. This list is then assigned to ediff-patch-map.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
121 ;; Returns the number of elements in the list ediff-patch-map
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
122 (defun ediff-map-patch-buffer (buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
123 (ediff-eval-in-buffer buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
124 (let ((count 0)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
125 (mark1 (move-marker (make-marker) (point-min)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
126 (mark1-end (point-min))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
127 (possible-file-names '("/dev/null" . "/dev/null"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
128 mark2-end mark2 filenames
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
129 beg1 beg2 end1 end2
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
130 patch-map opoint)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
131 (save-excursion
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
132 (goto-char (point-min))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
133 (setq opoint (point))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
134 (while (and (not (eobp))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
135 (re-search-forward ediff-context-diff-label-regexp nil t))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
136 (if (= opoint (point))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
137 (forward-char 1) ; ensure progress towards the end
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
138 (setq mark2 (move-marker (make-marker) (match-beginning 0))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
139 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
140 beg1 (or (match-beginning 2) (match-beginning 4))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
141 end1 (or (match-end 2) (match-end 4))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
142 beg2 (or (match-beginning 3) (match-beginning 5))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
143 end2 (or (match-end 3) (match-end 5)))
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
144 ;; possible-file-names is holding the new file names until we
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
145 ;; insert the old file name in the patch map
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
146 ;; It is a pair (filename from 1st header line . fn from 2nd line)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
147 (setq possible-file-names
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
148 (cons (if (and beg1 end1)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
149 (buffer-substring beg1 end1)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
150 "/dev/null")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
151 (if (and beg2 end2)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
152 (buffer-substring beg2 end2)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
153 "/dev/null")))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
154 ;; check for any `Index:' or `Prereq:' lines, but don't use them
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
155 (if (re-search-backward "^Index:" mark1-end 'noerror)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
156 (move-marker mark2 (match-beginning 0)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
157 (if (re-search-backward "^Prereq:" mark1-end 'noerror)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
158 (move-marker mark2 (match-beginning 0)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
159
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
160 (goto-char mark2-end)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
161
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
162 (if filenames
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
163 (setq patch-map (cons (list filenames mark1 mark2) patch-map)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
164 (setq mark1 mark2
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
165 mark1-end mark2-end
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
166 filenames possible-file-names))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
167 (setq opoint (point)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
168 count (1+ count))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
169 (setq mark2 (point-max-marker)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
170 patch-map (cons (list possible-file-names mark1 mark2) patch-map))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
171 (setq ediff-patch-map (nreverse patch-map))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
172 count)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
173
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
174 ;; Fix up the file names in the list using the argument FILENAME
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
175 ;; Algorithm: find the first file's directory and cut it out from each file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
176 ;; name in the patch. Prepend the directory of FILENAME to each file in the
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
177 ;; patch. In addition, the first file in the patch is replaced by FILENAME.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
178 ;; Each file is actually a file-pair of files found in the context diff header
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
179 ;; In the end, for each pair, we select the shortest existing file.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
180 ;; Note: Ediff doesn't recognize multi-file patches that are separated
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
181 ;; with the `Index:' line. It treats them as a single-file patch.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
182 ;;
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
183 ;; Executes inside the patch buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
184 (defun ediff-fixup-patch-map (filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
185 (setq filename (expand-file-name filename))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
186 (let ((actual-dir (if (file-directory-p filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
187 ;; directory part of filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
188 (file-name-as-directory filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
189 (file-name-directory filename)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
190 ;; directory part of the first file in the patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
191 (base-dir1 (file-name-directory (car (car (car ediff-patch-map)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
192 (base-dir2 (file-name-directory (cdr (car (car ediff-patch-map)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
193 )
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
194
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
195 ;; chop off base-dirs
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
196 (mapcar (function (lambda (triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
197 (or (string= (car (car triple)) "/dev/null")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
198 (setcar (car triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
199 (ediff-file-name-sans-prefix
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
200 (car (car triple)) base-dir1)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
201 (or (string= (cdr (car triple)) "/dev/null")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
202 (setcdr (car triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
203 (ediff-file-name-sans-prefix
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
204 (cdr (car triple)) base-dir2)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
205 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
206 ediff-patch-map)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
207
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
208 ;; take the given file name into account
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
209 (or (file-directory-p filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
210 (string= "/dev/null" filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
211 (progn
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
212 (setcar (car ediff-patch-map)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
213 (cons (file-name-nondirectory filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
214 (file-name-nondirectory filename)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
215
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
216 ;; prepend actual-dir
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
217 (mapcar (function (lambda (triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
218 (if (and (string-match "^/null/" (car (car triple)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
219 (string-match "^/null/" (cdr (car triple))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
220 ;; couldn't strip base-dir1 and base-dir2
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
221 ;; hence, something wrong
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
222 (progn
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
223 (with-output-to-temp-buffer ediff-msg-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
224 (princ
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
225 (format "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
226 The patch file contains a context diff for
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
227
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
228 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
229 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
230
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
231 However, Ediff cannot infer the name of the actual file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 to be patched on your system. If you know the correct file name,
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
233 please enter it now.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
234
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
235 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
236 other files, enter /dev/null
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
237 "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
238 (substring (car (car triple)) 6)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
239 (substring (cdr (car triple)) 6))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
240 (let ((directory t)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
241 user-file)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
242 (while directory
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
243 (setq user-file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
244 (read-file-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
245 "Please enter file name: "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
246 actual-dir actual-dir t))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
247 (if (not (file-directory-p user-file))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
248 (setq directory nil)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
249 (setq directory t)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
250 (beep)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
251 (message "%s is a directory" user-file)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
252 (sit-for 2)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
253 (setcar triple (cons user-file user-file))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
254 (setcar (car triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
255 (expand-file-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
256 (concat actual-dir (car (car triple)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
257 (setcdr (car triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
258 (expand-file-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
259 (concat actual-dir (cdr (car triple))))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
260 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
261 ediff-patch-map)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
262 ;; check for the shorter existing file in each pair and discard the other
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
263 ;; one
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
264 (mapcar (function (lambda (triple)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
265 (let* ((file1 (car (car triple)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
266 (file2 (cdr (car triple)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
267 (f1-exists (file-exists-p file1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
268 (f2-exists (file-exists-p file2)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
269 (cond
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
270 ((and (< (length file2) (length file1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
271 f2-exists)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
272 (setcar triple file2))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
273 ((and (< (length file1) (length file2))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
274 f1-exists)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
275 (setcar triple file1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
276 ((and f1-exists f2-exists
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
277 (string= file1 file2))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
278 (setcar triple file1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
279 ((and f1-exists f2-exists)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
280 (with-output-to-temp-buffer ediff-msg-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
281 (princ (format "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
282 Ediff has inferred that
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
283 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
284 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
285 are possible targets for applying the patch.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
286 Both files seem to be plausible alternatives.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
287
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
288 Please advice:
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
289 Type `y' to use %s as the target;
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
290 Type `n' to use %s as the target.
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 file1 file2 file2 file1)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
293 (setcar triple
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
294 (if (y-or-n-p (format "Use %s ? " file2))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
295 file2 file1)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
296 (f2-exists (setcar triple file2))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
297 (f1-exists (setcar triple file1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
298 (t
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
299 (with-output-to-temp-buffer ediff-msg-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
300 (princ (format "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
301 Ediff inferred that
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
302 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
303 %s
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
304 are possible alternative targets for this patch.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
305
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
306 However, these files do not exist.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
307
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
308 Please enter an alternative patch target ...
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
309 "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
310 file1 file2)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
311 (let ((directory t)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
312 target)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
313 (while directory
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
314 (setq target (read-file-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
315 "Please enter a patch target: "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
316 actual-dir actual-dir t))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
317 (if (not (file-directory-p target))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
318 (setq directory nil)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
319 (beep)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
320 (message "%s is a directory" target)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
321 (sit-for 2)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
322 (setcar triple target)))))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
323 ediff-patch-map)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
324 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
325
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
326 (defun ediff-show-patch-diagnostics ()
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
327 (interactive)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
328 (cond ((window-live-p ediff-window-A)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
329 (set-window-buffer ediff-window-A ediff-patch-diagnostics))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
330 ((window-live-p ediff-window-B)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
331 (set-window-buffer ediff-window-B ediff-patch-diagnostics))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
332 (t (display-buffer ediff-patch-diagnostics 'not-this-window))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
333
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
334 (defun ediff-get-patch-buffer ()
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
335 "Obtain patch buffer. If patch is already in a buffer---use it.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
336 Else, read patch file into a new buffer."
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
337 (let ((dir (cond (ediff-patch-default-directory) ; try patch default dir
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
338 (ediff-use-last-dir ediff-last-dir-patch)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
339 (t default-directory)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
340 patch-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
341 (if (y-or-n-p "Is the patch already in a buffer? ")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
342 (setq patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
343 (get-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
344 (read-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
345 "Which buffer contains the patch? "
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
346 (current-buffer) 'must-match)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
347 (setq patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
348 (find-file-noselect
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
349 (read-file-name "Which file contains the patch? "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
350 dir nil 'must-match))))
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
351
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
352 (ediff-eval-in-buffer patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
353 (goto-char (point-min))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
354 (or (ediff-get-visible-buffer-window patch-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
355 (progn
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
356 (pop-to-buffer patch-buf 'other-window)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
357 (select-window (previous-window)))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
358 (ediff-map-patch-buffer patch-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
359 patch-buf))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
360
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
361 ;; Dispatch the right patch file function: regular or meta-level,
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
362 ;; depending on how many patches are in the patch file.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
363 ;; At present, there is no support for meta-level patches.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
364 ;; Should return either the ctl buffer or the meta-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
365 (defun ediff-dispatch-file-patching-job (patch-buf filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
366 &optional startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
367 (ediff-eval-in-buffer patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
368 ;; relativize names in the patch with respect to source-file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
369 (ediff-fixup-patch-map filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
370 (if (< (length ediff-patch-map) 2)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
371 (ediff-patch-file-internal
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
372 patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
373 (if (and (not (string-match "^/dev/null" (car (car ediff-patch-map))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
374 (> (length (car (car ediff-patch-map))) 1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
375 (car (car ediff-patch-map))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
376 filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
377 startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
378 (ediff-multi-patch-internal patch-buf startup-hooks))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
379 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
380
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
381
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
382 (defun ediff-patch-buffer-internal (patch-buf buf-to-patch-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
383 &optional startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
384 (let* ((buf-to-patch (get-buffer buf-to-patch-name))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
385 (file-name-ok (if buf-to-patch (buffer-file-name buf-to-patch)))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
386 (buf-mod-status (buffer-modified-p buf-to-patch))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
387 (multifile-patch-p (> (length (ediff-eval-in-buffer patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
388 ediff-patch-map)) 1))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
389 default-dir file-name ctl-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
390 (if file-name-ok
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
391 (setq file-name file-name-ok)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
392 (if multifile-patch-p
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
393 (error
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
394 "Can't apply multi-file patches to buffers that visit no files"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
395 (ediff-eval-in-buffer buf-to-patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
396 (setq default-dir default-directory)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
397 (setq file-name (ediff-make-temp-file buf-to-patch))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
398 (set-visited-file-name file-name)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
399 (setq buffer-auto-save-file-name nil) ; don't create auto-save file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
400 ;;don't confuse the user with a new bufname
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
401 (rename-buffer buf-to-patch-name)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
402 (set-buffer-modified-p nil)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
403 (set-visited-file-modtime) ; sync buffer and temp file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
404 (setq default-directory default-dir)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
405 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
406
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
407 ;; dispatch a patch function
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
408 (setq ctl-buf (ediff-dispatch-file-patching-job
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
409 patch-buf file-name startup-hooks))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
410
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
411 (if file-name-ok
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
412 ()
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
413 ;; buffer wasn't visiting any file,
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
414 ;; so we will not run meta-level ediff here
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
415 (ediff-eval-in-buffer ctl-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
416 (delete-file (buffer-file-name ediff-buffer-A))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
417 (delete-file (buffer-file-name ediff-buffer-B))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
418 (ediff-eval-in-buffer ediff-buffer-A
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
419 (if default-dir (setq default-directory default-dir))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
420 (set-visited-file-name nil)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
421 (rename-buffer buf-to-patch-name)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
422 (set-buffer-modified-p buf-mod-status))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
423 (ediff-eval-in-buffer ediff-buffer-B
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
424 (setq buffer-auto-save-file-name nil) ; don't create auto-save file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
425 (if default-dir (setq default-directory default-dir))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
426 (set-visited-file-name nil)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
427 (rename-buffer (ediff-unique-buffer-name
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
428 (concat buf-to-patch-name "_patched") ""))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
429 (set-buffer-modified-p t))))
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
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
432 (defun ediff-patch-file-internal (patch-buf source-filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
433 &optional startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
434 (setq source-filename (expand-file-name source-filename))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
435
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
436 (let* ((shell-file-name ediff-shell)
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
437 (patch-diagnostics (get-buffer-create "*ediff patch diagnostics*"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
438 ;; ediff-find-file may use a temp file to do the patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
439 ;; so, we save source-filename and true-source-filename as a var
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
440 ;; that initially is source-filename but may be changed to a temp
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
441 ;; file for the purpose of patching.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
442 (true-source-filename source-filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
443 (target-filename source-filename)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
444 target-buf buf-to-patch file-name-magic-p
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
445 patch-return-code ctl-buf backup-style aux-wind)
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
446
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
447 (if (string-match "-V" ediff-patch-options)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
448 (error
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
449 "Ediff doesn't take the -V option in `ediff-patch-options'--sorry"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
450
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
451 ;; 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
452 ;; it is handled via auto-mode-alist and similar magic).
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
453 ;; 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
454 ;; sync; arrange for the deletion of temp file.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
455 (ediff-find-file 'true-source-filename 'buf-to-patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
456 'ediff-last-dir-patch 'startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
457
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
458 ;; 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
459 ;; handlers or auto mode alist, and make a note of it.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
460 ;; true-source-filename should be either the original name or a
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
461 ;; temporary file where we put the after-product of the file handler.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
462 (setq file-name-magic-p (not (equal (file-truename true-source-filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
463 (file-truename source-filename))))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
464
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
465 ;; Checkout orig file, if necessary, so that the patched file could be
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
466 ;; checked back in.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
467 (if (ediff-file-checked-in-p (buffer-file-name buf-to-patch))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
468 (ediff-toggle-read-only buf-to-patch))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
469
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
470 (ediff-eval-in-buffer patch-diagnostics
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
471 (insert-buffer patch-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
472 (message "Applying patch ... ")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
473 ;; fix environment for gnu patch, so it won't make numbered extensions
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
474 (setq backup-style (getenv "VERSION_CONTROL"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
475 (setenv "VERSION_CONTROL" nil)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
476 (setq patch-return-code
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
477 (call-process-region
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
478 (point-min) (point-max)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
479 shell-file-name
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
480 t ; delete region (which contains the patch
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
481 t ; insert output (patch diagnostics) in current buffer
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
482 nil ; don't redisplay
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
483 shell-command-switch ; usually -c
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
484 (format "%s %s %s %s"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
485 ediff-patch-program
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
486 ediff-patch-options
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
487 ediff-backup-specs
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
488 (expand-file-name true-source-filename))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
489 ))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
490
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
491 ;; restore environment for gnu patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
492 (setenv "VERSION_CONTROL" backup-style))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
493
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
494 (message "Applying patch ... done")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
495 (message "")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
496
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
497 (switch-to-buffer patch-diagnostics)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
498 (sit-for 0) ; synchronize - let the user see diagnostics
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
499
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
500 (or (and (eq patch-return-code 0) ; patch reported success
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
501 (file-exists-p
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
502 (concat true-source-filename ediff-backup-extension)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
503 (progn
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
504 (with-output-to-temp-buffer ediff-msg-buffer
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
505 (princ (format "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
506 Patch has failed OR the backup version of the patched file was not created by
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
507 the patch program.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
508
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
509 A possible reason is that the values of the variables
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
510
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
511 ediff-patch-options = %S
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
512 ediff-backup-extension = %S
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
513 ediff-backup-specs = %S
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
514
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
515 are not appropriate for the program specified in the variable
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
516
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
517 ediff-patch-program = %S
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
518
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
519 See Ediff on-line manual for more details on these variables.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
520 \(Or use a GNU-compatible patch program and stay out of trouble.\)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
521
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
522 Type any key to continue... "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
523 ediff-patch-options
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
524 ediff-backup-extension
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
525 ediff-backup-specs
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
526 ediff-patch-program)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
527 (beep 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
528 (if (setq aux-wind (get-buffer-window ediff-msg-buffer))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
529 (progn
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
530 (select-window aux-wind)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
531 (goto-char (point-max))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
532 (read-char-exclusive)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
533 (if aux-wind (bury-buffer)) ; ediff-msg-buffer
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
534 (if (setq aux-wind (get-buffer-window patch-diagnostics))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
535 (progn
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
536 (select-window aux-wind)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
537 (bury-buffer)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
538 (error "Patch appears to have failed")))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
539
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
540 ;; If black magic is involved, apply patch to a temp copy of the
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
541 ;; file. Otherwise, apply patch to the orig copy. If patch is applied
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
542 ;; to temp copy, we name the result old-name_patched for local files
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
543 ;; and temp-copy_patched for remote files. The orig file name isn't
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
544 ;; changed, and the temp copy of the original is later deleted.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
545 ;; Without magic, the original file is renamed (usually into
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
546 ;; 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
547 ;; the original.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
548 (if (not file-name-magic-p)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
549 (ediff-eval-in-buffer buf-to-patch
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
550 (set-visited-file-name
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
551 (concat source-filename ediff-backup-extension))
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
552 (set-buffer-modified-p nil))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
553
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
554 ;; Black magic in effect.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
555 ;; 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
556 ;; 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
557 ;; the orig file.
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
558 (setq target-filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
559 (concat
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
560 (if (ediff-file-remote-p (file-truename source-filename))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
561 true-source-filename
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
562 source-filename)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
563 "_patched"))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
564
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
565 (rename-file true-source-filename target-filename t)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
566
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
567 ;; 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
568 (rename-file (concat true-source-filename ediff-backup-extension)
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
569 true-source-filename t))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
570
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
571 ;; make orig buffer read-only
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
572 (setq startup-hooks
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
573 (cons 'ediff-set-read-only-in-buf-A startup-hooks))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
574
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
575 ;; set up a buf for the patched file
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
576 (setq target-buf (find-file-noselect target-filename))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
577
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
578 (setq ctl-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
579 (ediff-buffers-internal
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
580 buf-to-patch target-buf nil
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
581 startup-hooks 'epatch))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
582 (ediff-eval-in-buffer ctl-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
583 (setq ediff-patchbufer patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
584 ediff-patch-diagnostics patch-diagnostics))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
585
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
586 (bury-buffer patch-diagnostics)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
587 (message "Type `P', if you need to see patch diagnostics")
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
588 ctl-buf))
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 (defun ediff-multi-patch-internal (patch-buf &optional startup-hooks)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
591 (let (meta-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
592 (setq startup-hooks
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
593 ;; this sets various vars in the meta buffer inside
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
594 ;; ediff-prepare-meta-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
595 (cons (` (lambda ()
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
596 ;; tell what to do if the user clicks on a session record
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
597 (setq ediff-session-action-function
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
598 'ediff-patch-file-form-meta
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
599 ediff-meta-patchbufer patch-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
600 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
601 startup-hooks))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
602 (setq meta-buf (ediff-prepare-meta-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
603 'ediff-filegroup-action
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
604 (ediff-eval-in-buffer patch-buf
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
605 ;; nil replaces a regular expression
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
606 (cons (list nil (format "%S" patch-buf))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
607 ediff-patch-map))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
608 "*Ediff Session Group Panel"
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
609 'ediff-redraw-directory-group-buffer
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
610 'ediff-multifile-patch
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
611 startup-hooks))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
612 (ediff-show-meta-buffer meta-buf)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
613 ))
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
614
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
615
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
616
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
617
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
618 ;;; Local Variables:
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
619 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
620 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16168
diff changeset
621 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
15479
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
622 ;;; End:
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
623
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
624 (provide 'ediff-ptch)
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
625
78863db629bb Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
626 ;;; ediff-ptch.el ends here