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