Show More
@@ -1,671 +1,671 b'' | |||
|
1 | 1 | # record.py |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | '''commands to interactively select changes for commit/qrefresh''' |
|
9 | 9 | |
|
10 | 10 | from mercurial.i18n import gettext, _ |
|
11 | 11 | from mercurial import cmdutil, commands, extensions, hg, mdiff, patch |
|
12 | 12 | from mercurial import util |
|
13 | 13 | import copy, cStringIO, errno, os, re, shutil, tempfile |
|
14 | 14 | |
|
15 | 15 | cmdtable = {} |
|
16 | 16 | command = cmdutil.command(cmdtable) |
|
17 | 17 | testedwith = 'internal' |
|
18 | 18 | |
|
19 | 19 | lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
|
20 | 20 | |
|
21 | 21 | diffopts = [ |
|
22 | 22 | ('w', 'ignore-all-space', False, |
|
23 | 23 | _('ignore white space when comparing lines')), |
|
24 | 24 | ('b', 'ignore-space-change', None, |
|
25 | 25 | _('ignore changes in the amount of white space')), |
|
26 | 26 | ('B', 'ignore-blank-lines', None, |
|
27 | 27 | _('ignore changes whose lines are all blank')), |
|
28 | 28 | ] |
|
29 | 29 | |
|
30 | 30 | def scanpatch(fp): |
|
31 | 31 | """like patch.iterhunks, but yield different events |
|
32 | 32 | |
|
33 | 33 | - ('file', [header_lines + fromfile + tofile]) |
|
34 | 34 | - ('context', [context_lines]) |
|
35 | 35 | - ('hunk', [hunk_lines]) |
|
36 | 36 | - ('range', (-start,len, +start,len, proc)) |
|
37 | 37 | """ |
|
38 | 38 | lr = patch.linereader(fp) |
|
39 | 39 | |
|
40 | 40 | def scanwhile(first, p): |
|
41 | 41 | """scan lr while predicate holds""" |
|
42 | 42 | lines = [first] |
|
43 | 43 | while True: |
|
44 | 44 | line = lr.readline() |
|
45 | 45 | if not line: |
|
46 | 46 | break |
|
47 | 47 | if p(line): |
|
48 | 48 | lines.append(line) |
|
49 | 49 | else: |
|
50 | 50 | lr.push(line) |
|
51 | 51 | break |
|
52 | 52 | return lines |
|
53 | 53 | |
|
54 | 54 | while True: |
|
55 | 55 | line = lr.readline() |
|
56 | 56 | if not line: |
|
57 | 57 | break |
|
58 | 58 | if line.startswith('diff --git a/') or line.startswith('diff -r '): |
|
59 | 59 | def notheader(line): |
|
60 | 60 | s = line.split(None, 1) |
|
61 | 61 | return not s or s[0] not in ('---', 'diff') |
|
62 | 62 | header = scanwhile(line, notheader) |
|
63 | 63 | fromfile = lr.readline() |
|
64 | 64 | if fromfile.startswith('---'): |
|
65 | 65 | tofile = lr.readline() |
|
66 | 66 | header += [fromfile, tofile] |
|
67 | 67 | else: |
|
68 | 68 | lr.push(fromfile) |
|
69 | 69 | yield 'file', header |
|
70 | 70 | elif line[0] == ' ': |
|
71 | 71 | yield 'context', scanwhile(line, lambda l: l[0] in ' \\') |
|
72 | 72 | elif line[0] in '-+': |
|
73 | 73 | yield 'hunk', scanwhile(line, lambda l: l[0] in '-+\\') |
|
74 | 74 | else: |
|
75 | 75 | m = lines_re.match(line) |
|
76 | 76 | if m: |
|
77 | 77 | yield 'range', m.groups() |
|
78 | 78 | else: |
|
79 | 79 | raise patch.PatchError('unknown patch content: %r' % line) |
|
80 | 80 | |
|
81 | 81 | class header(object): |
|
82 | 82 | """patch header |
|
83 | 83 | |
|
84 | 84 | XXX shouldn't we move this to mercurial/patch.py ? |
|
85 | 85 | """ |
|
86 | 86 | diffgit_re = re.compile('diff --git a/(.*) b/(.*)$') |
|
87 | 87 | diff_re = re.compile('diff -r .* (.*)$') |
|
88 | 88 | allhunks_re = re.compile('(?:index|new file|deleted file) ') |
|
89 | 89 | pretty_re = re.compile('(?:new file|deleted file) ') |
|
90 | 90 | special_re = re.compile('(?:index|new|deleted|copy|rename) ') |
|
91 | 91 | |
|
92 | 92 | def __init__(self, header): |
|
93 | 93 | self.header = header |
|
94 | 94 | self.hunks = [] |
|
95 | 95 | |
|
96 | 96 | def binary(self): |
|
97 | 97 | return util.any(h.startswith('index ') for h in self.header) |
|
98 | 98 | |
|
99 | 99 | def pretty(self, fp): |
|
100 | 100 | for h in self.header: |
|
101 | 101 | if h.startswith('index '): |
|
102 | 102 | fp.write(_('this modifies a binary file (all or nothing)\n')) |
|
103 | 103 | break |
|
104 | 104 | if self.pretty_re.match(h): |
|
105 | 105 | fp.write(h) |
|
106 | 106 | if self.binary(): |
|
107 | 107 | fp.write(_('this is a binary file\n')) |
|
108 | 108 | break |
|
109 | 109 | if h.startswith('---'): |
|
110 | 110 | fp.write(_('%d hunks, %d lines changed\n') % |
|
111 | 111 | (len(self.hunks), |
|
112 | 112 | sum([max(h.added, h.removed) for h in self.hunks]))) |
|
113 | 113 | break |
|
114 | 114 | fp.write(h) |
|
115 | 115 | |
|
116 | 116 | def write(self, fp): |
|
117 | 117 | fp.write(''.join(self.header)) |
|
118 | 118 | |
|
119 | 119 | def allhunks(self): |
|
120 | 120 | return util.any(self.allhunks_re.match(h) for h in self.header) |
|
121 | 121 | |
|
122 | 122 | def files(self): |
|
123 | 123 | match = self.diffgit_re.match(self.header[0]) |
|
124 | 124 | if match: |
|
125 | 125 | fromfile, tofile = match.groups() |
|
126 | 126 | if fromfile == tofile: |
|
127 | 127 | return [fromfile] |
|
128 | 128 | return [fromfile, tofile] |
|
129 | 129 | else: |
|
130 | 130 | return self.diff_re.match(self.header[0]).groups() |
|
131 | 131 | |
|
132 | 132 | def filename(self): |
|
133 | 133 | return self.files()[-1] |
|
134 | 134 | |
|
135 | 135 | def __repr__(self): |
|
136 | 136 | return '<header %s>' % (' '.join(map(repr, self.files()))) |
|
137 | 137 | |
|
138 | 138 | def special(self): |
|
139 | 139 | return util.any(self.special_re.match(h) for h in self.header) |
|
140 | 140 | |
|
141 | 141 | def countchanges(hunk): |
|
142 | 142 | """hunk -> (n+,n-)""" |
|
143 | 143 | add = len([h for h in hunk if h[0] == '+']) |
|
144 | 144 | rem = len([h for h in hunk if h[0] == '-']) |
|
145 | 145 | return add, rem |
|
146 | 146 | |
|
147 | 147 | class hunk(object): |
|
148 | 148 | """patch hunk |
|
149 | 149 | |
|
150 | 150 | XXX shouldn't we merge this with patch.hunk ? |
|
151 | 151 | """ |
|
152 | 152 | maxcontext = 3 |
|
153 | 153 | |
|
154 | 154 | def __init__(self, header, fromline, toline, proc, before, hunk, after): |
|
155 | 155 | def trimcontext(number, lines): |
|
156 | 156 | delta = len(lines) - self.maxcontext |
|
157 | 157 | if False and delta > 0: |
|
158 | 158 | return number + delta, lines[:self.maxcontext] |
|
159 | 159 | return number, lines |
|
160 | 160 | |
|
161 | 161 | self.header = header |
|
162 | 162 | self.fromline, self.before = trimcontext(fromline, before) |
|
163 | 163 | self.toline, self.after = trimcontext(toline, after) |
|
164 | 164 | self.proc = proc |
|
165 | 165 | self.hunk = hunk |
|
166 | 166 | self.added, self.removed = countchanges(self.hunk) |
|
167 | 167 | |
|
168 | 168 | def write(self, fp): |
|
169 | 169 | delta = len(self.before) + len(self.after) |
|
170 | 170 | if self.after and self.after[-1] == '\\ No newline at end of file\n': |
|
171 | 171 | delta -= 1 |
|
172 | 172 | fromlen = delta + self.removed |
|
173 | 173 | tolen = delta + self.added |
|
174 | 174 | fp.write('@@ -%d,%d +%d,%d @@%s\n' % |
|
175 | 175 | (self.fromline, fromlen, self.toline, tolen, |
|
176 | 176 | self.proc and (' ' + self.proc))) |
|
177 | 177 | fp.write(''.join(self.before + self.hunk + self.after)) |
|
178 | 178 | |
|
179 | 179 | pretty = write |
|
180 | 180 | |
|
181 | 181 | def filename(self): |
|
182 | 182 | return self.header.filename() |
|
183 | 183 | |
|
184 | 184 | def __repr__(self): |
|
185 | 185 | return '<hunk %r@%d>' % (self.filename(), self.fromline) |
|
186 | 186 | |
|
187 | 187 | def parsepatch(fp): |
|
188 | 188 | """patch -> [] of headers -> [] of hunks """ |
|
189 | 189 | class parser(object): |
|
190 | 190 | """patch parsing state machine""" |
|
191 | 191 | def __init__(self): |
|
192 | 192 | self.fromline = 0 |
|
193 | 193 | self.toline = 0 |
|
194 | 194 | self.proc = '' |
|
195 | 195 | self.header = None |
|
196 | 196 | self.context = [] |
|
197 | 197 | self.before = [] |
|
198 | 198 | self.hunk = [] |
|
199 | 199 | self.headers = [] |
|
200 | 200 | |
|
201 | 201 | def addrange(self, limits): |
|
202 | 202 | fromstart, fromend, tostart, toend, proc = limits |
|
203 | 203 | self.fromline = int(fromstart) |
|
204 | 204 | self.toline = int(tostart) |
|
205 | 205 | self.proc = proc |
|
206 | 206 | |
|
207 | 207 | def addcontext(self, context): |
|
208 | 208 | if self.hunk: |
|
209 | 209 | h = hunk(self.header, self.fromline, self.toline, self.proc, |
|
210 | 210 | self.before, self.hunk, context) |
|
211 | 211 | self.header.hunks.append(h) |
|
212 | 212 | self.fromline += len(self.before) + h.removed |
|
213 | 213 | self.toline += len(self.before) + h.added |
|
214 | 214 | self.before = [] |
|
215 | 215 | self.hunk = [] |
|
216 | 216 | self.proc = '' |
|
217 | 217 | self.context = context |
|
218 | 218 | |
|
219 | 219 | def addhunk(self, hunk): |
|
220 | 220 | if self.context: |
|
221 | 221 | self.before = self.context |
|
222 | 222 | self.context = [] |
|
223 | 223 | self.hunk = hunk |
|
224 | 224 | |
|
225 | 225 | def newfile(self, hdr): |
|
226 | 226 | self.addcontext([]) |
|
227 | 227 | h = header(hdr) |
|
228 | 228 | self.headers.append(h) |
|
229 | 229 | self.header = h |
|
230 | 230 | |
|
231 | 231 | def finished(self): |
|
232 | 232 | self.addcontext([]) |
|
233 | 233 | return self.headers |
|
234 | 234 | |
|
235 | 235 | transitions = { |
|
236 | 236 | 'file': {'context': addcontext, |
|
237 | 237 | 'file': newfile, |
|
238 | 238 | 'hunk': addhunk, |
|
239 | 239 | 'range': addrange}, |
|
240 | 240 | 'context': {'file': newfile, |
|
241 | 241 | 'hunk': addhunk, |
|
242 | 242 | 'range': addrange}, |
|
243 | 243 | 'hunk': {'context': addcontext, |
|
244 | 244 | 'file': newfile, |
|
245 | 245 | 'range': addrange}, |
|
246 | 246 | 'range': {'context': addcontext, |
|
247 | 247 | 'hunk': addhunk}, |
|
248 | 248 | } |
|
249 | 249 | |
|
250 | 250 | p = parser() |
|
251 | 251 | |
|
252 | 252 | state = 'context' |
|
253 | 253 | for newstate, data in scanpatch(fp): |
|
254 | 254 | try: |
|
255 | 255 | p.transitions[state][newstate](p, data) |
|
256 | 256 | except KeyError: |
|
257 | 257 | raise patch.PatchError('unhandled transition: %s -> %s' % |
|
258 | 258 | (state, newstate)) |
|
259 | 259 | state = newstate |
|
260 | 260 | return p.finished() |
|
261 | 261 | |
|
262 | 262 | def filterpatch(ui, headers): |
|
263 | 263 | """Interactively filter patch chunks into applied-only chunks""" |
|
264 | 264 | |
|
265 | 265 | def prompt(skipfile, skipall, query, chunk): |
|
266 | 266 | """prompt query, and process base inputs |
|
267 | 267 | |
|
268 | 268 | - y/n for the rest of file |
|
269 | 269 | - y/n for the rest |
|
270 | 270 | - ? (help) |
|
271 | 271 | - q (quit) |
|
272 | 272 | |
|
273 | 273 | Return True/False and possibly updated skipfile and skipall. |
|
274 | 274 | """ |
|
275 | 275 | newpatches = None |
|
276 | 276 | if skipall is not None: |
|
277 | 277 | return skipall, skipfile, skipall, newpatches |
|
278 | 278 | if skipfile is not None: |
|
279 | 279 | return skipfile, skipfile, skipall, newpatches |
|
280 | 280 | while True: |
|
281 | 281 | resps = _('[Ynesfdaq?]') |
|
282 | 282 | choices = (_('&Yes, record this change'), |
|
283 | 283 | _('&No, skip this change'), |
|
284 | 284 | _('&Edit the change manually'), |
|
285 | 285 | _('&Skip remaining changes to this file'), |
|
286 | 286 | _('Record remaining changes to this &file'), |
|
287 | 287 | _('&Done, skip remaining changes and files'), |
|
288 | 288 | _('Record &all changes to all remaining files'), |
|
289 | 289 | _('&Quit, recording no changes'), |
|
290 | 290 | _('&?')) |
|
291 | 291 | r = ui.promptchoice("%s %s" % (query, resps), choices) |
|
292 | 292 | ui.write("\n") |
|
293 | 293 | if r == 8: # ? |
|
294 | 294 | doc = gettext(record.__doc__) |
|
295 | 295 | c = doc.find('::') + 2 |
|
296 | 296 | for l in doc[c:].splitlines(): |
|
297 | 297 | if l.startswith(' '): |
|
298 | 298 | ui.write(l.strip(), '\n') |
|
299 | 299 | continue |
|
300 | 300 | elif r == 0: # yes |
|
301 | 301 | ret = True |
|
302 | 302 | elif r == 1: # no |
|
303 | 303 | ret = False |
|
304 | 304 | elif r == 2: # Edit patch |
|
305 | 305 | if chunk is None: |
|
306 | 306 | ui.write(_('cannot edit patch for whole file')) |
|
307 | 307 | ui.write("\n") |
|
308 | 308 | continue |
|
309 | 309 | if chunk.header.binary(): |
|
310 | 310 | ui.write(_('cannot edit patch for binary file')) |
|
311 | 311 | ui.write("\n") |
|
312 | 312 | continue |
|
313 | 313 | # Patch comment based on the Git one (based on comment at end of |
|
314 | 314 | # http://mercurial.selenic.com/wiki/RecordExtension) |
|
315 | 315 | phelp = '---' + _(""" |
|
316 | 316 | To remove '-' lines, make them ' ' lines (context). |
|
317 | 317 | To remove '+' lines, delete them. |
|
318 | 318 | Lines starting with # will be removed from the patch. |
|
319 | 319 | |
|
320 | 320 | If the patch applies cleanly, the edited hunk will immediately be |
|
321 | 321 | added to the record list. If it does not apply cleanly, a rejects |
|
322 | 322 | file will be generated: you can use that when you try again. If |
|
323 | 323 | all lines of the hunk are removed, then the edit is aborted and |
|
324 | 324 | the hunk is left unchanged. |
|
325 | 325 | """) |
|
326 | 326 | (patchfd, patchfn) = tempfile.mkstemp(prefix="hg-editor-", |
|
327 | 327 | suffix=".diff", text=True) |
|
328 | 328 | ncpatchfp = None |
|
329 | 329 | try: |
|
330 | 330 | # Write the initial patch |
|
331 | 331 | f = os.fdopen(patchfd, "w") |
|
332 | 332 | chunk.header.write(f) |
|
333 | 333 | chunk.write(f) |
|
334 | 334 | f.write('\n'.join(['# ' + i for i in phelp.splitlines()])) |
|
335 | 335 | f.close() |
|
336 | 336 | # Start the editor and wait for it to complete |
|
337 | 337 | editor = ui.geteditor() |
|
338 | 338 | util.system("%s \"%s\"" % (editor, patchfn), |
|
339 | 339 | environ={'HGUSER': ui.username()}, |
|
340 | 340 | onerr=util.Abort, errprefix=_("edit failed"), |
|
341 | 341 | out=ui.fout) |
|
342 | 342 | # Remove comment lines |
|
343 | 343 | patchfp = open(patchfn) |
|
344 | 344 | ncpatchfp = cStringIO.StringIO() |
|
345 | 345 | for line in patchfp: |
|
346 | 346 | if not line.startswith('#'): |
|
347 | 347 | ncpatchfp.write(line) |
|
348 | 348 | patchfp.close() |
|
349 | 349 | ncpatchfp.seek(0) |
|
350 | 350 | newpatches = parsepatch(ncpatchfp) |
|
351 | 351 | finally: |
|
352 | 352 | os.unlink(patchfn) |
|
353 | 353 | del ncpatchfp |
|
354 | 354 | # Signal that the chunk shouldn't be applied as-is, but |
|
355 | 355 | # provide the new patch to be used instead. |
|
356 | 356 | ret = False |
|
357 | 357 | elif r == 3: # Skip |
|
358 | 358 | ret = skipfile = False |
|
359 | 359 | elif r == 4: # file (Record remaining) |
|
360 | 360 | ret = skipfile = True |
|
361 | 361 | elif r == 5: # done, skip remaining |
|
362 | 362 | ret = skipall = False |
|
363 | 363 | elif r == 6: # all |
|
364 | 364 | ret = skipall = True |
|
365 | 365 | elif r == 7: # quit |
|
366 | 366 | raise util.Abort(_('user quit')) |
|
367 | 367 | return ret, skipfile, skipall, newpatches |
|
368 | 368 | |
|
369 | 369 | seen = set() |
|
370 | 370 | applied = {} # 'filename' -> [] of chunks |
|
371 | 371 | skipfile, skipall = None, None |
|
372 | 372 | pos, total = 1, sum(len(h.hunks) for h in headers) |
|
373 | 373 | for h in headers: |
|
374 | 374 | pos += len(h.hunks) |
|
375 | 375 | skipfile = None |
|
376 | 376 | fixoffset = 0 |
|
377 | 377 | hdr = ''.join(h.header) |
|
378 | 378 | if hdr in seen: |
|
379 | 379 | continue |
|
380 | 380 | seen.add(hdr) |
|
381 | 381 | if skipall is None: |
|
382 | 382 | h.pretty(ui) |
|
383 | 383 | msg = (_('examine changes to %s?') % |
|
384 | 384 | _(' and ').join("'%s'" % f for f in h.files())) |
|
385 | 385 | r, skipfile, skipall, np = prompt(skipfile, skipall, msg, None) |
|
386 | 386 | if not r: |
|
387 | 387 | continue |
|
388 | 388 | applied[h.filename()] = [h] |
|
389 | 389 | if h.allhunks(): |
|
390 | 390 | applied[h.filename()] += h.hunks |
|
391 | 391 | continue |
|
392 | 392 | for i, chunk in enumerate(h.hunks): |
|
393 | 393 | if skipfile is None and skipall is None: |
|
394 | 394 | chunk.pretty(ui) |
|
395 | 395 | if total == 1: |
|
396 | 396 | msg = _("record this change to '%s'?") % chunk.filename() |
|
397 | 397 | else: |
|
398 | 398 | idx = pos - len(h.hunks) + i |
|
399 | 399 | msg = _("record change %d/%d to '%s'?") % (idx, total, |
|
400 | 400 | chunk.filename()) |
|
401 | 401 | r, skipfile, skipall, newpatches = prompt(skipfile, |
|
402 | 402 | skipall, msg, chunk) |
|
403 | 403 | if r: |
|
404 | 404 | if fixoffset: |
|
405 | 405 | chunk = copy.copy(chunk) |
|
406 | 406 | chunk.toline += fixoffset |
|
407 | 407 | applied[chunk.filename()].append(chunk) |
|
408 | 408 | elif newpatches is not None: |
|
409 | 409 | for newpatch in newpatches: |
|
410 | 410 | for newhunk in newpatch.hunks: |
|
411 | 411 | if fixoffset: |
|
412 | 412 | newhunk.toline += fixoffset |
|
413 | 413 | applied[newhunk.filename()].append(newhunk) |
|
414 | 414 | else: |
|
415 | 415 | fixoffset += chunk.removed - chunk.added |
|
416 | 416 | return sum([h for h in applied.itervalues() |
|
417 | 417 | if h[0].special() or len(h) > 1], []) |
|
418 | 418 | |
|
419 | 419 | @command("record", |
|
420 | 420 | # same options as commit + white space diff options |
|
421 | 421 | commands.table['^commit|ci'][1][:] + diffopts, |
|
422 | 422 | _('hg record [OPTION]... [FILE]...')) |
|
423 | 423 | def record(ui, repo, *pats, **opts): |
|
424 | 424 | '''interactively select changes to commit |
|
425 | 425 | |
|
426 | 426 | If a list of files is omitted, all changes reported by :hg:`status` |
|
427 | 427 | will be candidates for recording. |
|
428 | 428 | |
|
429 | 429 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
430 | 430 | |
|
431 | 431 | You will be prompted for whether to record changes to each |
|
432 | 432 | modified file, and for files with multiple changes, for each |
|
433 | 433 | change to use. For each query, the following responses are |
|
434 | 434 | possible:: |
|
435 | 435 | |
|
436 | 436 | y - record this change |
|
437 | 437 | n - skip this change |
|
438 | 438 | e - edit this change manually |
|
439 | 439 | |
|
440 | 440 | s - skip remaining changes to this file |
|
441 | 441 | f - record remaining changes to this file |
|
442 | 442 | |
|
443 | 443 | d - done, skip remaining changes and files |
|
444 | 444 | a - record all changes to all remaining files |
|
445 | 445 | q - quit, recording no changes |
|
446 | 446 | |
|
447 | 447 | ? - display help |
|
448 | 448 | |
|
449 | 449 | This command is not available when committing a merge.''' |
|
450 | 450 | |
|
451 | 451 | dorecord(ui, repo, commands.commit, 'commit', False, *pats, **opts) |
|
452 | 452 | |
|
453 | 453 | def qrefresh(origfn, ui, repo, *pats, **opts): |
|
454 | 454 | if not opts['interactive']: |
|
455 | 455 | return origfn(ui, repo, *pats, **opts) |
|
456 | 456 | |
|
457 | 457 | mq = extensions.find('mq') |
|
458 | 458 | |
|
459 | 459 | def committomq(ui, repo, *pats, **opts): |
|
460 | 460 | # At this point the working copy contains only changes that |
|
461 | 461 | # were accepted. All other changes were reverted. |
|
462 | 462 | # We can't pass *pats here since qrefresh will undo all other |
|
463 | 463 | # changed files in the patch that aren't in pats. |
|
464 | 464 | mq.refresh(ui, repo, **opts) |
|
465 | 465 | |
|
466 | 466 | # backup all changed files |
|
467 | 467 | dorecord(ui, repo, committomq, 'qrefresh', True, *pats, **opts) |
|
468 | 468 | |
|
469 | 469 | def qrecord(ui, repo, patch, *pats, **opts): |
|
470 | 470 | '''interactively record a new patch |
|
471 | 471 | |
|
472 | 472 | See :hg:`help qnew` & :hg:`help record` for more information and |
|
473 | 473 | usage. |
|
474 | 474 | ''' |
|
475 | 475 | |
|
476 | 476 | try: |
|
477 | 477 | mq = extensions.find('mq') |
|
478 | 478 | except KeyError: |
|
479 | 479 | raise util.Abort(_("'mq' extension not loaded")) |
|
480 | 480 | |
|
481 | 481 | repo.mq.checkpatchname(patch) |
|
482 | 482 | |
|
483 | 483 | def committomq(ui, repo, *pats, **opts): |
|
484 | 484 | opts['checkname'] = False |
|
485 | 485 | mq.new(ui, repo, patch, *pats, **opts) |
|
486 | 486 | |
|
487 | 487 | dorecord(ui, repo, committomq, 'qnew', False, *pats, **opts) |
|
488 | 488 | |
|
489 | 489 | def qnew(origfn, ui, repo, patch, *args, **opts): |
|
490 | 490 | if opts['interactive']: |
|
491 | 491 | return qrecord(ui, repo, patch, *args, **opts) |
|
492 | 492 | return origfn(ui, repo, patch, *args, **opts) |
|
493 | 493 | |
|
494 | 494 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, *pats, **opts): |
|
495 | 495 | if not ui.interactive(): |
|
496 | 496 | raise util.Abort(_('running non-interactively, use %s instead') % |
|
497 | 497 | cmdsuggest) |
|
498 | 498 | |
|
499 | 499 | # make sure username is set before going interactive |
|
500 | 500 | ui.username() |
|
501 | 501 | |
|
502 | 502 | def recordfunc(ui, repo, message, match, opts): |
|
503 | 503 | """This is generic record driver. |
|
504 | 504 | |
|
505 | 505 | Its job is to interactively filter local changes, and |
|
506 | 506 | accordingly prepare working directory into a state in which the |
|
507 | 507 | job can be delegated to a non-interactive commit command such as |
|
508 | 508 | 'commit' or 'qrefresh'. |
|
509 | 509 | |
|
510 | 510 | After the actual job is done by non-interactive command, the |
|
511 | 511 | working directory is restored to its original state. |
|
512 | 512 | |
|
513 | 513 | In the end we'll record interesting changes, and everything else |
|
514 | 514 | will be left in place, so the user can continue working. |
|
515 | 515 | """ |
|
516 | 516 | |
|
517 | 517 | merge = len(repo[None].parents()) > 1 |
|
518 | 518 | if merge: |
|
519 | 519 | raise util.Abort(_('cannot partially commit a merge ' |
|
520 | 520 | '(use "hg commit" instead)')) |
|
521 | 521 | |
|
522 | 522 | changes = repo.status(match=match)[:3] |
|
523 |
diffopts = |
|
|
523 | diffopts = patch.diffopts(ui, opts=dict( | |
|
524 | 524 | git=True, nodates=True, |
|
525 | 525 | ignorews=opts.get('ignore_all_space'), |
|
526 | 526 | ignorewsamount=opts.get('ignore_space_change'), |
|
527 | ignoreblanklines=opts.get('ignore_blank_lines')) | |
|
527 | ignoreblanklines=opts.get('ignore_blank_lines'))) | |
|
528 | 528 | chunks = patch.diff(repo, changes=changes, opts=diffopts) |
|
529 | 529 | fp = cStringIO.StringIO() |
|
530 | 530 | fp.write(''.join(chunks)) |
|
531 | 531 | fp.seek(0) |
|
532 | 532 | |
|
533 | 533 | # 1. filter patch, so we have intending-to apply subset of it |
|
534 | 534 | chunks = filterpatch(ui, parsepatch(fp)) |
|
535 | 535 | del fp |
|
536 | 536 | |
|
537 | 537 | contenders = set() |
|
538 | 538 | for h in chunks: |
|
539 | 539 | try: |
|
540 | 540 | contenders.update(set(h.files())) |
|
541 | 541 | except AttributeError: |
|
542 | 542 | pass |
|
543 | 543 | |
|
544 | 544 | changed = changes[0] + changes[1] + changes[2] |
|
545 | 545 | newfiles = [f for f in changed if f in contenders] |
|
546 | 546 | if not newfiles: |
|
547 | 547 | ui.status(_('no changes to record\n')) |
|
548 | 548 | return 0 |
|
549 | 549 | |
|
550 | 550 | modified = set(changes[0]) |
|
551 | 551 | |
|
552 | 552 | # 2. backup changed files, so we can restore them in the end |
|
553 | 553 | if backupall: |
|
554 | 554 | tobackup = changed |
|
555 | 555 | else: |
|
556 | 556 | tobackup = [f for f in newfiles if f in modified] |
|
557 | 557 | |
|
558 | 558 | backups = {} |
|
559 | 559 | if tobackup: |
|
560 | 560 | backupdir = repo.join('record-backups') |
|
561 | 561 | try: |
|
562 | 562 | os.mkdir(backupdir) |
|
563 | 563 | except OSError, err: |
|
564 | 564 | if err.errno != errno.EEXIST: |
|
565 | 565 | raise |
|
566 | 566 | try: |
|
567 | 567 | # backup continues |
|
568 | 568 | for f in tobackup: |
|
569 | 569 | fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.', |
|
570 | 570 | dir=backupdir) |
|
571 | 571 | os.close(fd) |
|
572 | 572 | ui.debug('backup %r as %r\n' % (f, tmpname)) |
|
573 | 573 | util.copyfile(repo.wjoin(f), tmpname) |
|
574 | 574 | shutil.copystat(repo.wjoin(f), tmpname) |
|
575 | 575 | backups[f] = tmpname |
|
576 | 576 | |
|
577 | 577 | fp = cStringIO.StringIO() |
|
578 | 578 | for c in chunks: |
|
579 | 579 | if c.filename() in backups: |
|
580 | 580 | c.write(fp) |
|
581 | 581 | dopatch = fp.tell() |
|
582 | 582 | fp.seek(0) |
|
583 | 583 | |
|
584 | 584 | # 3a. apply filtered patch to clean repo (clean) |
|
585 | 585 | if backups: |
|
586 | 586 | hg.revert(repo, repo.dirstate.p1(), |
|
587 | 587 | lambda key: key in backups) |
|
588 | 588 | |
|
589 | 589 | # 3b. (apply) |
|
590 | 590 | if dopatch: |
|
591 | 591 | try: |
|
592 | 592 | ui.debug('applying patch\n') |
|
593 | 593 | ui.debug(fp.getvalue()) |
|
594 | 594 | patch.internalpatch(ui, repo, fp, 1, eolmode=None) |
|
595 | 595 | except patch.PatchError, err: |
|
596 | 596 | raise util.Abort(str(err)) |
|
597 | 597 | del fp |
|
598 | 598 | |
|
599 | 599 | # 4. We prepared working directory according to filtered |
|
600 | 600 | # patch. Now is the time to delegate the job to |
|
601 | 601 | # commit/qrefresh or the like! |
|
602 | 602 | |
|
603 | 603 | # it is important to first chdir to repo root -- we'll call |
|
604 | 604 | # a highlevel command with list of pathnames relative to |
|
605 | 605 | # repo root |
|
606 | 606 | cwd = os.getcwd() |
|
607 | 607 | os.chdir(repo.root) |
|
608 | 608 | try: |
|
609 | 609 | commitfunc(ui, repo, *newfiles, **opts) |
|
610 | 610 | finally: |
|
611 | 611 | os.chdir(cwd) |
|
612 | 612 | |
|
613 | 613 | return 0 |
|
614 | 614 | finally: |
|
615 | 615 | # 5. finally restore backed-up files |
|
616 | 616 | try: |
|
617 | 617 | for realname, tmpname in backups.iteritems(): |
|
618 | 618 | ui.debug('restoring %r to %r\n' % (tmpname, realname)) |
|
619 | 619 | util.copyfile(tmpname, repo.wjoin(realname)) |
|
620 | 620 | # Our calls to copystat() here and above are a |
|
621 | 621 | # hack to trick any editors that have f open that |
|
622 | 622 | # we haven't modified them. |
|
623 | 623 | # |
|
624 | 624 | # Also note that this racy as an editor could |
|
625 | 625 | # notice the file's mtime before we've finished |
|
626 | 626 | # writing it. |
|
627 | 627 | shutil.copystat(tmpname, repo.wjoin(realname)) |
|
628 | 628 | os.unlink(tmpname) |
|
629 | 629 | if tobackup: |
|
630 | 630 | os.rmdir(backupdir) |
|
631 | 631 | except OSError: |
|
632 | 632 | pass |
|
633 | 633 | |
|
634 | 634 | # wrap ui.write so diff output can be labeled/colorized |
|
635 | 635 | def wrapwrite(orig, *args, **kw): |
|
636 | 636 | label = kw.pop('label', '') |
|
637 | 637 | for chunk, l in patch.difflabel(lambda: args): |
|
638 | 638 | orig(chunk, label=label + l) |
|
639 | 639 | oldwrite = ui.write |
|
640 | 640 | extensions.wrapfunction(ui, 'write', wrapwrite) |
|
641 | 641 | try: |
|
642 | 642 | return cmdutil.commit(ui, repo, recordfunc, pats, opts) |
|
643 | 643 | finally: |
|
644 | 644 | ui.write = oldwrite |
|
645 | 645 | |
|
646 | 646 | cmdtable["qrecord"] = \ |
|
647 | 647 | (qrecord, [], # placeholder until mq is available |
|
648 | 648 | _('hg qrecord [OPTION]... PATCH [FILE]...')) |
|
649 | 649 | |
|
650 | 650 | def uisetup(ui): |
|
651 | 651 | try: |
|
652 | 652 | mq = extensions.find('mq') |
|
653 | 653 | except KeyError: |
|
654 | 654 | return |
|
655 | 655 | |
|
656 | 656 | cmdtable["qrecord"] = \ |
|
657 | 657 | (qrecord, |
|
658 | 658 | # same options as qnew, but copy them so we don't get |
|
659 | 659 | # -i/--interactive for qrecord and add white space diff options |
|
660 | 660 | mq.cmdtable['^qnew'][1][:] + diffopts, |
|
661 | 661 | _('hg qrecord [OPTION]... PATCH [FILE]...')) |
|
662 | 662 | |
|
663 | 663 | _wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch")) |
|
664 | 664 | _wrapcmd('qrefresh', mq.cmdtable, qrefresh, |
|
665 | 665 | _("interactively select changes to refresh")) |
|
666 | 666 | |
|
667 | 667 | def _wrapcmd(cmd, table, wrapfn, msg): |
|
668 | 668 | entry = extensions.wrapcommand(table, cmd, wrapfn) |
|
669 | 669 | entry[1].append(('i', 'interactive', None, msg)) |
|
670 | 670 | |
|
671 | 671 | commands.inferrepo += " record qrecord" |
@@ -1,1230 +1,1230 b'' | |||
|
1 | 1 | Set up a repo |
|
2 | 2 | |
|
3 | 3 | $ echo "[ui]" >> $HGRCPATH |
|
4 | 4 | $ echo "interactive=true" >> $HGRCPATH |
|
5 | 5 | $ echo "[extensions]" >> $HGRCPATH |
|
6 | 6 | $ echo "record=" >> $HGRCPATH |
|
7 | 7 | |
|
8 | 8 | $ hg init a |
|
9 | 9 | $ cd a |
|
10 | 10 | |
|
11 | 11 | Select no files |
|
12 | 12 | |
|
13 | 13 | $ touch empty-rw |
|
14 | 14 | $ hg add empty-rw |
|
15 | 15 | |
|
16 | 16 | $ hg record empty-rw<<EOF |
|
17 | 17 | > n |
|
18 | 18 | > EOF |
|
19 | 19 | diff --git a/empty-rw b/empty-rw |
|
20 | 20 | new file mode 100644 |
|
21 | 21 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
22 | 22 | no changes to record |
|
23 | 23 | |
|
24 | 24 | $ hg tip -p |
|
25 | 25 | changeset: -1:000000000000 |
|
26 | 26 | tag: tip |
|
27 | 27 | user: |
|
28 | 28 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
29 | 29 | |
|
30 | 30 | |
|
31 | 31 | |
|
32 | 32 | Select files but no hunks |
|
33 | 33 | |
|
34 | 34 | $ hg record empty-rw<<EOF |
|
35 | 35 | > y |
|
36 | 36 | > n |
|
37 | 37 | > EOF |
|
38 | 38 | diff --git a/empty-rw b/empty-rw |
|
39 | 39 | new file mode 100644 |
|
40 | 40 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
41 | 41 | abort: empty commit message |
|
42 | 42 | [255] |
|
43 | 43 | |
|
44 | 44 | $ hg tip -p |
|
45 | 45 | changeset: -1:000000000000 |
|
46 | 46 | tag: tip |
|
47 | 47 | user: |
|
48 | 48 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
49 | 49 | |
|
50 | 50 | |
|
51 | 51 | |
|
52 | 52 | Record empty file |
|
53 | 53 | |
|
54 | 54 | $ hg record -d '0 0' -m empty empty-rw<<EOF |
|
55 | 55 | > y |
|
56 | 56 | > y |
|
57 | 57 | > EOF |
|
58 | 58 | diff --git a/empty-rw b/empty-rw |
|
59 | 59 | new file mode 100644 |
|
60 | 60 | examine changes to 'empty-rw'? [Ynesfdaq?] |
|
61 | 61 | |
|
62 | 62 | $ hg tip -p |
|
63 | 63 | changeset: 0:c0708cf4e46e |
|
64 | 64 | tag: tip |
|
65 | 65 | user: test |
|
66 | 66 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
67 | 67 | summary: empty |
|
68 | 68 | |
|
69 | 69 | |
|
70 | 70 | |
|
71 | 71 | Summary shows we updated to the new cset |
|
72 | 72 | |
|
73 | 73 | $ hg summary |
|
74 | 74 | parent: 0:c0708cf4e46e tip |
|
75 | 75 | empty |
|
76 | 76 | branch: default |
|
77 | 77 | commit: (clean) |
|
78 | 78 | update: (current) |
|
79 | 79 | |
|
80 | 80 | Rename empty file |
|
81 | 81 | |
|
82 | 82 | $ hg mv empty-rw empty-rename |
|
83 | 83 | $ hg record -d '1 0' -m rename<<EOF |
|
84 | 84 | > y |
|
85 | 85 | > EOF |
|
86 | 86 | diff --git a/empty-rw b/empty-rename |
|
87 | 87 | rename from empty-rw |
|
88 | 88 | rename to empty-rename |
|
89 | 89 | examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] |
|
90 | 90 | |
|
91 | 91 | $ hg tip -p |
|
92 | 92 | changeset: 1:d695e8dcb197 |
|
93 | 93 | tag: tip |
|
94 | 94 | user: test |
|
95 | 95 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
96 | 96 | summary: rename |
|
97 | 97 | |
|
98 | 98 | |
|
99 | 99 | |
|
100 | 100 | Copy empty file |
|
101 | 101 | |
|
102 | 102 | $ hg cp empty-rename empty-copy |
|
103 | 103 | $ hg record -d '2 0' -m copy<<EOF |
|
104 | 104 | > y |
|
105 | 105 | > EOF |
|
106 | 106 | diff --git a/empty-rename b/empty-copy |
|
107 | 107 | copy from empty-rename |
|
108 | 108 | copy to empty-copy |
|
109 | 109 | examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] |
|
110 | 110 | |
|
111 | 111 | $ hg tip -p |
|
112 | 112 | changeset: 2:1d4b90bea524 |
|
113 | 113 | tag: tip |
|
114 | 114 | user: test |
|
115 | 115 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
116 | 116 | summary: copy |
|
117 | 117 | |
|
118 | 118 | |
|
119 | 119 | |
|
120 | 120 | Delete empty file |
|
121 | 121 | |
|
122 | 122 | $ hg rm empty-copy |
|
123 | 123 | $ hg record -d '3 0' -m delete<<EOF |
|
124 | 124 | > y |
|
125 | 125 | > EOF |
|
126 | 126 | diff --git a/empty-copy b/empty-copy |
|
127 | 127 | deleted file mode 100644 |
|
128 | 128 | examine changes to 'empty-copy'? [Ynesfdaq?] |
|
129 | 129 | |
|
130 | 130 | $ hg tip -p |
|
131 | 131 | changeset: 3:b39a238f01a1 |
|
132 | 132 | tag: tip |
|
133 | 133 | user: test |
|
134 | 134 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
135 | 135 | summary: delete |
|
136 | 136 | |
|
137 | 137 | |
|
138 | 138 | |
|
139 | 139 | Add binary file |
|
140 | 140 | |
|
141 | 141 | $ hg bundle --base -2 tip.bundle |
|
142 | 142 | 1 changesets found |
|
143 | 143 | $ hg add tip.bundle |
|
144 | 144 | $ hg record -d '4 0' -m binary<<EOF |
|
145 | 145 | > y |
|
146 | 146 | > EOF |
|
147 | 147 | diff --git a/tip.bundle b/tip.bundle |
|
148 | 148 | new file mode 100644 |
|
149 | 149 | this is a binary file |
|
150 | 150 | examine changes to 'tip.bundle'? [Ynesfdaq?] |
|
151 | 151 | |
|
152 | 152 | $ hg tip -p |
|
153 | 153 | changeset: 4:ad816da3711e |
|
154 | 154 | tag: tip |
|
155 | 155 | user: test |
|
156 | 156 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
157 | 157 | summary: binary |
|
158 | 158 | |
|
159 | 159 | diff -r b39a238f01a1 -r ad816da3711e tip.bundle |
|
160 | 160 | Binary file tip.bundle has changed |
|
161 | 161 | |
|
162 | 162 | |
|
163 | 163 | Change binary file |
|
164 | 164 | |
|
165 | 165 | $ hg bundle --base -2 tip.bundle |
|
166 | 166 | 1 changesets found |
|
167 | 167 | $ hg record -d '5 0' -m binary-change<<EOF |
|
168 | 168 | > y |
|
169 | 169 | > EOF |
|
170 | 170 | diff --git a/tip.bundle b/tip.bundle |
|
171 | 171 | this modifies a binary file (all or nothing) |
|
172 | 172 | examine changes to 'tip.bundle'? [Ynesfdaq?] |
|
173 | 173 | |
|
174 | 174 | $ hg tip -p |
|
175 | 175 | changeset: 5:dccd6f3eb485 |
|
176 | 176 | tag: tip |
|
177 | 177 | user: test |
|
178 | 178 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
179 | 179 | summary: binary-change |
|
180 | 180 | |
|
181 | 181 | diff -r ad816da3711e -r dccd6f3eb485 tip.bundle |
|
182 | 182 | Binary file tip.bundle has changed |
|
183 | 183 | |
|
184 | 184 | |
|
185 | 185 | Rename and change binary file |
|
186 | 186 | |
|
187 | 187 | $ hg mv tip.bundle top.bundle |
|
188 | 188 | $ hg bundle --base -2 top.bundle |
|
189 | 189 | 1 changesets found |
|
190 | 190 | $ hg record -d '6 0' -m binary-change-rename<<EOF |
|
191 | 191 | > y |
|
192 | 192 | > EOF |
|
193 | 193 | diff --git a/tip.bundle b/top.bundle |
|
194 | 194 | rename from tip.bundle |
|
195 | 195 | rename to top.bundle |
|
196 | 196 | this modifies a binary file (all or nothing) |
|
197 | 197 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] |
|
198 | 198 | |
|
199 | 199 | $ hg tip -p |
|
200 | 200 | changeset: 6:7fa44105f5b3 |
|
201 | 201 | tag: tip |
|
202 | 202 | user: test |
|
203 | 203 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
204 | 204 | summary: binary-change-rename |
|
205 | 205 | |
|
206 | 206 | diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle |
|
207 | 207 | Binary file tip.bundle has changed |
|
208 | 208 | diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle |
|
209 | 209 | Binary file top.bundle has changed |
|
210 | 210 | |
|
211 | 211 | |
|
212 | 212 | Add plain file |
|
213 | 213 | |
|
214 | 214 | $ for i in 1 2 3 4 5 6 7 8 9 10; do |
|
215 | 215 | > echo $i >> plain |
|
216 | 216 | > done |
|
217 | 217 | |
|
218 | 218 | $ hg add plain |
|
219 | 219 | $ hg record -d '7 0' -m plain plain<<EOF |
|
220 | 220 | > y |
|
221 | 221 | > y |
|
222 | 222 | > EOF |
|
223 | 223 | diff --git a/plain b/plain |
|
224 | 224 | new file mode 100644 |
|
225 | 225 | examine changes to 'plain'? [Ynesfdaq?] |
|
226 | 226 | |
|
227 | 227 | $ hg tip -p |
|
228 | 228 | changeset: 7:11fb457c1be4 |
|
229 | 229 | tag: tip |
|
230 | 230 | user: test |
|
231 | 231 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
232 | 232 | summary: plain |
|
233 | 233 | |
|
234 | 234 | diff -r 7fa44105f5b3 -r 11fb457c1be4 plain |
|
235 | 235 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
236 | 236 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
237 | 237 | @@ -0,0 +1,10 @@ |
|
238 | 238 | +1 |
|
239 | 239 | +2 |
|
240 | 240 | +3 |
|
241 | 241 | +4 |
|
242 | 242 | +5 |
|
243 | 243 | +6 |
|
244 | 244 | +7 |
|
245 | 245 | +8 |
|
246 | 246 | +9 |
|
247 | 247 | +10 |
|
248 | 248 | |
|
249 | 249 | Modify end of plain file with username unset |
|
250 | 250 | |
|
251 | 251 | $ echo 11 >> plain |
|
252 | 252 | $ unset HGUSER |
|
253 | 253 | $ hg record --config ui.username= -d '8 0' -m end plain |
|
254 | 254 | abort: no username supplied (see "hg help config") |
|
255 | 255 | [255] |
|
256 | 256 | |
|
257 | 257 | |
|
258 | Modify end of plain file | |
|
258 | Modify end of plain file, also test that diffopts are accounted for | |
|
259 | 259 | |
|
260 | 260 | $ HGUSER="test" |
|
261 | 261 | $ export HGUSER |
|
262 | $ hg record -d '8 0' -m end plain <<EOF | |
|
262 | $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF | |
|
263 | 263 | > y |
|
264 | 264 | > y |
|
265 | 265 | > EOF |
|
266 | 266 | diff --git a/plain b/plain |
|
267 | 267 | 1 hunks, 1 lines changed |
|
268 | 268 | examine changes to 'plain'? [Ynesfdaq?] |
|
269 | @@ -8,3 +8,4 @@ | |
|
269 | @@ -8,3 +8,4 @@ 7 | |
|
270 | 270 | 8 |
|
271 | 271 | 9 |
|
272 | 272 | 10 |
|
273 | 273 | +11 |
|
274 | 274 | record this change to 'plain'? [Ynesfdaq?] |
|
275 | 275 | |
|
276 | 276 | Modify end of plain file, no EOL |
|
277 | 277 | |
|
278 | 278 | $ hg tip --template '{node}' >> plain |
|
279 | 279 | $ hg record -d '9 0' -m noeol plain <<EOF |
|
280 | 280 | > y |
|
281 | 281 | > y |
|
282 | 282 | > EOF |
|
283 | 283 | diff --git a/plain b/plain |
|
284 | 284 | 1 hunks, 1 lines changed |
|
285 | 285 | examine changes to 'plain'? [Ynesfdaq?] |
|
286 | 286 | @@ -9,3 +9,4 @@ |
|
287 | 287 | 9 |
|
288 | 288 | 10 |
|
289 | 289 | 11 |
|
290 | 290 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
291 | 291 | \ No newline at end of file |
|
292 | 292 | record this change to 'plain'? [Ynesfdaq?] |
|
293 | 293 | |
|
294 | 294 | Modify end of plain file, add EOL |
|
295 | 295 | |
|
296 | 296 | $ echo >> plain |
|
297 | 297 | $ echo 1 > plain2 |
|
298 | 298 | $ hg add plain2 |
|
299 | 299 | $ hg record -d '10 0' -m eol plain plain2 <<EOF |
|
300 | 300 | > y |
|
301 | 301 | > y |
|
302 | 302 | > y |
|
303 | 303 | > EOF |
|
304 | 304 | diff --git a/plain b/plain |
|
305 | 305 | 1 hunks, 1 lines changed |
|
306 | 306 | examine changes to 'plain'? [Ynesfdaq?] |
|
307 | 307 | @@ -9,4 +9,4 @@ |
|
308 | 308 | 9 |
|
309 | 309 | 10 |
|
310 | 310 | 11 |
|
311 | 311 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
312 | 312 | \ No newline at end of file |
|
313 | 313 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
314 | 314 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
315 | 315 | diff --git a/plain2 b/plain2 |
|
316 | 316 | new file mode 100644 |
|
317 | 317 | examine changes to 'plain2'? [Ynesfdaq?] |
|
318 | 318 | |
|
319 | 319 | Modify beginning, trim end, record both, add another file to test |
|
320 | 320 | changes numbering |
|
321 | 321 | |
|
322 | 322 | $ rm plain |
|
323 | 323 | $ for i in 2 2 3 4 5 6 7 8 9 10; do |
|
324 | 324 | > echo $i >> plain |
|
325 | 325 | > done |
|
326 | 326 | $ echo 2 >> plain2 |
|
327 | 327 | |
|
328 | 328 | $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF |
|
329 | 329 | > y |
|
330 | 330 | > y |
|
331 | 331 | > y |
|
332 | 332 | > y |
|
333 | 333 | > y |
|
334 | 334 | > EOF |
|
335 | 335 | diff --git a/plain b/plain |
|
336 | 336 | 2 hunks, 3 lines changed |
|
337 | 337 | examine changes to 'plain'? [Ynesfdaq?] |
|
338 | 338 | @@ -1,4 +1,4 @@ |
|
339 | 339 | -1 |
|
340 | 340 | +2 |
|
341 | 341 | 2 |
|
342 | 342 | 3 |
|
343 | 343 | 4 |
|
344 | 344 | record change 1/3 to 'plain'? [Ynesfdaq?] |
|
345 | 345 | @@ -8,5 +8,3 @@ |
|
346 | 346 | 8 |
|
347 | 347 | 9 |
|
348 | 348 | 10 |
|
349 | 349 | -11 |
|
350 | 350 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
351 | 351 | record change 2/3 to 'plain'? [Ynesfdaq?] |
|
352 | 352 | diff --git a/plain2 b/plain2 |
|
353 | 353 | 1 hunks, 1 lines changed |
|
354 | 354 | examine changes to 'plain2'? [Ynesfdaq?] |
|
355 | 355 | @@ -1,1 +1,2 @@ |
|
356 | 356 | 1 |
|
357 | 357 | +2 |
|
358 | 358 | record change 3/3 to 'plain2'? [Ynesfdaq?] |
|
359 | 359 | |
|
360 | 360 | $ hg tip -p |
|
361 | 361 | changeset: 11:21df83db12b8 |
|
362 | 362 | tag: tip |
|
363 | 363 | user: test |
|
364 | 364 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
365 | 365 | summary: begin-and-end |
|
366 | 366 | |
|
367 | 367 | diff -r ddb8b281c3ff -r 21df83db12b8 plain |
|
368 | 368 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
369 | 369 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
370 | 370 | @@ -1,4 +1,4 @@ |
|
371 | 371 | -1 |
|
372 | 372 | +2 |
|
373 | 373 | 2 |
|
374 | 374 | 3 |
|
375 | 375 | 4 |
|
376 | 376 | @@ -8,5 +8,3 @@ |
|
377 | 377 | 8 |
|
378 | 378 | 9 |
|
379 | 379 | 10 |
|
380 | 380 | -11 |
|
381 | 381 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
382 | 382 | diff -r ddb8b281c3ff -r 21df83db12b8 plain2 |
|
383 | 383 | --- a/plain2 Thu Jan 01 00:00:10 1970 +0000 |
|
384 | 384 | +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000 |
|
385 | 385 | @@ -1,1 +1,2 @@ |
|
386 | 386 | 1 |
|
387 | 387 | +2 |
|
388 | 388 | |
|
389 | 389 | |
|
390 | 390 | Trim beginning, modify end |
|
391 | 391 | |
|
392 | 392 | $ rm plain |
|
393 | 393 | > for i in 4 5 6 7 8 9 10.new; do |
|
394 | 394 | > echo $i >> plain |
|
395 | 395 | > done |
|
396 | 396 | |
|
397 | 397 | Record end |
|
398 | 398 | |
|
399 | 399 | $ hg record -d '11 0' -m end-only plain <<EOF |
|
400 | 400 | > y |
|
401 | 401 | > n |
|
402 | 402 | > y |
|
403 | 403 | > EOF |
|
404 | 404 | diff --git a/plain b/plain |
|
405 | 405 | 2 hunks, 4 lines changed |
|
406 | 406 | examine changes to 'plain'? [Ynesfdaq?] |
|
407 | 407 | @@ -1,9 +1,6 @@ |
|
408 | 408 | -2 |
|
409 | 409 | -2 |
|
410 | 410 | -3 |
|
411 | 411 | 4 |
|
412 | 412 | 5 |
|
413 | 413 | 6 |
|
414 | 414 | 7 |
|
415 | 415 | 8 |
|
416 | 416 | 9 |
|
417 | 417 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
418 | 418 | @@ -4,7 +1,7 @@ |
|
419 | 419 | 4 |
|
420 | 420 | 5 |
|
421 | 421 | 6 |
|
422 | 422 | 7 |
|
423 | 423 | 8 |
|
424 | 424 | 9 |
|
425 | 425 | -10 |
|
426 | 426 | +10.new |
|
427 | 427 | record change 2/2 to 'plain'? [Ynesfdaq?] |
|
428 | 428 | |
|
429 | 429 | $ hg tip -p |
|
430 | 430 | changeset: 12:99337501826f |
|
431 | 431 | tag: tip |
|
432 | 432 | user: test |
|
433 | 433 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
434 | 434 | summary: end-only |
|
435 | 435 | |
|
436 | 436 | diff -r 21df83db12b8 -r 99337501826f plain |
|
437 | 437 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
438 | 438 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
439 | 439 | @@ -7,4 +7,4 @@ |
|
440 | 440 | 7 |
|
441 | 441 | 8 |
|
442 | 442 | 9 |
|
443 | 443 | -10 |
|
444 | 444 | +10.new |
|
445 | 445 | |
|
446 | 446 | |
|
447 | 447 | Record beginning |
|
448 | 448 | |
|
449 | 449 | $ hg record -d '12 0' -m begin-only plain <<EOF |
|
450 | 450 | > y |
|
451 | 451 | > y |
|
452 | 452 | > EOF |
|
453 | 453 | diff --git a/plain b/plain |
|
454 | 454 | 1 hunks, 3 lines changed |
|
455 | 455 | examine changes to 'plain'? [Ynesfdaq?] |
|
456 | 456 | @@ -1,6 +1,3 @@ |
|
457 | 457 | -2 |
|
458 | 458 | -2 |
|
459 | 459 | -3 |
|
460 | 460 | 4 |
|
461 | 461 | 5 |
|
462 | 462 | 6 |
|
463 | 463 | record this change to 'plain'? [Ynesfdaq?] |
|
464 | 464 | |
|
465 | 465 | $ hg tip -p |
|
466 | 466 | changeset: 13:bbd45465d540 |
|
467 | 467 | tag: tip |
|
468 | 468 | user: test |
|
469 | 469 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
470 | 470 | summary: begin-only |
|
471 | 471 | |
|
472 | 472 | diff -r 99337501826f -r bbd45465d540 plain |
|
473 | 473 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
474 | 474 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
475 | 475 | @@ -1,6 +1,3 @@ |
|
476 | 476 | -2 |
|
477 | 477 | -2 |
|
478 | 478 | -3 |
|
479 | 479 | 4 |
|
480 | 480 | 5 |
|
481 | 481 | 6 |
|
482 | 482 | |
|
483 | 483 | |
|
484 | 484 | Add to beginning, trim from end |
|
485 | 485 | |
|
486 | 486 | $ rm plain |
|
487 | 487 | $ for i in 1 2 3 4 5 6 7 8 9; do |
|
488 | 488 | > echo $i >> plain |
|
489 | 489 | > done |
|
490 | 490 | |
|
491 | 491 | Record end |
|
492 | 492 | |
|
493 | 493 | $ hg record --traceback -d '13 0' -m end-again plain<<EOF |
|
494 | 494 | > y |
|
495 | 495 | > n |
|
496 | 496 | > y |
|
497 | 497 | > EOF |
|
498 | 498 | diff --git a/plain b/plain |
|
499 | 499 | 2 hunks, 4 lines changed |
|
500 | 500 | examine changes to 'plain'? [Ynesfdaq?] |
|
501 | 501 | @@ -1,6 +1,9 @@ |
|
502 | 502 | +1 |
|
503 | 503 | +2 |
|
504 | 504 | +3 |
|
505 | 505 | 4 |
|
506 | 506 | 5 |
|
507 | 507 | 6 |
|
508 | 508 | 7 |
|
509 | 509 | 8 |
|
510 | 510 | 9 |
|
511 | 511 | record change 1/2 to 'plain'? [Ynesfdaq?] |
|
512 | 512 | @@ -1,7 +4,6 @@ |
|
513 | 513 | 4 |
|
514 | 514 | 5 |
|
515 | 515 | 6 |
|
516 | 516 | 7 |
|
517 | 517 | 8 |
|
518 | 518 | 9 |
|
519 | 519 | -10.new |
|
520 | 520 | record change 2/2 to 'plain'? [Ynesfdaq?] |
|
521 | 521 | |
|
522 | 522 | Add to beginning, middle, end |
|
523 | 523 | |
|
524 | 524 | $ rm plain |
|
525 | 525 | $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do |
|
526 | 526 | > echo $i >> plain |
|
527 | 527 | > done |
|
528 | 528 | |
|
529 | 529 | Record beginning, middle |
|
530 | 530 | |
|
531 | 531 | $ hg record -d '14 0' -m middle-only plain <<EOF |
|
532 | 532 | > y |
|
533 | 533 | > y |
|
534 | 534 | > y |
|
535 | 535 | > n |
|
536 | 536 | > EOF |
|
537 | 537 | diff --git a/plain b/plain |
|
538 | 538 | 3 hunks, 7 lines changed |
|
539 | 539 | examine changes to 'plain'? [Ynesfdaq?] |
|
540 | 540 | @@ -1,2 +1,5 @@ |
|
541 | 541 | +1 |
|
542 | 542 | +2 |
|
543 | 543 | +3 |
|
544 | 544 | 4 |
|
545 | 545 | 5 |
|
546 | 546 | record change 1/3 to 'plain'? [Ynesfdaq?] |
|
547 | 547 | @@ -1,6 +4,8 @@ |
|
548 | 548 | 4 |
|
549 | 549 | 5 |
|
550 | 550 | +5.new |
|
551 | 551 | +5.reallynew |
|
552 | 552 | 6 |
|
553 | 553 | 7 |
|
554 | 554 | 8 |
|
555 | 555 | 9 |
|
556 | 556 | record change 2/3 to 'plain'? [Ynesfdaq?] |
|
557 | 557 | @@ -3,4 +8,6 @@ |
|
558 | 558 | 6 |
|
559 | 559 | 7 |
|
560 | 560 | 8 |
|
561 | 561 | 9 |
|
562 | 562 | +10 |
|
563 | 563 | +11 |
|
564 | 564 | record change 3/3 to 'plain'? [Ynesfdaq?] |
|
565 | 565 | |
|
566 | 566 | $ hg tip -p |
|
567 | 567 | changeset: 15:f34a7937ec33 |
|
568 | 568 | tag: tip |
|
569 | 569 | user: test |
|
570 | 570 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
571 | 571 | summary: middle-only |
|
572 | 572 | |
|
573 | 573 | diff -r 82c065d0b850 -r f34a7937ec33 plain |
|
574 | 574 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
575 | 575 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
576 | 576 | @@ -1,5 +1,10 @@ |
|
577 | 577 | +1 |
|
578 | 578 | +2 |
|
579 | 579 | +3 |
|
580 | 580 | 4 |
|
581 | 581 | 5 |
|
582 | 582 | +5.new |
|
583 | 583 | +5.reallynew |
|
584 | 584 | 6 |
|
585 | 585 | 7 |
|
586 | 586 | 8 |
|
587 | 587 | |
|
588 | 588 | |
|
589 | 589 | Record end |
|
590 | 590 | |
|
591 | 591 | $ hg record -d '15 0' -m end-only plain <<EOF |
|
592 | 592 | > y |
|
593 | 593 | > y |
|
594 | 594 | > EOF |
|
595 | 595 | diff --git a/plain b/plain |
|
596 | 596 | 1 hunks, 2 lines changed |
|
597 | 597 | examine changes to 'plain'? [Ynesfdaq?] |
|
598 | 598 | @@ -9,3 +9,5 @@ |
|
599 | 599 | 7 |
|
600 | 600 | 8 |
|
601 | 601 | 9 |
|
602 | 602 | +10 |
|
603 | 603 | +11 |
|
604 | 604 | record this change to 'plain'? [Ynesfdaq?] |
|
605 | 605 | |
|
606 | 606 | $ hg tip -p |
|
607 | 607 | changeset: 16:f9900b71a04c |
|
608 | 608 | tag: tip |
|
609 | 609 | user: test |
|
610 | 610 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
611 | 611 | summary: end-only |
|
612 | 612 | |
|
613 | 613 | diff -r f34a7937ec33 -r f9900b71a04c plain |
|
614 | 614 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
615 | 615 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
616 | 616 | @@ -9,3 +9,5 @@ |
|
617 | 617 | 7 |
|
618 | 618 | 8 |
|
619 | 619 | 9 |
|
620 | 620 | +10 |
|
621 | 621 | +11 |
|
622 | 622 | |
|
623 | 623 | |
|
624 | 624 | $ mkdir subdir |
|
625 | 625 | $ cd subdir |
|
626 | 626 | $ echo a > a |
|
627 | 627 | $ hg ci -d '16 0' -Amsubdir |
|
628 | 628 | adding subdir/a |
|
629 | 629 | |
|
630 | 630 | $ echo a >> a |
|
631 | 631 | $ hg record -d '16 0' -m subdir-change a <<EOF |
|
632 | 632 | > y |
|
633 | 633 | > y |
|
634 | 634 | > EOF |
|
635 | 635 | diff --git a/subdir/a b/subdir/a |
|
636 | 636 | 1 hunks, 1 lines changed |
|
637 | 637 | examine changes to 'subdir/a'? [Ynesfdaq?] |
|
638 | 638 | @@ -1,1 +1,2 @@ |
|
639 | 639 | a |
|
640 | 640 | +a |
|
641 | 641 | record this change to 'subdir/a'? [Ynesfdaq?] |
|
642 | 642 | |
|
643 | 643 | $ hg tip -p |
|
644 | 644 | changeset: 18:61be427a9deb |
|
645 | 645 | tag: tip |
|
646 | 646 | user: test |
|
647 | 647 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
648 | 648 | summary: subdir-change |
|
649 | 649 | |
|
650 | 650 | diff -r a7ffae4d61cb -r 61be427a9deb subdir/a |
|
651 | 651 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
652 | 652 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
653 | 653 | @@ -1,1 +1,2 @@ |
|
654 | 654 | a |
|
655 | 655 | +a |
|
656 | 656 | |
|
657 | 657 | |
|
658 | 658 | $ echo a > f1 |
|
659 | 659 | $ echo b > f2 |
|
660 | 660 | $ hg add f1 f2 |
|
661 | 661 | |
|
662 | 662 | $ hg ci -mz -d '17 0' |
|
663 | 663 | |
|
664 | 664 | $ echo a >> f1 |
|
665 | 665 | $ echo b >> f2 |
|
666 | 666 | |
|
667 | 667 | Help, quit |
|
668 | 668 | |
|
669 | 669 | $ hg record <<EOF |
|
670 | 670 | > ? |
|
671 | 671 | > q |
|
672 | 672 | > EOF |
|
673 | 673 | diff --git a/subdir/f1 b/subdir/f1 |
|
674 | 674 | 1 hunks, 1 lines changed |
|
675 | 675 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
676 | 676 | y - record this change |
|
677 | 677 | n - skip this change |
|
678 | 678 | e - edit this change manually |
|
679 | 679 | s - skip remaining changes to this file |
|
680 | 680 | f - record remaining changes to this file |
|
681 | 681 | d - done, skip remaining changes and files |
|
682 | 682 | a - record all changes to all remaining files |
|
683 | 683 | q - quit, recording no changes |
|
684 | 684 | ? - display help |
|
685 | 685 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
686 | 686 | abort: user quit |
|
687 | 687 | [255] |
|
688 | 688 | |
|
689 | 689 | Skip |
|
690 | 690 | |
|
691 | 691 | $ hg record <<EOF |
|
692 | 692 | > s |
|
693 | 693 | > EOF |
|
694 | 694 | diff --git a/subdir/f1 b/subdir/f1 |
|
695 | 695 | 1 hunks, 1 lines changed |
|
696 | 696 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
697 | 697 | diff --git a/subdir/f2 b/subdir/f2 |
|
698 | 698 | 1 hunks, 1 lines changed |
|
699 | 699 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
|
700 | 700 | [255] |
|
701 | 701 | |
|
702 | 702 | No |
|
703 | 703 | |
|
704 | 704 | $ hg record <<EOF |
|
705 | 705 | > n |
|
706 | 706 | > EOF |
|
707 | 707 | diff --git a/subdir/f1 b/subdir/f1 |
|
708 | 708 | 1 hunks, 1 lines changed |
|
709 | 709 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
710 | 710 | diff --git a/subdir/f2 b/subdir/f2 |
|
711 | 711 | 1 hunks, 1 lines changed |
|
712 | 712 | examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
|
713 | 713 | [255] |
|
714 | 714 | |
|
715 | 715 | f, quit |
|
716 | 716 | |
|
717 | 717 | $ hg record <<EOF |
|
718 | 718 | > f |
|
719 | 719 | > q |
|
720 | 720 | > EOF |
|
721 | 721 | diff --git a/subdir/f1 b/subdir/f1 |
|
722 | 722 | 1 hunks, 1 lines changed |
|
723 | 723 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
724 | 724 | diff --git a/subdir/f2 b/subdir/f2 |
|
725 | 725 | 1 hunks, 1 lines changed |
|
726 | 726 | examine changes to 'subdir/f2'? [Ynesfdaq?] |
|
727 | 727 | abort: user quit |
|
728 | 728 | [255] |
|
729 | 729 | |
|
730 | 730 | s, all |
|
731 | 731 | |
|
732 | 732 | $ hg record -d '18 0' -mx <<EOF |
|
733 | 733 | > s |
|
734 | 734 | > a |
|
735 | 735 | > EOF |
|
736 | 736 | diff --git a/subdir/f1 b/subdir/f1 |
|
737 | 737 | 1 hunks, 1 lines changed |
|
738 | 738 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
739 | 739 | diff --git a/subdir/f2 b/subdir/f2 |
|
740 | 740 | 1 hunks, 1 lines changed |
|
741 | 741 | examine changes to 'subdir/f2'? [Ynesfdaq?] |
|
742 | 742 | |
|
743 | 743 | $ hg tip -p |
|
744 | 744 | changeset: 20:b3df3dda369a |
|
745 | 745 | tag: tip |
|
746 | 746 | user: test |
|
747 | 747 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
748 | 748 | summary: x |
|
749 | 749 | |
|
750 | 750 | diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2 |
|
751 | 751 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
752 | 752 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
753 | 753 | @@ -1,1 +1,2 @@ |
|
754 | 754 | b |
|
755 | 755 | +b |
|
756 | 756 | |
|
757 | 757 | |
|
758 | 758 | f |
|
759 | 759 | |
|
760 | 760 | $ hg record -d '19 0' -my <<EOF |
|
761 | 761 | > f |
|
762 | 762 | > EOF |
|
763 | 763 | diff --git a/subdir/f1 b/subdir/f1 |
|
764 | 764 | 1 hunks, 1 lines changed |
|
765 | 765 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
766 | 766 | |
|
767 | 767 | $ hg tip -p |
|
768 | 768 | changeset: 21:38ec577f126b |
|
769 | 769 | tag: tip |
|
770 | 770 | user: test |
|
771 | 771 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
772 | 772 | summary: y |
|
773 | 773 | |
|
774 | 774 | diff -r b3df3dda369a -r 38ec577f126b subdir/f1 |
|
775 | 775 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
776 | 776 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
777 | 777 | @@ -1,1 +1,2 @@ |
|
778 | 778 | a |
|
779 | 779 | +a |
|
780 | 780 | |
|
781 | 781 | |
|
782 | 782 | #if execbit |
|
783 | 783 | |
|
784 | 784 | Preserve chmod +x |
|
785 | 785 | |
|
786 | 786 | $ chmod +x f1 |
|
787 | 787 | $ echo a >> f1 |
|
788 | 788 | $ hg record -d '20 0' -mz <<EOF |
|
789 | 789 | > y |
|
790 | 790 | > y |
|
791 | 791 | > y |
|
792 | 792 | > EOF |
|
793 | 793 | diff --git a/subdir/f1 b/subdir/f1 |
|
794 | 794 | old mode 100644 |
|
795 | 795 | new mode 100755 |
|
796 | 796 | 1 hunks, 1 lines changed |
|
797 | 797 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
798 | 798 | @@ -1,2 +1,3 @@ |
|
799 | 799 | a |
|
800 | 800 | a |
|
801 | 801 | +a |
|
802 | 802 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
803 | 803 | |
|
804 | 804 | $ hg tip --config diff.git=True -p |
|
805 | 805 | changeset: 22:3261adceb075 |
|
806 | 806 | tag: tip |
|
807 | 807 | user: test |
|
808 | 808 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
809 | 809 | summary: z |
|
810 | 810 | |
|
811 | 811 | diff --git a/subdir/f1 b/subdir/f1 |
|
812 | 812 | old mode 100644 |
|
813 | 813 | new mode 100755 |
|
814 | 814 | --- a/subdir/f1 |
|
815 | 815 | +++ b/subdir/f1 |
|
816 | 816 | @@ -1,2 +1,3 @@ |
|
817 | 817 | a |
|
818 | 818 | a |
|
819 | 819 | +a |
|
820 | 820 | |
|
821 | 821 | |
|
822 | 822 | Preserve execute permission on original |
|
823 | 823 | |
|
824 | 824 | $ echo b >> f1 |
|
825 | 825 | $ hg record -d '21 0' -maa <<EOF |
|
826 | 826 | > y |
|
827 | 827 | > y |
|
828 | 828 | > y |
|
829 | 829 | > EOF |
|
830 | 830 | diff --git a/subdir/f1 b/subdir/f1 |
|
831 | 831 | 1 hunks, 1 lines changed |
|
832 | 832 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
833 | 833 | @@ -1,3 +1,4 @@ |
|
834 | 834 | a |
|
835 | 835 | a |
|
836 | 836 | a |
|
837 | 837 | +b |
|
838 | 838 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
839 | 839 | |
|
840 | 840 | $ hg tip --config diff.git=True -p |
|
841 | 841 | changeset: 23:b429867550db |
|
842 | 842 | tag: tip |
|
843 | 843 | user: test |
|
844 | 844 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
845 | 845 | summary: aa |
|
846 | 846 | |
|
847 | 847 | diff --git a/subdir/f1 b/subdir/f1 |
|
848 | 848 | --- a/subdir/f1 |
|
849 | 849 | +++ b/subdir/f1 |
|
850 | 850 | @@ -1,3 +1,4 @@ |
|
851 | 851 | a |
|
852 | 852 | a |
|
853 | 853 | a |
|
854 | 854 | +b |
|
855 | 855 | |
|
856 | 856 | |
|
857 | 857 | Preserve chmod -x |
|
858 | 858 | |
|
859 | 859 | $ chmod -x f1 |
|
860 | 860 | $ echo c >> f1 |
|
861 | 861 | $ hg record -d '22 0' -mab <<EOF |
|
862 | 862 | > y |
|
863 | 863 | > y |
|
864 | 864 | > y |
|
865 | 865 | > EOF |
|
866 | 866 | diff --git a/subdir/f1 b/subdir/f1 |
|
867 | 867 | old mode 100755 |
|
868 | 868 | new mode 100644 |
|
869 | 869 | 1 hunks, 1 lines changed |
|
870 | 870 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
871 | 871 | @@ -2,3 +2,4 @@ |
|
872 | 872 | a |
|
873 | 873 | a |
|
874 | 874 | b |
|
875 | 875 | +c |
|
876 | 876 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
877 | 877 | |
|
878 | 878 | $ hg tip --config diff.git=True -p |
|
879 | 879 | changeset: 24:0b082130c20a |
|
880 | 880 | tag: tip |
|
881 | 881 | user: test |
|
882 | 882 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
883 | 883 | summary: ab |
|
884 | 884 | |
|
885 | 885 | diff --git a/subdir/f1 b/subdir/f1 |
|
886 | 886 | old mode 100755 |
|
887 | 887 | new mode 100644 |
|
888 | 888 | --- a/subdir/f1 |
|
889 | 889 | +++ b/subdir/f1 |
|
890 | 890 | @@ -2,3 +2,4 @@ |
|
891 | 891 | a |
|
892 | 892 | a |
|
893 | 893 | b |
|
894 | 894 | +c |
|
895 | 895 | |
|
896 | 896 | |
|
897 | 897 | #else |
|
898 | 898 | |
|
899 | 899 | Slightly bogus tests to get almost same repo structure as when x bit is used |
|
900 | 900 | - but with different hashes. |
|
901 | 901 | |
|
902 | 902 | Mock "Preserve chmod +x" |
|
903 | 903 | |
|
904 | 904 | $ echo a >> f1 |
|
905 | 905 | $ hg record -d '20 0' -mz <<EOF |
|
906 | 906 | > y |
|
907 | 907 | > y |
|
908 | 908 | > y |
|
909 | 909 | > EOF |
|
910 | 910 | diff --git a/subdir/f1 b/subdir/f1 |
|
911 | 911 | 1 hunks, 1 lines changed |
|
912 | 912 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
913 | 913 | @@ -1,2 +1,3 @@ |
|
914 | 914 | a |
|
915 | 915 | a |
|
916 | 916 | +a |
|
917 | 917 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
918 | 918 | |
|
919 | 919 | $ hg tip --config diff.git=True -p |
|
920 | 920 | changeset: 22:0d463bd428f5 |
|
921 | 921 | tag: tip |
|
922 | 922 | user: test |
|
923 | 923 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
924 | 924 | summary: z |
|
925 | 925 | |
|
926 | 926 | diff --git a/subdir/f1 b/subdir/f1 |
|
927 | 927 | --- a/subdir/f1 |
|
928 | 928 | +++ b/subdir/f1 |
|
929 | 929 | @@ -1,2 +1,3 @@ |
|
930 | 930 | a |
|
931 | 931 | a |
|
932 | 932 | +a |
|
933 | 933 | |
|
934 | 934 | |
|
935 | 935 | Mock "Preserve execute permission on original" |
|
936 | 936 | |
|
937 | 937 | $ echo b >> f1 |
|
938 | 938 | $ hg record -d '21 0' -maa <<EOF |
|
939 | 939 | > y |
|
940 | 940 | > y |
|
941 | 941 | > y |
|
942 | 942 | > EOF |
|
943 | 943 | diff --git a/subdir/f1 b/subdir/f1 |
|
944 | 944 | 1 hunks, 1 lines changed |
|
945 | 945 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
946 | 946 | @@ -1,3 +1,4 @@ |
|
947 | 947 | a |
|
948 | 948 | a |
|
949 | 949 | a |
|
950 | 950 | +b |
|
951 | 951 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
952 | 952 | |
|
953 | 953 | $ hg tip --config diff.git=True -p |
|
954 | 954 | changeset: 23:0eab41a3e524 |
|
955 | 955 | tag: tip |
|
956 | 956 | user: test |
|
957 | 957 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
958 | 958 | summary: aa |
|
959 | 959 | |
|
960 | 960 | diff --git a/subdir/f1 b/subdir/f1 |
|
961 | 961 | --- a/subdir/f1 |
|
962 | 962 | +++ b/subdir/f1 |
|
963 | 963 | @@ -1,3 +1,4 @@ |
|
964 | 964 | a |
|
965 | 965 | a |
|
966 | 966 | a |
|
967 | 967 | +b |
|
968 | 968 | |
|
969 | 969 | |
|
970 | 970 | Mock "Preserve chmod -x" |
|
971 | 971 | |
|
972 | 972 | $ chmod -x f1 |
|
973 | 973 | $ echo c >> f1 |
|
974 | 974 | $ hg record -d '22 0' -mab <<EOF |
|
975 | 975 | > y |
|
976 | 976 | > y |
|
977 | 977 | > y |
|
978 | 978 | > EOF |
|
979 | 979 | diff --git a/subdir/f1 b/subdir/f1 |
|
980 | 980 | 1 hunks, 1 lines changed |
|
981 | 981 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
982 | 982 | @@ -2,3 +2,4 @@ |
|
983 | 983 | a |
|
984 | 984 | a |
|
985 | 985 | b |
|
986 | 986 | +c |
|
987 | 987 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
988 | 988 | |
|
989 | 989 | $ hg tip --config diff.git=True -p |
|
990 | 990 | changeset: 24:f4f718f27b7c |
|
991 | 991 | tag: tip |
|
992 | 992 | user: test |
|
993 | 993 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
994 | 994 | summary: ab |
|
995 | 995 | |
|
996 | 996 | diff --git a/subdir/f1 b/subdir/f1 |
|
997 | 997 | --- a/subdir/f1 |
|
998 | 998 | +++ b/subdir/f1 |
|
999 | 999 | @@ -2,3 +2,4 @@ |
|
1000 | 1000 | a |
|
1001 | 1001 | a |
|
1002 | 1002 | b |
|
1003 | 1003 | +c |
|
1004 | 1004 | |
|
1005 | 1005 | |
|
1006 | 1006 | #endif |
|
1007 | 1007 | |
|
1008 | 1008 | $ cd .. |
|
1009 | 1009 | |
|
1010 | 1010 | |
|
1011 | 1011 | Abort early when a merge is in progress |
|
1012 | 1012 | |
|
1013 | 1013 | $ hg up 4 |
|
1014 | 1014 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
1015 | 1015 | |
|
1016 | 1016 | $ touch iwillmergethat |
|
1017 | 1017 | $ hg add iwillmergethat |
|
1018 | 1018 | |
|
1019 | 1019 | $ hg branch thatbranch |
|
1020 | 1020 | marked working directory as branch thatbranch |
|
1021 | 1021 | (branches are permanent and global, did you want a bookmark?) |
|
1022 | 1022 | |
|
1023 | 1023 | $ hg ci -m'new head' |
|
1024 | 1024 | |
|
1025 | 1025 | $ hg up default |
|
1026 | 1026 | 6 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1027 | 1027 | |
|
1028 | 1028 | $ hg merge thatbranch |
|
1029 | 1029 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1030 | 1030 | (branch merge, don't forget to commit) |
|
1031 | 1031 | |
|
1032 | 1032 | $ hg record -m'will abort' |
|
1033 | 1033 | abort: cannot partially commit a merge (use "hg commit" instead) |
|
1034 | 1034 | [255] |
|
1035 | 1035 | |
|
1036 | 1036 | $ hg up -C |
|
1037 | 1037 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1038 | 1038 | |
|
1039 | 1039 | Editing patch |
|
1040 | 1040 | |
|
1041 | 1041 | $ cat > editor.sh << '__EOF__' |
|
1042 | 1042 | > sed -e 7d -e '5s/^-/ /' "$1" > tmp |
|
1043 | 1043 | > mv tmp "$1" |
|
1044 | 1044 | > __EOF__ |
|
1045 | 1045 | $ cat > editedfile << '__EOF__' |
|
1046 | 1046 | > This is the first line |
|
1047 | 1047 | > This is the second line |
|
1048 | 1048 | > This is the third line |
|
1049 | 1049 | > __EOF__ |
|
1050 | 1050 | $ hg add editedfile |
|
1051 | 1051 | $ hg commit -medit-patch-1 |
|
1052 | 1052 | $ cat > editedfile << '__EOF__' |
|
1053 | 1053 | > This line has changed |
|
1054 | 1054 | > This change will be committed |
|
1055 | 1055 | > This is the third line |
|
1056 | 1056 | > __EOF__ |
|
1057 | 1057 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-2 <<EOF |
|
1058 | 1058 | > y |
|
1059 | 1059 | > e |
|
1060 | 1060 | > EOF |
|
1061 | 1061 | diff --git a/editedfile b/editedfile |
|
1062 | 1062 | 1 hunks, 2 lines changed |
|
1063 | 1063 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1064 | 1064 | @@ -1,3 +1,3 @@ |
|
1065 | 1065 | -This is the first line |
|
1066 | 1066 | -This is the second line |
|
1067 | 1067 | +This line has changed |
|
1068 | 1068 | +This change will be committed |
|
1069 | 1069 | This is the third line |
|
1070 | 1070 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1071 | 1071 | $ cat editedfile |
|
1072 | 1072 | This line has changed |
|
1073 | 1073 | This change will be committed |
|
1074 | 1074 | This is the third line |
|
1075 | 1075 | $ hg cat -r tip editedfile |
|
1076 | 1076 | This is the first line |
|
1077 | 1077 | This change will be committed |
|
1078 | 1078 | This is the third line |
|
1079 | 1079 | $ hg revert editedfile |
|
1080 | 1080 | |
|
1081 | 1081 | Trying to edit patch for whole file |
|
1082 | 1082 | |
|
1083 | 1083 | $ echo "This is the fourth line" >> editedfile |
|
1084 | 1084 | $ hg record <<EOF |
|
1085 | 1085 | > e |
|
1086 | 1086 | > q |
|
1087 | 1087 | > EOF |
|
1088 | 1088 | diff --git a/editedfile b/editedfile |
|
1089 | 1089 | 1 hunks, 1 lines changed |
|
1090 | 1090 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1091 | 1091 | cannot edit patch for whole file |
|
1092 | 1092 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1093 | 1093 | abort: user quit |
|
1094 | 1094 | [255] |
|
1095 | 1095 | $ hg revert editedfile |
|
1096 | 1096 | |
|
1097 | 1097 | Removing changes from patch |
|
1098 | 1098 | |
|
1099 | 1099 | $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
|
1100 | 1100 | $ mv tmp editedfile |
|
1101 | 1101 | $ echo "This line has been added" >> editedfile |
|
1102 | 1102 | $ cat > editor.sh << '__EOF__' |
|
1103 | 1103 | > sed -e 's/^[-+]/ /' "$1" > tmp |
|
1104 | 1104 | > mv tmp "$1" |
|
1105 | 1105 | > __EOF__ |
|
1106 | 1106 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
|
1107 | 1107 | > y |
|
1108 | 1108 | > e |
|
1109 | 1109 | > EOF |
|
1110 | 1110 | diff --git a/editedfile b/editedfile |
|
1111 | 1111 | 1 hunks, 3 lines changed |
|
1112 | 1112 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1113 | 1113 | @@ -1,3 +1,3 @@ |
|
1114 | 1114 | -This is the first line |
|
1115 | 1115 | -This change will be committed |
|
1116 | 1116 | -This is the third line |
|
1117 | 1117 | +This change will not be committed |
|
1118 | 1118 | +This is the second line |
|
1119 | 1119 | +This line has been added |
|
1120 | 1120 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1121 | 1121 | no changes to record |
|
1122 | 1122 | $ cat editedfile |
|
1123 | 1123 | This change will not be committed |
|
1124 | 1124 | This is the second line |
|
1125 | 1125 | This line has been added |
|
1126 | 1126 | $ hg cat -r tip editedfile |
|
1127 | 1127 | This is the first line |
|
1128 | 1128 | This change will be committed |
|
1129 | 1129 | This is the third line |
|
1130 | 1130 | $ hg revert editedfile |
|
1131 | 1131 | |
|
1132 | 1132 | Invalid patch |
|
1133 | 1133 | |
|
1134 | 1134 | $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
|
1135 | 1135 | $ mv tmp editedfile |
|
1136 | 1136 | $ echo "This line has been added" >> editedfile |
|
1137 | 1137 | $ cat > editor.sh << '__EOF__' |
|
1138 | 1138 | > sed s/This/That/ "$1" > tmp |
|
1139 | 1139 | > mv tmp "$1" |
|
1140 | 1140 | > __EOF__ |
|
1141 | 1141 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF |
|
1142 | 1142 | > y |
|
1143 | 1143 | > e |
|
1144 | 1144 | > EOF |
|
1145 | 1145 | diff --git a/editedfile b/editedfile |
|
1146 | 1146 | 1 hunks, 3 lines changed |
|
1147 | 1147 | examine changes to 'editedfile'? [Ynesfdaq?] |
|
1148 | 1148 | @@ -1,3 +1,3 @@ |
|
1149 | 1149 | -This is the first line |
|
1150 | 1150 | -This change will be committed |
|
1151 | 1151 | -This is the third line |
|
1152 | 1152 | +This change will not be committed |
|
1153 | 1153 | +This is the second line |
|
1154 | 1154 | +This line has been added |
|
1155 | 1155 | record this change to 'editedfile'? [Ynesfdaq?] |
|
1156 | 1156 | patching file editedfile |
|
1157 | 1157 | Hunk #1 FAILED at 0 |
|
1158 | 1158 | 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej |
|
1159 | 1159 | abort: patch failed to apply |
|
1160 | 1160 | [255] |
|
1161 | 1161 | $ cat editedfile |
|
1162 | 1162 | This change will not be committed |
|
1163 | 1163 | This is the second line |
|
1164 | 1164 | This line has been added |
|
1165 | 1165 | $ hg cat -r tip editedfile |
|
1166 | 1166 | This is the first line |
|
1167 | 1167 | This change will be committed |
|
1168 | 1168 | This is the third line |
|
1169 | 1169 | $ cat editedfile.rej |
|
1170 | 1170 | --- editedfile |
|
1171 | 1171 | +++ editedfile |
|
1172 | 1172 | @@ -1,3 +1,3 @@ |
|
1173 | 1173 | -That is the first line |
|
1174 | 1174 | -That change will be committed |
|
1175 | 1175 | -That is the third line |
|
1176 | 1176 | +That change will not be committed |
|
1177 | 1177 | +That is the second line |
|
1178 | 1178 | +That line has been added |
|
1179 | 1179 | $ hg up -C |
|
1180 | 1180 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1181 | 1181 | |
|
1182 | 1182 | With win32text |
|
1183 | 1183 | |
|
1184 | 1184 | $ echo '[extensions]' >> .hg/hgrc |
|
1185 | 1185 | $ echo 'win32text = ' >> .hg/hgrc |
|
1186 | 1186 | $ echo '[decode]' >> .hg/hgrc |
|
1187 | 1187 | $ echo '** = cleverdecode:' >> .hg/hgrc |
|
1188 | 1188 | $ echo '[encode]' >> .hg/hgrc |
|
1189 | 1189 | $ echo '** = cleverencode:' >> .hg/hgrc |
|
1190 | 1190 | $ echo '[patch]' >> .hg/hgrc |
|
1191 | 1191 | $ echo 'eol = crlf' >> .hg/hgrc |
|
1192 | 1192 | |
|
1193 | 1193 | Ignore win32text deprecation warning for now: |
|
1194 | 1194 | |
|
1195 | 1195 | $ echo '[win32text]' >> .hg/hgrc |
|
1196 | 1196 | $ echo 'warn = no' >> .hg/hgrc |
|
1197 | 1197 | |
|
1198 | 1198 | $ echo d >> subdir/f1 |
|
1199 | 1199 | $ hg record -d '24 0' -mw1 <<EOF |
|
1200 | 1200 | > y |
|
1201 | 1201 | > y |
|
1202 | 1202 | > EOF |
|
1203 | 1203 | diff --git a/subdir/f1 b/subdir/f1 |
|
1204 | 1204 | 1 hunks, 1 lines changed |
|
1205 | 1205 | examine changes to 'subdir/f1'? [Ynesfdaq?] |
|
1206 | 1206 | @@ -3,3 +3,4 @@ |
|
1207 | 1207 | a |
|
1208 | 1208 | b |
|
1209 | 1209 | c |
|
1210 | 1210 | +d |
|
1211 | 1211 | record this change to 'subdir/f1'? [Ynesfdaq?] |
|
1212 | 1212 | |
|
1213 | 1213 | $ hg tip -p |
|
1214 | 1214 | changeset: 28:* (glob) |
|
1215 | 1215 | tag: tip |
|
1216 | 1216 | user: test |
|
1217 | 1217 | date: Thu Jan 01 00:00:24 1970 +0000 |
|
1218 | 1218 | summary: w1 |
|
1219 | 1219 | |
|
1220 | 1220 | diff -r ???????????? -r ???????????? subdir/f1 (glob) |
|
1221 | 1221 | --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
1222 | 1222 | +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000 |
|
1223 | 1223 | @@ -3,3 +3,4 @@ |
|
1224 | 1224 | a |
|
1225 | 1225 | b |
|
1226 | 1226 | c |
|
1227 | 1227 | +d |
|
1228 | 1228 | |
|
1229 | 1229 | |
|
1230 | 1230 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now