##// END OF EJS Templates
copy: add option to unmark file as copied...
Martin von Zweigbergk -
r44844:8be0c635 default
parent child Browse files
Show More
@@ -1,4075 +1,4096 b''
1 1 # cmdutil.py - help for command processing in mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@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 mergeutil,
42 42 obsolete,
43 43 patch,
44 44 pathutil,
45 45 phases,
46 46 pycompat,
47 47 repair,
48 48 revlog,
49 49 rewriteutil,
50 50 scmutil,
51 51 smartset,
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.Abort(
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.Abort(_(b"cannot store a note of more than 255 bytes"))
337 337 if b'\n' in note:
338 338 raise error.Abort(_(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 return cmd.split(b"|")
364 364
365 365
366 366 def setupwrapcolorwrite(ui):
367 367 # wrap ui.write so diff output can be labeled/colorized
368 368 def wrapwrite(orig, *args, **kw):
369 369 label = kw.pop('label', b'')
370 370 for chunk, l in patch.difflabel(lambda: args):
371 371 orig(chunk, label=label + l)
372 372
373 373 oldwrite = ui.write
374 374
375 375 def wrap(*args, **kwargs):
376 376 return wrapwrite(oldwrite, *args, **kwargs)
377 377
378 378 setattr(ui, 'write', wrap)
379 379 return oldwrite
380 380
381 381
382 382 def filterchunks(ui, originalhunks, usecurses, testfile, match, operation=None):
383 383 try:
384 384 if usecurses:
385 385 if testfile:
386 386 recordfn = crecordmod.testdecorator(
387 387 testfile, crecordmod.testchunkselector
388 388 )
389 389 else:
390 390 recordfn = crecordmod.chunkselector
391 391
392 392 return crecordmod.filterpatch(
393 393 ui, originalhunks, recordfn, operation
394 394 )
395 395 except crecordmod.fallbackerror as e:
396 396 ui.warn(b'%s\n' % e)
397 397 ui.warn(_(b'falling back to text mode\n'))
398 398
399 399 return patch.filterpatch(ui, originalhunks, match, operation)
400 400
401 401
402 402 def recordfilter(ui, originalhunks, match, operation=None):
403 403 """ Prompts the user to filter the originalhunks and return a list of
404 404 selected hunks.
405 405 *operation* is used for to build ui messages to indicate the user what
406 406 kind of filtering they are doing: reverting, committing, shelving, etc.
407 407 (see patch.filterpatch).
408 408 """
409 409 usecurses = crecordmod.checkcurses(ui)
410 410 testfile = ui.config(b'experimental', b'crecordtest')
411 411 oldwrite = setupwrapcolorwrite(ui)
412 412 try:
413 413 newchunks, newopts = filterchunks(
414 414 ui, originalhunks, usecurses, testfile, match, operation
415 415 )
416 416 finally:
417 417 ui.write = oldwrite
418 418 return newchunks, newopts
419 419
420 420
421 421 def dorecord(
422 422 ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
423 423 ):
424 424 opts = pycompat.byteskwargs(opts)
425 425 if not ui.interactive():
426 426 if cmdsuggest:
427 427 msg = _(b'running non-interactively, use %s instead') % cmdsuggest
428 428 else:
429 429 msg = _(b'running non-interactively')
430 430 raise error.Abort(msg)
431 431
432 432 # make sure username is set before going interactive
433 433 if not opts.get(b'user'):
434 434 ui.username() # raise exception, username not provided
435 435
436 436 def recordfunc(ui, repo, message, match, opts):
437 437 """This is generic record driver.
438 438
439 439 Its job is to interactively filter local changes, and
440 440 accordingly prepare working directory into a state in which the
441 441 job can be delegated to a non-interactive commit command such as
442 442 'commit' or 'qrefresh'.
443 443
444 444 After the actual job is done by non-interactive command, the
445 445 working directory is restored to its original state.
446 446
447 447 In the end we'll record interesting changes, and everything else
448 448 will be left in place, so the user can continue working.
449 449 """
450 450 if not opts.get(b'interactive-unshelve'):
451 451 checkunfinished(repo, commit=True)
452 452 wctx = repo[None]
453 453 merge = len(wctx.parents()) > 1
454 454 if merge:
455 455 raise error.Abort(
456 456 _(
457 457 b'cannot partially commit a merge '
458 458 b'(use "hg commit" instead)'
459 459 )
460 460 )
461 461
462 462 def fail(f, msg):
463 463 raise error.Abort(b'%s: %s' % (f, msg))
464 464
465 465 force = opts.get(b'force')
466 466 if not force:
467 467 match = matchmod.badmatch(match, fail)
468 468
469 469 status = repo.status(match=match)
470 470
471 471 overrides = {(b'ui', b'commitsubrepos'): True}
472 472
473 473 with repo.ui.configoverride(overrides, b'record'):
474 474 # subrepoutil.precommit() modifies the status
475 475 tmpstatus = scmutil.status(
476 476 copymod.copy(status.modified),
477 477 copymod.copy(status.added),
478 478 copymod.copy(status.removed),
479 479 copymod.copy(status.deleted),
480 480 copymod.copy(status.unknown),
481 481 copymod.copy(status.ignored),
482 482 copymod.copy(status.clean), # pytype: disable=wrong-arg-count
483 483 )
484 484
485 485 # Force allows -X subrepo to skip the subrepo.
486 486 subs, commitsubs, newstate = subrepoutil.precommit(
487 487 repo.ui, wctx, tmpstatus, match, force=True
488 488 )
489 489 for s in subs:
490 490 if s in commitsubs:
491 491 dirtyreason = wctx.sub(s).dirtyreason(True)
492 492 raise error.Abort(dirtyreason)
493 493
494 494 if not force:
495 495 repo.checkcommitpatterns(wctx, match, status, fail)
496 496 diffopts = patch.difffeatureopts(
497 497 ui,
498 498 opts=opts,
499 499 whitespace=True,
500 500 section=b'commands',
501 501 configprefix=b'commit.interactive.',
502 502 )
503 503 diffopts.nodates = True
504 504 diffopts.git = True
505 505 diffopts.showfunc = True
506 506 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
507 507 originalchunks = patch.parsepatch(originaldiff)
508 508 match = scmutil.match(repo[None], pats)
509 509
510 510 # 1. filter patch, since we are intending to apply subset of it
511 511 try:
512 512 chunks, newopts = filterfn(ui, originalchunks, match)
513 513 except error.PatchError as err:
514 514 raise error.Abort(_(b'error parsing patch: %s') % err)
515 515 opts.update(newopts)
516 516
517 517 # We need to keep a backup of files that have been newly added and
518 518 # modified during the recording process because there is a previous
519 519 # version without the edit in the workdir. We also will need to restore
520 520 # files that were the sources of renames so that the patch application
521 521 # works.
522 522 newlyaddedandmodifiedfiles, alsorestore = newandmodified(
523 523 chunks, originalchunks
524 524 )
525 525 contenders = set()
526 526 for h in chunks:
527 527 try:
528 528 contenders.update(set(h.files()))
529 529 except AttributeError:
530 530 pass
531 531
532 532 changed = status.modified + status.added + status.removed
533 533 newfiles = [f for f in changed if f in contenders]
534 534 if not newfiles:
535 535 ui.status(_(b'no changes to record\n'))
536 536 return 0
537 537
538 538 modified = set(status.modified)
539 539
540 540 # 2. backup changed files, so we can restore them in the end
541 541
542 542 if backupall:
543 543 tobackup = changed
544 544 else:
545 545 tobackup = [
546 546 f
547 547 for f in newfiles
548 548 if f in modified or f in newlyaddedandmodifiedfiles
549 549 ]
550 550 backups = {}
551 551 if tobackup:
552 552 backupdir = repo.vfs.join(b'record-backups')
553 553 try:
554 554 os.mkdir(backupdir)
555 555 except OSError as err:
556 556 if err.errno != errno.EEXIST:
557 557 raise
558 558 try:
559 559 # backup continues
560 560 for f in tobackup:
561 561 fd, tmpname = pycompat.mkstemp(
562 562 prefix=f.replace(b'/', b'_') + b'.', dir=backupdir
563 563 )
564 564 os.close(fd)
565 565 ui.debug(b'backup %r as %r\n' % (f, tmpname))
566 566 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
567 567 backups[f] = tmpname
568 568
569 569 fp = stringio()
570 570 for c in chunks:
571 571 fname = c.filename()
572 572 if fname in backups:
573 573 c.write(fp)
574 574 dopatch = fp.tell()
575 575 fp.seek(0)
576 576
577 577 # 2.5 optionally review / modify patch in text editor
578 578 if opts.get(b'review', False):
579 579 patchtext = (
580 580 crecordmod.diffhelptext
581 581 + crecordmod.patchhelptext
582 582 + fp.read()
583 583 )
584 584 reviewedpatch = ui.edit(
585 585 patchtext, b"", action=b"diff", repopath=repo.path
586 586 )
587 587 fp.truncate(0)
588 588 fp.write(reviewedpatch)
589 589 fp.seek(0)
590 590
591 591 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
592 592 # 3a. apply filtered patch to clean repo (clean)
593 593 if backups:
594 594 m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
595 595 mergemod.revert_to(repo[b'.'], matcher=m)
596 596
597 597 # 3b. (apply)
598 598 if dopatch:
599 599 try:
600 600 ui.debug(b'applying patch\n')
601 601 ui.debug(fp.getvalue())
602 602 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
603 603 except error.PatchError as err:
604 604 raise error.Abort(pycompat.bytestr(err))
605 605 del fp
606 606
607 607 # 4. We prepared working directory according to filtered
608 608 # patch. Now is the time to delegate the job to
609 609 # commit/qrefresh or the like!
610 610
611 611 # Make all of the pathnames absolute.
612 612 newfiles = [repo.wjoin(nf) for nf in newfiles]
613 613 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
614 614 finally:
615 615 # 5. finally restore backed-up files
616 616 try:
617 617 dirstate = repo.dirstate
618 618 for realname, tmpname in pycompat.iteritems(backups):
619 619 ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
620 620
621 621 if dirstate[realname] == b'n':
622 622 # without normallookup, restoring timestamp
623 623 # may cause partially committed files
624 624 # to be treated as unmodified
625 625 dirstate.normallookup(realname)
626 626
627 627 # copystat=True here and above are a hack to trick any
628 628 # editors that have f open that we haven't modified them.
629 629 #
630 630 # Also note that this racy as an editor could notice the
631 631 # file's mtime before we've finished writing it.
632 632 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
633 633 os.unlink(tmpname)
634 634 if tobackup:
635 635 os.rmdir(backupdir)
636 636 except OSError:
637 637 pass
638 638
639 639 def recordinwlock(ui, repo, message, match, opts):
640 640 with repo.wlock():
641 641 return recordfunc(ui, repo, message, match, opts)
642 642
643 643 return commit(ui, repo, recordinwlock, pats, opts)
644 644
645 645
646 646 class dirnode(object):
647 647 """
648 648 Represent a directory in user working copy with information required for
649 649 the purpose of tersing its status.
650 650
651 651 path is the path to the directory, without a trailing '/'
652 652
653 653 statuses is a set of statuses of all files in this directory (this includes
654 654 all the files in all the subdirectories too)
655 655
656 656 files is a list of files which are direct child of this directory
657 657
658 658 subdirs is a dictionary of sub-directory name as the key and it's own
659 659 dirnode object as the value
660 660 """
661 661
662 662 def __init__(self, dirpath):
663 663 self.path = dirpath
664 664 self.statuses = set()
665 665 self.files = []
666 666 self.subdirs = {}
667 667
668 668 def _addfileindir(self, filename, status):
669 669 """Add a file in this directory as a direct child."""
670 670 self.files.append((filename, status))
671 671
672 672 def addfile(self, filename, status):
673 673 """
674 674 Add a file to this directory or to its direct parent directory.
675 675
676 676 If the file is not direct child of this directory, we traverse to the
677 677 directory of which this file is a direct child of and add the file
678 678 there.
679 679 """
680 680
681 681 # the filename contains a path separator, it means it's not the direct
682 682 # child of this directory
683 683 if b'/' in filename:
684 684 subdir, filep = filename.split(b'/', 1)
685 685
686 686 # does the dirnode object for subdir exists
687 687 if subdir not in self.subdirs:
688 688 subdirpath = pathutil.join(self.path, subdir)
689 689 self.subdirs[subdir] = dirnode(subdirpath)
690 690
691 691 # try adding the file in subdir
692 692 self.subdirs[subdir].addfile(filep, status)
693 693
694 694 else:
695 695 self._addfileindir(filename, status)
696 696
697 697 if status not in self.statuses:
698 698 self.statuses.add(status)
699 699
700 700 def iterfilepaths(self):
701 701 """Yield (status, path) for files directly under this directory."""
702 702 for f, st in self.files:
703 703 yield st, pathutil.join(self.path, f)
704 704
705 705 def tersewalk(self, terseargs):
706 706 """
707 707 Yield (status, path) obtained by processing the status of this
708 708 dirnode.
709 709
710 710 terseargs is the string of arguments passed by the user with `--terse`
711 711 flag.
712 712
713 713 Following are the cases which can happen:
714 714
715 715 1) All the files in the directory (including all the files in its
716 716 subdirectories) share the same status and the user has asked us to terse
717 717 that status. -> yield (status, dirpath). dirpath will end in '/'.
718 718
719 719 2) Otherwise, we do following:
720 720
721 721 a) Yield (status, filepath) for all the files which are in this
722 722 directory (only the ones in this directory, not the subdirs)
723 723
724 724 b) Recurse the function on all the subdirectories of this
725 725 directory
726 726 """
727 727
728 728 if len(self.statuses) == 1:
729 729 onlyst = self.statuses.pop()
730 730
731 731 # Making sure we terse only when the status abbreviation is
732 732 # passed as terse argument
733 733 if onlyst in terseargs:
734 734 yield onlyst, self.path + b'/'
735 735 return
736 736
737 737 # add the files to status list
738 738 for st, fpath in self.iterfilepaths():
739 739 yield st, fpath
740 740
741 741 # recurse on the subdirs
742 742 for dirobj in self.subdirs.values():
743 743 for st, fpath in dirobj.tersewalk(terseargs):
744 744 yield st, fpath
745 745
746 746
747 747 def tersedir(statuslist, terseargs):
748 748 """
749 749 Terse the status if all the files in a directory shares the same status.
750 750
751 751 statuslist is scmutil.status() object which contains a list of files for
752 752 each status.
753 753 terseargs is string which is passed by the user as the argument to `--terse`
754 754 flag.
755 755
756 756 The function makes a tree of objects of dirnode class, and at each node it
757 757 stores the information required to know whether we can terse a certain
758 758 directory or not.
759 759 """
760 760 # the order matters here as that is used to produce final list
761 761 allst = (b'm', b'a', b'r', b'd', b'u', b'i', b'c')
762 762
763 763 # checking the argument validity
764 764 for s in pycompat.bytestr(terseargs):
765 765 if s not in allst:
766 766 raise error.Abort(_(b"'%s' not recognized") % s)
767 767
768 768 # creating a dirnode object for the root of the repo
769 769 rootobj = dirnode(b'')
770 770 pstatus = (
771 771 b'modified',
772 772 b'added',
773 773 b'deleted',
774 774 b'clean',
775 775 b'unknown',
776 776 b'ignored',
777 777 b'removed',
778 778 )
779 779
780 780 tersedict = {}
781 781 for attrname in pstatus:
782 782 statuschar = attrname[0:1]
783 783 for f in getattr(statuslist, attrname):
784 784 rootobj.addfile(f, statuschar)
785 785 tersedict[statuschar] = []
786 786
787 787 # we won't be tersing the root dir, so add files in it
788 788 for st, fpath in rootobj.iterfilepaths():
789 789 tersedict[st].append(fpath)
790 790
791 791 # process each sub-directory and build tersedict
792 792 for subdir in rootobj.subdirs.values():
793 793 for st, f in subdir.tersewalk(terseargs):
794 794 tersedict[st].append(f)
795 795
796 796 tersedlist = []
797 797 for st in allst:
798 798 tersedict[st].sort()
799 799 tersedlist.append(tersedict[st])
800 800
801 801 return scmutil.status(*tersedlist)
802 802
803 803
804 804 def _commentlines(raw):
805 805 '''Surround lineswith a comment char and a new line'''
806 806 lines = raw.splitlines()
807 807 commentedlines = [b'# %s' % line for line in lines]
808 808 return b'\n'.join(commentedlines) + b'\n'
809 809
810 810
811 811 @attr.s(frozen=True)
812 812 class morestatus(object):
813 813 reporoot = attr.ib()
814 814 unfinishedop = attr.ib()
815 815 unfinishedmsg = attr.ib()
816 816 activemerge = attr.ib()
817 817 unresolvedpaths = attr.ib()
818 818 _formattedpaths = attr.ib(init=False, default=set())
819 819 _label = b'status.morestatus'
820 820
821 821 def formatfile(self, path, fm):
822 822 self._formattedpaths.add(path)
823 823 if self.activemerge and path in self.unresolvedpaths:
824 824 fm.data(unresolved=True)
825 825
826 826 def formatfooter(self, fm):
827 827 if self.unfinishedop or self.unfinishedmsg:
828 828 fm.startitem()
829 829 fm.data(itemtype=b'morestatus')
830 830
831 831 if self.unfinishedop:
832 832 fm.data(unfinished=self.unfinishedop)
833 833 statemsg = (
834 834 _(b'The repository is in an unfinished *%s* state.')
835 835 % self.unfinishedop
836 836 )
837 837 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
838 838 if self.unfinishedmsg:
839 839 fm.data(unfinishedmsg=self.unfinishedmsg)
840 840
841 841 # May also start new data items.
842 842 self._formatconflicts(fm)
843 843
844 844 if self.unfinishedmsg:
845 845 fm.plain(
846 846 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
847 847 )
848 848
849 849 def _formatconflicts(self, fm):
850 850 if not self.activemerge:
851 851 return
852 852
853 853 if self.unresolvedpaths:
854 854 mergeliststr = b'\n'.join(
855 855 [
856 856 b' %s'
857 857 % util.pathto(self.reporoot, encoding.getcwd(), path)
858 858 for path in self.unresolvedpaths
859 859 ]
860 860 )
861 861 msg = (
862 862 _(
863 863 '''Unresolved merge conflicts:
864 864
865 865 %s
866 866
867 867 To mark files as resolved: hg resolve --mark FILE'''
868 868 )
869 869 % mergeliststr
870 870 )
871 871
872 872 # If any paths with unresolved conflicts were not previously
873 873 # formatted, output them now.
874 874 for f in self.unresolvedpaths:
875 875 if f in self._formattedpaths:
876 876 # Already output.
877 877 continue
878 878 fm.startitem()
879 879 # We can't claim to know the status of the file - it may just
880 880 # have been in one of the states that were not requested for
881 881 # display, so it could be anything.
882 882 fm.data(itemtype=b'file', path=f, unresolved=True)
883 883
884 884 else:
885 885 msg = _(b'No unresolved merge conflicts.')
886 886
887 887 fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
888 888
889 889
890 890 def readmorestatus(repo):
891 891 """Returns a morestatus object if the repo has unfinished state."""
892 892 statetuple = statemod.getrepostate(repo)
893 893 mergestate = mergemod.mergestate.read(repo)
894 894 activemerge = mergestate.active()
895 895 if not statetuple and not activemerge:
896 896 return None
897 897
898 898 unfinishedop = unfinishedmsg = unresolved = None
899 899 if statetuple:
900 900 unfinishedop, unfinishedmsg = statetuple
901 901 if activemerge:
902 902 unresolved = sorted(mergestate.unresolved())
903 903 return morestatus(
904 904 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
905 905 )
906 906
907 907
908 908 def findpossible(cmd, table, strict=False):
909 909 """
910 910 Return cmd -> (aliases, command table entry)
911 911 for each matching command.
912 912 Return debug commands (or their aliases) only if no normal command matches.
913 913 """
914 914 choice = {}
915 915 debugchoice = {}
916 916
917 917 if cmd in table:
918 918 # short-circuit exact matches, "log" alias beats "log|history"
919 919 keys = [cmd]
920 920 else:
921 921 keys = table.keys()
922 922
923 923 allcmds = []
924 924 for e in keys:
925 925 aliases = parsealiases(e)
926 926 allcmds.extend(aliases)
927 927 found = None
928 928 if cmd in aliases:
929 929 found = cmd
930 930 elif not strict:
931 931 for a in aliases:
932 932 if a.startswith(cmd):
933 933 found = a
934 934 break
935 935 if found is not None:
936 936 if aliases[0].startswith(b"debug") or found.startswith(b"debug"):
937 937 debugchoice[found] = (aliases, table[e])
938 938 else:
939 939 choice[found] = (aliases, table[e])
940 940
941 941 if not choice and debugchoice:
942 942 choice = debugchoice
943 943
944 944 return choice, allcmds
945 945
946 946
947 947 def findcmd(cmd, table, strict=True):
948 948 """Return (aliases, command table entry) for command string."""
949 949 choice, allcmds = findpossible(cmd, table, strict)
950 950
951 951 if cmd in choice:
952 952 return choice[cmd]
953 953
954 954 if len(choice) > 1:
955 955 clist = sorted(choice)
956 956 raise error.AmbiguousCommand(cmd, clist)
957 957
958 958 if choice:
959 959 return list(choice.values())[0]
960 960
961 961 raise error.UnknownCommand(cmd, allcmds)
962 962
963 963
964 964 def changebranch(ui, repo, revs, label):
965 965 """ Change the branch name of given revs to label """
966 966
967 967 with repo.wlock(), repo.lock(), repo.transaction(b'branches'):
968 968 # abort in case of uncommitted merge or dirty wdir
969 969 bailifchanged(repo)
970 970 revs = scmutil.revrange(repo, revs)
971 971 if not revs:
972 972 raise error.Abort(b"empty revision set")
973 973 roots = repo.revs(b'roots(%ld)', revs)
974 974 if len(roots) > 1:
975 975 raise error.Abort(
976 976 _(b"cannot change branch of non-linear revisions")
977 977 )
978 978 rewriteutil.precheck(repo, revs, b'change branch of')
979 979
980 980 root = repo[roots.first()]
981 981 rpb = {parent.branch() for parent in root.parents()}
982 982 if label not in rpb and label in repo.branchmap():
983 983 raise error.Abort(_(b"a branch of the same name already exists"))
984 984
985 985 if repo.revs(b'obsolete() and %ld', revs):
986 986 raise error.Abort(
987 987 _(b"cannot change branch of a obsolete changeset")
988 988 )
989 989
990 990 # make sure only topological heads
991 991 if repo.revs(b'heads(%ld) - head()', revs):
992 992 raise error.Abort(_(b"cannot change branch in middle of a stack"))
993 993
994 994 replacements = {}
995 995 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
996 996 # mercurial.subrepo -> mercurial.cmdutil
997 997 from . import context
998 998
999 999 for rev in revs:
1000 1000 ctx = repo[rev]
1001 1001 oldbranch = ctx.branch()
1002 1002 # check if ctx has same branch
1003 1003 if oldbranch == label:
1004 1004 continue
1005 1005
1006 1006 def filectxfn(repo, newctx, path):
1007 1007 try:
1008 1008 return ctx[path]
1009 1009 except error.ManifestLookupError:
1010 1010 return None
1011 1011
1012 1012 ui.debug(
1013 1013 b"changing branch of '%s' from '%s' to '%s'\n"
1014 1014 % (hex(ctx.node()), oldbranch, label)
1015 1015 )
1016 1016 extra = ctx.extra()
1017 1017 extra[b'branch_change'] = hex(ctx.node())
1018 1018 # While changing branch of set of linear commits, make sure that
1019 1019 # we base our commits on new parent rather than old parent which
1020 1020 # was obsoleted while changing the branch
1021 1021 p1 = ctx.p1().node()
1022 1022 p2 = ctx.p2().node()
1023 1023 if p1 in replacements:
1024 1024 p1 = replacements[p1][0]
1025 1025 if p2 in replacements:
1026 1026 p2 = replacements[p2][0]
1027 1027
1028 1028 mc = context.memctx(
1029 1029 repo,
1030 1030 (p1, p2),
1031 1031 ctx.description(),
1032 1032 ctx.files(),
1033 1033 filectxfn,
1034 1034 user=ctx.user(),
1035 1035 date=ctx.date(),
1036 1036 extra=extra,
1037 1037 branch=label,
1038 1038 )
1039 1039
1040 1040 newnode = repo.commitctx(mc)
1041 1041 replacements[ctx.node()] = (newnode,)
1042 1042 ui.debug(b'new node id is %s\n' % hex(newnode))
1043 1043
1044 1044 # create obsmarkers and move bookmarks
1045 1045 scmutil.cleanupnodes(
1046 1046 repo, replacements, b'branch-change', fixphase=True
1047 1047 )
1048 1048
1049 1049 # move the working copy too
1050 1050 wctx = repo[None]
1051 1051 # in-progress merge is a bit too complex for now.
1052 1052 if len(wctx.parents()) == 1:
1053 1053 newid = replacements.get(wctx.p1().node())
1054 1054 if newid is not None:
1055 1055 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
1056 1056 # mercurial.cmdutil
1057 1057 from . import hg
1058 1058
1059 1059 hg.update(repo, newid[0], quietempty=True)
1060 1060
1061 1061 ui.status(_(b"changed branch on %d changesets\n") % len(replacements))
1062 1062
1063 1063
1064 1064 def findrepo(p):
1065 1065 while not os.path.isdir(os.path.join(p, b".hg")):
1066 1066 oldp, p = p, os.path.dirname(p)
1067 1067 if p == oldp:
1068 1068 return None
1069 1069
1070 1070 return p
1071 1071
1072 1072
1073 1073 def bailifchanged(repo, merge=True, hint=None):
1074 1074 """ enforce the precondition that working directory must be clean.
1075 1075
1076 1076 'merge' can be set to false if a pending uncommitted merge should be
1077 1077 ignored (such as when 'update --check' runs).
1078 1078
1079 1079 'hint' is the usual hint given to Abort exception.
1080 1080 """
1081 1081
1082 1082 if merge and repo.dirstate.p2() != nullid:
1083 1083 raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint)
1084 1084 st = repo.status()
1085 1085 if st.modified or st.added or st.removed or st.deleted:
1086 1086 raise error.Abort(_(b'uncommitted changes'), hint=hint)
1087 1087 ctx = repo[None]
1088 1088 for s in sorted(ctx.substate):
1089 1089 ctx.sub(s).bailifchanged(hint=hint)
1090 1090
1091 1091
1092 1092 def logmessage(ui, opts):
1093 1093 """ get the log message according to -m and -l option """
1094 1094
1095 1095 check_at_most_one_arg(opts, b'message', b'logfile')
1096 1096
1097 1097 message = opts.get(b'message')
1098 1098 logfile = opts.get(b'logfile')
1099 1099
1100 1100 if not message and logfile:
1101 1101 try:
1102 1102 if isstdiofilename(logfile):
1103 1103 message = ui.fin.read()
1104 1104 else:
1105 1105 message = b'\n'.join(util.readfile(logfile).splitlines())
1106 1106 except IOError as inst:
1107 1107 raise error.Abort(
1108 1108 _(b"can't read commit message '%s': %s")
1109 1109 % (logfile, encoding.strtolocal(inst.strerror))
1110 1110 )
1111 1111 return message
1112 1112
1113 1113
1114 1114 def mergeeditform(ctxorbool, baseformname):
1115 1115 """return appropriate editform name (referencing a committemplate)
1116 1116
1117 1117 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
1118 1118 merging is committed.
1119 1119
1120 1120 This returns baseformname with '.merge' appended if it is a merge,
1121 1121 otherwise '.normal' is appended.
1122 1122 """
1123 1123 if isinstance(ctxorbool, bool):
1124 1124 if ctxorbool:
1125 1125 return baseformname + b".merge"
1126 1126 elif len(ctxorbool.parents()) > 1:
1127 1127 return baseformname + b".merge"
1128 1128
1129 1129 return baseformname + b".normal"
1130 1130
1131 1131
1132 1132 def getcommiteditor(
1133 1133 edit=False, finishdesc=None, extramsg=None, editform=b'', **opts
1134 1134 ):
1135 1135 """get appropriate commit message editor according to '--edit' option
1136 1136
1137 1137 'finishdesc' is a function to be called with edited commit message
1138 1138 (= 'description' of the new changeset) just after editing, but
1139 1139 before checking empty-ness. It should return actual text to be
1140 1140 stored into history. This allows to change description before
1141 1141 storing.
1142 1142
1143 1143 'extramsg' is a extra message to be shown in the editor instead of
1144 1144 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
1145 1145 is automatically added.
1146 1146
1147 1147 'editform' is a dot-separated list of names, to distinguish
1148 1148 the purpose of commit text editing.
1149 1149
1150 1150 'getcommiteditor' returns 'commitforceeditor' regardless of
1151 1151 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
1152 1152 they are specific for usage in MQ.
1153 1153 """
1154 1154 if edit or finishdesc or extramsg:
1155 1155 return lambda r, c, s: commitforceeditor(
1156 1156 r, c, s, finishdesc=finishdesc, extramsg=extramsg, editform=editform
1157 1157 )
1158 1158 elif editform:
1159 1159 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
1160 1160 else:
1161 1161 return commiteditor
1162 1162
1163 1163
1164 1164 def _escapecommandtemplate(tmpl):
1165 1165 parts = []
1166 1166 for typ, start, end in templater.scantemplate(tmpl, raw=True):
1167 1167 if typ == b'string':
1168 1168 parts.append(stringutil.escapestr(tmpl[start:end]))
1169 1169 else:
1170 1170 parts.append(tmpl[start:end])
1171 1171 return b''.join(parts)
1172 1172
1173 1173
1174 1174 def rendercommandtemplate(ui, tmpl, props):
1175 1175 r"""Expand a literal template 'tmpl' in a way suitable for command line
1176 1176
1177 1177 '\' in outermost string is not taken as an escape character because it
1178 1178 is a directory separator on Windows.
1179 1179
1180 1180 >>> from . import ui as uimod
1181 1181 >>> ui = uimod.ui()
1182 1182 >>> rendercommandtemplate(ui, b'c:\\{path}', {b'path': b'foo'})
1183 1183 'c:\\foo'
1184 1184 >>> rendercommandtemplate(ui, b'{"c:\\{path}"}', {'path': b'foo'})
1185 1185 'c:{path}'
1186 1186 """
1187 1187 if not tmpl:
1188 1188 return tmpl
1189 1189 t = formatter.maketemplater(ui, _escapecommandtemplate(tmpl))
1190 1190 return t.renderdefault(props)
1191 1191
1192 1192
1193 1193 def rendertemplate(ctx, tmpl, props=None):
1194 1194 """Expand a literal template 'tmpl' byte-string against one changeset
1195 1195
1196 1196 Each props item must be a stringify-able value or a callable returning
1197 1197 such value, i.e. no bare list nor dict should be passed.
1198 1198 """
1199 1199 repo = ctx.repo()
1200 1200 tres = formatter.templateresources(repo.ui, repo)
1201 1201 t = formatter.maketemplater(
1202 1202 repo.ui, tmpl, defaults=templatekw.keywords, resources=tres
1203 1203 )
1204 1204 mapping = {b'ctx': ctx}
1205 1205 if props:
1206 1206 mapping.update(props)
1207 1207 return t.renderdefault(mapping)
1208 1208
1209 1209
1210 1210 def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
1211 1211 r"""Convert old-style filename format string to template string
1212 1212
1213 1213 >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)
1214 1214 'foo-{reporoot|basename}-{seqno}.patch'
1215 1215 >>> _buildfntemplate(b'%R{tags % "{tag}"}%H')
1216 1216 '{rev}{tags % "{tag}"}{node}'
1217 1217
1218 1218 '\' in outermost strings has to be escaped because it is a directory
1219 1219 separator on Windows:
1220 1220
1221 1221 >>> _buildfntemplate(b'c:\\tmp\\%R\\%n.patch', seqno=0)
1222 1222 'c:\\\\tmp\\\\{rev}\\\\{seqno}.patch'
1223 1223 >>> _buildfntemplate(b'\\\\foo\\bar.patch')
1224 1224 '\\\\\\\\foo\\\\bar.patch'
1225 1225 >>> _buildfntemplate(b'\\{tags % "{tag}"}')
1226 1226 '\\\\{tags % "{tag}"}'
1227 1227
1228 1228 but inner strings follow the template rules (i.e. '\' is taken as an
1229 1229 escape character):
1230 1230
1231 1231 >>> _buildfntemplate(br'{"c:\tmp"}', seqno=0)
1232 1232 '{"c:\\tmp"}'
1233 1233 """
1234 1234 expander = {
1235 1235 b'H': b'{node}',
1236 1236 b'R': b'{rev}',
1237 1237 b'h': b'{node|short}',
1238 1238 b'm': br'{sub(r"[^\w]", "_", desc|firstline)}',
1239 1239 b'r': b'{if(revwidth, pad(rev, revwidth, "0", left=True), rev)}',
1240 1240 b'%': b'%',
1241 1241 b'b': b'{reporoot|basename}',
1242 1242 }
1243 1243 if total is not None:
1244 1244 expander[b'N'] = b'{total}'
1245 1245 if seqno is not None:
1246 1246 expander[b'n'] = b'{seqno}'
1247 1247 if total is not None and seqno is not None:
1248 1248 expander[b'n'] = b'{pad(seqno, total|stringify|count, "0", left=True)}'
1249 1249 if pathname is not None:
1250 1250 expander[b's'] = b'{pathname|basename}'
1251 1251 expander[b'd'] = b'{if(pathname|dirname, pathname|dirname, ".")}'
1252 1252 expander[b'p'] = b'{pathname}'
1253 1253
1254 1254 newname = []
1255 1255 for typ, start, end in templater.scantemplate(pat, raw=True):
1256 1256 if typ != b'string':
1257 1257 newname.append(pat[start:end])
1258 1258 continue
1259 1259 i = start
1260 1260 while i < end:
1261 1261 n = pat.find(b'%', i, end)
1262 1262 if n < 0:
1263 1263 newname.append(stringutil.escapestr(pat[i:end]))
1264 1264 break
1265 1265 newname.append(stringutil.escapestr(pat[i:n]))
1266 1266 if n + 2 > end:
1267 1267 raise error.Abort(
1268 1268 _(b"incomplete format spec in output filename")
1269 1269 )
1270 1270 c = pat[n + 1 : n + 2]
1271 1271 i = n + 2
1272 1272 try:
1273 1273 newname.append(expander[c])
1274 1274 except KeyError:
1275 1275 raise error.Abort(
1276 1276 _(b"invalid format spec '%%%s' in output filename") % c
1277 1277 )
1278 1278 return b''.join(newname)
1279 1279
1280 1280
1281 1281 def makefilename(ctx, pat, **props):
1282 1282 if not pat:
1283 1283 return pat
1284 1284 tmpl = _buildfntemplate(pat, **props)
1285 1285 # BUG: alias expansion shouldn't be made against template fragments
1286 1286 # rewritten from %-format strings, but we have no easy way to partially
1287 1287 # disable the expansion.
1288 1288 return rendertemplate(ctx, tmpl, pycompat.byteskwargs(props))
1289 1289
1290 1290
1291 1291 def isstdiofilename(pat):
1292 1292 """True if the given pat looks like a filename denoting stdin/stdout"""
1293 1293 return not pat or pat == b'-'
1294 1294
1295 1295
1296 1296 class _unclosablefile(object):
1297 1297 def __init__(self, fp):
1298 1298 self._fp = fp
1299 1299
1300 1300 def close(self):
1301 1301 pass
1302 1302
1303 1303 def __iter__(self):
1304 1304 return iter(self._fp)
1305 1305
1306 1306 def __getattr__(self, attr):
1307 1307 return getattr(self._fp, attr)
1308 1308
1309 1309 def __enter__(self):
1310 1310 return self
1311 1311
1312 1312 def __exit__(self, exc_type, exc_value, exc_tb):
1313 1313 pass
1314 1314
1315 1315
1316 1316 def makefileobj(ctx, pat, mode=b'wb', **props):
1317 1317 writable = mode not in (b'r', b'rb')
1318 1318
1319 1319 if isstdiofilename(pat):
1320 1320 repo = ctx.repo()
1321 1321 if writable:
1322 1322 fp = repo.ui.fout
1323 1323 else:
1324 1324 fp = repo.ui.fin
1325 1325 return _unclosablefile(fp)
1326 1326 fn = makefilename(ctx, pat, **props)
1327 1327 return open(fn, mode)
1328 1328
1329 1329
1330 1330 def openstorage(repo, cmd, file_, opts, returnrevlog=False):
1331 1331 """opens the changelog, manifest, a filelog or a given revlog"""
1332 1332 cl = opts[b'changelog']
1333 1333 mf = opts[b'manifest']
1334 1334 dir = opts[b'dir']
1335 1335 msg = None
1336 1336 if cl and mf:
1337 1337 msg = _(b'cannot specify --changelog and --manifest at the same time')
1338 1338 elif cl and dir:
1339 1339 msg = _(b'cannot specify --changelog and --dir at the same time')
1340 1340 elif cl or mf or dir:
1341 1341 if file_:
1342 1342 msg = _(b'cannot specify filename with --changelog or --manifest')
1343 1343 elif not repo:
1344 1344 msg = _(
1345 1345 b'cannot specify --changelog or --manifest or --dir '
1346 1346 b'without a repository'
1347 1347 )
1348 1348 if msg:
1349 1349 raise error.Abort(msg)
1350 1350
1351 1351 r = None
1352 1352 if repo:
1353 1353 if cl:
1354 1354 r = repo.unfiltered().changelog
1355 1355 elif dir:
1356 1356 if b'treemanifest' not in repo.requirements:
1357 1357 raise error.Abort(
1358 1358 _(
1359 1359 b"--dir can only be used on repos with "
1360 1360 b"treemanifest enabled"
1361 1361 )
1362 1362 )
1363 1363 if not dir.endswith(b'/'):
1364 1364 dir = dir + b'/'
1365 1365 dirlog = repo.manifestlog.getstorage(dir)
1366 1366 if len(dirlog):
1367 1367 r = dirlog
1368 1368 elif mf:
1369 1369 r = repo.manifestlog.getstorage(b'')
1370 1370 elif file_:
1371 1371 filelog = repo.file(file_)
1372 1372 if len(filelog):
1373 1373 r = filelog
1374 1374
1375 1375 # Not all storage may be revlogs. If requested, try to return an actual
1376 1376 # revlog instance.
1377 1377 if returnrevlog:
1378 1378 if isinstance(r, revlog.revlog):
1379 1379 pass
1380 1380 elif util.safehasattr(r, b'_revlog'):
1381 1381 r = r._revlog # pytype: disable=attribute-error
1382 1382 elif r is not None:
1383 1383 raise error.Abort(_(b'%r does not appear to be a revlog') % r)
1384 1384
1385 1385 if not r:
1386 1386 if not returnrevlog:
1387 1387 raise error.Abort(_(b'cannot give path to non-revlog'))
1388 1388
1389 1389 if not file_:
1390 1390 raise error.CommandError(cmd, _(b'invalid arguments'))
1391 1391 if not os.path.isfile(file_):
1392 1392 raise error.Abort(_(b"revlog '%s' not found") % file_)
1393 1393 r = revlog.revlog(
1394 1394 vfsmod.vfs(encoding.getcwd(), audit=False), file_[:-2] + b".i"
1395 1395 )
1396 1396 return r
1397 1397
1398 1398
1399 1399 def openrevlog(repo, cmd, file_, opts):
1400 1400 """Obtain a revlog backing storage of an item.
1401 1401
1402 1402 This is similar to ``openstorage()`` except it always returns a revlog.
1403 1403
1404 1404 In most cases, a caller cares about the main storage object - not the
1405 1405 revlog backing it. Therefore, this function should only be used by code
1406 1406 that needs to examine low-level revlog implementation details. e.g. debug
1407 1407 commands.
1408 1408 """
1409 1409 return openstorage(repo, cmd, file_, opts, returnrevlog=True)
1410 1410
1411 1411
1412 1412 def copy(ui, repo, pats, opts, rename=False):
1413 check_incompatible_arguments(opts, b'forget', [b'dry_run'])
1414
1413 1415 # called with the repo lock held
1414 1416 #
1415 1417 # hgsep => pathname that uses "/" to separate directories
1416 1418 # ossep => pathname that uses os.sep to separate directories
1417 1419 cwd = repo.getcwd()
1418 1420 targets = {}
1421 forget = opts.get(b"forget")
1419 1422 after = opts.get(b"after")
1420 1423 dryrun = opts.get(b"dry_run")
1421 1424 ctx = repo[None]
1422 1425 pctx = ctx.p1()
1423 1426
1424 1427 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1425 1428
1429 if forget:
1430 match = scmutil.match(wctx, pats, opts)
1431
1432 current_copies = wctx.p1copies()
1433 current_copies.update(wctx.p2copies())
1434
1435 for f in wctx.walk(match):
1436 if f in current_copies:
1437 wctx[f].markcopied(None)
1438 elif match.exact(f):
1439 ui.warn(
1440 _(
1441 b'%s: not unmarking as copy - file is not marked as copied\n'
1442 )
1443 % uipathfn(f)
1444 )
1445 return
1446
1426 1447 def walkpat(pat):
1427 1448 srcs = []
1428 1449 m = scmutil.match(ctx, [pat], opts, globbed=True)
1429 1450 for abs in ctx.walk(m):
1430 1451 rel = uipathfn(abs)
1431 1452 exact = m.exact(abs)
1432 1453 if abs not in ctx:
1433 1454 if abs in pctx:
1434 1455 if not after:
1435 1456 if exact:
1436 1457 ui.warn(
1437 1458 _(
1438 1459 b'%s: not copying - file has been marked '
1439 1460 b'for remove\n'
1440 1461 )
1441 1462 % rel
1442 1463 )
1443 1464 continue
1444 1465 else:
1445 1466 if exact:
1446 1467 ui.warn(
1447 1468 _(b'%s: not copying - file is not managed\n') % rel
1448 1469 )
1449 1470 continue
1450 1471
1451 1472 # abs: hgsep
1452 1473 # rel: ossep
1453 1474 srcs.append((abs, rel, exact))
1454 1475 return srcs
1455 1476
1456 1477 # abssrc: hgsep
1457 1478 # relsrc: ossep
1458 1479 # otarget: ossep
1459 1480 def copyfile(abssrc, relsrc, otarget, exact):
1460 1481 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1461 1482 if b'/' in abstarget:
1462 1483 # We cannot normalize abstarget itself, this would prevent
1463 1484 # case only renames, like a => A.
1464 1485 abspath, absname = abstarget.rsplit(b'/', 1)
1465 1486 abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
1466 1487 reltarget = repo.pathto(abstarget, cwd)
1467 1488 target = repo.wjoin(abstarget)
1468 1489 src = repo.wjoin(abssrc)
1469 1490 state = repo.dirstate[abstarget]
1470 1491
1471 1492 scmutil.checkportable(ui, abstarget)
1472 1493
1473 1494 # check for collisions
1474 1495 prevsrc = targets.get(abstarget)
1475 1496 if prevsrc is not None:
1476 1497 ui.warn(
1477 1498 _(b'%s: not overwriting - %s collides with %s\n')
1478 1499 % (
1479 1500 reltarget,
1480 1501 repo.pathto(abssrc, cwd),
1481 1502 repo.pathto(prevsrc, cwd),
1482 1503 )
1483 1504 )
1484 1505 return True # report a failure
1485 1506
1486 1507 # check for overwrites
1487 1508 exists = os.path.lexists(target)
1488 1509 samefile = False
1489 1510 if exists and abssrc != abstarget:
1490 1511 if repo.dirstate.normalize(abssrc) == repo.dirstate.normalize(
1491 1512 abstarget
1492 1513 ):
1493 1514 if not rename:
1494 1515 ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
1495 1516 return True # report a failure
1496 1517 exists = False
1497 1518 samefile = True
1498 1519
1499 1520 if not after and exists or after and state in b'mn':
1500 1521 if not opts[b'force']:
1501 1522 if state in b'mn':
1502 1523 msg = _(b'%s: not overwriting - file already committed\n')
1503 1524 if after:
1504 1525 flags = b'--after --force'
1505 1526 else:
1506 1527 flags = b'--force'
1507 1528 if rename:
1508 1529 hint = (
1509 1530 _(
1510 1531 b"('hg rename %s' to replace the file by "
1511 1532 b'recording a rename)\n'
1512 1533 )
1513 1534 % flags
1514 1535 )
1515 1536 else:
1516 1537 hint = (
1517 1538 _(
1518 1539 b"('hg copy %s' to replace the file by "
1519 1540 b'recording a copy)\n'
1520 1541 )
1521 1542 % flags
1522 1543 )
1523 1544 else:
1524 1545 msg = _(b'%s: not overwriting - file exists\n')
1525 1546 if rename:
1526 1547 hint = _(
1527 1548 b"('hg rename --after' to record the rename)\n"
1528 1549 )
1529 1550 else:
1530 1551 hint = _(b"('hg copy --after' to record the copy)\n")
1531 1552 ui.warn(msg % reltarget)
1532 1553 ui.warn(hint)
1533 1554 return True # report a failure
1534 1555
1535 1556 if after:
1536 1557 if not exists:
1537 1558 if rename:
1538 1559 ui.warn(
1539 1560 _(b'%s: not recording move - %s does not exist\n')
1540 1561 % (relsrc, reltarget)
1541 1562 )
1542 1563 else:
1543 1564 ui.warn(
1544 1565 _(b'%s: not recording copy - %s does not exist\n')
1545 1566 % (relsrc, reltarget)
1546 1567 )
1547 1568 return True # report a failure
1548 1569 elif not dryrun:
1549 1570 try:
1550 1571 if exists:
1551 1572 os.unlink(target)
1552 1573 targetdir = os.path.dirname(target) or b'.'
1553 1574 if not os.path.isdir(targetdir):
1554 1575 os.makedirs(targetdir)
1555 1576 if samefile:
1556 1577 tmp = target + b"~hgrename"
1557 1578 os.rename(src, tmp)
1558 1579 os.rename(tmp, target)
1559 1580 else:
1560 1581 # Preserve stat info on renames, not on copies; this matches
1561 1582 # Linux CLI behavior.
1562 1583 util.copyfile(src, target, copystat=rename)
1563 1584 srcexists = True
1564 1585 except IOError as inst:
1565 1586 if inst.errno == errno.ENOENT:
1566 1587 ui.warn(_(b'%s: deleted in working directory\n') % relsrc)
1567 1588 srcexists = False
1568 1589 else:
1569 1590 ui.warn(
1570 1591 _(b'%s: cannot copy - %s\n')
1571 1592 % (relsrc, encoding.strtolocal(inst.strerror))
1572 1593 )
1573 1594 return True # report a failure
1574 1595
1575 1596 if ui.verbose or not exact:
1576 1597 if rename:
1577 1598 ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
1578 1599 else:
1579 1600 ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
1580 1601
1581 1602 targets[abstarget] = abssrc
1582 1603
1583 1604 # fix up dirstate
1584 1605 scmutil.dirstatecopy(
1585 1606 ui, repo, ctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd
1586 1607 )
1587 1608 if rename and not dryrun:
1588 1609 if not after and srcexists and not samefile:
1589 1610 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
1590 1611 repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
1591 1612 ctx.forget([abssrc])
1592 1613
1593 1614 # pat: ossep
1594 1615 # dest ossep
1595 1616 # srcs: list of (hgsep, hgsep, ossep, bool)
1596 1617 # return: function that takes hgsep and returns ossep
1597 1618 def targetpathfn(pat, dest, srcs):
1598 1619 if os.path.isdir(pat):
1599 1620 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1600 1621 abspfx = util.localpath(abspfx)
1601 1622 if destdirexists:
1602 1623 striplen = len(os.path.split(abspfx)[0])
1603 1624 else:
1604 1625 striplen = len(abspfx)
1605 1626 if striplen:
1606 1627 striplen += len(pycompat.ossep)
1607 1628 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1608 1629 elif destdirexists:
1609 1630 res = lambda p: os.path.join(
1610 1631 dest, os.path.basename(util.localpath(p))
1611 1632 )
1612 1633 else:
1613 1634 res = lambda p: dest
1614 1635 return res
1615 1636
1616 1637 # pat: ossep
1617 1638 # dest ossep
1618 1639 # srcs: list of (hgsep, hgsep, ossep, bool)
1619 1640 # return: function that takes hgsep and returns ossep
1620 1641 def targetpathafterfn(pat, dest, srcs):
1621 1642 if matchmod.patkind(pat):
1622 1643 # a mercurial pattern
1623 1644 res = lambda p: os.path.join(
1624 1645 dest, os.path.basename(util.localpath(p))
1625 1646 )
1626 1647 else:
1627 1648 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1628 1649 if len(abspfx) < len(srcs[0][0]):
1629 1650 # A directory. Either the target path contains the last
1630 1651 # component of the source path or it does not.
1631 1652 def evalpath(striplen):
1632 1653 score = 0
1633 1654 for s in srcs:
1634 1655 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1635 1656 if os.path.lexists(t):
1636 1657 score += 1
1637 1658 return score
1638 1659
1639 1660 abspfx = util.localpath(abspfx)
1640 1661 striplen = len(abspfx)
1641 1662 if striplen:
1642 1663 striplen += len(pycompat.ossep)
1643 1664 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1644 1665 score = evalpath(striplen)
1645 1666 striplen1 = len(os.path.split(abspfx)[0])
1646 1667 if striplen1:
1647 1668 striplen1 += len(pycompat.ossep)
1648 1669 if evalpath(striplen1) > score:
1649 1670 striplen = striplen1
1650 1671 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1651 1672 else:
1652 1673 # a file
1653 1674 if destdirexists:
1654 1675 res = lambda p: os.path.join(
1655 1676 dest, os.path.basename(util.localpath(p))
1656 1677 )
1657 1678 else:
1658 1679 res = lambda p: dest
1659 1680 return res
1660 1681
1661 1682 pats = scmutil.expandpats(pats)
1662 1683 if not pats:
1663 1684 raise error.Abort(_(b'no source or destination specified'))
1664 1685 if len(pats) == 1:
1665 1686 raise error.Abort(_(b'no destination specified'))
1666 1687 dest = pats.pop()
1667 1688 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1668 1689 if not destdirexists:
1669 1690 if len(pats) > 1 or matchmod.patkind(pats[0]):
1670 1691 raise error.Abort(
1671 1692 _(
1672 1693 b'with multiple sources, destination must be an '
1673 1694 b'existing directory'
1674 1695 )
1675 1696 )
1676 1697 if util.endswithsep(dest):
1677 1698 raise error.Abort(_(b'destination %s is not a directory') % dest)
1678 1699
1679 1700 tfn = targetpathfn
1680 1701 if after:
1681 1702 tfn = targetpathafterfn
1682 1703 copylist = []
1683 1704 for pat in pats:
1684 1705 srcs = walkpat(pat)
1685 1706 if not srcs:
1686 1707 continue
1687 1708 copylist.append((tfn(pat, dest, srcs), srcs))
1688 1709 if not copylist:
1689 1710 raise error.Abort(_(b'no files to copy'))
1690 1711
1691 1712 errors = 0
1692 1713 for targetpath, srcs in copylist:
1693 1714 for abssrc, relsrc, exact in srcs:
1694 1715 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1695 1716 errors += 1
1696 1717
1697 1718 return errors != 0
1698 1719
1699 1720
1700 1721 ## facility to let extension process additional data into an import patch
1701 1722 # list of identifier to be executed in order
1702 1723 extrapreimport = [] # run before commit
1703 1724 extrapostimport = [] # run after commit
1704 1725 # mapping from identifier to actual import function
1705 1726 #
1706 1727 # 'preimport' are run before the commit is made and are provided the following
1707 1728 # arguments:
1708 1729 # - repo: the localrepository instance,
1709 1730 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1710 1731 # - extra: the future extra dictionary of the changeset, please mutate it,
1711 1732 # - opts: the import options.
1712 1733 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1713 1734 # mutation of in memory commit and more. Feel free to rework the code to get
1714 1735 # there.
1715 1736 extrapreimportmap = {}
1716 1737 # 'postimport' are run after the commit is made and are provided the following
1717 1738 # argument:
1718 1739 # - ctx: the changectx created by import.
1719 1740 extrapostimportmap = {}
1720 1741
1721 1742
1722 1743 def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc):
1723 1744 """Utility function used by commands.import to import a single patch
1724 1745
1725 1746 This function is explicitly defined here to help the evolve extension to
1726 1747 wrap this part of the import logic.
1727 1748
1728 1749 The API is currently a bit ugly because it a simple code translation from
1729 1750 the import command. Feel free to make it better.
1730 1751
1731 1752 :patchdata: a dictionary containing parsed patch data (such as from
1732 1753 ``patch.extract()``)
1733 1754 :parents: nodes that will be parent of the created commit
1734 1755 :opts: the full dict of option passed to the import command
1735 1756 :msgs: list to save commit message to.
1736 1757 (used in case we need to save it when failing)
1737 1758 :updatefunc: a function that update a repo to a given node
1738 1759 updatefunc(<repo>, <node>)
1739 1760 """
1740 1761 # avoid cycle context -> subrepo -> cmdutil
1741 1762 from . import context
1742 1763
1743 1764 tmpname = patchdata.get(b'filename')
1744 1765 message = patchdata.get(b'message')
1745 1766 user = opts.get(b'user') or patchdata.get(b'user')
1746 1767 date = opts.get(b'date') or patchdata.get(b'date')
1747 1768 branch = patchdata.get(b'branch')
1748 1769 nodeid = patchdata.get(b'nodeid')
1749 1770 p1 = patchdata.get(b'p1')
1750 1771 p2 = patchdata.get(b'p2')
1751 1772
1752 1773 nocommit = opts.get(b'no_commit')
1753 1774 importbranch = opts.get(b'import_branch')
1754 1775 update = not opts.get(b'bypass')
1755 1776 strip = opts[b"strip"]
1756 1777 prefix = opts[b"prefix"]
1757 1778 sim = float(opts.get(b'similarity') or 0)
1758 1779
1759 1780 if not tmpname:
1760 1781 return None, None, False
1761 1782
1762 1783 rejects = False
1763 1784
1764 1785 cmdline_message = logmessage(ui, opts)
1765 1786 if cmdline_message:
1766 1787 # pickup the cmdline msg
1767 1788 message = cmdline_message
1768 1789 elif message:
1769 1790 # pickup the patch msg
1770 1791 message = message.strip()
1771 1792 else:
1772 1793 # launch the editor
1773 1794 message = None
1774 1795 ui.debug(b'message:\n%s\n' % (message or b''))
1775 1796
1776 1797 if len(parents) == 1:
1777 1798 parents.append(repo[nullid])
1778 1799 if opts.get(b'exact'):
1779 1800 if not nodeid or not p1:
1780 1801 raise error.Abort(_(b'not a Mercurial patch'))
1781 1802 p1 = repo[p1]
1782 1803 p2 = repo[p2 or nullid]
1783 1804 elif p2:
1784 1805 try:
1785 1806 p1 = repo[p1]
1786 1807 p2 = repo[p2]
1787 1808 # Without any options, consider p2 only if the
1788 1809 # patch is being applied on top of the recorded
1789 1810 # first parent.
1790 1811 if p1 != parents[0]:
1791 1812 p1 = parents[0]
1792 1813 p2 = repo[nullid]
1793 1814 except error.RepoError:
1794 1815 p1, p2 = parents
1795 1816 if p2.node() == nullid:
1796 1817 ui.warn(
1797 1818 _(
1798 1819 b"warning: import the patch as a normal revision\n"
1799 1820 b"(use --exact to import the patch as a merge)\n"
1800 1821 )
1801 1822 )
1802 1823 else:
1803 1824 p1, p2 = parents
1804 1825
1805 1826 n = None
1806 1827 if update:
1807 1828 if p1 != parents[0]:
1808 1829 updatefunc(repo, p1.node())
1809 1830 if p2 != parents[1]:
1810 1831 repo.setparents(p1.node(), p2.node())
1811 1832
1812 1833 if opts.get(b'exact') or importbranch:
1813 1834 repo.dirstate.setbranch(branch or b'default')
1814 1835
1815 1836 partial = opts.get(b'partial', False)
1816 1837 files = set()
1817 1838 try:
1818 1839 patch.patch(
1819 1840 ui,
1820 1841 repo,
1821 1842 tmpname,
1822 1843 strip=strip,
1823 1844 prefix=prefix,
1824 1845 files=files,
1825 1846 eolmode=None,
1826 1847 similarity=sim / 100.0,
1827 1848 )
1828 1849 except error.PatchError as e:
1829 1850 if not partial:
1830 1851 raise error.Abort(pycompat.bytestr(e))
1831 1852 if partial:
1832 1853 rejects = True
1833 1854
1834 1855 files = list(files)
1835 1856 if nocommit:
1836 1857 if message:
1837 1858 msgs.append(message)
1838 1859 else:
1839 1860 if opts.get(b'exact') or p2:
1840 1861 # If you got here, you either use --force and know what
1841 1862 # you are doing or used --exact or a merge patch while
1842 1863 # being updated to its first parent.
1843 1864 m = None
1844 1865 else:
1845 1866 m = scmutil.matchfiles(repo, files or [])
1846 1867 editform = mergeeditform(repo[None], b'import.normal')
1847 1868 if opts.get(b'exact'):
1848 1869 editor = None
1849 1870 else:
1850 1871 editor = getcommiteditor(
1851 1872 editform=editform, **pycompat.strkwargs(opts)
1852 1873 )
1853 1874 extra = {}
1854 1875 for idfunc in extrapreimport:
1855 1876 extrapreimportmap[idfunc](repo, patchdata, extra, opts)
1856 1877 overrides = {}
1857 1878 if partial:
1858 1879 overrides[(b'ui', b'allowemptycommit')] = True
1859 1880 if opts.get(b'secret'):
1860 1881 overrides[(b'phases', b'new-commit')] = b'secret'
1861 1882 with repo.ui.configoverride(overrides, b'import'):
1862 1883 n = repo.commit(
1863 1884 message, user, date, match=m, editor=editor, extra=extra
1864 1885 )
1865 1886 for idfunc in extrapostimport:
1866 1887 extrapostimportmap[idfunc](repo[n])
1867 1888 else:
1868 1889 if opts.get(b'exact') or importbranch:
1869 1890 branch = branch or b'default'
1870 1891 else:
1871 1892 branch = p1.branch()
1872 1893 store = patch.filestore()
1873 1894 try:
1874 1895 files = set()
1875 1896 try:
1876 1897 patch.patchrepo(
1877 1898 ui,
1878 1899 repo,
1879 1900 p1,
1880 1901 store,
1881 1902 tmpname,
1882 1903 strip,
1883 1904 prefix,
1884 1905 files,
1885 1906 eolmode=None,
1886 1907 )
1887 1908 except error.PatchError as e:
1888 1909 raise error.Abort(stringutil.forcebytestr(e))
1889 1910 if opts.get(b'exact'):
1890 1911 editor = None
1891 1912 else:
1892 1913 editor = getcommiteditor(editform=b'import.bypass')
1893 1914 memctx = context.memctx(
1894 1915 repo,
1895 1916 (p1.node(), p2.node()),
1896 1917 message,
1897 1918 files=files,
1898 1919 filectxfn=store,
1899 1920 user=user,
1900 1921 date=date,
1901 1922 branch=branch,
1902 1923 editor=editor,
1903 1924 )
1904 1925 n = memctx.commit()
1905 1926 finally:
1906 1927 store.close()
1907 1928 if opts.get(b'exact') and nocommit:
1908 1929 # --exact with --no-commit is still useful in that it does merge
1909 1930 # and branch bits
1910 1931 ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
1911 1932 elif opts.get(b'exact') and (not n or hex(n) != nodeid):
1912 1933 raise error.Abort(_(b'patch is damaged or loses information'))
1913 1934 msg = _(b'applied to working directory')
1914 1935 if n:
1915 1936 # i18n: refers to a short changeset id
1916 1937 msg = _(b'created %s') % short(n)
1917 1938 return msg, n, rejects
1918 1939
1919 1940
1920 1941 # facility to let extensions include additional data in an exported patch
1921 1942 # list of identifiers to be executed in order
1922 1943 extraexport = []
1923 1944 # mapping from identifier to actual export function
1924 1945 # function as to return a string to be added to the header or None
1925 1946 # it is given two arguments (sequencenumber, changectx)
1926 1947 extraexportmap = {}
1927 1948
1928 1949
1929 1950 def _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts):
1930 1951 node = scmutil.binnode(ctx)
1931 1952 parents = [p.node() for p in ctx.parents() if p]
1932 1953 branch = ctx.branch()
1933 1954 if switch_parent:
1934 1955 parents.reverse()
1935 1956
1936 1957 if parents:
1937 1958 prev = parents[0]
1938 1959 else:
1939 1960 prev = nullid
1940 1961
1941 1962 fm.context(ctx=ctx)
1942 1963 fm.plain(b'# HG changeset patch\n')
1943 1964 fm.write(b'user', b'# User %s\n', ctx.user())
1944 1965 fm.plain(b'# Date %d %d\n' % ctx.date())
1945 1966 fm.write(b'date', b'# %s\n', fm.formatdate(ctx.date()))
1946 1967 fm.condwrite(
1947 1968 branch and branch != b'default', b'branch', b'# Branch %s\n', branch
1948 1969 )
1949 1970 fm.write(b'node', b'# Node ID %s\n', hex(node))
1950 1971 fm.plain(b'# Parent %s\n' % hex(prev))
1951 1972 if len(parents) > 1:
1952 1973 fm.plain(b'# Parent %s\n' % hex(parents[1]))
1953 1974 fm.data(parents=fm.formatlist(pycompat.maplist(hex, parents), name=b'node'))
1954 1975
1955 1976 # TODO: redesign extraexportmap function to support formatter
1956 1977 for headerid in extraexport:
1957 1978 header = extraexportmap[headerid](seqno, ctx)
1958 1979 if header is not None:
1959 1980 fm.plain(b'# %s\n' % header)
1960 1981
1961 1982 fm.write(b'desc', b'%s\n', ctx.description().rstrip())
1962 1983 fm.plain(b'\n')
1963 1984
1964 1985 if fm.isplain():
1965 1986 chunkiter = patch.diffui(repo, prev, node, match, opts=diffopts)
1966 1987 for chunk, label in chunkiter:
1967 1988 fm.plain(chunk, label=label)
1968 1989 else:
1969 1990 chunkiter = patch.diff(repo, prev, node, match, opts=diffopts)
1970 1991 # TODO: make it structured?
1971 1992 fm.data(diff=b''.join(chunkiter))
1972 1993
1973 1994
1974 1995 def _exportfile(repo, revs, fm, dest, switch_parent, diffopts, match):
1975 1996 """Export changesets to stdout or a single file"""
1976 1997 for seqno, rev in enumerate(revs, 1):
1977 1998 ctx = repo[rev]
1978 1999 if not dest.startswith(b'<'):
1979 2000 repo.ui.note(b"%s\n" % dest)
1980 2001 fm.startitem()
1981 2002 _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts)
1982 2003
1983 2004
1984 2005 def _exportfntemplate(
1985 2006 repo, revs, basefm, fntemplate, switch_parent, diffopts, match
1986 2007 ):
1987 2008 """Export changesets to possibly multiple files"""
1988 2009 total = len(revs)
1989 2010 revwidth = max(len(str(rev)) for rev in revs)
1990 2011 filemap = util.sortdict() # filename: [(seqno, rev), ...]
1991 2012
1992 2013 for seqno, rev in enumerate(revs, 1):
1993 2014 ctx = repo[rev]
1994 2015 dest = makefilename(
1995 2016 ctx, fntemplate, total=total, seqno=seqno, revwidth=revwidth
1996 2017 )
1997 2018 filemap.setdefault(dest, []).append((seqno, rev))
1998 2019
1999 2020 for dest in filemap:
2000 2021 with formatter.maybereopen(basefm, dest) as fm:
2001 2022 repo.ui.note(b"%s\n" % dest)
2002 2023 for seqno, rev in filemap[dest]:
2003 2024 fm.startitem()
2004 2025 ctx = repo[rev]
2005 2026 _exportsingle(
2006 2027 repo, ctx, fm, match, switch_parent, seqno, diffopts
2007 2028 )
2008 2029
2009 2030
2010 2031 def _prefetchchangedfiles(repo, revs, match):
2011 2032 allfiles = set()
2012 2033 for rev in revs:
2013 2034 for file in repo[rev].files():
2014 2035 if not match or match(file):
2015 2036 allfiles.add(file)
2016 2037 scmutil.prefetchfiles(repo, revs, scmutil.matchfiles(repo, allfiles))
2017 2038
2018 2039
2019 2040 def export(
2020 2041 repo,
2021 2042 revs,
2022 2043 basefm,
2023 2044 fntemplate=b'hg-%h.patch',
2024 2045 switch_parent=False,
2025 2046 opts=None,
2026 2047 match=None,
2027 2048 ):
2028 2049 '''export changesets as hg patches
2029 2050
2030 2051 Args:
2031 2052 repo: The repository from which we're exporting revisions.
2032 2053 revs: A list of revisions to export as revision numbers.
2033 2054 basefm: A formatter to which patches should be written.
2034 2055 fntemplate: An optional string to use for generating patch file names.
2035 2056 switch_parent: If True, show diffs against second parent when not nullid.
2036 2057 Default is false, which always shows diff against p1.
2037 2058 opts: diff options to use for generating the patch.
2038 2059 match: If specified, only export changes to files matching this matcher.
2039 2060
2040 2061 Returns:
2041 2062 Nothing.
2042 2063
2043 2064 Side Effect:
2044 2065 "HG Changeset Patch" data is emitted to one of the following
2045 2066 destinations:
2046 2067 fntemplate specified: Each rev is written to a unique file named using
2047 2068 the given template.
2048 2069 Otherwise: All revs will be written to basefm.
2049 2070 '''
2050 2071 _prefetchchangedfiles(repo, revs, match)
2051 2072
2052 2073 if not fntemplate:
2053 2074 _exportfile(
2054 2075 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
2055 2076 )
2056 2077 else:
2057 2078 _exportfntemplate(
2058 2079 repo, revs, basefm, fntemplate, switch_parent, opts, match
2059 2080 )
2060 2081
2061 2082
2062 2083 def exportfile(repo, revs, fp, switch_parent=False, opts=None, match=None):
2063 2084 """Export changesets to the given file stream"""
2064 2085 _prefetchchangedfiles(repo, revs, match)
2065 2086
2066 2087 dest = getattr(fp, 'name', b'<unnamed>')
2067 2088 with formatter.formatter(repo.ui, fp, b'export', {}) as fm:
2068 2089 _exportfile(repo, revs, fm, dest, switch_parent, opts, match)
2069 2090
2070 2091
2071 2092 def showmarker(fm, marker, index=None):
2072 2093 """utility function to display obsolescence marker in a readable way
2073 2094
2074 2095 To be used by debug function."""
2075 2096 if index is not None:
2076 2097 fm.write(b'index', b'%i ', index)
2077 2098 fm.write(b'prednode', b'%s ', hex(marker.prednode()))
2078 2099 succs = marker.succnodes()
2079 2100 fm.condwrite(
2080 2101 succs,
2081 2102 b'succnodes',
2082 2103 b'%s ',
2083 2104 fm.formatlist(map(hex, succs), name=b'node'),
2084 2105 )
2085 2106 fm.write(b'flag', b'%X ', marker.flags())
2086 2107 parents = marker.parentnodes()
2087 2108 if parents is not None:
2088 2109 fm.write(
2089 2110 b'parentnodes',
2090 2111 b'{%s} ',
2091 2112 fm.formatlist(map(hex, parents), name=b'node', sep=b', '),
2092 2113 )
2093 2114 fm.write(b'date', b'(%s) ', fm.formatdate(marker.date()))
2094 2115 meta = marker.metadata().copy()
2095 2116 meta.pop(b'date', None)
2096 2117 smeta = pycompat.rapply(pycompat.maybebytestr, meta)
2097 2118 fm.write(
2098 2119 b'metadata', b'{%s}', fm.formatdict(smeta, fmt=b'%r: %r', sep=b', ')
2099 2120 )
2100 2121 fm.plain(b'\n')
2101 2122
2102 2123
2103 2124 def finddate(ui, repo, date):
2104 2125 """Find the tipmost changeset that matches the given date spec"""
2105 2126
2106 2127 df = dateutil.matchdate(date)
2107 2128 m = scmutil.matchall(repo)
2108 2129 results = {}
2109 2130
2110 2131 def prep(ctx, fns):
2111 2132 d = ctx.date()
2112 2133 if df(d[0]):
2113 2134 results[ctx.rev()] = d
2114 2135
2115 2136 for ctx in walkchangerevs(repo, m, {b'rev': None}, prep):
2116 2137 rev = ctx.rev()
2117 2138 if rev in results:
2118 2139 ui.status(
2119 2140 _(b"found revision %d from %s\n")
2120 2141 % (rev, dateutil.datestr(results[rev]))
2121 2142 )
2122 2143 return b'%d' % rev
2123 2144
2124 2145 raise error.Abort(_(b"revision matching date not found"))
2125 2146
2126 2147
2127 2148 def increasingwindows(windowsize=8, sizelimit=512):
2128 2149 while True:
2129 2150 yield windowsize
2130 2151 if windowsize < sizelimit:
2131 2152 windowsize *= 2
2132 2153
2133 2154
2134 2155 def _walkrevs(repo, opts):
2135 2156 # Default --rev value depends on --follow but --follow behavior
2136 2157 # depends on revisions resolved from --rev...
2137 2158 follow = opts.get(b'follow') or opts.get(b'follow_first')
2138 2159 if opts.get(b'rev'):
2139 2160 revs = scmutil.revrange(repo, opts[b'rev'])
2140 2161 elif follow and repo.dirstate.p1() == nullid:
2141 2162 revs = smartset.baseset()
2142 2163 elif follow:
2143 2164 revs = repo.revs(b'reverse(:.)')
2144 2165 else:
2145 2166 revs = smartset.spanset(repo)
2146 2167 revs.reverse()
2147 2168 return revs
2148 2169
2149 2170
2150 2171 class FileWalkError(Exception):
2151 2172 pass
2152 2173
2153 2174
2154 2175 def walkfilerevs(repo, match, follow, revs, fncache):
2155 2176 '''Walks the file history for the matched files.
2156 2177
2157 2178 Returns the changeset revs that are involved in the file history.
2158 2179
2159 2180 Throws FileWalkError if the file history can't be walked using
2160 2181 filelogs alone.
2161 2182 '''
2162 2183 wanted = set()
2163 2184 copies = []
2164 2185 minrev, maxrev = min(revs), max(revs)
2165 2186
2166 2187 def filerevs(filelog, last):
2167 2188 """
2168 2189 Only files, no patterns. Check the history of each file.
2169 2190
2170 2191 Examines filelog entries within minrev, maxrev linkrev range
2171 2192 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
2172 2193 tuples in backwards order
2173 2194 """
2174 2195 cl_count = len(repo)
2175 2196 revs = []
2176 2197 for j in pycompat.xrange(0, last + 1):
2177 2198 linkrev = filelog.linkrev(j)
2178 2199 if linkrev < minrev:
2179 2200 continue
2180 2201 # only yield rev for which we have the changelog, it can
2181 2202 # happen while doing "hg log" during a pull or commit
2182 2203 if linkrev >= cl_count:
2183 2204 break
2184 2205
2185 2206 parentlinkrevs = []
2186 2207 for p in filelog.parentrevs(j):
2187 2208 if p != nullrev:
2188 2209 parentlinkrevs.append(filelog.linkrev(p))
2189 2210 n = filelog.node(j)
2190 2211 revs.append(
2191 2212 (linkrev, parentlinkrevs, follow and filelog.renamed(n))
2192 2213 )
2193 2214
2194 2215 return reversed(revs)
2195 2216
2196 2217 def iterfiles():
2197 2218 pctx = repo[b'.']
2198 2219 for filename in match.files():
2199 2220 if follow:
2200 2221 if filename not in pctx:
2201 2222 raise error.Abort(
2202 2223 _(
2203 2224 b'cannot follow file not in parent '
2204 2225 b'revision: "%s"'
2205 2226 )
2206 2227 % filename
2207 2228 )
2208 2229 yield filename, pctx[filename].filenode()
2209 2230 else:
2210 2231 yield filename, None
2211 2232 for filename_node in copies:
2212 2233 yield filename_node
2213 2234
2214 2235 for file_, node in iterfiles():
2215 2236 filelog = repo.file(file_)
2216 2237 if not len(filelog):
2217 2238 if node is None:
2218 2239 # A zero count may be a directory or deleted file, so
2219 2240 # try to find matching entries on the slow path.
2220 2241 if follow:
2221 2242 raise error.Abort(
2222 2243 _(b'cannot follow nonexistent file: "%s"') % file_
2223 2244 )
2224 2245 raise FileWalkError(b"Cannot walk via filelog")
2225 2246 else:
2226 2247 continue
2227 2248
2228 2249 if node is None:
2229 2250 last = len(filelog) - 1
2230 2251 else:
2231 2252 last = filelog.rev(node)
2232 2253
2233 2254 # keep track of all ancestors of the file
2234 2255 ancestors = {filelog.linkrev(last)}
2235 2256
2236 2257 # iterate from latest to oldest revision
2237 2258 for rev, flparentlinkrevs, copied in filerevs(filelog, last):
2238 2259 if not follow:
2239 2260 if rev > maxrev:
2240 2261 continue
2241 2262 else:
2242 2263 # Note that last might not be the first interesting
2243 2264 # rev to us:
2244 2265 # if the file has been changed after maxrev, we'll
2245 2266 # have linkrev(last) > maxrev, and we still need
2246 2267 # to explore the file graph
2247 2268 if rev not in ancestors:
2248 2269 continue
2249 2270 # XXX insert 1327 fix here
2250 2271 if flparentlinkrevs:
2251 2272 ancestors.update(flparentlinkrevs)
2252 2273
2253 2274 fncache.setdefault(rev, []).append(file_)
2254 2275 wanted.add(rev)
2255 2276 if copied:
2256 2277 copies.append(copied)
2257 2278
2258 2279 return wanted
2259 2280
2260 2281
2261 2282 class _followfilter(object):
2262 2283 def __init__(self, repo, onlyfirst=False):
2263 2284 self.repo = repo
2264 2285 self.startrev = nullrev
2265 2286 self.roots = set()
2266 2287 self.onlyfirst = onlyfirst
2267 2288
2268 2289 def match(self, rev):
2269 2290 def realparents(rev):
2270 2291 if self.onlyfirst:
2271 2292 return self.repo.changelog.parentrevs(rev)[0:1]
2272 2293 else:
2273 2294 return filter(
2274 2295 lambda x: x != nullrev, self.repo.changelog.parentrevs(rev)
2275 2296 )
2276 2297
2277 2298 if self.startrev == nullrev:
2278 2299 self.startrev = rev
2279 2300 return True
2280 2301
2281 2302 if rev > self.startrev:
2282 2303 # forward: all descendants
2283 2304 if not self.roots:
2284 2305 self.roots.add(self.startrev)
2285 2306 for parent in realparents(rev):
2286 2307 if parent in self.roots:
2287 2308 self.roots.add(rev)
2288 2309 return True
2289 2310 else:
2290 2311 # backwards: all parents
2291 2312 if not self.roots:
2292 2313 self.roots.update(realparents(self.startrev))
2293 2314 if rev in self.roots:
2294 2315 self.roots.remove(rev)
2295 2316 self.roots.update(realparents(rev))
2296 2317 return True
2297 2318
2298 2319 return False
2299 2320
2300 2321
2301 2322 def walkchangerevs(repo, match, opts, prepare):
2302 2323 '''Iterate over files and the revs in which they changed.
2303 2324
2304 2325 Callers most commonly need to iterate backwards over the history
2305 2326 in which they are interested. Doing so has awful (quadratic-looking)
2306 2327 performance, so we use iterators in a "windowed" way.
2307 2328
2308 2329 We walk a window of revisions in the desired order. Within the
2309 2330 window, we first walk forwards to gather data, then in the desired
2310 2331 order (usually backwards) to display it.
2311 2332
2312 2333 This function returns an iterator yielding contexts. Before
2313 2334 yielding each context, the iterator will first call the prepare
2314 2335 function on each context in the window in forward order.'''
2315 2336
2316 2337 allfiles = opts.get(b'all_files')
2317 2338 follow = opts.get(b'follow') or opts.get(b'follow_first')
2318 2339 revs = _walkrevs(repo, opts)
2319 2340 if not revs:
2320 2341 return []
2321 2342 wanted = set()
2322 2343 slowpath = match.anypats() or (not match.always() and opts.get(b'removed'))
2323 2344 fncache = {}
2324 2345 change = repo.__getitem__
2325 2346
2326 2347 # First step is to fill wanted, the set of revisions that we want to yield.
2327 2348 # When it does not induce extra cost, we also fill fncache for revisions in
2328 2349 # wanted: a cache of filenames that were changed (ctx.files()) and that
2329 2350 # match the file filtering conditions.
2330 2351
2331 2352 if match.always() or allfiles:
2332 2353 # No files, no patterns. Display all revs.
2333 2354 wanted = revs
2334 2355 elif not slowpath:
2335 2356 # We only have to read through the filelog to find wanted revisions
2336 2357
2337 2358 try:
2338 2359 wanted = walkfilerevs(repo, match, follow, revs, fncache)
2339 2360 except FileWalkError:
2340 2361 slowpath = True
2341 2362
2342 2363 # We decided to fall back to the slowpath because at least one
2343 2364 # of the paths was not a file. Check to see if at least one of them
2344 2365 # existed in history, otherwise simply return
2345 2366 for path in match.files():
2346 2367 if path == b'.' or path in repo.store:
2347 2368 break
2348 2369 else:
2349 2370 return []
2350 2371
2351 2372 if slowpath:
2352 2373 # We have to read the changelog to match filenames against
2353 2374 # changed files
2354 2375
2355 2376 if follow:
2356 2377 raise error.Abort(
2357 2378 _(b'can only follow copies/renames for explicit filenames')
2358 2379 )
2359 2380
2360 2381 # The slow path checks files modified in every changeset.
2361 2382 # This is really slow on large repos, so compute the set lazily.
2362 2383 class lazywantedset(object):
2363 2384 def __init__(self):
2364 2385 self.set = set()
2365 2386 self.revs = set(revs)
2366 2387
2367 2388 # No need to worry about locality here because it will be accessed
2368 2389 # in the same order as the increasing window below.
2369 2390 def __contains__(self, value):
2370 2391 if value in self.set:
2371 2392 return True
2372 2393 elif not value in self.revs:
2373 2394 return False
2374 2395 else:
2375 2396 self.revs.discard(value)
2376 2397 ctx = change(value)
2377 2398 if allfiles:
2378 2399 matches = list(ctx.manifest().walk(match))
2379 2400 else:
2380 2401 matches = [f for f in ctx.files() if match(f)]
2381 2402 if matches:
2382 2403 fncache[value] = matches
2383 2404 self.set.add(value)
2384 2405 return True
2385 2406 return False
2386 2407
2387 2408 def discard(self, value):
2388 2409 self.revs.discard(value)
2389 2410 self.set.discard(value)
2390 2411
2391 2412 wanted = lazywantedset()
2392 2413
2393 2414 # it might be worthwhile to do this in the iterator if the rev range
2394 2415 # is descending and the prune args are all within that range
2395 2416 for rev in opts.get(b'prune', ()):
2396 2417 rev = repo[rev].rev()
2397 2418 ff = _followfilter(repo)
2398 2419 stop = min(revs[0], revs[-1])
2399 2420 for x in pycompat.xrange(rev, stop - 1, -1):
2400 2421 if ff.match(x):
2401 2422 wanted = wanted - [x]
2402 2423
2403 2424 # Now that wanted is correctly initialized, we can iterate over the
2404 2425 # revision range, yielding only revisions in wanted.
2405 2426 def iterate():
2406 2427 if follow and match.always():
2407 2428 ff = _followfilter(repo, onlyfirst=opts.get(b'follow_first'))
2408 2429
2409 2430 def want(rev):
2410 2431 return ff.match(rev) and rev in wanted
2411 2432
2412 2433 else:
2413 2434
2414 2435 def want(rev):
2415 2436 return rev in wanted
2416 2437
2417 2438 it = iter(revs)
2418 2439 stopiteration = False
2419 2440 for windowsize in increasingwindows():
2420 2441 nrevs = []
2421 2442 for i in pycompat.xrange(windowsize):
2422 2443 rev = next(it, None)
2423 2444 if rev is None:
2424 2445 stopiteration = True
2425 2446 break
2426 2447 elif want(rev):
2427 2448 nrevs.append(rev)
2428 2449 for rev in sorted(nrevs):
2429 2450 fns = fncache.get(rev)
2430 2451 ctx = change(rev)
2431 2452 if not fns:
2432 2453
2433 2454 def fns_generator():
2434 2455 if allfiles:
2435 2456
2436 2457 def bad(f, msg):
2437 2458 pass
2438 2459
2439 2460 for f in ctx.matches(matchmod.badmatch(match, bad)):
2440 2461 yield f
2441 2462 else:
2442 2463 for f in ctx.files():
2443 2464 if match(f):
2444 2465 yield f
2445 2466
2446 2467 fns = fns_generator()
2447 2468 prepare(ctx, fns)
2448 2469 for rev in nrevs:
2449 2470 yield change(rev)
2450 2471
2451 2472 if stopiteration:
2452 2473 break
2453 2474
2454 2475 return iterate()
2455 2476
2456 2477
2457 2478 def add(ui, repo, match, prefix, uipathfn, explicitonly, **opts):
2458 2479 bad = []
2459 2480
2460 2481 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2461 2482 names = []
2462 2483 wctx = repo[None]
2463 2484 cca = None
2464 2485 abort, warn = scmutil.checkportabilityalert(ui)
2465 2486 if abort or warn:
2466 2487 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2467 2488
2468 2489 match = repo.narrowmatch(match, includeexact=True)
2469 2490 badmatch = matchmod.badmatch(match, badfn)
2470 2491 dirstate = repo.dirstate
2471 2492 # We don't want to just call wctx.walk here, since it would return a lot of
2472 2493 # clean files, which we aren't interested in and takes time.
2473 2494 for f in sorted(
2474 2495 dirstate.walk(
2475 2496 badmatch,
2476 2497 subrepos=sorted(wctx.substate),
2477 2498 unknown=True,
2478 2499 ignored=False,
2479 2500 full=False,
2480 2501 )
2481 2502 ):
2482 2503 exact = match.exact(f)
2483 2504 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2484 2505 if cca:
2485 2506 cca(f)
2486 2507 names.append(f)
2487 2508 if ui.verbose or not exact:
2488 2509 ui.status(
2489 2510 _(b'adding %s\n') % uipathfn(f), label=b'ui.addremove.added'
2490 2511 )
2491 2512
2492 2513 for subpath in sorted(wctx.substate):
2493 2514 sub = wctx.sub(subpath)
2494 2515 try:
2495 2516 submatch = matchmod.subdirmatcher(subpath, match)
2496 2517 subprefix = repo.wvfs.reljoin(prefix, subpath)
2497 2518 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2498 2519 if opts.get('subrepos'):
2499 2520 bad.extend(
2500 2521 sub.add(ui, submatch, subprefix, subuipathfn, False, **opts)
2501 2522 )
2502 2523 else:
2503 2524 bad.extend(
2504 2525 sub.add(ui, submatch, subprefix, subuipathfn, True, **opts)
2505 2526 )
2506 2527 except error.LookupError:
2507 2528 ui.status(
2508 2529 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2509 2530 )
2510 2531
2511 2532 if not opts.get('dry_run'):
2512 2533 rejected = wctx.add(names, prefix)
2513 2534 bad.extend(f for f in rejected if f in match.files())
2514 2535 return bad
2515 2536
2516 2537
2517 2538 def addwebdirpath(repo, serverpath, webconf):
2518 2539 webconf[serverpath] = repo.root
2519 2540 repo.ui.debug(b'adding %s = %s\n' % (serverpath, repo.root))
2520 2541
2521 2542 for r in repo.revs(b'filelog("path:.hgsub")'):
2522 2543 ctx = repo[r]
2523 2544 for subpath in ctx.substate:
2524 2545 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2525 2546
2526 2547
2527 2548 def forget(
2528 2549 ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive
2529 2550 ):
2530 2551 if dryrun and interactive:
2531 2552 raise error.Abort(_(b"cannot specify both --dry-run and --interactive"))
2532 2553 bad = []
2533 2554 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2534 2555 wctx = repo[None]
2535 2556 forgot = []
2536 2557
2537 2558 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2538 2559 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2539 2560 if explicitonly:
2540 2561 forget = [f for f in forget if match.exact(f)]
2541 2562
2542 2563 for subpath in sorted(wctx.substate):
2543 2564 sub = wctx.sub(subpath)
2544 2565 submatch = matchmod.subdirmatcher(subpath, match)
2545 2566 subprefix = repo.wvfs.reljoin(prefix, subpath)
2546 2567 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2547 2568 try:
2548 2569 subbad, subforgot = sub.forget(
2549 2570 submatch,
2550 2571 subprefix,
2551 2572 subuipathfn,
2552 2573 dryrun=dryrun,
2553 2574 interactive=interactive,
2554 2575 )
2555 2576 bad.extend([subpath + b'/' + f for f in subbad])
2556 2577 forgot.extend([subpath + b'/' + f for f in subforgot])
2557 2578 except error.LookupError:
2558 2579 ui.status(
2559 2580 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2560 2581 )
2561 2582
2562 2583 if not explicitonly:
2563 2584 for f in match.files():
2564 2585 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2565 2586 if f not in forgot:
2566 2587 if repo.wvfs.exists(f):
2567 2588 # Don't complain if the exact case match wasn't given.
2568 2589 # But don't do this until after checking 'forgot', so
2569 2590 # that subrepo files aren't normalized, and this op is
2570 2591 # purely from data cached by the status walk above.
2571 2592 if repo.dirstate.normalize(f) in repo.dirstate:
2572 2593 continue
2573 2594 ui.warn(
2574 2595 _(
2575 2596 b'not removing %s: '
2576 2597 b'file is already untracked\n'
2577 2598 )
2578 2599 % uipathfn(f)
2579 2600 )
2580 2601 bad.append(f)
2581 2602
2582 2603 if interactive:
2583 2604 responses = _(
2584 2605 b'[Ynsa?]'
2585 2606 b'$$ &Yes, forget this file'
2586 2607 b'$$ &No, skip this file'
2587 2608 b'$$ &Skip remaining files'
2588 2609 b'$$ Include &all remaining files'
2589 2610 b'$$ &? (display help)'
2590 2611 )
2591 2612 for filename in forget[:]:
2592 2613 r = ui.promptchoice(
2593 2614 _(b'forget %s %s') % (uipathfn(filename), responses)
2594 2615 )
2595 2616 if r == 4: # ?
2596 2617 while r == 4:
2597 2618 for c, t in ui.extractchoices(responses)[1]:
2598 2619 ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
2599 2620 r = ui.promptchoice(
2600 2621 _(b'forget %s %s') % (uipathfn(filename), responses)
2601 2622 )
2602 2623 if r == 0: # yes
2603 2624 continue
2604 2625 elif r == 1: # no
2605 2626 forget.remove(filename)
2606 2627 elif r == 2: # Skip
2607 2628 fnindex = forget.index(filename)
2608 2629 del forget[fnindex:]
2609 2630 break
2610 2631 elif r == 3: # All
2611 2632 break
2612 2633
2613 2634 for f in forget:
2614 2635 if ui.verbose or not match.exact(f) or interactive:
2615 2636 ui.status(
2616 2637 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2617 2638 )
2618 2639
2619 2640 if not dryrun:
2620 2641 rejected = wctx.forget(forget, prefix)
2621 2642 bad.extend(f for f in rejected if f in match.files())
2622 2643 forgot.extend(f for f in forget if f not in rejected)
2623 2644 return bad, forgot
2624 2645
2625 2646
2626 2647 def files(ui, ctx, m, uipathfn, fm, fmt, subrepos):
2627 2648 ret = 1
2628 2649
2629 2650 needsfctx = ui.verbose or {b'size', b'flags'} & fm.datahint()
2630 2651 for f in ctx.matches(m):
2631 2652 fm.startitem()
2632 2653 fm.context(ctx=ctx)
2633 2654 if needsfctx:
2634 2655 fc = ctx[f]
2635 2656 fm.write(b'size flags', b'% 10d % 1s ', fc.size(), fc.flags())
2636 2657 fm.data(path=f)
2637 2658 fm.plain(fmt % uipathfn(f))
2638 2659 ret = 0
2639 2660
2640 2661 for subpath in sorted(ctx.substate):
2641 2662 submatch = matchmod.subdirmatcher(subpath, m)
2642 2663 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2643 2664 if subrepos or m.exact(subpath) or any(submatch.files()):
2644 2665 sub = ctx.sub(subpath)
2645 2666 try:
2646 2667 recurse = m.exact(subpath) or subrepos
2647 2668 if (
2648 2669 sub.printfiles(ui, submatch, subuipathfn, fm, fmt, recurse)
2649 2670 == 0
2650 2671 ):
2651 2672 ret = 0
2652 2673 except error.LookupError:
2653 2674 ui.status(
2654 2675 _(b"skipping missing subrepository: %s\n")
2655 2676 % uipathfn(subpath)
2656 2677 )
2657 2678
2658 2679 return ret
2659 2680
2660 2681
2661 2682 def remove(
2662 2683 ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
2663 2684 ):
2664 2685 ret = 0
2665 2686 s = repo.status(match=m, clean=True)
2666 2687 modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
2667 2688
2668 2689 wctx = repo[None]
2669 2690
2670 2691 if warnings is None:
2671 2692 warnings = []
2672 2693 warn = True
2673 2694 else:
2674 2695 warn = False
2675 2696
2676 2697 subs = sorted(wctx.substate)
2677 2698 progress = ui.makeprogress(
2678 2699 _(b'searching'), total=len(subs), unit=_(b'subrepos')
2679 2700 )
2680 2701 for subpath in subs:
2681 2702 submatch = matchmod.subdirmatcher(subpath, m)
2682 2703 subprefix = repo.wvfs.reljoin(prefix, subpath)
2683 2704 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2684 2705 if subrepos or m.exact(subpath) or any(submatch.files()):
2685 2706 progress.increment()
2686 2707 sub = wctx.sub(subpath)
2687 2708 try:
2688 2709 if sub.removefiles(
2689 2710 submatch,
2690 2711 subprefix,
2691 2712 subuipathfn,
2692 2713 after,
2693 2714 force,
2694 2715 subrepos,
2695 2716 dryrun,
2696 2717 warnings,
2697 2718 ):
2698 2719 ret = 1
2699 2720 except error.LookupError:
2700 2721 warnings.append(
2701 2722 _(b"skipping missing subrepository: %s\n")
2702 2723 % uipathfn(subpath)
2703 2724 )
2704 2725 progress.complete()
2705 2726
2706 2727 # warn about failure to delete explicit files/dirs
2707 2728 deleteddirs = pathutil.dirs(deleted)
2708 2729 files = m.files()
2709 2730 progress = ui.makeprogress(
2710 2731 _(b'deleting'), total=len(files), unit=_(b'files')
2711 2732 )
2712 2733 for f in files:
2713 2734
2714 2735 def insubrepo():
2715 2736 for subpath in wctx.substate:
2716 2737 if f.startswith(subpath + b'/'):
2717 2738 return True
2718 2739 return False
2719 2740
2720 2741 progress.increment()
2721 2742 isdir = f in deleteddirs or wctx.hasdir(f)
2722 2743 if f in repo.dirstate or isdir or f == b'.' or insubrepo() or f in subs:
2723 2744 continue
2724 2745
2725 2746 if repo.wvfs.exists(f):
2726 2747 if repo.wvfs.isdir(f):
2727 2748 warnings.append(
2728 2749 _(b'not removing %s: no tracked files\n') % uipathfn(f)
2729 2750 )
2730 2751 else:
2731 2752 warnings.append(
2732 2753 _(b'not removing %s: file is untracked\n') % uipathfn(f)
2733 2754 )
2734 2755 # missing files will generate a warning elsewhere
2735 2756 ret = 1
2736 2757 progress.complete()
2737 2758
2738 2759 if force:
2739 2760 list = modified + deleted + clean + added
2740 2761 elif after:
2741 2762 list = deleted
2742 2763 remaining = modified + added + clean
2743 2764 progress = ui.makeprogress(
2744 2765 _(b'skipping'), total=len(remaining), unit=_(b'files')
2745 2766 )
2746 2767 for f in remaining:
2747 2768 progress.increment()
2748 2769 if ui.verbose or (f in files):
2749 2770 warnings.append(
2750 2771 _(b'not removing %s: file still exists\n') % uipathfn(f)
2751 2772 )
2752 2773 ret = 1
2753 2774 progress.complete()
2754 2775 else:
2755 2776 list = deleted + clean
2756 2777 progress = ui.makeprogress(
2757 2778 _(b'skipping'), total=(len(modified) + len(added)), unit=_(b'files')
2758 2779 )
2759 2780 for f in modified:
2760 2781 progress.increment()
2761 2782 warnings.append(
2762 2783 _(
2763 2784 b'not removing %s: file is modified (use -f'
2764 2785 b' to force removal)\n'
2765 2786 )
2766 2787 % uipathfn(f)
2767 2788 )
2768 2789 ret = 1
2769 2790 for f in added:
2770 2791 progress.increment()
2771 2792 warnings.append(
2772 2793 _(
2773 2794 b"not removing %s: file has been marked for add"
2774 2795 b" (use 'hg forget' to undo add)\n"
2775 2796 )
2776 2797 % uipathfn(f)
2777 2798 )
2778 2799 ret = 1
2779 2800 progress.complete()
2780 2801
2781 2802 list = sorted(list)
2782 2803 progress = ui.makeprogress(
2783 2804 _(b'deleting'), total=len(list), unit=_(b'files')
2784 2805 )
2785 2806 for f in list:
2786 2807 if ui.verbose or not m.exact(f):
2787 2808 progress.increment()
2788 2809 ui.status(
2789 2810 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2790 2811 )
2791 2812 progress.complete()
2792 2813
2793 2814 if not dryrun:
2794 2815 with repo.wlock():
2795 2816 if not after:
2796 2817 for f in list:
2797 2818 if f in added:
2798 2819 continue # we never unlink added files on remove
2799 2820 rmdir = repo.ui.configbool(
2800 2821 b'experimental', b'removeemptydirs'
2801 2822 )
2802 2823 repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
2803 2824 repo[None].forget(list)
2804 2825
2805 2826 if warn:
2806 2827 for warning in warnings:
2807 2828 ui.warn(warning)
2808 2829
2809 2830 return ret
2810 2831
2811 2832
2812 2833 def _catfmtneedsdata(fm):
2813 2834 return not fm.datahint() or b'data' in fm.datahint()
2814 2835
2815 2836
2816 2837 def _updatecatformatter(fm, ctx, matcher, path, decode):
2817 2838 """Hook for adding data to the formatter used by ``hg cat``.
2818 2839
2819 2840 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2820 2841 this method first."""
2821 2842
2822 2843 # data() can be expensive to fetch (e.g. lfs), so don't fetch it if it
2823 2844 # wasn't requested.
2824 2845 data = b''
2825 2846 if _catfmtneedsdata(fm):
2826 2847 data = ctx[path].data()
2827 2848 if decode:
2828 2849 data = ctx.repo().wwritedata(path, data)
2829 2850 fm.startitem()
2830 2851 fm.context(ctx=ctx)
2831 2852 fm.write(b'data', b'%s', data)
2832 2853 fm.data(path=path)
2833 2854
2834 2855
2835 2856 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2836 2857 err = 1
2837 2858 opts = pycompat.byteskwargs(opts)
2838 2859
2839 2860 def write(path):
2840 2861 filename = None
2841 2862 if fntemplate:
2842 2863 filename = makefilename(
2843 2864 ctx, fntemplate, pathname=os.path.join(prefix, path)
2844 2865 )
2845 2866 # attempt to create the directory if it does not already exist
2846 2867 try:
2847 2868 os.makedirs(os.path.dirname(filename))
2848 2869 except OSError:
2849 2870 pass
2850 2871 with formatter.maybereopen(basefm, filename) as fm:
2851 2872 _updatecatformatter(fm, ctx, matcher, path, opts.get(b'decode'))
2852 2873
2853 2874 # Automation often uses hg cat on single files, so special case it
2854 2875 # for performance to avoid the cost of parsing the manifest.
2855 2876 if len(matcher.files()) == 1 and not matcher.anypats():
2856 2877 file = matcher.files()[0]
2857 2878 mfl = repo.manifestlog
2858 2879 mfnode = ctx.manifestnode()
2859 2880 try:
2860 2881 if mfnode and mfl[mfnode].find(file)[0]:
2861 2882 if _catfmtneedsdata(basefm):
2862 2883 scmutil.prefetchfiles(repo, [ctx.rev()], matcher)
2863 2884 write(file)
2864 2885 return 0
2865 2886 except KeyError:
2866 2887 pass
2867 2888
2868 2889 if _catfmtneedsdata(basefm):
2869 2890 scmutil.prefetchfiles(repo, [ctx.rev()], matcher)
2870 2891
2871 2892 for abs in ctx.walk(matcher):
2872 2893 write(abs)
2873 2894 err = 0
2874 2895
2875 2896 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2876 2897 for subpath in sorted(ctx.substate):
2877 2898 sub = ctx.sub(subpath)
2878 2899 try:
2879 2900 submatch = matchmod.subdirmatcher(subpath, matcher)
2880 2901 subprefix = os.path.join(prefix, subpath)
2881 2902 if not sub.cat(
2882 2903 submatch,
2883 2904 basefm,
2884 2905 fntemplate,
2885 2906 subprefix,
2886 2907 **pycompat.strkwargs(opts)
2887 2908 ):
2888 2909 err = 0
2889 2910 except error.RepoLookupError:
2890 2911 ui.status(
2891 2912 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2892 2913 )
2893 2914
2894 2915 return err
2895 2916
2896 2917
2897 2918 def commit(ui, repo, commitfunc, pats, opts):
2898 2919 '''commit the specified files or all outstanding changes'''
2899 2920 date = opts.get(b'date')
2900 2921 if date:
2901 2922 opts[b'date'] = dateutil.parsedate(date)
2902 2923 message = logmessage(ui, opts)
2903 2924 matcher = scmutil.match(repo[None], pats, opts)
2904 2925
2905 2926 dsguard = None
2906 2927 # extract addremove carefully -- this function can be called from a command
2907 2928 # that doesn't support addremove
2908 2929 if opts.get(b'addremove'):
2909 2930 dsguard = dirstateguard.dirstateguard(repo, b'commit')
2910 2931 with dsguard or util.nullcontextmanager():
2911 2932 if dsguard:
2912 2933 relative = scmutil.anypats(pats, opts)
2913 2934 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2914 2935 if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
2915 2936 raise error.Abort(
2916 2937 _(b"failed to mark all new/missing files as added/removed")
2917 2938 )
2918 2939
2919 2940 return commitfunc(ui, repo, message, matcher, opts)
2920 2941
2921 2942
2922 2943 def samefile(f, ctx1, ctx2):
2923 2944 if f in ctx1.manifest():
2924 2945 a = ctx1.filectx(f)
2925 2946 if f in ctx2.manifest():
2926 2947 b = ctx2.filectx(f)
2927 2948 return not a.cmp(b) and a.flags() == b.flags()
2928 2949 else:
2929 2950 return False
2930 2951 else:
2931 2952 return f not in ctx2.manifest()
2932 2953
2933 2954
2934 2955 def amend(ui, repo, old, extra, pats, opts):
2935 2956 # avoid cycle context -> subrepo -> cmdutil
2936 2957 from . import context
2937 2958
2938 2959 # amend will reuse the existing user if not specified, but the obsolete
2939 2960 # marker creation requires that the current user's name is specified.
2940 2961 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2941 2962 ui.username() # raise exception if username not set
2942 2963
2943 2964 ui.note(_(b'amending changeset %s\n') % old)
2944 2965 base = old.p1()
2945 2966
2946 2967 with repo.wlock(), repo.lock(), repo.transaction(b'amend'):
2947 2968 # Participating changesets:
2948 2969 #
2949 2970 # wctx o - workingctx that contains changes from working copy
2950 2971 # | to go into amending commit
2951 2972 # |
2952 2973 # old o - changeset to amend
2953 2974 # |
2954 2975 # base o - first parent of the changeset to amend
2955 2976 wctx = repo[None]
2956 2977
2957 2978 # Copy to avoid mutating input
2958 2979 extra = extra.copy()
2959 2980 # Update extra dict from amended commit (e.g. to preserve graft
2960 2981 # source)
2961 2982 extra.update(old.extra())
2962 2983
2963 2984 # Also update it from the from the wctx
2964 2985 extra.update(wctx.extra())
2965 2986
2966 2987 # date-only change should be ignored?
2967 2988 datemaydiffer = resolvecommitoptions(ui, opts)
2968 2989
2969 2990 date = old.date()
2970 2991 if opts.get(b'date'):
2971 2992 date = dateutil.parsedate(opts.get(b'date'))
2972 2993 user = opts.get(b'user') or old.user()
2973 2994
2974 2995 if len(old.parents()) > 1:
2975 2996 # ctx.files() isn't reliable for merges, so fall back to the
2976 2997 # slower repo.status() method
2977 2998 st = base.status(old)
2978 2999 files = set(st.modified) | set(st.added) | set(st.removed)
2979 3000 else:
2980 3001 files = set(old.files())
2981 3002
2982 3003 # add/remove the files to the working copy if the "addremove" option
2983 3004 # was specified.
2984 3005 matcher = scmutil.match(wctx, pats, opts)
2985 3006 relative = scmutil.anypats(pats, opts)
2986 3007 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2987 3008 if opts.get(b'addremove') and scmutil.addremove(
2988 3009 repo, matcher, b"", uipathfn, opts
2989 3010 ):
2990 3011 raise error.Abort(
2991 3012 _(b"failed to mark all new/missing files as added/removed")
2992 3013 )
2993 3014
2994 3015 # Check subrepos. This depends on in-place wctx._status update in
2995 3016 # subrepo.precommit(). To minimize the risk of this hack, we do
2996 3017 # nothing if .hgsub does not exist.
2997 3018 if b'.hgsub' in wctx or b'.hgsub' in old:
2998 3019 subs, commitsubs, newsubstate = subrepoutil.precommit(
2999 3020 ui, wctx, wctx._status, matcher
3000 3021 )
3001 3022 # amend should abort if commitsubrepos is enabled
3002 3023 assert not commitsubs
3003 3024 if subs:
3004 3025 subrepoutil.writestate(repo, newsubstate)
3005 3026
3006 3027 ms = mergemod.mergestate.read(repo)
3007 3028 mergeutil.checkunresolved(ms)
3008 3029
3009 3030 filestoamend = set(f for f in wctx.files() if matcher(f))
3010 3031
3011 3032 changes = len(filestoamend) > 0
3012 3033 if changes:
3013 3034 # Recompute copies (avoid recording a -> b -> a)
3014 3035 copied = copies.pathcopies(base, wctx, matcher)
3015 3036 if old.p2:
3016 3037 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
3017 3038
3018 3039 # Prune files which were reverted by the updates: if old
3019 3040 # introduced file X and the file was renamed in the working
3020 3041 # copy, then those two files are the same and
3021 3042 # we can discard X from our list of files. Likewise if X
3022 3043 # was removed, it's no longer relevant. If X is missing (aka
3023 3044 # deleted), old X must be preserved.
3024 3045 files.update(filestoamend)
3025 3046 files = [
3026 3047 f
3027 3048 for f in files
3028 3049 if (f not in filestoamend or not samefile(f, wctx, base))
3029 3050 ]
3030 3051
3031 3052 def filectxfn(repo, ctx_, path):
3032 3053 try:
3033 3054 # If the file being considered is not amongst the files
3034 3055 # to be amended, we should return the file context from the
3035 3056 # old changeset. This avoids issues when only some files in
3036 3057 # the working copy are being amended but there are also
3037 3058 # changes to other files from the old changeset.
3038 3059 if path not in filestoamend:
3039 3060 return old.filectx(path)
3040 3061
3041 3062 # Return None for removed files.
3042 3063 if path in wctx.removed():
3043 3064 return None
3044 3065
3045 3066 fctx = wctx[path]
3046 3067 flags = fctx.flags()
3047 3068 mctx = context.memfilectx(
3048 3069 repo,
3049 3070 ctx_,
3050 3071 fctx.path(),
3051 3072 fctx.data(),
3052 3073 islink=b'l' in flags,
3053 3074 isexec=b'x' in flags,
3054 3075 copysource=copied.get(path),
3055 3076 )
3056 3077 return mctx
3057 3078 except KeyError:
3058 3079 return None
3059 3080
3060 3081 else:
3061 3082 ui.note(_(b'copying changeset %s to %s\n') % (old, base))
3062 3083
3063 3084 # Use version of files as in the old cset
3064 3085 def filectxfn(repo, ctx_, path):
3065 3086 try:
3066 3087 return old.filectx(path)
3067 3088 except KeyError:
3068 3089 return None
3069 3090
3070 3091 # See if we got a message from -m or -l, if not, open the editor with
3071 3092 # the message of the changeset to amend.
3072 3093 message = logmessage(ui, opts)
3073 3094
3074 3095 editform = mergeeditform(old, b'commit.amend')
3075 3096
3076 3097 if not message:
3077 3098 message = old.description()
3078 3099 # Default if message isn't provided and --edit is not passed is to
3079 3100 # invoke editor, but allow --no-edit. If somehow we don't have any
3080 3101 # description, let's always start the editor.
3081 3102 doedit = not message or opts.get(b'edit') in [True, None]
3082 3103 else:
3083 3104 # Default if message is provided is to not invoke editor, but allow
3084 3105 # --edit.
3085 3106 doedit = opts.get(b'edit') is True
3086 3107 editor = getcommiteditor(edit=doedit, editform=editform)
3087 3108
3088 3109 pureextra = extra.copy()
3089 3110 extra[b'amend_source'] = old.hex()
3090 3111
3091 3112 new = context.memctx(
3092 3113 repo,
3093 3114 parents=[base.node(), old.p2().node()],
3094 3115 text=message,
3095 3116 files=files,
3096 3117 filectxfn=filectxfn,
3097 3118 user=user,
3098 3119 date=date,
3099 3120 extra=extra,
3100 3121 editor=editor,
3101 3122 )
3102 3123
3103 3124 newdesc = changelog.stripdesc(new.description())
3104 3125 if (
3105 3126 (not changes)
3106 3127 and newdesc == old.description()
3107 3128 and user == old.user()
3108 3129 and (date == old.date() or datemaydiffer)
3109 3130 and pureextra == old.extra()
3110 3131 ):
3111 3132 # nothing changed. continuing here would create a new node
3112 3133 # anyway because of the amend_source noise.
3113 3134 #
3114 3135 # This not what we expect from amend.
3115 3136 return old.node()
3116 3137
3117 3138 commitphase = None
3118 3139 if opts.get(b'secret'):
3119 3140 commitphase = phases.secret
3120 3141 newid = repo.commitctx(new)
3121 3142
3122 3143 # Reroute the working copy parent to the new changeset
3123 3144 repo.setparents(newid, nullid)
3124 3145 mapping = {old.node(): (newid,)}
3125 3146 obsmetadata = None
3126 3147 if opts.get(b'note'):
3127 3148 obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
3128 3149 backup = ui.configbool(b'rewrite', b'backup-bundle')
3129 3150 scmutil.cleanupnodes(
3130 3151 repo,
3131 3152 mapping,
3132 3153 b'amend',
3133 3154 metadata=obsmetadata,
3134 3155 fixphase=True,
3135 3156 targetphase=commitphase,
3136 3157 backup=backup,
3137 3158 )
3138 3159
3139 3160 # Fixing the dirstate because localrepo.commitctx does not update
3140 3161 # it. This is rather convenient because we did not need to update
3141 3162 # the dirstate for all the files in the new commit which commitctx
3142 3163 # could have done if it updated the dirstate. Now, we can
3143 3164 # selectively update the dirstate only for the amended files.
3144 3165 dirstate = repo.dirstate
3145 3166
3146 3167 # Update the state of the files which were added and modified in the
3147 3168 # amend to "normal" in the dirstate. We need to use "normallookup" since
3148 3169 # the files may have changed since the command started; using "normal"
3149 3170 # would mark them as clean but with uncommitted contents.
3150 3171 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
3151 3172 for f in normalfiles:
3152 3173 dirstate.normallookup(f)
3153 3174
3154 3175 # Update the state of files which were removed in the amend
3155 3176 # to "removed" in the dirstate.
3156 3177 removedfiles = set(wctx.removed()) & filestoamend
3157 3178 for f in removedfiles:
3158 3179 dirstate.drop(f)
3159 3180
3160 3181 return newid
3161 3182
3162 3183
3163 3184 def commiteditor(repo, ctx, subs, editform=b''):
3164 3185 if ctx.description():
3165 3186 return ctx.description()
3166 3187 return commitforceeditor(
3167 3188 repo, ctx, subs, editform=editform, unchangedmessagedetection=True
3168 3189 )
3169 3190
3170 3191
3171 3192 def commitforceeditor(
3172 3193 repo,
3173 3194 ctx,
3174 3195 subs,
3175 3196 finishdesc=None,
3176 3197 extramsg=None,
3177 3198 editform=b'',
3178 3199 unchangedmessagedetection=False,
3179 3200 ):
3180 3201 if not extramsg:
3181 3202 extramsg = _(b"Leave message empty to abort commit.")
3182 3203
3183 3204 forms = [e for e in editform.split(b'.') if e]
3184 3205 forms.insert(0, b'changeset')
3185 3206 templatetext = None
3186 3207 while forms:
3187 3208 ref = b'.'.join(forms)
3188 3209 if repo.ui.config(b'committemplate', ref):
3189 3210 templatetext = committext = buildcommittemplate(
3190 3211 repo, ctx, subs, extramsg, ref
3191 3212 )
3192 3213 break
3193 3214 forms.pop()
3194 3215 else:
3195 3216 committext = buildcommittext(repo, ctx, subs, extramsg)
3196 3217
3197 3218 # run editor in the repository root
3198 3219 olddir = encoding.getcwd()
3199 3220 os.chdir(repo.root)
3200 3221
3201 3222 # make in-memory changes visible to external process
3202 3223 tr = repo.currenttransaction()
3203 3224 repo.dirstate.write(tr)
3204 3225 pending = tr and tr.writepending() and repo.root
3205 3226
3206 3227 editortext = repo.ui.edit(
3207 3228 committext,
3208 3229 ctx.user(),
3209 3230 ctx.extra(),
3210 3231 editform=editform,
3211 3232 pending=pending,
3212 3233 repopath=repo.path,
3213 3234 action=b'commit',
3214 3235 )
3215 3236 text = editortext
3216 3237
3217 3238 # strip away anything below this special string (used for editors that want
3218 3239 # to display the diff)
3219 3240 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
3220 3241 if stripbelow:
3221 3242 text = text[: stripbelow.start()]
3222 3243
3223 3244 text = re.sub(b"(?m)^HG:.*(\n|$)", b"", text)
3224 3245 os.chdir(olddir)
3225 3246
3226 3247 if finishdesc:
3227 3248 text = finishdesc(text)
3228 3249 if not text.strip():
3229 3250 raise error.Abort(_(b"empty commit message"))
3230 3251 if unchangedmessagedetection and editortext == templatetext:
3231 3252 raise error.Abort(_(b"commit message unchanged"))
3232 3253
3233 3254 return text
3234 3255
3235 3256
3236 3257 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
3237 3258 ui = repo.ui
3238 3259 spec = formatter.templatespec(ref, None, None)
3239 3260 t = logcmdutil.changesettemplater(ui, repo, spec)
3240 3261 t.t.cache.update(
3241 3262 (k, templater.unquotestring(v))
3242 3263 for k, v in repo.ui.configitems(b'committemplate')
3243 3264 )
3244 3265
3245 3266 if not extramsg:
3246 3267 extramsg = b'' # ensure that extramsg is string
3247 3268
3248 3269 ui.pushbuffer()
3249 3270 t.show(ctx, extramsg=extramsg)
3250 3271 return ui.popbuffer()
3251 3272
3252 3273
3253 3274 def hgprefix(msg):
3254 3275 return b"\n".join([b"HG: %s" % a for a in msg.split(b"\n") if a])
3255 3276
3256 3277
3257 3278 def buildcommittext(repo, ctx, subs, extramsg):
3258 3279 edittext = []
3259 3280 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
3260 3281 if ctx.description():
3261 3282 edittext.append(ctx.description())
3262 3283 edittext.append(b"")
3263 3284 edittext.append(b"") # Empty line between message and comments.
3264 3285 edittext.append(
3265 3286 hgprefix(
3266 3287 _(
3267 3288 b"Enter commit message."
3268 3289 b" Lines beginning with 'HG:' are removed."
3269 3290 )
3270 3291 )
3271 3292 )
3272 3293 edittext.append(hgprefix(extramsg))
3273 3294 edittext.append(b"HG: --")
3274 3295 edittext.append(hgprefix(_(b"user: %s") % ctx.user()))
3275 3296 if ctx.p2():
3276 3297 edittext.append(hgprefix(_(b"branch merge")))
3277 3298 if ctx.branch():
3278 3299 edittext.append(hgprefix(_(b"branch '%s'") % ctx.branch()))
3279 3300 if bookmarks.isactivewdirparent(repo):
3280 3301 edittext.append(hgprefix(_(b"bookmark '%s'") % repo._activebookmark))
3281 3302 edittext.extend([hgprefix(_(b"subrepo %s") % s) for s in subs])
3282 3303 edittext.extend([hgprefix(_(b"added %s") % f) for f in added])
3283 3304 edittext.extend([hgprefix(_(b"changed %s") % f) for f in modified])
3284 3305 edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
3285 3306 if not added and not modified and not removed:
3286 3307 edittext.append(hgprefix(_(b"no files changed")))
3287 3308 edittext.append(b"")
3288 3309
3289 3310 return b"\n".join(edittext)
3290 3311
3291 3312
3292 3313 def commitstatus(repo, node, branch, bheads=None, opts=None):
3293 3314 if opts is None:
3294 3315 opts = {}
3295 3316 ctx = repo[node]
3296 3317 parents = ctx.parents()
3297 3318
3298 3319 if (
3299 3320 not opts.get(b'amend')
3300 3321 and bheads
3301 3322 and node not in bheads
3302 3323 and not [
3303 3324 x for x in parents if x.node() in bheads and x.branch() == branch
3304 3325 ]
3305 3326 ):
3306 3327 repo.ui.status(_(b'created new head\n'))
3307 3328 # The message is not printed for initial roots. For the other
3308 3329 # changesets, it is printed in the following situations:
3309 3330 #
3310 3331 # Par column: for the 2 parents with ...
3311 3332 # N: null or no parent
3312 3333 # B: parent is on another named branch
3313 3334 # C: parent is a regular non head changeset
3314 3335 # H: parent was a branch head of the current branch
3315 3336 # Msg column: whether we print "created new head" message
3316 3337 # In the following, it is assumed that there already exists some
3317 3338 # initial branch heads of the current branch, otherwise nothing is
3318 3339 # printed anyway.
3319 3340 #
3320 3341 # Par Msg Comment
3321 3342 # N N y additional topo root
3322 3343 #
3323 3344 # B N y additional branch root
3324 3345 # C N y additional topo head
3325 3346 # H N n usual case
3326 3347 #
3327 3348 # B B y weird additional branch root
3328 3349 # C B y branch merge
3329 3350 # H B n merge with named branch
3330 3351 #
3331 3352 # C C y additional head from merge
3332 3353 # C H n merge with a head
3333 3354 #
3334 3355 # H H n head merge: head count decreases
3335 3356
3336 3357 if not opts.get(b'close_branch'):
3337 3358 for r in parents:
3338 3359 if r.closesbranch() and r.branch() == branch:
3339 3360 repo.ui.status(
3340 3361 _(b'reopening closed branch head %d\n') % r.rev()
3341 3362 )
3342 3363
3343 3364 if repo.ui.debugflag:
3344 3365 repo.ui.write(
3345 3366 _(b'committed changeset %d:%s\n') % (ctx.rev(), ctx.hex())
3346 3367 )
3347 3368 elif repo.ui.verbose:
3348 3369 repo.ui.write(_(b'committed changeset %d:%s\n') % (ctx.rev(), ctx))
3349 3370
3350 3371
3351 3372 def postcommitstatus(repo, pats, opts):
3352 3373 return repo.status(match=scmutil.match(repo[None], pats, opts))
3353 3374
3354 3375
3355 3376 def revert(ui, repo, ctx, parents, *pats, **opts):
3356 3377 opts = pycompat.byteskwargs(opts)
3357 3378 parent, p2 = parents
3358 3379 node = ctx.node()
3359 3380
3360 3381 mf = ctx.manifest()
3361 3382 if node == p2:
3362 3383 parent = p2
3363 3384
3364 3385 # need all matching names in dirstate and manifest of target rev,
3365 3386 # so have to walk both. do not print errors if files exist in one
3366 3387 # but not other. in both cases, filesets should be evaluated against
3367 3388 # workingctx to get consistent result (issue4497). this means 'set:**'
3368 3389 # cannot be used to select missing files from target rev.
3369 3390
3370 3391 # `names` is a mapping for all elements in working copy and target revision
3371 3392 # The mapping is in the form:
3372 3393 # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3373 3394 names = {}
3374 3395 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
3375 3396
3376 3397 with repo.wlock():
3377 3398 ## filling of the `names` mapping
3378 3399 # walk dirstate to fill `names`
3379 3400
3380 3401 interactive = opts.get(b'interactive', False)
3381 3402 wctx = repo[None]
3382 3403 m = scmutil.match(wctx, pats, opts)
3383 3404
3384 3405 # we'll need this later
3385 3406 targetsubs = sorted(s for s in wctx.substate if m(s))
3386 3407
3387 3408 if not m.always():
3388 3409 matcher = matchmod.badmatch(m, lambda x, y: False)
3389 3410 for abs in wctx.walk(matcher):
3390 3411 names[abs] = m.exact(abs)
3391 3412
3392 3413 # walk target manifest to fill `names`
3393 3414
3394 3415 def badfn(path, msg):
3395 3416 if path in names:
3396 3417 return
3397 3418 if path in ctx.substate:
3398 3419 return
3399 3420 path_ = path + b'/'
3400 3421 for f in names:
3401 3422 if f.startswith(path_):
3402 3423 return
3403 3424 ui.warn(b"%s: %s\n" % (uipathfn(path), msg))
3404 3425
3405 3426 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3406 3427 if abs not in names:
3407 3428 names[abs] = m.exact(abs)
3408 3429
3409 3430 # Find status of all file in `names`.
3410 3431 m = scmutil.matchfiles(repo, names)
3411 3432
3412 3433 changes = repo.status(
3413 3434 node1=node, match=m, unknown=True, ignored=True, clean=True
3414 3435 )
3415 3436 else:
3416 3437 changes = repo.status(node1=node, match=m)
3417 3438 for kind in changes:
3418 3439 for abs in kind:
3419 3440 names[abs] = m.exact(abs)
3420 3441
3421 3442 m = scmutil.matchfiles(repo, names)
3422 3443
3423 3444 modified = set(changes.modified)
3424 3445 added = set(changes.added)
3425 3446 removed = set(changes.removed)
3426 3447 _deleted = set(changes.deleted)
3427 3448 unknown = set(changes.unknown)
3428 3449 unknown.update(changes.ignored)
3429 3450 clean = set(changes.clean)
3430 3451 modadded = set()
3431 3452
3432 3453 # We need to account for the state of the file in the dirstate,
3433 3454 # even when we revert against something else than parent. This will
3434 3455 # slightly alter the behavior of revert (doing back up or not, delete
3435 3456 # or just forget etc).
3436 3457 if parent == node:
3437 3458 dsmodified = modified
3438 3459 dsadded = added
3439 3460 dsremoved = removed
3440 3461 # store all local modifications, useful later for rename detection
3441 3462 localchanges = dsmodified | dsadded
3442 3463 modified, added, removed = set(), set(), set()
3443 3464 else:
3444 3465 changes = repo.status(node1=parent, match=m)
3445 3466 dsmodified = set(changes.modified)
3446 3467 dsadded = set(changes.added)
3447 3468 dsremoved = set(changes.removed)
3448 3469 # store all local modifications, useful later for rename detection
3449 3470 localchanges = dsmodified | dsadded
3450 3471
3451 3472 # only take into account for removes between wc and target
3452 3473 clean |= dsremoved - removed
3453 3474 dsremoved &= removed
3454 3475 # distinct between dirstate remove and other
3455 3476 removed -= dsremoved
3456 3477
3457 3478 modadded = added & dsmodified
3458 3479 added -= modadded
3459 3480
3460 3481 # tell newly modified apart.
3461 3482 dsmodified &= modified
3462 3483 dsmodified |= modified & dsadded # dirstate added may need backup
3463 3484 modified -= dsmodified
3464 3485
3465 3486 # We need to wait for some post-processing to update this set
3466 3487 # before making the distinction. The dirstate will be used for
3467 3488 # that purpose.
3468 3489 dsadded = added
3469 3490
3470 3491 # in case of merge, files that are actually added can be reported as
3471 3492 # modified, we need to post process the result
3472 3493 if p2 != nullid:
3473 3494 mergeadd = set(dsmodified)
3474 3495 for path in dsmodified:
3475 3496 if path in mf:
3476 3497 mergeadd.remove(path)
3477 3498 dsadded |= mergeadd
3478 3499 dsmodified -= mergeadd
3479 3500
3480 3501 # if f is a rename, update `names` to also revert the source
3481 3502 for f in localchanges:
3482 3503 src = repo.dirstate.copied(f)
3483 3504 # XXX should we check for rename down to target node?
3484 3505 if src and src not in names and repo.dirstate[src] == b'r':
3485 3506 dsremoved.add(src)
3486 3507 names[src] = True
3487 3508
3488 3509 # determine the exact nature of the deleted changesets
3489 3510 deladded = set(_deleted)
3490 3511 for path in _deleted:
3491 3512 if path in mf:
3492 3513 deladded.remove(path)
3493 3514 deleted = _deleted - deladded
3494 3515
3495 3516 # distinguish between file to forget and the other
3496 3517 added = set()
3497 3518 for abs in dsadded:
3498 3519 if repo.dirstate[abs] != b'a':
3499 3520 added.add(abs)
3500 3521 dsadded -= added
3501 3522
3502 3523 for abs in deladded:
3503 3524 if repo.dirstate[abs] == b'a':
3504 3525 dsadded.add(abs)
3505 3526 deladded -= dsadded
3506 3527
3507 3528 # For files marked as removed, we check if an unknown file is present at
3508 3529 # the same path. If a such file exists it may need to be backed up.
3509 3530 # Making the distinction at this stage helps have simpler backup
3510 3531 # logic.
3511 3532 removunk = set()
3512 3533 for abs in removed:
3513 3534 target = repo.wjoin(abs)
3514 3535 if os.path.lexists(target):
3515 3536 removunk.add(abs)
3516 3537 removed -= removunk
3517 3538
3518 3539 dsremovunk = set()
3519 3540 for abs in dsremoved:
3520 3541 target = repo.wjoin(abs)
3521 3542 if os.path.lexists(target):
3522 3543 dsremovunk.add(abs)
3523 3544 dsremoved -= dsremovunk
3524 3545
3525 3546 # action to be actually performed by revert
3526 3547 # (<list of file>, message>) tuple
3527 3548 actions = {
3528 3549 b'revert': ([], _(b'reverting %s\n')),
3529 3550 b'add': ([], _(b'adding %s\n')),
3530 3551 b'remove': ([], _(b'removing %s\n')),
3531 3552 b'drop': ([], _(b'removing %s\n')),
3532 3553 b'forget': ([], _(b'forgetting %s\n')),
3533 3554 b'undelete': ([], _(b'undeleting %s\n')),
3534 3555 b'noop': (None, _(b'no changes needed to %s\n')),
3535 3556 b'unknown': (None, _(b'file not managed: %s\n')),
3536 3557 }
3537 3558
3538 3559 # "constant" that convey the backup strategy.
3539 3560 # All set to `discard` if `no-backup` is set do avoid checking
3540 3561 # no_backup lower in the code.
3541 3562 # These values are ordered for comparison purposes
3542 3563 backupinteractive = 3 # do backup if interactively modified
3543 3564 backup = 2 # unconditionally do backup
3544 3565 check = 1 # check if the existing file differs from target
3545 3566 discard = 0 # never do backup
3546 3567 if opts.get(b'no_backup'):
3547 3568 backupinteractive = backup = check = discard
3548 3569 if interactive:
3549 3570 dsmodifiedbackup = backupinteractive
3550 3571 else:
3551 3572 dsmodifiedbackup = backup
3552 3573 tobackup = set()
3553 3574
3554 3575 backupanddel = actions[b'remove']
3555 3576 if not opts.get(b'no_backup'):
3556 3577 backupanddel = actions[b'drop']
3557 3578
3558 3579 disptable = (
3559 3580 # dispatch table:
3560 3581 # file state
3561 3582 # action
3562 3583 # make backup
3563 3584 ## Sets that results that will change file on disk
3564 3585 # Modified compared to target, no local change
3565 3586 (modified, actions[b'revert'], discard),
3566 3587 # Modified compared to target, but local file is deleted
3567 3588 (deleted, actions[b'revert'], discard),
3568 3589 # Modified compared to target, local change
3569 3590 (dsmodified, actions[b'revert'], dsmodifiedbackup),
3570 3591 # Added since target
3571 3592 (added, actions[b'remove'], discard),
3572 3593 # Added in working directory
3573 3594 (dsadded, actions[b'forget'], discard),
3574 3595 # Added since target, have local modification
3575 3596 (modadded, backupanddel, backup),
3576 3597 # Added since target but file is missing in working directory
3577 3598 (deladded, actions[b'drop'], discard),
3578 3599 # Removed since target, before working copy parent
3579 3600 (removed, actions[b'add'], discard),
3580 3601 # Same as `removed` but an unknown file exists at the same path
3581 3602 (removunk, actions[b'add'], check),
3582 3603 # Removed since targe, marked as such in working copy parent
3583 3604 (dsremoved, actions[b'undelete'], discard),
3584 3605 # Same as `dsremoved` but an unknown file exists at the same path
3585 3606 (dsremovunk, actions[b'undelete'], check),
3586 3607 ## the following sets does not result in any file changes
3587 3608 # File with no modification
3588 3609 (clean, actions[b'noop'], discard),
3589 3610 # Existing file, not tracked anywhere
3590 3611 (unknown, actions[b'unknown'], discard),
3591 3612 )
3592 3613
3593 3614 for abs, exact in sorted(names.items()):
3594 3615 # target file to be touch on disk (relative to cwd)
3595 3616 target = repo.wjoin(abs)
3596 3617 # search the entry in the dispatch table.
3597 3618 # if the file is in any of these sets, it was touched in the working
3598 3619 # directory parent and we are sure it needs to be reverted.
3599 3620 for table, (xlist, msg), dobackup in disptable:
3600 3621 if abs not in table:
3601 3622 continue
3602 3623 if xlist is not None:
3603 3624 xlist.append(abs)
3604 3625 if dobackup:
3605 3626 # If in interactive mode, don't automatically create
3606 3627 # .orig files (issue4793)
3607 3628 if dobackup == backupinteractive:
3608 3629 tobackup.add(abs)
3609 3630 elif backup <= dobackup or wctx[abs].cmp(ctx[abs]):
3610 3631 absbakname = scmutil.backuppath(ui, repo, abs)
3611 3632 bakname = os.path.relpath(
3612 3633 absbakname, start=repo.root
3613 3634 )
3614 3635 ui.note(
3615 3636 _(b'saving current version of %s as %s\n')
3616 3637 % (uipathfn(abs), uipathfn(bakname))
3617 3638 )
3618 3639 if not opts.get(b'dry_run'):
3619 3640 if interactive:
3620 3641 util.copyfile(target, absbakname)
3621 3642 else:
3622 3643 util.rename(target, absbakname)
3623 3644 if opts.get(b'dry_run'):
3624 3645 if ui.verbose or not exact:
3625 3646 ui.status(msg % uipathfn(abs))
3626 3647 elif exact:
3627 3648 ui.warn(msg % uipathfn(abs))
3628 3649 break
3629 3650
3630 3651 if not opts.get(b'dry_run'):
3631 3652 needdata = (b'revert', b'add', b'undelete')
3632 3653 oplist = [actions[name][0] for name in needdata]
3633 3654 prefetch = scmutil.prefetchfiles
3634 3655 matchfiles = scmutil.matchfiles
3635 3656 prefetch(
3636 3657 repo,
3637 3658 [ctx.rev()],
3638 3659 matchfiles(repo, [f for sublist in oplist for f in sublist]),
3639 3660 )
3640 3661 match = scmutil.match(repo[None], pats)
3641 3662 _performrevert(
3642 3663 repo,
3643 3664 parents,
3644 3665 ctx,
3645 3666 names,
3646 3667 uipathfn,
3647 3668 actions,
3648 3669 match,
3649 3670 interactive,
3650 3671 tobackup,
3651 3672 )
3652 3673
3653 3674 if targetsubs:
3654 3675 # Revert the subrepos on the revert list
3655 3676 for sub in targetsubs:
3656 3677 try:
3657 3678 wctx.sub(sub).revert(
3658 3679 ctx.substate[sub], *pats, **pycompat.strkwargs(opts)
3659 3680 )
3660 3681 except KeyError:
3661 3682 raise error.Abort(
3662 3683 b"subrepository '%s' does not exist in %s!"
3663 3684 % (sub, short(ctx.node()))
3664 3685 )
3665 3686
3666 3687
3667 3688 def _performrevert(
3668 3689 repo,
3669 3690 parents,
3670 3691 ctx,
3671 3692 names,
3672 3693 uipathfn,
3673 3694 actions,
3674 3695 match,
3675 3696 interactive=False,
3676 3697 tobackup=None,
3677 3698 ):
3678 3699 """function that actually perform all the actions computed for revert
3679 3700
3680 3701 This is an independent function to let extension to plug in and react to
3681 3702 the imminent revert.
3682 3703
3683 3704 Make sure you have the working directory locked when calling this function.
3684 3705 """
3685 3706 parent, p2 = parents
3686 3707 node = ctx.node()
3687 3708 excluded_files = []
3688 3709
3689 3710 def checkout(f):
3690 3711 fc = ctx[f]
3691 3712 repo.wwrite(f, fc.data(), fc.flags())
3692 3713
3693 3714 def doremove(f):
3694 3715 try:
3695 3716 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
3696 3717 repo.wvfs.unlinkpath(f, rmdir=rmdir)
3697 3718 except OSError:
3698 3719 pass
3699 3720 repo.dirstate.remove(f)
3700 3721
3701 3722 def prntstatusmsg(action, f):
3702 3723 exact = names[f]
3703 3724 if repo.ui.verbose or not exact:
3704 3725 repo.ui.status(actions[action][1] % uipathfn(f))
3705 3726
3706 3727 audit_path = pathutil.pathauditor(repo.root, cached=True)
3707 3728 for f in actions[b'forget'][0]:
3708 3729 if interactive:
3709 3730 choice = repo.ui.promptchoice(
3710 3731 _(b"forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3711 3732 )
3712 3733 if choice == 0:
3713 3734 prntstatusmsg(b'forget', f)
3714 3735 repo.dirstate.drop(f)
3715 3736 else:
3716 3737 excluded_files.append(f)
3717 3738 else:
3718 3739 prntstatusmsg(b'forget', f)
3719 3740 repo.dirstate.drop(f)
3720 3741 for f in actions[b'remove'][0]:
3721 3742 audit_path(f)
3722 3743 if interactive:
3723 3744 choice = repo.ui.promptchoice(
3724 3745 _(b"remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3725 3746 )
3726 3747 if choice == 0:
3727 3748 prntstatusmsg(b'remove', f)
3728 3749 doremove(f)
3729 3750 else:
3730 3751 excluded_files.append(f)
3731 3752 else:
3732 3753 prntstatusmsg(b'remove', f)
3733 3754 doremove(f)
3734 3755 for f in actions[b'drop'][0]:
3735 3756 audit_path(f)
3736 3757 prntstatusmsg(b'drop', f)
3737 3758 repo.dirstate.remove(f)
3738 3759
3739 3760 normal = None
3740 3761 if node == parent:
3741 3762 # We're reverting to our parent. If possible, we'd like status
3742 3763 # to report the file as clean. We have to use normallookup for
3743 3764 # merges to avoid losing information about merged/dirty files.
3744 3765 if p2 != nullid:
3745 3766 normal = repo.dirstate.normallookup
3746 3767 else:
3747 3768 normal = repo.dirstate.normal
3748 3769
3749 3770 newlyaddedandmodifiedfiles = set()
3750 3771 if interactive:
3751 3772 # Prompt the user for changes to revert
3752 3773 torevert = [f for f in actions[b'revert'][0] if f not in excluded_files]
3753 3774 m = scmutil.matchfiles(repo, torevert)
3754 3775 diffopts = patch.difffeatureopts(
3755 3776 repo.ui,
3756 3777 whitespace=True,
3757 3778 section=b'commands',
3758 3779 configprefix=b'revert.interactive.',
3759 3780 )
3760 3781 diffopts.nodates = True
3761 3782 diffopts.git = True
3762 3783 operation = b'apply'
3763 3784 if node == parent:
3764 3785 if repo.ui.configbool(
3765 3786 b'experimental', b'revert.interactive.select-to-keep'
3766 3787 ):
3767 3788 operation = b'keep'
3768 3789 else:
3769 3790 operation = b'discard'
3770 3791
3771 3792 if operation == b'apply':
3772 3793 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3773 3794 else:
3774 3795 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3775 3796 originalchunks = patch.parsepatch(diff)
3776 3797
3777 3798 try:
3778 3799
3779 3800 chunks, opts = recordfilter(
3780 3801 repo.ui, originalchunks, match, operation=operation
3781 3802 )
3782 3803 if operation == b'discard':
3783 3804 chunks = patch.reversehunks(chunks)
3784 3805
3785 3806 except error.PatchError as err:
3786 3807 raise error.Abort(_(b'error parsing patch: %s') % err)
3787 3808
3788 3809 # FIXME: when doing an interactive revert of a copy, there's no way of
3789 3810 # performing a partial revert of the added file, the only option is
3790 3811 # "remove added file <name> (Yn)?", so we don't need to worry about the
3791 3812 # alsorestore value. Ideally we'd be able to partially revert
3792 3813 # copied/renamed files.
3793 3814 newlyaddedandmodifiedfiles, unusedalsorestore = newandmodified(
3794 3815 chunks, originalchunks
3795 3816 )
3796 3817 if tobackup is None:
3797 3818 tobackup = set()
3798 3819 # Apply changes
3799 3820 fp = stringio()
3800 3821 # chunks are serialized per file, but files aren't sorted
3801 3822 for f in sorted(set(c.header.filename() for c in chunks if ishunk(c))):
3802 3823 prntstatusmsg(b'revert', f)
3803 3824 files = set()
3804 3825 for c in chunks:
3805 3826 if ishunk(c):
3806 3827 abs = c.header.filename()
3807 3828 # Create a backup file only if this hunk should be backed up
3808 3829 if c.header.filename() in tobackup:
3809 3830 target = repo.wjoin(abs)
3810 3831 bakname = scmutil.backuppath(repo.ui, repo, abs)
3811 3832 util.copyfile(target, bakname)
3812 3833 tobackup.remove(abs)
3813 3834 if abs not in files:
3814 3835 files.add(abs)
3815 3836 if operation == b'keep':
3816 3837 checkout(abs)
3817 3838 c.write(fp)
3818 3839 dopatch = fp.tell()
3819 3840 fp.seek(0)
3820 3841 if dopatch:
3821 3842 try:
3822 3843 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3823 3844 except error.PatchError as err:
3824 3845 raise error.Abort(pycompat.bytestr(err))
3825 3846 del fp
3826 3847 else:
3827 3848 for f in actions[b'revert'][0]:
3828 3849 prntstatusmsg(b'revert', f)
3829 3850 checkout(f)
3830 3851 if normal:
3831 3852 normal(f)
3832 3853
3833 3854 for f in actions[b'add'][0]:
3834 3855 # Don't checkout modified files, they are already created by the diff
3835 3856 if f not in newlyaddedandmodifiedfiles:
3836 3857 prntstatusmsg(b'add', f)
3837 3858 checkout(f)
3838 3859 repo.dirstate.add(f)
3839 3860
3840 3861 normal = repo.dirstate.normallookup
3841 3862 if node == parent and p2 == nullid:
3842 3863 normal = repo.dirstate.normal
3843 3864 for f in actions[b'undelete'][0]:
3844 3865 if interactive:
3845 3866 choice = repo.ui.promptchoice(
3846 3867 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f
3847 3868 )
3848 3869 if choice == 0:
3849 3870 prntstatusmsg(b'undelete', f)
3850 3871 checkout(f)
3851 3872 normal(f)
3852 3873 else:
3853 3874 excluded_files.append(f)
3854 3875 else:
3855 3876 prntstatusmsg(b'undelete', f)
3856 3877 checkout(f)
3857 3878 normal(f)
3858 3879
3859 3880 copied = copies.pathcopies(repo[parent], ctx)
3860 3881
3861 3882 for f in (
3862 3883 actions[b'add'][0] + actions[b'undelete'][0] + actions[b'revert'][0]
3863 3884 ):
3864 3885 if f in copied:
3865 3886 repo.dirstate.copy(copied[f], f)
3866 3887
3867 3888
3868 3889 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3869 3890 # commands.outgoing. "missing" is "missing" of the result of
3870 3891 # "findcommonoutgoing()"
3871 3892 outgoinghooks = util.hooks()
3872 3893
3873 3894 # a list of (ui, repo) functions called by commands.summary
3874 3895 summaryhooks = util.hooks()
3875 3896
3876 3897 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3877 3898 #
3878 3899 # functions should return tuple of booleans below, if 'changes' is None:
3879 3900 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3880 3901 #
3881 3902 # otherwise, 'changes' is a tuple of tuples below:
3882 3903 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3883 3904 # - (desturl, destbranch, destpeer, outgoing)
3884 3905 summaryremotehooks = util.hooks()
3885 3906
3886 3907
3887 3908 def checkunfinished(repo, commit=False, skipmerge=False):
3888 3909 '''Look for an unfinished multistep operation, like graft, and abort
3889 3910 if found. It's probably good to check this right before
3890 3911 bailifchanged().
3891 3912 '''
3892 3913 # Check for non-clearable states first, so things like rebase will take
3893 3914 # precedence over update.
3894 3915 for state in statemod._unfinishedstates:
3895 3916 if (
3896 3917 state._clearable
3897 3918 or (commit and state._allowcommit)
3898 3919 or state._reportonly
3899 3920 ):
3900 3921 continue
3901 3922 if state.isunfinished(repo):
3902 3923 raise error.Abort(state.msg(), hint=state.hint())
3903 3924
3904 3925 for s in statemod._unfinishedstates:
3905 3926 if (
3906 3927 not s._clearable
3907 3928 or (commit and s._allowcommit)
3908 3929 or (s._opname == b'merge' and skipmerge)
3909 3930 or s._reportonly
3910 3931 ):
3911 3932 continue
3912 3933 if s.isunfinished(repo):
3913 3934 raise error.Abort(s.msg(), hint=s.hint())
3914 3935
3915 3936
3916 3937 def clearunfinished(repo):
3917 3938 '''Check for unfinished operations (as above), and clear the ones
3918 3939 that are clearable.
3919 3940 '''
3920 3941 for state in statemod._unfinishedstates:
3921 3942 if state._reportonly:
3922 3943 continue
3923 3944 if not state._clearable and state.isunfinished(repo):
3924 3945 raise error.Abort(state.msg(), hint=state.hint())
3925 3946
3926 3947 for s in statemod._unfinishedstates:
3927 3948 if s._opname == b'merge' or state._reportonly:
3928 3949 continue
3929 3950 if s._clearable and s.isunfinished(repo):
3930 3951 util.unlink(repo.vfs.join(s._fname))
3931 3952
3932 3953
3933 3954 def getunfinishedstate(repo):
3934 3955 ''' Checks for unfinished operations and returns statecheck object
3935 3956 for it'''
3936 3957 for state in statemod._unfinishedstates:
3937 3958 if state.isunfinished(repo):
3938 3959 return state
3939 3960 return None
3940 3961
3941 3962
3942 3963 def howtocontinue(repo):
3943 3964 '''Check for an unfinished operation and return the command to finish
3944 3965 it.
3945 3966
3946 3967 statemod._unfinishedstates list is checked for an unfinished operation
3947 3968 and the corresponding message to finish it is generated if a method to
3948 3969 continue is supported by the operation.
3949 3970
3950 3971 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3951 3972 a boolean.
3952 3973 '''
3953 3974 contmsg = _(b"continue: %s")
3954 3975 for state in statemod._unfinishedstates:
3955 3976 if not state._continueflag:
3956 3977 continue
3957 3978 if state.isunfinished(repo):
3958 3979 return contmsg % state.continuemsg(), True
3959 3980 if repo[None].dirty(missing=True, merge=False, branch=False):
3960 3981 return contmsg % _(b"hg commit"), False
3961 3982 return None, None
3962 3983
3963 3984
3964 3985 def checkafterresolved(repo):
3965 3986 '''Inform the user about the next action after completing hg resolve
3966 3987
3967 3988 If there's a an unfinished operation that supports continue flag,
3968 3989 howtocontinue will yield repo.ui.warn as the reporter.
3969 3990
3970 3991 Otherwise, it will yield repo.ui.note.
3971 3992 '''
3972 3993 msg, warning = howtocontinue(repo)
3973 3994 if msg is not None:
3974 3995 if warning:
3975 3996 repo.ui.warn(b"%s\n" % msg)
3976 3997 else:
3977 3998 repo.ui.note(b"%s\n" % msg)
3978 3999
3979 4000
3980 4001 def wrongtooltocontinue(repo, task):
3981 4002 '''Raise an abort suggesting how to properly continue if there is an
3982 4003 active task.
3983 4004
3984 4005 Uses howtocontinue() to find the active task.
3985 4006
3986 4007 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3987 4008 a hint.
3988 4009 '''
3989 4010 after = howtocontinue(repo)
3990 4011 hint = None
3991 4012 if after[1]:
3992 4013 hint = after[0]
3993 4014 raise error.Abort(_(b'no %s in progress') % task, hint=hint)
3994 4015
3995 4016
3996 4017 def abortgraft(ui, repo, graftstate):
3997 4018 """abort the interrupted graft and rollbacks to the state before interrupted
3998 4019 graft"""
3999 4020 if not graftstate.exists():
4000 4021 raise error.Abort(_(b"no interrupted graft to abort"))
4001 4022 statedata = readgraftstate(repo, graftstate)
4002 4023 newnodes = statedata.get(b'newnodes')
4003 4024 if newnodes is None:
4004 4025 # and old graft state which does not have all the data required to abort
4005 4026 # the graft
4006 4027 raise error.Abort(_(b"cannot abort using an old graftstate"))
4007 4028
4008 4029 # changeset from which graft operation was started
4009 4030 if len(newnodes) > 0:
4010 4031 startctx = repo[newnodes[0]].p1()
4011 4032 else:
4012 4033 startctx = repo[b'.']
4013 4034 # whether to strip or not
4014 4035 cleanup = False
4015 4036 from . import hg
4016 4037
4017 4038 if newnodes:
4018 4039 newnodes = [repo[r].rev() for r in newnodes]
4019 4040 cleanup = True
4020 4041 # checking that none of the newnodes turned public or is public
4021 4042 immutable = [c for c in newnodes if not repo[c].mutable()]
4022 4043 if immutable:
4023 4044 repo.ui.warn(
4024 4045 _(b"cannot clean up public changesets %s\n")
4025 4046 % b', '.join(bytes(repo[r]) for r in immutable),
4026 4047 hint=_(b"see 'hg help phases' for details"),
4027 4048 )
4028 4049 cleanup = False
4029 4050
4030 4051 # checking that no new nodes are created on top of grafted revs
4031 4052 desc = set(repo.changelog.descendants(newnodes))
4032 4053 if desc - set(newnodes):
4033 4054 repo.ui.warn(
4034 4055 _(
4035 4056 b"new changesets detected on destination "
4036 4057 b"branch, can't strip\n"
4037 4058 )
4038 4059 )
4039 4060 cleanup = False
4040 4061
4041 4062 if cleanup:
4042 4063 with repo.wlock(), repo.lock():
4043 4064 hg.updaterepo(repo, startctx.node(), overwrite=True)
4044 4065 # stripping the new nodes created
4045 4066 strippoints = [
4046 4067 c.node() for c in repo.set(b"roots(%ld)", newnodes)
4047 4068 ]
4048 4069 repair.strip(repo.ui, repo, strippoints, backup=False)
4049 4070
4050 4071 if not cleanup:
4051 4072 # we don't update to the startnode if we can't strip
4052 4073 startctx = repo[b'.']
4053 4074 hg.updaterepo(repo, startctx.node(), overwrite=True)
4054 4075
4055 4076 ui.status(_(b"graft aborted\n"))
4056 4077 ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
4057 4078 graftstate.delete()
4058 4079 return 0
4059 4080
4060 4081
4061 4082 def readgraftstate(repo, graftstate):
4062 4083 # type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
4063 4084 """read the graft state file and return a dict of the data stored in it"""
4064 4085 try:
4065 4086 return graftstate.read()
4066 4087 except error.CorruptedState:
4067 4088 nodes = repo.vfs.read(b'graftstate').splitlines()
4068 4089 return {b'nodes': nodes}
4069 4090
4070 4091
4071 4092 def hgabortgraft(ui, repo):
4072 4093 """ abort logic for aborting graft using 'hg abort'"""
4073 4094 with repo.wlock():
4074 4095 graftstate = statemod.cmdstate(repo, b'graftstate')
4075 4096 return abortgraft(ui, repo, graftstate)
@@ -1,7829 +1,7833 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@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 difflib
11 11 import errno
12 12 import os
13 13 import re
14 14 import sys
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 wdirhex,
23 23 wdirrev,
24 24 )
25 25 from .pycompat import open
26 26 from . import (
27 27 archival,
28 28 bookmarks,
29 29 bundle2,
30 30 changegroup,
31 31 cmdutil,
32 32 copies,
33 33 debugcommands as debugcommandsmod,
34 34 destutil,
35 35 dirstateguard,
36 36 discovery,
37 37 encoding,
38 38 error,
39 39 exchange,
40 40 extensions,
41 41 filemerge,
42 42 formatter,
43 43 graphmod,
44 44 hbisect,
45 45 help,
46 46 hg,
47 47 logcmdutil,
48 48 merge as mergemod,
49 49 narrowspec,
50 50 obsolete,
51 51 obsutil,
52 52 patch,
53 53 phases,
54 54 pycompat,
55 55 rcutil,
56 56 registrar,
57 57 revsetlang,
58 58 rewriteutil,
59 59 scmutil,
60 60 server,
61 61 shelve as shelvemod,
62 62 state as statemod,
63 63 streamclone,
64 64 tags as tagsmod,
65 65 ui as uimod,
66 66 util,
67 67 verify as verifymod,
68 68 wireprotoserver,
69 69 )
70 70 from .utils import (
71 71 dateutil,
72 72 stringutil,
73 73 )
74 74
75 75 table = {}
76 76 table.update(debugcommandsmod.command._table)
77 77
78 78 command = registrar.command(table)
79 79 INTENT_READONLY = registrar.INTENT_READONLY
80 80
81 81 # common command options
82 82
83 83 globalopts = [
84 84 (
85 85 b'R',
86 86 b'repository',
87 87 b'',
88 88 _(b'repository root directory or name of overlay bundle file'),
89 89 _(b'REPO'),
90 90 ),
91 91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 92 (
93 93 b'y',
94 94 b'noninteractive',
95 95 None,
96 96 _(
97 97 b'do not prompt, automatically pick the first choice for all prompts'
98 98 ),
99 99 ),
100 100 (b'q', b'quiet', None, _(b'suppress output')),
101 101 (b'v', b'verbose', None, _(b'enable additional output')),
102 102 (
103 103 b'',
104 104 b'color',
105 105 b'',
106 106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 107 # and should not be translated
108 108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 109 _(b'TYPE'),
110 110 ),
111 111 (
112 112 b'',
113 113 b'config',
114 114 [],
115 115 _(b'set/override config option (use \'section.name=value\')'),
116 116 _(b'CONFIG'),
117 117 ),
118 118 (b'', b'debug', None, _(b'enable debugging output')),
119 119 (b'', b'debugger', None, _(b'start debugger')),
120 120 (
121 121 b'',
122 122 b'encoding',
123 123 encoding.encoding,
124 124 _(b'set the charset encoding'),
125 125 _(b'ENCODE'),
126 126 ),
127 127 (
128 128 b'',
129 129 b'encodingmode',
130 130 encoding.encodingmode,
131 131 _(b'set the charset encoding mode'),
132 132 _(b'MODE'),
133 133 ),
134 134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 135 (b'', b'time', None, _(b'time how long the command takes')),
136 136 (b'', b'profile', None, _(b'print command execution profile')),
137 137 (b'', b'version', None, _(b'output version information and exit')),
138 138 (b'h', b'help', None, _(b'display help and exit')),
139 139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 140 (
141 141 b'',
142 142 b'pager',
143 143 b'auto',
144 144 _(b"when to paginate (boolean, always, auto, or never)"),
145 145 _(b'TYPE'),
146 146 ),
147 147 ]
148 148
149 149 dryrunopts = cmdutil.dryrunopts
150 150 remoteopts = cmdutil.remoteopts
151 151 walkopts = cmdutil.walkopts
152 152 commitopts = cmdutil.commitopts
153 153 commitopts2 = cmdutil.commitopts2
154 154 commitopts3 = cmdutil.commitopts3
155 155 formatteropts = cmdutil.formatteropts
156 156 templateopts = cmdutil.templateopts
157 157 logopts = cmdutil.logopts
158 158 diffopts = cmdutil.diffopts
159 159 diffwsopts = cmdutil.diffwsopts
160 160 diffopts2 = cmdutil.diffopts2
161 161 mergetoolopts = cmdutil.mergetoolopts
162 162 similarityopts = cmdutil.similarityopts
163 163 subrepoopts = cmdutil.subrepoopts
164 164 debugrevlogopts = cmdutil.debugrevlogopts
165 165
166 166 # Commands start here, listed alphabetically
167 167
168 168
169 169 @command(
170 170 b'abort',
171 171 dryrunopts,
172 172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 173 helpbasic=True,
174 174 )
175 175 def abort(ui, repo, **opts):
176 176 """abort an unfinished operation (EXPERIMENTAL)
177 177
178 178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 179 and unshelve if they are in an unfinished state.
180 180
181 181 use --dry-run/-n to dry run the command.
182 182 """
183 183 dryrun = opts.get('dry_run')
184 184 abortstate = cmdutil.getunfinishedstate(repo)
185 185 if not abortstate:
186 186 raise error.Abort(_(b'no operation in progress'))
187 187 if not abortstate.abortfunc:
188 188 raise error.Abort(
189 189 (
190 190 _(b"%s in progress but does not support 'hg abort'")
191 191 % (abortstate._opname)
192 192 ),
193 193 hint=abortstate.hint(),
194 194 )
195 195 if dryrun:
196 196 ui.status(
197 197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 198 )
199 199 return
200 200 return abortstate.abortfunc(ui, repo)
201 201
202 202
203 203 @command(
204 204 b'add',
205 205 walkopts + subrepoopts + dryrunopts,
206 206 _(b'[OPTION]... [FILE]...'),
207 207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 208 helpbasic=True,
209 209 inferrepo=True,
210 210 )
211 211 def add(ui, repo, *pats, **opts):
212 212 """add the specified files on the next commit
213 213
214 214 Schedule files to be version controlled and added to the
215 215 repository.
216 216
217 217 The files will be added to the repository at the next commit. To
218 218 undo an add before that, see :hg:`forget`.
219 219
220 220 If no names are given, add all files to the repository (except
221 221 files matching ``.hgignore``).
222 222
223 223 .. container:: verbose
224 224
225 225 Examples:
226 226
227 227 - New (unknown) files are added
228 228 automatically by :hg:`add`::
229 229
230 230 $ ls
231 231 foo.c
232 232 $ hg status
233 233 ? foo.c
234 234 $ hg add
235 235 adding foo.c
236 236 $ hg status
237 237 A foo.c
238 238
239 239 - Specific files to be added can be specified::
240 240
241 241 $ ls
242 242 bar.c foo.c
243 243 $ hg status
244 244 ? bar.c
245 245 ? foo.c
246 246 $ hg add bar.c
247 247 $ hg status
248 248 A bar.c
249 249 ? foo.c
250 250
251 251 Returns 0 if all files are successfully added.
252 252 """
253 253
254 254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 257 return rejected and 1 or 0
258 258
259 259
260 260 @command(
261 261 b'addremove',
262 262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 263 _(b'[OPTION]... [FILE]...'),
264 264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 265 inferrepo=True,
266 266 )
267 267 def addremove(ui, repo, *pats, **opts):
268 268 """add all new files, delete all missing files
269 269
270 270 Add all new files and remove all missing files from the
271 271 repository.
272 272
273 273 Unless names are given, new files are ignored if they match any of
274 274 the patterns in ``.hgignore``. As with add, these changes take
275 275 effect at the next commit.
276 276
277 277 Use the -s/--similarity option to detect renamed files. This
278 278 option takes a percentage between 0 (disabled) and 100 (files must
279 279 be identical) as its parameter. With a parameter greater than 0,
280 280 this compares every removed file with every added file and records
281 281 those similar enough as renames. Detecting renamed files this way
282 282 can be expensive. After using this option, :hg:`status -C` can be
283 283 used to check which files were identified as moved or renamed. If
284 284 not specified, -s/--similarity defaults to 100 and only renames of
285 285 identical files are detected.
286 286
287 287 .. container:: verbose
288 288
289 289 Examples:
290 290
291 291 - A number of files (bar.c and foo.c) are new,
292 292 while foobar.c has been removed (without using :hg:`remove`)
293 293 from the repository::
294 294
295 295 $ ls
296 296 bar.c foo.c
297 297 $ hg status
298 298 ! foobar.c
299 299 ? bar.c
300 300 ? foo.c
301 301 $ hg addremove
302 302 adding bar.c
303 303 adding foo.c
304 304 removing foobar.c
305 305 $ hg status
306 306 A bar.c
307 307 A foo.c
308 308 R foobar.c
309 309
310 310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 311 Afterwards, it was edited slightly::
312 312
313 313 $ ls
314 314 foo.c
315 315 $ hg status
316 316 ! foobar.c
317 317 ? foo.c
318 318 $ hg addremove --similarity 90
319 319 removing foobar.c
320 320 adding foo.c
321 321 recording removal of foobar.c as rename to foo.c (94% similar)
322 322 $ hg status -C
323 323 A foo.c
324 324 foobar.c
325 325 R foobar.c
326 326
327 327 Returns 0 if all files are successfully added.
328 328 """
329 329 opts = pycompat.byteskwargs(opts)
330 330 if not opts.get(b'similarity'):
331 331 opts[b'similarity'] = b'100'
332 332 matcher = scmutil.match(repo[None], pats, opts)
333 333 relative = scmutil.anypats(pats, opts)
334 334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336 336
337 337
338 338 @command(
339 339 b'annotate|blame',
340 340 [
341 341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 342 (
343 343 b'',
344 344 b'follow',
345 345 None,
346 346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 347 ),
348 348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 349 (b'a', b'text', None, _(b'treat all files as text')),
350 350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 351 (b'f', b'file', None, _(b'list the filename')),
352 352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 354 (b'c', b'changeset', None, _(b'list the changeset')),
355 355 (
356 356 b'l',
357 357 b'line-number',
358 358 None,
359 359 _(b'show line number at the first appearance'),
360 360 ),
361 361 (
362 362 b'',
363 363 b'skip',
364 364 [],
365 365 _(b'revset to not display (EXPERIMENTAL)'),
366 366 _(b'REV'),
367 367 ),
368 368 ]
369 369 + diffwsopts
370 370 + walkopts
371 371 + formatteropts,
372 372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 374 helpbasic=True,
375 375 inferrepo=True,
376 376 )
377 377 def annotate(ui, repo, *pats, **opts):
378 378 """show changeset information by line for each file
379 379
380 380 List changes in files, showing the revision id responsible for
381 381 each line.
382 382
383 383 This command is useful for discovering when a change was made and
384 384 by whom.
385 385
386 386 If you include --file, --user, or --date, the revision number is
387 387 suppressed unless you also include --number.
388 388
389 389 Without the -a/--text option, annotate will avoid processing files
390 390 it detects as binary. With -a, annotate will annotate the file
391 391 anyway, although the results will probably be neither useful
392 392 nor desirable.
393 393
394 394 .. container:: verbose
395 395
396 396 Template:
397 397
398 398 The following keywords are supported in addition to the common template
399 399 keywords and functions. See also :hg:`help templates`.
400 400
401 401 :lines: List of lines with annotation data.
402 402 :path: String. Repository-absolute path of the specified file.
403 403
404 404 And each entry of ``{lines}`` provides the following sub-keywords in
405 405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406 406
407 407 :line: String. Line content.
408 408 :lineno: Integer. Line number at that revision.
409 409 :path: String. Repository-absolute path of the file at that revision.
410 410
411 411 See :hg:`help templates.operators` for the list expansion syntax.
412 412
413 413 Returns 0 on success.
414 414 """
415 415 opts = pycompat.byteskwargs(opts)
416 416 if not pats:
417 417 raise error.Abort(_(b'at least one filename or pattern is required'))
418 418
419 419 if opts.get(b'follow'):
420 420 # --follow is deprecated and now just an alias for -f/--file
421 421 # to mimic the behavior of Mercurial before version 1.5
422 422 opts[b'file'] = True
423 423
424 424 if (
425 425 not opts.get(b'user')
426 426 and not opts.get(b'changeset')
427 427 and not opts.get(b'date')
428 428 and not opts.get(b'file')
429 429 ):
430 430 opts[b'number'] = True
431 431
432 432 linenumber = opts.get(b'line_number') is not None
433 433 if (
434 434 linenumber
435 435 and (not opts.get(b'changeset'))
436 436 and (not opts.get(b'number'))
437 437 ):
438 438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439 439
440 440 rev = opts.get(b'rev')
441 441 if rev:
442 442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 443 ctx = scmutil.revsingle(repo, rev)
444 444
445 445 ui.pager(b'annotate')
446 446 rootfm = ui.formatter(b'annotate', opts)
447 447 if ui.debugflag:
448 448 shorthex = pycompat.identity
449 449 else:
450 450
451 451 def shorthex(h):
452 452 return h[:12]
453 453
454 454 if ui.quiet:
455 455 datefunc = dateutil.shortdate
456 456 else:
457 457 datefunc = dateutil.datestr
458 458 if ctx.rev() is None:
459 459 if opts.get(b'changeset'):
460 460 # omit "+" suffix which is appended to node hex
461 461 def formatrev(rev):
462 462 if rev == wdirrev:
463 463 return b'%d' % ctx.p1().rev()
464 464 else:
465 465 return b'%d' % rev
466 466
467 467 else:
468 468
469 469 def formatrev(rev):
470 470 if rev == wdirrev:
471 471 return b'%d+' % ctx.p1().rev()
472 472 else:
473 473 return b'%d ' % rev
474 474
475 475 def formathex(h):
476 476 if h == wdirhex:
477 477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 478 else:
479 479 return b'%s ' % shorthex(h)
480 480
481 481 else:
482 482 formatrev = b'%d'.__mod__
483 483 formathex = shorthex
484 484
485 485 opmap = [
486 486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 492 ]
493 493 opnamemap = {
494 494 b'rev': b'number',
495 495 b'node': b'changeset',
496 496 b'path': b'file',
497 497 b'lineno': b'line_number',
498 498 }
499 499
500 500 if rootfm.isplain():
501 501
502 502 def makefunc(get, fmt):
503 503 return lambda x: fmt(get(x))
504 504
505 505 else:
506 506
507 507 def makefunc(get, fmt):
508 508 return get
509 509
510 510 datahint = rootfm.datahint()
511 511 funcmap = [
512 512 (makefunc(get, fmt), sep)
513 513 for fn, sep, get, fmt in opmap
514 514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 515 ]
516 516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 517 fields = b' '.join(
518 518 fn
519 519 for fn, sep, get, fmt in opmap
520 520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 521 )
522 522
523 523 def bad(x, y):
524 524 raise error.Abort(b"%s: %s" % (x, y))
525 525
526 526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527 527
528 528 follow = not opts.get(b'no_follow')
529 529 diffopts = patch.difffeatureopts(
530 530 ui, opts, section=b'annotate', whitespace=True
531 531 )
532 532 skiprevs = opts.get(b'skip')
533 533 if skiprevs:
534 534 skiprevs = scmutil.revrange(repo, skiprevs)
535 535
536 536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 537 for abs in ctx.walk(m):
538 538 fctx = ctx[abs]
539 539 rootfm.startitem()
540 540 rootfm.data(path=abs)
541 541 if not opts.get(b'text') and fctx.isbinary():
542 542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 543 continue
544 544
545 545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 546 lines = fctx.annotate(
547 547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 548 )
549 549 if not lines:
550 550 fm.end()
551 551 continue
552 552 formats = []
553 553 pieces = []
554 554
555 555 for f, sep in funcmap:
556 556 l = [f(n) for n in lines]
557 557 if fm.isplain():
558 558 sizes = [encoding.colwidth(x) for x in l]
559 559 ml = max(sizes)
560 560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 561 else:
562 562 formats.append([b'%s'] * len(l))
563 563 pieces.append(l)
564 564
565 565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 566 fm.startitem()
567 567 fm.context(fctx=n.fctx)
568 568 fm.write(fields, b"".join(f), *p)
569 569 if n.skip:
570 570 fmt = b"* %s"
571 571 else:
572 572 fmt = b": %s"
573 573 fm.write(b'line', fmt, n.text)
574 574
575 575 if not lines[-1].text.endswith(b'\n'):
576 576 fm.plain(b'\n')
577 577 fm.end()
578 578
579 579 rootfm.end()
580 580
581 581
582 582 @command(
583 583 b'archive',
584 584 [
585 585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 586 (
587 587 b'p',
588 588 b'prefix',
589 589 b'',
590 590 _(b'directory prefix for files in archive'),
591 591 _(b'PREFIX'),
592 592 ),
593 593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 595 ]
596 596 + subrepoopts
597 597 + walkopts,
598 598 _(b'[OPTION]... DEST'),
599 599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 600 )
601 601 def archive(ui, repo, dest, **opts):
602 602 '''create an unversioned archive of a repository revision
603 603
604 604 By default, the revision used is the parent of the working
605 605 directory; use -r/--rev to specify a different revision.
606 606
607 607 The archive type is automatically detected based on file
608 608 extension (to override, use -t/--type).
609 609
610 610 .. container:: verbose
611 611
612 612 Examples:
613 613
614 614 - create a zip file containing the 1.0 release::
615 615
616 616 hg archive -r 1.0 project-1.0.zip
617 617
618 618 - create a tarball excluding .hg files::
619 619
620 620 hg archive project.tar.gz -X ".hg*"
621 621
622 622 Valid types are:
623 623
624 624 :``files``: a directory full of files (default)
625 625 :``tar``: tar archive, uncompressed
626 626 :``tbz2``: tar archive, compressed using bzip2
627 627 :``tgz``: tar archive, compressed using gzip
628 628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 629 :``uzip``: zip archive, uncompressed
630 630 :``zip``: zip archive, compressed using deflate
631 631
632 632 The exact name of the destination archive or directory is given
633 633 using a format string; see :hg:`help export` for details.
634 634
635 635 Each member added to an archive file has a directory prefix
636 636 prepended. Use -p/--prefix to specify a format string for the
637 637 prefix. The default is the basename of the archive, with suffixes
638 638 removed.
639 639
640 640 Returns 0 on success.
641 641 '''
642 642
643 643 opts = pycompat.byteskwargs(opts)
644 644 rev = opts.get(b'rev')
645 645 if rev:
646 646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 647 ctx = scmutil.revsingle(repo, rev)
648 648 if not ctx:
649 649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 650 node = ctx.node()
651 651 dest = cmdutil.makefilename(ctx, dest)
652 652 if os.path.realpath(dest) == repo.root:
653 653 raise error.Abort(_(b'repository root cannot be destination'))
654 654
655 655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 656 prefix = opts.get(b'prefix')
657 657
658 658 if dest == b'-':
659 659 if kind == b'files':
660 660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 661 dest = cmdutil.makefileobj(ctx, dest)
662 662 if not prefix:
663 663 prefix = os.path.basename(repo.root) + b'-%h'
664 664
665 665 prefix = cmdutil.makefilename(ctx, prefix)
666 666 match = scmutil.match(ctx, [], opts)
667 667 archival.archive(
668 668 repo,
669 669 dest,
670 670 node,
671 671 kind,
672 672 not opts.get(b'no_decode'),
673 673 match,
674 674 prefix,
675 675 subrepos=opts.get(b'subrepos'),
676 676 )
677 677
678 678
679 679 @command(
680 680 b'backout',
681 681 [
682 682 (
683 683 b'',
684 684 b'merge',
685 685 None,
686 686 _(b'merge with old dirstate parent after backout'),
687 687 ),
688 688 (
689 689 b'',
690 690 b'commit',
691 691 None,
692 692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 693 ),
694 694 (b'', b'no-commit', None, _(b'do not commit')),
695 695 (
696 696 b'',
697 697 b'parent',
698 698 b'',
699 699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 700 _(b'REV'),
701 701 ),
702 702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 704 ]
705 705 + mergetoolopts
706 706 + walkopts
707 707 + commitopts
708 708 + commitopts2,
709 709 _(b'[OPTION]... [-r] REV'),
710 710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 711 )
712 712 def backout(ui, repo, node=None, rev=None, **opts):
713 713 '''reverse effect of earlier changeset
714 714
715 715 Prepare a new changeset with the effect of REV undone in the
716 716 current working directory. If no conflicts were encountered,
717 717 it will be committed immediately.
718 718
719 719 If REV is the parent of the working directory, then this new changeset
720 720 is committed automatically (unless --no-commit is specified).
721 721
722 722 .. note::
723 723
724 724 :hg:`backout` cannot be used to fix either an unwanted or
725 725 incorrect merge.
726 726
727 727 .. container:: verbose
728 728
729 729 Examples:
730 730
731 731 - Reverse the effect of the parent of the working directory.
732 732 This backout will be committed immediately::
733 733
734 734 hg backout -r .
735 735
736 736 - Reverse the effect of previous bad revision 23::
737 737
738 738 hg backout -r 23
739 739
740 740 - Reverse the effect of previous bad revision 23 and
741 741 leave changes uncommitted::
742 742
743 743 hg backout -r 23 --no-commit
744 744 hg commit -m "Backout revision 23"
745 745
746 746 By default, the pending changeset will have one parent,
747 747 maintaining a linear history. With --merge, the pending
748 748 changeset will instead have two parents: the old parent of the
749 749 working directory and a new child of REV that simply undoes REV.
750 750
751 751 Before version 1.7, the behavior without --merge was equivalent
752 752 to specifying --merge followed by :hg:`update --clean .` to
753 753 cancel the merge and leave the child of REV as a head to be
754 754 merged separately.
755 755
756 756 See :hg:`help dates` for a list of formats valid for -d/--date.
757 757
758 758 See :hg:`help revert` for a way to restore files to the state
759 759 of another revision.
760 760
761 761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 762 files.
763 763 '''
764 764 with repo.wlock(), repo.lock():
765 765 return _dobackout(ui, repo, node, rev, **opts)
766 766
767 767
768 768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 769 opts = pycompat.byteskwargs(opts)
770 770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774 774
775 775 if rev and node:
776 776 raise error.Abort(_(b"please specify just one revision"))
777 777
778 778 if not rev:
779 779 rev = node
780 780
781 781 if not rev:
782 782 raise error.Abort(_(b"please specify a revision to backout"))
783 783
784 784 date = opts.get(b'date')
785 785 if date:
786 786 opts[b'date'] = dateutil.parsedate(date)
787 787
788 788 cmdutil.checkunfinished(repo)
789 789 cmdutil.bailifchanged(repo)
790 790 node = scmutil.revsingle(repo, rev).node()
791 791
792 792 op1, op2 = repo.dirstate.parents()
793 793 if not repo.changelog.isancestor(node, op1):
794 794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795 795
796 796 p1, p2 = repo.changelog.parents(node)
797 797 if p1 == nullid:
798 798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 799 if p2 != nullid:
800 800 if not opts.get(b'parent'):
801 801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 802 p = repo.lookup(opts[b'parent'])
803 803 if p not in (p1, p2):
804 804 raise error.Abort(
805 805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 806 )
807 807 parent = p
808 808 else:
809 809 if opts.get(b'parent'):
810 810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 811 parent = p1
812 812
813 813 # the backout should appear on the same branch
814 814 branch = repo.dirstate.branch()
815 815 bheads = repo.branchheads(branch)
816 816 rctx = scmutil.revsingle(repo, hex(parent))
817 817 if not opts.get(b'merge') and op1 != node:
818 818 with dirstateguard.dirstateguard(repo, b'backout'):
819 819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 820 with ui.configoverride(overrides, b'backout'):
821 821 stats = mergemod.update(
822 822 repo,
823 823 parent,
824 824 branchmerge=True,
825 825 force=True,
826 826 ancestor=node,
827 827 mergeancestor=False,
828 828 )
829 829 repo.setparents(op1, op2)
830 830 hg._showstats(repo, stats)
831 831 if stats.unresolvedcount:
832 832 repo.ui.status(
833 833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 834 )
835 835 return 1
836 836 else:
837 837 hg.clean(repo, node, show_stats=False)
838 838 repo.dirstate.setbranch(branch)
839 839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840 840
841 841 if opts.get(b'no_commit'):
842 842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 843 ui.status(msg % short(node))
844 844 return 0
845 845
846 846 def commitfunc(ui, repo, message, match, opts):
847 847 editform = b'backout'
848 848 e = cmdutil.getcommiteditor(
849 849 editform=editform, **pycompat.strkwargs(opts)
850 850 )
851 851 if not message:
852 852 # we don't translate commit messages
853 853 message = b"Backed out changeset %s" % short(node)
854 854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 855 return repo.commit(
856 856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 857 )
858 858
859 859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 860 if not newnode:
861 861 ui.status(_(b"nothing changed\n"))
862 862 return 1
863 863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864 864
865 865 def nice(node):
866 866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867 867
868 868 ui.status(
869 869 _(b'changeset %s backs out changeset %s\n')
870 870 % (nice(repo.changelog.tip()), nice(node))
871 871 )
872 872 if opts.get(b'merge') and op1 != node:
873 873 hg.clean(repo, op1, show_stats=False)
874 874 ui.status(
875 875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 876 )
877 877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 878 with ui.configoverride(overrides, b'backout'):
879 879 return hg.merge(repo, hex(repo.changelog.tip()))
880 880 return 0
881 881
882 882
883 883 @command(
884 884 b'bisect',
885 885 [
886 886 (b'r', b'reset', False, _(b'reset bisect state')),
887 887 (b'g', b'good', False, _(b'mark changeset good')),
888 888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 889 (b's', b'skip', False, _(b'skip testing changeset')),
890 890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 891 (
892 892 b'c',
893 893 b'command',
894 894 b'',
895 895 _(b'use command to check changeset state'),
896 896 _(b'CMD'),
897 897 ),
898 898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 899 ],
900 900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 902 )
903 903 def bisect(
904 904 ui,
905 905 repo,
906 906 rev=None,
907 907 extra=None,
908 908 command=None,
909 909 reset=None,
910 910 good=None,
911 911 bad=None,
912 912 skip=None,
913 913 extend=None,
914 914 noupdate=None,
915 915 ):
916 916 """subdivision search of changesets
917 917
918 918 This command helps to find changesets which introduce problems. To
919 919 use, mark the earliest changeset you know exhibits the problem as
920 920 bad, then mark the latest changeset which is free from the problem
921 921 as good. Bisect will update your working directory to a revision
922 922 for testing (unless the -U/--noupdate option is specified). Once
923 923 you have performed tests, mark the working directory as good or
924 924 bad, and bisect will either update to another candidate changeset
925 925 or announce that it has found the bad revision.
926 926
927 927 As a shortcut, you can also use the revision argument to mark a
928 928 revision as good or bad without checking it out first.
929 929
930 930 If you supply a command, it will be used for automatic bisection.
931 931 The environment variable HG_NODE will contain the ID of the
932 932 changeset being tested. The exit status of the command will be
933 933 used to mark revisions as good or bad: status 0 means good, 125
934 934 means to skip the revision, 127 (command not found) will abort the
935 935 bisection, and any other non-zero exit status means the revision
936 936 is bad.
937 937
938 938 .. container:: verbose
939 939
940 940 Some examples:
941 941
942 942 - start a bisection with known bad revision 34, and good revision 12::
943 943
944 944 hg bisect --bad 34
945 945 hg bisect --good 12
946 946
947 947 - advance the current bisection by marking current revision as good or
948 948 bad::
949 949
950 950 hg bisect --good
951 951 hg bisect --bad
952 952
953 953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 954 that revision is not usable because of another issue)::
955 955
956 956 hg bisect --skip
957 957 hg bisect --skip 23
958 958
959 959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960 960
961 961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962 962
963 963 - forget the current bisection::
964 964
965 965 hg bisect --reset
966 966
967 967 - use 'make && make tests' to automatically find the first broken
968 968 revision::
969 969
970 970 hg bisect --reset
971 971 hg bisect --bad 34
972 972 hg bisect --good 12
973 973 hg bisect --command "make && make tests"
974 974
975 975 - see all changesets whose states are already known in the current
976 976 bisection::
977 977
978 978 hg log -r "bisect(pruned)"
979 979
980 980 - see the changeset currently being bisected (especially useful
981 981 if running with -U/--noupdate)::
982 982
983 983 hg log -r "bisect(current)"
984 984
985 985 - see all changesets that took part in the current bisection::
986 986
987 987 hg log -r "bisect(range)"
988 988
989 989 - you can even get a nice graph::
990 990
991 991 hg log --graph -r "bisect(range)"
992 992
993 993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994 994
995 995 Returns 0 on success.
996 996 """
997 997 # backward compatibility
998 998 if rev in b"good bad reset init".split():
999 999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 1000 cmd, rev, extra = rev, extra, None
1001 1001 if cmd == b"good":
1002 1002 good = True
1003 1003 elif cmd == b"bad":
1004 1004 bad = True
1005 1005 else:
1006 1006 reset = True
1007 1007 elif extra:
1008 1008 raise error.Abort(_(b'incompatible arguments'))
1009 1009
1010 1010 incompatibles = {
1011 1011 b'--bad': bad,
1012 1012 b'--command': bool(command),
1013 1013 b'--extend': extend,
1014 1014 b'--good': good,
1015 1015 b'--reset': reset,
1016 1016 b'--skip': skip,
1017 1017 }
1018 1018
1019 1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020 1020
1021 1021 if len(enabled) > 1:
1022 1022 raise error.Abort(
1023 1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 1024 )
1025 1025
1026 1026 if reset:
1027 1027 hbisect.resetstate(repo)
1028 1028 return
1029 1029
1030 1030 state = hbisect.load_state(repo)
1031 1031
1032 1032 # update state
1033 1033 if good or bad or skip:
1034 1034 if rev:
1035 1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 1036 else:
1037 1037 nodes = [repo.lookup(b'.')]
1038 1038 if good:
1039 1039 state[b'good'] += nodes
1040 1040 elif bad:
1041 1041 state[b'bad'] += nodes
1042 1042 elif skip:
1043 1043 state[b'skip'] += nodes
1044 1044 hbisect.save_state(repo, state)
1045 1045 if not (state[b'good'] and state[b'bad']):
1046 1046 return
1047 1047
1048 1048 def mayupdate(repo, node, show_stats=True):
1049 1049 """common used update sequence"""
1050 1050 if noupdate:
1051 1051 return
1052 1052 cmdutil.checkunfinished(repo)
1053 1053 cmdutil.bailifchanged(repo)
1054 1054 return hg.clean(repo, node, show_stats=show_stats)
1055 1055
1056 1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057 1057
1058 1058 if command:
1059 1059 changesets = 1
1060 1060 if noupdate:
1061 1061 try:
1062 1062 node = state[b'current'][0]
1063 1063 except LookupError:
1064 1064 raise error.Abort(
1065 1065 _(
1066 1066 b'current bisect revision is unknown - '
1067 1067 b'start a new bisect to fix'
1068 1068 )
1069 1069 )
1070 1070 else:
1071 1071 node, p2 = repo.dirstate.parents()
1072 1072 if p2 != nullid:
1073 1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 1074 if rev:
1075 1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 1076 with hbisect.restore_state(repo, state, node):
1077 1077 while changesets:
1078 1078 # update state
1079 1079 state[b'current'] = [node]
1080 1080 hbisect.save_state(repo, state)
1081 1081 status = ui.system(
1082 1082 command,
1083 1083 environ={b'HG_NODE': hex(node)},
1084 1084 blockedtag=b'bisect_check',
1085 1085 )
1086 1086 if status == 125:
1087 1087 transition = b"skip"
1088 1088 elif status == 0:
1089 1089 transition = b"good"
1090 1090 # status < 0 means process was killed
1091 1091 elif status == 127:
1092 1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 1093 elif status < 0:
1094 1094 raise error.Abort(_(b"%s killed") % command)
1095 1095 else:
1096 1096 transition = b"bad"
1097 1097 state[transition].append(node)
1098 1098 ctx = repo[node]
1099 1099 ui.status(
1100 1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 1101 )
1102 1102 hbisect.checkstate(state)
1103 1103 # bisect
1104 1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 1105 # update to next check
1106 1106 node = nodes[0]
1107 1107 mayupdate(repo, node, show_stats=False)
1108 1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 1109 return
1110 1110
1111 1111 hbisect.checkstate(state)
1112 1112
1113 1113 # actually bisect
1114 1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 1115 if extend:
1116 1116 if not changesets:
1117 1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 1118 if extendnode is not None:
1119 1119 ui.write(
1120 1120 _(b"Extending search to changeset %d:%s\n")
1121 1121 % (extendnode.rev(), extendnode)
1122 1122 )
1123 1123 state[b'current'] = [extendnode.node()]
1124 1124 hbisect.save_state(repo, state)
1125 1125 return mayupdate(repo, extendnode.node())
1126 1126 raise error.Abort(_(b"nothing to extend"))
1127 1127
1128 1128 if changesets == 0:
1129 1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 1130 else:
1131 1131 assert len(nodes) == 1 # only a single node can be tested next
1132 1132 node = nodes[0]
1133 1133 # compute the approximate number of remaining tests
1134 1134 tests, size = 0, 2
1135 1135 while size <= changesets:
1136 1136 tests, size = tests + 1, size * 2
1137 1137 rev = repo.changelog.rev(node)
1138 1138 ui.write(
1139 1139 _(
1140 1140 b"Testing changeset %d:%s "
1141 1141 b"(%d changesets remaining, ~%d tests)\n"
1142 1142 )
1143 1143 % (rev, short(node), changesets, tests)
1144 1144 )
1145 1145 state[b'current'] = [node]
1146 1146 hbisect.save_state(repo, state)
1147 1147 return mayupdate(repo, node)
1148 1148
1149 1149
1150 1150 @command(
1151 1151 b'bookmarks|bookmark',
1152 1152 [
1153 1153 (b'f', b'force', False, _(b'force')),
1154 1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 1159 ]
1160 1160 + formatteropts,
1161 1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 1163 )
1164 1164 def bookmark(ui, repo, *names, **opts):
1165 1165 '''create a new bookmark or list existing bookmarks
1166 1166
1167 1167 Bookmarks are labels on changesets to help track lines of development.
1168 1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170 1170
1171 1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 1172 The active bookmark is indicated with a '*'.
1173 1173 When a commit is made, the active bookmark will advance to the new commit.
1174 1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 1175 Updating away from a bookmark will cause it to be deactivated.
1176 1176
1177 1177 Bookmarks can be pushed and pulled between repositories (see
1178 1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 1180 be created. Using :hg:`merge` will resolve the divergence.
1181 1181
1182 1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 1183 the active bookmark's name.
1184 1184
1185 1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 1186 check it out by default if it exists.
1187 1187
1188 1188 .. container:: verbose
1189 1189
1190 1190 Template:
1191 1191
1192 1192 The following keywords are supported in addition to the common template
1193 1193 keywords and functions such as ``{bookmark}``. See also
1194 1194 :hg:`help templates`.
1195 1195
1196 1196 :active: Boolean. True if the bookmark is active.
1197 1197
1198 1198 Examples:
1199 1199
1200 1200 - create an active bookmark for a new line of development::
1201 1201
1202 1202 hg book new-feature
1203 1203
1204 1204 - create an inactive bookmark as a place marker::
1205 1205
1206 1206 hg book -i reviewed
1207 1207
1208 1208 - create an inactive bookmark on another changeset::
1209 1209
1210 1210 hg book -r .^ tested
1211 1211
1212 1212 - rename bookmark turkey to dinner::
1213 1213
1214 1214 hg book -m turkey dinner
1215 1215
1216 1216 - move the '@' bookmark from another branch::
1217 1217
1218 1218 hg book -f @
1219 1219
1220 1220 - print only the active bookmark name::
1221 1221
1222 1222 hg book -ql .
1223 1223 '''
1224 1224 opts = pycompat.byteskwargs(opts)
1225 1225 force = opts.get(b'force')
1226 1226 rev = opts.get(b'rev')
1227 1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228 1228
1229 1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 1230 if action:
1231 1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 1232 elif names or rev:
1233 1233 action = b'add'
1234 1234 elif inactive:
1235 1235 action = b'inactive' # meaning deactivate
1236 1236 else:
1237 1237 action = b'list'
1238 1238
1239 1239 cmdutil.check_incompatible_arguments(
1240 1240 opts, b'inactive', [b'delete', b'list']
1241 1241 )
1242 1242 if not names and action in {b'add', b'delete'}:
1243 1243 raise error.Abort(_(b"bookmark name required"))
1244 1244
1245 1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 1247 if action == b'delete':
1248 1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 1249 bookmarks.delete(repo, tr, names)
1250 1250 elif action == b'rename':
1251 1251 if not names:
1252 1252 raise error.Abort(_(b"new bookmark name required"))
1253 1253 elif len(names) > 1:
1254 1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 1257 elif action == b'add':
1258 1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 1259 elif action == b'inactive':
1260 1260 if len(repo._bookmarks) == 0:
1261 1261 ui.status(_(b"no bookmarks set\n"))
1262 1262 elif not repo._activebookmark:
1263 1263 ui.status(_(b"no active bookmark\n"))
1264 1264 else:
1265 1265 bookmarks.deactivate(repo)
1266 1266 elif action == b'list':
1267 1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 1268 with ui.formatter(b'bookmarks', opts) as fm:
1269 1269 bookmarks.printbookmarks(ui, repo, fm, names)
1270 1270 else:
1271 1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1272 1272
1273 1273
1274 1274 @command(
1275 1275 b'branch',
1276 1276 [
1277 1277 (
1278 1278 b'f',
1279 1279 b'force',
1280 1280 None,
1281 1281 _(b'set branch name even if it shadows an existing branch'),
1282 1282 ),
1283 1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 1284 (
1285 1285 b'r',
1286 1286 b'rev',
1287 1287 [],
1288 1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 1289 ),
1290 1290 ],
1291 1291 _(b'[-fC] [NAME]'),
1292 1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 1293 )
1294 1294 def branch(ui, repo, label=None, **opts):
1295 1295 """set or show the current branch name
1296 1296
1297 1297 .. note::
1298 1298
1299 1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 1300 light-weight bookmark instead. See :hg:`help glossary` for more
1301 1301 information about named branches and bookmarks.
1302 1302
1303 1303 With no argument, show the current branch name. With one argument,
1304 1304 set the working directory branch name (the branch will not exist
1305 1305 in the repository until the next commit). Standard practice
1306 1306 recommends that primary development take place on the 'default'
1307 1307 branch.
1308 1308
1309 1309 Unless -f/--force is specified, branch will not let you set a
1310 1310 branch name that already exists.
1311 1311
1312 1312 Use -C/--clean to reset the working directory branch to that of
1313 1313 the parent of the working directory, negating a previous branch
1314 1314 change.
1315 1315
1316 1316 Use the command :hg:`update` to switch to an existing branch. Use
1317 1317 :hg:`commit --close-branch` to mark this branch head as closed.
1318 1318 When all heads of a branch are closed, the branch will be
1319 1319 considered closed.
1320 1320
1321 1321 Returns 0 on success.
1322 1322 """
1323 1323 opts = pycompat.byteskwargs(opts)
1324 1324 revs = opts.get(b'rev')
1325 1325 if label:
1326 1326 label = label.strip()
1327 1327
1328 1328 if not opts.get(b'clean') and not label:
1329 1329 if revs:
1330 1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 1331 ui.write(b"%s\n" % repo.dirstate.branch())
1332 1332 return
1333 1333
1334 1334 with repo.wlock():
1335 1335 if opts.get(b'clean'):
1336 1336 label = repo[b'.'].branch()
1337 1337 repo.dirstate.setbranch(label)
1338 1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 1339 elif label:
1340 1340
1341 1341 scmutil.checknewlabel(repo, label, b'branch')
1342 1342 if revs:
1343 1343 return cmdutil.changebranch(ui, repo, revs, label)
1344 1344
1345 1345 if not opts.get(b'force') and label in repo.branchmap():
1346 1346 if label not in [p.branch() for p in repo[None].parents()]:
1347 1347 raise error.Abort(
1348 1348 _(b'a branch of the same name already exists'),
1349 1349 # i18n: "it" refers to an existing branch
1350 1350 hint=_(b"use 'hg update' to switch to it"),
1351 1351 )
1352 1352
1353 1353 repo.dirstate.setbranch(label)
1354 1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1355 1355
1356 1356 # find any open named branches aside from default
1357 1357 for n, h, t, c in repo.branchmap().iterbranches():
1358 1358 if n != b"default" and not c:
1359 1359 return 0
1360 1360 ui.status(
1361 1361 _(
1362 1362 b'(branches are permanent and global, '
1363 1363 b'did you want a bookmark?)\n'
1364 1364 )
1365 1365 )
1366 1366
1367 1367
1368 1368 @command(
1369 1369 b'branches',
1370 1370 [
1371 1371 (
1372 1372 b'a',
1373 1373 b'active',
1374 1374 False,
1375 1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 1376 ),
1377 1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 1379 ]
1380 1380 + formatteropts,
1381 1381 _(b'[-c]'),
1382 1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 1383 intents={INTENT_READONLY},
1384 1384 )
1385 1385 def branches(ui, repo, active=False, closed=False, **opts):
1386 1386 """list repository named branches
1387 1387
1388 1388 List the repository's named branches, indicating which ones are
1389 1389 inactive. If -c/--closed is specified, also list branches which have
1390 1390 been marked closed (see :hg:`commit --close-branch`).
1391 1391
1392 1392 Use the command :hg:`update` to switch to an existing branch.
1393 1393
1394 1394 .. container:: verbose
1395 1395
1396 1396 Template:
1397 1397
1398 1398 The following keywords are supported in addition to the common template
1399 1399 keywords and functions such as ``{branch}``. See also
1400 1400 :hg:`help templates`.
1401 1401
1402 1402 :active: Boolean. True if the branch is active.
1403 1403 :closed: Boolean. True if the branch is closed.
1404 1404 :current: Boolean. True if it is the current branch.
1405 1405
1406 1406 Returns 0.
1407 1407 """
1408 1408
1409 1409 opts = pycompat.byteskwargs(opts)
1410 1410 revs = opts.get(b'rev')
1411 1411 selectedbranches = None
1412 1412 if revs:
1413 1413 revs = scmutil.revrange(repo, revs)
1414 1414 getbi = repo.revbranchcache().branchinfo
1415 1415 selectedbranches = {getbi(r)[0] for r in revs}
1416 1416
1417 1417 ui.pager(b'branches')
1418 1418 fm = ui.formatter(b'branches', opts)
1419 1419 hexfunc = fm.hexfunc
1420 1420
1421 1421 allheads = set(repo.heads())
1422 1422 branches = []
1423 1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 1424 if selectedbranches is not None and tag not in selectedbranches:
1425 1425 continue
1426 1426 isactive = False
1427 1427 if not isclosed:
1428 1428 openheads = set(repo.branchmap().iteropen(heads))
1429 1429 isactive = bool(openheads & allheads)
1430 1430 branches.append((tag, repo[tip], isactive, not isclosed))
1431 1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432 1432
1433 1433 for tag, ctx, isactive, isopen in branches:
1434 1434 if active and not isactive:
1435 1435 continue
1436 1436 if isactive:
1437 1437 label = b'branches.active'
1438 1438 notice = b''
1439 1439 elif not isopen:
1440 1440 if not closed:
1441 1441 continue
1442 1442 label = b'branches.closed'
1443 1443 notice = _(b' (closed)')
1444 1444 else:
1445 1445 label = b'branches.inactive'
1446 1446 notice = _(b' (inactive)')
1447 1447 current = tag == repo.dirstate.branch()
1448 1448 if current:
1449 1449 label = b'branches.current'
1450 1450
1451 1451 fm.startitem()
1452 1452 fm.write(b'branch', b'%s', tag, label=label)
1453 1453 rev = ctx.rev()
1454 1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 1455 fmt = b' ' * padsize + b' %d:%s'
1456 1456 fm.condwrite(
1457 1457 not ui.quiet,
1458 1458 b'rev node',
1459 1459 fmt,
1460 1460 rev,
1461 1461 hexfunc(ctx.node()),
1462 1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 1463 )
1464 1464 fm.context(ctx=ctx)
1465 1465 fm.data(active=isactive, closed=not isopen, current=current)
1466 1466 if not ui.quiet:
1467 1467 fm.plain(notice)
1468 1468 fm.plain(b'\n')
1469 1469 fm.end()
1470 1470
1471 1471
1472 1472 @command(
1473 1473 b'bundle',
1474 1474 [
1475 1475 (
1476 1476 b'f',
1477 1477 b'force',
1478 1478 None,
1479 1479 _(b'run even when the destination is unrelated'),
1480 1480 ),
1481 1481 (
1482 1482 b'r',
1483 1483 b'rev',
1484 1484 [],
1485 1485 _(b'a changeset intended to be added to the destination'),
1486 1486 _(b'REV'),
1487 1487 ),
1488 1488 (
1489 1489 b'b',
1490 1490 b'branch',
1491 1491 [],
1492 1492 _(b'a specific branch you would like to bundle'),
1493 1493 _(b'BRANCH'),
1494 1494 ),
1495 1495 (
1496 1496 b'',
1497 1497 b'base',
1498 1498 [],
1499 1499 _(b'a base changeset assumed to be available at the destination'),
1500 1500 _(b'REV'),
1501 1501 ),
1502 1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 1503 (
1504 1504 b't',
1505 1505 b'type',
1506 1506 b'bzip2',
1507 1507 _(b'bundle compression type to use'),
1508 1508 _(b'TYPE'),
1509 1509 ),
1510 1510 ]
1511 1511 + remoteopts,
1512 1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 1514 )
1515 1515 def bundle(ui, repo, fname, dest=None, **opts):
1516 1516 """create a bundle file
1517 1517
1518 1518 Generate a bundle file containing data to be transferred to another
1519 1519 repository.
1520 1520
1521 1521 To create a bundle containing all changesets, use -a/--all
1522 1522 (or --base null). Otherwise, hg assumes the destination will have
1523 1523 all the nodes you specify with --base parameters. Otherwise, hg
1524 1524 will assume the repository has all the nodes in destination, or
1525 1525 default-push/default if no destination is specified, where destination
1526 1526 is the repository you provide through DEST option.
1527 1527
1528 1528 You can change bundle format with the -t/--type option. See
1529 1529 :hg:`help bundlespec` for documentation on this format. By default,
1530 1530 the most appropriate format is used and compression defaults to
1531 1531 bzip2.
1532 1532
1533 1533 The bundle file can then be transferred using conventional means
1534 1534 and applied to another repository with the unbundle or pull
1535 1535 command. This is useful when direct push and pull are not
1536 1536 available or when exporting an entire repository is undesirable.
1537 1537
1538 1538 Applying bundles preserves all changeset contents including
1539 1539 permissions, copy/rename information, and revision history.
1540 1540
1541 1541 Returns 0 on success, 1 if no changes found.
1542 1542 """
1543 1543 opts = pycompat.byteskwargs(opts)
1544 1544 revs = None
1545 1545 if b'rev' in opts:
1546 1546 revstrings = opts[b'rev']
1547 1547 revs = scmutil.revrange(repo, revstrings)
1548 1548 if revstrings and not revs:
1549 1549 raise error.Abort(_(b'no commits to bundle'))
1550 1550
1551 1551 bundletype = opts.get(b'type', b'bzip2').lower()
1552 1552 try:
1553 1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 1554 except error.UnsupportedBundleSpecification as e:
1555 1555 raise error.Abort(
1556 1556 pycompat.bytestr(e),
1557 1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 1558 )
1559 1559 cgversion = bundlespec.contentopts[b"cg.version"]
1560 1560
1561 1561 # Packed bundles are a pseudo bundle format for now.
1562 1562 if cgversion == b's1':
1563 1563 raise error.Abort(
1564 1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 1566 )
1567 1567
1568 1568 if opts.get(b'all'):
1569 1569 if dest:
1570 1570 raise error.Abort(
1571 1571 _(b"--all is incompatible with specifying a destination")
1572 1572 )
1573 1573 if opts.get(b'base'):
1574 1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 1575 base = [nullrev]
1576 1576 else:
1577 1577 base = scmutil.revrange(repo, opts.get(b'base'))
1578 1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 1579 raise error.Abort(
1580 1580 _(b"repository does not support bundle version %s") % cgversion
1581 1581 )
1582 1582
1583 1583 if base:
1584 1584 if dest:
1585 1585 raise error.Abort(
1586 1586 _(b"--base is incompatible with specifying a destination")
1587 1587 )
1588 1588 common = [repo[rev].node() for rev in base]
1589 1589 heads = [repo[r].node() for r in revs] if revs else None
1590 1590 outgoing = discovery.outgoing(repo, common, heads)
1591 1591 else:
1592 1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 1594 other = hg.peer(repo, opts, dest)
1595 1595 revs = [repo[r].hex() for r in revs]
1596 1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 1598 outgoing = discovery.findcommonoutgoing(
1599 1599 repo,
1600 1600 other,
1601 1601 onlyheads=heads,
1602 1602 force=opts.get(b'force'),
1603 1603 portable=True,
1604 1604 )
1605 1605
1606 1606 if not outgoing.missing:
1607 1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 1608 return 1
1609 1609
1610 1610 if cgversion == b'01': # bundle1
1611 1611 bversion = b'HG10' + bundlespec.wirecompression
1612 1612 bcompression = None
1613 1613 elif cgversion in (b'02', b'03'):
1614 1614 bversion = b'HG20'
1615 1615 bcompression = bundlespec.wirecompression
1616 1616 else:
1617 1617 raise error.ProgrammingError(
1618 1618 b'bundle: unexpected changegroup version %s' % cgversion
1619 1619 )
1620 1620
1621 1621 # TODO compression options should be derived from bundlespec parsing.
1622 1622 # This is a temporary hack to allow adjusting bundle compression
1623 1623 # level without a) formalizing the bundlespec changes to declare it
1624 1624 # b) introducing a command flag.
1625 1625 compopts = {}
1626 1626 complevel = ui.configint(
1627 1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 1628 )
1629 1629 if complevel is None:
1630 1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 1631 if complevel is not None:
1632 1632 compopts[b'level'] = complevel
1633 1633
1634 1634 # Allow overriding the bundling of obsmarker in phases through
1635 1635 # configuration while we don't have a bundle version that include them
1636 1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 1637 bundlespec.contentopts[b'obsolescence'] = True
1638 1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 1639 bundlespec.contentopts[b'phases'] = True
1640 1640
1641 1641 bundle2.writenewbundle(
1642 1642 ui,
1643 1643 repo,
1644 1644 b'bundle',
1645 1645 fname,
1646 1646 bversion,
1647 1647 outgoing,
1648 1648 bundlespec.contentopts,
1649 1649 compression=bcompression,
1650 1650 compopts=compopts,
1651 1651 )
1652 1652
1653 1653
1654 1654 @command(
1655 1655 b'cat',
1656 1656 [
1657 1657 (
1658 1658 b'o',
1659 1659 b'output',
1660 1660 b'',
1661 1661 _(b'print output to file with formatted name'),
1662 1662 _(b'FORMAT'),
1663 1663 ),
1664 1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 1666 ]
1667 1667 + walkopts
1668 1668 + formatteropts,
1669 1669 _(b'[OPTION]... FILE...'),
1670 1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 1671 inferrepo=True,
1672 1672 intents={INTENT_READONLY},
1673 1673 )
1674 1674 def cat(ui, repo, file1, *pats, **opts):
1675 1675 """output the current or given revision of files
1676 1676
1677 1677 Print the specified files as they were at the given revision. If
1678 1678 no revision is given, the parent of the working directory is used.
1679 1679
1680 1680 Output may be to a file, in which case the name of the file is
1681 1681 given using a template string. See :hg:`help templates`. In addition
1682 1682 to the common template keywords, the following formatting rules are
1683 1683 supported:
1684 1684
1685 1685 :``%%``: literal "%" character
1686 1686 :``%s``: basename of file being printed
1687 1687 :``%d``: dirname of file being printed, or '.' if in repository root
1688 1688 :``%p``: root-relative path name of file being printed
1689 1689 :``%H``: changeset hash (40 hexadecimal digits)
1690 1690 :``%R``: changeset revision number
1691 1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 1692 :``%r``: zero-padded changeset revision number
1693 1693 :``%b``: basename of the exporting repository
1694 1694 :``\\``: literal "\\" character
1695 1695
1696 1696 .. container:: verbose
1697 1697
1698 1698 Template:
1699 1699
1700 1700 The following keywords are supported in addition to the common template
1701 1701 keywords and functions. See also :hg:`help templates`.
1702 1702
1703 1703 :data: String. File content.
1704 1704 :path: String. Repository-absolute path of the file.
1705 1705
1706 1706 Returns 0 on success.
1707 1707 """
1708 1708 opts = pycompat.byteskwargs(opts)
1709 1709 rev = opts.get(b'rev')
1710 1710 if rev:
1711 1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 1712 ctx = scmutil.revsingle(repo, rev)
1713 1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 1714 fntemplate = opts.pop(b'output', b'')
1715 1715 if cmdutil.isstdiofilename(fntemplate):
1716 1716 fntemplate = b''
1717 1717
1718 1718 if fntemplate:
1719 1719 fm = formatter.nullformatter(ui, b'cat', opts)
1720 1720 else:
1721 1721 ui.pager(b'cat')
1722 1722 fm = ui.formatter(b'cat', opts)
1723 1723 with fm:
1724 1724 return cmdutil.cat(
1725 1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 1726 )
1727 1727
1728 1728
1729 1729 @command(
1730 1730 b'clone',
1731 1731 [
1732 1732 (
1733 1733 b'U',
1734 1734 b'noupdate',
1735 1735 None,
1736 1736 _(
1737 1737 b'the clone will include an empty working '
1738 1738 b'directory (only a repository)'
1739 1739 ),
1740 1740 ),
1741 1741 (
1742 1742 b'u',
1743 1743 b'updaterev',
1744 1744 b'',
1745 1745 _(b'revision, tag, or branch to check out'),
1746 1746 _(b'REV'),
1747 1747 ),
1748 1748 (
1749 1749 b'r',
1750 1750 b'rev',
1751 1751 [],
1752 1752 _(
1753 1753 b'do not clone everything, but include this changeset'
1754 1754 b' and its ancestors'
1755 1755 ),
1756 1756 _(b'REV'),
1757 1757 ),
1758 1758 (
1759 1759 b'b',
1760 1760 b'branch',
1761 1761 [],
1762 1762 _(
1763 1763 b'do not clone everything, but include this branch\'s'
1764 1764 b' changesets and their ancestors'
1765 1765 ),
1766 1766 _(b'BRANCH'),
1767 1767 ),
1768 1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 1771 ]
1772 1772 + remoteopts,
1773 1773 _(b'[OPTION]... SOURCE [DEST]'),
1774 1774 helpcategory=command.CATEGORY_REPO_CREATION,
1775 1775 helpbasic=True,
1776 1776 norepo=True,
1777 1777 )
1778 1778 def clone(ui, source, dest=None, **opts):
1779 1779 """make a copy of an existing repository
1780 1780
1781 1781 Create a copy of an existing repository in a new directory.
1782 1782
1783 1783 If no destination directory name is specified, it defaults to the
1784 1784 basename of the source.
1785 1785
1786 1786 The location of the source is added to the new repository's
1787 1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788 1788
1789 1789 Only local paths and ``ssh://`` URLs are supported as
1790 1790 destinations. For ``ssh://`` destinations, no working directory or
1791 1791 ``.hg/hgrc`` will be created on the remote side.
1792 1792
1793 1793 If the source repository has a bookmark called '@' set, that
1794 1794 revision will be checked out in the new repository by default.
1795 1795
1796 1796 To check out a particular version, use -u/--update, or
1797 1797 -U/--noupdate to create a clone with no working directory.
1798 1798
1799 1799 To pull only a subset of changesets, specify one or more revisions
1800 1800 identifiers with -r/--rev or branches with -b/--branch. The
1801 1801 resulting clone will contain only the specified changesets and
1802 1802 their ancestors. These options (or 'clone src#rev dest') imply
1803 1803 --pull, even for local source repositories.
1804 1804
1805 1805 In normal clone mode, the remote normalizes repository data into a common
1806 1806 exchange format and the receiving end translates this data into its local
1807 1807 storage format. --stream activates a different clone mode that essentially
1808 1808 copies repository files from the remote with minimal data processing. This
1809 1809 significantly reduces the CPU cost of a clone both remotely and locally.
1810 1810 However, it often increases the transferred data size by 30-40%. This can
1811 1811 result in substantially faster clones where I/O throughput is plentiful,
1812 1812 especially for larger repositories. A side-effect of --stream clones is
1813 1813 that storage settings and requirements on the remote are applied locally:
1814 1814 a modern client may inherit legacy or inefficient storage used by the
1815 1815 remote or a legacy Mercurial client may not be able to clone from a
1816 1816 modern Mercurial remote.
1817 1817
1818 1818 .. note::
1819 1819
1820 1820 Specifying a tag will include the tagged changeset but not the
1821 1821 changeset containing the tag.
1822 1822
1823 1823 .. container:: verbose
1824 1824
1825 1825 For efficiency, hardlinks are used for cloning whenever the
1826 1826 source and destination are on the same filesystem (note this
1827 1827 applies only to the repository data, not to the working
1828 1828 directory). Some filesystems, such as AFS, implement hardlinking
1829 1829 incorrectly, but do not report errors. In these cases, use the
1830 1830 --pull option to avoid hardlinking.
1831 1831
1832 1832 Mercurial will update the working directory to the first applicable
1833 1833 revision from this list:
1834 1834
1835 1835 a) null if -U or the source repository has no changesets
1836 1836 b) if -u . and the source repository is local, the first parent of
1837 1837 the source repository's working directory
1838 1838 c) the changeset specified with -u (if a branch name, this means the
1839 1839 latest head of that branch)
1840 1840 d) the changeset specified with -r
1841 1841 e) the tipmost head specified with -b
1842 1842 f) the tipmost head specified with the url#branch source syntax
1843 1843 g) the revision marked with the '@' bookmark, if present
1844 1844 h) the tipmost head of the default branch
1845 1845 i) tip
1846 1846
1847 1847 When cloning from servers that support it, Mercurial may fetch
1848 1848 pre-generated data from a server-advertised URL or inline from the
1849 1849 same stream. When this is done, hooks operating on incoming changesets
1850 1850 and changegroups may fire more than once, once for each pre-generated
1851 1851 bundle and as well as for any additional remaining data. In addition,
1852 1852 if an error occurs, the repository may be rolled back to a partial
1853 1853 clone. This behavior may change in future releases.
1854 1854 See :hg:`help -e clonebundles` for more.
1855 1855
1856 1856 Examples:
1857 1857
1858 1858 - clone a remote repository to a new directory named hg/::
1859 1859
1860 1860 hg clone https://www.mercurial-scm.org/repo/hg/
1861 1861
1862 1862 - create a lightweight local clone::
1863 1863
1864 1864 hg clone project/ project-feature/
1865 1865
1866 1866 - clone from an absolute path on an ssh server (note double-slash)::
1867 1867
1868 1868 hg clone ssh://user@server//home/projects/alpha/
1869 1869
1870 1870 - do a streaming clone while checking out a specified version::
1871 1871
1872 1872 hg clone --stream http://server/repo -u 1.5
1873 1873
1874 1874 - create a repository without changesets after a particular revision::
1875 1875
1876 1876 hg clone -r 04e544 experimental/ good/
1877 1877
1878 1878 - clone (and track) a particular named branch::
1879 1879
1880 1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881 1881
1882 1882 See :hg:`help urls` for details on specifying URLs.
1883 1883
1884 1884 Returns 0 on success.
1885 1885 """
1886 1886 opts = pycompat.byteskwargs(opts)
1887 1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888 1888
1889 1889 # --include/--exclude can come from narrow or sparse.
1890 1890 includepats, excludepats = None, None
1891 1891
1892 1892 # hg.clone() differentiates between None and an empty set. So make sure
1893 1893 # patterns are sets if narrow is requested without patterns.
1894 1894 if opts.get(b'narrow'):
1895 1895 includepats = set()
1896 1896 excludepats = set()
1897 1897
1898 1898 if opts.get(b'include'):
1899 1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 1900 if opts.get(b'exclude'):
1901 1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902 1902
1903 1903 r = hg.clone(
1904 1904 ui,
1905 1905 opts,
1906 1906 source,
1907 1907 dest,
1908 1908 pull=opts.get(b'pull'),
1909 1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 1910 revs=opts.get(b'rev'),
1911 1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 1912 branch=opts.get(b'branch'),
1913 1913 shareopts=opts.get(b'shareopts'),
1914 1914 storeincludepats=includepats,
1915 1915 storeexcludepats=excludepats,
1916 1916 depth=opts.get(b'depth') or None,
1917 1917 )
1918 1918
1919 1919 return r is None
1920 1920
1921 1921
1922 1922 @command(
1923 1923 b'commit|ci',
1924 1924 [
1925 1925 (
1926 1926 b'A',
1927 1927 b'addremove',
1928 1928 None,
1929 1929 _(b'mark new/missing files as added/removed before committing'),
1930 1930 ),
1931 1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 1935 (
1936 1936 b'',
1937 1937 b'force-close-branch',
1938 1938 None,
1939 1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 1940 ),
1941 1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 1942 ]
1943 1943 + walkopts
1944 1944 + commitopts
1945 1945 + commitopts2
1946 1946 + subrepoopts,
1947 1947 _(b'[OPTION]... [FILE]...'),
1948 1948 helpcategory=command.CATEGORY_COMMITTING,
1949 1949 helpbasic=True,
1950 1950 inferrepo=True,
1951 1951 )
1952 1952 def commit(ui, repo, *pats, **opts):
1953 1953 """commit the specified files or all outstanding changes
1954 1954
1955 1955 Commit changes to the given files into the repository. Unlike a
1956 1956 centralized SCM, this operation is a local operation. See
1957 1957 :hg:`push` for a way to actively distribute your changes.
1958 1958
1959 1959 If a list of files is omitted, all changes reported by :hg:`status`
1960 1960 will be committed.
1961 1961
1962 1962 If you are committing the result of a merge, do not provide any
1963 1963 filenames or -I/-X filters.
1964 1964
1965 1965 If no commit message is specified, Mercurial starts your
1966 1966 configured editor where you can enter a message. In case your
1967 1967 commit fails, you will find a backup of your message in
1968 1968 ``.hg/last-message.txt``.
1969 1969
1970 1970 The --close-branch flag can be used to mark the current branch
1971 1971 head closed. When all heads of a branch are closed, the branch
1972 1972 will be considered closed and no longer listed.
1973 1973
1974 1974 The --amend flag can be used to amend the parent of the
1975 1975 working directory with a new commit that contains the changes
1976 1976 in the parent in addition to those currently reported by :hg:`status`,
1977 1977 if there are any. The old commit is stored in a backup bundle in
1978 1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 1979 on how to restore it).
1980 1980
1981 1981 Message, user and date are taken from the amended commit unless
1982 1982 specified. When a message isn't specified on the command line,
1983 1983 the editor will open with the message of the amended commit.
1984 1984
1985 1985 It is not possible to amend public changesets (see :hg:`help phases`)
1986 1986 or changesets that have children.
1987 1987
1988 1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1989 1989
1990 1990 Returns 0 on success, 1 if nothing changed.
1991 1991
1992 1992 .. container:: verbose
1993 1993
1994 1994 Examples:
1995 1995
1996 1996 - commit all files ending in .py::
1997 1997
1998 1998 hg commit --include "set:**.py"
1999 1999
2000 2000 - commit all non-binary files::
2001 2001
2002 2002 hg commit --exclude "set:binary()"
2003 2003
2004 2004 - amend the current commit and set the date to now::
2005 2005
2006 2006 hg commit --amend --date now
2007 2007 """
2008 2008 with repo.wlock(), repo.lock():
2009 2009 return _docommit(ui, repo, *pats, **opts)
2010 2010
2011 2011
2012 2012 def _docommit(ui, repo, *pats, **opts):
2013 2013 if opts.get('interactive'):
2014 2014 opts.pop('interactive')
2015 2015 ret = cmdutil.dorecord(
2016 2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 2017 )
2018 2018 # ret can be 0 (no changes to record) or the value returned by
2019 2019 # commit(), 1 if nothing changed or None on success.
2020 2020 return 1 if ret == 0 else ret
2021 2021
2022 2022 opts = pycompat.byteskwargs(opts)
2023 2023 if opts.get(b'subrepos'):
2024 2024 if opts.get(b'amend'):
2025 2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 2026 # Let --subrepos on the command line override config setting.
2027 2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028 2028
2029 2029 cmdutil.checkunfinished(repo, commit=True)
2030 2030
2031 2031 branch = repo[None].branch()
2032 2032 bheads = repo.branchheads(branch)
2033 2033
2034 2034 extra = {}
2035 2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 2036 extra[b'close'] = b'1'
2037 2037
2038 2038 if repo[b'.'].closesbranch():
2039 2039 raise error.Abort(
2040 2040 _(b'current revision is already a branch closing head')
2041 2041 )
2042 2042 elif not bheads:
2043 2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 2044 elif (
2045 2045 branch == repo[b'.'].branch()
2046 2046 and repo[b'.'].node() not in bheads
2047 2047 and not opts.get(b'force_close_branch')
2048 2048 ):
2049 2049 hint = _(
2050 2050 b'use --force-close-branch to close branch from a non-head'
2051 2051 b' changeset'
2052 2052 )
2053 2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 2054 elif opts.get(b'amend'):
2055 2055 if (
2056 2056 repo[b'.'].p1().branch() != branch
2057 2057 and repo[b'.'].p2().branch() != branch
2058 2058 ):
2059 2059 raise error.Abort(_(b'can only close branch heads'))
2060 2060
2061 2061 if opts.get(b'amend'):
2062 2062 if ui.configbool(b'ui', b'commitsubrepos'):
2063 2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064 2064
2065 2065 old = repo[b'.']
2066 2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067 2067
2068 2068 # Currently histedit gets confused if an amend happens while histedit
2069 2069 # is in progress. Since we have a checkunfinished command, we are
2070 2070 # temporarily honoring it.
2071 2071 #
2072 2072 # Note: eventually this guard will be removed. Please do not expect
2073 2073 # this behavior to remain.
2074 2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 2075 cmdutil.checkunfinished(repo)
2076 2076
2077 2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 2078 if node == old.node():
2079 2079 ui.status(_(b"nothing changed\n"))
2080 2080 return 1
2081 2081 else:
2082 2082
2083 2083 def commitfunc(ui, repo, message, match, opts):
2084 2084 overrides = {}
2085 2085 if opts.get(b'secret'):
2086 2086 overrides[(b'phases', b'new-commit')] = b'secret'
2087 2087
2088 2088 baseui = repo.baseui
2089 2089 with baseui.configoverride(overrides, b'commit'):
2090 2090 with ui.configoverride(overrides, b'commit'):
2091 2091 editform = cmdutil.mergeeditform(
2092 2092 repo[None], b'commit.normal'
2093 2093 )
2094 2094 editor = cmdutil.getcommiteditor(
2095 2095 editform=editform, **pycompat.strkwargs(opts)
2096 2096 )
2097 2097 return repo.commit(
2098 2098 message,
2099 2099 opts.get(b'user'),
2100 2100 opts.get(b'date'),
2101 2101 match,
2102 2102 editor=editor,
2103 2103 extra=extra,
2104 2104 )
2105 2105
2106 2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107 2107
2108 2108 if not node:
2109 2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 2110 if stat.deleted:
2111 2111 ui.status(
2112 2112 _(
2113 2113 b"nothing changed (%d missing files, see "
2114 2114 b"'hg status')\n"
2115 2115 )
2116 2116 % len(stat.deleted)
2117 2117 )
2118 2118 else:
2119 2119 ui.status(_(b"nothing changed\n"))
2120 2120 return 1
2121 2121
2122 2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123 2123
2124 2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 2125 status(
2126 2126 ui,
2127 2127 repo,
2128 2128 modified=True,
2129 2129 added=True,
2130 2130 removed=True,
2131 2131 deleted=True,
2132 2132 unknown=True,
2133 2133 subrepos=opts.get(b'subrepos'),
2134 2134 )
2135 2135
2136 2136
2137 2137 @command(
2138 2138 b'config|showconfig|debugconfig',
2139 2139 [
2140 2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 2141 (b'e', b'edit', None, _(b'edit user config')),
2142 2142 (b'l', b'local', None, _(b'edit repository config')),
2143 2143 (b'g', b'global', None, _(b'edit global config')),
2144 2144 ]
2145 2145 + formatteropts,
2146 2146 _(b'[-u] [NAME]...'),
2147 2147 helpcategory=command.CATEGORY_HELP,
2148 2148 optionalrepo=True,
2149 2149 intents={INTENT_READONLY},
2150 2150 )
2151 2151 def config(ui, repo, *values, **opts):
2152 2152 """show combined config settings from all hgrc files
2153 2153
2154 2154 With no arguments, print names and values of all config items.
2155 2155
2156 2156 With one argument of the form section.name, print just the value
2157 2157 of that config item.
2158 2158
2159 2159 With multiple arguments, print names and values of all config
2160 2160 items with matching section names or section.names.
2161 2161
2162 2162 With --edit, start an editor on the user-level config file. With
2163 2163 --global, edit the system-wide config file. With --local, edit the
2164 2164 repository-level config file.
2165 2165
2166 2166 With --debug, the source (filename and line number) is printed
2167 2167 for each config item.
2168 2168
2169 2169 See :hg:`help config` for more information about config files.
2170 2170
2171 2171 .. container:: verbose
2172 2172
2173 2173 Template:
2174 2174
2175 2175 The following keywords are supported. See also :hg:`help templates`.
2176 2176
2177 2177 :name: String. Config name.
2178 2178 :source: String. Filename and line number where the item is defined.
2179 2179 :value: String. Config value.
2180 2180
2181 2181 Returns 0 on success, 1 if NAME does not exist.
2182 2182
2183 2183 """
2184 2184
2185 2185 opts = pycompat.byteskwargs(opts)
2186 2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 2187 if opts.get(b'local') and opts.get(b'global'):
2188 2188 raise error.Abort(_(b"can't use --local and --global together"))
2189 2189
2190 2190 if opts.get(b'local'):
2191 2191 if not repo:
2192 2192 raise error.Abort(_(b"can't use --local outside a repository"))
2193 2193 paths = [repo.vfs.join(b'hgrc')]
2194 2194 elif opts.get(b'global'):
2195 2195 paths = rcutil.systemrcpath()
2196 2196 else:
2197 2197 paths = rcutil.userrcpath()
2198 2198
2199 2199 for f in paths:
2200 2200 if os.path.exists(f):
2201 2201 break
2202 2202 else:
2203 2203 if opts.get(b'global'):
2204 2204 samplehgrc = uimod.samplehgrcs[b'global']
2205 2205 elif opts.get(b'local'):
2206 2206 samplehgrc = uimod.samplehgrcs[b'local']
2207 2207 else:
2208 2208 samplehgrc = uimod.samplehgrcs[b'user']
2209 2209
2210 2210 f = paths[0]
2211 2211 fp = open(f, b"wb")
2212 2212 fp.write(util.tonativeeol(samplehgrc))
2213 2213 fp.close()
2214 2214
2215 2215 editor = ui.geteditor()
2216 2216 ui.system(
2217 2217 b"%s \"%s\"" % (editor, f),
2218 2218 onerr=error.Abort,
2219 2219 errprefix=_(b"edit failed"),
2220 2220 blockedtag=b'config_edit',
2221 2221 )
2222 2222 return
2223 2223 ui.pager(b'config')
2224 2224 fm = ui.formatter(b'config', opts)
2225 2225 for t, f in rcutil.rccomponents():
2226 2226 if t == b'path':
2227 2227 ui.debug(b'read config from: %s\n' % f)
2228 2228 elif t == b'resource':
2229 2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 2230 elif t == b'items':
2231 2231 # Don't print anything for 'items'.
2232 2232 pass
2233 2233 else:
2234 2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 2235 untrusted = bool(opts.get(b'untrusted'))
2236 2236
2237 2237 selsections = selentries = []
2238 2238 if values:
2239 2239 selsections = [v for v in values if b'.' not in v]
2240 2240 selentries = [v for v in values if b'.' in v]
2241 2241 uniquesel = len(selentries) == 1 and not selsections
2242 2242 selsections = set(selsections)
2243 2243 selentries = set(selentries)
2244 2244
2245 2245 matched = False
2246 2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 2247 source = ui.configsource(section, name, untrusted)
2248 2248 value = pycompat.bytestr(value)
2249 2249 defaultvalue = ui.configdefault(section, name)
2250 2250 if fm.isplain():
2251 2251 source = source or b'none'
2252 2252 value = value.replace(b'\n', b'\\n')
2253 2253 entryname = section + b'.' + name
2254 2254 if values and not (section in selsections or entryname in selentries):
2255 2255 continue
2256 2256 fm.startitem()
2257 2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 2258 if uniquesel:
2259 2259 fm.data(name=entryname)
2260 2260 fm.write(b'value', b'%s\n', value)
2261 2261 else:
2262 2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 2263 if formatter.isprintable(defaultvalue):
2264 2264 fm.data(defaultvalue=defaultvalue)
2265 2265 elif isinstance(defaultvalue, list) and all(
2266 2266 formatter.isprintable(e) for e in defaultvalue
2267 2267 ):
2268 2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 2269 # TODO: no idea how to process unsupported defaultvalue types
2270 2270 matched = True
2271 2271 fm.end()
2272 2272 if matched:
2273 2273 return 0
2274 2274 return 1
2275 2275
2276 2276
2277 2277 @command(
2278 2278 b'continue',
2279 2279 dryrunopts,
2280 2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 2281 helpbasic=True,
2282 2282 )
2283 2283 def continuecmd(ui, repo, **opts):
2284 2284 """resumes an interrupted operation (EXPERIMENTAL)
2285 2285
2286 2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 2287 and unshelve if they are in an interrupted state.
2288 2288
2289 2289 use --dry-run/-n to dry run the command.
2290 2290 """
2291 2291 dryrun = opts.get('dry_run')
2292 2292 contstate = cmdutil.getunfinishedstate(repo)
2293 2293 if not contstate:
2294 2294 raise error.Abort(_(b'no operation in progress'))
2295 2295 if not contstate.continuefunc:
2296 2296 raise error.Abort(
2297 2297 (
2298 2298 _(b"%s in progress but does not support 'hg continue'")
2299 2299 % (contstate._opname)
2300 2300 ),
2301 2301 hint=contstate.continuemsg(),
2302 2302 )
2303 2303 if dryrun:
2304 2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 2305 return
2306 2306 return contstate.continuefunc(ui, repo)
2307 2307
2308 2308
2309 2309 @command(
2310 2310 b'copy|cp',
2311 2311 [
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2312 2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2313 2314 (
2314 2315 b'f',
2315 2316 b'force',
2316 2317 None,
2317 2318 _(b'forcibly copy over an existing managed file'),
2318 2319 ),
2319 2320 ]
2320 2321 + walkopts
2321 2322 + dryrunopts,
2322 2323 _(b'[OPTION]... SOURCE... DEST'),
2323 2324 helpcategory=command.CATEGORY_FILE_CONTENTS,
2324 2325 )
2325 2326 def copy(ui, repo, *pats, **opts):
2326 2327 """mark files as copied for the next commit
2327 2328
2328 2329 Mark dest as having copies of source files. If dest is a
2329 2330 directory, copies are put in that directory. If dest is a file,
2330 2331 the source must be a single file.
2331 2332
2332 2333 By default, this command copies the contents of files as they
2333 2334 exist in the working directory. If invoked with -A/--after, the
2334 2335 operation is recorded, but no copying is performed.
2335 2336
2336 This command takes effect with the next commit. To undo a copy
2337 before that, see :hg:`revert`.
2337 To undo marking a file as copied, use --forget. With that option,
2338 all given (positional) arguments are unmarked as copies. The destination
2339 file(s) will be left in place (still tracked).
2340
2341 This command takes effect with the next commit.
2338 2342
2339 2343 Returns 0 on success, 1 if errors are encountered.
2340 2344 """
2341 2345 opts = pycompat.byteskwargs(opts)
2342 2346 with repo.wlock(False):
2343 2347 return cmdutil.copy(ui, repo, pats, opts)
2344 2348
2345 2349
2346 2350 @command(
2347 2351 b'debugcommands',
2348 2352 [],
2349 2353 _(b'[COMMAND]'),
2350 2354 helpcategory=command.CATEGORY_HELP,
2351 2355 norepo=True,
2352 2356 )
2353 2357 def debugcommands(ui, cmd=b'', *args):
2354 2358 """list all available commands and options"""
2355 2359 for cmd, vals in sorted(pycompat.iteritems(table)):
2356 2360 cmd = cmd.split(b'|')[0]
2357 2361 opts = b', '.join([i[1] for i in vals[1]])
2358 2362 ui.write(b'%s: %s\n' % (cmd, opts))
2359 2363
2360 2364
2361 2365 @command(
2362 2366 b'debugcomplete',
2363 2367 [(b'o', b'options', None, _(b'show the command options'))],
2364 2368 _(b'[-o] CMD'),
2365 2369 helpcategory=command.CATEGORY_HELP,
2366 2370 norepo=True,
2367 2371 )
2368 2372 def debugcomplete(ui, cmd=b'', **opts):
2369 2373 """returns the completion list associated with the given command"""
2370 2374
2371 2375 if opts.get('options'):
2372 2376 options = []
2373 2377 otables = [globalopts]
2374 2378 if cmd:
2375 2379 aliases, entry = cmdutil.findcmd(cmd, table, False)
2376 2380 otables.append(entry[1])
2377 2381 for t in otables:
2378 2382 for o in t:
2379 2383 if b"(DEPRECATED)" in o[3]:
2380 2384 continue
2381 2385 if o[0]:
2382 2386 options.append(b'-%s' % o[0])
2383 2387 options.append(b'--%s' % o[1])
2384 2388 ui.write(b"%s\n" % b"\n".join(options))
2385 2389 return
2386 2390
2387 2391 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2388 2392 if ui.verbose:
2389 2393 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2390 2394 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2391 2395
2392 2396
2393 2397 @command(
2394 2398 b'diff',
2395 2399 [
2396 2400 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2397 2401 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2398 2402 ]
2399 2403 + diffopts
2400 2404 + diffopts2
2401 2405 + walkopts
2402 2406 + subrepoopts,
2403 2407 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2404 2408 helpcategory=command.CATEGORY_FILE_CONTENTS,
2405 2409 helpbasic=True,
2406 2410 inferrepo=True,
2407 2411 intents={INTENT_READONLY},
2408 2412 )
2409 2413 def diff(ui, repo, *pats, **opts):
2410 2414 """diff repository (or selected files)
2411 2415
2412 2416 Show differences between revisions for the specified files.
2413 2417
2414 2418 Differences between files are shown using the unified diff format.
2415 2419
2416 2420 .. note::
2417 2421
2418 2422 :hg:`diff` may generate unexpected results for merges, as it will
2419 2423 default to comparing against the working directory's first
2420 2424 parent changeset if no revisions are specified.
2421 2425
2422 2426 When two revision arguments are given, then changes are shown
2423 2427 between those revisions. If only one revision is specified then
2424 2428 that revision is compared to the working directory, and, when no
2425 2429 revisions are specified, the working directory files are compared
2426 2430 to its first parent.
2427 2431
2428 2432 Alternatively you can specify -c/--change with a revision to see
2429 2433 the changes in that changeset relative to its first parent.
2430 2434
2431 2435 Without the -a/--text option, diff will avoid generating diffs of
2432 2436 files it detects as binary. With -a, diff will generate a diff
2433 2437 anyway, probably with undesirable results.
2434 2438
2435 2439 Use the -g/--git option to generate diffs in the git extended diff
2436 2440 format. For more information, read :hg:`help diffs`.
2437 2441
2438 2442 .. container:: verbose
2439 2443
2440 2444 Examples:
2441 2445
2442 2446 - compare a file in the current working directory to its parent::
2443 2447
2444 2448 hg diff foo.c
2445 2449
2446 2450 - compare two historical versions of a directory, with rename info::
2447 2451
2448 2452 hg diff --git -r 1.0:1.2 lib/
2449 2453
2450 2454 - get change stats relative to the last change on some date::
2451 2455
2452 2456 hg diff --stat -r "date('may 2')"
2453 2457
2454 2458 - diff all newly-added files that contain a keyword::
2455 2459
2456 2460 hg diff "set:added() and grep(GNU)"
2457 2461
2458 2462 - compare a revision and its parents::
2459 2463
2460 2464 hg diff -c 9353 # compare against first parent
2461 2465 hg diff -r 9353^:9353 # same using revset syntax
2462 2466 hg diff -r 9353^2:9353 # compare against the second parent
2463 2467
2464 2468 Returns 0 on success.
2465 2469 """
2466 2470
2467 2471 opts = pycompat.byteskwargs(opts)
2468 2472 revs = opts.get(b'rev')
2469 2473 change = opts.get(b'change')
2470 2474 stat = opts.get(b'stat')
2471 2475 reverse = opts.get(b'reverse')
2472 2476
2473 2477 if revs and change:
2474 2478 msg = _(b'cannot specify --rev and --change at the same time')
2475 2479 raise error.Abort(msg)
2476 2480 elif change:
2477 2481 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2478 2482 ctx2 = scmutil.revsingle(repo, change, None)
2479 2483 ctx1 = ctx2.p1()
2480 2484 else:
2481 2485 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2482 2486 ctx1, ctx2 = scmutil.revpair(repo, revs)
2483 2487 node1, node2 = ctx1.node(), ctx2.node()
2484 2488
2485 2489 if reverse:
2486 2490 node1, node2 = node2, node1
2487 2491
2488 2492 diffopts = patch.diffallopts(ui, opts)
2489 2493 m = scmutil.match(ctx2, pats, opts)
2490 2494 m = repo.narrowmatch(m)
2491 2495 ui.pager(b'diff')
2492 2496 logcmdutil.diffordiffstat(
2493 2497 ui,
2494 2498 repo,
2495 2499 diffopts,
2496 2500 node1,
2497 2501 node2,
2498 2502 m,
2499 2503 stat=stat,
2500 2504 listsubrepos=opts.get(b'subrepos'),
2501 2505 root=opts.get(b'root'),
2502 2506 )
2503 2507
2504 2508
2505 2509 @command(
2506 2510 b'export',
2507 2511 [
2508 2512 (
2509 2513 b'B',
2510 2514 b'bookmark',
2511 2515 b'',
2512 2516 _(b'export changes only reachable by given bookmark'),
2513 2517 _(b'BOOKMARK'),
2514 2518 ),
2515 2519 (
2516 2520 b'o',
2517 2521 b'output',
2518 2522 b'',
2519 2523 _(b'print output to file with formatted name'),
2520 2524 _(b'FORMAT'),
2521 2525 ),
2522 2526 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2523 2527 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2524 2528 ]
2525 2529 + diffopts
2526 2530 + formatteropts,
2527 2531 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2528 2532 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2529 2533 helpbasic=True,
2530 2534 intents={INTENT_READONLY},
2531 2535 )
2532 2536 def export(ui, repo, *changesets, **opts):
2533 2537 """dump the header and diffs for one or more changesets
2534 2538
2535 2539 Print the changeset header and diffs for one or more revisions.
2536 2540 If no revision is given, the parent of the working directory is used.
2537 2541
2538 2542 The information shown in the changeset header is: author, date,
2539 2543 branch name (if non-default), changeset hash, parent(s) and commit
2540 2544 comment.
2541 2545
2542 2546 .. note::
2543 2547
2544 2548 :hg:`export` may generate unexpected diff output for merge
2545 2549 changesets, as it will compare the merge changeset against its
2546 2550 first parent only.
2547 2551
2548 2552 Output may be to a file, in which case the name of the file is
2549 2553 given using a template string. See :hg:`help templates`. In addition
2550 2554 to the common template keywords, the following formatting rules are
2551 2555 supported:
2552 2556
2553 2557 :``%%``: literal "%" character
2554 2558 :``%H``: changeset hash (40 hexadecimal digits)
2555 2559 :``%N``: number of patches being generated
2556 2560 :``%R``: changeset revision number
2557 2561 :``%b``: basename of the exporting repository
2558 2562 :``%h``: short-form changeset hash (12 hexadecimal digits)
2559 2563 :``%m``: first line of the commit message (only alphanumeric characters)
2560 2564 :``%n``: zero-padded sequence number, starting at 1
2561 2565 :``%r``: zero-padded changeset revision number
2562 2566 :``\\``: literal "\\" character
2563 2567
2564 2568 Without the -a/--text option, export will avoid generating diffs
2565 2569 of files it detects as binary. With -a, export will generate a
2566 2570 diff anyway, probably with undesirable results.
2567 2571
2568 2572 With -B/--bookmark changesets reachable by the given bookmark are
2569 2573 selected.
2570 2574
2571 2575 Use the -g/--git option to generate diffs in the git extended diff
2572 2576 format. See :hg:`help diffs` for more information.
2573 2577
2574 2578 With the --switch-parent option, the diff will be against the
2575 2579 second parent. It can be useful to review a merge.
2576 2580
2577 2581 .. container:: verbose
2578 2582
2579 2583 Template:
2580 2584
2581 2585 The following keywords are supported in addition to the common template
2582 2586 keywords and functions. See also :hg:`help templates`.
2583 2587
2584 2588 :diff: String. Diff content.
2585 2589 :parents: List of strings. Parent nodes of the changeset.
2586 2590
2587 2591 Examples:
2588 2592
2589 2593 - use export and import to transplant a bugfix to the current
2590 2594 branch::
2591 2595
2592 2596 hg export -r 9353 | hg import -
2593 2597
2594 2598 - export all the changesets between two revisions to a file with
2595 2599 rename information::
2596 2600
2597 2601 hg export --git -r 123:150 > changes.txt
2598 2602
2599 2603 - split outgoing changes into a series of patches with
2600 2604 descriptive names::
2601 2605
2602 2606 hg export -r "outgoing()" -o "%n-%m.patch"
2603 2607
2604 2608 Returns 0 on success.
2605 2609 """
2606 2610 opts = pycompat.byteskwargs(opts)
2607 2611 bookmark = opts.get(b'bookmark')
2608 2612 changesets += tuple(opts.get(b'rev', []))
2609 2613
2610 2614 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2611 2615
2612 2616 if bookmark:
2613 2617 if bookmark not in repo._bookmarks:
2614 2618 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2615 2619
2616 2620 revs = scmutil.bookmarkrevs(repo, bookmark)
2617 2621 else:
2618 2622 if not changesets:
2619 2623 changesets = [b'.']
2620 2624
2621 2625 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2622 2626 revs = scmutil.revrange(repo, changesets)
2623 2627
2624 2628 if not revs:
2625 2629 raise error.Abort(_(b"export requires at least one changeset"))
2626 2630 if len(revs) > 1:
2627 2631 ui.note(_(b'exporting patches:\n'))
2628 2632 else:
2629 2633 ui.note(_(b'exporting patch:\n'))
2630 2634
2631 2635 fntemplate = opts.get(b'output')
2632 2636 if cmdutil.isstdiofilename(fntemplate):
2633 2637 fntemplate = b''
2634 2638
2635 2639 if fntemplate:
2636 2640 fm = formatter.nullformatter(ui, b'export', opts)
2637 2641 else:
2638 2642 ui.pager(b'export')
2639 2643 fm = ui.formatter(b'export', opts)
2640 2644 with fm:
2641 2645 cmdutil.export(
2642 2646 repo,
2643 2647 revs,
2644 2648 fm,
2645 2649 fntemplate=fntemplate,
2646 2650 switch_parent=opts.get(b'switch_parent'),
2647 2651 opts=patch.diffallopts(ui, opts),
2648 2652 )
2649 2653
2650 2654
2651 2655 @command(
2652 2656 b'files',
2653 2657 [
2654 2658 (
2655 2659 b'r',
2656 2660 b'rev',
2657 2661 b'',
2658 2662 _(b'search the repository as it is in REV'),
2659 2663 _(b'REV'),
2660 2664 ),
2661 2665 (
2662 2666 b'0',
2663 2667 b'print0',
2664 2668 None,
2665 2669 _(b'end filenames with NUL, for use with xargs'),
2666 2670 ),
2667 2671 ]
2668 2672 + walkopts
2669 2673 + formatteropts
2670 2674 + subrepoopts,
2671 2675 _(b'[OPTION]... [FILE]...'),
2672 2676 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2673 2677 intents={INTENT_READONLY},
2674 2678 )
2675 2679 def files(ui, repo, *pats, **opts):
2676 2680 """list tracked files
2677 2681
2678 2682 Print files under Mercurial control in the working directory or
2679 2683 specified revision for given files (excluding removed files).
2680 2684 Files can be specified as filenames or filesets.
2681 2685
2682 2686 If no files are given to match, this command prints the names
2683 2687 of all files under Mercurial control.
2684 2688
2685 2689 .. container:: verbose
2686 2690
2687 2691 Template:
2688 2692
2689 2693 The following keywords are supported in addition to the common template
2690 2694 keywords and functions. See also :hg:`help templates`.
2691 2695
2692 2696 :flags: String. Character denoting file's symlink and executable bits.
2693 2697 :path: String. Repository-absolute path of the file.
2694 2698 :size: Integer. Size of the file in bytes.
2695 2699
2696 2700 Examples:
2697 2701
2698 2702 - list all files under the current directory::
2699 2703
2700 2704 hg files .
2701 2705
2702 2706 - shows sizes and flags for current revision::
2703 2707
2704 2708 hg files -vr .
2705 2709
2706 2710 - list all files named README::
2707 2711
2708 2712 hg files -I "**/README"
2709 2713
2710 2714 - list all binary files::
2711 2715
2712 2716 hg files "set:binary()"
2713 2717
2714 2718 - find files containing a regular expression::
2715 2719
2716 2720 hg files "set:grep('bob')"
2717 2721
2718 2722 - search tracked file contents with xargs and grep::
2719 2723
2720 2724 hg files -0 | xargs -0 grep foo
2721 2725
2722 2726 See :hg:`help patterns` and :hg:`help filesets` for more information
2723 2727 on specifying file patterns.
2724 2728
2725 2729 Returns 0 if a match is found, 1 otherwise.
2726 2730
2727 2731 """
2728 2732
2729 2733 opts = pycompat.byteskwargs(opts)
2730 2734 rev = opts.get(b'rev')
2731 2735 if rev:
2732 2736 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2733 2737 ctx = scmutil.revsingle(repo, rev, None)
2734 2738
2735 2739 end = b'\n'
2736 2740 if opts.get(b'print0'):
2737 2741 end = b'\0'
2738 2742 fmt = b'%s' + end
2739 2743
2740 2744 m = scmutil.match(ctx, pats, opts)
2741 2745 ui.pager(b'files')
2742 2746 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2743 2747 with ui.formatter(b'files', opts) as fm:
2744 2748 return cmdutil.files(
2745 2749 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2746 2750 )
2747 2751
2748 2752
2749 2753 @command(
2750 2754 b'forget',
2751 2755 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2752 2756 + walkopts
2753 2757 + dryrunopts,
2754 2758 _(b'[OPTION]... FILE...'),
2755 2759 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2756 2760 helpbasic=True,
2757 2761 inferrepo=True,
2758 2762 )
2759 2763 def forget(ui, repo, *pats, **opts):
2760 2764 """forget the specified files on the next commit
2761 2765
2762 2766 Mark the specified files so they will no longer be tracked
2763 2767 after the next commit.
2764 2768
2765 2769 This only removes files from the current branch, not from the
2766 2770 entire project history, and it does not delete them from the
2767 2771 working directory.
2768 2772
2769 2773 To delete the file from the working directory, see :hg:`remove`.
2770 2774
2771 2775 To undo a forget before the next commit, see :hg:`add`.
2772 2776
2773 2777 .. container:: verbose
2774 2778
2775 2779 Examples:
2776 2780
2777 2781 - forget newly-added binary files::
2778 2782
2779 2783 hg forget "set:added() and binary()"
2780 2784
2781 2785 - forget files that would be excluded by .hgignore::
2782 2786
2783 2787 hg forget "set:hgignore()"
2784 2788
2785 2789 Returns 0 on success.
2786 2790 """
2787 2791
2788 2792 opts = pycompat.byteskwargs(opts)
2789 2793 if not pats:
2790 2794 raise error.Abort(_(b'no files specified'))
2791 2795
2792 2796 m = scmutil.match(repo[None], pats, opts)
2793 2797 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2794 2798 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2795 2799 rejected = cmdutil.forget(
2796 2800 ui,
2797 2801 repo,
2798 2802 m,
2799 2803 prefix=b"",
2800 2804 uipathfn=uipathfn,
2801 2805 explicitonly=False,
2802 2806 dryrun=dryrun,
2803 2807 interactive=interactive,
2804 2808 )[0]
2805 2809 return rejected and 1 or 0
2806 2810
2807 2811
2808 2812 @command(
2809 2813 b'graft',
2810 2814 [
2811 2815 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2812 2816 (
2813 2817 b'',
2814 2818 b'base',
2815 2819 b'',
2816 2820 _(b'base revision when doing the graft merge (ADVANCED)'),
2817 2821 _(b'REV'),
2818 2822 ),
2819 2823 (b'c', b'continue', False, _(b'resume interrupted graft')),
2820 2824 (b'', b'stop', False, _(b'stop interrupted graft')),
2821 2825 (b'', b'abort', False, _(b'abort interrupted graft')),
2822 2826 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2823 2827 (b'', b'log', None, _(b'append graft info to log message')),
2824 2828 (
2825 2829 b'',
2826 2830 b'no-commit',
2827 2831 None,
2828 2832 _(b"don't commit, just apply the changes in working directory"),
2829 2833 ),
2830 2834 (b'f', b'force', False, _(b'force graft')),
2831 2835 (
2832 2836 b'D',
2833 2837 b'currentdate',
2834 2838 False,
2835 2839 _(b'record the current date as commit date'),
2836 2840 ),
2837 2841 (
2838 2842 b'U',
2839 2843 b'currentuser',
2840 2844 False,
2841 2845 _(b'record the current user as committer'),
2842 2846 ),
2843 2847 ]
2844 2848 + commitopts2
2845 2849 + mergetoolopts
2846 2850 + dryrunopts,
2847 2851 _(b'[OPTION]... [-r REV]... REV...'),
2848 2852 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2849 2853 )
2850 2854 def graft(ui, repo, *revs, **opts):
2851 2855 '''copy changes from other branches onto the current branch
2852 2856
2853 2857 This command uses Mercurial's merge logic to copy individual
2854 2858 changes from other branches without merging branches in the
2855 2859 history graph. This is sometimes known as 'backporting' or
2856 2860 'cherry-picking'. By default, graft will copy user, date, and
2857 2861 description from the source changesets.
2858 2862
2859 2863 Changesets that are ancestors of the current revision, that have
2860 2864 already been grafted, or that are merges will be skipped.
2861 2865
2862 2866 If --log is specified, log messages will have a comment appended
2863 2867 of the form::
2864 2868
2865 2869 (grafted from CHANGESETHASH)
2866 2870
2867 2871 If --force is specified, revisions will be grafted even if they
2868 2872 are already ancestors of, or have been grafted to, the destination.
2869 2873 This is useful when the revisions have since been backed out.
2870 2874
2871 2875 If a graft merge results in conflicts, the graft process is
2872 2876 interrupted so that the current merge can be manually resolved.
2873 2877 Once all conflicts are addressed, the graft process can be
2874 2878 continued with the -c/--continue option.
2875 2879
2876 2880 The -c/--continue option reapplies all the earlier options.
2877 2881
2878 2882 .. container:: verbose
2879 2883
2880 2884 The --base option exposes more of how graft internally uses merge with a
2881 2885 custom base revision. --base can be used to specify another ancestor than
2882 2886 the first and only parent.
2883 2887
2884 2888 The command::
2885 2889
2886 2890 hg graft -r 345 --base 234
2887 2891
2888 2892 is thus pretty much the same as::
2889 2893
2890 2894 hg diff -r 234 -r 345 | hg import
2891 2895
2892 2896 but using merge to resolve conflicts and track moved files.
2893 2897
2894 2898 The result of a merge can thus be backported as a single commit by
2895 2899 specifying one of the merge parents as base, and thus effectively
2896 2900 grafting the changes from the other side.
2897 2901
2898 2902 It is also possible to collapse multiple changesets and clean up history
2899 2903 by specifying another ancestor as base, much like rebase --collapse
2900 2904 --keep.
2901 2905
2902 2906 The commit message can be tweaked after the fact using commit --amend .
2903 2907
2904 2908 For using non-ancestors as the base to backout changes, see the backout
2905 2909 command and the hidden --parent option.
2906 2910
2907 2911 .. container:: verbose
2908 2912
2909 2913 Examples:
2910 2914
2911 2915 - copy a single change to the stable branch and edit its description::
2912 2916
2913 2917 hg update stable
2914 2918 hg graft --edit 9393
2915 2919
2916 2920 - graft a range of changesets with one exception, updating dates::
2917 2921
2918 2922 hg graft -D "2085::2093 and not 2091"
2919 2923
2920 2924 - continue a graft after resolving conflicts::
2921 2925
2922 2926 hg graft -c
2923 2927
2924 2928 - show the source of a grafted changeset::
2925 2929
2926 2930 hg log --debug -r .
2927 2931
2928 2932 - show revisions sorted by date::
2929 2933
2930 2934 hg log -r "sort(all(), date)"
2931 2935
2932 2936 - backport the result of a merge as a single commit::
2933 2937
2934 2938 hg graft -r 123 --base 123^
2935 2939
2936 2940 - land a feature branch as one changeset::
2937 2941
2938 2942 hg up -cr default
2939 2943 hg graft -r featureX --base "ancestor('featureX', 'default')"
2940 2944
2941 2945 See :hg:`help revisions` for more about specifying revisions.
2942 2946
2943 2947 Returns 0 on successful completion.
2944 2948 '''
2945 2949 with repo.wlock():
2946 2950 return _dograft(ui, repo, *revs, **opts)
2947 2951
2948 2952
2949 2953 def _dograft(ui, repo, *revs, **opts):
2950 2954 opts = pycompat.byteskwargs(opts)
2951 2955 if revs and opts.get(b'rev'):
2952 2956 ui.warn(
2953 2957 _(
2954 2958 b'warning: inconsistent use of --rev might give unexpected '
2955 2959 b'revision ordering!\n'
2956 2960 )
2957 2961 )
2958 2962
2959 2963 revs = list(revs)
2960 2964 revs.extend(opts.get(b'rev'))
2961 2965 basectx = None
2962 2966 if opts.get(b'base'):
2963 2967 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2964 2968 # a dict of data to be stored in state file
2965 2969 statedata = {}
2966 2970 # list of new nodes created by ongoing graft
2967 2971 statedata[b'newnodes'] = []
2968 2972
2969 2973 cmdutil.resolvecommitoptions(ui, opts)
2970 2974
2971 2975 editor = cmdutil.getcommiteditor(
2972 2976 editform=b'graft', **pycompat.strkwargs(opts)
2973 2977 )
2974 2978
2975 2979 cont = False
2976 2980 if opts.get(b'no_commit'):
2977 2981 if opts.get(b'edit'):
2978 2982 raise error.Abort(
2979 2983 _(b"cannot specify --no-commit and --edit together")
2980 2984 )
2981 2985 if opts.get(b'currentuser'):
2982 2986 raise error.Abort(
2983 2987 _(b"cannot specify --no-commit and --currentuser together")
2984 2988 )
2985 2989 if opts.get(b'currentdate'):
2986 2990 raise error.Abort(
2987 2991 _(b"cannot specify --no-commit and --currentdate together")
2988 2992 )
2989 2993 if opts.get(b'log'):
2990 2994 raise error.Abort(
2991 2995 _(b"cannot specify --no-commit and --log together")
2992 2996 )
2993 2997
2994 2998 graftstate = statemod.cmdstate(repo, b'graftstate')
2995 2999
2996 3000 if opts.get(b'stop'):
2997 3001 if opts.get(b'continue'):
2998 3002 raise error.Abort(
2999 3003 _(b"cannot use '--continue' and '--stop' together")
3000 3004 )
3001 3005 if opts.get(b'abort'):
3002 3006 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3003 3007
3004 3008 if any(
3005 3009 (
3006 3010 opts.get(b'edit'),
3007 3011 opts.get(b'log'),
3008 3012 opts.get(b'user'),
3009 3013 opts.get(b'date'),
3010 3014 opts.get(b'currentdate'),
3011 3015 opts.get(b'currentuser'),
3012 3016 opts.get(b'rev'),
3013 3017 )
3014 3018 ):
3015 3019 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3016 3020 return _stopgraft(ui, repo, graftstate)
3017 3021 elif opts.get(b'abort'):
3018 3022 if opts.get(b'continue'):
3019 3023 raise error.Abort(
3020 3024 _(b"cannot use '--continue' and '--abort' together")
3021 3025 )
3022 3026 if any(
3023 3027 (
3024 3028 opts.get(b'edit'),
3025 3029 opts.get(b'log'),
3026 3030 opts.get(b'user'),
3027 3031 opts.get(b'date'),
3028 3032 opts.get(b'currentdate'),
3029 3033 opts.get(b'currentuser'),
3030 3034 opts.get(b'rev'),
3031 3035 )
3032 3036 ):
3033 3037 raise error.Abort(
3034 3038 _(b"cannot specify any other flag with '--abort'")
3035 3039 )
3036 3040
3037 3041 return cmdutil.abortgraft(ui, repo, graftstate)
3038 3042 elif opts.get(b'continue'):
3039 3043 cont = True
3040 3044 if revs:
3041 3045 raise error.Abort(_(b"can't specify --continue and revisions"))
3042 3046 # read in unfinished revisions
3043 3047 if graftstate.exists():
3044 3048 statedata = cmdutil.readgraftstate(repo, graftstate)
3045 3049 if statedata.get(b'date'):
3046 3050 opts[b'date'] = statedata[b'date']
3047 3051 if statedata.get(b'user'):
3048 3052 opts[b'user'] = statedata[b'user']
3049 3053 if statedata.get(b'log'):
3050 3054 opts[b'log'] = True
3051 3055 if statedata.get(b'no_commit'):
3052 3056 opts[b'no_commit'] = statedata.get(b'no_commit')
3053 3057 nodes = statedata[b'nodes']
3054 3058 revs = [repo[node].rev() for node in nodes]
3055 3059 else:
3056 3060 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3057 3061 else:
3058 3062 if not revs:
3059 3063 raise error.Abort(_(b'no revisions specified'))
3060 3064 cmdutil.checkunfinished(repo)
3061 3065 cmdutil.bailifchanged(repo)
3062 3066 revs = scmutil.revrange(repo, revs)
3063 3067
3064 3068 skipped = set()
3065 3069 if basectx is None:
3066 3070 # check for merges
3067 3071 for rev in repo.revs(b'%ld and merge()', revs):
3068 3072 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3069 3073 skipped.add(rev)
3070 3074 revs = [r for r in revs if r not in skipped]
3071 3075 if not revs:
3072 3076 return -1
3073 3077 if basectx is not None and len(revs) != 1:
3074 3078 raise error.Abort(_(b'only one revision allowed with --base '))
3075 3079
3076 3080 # Don't check in the --continue case, in effect retaining --force across
3077 3081 # --continues. That's because without --force, any revisions we decided to
3078 3082 # skip would have been filtered out here, so they wouldn't have made their
3079 3083 # way to the graftstate. With --force, any revisions we would have otherwise
3080 3084 # skipped would not have been filtered out, and if they hadn't been applied
3081 3085 # already, they'd have been in the graftstate.
3082 3086 if not (cont or opts.get(b'force')) and basectx is None:
3083 3087 # check for ancestors of dest branch
3084 3088 ancestors = repo.revs(b'%ld & (::.)', revs)
3085 3089 for rev in ancestors:
3086 3090 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3087 3091
3088 3092 revs = [r for r in revs if r not in ancestors]
3089 3093
3090 3094 if not revs:
3091 3095 return -1
3092 3096
3093 3097 # analyze revs for earlier grafts
3094 3098 ids = {}
3095 3099 for ctx in repo.set(b"%ld", revs):
3096 3100 ids[ctx.hex()] = ctx.rev()
3097 3101 n = ctx.extra().get(b'source')
3098 3102 if n:
3099 3103 ids[n] = ctx.rev()
3100 3104
3101 3105 # check ancestors for earlier grafts
3102 3106 ui.debug(b'scanning for duplicate grafts\n')
3103 3107
3104 3108 # The only changesets we can be sure doesn't contain grafts of any
3105 3109 # revs, are the ones that are common ancestors of *all* revs:
3106 3110 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3107 3111 ctx = repo[rev]
3108 3112 n = ctx.extra().get(b'source')
3109 3113 if n in ids:
3110 3114 try:
3111 3115 r = repo[n].rev()
3112 3116 except error.RepoLookupError:
3113 3117 r = None
3114 3118 if r in revs:
3115 3119 ui.warn(
3116 3120 _(
3117 3121 b'skipping revision %d:%s '
3118 3122 b'(already grafted to %d:%s)\n'
3119 3123 )
3120 3124 % (r, repo[r], rev, ctx)
3121 3125 )
3122 3126 revs.remove(r)
3123 3127 elif ids[n] in revs:
3124 3128 if r is None:
3125 3129 ui.warn(
3126 3130 _(
3127 3131 b'skipping already grafted revision %d:%s '
3128 3132 b'(%d:%s also has unknown origin %s)\n'
3129 3133 )
3130 3134 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3131 3135 )
3132 3136 else:
3133 3137 ui.warn(
3134 3138 _(
3135 3139 b'skipping already grafted revision %d:%s '
3136 3140 b'(%d:%s also has origin %d:%s)\n'
3137 3141 )
3138 3142 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3139 3143 )
3140 3144 revs.remove(ids[n])
3141 3145 elif ctx.hex() in ids:
3142 3146 r = ids[ctx.hex()]
3143 3147 if r in revs:
3144 3148 ui.warn(
3145 3149 _(
3146 3150 b'skipping already grafted revision %d:%s '
3147 3151 b'(was grafted from %d:%s)\n'
3148 3152 )
3149 3153 % (r, repo[r], rev, ctx)
3150 3154 )
3151 3155 revs.remove(r)
3152 3156 if not revs:
3153 3157 return -1
3154 3158
3155 3159 if opts.get(b'no_commit'):
3156 3160 statedata[b'no_commit'] = True
3157 3161 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3158 3162 desc = b'%d:%s "%s"' % (
3159 3163 ctx.rev(),
3160 3164 ctx,
3161 3165 ctx.description().split(b'\n', 1)[0],
3162 3166 )
3163 3167 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3164 3168 if names:
3165 3169 desc += b' (%s)' % b' '.join(names)
3166 3170 ui.status(_(b'grafting %s\n') % desc)
3167 3171 if opts.get(b'dry_run'):
3168 3172 continue
3169 3173
3170 3174 source = ctx.extra().get(b'source')
3171 3175 extra = {}
3172 3176 if source:
3173 3177 extra[b'source'] = source
3174 3178 extra[b'intermediate-source'] = ctx.hex()
3175 3179 else:
3176 3180 extra[b'source'] = ctx.hex()
3177 3181 user = ctx.user()
3178 3182 if opts.get(b'user'):
3179 3183 user = opts[b'user']
3180 3184 statedata[b'user'] = user
3181 3185 date = ctx.date()
3182 3186 if opts.get(b'date'):
3183 3187 date = opts[b'date']
3184 3188 statedata[b'date'] = date
3185 3189 message = ctx.description()
3186 3190 if opts.get(b'log'):
3187 3191 message += b'\n(grafted from %s)' % ctx.hex()
3188 3192 statedata[b'log'] = True
3189 3193
3190 3194 # we don't merge the first commit when continuing
3191 3195 if not cont:
3192 3196 # perform the graft merge with p1(rev) as 'ancestor'
3193 3197 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3194 3198 base = ctx.p1() if basectx is None else basectx
3195 3199 with ui.configoverride(overrides, b'graft'):
3196 3200 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3197 3201 # report any conflicts
3198 3202 if stats.unresolvedcount > 0:
3199 3203 # write out state for --continue
3200 3204 nodes = [repo[rev].hex() for rev in revs[pos:]]
3201 3205 statedata[b'nodes'] = nodes
3202 3206 stateversion = 1
3203 3207 graftstate.save(stateversion, statedata)
3204 3208 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3205 3209 raise error.Abort(
3206 3210 _(b"unresolved conflicts, can't continue"), hint=hint
3207 3211 )
3208 3212 else:
3209 3213 cont = False
3210 3214
3211 3215 # commit if --no-commit is false
3212 3216 if not opts.get(b'no_commit'):
3213 3217 node = repo.commit(
3214 3218 text=message, user=user, date=date, extra=extra, editor=editor
3215 3219 )
3216 3220 if node is None:
3217 3221 ui.warn(
3218 3222 _(b'note: graft of %d:%s created no changes to commit\n')
3219 3223 % (ctx.rev(), ctx)
3220 3224 )
3221 3225 # checking that newnodes exist because old state files won't have it
3222 3226 elif statedata.get(b'newnodes') is not None:
3223 3227 statedata[b'newnodes'].append(node)
3224 3228
3225 3229 # remove state when we complete successfully
3226 3230 if not opts.get(b'dry_run'):
3227 3231 graftstate.delete()
3228 3232
3229 3233 return 0
3230 3234
3231 3235
3232 3236 def _stopgraft(ui, repo, graftstate):
3233 3237 """stop the interrupted graft"""
3234 3238 if not graftstate.exists():
3235 3239 raise error.Abort(_(b"no interrupted graft found"))
3236 3240 pctx = repo[b'.']
3237 3241 hg.updaterepo(repo, pctx.node(), overwrite=True)
3238 3242 graftstate.delete()
3239 3243 ui.status(_(b"stopped the interrupted graft\n"))
3240 3244 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3241 3245 return 0
3242 3246
3243 3247
3244 3248 statemod.addunfinished(
3245 3249 b'graft',
3246 3250 fname=b'graftstate',
3247 3251 clearable=True,
3248 3252 stopflag=True,
3249 3253 continueflag=True,
3250 3254 abortfunc=cmdutil.hgabortgraft,
3251 3255 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3252 3256 )
3253 3257
3254 3258
3255 3259 @command(
3256 3260 b'grep',
3257 3261 [
3258 3262 (b'0', b'print0', None, _(b'end fields with NUL')),
3259 3263 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3260 3264 (
3261 3265 b'',
3262 3266 b'diff',
3263 3267 None,
3264 3268 _(
3265 3269 b'search revision differences for when the pattern was added '
3266 3270 b'or removed'
3267 3271 ),
3268 3272 ),
3269 3273 (b'a', b'text', None, _(b'treat all files as text')),
3270 3274 (
3271 3275 b'f',
3272 3276 b'follow',
3273 3277 None,
3274 3278 _(
3275 3279 b'follow changeset history,'
3276 3280 b' or file history across copies and renames'
3277 3281 ),
3278 3282 ),
3279 3283 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3280 3284 (
3281 3285 b'l',
3282 3286 b'files-with-matches',
3283 3287 None,
3284 3288 _(b'print only filenames and revisions that match'),
3285 3289 ),
3286 3290 (b'n', b'line-number', None, _(b'print matching line numbers')),
3287 3291 (
3288 3292 b'r',
3289 3293 b'rev',
3290 3294 [],
3291 3295 _(b'search files changed within revision range'),
3292 3296 _(b'REV'),
3293 3297 ),
3294 3298 (
3295 3299 b'',
3296 3300 b'all-files',
3297 3301 None,
3298 3302 _(
3299 3303 b'include all files in the changeset while grepping (DEPRECATED)'
3300 3304 ),
3301 3305 ),
3302 3306 (b'u', b'user', None, _(b'list the author (long with -v)')),
3303 3307 (b'd', b'date', None, _(b'list the date (short with -q)')),
3304 3308 ]
3305 3309 + formatteropts
3306 3310 + walkopts,
3307 3311 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3308 3312 helpcategory=command.CATEGORY_FILE_CONTENTS,
3309 3313 inferrepo=True,
3310 3314 intents={INTENT_READONLY},
3311 3315 )
3312 3316 def grep(ui, repo, pattern, *pats, **opts):
3313 3317 """search for a pattern in specified files
3314 3318
3315 3319 Search the working directory or revision history for a regular
3316 3320 expression in the specified files for the entire repository.
3317 3321
3318 3322 By default, grep searches the repository files in the working
3319 3323 directory and prints the files where it finds a match. To specify
3320 3324 historical revisions instead of the working directory, use the
3321 3325 --rev flag.
3322 3326
3323 3327 To search instead historical revision differences that contains a
3324 3328 change in match status ("-" for a match that becomes a non-match,
3325 3329 or "+" for a non-match that becomes a match), use the --diff flag.
3326 3330
3327 3331 PATTERN can be any Python (roughly Perl-compatible) regular
3328 3332 expression.
3329 3333
3330 3334 If no FILEs are specified and the --rev flag isn't supplied, all
3331 3335 files in the working directory are searched. When using the --rev
3332 3336 flag and specifying FILEs, use the --follow argument to also
3333 3337 follow the specified FILEs across renames and copies.
3334 3338
3335 3339 .. container:: verbose
3336 3340
3337 3341 Template:
3338 3342
3339 3343 The following keywords are supported in addition to the common template
3340 3344 keywords and functions. See also :hg:`help templates`.
3341 3345
3342 3346 :change: String. Character denoting insertion ``+`` or removal ``-``.
3343 3347 Available if ``--diff`` is specified.
3344 3348 :lineno: Integer. Line number of the match.
3345 3349 :path: String. Repository-absolute path of the file.
3346 3350 :texts: List of text chunks.
3347 3351
3348 3352 And each entry of ``{texts}`` provides the following sub-keywords.
3349 3353
3350 3354 :matched: Boolean. True if the chunk matches the specified pattern.
3351 3355 :text: String. Chunk content.
3352 3356
3353 3357 See :hg:`help templates.operators` for the list expansion syntax.
3354 3358
3355 3359 Returns 0 if a match is found, 1 otherwise.
3356 3360
3357 3361 """
3358 3362 opts = pycompat.byteskwargs(opts)
3359 3363 diff = opts.get(b'all') or opts.get(b'diff')
3360 3364 if diff and opts.get(b'all_files'):
3361 3365 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3362 3366 if opts.get(b'all_files') is None and not diff:
3363 3367 opts[b'all_files'] = True
3364 3368 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3365 3369 all_files = opts.get(b'all_files')
3366 3370 if plaingrep:
3367 3371 opts[b'rev'] = [b'wdir()']
3368 3372
3369 3373 reflags = re.M
3370 3374 if opts.get(b'ignore_case'):
3371 3375 reflags |= re.I
3372 3376 try:
3373 3377 regexp = util.re.compile(pattern, reflags)
3374 3378 except re.error as inst:
3375 3379 ui.warn(
3376 3380 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3377 3381 )
3378 3382 return 1
3379 3383 sep, eol = b':', b'\n'
3380 3384 if opts.get(b'print0'):
3381 3385 sep = eol = b'\0'
3382 3386
3383 3387 getfile = util.lrucachefunc(repo.file)
3384 3388
3385 3389 def matchlines(body):
3386 3390 begin = 0
3387 3391 linenum = 0
3388 3392 while begin < len(body):
3389 3393 match = regexp.search(body, begin)
3390 3394 if not match:
3391 3395 break
3392 3396 mstart, mend = match.span()
3393 3397 linenum += body.count(b'\n', begin, mstart) + 1
3394 3398 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3395 3399 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3396 3400 lend = begin - 1
3397 3401 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3398 3402
3399 3403 class linestate(object):
3400 3404 def __init__(self, line, linenum, colstart, colend):
3401 3405 self.line = line
3402 3406 self.linenum = linenum
3403 3407 self.colstart = colstart
3404 3408 self.colend = colend
3405 3409
3406 3410 def __hash__(self):
3407 3411 return hash((self.linenum, self.line))
3408 3412
3409 3413 def __eq__(self, other):
3410 3414 return self.line == other.line
3411 3415
3412 3416 def findpos(self):
3413 3417 """Iterate all (start, end) indices of matches"""
3414 3418 yield self.colstart, self.colend
3415 3419 p = self.colend
3416 3420 while p < len(self.line):
3417 3421 m = regexp.search(self.line, p)
3418 3422 if not m:
3419 3423 break
3420 3424 yield m.span()
3421 3425 p = m.end()
3422 3426
3423 3427 matches = {}
3424 3428 copies = {}
3425 3429
3426 3430 def grepbody(fn, rev, body):
3427 3431 matches[rev].setdefault(fn, [])
3428 3432 m = matches[rev][fn]
3429 3433 if body is None:
3430 3434 return
3431 3435
3432 3436 for lnum, cstart, cend, line in matchlines(body):
3433 3437 s = linestate(line, lnum, cstart, cend)
3434 3438 m.append(s)
3435 3439
3436 3440 def difflinestates(a, b):
3437 3441 sm = difflib.SequenceMatcher(None, a, b)
3438 3442 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3439 3443 if tag == 'insert':
3440 3444 for i in pycompat.xrange(blo, bhi):
3441 3445 yield (b'+', b[i])
3442 3446 elif tag == 'delete':
3443 3447 for i in pycompat.xrange(alo, ahi):
3444 3448 yield (b'-', a[i])
3445 3449 elif tag == 'replace':
3446 3450 for i in pycompat.xrange(alo, ahi):
3447 3451 yield (b'-', a[i])
3448 3452 for i in pycompat.xrange(blo, bhi):
3449 3453 yield (b'+', b[i])
3450 3454
3451 3455 uipathfn = scmutil.getuipathfn(repo)
3452 3456
3453 3457 def display(fm, fn, ctx, pstates, states):
3454 3458 rev = scmutil.intrev(ctx)
3455 3459 if fm.isplain():
3456 3460 formatuser = ui.shortuser
3457 3461 else:
3458 3462 formatuser = pycompat.bytestr
3459 3463 if ui.quiet:
3460 3464 datefmt = b'%Y-%m-%d'
3461 3465 else:
3462 3466 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3463 3467 found = False
3464 3468
3465 3469 @util.cachefunc
3466 3470 def binary():
3467 3471 flog = getfile(fn)
3468 3472 try:
3469 3473 return stringutil.binary(flog.read(ctx.filenode(fn)))
3470 3474 except error.WdirUnsupported:
3471 3475 return ctx[fn].isbinary()
3472 3476
3473 3477 fieldnamemap = {b'linenumber': b'lineno'}
3474 3478 if diff:
3475 3479 iter = difflinestates(pstates, states)
3476 3480 else:
3477 3481 iter = [(b'', l) for l in states]
3478 3482 for change, l in iter:
3479 3483 fm.startitem()
3480 3484 fm.context(ctx=ctx)
3481 3485 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3482 3486 fm.plain(uipathfn(fn), label=b'grep.filename')
3483 3487
3484 3488 cols = [
3485 3489 (b'rev', b'%d', rev, not plaingrep, b''),
3486 3490 (
3487 3491 b'linenumber',
3488 3492 b'%d',
3489 3493 l.linenum,
3490 3494 opts.get(b'line_number'),
3491 3495 b'',
3492 3496 ),
3493 3497 ]
3494 3498 if diff:
3495 3499 cols.append(
3496 3500 (
3497 3501 b'change',
3498 3502 b'%s',
3499 3503 change,
3500 3504 True,
3501 3505 b'grep.inserted '
3502 3506 if change == b'+'
3503 3507 else b'grep.deleted ',
3504 3508 )
3505 3509 )
3506 3510 cols.extend(
3507 3511 [
3508 3512 (
3509 3513 b'user',
3510 3514 b'%s',
3511 3515 formatuser(ctx.user()),
3512 3516 opts.get(b'user'),
3513 3517 b'',
3514 3518 ),
3515 3519 (
3516 3520 b'date',
3517 3521 b'%s',
3518 3522 fm.formatdate(ctx.date(), datefmt),
3519 3523 opts.get(b'date'),
3520 3524 b'',
3521 3525 ),
3522 3526 ]
3523 3527 )
3524 3528 for name, fmt, data, cond, extra_label in cols:
3525 3529 if cond:
3526 3530 fm.plain(sep, label=b'grep.sep')
3527 3531 field = fieldnamemap.get(name, name)
3528 3532 label = extra_label + (b'grep.%s' % name)
3529 3533 fm.condwrite(cond, field, fmt, data, label=label)
3530 3534 if not opts.get(b'files_with_matches'):
3531 3535 fm.plain(sep, label=b'grep.sep')
3532 3536 if not opts.get(b'text') and binary():
3533 3537 fm.plain(_(b" Binary file matches"))
3534 3538 else:
3535 3539 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3536 3540 fm.plain(eol)
3537 3541 found = True
3538 3542 if opts.get(b'files_with_matches'):
3539 3543 break
3540 3544 return found
3541 3545
3542 3546 def displaymatches(fm, l):
3543 3547 p = 0
3544 3548 for s, e in l.findpos():
3545 3549 if p < s:
3546 3550 fm.startitem()
3547 3551 fm.write(b'text', b'%s', l.line[p:s])
3548 3552 fm.data(matched=False)
3549 3553 fm.startitem()
3550 3554 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3551 3555 fm.data(matched=True)
3552 3556 p = e
3553 3557 if p < len(l.line):
3554 3558 fm.startitem()
3555 3559 fm.write(b'text', b'%s', l.line[p:])
3556 3560 fm.data(matched=False)
3557 3561 fm.end()
3558 3562
3559 3563 skip = set()
3560 3564 revfiles = {}
3561 3565 match = scmutil.match(repo[None], pats, opts)
3562 3566 found = False
3563 3567 follow = opts.get(b'follow')
3564 3568
3565 3569 getrenamed = scmutil.getrenamedfn(repo)
3566 3570
3567 3571 def get_file_content(filename, filelog, filenode, context, revision):
3568 3572 try:
3569 3573 content = filelog.read(filenode)
3570 3574 except error.WdirUnsupported:
3571 3575 content = context[filename].data()
3572 3576 except error.CensoredNodeError:
3573 3577 content = None
3574 3578 ui.warn(
3575 3579 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3576 3580 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3577 3581 )
3578 3582 return content
3579 3583
3580 3584 def prep(ctx, fns):
3581 3585 rev = ctx.rev()
3582 3586 pctx = ctx.p1()
3583 3587 parent = pctx.rev()
3584 3588 matches.setdefault(rev, {})
3585 3589 matches.setdefault(parent, {})
3586 3590 files = revfiles.setdefault(rev, [])
3587 3591 for fn in fns:
3588 3592 flog = getfile(fn)
3589 3593 try:
3590 3594 fnode = ctx.filenode(fn)
3591 3595 except error.LookupError:
3592 3596 continue
3593 3597
3594 3598 copy = None
3595 3599 if follow:
3596 3600 copy = getrenamed(fn, rev)
3597 3601 if copy:
3598 3602 copies.setdefault(rev, {})[fn] = copy
3599 3603 if fn in skip:
3600 3604 skip.add(copy)
3601 3605 if fn in skip:
3602 3606 continue
3603 3607 files.append(fn)
3604 3608
3605 3609 if fn not in matches[rev]:
3606 3610 content = get_file_content(fn, flog, fnode, ctx, rev)
3607 3611 grepbody(fn, rev, content)
3608 3612
3609 3613 pfn = copy or fn
3610 3614 if pfn not in matches[parent]:
3611 3615 try:
3612 3616 pfnode = pctx.filenode(pfn)
3613 3617 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3614 3618 grepbody(pfn, parent, pcontent)
3615 3619 except error.LookupError:
3616 3620 pass
3617 3621
3618 3622 ui.pager(b'grep')
3619 3623 fm = ui.formatter(b'grep', opts)
3620 3624 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3621 3625 rev = ctx.rev()
3622 3626 parent = ctx.p1().rev()
3623 3627 for fn in sorted(revfiles.get(rev, [])):
3624 3628 states = matches[rev][fn]
3625 3629 copy = copies.get(rev, {}).get(fn)
3626 3630 if fn in skip:
3627 3631 if copy:
3628 3632 skip.add(copy)
3629 3633 continue
3630 3634 pstates = matches.get(parent, {}).get(copy or fn, [])
3631 3635 if pstates or states:
3632 3636 r = display(fm, fn, ctx, pstates, states)
3633 3637 found = found or r
3634 3638 if r and not diff and not all_files:
3635 3639 skip.add(fn)
3636 3640 if copy:
3637 3641 skip.add(copy)
3638 3642 del revfiles[rev]
3639 3643 # We will keep the matches dict for the duration of the window
3640 3644 # clear the matches dict once the window is over
3641 3645 if not revfiles:
3642 3646 matches.clear()
3643 3647 fm.end()
3644 3648
3645 3649 return not found
3646 3650
3647 3651
3648 3652 @command(
3649 3653 b'heads',
3650 3654 [
3651 3655 (
3652 3656 b'r',
3653 3657 b'rev',
3654 3658 b'',
3655 3659 _(b'show only heads which are descendants of STARTREV'),
3656 3660 _(b'STARTREV'),
3657 3661 ),
3658 3662 (b't', b'topo', False, _(b'show topological heads only')),
3659 3663 (
3660 3664 b'a',
3661 3665 b'active',
3662 3666 False,
3663 3667 _(b'show active branchheads only (DEPRECATED)'),
3664 3668 ),
3665 3669 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3666 3670 ]
3667 3671 + templateopts,
3668 3672 _(b'[-ct] [-r STARTREV] [REV]...'),
3669 3673 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3670 3674 intents={INTENT_READONLY},
3671 3675 )
3672 3676 def heads(ui, repo, *branchrevs, **opts):
3673 3677 """show branch heads
3674 3678
3675 3679 With no arguments, show all open branch heads in the repository.
3676 3680 Branch heads are changesets that have no descendants on the
3677 3681 same branch. They are where development generally takes place and
3678 3682 are the usual targets for update and merge operations.
3679 3683
3680 3684 If one or more REVs are given, only open branch heads on the
3681 3685 branches associated with the specified changesets are shown. This
3682 3686 means that you can use :hg:`heads .` to see the heads on the
3683 3687 currently checked-out branch.
3684 3688
3685 3689 If -c/--closed is specified, also show branch heads marked closed
3686 3690 (see :hg:`commit --close-branch`).
3687 3691
3688 3692 If STARTREV is specified, only those heads that are descendants of
3689 3693 STARTREV will be displayed.
3690 3694
3691 3695 If -t/--topo is specified, named branch mechanics will be ignored and only
3692 3696 topological heads (changesets with no children) will be shown.
3693 3697
3694 3698 Returns 0 if matching heads are found, 1 if not.
3695 3699 """
3696 3700
3697 3701 opts = pycompat.byteskwargs(opts)
3698 3702 start = None
3699 3703 rev = opts.get(b'rev')
3700 3704 if rev:
3701 3705 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3702 3706 start = scmutil.revsingle(repo, rev, None).node()
3703 3707
3704 3708 if opts.get(b'topo'):
3705 3709 heads = [repo[h] for h in repo.heads(start)]
3706 3710 else:
3707 3711 heads = []
3708 3712 for branch in repo.branchmap():
3709 3713 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3710 3714 heads = [repo[h] for h in heads]
3711 3715
3712 3716 if branchrevs:
3713 3717 branches = set(
3714 3718 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3715 3719 )
3716 3720 heads = [h for h in heads if h.branch() in branches]
3717 3721
3718 3722 if opts.get(b'active') and branchrevs:
3719 3723 dagheads = repo.heads(start)
3720 3724 heads = [h for h in heads if h.node() in dagheads]
3721 3725
3722 3726 if branchrevs:
3723 3727 haveheads = set(h.branch() for h in heads)
3724 3728 if branches - haveheads:
3725 3729 headless = b', '.join(b for b in branches - haveheads)
3726 3730 msg = _(b'no open branch heads found on branches %s')
3727 3731 if opts.get(b'rev'):
3728 3732 msg += _(b' (started at %s)') % opts[b'rev']
3729 3733 ui.warn((msg + b'\n') % headless)
3730 3734
3731 3735 if not heads:
3732 3736 return 1
3733 3737
3734 3738 ui.pager(b'heads')
3735 3739 heads = sorted(heads, key=lambda x: -(x.rev()))
3736 3740 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3737 3741 for ctx in heads:
3738 3742 displayer.show(ctx)
3739 3743 displayer.close()
3740 3744
3741 3745
3742 3746 @command(
3743 3747 b'help',
3744 3748 [
3745 3749 (b'e', b'extension', None, _(b'show only help for extensions')),
3746 3750 (b'c', b'command', None, _(b'show only help for commands')),
3747 3751 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3748 3752 (
3749 3753 b's',
3750 3754 b'system',
3751 3755 [],
3752 3756 _(b'show help for specific platform(s)'),
3753 3757 _(b'PLATFORM'),
3754 3758 ),
3755 3759 ],
3756 3760 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3757 3761 helpcategory=command.CATEGORY_HELP,
3758 3762 norepo=True,
3759 3763 intents={INTENT_READONLY},
3760 3764 )
3761 3765 def help_(ui, name=None, **opts):
3762 3766 """show help for a given topic or a help overview
3763 3767
3764 3768 With no arguments, print a list of commands with short help messages.
3765 3769
3766 3770 Given a topic, extension, or command name, print help for that
3767 3771 topic.
3768 3772
3769 3773 Returns 0 if successful.
3770 3774 """
3771 3775
3772 3776 keep = opts.get('system') or []
3773 3777 if len(keep) == 0:
3774 3778 if pycompat.sysplatform.startswith(b'win'):
3775 3779 keep.append(b'windows')
3776 3780 elif pycompat.sysplatform == b'OpenVMS':
3777 3781 keep.append(b'vms')
3778 3782 elif pycompat.sysplatform == b'plan9':
3779 3783 keep.append(b'plan9')
3780 3784 else:
3781 3785 keep.append(b'unix')
3782 3786 keep.append(pycompat.sysplatform.lower())
3783 3787 if ui.verbose:
3784 3788 keep.append(b'verbose')
3785 3789
3786 3790 commands = sys.modules[__name__]
3787 3791 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3788 3792 ui.pager(b'help')
3789 3793 ui.write(formatted)
3790 3794
3791 3795
3792 3796 @command(
3793 3797 b'identify|id',
3794 3798 [
3795 3799 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3796 3800 (b'n', b'num', None, _(b'show local revision number')),
3797 3801 (b'i', b'id', None, _(b'show global revision id')),
3798 3802 (b'b', b'branch', None, _(b'show branch')),
3799 3803 (b't', b'tags', None, _(b'show tags')),
3800 3804 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3801 3805 ]
3802 3806 + remoteopts
3803 3807 + formatteropts,
3804 3808 _(b'[-nibtB] [-r REV] [SOURCE]'),
3805 3809 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3806 3810 optionalrepo=True,
3807 3811 intents={INTENT_READONLY},
3808 3812 )
3809 3813 def identify(
3810 3814 ui,
3811 3815 repo,
3812 3816 source=None,
3813 3817 rev=None,
3814 3818 num=None,
3815 3819 id=None,
3816 3820 branch=None,
3817 3821 tags=None,
3818 3822 bookmarks=None,
3819 3823 **opts
3820 3824 ):
3821 3825 """identify the working directory or specified revision
3822 3826
3823 3827 Print a summary identifying the repository state at REV using one or
3824 3828 two parent hash identifiers, followed by a "+" if the working
3825 3829 directory has uncommitted changes, the branch name (if not default),
3826 3830 a list of tags, and a list of bookmarks.
3827 3831
3828 3832 When REV is not given, print a summary of the current state of the
3829 3833 repository including the working directory. Specify -r. to get information
3830 3834 of the working directory parent without scanning uncommitted changes.
3831 3835
3832 3836 Specifying a path to a repository root or Mercurial bundle will
3833 3837 cause lookup to operate on that repository/bundle.
3834 3838
3835 3839 .. container:: verbose
3836 3840
3837 3841 Template:
3838 3842
3839 3843 The following keywords are supported in addition to the common template
3840 3844 keywords and functions. See also :hg:`help templates`.
3841 3845
3842 3846 :dirty: String. Character ``+`` denoting if the working directory has
3843 3847 uncommitted changes.
3844 3848 :id: String. One or two nodes, optionally followed by ``+``.
3845 3849 :parents: List of strings. Parent nodes of the changeset.
3846 3850
3847 3851 Examples:
3848 3852
3849 3853 - generate a build identifier for the working directory::
3850 3854
3851 3855 hg id --id > build-id.dat
3852 3856
3853 3857 - find the revision corresponding to a tag::
3854 3858
3855 3859 hg id -n -r 1.3
3856 3860
3857 3861 - check the most recent revision of a remote repository::
3858 3862
3859 3863 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3860 3864
3861 3865 See :hg:`log` for generating more information about specific revisions,
3862 3866 including full hash identifiers.
3863 3867
3864 3868 Returns 0 if successful.
3865 3869 """
3866 3870
3867 3871 opts = pycompat.byteskwargs(opts)
3868 3872 if not repo and not source:
3869 3873 raise error.Abort(
3870 3874 _(b"there is no Mercurial repository here (.hg not found)")
3871 3875 )
3872 3876
3873 3877 default = not (num or id or branch or tags or bookmarks)
3874 3878 output = []
3875 3879 revs = []
3876 3880
3877 3881 if source:
3878 3882 source, branches = hg.parseurl(ui.expandpath(source))
3879 3883 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3880 3884 repo = peer.local()
3881 3885 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3882 3886
3883 3887 fm = ui.formatter(b'identify', opts)
3884 3888 fm.startitem()
3885 3889
3886 3890 if not repo:
3887 3891 if num or branch or tags:
3888 3892 raise error.Abort(
3889 3893 _(b"can't query remote revision number, branch, or tags")
3890 3894 )
3891 3895 if not rev and revs:
3892 3896 rev = revs[0]
3893 3897 if not rev:
3894 3898 rev = b"tip"
3895 3899
3896 3900 remoterev = peer.lookup(rev)
3897 3901 hexrev = fm.hexfunc(remoterev)
3898 3902 if default or id:
3899 3903 output = [hexrev]
3900 3904 fm.data(id=hexrev)
3901 3905
3902 3906 @util.cachefunc
3903 3907 def getbms():
3904 3908 bms = []
3905 3909
3906 3910 if b'bookmarks' in peer.listkeys(b'namespaces'):
3907 3911 hexremoterev = hex(remoterev)
3908 3912 bms = [
3909 3913 bm
3910 3914 for bm, bmr in pycompat.iteritems(
3911 3915 peer.listkeys(b'bookmarks')
3912 3916 )
3913 3917 if bmr == hexremoterev
3914 3918 ]
3915 3919
3916 3920 return sorted(bms)
3917 3921
3918 3922 if fm.isplain():
3919 3923 if bookmarks:
3920 3924 output.extend(getbms())
3921 3925 elif default and not ui.quiet:
3922 3926 # multiple bookmarks for a single parent separated by '/'
3923 3927 bm = b'/'.join(getbms())
3924 3928 if bm:
3925 3929 output.append(bm)
3926 3930 else:
3927 3931 fm.data(node=hex(remoterev))
3928 3932 if bookmarks or b'bookmarks' in fm.datahint():
3929 3933 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3930 3934 else:
3931 3935 if rev:
3932 3936 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3933 3937 ctx = scmutil.revsingle(repo, rev, None)
3934 3938
3935 3939 if ctx.rev() is None:
3936 3940 ctx = repo[None]
3937 3941 parents = ctx.parents()
3938 3942 taglist = []
3939 3943 for p in parents:
3940 3944 taglist.extend(p.tags())
3941 3945
3942 3946 dirty = b""
3943 3947 if ctx.dirty(missing=True, merge=False, branch=False):
3944 3948 dirty = b'+'
3945 3949 fm.data(dirty=dirty)
3946 3950
3947 3951 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3948 3952 if default or id:
3949 3953 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3950 3954 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3951 3955
3952 3956 if num:
3953 3957 numoutput = [b"%d" % p.rev() for p in parents]
3954 3958 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3955 3959
3956 3960 fm.data(
3957 3961 parents=fm.formatlist(
3958 3962 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3959 3963 )
3960 3964 )
3961 3965 else:
3962 3966 hexoutput = fm.hexfunc(ctx.node())
3963 3967 if default or id:
3964 3968 output = [hexoutput]
3965 3969 fm.data(id=hexoutput)
3966 3970
3967 3971 if num:
3968 3972 output.append(pycompat.bytestr(ctx.rev()))
3969 3973 taglist = ctx.tags()
3970 3974
3971 3975 if default and not ui.quiet:
3972 3976 b = ctx.branch()
3973 3977 if b != b'default':
3974 3978 output.append(b"(%s)" % b)
3975 3979
3976 3980 # multiple tags for a single parent separated by '/'
3977 3981 t = b'/'.join(taglist)
3978 3982 if t:
3979 3983 output.append(t)
3980 3984
3981 3985 # multiple bookmarks for a single parent separated by '/'
3982 3986 bm = b'/'.join(ctx.bookmarks())
3983 3987 if bm:
3984 3988 output.append(bm)
3985 3989 else:
3986 3990 if branch:
3987 3991 output.append(ctx.branch())
3988 3992
3989 3993 if tags:
3990 3994 output.extend(taglist)
3991 3995
3992 3996 if bookmarks:
3993 3997 output.extend(ctx.bookmarks())
3994 3998
3995 3999 fm.data(node=ctx.hex())
3996 4000 fm.data(branch=ctx.branch())
3997 4001 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3998 4002 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3999 4003 fm.context(ctx=ctx)
4000 4004
4001 4005 fm.plain(b"%s\n" % b' '.join(output))
4002 4006 fm.end()
4003 4007
4004 4008
4005 4009 @command(
4006 4010 b'import|patch',
4007 4011 [
4008 4012 (
4009 4013 b'p',
4010 4014 b'strip',
4011 4015 1,
4012 4016 _(
4013 4017 b'directory strip option for patch. This has the same '
4014 4018 b'meaning as the corresponding patch option'
4015 4019 ),
4016 4020 _(b'NUM'),
4017 4021 ),
4018 4022 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4019 4023 (b'', b'secret', None, _(b'use the secret phase for committing')),
4020 4024 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4021 4025 (
4022 4026 b'f',
4023 4027 b'force',
4024 4028 None,
4025 4029 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4026 4030 ),
4027 4031 (
4028 4032 b'',
4029 4033 b'no-commit',
4030 4034 None,
4031 4035 _(b"don't commit, just update the working directory"),
4032 4036 ),
4033 4037 (
4034 4038 b'',
4035 4039 b'bypass',
4036 4040 None,
4037 4041 _(b"apply patch without touching the working directory"),
4038 4042 ),
4039 4043 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4040 4044 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4041 4045 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4042 4046 (
4043 4047 b'',
4044 4048 b'import-branch',
4045 4049 None,
4046 4050 _(b'use any branch information in patch (implied by --exact)'),
4047 4051 ),
4048 4052 ]
4049 4053 + commitopts
4050 4054 + commitopts2
4051 4055 + similarityopts,
4052 4056 _(b'[OPTION]... PATCH...'),
4053 4057 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4054 4058 )
4055 4059 def import_(ui, repo, patch1=None, *patches, **opts):
4056 4060 """import an ordered set of patches
4057 4061
4058 4062 Import a list of patches and commit them individually (unless
4059 4063 --no-commit is specified).
4060 4064
4061 4065 To read a patch from standard input (stdin), use "-" as the patch
4062 4066 name. If a URL is specified, the patch will be downloaded from
4063 4067 there.
4064 4068
4065 4069 Import first applies changes to the working directory (unless
4066 4070 --bypass is specified), import will abort if there are outstanding
4067 4071 changes.
4068 4072
4069 4073 Use --bypass to apply and commit patches directly to the
4070 4074 repository, without affecting the working directory. Without
4071 4075 --exact, patches will be applied on top of the working directory
4072 4076 parent revision.
4073 4077
4074 4078 You can import a patch straight from a mail message. Even patches
4075 4079 as attachments work (to use the body part, it must have type
4076 4080 text/plain or text/x-patch). From and Subject headers of email
4077 4081 message are used as default committer and commit message. All
4078 4082 text/plain body parts before first diff are added to the commit
4079 4083 message.
4080 4084
4081 4085 If the imported patch was generated by :hg:`export`, user and
4082 4086 description from patch override values from message headers and
4083 4087 body. Values given on command line with -m/--message and -u/--user
4084 4088 override these.
4085 4089
4086 4090 If --exact is specified, import will set the working directory to
4087 4091 the parent of each patch before applying it, and will abort if the
4088 4092 resulting changeset has a different ID than the one recorded in
4089 4093 the patch. This will guard against various ways that portable
4090 4094 patch formats and mail systems might fail to transfer Mercurial
4091 4095 data or metadata. See :hg:`bundle` for lossless transmission.
4092 4096
4093 4097 Use --partial to ensure a changeset will be created from the patch
4094 4098 even if some hunks fail to apply. Hunks that fail to apply will be
4095 4099 written to a <target-file>.rej file. Conflicts can then be resolved
4096 4100 by hand before :hg:`commit --amend` is run to update the created
4097 4101 changeset. This flag exists to let people import patches that
4098 4102 partially apply without losing the associated metadata (author,
4099 4103 date, description, ...).
4100 4104
4101 4105 .. note::
4102 4106
4103 4107 When no hunks apply cleanly, :hg:`import --partial` will create
4104 4108 an empty changeset, importing only the patch metadata.
4105 4109
4106 4110 With -s/--similarity, hg will attempt to discover renames and
4107 4111 copies in the patch in the same way as :hg:`addremove`.
4108 4112
4109 4113 It is possible to use external patch programs to perform the patch
4110 4114 by setting the ``ui.patch`` configuration option. For the default
4111 4115 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4112 4116 See :hg:`help config` for more information about configuration
4113 4117 files and how to use these options.
4114 4118
4115 4119 See :hg:`help dates` for a list of formats valid for -d/--date.
4116 4120
4117 4121 .. container:: verbose
4118 4122
4119 4123 Examples:
4120 4124
4121 4125 - import a traditional patch from a website and detect renames::
4122 4126
4123 4127 hg import -s 80 http://example.com/bugfix.patch
4124 4128
4125 4129 - import a changeset from an hgweb server::
4126 4130
4127 4131 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4128 4132
4129 4133 - import all the patches in an Unix-style mbox::
4130 4134
4131 4135 hg import incoming-patches.mbox
4132 4136
4133 4137 - import patches from stdin::
4134 4138
4135 4139 hg import -
4136 4140
4137 4141 - attempt to exactly restore an exported changeset (not always
4138 4142 possible)::
4139 4143
4140 4144 hg import --exact proposed-fix.patch
4141 4145
4142 4146 - use an external tool to apply a patch which is too fuzzy for
4143 4147 the default internal tool.
4144 4148
4145 4149 hg import --config ui.patch="patch --merge" fuzzy.patch
4146 4150
4147 4151 - change the default fuzzing from 2 to a less strict 7
4148 4152
4149 4153 hg import --config ui.fuzz=7 fuzz.patch
4150 4154
4151 4155 Returns 0 on success, 1 on partial success (see --partial).
4152 4156 """
4153 4157
4154 4158 opts = pycompat.byteskwargs(opts)
4155 4159 if not patch1:
4156 4160 raise error.Abort(_(b'need at least one patch to import'))
4157 4161
4158 4162 patches = (patch1,) + patches
4159 4163
4160 4164 date = opts.get(b'date')
4161 4165 if date:
4162 4166 opts[b'date'] = dateutil.parsedate(date)
4163 4167
4164 4168 exact = opts.get(b'exact')
4165 4169 update = not opts.get(b'bypass')
4166 4170 if not update and opts.get(b'no_commit'):
4167 4171 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4168 4172 if opts.get(b'secret') and opts.get(b'no_commit'):
4169 4173 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4170 4174 try:
4171 4175 sim = float(opts.get(b'similarity') or 0)
4172 4176 except ValueError:
4173 4177 raise error.Abort(_(b'similarity must be a number'))
4174 4178 if sim < 0 or sim > 100:
4175 4179 raise error.Abort(_(b'similarity must be between 0 and 100'))
4176 4180 if sim and not update:
4177 4181 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4178 4182 if exact:
4179 4183 if opts.get(b'edit'):
4180 4184 raise error.Abort(_(b'cannot use --exact with --edit'))
4181 4185 if opts.get(b'prefix'):
4182 4186 raise error.Abort(_(b'cannot use --exact with --prefix'))
4183 4187
4184 4188 base = opts[b"base"]
4185 4189 msgs = []
4186 4190 ret = 0
4187 4191
4188 4192 with repo.wlock():
4189 4193 if update:
4190 4194 cmdutil.checkunfinished(repo)
4191 4195 if exact or not opts.get(b'force'):
4192 4196 cmdutil.bailifchanged(repo)
4193 4197
4194 4198 if not opts.get(b'no_commit'):
4195 4199 lock = repo.lock
4196 4200 tr = lambda: repo.transaction(b'import')
4197 4201 dsguard = util.nullcontextmanager
4198 4202 else:
4199 4203 lock = util.nullcontextmanager
4200 4204 tr = util.nullcontextmanager
4201 4205 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 4206 with lock(), tr(), dsguard():
4203 4207 parents = repo[None].parents()
4204 4208 for patchurl in patches:
4205 4209 if patchurl == b'-':
4206 4210 ui.status(_(b'applying patch from stdin\n'))
4207 4211 patchfile = ui.fin
4208 4212 patchurl = b'stdin' # for error message
4209 4213 else:
4210 4214 patchurl = os.path.join(base, patchurl)
4211 4215 ui.status(_(b'applying %s\n') % patchurl)
4212 4216 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213 4217
4214 4218 haspatch = False
4215 4219 for hunk in patch.split(patchfile):
4216 4220 with patch.extract(ui, hunk) as patchdata:
4217 4221 msg, node, rej = cmdutil.tryimportone(
4218 4222 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 4223 )
4220 4224 if msg:
4221 4225 haspatch = True
4222 4226 ui.note(msg + b'\n')
4223 4227 if update or exact:
4224 4228 parents = repo[None].parents()
4225 4229 else:
4226 4230 parents = [repo[node]]
4227 4231 if rej:
4228 4232 ui.write_err(_(b"patch applied partially\n"))
4229 4233 ui.write_err(
4230 4234 _(
4231 4235 b"(fix the .rej files and run "
4232 4236 b"`hg commit --amend`)\n"
4233 4237 )
4234 4238 )
4235 4239 ret = 1
4236 4240 break
4237 4241
4238 4242 if not haspatch:
4239 4243 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4240 4244
4241 4245 if msgs:
4242 4246 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 4247 return ret
4244 4248
4245 4249
4246 4250 @command(
4247 4251 b'incoming|in',
4248 4252 [
4249 4253 (
4250 4254 b'f',
4251 4255 b'force',
4252 4256 None,
4253 4257 _(b'run even if remote repository is unrelated'),
4254 4258 ),
4255 4259 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 4260 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 4261 (
4258 4262 b'r',
4259 4263 b'rev',
4260 4264 [],
4261 4265 _(b'a remote changeset intended to be added'),
4262 4266 _(b'REV'),
4263 4267 ),
4264 4268 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 4269 (
4266 4270 b'b',
4267 4271 b'branch',
4268 4272 [],
4269 4273 _(b'a specific branch you would like to pull'),
4270 4274 _(b'BRANCH'),
4271 4275 ),
4272 4276 ]
4273 4277 + logopts
4274 4278 + remoteopts
4275 4279 + subrepoopts,
4276 4280 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 4281 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 4282 )
4279 4283 def incoming(ui, repo, source=b"default", **opts):
4280 4284 """show new changesets found in source
4281 4285
4282 4286 Show new changesets found in the specified path/URL or the default
4283 4287 pull location. These are the changesets that would have been pulled
4284 4288 by :hg:`pull` at the time you issued this command.
4285 4289
4286 4290 See pull for valid source format details.
4287 4291
4288 4292 .. container:: verbose
4289 4293
4290 4294 With -B/--bookmarks, the result of bookmark comparison between
4291 4295 local and remote repositories is displayed. With -v/--verbose,
4292 4296 status is also displayed for each bookmark like below::
4293 4297
4294 4298 BM1 01234567890a added
4295 4299 BM2 1234567890ab advanced
4296 4300 BM3 234567890abc diverged
4297 4301 BM4 34567890abcd changed
4298 4302
4299 4303 The action taken locally when pulling depends on the
4300 4304 status of each bookmark:
4301 4305
4302 4306 :``added``: pull will create it
4303 4307 :``advanced``: pull will update it
4304 4308 :``diverged``: pull will create a divergent bookmark
4305 4309 :``changed``: result depends on remote changesets
4306 4310
4307 4311 From the point of view of pulling behavior, bookmark
4308 4312 existing only in the remote repository are treated as ``added``,
4309 4313 even if it is in fact locally deleted.
4310 4314
4311 4315 .. container:: verbose
4312 4316
4313 4317 For remote repository, using --bundle avoids downloading the
4314 4318 changesets twice if the incoming is followed by a pull.
4315 4319
4316 4320 Examples:
4317 4321
4318 4322 - show incoming changes with patches and full description::
4319 4323
4320 4324 hg incoming -vp
4321 4325
4322 4326 - show incoming changes excluding merges, store a bundle::
4323 4327
4324 4328 hg in -vpM --bundle incoming.hg
4325 4329 hg pull incoming.hg
4326 4330
4327 4331 - briefly list changes inside a bundle::
4328 4332
4329 4333 hg in changes.hg -T "{desc|firstline}\\n"
4330 4334
4331 4335 Returns 0 if there are incoming changes, 1 otherwise.
4332 4336 """
4333 4337 opts = pycompat.byteskwargs(opts)
4334 4338 if opts.get(b'graph'):
4335 4339 logcmdutil.checkunsupportedgraphflags([], opts)
4336 4340
4337 4341 def display(other, chlist, displayer):
4338 4342 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 4343 logcmdutil.displaygraph(
4340 4344 ui, repo, revdag, displayer, graphmod.asciiedges
4341 4345 )
4342 4346
4343 4347 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 4348 return 0
4345 4349
4346 4350 if opts.get(b'bundle') and opts.get(b'subrepos'):
4347 4351 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4348 4352
4349 4353 if opts.get(b'bookmarks'):
4350 4354 source, branches = hg.parseurl(
4351 4355 ui.expandpath(source), opts.get(b'branch')
4352 4356 )
4353 4357 other = hg.peer(repo, opts, source)
4354 4358 if b'bookmarks' not in other.listkeys(b'namespaces'):
4355 4359 ui.warn(_(b"remote doesn't support bookmarks\n"))
4356 4360 return 0
4357 4361 ui.pager(b'incoming')
4358 4362 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4359 4363 return bookmarks.incoming(ui, repo, other)
4360 4364
4361 4365 repo._subtoppath = ui.expandpath(source)
4362 4366 try:
4363 4367 return hg.incoming(ui, repo, source, opts)
4364 4368 finally:
4365 4369 del repo._subtoppath
4366 4370
4367 4371
4368 4372 @command(
4369 4373 b'init',
4370 4374 remoteopts,
4371 4375 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4372 4376 helpcategory=command.CATEGORY_REPO_CREATION,
4373 4377 helpbasic=True,
4374 4378 norepo=True,
4375 4379 )
4376 4380 def init(ui, dest=b".", **opts):
4377 4381 """create a new repository in the given directory
4378 4382
4379 4383 Initialize a new repository in the given directory. If the given
4380 4384 directory does not exist, it will be created.
4381 4385
4382 4386 If no directory is given, the current directory is used.
4383 4387
4384 4388 It is possible to specify an ``ssh://`` URL as the destination.
4385 4389 See :hg:`help urls` for more information.
4386 4390
4387 4391 Returns 0 on success.
4388 4392 """
4389 4393 opts = pycompat.byteskwargs(opts)
4390 4394 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4391 4395
4392 4396
4393 4397 @command(
4394 4398 b'locate',
4395 4399 [
4396 4400 (
4397 4401 b'r',
4398 4402 b'rev',
4399 4403 b'',
4400 4404 _(b'search the repository as it is in REV'),
4401 4405 _(b'REV'),
4402 4406 ),
4403 4407 (
4404 4408 b'0',
4405 4409 b'print0',
4406 4410 None,
4407 4411 _(b'end filenames with NUL, for use with xargs'),
4408 4412 ),
4409 4413 (
4410 4414 b'f',
4411 4415 b'fullpath',
4412 4416 None,
4413 4417 _(b'print complete paths from the filesystem root'),
4414 4418 ),
4415 4419 ]
4416 4420 + walkopts,
4417 4421 _(b'[OPTION]... [PATTERN]...'),
4418 4422 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4419 4423 )
4420 4424 def locate(ui, repo, *pats, **opts):
4421 4425 """locate files matching specific patterns (DEPRECATED)
4422 4426
4423 4427 Print files under Mercurial control in the working directory whose
4424 4428 names match the given patterns.
4425 4429
4426 4430 By default, this command searches all directories in the working
4427 4431 directory. To search just the current directory and its
4428 4432 subdirectories, use "--include .".
4429 4433
4430 4434 If no patterns are given to match, this command prints the names
4431 4435 of all files under Mercurial control in the working directory.
4432 4436
4433 4437 If you want to feed the output of this command into the "xargs"
4434 4438 command, use the -0 option to both this command and "xargs". This
4435 4439 will avoid the problem of "xargs" treating single filenames that
4436 4440 contain whitespace as multiple filenames.
4437 4441
4438 4442 See :hg:`help files` for a more versatile command.
4439 4443
4440 4444 Returns 0 if a match is found, 1 otherwise.
4441 4445 """
4442 4446 opts = pycompat.byteskwargs(opts)
4443 4447 if opts.get(b'print0'):
4444 4448 end = b'\0'
4445 4449 else:
4446 4450 end = b'\n'
4447 4451 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4448 4452
4449 4453 ret = 1
4450 4454 m = scmutil.match(
4451 4455 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4452 4456 )
4453 4457
4454 4458 ui.pager(b'locate')
4455 4459 if ctx.rev() is None:
4456 4460 # When run on the working copy, "locate" includes removed files, so
4457 4461 # we get the list of files from the dirstate.
4458 4462 filesgen = sorted(repo.dirstate.matches(m))
4459 4463 else:
4460 4464 filesgen = ctx.matches(m)
4461 4465 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4462 4466 for abs in filesgen:
4463 4467 if opts.get(b'fullpath'):
4464 4468 ui.write(repo.wjoin(abs), end)
4465 4469 else:
4466 4470 ui.write(uipathfn(abs), end)
4467 4471 ret = 0
4468 4472
4469 4473 return ret
4470 4474
4471 4475
4472 4476 @command(
4473 4477 b'log|history',
4474 4478 [
4475 4479 (
4476 4480 b'f',
4477 4481 b'follow',
4478 4482 None,
4479 4483 _(
4480 4484 b'follow changeset history, or file history across copies and renames'
4481 4485 ),
4482 4486 ),
4483 4487 (
4484 4488 b'',
4485 4489 b'follow-first',
4486 4490 None,
4487 4491 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4488 4492 ),
4489 4493 (
4490 4494 b'd',
4491 4495 b'date',
4492 4496 b'',
4493 4497 _(b'show revisions matching date spec'),
4494 4498 _(b'DATE'),
4495 4499 ),
4496 4500 (b'C', b'copies', None, _(b'show copied files')),
4497 4501 (
4498 4502 b'k',
4499 4503 b'keyword',
4500 4504 [],
4501 4505 _(b'do case-insensitive search for a given text'),
4502 4506 _(b'TEXT'),
4503 4507 ),
4504 4508 (
4505 4509 b'r',
4506 4510 b'rev',
4507 4511 [],
4508 4512 _(b'show the specified revision or revset'),
4509 4513 _(b'REV'),
4510 4514 ),
4511 4515 (
4512 4516 b'L',
4513 4517 b'line-range',
4514 4518 [],
4515 4519 _(b'follow line range of specified file (EXPERIMENTAL)'),
4516 4520 _(b'FILE,RANGE'),
4517 4521 ),
4518 4522 (
4519 4523 b'',
4520 4524 b'removed',
4521 4525 None,
4522 4526 _(b'include revisions where files were removed'),
4523 4527 ),
4524 4528 (
4525 4529 b'm',
4526 4530 b'only-merges',
4527 4531 None,
4528 4532 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4529 4533 ),
4530 4534 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4531 4535 (
4532 4536 b'',
4533 4537 b'only-branch',
4534 4538 [],
4535 4539 _(
4536 4540 b'show only changesets within the given named branch (DEPRECATED)'
4537 4541 ),
4538 4542 _(b'BRANCH'),
4539 4543 ),
4540 4544 (
4541 4545 b'b',
4542 4546 b'branch',
4543 4547 [],
4544 4548 _(b'show changesets within the given named branch'),
4545 4549 _(b'BRANCH'),
4546 4550 ),
4547 4551 (
4548 4552 b'P',
4549 4553 b'prune',
4550 4554 [],
4551 4555 _(b'do not display revision or any of its ancestors'),
4552 4556 _(b'REV'),
4553 4557 ),
4554 4558 ]
4555 4559 + logopts
4556 4560 + walkopts,
4557 4561 _(b'[OPTION]... [FILE]'),
4558 4562 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4559 4563 helpbasic=True,
4560 4564 inferrepo=True,
4561 4565 intents={INTENT_READONLY},
4562 4566 )
4563 4567 def log(ui, repo, *pats, **opts):
4564 4568 """show revision history of entire repository or files
4565 4569
4566 4570 Print the revision history of the specified files or the entire
4567 4571 project.
4568 4572
4569 4573 If no revision range is specified, the default is ``tip:0`` unless
4570 4574 --follow is set, in which case the working directory parent is
4571 4575 used as the starting revision.
4572 4576
4573 4577 File history is shown without following rename or copy history of
4574 4578 files. Use -f/--follow with a filename to follow history across
4575 4579 renames and copies. --follow without a filename will only show
4576 4580 ancestors of the starting revision.
4577 4581
4578 4582 By default this command prints revision number and changeset id,
4579 4583 tags, non-trivial parents, user, date and time, and a summary for
4580 4584 each commit. When the -v/--verbose switch is used, the list of
4581 4585 changed files and full commit message are shown.
4582 4586
4583 4587 With --graph the revisions are shown as an ASCII art DAG with the most
4584 4588 recent changeset at the top.
4585 4589 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4586 4590 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4587 4591 changeset from the lines below is a parent of the 'o' merge on the same
4588 4592 line.
4589 4593 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4590 4594 of a '|' indicates one or more revisions in a path are omitted.
4591 4595
4592 4596 .. container:: verbose
4593 4597
4594 4598 Use -L/--line-range FILE,M:N options to follow the history of lines
4595 4599 from M to N in FILE. With -p/--patch only diff hunks affecting
4596 4600 specified line range will be shown. This option requires --follow;
4597 4601 it can be specified multiple times. Currently, this option is not
4598 4602 compatible with --graph. This option is experimental.
4599 4603
4600 4604 .. note::
4601 4605
4602 4606 :hg:`log --patch` may generate unexpected diff output for merge
4603 4607 changesets, as it will only compare the merge changeset against
4604 4608 its first parent. Also, only files different from BOTH parents
4605 4609 will appear in files:.
4606 4610
4607 4611 .. note::
4608 4612
4609 4613 For performance reasons, :hg:`log FILE` may omit duplicate changes
4610 4614 made on branches and will not show removals or mode changes. To
4611 4615 see all such changes, use the --removed switch.
4612 4616
4613 4617 .. container:: verbose
4614 4618
4615 4619 .. note::
4616 4620
4617 4621 The history resulting from -L/--line-range options depends on diff
4618 4622 options; for instance if white-spaces are ignored, respective changes
4619 4623 with only white-spaces in specified line range will not be listed.
4620 4624
4621 4625 .. container:: verbose
4622 4626
4623 4627 Some examples:
4624 4628
4625 4629 - changesets with full descriptions and file lists::
4626 4630
4627 4631 hg log -v
4628 4632
4629 4633 - changesets ancestral to the working directory::
4630 4634
4631 4635 hg log -f
4632 4636
4633 4637 - last 10 commits on the current branch::
4634 4638
4635 4639 hg log -l 10 -b .
4636 4640
4637 4641 - changesets showing all modifications of a file, including removals::
4638 4642
4639 4643 hg log --removed file.c
4640 4644
4641 4645 - all changesets that touch a directory, with diffs, excluding merges::
4642 4646
4643 4647 hg log -Mp lib/
4644 4648
4645 4649 - all revision numbers that match a keyword::
4646 4650
4647 4651 hg log -k bug --template "{rev}\\n"
4648 4652
4649 4653 - the full hash identifier of the working directory parent::
4650 4654
4651 4655 hg log -r . --template "{node}\\n"
4652 4656
4653 4657 - list available log templates::
4654 4658
4655 4659 hg log -T list
4656 4660
4657 4661 - check if a given changeset is included in a tagged release::
4658 4662
4659 4663 hg log -r "a21ccf and ancestor(1.9)"
4660 4664
4661 4665 - find all changesets by some user in a date range::
4662 4666
4663 4667 hg log -k alice -d "may 2008 to jul 2008"
4664 4668
4665 4669 - summary of all changesets after the last tag::
4666 4670
4667 4671 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4668 4672
4669 4673 - changesets touching lines 13 to 23 for file.c::
4670 4674
4671 4675 hg log -L file.c,13:23
4672 4676
4673 4677 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4674 4678 main.c with patch::
4675 4679
4676 4680 hg log -L file.c,13:23 -L main.c,2:6 -p
4677 4681
4678 4682 See :hg:`help dates` for a list of formats valid for -d/--date.
4679 4683
4680 4684 See :hg:`help revisions` for more about specifying and ordering
4681 4685 revisions.
4682 4686
4683 4687 See :hg:`help templates` for more about pre-packaged styles and
4684 4688 specifying custom templates. The default template used by the log
4685 4689 command can be customized via the ``ui.logtemplate`` configuration
4686 4690 setting.
4687 4691
4688 4692 Returns 0 on success.
4689 4693
4690 4694 """
4691 4695 opts = pycompat.byteskwargs(opts)
4692 4696 linerange = opts.get(b'line_range')
4693 4697
4694 4698 if linerange and not opts.get(b'follow'):
4695 4699 raise error.Abort(_(b'--line-range requires --follow'))
4696 4700
4697 4701 if linerange and pats:
4698 4702 # TODO: take pats as patterns with no line-range filter
4699 4703 raise error.Abort(
4700 4704 _(b'FILE arguments are not compatible with --line-range option')
4701 4705 )
4702 4706
4703 4707 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4704 4708 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4705 4709 if linerange:
4706 4710 # TODO: should follow file history from logcmdutil._initialrevs(),
4707 4711 # then filter the result by logcmdutil._makerevset() and --limit
4708 4712 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4709 4713
4710 4714 getcopies = None
4711 4715 if opts.get(b'copies'):
4712 4716 endrev = None
4713 4717 if revs:
4714 4718 endrev = revs.max() + 1
4715 4719 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4716 4720
4717 4721 ui.pager(b'log')
4718 4722 displayer = logcmdutil.changesetdisplayer(
4719 4723 ui, repo, opts, differ, buffered=True
4720 4724 )
4721 4725 if opts.get(b'graph'):
4722 4726 displayfn = logcmdutil.displaygraphrevs
4723 4727 else:
4724 4728 displayfn = logcmdutil.displayrevs
4725 4729 displayfn(ui, repo, revs, displayer, getcopies)
4726 4730
4727 4731
4728 4732 @command(
4729 4733 b'manifest',
4730 4734 [
4731 4735 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4732 4736 (b'', b'all', False, _(b"list files from all revisions")),
4733 4737 ]
4734 4738 + formatteropts,
4735 4739 _(b'[-r REV]'),
4736 4740 helpcategory=command.CATEGORY_MAINTENANCE,
4737 4741 intents={INTENT_READONLY},
4738 4742 )
4739 4743 def manifest(ui, repo, node=None, rev=None, **opts):
4740 4744 """output the current or given revision of the project manifest
4741 4745
4742 4746 Print a list of version controlled files for the given revision.
4743 4747 If no revision is given, the first parent of the working directory
4744 4748 is used, or the null revision if no revision is checked out.
4745 4749
4746 4750 With -v, print file permissions, symlink and executable bits.
4747 4751 With --debug, print file revision hashes.
4748 4752
4749 4753 If option --all is specified, the list of all files from all revisions
4750 4754 is printed. This includes deleted and renamed files.
4751 4755
4752 4756 Returns 0 on success.
4753 4757 """
4754 4758 opts = pycompat.byteskwargs(opts)
4755 4759 fm = ui.formatter(b'manifest', opts)
4756 4760
4757 4761 if opts.get(b'all'):
4758 4762 if rev or node:
4759 4763 raise error.Abort(_(b"can't specify a revision with --all"))
4760 4764
4761 4765 res = set()
4762 4766 for rev in repo:
4763 4767 ctx = repo[rev]
4764 4768 res |= set(ctx.files())
4765 4769
4766 4770 ui.pager(b'manifest')
4767 4771 for f in sorted(res):
4768 4772 fm.startitem()
4769 4773 fm.write(b"path", b'%s\n', f)
4770 4774 fm.end()
4771 4775 return
4772 4776
4773 4777 if rev and node:
4774 4778 raise error.Abort(_(b"please specify just one revision"))
4775 4779
4776 4780 if not node:
4777 4781 node = rev
4778 4782
4779 4783 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4780 4784 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4781 4785 if node:
4782 4786 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4783 4787 ctx = scmutil.revsingle(repo, node)
4784 4788 mf = ctx.manifest()
4785 4789 ui.pager(b'manifest')
4786 4790 for f in ctx:
4787 4791 fm.startitem()
4788 4792 fm.context(ctx=ctx)
4789 4793 fl = ctx[f].flags()
4790 4794 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4791 4795 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4792 4796 fm.write(b'path', b'%s\n', f)
4793 4797 fm.end()
4794 4798
4795 4799
4796 4800 @command(
4797 4801 b'merge',
4798 4802 [
4799 4803 (
4800 4804 b'f',
4801 4805 b'force',
4802 4806 None,
4803 4807 _(b'force a merge including outstanding changes (DEPRECATED)'),
4804 4808 ),
4805 4809 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4806 4810 (
4807 4811 b'P',
4808 4812 b'preview',
4809 4813 None,
4810 4814 _(b'review revisions to merge (no merge is performed)'),
4811 4815 ),
4812 4816 (b'', b'abort', None, _(b'abort the ongoing merge')),
4813 4817 ]
4814 4818 + mergetoolopts,
4815 4819 _(b'[-P] [[-r] REV]'),
4816 4820 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4817 4821 helpbasic=True,
4818 4822 )
4819 4823 def merge(ui, repo, node=None, **opts):
4820 4824 """merge another revision into working directory
4821 4825
4822 4826 The current working directory is updated with all changes made in
4823 4827 the requested revision since the last common predecessor revision.
4824 4828
4825 4829 Files that changed between either parent are marked as changed for
4826 4830 the next commit and a commit must be performed before any further
4827 4831 updates to the repository are allowed. The next commit will have
4828 4832 two parents.
4829 4833
4830 4834 ``--tool`` can be used to specify the merge tool used for file
4831 4835 merges. It overrides the HGMERGE environment variable and your
4832 4836 configuration files. See :hg:`help merge-tools` for options.
4833 4837
4834 4838 If no revision is specified, the working directory's parent is a
4835 4839 head revision, and the current branch contains exactly one other
4836 4840 head, the other head is merged with by default. Otherwise, an
4837 4841 explicit revision with which to merge must be provided.
4838 4842
4839 4843 See :hg:`help resolve` for information on handling file conflicts.
4840 4844
4841 4845 To undo an uncommitted merge, use :hg:`merge --abort` which
4842 4846 will check out a clean copy of the original merge parent, losing
4843 4847 all changes.
4844 4848
4845 4849 Returns 0 on success, 1 if there are unresolved files.
4846 4850 """
4847 4851
4848 4852 opts = pycompat.byteskwargs(opts)
4849 4853 abort = opts.get(b'abort')
4850 4854 if abort and repo.dirstate.p2() == nullid:
4851 4855 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4852 4856 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4853 4857 if abort:
4854 4858 state = cmdutil.getunfinishedstate(repo)
4855 4859 if state and state._opname != b'merge':
4856 4860 raise error.Abort(
4857 4861 _(b'cannot abort merge with %s in progress') % (state._opname),
4858 4862 hint=state.hint(),
4859 4863 )
4860 4864 if node:
4861 4865 raise error.Abort(_(b"cannot specify a node with --abort"))
4862 4866 return hg.abortmerge(repo.ui, repo)
4863 4867
4864 4868 if opts.get(b'rev') and node:
4865 4869 raise error.Abort(_(b"please specify just one revision"))
4866 4870 if not node:
4867 4871 node = opts.get(b'rev')
4868 4872
4869 4873 if node:
4870 4874 node = scmutil.revsingle(repo, node).node()
4871 4875 else:
4872 4876 if ui.configbool(b'commands', b'merge.require-rev'):
4873 4877 raise error.Abort(
4874 4878 _(
4875 4879 b'configuration requires specifying revision to merge '
4876 4880 b'with'
4877 4881 )
4878 4882 )
4879 4883 node = repo[destutil.destmerge(repo)].node()
4880 4884
4881 4885 if node is None:
4882 4886 raise error.Abort(_(b'merging with the working copy has no effect'))
4883 4887
4884 4888 if opts.get(b'preview'):
4885 4889 # find nodes that are ancestors of p2 but not of p1
4886 4890 p1 = repo[b'.'].node()
4887 4891 p2 = node
4888 4892 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4889 4893
4890 4894 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4891 4895 for node in nodes:
4892 4896 displayer.show(repo[node])
4893 4897 displayer.close()
4894 4898 return 0
4895 4899
4896 4900 # ui.forcemerge is an internal variable, do not document
4897 4901 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4898 4902 with ui.configoverride(overrides, b'merge'):
4899 4903 force = opts.get(b'force')
4900 4904 labels = [b'working copy', b'merge rev']
4901 4905 return hg.merge(
4902 4906 repo, node, force=force, mergeforce=force, labels=labels
4903 4907 )
4904 4908
4905 4909
4906 4910 statemod.addunfinished(
4907 4911 b'merge',
4908 4912 fname=None,
4909 4913 clearable=True,
4910 4914 allowcommit=True,
4911 4915 cmdmsg=_(b'outstanding uncommitted merge'),
4912 4916 abortfunc=hg.abortmerge,
4913 4917 statushint=_(
4914 4918 b'To continue: hg commit\nTo abort: hg merge --abort'
4915 4919 ),
4916 4920 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4917 4921 )
4918 4922
4919 4923
4920 4924 @command(
4921 4925 b'outgoing|out',
4922 4926 [
4923 4927 (
4924 4928 b'f',
4925 4929 b'force',
4926 4930 None,
4927 4931 _(b'run even when the destination is unrelated'),
4928 4932 ),
4929 4933 (
4930 4934 b'r',
4931 4935 b'rev',
4932 4936 [],
4933 4937 _(b'a changeset intended to be included in the destination'),
4934 4938 _(b'REV'),
4935 4939 ),
4936 4940 (b'n', b'newest-first', None, _(b'show newest record first')),
4937 4941 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4938 4942 (
4939 4943 b'b',
4940 4944 b'branch',
4941 4945 [],
4942 4946 _(b'a specific branch you would like to push'),
4943 4947 _(b'BRANCH'),
4944 4948 ),
4945 4949 ]
4946 4950 + logopts
4947 4951 + remoteopts
4948 4952 + subrepoopts,
4949 4953 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4950 4954 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4951 4955 )
4952 4956 def outgoing(ui, repo, dest=None, **opts):
4953 4957 """show changesets not found in the destination
4954 4958
4955 4959 Show changesets not found in the specified destination repository
4956 4960 or the default push location. These are the changesets that would
4957 4961 be pushed if a push was requested.
4958 4962
4959 4963 See pull for details of valid destination formats.
4960 4964
4961 4965 .. container:: verbose
4962 4966
4963 4967 With -B/--bookmarks, the result of bookmark comparison between
4964 4968 local and remote repositories is displayed. With -v/--verbose,
4965 4969 status is also displayed for each bookmark like below::
4966 4970
4967 4971 BM1 01234567890a added
4968 4972 BM2 deleted
4969 4973 BM3 234567890abc advanced
4970 4974 BM4 34567890abcd diverged
4971 4975 BM5 4567890abcde changed
4972 4976
4973 4977 The action taken when pushing depends on the
4974 4978 status of each bookmark:
4975 4979
4976 4980 :``added``: push with ``-B`` will create it
4977 4981 :``deleted``: push with ``-B`` will delete it
4978 4982 :``advanced``: push will update it
4979 4983 :``diverged``: push with ``-B`` will update it
4980 4984 :``changed``: push with ``-B`` will update it
4981 4985
4982 4986 From the point of view of pushing behavior, bookmarks
4983 4987 existing only in the remote repository are treated as
4984 4988 ``deleted``, even if it is in fact added remotely.
4985 4989
4986 4990 Returns 0 if there are outgoing changes, 1 otherwise.
4987 4991 """
4988 4992 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4989 4993 # style URLs, so don't overwrite dest.
4990 4994 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4991 4995 if not path:
4992 4996 raise error.Abort(
4993 4997 _(b'default repository not configured!'),
4994 4998 hint=_(b"see 'hg help config.paths'"),
4995 4999 )
4996 5000
4997 5001 opts = pycompat.byteskwargs(opts)
4998 5002 if opts.get(b'graph'):
4999 5003 logcmdutil.checkunsupportedgraphflags([], opts)
5000 5004 o, other = hg._outgoing(ui, repo, dest, opts)
5001 5005 if not o:
5002 5006 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5003 5007 return
5004 5008
5005 5009 revdag = logcmdutil.graphrevs(repo, o, opts)
5006 5010 ui.pager(b'outgoing')
5007 5011 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5008 5012 logcmdutil.displaygraph(
5009 5013 ui, repo, revdag, displayer, graphmod.asciiedges
5010 5014 )
5011 5015 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 5016 return 0
5013 5017
5014 5018 if opts.get(b'bookmarks'):
5015 5019 dest = path.pushloc or path.loc
5016 5020 other = hg.peer(repo, opts, dest)
5017 5021 if b'bookmarks' not in other.listkeys(b'namespaces'):
5018 5022 ui.warn(_(b"remote doesn't support bookmarks\n"))
5019 5023 return 0
5020 5024 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5021 5025 ui.pager(b'outgoing')
5022 5026 return bookmarks.outgoing(ui, repo, other)
5023 5027
5024 5028 repo._subtoppath = path.pushloc or path.loc
5025 5029 try:
5026 5030 return hg.outgoing(ui, repo, dest, opts)
5027 5031 finally:
5028 5032 del repo._subtoppath
5029 5033
5030 5034
5031 5035 @command(
5032 5036 b'parents',
5033 5037 [
5034 5038 (
5035 5039 b'r',
5036 5040 b'rev',
5037 5041 b'',
5038 5042 _(b'show parents of the specified revision'),
5039 5043 _(b'REV'),
5040 5044 ),
5041 5045 ]
5042 5046 + templateopts,
5043 5047 _(b'[-r REV] [FILE]'),
5044 5048 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5045 5049 inferrepo=True,
5046 5050 )
5047 5051 def parents(ui, repo, file_=None, **opts):
5048 5052 """show the parents of the working directory or revision (DEPRECATED)
5049 5053
5050 5054 Print the working directory's parent revisions. If a revision is
5051 5055 given via -r/--rev, the parent of that revision will be printed.
5052 5056 If a file argument is given, the revision in which the file was
5053 5057 last changed (before the working directory revision or the
5054 5058 argument to --rev if given) is printed.
5055 5059
5056 5060 This command is equivalent to::
5057 5061
5058 5062 hg log -r "p1()+p2()" or
5059 5063 hg log -r "p1(REV)+p2(REV)" or
5060 5064 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5061 5065 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5062 5066
5063 5067 See :hg:`summary` and :hg:`help revsets` for related information.
5064 5068
5065 5069 Returns 0 on success.
5066 5070 """
5067 5071
5068 5072 opts = pycompat.byteskwargs(opts)
5069 5073 rev = opts.get(b'rev')
5070 5074 if rev:
5071 5075 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5072 5076 ctx = scmutil.revsingle(repo, rev, None)
5073 5077
5074 5078 if file_:
5075 5079 m = scmutil.match(ctx, (file_,), opts)
5076 5080 if m.anypats() or len(m.files()) != 1:
5077 5081 raise error.Abort(_(b'can only specify an explicit filename'))
5078 5082 file_ = m.files()[0]
5079 5083 filenodes = []
5080 5084 for cp in ctx.parents():
5081 5085 if not cp:
5082 5086 continue
5083 5087 try:
5084 5088 filenodes.append(cp.filenode(file_))
5085 5089 except error.LookupError:
5086 5090 pass
5087 5091 if not filenodes:
5088 5092 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5089 5093 p = []
5090 5094 for fn in filenodes:
5091 5095 fctx = repo.filectx(file_, fileid=fn)
5092 5096 p.append(fctx.node())
5093 5097 else:
5094 5098 p = [cp.node() for cp in ctx.parents()]
5095 5099
5096 5100 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5097 5101 for n in p:
5098 5102 if n != nullid:
5099 5103 displayer.show(repo[n])
5100 5104 displayer.close()
5101 5105
5102 5106
5103 5107 @command(
5104 5108 b'paths',
5105 5109 formatteropts,
5106 5110 _(b'[NAME]'),
5107 5111 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5108 5112 optionalrepo=True,
5109 5113 intents={INTENT_READONLY},
5110 5114 )
5111 5115 def paths(ui, repo, search=None, **opts):
5112 5116 """show aliases for remote repositories
5113 5117
5114 5118 Show definition of symbolic path name NAME. If no name is given,
5115 5119 show definition of all available names.
5116 5120
5117 5121 Option -q/--quiet suppresses all output when searching for NAME
5118 5122 and shows only the path names when listing all definitions.
5119 5123
5120 5124 Path names are defined in the [paths] section of your
5121 5125 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5122 5126 repository, ``.hg/hgrc`` is used, too.
5123 5127
5124 5128 The path names ``default`` and ``default-push`` have a special
5125 5129 meaning. When performing a push or pull operation, they are used
5126 5130 as fallbacks if no location is specified on the command-line.
5127 5131 When ``default-push`` is set, it will be used for push and
5128 5132 ``default`` will be used for pull; otherwise ``default`` is used
5129 5133 as the fallback for both. When cloning a repository, the clone
5130 5134 source is written as ``default`` in ``.hg/hgrc``.
5131 5135
5132 5136 .. note::
5133 5137
5134 5138 ``default`` and ``default-push`` apply to all inbound (e.g.
5135 5139 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5136 5140 and :hg:`bundle`) operations.
5137 5141
5138 5142 See :hg:`help urls` for more information.
5139 5143
5140 5144 .. container:: verbose
5141 5145
5142 5146 Template:
5143 5147
5144 5148 The following keywords are supported. See also :hg:`help templates`.
5145 5149
5146 5150 :name: String. Symbolic name of the path alias.
5147 5151 :pushurl: String. URL for push operations.
5148 5152 :url: String. URL or directory path for the other operations.
5149 5153
5150 5154 Returns 0 on success.
5151 5155 """
5152 5156
5153 5157 opts = pycompat.byteskwargs(opts)
5154 5158 ui.pager(b'paths')
5155 5159 if search:
5156 5160 pathitems = [
5157 5161 (name, path)
5158 5162 for name, path in pycompat.iteritems(ui.paths)
5159 5163 if name == search
5160 5164 ]
5161 5165 else:
5162 5166 pathitems = sorted(pycompat.iteritems(ui.paths))
5163 5167
5164 5168 fm = ui.formatter(b'paths', opts)
5165 5169 if fm.isplain():
5166 5170 hidepassword = util.hidepassword
5167 5171 else:
5168 5172 hidepassword = bytes
5169 5173 if ui.quiet:
5170 5174 namefmt = b'%s\n'
5171 5175 else:
5172 5176 namefmt = b'%s = '
5173 5177 showsubopts = not search and not ui.quiet
5174 5178
5175 5179 for name, path in pathitems:
5176 5180 fm.startitem()
5177 5181 fm.condwrite(not search, b'name', namefmt, name)
5178 5182 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5179 5183 for subopt, value in sorted(path.suboptions.items()):
5180 5184 assert subopt not in (b'name', b'url')
5181 5185 if showsubopts:
5182 5186 fm.plain(b'%s:%s = ' % (name, subopt))
5183 5187 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5184 5188
5185 5189 fm.end()
5186 5190
5187 5191 if search and not pathitems:
5188 5192 if not ui.quiet:
5189 5193 ui.warn(_(b"not found!\n"))
5190 5194 return 1
5191 5195 else:
5192 5196 return 0
5193 5197
5194 5198
5195 5199 @command(
5196 5200 b'phase',
5197 5201 [
5198 5202 (b'p', b'public', False, _(b'set changeset phase to public')),
5199 5203 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5200 5204 (b's', b'secret', False, _(b'set changeset phase to secret')),
5201 5205 (b'f', b'force', False, _(b'allow to move boundary backward')),
5202 5206 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5203 5207 ],
5204 5208 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5205 5209 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5206 5210 )
5207 5211 def phase(ui, repo, *revs, **opts):
5208 5212 """set or show the current phase name
5209 5213
5210 5214 With no argument, show the phase name of the current revision(s).
5211 5215
5212 5216 With one of -p/--public, -d/--draft or -s/--secret, change the
5213 5217 phase value of the specified revisions.
5214 5218
5215 5219 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5216 5220 lower phase to a higher phase. Phases are ordered as follows::
5217 5221
5218 5222 public < draft < secret
5219 5223
5220 5224 Returns 0 on success, 1 if some phases could not be changed.
5221 5225
5222 5226 (For more information about the phases concept, see :hg:`help phases`.)
5223 5227 """
5224 5228 opts = pycompat.byteskwargs(opts)
5225 5229 # search for a unique phase argument
5226 5230 targetphase = None
5227 5231 for idx, name in enumerate(phases.cmdphasenames):
5228 5232 if opts[name]:
5229 5233 if targetphase is not None:
5230 5234 raise error.Abort(_(b'only one phase can be specified'))
5231 5235 targetphase = idx
5232 5236
5233 5237 # look for specified revision
5234 5238 revs = list(revs)
5235 5239 revs.extend(opts[b'rev'])
5236 5240 if not revs:
5237 5241 # display both parents as the second parent phase can influence
5238 5242 # the phase of a merge commit
5239 5243 revs = [c.rev() for c in repo[None].parents()]
5240 5244
5241 5245 revs = scmutil.revrange(repo, revs)
5242 5246
5243 5247 ret = 0
5244 5248 if targetphase is None:
5245 5249 # display
5246 5250 for r in revs:
5247 5251 ctx = repo[r]
5248 5252 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5249 5253 else:
5250 5254 with repo.lock(), repo.transaction(b"phase") as tr:
5251 5255 # set phase
5252 5256 if not revs:
5253 5257 raise error.Abort(_(b'empty revision set'))
5254 5258 nodes = [repo[r].node() for r in revs]
5255 5259 # moving revision from public to draft may hide them
5256 5260 # We have to check result on an unfiltered repository
5257 5261 unfi = repo.unfiltered()
5258 5262 getphase = unfi._phasecache.phase
5259 5263 olddata = [getphase(unfi, r) for r in unfi]
5260 5264 phases.advanceboundary(repo, tr, targetphase, nodes)
5261 5265 if opts[b'force']:
5262 5266 phases.retractboundary(repo, tr, targetphase, nodes)
5263 5267 getphase = unfi._phasecache.phase
5264 5268 newdata = [getphase(unfi, r) for r in unfi]
5265 5269 changes = sum(newdata[r] != olddata[r] for r in unfi)
5266 5270 cl = unfi.changelog
5267 5271 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5268 5272 if rejected:
5269 5273 ui.warn(
5270 5274 _(
5271 5275 b'cannot move %i changesets to a higher '
5272 5276 b'phase, use --force\n'
5273 5277 )
5274 5278 % len(rejected)
5275 5279 )
5276 5280 ret = 1
5277 5281 if changes:
5278 5282 msg = _(b'phase changed for %i changesets\n') % changes
5279 5283 if ret:
5280 5284 ui.status(msg)
5281 5285 else:
5282 5286 ui.note(msg)
5283 5287 else:
5284 5288 ui.warn(_(b'no phases changed\n'))
5285 5289 return ret
5286 5290
5287 5291
5288 5292 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5289 5293 """Run after a changegroup has been added via pull/unbundle
5290 5294
5291 5295 This takes arguments below:
5292 5296
5293 5297 :modheads: change of heads by pull/unbundle
5294 5298 :optupdate: updating working directory is needed or not
5295 5299 :checkout: update destination revision (or None to default destination)
5296 5300 :brev: a name, which might be a bookmark to be activated after updating
5297 5301 """
5298 5302 if modheads == 0:
5299 5303 return
5300 5304 if optupdate:
5301 5305 try:
5302 5306 return hg.updatetotally(ui, repo, checkout, brev)
5303 5307 except error.UpdateAbort as inst:
5304 5308 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5305 5309 hint = inst.hint
5306 5310 raise error.UpdateAbort(msg, hint=hint)
5307 5311 if modheads is not None and modheads > 1:
5308 5312 currentbranchheads = len(repo.branchheads())
5309 5313 if currentbranchheads == modheads:
5310 5314 ui.status(
5311 5315 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5312 5316 )
5313 5317 elif currentbranchheads > 1:
5314 5318 ui.status(
5315 5319 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5316 5320 )
5317 5321 else:
5318 5322 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5319 5323 elif not ui.configbool(b'commands', b'update.requiredest'):
5320 5324 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5321 5325
5322 5326
5323 5327 @command(
5324 5328 b'pull',
5325 5329 [
5326 5330 (
5327 5331 b'u',
5328 5332 b'update',
5329 5333 None,
5330 5334 _(b'update to new branch head if new descendants were pulled'),
5331 5335 ),
5332 5336 (
5333 5337 b'f',
5334 5338 b'force',
5335 5339 None,
5336 5340 _(b'run even when remote repository is unrelated'),
5337 5341 ),
5338 5342 (
5339 5343 b'r',
5340 5344 b'rev',
5341 5345 [],
5342 5346 _(b'a remote changeset intended to be added'),
5343 5347 _(b'REV'),
5344 5348 ),
5345 5349 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5346 5350 (
5347 5351 b'b',
5348 5352 b'branch',
5349 5353 [],
5350 5354 _(b'a specific branch you would like to pull'),
5351 5355 _(b'BRANCH'),
5352 5356 ),
5353 5357 ]
5354 5358 + remoteopts,
5355 5359 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5356 5360 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5357 5361 helpbasic=True,
5358 5362 )
5359 5363 def pull(ui, repo, source=b"default", **opts):
5360 5364 """pull changes from the specified source
5361 5365
5362 5366 Pull changes from a remote repository to a local one.
5363 5367
5364 5368 This finds all changes from the repository at the specified path
5365 5369 or URL and adds them to a local repository (the current one unless
5366 5370 -R is specified). By default, this does not update the copy of the
5367 5371 project in the working directory.
5368 5372
5369 5373 When cloning from servers that support it, Mercurial may fetch
5370 5374 pre-generated data. When this is done, hooks operating on incoming
5371 5375 changesets and changegroups may fire more than once, once for each
5372 5376 pre-generated bundle and as well as for any additional remaining
5373 5377 data. See :hg:`help -e clonebundles` for more.
5374 5378
5375 5379 Use :hg:`incoming` if you want to see what would have been added
5376 5380 by a pull at the time you issued this command. If you then decide
5377 5381 to add those changes to the repository, you should use :hg:`pull
5378 5382 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5379 5383
5380 5384 If SOURCE is omitted, the 'default' path will be used.
5381 5385 See :hg:`help urls` for more information.
5382 5386
5383 5387 Specifying bookmark as ``.`` is equivalent to specifying the active
5384 5388 bookmark's name.
5385 5389
5386 5390 Returns 0 on success, 1 if an update had unresolved files.
5387 5391 """
5388 5392
5389 5393 opts = pycompat.byteskwargs(opts)
5390 5394 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5391 5395 b'update'
5392 5396 ):
5393 5397 msg = _(b'update destination required by configuration')
5394 5398 hint = _(b'use hg pull followed by hg update DEST')
5395 5399 raise error.Abort(msg, hint=hint)
5396 5400
5397 5401 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5398 5402 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5399 5403 other = hg.peer(repo, opts, source)
5400 5404 try:
5401 5405 revs, checkout = hg.addbranchrevs(
5402 5406 repo, other, branches, opts.get(b'rev')
5403 5407 )
5404 5408
5405 5409 pullopargs = {}
5406 5410
5407 5411 nodes = None
5408 5412 if opts.get(b'bookmark') or revs:
5409 5413 # The list of bookmark used here is the same used to actually update
5410 5414 # the bookmark names, to avoid the race from issue 4689 and we do
5411 5415 # all lookup and bookmark queries in one go so they see the same
5412 5416 # version of the server state (issue 4700).
5413 5417 nodes = []
5414 5418 fnodes = []
5415 5419 revs = revs or []
5416 5420 if revs and not other.capable(b'lookup'):
5417 5421 err = _(
5418 5422 b"other repository doesn't support revision lookup, "
5419 5423 b"so a rev cannot be specified."
5420 5424 )
5421 5425 raise error.Abort(err)
5422 5426 with other.commandexecutor() as e:
5423 5427 fremotebookmarks = e.callcommand(
5424 5428 b'listkeys', {b'namespace': b'bookmarks'}
5425 5429 )
5426 5430 for r in revs:
5427 5431 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5428 5432 remotebookmarks = fremotebookmarks.result()
5429 5433 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5430 5434 pullopargs[b'remotebookmarks'] = remotebookmarks
5431 5435 for b in opts.get(b'bookmark', []):
5432 5436 b = repo._bookmarks.expandname(b)
5433 5437 if b not in remotebookmarks:
5434 5438 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5435 5439 nodes.append(remotebookmarks[b])
5436 5440 for i, rev in enumerate(revs):
5437 5441 node = fnodes[i].result()
5438 5442 nodes.append(node)
5439 5443 if rev == checkout:
5440 5444 checkout = node
5441 5445
5442 5446 wlock = util.nullcontextmanager()
5443 5447 if opts.get(b'update'):
5444 5448 wlock = repo.wlock()
5445 5449 with wlock:
5446 5450 pullopargs.update(opts.get(b'opargs', {}))
5447 5451 modheads = exchange.pull(
5448 5452 repo,
5449 5453 other,
5450 5454 heads=nodes,
5451 5455 force=opts.get(b'force'),
5452 5456 bookmarks=opts.get(b'bookmark', ()),
5453 5457 opargs=pullopargs,
5454 5458 ).cgresult
5455 5459
5456 5460 # brev is a name, which might be a bookmark to be activated at
5457 5461 # the end of the update. In other words, it is an explicit
5458 5462 # destination of the update
5459 5463 brev = None
5460 5464
5461 5465 if checkout:
5462 5466 checkout = repo.unfiltered().changelog.rev(checkout)
5463 5467
5464 5468 # order below depends on implementation of
5465 5469 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5466 5470 # because 'checkout' is determined without it.
5467 5471 if opts.get(b'rev'):
5468 5472 brev = opts[b'rev'][0]
5469 5473 elif opts.get(b'branch'):
5470 5474 brev = opts[b'branch'][0]
5471 5475 else:
5472 5476 brev = branches[0]
5473 5477 repo._subtoppath = source
5474 5478 try:
5475 5479 ret = postincoming(
5476 5480 ui, repo, modheads, opts.get(b'update'), checkout, brev
5477 5481 )
5478 5482 except error.FilteredRepoLookupError as exc:
5479 5483 msg = _(b'cannot update to target: %s') % exc.args[0]
5480 5484 exc.args = (msg,) + exc.args[1:]
5481 5485 raise
5482 5486 finally:
5483 5487 del repo._subtoppath
5484 5488
5485 5489 finally:
5486 5490 other.close()
5487 5491 return ret
5488 5492
5489 5493
5490 5494 @command(
5491 5495 b'push',
5492 5496 [
5493 5497 (b'f', b'force', None, _(b'force push')),
5494 5498 (
5495 5499 b'r',
5496 5500 b'rev',
5497 5501 [],
5498 5502 _(b'a changeset intended to be included in the destination'),
5499 5503 _(b'REV'),
5500 5504 ),
5501 5505 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5502 5506 (
5503 5507 b'b',
5504 5508 b'branch',
5505 5509 [],
5506 5510 _(b'a specific branch you would like to push'),
5507 5511 _(b'BRANCH'),
5508 5512 ),
5509 5513 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5510 5514 (
5511 5515 b'',
5512 5516 b'pushvars',
5513 5517 [],
5514 5518 _(b'variables that can be sent to server (ADVANCED)'),
5515 5519 ),
5516 5520 (
5517 5521 b'',
5518 5522 b'publish',
5519 5523 False,
5520 5524 _(b'push the changeset as public (EXPERIMENTAL)'),
5521 5525 ),
5522 5526 ]
5523 5527 + remoteopts,
5524 5528 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5525 5529 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5526 5530 helpbasic=True,
5527 5531 )
5528 5532 def push(ui, repo, dest=None, **opts):
5529 5533 """push changes to the specified destination
5530 5534
5531 5535 Push changesets from the local repository to the specified
5532 5536 destination.
5533 5537
5534 5538 This operation is symmetrical to pull: it is identical to a pull
5535 5539 in the destination repository from the current one.
5536 5540
5537 5541 By default, push will not allow creation of new heads at the
5538 5542 destination, since multiple heads would make it unclear which head
5539 5543 to use. In this situation, it is recommended to pull and merge
5540 5544 before pushing.
5541 5545
5542 5546 Use --new-branch if you want to allow push to create a new named
5543 5547 branch that is not present at the destination. This allows you to
5544 5548 only create a new branch without forcing other changes.
5545 5549
5546 5550 .. note::
5547 5551
5548 5552 Extra care should be taken with the -f/--force option,
5549 5553 which will push all new heads on all branches, an action which will
5550 5554 almost always cause confusion for collaborators.
5551 5555
5552 5556 If -r/--rev is used, the specified revision and all its ancestors
5553 5557 will be pushed to the remote repository.
5554 5558
5555 5559 If -B/--bookmark is used, the specified bookmarked revision, its
5556 5560 ancestors, and the bookmark will be pushed to the remote
5557 5561 repository. Specifying ``.`` is equivalent to specifying the active
5558 5562 bookmark's name.
5559 5563
5560 5564 Please see :hg:`help urls` for important details about ``ssh://``
5561 5565 URLs. If DESTINATION is omitted, a default path will be used.
5562 5566
5563 5567 .. container:: verbose
5564 5568
5565 5569 The --pushvars option sends strings to the server that become
5566 5570 environment variables prepended with ``HG_USERVAR_``. For example,
5567 5571 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5568 5572 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5569 5573
5570 5574 pushvars can provide for user-overridable hooks as well as set debug
5571 5575 levels. One example is having a hook that blocks commits containing
5572 5576 conflict markers, but enables the user to override the hook if the file
5573 5577 is using conflict markers for testing purposes or the file format has
5574 5578 strings that look like conflict markers.
5575 5579
5576 5580 By default, servers will ignore `--pushvars`. To enable it add the
5577 5581 following to your configuration file::
5578 5582
5579 5583 [push]
5580 5584 pushvars.server = true
5581 5585
5582 5586 Returns 0 if push was successful, 1 if nothing to push.
5583 5587 """
5584 5588
5585 5589 opts = pycompat.byteskwargs(opts)
5586 5590 if opts.get(b'bookmark'):
5587 5591 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5588 5592 for b in opts[b'bookmark']:
5589 5593 # translate -B options to -r so changesets get pushed
5590 5594 b = repo._bookmarks.expandname(b)
5591 5595 if b in repo._bookmarks:
5592 5596 opts.setdefault(b'rev', []).append(b)
5593 5597 else:
5594 5598 # if we try to push a deleted bookmark, translate it to null
5595 5599 # this lets simultaneous -r, -b options continue working
5596 5600 opts.setdefault(b'rev', []).append(b"null")
5597 5601
5598 5602 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5599 5603 if not path:
5600 5604 raise error.Abort(
5601 5605 _(b'default repository not configured!'),
5602 5606 hint=_(b"see 'hg help config.paths'"),
5603 5607 )
5604 5608 dest = path.pushloc or path.loc
5605 5609 branches = (path.branch, opts.get(b'branch') or [])
5606 5610 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5607 5611 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5608 5612 other = hg.peer(repo, opts, dest)
5609 5613
5610 5614 if revs:
5611 5615 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5612 5616 if not revs:
5613 5617 raise error.Abort(
5614 5618 _(b"specified revisions evaluate to an empty set"),
5615 5619 hint=_(b"use different revision arguments"),
5616 5620 )
5617 5621 elif path.pushrev:
5618 5622 # It doesn't make any sense to specify ancestor revisions. So limit
5619 5623 # to DAG heads to make discovery simpler.
5620 5624 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5621 5625 revs = scmutil.revrange(repo, [expr])
5622 5626 revs = [repo[rev].node() for rev in revs]
5623 5627 if not revs:
5624 5628 raise error.Abort(
5625 5629 _(b'default push revset for path evaluates to an empty set')
5626 5630 )
5627 5631 elif ui.configbool(b'commands', b'push.require-revs'):
5628 5632 raise error.Abort(
5629 5633 _(b'no revisions specified to push'),
5630 5634 hint=_(b'did you mean "hg push -r ."?'),
5631 5635 )
5632 5636
5633 5637 repo._subtoppath = dest
5634 5638 try:
5635 5639 # push subrepos depth-first for coherent ordering
5636 5640 c = repo[b'.']
5637 5641 subs = c.substate # only repos that are committed
5638 5642 for s in sorted(subs):
5639 5643 result = c.sub(s).push(opts)
5640 5644 if result == 0:
5641 5645 return not result
5642 5646 finally:
5643 5647 del repo._subtoppath
5644 5648
5645 5649 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5646 5650 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5647 5651
5648 5652 pushop = exchange.push(
5649 5653 repo,
5650 5654 other,
5651 5655 opts.get(b'force'),
5652 5656 revs=revs,
5653 5657 newbranch=opts.get(b'new_branch'),
5654 5658 bookmarks=opts.get(b'bookmark', ()),
5655 5659 publish=opts.get(b'publish'),
5656 5660 opargs=opargs,
5657 5661 )
5658 5662
5659 5663 result = not pushop.cgresult
5660 5664
5661 5665 if pushop.bkresult is not None:
5662 5666 if pushop.bkresult == 2:
5663 5667 result = 2
5664 5668 elif not result and pushop.bkresult:
5665 5669 result = 2
5666 5670
5667 5671 return result
5668 5672
5669 5673
5670 5674 @command(
5671 5675 b'recover',
5672 5676 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5673 5677 helpcategory=command.CATEGORY_MAINTENANCE,
5674 5678 )
5675 5679 def recover(ui, repo, **opts):
5676 5680 """roll back an interrupted transaction
5677 5681
5678 5682 Recover from an interrupted commit or pull.
5679 5683
5680 5684 This command tries to fix the repository status after an
5681 5685 interrupted operation. It should only be necessary when Mercurial
5682 5686 suggests it.
5683 5687
5684 5688 Returns 0 if successful, 1 if nothing to recover or verify fails.
5685 5689 """
5686 5690 ret = repo.recover()
5687 5691 if ret:
5688 5692 if opts['verify']:
5689 5693 return hg.verify(repo)
5690 5694 else:
5691 5695 msg = _(
5692 5696 b"(verify step skipped, run `hg verify` to check your "
5693 5697 b"repository content)\n"
5694 5698 )
5695 5699 ui.warn(msg)
5696 5700 return 0
5697 5701 return 1
5698 5702
5699 5703
5700 5704 @command(
5701 5705 b'remove|rm',
5702 5706 [
5703 5707 (b'A', b'after', None, _(b'record delete for missing files')),
5704 5708 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5705 5709 ]
5706 5710 + subrepoopts
5707 5711 + walkopts
5708 5712 + dryrunopts,
5709 5713 _(b'[OPTION]... FILE...'),
5710 5714 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5711 5715 helpbasic=True,
5712 5716 inferrepo=True,
5713 5717 )
5714 5718 def remove(ui, repo, *pats, **opts):
5715 5719 """remove the specified files on the next commit
5716 5720
5717 5721 Schedule the indicated files for removal from the current branch.
5718 5722
5719 5723 This command schedules the files to be removed at the next commit.
5720 5724 To undo a remove before that, see :hg:`revert`. To undo added
5721 5725 files, see :hg:`forget`.
5722 5726
5723 5727 .. container:: verbose
5724 5728
5725 5729 -A/--after can be used to remove only files that have already
5726 5730 been deleted, -f/--force can be used to force deletion, and -Af
5727 5731 can be used to remove files from the next revision without
5728 5732 deleting them from the working directory.
5729 5733
5730 5734 The following table details the behavior of remove for different
5731 5735 file states (columns) and option combinations (rows). The file
5732 5736 states are Added [A], Clean [C], Modified [M] and Missing [!]
5733 5737 (as reported by :hg:`status`). The actions are Warn, Remove
5734 5738 (from branch) and Delete (from disk):
5735 5739
5736 5740 ========= == == == ==
5737 5741 opt/state A C M !
5738 5742 ========= == == == ==
5739 5743 none W RD W R
5740 5744 -f R RD RD R
5741 5745 -A W W W R
5742 5746 -Af R R R R
5743 5747 ========= == == == ==
5744 5748
5745 5749 .. note::
5746 5750
5747 5751 :hg:`remove` never deletes files in Added [A] state from the
5748 5752 working directory, not even if ``--force`` is specified.
5749 5753
5750 5754 Returns 0 on success, 1 if any warnings encountered.
5751 5755 """
5752 5756
5753 5757 opts = pycompat.byteskwargs(opts)
5754 5758 after, force = opts.get(b'after'), opts.get(b'force')
5755 5759 dryrun = opts.get(b'dry_run')
5756 5760 if not pats and not after:
5757 5761 raise error.Abort(_(b'no files specified'))
5758 5762
5759 5763 m = scmutil.match(repo[None], pats, opts)
5760 5764 subrepos = opts.get(b'subrepos')
5761 5765 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5762 5766 return cmdutil.remove(
5763 5767 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5764 5768 )
5765 5769
5766 5770
5767 5771 @command(
5768 5772 b'rename|move|mv',
5769 5773 [
5770 5774 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5771 5775 (
5772 5776 b'f',
5773 5777 b'force',
5774 5778 None,
5775 5779 _(b'forcibly move over an existing managed file'),
5776 5780 ),
5777 5781 ]
5778 5782 + walkopts
5779 5783 + dryrunopts,
5780 5784 _(b'[OPTION]... SOURCE... DEST'),
5781 5785 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5782 5786 )
5783 5787 def rename(ui, repo, *pats, **opts):
5784 5788 """rename files; equivalent of copy + remove
5785 5789
5786 5790 Mark dest as copies of sources; mark sources for deletion. If dest
5787 5791 is a directory, copies are put in that directory. If dest is a
5788 5792 file, there can only be one source.
5789 5793
5790 5794 By default, this command copies the contents of files as they
5791 5795 exist in the working directory. If invoked with -A/--after, the
5792 5796 operation is recorded, but no copying is performed.
5793 5797
5794 5798 This command takes effect at the next commit. To undo a rename
5795 5799 before that, see :hg:`revert`.
5796 5800
5797 5801 Returns 0 on success, 1 if errors are encountered.
5798 5802 """
5799 5803 opts = pycompat.byteskwargs(opts)
5800 5804 with repo.wlock(False):
5801 5805 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5802 5806
5803 5807
5804 5808 @command(
5805 5809 b'resolve',
5806 5810 [
5807 5811 (b'a', b'all', None, _(b'select all unresolved files')),
5808 5812 (b'l', b'list', None, _(b'list state of files needing merge')),
5809 5813 (b'm', b'mark', None, _(b'mark files as resolved')),
5810 5814 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5811 5815 (b'n', b'no-status', None, _(b'hide status prefix')),
5812 5816 (b'', b're-merge', None, _(b're-merge files')),
5813 5817 ]
5814 5818 + mergetoolopts
5815 5819 + walkopts
5816 5820 + formatteropts,
5817 5821 _(b'[OPTION]... [FILE]...'),
5818 5822 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5819 5823 inferrepo=True,
5820 5824 )
5821 5825 def resolve(ui, repo, *pats, **opts):
5822 5826 """redo merges or set/view the merge status of files
5823 5827
5824 5828 Merges with unresolved conflicts are often the result of
5825 5829 non-interactive merging using the ``internal:merge`` configuration
5826 5830 setting, or a command-line merge tool like ``diff3``. The resolve
5827 5831 command is used to manage the files involved in a merge, after
5828 5832 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5829 5833 working directory must have two parents). See :hg:`help
5830 5834 merge-tools` for information on configuring merge tools.
5831 5835
5832 5836 The resolve command can be used in the following ways:
5833 5837
5834 5838 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5835 5839 the specified files, discarding any previous merge attempts. Re-merging
5836 5840 is not performed for files already marked as resolved. Use ``--all/-a``
5837 5841 to select all unresolved files. ``--tool`` can be used to specify
5838 5842 the merge tool used for the given files. It overrides the HGMERGE
5839 5843 environment variable and your configuration files. Previous file
5840 5844 contents are saved with a ``.orig`` suffix.
5841 5845
5842 5846 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5843 5847 (e.g. after having manually fixed-up the files). The default is
5844 5848 to mark all unresolved files.
5845 5849
5846 5850 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5847 5851 default is to mark all resolved files.
5848 5852
5849 5853 - :hg:`resolve -l`: list files which had or still have conflicts.
5850 5854 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5851 5855 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5852 5856 the list. See :hg:`help filesets` for details.
5853 5857
5854 5858 .. note::
5855 5859
5856 5860 Mercurial will not let you commit files with unresolved merge
5857 5861 conflicts. You must use :hg:`resolve -m ...` before you can
5858 5862 commit after a conflicting merge.
5859 5863
5860 5864 .. container:: verbose
5861 5865
5862 5866 Template:
5863 5867
5864 5868 The following keywords are supported in addition to the common template
5865 5869 keywords and functions. See also :hg:`help templates`.
5866 5870
5867 5871 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5868 5872 :path: String. Repository-absolute path of the file.
5869 5873
5870 5874 Returns 0 on success, 1 if any files fail a resolve attempt.
5871 5875 """
5872 5876
5873 5877 opts = pycompat.byteskwargs(opts)
5874 5878 confirm = ui.configbool(b'commands', b'resolve.confirm')
5875 5879 flaglist = b'all mark unmark list no_status re_merge'.split()
5876 5880 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5877 5881
5878 5882 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5879 5883 if actioncount > 1:
5880 5884 raise error.Abort(_(b"too many actions specified"))
5881 5885 elif actioncount == 0 and ui.configbool(
5882 5886 b'commands', b'resolve.explicit-re-merge'
5883 5887 ):
5884 5888 hint = _(b'use --mark, --unmark, --list or --re-merge')
5885 5889 raise error.Abort(_(b'no action specified'), hint=hint)
5886 5890 if pats and all:
5887 5891 raise error.Abort(_(b"can't specify --all and patterns"))
5888 5892 if not (all or pats or show or mark or unmark):
5889 5893 raise error.Abort(
5890 5894 _(b'no files or directories specified'),
5891 5895 hint=b'use --all to re-merge all unresolved files',
5892 5896 )
5893 5897
5894 5898 if confirm:
5895 5899 if all:
5896 5900 if ui.promptchoice(
5897 5901 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5898 5902 ):
5899 5903 raise error.Abort(_(b'user quit'))
5900 5904 if mark and not pats:
5901 5905 if ui.promptchoice(
5902 5906 _(
5903 5907 b'mark all unresolved files as resolved (yn)?'
5904 5908 b'$$ &Yes $$ &No'
5905 5909 )
5906 5910 ):
5907 5911 raise error.Abort(_(b'user quit'))
5908 5912 if unmark and not pats:
5909 5913 if ui.promptchoice(
5910 5914 _(
5911 5915 b'mark all resolved files as unresolved (yn)?'
5912 5916 b'$$ &Yes $$ &No'
5913 5917 )
5914 5918 ):
5915 5919 raise error.Abort(_(b'user quit'))
5916 5920
5917 5921 uipathfn = scmutil.getuipathfn(repo)
5918 5922
5919 5923 if show:
5920 5924 ui.pager(b'resolve')
5921 5925 fm = ui.formatter(b'resolve', opts)
5922 5926 ms = mergemod.mergestate.read(repo)
5923 5927 wctx = repo[None]
5924 5928 m = scmutil.match(wctx, pats, opts)
5925 5929
5926 5930 # Labels and keys based on merge state. Unresolved path conflicts show
5927 5931 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5928 5932 # resolved conflicts.
5929 5933 mergestateinfo = {
5930 5934 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5931 5935 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5932 5936 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5933 5937 b'resolve.unresolved',
5934 5938 b'P',
5935 5939 ),
5936 5940 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5937 5941 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5938 5942 b'resolve.driverresolved',
5939 5943 b'D',
5940 5944 ),
5941 5945 }
5942 5946
5943 5947 for f in ms:
5944 5948 if not m(f):
5945 5949 continue
5946 5950
5947 5951 label, key = mergestateinfo[ms[f]]
5948 5952 fm.startitem()
5949 5953 fm.context(ctx=wctx)
5950 5954 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5951 5955 fm.data(path=f)
5952 5956 fm.plain(b'%s\n' % uipathfn(f), label=label)
5953 5957 fm.end()
5954 5958 return 0
5955 5959
5956 5960 with repo.wlock():
5957 5961 ms = mergemod.mergestate.read(repo)
5958 5962
5959 5963 if not (ms.active() or repo.dirstate.p2() != nullid):
5960 5964 raise error.Abort(
5961 5965 _(b'resolve command not applicable when not merging')
5962 5966 )
5963 5967
5964 5968 wctx = repo[None]
5965 5969
5966 5970 if (
5967 5971 ms.mergedriver
5968 5972 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5969 5973 ):
5970 5974 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5971 5975 ms.commit()
5972 5976 # allow mark and unmark to go through
5973 5977 if not mark and not unmark and not proceed:
5974 5978 return 1
5975 5979
5976 5980 m = scmutil.match(wctx, pats, opts)
5977 5981 ret = 0
5978 5982 didwork = False
5979 5983 runconclude = False
5980 5984
5981 5985 tocomplete = []
5982 5986 hasconflictmarkers = []
5983 5987 if mark:
5984 5988 markcheck = ui.config(b'commands', b'resolve.mark-check')
5985 5989 if markcheck not in [b'warn', b'abort']:
5986 5990 # Treat all invalid / unrecognized values as 'none'.
5987 5991 markcheck = False
5988 5992 for f in ms:
5989 5993 if not m(f):
5990 5994 continue
5991 5995
5992 5996 didwork = True
5993 5997
5994 5998 # don't let driver-resolved files be marked, and run the conclude
5995 5999 # step if asked to resolve
5996 6000 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
5997 6001 exact = m.exact(f)
5998 6002 if mark:
5999 6003 if exact:
6000 6004 ui.warn(
6001 6005 _(b'not marking %s as it is driver-resolved\n')
6002 6006 % uipathfn(f)
6003 6007 )
6004 6008 elif unmark:
6005 6009 if exact:
6006 6010 ui.warn(
6007 6011 _(b'not unmarking %s as it is driver-resolved\n')
6008 6012 % uipathfn(f)
6009 6013 )
6010 6014 else:
6011 6015 runconclude = True
6012 6016 continue
6013 6017
6014 6018 # path conflicts must be resolved manually
6015 6019 if ms[f] in (
6016 6020 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6017 6021 mergemod.MERGE_RECORD_RESOLVED_PATH,
6018 6022 ):
6019 6023 if mark:
6020 6024 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6021 6025 elif unmark:
6022 6026 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6023 6027 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6024 6028 ui.warn(
6025 6029 _(b'%s: path conflict must be resolved manually\n')
6026 6030 % uipathfn(f)
6027 6031 )
6028 6032 continue
6029 6033
6030 6034 if mark:
6031 6035 if markcheck:
6032 6036 fdata = repo.wvfs.tryread(f)
6033 6037 if (
6034 6038 filemerge.hasconflictmarkers(fdata)
6035 6039 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6036 6040 ):
6037 6041 hasconflictmarkers.append(f)
6038 6042 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6039 6043 elif unmark:
6040 6044 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6041 6045 else:
6042 6046 # backup pre-resolve (merge uses .orig for its own purposes)
6043 6047 a = repo.wjoin(f)
6044 6048 try:
6045 6049 util.copyfile(a, a + b".resolve")
6046 6050 except (IOError, OSError) as inst:
6047 6051 if inst.errno != errno.ENOENT:
6048 6052 raise
6049 6053
6050 6054 try:
6051 6055 # preresolve file
6052 6056 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6053 6057 with ui.configoverride(overrides, b'resolve'):
6054 6058 complete, r = ms.preresolve(f, wctx)
6055 6059 if not complete:
6056 6060 tocomplete.append(f)
6057 6061 elif r:
6058 6062 ret = 1
6059 6063 finally:
6060 6064 ms.commit()
6061 6065
6062 6066 # replace filemerge's .orig file with our resolve file, but only
6063 6067 # for merges that are complete
6064 6068 if complete:
6065 6069 try:
6066 6070 util.rename(
6067 6071 a + b".resolve", scmutil.backuppath(ui, repo, f)
6068 6072 )
6069 6073 except OSError as inst:
6070 6074 if inst.errno != errno.ENOENT:
6071 6075 raise
6072 6076
6073 6077 if hasconflictmarkers:
6074 6078 ui.warn(
6075 6079 _(
6076 6080 b'warning: the following files still have conflict '
6077 6081 b'markers:\n'
6078 6082 )
6079 6083 + b''.join(
6080 6084 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6081 6085 )
6082 6086 )
6083 6087 if markcheck == b'abort' and not all and not pats:
6084 6088 raise error.Abort(
6085 6089 _(b'conflict markers detected'),
6086 6090 hint=_(b'use --all to mark anyway'),
6087 6091 )
6088 6092
6089 6093 for f in tocomplete:
6090 6094 try:
6091 6095 # resolve file
6092 6096 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6093 6097 with ui.configoverride(overrides, b'resolve'):
6094 6098 r = ms.resolve(f, wctx)
6095 6099 if r:
6096 6100 ret = 1
6097 6101 finally:
6098 6102 ms.commit()
6099 6103
6100 6104 # replace filemerge's .orig file with our resolve file
6101 6105 a = repo.wjoin(f)
6102 6106 try:
6103 6107 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6104 6108 except OSError as inst:
6105 6109 if inst.errno != errno.ENOENT:
6106 6110 raise
6107 6111
6108 6112 ms.commit()
6109 6113 ms.recordactions()
6110 6114
6111 6115 if not didwork and pats:
6112 6116 hint = None
6113 6117 if not any([p for p in pats if p.find(b':') >= 0]):
6114 6118 pats = [b'path:%s' % p for p in pats]
6115 6119 m = scmutil.match(wctx, pats, opts)
6116 6120 for f in ms:
6117 6121 if not m(f):
6118 6122 continue
6119 6123
6120 6124 def flag(o):
6121 6125 if o == b're_merge':
6122 6126 return b'--re-merge '
6123 6127 return b'-%s ' % o[0:1]
6124 6128
6125 6129 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6126 6130 hint = _(b"(try: hg resolve %s%s)\n") % (
6127 6131 flags,
6128 6132 b' '.join(pats),
6129 6133 )
6130 6134 break
6131 6135 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6132 6136 if hint:
6133 6137 ui.warn(hint)
6134 6138 elif ms.mergedriver and ms.mdstate() != b's':
6135 6139 # run conclude step when either a driver-resolved file is requested
6136 6140 # or there are no driver-resolved files
6137 6141 # we can't use 'ret' to determine whether any files are unresolved
6138 6142 # because we might not have tried to resolve some
6139 6143 if (runconclude or not list(ms.driverresolved())) and not list(
6140 6144 ms.unresolved()
6141 6145 ):
6142 6146 proceed = mergemod.driverconclude(repo, ms, wctx)
6143 6147 ms.commit()
6144 6148 if not proceed:
6145 6149 return 1
6146 6150
6147 6151 # Nudge users into finishing an unfinished operation
6148 6152 unresolvedf = list(ms.unresolved())
6149 6153 driverresolvedf = list(ms.driverresolved())
6150 6154 if not unresolvedf and not driverresolvedf:
6151 6155 ui.status(_(b'(no more unresolved files)\n'))
6152 6156 cmdutil.checkafterresolved(repo)
6153 6157 elif not unresolvedf:
6154 6158 ui.status(
6155 6159 _(
6156 6160 b'(no more unresolved files -- '
6157 6161 b'run "hg resolve --all" to conclude)\n'
6158 6162 )
6159 6163 )
6160 6164
6161 6165 return ret
6162 6166
6163 6167
6164 6168 @command(
6165 6169 b'revert',
6166 6170 [
6167 6171 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6168 6172 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6169 6173 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6170 6174 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6171 6175 (b'i', b'interactive', None, _(b'interactively select the changes')),
6172 6176 ]
6173 6177 + walkopts
6174 6178 + dryrunopts,
6175 6179 _(b'[OPTION]... [-r REV] [NAME]...'),
6176 6180 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6177 6181 )
6178 6182 def revert(ui, repo, *pats, **opts):
6179 6183 """restore files to their checkout state
6180 6184
6181 6185 .. note::
6182 6186
6183 6187 To check out earlier revisions, you should use :hg:`update REV`.
6184 6188 To cancel an uncommitted merge (and lose your changes),
6185 6189 use :hg:`merge --abort`.
6186 6190
6187 6191 With no revision specified, revert the specified files or directories
6188 6192 to the contents they had in the parent of the working directory.
6189 6193 This restores the contents of files to an unmodified
6190 6194 state and unschedules adds, removes, copies, and renames. If the
6191 6195 working directory has two parents, you must explicitly specify a
6192 6196 revision.
6193 6197
6194 6198 Using the -r/--rev or -d/--date options, revert the given files or
6195 6199 directories to their states as of a specific revision. Because
6196 6200 revert does not change the working directory parents, this will
6197 6201 cause these files to appear modified. This can be helpful to "back
6198 6202 out" some or all of an earlier change. See :hg:`backout` for a
6199 6203 related method.
6200 6204
6201 6205 Modified files are saved with a .orig suffix before reverting.
6202 6206 To disable these backups, use --no-backup. It is possible to store
6203 6207 the backup files in a custom directory relative to the root of the
6204 6208 repository by setting the ``ui.origbackuppath`` configuration
6205 6209 option.
6206 6210
6207 6211 See :hg:`help dates` for a list of formats valid for -d/--date.
6208 6212
6209 6213 See :hg:`help backout` for a way to reverse the effect of an
6210 6214 earlier changeset.
6211 6215
6212 6216 Returns 0 on success.
6213 6217 """
6214 6218
6215 6219 opts = pycompat.byteskwargs(opts)
6216 6220 if opts.get(b"date"):
6217 6221 if opts.get(b"rev"):
6218 6222 raise error.Abort(_(b"you can't specify a revision and a date"))
6219 6223 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6220 6224
6221 6225 parent, p2 = repo.dirstate.parents()
6222 6226 if not opts.get(b'rev') and p2 != nullid:
6223 6227 # revert after merge is a trap for new users (issue2915)
6224 6228 raise error.Abort(
6225 6229 _(b'uncommitted merge with no revision specified'),
6226 6230 hint=_(b"use 'hg update' or see 'hg help revert'"),
6227 6231 )
6228 6232
6229 6233 rev = opts.get(b'rev')
6230 6234 if rev:
6231 6235 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6232 6236 ctx = scmutil.revsingle(repo, rev)
6233 6237
6234 6238 if not (
6235 6239 pats
6236 6240 or opts.get(b'include')
6237 6241 or opts.get(b'exclude')
6238 6242 or opts.get(b'all')
6239 6243 or opts.get(b'interactive')
6240 6244 ):
6241 6245 msg = _(b"no files or directories specified")
6242 6246 if p2 != nullid:
6243 6247 hint = _(
6244 6248 b"uncommitted merge, use --all to discard all changes,"
6245 6249 b" or 'hg update -C .' to abort the merge"
6246 6250 )
6247 6251 raise error.Abort(msg, hint=hint)
6248 6252 dirty = any(repo.status())
6249 6253 node = ctx.node()
6250 6254 if node != parent:
6251 6255 if dirty:
6252 6256 hint = (
6253 6257 _(
6254 6258 b"uncommitted changes, use --all to discard all"
6255 6259 b" changes, or 'hg update %d' to update"
6256 6260 )
6257 6261 % ctx.rev()
6258 6262 )
6259 6263 else:
6260 6264 hint = (
6261 6265 _(
6262 6266 b"use --all to revert all files,"
6263 6267 b" or 'hg update %d' to update"
6264 6268 )
6265 6269 % ctx.rev()
6266 6270 )
6267 6271 elif dirty:
6268 6272 hint = _(b"uncommitted changes, use --all to discard all changes")
6269 6273 else:
6270 6274 hint = _(b"use --all to revert all files")
6271 6275 raise error.Abort(msg, hint=hint)
6272 6276
6273 6277 return cmdutil.revert(
6274 6278 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6275 6279 )
6276 6280
6277 6281
6278 6282 @command(
6279 6283 b'rollback',
6280 6284 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6281 6285 helpcategory=command.CATEGORY_MAINTENANCE,
6282 6286 )
6283 6287 def rollback(ui, repo, **opts):
6284 6288 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6285 6289
6286 6290 Please use :hg:`commit --amend` instead of rollback to correct
6287 6291 mistakes in the last commit.
6288 6292
6289 6293 This command should be used with care. There is only one level of
6290 6294 rollback, and there is no way to undo a rollback. It will also
6291 6295 restore the dirstate at the time of the last transaction, losing
6292 6296 any dirstate changes since that time. This command does not alter
6293 6297 the working directory.
6294 6298
6295 6299 Transactions are used to encapsulate the effects of all commands
6296 6300 that create new changesets or propagate existing changesets into a
6297 6301 repository.
6298 6302
6299 6303 .. container:: verbose
6300 6304
6301 6305 For example, the following commands are transactional, and their
6302 6306 effects can be rolled back:
6303 6307
6304 6308 - commit
6305 6309 - import
6306 6310 - pull
6307 6311 - push (with this repository as the destination)
6308 6312 - unbundle
6309 6313
6310 6314 To avoid permanent data loss, rollback will refuse to rollback a
6311 6315 commit transaction if it isn't checked out. Use --force to
6312 6316 override this protection.
6313 6317
6314 6318 The rollback command can be entirely disabled by setting the
6315 6319 ``ui.rollback`` configuration setting to false. If you're here
6316 6320 because you want to use rollback and it's disabled, you can
6317 6321 re-enable the command by setting ``ui.rollback`` to true.
6318 6322
6319 6323 This command is not intended for use on public repositories. Once
6320 6324 changes are visible for pull by other users, rolling a transaction
6321 6325 back locally is ineffective (someone else may already have pulled
6322 6326 the changes). Furthermore, a race is possible with readers of the
6323 6327 repository; for example an in-progress pull from the repository
6324 6328 may fail if a rollback is performed.
6325 6329
6326 6330 Returns 0 on success, 1 if no rollback data is available.
6327 6331 """
6328 6332 if not ui.configbool(b'ui', b'rollback'):
6329 6333 raise error.Abort(
6330 6334 _(b'rollback is disabled because it is unsafe'),
6331 6335 hint=b'see `hg help -v rollback` for information',
6332 6336 )
6333 6337 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6334 6338
6335 6339
6336 6340 @command(
6337 6341 b'root',
6338 6342 [] + formatteropts,
6339 6343 intents={INTENT_READONLY},
6340 6344 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6341 6345 )
6342 6346 def root(ui, repo, **opts):
6343 6347 """print the root (top) of the current working directory
6344 6348
6345 6349 Print the root directory of the current repository.
6346 6350
6347 6351 .. container:: verbose
6348 6352
6349 6353 Template:
6350 6354
6351 6355 The following keywords are supported in addition to the common template
6352 6356 keywords and functions. See also :hg:`help templates`.
6353 6357
6354 6358 :hgpath: String. Path to the .hg directory.
6355 6359 :storepath: String. Path to the directory holding versioned data.
6356 6360
6357 6361 Returns 0 on success.
6358 6362 """
6359 6363 opts = pycompat.byteskwargs(opts)
6360 6364 with ui.formatter(b'root', opts) as fm:
6361 6365 fm.startitem()
6362 6366 fm.write(b'reporoot', b'%s\n', repo.root)
6363 6367 fm.data(hgpath=repo.path, storepath=repo.spath)
6364 6368
6365 6369
6366 6370 @command(
6367 6371 b'serve',
6368 6372 [
6369 6373 (
6370 6374 b'A',
6371 6375 b'accesslog',
6372 6376 b'',
6373 6377 _(b'name of access log file to write to'),
6374 6378 _(b'FILE'),
6375 6379 ),
6376 6380 (b'd', b'daemon', None, _(b'run server in background')),
6377 6381 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6378 6382 (
6379 6383 b'E',
6380 6384 b'errorlog',
6381 6385 b'',
6382 6386 _(b'name of error log file to write to'),
6383 6387 _(b'FILE'),
6384 6388 ),
6385 6389 # use string type, then we can check if something was passed
6386 6390 (
6387 6391 b'p',
6388 6392 b'port',
6389 6393 b'',
6390 6394 _(b'port to listen on (default: 8000)'),
6391 6395 _(b'PORT'),
6392 6396 ),
6393 6397 (
6394 6398 b'a',
6395 6399 b'address',
6396 6400 b'',
6397 6401 _(b'address to listen on (default: all interfaces)'),
6398 6402 _(b'ADDR'),
6399 6403 ),
6400 6404 (
6401 6405 b'',
6402 6406 b'prefix',
6403 6407 b'',
6404 6408 _(b'prefix path to serve from (default: server root)'),
6405 6409 _(b'PREFIX'),
6406 6410 ),
6407 6411 (
6408 6412 b'n',
6409 6413 b'name',
6410 6414 b'',
6411 6415 _(b'name to show in web pages (default: working directory)'),
6412 6416 _(b'NAME'),
6413 6417 ),
6414 6418 (
6415 6419 b'',
6416 6420 b'web-conf',
6417 6421 b'',
6418 6422 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6419 6423 _(b'FILE'),
6420 6424 ),
6421 6425 (
6422 6426 b'',
6423 6427 b'webdir-conf',
6424 6428 b'',
6425 6429 _(b'name of the hgweb config file (DEPRECATED)'),
6426 6430 _(b'FILE'),
6427 6431 ),
6428 6432 (
6429 6433 b'',
6430 6434 b'pid-file',
6431 6435 b'',
6432 6436 _(b'name of file to write process ID to'),
6433 6437 _(b'FILE'),
6434 6438 ),
6435 6439 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6436 6440 (
6437 6441 b'',
6438 6442 b'cmdserver',
6439 6443 b'',
6440 6444 _(b'for remote clients (ADVANCED)'),
6441 6445 _(b'MODE'),
6442 6446 ),
6443 6447 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6444 6448 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6445 6449 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6446 6450 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6447 6451 (b'', b'print-url', None, _(b'start and print only the URL')),
6448 6452 ]
6449 6453 + subrepoopts,
6450 6454 _(b'[OPTION]...'),
6451 6455 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6452 6456 helpbasic=True,
6453 6457 optionalrepo=True,
6454 6458 )
6455 6459 def serve(ui, repo, **opts):
6456 6460 """start stand-alone webserver
6457 6461
6458 6462 Start a local HTTP repository browser and pull server. You can use
6459 6463 this for ad-hoc sharing and browsing of repositories. It is
6460 6464 recommended to use a real web server to serve a repository for
6461 6465 longer periods of time.
6462 6466
6463 6467 Please note that the server does not implement access control.
6464 6468 This means that, by default, anybody can read from the server and
6465 6469 nobody can write to it by default. Set the ``web.allow-push``
6466 6470 option to ``*`` to allow everybody to push to the server. You
6467 6471 should use a real web server if you need to authenticate users.
6468 6472
6469 6473 By default, the server logs accesses to stdout and errors to
6470 6474 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6471 6475 files.
6472 6476
6473 6477 To have the server choose a free port number to listen on, specify
6474 6478 a port number of 0; in this case, the server will print the port
6475 6479 number it uses.
6476 6480
6477 6481 Returns 0 on success.
6478 6482 """
6479 6483
6480 6484 opts = pycompat.byteskwargs(opts)
6481 6485 if opts[b"stdio"] and opts[b"cmdserver"]:
6482 6486 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6483 6487 if opts[b"print_url"] and ui.verbose:
6484 6488 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6485 6489
6486 6490 if opts[b"stdio"]:
6487 6491 if repo is None:
6488 6492 raise error.RepoError(
6489 6493 _(b"there is no Mercurial repository here (.hg not found)")
6490 6494 )
6491 6495 s = wireprotoserver.sshserver(ui, repo)
6492 6496 s.serve_forever()
6493 6497
6494 6498 service = server.createservice(ui, repo, opts)
6495 6499 return server.runservice(opts, initfn=service.init, runfn=service.run)
6496 6500
6497 6501
6498 6502 @command(
6499 6503 b'shelve',
6500 6504 [
6501 6505 (
6502 6506 b'A',
6503 6507 b'addremove',
6504 6508 None,
6505 6509 _(b'mark new/missing files as added/removed before shelving'),
6506 6510 ),
6507 6511 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6508 6512 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6509 6513 (
6510 6514 b'',
6511 6515 b'date',
6512 6516 b'',
6513 6517 _(b'shelve with the specified commit date'),
6514 6518 _(b'DATE'),
6515 6519 ),
6516 6520 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6517 6521 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6518 6522 (
6519 6523 b'k',
6520 6524 b'keep',
6521 6525 False,
6522 6526 _(b'shelve, but keep changes in the working directory'),
6523 6527 ),
6524 6528 (b'l', b'list', None, _(b'list current shelves')),
6525 6529 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6526 6530 (
6527 6531 b'n',
6528 6532 b'name',
6529 6533 b'',
6530 6534 _(b'use the given name for the shelved commit'),
6531 6535 _(b'NAME'),
6532 6536 ),
6533 6537 (
6534 6538 b'p',
6535 6539 b'patch',
6536 6540 None,
6537 6541 _(
6538 6542 b'output patches for changes (provide the names of the shelved '
6539 6543 b'changes as positional arguments)'
6540 6544 ),
6541 6545 ),
6542 6546 (b'i', b'interactive', None, _(b'interactive mode')),
6543 6547 (
6544 6548 b'',
6545 6549 b'stat',
6546 6550 None,
6547 6551 _(
6548 6552 b'output diffstat-style summary of changes (provide the names of '
6549 6553 b'the shelved changes as positional arguments)'
6550 6554 ),
6551 6555 ),
6552 6556 ]
6553 6557 + cmdutil.walkopts,
6554 6558 _(b'hg shelve [OPTION]... [FILE]...'),
6555 6559 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6556 6560 )
6557 6561 def shelve(ui, repo, *pats, **opts):
6558 6562 '''save and set aside changes from the working directory
6559 6563
6560 6564 Shelving takes files that "hg status" reports as not clean, saves
6561 6565 the modifications to a bundle (a shelved change), and reverts the
6562 6566 files so that their state in the working directory becomes clean.
6563 6567
6564 6568 To restore these changes to the working directory, using "hg
6565 6569 unshelve"; this will work even if you switch to a different
6566 6570 commit.
6567 6571
6568 6572 When no files are specified, "hg shelve" saves all not-clean
6569 6573 files. If specific files or directories are named, only changes to
6570 6574 those files are shelved.
6571 6575
6572 6576 In bare shelve (when no files are specified, without interactive,
6573 6577 include and exclude option), shelving remembers information if the
6574 6578 working directory was on newly created branch, in other words working
6575 6579 directory was on different branch than its first parent. In this
6576 6580 situation unshelving restores branch information to the working directory.
6577 6581
6578 6582 Each shelved change has a name that makes it easier to find later.
6579 6583 The name of a shelved change defaults to being based on the active
6580 6584 bookmark, or if there is no active bookmark, the current named
6581 6585 branch. To specify a different name, use ``--name``.
6582 6586
6583 6587 To see a list of existing shelved changes, use the ``--list``
6584 6588 option. For each shelved change, this will print its name, age,
6585 6589 and description; use ``--patch`` or ``--stat`` for more details.
6586 6590
6587 6591 To delete specific shelved changes, use ``--delete``. To delete
6588 6592 all shelved changes, use ``--cleanup``.
6589 6593 '''
6590 6594 opts = pycompat.byteskwargs(opts)
6591 6595 allowables = [
6592 6596 (b'addremove', {b'create'}), # 'create' is pseudo action
6593 6597 (b'unknown', {b'create'}),
6594 6598 (b'cleanup', {b'cleanup'}),
6595 6599 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6596 6600 (b'delete', {b'delete'}),
6597 6601 (b'edit', {b'create'}),
6598 6602 (b'keep', {b'create'}),
6599 6603 (b'list', {b'list'}),
6600 6604 (b'message', {b'create'}),
6601 6605 (b'name', {b'create'}),
6602 6606 (b'patch', {b'patch', b'list'}),
6603 6607 (b'stat', {b'stat', b'list'}),
6604 6608 ]
6605 6609
6606 6610 def checkopt(opt):
6607 6611 if opts.get(opt):
6608 6612 for i, allowable in allowables:
6609 6613 if opts[i] and opt not in allowable:
6610 6614 raise error.Abort(
6611 6615 _(
6612 6616 b"options '--%s' and '--%s' may not be "
6613 6617 b"used together"
6614 6618 )
6615 6619 % (opt, i)
6616 6620 )
6617 6621 return True
6618 6622
6619 6623 if checkopt(b'cleanup'):
6620 6624 if pats:
6621 6625 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6622 6626 return shelvemod.cleanupcmd(ui, repo)
6623 6627 elif checkopt(b'delete'):
6624 6628 return shelvemod.deletecmd(ui, repo, pats)
6625 6629 elif checkopt(b'list'):
6626 6630 return shelvemod.listcmd(ui, repo, pats, opts)
6627 6631 elif checkopt(b'patch') or checkopt(b'stat'):
6628 6632 return shelvemod.patchcmds(ui, repo, pats, opts)
6629 6633 else:
6630 6634 return shelvemod.createcmd(ui, repo, pats, opts)
6631 6635
6632 6636
6633 6637 _NOTTERSE = b'nothing'
6634 6638
6635 6639
6636 6640 @command(
6637 6641 b'status|st',
6638 6642 [
6639 6643 (b'A', b'all', None, _(b'show status of all files')),
6640 6644 (b'm', b'modified', None, _(b'show only modified files')),
6641 6645 (b'a', b'added', None, _(b'show only added files')),
6642 6646 (b'r', b'removed', None, _(b'show only removed files')),
6643 6647 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6644 6648 (b'c', b'clean', None, _(b'show only files without changes')),
6645 6649 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6646 6650 (b'i', b'ignored', None, _(b'show only ignored files')),
6647 6651 (b'n', b'no-status', None, _(b'hide status prefix')),
6648 6652 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6649 6653 (
6650 6654 b'C',
6651 6655 b'copies',
6652 6656 None,
6653 6657 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6654 6658 ),
6655 6659 (
6656 6660 b'0',
6657 6661 b'print0',
6658 6662 None,
6659 6663 _(b'end filenames with NUL, for use with xargs'),
6660 6664 ),
6661 6665 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6662 6666 (
6663 6667 b'',
6664 6668 b'change',
6665 6669 b'',
6666 6670 _(b'list the changed files of a revision'),
6667 6671 _(b'REV'),
6668 6672 ),
6669 6673 ]
6670 6674 + walkopts
6671 6675 + subrepoopts
6672 6676 + formatteropts,
6673 6677 _(b'[OPTION]... [FILE]...'),
6674 6678 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6675 6679 helpbasic=True,
6676 6680 inferrepo=True,
6677 6681 intents={INTENT_READONLY},
6678 6682 )
6679 6683 def status(ui, repo, *pats, **opts):
6680 6684 """show changed files in the working directory
6681 6685
6682 6686 Show status of files in the repository. If names are given, only
6683 6687 files that match are shown. Files that are clean or ignored or
6684 6688 the source of a copy/move operation, are not listed unless
6685 6689 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6686 6690 Unless options described with "show only ..." are given, the
6687 6691 options -mardu are used.
6688 6692
6689 6693 Option -q/--quiet hides untracked (unknown and ignored) files
6690 6694 unless explicitly requested with -u/--unknown or -i/--ignored.
6691 6695
6692 6696 .. note::
6693 6697
6694 6698 :hg:`status` may appear to disagree with diff if permissions have
6695 6699 changed or a merge has occurred. The standard diff format does
6696 6700 not report permission changes and diff only reports changes
6697 6701 relative to one merge parent.
6698 6702
6699 6703 If one revision is given, it is used as the base revision.
6700 6704 If two revisions are given, the differences between them are
6701 6705 shown. The --change option can also be used as a shortcut to list
6702 6706 the changed files of a revision from its first parent.
6703 6707
6704 6708 The codes used to show the status of files are::
6705 6709
6706 6710 M = modified
6707 6711 A = added
6708 6712 R = removed
6709 6713 C = clean
6710 6714 ! = missing (deleted by non-hg command, but still tracked)
6711 6715 ? = not tracked
6712 6716 I = ignored
6713 6717 = origin of the previous file (with --copies)
6714 6718
6715 6719 .. container:: verbose
6716 6720
6717 6721 The -t/--terse option abbreviates the output by showing only the directory
6718 6722 name if all the files in it share the same status. The option takes an
6719 6723 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6720 6724 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6721 6725 for 'ignored' and 'c' for clean.
6722 6726
6723 6727 It abbreviates only those statuses which are passed. Note that clean and
6724 6728 ignored files are not displayed with '--terse ic' unless the -c/--clean
6725 6729 and -i/--ignored options are also used.
6726 6730
6727 6731 The -v/--verbose option shows information when the repository is in an
6728 6732 unfinished merge, shelve, rebase state etc. You can have this behavior
6729 6733 turned on by default by enabling the ``commands.status.verbose`` option.
6730 6734
6731 6735 You can skip displaying some of these states by setting
6732 6736 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6733 6737 'histedit', 'merge', 'rebase', or 'unshelve'.
6734 6738
6735 6739 Template:
6736 6740
6737 6741 The following keywords are supported in addition to the common template
6738 6742 keywords and functions. See also :hg:`help templates`.
6739 6743
6740 6744 :path: String. Repository-absolute path of the file.
6741 6745 :source: String. Repository-absolute path of the file originated from.
6742 6746 Available if ``--copies`` is specified.
6743 6747 :status: String. Character denoting file's status.
6744 6748
6745 6749 Examples:
6746 6750
6747 6751 - show changes in the working directory relative to a
6748 6752 changeset::
6749 6753
6750 6754 hg status --rev 9353
6751 6755
6752 6756 - show changes in the working directory relative to the
6753 6757 current directory (see :hg:`help patterns` for more information)::
6754 6758
6755 6759 hg status re:
6756 6760
6757 6761 - show all changes including copies in an existing changeset::
6758 6762
6759 6763 hg status --copies --change 9353
6760 6764
6761 6765 - get a NUL separated list of added files, suitable for xargs::
6762 6766
6763 6767 hg status -an0
6764 6768
6765 6769 - show more information about the repository status, abbreviating
6766 6770 added, removed, modified, deleted, and untracked paths::
6767 6771
6768 6772 hg status -v -t mardu
6769 6773
6770 6774 Returns 0 on success.
6771 6775
6772 6776 """
6773 6777
6774 6778 opts = pycompat.byteskwargs(opts)
6775 6779 revs = opts.get(b'rev')
6776 6780 change = opts.get(b'change')
6777 6781 terse = opts.get(b'terse')
6778 6782 if terse is _NOTTERSE:
6779 6783 if revs:
6780 6784 terse = b''
6781 6785 else:
6782 6786 terse = ui.config(b'commands', b'status.terse')
6783 6787
6784 6788 if revs and change:
6785 6789 msg = _(b'cannot specify --rev and --change at the same time')
6786 6790 raise error.Abort(msg)
6787 6791 elif revs and terse:
6788 6792 msg = _(b'cannot use --terse with --rev')
6789 6793 raise error.Abort(msg)
6790 6794 elif change:
6791 6795 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6792 6796 ctx2 = scmutil.revsingle(repo, change, None)
6793 6797 ctx1 = ctx2.p1()
6794 6798 else:
6795 6799 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6796 6800 ctx1, ctx2 = scmutil.revpair(repo, revs)
6797 6801
6798 6802 forcerelativevalue = None
6799 6803 if ui.hasconfig(b'commands', b'status.relative'):
6800 6804 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6801 6805 uipathfn = scmutil.getuipathfn(
6802 6806 repo,
6803 6807 legacyrelativevalue=bool(pats),
6804 6808 forcerelativevalue=forcerelativevalue,
6805 6809 )
6806 6810
6807 6811 if opts.get(b'print0'):
6808 6812 end = b'\0'
6809 6813 else:
6810 6814 end = b'\n'
6811 6815 states = b'modified added removed deleted unknown ignored clean'.split()
6812 6816 show = [k for k in states if opts.get(k)]
6813 6817 if opts.get(b'all'):
6814 6818 show += ui.quiet and (states[:4] + [b'clean']) or states
6815 6819
6816 6820 if not show:
6817 6821 if ui.quiet:
6818 6822 show = states[:4]
6819 6823 else:
6820 6824 show = states[:5]
6821 6825
6822 6826 m = scmutil.match(ctx2, pats, opts)
6823 6827 if terse:
6824 6828 # we need to compute clean and unknown to terse
6825 6829 stat = repo.status(
6826 6830 ctx1.node(),
6827 6831 ctx2.node(),
6828 6832 m,
6829 6833 b'ignored' in show or b'i' in terse,
6830 6834 clean=True,
6831 6835 unknown=True,
6832 6836 listsubrepos=opts.get(b'subrepos'),
6833 6837 )
6834 6838
6835 6839 stat = cmdutil.tersedir(stat, terse)
6836 6840 else:
6837 6841 stat = repo.status(
6838 6842 ctx1.node(),
6839 6843 ctx2.node(),
6840 6844 m,
6841 6845 b'ignored' in show,
6842 6846 b'clean' in show,
6843 6847 b'unknown' in show,
6844 6848 opts.get(b'subrepos'),
6845 6849 )
6846 6850
6847 6851 changestates = zip(
6848 6852 states,
6849 6853 pycompat.iterbytestr(b'MAR!?IC'),
6850 6854 [getattr(stat, s.decode('utf8')) for s in states],
6851 6855 )
6852 6856
6853 6857 copy = {}
6854 6858 if (
6855 6859 opts.get(b'all')
6856 6860 or opts.get(b'copies')
6857 6861 or ui.configbool(b'ui', b'statuscopies')
6858 6862 ) and not opts.get(b'no_status'):
6859 6863 copy = copies.pathcopies(ctx1, ctx2, m)
6860 6864
6861 6865 morestatus = None
6862 6866 if (
6863 6867 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6864 6868 ) and not ui.plain():
6865 6869 morestatus = cmdutil.readmorestatus(repo)
6866 6870
6867 6871 ui.pager(b'status')
6868 6872 fm = ui.formatter(b'status', opts)
6869 6873 fmt = b'%s' + end
6870 6874 showchar = not opts.get(b'no_status')
6871 6875
6872 6876 for state, char, files in changestates:
6873 6877 if state in show:
6874 6878 label = b'status.' + state
6875 6879 for f in files:
6876 6880 fm.startitem()
6877 6881 fm.context(ctx=ctx2)
6878 6882 fm.data(itemtype=b'file', path=f)
6879 6883 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6880 6884 fm.plain(fmt % uipathfn(f), label=label)
6881 6885 if f in copy:
6882 6886 fm.data(source=copy[f])
6883 6887 fm.plain(
6884 6888 (b' %s' + end) % uipathfn(copy[f]),
6885 6889 label=b'status.copied',
6886 6890 )
6887 6891 if morestatus:
6888 6892 morestatus.formatfile(f, fm)
6889 6893
6890 6894 if morestatus:
6891 6895 morestatus.formatfooter(fm)
6892 6896 fm.end()
6893 6897
6894 6898
6895 6899 @command(
6896 6900 b'summary|sum',
6897 6901 [(b'', b'remote', None, _(b'check for push and pull'))],
6898 6902 b'[--remote]',
6899 6903 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6900 6904 helpbasic=True,
6901 6905 intents={INTENT_READONLY},
6902 6906 )
6903 6907 def summary(ui, repo, **opts):
6904 6908 """summarize working directory state
6905 6909
6906 6910 This generates a brief summary of the working directory state,
6907 6911 including parents, branch, commit status, phase and available updates.
6908 6912
6909 6913 With the --remote option, this will check the default paths for
6910 6914 incoming and outgoing changes. This can be time-consuming.
6911 6915
6912 6916 Returns 0 on success.
6913 6917 """
6914 6918
6915 6919 opts = pycompat.byteskwargs(opts)
6916 6920 ui.pager(b'summary')
6917 6921 ctx = repo[None]
6918 6922 parents = ctx.parents()
6919 6923 pnode = parents[0].node()
6920 6924 marks = []
6921 6925
6922 6926 try:
6923 6927 ms = mergemod.mergestate.read(repo)
6924 6928 except error.UnsupportedMergeRecords as e:
6925 6929 s = b' '.join(e.recordtypes)
6926 6930 ui.warn(
6927 6931 _(b'warning: merge state has unsupported record types: %s\n') % s
6928 6932 )
6929 6933 unresolved = []
6930 6934 else:
6931 6935 unresolved = list(ms.unresolved())
6932 6936
6933 6937 for p in parents:
6934 6938 # label with log.changeset (instead of log.parent) since this
6935 6939 # shows a working directory parent *changeset*:
6936 6940 # i18n: column positioning for "hg summary"
6937 6941 ui.write(
6938 6942 _(b'parent: %d:%s ') % (p.rev(), p),
6939 6943 label=logcmdutil.changesetlabels(p),
6940 6944 )
6941 6945 ui.write(b' '.join(p.tags()), label=b'log.tag')
6942 6946 if p.bookmarks():
6943 6947 marks.extend(p.bookmarks())
6944 6948 if p.rev() == -1:
6945 6949 if not len(repo):
6946 6950 ui.write(_(b' (empty repository)'))
6947 6951 else:
6948 6952 ui.write(_(b' (no revision checked out)'))
6949 6953 if p.obsolete():
6950 6954 ui.write(_(b' (obsolete)'))
6951 6955 if p.isunstable():
6952 6956 instabilities = (
6953 6957 ui.label(instability, b'trouble.%s' % instability)
6954 6958 for instability in p.instabilities()
6955 6959 )
6956 6960 ui.write(b' (' + b', '.join(instabilities) + b')')
6957 6961 ui.write(b'\n')
6958 6962 if p.description():
6959 6963 ui.status(
6960 6964 b' ' + p.description().splitlines()[0].strip() + b'\n',
6961 6965 label=b'log.summary',
6962 6966 )
6963 6967
6964 6968 branch = ctx.branch()
6965 6969 bheads = repo.branchheads(branch)
6966 6970 # i18n: column positioning for "hg summary"
6967 6971 m = _(b'branch: %s\n') % branch
6968 6972 if branch != b'default':
6969 6973 ui.write(m, label=b'log.branch')
6970 6974 else:
6971 6975 ui.status(m, label=b'log.branch')
6972 6976
6973 6977 if marks:
6974 6978 active = repo._activebookmark
6975 6979 # i18n: column positioning for "hg summary"
6976 6980 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6977 6981 if active is not None:
6978 6982 if active in marks:
6979 6983 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6980 6984 marks.remove(active)
6981 6985 else:
6982 6986 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6983 6987 for m in marks:
6984 6988 ui.write(b' ' + m, label=b'log.bookmark')
6985 6989 ui.write(b'\n', label=b'log.bookmark')
6986 6990
6987 6991 status = repo.status(unknown=True)
6988 6992
6989 6993 c = repo.dirstate.copies()
6990 6994 copied, renamed = [], []
6991 6995 for d, s in pycompat.iteritems(c):
6992 6996 if s in status.removed:
6993 6997 status.removed.remove(s)
6994 6998 renamed.append(d)
6995 6999 else:
6996 7000 copied.append(d)
6997 7001 if d in status.added:
6998 7002 status.added.remove(d)
6999 7003
7000 7004 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7001 7005
7002 7006 labels = [
7003 7007 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7004 7008 (ui.label(_(b'%d added'), b'status.added'), status.added),
7005 7009 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7006 7010 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7007 7011 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7008 7012 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7009 7013 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7010 7014 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7011 7015 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7012 7016 ]
7013 7017 t = []
7014 7018 for l, s in labels:
7015 7019 if s:
7016 7020 t.append(l % len(s))
7017 7021
7018 7022 t = b', '.join(t)
7019 7023 cleanworkdir = False
7020 7024
7021 7025 if repo.vfs.exists(b'graftstate'):
7022 7026 t += _(b' (graft in progress)')
7023 7027 if repo.vfs.exists(b'updatestate'):
7024 7028 t += _(b' (interrupted update)')
7025 7029 elif len(parents) > 1:
7026 7030 t += _(b' (merge)')
7027 7031 elif branch != parents[0].branch():
7028 7032 t += _(b' (new branch)')
7029 7033 elif parents[0].closesbranch() and pnode in repo.branchheads(
7030 7034 branch, closed=True
7031 7035 ):
7032 7036 t += _(b' (head closed)')
7033 7037 elif not (
7034 7038 status.modified
7035 7039 or status.added
7036 7040 or status.removed
7037 7041 or renamed
7038 7042 or copied
7039 7043 or subs
7040 7044 ):
7041 7045 t += _(b' (clean)')
7042 7046 cleanworkdir = True
7043 7047 elif pnode not in bheads:
7044 7048 t += _(b' (new branch head)')
7045 7049
7046 7050 if parents:
7047 7051 pendingphase = max(p.phase() for p in parents)
7048 7052 else:
7049 7053 pendingphase = phases.public
7050 7054
7051 7055 if pendingphase > phases.newcommitphase(ui):
7052 7056 t += b' (%s)' % phases.phasenames[pendingphase]
7053 7057
7054 7058 if cleanworkdir:
7055 7059 # i18n: column positioning for "hg summary"
7056 7060 ui.status(_(b'commit: %s\n') % t.strip())
7057 7061 else:
7058 7062 # i18n: column positioning for "hg summary"
7059 7063 ui.write(_(b'commit: %s\n') % t.strip())
7060 7064
7061 7065 # all ancestors of branch heads - all ancestors of parent = new csets
7062 7066 new = len(
7063 7067 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7064 7068 )
7065 7069
7066 7070 if new == 0:
7067 7071 # i18n: column positioning for "hg summary"
7068 7072 ui.status(_(b'update: (current)\n'))
7069 7073 elif pnode not in bheads:
7070 7074 # i18n: column positioning for "hg summary"
7071 7075 ui.write(_(b'update: %d new changesets (update)\n') % new)
7072 7076 else:
7073 7077 # i18n: column positioning for "hg summary"
7074 7078 ui.write(
7075 7079 _(b'update: %d new changesets, %d branch heads (merge)\n')
7076 7080 % (new, len(bheads))
7077 7081 )
7078 7082
7079 7083 t = []
7080 7084 draft = len(repo.revs(b'draft()'))
7081 7085 if draft:
7082 7086 t.append(_(b'%d draft') % draft)
7083 7087 secret = len(repo.revs(b'secret()'))
7084 7088 if secret:
7085 7089 t.append(_(b'%d secret') % secret)
7086 7090
7087 7091 if draft or secret:
7088 7092 ui.status(_(b'phases: %s\n') % b', '.join(t))
7089 7093
7090 7094 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7091 7095 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7092 7096 numtrouble = len(repo.revs(trouble + b"()"))
7093 7097 # We write all the possibilities to ease translation
7094 7098 troublemsg = {
7095 7099 b"orphan": _(b"orphan: %d changesets"),
7096 7100 b"contentdivergent": _(b"content-divergent: %d changesets"),
7097 7101 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7098 7102 }
7099 7103 if numtrouble > 0:
7100 7104 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7101 7105
7102 7106 cmdutil.summaryhooks(ui, repo)
7103 7107
7104 7108 if opts.get(b'remote'):
7105 7109 needsincoming, needsoutgoing = True, True
7106 7110 else:
7107 7111 needsincoming, needsoutgoing = False, False
7108 7112 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7109 7113 if i:
7110 7114 needsincoming = True
7111 7115 if o:
7112 7116 needsoutgoing = True
7113 7117 if not needsincoming and not needsoutgoing:
7114 7118 return
7115 7119
7116 7120 def getincoming():
7117 7121 source, branches = hg.parseurl(ui.expandpath(b'default'))
7118 7122 sbranch = branches[0]
7119 7123 try:
7120 7124 other = hg.peer(repo, {}, source)
7121 7125 except error.RepoError:
7122 7126 if opts.get(b'remote'):
7123 7127 raise
7124 7128 return source, sbranch, None, None, None
7125 7129 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7126 7130 if revs:
7127 7131 revs = [other.lookup(rev) for rev in revs]
7128 7132 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7129 7133 repo.ui.pushbuffer()
7130 7134 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7131 7135 repo.ui.popbuffer()
7132 7136 return source, sbranch, other, commoninc, commoninc[1]
7133 7137
7134 7138 if needsincoming:
7135 7139 source, sbranch, sother, commoninc, incoming = getincoming()
7136 7140 else:
7137 7141 source = sbranch = sother = commoninc = incoming = None
7138 7142
7139 7143 def getoutgoing():
7140 7144 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7141 7145 dbranch = branches[0]
7142 7146 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7143 7147 if source != dest:
7144 7148 try:
7145 7149 dother = hg.peer(repo, {}, dest)
7146 7150 except error.RepoError:
7147 7151 if opts.get(b'remote'):
7148 7152 raise
7149 7153 return dest, dbranch, None, None
7150 7154 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7151 7155 elif sother is None:
7152 7156 # there is no explicit destination peer, but source one is invalid
7153 7157 return dest, dbranch, None, None
7154 7158 else:
7155 7159 dother = sother
7156 7160 if source != dest or (sbranch is not None and sbranch != dbranch):
7157 7161 common = None
7158 7162 else:
7159 7163 common = commoninc
7160 7164 if revs:
7161 7165 revs = [repo.lookup(rev) for rev in revs]
7162 7166 repo.ui.pushbuffer()
7163 7167 outgoing = discovery.findcommonoutgoing(
7164 7168 repo, dother, onlyheads=revs, commoninc=common
7165 7169 )
7166 7170 repo.ui.popbuffer()
7167 7171 return dest, dbranch, dother, outgoing
7168 7172
7169 7173 if needsoutgoing:
7170 7174 dest, dbranch, dother, outgoing = getoutgoing()
7171 7175 else:
7172 7176 dest = dbranch = dother = outgoing = None
7173 7177
7174 7178 if opts.get(b'remote'):
7175 7179 t = []
7176 7180 if incoming:
7177 7181 t.append(_(b'1 or more incoming'))
7178 7182 o = outgoing.missing
7179 7183 if o:
7180 7184 t.append(_(b'%d outgoing') % len(o))
7181 7185 other = dother or sother
7182 7186 if b'bookmarks' in other.listkeys(b'namespaces'):
7183 7187 counts = bookmarks.summary(repo, other)
7184 7188 if counts[0] > 0:
7185 7189 t.append(_(b'%d incoming bookmarks') % counts[0])
7186 7190 if counts[1] > 0:
7187 7191 t.append(_(b'%d outgoing bookmarks') % counts[1])
7188 7192
7189 7193 if t:
7190 7194 # i18n: column positioning for "hg summary"
7191 7195 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7192 7196 else:
7193 7197 # i18n: column positioning for "hg summary"
7194 7198 ui.status(_(b'remote: (synced)\n'))
7195 7199
7196 7200 cmdutil.summaryremotehooks(
7197 7201 ui,
7198 7202 repo,
7199 7203 opts,
7200 7204 (
7201 7205 (source, sbranch, sother, commoninc),
7202 7206 (dest, dbranch, dother, outgoing),
7203 7207 ),
7204 7208 )
7205 7209
7206 7210
7207 7211 @command(
7208 7212 b'tag',
7209 7213 [
7210 7214 (b'f', b'force', None, _(b'force tag')),
7211 7215 (b'l', b'local', None, _(b'make the tag local')),
7212 7216 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7213 7217 (b'', b'remove', None, _(b'remove a tag')),
7214 7218 # -l/--local is already there, commitopts cannot be used
7215 7219 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7216 7220 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7217 7221 ]
7218 7222 + commitopts2,
7219 7223 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7220 7224 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7221 7225 )
7222 7226 def tag(ui, repo, name1, *names, **opts):
7223 7227 """add one or more tags for the current or given revision
7224 7228
7225 7229 Name a particular revision using <name>.
7226 7230
7227 7231 Tags are used to name particular revisions of the repository and are
7228 7232 very useful to compare different revisions, to go back to significant
7229 7233 earlier versions or to mark branch points as releases, etc. Changing
7230 7234 an existing tag is normally disallowed; use -f/--force to override.
7231 7235
7232 7236 If no revision is given, the parent of the working directory is
7233 7237 used.
7234 7238
7235 7239 To facilitate version control, distribution, and merging of tags,
7236 7240 they are stored as a file named ".hgtags" which is managed similarly
7237 7241 to other project files and can be hand-edited if necessary. This
7238 7242 also means that tagging creates a new commit. The file
7239 7243 ".hg/localtags" is used for local tags (not shared among
7240 7244 repositories).
7241 7245
7242 7246 Tag commits are usually made at the head of a branch. If the parent
7243 7247 of the working directory is not a branch head, :hg:`tag` aborts; use
7244 7248 -f/--force to force the tag commit to be based on a non-head
7245 7249 changeset.
7246 7250
7247 7251 See :hg:`help dates` for a list of formats valid for -d/--date.
7248 7252
7249 7253 Since tag names have priority over branch names during revision
7250 7254 lookup, using an existing branch name as a tag name is discouraged.
7251 7255
7252 7256 Returns 0 on success.
7253 7257 """
7254 7258 opts = pycompat.byteskwargs(opts)
7255 7259 with repo.wlock(), repo.lock():
7256 7260 rev_ = b"."
7257 7261 names = [t.strip() for t in (name1,) + names]
7258 7262 if len(names) != len(set(names)):
7259 7263 raise error.Abort(_(b'tag names must be unique'))
7260 7264 for n in names:
7261 7265 scmutil.checknewlabel(repo, n, b'tag')
7262 7266 if not n:
7263 7267 raise error.Abort(
7264 7268 _(b'tag names cannot consist entirely of whitespace')
7265 7269 )
7266 7270 if opts.get(b'rev') and opts.get(b'remove'):
7267 7271 raise error.Abort(_(b"--rev and --remove are incompatible"))
7268 7272 if opts.get(b'rev'):
7269 7273 rev_ = opts[b'rev']
7270 7274 message = opts.get(b'message')
7271 7275 if opts.get(b'remove'):
7272 7276 if opts.get(b'local'):
7273 7277 expectedtype = b'local'
7274 7278 else:
7275 7279 expectedtype = b'global'
7276 7280
7277 7281 for n in names:
7278 7282 if repo.tagtype(n) == b'global':
7279 7283 alltags = tagsmod.findglobaltags(ui, repo)
7280 7284 if alltags[n][0] == nullid:
7281 7285 raise error.Abort(_(b"tag '%s' is already removed") % n)
7282 7286 if not repo.tagtype(n):
7283 7287 raise error.Abort(_(b"tag '%s' does not exist") % n)
7284 7288 if repo.tagtype(n) != expectedtype:
7285 7289 if expectedtype == b'global':
7286 7290 raise error.Abort(
7287 7291 _(b"tag '%s' is not a global tag") % n
7288 7292 )
7289 7293 else:
7290 7294 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7291 7295 rev_ = b'null'
7292 7296 if not message:
7293 7297 # we don't translate commit messages
7294 7298 message = b'Removed tag %s' % b', '.join(names)
7295 7299 elif not opts.get(b'force'):
7296 7300 for n in names:
7297 7301 if n in repo.tags():
7298 7302 raise error.Abort(
7299 7303 _(b"tag '%s' already exists (use -f to force)") % n
7300 7304 )
7301 7305 if not opts.get(b'local'):
7302 7306 p1, p2 = repo.dirstate.parents()
7303 7307 if p2 != nullid:
7304 7308 raise error.Abort(_(b'uncommitted merge'))
7305 7309 bheads = repo.branchheads()
7306 7310 if not opts.get(b'force') and bheads and p1 not in bheads:
7307 7311 raise error.Abort(
7308 7312 _(
7309 7313 b'working directory is not at a branch head '
7310 7314 b'(use -f to force)'
7311 7315 )
7312 7316 )
7313 7317 node = scmutil.revsingle(repo, rev_).node()
7314 7318
7315 7319 if not message:
7316 7320 # we don't translate commit messages
7317 7321 message = b'Added tag %s for changeset %s' % (
7318 7322 b', '.join(names),
7319 7323 short(node),
7320 7324 )
7321 7325
7322 7326 date = opts.get(b'date')
7323 7327 if date:
7324 7328 date = dateutil.parsedate(date)
7325 7329
7326 7330 if opts.get(b'remove'):
7327 7331 editform = b'tag.remove'
7328 7332 else:
7329 7333 editform = b'tag.add'
7330 7334 editor = cmdutil.getcommiteditor(
7331 7335 editform=editform, **pycompat.strkwargs(opts)
7332 7336 )
7333 7337
7334 7338 # don't allow tagging the null rev
7335 7339 if (
7336 7340 not opts.get(b'remove')
7337 7341 and scmutil.revsingle(repo, rev_).rev() == nullrev
7338 7342 ):
7339 7343 raise error.Abort(_(b"cannot tag null revision"))
7340 7344
7341 7345 tagsmod.tag(
7342 7346 repo,
7343 7347 names,
7344 7348 node,
7345 7349 message,
7346 7350 opts.get(b'local'),
7347 7351 opts.get(b'user'),
7348 7352 date,
7349 7353 editor=editor,
7350 7354 )
7351 7355
7352 7356
7353 7357 @command(
7354 7358 b'tags',
7355 7359 formatteropts,
7356 7360 b'',
7357 7361 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7358 7362 intents={INTENT_READONLY},
7359 7363 )
7360 7364 def tags(ui, repo, **opts):
7361 7365 """list repository tags
7362 7366
7363 7367 This lists both regular and local tags. When the -v/--verbose
7364 7368 switch is used, a third column "local" is printed for local tags.
7365 7369 When the -q/--quiet switch is used, only the tag name is printed.
7366 7370
7367 7371 .. container:: verbose
7368 7372
7369 7373 Template:
7370 7374
7371 7375 The following keywords are supported in addition to the common template
7372 7376 keywords and functions such as ``{tag}``. See also
7373 7377 :hg:`help templates`.
7374 7378
7375 7379 :type: String. ``local`` for local tags.
7376 7380
7377 7381 Returns 0 on success.
7378 7382 """
7379 7383
7380 7384 opts = pycompat.byteskwargs(opts)
7381 7385 ui.pager(b'tags')
7382 7386 fm = ui.formatter(b'tags', opts)
7383 7387 hexfunc = fm.hexfunc
7384 7388
7385 7389 for t, n in reversed(repo.tagslist()):
7386 7390 hn = hexfunc(n)
7387 7391 label = b'tags.normal'
7388 7392 tagtype = b''
7389 7393 if repo.tagtype(t) == b'local':
7390 7394 label = b'tags.local'
7391 7395 tagtype = b'local'
7392 7396
7393 7397 fm.startitem()
7394 7398 fm.context(repo=repo)
7395 7399 fm.write(b'tag', b'%s', t, label=label)
7396 7400 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7397 7401 fm.condwrite(
7398 7402 not ui.quiet,
7399 7403 b'rev node',
7400 7404 fmt,
7401 7405 repo.changelog.rev(n),
7402 7406 hn,
7403 7407 label=label,
7404 7408 )
7405 7409 fm.condwrite(
7406 7410 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7407 7411 )
7408 7412 fm.plain(b'\n')
7409 7413 fm.end()
7410 7414
7411 7415
7412 7416 @command(
7413 7417 b'tip',
7414 7418 [
7415 7419 (b'p', b'patch', None, _(b'show patch')),
7416 7420 (b'g', b'git', None, _(b'use git extended diff format')),
7417 7421 ]
7418 7422 + templateopts,
7419 7423 _(b'[-p] [-g]'),
7420 7424 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7421 7425 )
7422 7426 def tip(ui, repo, **opts):
7423 7427 """show the tip revision (DEPRECATED)
7424 7428
7425 7429 The tip revision (usually just called the tip) is the changeset
7426 7430 most recently added to the repository (and therefore the most
7427 7431 recently changed head).
7428 7432
7429 7433 If you have just made a commit, that commit will be the tip. If
7430 7434 you have just pulled changes from another repository, the tip of
7431 7435 that repository becomes the current tip. The "tip" tag is special
7432 7436 and cannot be renamed or assigned to a different changeset.
7433 7437
7434 7438 This command is deprecated, please use :hg:`heads` instead.
7435 7439
7436 7440 Returns 0 on success.
7437 7441 """
7438 7442 opts = pycompat.byteskwargs(opts)
7439 7443 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7440 7444 displayer.show(repo[b'tip'])
7441 7445 displayer.close()
7442 7446
7443 7447
7444 7448 @command(
7445 7449 b'unbundle',
7446 7450 [
7447 7451 (
7448 7452 b'u',
7449 7453 b'update',
7450 7454 None,
7451 7455 _(b'update to new branch head if changesets were unbundled'),
7452 7456 )
7453 7457 ],
7454 7458 _(b'[-u] FILE...'),
7455 7459 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7456 7460 )
7457 7461 def unbundle(ui, repo, fname1, *fnames, **opts):
7458 7462 """apply one or more bundle files
7459 7463
7460 7464 Apply one or more bundle files generated by :hg:`bundle`.
7461 7465
7462 7466 Returns 0 on success, 1 if an update has unresolved files.
7463 7467 """
7464 7468 fnames = (fname1,) + fnames
7465 7469
7466 7470 with repo.lock():
7467 7471 for fname in fnames:
7468 7472 f = hg.openpath(ui, fname)
7469 7473 gen = exchange.readbundle(ui, f, fname)
7470 7474 if isinstance(gen, streamclone.streamcloneapplier):
7471 7475 raise error.Abort(
7472 7476 _(
7473 7477 b'packed bundles cannot be applied with '
7474 7478 b'"hg unbundle"'
7475 7479 ),
7476 7480 hint=_(b'use "hg debugapplystreamclonebundle"'),
7477 7481 )
7478 7482 url = b'bundle:' + fname
7479 7483 try:
7480 7484 txnname = b'unbundle'
7481 7485 if not isinstance(gen, bundle2.unbundle20):
7482 7486 txnname = b'unbundle\n%s' % util.hidepassword(url)
7483 7487 with repo.transaction(txnname) as tr:
7484 7488 op = bundle2.applybundle(
7485 7489 repo, gen, tr, source=b'unbundle', url=url
7486 7490 )
7487 7491 except error.BundleUnknownFeatureError as exc:
7488 7492 raise error.Abort(
7489 7493 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7490 7494 hint=_(
7491 7495 b"see https://mercurial-scm.org/"
7492 7496 b"wiki/BundleFeature for more "
7493 7497 b"information"
7494 7498 ),
7495 7499 )
7496 7500 modheads = bundle2.combinechangegroupresults(op)
7497 7501
7498 7502 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7499 7503
7500 7504
7501 7505 @command(
7502 7506 b'unshelve',
7503 7507 [
7504 7508 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7505 7509 (
7506 7510 b'c',
7507 7511 b'continue',
7508 7512 None,
7509 7513 _(b'continue an incomplete unshelve operation'),
7510 7514 ),
7511 7515 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7512 7516 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7513 7517 (
7514 7518 b'n',
7515 7519 b'name',
7516 7520 b'',
7517 7521 _(b'restore shelved change with given name'),
7518 7522 _(b'NAME'),
7519 7523 ),
7520 7524 (b't', b'tool', b'', _(b'specify merge tool')),
7521 7525 (
7522 7526 b'',
7523 7527 b'date',
7524 7528 b'',
7525 7529 _(b'set date for temporary commits (DEPRECATED)'),
7526 7530 _(b'DATE'),
7527 7531 ),
7528 7532 ],
7529 7533 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7530 7534 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7531 7535 )
7532 7536 def unshelve(ui, repo, *shelved, **opts):
7533 7537 """restore a shelved change to the working directory
7534 7538
7535 7539 This command accepts an optional name of a shelved change to
7536 7540 restore. If none is given, the most recent shelved change is used.
7537 7541
7538 7542 If a shelved change is applied successfully, the bundle that
7539 7543 contains the shelved changes is moved to a backup location
7540 7544 (.hg/shelve-backup).
7541 7545
7542 7546 Since you can restore a shelved change on top of an arbitrary
7543 7547 commit, it is possible that unshelving will result in a conflict
7544 7548 between your changes and the commits you are unshelving onto. If
7545 7549 this occurs, you must resolve the conflict, then use
7546 7550 ``--continue`` to complete the unshelve operation. (The bundle
7547 7551 will not be moved until you successfully complete the unshelve.)
7548 7552
7549 7553 (Alternatively, you can use ``--abort`` to abandon an unshelve
7550 7554 that causes a conflict. This reverts the unshelved changes, and
7551 7555 leaves the bundle in place.)
7552 7556
7553 7557 If bare shelved change (without interactive, include and exclude
7554 7558 option) was done on newly created branch it would restore branch
7555 7559 information to the working directory.
7556 7560
7557 7561 After a successful unshelve, the shelved changes are stored in a
7558 7562 backup directory. Only the N most recent backups are kept. N
7559 7563 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7560 7564 configuration option.
7561 7565
7562 7566 .. container:: verbose
7563 7567
7564 7568 Timestamp in seconds is used to decide order of backups. More
7565 7569 than ``maxbackups`` backups are kept, if same timestamp
7566 7570 prevents from deciding exact order of them, for safety.
7567 7571
7568 7572 Selected changes can be unshelved with ``--interactive`` flag.
7569 7573 The working directory is updated with the selected changes, and
7570 7574 only the unselected changes remain shelved.
7571 7575 Note: The whole shelve is applied to working directory first before
7572 7576 running interactively. So, this will bring up all the conflicts between
7573 7577 working directory and the shelve, irrespective of which changes will be
7574 7578 unshelved.
7575 7579 """
7576 7580 with repo.wlock():
7577 7581 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7578 7582
7579 7583
7580 7584 statemod.addunfinished(
7581 7585 b'unshelve',
7582 7586 fname=b'shelvedstate',
7583 7587 continueflag=True,
7584 7588 abortfunc=shelvemod.hgabortunshelve,
7585 7589 continuefunc=shelvemod.hgcontinueunshelve,
7586 7590 cmdmsg=_(b'unshelve already in progress'),
7587 7591 )
7588 7592
7589 7593
7590 7594 @command(
7591 7595 b'update|up|checkout|co',
7592 7596 [
7593 7597 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7594 7598 (b'c', b'check', None, _(b'require clean working directory')),
7595 7599 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7596 7600 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7597 7601 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7598 7602 ]
7599 7603 + mergetoolopts,
7600 7604 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7601 7605 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7602 7606 helpbasic=True,
7603 7607 )
7604 7608 def update(ui, repo, node=None, **opts):
7605 7609 """update working directory (or switch revisions)
7606 7610
7607 7611 Update the repository's working directory to the specified
7608 7612 changeset. If no changeset is specified, update to the tip of the
7609 7613 current named branch and move the active bookmark (see :hg:`help
7610 7614 bookmarks`).
7611 7615
7612 7616 Update sets the working directory's parent revision to the specified
7613 7617 changeset (see :hg:`help parents`).
7614 7618
7615 7619 If the changeset is not a descendant or ancestor of the working
7616 7620 directory's parent and there are uncommitted changes, the update is
7617 7621 aborted. With the -c/--check option, the working directory is checked
7618 7622 for uncommitted changes; if none are found, the working directory is
7619 7623 updated to the specified changeset.
7620 7624
7621 7625 .. container:: verbose
7622 7626
7623 7627 The -C/--clean, -c/--check, and -m/--merge options control what
7624 7628 happens if the working directory contains uncommitted changes.
7625 7629 At most of one of them can be specified.
7626 7630
7627 7631 1. If no option is specified, and if
7628 7632 the requested changeset is an ancestor or descendant of
7629 7633 the working directory's parent, the uncommitted changes
7630 7634 are merged into the requested changeset and the merged
7631 7635 result is left uncommitted. If the requested changeset is
7632 7636 not an ancestor or descendant (that is, it is on another
7633 7637 branch), the update is aborted and the uncommitted changes
7634 7638 are preserved.
7635 7639
7636 7640 2. With the -m/--merge option, the update is allowed even if the
7637 7641 requested changeset is not an ancestor or descendant of
7638 7642 the working directory's parent.
7639 7643
7640 7644 3. With the -c/--check option, the update is aborted and the
7641 7645 uncommitted changes are preserved.
7642 7646
7643 7647 4. With the -C/--clean option, uncommitted changes are discarded and
7644 7648 the working directory is updated to the requested changeset.
7645 7649
7646 7650 To cancel an uncommitted merge (and lose your changes), use
7647 7651 :hg:`merge --abort`.
7648 7652
7649 7653 Use null as the changeset to remove the working directory (like
7650 7654 :hg:`clone -U`).
7651 7655
7652 7656 If you want to revert just one file to an older revision, use
7653 7657 :hg:`revert [-r REV] NAME`.
7654 7658
7655 7659 See :hg:`help dates` for a list of formats valid for -d/--date.
7656 7660
7657 7661 Returns 0 on success, 1 if there are unresolved files.
7658 7662 """
7659 7663 rev = opts.get('rev')
7660 7664 date = opts.get('date')
7661 7665 clean = opts.get('clean')
7662 7666 check = opts.get('check')
7663 7667 merge = opts.get('merge')
7664 7668 if rev and node:
7665 7669 raise error.Abort(_(b"please specify just one revision"))
7666 7670
7667 7671 if ui.configbool(b'commands', b'update.requiredest'):
7668 7672 if not node and not rev and not date:
7669 7673 raise error.Abort(
7670 7674 _(b'you must specify a destination'),
7671 7675 hint=_(b'for example: hg update ".::"'),
7672 7676 )
7673 7677
7674 7678 if rev is None or rev == b'':
7675 7679 rev = node
7676 7680
7677 7681 if date and rev is not None:
7678 7682 raise error.Abort(_(b"you can't specify a revision and a date"))
7679 7683
7680 7684 if len([x for x in (clean, check, merge) if x]) > 1:
7681 7685 raise error.Abort(
7682 7686 _(
7683 7687 b"can only specify one of -C/--clean, -c/--check, "
7684 7688 b"or -m/--merge"
7685 7689 )
7686 7690 )
7687 7691
7688 7692 updatecheck = None
7689 7693 if check:
7690 7694 updatecheck = b'abort'
7691 7695 elif merge:
7692 7696 updatecheck = b'none'
7693 7697
7694 7698 with repo.wlock():
7695 7699 cmdutil.clearunfinished(repo)
7696 7700 if date:
7697 7701 rev = cmdutil.finddate(ui, repo, date)
7698 7702
7699 7703 # if we defined a bookmark, we have to remember the original name
7700 7704 brev = rev
7701 7705 if rev:
7702 7706 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7703 7707 ctx = scmutil.revsingle(repo, rev, default=None)
7704 7708 rev = ctx.rev()
7705 7709 hidden = ctx.hidden()
7706 7710 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7707 7711 with ui.configoverride(overrides, b'update'):
7708 7712 ret = hg.updatetotally(
7709 7713 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7710 7714 )
7711 7715 if hidden:
7712 7716 ctxstr = ctx.hex()[:12]
7713 7717 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7714 7718
7715 7719 if ctx.obsolete():
7716 7720 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7717 7721 ui.warn(b"(%s)\n" % obsfatemsg)
7718 7722 return ret
7719 7723
7720 7724
7721 7725 @command(
7722 7726 b'verify',
7723 7727 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7724 7728 helpcategory=command.CATEGORY_MAINTENANCE,
7725 7729 )
7726 7730 def verify(ui, repo, **opts):
7727 7731 """verify the integrity of the repository
7728 7732
7729 7733 Verify the integrity of the current repository.
7730 7734
7731 7735 This will perform an extensive check of the repository's
7732 7736 integrity, validating the hashes and checksums of each entry in
7733 7737 the changelog, manifest, and tracked files, as well as the
7734 7738 integrity of their crosslinks and indices.
7735 7739
7736 7740 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7737 7741 for more information about recovery from corruption of the
7738 7742 repository.
7739 7743
7740 7744 Returns 0 on success, 1 if errors are encountered.
7741 7745 """
7742 7746 opts = pycompat.byteskwargs(opts)
7743 7747
7744 7748 level = None
7745 7749 if opts[b'full']:
7746 7750 level = verifymod.VERIFY_FULL
7747 7751 return hg.verify(repo, level)
7748 7752
7749 7753
7750 7754 @command(
7751 7755 b'version',
7752 7756 [] + formatteropts,
7753 7757 helpcategory=command.CATEGORY_HELP,
7754 7758 norepo=True,
7755 7759 intents={INTENT_READONLY},
7756 7760 )
7757 7761 def version_(ui, **opts):
7758 7762 """output version and copyright information
7759 7763
7760 7764 .. container:: verbose
7761 7765
7762 7766 Template:
7763 7767
7764 7768 The following keywords are supported. See also :hg:`help templates`.
7765 7769
7766 7770 :extensions: List of extensions.
7767 7771 :ver: String. Version number.
7768 7772
7769 7773 And each entry of ``{extensions}`` provides the following sub-keywords
7770 7774 in addition to ``{ver}``.
7771 7775
7772 7776 :bundled: Boolean. True if included in the release.
7773 7777 :name: String. Extension name.
7774 7778 """
7775 7779 opts = pycompat.byteskwargs(opts)
7776 7780 if ui.verbose:
7777 7781 ui.pager(b'version')
7778 7782 fm = ui.formatter(b"version", opts)
7779 7783 fm.startitem()
7780 7784 fm.write(
7781 7785 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7782 7786 )
7783 7787 license = _(
7784 7788 b"(see https://mercurial-scm.org for more information)\n"
7785 7789 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7786 7790 b"This is free software; see the source for copying conditions. "
7787 7791 b"There is NO\nwarranty; "
7788 7792 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7789 7793 )
7790 7794 if not ui.quiet:
7791 7795 fm.plain(license)
7792 7796
7793 7797 if ui.verbose:
7794 7798 fm.plain(_(b"\nEnabled extensions:\n\n"))
7795 7799 # format names and versions into columns
7796 7800 names = []
7797 7801 vers = []
7798 7802 isinternals = []
7799 7803 for name, module in extensions.extensions():
7800 7804 names.append(name)
7801 7805 vers.append(extensions.moduleversion(module) or None)
7802 7806 isinternals.append(extensions.ismoduleinternal(module))
7803 7807 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7804 7808 if names:
7805 7809 namefmt = b" %%-%ds " % max(len(n) for n in names)
7806 7810 places = [_(b"external"), _(b"internal")]
7807 7811 for n, v, p in zip(names, vers, isinternals):
7808 7812 fn.startitem()
7809 7813 fn.condwrite(ui.verbose, b"name", namefmt, n)
7810 7814 if ui.verbose:
7811 7815 fn.plain(b"%s " % places[p])
7812 7816 fn.data(bundled=p)
7813 7817 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7814 7818 if ui.verbose:
7815 7819 fn.plain(b"\n")
7816 7820 fn.end()
7817 7821 fm.end()
7818 7822
7819 7823
7820 7824 def loadcmdtable(ui, name, cmdtable):
7821 7825 """Load command functions from specified cmdtable
7822 7826 """
7823 7827 overrides = [cmd for cmd in cmdtable if cmd in table]
7824 7828 if overrides:
7825 7829 ui.warn(
7826 7830 _(b"extension '%s' overrides commands: %s\n")
7827 7831 % (name, b" ".join(overrides))
7828 7832 )
7829 7833 table.update(cmdtable)
@@ -1,39 +1,41 b''
1 1 == New Features ==
2 2
3 3 * `hg purge`/`hg clean` can now delete ignored files instead of
4 4 untracked files, with the new -i flag.
5 5
6 6 * `hg log` now defaults to using an '%' symbol for commits involved
7 7 in unresolved merge conflicts. That includes unresolved conflicts
8 8 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
9 9 precedence, so what used to be marked '@' still is.
10 10
11 11 * New `conflictlocal()` and `conflictother()` revsets return the
12 12 commits that are being merged, when there are conflicts. Also works
13 13 for conflicts caused by e.g. `hg graft`.
14 14
15 * `hg copy --forget` can be used to unmark a file as copied.
16
15 17
16 18 == New Experimental Features ==
17 19
18 20
19 21 == Bug Fixes ==
20 22
21 23
22 24 == Backwards Compatibility Changes ==
23 25
24 26 * When `hg rebase` pauses for merge conflict resolution, the working
25 27 copy will no longer have the rebased node as a second parent. You
26 28 can use the new `conflictparents()` revset for finding the other
27 29 parent during a conflict.
28 30
29 31
30 32 == Internal API Changes ==
31 33
32 34 * The deprecated `ui.progress()` has now been deleted. Please use
33 35 `ui.makeprogress()` instead.
34 36
35 37 * `hg.merge()` has lost its `abort` argument. Please call
36 38 `hg.abortmerge()` directly instead.
37 39
38 40 * The `*others` argument of `cmdutil.check_incompatible_arguments()`
39 41 changed from being varargs argument to being a single collection.
@@ -1,429 +1,429 b''
1 1 Show all commands except debug commands
2 2 $ hg debugcomplete
3 3 abort
4 4 add
5 5 addremove
6 6 annotate
7 7 archive
8 8 backout
9 9 bisect
10 10 bookmarks
11 11 branch
12 12 branches
13 13 bundle
14 14 cat
15 15 clone
16 16 commit
17 17 config
18 18 continue
19 19 copy
20 20 diff
21 21 export
22 22 files
23 23 forget
24 24 graft
25 25 grep
26 26 heads
27 27 help
28 28 identify
29 29 import
30 30 incoming
31 31 init
32 32 locate
33 33 log
34 34 manifest
35 35 merge
36 36 outgoing
37 37 parents
38 38 paths
39 39 phase
40 40 pull
41 41 push
42 42 recover
43 43 remove
44 44 rename
45 45 resolve
46 46 revert
47 47 rollback
48 48 root
49 49 serve
50 50 shelve
51 51 status
52 52 summary
53 53 tag
54 54 tags
55 55 tip
56 56 unbundle
57 57 unshelve
58 58 update
59 59 verify
60 60 version
61 61
62 62 Show all commands that start with "a"
63 63 $ hg debugcomplete a
64 64 abort
65 65 add
66 66 addremove
67 67 annotate
68 68 archive
69 69
70 70 Do not show debug commands if there are other candidates
71 71 $ hg debugcomplete d
72 72 diff
73 73
74 74 Show debug commands if there are no other candidates
75 75 $ hg debugcomplete debug
76 76 debugancestor
77 77 debugapplystreamclonebundle
78 78 debugbuilddag
79 79 debugbundle
80 80 debugcapabilities
81 81 debugcheckstate
82 82 debugcolor
83 83 debugcommands
84 84 debugcomplete
85 85 debugconfig
86 86 debugcreatestreamclonebundle
87 87 debugdag
88 88 debugdata
89 89 debugdate
90 90 debugdeltachain
91 91 debugdirstate
92 92 debugdiscovery
93 93 debugdownload
94 94 debugextensions
95 95 debugfileset
96 96 debugformat
97 97 debugfsinfo
98 98 debuggetbundle
99 99 debugignore
100 100 debugindex
101 101 debugindexdot
102 102 debugindexstats
103 103 debuginstall
104 104 debugknown
105 105 debuglabelcomplete
106 106 debuglocks
107 107 debugmanifestfulltextcache
108 108 debugmergestate
109 109 debugnamecomplete
110 110 debugnodemap
111 111 debugobsolete
112 112 debugp1copies
113 113 debugp2copies
114 114 debugpathcomplete
115 115 debugpathcopies
116 116 debugpeer
117 117 debugpickmergetool
118 118 debugpushkey
119 119 debugpvec
120 120 debugrebuilddirstate
121 121 debugrebuildfncache
122 122 debugrename
123 123 debugrevlog
124 124 debugrevlogindex
125 125 debugrevspec
126 126 debugserve
127 127 debugsetparents
128 128 debugsidedata
129 129 debugssl
130 130 debugsub
131 131 debugsuccessorssets
132 132 debugtagscache
133 133 debugtemplate
134 134 debuguigetpass
135 135 debuguiprompt
136 136 debugupdatecaches
137 137 debugupgraderepo
138 138 debugwalk
139 139 debugwhyunstable
140 140 debugwireargs
141 141 debugwireproto
142 142
143 143 Do not show the alias of a debug command if there are other candidates
144 144 (this should hide rawcommit)
145 145 $ hg debugcomplete r
146 146 recover
147 147 remove
148 148 rename
149 149 resolve
150 150 revert
151 151 rollback
152 152 root
153 153 Show the alias of a debug command if there are no other candidates
154 154 $ hg debugcomplete rawc
155 155
156 156
157 157 Show the global options
158 158 $ hg debugcomplete --options | sort
159 159 --color
160 160 --config
161 161 --cwd
162 162 --debug
163 163 --debugger
164 164 --encoding
165 165 --encodingmode
166 166 --help
167 167 --hidden
168 168 --noninteractive
169 169 --pager
170 170 --profile
171 171 --quiet
172 172 --repository
173 173 --time
174 174 --traceback
175 175 --verbose
176 176 --version
177 177 -R
178 178 -h
179 179 -q
180 180 -v
181 181 -y
182 182
183 183 Show the options for the "serve" command
184 184 $ hg debugcomplete --options serve | sort
185 185 --accesslog
186 186 --address
187 187 --certificate
188 188 --cmdserver
189 189 --color
190 190 --config
191 191 --cwd
192 192 --daemon
193 193 --daemon-postexec
194 194 --debug
195 195 --debugger
196 196 --encoding
197 197 --encodingmode
198 198 --errorlog
199 199 --help
200 200 --hidden
201 201 --ipv6
202 202 --name
203 203 --noninteractive
204 204 --pager
205 205 --pid-file
206 206 --port
207 207 --prefix
208 208 --print-url
209 209 --profile
210 210 --quiet
211 211 --repository
212 212 --stdio
213 213 --style
214 214 --subrepos
215 215 --templates
216 216 --time
217 217 --traceback
218 218 --verbose
219 219 --version
220 220 --web-conf
221 221 -6
222 222 -A
223 223 -E
224 224 -R
225 225 -S
226 226 -a
227 227 -d
228 228 -h
229 229 -n
230 230 -p
231 231 -q
232 232 -t
233 233 -v
234 234 -y
235 235
236 236 Show an error if we use --options with an ambiguous abbreviation
237 237 $ hg debugcomplete --options s
238 238 hg: command 's' is ambiguous:
239 239 serve shelve showconfig status summary
240 240 [255]
241 241
242 242 Show all commands + options
243 243 $ hg debugcommands
244 244 abort: dry-run
245 245 add: include, exclude, subrepos, dry-run
246 246 addremove: similarity, subrepos, include, exclude, dry-run
247 247 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template
248 248 archive: no-decode, prefix, rev, type, subrepos, include, exclude
249 249 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
250 250 bisect: reset, good, bad, skip, extend, command, noupdate
251 251 bookmarks: force, rev, delete, rename, inactive, list, template
252 252 branch: force, clean, rev
253 253 branches: active, closed, rev, template
254 254 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
255 255 cat: output, rev, decode, include, exclude, template
256 256 clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
257 257 commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos
258 258 config: untrusted, edit, local, global, template
259 259 continue: dry-run
260 copy: after, force, include, exclude, dry-run
260 copy: forget, after, force, include, exclude, dry-run
261 261 debugancestor:
262 262 debugapplystreamclonebundle:
263 263 debugbuilddag: mergeable-file, overwritten-file, new-file
264 264 debugbundle: all, part-type, spec
265 265 debugcapabilities:
266 266 debugcheckstate:
267 267 debugcolor: style
268 268 debugcommands:
269 269 debugcomplete: options
270 270 debugcreatestreamclonebundle:
271 271 debugdag: tags, branches, dots, spaces
272 272 debugdata: changelog, manifest, dir
273 273 debugdate: extended
274 274 debugdeltachain: changelog, manifest, dir, template
275 275 debugdirstate: nodates, dates, datesort
276 276 debugdiscovery: old, nonheads, rev, seed, ssh, remotecmd, insecure
277 277 debugdownload: output
278 278 debugextensions: template
279 279 debugfileset: rev, all-files, show-matcher, show-stage
280 280 debugformat: template
281 281 debugfsinfo:
282 282 debuggetbundle: head, common, type
283 283 debugignore:
284 284 debugindex: changelog, manifest, dir, template
285 285 debugindexdot: changelog, manifest, dir
286 286 debugindexstats:
287 287 debuginstall: template
288 288 debugknown:
289 289 debuglabelcomplete:
290 290 debuglocks: force-lock, force-wlock, set-lock, set-wlock
291 291 debugmanifestfulltextcache: clear, add
292 292 debugmergestate:
293 293 debugnamecomplete:
294 294 debugnodemap: dump-new, dump-disk, check, metadata
295 295 debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template
296 296 debugp1copies: rev
297 297 debugp2copies: rev
298 298 debugpathcomplete: full, normal, added, removed
299 299 debugpathcopies: include, exclude
300 300 debugpeer:
301 301 debugpickmergetool: rev, changedelete, include, exclude, tool
302 302 debugpushkey:
303 303 debugpvec:
304 304 debugrebuilddirstate: rev, minimal
305 305 debugrebuildfncache:
306 306 debugrename: rev
307 307 debugrevlog: changelog, manifest, dir, dump
308 308 debugrevlogindex: changelog, manifest, dir, format
309 309 debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized
310 310 debugserve: sshstdio, logiofd, logiofile
311 311 debugsetparents:
312 312 debugsidedata: changelog, manifest, dir
313 313 debugssl:
314 314 debugsub: rev
315 315 debugsuccessorssets: closest
316 316 debugtagscache:
317 317 debugtemplate: rev, define
318 318 debuguigetpass: prompt
319 319 debuguiprompt: prompt
320 320 debugupdatecaches:
321 321 debugupgraderepo: optimize, run, backup, changelog, manifest
322 322 debugwalk: include, exclude
323 323 debugwhyunstable:
324 324 debugwireargs: three, four, five, ssh, remotecmd, insecure
325 325 debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
326 326 diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
327 327 export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
328 328 files: rev, print0, include, exclude, template, subrepos
329 329 forget: interactive, include, exclude, dry-run
330 330 graft: rev, base, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run
331 331 grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude
332 332 heads: rev, topo, active, closed, style, template
333 333 help: extension, command, keyword, system
334 334 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
335 335 import: strip, base, secret, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
336 336 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
337 337 init: ssh, remotecmd, insecure
338 338 locate: rev, print0, fullpath, include, exclude
339 339 log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
340 340 manifest: rev, all, template
341 341 merge: force, rev, preview, abort, tool
342 342 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
343 343 parents: rev, style, template
344 344 paths: template
345 345 phase: public, draft, secret, force, rev
346 346 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
347 347 push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure
348 348 recover: verify
349 349 remove: after, force, subrepos, include, exclude, dry-run
350 350 rename: after, force, include, exclude, dry-run
351 351 resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
352 352 revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
353 353 rollback: dry-run, force
354 354 root: template
355 355 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
356 356 shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude
357 357 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
358 358 summary: remote
359 359 tag: force, local, rev, remove, edit, message, date, user
360 360 tags: template
361 361 tip: patch, git, style, template
362 362 unbundle: update
363 363 unshelve: abort, continue, interactive, keep, name, tool, date
364 364 update: clean, check, merge, date, rev, tool
365 365 verify: full
366 366 version: template
367 367
368 368 $ hg init a
369 369 $ cd a
370 370 $ echo fee > fee
371 371 $ hg ci -q -Amfee
372 372 $ hg tag fee
373 373 $ mkdir fie
374 374 $ echo dead > fie/dead
375 375 $ echo live > fie/live
376 376 $ hg bookmark fo
377 377 $ hg branch -q fie
378 378 $ hg ci -q -Amfie
379 379 $ echo fo > fo
380 380 $ hg branch -qf default
381 381 $ hg ci -q -Amfo
382 382 $ echo Fum > Fum
383 383 $ hg ci -q -AmFum
384 384 $ hg bookmark Fum
385 385
386 386 Test debugpathcomplete
387 387
388 388 $ hg debugpathcomplete f
389 389 fee
390 390 fie
391 391 fo
392 392 $ hg debugpathcomplete -f f
393 393 fee
394 394 fie/dead
395 395 fie/live
396 396 fo
397 397
398 398 $ hg rm Fum
399 399 $ hg debugpathcomplete -r F
400 400 Fum
401 401
402 402 Test debugnamecomplete
403 403
404 404 $ hg debugnamecomplete
405 405 Fum
406 406 default
407 407 fee
408 408 fie
409 409 fo
410 410 tip
411 411 $ hg debugnamecomplete f
412 412 fee
413 413 fie
414 414 fo
415 415
416 416 Test debuglabelcomplete, a deprecated name for debugnamecomplete that is still
417 417 used for completions in some shells.
418 418
419 419 $ hg debuglabelcomplete
420 420 Fum
421 421 default
422 422 fee
423 423 fie
424 424 fo
425 425 tip
426 426 $ hg debuglabelcomplete f
427 427 fee
428 428 fie
429 429 fo
@@ -1,266 +1,323 b''
1 1 $ mkdir part1
2 2 $ cd part1
3 3
4 4 $ hg init
5 5 $ echo a > a
6 6 $ hg add a
7 7 $ hg commit -m "1"
8 8 $ hg status
9 9 $ hg copy a b
10 10 $ hg --config ui.portablefilenames=abort copy a con.xml
11 11 abort: filename contains 'con', which is reserved on Windows: con.xml
12 12 [255]
13 13 $ hg status
14 14 A b
15 15 $ hg sum
16 16 parent: 0:c19d34741b0a tip
17 17 1
18 18 branch: default
19 19 commit: 1 copied
20 20 update: (current)
21 21 phases: 1 draft
22 22 $ hg --debug commit -m "2"
23 23 committing files:
24 24 b
25 25 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
26 26 committing manifest
27 27 committing changelog
28 28 updating the branch cache
29 29 committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
30 30
31 31 we should see two history entries
32 32
33 33 $ hg history -v
34 34 changeset: 1:93580a2c28a5
35 35 tag: tip
36 36 user: test
37 37 date: Thu Jan 01 00:00:00 1970 +0000
38 38 files: b
39 39 description:
40 40 2
41 41
42 42
43 43 changeset: 0:c19d34741b0a
44 44 user: test
45 45 date: Thu Jan 01 00:00:00 1970 +0000
46 46 files: a
47 47 description:
48 48 1
49 49
50 50
51 51
52 52 we should see one log entry for a
53 53
54 54 $ hg log a
55 55 changeset: 0:c19d34741b0a
56 56 user: test
57 57 date: Thu Jan 01 00:00:00 1970 +0000
58 58 summary: 1
59 59
60 60
61 61 this should show a revision linked to changeset 0
62 62
63 63 $ hg debugindex a
64 64 rev linkrev nodeid p1 p2
65 65 0 0 b789fdd96dc2 000000000000 000000000000
66 66
67 67 we should see one log entry for b
68 68
69 69 $ hg log b
70 70 changeset: 1:93580a2c28a5
71 71 tag: tip
72 72 user: test
73 73 date: Thu Jan 01 00:00:00 1970 +0000
74 74 summary: 2
75 75
76 76
77 77 this should show a revision linked to changeset 1
78 78
79 79 $ hg debugindex b
80 80 rev linkrev nodeid p1 p2
81 81 0 1 37d9b5d994ea 000000000000 000000000000
82 82
83 83 this should show the rename information in the metadata
84 84
85 85 $ hg debugdata b 0 | head -3 | tail -2
86 86 copy: a
87 87 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
88 88
89 89 #if reporevlogstore
90 90 $ md5sum.py .hg/store/data/b.i
91 91 44913824c8f5890ae218f9829535922e .hg/store/data/b.i
92 92 #endif
93 93 $ hg cat b > bsum
94 94 $ md5sum.py bsum
95 95 60b725f10c9c85c70d97880dfe8191b3 bsum
96 96 $ hg cat a > asum
97 97 $ md5sum.py asum
98 98 60b725f10c9c85c70d97880dfe8191b3 asum
99 99 $ hg verify
100 100 checking changesets
101 101 checking manifests
102 102 crosschecking files in changesets and manifests
103 103 checking files
104 104 checked 2 changesets with 2 changes to 2 files
105 105
106 106 $ cd ..
107 107
108 108
109 109 $ mkdir part2
110 110 $ cd part2
111 111
112 112 $ hg init
113 113 $ echo foo > foo
114 114 should fail - foo is not managed
115 115 $ hg mv foo bar
116 116 foo: not copying - file is not managed
117 117 abort: no files to copy
118 118 [255]
119 119 $ hg st -A
120 120 ? foo
121 121 respects ui.relative-paths
122 122 $ mkdir dir
123 123 $ cd dir
124 124 $ hg mv ../foo ../bar
125 125 ../foo: not copying - file is not managed
126 126 abort: no files to copy
127 127 [255]
128 128 $ hg mv ../foo ../bar --config ui.relative-paths=yes
129 129 ../foo: not copying - file is not managed
130 130 abort: no files to copy
131 131 [255]
132 132 $ hg mv ../foo ../bar --config ui.relative-paths=no
133 133 foo: not copying - file is not managed
134 134 abort: no files to copy
135 135 [255]
136 136 $ cd ..
137 137 $ rmdir dir
138 138 $ hg add foo
139 139 dry-run; print a warning that this is not a real copy; foo is added
140 140 $ hg mv --dry-run foo bar
141 141 foo has not been committed yet, so no copy data will be stored for bar.
142 142 $ hg st -A
143 143 A foo
144 144 should print a warning that this is not a real copy; bar is added
145 145 $ hg mv foo bar
146 146 foo has not been committed yet, so no copy data will be stored for bar.
147 147 $ hg st -A
148 148 A bar
149 149 should print a warning that this is not a real copy; foo is added
150 150 $ hg cp bar foo
151 151 bar has not been committed yet, so no copy data will be stored for foo.
152 152 $ hg rm -f bar
153 153 $ rm bar
154 154 $ hg st -A
155 155 A foo
156 156 $ hg commit -m1
157 157
158 158 moving a missing file
159 159 $ rm foo
160 160 $ hg mv foo foo3
161 161 foo: deleted in working directory
162 162 foo3 does not exist!
163 163 $ hg up -qC .
164 164
165 165 copy --after to a nonexistent target filename
166 166 $ hg cp -A foo dummy
167 167 foo: not recording copy - dummy does not exist
168 168 [1]
169 169
170 170 dry-run; should show that foo is clean
171 171 $ hg copy --dry-run foo bar
172 172 $ hg st -A
173 173 C foo
174 174 should show copy
175 175 $ hg copy foo bar
176 176 $ hg st -C
177 177 A bar
178 178 foo
179 179
180 180 shouldn't show copy
181 181 $ hg commit -m2
182 182 $ hg st -C
183 183
184 184 should match
185 185 $ hg debugindex foo
186 186 rev linkrev nodeid p1 p2
187 187 0 0 2ed2a3912a0b 000000000000 000000000000
188 188 $ hg debugrename bar
189 189 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
190 190
191 191 $ echo bleah > foo
192 192 $ echo quux > bar
193 193 $ hg commit -m3
194 194
195 195 should not be renamed
196 196 $ hg debugrename bar
197 197 bar not renamed
198 198
199 199 $ hg copy -f foo bar
200 200 should show copy
201 201 $ hg st -C
202 202 M bar
203 203 foo
204 204
205 205 XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be
206 206 displayed.
207 207 $ hg st -C --config extensions.largefiles=
208 208 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
209 209 M bar
210 210 foo
211 211
212 212 $ hg commit -m3
213 213
214 214 should show no parents for tip
215 215 $ hg debugindex bar
216 216 rev linkrev nodeid p1 p2
217 217 0 1 7711d36246cc 000000000000 000000000000
218 218 1 2 bdf70a2b8d03 7711d36246cc 000000000000
219 219 2 3 b2558327ea8d 000000000000 000000000000
220 220 should match
221 221 $ hg debugindex foo
222 222 rev linkrev nodeid p1 p2
223 223 0 0 2ed2a3912a0b 000000000000 000000000000
224 224 1 2 dd12c926cf16 2ed2a3912a0b 000000000000
225 225 $ hg debugrename bar
226 226 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
227 227
228 228 should show no copies
229 229 $ hg st -C
230 230
231 231 copy --after on an added file
232 232 $ cp bar baz
233 233 $ hg add baz
234 234 $ hg cp -A bar baz
235 235 $ hg st -C
236 236 A baz
237 237 bar
238 238
239 239 foo was clean:
240 240 $ hg st -AC foo
241 241 C foo
242 242 Trying to copy on top of an existing file fails,
243 243 $ hg copy -A bar foo
244 244 foo: not overwriting - file already committed
245 245 ('hg copy --after --force' to replace the file by recording a copy)
246 246 [1]
247 247 same error without the --after, so the user doesn't have to go through
248 248 two hints:
249 249 $ hg copy bar foo
250 250 foo: not overwriting - file already committed
251 251 ('hg copy --force' to replace the file by recording a copy)
252 252 [1]
253 253 but it's considered modified after a copy --after --force
254 254 $ hg copy -Af bar foo
255 255 $ hg st -AC foo
256 256 M foo
257 257 bar
258 258 The hint for a file that exists but is not in file history doesn't
259 259 mention --force:
260 260 $ touch xyzzy
261 261 $ hg cp bar xyzzy
262 262 xyzzy: not overwriting - file exists
263 263 ('hg copy --after' to record the copy)
264 264 [1]
265 $ hg co -qC .
266 $ rm baz xyzzy
267
268
269 Test unmarking copy of a single file
270
271 # Set up by creating a copy
272 $ hg cp bar baz
273 # Test uncopying a non-existent file
274 $ hg copy --forget non-existent
275 non-existent: $ENOENT$
276 # Test uncopying an tracked but unrelated file
277 $ hg copy --forget foo
278 foo: not unmarking as copy - file is not marked as copied
279 # Test uncopying a copy source
280 $ hg copy --forget bar
281 bar: not unmarking as copy - file is not marked as copied
282 # baz should still be marked as a copy
283 $ hg st -C
284 A baz
285 bar
286 # Test the normal case
287 $ hg copy --forget baz
288 $ hg st -C
289 A baz
290 # Test uncopy with matching an non-matching patterns
291 $ hg cp bar baz --after
292 $ hg copy --forget bar baz
293 bar: not unmarking as copy - file is not marked as copied
294 $ hg st -C
295 A baz
296 # Test uncopy with no exact matches
297 $ hg cp bar baz --after
298 $ hg copy --forget .
299 $ hg st -C
300 A baz
301 $ hg forget baz
302 $ rm baz
303
304 Test unmarking copy of a directory
305
306 $ mkdir dir
307 $ echo foo > dir/foo
308 $ echo bar > dir/bar
309 $ hg add dir
310 adding dir/bar
311 adding dir/foo
312 $ hg ci -m 'add dir/'
313 $ hg cp dir dir2
314 copying dir/bar to dir2/bar
315 copying dir/foo to dir2/foo
316 $ touch dir2/untracked
317 $ hg copy --forget dir2
318 $ hg st -C
319 A dir2/bar
320 A dir2/foo
321 ? dir2/untracked
265 322
266 323 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now