Show More
@@ -1,662 +1,665 b'' | |||||
1 | # patch.py - patch file parsing routines |
|
1 | # patch.py - patch file parsing routines | |
2 | # |
|
2 | # | |
3 | # Copyright 2006 Brendan Cully <brendan@kublai.com> |
|
3 | # Copyright 2006 Brendan Cully <brendan@kublai.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from demandload import demandload |
|
8 | from demandload import demandload | |
9 | from i18n import gettext as _ |
|
9 | from i18n import gettext as _ | |
10 | from node import * |
|
10 | from node import * | |
11 | demandload(globals(), "base85 cmdutil mdiff util") |
|
11 | demandload(globals(), "base85 cmdutil mdiff util") | |
12 | demandload(globals(), "cStringIO email.Parser errno os popen2 re shutil sha") |
|
12 | demandload(globals(), "cStringIO email.Parser errno os popen2 re shutil sha") | |
13 | demandload(globals(), "sys tempfile zlib") |
|
13 | demandload(globals(), "sys tempfile zlib") | |
14 |
|
14 | |||
15 | # helper functions |
|
15 | # helper functions | |
16 |
|
16 | |||
17 | def copyfile(src, dst, basedir=None): |
|
17 | def copyfile(src, dst, basedir=None): | |
18 | if not basedir: |
|
18 | if not basedir: | |
19 | basedir = os.getcwd() |
|
19 | basedir = os.getcwd() | |
20 |
|
20 | |||
21 | abssrc, absdst = [os.path.join(basedir, n) for n in (src, dst)] |
|
21 | abssrc, absdst = [os.path.join(basedir, n) for n in (src, dst)] | |
22 | if os.path.exists(absdst): |
|
22 | if os.path.exists(absdst): | |
23 | raise util.Abort(_("cannot create %s: destination already exists") % |
|
23 | raise util.Abort(_("cannot create %s: destination already exists") % | |
24 | dst) |
|
24 | dst) | |
25 |
|
25 | |||
26 | targetdir = os.path.dirname(absdst) |
|
26 | targetdir = os.path.dirname(absdst) | |
27 | if not os.path.isdir(targetdir): |
|
27 | if not os.path.isdir(targetdir): | |
28 | os.makedirs(targetdir) |
|
28 | os.makedirs(targetdir) | |
29 |
|
29 | |||
30 | util.copyfile(abssrc, absdst) |
|
30 | util.copyfile(abssrc, absdst) | |
31 |
|
31 | |||
32 | # public functions |
|
32 | # public functions | |
33 |
|
33 | |||
34 | def extract(ui, fileobj): |
|
34 | def extract(ui, fileobj): | |
35 | '''extract patch from data read from fileobj. |
|
35 | '''extract patch from data read from fileobj. | |
36 |
|
36 | |||
37 | patch can be normal patch or contained in email message. |
|
37 | patch can be normal patch or contained in email message. | |
38 |
|
38 | |||
39 | return tuple (filename, message, user, date). any item in returned |
|
39 | return tuple (filename, message, user, date). any item in returned | |
40 | tuple can be None. if filename is None, fileobj did not contain |
|
40 | tuple can be None. if filename is None, fileobj did not contain | |
41 | patch. caller must unlink filename when done.''' |
|
41 | patch. caller must unlink filename when done.''' | |
42 |
|
42 | |||
43 | # attempt to detect the start of a patch |
|
43 | # attempt to detect the start of a patch | |
44 | # (this heuristic is borrowed from quilt) |
|
44 | # (this heuristic is borrowed from quilt) | |
45 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + |
|
45 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + | |
46 | 'retrieving revision [0-9]+(\.[0-9]+)*$|' + |
|
46 | 'retrieving revision [0-9]+(\.[0-9]+)*$|' + | |
47 | '(---|\*\*\*)[ \t])', re.MULTILINE) |
|
47 | '(---|\*\*\*)[ \t])', re.MULTILINE) | |
48 |
|
48 | |||
49 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') |
|
49 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') | |
50 | tmpfp = os.fdopen(fd, 'w') |
|
50 | tmpfp = os.fdopen(fd, 'w') | |
51 | try: |
|
51 | try: | |
52 | hgpatch = False |
|
52 | hgpatch = False | |
53 |
|
53 | |||
54 | msg = email.Parser.Parser().parse(fileobj) |
|
54 | msg = email.Parser.Parser().parse(fileobj) | |
55 |
|
55 | |||
56 | message = msg['Subject'] |
|
56 | message = msg['Subject'] | |
57 | user = msg['From'] |
|
57 | user = msg['From'] | |
58 | # should try to parse msg['Date'] |
|
58 | # should try to parse msg['Date'] | |
59 | date = None |
|
59 | date = None | |
60 |
|
60 | |||
61 | if message: |
|
61 | if message: | |
62 | message = message.replace('\n\t', ' ') |
|
62 | message = message.replace('\n\t', ' ') | |
63 | ui.debug('Subject: %s\n' % message) |
|
63 | ui.debug('Subject: %s\n' % message) | |
64 | if user: |
|
64 | if user: | |
65 | ui.debug('From: %s\n' % user) |
|
65 | ui.debug('From: %s\n' % user) | |
66 | diffs_seen = 0 |
|
66 | diffs_seen = 0 | |
67 | ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') |
|
67 | ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') | |
68 |
|
68 | |||
69 | for part in msg.walk(): |
|
69 | for part in msg.walk(): | |
70 | content_type = part.get_content_type() |
|
70 | content_type = part.get_content_type() | |
71 | ui.debug('Content-Type: %s\n' % content_type) |
|
71 | ui.debug('Content-Type: %s\n' % content_type) | |
72 | if content_type not in ok_types: |
|
72 | if content_type not in ok_types: | |
73 | continue |
|
73 | continue | |
74 | payload = part.get_payload(decode=True) |
|
74 | payload = part.get_payload(decode=True) | |
75 | m = diffre.search(payload) |
|
75 | m = diffre.search(payload) | |
76 | if m: |
|
76 | if m: | |
77 | ui.debug(_('found patch at byte %d\n') % m.start(0)) |
|
77 | ui.debug(_('found patch at byte %d\n') % m.start(0)) | |
78 | diffs_seen += 1 |
|
78 | diffs_seen += 1 | |
79 | cfp = cStringIO.StringIO() |
|
79 | cfp = cStringIO.StringIO() | |
80 | if message: |
|
80 | if message: | |
81 | cfp.write(message) |
|
81 | cfp.write(message) | |
82 | cfp.write('\n') |
|
82 | cfp.write('\n') | |
83 | for line in payload[:m.start(0)].splitlines(): |
|
83 | for line in payload[:m.start(0)].splitlines(): | |
84 | if line.startswith('# HG changeset patch'): |
|
84 | if line.startswith('# HG changeset patch'): | |
85 | ui.debug(_('patch generated by hg export\n')) |
|
85 | ui.debug(_('patch generated by hg export\n')) | |
86 | hgpatch = True |
|
86 | hgpatch = True | |
87 | # drop earlier commit message content |
|
87 | # drop earlier commit message content | |
88 | cfp.seek(0) |
|
88 | cfp.seek(0) | |
89 | cfp.truncate() |
|
89 | cfp.truncate() | |
90 | elif hgpatch: |
|
90 | elif hgpatch: | |
91 | if line.startswith('# User '): |
|
91 | if line.startswith('# User '): | |
92 | user = line[7:] |
|
92 | user = line[7:] | |
93 | ui.debug('From: %s\n' % user) |
|
93 | ui.debug('From: %s\n' % user) | |
94 | elif line.startswith("# Date "): |
|
94 | elif line.startswith("# Date "): | |
95 | date = line[7:] |
|
95 | date = line[7:] | |
96 | if not line.startswith('# '): |
|
96 | if not line.startswith('# '): | |
97 | cfp.write(line) |
|
97 | cfp.write(line) | |
98 | cfp.write('\n') |
|
98 | cfp.write('\n') | |
99 | message = cfp.getvalue() |
|
99 | message = cfp.getvalue() | |
100 | if tmpfp: |
|
100 | if tmpfp: | |
101 | tmpfp.write(payload) |
|
101 | tmpfp.write(payload) | |
102 | if not payload.endswith('\n'): |
|
102 | if not payload.endswith('\n'): | |
103 | tmpfp.write('\n') |
|
103 | tmpfp.write('\n') | |
104 | elif not diffs_seen and message and content_type == 'text/plain': |
|
104 | elif not diffs_seen and message and content_type == 'text/plain': | |
105 | message += '\n' + payload |
|
105 | message += '\n' + payload | |
106 | except: |
|
106 | except: | |
107 | tmpfp.close() |
|
107 | tmpfp.close() | |
108 | os.unlink(tmpname) |
|
108 | os.unlink(tmpname) | |
109 | raise |
|
109 | raise | |
110 |
|
110 | |||
111 | tmpfp.close() |
|
111 | tmpfp.close() | |
112 | if not diffs_seen: |
|
112 | if not diffs_seen: | |
113 | os.unlink(tmpname) |
|
113 | os.unlink(tmpname) | |
114 | return None, message, user, date |
|
114 | return None, message, user, date | |
115 | return tmpname, message, user, date |
|
115 | return tmpname, message, user, date | |
116 |
|
116 | |||
117 | def readgitpatch(patchname): |
|
117 | def readgitpatch(patchname): | |
118 | """extract git-style metadata about patches from <patchname>""" |
|
118 | """extract git-style metadata about patches from <patchname>""" | |
119 | class gitpatch: |
|
119 | class gitpatch: | |
120 | "op is one of ADD, DELETE, RENAME, MODIFY or COPY" |
|
120 | "op is one of ADD, DELETE, RENAME, MODIFY or COPY" | |
121 | def __init__(self, path): |
|
121 | def __init__(self, path): | |
122 | self.path = path |
|
122 | self.path = path | |
123 | self.oldpath = None |
|
123 | self.oldpath = None | |
124 | self.mode = None |
|
124 | self.mode = None | |
125 | self.op = 'MODIFY' |
|
125 | self.op = 'MODIFY' | |
126 | self.copymod = False |
|
126 | self.copymod = False | |
127 | self.lineno = 0 |
|
127 | self.lineno = 0 | |
128 | self.binary = False |
|
128 | self.binary = False | |
129 |
|
129 | |||
130 | # Filter patch for git information |
|
130 | # Filter patch for git information | |
131 | gitre = re.compile('diff --git a/(.*) b/(.*)') |
|
131 | gitre = re.compile('diff --git a/(.*) b/(.*)') | |
132 | pf = file(patchname) |
|
132 | pf = file(patchname) | |
133 | gp = None |
|
133 | gp = None | |
134 | gitpatches = [] |
|
134 | gitpatches = [] | |
135 | # Can have a git patch with only metadata, causing patch to complain |
|
135 | # Can have a git patch with only metadata, causing patch to complain | |
136 | dopatch = False |
|
136 | dopatch = False | |
137 |
|
137 | |||
138 | lineno = 0 |
|
138 | lineno = 0 | |
139 | for line in pf: |
|
139 | for line in pf: | |
140 | lineno += 1 |
|
140 | lineno += 1 | |
141 | if line.startswith('diff --git'): |
|
141 | if line.startswith('diff --git'): | |
142 | m = gitre.match(line) |
|
142 | m = gitre.match(line) | |
143 | if m: |
|
143 | if m: | |
144 | if gp: |
|
144 | if gp: | |
145 | gitpatches.append(gp) |
|
145 | gitpatches.append(gp) | |
146 | src, dst = m.group(1, 2) |
|
146 | src, dst = m.group(1, 2) | |
147 | gp = gitpatch(dst) |
|
147 | gp = gitpatch(dst) | |
148 | gp.lineno = lineno |
|
148 | gp.lineno = lineno | |
149 | elif gp: |
|
149 | elif gp: | |
150 | if line.startswith('--- '): |
|
150 | if line.startswith('--- '): | |
151 | if gp.op in ('COPY', 'RENAME'): |
|
151 | if gp.op in ('COPY', 'RENAME'): | |
152 | gp.copymod = True |
|
152 | gp.copymod = True | |
153 | dopatch = 'filter' |
|
153 | dopatch = 'filter' | |
154 | gitpatches.append(gp) |
|
154 | gitpatches.append(gp) | |
155 | gp = None |
|
155 | gp = None | |
156 | if not dopatch: |
|
156 | if not dopatch: | |
157 | dopatch = True |
|
157 | dopatch = True | |
158 | continue |
|
158 | continue | |
159 | if line.startswith('rename from '): |
|
159 | if line.startswith('rename from '): | |
160 | gp.op = 'RENAME' |
|
160 | gp.op = 'RENAME' | |
161 | gp.oldpath = line[12:].rstrip() |
|
161 | gp.oldpath = line[12:].rstrip() | |
162 | elif line.startswith('rename to '): |
|
162 | elif line.startswith('rename to '): | |
163 | gp.path = line[10:].rstrip() |
|
163 | gp.path = line[10:].rstrip() | |
164 | elif line.startswith('copy from '): |
|
164 | elif line.startswith('copy from '): | |
165 | gp.op = 'COPY' |
|
165 | gp.op = 'COPY' | |
166 | gp.oldpath = line[10:].rstrip() |
|
166 | gp.oldpath = line[10:].rstrip() | |
167 | elif line.startswith('copy to '): |
|
167 | elif line.startswith('copy to '): | |
168 | gp.path = line[8:].rstrip() |
|
168 | gp.path = line[8:].rstrip() | |
169 | elif line.startswith('deleted file'): |
|
169 | elif line.startswith('deleted file'): | |
170 | gp.op = 'DELETE' |
|
170 | gp.op = 'DELETE' | |
171 | elif line.startswith('new file mode '): |
|
171 | elif line.startswith('new file mode '): | |
172 | gp.op = 'ADD' |
|
172 | gp.op = 'ADD' | |
173 | gp.mode = int(line.rstrip()[-3:], 8) |
|
173 | gp.mode = int(line.rstrip()[-3:], 8) | |
174 | elif line.startswith('new mode '): |
|
174 | elif line.startswith('new mode '): | |
175 | gp.mode = int(line.rstrip()[-3:], 8) |
|
175 | gp.mode = int(line.rstrip()[-3:], 8) | |
176 | elif line.startswith('GIT binary patch'): |
|
176 | elif line.startswith('GIT binary patch'): | |
177 | if not dopatch: |
|
177 | if not dopatch: | |
178 | dopatch = 'binary' |
|
178 | dopatch = 'binary' | |
179 | gp.binary = True |
|
179 | gp.binary = True | |
180 | if gp: |
|
180 | if gp: | |
181 | gitpatches.append(gp) |
|
181 | gitpatches.append(gp) | |
182 |
|
182 | |||
183 | if not gitpatches: |
|
183 | if not gitpatches: | |
184 | dopatch = True |
|
184 | dopatch = True | |
185 |
|
185 | |||
186 | return (dopatch, gitpatches) |
|
186 | return (dopatch, gitpatches) | |
187 |
|
187 | |||
188 | def dogitpatch(patchname, gitpatches, cwd=None): |
|
188 | def dogitpatch(patchname, gitpatches, cwd=None): | |
189 | """Preprocess git patch so that vanilla patch can handle it""" |
|
189 | """Preprocess git patch so that vanilla patch can handle it""" | |
190 | def extractbin(fp): |
|
190 | def extractbin(fp): | |
191 | line = fp.readline().rstrip() |
|
191 | line = fp.readline().rstrip() | |
192 | while line and not line.startswith('literal '): |
|
192 | while line and not line.startswith('literal '): | |
193 | line = fp.readline().rstrip() |
|
193 | line = fp.readline().rstrip() | |
194 | if not line: |
|
194 | if not line: | |
195 | return |
|
195 | return | |
196 | size = int(line[8:]) |
|
196 | size = int(line[8:]) | |
197 | dec = [] |
|
197 | dec = [] | |
198 | line = fp.readline().rstrip() |
|
198 | line = fp.readline().rstrip() | |
199 | while line: |
|
199 | while line: | |
200 | l = line[0] |
|
200 | l = line[0] | |
201 | if l <= 'Z' and l >= 'A': |
|
201 | if l <= 'Z' and l >= 'A': | |
202 | l = ord(l) - ord('A') + 1 |
|
202 | l = ord(l) - ord('A') + 1 | |
203 | else: |
|
203 | else: | |
204 | l = ord(l) - ord('a') + 27 |
|
204 | l = ord(l) - ord('a') + 27 | |
205 | dec.append(base85.b85decode(line[1:])[:l]) |
|
205 | dec.append(base85.b85decode(line[1:])[:l]) | |
206 | line = fp.readline().rstrip() |
|
206 | line = fp.readline().rstrip() | |
207 | text = zlib.decompress(''.join(dec)) |
|
207 | text = zlib.decompress(''.join(dec)) | |
208 | if len(text) != size: |
|
208 | if len(text) != size: | |
209 | raise util.Abort(_('binary patch is %d bytes, not %d') % |
|
209 | raise util.Abort(_('binary patch is %d bytes, not %d') % | |
210 | (len(text), size)) |
|
210 | (len(text), size)) | |
211 | return text |
|
211 | return text | |
212 |
|
212 | |||
213 | pf = file(patchname) |
|
213 | pf = file(patchname) | |
214 | pfline = 1 |
|
214 | pfline = 1 | |
215 |
|
215 | |||
216 | fd, patchname = tempfile.mkstemp(prefix='hg-patch-') |
|
216 | fd, patchname = tempfile.mkstemp(prefix='hg-patch-') | |
217 | tmpfp = os.fdopen(fd, 'w') |
|
217 | tmpfp = os.fdopen(fd, 'w') | |
218 |
|
218 | |||
219 | try: |
|
219 | try: | |
220 | for i in xrange(len(gitpatches)): |
|
220 | for i in xrange(len(gitpatches)): | |
221 | p = gitpatches[i] |
|
221 | p = gitpatches[i] | |
222 | if not p.copymod and not p.binary: |
|
222 | if not p.copymod and not p.binary: | |
223 | continue |
|
223 | continue | |
224 |
|
224 | |||
225 | # rewrite patch hunk |
|
225 | # rewrite patch hunk | |
226 | while pfline < p.lineno: |
|
226 | while pfline < p.lineno: | |
227 | tmpfp.write(pf.readline()) |
|
227 | tmpfp.write(pf.readline()) | |
228 | pfline += 1 |
|
228 | pfline += 1 | |
229 |
|
229 | |||
230 | if p.binary: |
|
230 | if p.binary: | |
231 | text = extractbin(pf) |
|
231 | text = extractbin(pf) | |
232 | if not text: |
|
232 | if not text: | |
233 | raise util.Abort(_('binary patch extraction failed')) |
|
233 | raise util.Abort(_('binary patch extraction failed')) | |
234 | if not cwd: |
|
234 | if not cwd: | |
235 | cwd = os.getcwd() |
|
235 | cwd = os.getcwd() | |
236 | absdst = os.path.join(cwd, p.path) |
|
236 | absdst = os.path.join(cwd, p.path) | |
237 | basedir = os.path.dirname(absdst) |
|
237 | basedir = os.path.dirname(absdst) | |
238 | if not os.path.isdir(basedir): |
|
238 | if not os.path.isdir(basedir): | |
239 | os.makedirs(basedir) |
|
239 | os.makedirs(basedir) | |
240 | out = file(absdst, 'wb') |
|
240 | out = file(absdst, 'wb') | |
241 | out.write(text) |
|
241 | out.write(text) | |
242 | out.close() |
|
242 | out.close() | |
243 | elif p.copymod: |
|
243 | elif p.copymod: | |
244 | copyfile(p.oldpath, p.path, basedir=cwd) |
|
244 | copyfile(p.oldpath, p.path, basedir=cwd) | |
245 | tmpfp.write('diff --git a/%s b/%s\n' % (p.path, p.path)) |
|
245 | tmpfp.write('diff --git a/%s b/%s\n' % (p.path, p.path)) | |
246 | line = pf.readline() |
|
246 | line = pf.readline() | |
247 | pfline += 1 |
|
247 | pfline += 1 | |
248 | while not line.startswith('--- a/'): |
|
248 | while not line.startswith('--- a/'): | |
249 | tmpfp.write(line) |
|
249 | tmpfp.write(line) | |
250 | line = pf.readline() |
|
250 | line = pf.readline() | |
251 | pfline += 1 |
|
251 | pfline += 1 | |
252 | tmpfp.write('--- a/%s\n' % p.path) |
|
252 | tmpfp.write('--- a/%s\n' % p.path) | |
253 |
|
253 | |||
254 | line = pf.readline() |
|
254 | line = pf.readline() | |
255 | while line: |
|
255 | while line: | |
256 | tmpfp.write(line) |
|
256 | tmpfp.write(line) | |
257 | line = pf.readline() |
|
257 | line = pf.readline() | |
258 | except: |
|
258 | except: | |
259 | tmpfp.close() |
|
259 | tmpfp.close() | |
260 | os.unlink(patchname) |
|
260 | os.unlink(patchname) | |
261 | raise |
|
261 | raise | |
262 |
|
262 | |||
263 | tmpfp.close() |
|
263 | tmpfp.close() | |
264 | return patchname |
|
264 | return patchname | |
265 |
|
265 | |||
266 | def patch(patchname, ui, strip=1, cwd=None, files={}): |
|
266 | def patch(patchname, ui, strip=1, cwd=None, files={}): | |
267 | """apply the patch <patchname> to the working directory. |
|
267 | """apply the patch <patchname> to the working directory. | |
268 | a list of patched files is returned""" |
|
268 | a list of patched files is returned""" | |
269 |
|
269 | |||
270 | # helper function |
|
270 | # helper function | |
271 | def __patch(patchname): |
|
271 | def __patch(patchname): | |
272 | """patch and updates the files and fuzz variables""" |
|
272 | """patch and updates the files and fuzz variables""" | |
273 | fuzz = False |
|
273 | fuzz = False | |
274 |
|
274 | |||
275 | patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''), |
|
275 | patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''), | |
276 | 'patch') |
|
276 | 'patch') | |
277 | args = [] |
|
277 | args = [] | |
278 | if cwd: |
|
278 | if cwd: | |
279 | args.append('-d %s' % util.shellquote(cwd)) |
|
279 | args.append('-d %s' % util.shellquote(cwd)) | |
280 | fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
|
280 | fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, | |
281 | util.shellquote(patchname))) |
|
281 | util.shellquote(patchname))) | |
282 |
|
282 | |||
283 | for line in fp: |
|
283 | for line in fp: | |
284 | line = line.rstrip() |
|
284 | line = line.rstrip() | |
285 | ui.note(line + '\n') |
|
285 | ui.note(line + '\n') | |
286 | if line.startswith('patching file '): |
|
286 | if line.startswith('patching file '): | |
287 | pf = util.parse_patch_output(line) |
|
287 | pf = util.parse_patch_output(line) | |
288 | printed_file = False |
|
288 | printed_file = False | |
289 | files.setdefault(pf, (None, None)) |
|
289 | files.setdefault(pf, (None, None)) | |
290 | elif line.find('with fuzz') >= 0: |
|
290 | elif line.find('with fuzz') >= 0: | |
291 | fuzz = True |
|
291 | fuzz = True | |
292 | if not printed_file: |
|
292 | if not printed_file: | |
293 | ui.warn(pf + '\n') |
|
293 | ui.warn(pf + '\n') | |
294 | printed_file = True |
|
294 | printed_file = True | |
295 | ui.warn(line + '\n') |
|
295 | ui.warn(line + '\n') | |
296 | elif line.find('saving rejects to file') >= 0: |
|
296 | elif line.find('saving rejects to file') >= 0: | |
297 | ui.warn(line + '\n') |
|
297 | ui.warn(line + '\n') | |
298 | elif line.find('FAILED') >= 0: |
|
298 | elif line.find('FAILED') >= 0: | |
299 | if not printed_file: |
|
299 | if not printed_file: | |
300 | ui.warn(pf + '\n') |
|
300 | ui.warn(pf + '\n') | |
301 | printed_file = True |
|
301 | printed_file = True | |
302 | ui.warn(line + '\n') |
|
302 | ui.warn(line + '\n') | |
303 | code = fp.close() |
|
303 | code = fp.close() | |
304 | if code: |
|
304 | if code: | |
305 | raise util.Abort(_("patch command failed: %s") % |
|
305 | raise util.Abort(_("patch command failed: %s") % | |
306 | util.explain_exit(code)[0]) |
|
306 | util.explain_exit(code)[0]) | |
307 | return fuzz |
|
307 | return fuzz | |
308 |
|
308 | |||
309 | (dopatch, gitpatches) = readgitpatch(patchname) |
|
309 | (dopatch, gitpatches) = readgitpatch(patchname) | |
310 | for gp in gitpatches: |
|
310 | for gp in gitpatches: | |
311 | files[gp.path] = (gp.op, gp) |
|
311 | files[gp.path] = (gp.op, gp) | |
312 |
|
312 | |||
313 | fuzz = False |
|
313 | fuzz = False | |
314 | if dopatch: |
|
314 | if dopatch: | |
315 | if dopatch in ('filter', 'binary'): |
|
315 | if dopatch in ('filter', 'binary'): | |
316 | patchname = dogitpatch(patchname, gitpatches, cwd=cwd) |
|
316 | patchname = dogitpatch(patchname, gitpatches, cwd=cwd) | |
317 | try: |
|
317 | try: | |
318 | if dopatch != 'binary': |
|
318 | if dopatch != 'binary': | |
319 | fuzz = __patch(patchname) |
|
319 | fuzz = __patch(patchname) | |
320 | finally: |
|
320 | finally: | |
321 | if dopatch == 'filter': |
|
321 | if dopatch == 'filter': | |
322 | os.unlink(patchname) |
|
322 | os.unlink(patchname) | |
323 |
|
323 | |||
324 | return fuzz |
|
324 | return fuzz | |
325 |
|
325 | |||
326 | def diffopts(ui, opts={}, untrusted=False): |
|
326 | def diffopts(ui, opts={}, untrusted=False): | |
327 | def get(key, name=None): |
|
327 | def get(key, name=None): | |
328 | return (opts.get(key) or |
|
328 | return (opts.get(key) or | |
329 | ui.configbool('diff', name or key, None, untrusted=untrusted)) |
|
329 | ui.configbool('diff', name or key, None, untrusted=untrusted)) | |
330 | return mdiff.diffopts( |
|
330 | return mdiff.diffopts( | |
331 | text=opts.get('text'), |
|
331 | text=opts.get('text'), | |
332 | git=get('git'), |
|
332 | git=get('git'), | |
333 | nodates=get('nodates'), |
|
333 | nodates=get('nodates'), | |
334 | showfunc=get('show_function', 'showfunc'), |
|
334 | showfunc=get('show_function', 'showfunc'), | |
335 | ignorews=get('ignore_all_space', 'ignorews'), |
|
335 | ignorews=get('ignore_all_space', 'ignorews'), | |
336 | ignorewsamount=get('ignore_space_change', 'ignorewsamount'), |
|
336 | ignorewsamount=get('ignore_space_change', 'ignorewsamount'), | |
337 | ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines')) |
|
337 | ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines')) | |
338 |
|
338 | |||
339 | def updatedir(ui, repo, patches, wlock=None): |
|
339 | def updatedir(ui, repo, patches, wlock=None): | |
340 | '''Update dirstate after patch application according to metadata''' |
|
340 | '''Update dirstate after patch application according to metadata''' | |
341 | if not patches: |
|
341 | if not patches: | |
342 | return |
|
342 | return | |
343 | copies = [] |
|
343 | copies = [] | |
344 | removes = [] |
|
344 | removes = [] | |
345 | cfiles = patches.keys() |
|
345 | cfiles = patches.keys() | |
346 | cwd = repo.getcwd() |
|
346 | cwd = repo.getcwd() | |
347 | if cwd: |
|
347 | if cwd: | |
348 | cfiles = [util.pathto(cwd, f) for f in patches.keys()] |
|
348 | cfiles = [util.pathto(cwd, f) for f in patches.keys()] | |
349 | for f in patches: |
|
349 | for f in patches: | |
350 | ctype, gp = patches[f] |
|
350 | ctype, gp = patches[f] | |
351 | if ctype == 'RENAME': |
|
351 | if ctype == 'RENAME': | |
352 | copies.append((gp.oldpath, gp.path, gp.copymod)) |
|
352 | copies.append((gp.oldpath, gp.path, gp.copymod)) | |
353 | removes.append(gp.oldpath) |
|
353 | removes.append(gp.oldpath) | |
354 | elif ctype == 'COPY': |
|
354 | elif ctype == 'COPY': | |
355 | copies.append((gp.oldpath, gp.path, gp.copymod)) |
|
355 | copies.append((gp.oldpath, gp.path, gp.copymod)) | |
356 | elif ctype == 'DELETE': |
|
356 | elif ctype == 'DELETE': | |
357 | removes.append(gp.path) |
|
357 | removes.append(gp.path) | |
358 | for src, dst, after in copies: |
|
358 | for src, dst, after in copies: | |
359 | if not after: |
|
359 | if not after: | |
360 | copyfile(src, dst, repo.root) |
|
360 | copyfile(src, dst, repo.root) | |
361 | repo.copy(src, dst, wlock=wlock) |
|
361 | repo.copy(src, dst, wlock=wlock) | |
362 | if removes: |
|
362 | if removes: | |
363 | repo.remove(removes, True, wlock=wlock) |
|
363 | repo.remove(removes, True, wlock=wlock) | |
364 | for f in patches: |
|
364 | for f in patches: | |
365 | ctype, gp = patches[f] |
|
365 | ctype, gp = patches[f] | |
366 | if gp and gp.mode: |
|
366 | if gp and gp.mode: | |
367 | x = gp.mode & 0100 != 0 |
|
367 | x = gp.mode & 0100 != 0 | |
368 | dst = os.path.join(repo.root, gp.path) |
|
368 | dst = os.path.join(repo.root, gp.path) | |
369 | # patch won't create empty files |
|
369 | # patch won't create empty files | |
370 | if ctype == 'ADD' and not os.path.exists(dst): |
|
370 | if ctype == 'ADD' and not os.path.exists(dst): | |
371 | repo.wwrite(gp.path, '') |
|
371 | repo.wwrite(gp.path, '') | |
372 | util.set_exec(dst, x) |
|
372 | util.set_exec(dst, x) | |
373 | cmdutil.addremove(repo, cfiles, wlock=wlock) |
|
373 | cmdutil.addremove(repo, cfiles, wlock=wlock) | |
374 | files = patches.keys() |
|
374 | files = patches.keys() | |
375 | files.extend([r for r in removes if r not in files]) |
|
375 | files.extend([r for r in removes if r not in files]) | |
376 | files.sort() |
|
376 | files.sort() | |
377 |
|
377 | |||
378 | return files |
|
378 | return files | |
379 |
|
379 | |||
380 | def b85diff(fp, to, tn): |
|
380 | def b85diff(fp, to, tn): | |
381 | '''print base85-encoded binary diff''' |
|
381 | '''print base85-encoded binary diff''' | |
382 | def gitindex(text): |
|
382 | def gitindex(text): | |
383 | if not text: |
|
383 | if not text: | |
384 | return '0' * 40 |
|
384 | return '0' * 40 | |
385 | l = len(text) |
|
385 | l = len(text) | |
386 | s = sha.new('blob %d\0' % l) |
|
386 | s = sha.new('blob %d\0' % l) | |
387 | s.update(text) |
|
387 | s.update(text) | |
388 | return s.hexdigest() |
|
388 | return s.hexdigest() | |
389 |
|
389 | |||
390 | def fmtline(line): |
|
390 | def fmtline(line): | |
391 | l = len(line) |
|
391 | l = len(line) | |
392 | if l <= 26: |
|
392 | if l <= 26: | |
393 | l = chr(ord('A') + l - 1) |
|
393 | l = chr(ord('A') + l - 1) | |
394 | else: |
|
394 | else: | |
395 | l = chr(l - 26 + ord('a') - 1) |
|
395 | l = chr(l - 26 + ord('a') - 1) | |
396 | return '%c%s\n' % (l, base85.b85encode(line, True)) |
|
396 | return '%c%s\n' % (l, base85.b85encode(line, True)) | |
397 |
|
397 | |||
398 | def chunk(text, csize=52): |
|
398 | def chunk(text, csize=52): | |
399 | l = len(text) |
|
399 | l = len(text) | |
400 | i = 0 |
|
400 | i = 0 | |
401 | while i < l: |
|
401 | while i < l: | |
402 | yield text[i:i+csize] |
|
402 | yield text[i:i+csize] | |
403 | i += csize |
|
403 | i += csize | |
404 |
|
404 | |||
405 | # TODO: deltas |
|
405 | # TODO: deltas | |
406 | l = len(tn) |
|
406 | l = len(tn) | |
407 | fp.write('index %s..%s\nGIT binary patch\nliteral %s\n' % |
|
407 | fp.write('index %s..%s\nGIT binary patch\nliteral %s\n' % | |
408 | (gitindex(to), gitindex(tn), len(tn))) |
|
408 | (gitindex(to), gitindex(tn), len(tn))) | |
409 |
|
409 | |||
410 | tn = ''.join([fmtline(l) for l in chunk(zlib.compress(tn))]) |
|
410 | tn = ''.join([fmtline(l) for l in chunk(zlib.compress(tn))]) | |
411 | fp.write(tn) |
|
411 | fp.write(tn) | |
412 | fp.write('\n') |
|
412 | fp.write('\n') | |
413 |
|
413 | |||
414 | def diff(repo, node1=None, node2=None, files=None, match=util.always, |
|
414 | def diff(repo, node1=None, node2=None, files=None, match=util.always, | |
415 | fp=None, changes=None, opts=None): |
|
415 | fp=None, changes=None, opts=None): | |
416 | '''print diff of changes to files between two nodes, or node and |
|
416 | '''print diff of changes to files between two nodes, or node and | |
417 | working directory. |
|
417 | working directory. | |
418 |
|
418 | |||
419 | if node1 is None, use first dirstate parent instead. |
|
419 | if node1 is None, use first dirstate parent instead. | |
420 | if node2 is None, compare node1 with working directory.''' |
|
420 | if node2 is None, compare node1 with working directory.''' | |
421 |
|
421 | |||
422 | if opts is None: |
|
422 | if opts is None: | |
423 | opts = mdiff.defaultopts |
|
423 | opts = mdiff.defaultopts | |
424 | if fp is None: |
|
424 | if fp is None: | |
425 | fp = repo.ui |
|
425 | fp = repo.ui | |
426 |
|
426 | |||
427 | if not node1: |
|
427 | if not node1: | |
428 | node1 = repo.dirstate.parents()[0] |
|
428 | node1 = repo.dirstate.parents()[0] | |
429 |
|
429 | |||
430 | clcache = {} |
|
430 | clcache = {} | |
431 | def getchangelog(n): |
|
431 | def getchangelog(n): | |
432 | if n not in clcache: |
|
432 | if n not in clcache: | |
433 | clcache[n] = repo.changelog.read(n) |
|
433 | clcache[n] = repo.changelog.read(n) | |
434 | return clcache[n] |
|
434 | return clcache[n] | |
435 | mcache = {} |
|
435 | mcache = {} | |
436 | def getmanifest(n): |
|
436 | def getmanifest(n): | |
437 | if n not in mcache: |
|
437 | if n not in mcache: | |
438 | mcache[n] = repo.manifest.read(n) |
|
438 | mcache[n] = repo.manifest.read(n) | |
439 | return mcache[n] |
|
439 | return mcache[n] | |
440 | fcache = {} |
|
440 | fcache = {} | |
441 | def getfile(f): |
|
441 | def getfile(f): | |
442 | if f not in fcache: |
|
442 | if f not in fcache: | |
443 | fcache[f] = repo.file(f) |
|
443 | fcache[f] = repo.file(f) | |
444 | return fcache[f] |
|
444 | return fcache[f] | |
445 |
|
445 | |||
446 | # reading the data for node1 early allows it to play nicely |
|
446 | # reading the data for node1 early allows it to play nicely | |
447 | # with repo.status and the revlog cache. |
|
447 | # with repo.status and the revlog cache. | |
448 | change = getchangelog(node1) |
|
448 | change = getchangelog(node1) | |
449 | mmap = getmanifest(change[0]) |
|
449 | mmap = getmanifest(change[0]) | |
450 | date1 = util.datestr(change[2]) |
|
450 | date1 = util.datestr(change[2]) | |
451 |
|
451 | |||
452 | if not changes: |
|
452 | if not changes: | |
453 | changes = repo.status(node1, node2, files, match=match)[:5] |
|
453 | changes = repo.status(node1, node2, files, match=match)[:5] | |
454 | modified, added, removed, deleted, unknown = changes |
|
454 | modified, added, removed, deleted, unknown = changes | |
455 | if files: |
|
455 | if files: | |
456 | def filterfiles(filters): |
|
456 | def filterfiles(filters): | |
457 | l = [x for x in filters if x in files] |
|
457 | l = [x for x in filters if x in files] | |
458 |
|
458 | |||
459 | for t in files: |
|
459 | for t in files: | |
460 | if not t.endswith("/"): |
|
460 | if not t.endswith("/"): | |
461 | t += "/" |
|
461 | t += "/" | |
462 | l += [x for x in filters if x.startswith(t)] |
|
462 | l += [x for x in filters if x.startswith(t)] | |
463 | return l |
|
463 | return l | |
464 |
|
464 | |||
465 | modified, added, removed = map(filterfiles, (modified, added, removed)) |
|
465 | modified, added, removed = map(filterfiles, (modified, added, removed)) | |
466 |
|
466 | |||
467 | if not modified and not added and not removed: |
|
467 | if not modified and not added and not removed: | |
468 | return |
|
468 | return | |
469 |
|
469 | |||
|
470 | # returns False if there was no rename between n1 and n2 | |||
|
471 | # returns None if the file was created between n1 and n2 | |||
|
472 | # returns the (file, node) present in n1 that was renamed to f in n2 | |||
470 | def renamedbetween(f, n1, n2): |
|
473 | def renamedbetween(f, n1, n2): | |
471 | r1, r2 = map(repo.changelog.rev, (n1, n2)) |
|
474 | r1, r2 = map(repo.changelog.rev, (n1, n2)) | |
472 | orig = f |
|
475 | orig = f | |
473 | src = None |
|
476 | src = None | |
474 | while r2 > r1: |
|
477 | while r2 > r1: | |
475 | cl = getchangelog(n2) |
|
478 | cl = getchangelog(n2) | |
476 | if f in cl[3]: |
|
479 | if f in cl[3]: | |
477 | m = getmanifest(cl[0]) |
|
480 | m = getmanifest(cl[0]) | |
478 | try: |
|
481 | try: | |
479 | src = getfile(f).renamed(m[f]) |
|
482 | src = getfile(f).renamed(m[f]) | |
480 | except KeyError: |
|
483 | except KeyError: | |
481 | return None |
|
484 | return None | |
482 | if src: |
|
485 | if src: | |
483 | f = src[0] |
|
486 | f = src[0] | |
484 | n2 = repo.changelog.parents(n2)[0] |
|
487 | n2 = repo.changelog.parents(n2)[0] | |
485 | r2 = repo.changelog.rev(n2) |
|
488 | r2 = repo.changelog.rev(n2) | |
486 | if orig == f: |
|
|||
487 | return None |
|
|||
488 | cl = getchangelog(n1) |
|
489 | cl = getchangelog(n1) | |
489 | m = getmanifest(cl[0]) |
|
490 | m = getmanifest(cl[0]) | |
490 | if f not in m: |
|
491 | if f not in m: | |
491 | return None |
|
492 | return None | |
|
493 | if f == orig: | |||
|
494 | return False | |||
492 | return f, m[f] |
|
495 | return f, m[f] | |
493 |
|
496 | |||
494 | if node2: |
|
497 | if node2: | |
495 | change = getchangelog(node2) |
|
498 | change = getchangelog(node2) | |
496 | mmap2 = getmanifest(change[0]) |
|
499 | mmap2 = getmanifest(change[0]) | |
497 | _date2 = util.datestr(change[2]) |
|
500 | _date2 = util.datestr(change[2]) | |
498 | def date2(f): |
|
501 | def date2(f): | |
499 | return _date2 |
|
502 | return _date2 | |
500 | def read(f): |
|
503 | def read(f): | |
501 | return getfile(f).read(mmap2[f]) |
|
504 | return getfile(f).read(mmap2[f]) | |
502 | def renamed(f): |
|
505 | def renamed(f): | |
503 | return renamedbetween(f, node1, node2) |
|
506 | return renamedbetween(f, node1, node2) | |
504 | else: |
|
507 | else: | |
505 | tz = util.makedate()[1] |
|
508 | tz = util.makedate()[1] | |
506 | _date2 = util.datestr() |
|
509 | _date2 = util.datestr() | |
507 | def date2(f): |
|
510 | def date2(f): | |
508 | try: |
|
511 | try: | |
509 | return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz)) |
|
512 | return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz)) | |
510 | except OSError, err: |
|
513 | except OSError, err: | |
511 | if err.errno != errno.ENOENT: raise |
|
514 | if err.errno != errno.ENOENT: raise | |
512 | return _date2 |
|
515 | return _date2 | |
513 | def read(f): |
|
516 | def read(f): | |
514 | return repo.wread(f) |
|
517 | return repo.wread(f) | |
515 | def renamed(f): |
|
518 | def renamed(f): | |
516 | src = repo.dirstate.copied(f) |
|
519 | src = repo.dirstate.copied(f) | |
517 | parent = repo.dirstate.parents()[0] |
|
520 | parent = repo.dirstate.parents()[0] | |
518 | if src: |
|
521 | if src: | |
519 | f = src |
|
522 | f = src | |
520 | of = renamedbetween(f, node1, parent) |
|
523 | of = renamedbetween(f, node1, parent) | |
521 | if of: |
|
524 | if of or of is None: | |
522 | return of |
|
525 | return of | |
523 | elif src: |
|
526 | elif src: | |
524 | cl = getchangelog(parent)[0] |
|
527 | cl = getchangelog(parent)[0] | |
525 | return (src, getmanifest(cl)[src]) |
|
528 | return (src, getmanifest(cl)[src]) | |
526 | else: |
|
529 | else: | |
527 | return None |
|
530 | return None | |
528 |
|
531 | |||
529 | if repo.ui.quiet: |
|
532 | if repo.ui.quiet: | |
530 | r = None |
|
533 | r = None | |
531 | else: |
|
534 | else: | |
532 | hexfunc = repo.ui.debugflag and hex or short |
|
535 | hexfunc = repo.ui.debugflag and hex or short | |
533 | r = [hexfunc(node) for node in [node1, node2] if node] |
|
536 | r = [hexfunc(node) for node in [node1, node2] if node] | |
534 |
|
537 | |||
535 | if opts.git: |
|
538 | if opts.git: | |
536 | copied = {} |
|
539 | copied = {} | |
537 | for f in added: |
|
540 | for f in added: | |
538 | src = renamed(f) |
|
541 | src = renamed(f) | |
539 | if src: |
|
542 | if src: | |
540 | copied[f] = src |
|
543 | copied[f] = src | |
541 | srcs = [x[1][0] for x in copied.items()] |
|
544 | srcs = [x[1][0] for x in copied.items()] | |
542 |
|
545 | |||
543 | all = modified + added + removed |
|
546 | all = modified + added + removed | |
544 | all.sort() |
|
547 | all.sort() | |
545 | for f in all: |
|
548 | for f in all: | |
546 | to = None |
|
549 | to = None | |
547 | tn = None |
|
550 | tn = None | |
548 | dodiff = True |
|
551 | dodiff = True | |
549 | header = [] |
|
552 | header = [] | |
550 | if f in mmap: |
|
553 | if f in mmap: | |
551 | to = getfile(f).read(mmap[f]) |
|
554 | to = getfile(f).read(mmap[f]) | |
552 | if f not in removed: |
|
555 | if f not in removed: | |
553 | tn = read(f) |
|
556 | tn = read(f) | |
554 | if opts.git: |
|
557 | if opts.git: | |
555 | def gitmode(x): |
|
558 | def gitmode(x): | |
556 | return x and '100755' or '100644' |
|
559 | return x and '100755' or '100644' | |
557 | def addmodehdr(header, omode, nmode): |
|
560 | def addmodehdr(header, omode, nmode): | |
558 | if omode != nmode: |
|
561 | if omode != nmode: | |
559 | header.append('old mode %s\n' % omode) |
|
562 | header.append('old mode %s\n' % omode) | |
560 | header.append('new mode %s\n' % nmode) |
|
563 | header.append('new mode %s\n' % nmode) | |
561 |
|
564 | |||
562 | a, b = f, f |
|
565 | a, b = f, f | |
563 | if f in added: |
|
566 | if f in added: | |
564 | if node2: |
|
567 | if node2: | |
565 | mode = gitmode(mmap2.execf(f)) |
|
568 | mode = gitmode(mmap2.execf(f)) | |
566 | else: |
|
569 | else: | |
567 | mode = gitmode(util.is_exec(repo.wjoin(f), None)) |
|
570 | mode = gitmode(util.is_exec(repo.wjoin(f), None)) | |
568 | if f in copied: |
|
571 | if f in copied: | |
569 | a, arev = copied[f] |
|
572 | a, arev = copied[f] | |
570 | omode = gitmode(mmap.execf(a)) |
|
573 | omode = gitmode(mmap.execf(a)) | |
571 | addmodehdr(header, omode, mode) |
|
574 | addmodehdr(header, omode, mode) | |
572 | op = a in removed and 'rename' or 'copy' |
|
575 | op = a in removed and 'rename' or 'copy' | |
573 | header.append('%s from %s\n' % (op, a)) |
|
576 | header.append('%s from %s\n' % (op, a)) | |
574 | header.append('%s to %s\n' % (op, f)) |
|
577 | header.append('%s to %s\n' % (op, f)) | |
575 | to = getfile(a).read(arev) |
|
578 | to = getfile(a).read(arev) | |
576 | else: |
|
579 | else: | |
577 | header.append('new file mode %s\n' % mode) |
|
580 | header.append('new file mode %s\n' % mode) | |
578 | if util.binary(tn): |
|
581 | if util.binary(tn): | |
579 | dodiff = 'binary' |
|
582 | dodiff = 'binary' | |
580 | elif f in removed: |
|
583 | elif f in removed: | |
581 | if f in srcs: |
|
584 | if f in srcs: | |
582 | dodiff = False |
|
585 | dodiff = False | |
583 | else: |
|
586 | else: | |
584 | mode = gitmode(mmap.execf(f)) |
|
587 | mode = gitmode(mmap.execf(f)) | |
585 | header.append('deleted file mode %s\n' % mode) |
|
588 | header.append('deleted file mode %s\n' % mode) | |
586 | else: |
|
589 | else: | |
587 | omode = gitmode(mmap.execf(f)) |
|
590 | omode = gitmode(mmap.execf(f)) | |
588 | if node2: |
|
591 | if node2: | |
589 | nmode = gitmode(mmap2.execf(f)) |
|
592 | nmode = gitmode(mmap2.execf(f)) | |
590 | else: |
|
593 | else: | |
591 | nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f))) |
|
594 | nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f))) | |
592 | addmodehdr(header, omode, nmode) |
|
595 | addmodehdr(header, omode, nmode) | |
593 | if util.binary(to) or util.binary(tn): |
|
596 | if util.binary(to) or util.binary(tn): | |
594 | dodiff = 'binary' |
|
597 | dodiff = 'binary' | |
595 | r = None |
|
598 | r = None | |
596 | header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) |
|
599 | header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) | |
597 | if dodiff == 'binary': |
|
600 | if dodiff == 'binary': | |
598 | fp.write(''.join(header)) |
|
601 | fp.write(''.join(header)) | |
599 | b85diff(fp, to, tn) |
|
602 | b85diff(fp, to, tn) | |
600 | elif dodiff: |
|
603 | elif dodiff: | |
601 | text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts) |
|
604 | text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts) | |
602 | if text or len(header) > 1: |
|
605 | if text or len(header) > 1: | |
603 | fp.write(''.join(header)) |
|
606 | fp.write(''.join(header)) | |
604 | fp.write(text) |
|
607 | fp.write(text) | |
605 |
|
608 | |||
606 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, |
|
609 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, | |
607 | opts=None): |
|
610 | opts=None): | |
608 | '''export changesets as hg patches.''' |
|
611 | '''export changesets as hg patches.''' | |
609 |
|
612 | |||
610 | total = len(revs) |
|
613 | total = len(revs) | |
611 | revwidth = max(map(len, revs)) |
|
614 | revwidth = max(map(len, revs)) | |
612 |
|
615 | |||
613 | def single(node, seqno, fp): |
|
616 | def single(node, seqno, fp): | |
614 | parents = [p for p in repo.changelog.parents(node) if p != nullid] |
|
617 | parents = [p for p in repo.changelog.parents(node) if p != nullid] | |
615 | if switch_parent: |
|
618 | if switch_parent: | |
616 | parents.reverse() |
|
619 | parents.reverse() | |
617 | prev = (parents and parents[0]) or nullid |
|
620 | prev = (parents and parents[0]) or nullid | |
618 | change = repo.changelog.read(node) |
|
621 | change = repo.changelog.read(node) | |
619 |
|
622 | |||
620 | if not fp: |
|
623 | if not fp: | |
621 | fp = cmdutil.make_file(repo, template, node, total=total, |
|
624 | fp = cmdutil.make_file(repo, template, node, total=total, | |
622 | seqno=seqno, revwidth=revwidth) |
|
625 | seqno=seqno, revwidth=revwidth) | |
623 | if fp not in (sys.stdout, repo.ui): |
|
626 | if fp not in (sys.stdout, repo.ui): | |
624 | repo.ui.note("%s\n" % fp.name) |
|
627 | repo.ui.note("%s\n" % fp.name) | |
625 |
|
628 | |||
626 | fp.write("# HG changeset patch\n") |
|
629 | fp.write("# HG changeset patch\n") | |
627 | fp.write("# User %s\n" % change[1]) |
|
630 | fp.write("# User %s\n" % change[1]) | |
628 | fp.write("# Date %d %d\n" % change[2]) |
|
631 | fp.write("# Date %d %d\n" % change[2]) | |
629 | fp.write("# Node ID %s\n" % hex(node)) |
|
632 | fp.write("# Node ID %s\n" % hex(node)) | |
630 | fp.write("# Parent %s\n" % hex(prev)) |
|
633 | fp.write("# Parent %s\n" % hex(prev)) | |
631 | if len(parents) > 1: |
|
634 | if len(parents) > 1: | |
632 | fp.write("# Parent %s\n" % hex(parents[1])) |
|
635 | fp.write("# Parent %s\n" % hex(parents[1])) | |
633 | fp.write(change[4].rstrip()) |
|
636 | fp.write(change[4].rstrip()) | |
634 | fp.write("\n\n") |
|
637 | fp.write("\n\n") | |
635 |
|
638 | |||
636 | diff(repo, prev, node, fp=fp, opts=opts) |
|
639 | diff(repo, prev, node, fp=fp, opts=opts) | |
637 | if fp not in (sys.stdout, repo.ui): |
|
640 | if fp not in (sys.stdout, repo.ui): | |
638 | fp.close() |
|
641 | fp.close() | |
639 |
|
642 | |||
640 | for seqno, cset in enumerate(revs): |
|
643 | for seqno, cset in enumerate(revs): | |
641 | single(cset, seqno, fp) |
|
644 | single(cset, seqno, fp) | |
642 |
|
645 | |||
643 | def diffstat(patchlines): |
|
646 | def diffstat(patchlines): | |
644 | fd, name = tempfile.mkstemp(prefix="hg-patchbomb-", suffix=".txt") |
|
647 | fd, name = tempfile.mkstemp(prefix="hg-patchbomb-", suffix=".txt") | |
645 | try: |
|
648 | try: | |
646 | p = popen2.Popen3('diffstat -p1 -w79 2>/dev/null > ' + name) |
|
649 | p = popen2.Popen3('diffstat -p1 -w79 2>/dev/null > ' + name) | |
647 | try: |
|
650 | try: | |
648 | for line in patchlines: print >> p.tochild, line |
|
651 | for line in patchlines: print >> p.tochild, line | |
649 | p.tochild.close() |
|
652 | p.tochild.close() | |
650 | if p.wait(): return |
|
653 | if p.wait(): return | |
651 | fp = os.fdopen(fd, 'r') |
|
654 | fp = os.fdopen(fd, 'r') | |
652 | stat = [] |
|
655 | stat = [] | |
653 | for line in fp: stat.append(line.lstrip()) |
|
656 | for line in fp: stat.append(line.lstrip()) | |
654 | last = stat.pop() |
|
657 | last = stat.pop() | |
655 | stat.insert(0, last) |
|
658 | stat.insert(0, last) | |
656 | stat = ''.join(stat) |
|
659 | stat = ''.join(stat) | |
657 | if stat.startswith('0 files'): raise ValueError |
|
660 | if stat.startswith('0 files'): raise ValueError | |
658 | return stat |
|
661 | return stat | |
659 | except: raise |
|
662 | except: raise | |
660 | finally: |
|
663 | finally: | |
661 | try: os.unlink(name) |
|
664 | try: os.unlink(name) | |
662 | except: pass |
|
665 | except: pass |
@@ -1,114 +1,129 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init a |
|
3 | hg init a | |
4 | cd a |
|
4 | cd a | |
5 |
|
5 | |||
6 | echo start > start |
|
6 | echo start > start | |
7 | hg ci -Amstart -d '0 0' |
|
7 | hg ci -Amstart -d '0 0' | |
8 | echo new > new |
|
8 | echo new > new | |
9 | hg ci -Amnew -d '0 0' |
|
9 | hg ci -Amnew -d '0 0' | |
10 | echo '% new file' |
|
10 | echo '% new file' | |
11 | hg diff --git -r 0 |
|
11 | hg diff --git -r 0 | |
12 |
|
12 | |||
13 | hg cp new copy |
|
13 | hg cp new copy | |
14 | hg ci -mcopy -d '0 0' |
|
14 | hg ci -mcopy -d '0 0' | |
15 | echo '% copy' |
|
15 | echo '% copy' | |
16 | hg diff --git -r 1:tip |
|
16 | hg diff --git -r 1:tip | |
17 |
|
17 | |||
18 | hg mv copy rename |
|
18 | hg mv copy rename | |
19 | hg ci -mrename -d '0 0' |
|
19 | hg ci -mrename -d '0 0' | |
20 | echo '% rename' |
|
20 | echo '% rename' | |
21 | hg diff --git -r 2:tip |
|
21 | hg diff --git -r 2:tip | |
22 |
|
22 | |||
23 | hg rm rename |
|
23 | hg rm rename | |
24 | hg ci -mdelete -d '0 0' |
|
24 | hg ci -mdelete -d '0 0' | |
25 | echo '% delete' |
|
25 | echo '% delete' | |
26 | hg diff --git -r 3:tip |
|
26 | hg diff --git -r 3:tip | |
27 |
|
27 | |||
28 | cat > src <<EOF |
|
28 | cat > src <<EOF | |
29 | 1 |
|
29 | 1 | |
30 | 2 |
|
30 | 2 | |
31 | 3 |
|
31 | 3 | |
32 | 4 |
|
32 | 4 | |
33 | 5 |
|
33 | 5 | |
34 | EOF |
|
34 | EOF | |
35 | hg ci -Amsrc -d '0 0' |
|
35 | hg ci -Amsrc -d '0 0' | |
36 | chmod +x src |
|
36 | chmod +x src | |
37 | hg ci -munexec -d '0 0' |
|
37 | hg ci -munexec -d '0 0' | |
38 | echo '% chmod 644' |
|
38 | echo '% chmod 644' | |
39 | hg diff --git -r 5:tip |
|
39 | hg diff --git -r 5:tip | |
40 |
|
40 | |||
41 | hg mv src dst |
|
41 | hg mv src dst | |
42 | chmod -x dst |
|
42 | chmod -x dst | |
43 | echo a >> dst |
|
43 | echo a >> dst | |
44 | hg ci -mrenamemod -d '0 0' |
|
44 | hg ci -mrenamemod -d '0 0' | |
45 | echo '% rename+mod+chmod' |
|
45 | echo '% rename+mod+chmod' | |
46 | hg diff --git -r 6:tip |
|
46 | hg diff --git -r 6:tip | |
47 |
|
47 | |||
48 | echo '% nonexistent in tip+chmod' |
|
48 | echo '% nonexistent in tip+chmod' | |
49 | hg diff --git -r 5:6 |
|
49 | hg diff --git -r 5:6 | |
50 |
|
50 | |||
51 | echo '% binary diff' |
|
51 | echo '% binary diff' | |
52 | cp $TESTDIR/binfile.bin . |
|
52 | cp $TESTDIR/binfile.bin . | |
53 | hg add binfile.bin |
|
53 | hg add binfile.bin | |
54 | hg diff --git > b.diff |
|
54 | hg diff --git > b.diff | |
55 | cat b.diff |
|
55 | cat b.diff | |
56 |
|
56 | |||
57 | echo '% import binary diff' |
|
57 | echo '% import binary diff' | |
58 | hg revert binfile.bin |
|
58 | hg revert binfile.bin | |
59 | rm binfile.bin |
|
59 | rm binfile.bin | |
60 | hg import -mfoo b.diff |
|
60 | hg import -mfoo b.diff | |
61 | cmp binfile.bin $TESTDIR/binfile.bin |
|
61 | cmp binfile.bin $TESTDIR/binfile.bin | |
62 |
|
62 | |||
63 | echo |
|
63 | echo | |
64 | echo '% diff across many revisions' |
|
64 | echo '% diff across many revisions' | |
65 | hg mv dst dst2 |
|
65 | hg mv dst dst2 | |
66 | hg ci -m 'mv dst dst2' -d '0 0' |
|
66 | hg ci -m 'mv dst dst2' -d '0 0' | |
67 |
|
67 | |||
68 | echo >> start |
|
68 | echo >> start | |
69 | hg ci -m 'change start' -d '0 0' |
|
69 | hg ci -m 'change start' -d '0 0' | |
70 |
|
70 | |||
71 | hg revert -r -2 start |
|
71 | hg revert -r -2 start | |
72 | hg mv dst2 dst3 |
|
72 | hg mv dst2 dst3 | |
73 | hg ci -m 'mv dst2 dst3; revert start' -d '0 0' |
|
73 | hg ci -m 'mv dst2 dst3; revert start' -d '0 0' | |
74 |
|
74 | |||
75 | hg diff --git -r 9:11 |
|
75 | hg diff --git -r 9:11 | |
76 |
|
76 | |||
77 | echo a >> foo |
|
77 | echo a >> foo | |
78 | hg add foo |
|
78 | hg add foo | |
79 | hg ci -m 'add foo' |
|
79 | hg ci -m 'add foo' | |
80 | echo b >> foo |
|
80 | echo b >> foo | |
81 | hg ci -m 'change foo' |
|
81 | hg ci -m 'change foo' | |
82 | hg mv foo bar |
|
82 | hg mv foo bar | |
83 | hg ci -m 'mv foo bar' |
|
83 | hg ci -m 'mv foo bar' | |
84 | echo c >> bar |
|
84 | echo c >> bar | |
85 | hg ci -m 'change bar' |
|
85 | hg ci -m 'change bar' | |
86 |
|
86 | |||
87 | echo |
|
87 | echo | |
88 | echo '% file created before r1 and renamed before r2' |
|
88 | echo '% file created before r1 and renamed before r2' | |
89 | hg diff --git -r -3:-1 |
|
89 | hg diff --git -r -3:-1 | |
90 | echo |
|
90 | echo | |
91 | echo '% file created in r1 and renamed before r2' |
|
91 | echo '% file created in r1 and renamed before r2' | |
92 | hg diff --git -r -4:-1 |
|
92 | hg diff --git -r -4:-1 | |
93 | echo |
|
93 | echo | |
94 | echo '% file created after r1 and renamed before r2' |
|
94 | echo '% file created after r1 and renamed before r2' | |
95 | hg diff --git -r -5:-1 |
|
95 | hg diff --git -r -5:-1 | |
96 |
|
96 | |||
97 | echo |
|
97 | echo | |
98 | echo '% comparing with the working dir' |
|
98 | echo '% comparing with the working dir' | |
99 | echo >> start |
|
99 | echo >> start | |
100 | hg ci -m 'change start again' -d '0 0' |
|
100 | hg ci -m 'change start again' -d '0 0' | |
101 |
|
101 | |||
102 | echo > created |
|
102 | echo > created | |
103 | hg add created |
|
103 | hg add created | |
104 | hg ci -m 'add created' |
|
104 | hg ci -m 'add created' | |
105 |
|
105 | |||
106 | hg mv created created2 |
|
106 | hg mv created created2 | |
107 | hg ci -m 'mv created created2' |
|
107 | hg ci -m 'mv created created2' | |
108 |
|
108 | |||
109 | hg mv created2 created3 |
|
109 | hg mv created2 created3 | |
110 | echo "% there's a copy in the working dir..." |
|
110 | echo "% there's a copy in the working dir..." | |
111 | hg diff --git |
|
111 | hg diff --git | |
112 | echo |
|
112 | echo | |
113 | echo "% ...but there's another copy between the original rev and the wd" |
|
113 | echo "% ...but there's another copy between the original rev and the wd" | |
114 | hg diff --git -r -2 |
|
114 | hg diff --git -r -2 | |
|
115 | echo | |||
|
116 | echo "% ...but the source of the copy was created after the original rev" | |||
|
117 | hg diff --git -r -3 | |||
|
118 | hg ci -m 'mv created2 created3' | |||
|
119 | ||||
|
120 | echo > brand-new | |||
|
121 | hg add brand-new | |||
|
122 | hg ci -m 'add brand-new' | |||
|
123 | hg mv brand-new brand-new2 | |||
|
124 | echo '% created in parent of wd; renamed in the wd' | |||
|
125 | hg diff --git | |||
|
126 | ||||
|
127 | echo | |||
|
128 | echo '% created between r1 and parent of wd; renamed in the wd' | |||
|
129 | hg diff --git -r -2 |
@@ -1,115 +1,135 b'' | |||||
1 | adding start |
|
1 | adding start | |
2 | adding new |
|
2 | adding new | |
3 | % new file |
|
3 | % new file | |
4 | diff --git a/new b/new |
|
4 | diff --git a/new b/new | |
5 | new file mode 100644 |
|
5 | new file mode 100644 | |
6 | --- /dev/null |
|
6 | --- /dev/null | |
7 | +++ b/new |
|
7 | +++ b/new | |
8 | @@ -0,0 +1,1 @@ |
|
8 | @@ -0,0 +1,1 @@ | |
9 | +new |
|
9 | +new | |
10 | % copy |
|
10 | % copy | |
11 | diff --git a/new b/copy |
|
11 | diff --git a/new b/copy | |
12 | copy from new |
|
12 | copy from new | |
13 | copy to copy |
|
13 | copy to copy | |
14 | % rename |
|
14 | % rename | |
15 | diff --git a/copy b/rename |
|
15 | diff --git a/copy b/rename | |
16 | rename from copy |
|
16 | rename from copy | |
17 | rename to rename |
|
17 | rename to rename | |
18 | % delete |
|
18 | % delete | |
19 | diff --git a/rename b/rename |
|
19 | diff --git a/rename b/rename | |
20 | deleted file mode 100644 |
|
20 | deleted file mode 100644 | |
21 | --- a/rename |
|
21 | --- a/rename | |
22 | +++ /dev/null |
|
22 | +++ /dev/null | |
23 | @@ -1,1 +0,0 @@ |
|
23 | @@ -1,1 +0,0 @@ | |
24 | -new |
|
24 | -new | |
25 | adding src |
|
25 | adding src | |
26 | % chmod 644 |
|
26 | % chmod 644 | |
27 | diff --git a/src b/src |
|
27 | diff --git a/src b/src | |
28 | old mode 100644 |
|
28 | old mode 100644 | |
29 | new mode 100755 |
|
29 | new mode 100755 | |
30 | % rename+mod+chmod |
|
30 | % rename+mod+chmod | |
31 | diff --git a/src b/dst |
|
31 | diff --git a/src b/dst | |
32 | old mode 100755 |
|
32 | old mode 100755 | |
33 | new mode 100644 |
|
33 | new mode 100644 | |
34 | rename from src |
|
34 | rename from src | |
35 | rename to dst |
|
35 | rename to dst | |
36 | --- a/dst |
|
36 | --- a/dst | |
37 | +++ b/dst |
|
37 | +++ b/dst | |
38 | @@ -3,3 +3,4 @@ 3 |
|
38 | @@ -3,3 +3,4 @@ 3 | |
39 | 3 |
|
39 | 3 | |
40 | 4 |
|
40 | 4 | |
41 | 5 |
|
41 | 5 | |
42 | +a |
|
42 | +a | |
43 | % nonexistent in tip+chmod |
|
43 | % nonexistent in tip+chmod | |
44 | diff --git a/src b/src |
|
44 | diff --git a/src b/src | |
45 | old mode 100644 |
|
45 | old mode 100644 | |
46 | new mode 100755 |
|
46 | new mode 100755 | |
47 | % binary diff |
|
47 | % binary diff | |
48 | diff --git a/binfile.bin b/binfile.bin |
|
48 | diff --git a/binfile.bin b/binfile.bin | |
49 | new file mode 100644 |
|
49 | new file mode 100644 | |
50 | index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9 |
|
50 | index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9 | |
51 | GIT binary patch |
|
51 | GIT binary patch | |
52 | literal 593 |
|
52 | literal 593 | |
53 | zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU |
|
53 | zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU | |
54 | z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd |
|
54 | z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd | |
55 | zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M |
|
55 | zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M | |
56 | z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT |
|
56 | z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT | |
57 | zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po |
|
57 | zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po | |
58 | ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<; |
|
58 | ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<; | |
59 | zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V |
|
59 | zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V | |
60 | z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W- |
|
60 | z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W- | |
61 | zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U; |
|
61 | zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U; | |
62 | z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K |
|
62 | z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K | |
63 | zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#= |
|
63 | zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#= | |
64 | fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4 |
|
64 | fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4 | |
65 |
|
65 | |||
66 | % import binary diff |
|
66 | % import binary diff | |
67 | applying b.diff |
|
67 | applying b.diff | |
68 |
|
68 | |||
69 | % diff across many revisions |
|
69 | % diff across many revisions | |
70 | diff --git a/dst2 b/dst3 |
|
70 | diff --git a/dst2 b/dst3 | |
71 | rename from dst2 |
|
71 | rename from dst2 | |
72 | rename to dst3 |
|
72 | rename to dst3 | |
73 |
|
73 | |||
74 | % file created before r1 and renamed before r2 |
|
74 | % file created before r1 and renamed before r2 | |
75 | diff --git a/foo b/bar |
|
75 | diff --git a/foo b/bar | |
76 | rename from foo |
|
76 | rename from foo | |
77 | rename to bar |
|
77 | rename to bar | |
78 | --- a/bar |
|
78 | --- a/bar | |
79 | +++ b/bar |
|
79 | +++ b/bar | |
80 | @@ -1,2 +1,3 @@ a |
|
80 | @@ -1,2 +1,3 @@ a | |
81 | a |
|
81 | a | |
82 | b |
|
82 | b | |
83 | +c |
|
83 | +c | |
84 |
|
84 | |||
85 | % file created in r1 and renamed before r2 |
|
85 | % file created in r1 and renamed before r2 | |
86 | diff --git a/foo b/bar |
|
86 | diff --git a/foo b/bar | |
87 | rename from foo |
|
87 | rename from foo | |
88 | rename to bar |
|
88 | rename to bar | |
89 | --- a/bar |
|
89 | --- a/bar | |
90 | +++ b/bar |
|
90 | +++ b/bar | |
91 | @@ -1,1 +1,3 @@ a |
|
91 | @@ -1,1 +1,3 @@ a | |
92 | a |
|
92 | a | |
93 | +b |
|
93 | +b | |
94 | +c |
|
94 | +c | |
95 |
|
95 | |||
96 | % file created after r1 and renamed before r2 |
|
96 | % file created after r1 and renamed before r2 | |
97 | diff --git a/bar b/bar |
|
97 | diff --git a/bar b/bar | |
98 | new file mode 100644 |
|
98 | new file mode 100644 | |
99 | --- /dev/null |
|
99 | --- /dev/null | |
100 | +++ b/bar |
|
100 | +++ b/bar | |
101 | @@ -0,0 +1,3 @@ |
|
101 | @@ -0,0 +1,3 @@ | |
102 | +a |
|
102 | +a | |
103 | +b |
|
103 | +b | |
104 | +c |
|
104 | +c | |
105 |
|
105 | |||
106 | % comparing with the working dir |
|
106 | % comparing with the working dir | |
107 | % there's a copy in the working dir... |
|
107 | % there's a copy in the working dir... | |
108 | diff --git a/created2 b/created3 |
|
108 | diff --git a/created2 b/created3 | |
109 | rename from created2 |
|
109 | rename from created2 | |
110 | rename to created3 |
|
110 | rename to created3 | |
111 |
|
111 | |||
112 | % ...but there's another copy between the original rev and the wd |
|
112 | % ...but there's another copy between the original rev and the wd | |
113 | diff --git a/created b/created3 |
|
113 | diff --git a/created b/created3 | |
114 | rename from created |
|
114 | rename from created | |
115 | rename to created3 |
|
115 | rename to created3 | |
|
116 | ||||
|
117 | % ...but the source of the copy was created after the original rev | |||
|
118 | diff --git a/created3 b/created3 | |||
|
119 | new file mode 100644 | |||
|
120 | --- /dev/null | |||
|
121 | +++ b/created3 | |||
|
122 | @@ -0,0 +1,1 @@ | |||
|
123 | + | |||
|
124 | % created in parent of wd; renamed in the wd | |||
|
125 | diff --git a/brand-new b/brand-new2 | |||
|
126 | rename from brand-new | |||
|
127 | rename to brand-new2 | |||
|
128 | ||||
|
129 | % created between r1 and parent of wd; renamed in the wd | |||
|
130 | diff --git a/brand-new2 b/brand-new2 | |||
|
131 | new file mode 100644 | |||
|
132 | --- /dev/null | |||
|
133 | +++ b/brand-new2 | |||
|
134 | @@ -0,0 +1,1 @@ | |||
|
135 | + |
General Comments 0
You need to be logged in to leave comments.
Login now