##// END OF EJS Templates
rename: add hint about --at-rev if source file doesn't exist...
Martin von Zweigbergk -
r47897:5ffc6c18 default
parent child Browse files
Show More
@@ -1,3928 +1,3931 b''
1 1 # cmdutil.py - help for command processing in mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.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 from __future__ import absolute_import
9 9
10 10 import copy as copymod
11 11 import errno
12 12 import os
13 13 import re
14 14
15 15 from .i18n import _
16 16 from .node import (
17 17 hex,
18 18 nullrev,
19 19 short,
20 20 )
21 21 from .pycompat import (
22 22 getattr,
23 23 open,
24 24 setattr,
25 25 )
26 26 from .thirdparty import attr
27 27
28 28 from . import (
29 29 bookmarks,
30 30 changelog,
31 31 copies,
32 32 crecord as crecordmod,
33 33 dirstateguard,
34 34 encoding,
35 35 error,
36 36 formatter,
37 37 logcmdutil,
38 38 match as matchmod,
39 39 merge as mergemod,
40 40 mergestate as mergestatemod,
41 41 mergeutil,
42 42 obsolete,
43 43 patch,
44 44 pathutil,
45 45 phases,
46 46 pycompat,
47 47 repair,
48 48 revlog,
49 49 rewriteutil,
50 50 scmutil,
51 51 state as statemod,
52 52 subrepoutil,
53 53 templatekw,
54 54 templater,
55 55 util,
56 56 vfs as vfsmod,
57 57 )
58 58
59 59 from .utils import (
60 60 dateutil,
61 61 stringutil,
62 62 )
63 63
64 64 from .revlogutils import (
65 65 constants as revlog_constants,
66 66 )
67 67
68 68 if pycompat.TYPE_CHECKING:
69 69 from typing import (
70 70 Any,
71 71 Dict,
72 72 )
73 73
74 74 for t in (Any, Dict):
75 75 assert t
76 76
77 77 stringio = util.stringio
78 78
79 79 # templates of common command options
80 80
81 81 dryrunopts = [
82 82 (b'n', b'dry-run', None, _(b'do not perform actions, just print output')),
83 83 ]
84 84
85 85 confirmopts = [
86 86 (b'', b'confirm', None, _(b'ask before applying actions')),
87 87 ]
88 88
89 89 remoteopts = [
90 90 (b'e', b'ssh', b'', _(b'specify ssh command to use'), _(b'CMD')),
91 91 (
92 92 b'',
93 93 b'remotecmd',
94 94 b'',
95 95 _(b'specify hg command to run on the remote side'),
96 96 _(b'CMD'),
97 97 ),
98 98 (
99 99 b'',
100 100 b'insecure',
101 101 None,
102 102 _(b'do not verify server certificate (ignoring web.cacerts config)'),
103 103 ),
104 104 ]
105 105
106 106 walkopts = [
107 107 (
108 108 b'I',
109 109 b'include',
110 110 [],
111 111 _(b'include names matching the given patterns'),
112 112 _(b'PATTERN'),
113 113 ),
114 114 (
115 115 b'X',
116 116 b'exclude',
117 117 [],
118 118 _(b'exclude names matching the given patterns'),
119 119 _(b'PATTERN'),
120 120 ),
121 121 ]
122 122
123 123 commitopts = [
124 124 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
125 125 (b'l', b'logfile', b'', _(b'read commit message from file'), _(b'FILE')),
126 126 ]
127 127
128 128 commitopts2 = [
129 129 (
130 130 b'd',
131 131 b'date',
132 132 b'',
133 133 _(b'record the specified date as commit date'),
134 134 _(b'DATE'),
135 135 ),
136 136 (
137 137 b'u',
138 138 b'user',
139 139 b'',
140 140 _(b'record the specified user as committer'),
141 141 _(b'USER'),
142 142 ),
143 143 ]
144 144
145 145 commitopts3 = [
146 146 (b'D', b'currentdate', None, _(b'record the current date as commit date')),
147 147 (b'U', b'currentuser', None, _(b'record the current user as committer')),
148 148 ]
149 149
150 150 formatteropts = [
151 151 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
152 152 ]
153 153
154 154 templateopts = [
155 155 (
156 156 b'',
157 157 b'style',
158 158 b'',
159 159 _(b'display using template map file (DEPRECATED)'),
160 160 _(b'STYLE'),
161 161 ),
162 162 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
163 163 ]
164 164
165 165 logopts = [
166 166 (b'p', b'patch', None, _(b'show patch')),
167 167 (b'g', b'git', None, _(b'use git extended diff format')),
168 168 (b'l', b'limit', b'', _(b'limit number of changes displayed'), _(b'NUM')),
169 169 (b'M', b'no-merges', None, _(b'do not show merges')),
170 170 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
171 171 (b'G', b'graph', None, _(b"show the revision DAG")),
172 172 ] + templateopts
173 173
174 174 diffopts = [
175 175 (b'a', b'text', None, _(b'treat all files as text')),
176 176 (
177 177 b'g',
178 178 b'git',
179 179 None,
180 180 _(b'use git extended diff format (DEFAULT: diff.git)'),
181 181 ),
182 182 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')),
183 183 (b'', b'nodates', None, _(b'omit dates from diff headers')),
184 184 ]
185 185
186 186 diffwsopts = [
187 187 (
188 188 b'w',
189 189 b'ignore-all-space',
190 190 None,
191 191 _(b'ignore white space when comparing lines'),
192 192 ),
193 193 (
194 194 b'b',
195 195 b'ignore-space-change',
196 196 None,
197 197 _(b'ignore changes in the amount of white space'),
198 198 ),
199 199 (
200 200 b'B',
201 201 b'ignore-blank-lines',
202 202 None,
203 203 _(b'ignore changes whose lines are all blank'),
204 204 ),
205 205 (
206 206 b'Z',
207 207 b'ignore-space-at-eol',
208 208 None,
209 209 _(b'ignore changes in whitespace at EOL'),
210 210 ),
211 211 ]
212 212
213 213 diffopts2 = (
214 214 [
215 215 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')),
216 216 (
217 217 b'p',
218 218 b'show-function',
219 219 None,
220 220 _(
221 221 b'show which function each change is in (DEFAULT: diff.showfunc)'
222 222 ),
223 223 ),
224 224 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')),
225 225 ]
226 226 + diffwsopts
227 227 + [
228 228 (
229 229 b'U',
230 230 b'unified',
231 231 b'',
232 232 _(b'number of lines of context to show'),
233 233 _(b'NUM'),
234 234 ),
235 235 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
236 236 (
237 237 b'',
238 238 b'root',
239 239 b'',
240 240 _(b'produce diffs relative to subdirectory'),
241 241 _(b'DIR'),
242 242 ),
243 243 ]
244 244 )
245 245
246 246 mergetoolopts = [
247 247 (b't', b'tool', b'', _(b'specify merge tool'), _(b'TOOL')),
248 248 ]
249 249
250 250 similarityopts = [
251 251 (
252 252 b's',
253 253 b'similarity',
254 254 b'',
255 255 _(b'guess renamed files by similarity (0<=s<=100)'),
256 256 _(b'SIMILARITY'),
257 257 )
258 258 ]
259 259
260 260 subrepoopts = [(b'S', b'subrepos', None, _(b'recurse into subrepositories'))]
261 261
262 262 debugrevlogopts = [
263 263 (b'c', b'changelog', False, _(b'open changelog')),
264 264 (b'm', b'manifest', False, _(b'open manifest')),
265 265 (b'', b'dir', b'', _(b'open directory manifest')),
266 266 ]
267 267
268 268 # special string such that everything below this line will be ingored in the
269 269 # editor text
270 270 _linebelow = b"^HG: ------------------------ >8 ------------------------$"
271 271
272 272
273 273 def check_at_most_one_arg(opts, *args):
274 274 """abort if more than one of the arguments are in opts
275 275
276 276 Returns the unique argument or None if none of them were specified.
277 277 """
278 278
279 279 def to_display(name):
280 280 return pycompat.sysbytes(name).replace(b'_', b'-')
281 281
282 282 previous = None
283 283 for x in args:
284 284 if opts.get(x):
285 285 if previous:
286 286 raise error.InputError(
287 287 _(b'cannot specify both --%s and --%s')
288 288 % (to_display(previous), to_display(x))
289 289 )
290 290 previous = x
291 291 return previous
292 292
293 293
294 294 def check_incompatible_arguments(opts, first, others):
295 295 """abort if the first argument is given along with any of the others
296 296
297 297 Unlike check_at_most_one_arg(), `others` are not mutually exclusive
298 298 among themselves, and they're passed as a single collection.
299 299 """
300 300 for other in others:
301 301 check_at_most_one_arg(opts, first, other)
302 302
303 303
304 304 def resolvecommitoptions(ui, opts):
305 305 """modify commit options dict to handle related options
306 306
307 307 The return value indicates that ``rewrite.update-timestamp`` is the reason
308 308 the ``date`` option is set.
309 309 """
310 310 check_at_most_one_arg(opts, b'date', b'currentdate')
311 311 check_at_most_one_arg(opts, b'user', b'currentuser')
312 312
313 313 datemaydiffer = False # date-only change should be ignored?
314 314
315 315 if opts.get(b'currentdate'):
316 316 opts[b'date'] = b'%d %d' % dateutil.makedate()
317 317 elif (
318 318 not opts.get(b'date')
319 319 and ui.configbool(b'rewrite', b'update-timestamp')
320 320 and opts.get(b'currentdate') is None
321 321 ):
322 322 opts[b'date'] = b'%d %d' % dateutil.makedate()
323 323 datemaydiffer = True
324 324
325 325 if opts.get(b'currentuser'):
326 326 opts[b'user'] = ui.username()
327 327
328 328 return datemaydiffer
329 329
330 330
331 331 def checknotesize(ui, opts):
332 332 """ make sure note is of valid format """
333 333
334 334 note = opts.get(b'note')
335 335 if not note:
336 336 return
337 337
338 338 if len(note) > 255:
339 339 raise error.InputError(_(b"cannot store a note of more than 255 bytes"))
340 340 if b'\n' in note:
341 341 raise error.InputError(_(b"note cannot contain a newline"))
342 342
343 343
344 344 def ishunk(x):
345 345 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
346 346 return isinstance(x, hunkclasses)
347 347
348 348
349 349 def newandmodified(chunks, originalchunks):
350 350 newlyaddedandmodifiedfiles = set()
351 351 alsorestore = set()
352 352 for chunk in chunks:
353 353 if (
354 354 ishunk(chunk)
355 355 and chunk.header.isnewfile()
356 356 and chunk not in originalchunks
357 357 ):
358 358 newlyaddedandmodifiedfiles.add(chunk.header.filename())
359 359 alsorestore.update(
360 360 set(chunk.header.files()) - {chunk.header.filename()}
361 361 )
362 362 return newlyaddedandmodifiedfiles, alsorestore
363 363
364 364
365 365 def parsealiases(cmd):
366 366 base_aliases = cmd.split(b"|")
367 367 all_aliases = set(base_aliases)
368 368 extra_aliases = []
369 369 for alias in base_aliases:
370 370 if b'-' in alias:
371 371 folded_alias = alias.replace(b'-', b'')
372 372 if folded_alias not in all_aliases:
373 373 all_aliases.add(folded_alias)
374 374 extra_aliases.append(folded_alias)
375 375 base_aliases.extend(extra_aliases)
376 376 return base_aliases
377 377
378 378
379 379 def setupwrapcolorwrite(ui):
380 380 # wrap ui.write so diff output can be labeled/colorized
381 381 def wrapwrite(orig, *args, **kw):
382 382 label = kw.pop('label', b'')
383 383 for chunk, l in patch.difflabel(lambda: args):
384 384 orig(chunk, label=label + l)
385 385
386 386 oldwrite = ui.write
387 387
388 388 def wrap(*args, **kwargs):
389 389 return wrapwrite(oldwrite, *args, **kwargs)
390 390
391 391 setattr(ui, 'write', wrap)
392 392 return oldwrite
393 393
394 394
395 395 def filterchunks(ui, originalhunks, usecurses, testfile, match, operation=None):
396 396 try:
397 397 if usecurses:
398 398 if testfile:
399 399 recordfn = crecordmod.testdecorator(
400 400 testfile, crecordmod.testchunkselector
401 401 )
402 402 else:
403 403 recordfn = crecordmod.chunkselector
404 404
405 405 return crecordmod.filterpatch(
406 406 ui, originalhunks, recordfn, operation
407 407 )
408 408 except crecordmod.fallbackerror as e:
409 409 ui.warn(b'%s\n' % e)
410 410 ui.warn(_(b'falling back to text mode\n'))
411 411
412 412 return patch.filterpatch(ui, originalhunks, match, operation)
413 413
414 414
415 415 def recordfilter(ui, originalhunks, match, operation=None):
416 416 """Prompts the user to filter the originalhunks and return a list of
417 417 selected hunks.
418 418 *operation* is used for to build ui messages to indicate the user what
419 419 kind of filtering they are doing: reverting, committing, shelving, etc.
420 420 (see patch.filterpatch).
421 421 """
422 422 usecurses = crecordmod.checkcurses(ui)
423 423 testfile = ui.config(b'experimental', b'crecordtest')
424 424 oldwrite = setupwrapcolorwrite(ui)
425 425 try:
426 426 newchunks, newopts = filterchunks(
427 427 ui, originalhunks, usecurses, testfile, match, operation
428 428 )
429 429 finally:
430 430 ui.write = oldwrite
431 431 return newchunks, newopts
432 432
433 433
434 434 def dorecord(
435 435 ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
436 436 ):
437 437 opts = pycompat.byteskwargs(opts)
438 438 if not ui.interactive():
439 439 if cmdsuggest:
440 440 msg = _(b'running non-interactively, use %s instead') % cmdsuggest
441 441 else:
442 442 msg = _(b'running non-interactively')
443 443 raise error.InputError(msg)
444 444
445 445 # make sure username is set before going interactive
446 446 if not opts.get(b'user'):
447 447 ui.username() # raise exception, username not provided
448 448
449 449 def recordfunc(ui, repo, message, match, opts):
450 450 """This is generic record driver.
451 451
452 452 Its job is to interactively filter local changes, and
453 453 accordingly prepare working directory into a state in which the
454 454 job can be delegated to a non-interactive commit command such as
455 455 'commit' or 'qrefresh'.
456 456
457 457 After the actual job is done by non-interactive command, the
458 458 working directory is restored to its original state.
459 459
460 460 In the end we'll record interesting changes, and everything else
461 461 will be left in place, so the user can continue working.
462 462 """
463 463 if not opts.get(b'interactive-unshelve'):
464 464 checkunfinished(repo, commit=True)
465 465 wctx = repo[None]
466 466 merge = len(wctx.parents()) > 1
467 467 if merge:
468 468 raise error.InputError(
469 469 _(
470 470 b'cannot partially commit a merge '
471 471 b'(use "hg commit" instead)'
472 472 )
473 473 )
474 474
475 475 def fail(f, msg):
476 476 raise error.InputError(b'%s: %s' % (f, msg))
477 477
478 478 force = opts.get(b'force')
479 479 if not force:
480 480 match = matchmod.badmatch(match, fail)
481 481
482 482 status = repo.status(match=match)
483 483
484 484 overrides = {(b'ui', b'commitsubrepos'): True}
485 485
486 486 with repo.ui.configoverride(overrides, b'record'):
487 487 # subrepoutil.precommit() modifies the status
488 488 tmpstatus = scmutil.status(
489 489 copymod.copy(status.modified),
490 490 copymod.copy(status.added),
491 491 copymod.copy(status.removed),
492 492 copymod.copy(status.deleted),
493 493 copymod.copy(status.unknown),
494 494 copymod.copy(status.ignored),
495 495 copymod.copy(status.clean), # pytype: disable=wrong-arg-count
496 496 )
497 497
498 498 # Force allows -X subrepo to skip the subrepo.
499 499 subs, commitsubs, newstate = subrepoutil.precommit(
500 500 repo.ui, wctx, tmpstatus, match, force=True
501 501 )
502 502 for s in subs:
503 503 if s in commitsubs:
504 504 dirtyreason = wctx.sub(s).dirtyreason(True)
505 505 raise error.Abort(dirtyreason)
506 506
507 507 if not force:
508 508 repo.checkcommitpatterns(wctx, match, status, fail)
509 509 diffopts = patch.difffeatureopts(
510 510 ui,
511 511 opts=opts,
512 512 whitespace=True,
513 513 section=b'commands',
514 514 configprefix=b'commit.interactive.',
515 515 )
516 516 diffopts.nodates = True
517 517 diffopts.git = True
518 518 diffopts.showfunc = True
519 519 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
520 520 originalchunks = patch.parsepatch(originaldiff)
521 521 match = scmutil.match(repo[None], pats)
522 522
523 523 # 1. filter patch, since we are intending to apply subset of it
524 524 try:
525 525 chunks, newopts = filterfn(ui, originalchunks, match)
526 526 except error.PatchError as err:
527 527 raise error.InputError(_(b'error parsing patch: %s') % err)
528 528 opts.update(newopts)
529 529
530 530 # We need to keep a backup of files that have been newly added and
531 531 # modified during the recording process because there is a previous
532 532 # version without the edit in the workdir. We also will need to restore
533 533 # files that were the sources of renames so that the patch application
534 534 # works.
535 535 newlyaddedandmodifiedfiles, alsorestore = newandmodified(
536 536 chunks, originalchunks
537 537 )
538 538 contenders = set()
539 539 for h in chunks:
540 540 try:
541 541 contenders.update(set(h.files()))
542 542 except AttributeError:
543 543 pass
544 544
545 545 changed = status.modified + status.added + status.removed
546 546 newfiles = [f for f in changed if f in contenders]
547 547 if not newfiles:
548 548 ui.status(_(b'no changes to record\n'))
549 549 return 0
550 550
551 551 modified = set(status.modified)
552 552
553 553 # 2. backup changed files, so we can restore them in the end
554 554
555 555 if backupall:
556 556 tobackup = changed
557 557 else:
558 558 tobackup = [
559 559 f
560 560 for f in newfiles
561 561 if f in modified or f in newlyaddedandmodifiedfiles
562 562 ]
563 563 backups = {}
564 564 if tobackup:
565 565 backupdir = repo.vfs.join(b'record-backups')
566 566 try:
567 567 os.mkdir(backupdir)
568 568 except OSError as err:
569 569 if err.errno != errno.EEXIST:
570 570 raise
571 571 try:
572 572 # backup continues
573 573 for f in tobackup:
574 574 fd, tmpname = pycompat.mkstemp(
575 575 prefix=os.path.basename(f) + b'.', dir=backupdir
576 576 )
577 577 os.close(fd)
578 578 ui.debug(b'backup %r as %r\n' % (f, tmpname))
579 579 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
580 580 backups[f] = tmpname
581 581
582 582 fp = stringio()
583 583 for c in chunks:
584 584 fname = c.filename()
585 585 if fname in backups:
586 586 c.write(fp)
587 587 dopatch = fp.tell()
588 588 fp.seek(0)
589 589
590 590 # 2.5 optionally review / modify patch in text editor
591 591 if opts.get(b'review', False):
592 592 patchtext = (
593 593 crecordmod.diffhelptext
594 594 + crecordmod.patchhelptext
595 595 + fp.read()
596 596 )
597 597 reviewedpatch = ui.edit(
598 598 patchtext, b"", action=b"diff", repopath=repo.path
599 599 )
600 600 fp.truncate(0)
601 601 fp.write(reviewedpatch)
602 602 fp.seek(0)
603 603
604 604 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
605 605 # 3a. apply filtered patch to clean repo (clean)
606 606 if backups:
607 607 m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
608 608 mergemod.revert_to(repo[b'.'], matcher=m)
609 609
610 610 # 3b. (apply)
611 611 if dopatch:
612 612 try:
613 613 ui.debug(b'applying patch\n')
614 614 ui.debug(fp.getvalue())
615 615 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
616 616 except error.PatchError as err:
617 617 raise error.InputError(pycompat.bytestr(err))
618 618 del fp
619 619
620 620 # 4. We prepared working directory according to filtered
621 621 # patch. Now is the time to delegate the job to
622 622 # commit/qrefresh or the like!
623 623
624 624 # Make all of the pathnames absolute.
625 625 newfiles = [repo.wjoin(nf) for nf in newfiles]
626 626 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
627 627 finally:
628 628 # 5. finally restore backed-up files
629 629 try:
630 630 dirstate = repo.dirstate
631 631 for realname, tmpname in pycompat.iteritems(backups):
632 632 ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
633 633
634 634 if dirstate[realname] == b'n':
635 635 # without normallookup, restoring timestamp
636 636 # may cause partially committed files
637 637 # to be treated as unmodified
638 638 dirstate.normallookup(realname)
639 639
640 640 # copystat=True here and above are a hack to trick any
641 641 # editors that have f open that we haven't modified them.
642 642 #
643 643 # Also note that this racy as an editor could notice the
644 644 # file's mtime before we've finished writing it.
645 645 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
646 646 os.unlink(tmpname)
647 647 if tobackup:
648 648 os.rmdir(backupdir)
649 649 except OSError:
650 650 pass
651 651
652 652 def recordinwlock(ui, repo, message, match, opts):
653 653 with repo.wlock():
654 654 return recordfunc(ui, repo, message, match, opts)
655 655
656 656 return commit(ui, repo, recordinwlock, pats, opts)
657 657
658 658
659 659 class dirnode(object):
660 660 """
661 661 Represent a directory in user working copy with information required for
662 662 the purpose of tersing its status.
663 663
664 664 path is the path to the directory, without a trailing '/'
665 665
666 666 statuses is a set of statuses of all files in this directory (this includes
667 667 all the files in all the subdirectories too)
668 668
669 669 files is a list of files which are direct child of this directory
670 670
671 671 subdirs is a dictionary of sub-directory name as the key and it's own
672 672 dirnode object as the value
673 673 """
674 674
675 675 def __init__(self, dirpath):
676 676 self.path = dirpath
677 677 self.statuses = set()
678 678 self.files = []
679 679 self.subdirs = {}
680 680
681 681 def _addfileindir(self, filename, status):
682 682 """Add a file in this directory as a direct child."""
683 683 self.files.append((filename, status))
684 684
685 685 def addfile(self, filename, status):
686 686 """
687 687 Add a file to this directory or to its direct parent directory.
688 688
689 689 If the file is not direct child of this directory, we traverse to the
690 690 directory of which this file is a direct child of and add the file
691 691 there.
692 692 """
693 693
694 694 # the filename contains a path separator, it means it's not the direct
695 695 # child of this directory
696 696 if b'/' in filename:
697 697 subdir, filep = filename.split(b'/', 1)
698 698
699 699 # does the dirnode object for subdir exists
700 700 if subdir not in self.subdirs:
701 701 subdirpath = pathutil.join(self.path, subdir)
702 702 self.subdirs[subdir] = dirnode(subdirpath)
703 703
704 704 # try adding the file in subdir
705 705 self.subdirs[subdir].addfile(filep, status)
706 706
707 707 else:
708 708 self._addfileindir(filename, status)
709 709
710 710 if status not in self.statuses:
711 711 self.statuses.add(status)
712 712
713 713 def iterfilepaths(self):
714 714 """Yield (status, path) for files directly under this directory."""
715 715 for f, st in self.files:
716 716 yield st, pathutil.join(self.path, f)
717 717
718 718 def tersewalk(self, terseargs):
719 719 """
720 720 Yield (status, path) obtained by processing the status of this
721 721 dirnode.
722 722
723 723 terseargs is the string of arguments passed by the user with `--terse`
724 724 flag.
725 725
726 726 Following are the cases which can happen:
727 727
728 728 1) All the files in the directory (including all the files in its
729 729 subdirectories) share the same status and the user has asked us to terse
730 730 that status. -> yield (status, dirpath). dirpath will end in '/'.
731 731
732 732 2) Otherwise, we do following:
733 733
734 734 a) Yield (status, filepath) for all the files which are in this
735 735 directory (only the ones in this directory, not the subdirs)
736 736
737 737 b) Recurse the function on all the subdirectories of this
738 738 directory
739 739 """
740 740
741 741 if len(self.statuses) == 1:
742 742 onlyst = self.statuses.pop()
743 743
744 744 # Making sure we terse only when the status abbreviation is
745 745 # passed as terse argument
746 746 if onlyst in terseargs:
747 747 yield onlyst, self.path + b'/'
748 748 return
749 749
750 750 # add the files to status list
751 751 for st, fpath in self.iterfilepaths():
752 752 yield st, fpath
753 753
754 754 # recurse on the subdirs
755 755 for dirobj in self.subdirs.values():
756 756 for st, fpath in dirobj.tersewalk(terseargs):
757 757 yield st, fpath
758 758
759 759
760 760 def tersedir(statuslist, terseargs):
761 761 """
762 762 Terse the status if all the files in a directory shares the same status.
763 763
764 764 statuslist is scmutil.status() object which contains a list of files for
765 765 each status.
766 766 terseargs is string which is passed by the user as the argument to `--terse`
767 767 flag.
768 768
769 769 The function makes a tree of objects of dirnode class, and at each node it
770 770 stores the information required to know whether we can terse a certain
771 771 directory or not.
772 772 """
773 773 # the order matters here as that is used to produce final list
774 774 allst = (b'm', b'a', b'r', b'd', b'u', b'i', b'c')
775 775
776 776 # checking the argument validity
777 777 for s in pycompat.bytestr(terseargs):
778 778 if s not in allst:
779 779 raise error.InputError(_(b"'%s' not recognized") % s)
780 780
781 781 # creating a dirnode object for the root of the repo
782 782 rootobj = dirnode(b'')
783 783 pstatus = (
784 784 b'modified',
785 785 b'added',
786 786 b'deleted',
787 787 b'clean',
788 788 b'unknown',
789 789 b'ignored',
790 790 b'removed',
791 791 )
792 792
793 793 tersedict = {}
794 794 for attrname in pstatus:
795 795 statuschar = attrname[0:1]
796 796 for f in getattr(statuslist, attrname):
797 797 rootobj.addfile(f, statuschar)
798 798 tersedict[statuschar] = []
799 799
800 800 # we won't be tersing the root dir, so add files in it
801 801 for st, fpath in rootobj.iterfilepaths():
802 802 tersedict[st].append(fpath)
803 803
804 804 # process each sub-directory and build tersedict
805 805 for subdir in rootobj.subdirs.values():
806 806 for st, f in subdir.tersewalk(terseargs):
807 807 tersedict[st].append(f)
808 808
809 809 tersedlist = []
810 810 for st in allst:
811 811 tersedict[st].sort()
812 812 tersedlist.append(tersedict[st])
813 813
814 814 return scmutil.status(*tersedlist)
815 815
816 816
817 817 def _commentlines(raw):
818 818 '''Surround lineswith a comment char and a new line'''
819 819 lines = raw.splitlines()
820 820 commentedlines = [b'# %s' % line for line in lines]
821 821 return b'\n'.join(commentedlines) + b'\n'
822 822
823 823
824 824 @attr.s(frozen=True)
825 825 class morestatus(object):
826 826 reporoot = attr.ib()
827 827 unfinishedop = attr.ib()
828 828 unfinishedmsg = attr.ib()
829 829 activemerge = attr.ib()
830 830 unresolvedpaths = attr.ib()
831 831 _formattedpaths = attr.ib(init=False, default=set())
832 832 _label = b'status.morestatus'
833 833
834 834 def formatfile(self, path, fm):
835 835 self._formattedpaths.add(path)
836 836 if self.activemerge and path in self.unresolvedpaths:
837 837 fm.data(unresolved=True)
838 838
839 839 def formatfooter(self, fm):
840 840 if self.unfinishedop or self.unfinishedmsg:
841 841 fm.startitem()
842 842 fm.data(itemtype=b'morestatus')
843 843
844 844 if self.unfinishedop:
845 845 fm.data(unfinished=self.unfinishedop)
846 846 statemsg = (
847 847 _(b'The repository is in an unfinished *%s* state.')
848 848 % self.unfinishedop
849 849 )
850 850 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
851 851 if self.unfinishedmsg:
852 852 fm.data(unfinishedmsg=self.unfinishedmsg)
853 853
854 854 # May also start new data items.
855 855 self._formatconflicts(fm)
856 856
857 857 if self.unfinishedmsg:
858 858 fm.plain(
859 859 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
860 860 )
861 861
862 862 def _formatconflicts(self, fm):
863 863 if not self.activemerge:
864 864 return
865 865
866 866 if self.unresolvedpaths:
867 867 mergeliststr = b'\n'.join(
868 868 [
869 869 b' %s'
870 870 % util.pathto(self.reporoot, encoding.getcwd(), path)
871 871 for path in self.unresolvedpaths
872 872 ]
873 873 )
874 874 msg = (
875 875 _(
876 876 b'''Unresolved merge conflicts:
877 877
878 878 %s
879 879
880 880 To mark files as resolved: hg resolve --mark FILE'''
881 881 )
882 882 % mergeliststr
883 883 )
884 884
885 885 # If any paths with unresolved conflicts were not previously
886 886 # formatted, output them now.
887 887 for f in self.unresolvedpaths:
888 888 if f in self._formattedpaths:
889 889 # Already output.
890 890 continue
891 891 fm.startitem()
892 892 # We can't claim to know the status of the file - it may just
893 893 # have been in one of the states that were not requested for
894 894 # display, so it could be anything.
895 895 fm.data(itemtype=b'file', path=f, unresolved=True)
896 896
897 897 else:
898 898 msg = _(b'No unresolved merge conflicts.')
899 899
900 900 fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
901 901
902 902
903 903 def readmorestatus(repo):
904 904 """Returns a morestatus object if the repo has unfinished state."""
905 905 statetuple = statemod.getrepostate(repo)
906 906 mergestate = mergestatemod.mergestate.read(repo)
907 907 activemerge = mergestate.active()
908 908 if not statetuple and not activemerge:
909 909 return None
910 910
911 911 unfinishedop = unfinishedmsg = unresolved = None
912 912 if statetuple:
913 913 unfinishedop, unfinishedmsg = statetuple
914 914 if activemerge:
915 915 unresolved = sorted(mergestate.unresolved())
916 916 return morestatus(
917 917 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
918 918 )
919 919
920 920
921 921 def findpossible(cmd, table, strict=False):
922 922 """
923 923 Return cmd -> (aliases, command table entry)
924 924 for each matching command.
925 925 Return debug commands (or their aliases) only if no normal command matches.
926 926 """
927 927 choice = {}
928 928 debugchoice = {}
929 929
930 930 if cmd in table:
931 931 # short-circuit exact matches, "log" alias beats "log|history"
932 932 keys = [cmd]
933 933 else:
934 934 keys = table.keys()
935 935
936 936 allcmds = []
937 937 for e in keys:
938 938 aliases = parsealiases(e)
939 939 allcmds.extend(aliases)
940 940 found = None
941 941 if cmd in aliases:
942 942 found = cmd
943 943 elif not strict:
944 944 for a in aliases:
945 945 if a.startswith(cmd):
946 946 found = a
947 947 break
948 948 if found is not None:
949 949 if aliases[0].startswith(b"debug") or found.startswith(b"debug"):
950 950 debugchoice[found] = (aliases, table[e])
951 951 else:
952 952 choice[found] = (aliases, table[e])
953 953
954 954 if not choice and debugchoice:
955 955 choice = debugchoice
956 956
957 957 return choice, allcmds
958 958
959 959
960 960 def findcmd(cmd, table, strict=True):
961 961 """Return (aliases, command table entry) for command string."""
962 962 choice, allcmds = findpossible(cmd, table, strict)
963 963
964 964 if cmd in choice:
965 965 return choice[cmd]
966 966
967 967 if len(choice) > 1:
968 968 clist = sorted(choice)
969 969 raise error.AmbiguousCommand(cmd, clist)
970 970
971 971 if choice:
972 972 return list(choice.values())[0]
973 973
974 974 raise error.UnknownCommand(cmd, allcmds)
975 975
976 976
977 977 def changebranch(ui, repo, revs, label, opts):
978 978 """ Change the branch name of given revs to label """
979 979
980 980 with repo.wlock(), repo.lock(), repo.transaction(b'branches'):
981 981 # abort in case of uncommitted merge or dirty wdir
982 982 bailifchanged(repo)
983 983 revs = scmutil.revrange(repo, revs)
984 984 if not revs:
985 985 raise error.InputError(b"empty revision set")
986 986 roots = repo.revs(b'roots(%ld)', revs)
987 987 if len(roots) > 1:
988 988 raise error.InputError(
989 989 _(b"cannot change branch of non-linear revisions")
990 990 )
991 991 rewriteutil.precheck(repo, revs, b'change branch of')
992 992
993 993 root = repo[roots.first()]
994 994 rpb = {parent.branch() for parent in root.parents()}
995 995 if (
996 996 not opts.get(b'force')
997 997 and label not in rpb
998 998 and label in repo.branchmap()
999 999 ):
1000 1000 raise error.InputError(
1001 1001 _(b"a branch of the same name already exists")
1002 1002 )
1003 1003
1004 1004 # make sure only topological heads
1005 1005 if repo.revs(b'heads(%ld) - head()', revs):
1006 1006 raise error.InputError(
1007 1007 _(b"cannot change branch in middle of a stack")
1008 1008 )
1009 1009
1010 1010 replacements = {}
1011 1011 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
1012 1012 # mercurial.subrepo -> mercurial.cmdutil
1013 1013 from . import context
1014 1014
1015 1015 for rev in revs:
1016 1016 ctx = repo[rev]
1017 1017 oldbranch = ctx.branch()
1018 1018 # check if ctx has same branch
1019 1019 if oldbranch == label:
1020 1020 continue
1021 1021
1022 1022 def filectxfn(repo, newctx, path):
1023 1023 try:
1024 1024 return ctx[path]
1025 1025 except error.ManifestLookupError:
1026 1026 return None
1027 1027
1028 1028 ui.debug(
1029 1029 b"changing branch of '%s' from '%s' to '%s'\n"
1030 1030 % (hex(ctx.node()), oldbranch, label)
1031 1031 )
1032 1032 extra = ctx.extra()
1033 1033 extra[b'branch_change'] = hex(ctx.node())
1034 1034 # While changing branch of set of linear commits, make sure that
1035 1035 # we base our commits on new parent rather than old parent which
1036 1036 # was obsoleted while changing the branch
1037 1037 p1 = ctx.p1().node()
1038 1038 p2 = ctx.p2().node()
1039 1039 if p1 in replacements:
1040 1040 p1 = replacements[p1][0]
1041 1041 if p2 in replacements:
1042 1042 p2 = replacements[p2][0]
1043 1043
1044 1044 mc = context.memctx(
1045 1045 repo,
1046 1046 (p1, p2),
1047 1047 ctx.description(),
1048 1048 ctx.files(),
1049 1049 filectxfn,
1050 1050 user=ctx.user(),
1051 1051 date=ctx.date(),
1052 1052 extra=extra,
1053 1053 branch=label,
1054 1054 )
1055 1055
1056 1056 newnode = repo.commitctx(mc)
1057 1057 replacements[ctx.node()] = (newnode,)
1058 1058 ui.debug(b'new node id is %s\n' % hex(newnode))
1059 1059
1060 1060 # create obsmarkers and move bookmarks
1061 1061 scmutil.cleanupnodes(
1062 1062 repo, replacements, b'branch-change', fixphase=True
1063 1063 )
1064 1064
1065 1065 # move the working copy too
1066 1066 wctx = repo[None]
1067 1067 # in-progress merge is a bit too complex for now.
1068 1068 if len(wctx.parents()) == 1:
1069 1069 newid = replacements.get(wctx.p1().node())
1070 1070 if newid is not None:
1071 1071 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
1072 1072 # mercurial.cmdutil
1073 1073 from . import hg
1074 1074
1075 1075 hg.update(repo, newid[0], quietempty=True)
1076 1076
1077 1077 ui.status(_(b"changed branch on %d changesets\n") % len(replacements))
1078 1078
1079 1079
1080 1080 def findrepo(p):
1081 1081 while not os.path.isdir(os.path.join(p, b".hg")):
1082 1082 oldp, p = p, os.path.dirname(p)
1083 1083 if p == oldp:
1084 1084 return None
1085 1085
1086 1086 return p
1087 1087
1088 1088
1089 1089 def bailifchanged(repo, merge=True, hint=None):
1090 1090 """enforce the precondition that working directory must be clean.
1091 1091
1092 1092 'merge' can be set to false if a pending uncommitted merge should be
1093 1093 ignored (such as when 'update --check' runs).
1094 1094
1095 1095 'hint' is the usual hint given to Abort exception.
1096 1096 """
1097 1097
1098 1098 if merge and repo.dirstate.p2() != repo.nullid:
1099 1099 raise error.StateError(_(b'outstanding uncommitted merge'), hint=hint)
1100 1100 st = repo.status()
1101 1101 if st.modified or st.added or st.removed or st.deleted:
1102 1102 raise error.StateError(_(b'uncommitted changes'), hint=hint)
1103 1103 ctx = repo[None]
1104 1104 for s in sorted(ctx.substate):
1105 1105 ctx.sub(s).bailifchanged(hint=hint)
1106 1106
1107 1107
1108 1108 def logmessage(ui, opts):
1109 1109 """ get the log message according to -m and -l option """
1110 1110
1111 1111 check_at_most_one_arg(opts, b'message', b'logfile')
1112 1112
1113 1113 message = opts.get(b'message')
1114 1114 logfile = opts.get(b'logfile')
1115 1115
1116 1116 if not message and logfile:
1117 1117 try:
1118 1118 if isstdiofilename(logfile):
1119 1119 message = ui.fin.read()
1120 1120 else:
1121 1121 message = b'\n'.join(util.readfile(logfile).splitlines())
1122 1122 except IOError as inst:
1123 1123 raise error.Abort(
1124 1124 _(b"can't read commit message '%s': %s")
1125 1125 % (logfile, encoding.strtolocal(inst.strerror))
1126 1126 )
1127 1127 return message
1128 1128
1129 1129
1130 1130 def mergeeditform(ctxorbool, baseformname):
1131 1131 """return appropriate editform name (referencing a committemplate)
1132 1132
1133 1133 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
1134 1134 merging is committed.
1135 1135
1136 1136 This returns baseformname with '.merge' appended if it is a merge,
1137 1137 otherwise '.normal' is appended.
1138 1138 """
1139 1139 if isinstance(ctxorbool, bool):
1140 1140 if ctxorbool:
1141 1141 return baseformname + b".merge"
1142 1142 elif len(ctxorbool.parents()) > 1:
1143 1143 return baseformname + b".merge"
1144 1144
1145 1145 return baseformname + b".normal"
1146 1146
1147 1147
1148 1148 def getcommiteditor(
1149 1149 edit=False, finishdesc=None, extramsg=None, editform=b'', **opts
1150 1150 ):
1151 1151 """get appropriate commit message editor according to '--edit' option
1152 1152
1153 1153 'finishdesc' is a function to be called with edited commit message
1154 1154 (= 'description' of the new changeset) just after editing, but
1155 1155 before checking empty-ness. It should return actual text to be
1156 1156 stored into history. This allows to change description before
1157 1157 storing.
1158 1158
1159 1159 'extramsg' is a extra message to be shown in the editor instead of
1160 1160 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
1161 1161 is automatically added.
1162 1162
1163 1163 'editform' is a dot-separated list of names, to distinguish
1164 1164 the purpose of commit text editing.
1165 1165
1166 1166 'getcommiteditor' returns 'commitforceeditor' regardless of
1167 1167 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
1168 1168 they are specific for usage in MQ.
1169 1169 """
1170 1170 if edit or finishdesc or extramsg:
1171 1171 return lambda r, c, s: commitforceeditor(
1172 1172 r, c, s, finishdesc=finishdesc, extramsg=extramsg, editform=editform
1173 1173 )
1174 1174 elif editform:
1175 1175 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
1176 1176 else:
1177 1177 return commiteditor
1178 1178
1179 1179
1180 1180 def _escapecommandtemplate(tmpl):
1181 1181 parts = []
1182 1182 for typ, start, end in templater.scantemplate(tmpl, raw=True):
1183 1183 if typ == b'string':
1184 1184 parts.append(stringutil.escapestr(tmpl[start:end]))
1185 1185 else:
1186 1186 parts.append(tmpl[start:end])
1187 1187 return b''.join(parts)
1188 1188
1189 1189
1190 1190 def rendercommandtemplate(ui, tmpl, props):
1191 1191 r"""Expand a literal template 'tmpl' in a way suitable for command line
1192 1192
1193 1193 '\' in outermost string is not taken as an escape character because it
1194 1194 is a directory separator on Windows.
1195 1195
1196 1196 >>> from . import ui as uimod
1197 1197 >>> ui = uimod.ui()
1198 1198 >>> rendercommandtemplate(ui, b'c:\\{path}', {b'path': b'foo'})
1199 1199 'c:\\foo'
1200 1200 >>> rendercommandtemplate(ui, b'{"c:\\{path}"}', {'path': b'foo'})
1201 1201 'c:{path}'
1202 1202 """
1203 1203 if not tmpl:
1204 1204 return tmpl
1205 1205 t = formatter.maketemplater(ui, _escapecommandtemplate(tmpl))
1206 1206 return t.renderdefault(props)
1207 1207
1208 1208
1209 1209 def rendertemplate(ctx, tmpl, props=None):
1210 1210 """Expand a literal template 'tmpl' byte-string against one changeset
1211 1211
1212 1212 Each props item must be a stringify-able value or a callable returning
1213 1213 such value, i.e. no bare list nor dict should be passed.
1214 1214 """
1215 1215 repo = ctx.repo()
1216 1216 tres = formatter.templateresources(repo.ui, repo)
1217 1217 t = formatter.maketemplater(
1218 1218 repo.ui, tmpl, defaults=templatekw.keywords, resources=tres
1219 1219 )
1220 1220 mapping = {b'ctx': ctx}
1221 1221 if props:
1222 1222 mapping.update(props)
1223 1223 return t.renderdefault(mapping)
1224 1224
1225 1225
1226 1226 def format_changeset_summary(ui, ctx, command=None, default_spec=None):
1227 1227 """Format a changeset summary (one line)."""
1228 1228 spec = None
1229 1229 if command:
1230 1230 spec = ui.config(
1231 1231 b'command-templates', b'oneline-summary.%s' % command, None
1232 1232 )
1233 1233 if not spec:
1234 1234 spec = ui.config(b'command-templates', b'oneline-summary')
1235 1235 if not spec:
1236 1236 spec = default_spec
1237 1237 if not spec:
1238 1238 spec = (
1239 1239 b'{separate(" ", '
1240 1240 b'label("oneline-summary.changeset", "{rev}:{node|short}")'
1241 1241 b', '
1242 1242 b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names % "{label("oneline-summary.{namespace}", name)}", " "))}"), " ")'
1243 1243 b')} '
1244 1244 b'"{label("oneline-summary.desc", desc|firstline)}"'
1245 1245 )
1246 1246 text = rendertemplate(ctx, spec)
1247 1247 return text.split(b'\n')[0]
1248 1248
1249 1249
1250 1250 def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
1251 1251 r"""Convert old-style filename format string to template string
1252 1252
1253 1253 >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)
1254 1254 'foo-{reporoot|basename}-{seqno}.patch'
1255 1255 >>> _buildfntemplate(b'%R{tags % "{tag}"}%H')
1256 1256 '{rev}{tags % "{tag}"}{node}'
1257 1257
1258 1258 '\' in outermost strings has to be escaped because it is a directory
1259 1259 separator on Windows:
1260 1260
1261 1261 >>> _buildfntemplate(b'c:\\tmp\\%R\\%n.patch', seqno=0)
1262 1262 'c:\\\\tmp\\\\{rev}\\\\{seqno}.patch'
1263 1263 >>> _buildfntemplate(b'\\\\foo\\bar.patch')
1264 1264 '\\\\\\\\foo\\\\bar.patch'
1265 1265 >>> _buildfntemplate(b'\\{tags % "{tag}"}')
1266 1266 '\\\\{tags % "{tag}"}'
1267 1267
1268 1268 but inner strings follow the template rules (i.e. '\' is taken as an
1269 1269 escape character):
1270 1270
1271 1271 >>> _buildfntemplate(br'{"c:\tmp"}', seqno=0)
1272 1272 '{"c:\\tmp"}'
1273 1273 """
1274 1274 expander = {
1275 1275 b'H': b'{node}',
1276 1276 b'R': b'{rev}',
1277 1277 b'h': b'{node|short}',
1278 1278 b'm': br'{sub(r"[^\w]", "_", desc|firstline)}',
1279 1279 b'r': b'{if(revwidth, pad(rev, revwidth, "0", left=True), rev)}',
1280 1280 b'%': b'%',
1281 1281 b'b': b'{reporoot|basename}',
1282 1282 }
1283 1283 if total is not None:
1284 1284 expander[b'N'] = b'{total}'
1285 1285 if seqno is not None:
1286 1286 expander[b'n'] = b'{seqno}'
1287 1287 if total is not None and seqno is not None:
1288 1288 expander[b'n'] = b'{pad(seqno, total|stringify|count, "0", left=True)}'
1289 1289 if pathname is not None:
1290 1290 expander[b's'] = b'{pathname|basename}'
1291 1291 expander[b'd'] = b'{if(pathname|dirname, pathname|dirname, ".")}'
1292 1292 expander[b'p'] = b'{pathname}'
1293 1293
1294 1294 newname = []
1295 1295 for typ, start, end in templater.scantemplate(pat, raw=True):
1296 1296 if typ != b'string':
1297 1297 newname.append(pat[start:end])
1298 1298 continue
1299 1299 i = start
1300 1300 while i < end:
1301 1301 n = pat.find(b'%', i, end)
1302 1302 if n < 0:
1303 1303 newname.append(stringutil.escapestr(pat[i:end]))
1304 1304 break
1305 1305 newname.append(stringutil.escapestr(pat[i:n]))
1306 1306 if n + 2 > end:
1307 1307 raise error.Abort(
1308 1308 _(b"incomplete format spec in output filename")
1309 1309 )
1310 1310 c = pat[n + 1 : n + 2]
1311 1311 i = n + 2
1312 1312 try:
1313 1313 newname.append(expander[c])
1314 1314 except KeyError:
1315 1315 raise error.Abort(
1316 1316 _(b"invalid format spec '%%%s' in output filename") % c
1317 1317 )
1318 1318 return b''.join(newname)
1319 1319
1320 1320
1321 1321 def makefilename(ctx, pat, **props):
1322 1322 if not pat:
1323 1323 return pat
1324 1324 tmpl = _buildfntemplate(pat, **props)
1325 1325 # BUG: alias expansion shouldn't be made against template fragments
1326 1326 # rewritten from %-format strings, but we have no easy way to partially
1327 1327 # disable the expansion.
1328 1328 return rendertemplate(ctx, tmpl, pycompat.byteskwargs(props))
1329 1329
1330 1330
1331 1331 def isstdiofilename(pat):
1332 1332 """True if the given pat looks like a filename denoting stdin/stdout"""
1333 1333 return not pat or pat == b'-'
1334 1334
1335 1335
1336 1336 class _unclosablefile(object):
1337 1337 def __init__(self, fp):
1338 1338 self._fp = fp
1339 1339
1340 1340 def close(self):
1341 1341 pass
1342 1342
1343 1343 def __iter__(self):
1344 1344 return iter(self._fp)
1345 1345
1346 1346 def __getattr__(self, attr):
1347 1347 return getattr(self._fp, attr)
1348 1348
1349 1349 def __enter__(self):
1350 1350 return self
1351 1351
1352 1352 def __exit__(self, exc_type, exc_value, exc_tb):
1353 1353 pass
1354 1354
1355 1355
1356 1356 def makefileobj(ctx, pat, mode=b'wb', **props):
1357 1357 writable = mode not in (b'r', b'rb')
1358 1358
1359 1359 if isstdiofilename(pat):
1360 1360 repo = ctx.repo()
1361 1361 if writable:
1362 1362 fp = repo.ui.fout
1363 1363 else:
1364 1364 fp = repo.ui.fin
1365 1365 return _unclosablefile(fp)
1366 1366 fn = makefilename(ctx, pat, **props)
1367 1367 return open(fn, mode)
1368 1368
1369 1369
1370 1370 def openstorage(repo, cmd, file_, opts, returnrevlog=False):
1371 1371 """opens the changelog, manifest, a filelog or a given revlog"""
1372 1372 cl = opts[b'changelog']
1373 1373 mf = opts[b'manifest']
1374 1374 dir = opts[b'dir']
1375 1375 msg = None
1376 1376 if cl and mf:
1377 1377 msg = _(b'cannot specify --changelog and --manifest at the same time')
1378 1378 elif cl and dir:
1379 1379 msg = _(b'cannot specify --changelog and --dir at the same time')
1380 1380 elif cl or mf or dir:
1381 1381 if file_:
1382 1382 msg = _(b'cannot specify filename with --changelog or --manifest')
1383 1383 elif not repo:
1384 1384 msg = _(
1385 1385 b'cannot specify --changelog or --manifest or --dir '
1386 1386 b'without a repository'
1387 1387 )
1388 1388 if msg:
1389 1389 raise error.InputError(msg)
1390 1390
1391 1391 r = None
1392 1392 if repo:
1393 1393 if cl:
1394 1394 r = repo.unfiltered().changelog
1395 1395 elif dir:
1396 1396 if not scmutil.istreemanifest(repo):
1397 1397 raise error.InputError(
1398 1398 _(
1399 1399 b"--dir can only be used on repos with "
1400 1400 b"treemanifest enabled"
1401 1401 )
1402 1402 )
1403 1403 if not dir.endswith(b'/'):
1404 1404 dir = dir + b'/'
1405 1405 dirlog = repo.manifestlog.getstorage(dir)
1406 1406 if len(dirlog):
1407 1407 r = dirlog
1408 1408 elif mf:
1409 1409 r = repo.manifestlog.getstorage(b'')
1410 1410 elif file_:
1411 1411 filelog = repo.file(file_)
1412 1412 if len(filelog):
1413 1413 r = filelog
1414 1414
1415 1415 # Not all storage may be revlogs. If requested, try to return an actual
1416 1416 # revlog instance.
1417 1417 if returnrevlog:
1418 1418 if isinstance(r, revlog.revlog):
1419 1419 pass
1420 1420 elif util.safehasattr(r, b'_revlog'):
1421 1421 r = r._revlog # pytype: disable=attribute-error
1422 1422 elif r is not None:
1423 1423 raise error.InputError(
1424 1424 _(b'%r does not appear to be a revlog') % r
1425 1425 )
1426 1426
1427 1427 if not r:
1428 1428 if not returnrevlog:
1429 1429 raise error.InputError(_(b'cannot give path to non-revlog'))
1430 1430
1431 1431 if not file_:
1432 1432 raise error.CommandError(cmd, _(b'invalid arguments'))
1433 1433 if not os.path.isfile(file_):
1434 1434 raise error.InputError(_(b"revlog '%s' not found") % file_)
1435 1435
1436 1436 target = (revlog_constants.KIND_OTHER, b'free-form:%s' % file_)
1437 1437 r = revlog.revlog(
1438 1438 vfsmod.vfs(encoding.getcwd(), audit=False),
1439 1439 target=target,
1440 1440 indexfile=file_[:-2] + b".i",
1441 1441 )
1442 1442 return r
1443 1443
1444 1444
1445 1445 def openrevlog(repo, cmd, file_, opts):
1446 1446 """Obtain a revlog backing storage of an item.
1447 1447
1448 1448 This is similar to ``openstorage()`` except it always returns a revlog.
1449 1449
1450 1450 In most cases, a caller cares about the main storage object - not the
1451 1451 revlog backing it. Therefore, this function should only be used by code
1452 1452 that needs to examine low-level revlog implementation details. e.g. debug
1453 1453 commands.
1454 1454 """
1455 1455 return openstorage(repo, cmd, file_, opts, returnrevlog=True)
1456 1456
1457 1457
1458 1458 def copy(ui, repo, pats, opts, rename=False):
1459 1459 check_incompatible_arguments(opts, b'forget', [b'dry_run'])
1460 1460
1461 1461 # called with the repo lock held
1462 1462 #
1463 1463 # hgsep => pathname that uses "/" to separate directories
1464 1464 # ossep => pathname that uses os.sep to separate directories
1465 1465 cwd = repo.getcwd()
1466 1466 targets = {}
1467 1467 forget = opts.get(b"forget")
1468 1468 after = opts.get(b"after")
1469 1469 dryrun = opts.get(b"dry_run")
1470 1470 rev = opts.get(b'at_rev')
1471 1471 if rev:
1472 1472 if not forget and not after:
1473 1473 # TODO: Remove this restriction and make it also create the copy
1474 1474 # targets (and remove the rename source if rename==True).
1475 1475 raise error.InputError(_(b'--at-rev requires --after'))
1476 1476 ctx = scmutil.revsingle(repo, rev)
1477 1477 if len(ctx.parents()) > 1:
1478 1478 raise error.InputError(
1479 1479 _(b'cannot mark/unmark copy in merge commit')
1480 1480 )
1481 1481 else:
1482 1482 ctx = repo[None]
1483 1483
1484 1484 pctx = ctx.p1()
1485 1485
1486 1486 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1487 1487
1488 1488 if forget:
1489 1489 if ctx.rev() is None:
1490 1490 new_ctx = ctx
1491 1491 else:
1492 1492 if len(ctx.parents()) > 1:
1493 1493 raise error.InputError(_(b'cannot unmark copy in merge commit'))
1494 1494 # avoid cycle context -> subrepo -> cmdutil
1495 1495 from . import context
1496 1496
1497 1497 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1498 1498 new_ctx = context.overlayworkingctx(repo)
1499 1499 new_ctx.setbase(ctx.p1())
1500 1500 mergemod.graft(repo, ctx, wctx=new_ctx)
1501 1501
1502 1502 match = scmutil.match(ctx, pats, opts)
1503 1503
1504 1504 current_copies = ctx.p1copies()
1505 1505 current_copies.update(ctx.p2copies())
1506 1506
1507 1507 uipathfn = scmutil.getuipathfn(repo)
1508 1508 for f in ctx.walk(match):
1509 1509 if f in current_copies:
1510 1510 new_ctx[f].markcopied(None)
1511 1511 elif match.exact(f):
1512 1512 ui.warn(
1513 1513 _(
1514 1514 b'%s: not unmarking as copy - file is not marked as copied\n'
1515 1515 )
1516 1516 % uipathfn(f)
1517 1517 )
1518 1518
1519 1519 if ctx.rev() is not None:
1520 1520 with repo.lock():
1521 1521 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1522 1522 new_node = mem_ctx.commit()
1523 1523
1524 1524 if repo.dirstate.p1() == ctx.node():
1525 1525 with repo.dirstate.parentchange():
1526 1526 scmutil.movedirstate(repo, repo[new_node])
1527 1527 replacements = {ctx.node(): [new_node]}
1528 1528 scmutil.cleanupnodes(
1529 1529 repo, replacements, b'uncopy', fixphase=True
1530 1530 )
1531 1531
1532 1532 return
1533 1533
1534 1534 pats = scmutil.expandpats(pats)
1535 1535 if not pats:
1536 1536 raise error.InputError(_(b'no source or destination specified'))
1537 1537 if len(pats) == 1:
1538 1538 raise error.InputError(_(b'no destination specified'))
1539 1539 dest = pats.pop()
1540 1540
1541 1541 def walkpat(pat):
1542 1542 srcs = []
1543 1543 # TODO: Inline and simplify the non-working-copy version of this code
1544 1544 # since it shares very little with the working-copy version of it.
1545 1545 ctx_to_walk = ctx if ctx.rev() is None else pctx
1546 1546 m = scmutil.match(ctx_to_walk, [pat], opts, globbed=True)
1547 1547 for abs in ctx_to_walk.walk(m):
1548 1548 rel = uipathfn(abs)
1549 1549 exact = m.exact(abs)
1550 1550 if abs not in ctx:
1551 1551 if abs in pctx:
1552 1552 if not after:
1553 1553 if exact:
1554 1554 ui.warn(
1555 1555 _(
1556 1556 b'%s: not copying - file has been marked '
1557 1557 b'for remove\n'
1558 1558 )
1559 1559 % rel
1560 1560 )
1561 1561 continue
1562 1562 else:
1563 1563 if exact:
1564 1564 ui.warn(
1565 1565 _(b'%s: not copying - file is not managed\n') % rel
1566 1566 )
1567 1567 continue
1568 1568
1569 1569 # abs: hgsep
1570 1570 # rel: ossep
1571 1571 srcs.append((abs, rel, exact))
1572 1572 return srcs
1573 1573
1574 1574 if ctx.rev() is not None:
1575 1575 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1576 1576 absdest = pathutil.canonpath(repo.root, cwd, dest)
1577 1577 if ctx.hasdir(absdest):
1578 1578 raise error.InputError(
1579 1579 _(b'%s: --at-rev does not support a directory as destination')
1580 1580 % uipathfn(absdest)
1581 1581 )
1582 1582 if absdest not in ctx:
1583 1583 raise error.InputError(
1584 1584 _(b'%s: copy destination does not exist in %s')
1585 1585 % (uipathfn(absdest), ctx)
1586 1586 )
1587 1587
1588 1588 # avoid cycle context -> subrepo -> cmdutil
1589 1589 from . import context
1590 1590
1591 1591 copylist = []
1592 1592 for pat in pats:
1593 1593 srcs = walkpat(pat)
1594 1594 if not srcs:
1595 1595 continue
1596 1596 for abs, rel, exact in srcs:
1597 1597 copylist.append(abs)
1598 1598
1599 1599 if not copylist:
1600 1600 raise error.InputError(_(b'no files to copy'))
1601 1601 # TODO: Add support for `hg cp --at-rev . foo bar dir` and
1602 1602 # `hg cp --at-rev . dir1 dir2`, preferably unifying the code with the
1603 1603 # existing functions below.
1604 1604 if len(copylist) != 1:
1605 1605 raise error.InputError(_(b'--at-rev requires a single source'))
1606 1606
1607 1607 new_ctx = context.overlayworkingctx(repo)
1608 1608 new_ctx.setbase(ctx.p1())
1609 1609 mergemod.graft(repo, ctx, wctx=new_ctx)
1610 1610
1611 1611 new_ctx.markcopied(absdest, copylist[0])
1612 1612
1613 1613 with repo.lock():
1614 1614 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1615 1615 new_node = mem_ctx.commit()
1616 1616
1617 1617 if repo.dirstate.p1() == ctx.node():
1618 1618 with repo.dirstate.parentchange():
1619 1619 scmutil.movedirstate(repo, repo[new_node])
1620 1620 replacements = {ctx.node(): [new_node]}
1621 1621 scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)
1622 1622
1623 1623 return
1624 1624
1625 1625 # abssrc: hgsep
1626 1626 # relsrc: ossep
1627 1627 # otarget: ossep
1628 1628 def copyfile(abssrc, relsrc, otarget, exact):
1629 1629 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1630 1630 if b'/' in abstarget:
1631 1631 # We cannot normalize abstarget itself, this would prevent
1632 1632 # case only renames, like a => A.
1633 1633 abspath, absname = abstarget.rsplit(b'/', 1)
1634 1634 abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
1635 1635 reltarget = repo.pathto(abstarget, cwd)
1636 1636 target = repo.wjoin(abstarget)
1637 1637 src = repo.wjoin(abssrc)
1638 1638 state = repo.dirstate[abstarget]
1639 1639
1640 1640 scmutil.checkportable(ui, abstarget)
1641 1641
1642 1642 # check for collisions
1643 1643 prevsrc = targets.get(abstarget)
1644 1644 if prevsrc is not None:
1645 1645 ui.warn(
1646 1646 _(b'%s: not overwriting - %s collides with %s\n')
1647 1647 % (
1648 1648 reltarget,
1649 1649 repo.pathto(abssrc, cwd),
1650 1650 repo.pathto(prevsrc, cwd),
1651 1651 )
1652 1652 )
1653 1653 return True # report a failure
1654 1654
1655 1655 # check for overwrites
1656 1656 exists = os.path.lexists(target)
1657 1657 samefile = False
1658 1658 if exists and abssrc != abstarget:
1659 1659 if repo.dirstate.normalize(abssrc) == repo.dirstate.normalize(
1660 1660 abstarget
1661 1661 ):
1662 1662 if not rename:
1663 1663 ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
1664 1664 return True # report a failure
1665 1665 exists = False
1666 1666 samefile = True
1667 1667
1668 1668 if not after and exists or after and state in b'mn':
1669 1669 if not opts[b'force']:
1670 1670 if state in b'mn':
1671 1671 msg = _(b'%s: not overwriting - file already committed\n')
1672 1672 if after:
1673 1673 flags = b'--after --force'
1674 1674 else:
1675 1675 flags = b'--force'
1676 1676 if rename:
1677 1677 hint = (
1678 1678 _(
1679 1679 b"('hg rename %s' to replace the file by "
1680 1680 b'recording a rename)\n'
1681 1681 )
1682 1682 % flags
1683 1683 )
1684 1684 else:
1685 1685 hint = (
1686 1686 _(
1687 1687 b"('hg copy %s' to replace the file by "
1688 1688 b'recording a copy)\n'
1689 1689 )
1690 1690 % flags
1691 1691 )
1692 1692 else:
1693 1693 msg = _(b'%s: not overwriting - file exists\n')
1694 1694 if rename:
1695 1695 hint = _(
1696 1696 b"('hg rename --after' to record the rename)\n"
1697 1697 )
1698 1698 else:
1699 1699 hint = _(b"('hg copy --after' to record the copy)\n")
1700 1700 ui.warn(msg % reltarget)
1701 1701 ui.warn(hint)
1702 1702 return True # report a failure
1703 1703
1704 1704 if after:
1705 1705 if not exists:
1706 1706 if rename:
1707 1707 ui.warn(
1708 1708 _(b'%s: not recording move - %s does not exist\n')
1709 1709 % (relsrc, reltarget)
1710 1710 )
1711 1711 else:
1712 1712 ui.warn(
1713 1713 _(b'%s: not recording copy - %s does not exist\n')
1714 1714 % (relsrc, reltarget)
1715 1715 )
1716 1716 return True # report a failure
1717 1717 elif not dryrun:
1718 1718 try:
1719 1719 if exists:
1720 1720 os.unlink(target)
1721 1721 targetdir = os.path.dirname(target) or b'.'
1722 1722 if not os.path.isdir(targetdir):
1723 1723 os.makedirs(targetdir)
1724 1724 if samefile:
1725 1725 tmp = target + b"~hgrename"
1726 1726 os.rename(src, tmp)
1727 1727 os.rename(tmp, target)
1728 1728 else:
1729 1729 # Preserve stat info on renames, not on copies; this matches
1730 1730 # Linux CLI behavior.
1731 1731 util.copyfile(src, target, copystat=rename)
1732 1732 srcexists = True
1733 1733 except IOError as inst:
1734 1734 if inst.errno == errno.ENOENT:
1735 1735 ui.warn(_(b'%s: deleted in working directory\n') % relsrc)
1736 1736 srcexists = False
1737 1737 else:
1738 1738 ui.warn(
1739 1739 _(b'%s: cannot copy - %s\n')
1740 1740 % (relsrc, encoding.strtolocal(inst.strerror))
1741 1741 )
1742 1742 return True # report a failure
1743 1743
1744 1744 if ui.verbose or not exact:
1745 1745 if rename:
1746 1746 ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
1747 1747 else:
1748 1748 ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
1749 1749
1750 1750 targets[abstarget] = abssrc
1751 1751
1752 1752 # fix up dirstate
1753 1753 scmutil.dirstatecopy(
1754 1754 ui, repo, ctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd
1755 1755 )
1756 1756 if rename and not dryrun:
1757 1757 if not after and srcexists and not samefile:
1758 1758 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
1759 1759 repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
1760 1760 ctx.forget([abssrc])
1761 1761
1762 1762 # pat: ossep
1763 1763 # dest ossep
1764 1764 # srcs: list of (hgsep, hgsep, ossep, bool)
1765 1765 # return: function that takes hgsep and returns ossep
1766 1766 def targetpathfn(pat, dest, srcs):
1767 1767 if os.path.isdir(pat):
1768 1768 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1769 1769 abspfx = util.localpath(abspfx)
1770 1770 if destdirexists:
1771 1771 striplen = len(os.path.split(abspfx)[0])
1772 1772 else:
1773 1773 striplen = len(abspfx)
1774 1774 if striplen:
1775 1775 striplen += len(pycompat.ossep)
1776 1776 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1777 1777 elif destdirexists:
1778 1778 res = lambda p: os.path.join(
1779 1779 dest, os.path.basename(util.localpath(p))
1780 1780 )
1781 1781 else:
1782 1782 res = lambda p: dest
1783 1783 return res
1784 1784
1785 1785 # pat: ossep
1786 1786 # dest ossep
1787 1787 # srcs: list of (hgsep, hgsep, ossep, bool)
1788 1788 # return: function that takes hgsep and returns ossep
1789 1789 def targetpathafterfn(pat, dest, srcs):
1790 1790 if matchmod.patkind(pat):
1791 1791 # a mercurial pattern
1792 1792 res = lambda p: os.path.join(
1793 1793 dest, os.path.basename(util.localpath(p))
1794 1794 )
1795 1795 else:
1796 1796 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1797 1797 if len(abspfx) < len(srcs[0][0]):
1798 1798 # A directory. Either the target path contains the last
1799 1799 # component of the source path or it does not.
1800 1800 def evalpath(striplen):
1801 1801 score = 0
1802 1802 for s in srcs:
1803 1803 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1804 1804 if os.path.lexists(t):
1805 1805 score += 1
1806 1806 return score
1807 1807
1808 1808 abspfx = util.localpath(abspfx)
1809 1809 striplen = len(abspfx)
1810 1810 if striplen:
1811 1811 striplen += len(pycompat.ossep)
1812 1812 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1813 1813 score = evalpath(striplen)
1814 1814 striplen1 = len(os.path.split(abspfx)[0])
1815 1815 if striplen1:
1816 1816 striplen1 += len(pycompat.ossep)
1817 1817 if evalpath(striplen1) > score:
1818 1818 striplen = striplen1
1819 1819 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1820 1820 else:
1821 1821 # a file
1822 1822 if destdirexists:
1823 1823 res = lambda p: os.path.join(
1824 1824 dest, os.path.basename(util.localpath(p))
1825 1825 )
1826 1826 else:
1827 1827 res = lambda p: dest
1828 1828 return res
1829 1829
1830 1830 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1831 1831 if not destdirexists:
1832 1832 if len(pats) > 1 or matchmod.patkind(pats[0]):
1833 1833 raise error.InputError(
1834 1834 _(
1835 1835 b'with multiple sources, destination must be an '
1836 1836 b'existing directory'
1837 1837 )
1838 1838 )
1839 1839 if util.endswithsep(dest):
1840 1840 raise error.InputError(
1841 1841 _(b'destination %s is not a directory') % dest
1842 1842 )
1843 1843
1844 1844 tfn = targetpathfn
1845 1845 if after:
1846 1846 tfn = targetpathafterfn
1847 1847 copylist = []
1848 1848 for pat in pats:
1849 1849 srcs = walkpat(pat)
1850 1850 if not srcs:
1851 1851 continue
1852 1852 copylist.append((tfn(pat, dest, srcs), srcs))
1853 1853 if not copylist:
1854 raise error.InputError(_(b'no files to copy'))
1854 hint = None
1855 if rename:
1856 hint = _(b'maybe you meant to use --after --at-rev=.')
1857 raise error.InputError(_(b'no files to copy'), hint=hint)
1855 1858
1856 1859 errors = 0
1857 1860 for targetpath, srcs in copylist:
1858 1861 for abssrc, relsrc, exact in srcs:
1859 1862 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1860 1863 errors += 1
1861 1864
1862 1865 return errors != 0
1863 1866
1864 1867
1865 1868 ## facility to let extension process additional data into an import patch
1866 1869 # list of identifier to be executed in order
1867 1870 extrapreimport = [] # run before commit
1868 1871 extrapostimport = [] # run after commit
1869 1872 # mapping from identifier to actual import function
1870 1873 #
1871 1874 # 'preimport' are run before the commit is made and are provided the following
1872 1875 # arguments:
1873 1876 # - repo: the localrepository instance,
1874 1877 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1875 1878 # - extra: the future extra dictionary of the changeset, please mutate it,
1876 1879 # - opts: the import options.
1877 1880 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1878 1881 # mutation of in memory commit and more. Feel free to rework the code to get
1879 1882 # there.
1880 1883 extrapreimportmap = {}
1881 1884 # 'postimport' are run after the commit is made and are provided the following
1882 1885 # argument:
1883 1886 # - ctx: the changectx created by import.
1884 1887 extrapostimportmap = {}
1885 1888
1886 1889
1887 1890 def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc):
1888 1891 """Utility function used by commands.import to import a single patch
1889 1892
1890 1893 This function is explicitly defined here to help the evolve extension to
1891 1894 wrap this part of the import logic.
1892 1895
1893 1896 The API is currently a bit ugly because it a simple code translation from
1894 1897 the import command. Feel free to make it better.
1895 1898
1896 1899 :patchdata: a dictionary containing parsed patch data (such as from
1897 1900 ``patch.extract()``)
1898 1901 :parents: nodes that will be parent of the created commit
1899 1902 :opts: the full dict of option passed to the import command
1900 1903 :msgs: list to save commit message to.
1901 1904 (used in case we need to save it when failing)
1902 1905 :updatefunc: a function that update a repo to a given node
1903 1906 updatefunc(<repo>, <node>)
1904 1907 """
1905 1908 # avoid cycle context -> subrepo -> cmdutil
1906 1909 from . import context
1907 1910
1908 1911 tmpname = patchdata.get(b'filename')
1909 1912 message = patchdata.get(b'message')
1910 1913 user = opts.get(b'user') or patchdata.get(b'user')
1911 1914 date = opts.get(b'date') or patchdata.get(b'date')
1912 1915 branch = patchdata.get(b'branch')
1913 1916 nodeid = patchdata.get(b'nodeid')
1914 1917 p1 = patchdata.get(b'p1')
1915 1918 p2 = patchdata.get(b'p2')
1916 1919
1917 1920 nocommit = opts.get(b'no_commit')
1918 1921 importbranch = opts.get(b'import_branch')
1919 1922 update = not opts.get(b'bypass')
1920 1923 strip = opts[b"strip"]
1921 1924 prefix = opts[b"prefix"]
1922 1925 sim = float(opts.get(b'similarity') or 0)
1923 1926
1924 1927 if not tmpname:
1925 1928 return None, None, False
1926 1929
1927 1930 rejects = False
1928 1931
1929 1932 cmdline_message = logmessage(ui, opts)
1930 1933 if cmdline_message:
1931 1934 # pickup the cmdline msg
1932 1935 message = cmdline_message
1933 1936 elif message:
1934 1937 # pickup the patch msg
1935 1938 message = message.strip()
1936 1939 else:
1937 1940 # launch the editor
1938 1941 message = None
1939 1942 ui.debug(b'message:\n%s\n' % (message or b''))
1940 1943
1941 1944 if len(parents) == 1:
1942 1945 parents.append(repo[nullrev])
1943 1946 if opts.get(b'exact'):
1944 1947 if not nodeid or not p1:
1945 1948 raise error.InputError(_(b'not a Mercurial patch'))
1946 1949 p1 = repo[p1]
1947 1950 p2 = repo[p2 or nullrev]
1948 1951 elif p2:
1949 1952 try:
1950 1953 p1 = repo[p1]
1951 1954 p2 = repo[p2]
1952 1955 # Without any options, consider p2 only if the
1953 1956 # patch is being applied on top of the recorded
1954 1957 # first parent.
1955 1958 if p1 != parents[0]:
1956 1959 p1 = parents[0]
1957 1960 p2 = repo[nullrev]
1958 1961 except error.RepoError:
1959 1962 p1, p2 = parents
1960 1963 if p2.rev() == nullrev:
1961 1964 ui.warn(
1962 1965 _(
1963 1966 b"warning: import the patch as a normal revision\n"
1964 1967 b"(use --exact to import the patch as a merge)\n"
1965 1968 )
1966 1969 )
1967 1970 else:
1968 1971 p1, p2 = parents
1969 1972
1970 1973 n = None
1971 1974 if update:
1972 1975 if p1 != parents[0]:
1973 1976 updatefunc(repo, p1.node())
1974 1977 if p2 != parents[1]:
1975 1978 repo.setparents(p1.node(), p2.node())
1976 1979
1977 1980 if opts.get(b'exact') or importbranch:
1978 1981 repo.dirstate.setbranch(branch or b'default')
1979 1982
1980 1983 partial = opts.get(b'partial', False)
1981 1984 files = set()
1982 1985 try:
1983 1986 patch.patch(
1984 1987 ui,
1985 1988 repo,
1986 1989 tmpname,
1987 1990 strip=strip,
1988 1991 prefix=prefix,
1989 1992 files=files,
1990 1993 eolmode=None,
1991 1994 similarity=sim / 100.0,
1992 1995 )
1993 1996 except error.PatchError as e:
1994 1997 if not partial:
1995 1998 raise error.Abort(pycompat.bytestr(e))
1996 1999 if partial:
1997 2000 rejects = True
1998 2001
1999 2002 files = list(files)
2000 2003 if nocommit:
2001 2004 if message:
2002 2005 msgs.append(message)
2003 2006 else:
2004 2007 if opts.get(b'exact') or p2:
2005 2008 # If you got here, you either use --force and know what
2006 2009 # you are doing or used --exact or a merge patch while
2007 2010 # being updated to its first parent.
2008 2011 m = None
2009 2012 else:
2010 2013 m = scmutil.matchfiles(repo, files or [])
2011 2014 editform = mergeeditform(repo[None], b'import.normal')
2012 2015 if opts.get(b'exact'):
2013 2016 editor = None
2014 2017 else:
2015 2018 editor = getcommiteditor(
2016 2019 editform=editform, **pycompat.strkwargs(opts)
2017 2020 )
2018 2021 extra = {}
2019 2022 for idfunc in extrapreimport:
2020 2023 extrapreimportmap[idfunc](repo, patchdata, extra, opts)
2021 2024 overrides = {}
2022 2025 if partial:
2023 2026 overrides[(b'ui', b'allowemptycommit')] = True
2024 2027 if opts.get(b'secret'):
2025 2028 overrides[(b'phases', b'new-commit')] = b'secret'
2026 2029 with repo.ui.configoverride(overrides, b'import'):
2027 2030 n = repo.commit(
2028 2031 message, user, date, match=m, editor=editor, extra=extra
2029 2032 )
2030 2033 for idfunc in extrapostimport:
2031 2034 extrapostimportmap[idfunc](repo[n])
2032 2035 else:
2033 2036 if opts.get(b'exact') or importbranch:
2034 2037 branch = branch or b'default'
2035 2038 else:
2036 2039 branch = p1.branch()
2037 2040 store = patch.filestore()
2038 2041 try:
2039 2042 files = set()
2040 2043 try:
2041 2044 patch.patchrepo(
2042 2045 ui,
2043 2046 repo,
2044 2047 p1,
2045 2048 store,
2046 2049 tmpname,
2047 2050 strip,
2048 2051 prefix,
2049 2052 files,
2050 2053 eolmode=None,
2051 2054 )
2052 2055 except error.PatchError as e:
2053 2056 raise error.Abort(stringutil.forcebytestr(e))
2054 2057 if opts.get(b'exact'):
2055 2058 editor = None
2056 2059 else:
2057 2060 editor = getcommiteditor(editform=b'import.bypass')
2058 2061 memctx = context.memctx(
2059 2062 repo,
2060 2063 (p1.node(), p2.node()),
2061 2064 message,
2062 2065 files=files,
2063 2066 filectxfn=store,
2064 2067 user=user,
2065 2068 date=date,
2066 2069 branch=branch,
2067 2070 editor=editor,
2068 2071 )
2069 2072
2070 2073 overrides = {}
2071 2074 if opts.get(b'secret'):
2072 2075 overrides[(b'phases', b'new-commit')] = b'secret'
2073 2076 with repo.ui.configoverride(overrides, b'import'):
2074 2077 n = memctx.commit()
2075 2078 finally:
2076 2079 store.close()
2077 2080 if opts.get(b'exact') and nocommit:
2078 2081 # --exact with --no-commit is still useful in that it does merge
2079 2082 # and branch bits
2080 2083 ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
2081 2084 elif opts.get(b'exact') and (not n or hex(n) != nodeid):
2082 2085 raise error.Abort(_(b'patch is damaged or loses information'))
2083 2086 msg = _(b'applied to working directory')
2084 2087 if n:
2085 2088 # i18n: refers to a short changeset id
2086 2089 msg = _(b'created %s') % short(n)
2087 2090 return msg, n, rejects
2088 2091
2089 2092
2090 2093 # facility to let extensions include additional data in an exported patch
2091 2094 # list of identifiers to be executed in order
2092 2095 extraexport = []
2093 2096 # mapping from identifier to actual export function
2094 2097 # function as to return a string to be added to the header or None
2095 2098 # it is given two arguments (sequencenumber, changectx)
2096 2099 extraexportmap = {}
2097 2100
2098 2101
2099 2102 def _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts):
2100 2103 node = scmutil.binnode(ctx)
2101 2104 parents = [p.node() for p in ctx.parents() if p]
2102 2105 branch = ctx.branch()
2103 2106 if switch_parent:
2104 2107 parents.reverse()
2105 2108
2106 2109 if parents:
2107 2110 prev = parents[0]
2108 2111 else:
2109 2112 prev = repo.nullid
2110 2113
2111 2114 fm.context(ctx=ctx)
2112 2115 fm.plain(b'# HG changeset patch\n')
2113 2116 fm.write(b'user', b'# User %s\n', ctx.user())
2114 2117 fm.plain(b'# Date %d %d\n' % ctx.date())
2115 2118 fm.write(b'date', b'# %s\n', fm.formatdate(ctx.date()))
2116 2119 fm.condwrite(
2117 2120 branch and branch != b'default', b'branch', b'# Branch %s\n', branch
2118 2121 )
2119 2122 fm.write(b'node', b'# Node ID %s\n', hex(node))
2120 2123 fm.plain(b'# Parent %s\n' % hex(prev))
2121 2124 if len(parents) > 1:
2122 2125 fm.plain(b'# Parent %s\n' % hex(parents[1]))
2123 2126 fm.data(parents=fm.formatlist(pycompat.maplist(hex, parents), name=b'node'))
2124 2127
2125 2128 # TODO: redesign extraexportmap function to support formatter
2126 2129 for headerid in extraexport:
2127 2130 header = extraexportmap[headerid](seqno, ctx)
2128 2131 if header is not None:
2129 2132 fm.plain(b'# %s\n' % header)
2130 2133
2131 2134 fm.write(b'desc', b'%s\n', ctx.description().rstrip())
2132 2135 fm.plain(b'\n')
2133 2136
2134 2137 if fm.isplain():
2135 2138 chunkiter = patch.diffui(repo, prev, node, match, opts=diffopts)
2136 2139 for chunk, label in chunkiter:
2137 2140 fm.plain(chunk, label=label)
2138 2141 else:
2139 2142 chunkiter = patch.diff(repo, prev, node, match, opts=diffopts)
2140 2143 # TODO: make it structured?
2141 2144 fm.data(diff=b''.join(chunkiter))
2142 2145
2143 2146
2144 2147 def _exportfile(repo, revs, fm, dest, switch_parent, diffopts, match):
2145 2148 """Export changesets to stdout or a single file"""
2146 2149 for seqno, rev in enumerate(revs, 1):
2147 2150 ctx = repo[rev]
2148 2151 if not dest.startswith(b'<'):
2149 2152 repo.ui.note(b"%s\n" % dest)
2150 2153 fm.startitem()
2151 2154 _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts)
2152 2155
2153 2156
2154 2157 def _exportfntemplate(
2155 2158 repo, revs, basefm, fntemplate, switch_parent, diffopts, match
2156 2159 ):
2157 2160 """Export changesets to possibly multiple files"""
2158 2161 total = len(revs)
2159 2162 revwidth = max(len(str(rev)) for rev in revs)
2160 2163 filemap = util.sortdict() # filename: [(seqno, rev), ...]
2161 2164
2162 2165 for seqno, rev in enumerate(revs, 1):
2163 2166 ctx = repo[rev]
2164 2167 dest = makefilename(
2165 2168 ctx, fntemplate, total=total, seqno=seqno, revwidth=revwidth
2166 2169 )
2167 2170 filemap.setdefault(dest, []).append((seqno, rev))
2168 2171
2169 2172 for dest in filemap:
2170 2173 with formatter.maybereopen(basefm, dest) as fm:
2171 2174 repo.ui.note(b"%s\n" % dest)
2172 2175 for seqno, rev in filemap[dest]:
2173 2176 fm.startitem()
2174 2177 ctx = repo[rev]
2175 2178 _exportsingle(
2176 2179 repo, ctx, fm, match, switch_parent, seqno, diffopts
2177 2180 )
2178 2181
2179 2182
2180 2183 def _prefetchchangedfiles(repo, revs, match):
2181 2184 allfiles = set()
2182 2185 for rev in revs:
2183 2186 for file in repo[rev].files():
2184 2187 if not match or match(file):
2185 2188 allfiles.add(file)
2186 2189 match = scmutil.matchfiles(repo, allfiles)
2187 2190 revmatches = [(rev, match) for rev in revs]
2188 2191 scmutil.prefetchfiles(repo, revmatches)
2189 2192
2190 2193
2191 2194 def export(
2192 2195 repo,
2193 2196 revs,
2194 2197 basefm,
2195 2198 fntemplate=b'hg-%h.patch',
2196 2199 switch_parent=False,
2197 2200 opts=None,
2198 2201 match=None,
2199 2202 ):
2200 2203 """export changesets as hg patches
2201 2204
2202 2205 Args:
2203 2206 repo: The repository from which we're exporting revisions.
2204 2207 revs: A list of revisions to export as revision numbers.
2205 2208 basefm: A formatter to which patches should be written.
2206 2209 fntemplate: An optional string to use for generating patch file names.
2207 2210 switch_parent: If True, show diffs against second parent when not nullid.
2208 2211 Default is false, which always shows diff against p1.
2209 2212 opts: diff options to use for generating the patch.
2210 2213 match: If specified, only export changes to files matching this matcher.
2211 2214
2212 2215 Returns:
2213 2216 Nothing.
2214 2217
2215 2218 Side Effect:
2216 2219 "HG Changeset Patch" data is emitted to one of the following
2217 2220 destinations:
2218 2221 fntemplate specified: Each rev is written to a unique file named using
2219 2222 the given template.
2220 2223 Otherwise: All revs will be written to basefm.
2221 2224 """
2222 2225 _prefetchchangedfiles(repo, revs, match)
2223 2226
2224 2227 if not fntemplate:
2225 2228 _exportfile(
2226 2229 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
2227 2230 )
2228 2231 else:
2229 2232 _exportfntemplate(
2230 2233 repo, revs, basefm, fntemplate, switch_parent, opts, match
2231 2234 )
2232 2235
2233 2236
2234 2237 def exportfile(repo, revs, fp, switch_parent=False, opts=None, match=None):
2235 2238 """Export changesets to the given file stream"""
2236 2239 _prefetchchangedfiles(repo, revs, match)
2237 2240
2238 2241 dest = getattr(fp, 'name', b'<unnamed>')
2239 2242 with formatter.formatter(repo.ui, fp, b'export', {}) as fm:
2240 2243 _exportfile(repo, revs, fm, dest, switch_parent, opts, match)
2241 2244
2242 2245
2243 2246 def showmarker(fm, marker, index=None):
2244 2247 """utility function to display obsolescence marker in a readable way
2245 2248
2246 2249 To be used by debug function."""
2247 2250 if index is not None:
2248 2251 fm.write(b'index', b'%i ', index)
2249 2252 fm.write(b'prednode', b'%s ', hex(marker.prednode()))
2250 2253 succs = marker.succnodes()
2251 2254 fm.condwrite(
2252 2255 succs,
2253 2256 b'succnodes',
2254 2257 b'%s ',
2255 2258 fm.formatlist(map(hex, succs), name=b'node'),
2256 2259 )
2257 2260 fm.write(b'flag', b'%X ', marker.flags())
2258 2261 parents = marker.parentnodes()
2259 2262 if parents is not None:
2260 2263 fm.write(
2261 2264 b'parentnodes',
2262 2265 b'{%s} ',
2263 2266 fm.formatlist(map(hex, parents), name=b'node', sep=b', '),
2264 2267 )
2265 2268 fm.write(b'date', b'(%s) ', fm.formatdate(marker.date()))
2266 2269 meta = marker.metadata().copy()
2267 2270 meta.pop(b'date', None)
2268 2271 smeta = pycompat.rapply(pycompat.maybebytestr, meta)
2269 2272 fm.write(
2270 2273 b'metadata', b'{%s}', fm.formatdict(smeta, fmt=b'%r: %r', sep=b', ')
2271 2274 )
2272 2275 fm.plain(b'\n')
2273 2276
2274 2277
2275 2278 def finddate(ui, repo, date):
2276 2279 """Find the tipmost changeset that matches the given date spec"""
2277 2280 mrevs = repo.revs(b'date(%s)', date)
2278 2281 try:
2279 2282 rev = mrevs.max()
2280 2283 except ValueError:
2281 2284 raise error.InputError(_(b"revision matching date not found"))
2282 2285
2283 2286 ui.status(
2284 2287 _(b"found revision %d from %s\n")
2285 2288 % (rev, dateutil.datestr(repo[rev].date()))
2286 2289 )
2287 2290 return b'%d' % rev
2288 2291
2289 2292
2290 2293 def add(ui, repo, match, prefix, uipathfn, explicitonly, **opts):
2291 2294 bad = []
2292 2295
2293 2296 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2294 2297 names = []
2295 2298 wctx = repo[None]
2296 2299 cca = None
2297 2300 abort, warn = scmutil.checkportabilityalert(ui)
2298 2301 if abort or warn:
2299 2302 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2300 2303
2301 2304 match = repo.narrowmatch(match, includeexact=True)
2302 2305 badmatch = matchmod.badmatch(match, badfn)
2303 2306 dirstate = repo.dirstate
2304 2307 # We don't want to just call wctx.walk here, since it would return a lot of
2305 2308 # clean files, which we aren't interested in and takes time.
2306 2309 for f in sorted(
2307 2310 dirstate.walk(
2308 2311 badmatch,
2309 2312 subrepos=sorted(wctx.substate),
2310 2313 unknown=True,
2311 2314 ignored=False,
2312 2315 full=False,
2313 2316 )
2314 2317 ):
2315 2318 exact = match.exact(f)
2316 2319 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2317 2320 if cca:
2318 2321 cca(f)
2319 2322 names.append(f)
2320 2323 if ui.verbose or not exact:
2321 2324 ui.status(
2322 2325 _(b'adding %s\n') % uipathfn(f), label=b'ui.addremove.added'
2323 2326 )
2324 2327
2325 2328 for subpath in sorted(wctx.substate):
2326 2329 sub = wctx.sub(subpath)
2327 2330 try:
2328 2331 submatch = matchmod.subdirmatcher(subpath, match)
2329 2332 subprefix = repo.wvfs.reljoin(prefix, subpath)
2330 2333 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2331 2334 if opts.get('subrepos'):
2332 2335 bad.extend(
2333 2336 sub.add(ui, submatch, subprefix, subuipathfn, False, **opts)
2334 2337 )
2335 2338 else:
2336 2339 bad.extend(
2337 2340 sub.add(ui, submatch, subprefix, subuipathfn, True, **opts)
2338 2341 )
2339 2342 except error.LookupError:
2340 2343 ui.status(
2341 2344 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2342 2345 )
2343 2346
2344 2347 if not opts.get('dry_run'):
2345 2348 rejected = wctx.add(names, prefix)
2346 2349 bad.extend(f for f in rejected if f in match.files())
2347 2350 return bad
2348 2351
2349 2352
2350 2353 def addwebdirpath(repo, serverpath, webconf):
2351 2354 webconf[serverpath] = repo.root
2352 2355 repo.ui.debug(b'adding %s = %s\n' % (serverpath, repo.root))
2353 2356
2354 2357 for r in repo.revs(b'filelog("path:.hgsub")'):
2355 2358 ctx = repo[r]
2356 2359 for subpath in ctx.substate:
2357 2360 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2358 2361
2359 2362
2360 2363 def forget(
2361 2364 ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive
2362 2365 ):
2363 2366 if dryrun and interactive:
2364 2367 raise error.InputError(
2365 2368 _(b"cannot specify both --dry-run and --interactive")
2366 2369 )
2367 2370 bad = []
2368 2371 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2369 2372 wctx = repo[None]
2370 2373 forgot = []
2371 2374
2372 2375 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2373 2376 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2374 2377 if explicitonly:
2375 2378 forget = [f for f in forget if match.exact(f)]
2376 2379
2377 2380 for subpath in sorted(wctx.substate):
2378 2381 sub = wctx.sub(subpath)
2379 2382 submatch = matchmod.subdirmatcher(subpath, match)
2380 2383 subprefix = repo.wvfs.reljoin(prefix, subpath)
2381 2384 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2382 2385 try:
2383 2386 subbad, subforgot = sub.forget(
2384 2387 submatch,
2385 2388 subprefix,
2386 2389 subuipathfn,
2387 2390 dryrun=dryrun,
2388 2391 interactive=interactive,
2389 2392 )
2390 2393 bad.extend([subpath + b'/' + f for f in subbad])
2391 2394 forgot.extend([subpath + b'/' + f for f in subforgot])
2392 2395 except error.LookupError:
2393 2396 ui.status(
2394 2397 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2395 2398 )
2396 2399
2397 2400 if not explicitonly:
2398 2401 for f in match.files():
2399 2402 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2400 2403 if f not in forgot:
2401 2404 if repo.wvfs.exists(f):
2402 2405 # Don't complain if the exact case match wasn't given.
2403 2406 # But don't do this until after checking 'forgot', so
2404 2407 # that subrepo files aren't normalized, and this op is
2405 2408 # purely from data cached by the status walk above.
2406 2409 if repo.dirstate.normalize(f) in repo.dirstate:
2407 2410 continue
2408 2411 ui.warn(
2409 2412 _(
2410 2413 b'not removing %s: '
2411 2414 b'file is already untracked\n'
2412 2415 )
2413 2416 % uipathfn(f)
2414 2417 )
2415 2418 bad.append(f)
2416 2419
2417 2420 if interactive:
2418 2421 responses = _(
2419 2422 b'[Ynsa?]'
2420 2423 b'$$ &Yes, forget this file'
2421 2424 b'$$ &No, skip this file'
2422 2425 b'$$ &Skip remaining files'
2423 2426 b'$$ Include &all remaining files'
2424 2427 b'$$ &? (display help)'
2425 2428 )
2426 2429 for filename in forget[:]:
2427 2430 r = ui.promptchoice(
2428 2431 _(b'forget %s %s') % (uipathfn(filename), responses)
2429 2432 )
2430 2433 if r == 4: # ?
2431 2434 while r == 4:
2432 2435 for c, t in ui.extractchoices(responses)[1]:
2433 2436 ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
2434 2437 r = ui.promptchoice(
2435 2438 _(b'forget %s %s') % (uipathfn(filename), responses)
2436 2439 )
2437 2440 if r == 0: # yes
2438 2441 continue
2439 2442 elif r == 1: # no
2440 2443 forget.remove(filename)
2441 2444 elif r == 2: # Skip
2442 2445 fnindex = forget.index(filename)
2443 2446 del forget[fnindex:]
2444 2447 break
2445 2448 elif r == 3: # All
2446 2449 break
2447 2450
2448 2451 for f in forget:
2449 2452 if ui.verbose or not match.exact(f) or interactive:
2450 2453 ui.status(
2451 2454 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2452 2455 )
2453 2456
2454 2457 if not dryrun:
2455 2458 rejected = wctx.forget(forget, prefix)
2456 2459 bad.extend(f for f in rejected if f in match.files())
2457 2460 forgot.extend(f for f in forget if f not in rejected)
2458 2461 return bad, forgot
2459 2462
2460 2463
2461 2464 def files(ui, ctx, m, uipathfn, fm, fmt, subrepos):
2462 2465 ret = 1
2463 2466
2464 2467 needsfctx = ui.verbose or {b'size', b'flags'} & fm.datahint()
2465 2468 if fm.isplain() and not needsfctx:
2466 2469 # Fast path. The speed-up comes from skipping the formatter, and batching
2467 2470 # calls to ui.write.
2468 2471 buf = []
2469 2472 for f in ctx.matches(m):
2470 2473 buf.append(fmt % uipathfn(f))
2471 2474 if len(buf) > 100:
2472 2475 ui.write(b''.join(buf))
2473 2476 del buf[:]
2474 2477 ret = 0
2475 2478 if buf:
2476 2479 ui.write(b''.join(buf))
2477 2480 else:
2478 2481 for f in ctx.matches(m):
2479 2482 fm.startitem()
2480 2483 fm.context(ctx=ctx)
2481 2484 if needsfctx:
2482 2485 fc = ctx[f]
2483 2486 fm.write(b'size flags', b'% 10d % 1s ', fc.size(), fc.flags())
2484 2487 fm.data(path=f)
2485 2488 fm.plain(fmt % uipathfn(f))
2486 2489 ret = 0
2487 2490
2488 2491 for subpath in sorted(ctx.substate):
2489 2492 submatch = matchmod.subdirmatcher(subpath, m)
2490 2493 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2491 2494 if subrepos or m.exact(subpath) or any(submatch.files()):
2492 2495 sub = ctx.sub(subpath)
2493 2496 try:
2494 2497 recurse = m.exact(subpath) or subrepos
2495 2498 if (
2496 2499 sub.printfiles(ui, submatch, subuipathfn, fm, fmt, recurse)
2497 2500 == 0
2498 2501 ):
2499 2502 ret = 0
2500 2503 except error.LookupError:
2501 2504 ui.status(
2502 2505 _(b"skipping missing subrepository: %s\n")
2503 2506 % uipathfn(subpath)
2504 2507 )
2505 2508
2506 2509 return ret
2507 2510
2508 2511
2509 2512 def remove(
2510 2513 ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
2511 2514 ):
2512 2515 ret = 0
2513 2516 s = repo.status(match=m, clean=True)
2514 2517 modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
2515 2518
2516 2519 wctx = repo[None]
2517 2520
2518 2521 if warnings is None:
2519 2522 warnings = []
2520 2523 warn = True
2521 2524 else:
2522 2525 warn = False
2523 2526
2524 2527 subs = sorted(wctx.substate)
2525 2528 progress = ui.makeprogress(
2526 2529 _(b'searching'), total=len(subs), unit=_(b'subrepos')
2527 2530 )
2528 2531 for subpath in subs:
2529 2532 submatch = matchmod.subdirmatcher(subpath, m)
2530 2533 subprefix = repo.wvfs.reljoin(prefix, subpath)
2531 2534 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2532 2535 if subrepos or m.exact(subpath) or any(submatch.files()):
2533 2536 progress.increment()
2534 2537 sub = wctx.sub(subpath)
2535 2538 try:
2536 2539 if sub.removefiles(
2537 2540 submatch,
2538 2541 subprefix,
2539 2542 subuipathfn,
2540 2543 after,
2541 2544 force,
2542 2545 subrepos,
2543 2546 dryrun,
2544 2547 warnings,
2545 2548 ):
2546 2549 ret = 1
2547 2550 except error.LookupError:
2548 2551 warnings.append(
2549 2552 _(b"skipping missing subrepository: %s\n")
2550 2553 % uipathfn(subpath)
2551 2554 )
2552 2555 progress.complete()
2553 2556
2554 2557 # warn about failure to delete explicit files/dirs
2555 2558 deleteddirs = pathutil.dirs(deleted)
2556 2559 files = m.files()
2557 2560 progress = ui.makeprogress(
2558 2561 _(b'deleting'), total=len(files), unit=_(b'files')
2559 2562 )
2560 2563 for f in files:
2561 2564
2562 2565 def insubrepo():
2563 2566 for subpath in wctx.substate:
2564 2567 if f.startswith(subpath + b'/'):
2565 2568 return True
2566 2569 return False
2567 2570
2568 2571 progress.increment()
2569 2572 isdir = f in deleteddirs or wctx.hasdir(f)
2570 2573 if f in repo.dirstate or isdir or f == b'.' or insubrepo() or f in subs:
2571 2574 continue
2572 2575
2573 2576 if repo.wvfs.exists(f):
2574 2577 if repo.wvfs.isdir(f):
2575 2578 warnings.append(
2576 2579 _(b'not removing %s: no tracked files\n') % uipathfn(f)
2577 2580 )
2578 2581 else:
2579 2582 warnings.append(
2580 2583 _(b'not removing %s: file is untracked\n') % uipathfn(f)
2581 2584 )
2582 2585 # missing files will generate a warning elsewhere
2583 2586 ret = 1
2584 2587 progress.complete()
2585 2588
2586 2589 if force:
2587 2590 list = modified + deleted + clean + added
2588 2591 elif after:
2589 2592 list = deleted
2590 2593 remaining = modified + added + clean
2591 2594 progress = ui.makeprogress(
2592 2595 _(b'skipping'), total=len(remaining), unit=_(b'files')
2593 2596 )
2594 2597 for f in remaining:
2595 2598 progress.increment()
2596 2599 if ui.verbose or (f in files):
2597 2600 warnings.append(
2598 2601 _(b'not removing %s: file still exists\n') % uipathfn(f)
2599 2602 )
2600 2603 ret = 1
2601 2604 progress.complete()
2602 2605 else:
2603 2606 list = deleted + clean
2604 2607 progress = ui.makeprogress(
2605 2608 _(b'skipping'), total=(len(modified) + len(added)), unit=_(b'files')
2606 2609 )
2607 2610 for f in modified:
2608 2611 progress.increment()
2609 2612 warnings.append(
2610 2613 _(
2611 2614 b'not removing %s: file is modified (use -f'
2612 2615 b' to force removal)\n'
2613 2616 )
2614 2617 % uipathfn(f)
2615 2618 )
2616 2619 ret = 1
2617 2620 for f in added:
2618 2621 progress.increment()
2619 2622 warnings.append(
2620 2623 _(
2621 2624 b"not removing %s: file has been marked for add"
2622 2625 b" (use 'hg forget' to undo add)\n"
2623 2626 )
2624 2627 % uipathfn(f)
2625 2628 )
2626 2629 ret = 1
2627 2630 progress.complete()
2628 2631
2629 2632 list = sorted(list)
2630 2633 progress = ui.makeprogress(
2631 2634 _(b'deleting'), total=len(list), unit=_(b'files')
2632 2635 )
2633 2636 for f in list:
2634 2637 if ui.verbose or not m.exact(f):
2635 2638 progress.increment()
2636 2639 ui.status(
2637 2640 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2638 2641 )
2639 2642 progress.complete()
2640 2643
2641 2644 if not dryrun:
2642 2645 with repo.wlock():
2643 2646 if not after:
2644 2647 for f in list:
2645 2648 if f in added:
2646 2649 continue # we never unlink added files on remove
2647 2650 rmdir = repo.ui.configbool(
2648 2651 b'experimental', b'removeemptydirs'
2649 2652 )
2650 2653 repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
2651 2654 repo[None].forget(list)
2652 2655
2653 2656 if warn:
2654 2657 for warning in warnings:
2655 2658 ui.warn(warning)
2656 2659
2657 2660 return ret
2658 2661
2659 2662
2660 2663 def _catfmtneedsdata(fm):
2661 2664 return not fm.datahint() or b'data' in fm.datahint()
2662 2665
2663 2666
2664 2667 def _updatecatformatter(fm, ctx, matcher, path, decode):
2665 2668 """Hook for adding data to the formatter used by ``hg cat``.
2666 2669
2667 2670 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2668 2671 this method first."""
2669 2672
2670 2673 # data() can be expensive to fetch (e.g. lfs), so don't fetch it if it
2671 2674 # wasn't requested.
2672 2675 data = b''
2673 2676 if _catfmtneedsdata(fm):
2674 2677 data = ctx[path].data()
2675 2678 if decode:
2676 2679 data = ctx.repo().wwritedata(path, data)
2677 2680 fm.startitem()
2678 2681 fm.context(ctx=ctx)
2679 2682 fm.write(b'data', b'%s', data)
2680 2683 fm.data(path=path)
2681 2684
2682 2685
2683 2686 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2684 2687 err = 1
2685 2688 opts = pycompat.byteskwargs(opts)
2686 2689
2687 2690 def write(path):
2688 2691 filename = None
2689 2692 if fntemplate:
2690 2693 filename = makefilename(
2691 2694 ctx, fntemplate, pathname=os.path.join(prefix, path)
2692 2695 )
2693 2696 # attempt to create the directory if it does not already exist
2694 2697 try:
2695 2698 os.makedirs(os.path.dirname(filename))
2696 2699 except OSError:
2697 2700 pass
2698 2701 with formatter.maybereopen(basefm, filename) as fm:
2699 2702 _updatecatformatter(fm, ctx, matcher, path, opts.get(b'decode'))
2700 2703
2701 2704 # Automation often uses hg cat on single files, so special case it
2702 2705 # for performance to avoid the cost of parsing the manifest.
2703 2706 if len(matcher.files()) == 1 and not matcher.anypats():
2704 2707 file = matcher.files()[0]
2705 2708 mfl = repo.manifestlog
2706 2709 mfnode = ctx.manifestnode()
2707 2710 try:
2708 2711 if mfnode and mfl[mfnode].find(file)[0]:
2709 2712 if _catfmtneedsdata(basefm):
2710 2713 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2711 2714 write(file)
2712 2715 return 0
2713 2716 except KeyError:
2714 2717 pass
2715 2718
2716 2719 if _catfmtneedsdata(basefm):
2717 2720 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2718 2721
2719 2722 for abs in ctx.walk(matcher):
2720 2723 write(abs)
2721 2724 err = 0
2722 2725
2723 2726 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2724 2727 for subpath in sorted(ctx.substate):
2725 2728 sub = ctx.sub(subpath)
2726 2729 try:
2727 2730 submatch = matchmod.subdirmatcher(subpath, matcher)
2728 2731 subprefix = os.path.join(prefix, subpath)
2729 2732 if not sub.cat(
2730 2733 submatch,
2731 2734 basefm,
2732 2735 fntemplate,
2733 2736 subprefix,
2734 2737 **pycompat.strkwargs(opts)
2735 2738 ):
2736 2739 err = 0
2737 2740 except error.RepoLookupError:
2738 2741 ui.status(
2739 2742 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2740 2743 )
2741 2744
2742 2745 return err
2743 2746
2744 2747
2745 2748 def commit(ui, repo, commitfunc, pats, opts):
2746 2749 '''commit the specified files or all outstanding changes'''
2747 2750 date = opts.get(b'date')
2748 2751 if date:
2749 2752 opts[b'date'] = dateutil.parsedate(date)
2750 2753 message = logmessage(ui, opts)
2751 2754 matcher = scmutil.match(repo[None], pats, opts)
2752 2755
2753 2756 dsguard = None
2754 2757 # extract addremove carefully -- this function can be called from a command
2755 2758 # that doesn't support addremove
2756 2759 if opts.get(b'addremove'):
2757 2760 dsguard = dirstateguard.dirstateguard(repo, b'commit')
2758 2761 with dsguard or util.nullcontextmanager():
2759 2762 if dsguard:
2760 2763 relative = scmutil.anypats(pats, opts)
2761 2764 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2762 2765 if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
2763 2766 raise error.Abort(
2764 2767 _(b"failed to mark all new/missing files as added/removed")
2765 2768 )
2766 2769
2767 2770 return commitfunc(ui, repo, message, matcher, opts)
2768 2771
2769 2772
2770 2773 def samefile(f, ctx1, ctx2):
2771 2774 if f in ctx1.manifest():
2772 2775 a = ctx1.filectx(f)
2773 2776 if f in ctx2.manifest():
2774 2777 b = ctx2.filectx(f)
2775 2778 return not a.cmp(b) and a.flags() == b.flags()
2776 2779 else:
2777 2780 return False
2778 2781 else:
2779 2782 return f not in ctx2.manifest()
2780 2783
2781 2784
2782 2785 def amend(ui, repo, old, extra, pats, opts):
2783 2786 # avoid cycle context -> subrepo -> cmdutil
2784 2787 from . import context
2785 2788
2786 2789 # amend will reuse the existing user if not specified, but the obsolete
2787 2790 # marker creation requires that the current user's name is specified.
2788 2791 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2789 2792 ui.username() # raise exception if username not set
2790 2793
2791 2794 ui.note(_(b'amending changeset %s\n') % old)
2792 2795 base = old.p1()
2793 2796
2794 2797 with repo.wlock(), repo.lock(), repo.transaction(b'amend'):
2795 2798 # Participating changesets:
2796 2799 #
2797 2800 # wctx o - workingctx that contains changes from working copy
2798 2801 # | to go into amending commit
2799 2802 # |
2800 2803 # old o - changeset to amend
2801 2804 # |
2802 2805 # base o - first parent of the changeset to amend
2803 2806 wctx = repo[None]
2804 2807
2805 2808 # Copy to avoid mutating input
2806 2809 extra = extra.copy()
2807 2810 # Update extra dict from amended commit (e.g. to preserve graft
2808 2811 # source)
2809 2812 extra.update(old.extra())
2810 2813
2811 2814 # Also update it from the from the wctx
2812 2815 extra.update(wctx.extra())
2813 2816
2814 2817 # date-only change should be ignored?
2815 2818 datemaydiffer = resolvecommitoptions(ui, opts)
2816 2819
2817 2820 date = old.date()
2818 2821 if opts.get(b'date'):
2819 2822 date = dateutil.parsedate(opts.get(b'date'))
2820 2823 user = opts.get(b'user') or old.user()
2821 2824
2822 2825 if len(old.parents()) > 1:
2823 2826 # ctx.files() isn't reliable for merges, so fall back to the
2824 2827 # slower repo.status() method
2825 2828 st = base.status(old)
2826 2829 files = set(st.modified) | set(st.added) | set(st.removed)
2827 2830 else:
2828 2831 files = set(old.files())
2829 2832
2830 2833 # add/remove the files to the working copy if the "addremove" option
2831 2834 # was specified.
2832 2835 matcher = scmutil.match(wctx, pats, opts)
2833 2836 relative = scmutil.anypats(pats, opts)
2834 2837 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2835 2838 if opts.get(b'addremove') and scmutil.addremove(
2836 2839 repo, matcher, b"", uipathfn, opts
2837 2840 ):
2838 2841 raise error.Abort(
2839 2842 _(b"failed to mark all new/missing files as added/removed")
2840 2843 )
2841 2844
2842 2845 # Check subrepos. This depends on in-place wctx._status update in
2843 2846 # subrepo.precommit(). To minimize the risk of this hack, we do
2844 2847 # nothing if .hgsub does not exist.
2845 2848 if b'.hgsub' in wctx or b'.hgsub' in old:
2846 2849 subs, commitsubs, newsubstate = subrepoutil.precommit(
2847 2850 ui, wctx, wctx._status, matcher
2848 2851 )
2849 2852 # amend should abort if commitsubrepos is enabled
2850 2853 assert not commitsubs
2851 2854 if subs:
2852 2855 subrepoutil.writestate(repo, newsubstate)
2853 2856
2854 2857 ms = mergestatemod.mergestate.read(repo)
2855 2858 mergeutil.checkunresolved(ms)
2856 2859
2857 2860 filestoamend = {f for f in wctx.files() if matcher(f)}
2858 2861
2859 2862 changes = len(filestoamend) > 0
2860 2863 if changes:
2861 2864 # Recompute copies (avoid recording a -> b -> a)
2862 2865 copied = copies.pathcopies(base, wctx, matcher)
2863 2866 if old.p2:
2864 2867 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2865 2868
2866 2869 # Prune files which were reverted by the updates: if old
2867 2870 # introduced file X and the file was renamed in the working
2868 2871 # copy, then those two files are the same and
2869 2872 # we can discard X from our list of files. Likewise if X
2870 2873 # was removed, it's no longer relevant. If X is missing (aka
2871 2874 # deleted), old X must be preserved.
2872 2875 files.update(filestoamend)
2873 2876 files = [
2874 2877 f
2875 2878 for f in files
2876 2879 if (f not in filestoamend or not samefile(f, wctx, base))
2877 2880 ]
2878 2881
2879 2882 def filectxfn(repo, ctx_, path):
2880 2883 try:
2881 2884 # If the file being considered is not amongst the files
2882 2885 # to be amended, we should return the file context from the
2883 2886 # old changeset. This avoids issues when only some files in
2884 2887 # the working copy are being amended but there are also
2885 2888 # changes to other files from the old changeset.
2886 2889 if path not in filestoamend:
2887 2890 return old.filectx(path)
2888 2891
2889 2892 # Return None for removed files.
2890 2893 if path in wctx.removed():
2891 2894 return None
2892 2895
2893 2896 fctx = wctx[path]
2894 2897 flags = fctx.flags()
2895 2898 mctx = context.memfilectx(
2896 2899 repo,
2897 2900 ctx_,
2898 2901 fctx.path(),
2899 2902 fctx.data(),
2900 2903 islink=b'l' in flags,
2901 2904 isexec=b'x' in flags,
2902 2905 copysource=copied.get(path),
2903 2906 )
2904 2907 return mctx
2905 2908 except KeyError:
2906 2909 return None
2907 2910
2908 2911 else:
2909 2912 ui.note(_(b'copying changeset %s to %s\n') % (old, base))
2910 2913
2911 2914 # Use version of files as in the old cset
2912 2915 def filectxfn(repo, ctx_, path):
2913 2916 try:
2914 2917 return old.filectx(path)
2915 2918 except KeyError:
2916 2919 return None
2917 2920
2918 2921 # See if we got a message from -m or -l, if not, open the editor with
2919 2922 # the message of the changeset to amend.
2920 2923 message = logmessage(ui, opts)
2921 2924
2922 2925 editform = mergeeditform(old, b'commit.amend')
2923 2926
2924 2927 if not message:
2925 2928 message = old.description()
2926 2929 # Default if message isn't provided and --edit is not passed is to
2927 2930 # invoke editor, but allow --no-edit. If somehow we don't have any
2928 2931 # description, let's always start the editor.
2929 2932 doedit = not message or opts.get(b'edit') in [True, None]
2930 2933 else:
2931 2934 # Default if message is provided is to not invoke editor, but allow
2932 2935 # --edit.
2933 2936 doedit = opts.get(b'edit') is True
2934 2937 editor = getcommiteditor(edit=doedit, editform=editform)
2935 2938
2936 2939 pureextra = extra.copy()
2937 2940 extra[b'amend_source'] = old.hex()
2938 2941
2939 2942 new = context.memctx(
2940 2943 repo,
2941 2944 parents=[base.node(), old.p2().node()],
2942 2945 text=message,
2943 2946 files=files,
2944 2947 filectxfn=filectxfn,
2945 2948 user=user,
2946 2949 date=date,
2947 2950 extra=extra,
2948 2951 editor=editor,
2949 2952 )
2950 2953
2951 2954 newdesc = changelog.stripdesc(new.description())
2952 2955 if (
2953 2956 (not changes)
2954 2957 and newdesc == old.description()
2955 2958 and user == old.user()
2956 2959 and (date == old.date() or datemaydiffer)
2957 2960 and pureextra == old.extra()
2958 2961 ):
2959 2962 # nothing changed. continuing here would create a new node
2960 2963 # anyway because of the amend_source noise.
2961 2964 #
2962 2965 # This not what we expect from amend.
2963 2966 return old.node()
2964 2967
2965 2968 commitphase = None
2966 2969 if opts.get(b'secret'):
2967 2970 commitphase = phases.secret
2968 2971 newid = repo.commitctx(new)
2969 2972 ms.reset()
2970 2973
2971 2974 # Reroute the working copy parent to the new changeset
2972 2975 repo.setparents(newid, repo.nullid)
2973 2976
2974 2977 # Fixing the dirstate because localrepo.commitctx does not update
2975 2978 # it. This is rather convenient because we did not need to update
2976 2979 # the dirstate for all the files in the new commit which commitctx
2977 2980 # could have done if it updated the dirstate. Now, we can
2978 2981 # selectively update the dirstate only for the amended files.
2979 2982 dirstate = repo.dirstate
2980 2983
2981 2984 # Update the state of the files which were added and modified in the
2982 2985 # amend to "normal" in the dirstate. We need to use "normallookup" since
2983 2986 # the files may have changed since the command started; using "normal"
2984 2987 # would mark them as clean but with uncommitted contents.
2985 2988 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
2986 2989 for f in normalfiles:
2987 2990 dirstate.normallookup(f)
2988 2991
2989 2992 # Update the state of files which were removed in the amend
2990 2993 # to "removed" in the dirstate.
2991 2994 removedfiles = set(wctx.removed()) & filestoamend
2992 2995 for f in removedfiles:
2993 2996 dirstate.drop(f)
2994 2997
2995 2998 mapping = {old.node(): (newid,)}
2996 2999 obsmetadata = None
2997 3000 if opts.get(b'note'):
2998 3001 obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
2999 3002 backup = ui.configbool(b'rewrite', b'backup-bundle')
3000 3003 scmutil.cleanupnodes(
3001 3004 repo,
3002 3005 mapping,
3003 3006 b'amend',
3004 3007 metadata=obsmetadata,
3005 3008 fixphase=True,
3006 3009 targetphase=commitphase,
3007 3010 backup=backup,
3008 3011 )
3009 3012
3010 3013 return newid
3011 3014
3012 3015
3013 3016 def commiteditor(repo, ctx, subs, editform=b''):
3014 3017 if ctx.description():
3015 3018 return ctx.description()
3016 3019 return commitforceeditor(
3017 3020 repo, ctx, subs, editform=editform, unchangedmessagedetection=True
3018 3021 )
3019 3022
3020 3023
3021 3024 def commitforceeditor(
3022 3025 repo,
3023 3026 ctx,
3024 3027 subs,
3025 3028 finishdesc=None,
3026 3029 extramsg=None,
3027 3030 editform=b'',
3028 3031 unchangedmessagedetection=False,
3029 3032 ):
3030 3033 if not extramsg:
3031 3034 extramsg = _(b"Leave message empty to abort commit.")
3032 3035
3033 3036 forms = [e for e in editform.split(b'.') if e]
3034 3037 forms.insert(0, b'changeset')
3035 3038 templatetext = None
3036 3039 while forms:
3037 3040 ref = b'.'.join(forms)
3038 3041 if repo.ui.config(b'committemplate', ref):
3039 3042 templatetext = committext = buildcommittemplate(
3040 3043 repo, ctx, subs, extramsg, ref
3041 3044 )
3042 3045 break
3043 3046 forms.pop()
3044 3047 else:
3045 3048 committext = buildcommittext(repo, ctx, subs, extramsg)
3046 3049
3047 3050 # run editor in the repository root
3048 3051 olddir = encoding.getcwd()
3049 3052 os.chdir(repo.root)
3050 3053
3051 3054 # make in-memory changes visible to external process
3052 3055 tr = repo.currenttransaction()
3053 3056 repo.dirstate.write(tr)
3054 3057 pending = tr and tr.writepending() and repo.root
3055 3058
3056 3059 editortext = repo.ui.edit(
3057 3060 committext,
3058 3061 ctx.user(),
3059 3062 ctx.extra(),
3060 3063 editform=editform,
3061 3064 pending=pending,
3062 3065 repopath=repo.path,
3063 3066 action=b'commit',
3064 3067 )
3065 3068 text = editortext
3066 3069
3067 3070 # strip away anything below this special string (used for editors that want
3068 3071 # to display the diff)
3069 3072 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
3070 3073 if stripbelow:
3071 3074 text = text[: stripbelow.start()]
3072 3075
3073 3076 text = re.sub(b"(?m)^HG:.*(\n|$)", b"", text)
3074 3077 os.chdir(olddir)
3075 3078
3076 3079 if finishdesc:
3077 3080 text = finishdesc(text)
3078 3081 if not text.strip():
3079 3082 raise error.InputError(_(b"empty commit message"))
3080 3083 if unchangedmessagedetection and editortext == templatetext:
3081 3084 raise error.InputError(_(b"commit message unchanged"))
3082 3085
3083 3086 return text
3084 3087
3085 3088
3086 3089 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
3087 3090 ui = repo.ui
3088 3091 spec = formatter.reference_templatespec(ref)
3089 3092 t = logcmdutil.changesettemplater(ui, repo, spec)
3090 3093 t.t.cache.update(
3091 3094 (k, templater.unquotestring(v))
3092 3095 for k, v in repo.ui.configitems(b'committemplate')
3093 3096 )
3094 3097
3095 3098 if not extramsg:
3096 3099 extramsg = b'' # ensure that extramsg is string
3097 3100
3098 3101 ui.pushbuffer()
3099 3102 t.show(ctx, extramsg=extramsg)
3100 3103 return ui.popbuffer()
3101 3104
3102 3105
3103 3106 def hgprefix(msg):
3104 3107 return b"\n".join([b"HG: %s" % a for a in msg.split(b"\n") if a])
3105 3108
3106 3109
3107 3110 def buildcommittext(repo, ctx, subs, extramsg):
3108 3111 edittext = []
3109 3112 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
3110 3113 if ctx.description():
3111 3114 edittext.append(ctx.description())
3112 3115 edittext.append(b"")
3113 3116 edittext.append(b"") # Empty line between message and comments.
3114 3117 edittext.append(
3115 3118 hgprefix(
3116 3119 _(
3117 3120 b"Enter commit message."
3118 3121 b" Lines beginning with 'HG:' are removed."
3119 3122 )
3120 3123 )
3121 3124 )
3122 3125 edittext.append(hgprefix(extramsg))
3123 3126 edittext.append(b"HG: --")
3124 3127 edittext.append(hgprefix(_(b"user: %s") % ctx.user()))
3125 3128 if ctx.p2():
3126 3129 edittext.append(hgprefix(_(b"branch merge")))
3127 3130 if ctx.branch():
3128 3131 edittext.append(hgprefix(_(b"branch '%s'") % ctx.branch()))
3129 3132 if bookmarks.isactivewdirparent(repo):
3130 3133 edittext.append(hgprefix(_(b"bookmark '%s'") % repo._activebookmark))
3131 3134 edittext.extend([hgprefix(_(b"subrepo %s") % s) for s in subs])
3132 3135 edittext.extend([hgprefix(_(b"added %s") % f) for f in added])
3133 3136 edittext.extend([hgprefix(_(b"changed %s") % f) for f in modified])
3134 3137 edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
3135 3138 if not added and not modified and not removed:
3136 3139 edittext.append(hgprefix(_(b"no files changed")))
3137 3140 edittext.append(b"")
3138 3141
3139 3142 return b"\n".join(edittext)
3140 3143
3141 3144
3142 3145 def commitstatus(repo, node, branch, bheads=None, tip=None, opts=None):
3143 3146 if opts is None:
3144 3147 opts = {}
3145 3148 ctx = repo[node]
3146 3149 parents = ctx.parents()
3147 3150
3148 3151 if tip is not None and repo.changelog.tip() == tip:
3149 3152 # avoid reporting something like "committed new head" when
3150 3153 # recommitting old changesets, and issue a helpful warning
3151 3154 # for most instances
3152 3155 repo.ui.warn(_(b"warning: commit already existed in the repository!\n"))
3153 3156 elif (
3154 3157 not opts.get(b'amend')
3155 3158 and bheads
3156 3159 and node not in bheads
3157 3160 and not any(
3158 3161 p.node() in bheads and p.branch() == branch for p in parents
3159 3162 )
3160 3163 ):
3161 3164 repo.ui.status(_(b'created new head\n'))
3162 3165 # The message is not printed for initial roots. For the other
3163 3166 # changesets, it is printed in the following situations:
3164 3167 #
3165 3168 # Par column: for the 2 parents with ...
3166 3169 # N: null or no parent
3167 3170 # B: parent is on another named branch
3168 3171 # C: parent is a regular non head changeset
3169 3172 # H: parent was a branch head of the current branch
3170 3173 # Msg column: whether we print "created new head" message
3171 3174 # In the following, it is assumed that there already exists some
3172 3175 # initial branch heads of the current branch, otherwise nothing is
3173 3176 # printed anyway.
3174 3177 #
3175 3178 # Par Msg Comment
3176 3179 # N N y additional topo root
3177 3180 #
3178 3181 # B N y additional branch root
3179 3182 # C N y additional topo head
3180 3183 # H N n usual case
3181 3184 #
3182 3185 # B B y weird additional branch root
3183 3186 # C B y branch merge
3184 3187 # H B n merge with named branch
3185 3188 #
3186 3189 # C C y additional head from merge
3187 3190 # C H n merge with a head
3188 3191 #
3189 3192 # H H n head merge: head count decreases
3190 3193
3191 3194 if not opts.get(b'close_branch'):
3192 3195 for r in parents:
3193 3196 if r.closesbranch() and r.branch() == branch:
3194 3197 repo.ui.status(
3195 3198 _(b'reopening closed branch head %d\n') % r.rev()
3196 3199 )
3197 3200
3198 3201 if repo.ui.debugflag:
3199 3202 repo.ui.write(
3200 3203 _(b'committed changeset %d:%s\n') % (ctx.rev(), ctx.hex())
3201 3204 )
3202 3205 elif repo.ui.verbose:
3203 3206 repo.ui.write(_(b'committed changeset %d:%s\n') % (ctx.rev(), ctx))
3204 3207
3205 3208
3206 3209 def postcommitstatus(repo, pats, opts):
3207 3210 return repo.status(match=scmutil.match(repo[None], pats, opts))
3208 3211
3209 3212
3210 3213 def revert(ui, repo, ctx, *pats, **opts):
3211 3214 opts = pycompat.byteskwargs(opts)
3212 3215 parent, p2 = repo.dirstate.parents()
3213 3216 node = ctx.node()
3214 3217
3215 3218 mf = ctx.manifest()
3216 3219 if node == p2:
3217 3220 parent = p2
3218 3221
3219 3222 # need all matching names in dirstate and manifest of target rev,
3220 3223 # so have to walk both. do not print errors if files exist in one
3221 3224 # but not other. in both cases, filesets should be evaluated against
3222 3225 # workingctx to get consistent result (issue4497). this means 'set:**'
3223 3226 # cannot be used to select missing files from target rev.
3224 3227
3225 3228 # `names` is a mapping for all elements in working copy and target revision
3226 3229 # The mapping is in the form:
3227 3230 # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3228 3231 names = {}
3229 3232 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
3230 3233
3231 3234 with repo.wlock():
3232 3235 ## filling of the `names` mapping
3233 3236 # walk dirstate to fill `names`
3234 3237
3235 3238 interactive = opts.get(b'interactive', False)
3236 3239 wctx = repo[None]
3237 3240 m = scmutil.match(wctx, pats, opts)
3238 3241
3239 3242 # we'll need this later
3240 3243 targetsubs = sorted(s for s in wctx.substate if m(s))
3241 3244
3242 3245 if not m.always():
3243 3246 matcher = matchmod.badmatch(m, lambda x, y: False)
3244 3247 for abs in wctx.walk(matcher):
3245 3248 names[abs] = m.exact(abs)
3246 3249
3247 3250 # walk target manifest to fill `names`
3248 3251
3249 3252 def badfn(path, msg):
3250 3253 if path in names:
3251 3254 return
3252 3255 if path in ctx.substate:
3253 3256 return
3254 3257 path_ = path + b'/'
3255 3258 for f in names:
3256 3259 if f.startswith(path_):
3257 3260 return
3258 3261 ui.warn(b"%s: %s\n" % (uipathfn(path), msg))
3259 3262
3260 3263 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3261 3264 if abs not in names:
3262 3265 names[abs] = m.exact(abs)
3263 3266
3264 3267 # Find status of all file in `names`.
3265 3268 m = scmutil.matchfiles(repo, names)
3266 3269
3267 3270 changes = repo.status(
3268 3271 node1=node, match=m, unknown=True, ignored=True, clean=True
3269 3272 )
3270 3273 else:
3271 3274 changes = repo.status(node1=node, match=m)
3272 3275 for kind in changes:
3273 3276 for abs in kind:
3274 3277 names[abs] = m.exact(abs)
3275 3278
3276 3279 m = scmutil.matchfiles(repo, names)
3277 3280
3278 3281 modified = set(changes.modified)
3279 3282 added = set(changes.added)
3280 3283 removed = set(changes.removed)
3281 3284 _deleted = set(changes.deleted)
3282 3285 unknown = set(changes.unknown)
3283 3286 unknown.update(changes.ignored)
3284 3287 clean = set(changes.clean)
3285 3288 modadded = set()
3286 3289
3287 3290 # We need to account for the state of the file in the dirstate,
3288 3291 # even when we revert against something else than parent. This will
3289 3292 # slightly alter the behavior of revert (doing back up or not, delete
3290 3293 # or just forget etc).
3291 3294 if parent == node:
3292 3295 dsmodified = modified
3293 3296 dsadded = added
3294 3297 dsremoved = removed
3295 3298 # store all local modifications, useful later for rename detection
3296 3299 localchanges = dsmodified | dsadded
3297 3300 modified, added, removed = set(), set(), set()
3298 3301 else:
3299 3302 changes = repo.status(node1=parent, match=m)
3300 3303 dsmodified = set(changes.modified)
3301 3304 dsadded = set(changes.added)
3302 3305 dsremoved = set(changes.removed)
3303 3306 # store all local modifications, useful later for rename detection
3304 3307 localchanges = dsmodified | dsadded
3305 3308
3306 3309 # only take into account for removes between wc and target
3307 3310 clean |= dsremoved - removed
3308 3311 dsremoved &= removed
3309 3312 # distinct between dirstate remove and other
3310 3313 removed -= dsremoved
3311 3314
3312 3315 modadded = added & dsmodified
3313 3316 added -= modadded
3314 3317
3315 3318 # tell newly modified apart.
3316 3319 dsmodified &= modified
3317 3320 dsmodified |= modified & dsadded # dirstate added may need backup
3318 3321 modified -= dsmodified
3319 3322
3320 3323 # We need to wait for some post-processing to update this set
3321 3324 # before making the distinction. The dirstate will be used for
3322 3325 # that purpose.
3323 3326 dsadded = added
3324 3327
3325 3328 # in case of merge, files that are actually added can be reported as
3326 3329 # modified, we need to post process the result
3327 3330 if p2 != repo.nullid:
3328 3331 mergeadd = set(dsmodified)
3329 3332 for path in dsmodified:
3330 3333 if path in mf:
3331 3334 mergeadd.remove(path)
3332 3335 dsadded |= mergeadd
3333 3336 dsmodified -= mergeadd
3334 3337
3335 3338 # if f is a rename, update `names` to also revert the source
3336 3339 for f in localchanges:
3337 3340 src = repo.dirstate.copied(f)
3338 3341 # XXX should we check for rename down to target node?
3339 3342 if src and src not in names and repo.dirstate[src] == b'r':
3340 3343 dsremoved.add(src)
3341 3344 names[src] = True
3342 3345
3343 3346 # determine the exact nature of the deleted changesets
3344 3347 deladded = set(_deleted)
3345 3348 for path in _deleted:
3346 3349 if path in mf:
3347 3350 deladded.remove(path)
3348 3351 deleted = _deleted - deladded
3349 3352
3350 3353 # distinguish between file to forget and the other
3351 3354 added = set()
3352 3355 for abs in dsadded:
3353 3356 if repo.dirstate[abs] != b'a':
3354 3357 added.add(abs)
3355 3358 dsadded -= added
3356 3359
3357 3360 for abs in deladded:
3358 3361 if repo.dirstate[abs] == b'a':
3359 3362 dsadded.add(abs)
3360 3363 deladded -= dsadded
3361 3364
3362 3365 # For files marked as removed, we check if an unknown file is present at
3363 3366 # the same path. If a such file exists it may need to be backed up.
3364 3367 # Making the distinction at this stage helps have simpler backup
3365 3368 # logic.
3366 3369 removunk = set()
3367 3370 for abs in removed:
3368 3371 target = repo.wjoin(abs)
3369 3372 if os.path.lexists(target):
3370 3373 removunk.add(abs)
3371 3374 removed -= removunk
3372 3375
3373 3376 dsremovunk = set()
3374 3377 for abs in dsremoved:
3375 3378 target = repo.wjoin(abs)
3376 3379 if os.path.lexists(target):
3377 3380 dsremovunk.add(abs)
3378 3381 dsremoved -= dsremovunk
3379 3382
3380 3383 # action to be actually performed by revert
3381 3384 # (<list of file>, message>) tuple
3382 3385 actions = {
3383 3386 b'revert': ([], _(b'reverting %s\n')),
3384 3387 b'add': ([], _(b'adding %s\n')),
3385 3388 b'remove': ([], _(b'removing %s\n')),
3386 3389 b'drop': ([], _(b'removing %s\n')),
3387 3390 b'forget': ([], _(b'forgetting %s\n')),
3388 3391 b'undelete': ([], _(b'undeleting %s\n')),
3389 3392 b'noop': (None, _(b'no changes needed to %s\n')),
3390 3393 b'unknown': (None, _(b'file not managed: %s\n')),
3391 3394 }
3392 3395
3393 3396 # "constant" that convey the backup strategy.
3394 3397 # All set to `discard` if `no-backup` is set do avoid checking
3395 3398 # no_backup lower in the code.
3396 3399 # These values are ordered for comparison purposes
3397 3400 backupinteractive = 3 # do backup if interactively modified
3398 3401 backup = 2 # unconditionally do backup
3399 3402 check = 1 # check if the existing file differs from target
3400 3403 discard = 0 # never do backup
3401 3404 if opts.get(b'no_backup'):
3402 3405 backupinteractive = backup = check = discard
3403 3406 if interactive:
3404 3407 dsmodifiedbackup = backupinteractive
3405 3408 else:
3406 3409 dsmodifiedbackup = backup
3407 3410 tobackup = set()
3408 3411
3409 3412 backupanddel = actions[b'remove']
3410 3413 if not opts.get(b'no_backup'):
3411 3414 backupanddel = actions[b'drop']
3412 3415
3413 3416 disptable = (
3414 3417 # dispatch table:
3415 3418 # file state
3416 3419 # action
3417 3420 # make backup
3418 3421 ## Sets that results that will change file on disk
3419 3422 # Modified compared to target, no local change
3420 3423 (modified, actions[b'revert'], discard),
3421 3424 # Modified compared to target, but local file is deleted
3422 3425 (deleted, actions[b'revert'], discard),
3423 3426 # Modified compared to target, local change
3424 3427 (dsmodified, actions[b'revert'], dsmodifiedbackup),
3425 3428 # Added since target
3426 3429 (added, actions[b'remove'], discard),
3427 3430 # Added in working directory
3428 3431 (dsadded, actions[b'forget'], discard),
3429 3432 # Added since target, have local modification
3430 3433 (modadded, backupanddel, backup),
3431 3434 # Added since target but file is missing in working directory
3432 3435 (deladded, actions[b'drop'], discard),
3433 3436 # Removed since target, before working copy parent
3434 3437 (removed, actions[b'add'], discard),
3435 3438 # Same as `removed` but an unknown file exists at the same path
3436 3439 (removunk, actions[b'add'], check),
3437 3440 # Removed since targe, marked as such in working copy parent
3438 3441 (dsremoved, actions[b'undelete'], discard),
3439 3442 # Same as `dsremoved` but an unknown file exists at the same path
3440 3443 (dsremovunk, actions[b'undelete'], check),
3441 3444 ## the following sets does not result in any file changes
3442 3445 # File with no modification
3443 3446 (clean, actions[b'noop'], discard),
3444 3447 # Existing file, not tracked anywhere
3445 3448 (unknown, actions[b'unknown'], discard),
3446 3449 )
3447 3450
3448 3451 for abs, exact in sorted(names.items()):
3449 3452 # target file to be touch on disk (relative to cwd)
3450 3453 target = repo.wjoin(abs)
3451 3454 # search the entry in the dispatch table.
3452 3455 # if the file is in any of these sets, it was touched in the working
3453 3456 # directory parent and we are sure it needs to be reverted.
3454 3457 for table, (xlist, msg), dobackup in disptable:
3455 3458 if abs not in table:
3456 3459 continue
3457 3460 if xlist is not None:
3458 3461 xlist.append(abs)
3459 3462 if dobackup:
3460 3463 # If in interactive mode, don't automatically create
3461 3464 # .orig files (issue4793)
3462 3465 if dobackup == backupinteractive:
3463 3466 tobackup.add(abs)
3464 3467 elif backup <= dobackup or wctx[abs].cmp(ctx[abs]):
3465 3468 absbakname = scmutil.backuppath(ui, repo, abs)
3466 3469 bakname = os.path.relpath(
3467 3470 absbakname, start=repo.root
3468 3471 )
3469 3472 ui.note(
3470 3473 _(b'saving current version of %s as %s\n')
3471 3474 % (uipathfn(abs), uipathfn(bakname))
3472 3475 )
3473 3476 if not opts.get(b'dry_run'):
3474 3477 if interactive:
3475 3478 util.copyfile(target, absbakname)
3476 3479 else:
3477 3480 util.rename(target, absbakname)
3478 3481 if opts.get(b'dry_run'):
3479 3482 if ui.verbose or not exact:
3480 3483 ui.status(msg % uipathfn(abs))
3481 3484 elif exact:
3482 3485 ui.warn(msg % uipathfn(abs))
3483 3486 break
3484 3487
3485 3488 if not opts.get(b'dry_run'):
3486 3489 needdata = (b'revert', b'add', b'undelete')
3487 3490 oplist = [actions[name][0] for name in needdata]
3488 3491 prefetch = scmutil.prefetchfiles
3489 3492 matchfiles = scmutil.matchfiles(
3490 3493 repo, [f for sublist in oplist for f in sublist]
3491 3494 )
3492 3495 prefetch(
3493 3496 repo,
3494 3497 [(ctx.rev(), matchfiles)],
3495 3498 )
3496 3499 match = scmutil.match(repo[None], pats)
3497 3500 _performrevert(
3498 3501 repo,
3499 3502 ctx,
3500 3503 names,
3501 3504 uipathfn,
3502 3505 actions,
3503 3506 match,
3504 3507 interactive,
3505 3508 tobackup,
3506 3509 )
3507 3510
3508 3511 if targetsubs:
3509 3512 # Revert the subrepos on the revert list
3510 3513 for sub in targetsubs:
3511 3514 try:
3512 3515 wctx.sub(sub).revert(
3513 3516 ctx.substate[sub], *pats, **pycompat.strkwargs(opts)
3514 3517 )
3515 3518 except KeyError:
3516 3519 raise error.Abort(
3517 3520 b"subrepository '%s' does not exist in %s!"
3518 3521 % (sub, short(ctx.node()))
3519 3522 )
3520 3523
3521 3524
3522 3525 def _performrevert(
3523 3526 repo,
3524 3527 ctx,
3525 3528 names,
3526 3529 uipathfn,
3527 3530 actions,
3528 3531 match,
3529 3532 interactive=False,
3530 3533 tobackup=None,
3531 3534 ):
3532 3535 """function that actually perform all the actions computed for revert
3533 3536
3534 3537 This is an independent function to let extension to plug in and react to
3535 3538 the imminent revert.
3536 3539
3537 3540 Make sure you have the working directory locked when calling this function.
3538 3541 """
3539 3542 parent, p2 = repo.dirstate.parents()
3540 3543 node = ctx.node()
3541 3544 excluded_files = []
3542 3545
3543 3546 def checkout(f):
3544 3547 fc = ctx[f]
3545 3548 repo.wwrite(f, fc.data(), fc.flags())
3546 3549
3547 3550 def doremove(f):
3548 3551 try:
3549 3552 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
3550 3553 repo.wvfs.unlinkpath(f, rmdir=rmdir)
3551 3554 except OSError:
3552 3555 pass
3553 3556 repo.dirstate.remove(f)
3554 3557
3555 3558 def prntstatusmsg(action, f):
3556 3559 exact = names[f]
3557 3560 if repo.ui.verbose or not exact:
3558 3561 repo.ui.status(actions[action][1] % uipathfn(f))
3559 3562
3560 3563 audit_path = pathutil.pathauditor(repo.root, cached=True)
3561 3564 for f in actions[b'forget'][0]:
3562 3565 if interactive:
3563 3566 choice = repo.ui.promptchoice(
3564 3567 _(b"forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3565 3568 )
3566 3569 if choice == 0:
3567 3570 prntstatusmsg(b'forget', f)
3568 3571 repo.dirstate.drop(f)
3569 3572 else:
3570 3573 excluded_files.append(f)
3571 3574 else:
3572 3575 prntstatusmsg(b'forget', f)
3573 3576 repo.dirstate.drop(f)
3574 3577 for f in actions[b'remove'][0]:
3575 3578 audit_path(f)
3576 3579 if interactive:
3577 3580 choice = repo.ui.promptchoice(
3578 3581 _(b"remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3579 3582 )
3580 3583 if choice == 0:
3581 3584 prntstatusmsg(b'remove', f)
3582 3585 doremove(f)
3583 3586 else:
3584 3587 excluded_files.append(f)
3585 3588 else:
3586 3589 prntstatusmsg(b'remove', f)
3587 3590 doremove(f)
3588 3591 for f in actions[b'drop'][0]:
3589 3592 audit_path(f)
3590 3593 prntstatusmsg(b'drop', f)
3591 3594 repo.dirstate.remove(f)
3592 3595
3593 3596 normal = None
3594 3597 if node == parent:
3595 3598 # We're reverting to our parent. If possible, we'd like status
3596 3599 # to report the file as clean. We have to use normallookup for
3597 3600 # merges to avoid losing information about merged/dirty files.
3598 3601 if p2 != repo.nullid:
3599 3602 normal = repo.dirstate.normallookup
3600 3603 else:
3601 3604 normal = repo.dirstate.normal
3602 3605
3603 3606 newlyaddedandmodifiedfiles = set()
3604 3607 if interactive:
3605 3608 # Prompt the user for changes to revert
3606 3609 torevert = [f for f in actions[b'revert'][0] if f not in excluded_files]
3607 3610 m = scmutil.matchfiles(repo, torevert)
3608 3611 diffopts = patch.difffeatureopts(
3609 3612 repo.ui,
3610 3613 whitespace=True,
3611 3614 section=b'commands',
3612 3615 configprefix=b'revert.interactive.',
3613 3616 )
3614 3617 diffopts.nodates = True
3615 3618 diffopts.git = True
3616 3619 operation = b'apply'
3617 3620 if node == parent:
3618 3621 if repo.ui.configbool(
3619 3622 b'experimental', b'revert.interactive.select-to-keep'
3620 3623 ):
3621 3624 operation = b'keep'
3622 3625 else:
3623 3626 operation = b'discard'
3624 3627
3625 3628 if operation == b'apply':
3626 3629 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3627 3630 else:
3628 3631 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3629 3632 originalchunks = patch.parsepatch(diff)
3630 3633
3631 3634 try:
3632 3635
3633 3636 chunks, opts = recordfilter(
3634 3637 repo.ui, originalchunks, match, operation=operation
3635 3638 )
3636 3639 if operation == b'discard':
3637 3640 chunks = patch.reversehunks(chunks)
3638 3641
3639 3642 except error.PatchError as err:
3640 3643 raise error.Abort(_(b'error parsing patch: %s') % err)
3641 3644
3642 3645 # FIXME: when doing an interactive revert of a copy, there's no way of
3643 3646 # performing a partial revert of the added file, the only option is
3644 3647 # "remove added file <name> (Yn)?", so we don't need to worry about the
3645 3648 # alsorestore value. Ideally we'd be able to partially revert
3646 3649 # copied/renamed files.
3647 3650 newlyaddedandmodifiedfiles, unusedalsorestore = newandmodified(
3648 3651 chunks, originalchunks
3649 3652 )
3650 3653 if tobackup is None:
3651 3654 tobackup = set()
3652 3655 # Apply changes
3653 3656 fp = stringio()
3654 3657 # chunks are serialized per file, but files aren't sorted
3655 3658 for f in sorted({c.header.filename() for c in chunks if ishunk(c)}):
3656 3659 prntstatusmsg(b'revert', f)
3657 3660 files = set()
3658 3661 for c in chunks:
3659 3662 if ishunk(c):
3660 3663 abs = c.header.filename()
3661 3664 # Create a backup file only if this hunk should be backed up
3662 3665 if c.header.filename() in tobackup:
3663 3666 target = repo.wjoin(abs)
3664 3667 bakname = scmutil.backuppath(repo.ui, repo, abs)
3665 3668 util.copyfile(target, bakname)
3666 3669 tobackup.remove(abs)
3667 3670 if abs not in files:
3668 3671 files.add(abs)
3669 3672 if operation == b'keep':
3670 3673 checkout(abs)
3671 3674 c.write(fp)
3672 3675 dopatch = fp.tell()
3673 3676 fp.seek(0)
3674 3677 if dopatch:
3675 3678 try:
3676 3679 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3677 3680 except error.PatchError as err:
3678 3681 raise error.Abort(pycompat.bytestr(err))
3679 3682 del fp
3680 3683 else:
3681 3684 for f in actions[b'revert'][0]:
3682 3685 prntstatusmsg(b'revert', f)
3683 3686 checkout(f)
3684 3687 if normal:
3685 3688 normal(f)
3686 3689
3687 3690 for f in actions[b'add'][0]:
3688 3691 # Don't checkout modified files, they are already created by the diff
3689 3692 if f not in newlyaddedandmodifiedfiles:
3690 3693 prntstatusmsg(b'add', f)
3691 3694 checkout(f)
3692 3695 repo.dirstate.add(f)
3693 3696
3694 3697 normal = repo.dirstate.normallookup
3695 3698 if node == parent and p2 == repo.nullid:
3696 3699 normal = repo.dirstate.normal
3697 3700 for f in actions[b'undelete'][0]:
3698 3701 if interactive:
3699 3702 choice = repo.ui.promptchoice(
3700 3703 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f
3701 3704 )
3702 3705 if choice == 0:
3703 3706 prntstatusmsg(b'undelete', f)
3704 3707 checkout(f)
3705 3708 normal(f)
3706 3709 else:
3707 3710 excluded_files.append(f)
3708 3711 else:
3709 3712 prntstatusmsg(b'undelete', f)
3710 3713 checkout(f)
3711 3714 normal(f)
3712 3715
3713 3716 copied = copies.pathcopies(repo[parent], ctx)
3714 3717
3715 3718 for f in (
3716 3719 actions[b'add'][0] + actions[b'undelete'][0] + actions[b'revert'][0]
3717 3720 ):
3718 3721 if f in copied:
3719 3722 repo.dirstate.copy(copied[f], f)
3720 3723
3721 3724
3722 3725 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3723 3726 # commands.outgoing. "missing" is "missing" of the result of
3724 3727 # "findcommonoutgoing()"
3725 3728 outgoinghooks = util.hooks()
3726 3729
3727 3730 # a list of (ui, repo) functions called by commands.summary
3728 3731 summaryhooks = util.hooks()
3729 3732
3730 3733 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3731 3734 #
3732 3735 # functions should return tuple of booleans below, if 'changes' is None:
3733 3736 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3734 3737 #
3735 3738 # otherwise, 'changes' is a tuple of tuples below:
3736 3739 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3737 3740 # - (desturl, destbranch, destpeer, outgoing)
3738 3741 summaryremotehooks = util.hooks()
3739 3742
3740 3743
3741 3744 def checkunfinished(repo, commit=False, skipmerge=False):
3742 3745 """Look for an unfinished multistep operation, like graft, and abort
3743 3746 if found. It's probably good to check this right before
3744 3747 bailifchanged().
3745 3748 """
3746 3749 # Check for non-clearable states first, so things like rebase will take
3747 3750 # precedence over update.
3748 3751 for state in statemod._unfinishedstates:
3749 3752 if (
3750 3753 state._clearable
3751 3754 or (commit and state._allowcommit)
3752 3755 or state._reportonly
3753 3756 ):
3754 3757 continue
3755 3758 if state.isunfinished(repo):
3756 3759 raise error.StateError(state.msg(), hint=state.hint())
3757 3760
3758 3761 for s in statemod._unfinishedstates:
3759 3762 if (
3760 3763 not s._clearable
3761 3764 or (commit and s._allowcommit)
3762 3765 or (s._opname == b'merge' and skipmerge)
3763 3766 or s._reportonly
3764 3767 ):
3765 3768 continue
3766 3769 if s.isunfinished(repo):
3767 3770 raise error.StateError(s.msg(), hint=s.hint())
3768 3771
3769 3772
3770 3773 def clearunfinished(repo):
3771 3774 """Check for unfinished operations (as above), and clear the ones
3772 3775 that are clearable.
3773 3776 """
3774 3777 for state in statemod._unfinishedstates:
3775 3778 if state._reportonly:
3776 3779 continue
3777 3780 if not state._clearable and state.isunfinished(repo):
3778 3781 raise error.StateError(state.msg(), hint=state.hint())
3779 3782
3780 3783 for s in statemod._unfinishedstates:
3781 3784 if s._opname == b'merge' or s._reportonly:
3782 3785 continue
3783 3786 if s._clearable and s.isunfinished(repo):
3784 3787 util.unlink(repo.vfs.join(s._fname))
3785 3788
3786 3789
3787 3790 def getunfinishedstate(repo):
3788 3791 """Checks for unfinished operations and returns statecheck object
3789 3792 for it"""
3790 3793 for state in statemod._unfinishedstates:
3791 3794 if state.isunfinished(repo):
3792 3795 return state
3793 3796 return None
3794 3797
3795 3798
3796 3799 def howtocontinue(repo):
3797 3800 """Check for an unfinished operation and return the command to finish
3798 3801 it.
3799 3802
3800 3803 statemod._unfinishedstates list is checked for an unfinished operation
3801 3804 and the corresponding message to finish it is generated if a method to
3802 3805 continue is supported by the operation.
3803 3806
3804 3807 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3805 3808 a boolean.
3806 3809 """
3807 3810 contmsg = _(b"continue: %s")
3808 3811 for state in statemod._unfinishedstates:
3809 3812 if not state._continueflag:
3810 3813 continue
3811 3814 if state.isunfinished(repo):
3812 3815 return contmsg % state.continuemsg(), True
3813 3816 if repo[None].dirty(missing=True, merge=False, branch=False):
3814 3817 return contmsg % _(b"hg commit"), False
3815 3818 return None, None
3816 3819
3817 3820
3818 3821 def checkafterresolved(repo):
3819 3822 """Inform the user about the next action after completing hg resolve
3820 3823
3821 3824 If there's a an unfinished operation that supports continue flag,
3822 3825 howtocontinue will yield repo.ui.warn as the reporter.
3823 3826
3824 3827 Otherwise, it will yield repo.ui.note.
3825 3828 """
3826 3829 msg, warning = howtocontinue(repo)
3827 3830 if msg is not None:
3828 3831 if warning:
3829 3832 repo.ui.warn(b"%s\n" % msg)
3830 3833 else:
3831 3834 repo.ui.note(b"%s\n" % msg)
3832 3835
3833 3836
3834 3837 def wrongtooltocontinue(repo, task):
3835 3838 """Raise an abort suggesting how to properly continue if there is an
3836 3839 active task.
3837 3840
3838 3841 Uses howtocontinue() to find the active task.
3839 3842
3840 3843 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3841 3844 a hint.
3842 3845 """
3843 3846 after = howtocontinue(repo)
3844 3847 hint = None
3845 3848 if after[1]:
3846 3849 hint = after[0]
3847 3850 raise error.StateError(_(b'no %s in progress') % task, hint=hint)
3848 3851
3849 3852
3850 3853 def abortgraft(ui, repo, graftstate):
3851 3854 """abort the interrupted graft and rollbacks to the state before interrupted
3852 3855 graft"""
3853 3856 if not graftstate.exists():
3854 3857 raise error.StateError(_(b"no interrupted graft to abort"))
3855 3858 statedata = readgraftstate(repo, graftstate)
3856 3859 newnodes = statedata.get(b'newnodes')
3857 3860 if newnodes is None:
3858 3861 # and old graft state which does not have all the data required to abort
3859 3862 # the graft
3860 3863 raise error.Abort(_(b"cannot abort using an old graftstate"))
3861 3864
3862 3865 # changeset from which graft operation was started
3863 3866 if len(newnodes) > 0:
3864 3867 startctx = repo[newnodes[0]].p1()
3865 3868 else:
3866 3869 startctx = repo[b'.']
3867 3870 # whether to strip or not
3868 3871 cleanup = False
3869 3872
3870 3873 if newnodes:
3871 3874 newnodes = [repo[r].rev() for r in newnodes]
3872 3875 cleanup = True
3873 3876 # checking that none of the newnodes turned public or is public
3874 3877 immutable = [c for c in newnodes if not repo[c].mutable()]
3875 3878 if immutable:
3876 3879 repo.ui.warn(
3877 3880 _(b"cannot clean up public changesets %s\n")
3878 3881 % b', '.join(bytes(repo[r]) for r in immutable),
3879 3882 hint=_(b"see 'hg help phases' for details"),
3880 3883 )
3881 3884 cleanup = False
3882 3885
3883 3886 # checking that no new nodes are created on top of grafted revs
3884 3887 desc = set(repo.changelog.descendants(newnodes))
3885 3888 if desc - set(newnodes):
3886 3889 repo.ui.warn(
3887 3890 _(
3888 3891 b"new changesets detected on destination "
3889 3892 b"branch, can't strip\n"
3890 3893 )
3891 3894 )
3892 3895 cleanup = False
3893 3896
3894 3897 if cleanup:
3895 3898 with repo.wlock(), repo.lock():
3896 3899 mergemod.clean_update(startctx)
3897 3900 # stripping the new nodes created
3898 3901 strippoints = [
3899 3902 c.node() for c in repo.set(b"roots(%ld)", newnodes)
3900 3903 ]
3901 3904 repair.strip(repo.ui, repo, strippoints, backup=False)
3902 3905
3903 3906 if not cleanup:
3904 3907 # we don't update to the startnode if we can't strip
3905 3908 startctx = repo[b'.']
3906 3909 mergemod.clean_update(startctx)
3907 3910
3908 3911 ui.status(_(b"graft aborted\n"))
3909 3912 ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
3910 3913 graftstate.delete()
3911 3914 return 0
3912 3915
3913 3916
3914 3917 def readgraftstate(repo, graftstate):
3915 3918 # type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
3916 3919 """read the graft state file and return a dict of the data stored in it"""
3917 3920 try:
3918 3921 return graftstate.read()
3919 3922 except error.CorruptedState:
3920 3923 nodes = repo.vfs.read(b'graftstate').splitlines()
3921 3924 return {b'nodes': nodes}
3922 3925
3923 3926
3924 3927 def hgabortgraft(ui, repo):
3925 3928 """ abort logic for aborting graft using 'hg abort'"""
3926 3929 with repo.wlock():
3927 3930 graftstate = statemod.cmdstate(repo, b'graftstate')
3928 3931 return abortgraft(ui, repo, graftstate)
@@ -1,412 +1,416 b''
1 1 $ mkdir part1
2 2 $ cd part1
3 3
4 4 $ hg init
5 5 $ echo a > a
6 6 $ hg add a
7 7 $ hg commit -m "1"
8 8 $ hg status
9 9 $ hg copy a b
10 10 $ hg --config ui.portablefilenames=abort copy a con.xml
11 11 abort: filename contains 'con', which is reserved on Windows: con.xml
12 12 [10]
13 13 $ hg status
14 14 A b
15 15 $ hg sum
16 16 parent: 0:c19d34741b0a tip
17 17 1
18 18 branch: default
19 19 commit: 1 copied
20 20 update: (current)
21 21 phases: 1 draft
22 22 $ hg --debug commit -m "2"
23 23 committing files:
24 24 b
25 25 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
26 26 committing manifest
27 27 committing changelog
28 28 updating the branch cache
29 29 committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
30 30
31 31 we should see two history entries
32 32
33 33 $ hg history -v
34 34 changeset: 1:93580a2c28a5
35 35 tag: tip
36 36 user: test
37 37 date: Thu Jan 01 00:00:00 1970 +0000
38 38 files: b
39 39 description:
40 40 2
41 41
42 42
43 43 changeset: 0:c19d34741b0a
44 44 user: test
45 45 date: Thu Jan 01 00:00:00 1970 +0000
46 46 files: a
47 47 description:
48 48 1
49 49
50 50
51 51
52 52 we should see one log entry for a
53 53
54 54 $ hg log a
55 55 changeset: 0:c19d34741b0a
56 56 user: test
57 57 date: Thu Jan 01 00:00:00 1970 +0000
58 58 summary: 1
59 59
60 60
61 61 this should show a revision linked to changeset 0
62 62
63 63 $ hg debugindex a
64 64 rev linkrev nodeid p1 p2
65 65 0 0 b789fdd96dc2 000000000000 000000000000
66 66
67 67 we should see one log entry for b
68 68
69 69 $ hg log b
70 70 changeset: 1:93580a2c28a5
71 71 tag: tip
72 72 user: test
73 73 date: Thu Jan 01 00:00:00 1970 +0000
74 74 summary: 2
75 75
76 76
77 77 this should show a revision linked to changeset 1
78 78
79 79 $ hg debugindex b
80 80 rev linkrev nodeid p1 p2
81 81 0 1 37d9b5d994ea 000000000000 000000000000
82 82
83 83 this should show the rename information in the metadata
84 84
85 85 $ hg debugdata b 0 | head -3 | tail -2
86 86 copy: a
87 87 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
88 88
89 89 #if reporevlogstore
90 90 $ md5sum.py .hg/store/data/b.i
91 91 44913824c8f5890ae218f9829535922e .hg/store/data/b.i
92 92 #endif
93 93 $ hg cat b > bsum
94 94 $ md5sum.py bsum
95 95 60b725f10c9c85c70d97880dfe8191b3 bsum
96 96 $ hg cat a > asum
97 97 $ md5sum.py asum
98 98 60b725f10c9c85c70d97880dfe8191b3 asum
99 99 $ hg verify
100 100 checking changesets
101 101 checking manifests
102 102 crosschecking files in changesets and manifests
103 103 checking files
104 104 checked 2 changesets with 2 changes to 2 files
105 105
106 106 $ cd ..
107 107
108 108
109 109 $ mkdir part2
110 110 $ cd part2
111 111
112 112 $ hg init
113 113 $ echo foo > foo
114 114 should fail - foo is not managed
115 115 $ hg mv foo bar
116 116 foo: not copying - file is not managed
117 117 abort: no files to copy
118 (maybe you meant to use --after --at-rev=.)
118 119 [10]
119 120 $ hg st -A
120 121 ? foo
121 122 respects ui.relative-paths
122 123 $ mkdir dir
123 124 $ cd dir
124 125 $ hg mv ../foo ../bar
125 126 ../foo: not copying - file is not managed
126 127 abort: no files to copy
128 (maybe you meant to use --after --at-rev=.)
127 129 [10]
128 130 $ hg mv ../foo ../bar --config ui.relative-paths=yes
129 131 ../foo: not copying - file is not managed
130 132 abort: no files to copy
133 (maybe you meant to use --after --at-rev=.)
131 134 [10]
132 135 $ hg mv ../foo ../bar --config ui.relative-paths=no
133 136 foo: not copying - file is not managed
134 137 abort: no files to copy
138 (maybe you meant to use --after --at-rev=.)
135 139 [10]
136 140 $ cd ..
137 141 $ rmdir dir
138 142 $ hg add foo
139 143 dry-run; print a warning that this is not a real copy; foo is added
140 144 $ hg mv --dry-run foo bar
141 145 foo has not been committed yet, so no copy data will be stored for bar.
142 146 $ hg st -A
143 147 A foo
144 148 should print a warning that this is not a real copy; bar is added
145 149 $ hg mv foo bar
146 150 foo has not been committed yet, so no copy data will be stored for bar.
147 151 $ hg st -A
148 152 A bar
149 153 should print a warning that this is not a real copy; foo is added
150 154 $ hg cp bar foo
151 155 bar has not been committed yet, so no copy data will be stored for foo.
152 156 $ hg rm -f bar
153 157 $ rm bar
154 158 $ hg st -A
155 159 A foo
156 160 $ hg commit -m1
157 161
158 162 moving a missing file
159 163 $ rm foo
160 164 $ hg mv foo foo3
161 165 foo: deleted in working directory
162 166 foo3 does not exist!
163 167 $ hg up -qC .
164 168
165 169 copy --after to a nonexistent target filename
166 170 $ hg cp -A foo dummy
167 171 foo: not recording copy - dummy does not exist
168 172 [1]
169 173
170 174 dry-run; should show that foo is clean
171 175 $ hg copy --dry-run foo bar
172 176 $ hg st -A
173 177 C foo
174 178 should show copy
175 179 $ hg copy foo bar
176 180 $ hg st -C
177 181 A bar
178 182 foo
179 183
180 184 shouldn't show copy
181 185 $ hg commit -m2
182 186 $ hg st -C
183 187
184 188 should match
185 189 $ hg debugindex foo
186 190 rev linkrev nodeid p1 p2
187 191 0 0 2ed2a3912a0b 000000000000 000000000000
188 192 $ hg debugrename bar
189 193 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
190 194
191 195 $ echo bleah > foo
192 196 $ echo quux > bar
193 197 $ hg commit -m3
194 198
195 199 should not be renamed
196 200 $ hg debugrename bar
197 201 bar not renamed
198 202
199 203 $ hg copy -f foo bar
200 204 should show copy
201 205 $ hg st -C
202 206 M bar
203 207 foo
204 208
205 209 XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be
206 210 displayed.
207 211 $ hg st -C --config extensions.largefiles=
208 212 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
209 213 M bar
210 214 foo
211 215
212 216 $ hg commit -m3
213 217
214 218 should show no parents for tip
215 219 $ hg debugindex bar
216 220 rev linkrev nodeid p1 p2
217 221 0 1 7711d36246cc 000000000000 000000000000
218 222 1 2 bdf70a2b8d03 7711d36246cc 000000000000
219 223 2 3 b2558327ea8d 000000000000 000000000000
220 224 should match
221 225 $ hg debugindex foo
222 226 rev linkrev nodeid p1 p2
223 227 0 0 2ed2a3912a0b 000000000000 000000000000
224 228 1 2 dd12c926cf16 2ed2a3912a0b 000000000000
225 229 $ hg debugrename bar
226 230 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
227 231
228 232 should show no copies
229 233 $ hg st -C
230 234
231 235 note: since filelog based copy tracing only trace copy for new file, the copy information here is not displayed.
232 236
233 237 $ hg status --copies --change .
234 238 M bar
235 239
236 240 They are a devel option to walk all file and fine this information anyway.
237 241
238 242 $ hg status --copies --change . --config devel.copy-tracing.trace-all-files=yes
239 243 M bar
240 244 foo
241 245
242 246 copy --after on an added file
243 247 $ cp bar baz
244 248 $ hg add baz
245 249 $ hg cp -A bar baz
246 250 $ hg st -C
247 251 A baz
248 252 bar
249 253
250 254 foo was clean:
251 255 $ hg st -AC foo
252 256 C foo
253 257 Trying to copy on top of an existing file fails,
254 258 $ hg copy -A bar foo
255 259 foo: not overwriting - file already committed
256 260 ('hg copy --after --force' to replace the file by recording a copy)
257 261 [1]
258 262 same error without the --after, so the user doesn't have to go through
259 263 two hints:
260 264 $ hg copy bar foo
261 265 foo: not overwriting - file already committed
262 266 ('hg copy --force' to replace the file by recording a copy)
263 267 [1]
264 268 but it's considered modified after a copy --after --force
265 269 $ hg copy -Af bar foo
266 270 $ hg st -AC foo
267 271 M foo
268 272 bar
269 273 The hint for a file that exists but is not in file history doesn't
270 274 mention --force:
271 275 $ touch xyzzy
272 276 $ hg cp bar xyzzy
273 277 xyzzy: not overwriting - file exists
274 278 ('hg copy --after' to record the copy)
275 279 [1]
276 280 $ hg co -qC .
277 281 $ rm baz xyzzy
278 282
279 283
280 284 Test unmarking copy/rename of a single file
281 285
282 286 # Set up by creating a copy
283 287 $ hg cp bar baz
284 288 # Test unmarking as copy a non-existent file
285 289 $ hg copy --forget non-existent
286 290 non-existent: $ENOENT$
287 291 $ hg rename --forget non-existent
288 292 non-existent: $ENOENT$
289 293 # Test unmarking as copy an tracked but unrelated file
290 294 $ hg copy --forget foo
291 295 foo: not unmarking as copy - file is not marked as copied
292 296 $ hg rename --forget foo
293 297 foo: not unmarking as copy - file is not marked as copied
294 298 # Test unmarking as copy a copy source
295 299 $ hg copy --forget bar
296 300 bar: not unmarking as copy - file is not marked as copied
297 301 $ hg rename --forget bar
298 302 bar: not unmarking as copy - file is not marked as copied
299 303 # baz should still be marked as a copy
300 304 $ hg st -C
301 305 A baz
302 306 bar
303 307 # Test the normal case
304 308 $ hg copy --forget baz
305 309 $ hg st -C
306 310 A baz
307 311 $ rm bar
308 312 $ hg rename --after bar baz
309 313 $ hg st -C
310 314 A baz
311 315 bar
312 316 R bar
313 317 $ hg rename --forget baz
314 318 $ hg st -C
315 319 A baz
316 320 R bar
317 321 $ hg revert bar
318 322 # Test unmarking as copy with matching an non-matching patterns
319 323 $ hg cp bar baz --after
320 324 $ hg copy --forget bar baz
321 325 bar: not unmarking as copy - file is not marked as copied
322 326 $ hg cp bar baz --after
323 327 $ hg rename --forget bar baz
324 328 bar: not unmarking as copy - file is not marked as copied
325 329 $ hg st -C
326 330 A baz
327 331 # Test unmarking as copy with no exact matches
328 332 $ hg cp bar baz --after
329 333 $ hg copy --forget .
330 334 $ hg st -C
331 335 A baz
332 336 $ hg cp bar baz --after
333 337 $ hg st -C
334 338 A baz
335 339 bar
336 340 $ hg rename --forget .
337 341 $ hg st -C
338 342 A baz
339 343 $ hg forget baz
340 344 $ rm baz
341 345
342 346 Test unmarking copy of a directory
343 347
344 348 $ mkdir dir
345 349 $ echo foo > dir/foo
346 350 $ echo bar > dir/bar
347 351 $ hg add dir
348 352 adding dir/bar
349 353 adding dir/foo
350 354 $ hg ci -m 'add dir/'
351 355 $ hg cp dir dir2
352 356 copying dir/bar to dir2/bar
353 357 copying dir/foo to dir2/foo
354 358 $ touch dir2/untracked
355 359 $ hg copy --forget dir2
356 360 $ hg st -C
357 361 A dir2/bar
358 362 A dir2/foo
359 363 ? dir2/untracked
360 364 # Clean up for next test
361 365 $ hg forget dir2
362 366 removing dir2/bar
363 367 removing dir2/foo
364 368 $ rm -r dir2
365 369
366 370 Test uncopy on committed copies
367 371
368 372 # Commit some copies
369 373 $ hg cp bar baz
370 374 $ hg cp bar qux
371 375 $ hg ci -m copies
372 376 $ hg st -C --change .
373 377 A baz
374 378 bar
375 379 A qux
376 380 bar
377 381 $ base=$(hg log -r '.^' -T '{rev}')
378 382 $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
379 383 @ 5:a612dc2edfda copies
380 384 |
381 385 o 4:4800b1f1f38e add dir/
382 386 |
383 387 ~
384 388 # Add a dirty change on top to show that it's unaffected
385 389 $ echo dirty >> baz
386 390 $ hg st
387 391 M baz
388 392 $ cat baz
389 393 bleah
390 394 dirty
391 395 $ hg copy --forget --at-rev . baz
392 396 saved backup bundle to $TESTTMP/part2/.hg/strip-backup/a612dc2edfda-e36b4448-uncopy.hg
393 397 # The unwanted copy is no longer recorded, but the unrelated one is
394 398 $ hg st -C --change .
395 399 A baz
396 400 A qux
397 401 bar
398 402 # The old commit is gone and we have updated to the new commit
399 403 $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
400 404 @ 5:c45090e5effe copies
401 405 |
402 406 o 4:4800b1f1f38e add dir/
403 407 |
404 408 ~
405 409 # Working copy still has the uncommitted change
406 410 $ hg st
407 411 M baz
408 412 $ cat baz
409 413 bleah
410 414 dirty
411 415
412 416 $ cd ..
@@ -1,285 +1,286 b''
1 1 #require no-windows
2 2
3 3 $ . "$TESTDIR/remotefilelog-library.sh"
4 4
5 5 $ hg init master
6 6 $ cd master
7 7 $ cat >> .hg/hgrc <<EOF
8 8 > [remotefilelog]
9 9 > server=True
10 10 > EOF
11 11 $ echo x > x
12 12 $ echo z > z
13 13 $ hg commit -qAm x
14 14 $ echo x2 > x
15 15 $ echo y > y
16 16 $ hg commit -qAm y
17 17 $ hg bookmark foo
18 18
19 19 $ cd ..
20 20
21 21 # prefetch a revision
22 22
23 23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
24 24 streaming all changes
25 25 2 files to transfer, 528 bytes of data (no-zstd !)
26 26 transferred 528 bytes in * seconds (* */sec) (glob) (no-zstd !)
27 27 2 files to transfer, 532 bytes of data (zstd !)
28 28 transferred 532 bytes in * seconds (* */sec) (glob) (zstd !)
29 29 searching for changes
30 30 no changes found
31 31 $ cd shallow
32 32
33 33 $ hg prefetch -r 0
34 34 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
35 35
36 36 $ hg cat -r 0 x
37 37 x
38 38
39 39 # prefetch with base
40 40
41 41 $ clearcache
42 42 $ hg prefetch -r 0::1 -b 0
43 43 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
44 44
45 45 $ hg cat -r 1 x
46 46 x2
47 47 $ hg cat -r 1 y
48 48 y
49 49
50 50 $ hg cat -r 0 x
51 51 x
52 52 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
53 53
54 54 $ hg cat -r 0 z
55 55 z
56 56 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
57 57
58 58 $ hg prefetch -r 0::1 --base 0
59 59 $ hg prefetch -r 0::1 -b 1
60 60 $ hg prefetch -r 0::1
61 61
62 62 # prefetch a range of revisions
63 63
64 64 $ clearcache
65 65 $ hg prefetch -r 0::1
66 66 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over *s (glob)
67 67
68 68 $ hg cat -r 0 x
69 69 x
70 70 $ hg cat -r 1 x
71 71 x2
72 72
73 73 # prefetch certain files
74 74
75 75 $ clearcache
76 76 $ hg prefetch -r 1 x
77 77 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
78 78
79 79 $ hg cat -r 1 x
80 80 x2
81 81
82 82 $ hg cat -r 1 y
83 83 y
84 84 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
85 85
86 86 # prefetch on pull when configured
87 87
88 88 $ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc
89 89 $ hg strip tip
90 90 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
91 91 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
92 92
93 93 $ clearcache
94 94 $ hg pull
95 95 pulling from ssh://user@dummy/master
96 96 searching for changes
97 97 adding changesets
98 98 adding manifests
99 99 adding file changes
100 100 updating bookmark foo
101 101 added 1 changesets with 0 changes to 0 files
102 102 new changesets 109c3a557a73
103 103 (run 'hg update' to get a working copy)
104 104 prefetching file contents
105 105 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
106 106
107 107 $ hg up tip
108 108 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
109 109
110 110 # prefetch only fetches changes not in working copy
111 111
112 112 $ hg strip tip
113 113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
114 114 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
115 115 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
116 116 $ clearcache
117 117
118 118 $ hg pull
119 119 pulling from ssh://user@dummy/master
120 120 searching for changes
121 121 adding changesets
122 122 adding manifests
123 123 adding file changes
124 124 updating bookmark foo
125 125 added 1 changesets with 0 changes to 0 files
126 126 new changesets 109c3a557a73
127 127 (run 'hg update' to get a working copy)
128 128 prefetching file contents
129 129 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
130 130
131 131 # Make some local commits that produce the same file versions as are on the
132 132 # server. To simulate a situation where we have local commits that were somehow
133 133 # pushed, and we will soon pull.
134 134
135 135 $ hg prefetch -r 'all()'
136 136 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
137 137 $ hg strip -q -r 0
138 138 $ echo x > x
139 139 $ echo z > z
140 140 $ hg commit -qAm x
141 141 $ echo x2 > x
142 142 $ echo y > y
143 143 $ hg commit -qAm y
144 144
145 145 # prefetch server versions, even if local versions are available
146 146
147 147 $ clearcache
148 148 $ hg strip -q tip
149 149 $ hg pull
150 150 pulling from ssh://user@dummy/master
151 151 searching for changes
152 152 adding changesets
153 153 adding manifests
154 154 adding file changes
155 155 updating bookmark foo
156 156 added 1 changesets with 0 changes to 0 files
157 157 new changesets 109c3a557a73
158 158 1 local changesets published (?)
159 159 (run 'hg update' to get a working copy)
160 160 prefetching file contents
161 161 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
162 162
163 163 $ cd ..
164 164
165 165 # Prefetch unknown files during checkout
166 166
167 167 $ hgcloneshallow ssh://user@dummy/master shallow2
168 168 streaming all changes
169 169 2 files to transfer, 528 bytes of data (no-zstd !)
170 170 transferred 528 bytes in * seconds * (glob) (no-zstd !)
171 171 2 files to transfer, 532 bytes of data (zstd !)
172 172 transferred 532 bytes in * seconds (* */sec) (glob) (zstd !)
173 173 searching for changes
174 174 no changes found
175 175 updating to branch default
176 176 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
177 177 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
178 178 $ cd shallow2
179 179 $ hg up -q null
180 180 $ echo x > x
181 181 $ echo y > y
182 182 $ echo z > z
183 183 $ clearcache
184 184 $ hg up tip
185 185 x: untracked file differs
186 186 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
187 187 abort: untracked files in working directory differ from files in requested revision
188 188 [20]
189 189 $ hg revert --all
190 190
191 191 # Test batch fetching of lookup files during hg status
192 192 $ hg up --clean tip
193 193 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
194 194 $ hg debugrebuilddirstate
195 195 $ clearcache
196 196 $ hg status
197 197 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
198 198
199 199 # Prefetch during addrename detection
200 200 $ hg up -q --clean tip
201 201 $ hg revert --all
202 202 $ mv x x2
203 203 $ mv y y2
204 204 $ mv z z2
205 205 $ echo a > a
206 206 $ hg add a
207 207 $ rm a
208 208 $ clearcache
209 209 $ hg addremove -s 50 > /dev/null
210 210 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
211 211 $ hg revert --all
212 212 forgetting x2
213 213 forgetting y2
214 214 forgetting z2
215 215 undeleting x
216 216 undeleting y
217 217 undeleting z
218 218
219 219
220 220 # Revert across double renames. Note: the scary "abort", error is because
221 221 # https://bz.mercurial-scm.org/5419 .
222 222
223 223 $ cd ../master
224 224 $ hg mv z z2
225 225 $ hg commit -m 'move z -> z2'
226 226 $ cd ../shallow2
227 227 $ hg pull -q
228 228 $ clearcache
229 229 $ hg mv y y2
230 230 y2: not overwriting - file exists
231 231 ('hg rename --after' to record the rename)
232 232 [1]
233 233 $ hg mv x x2
234 234 x2: not overwriting - file exists
235 235 ('hg rename --after' to record the rename)
236 236 [1]
237 237 $ hg mv z2 z3
238 238 z2: not copying - file is not managed
239 239 abort: no files to copy
240 (maybe you meant to use --after --at-rev=.)
240 241 [10]
241 242 $ find $CACHEDIR -type f | sort
242 243 .. The following output line about files fetches is globed because it is
243 244 .. flaky, the core the test is checked when checking the cache dir, so
244 245 .. hopefully this flakyness is not hiding any actual bug.
245 246 $ hg revert -a -r 1 || true
246 247 ? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob)
247 248 abort: z2@109c3a557a73: not found in manifest (?)
248 249 $ find $CACHEDIR -type f | sort
249 250 $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0
250 251 $TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a
251 252 $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca
252 253 $TESTTMP/hgcache/repos
253 254
254 255 # warning when we have excess remotefilelog fetching
255 256
256 257 $ cat > repeated_fetch.py << EOF
257 258 > import binascii
258 259 > from mercurial import extensions, registrar
259 260 > cmdtable = {}
260 261 > command = registrar.command(cmdtable)
261 262 > @command(b'repeated-fetch', [], b'', inferrepo=True)
262 263 > def repeated_fetch(ui, repo, *args, **opts):
263 264 > for i in range(20):
264 265 > try:
265 266 > hexid = (b'%02x' % (i + 1)) * 20
266 267 > repo.fileservice.prefetch([(b'somefile.txt', hexid)])
267 268 > except Exception:
268 269 > pass
269 270 > EOF
270 271
271 272 We should only output to the user once. We're ignoring most of the output
272 273 because we're not actually fetching anything real here, all the hashes are
273 274 bogus, so it's just going to be errors and a final summary of all the misses.
274 275 $ hg --config extensions.repeated_fetch=repeated_fetch.py \
275 276 > --config remotefilelog.fetchwarning="fetch warning!" \
276 277 > --config extensions.blackbox= \
277 278 > repeated-fetch 2>&1 | grep 'fetch warning'
278 279 fetch warning!
279 280
280 281 We should output to blackbox three times, with a stack trace on each (though
281 282 that isn't tested here).
282 283 $ grep 'excess remotefilelog fetching' .hg/blackbox.log
283 284 .* excess remotefilelog fetching: (re)
284 285 .* excess remotefilelog fetching: (re)
285 286 .* excess remotefilelog fetching: (re)
General Comments 0
You need to be logged in to leave comments. Login now