##// END OF EJS Templates
graft: attempt to make merge labels more helpful...
Martin von Zweigbergk -
r49439:47b3fca3 default
parent child Browse files
Show More
@@ -1,7950 +1,7952 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import errno
11 11 import os
12 12 import re
13 13 import sys
14 14
15 15 from .i18n import _
16 16 from .node import (
17 17 hex,
18 18 nullrev,
19 19 short,
20 20 wdirrev,
21 21 )
22 22 from .pycompat import open
23 23 from . import (
24 24 archival,
25 25 bookmarks,
26 26 bundle2,
27 27 bundlecaches,
28 28 changegroup,
29 29 cmdutil,
30 30 copies,
31 31 debugcommands as debugcommandsmod,
32 32 destutil,
33 33 dirstateguard,
34 34 discovery,
35 35 encoding,
36 36 error,
37 37 exchange,
38 38 extensions,
39 39 filemerge,
40 40 formatter,
41 41 graphmod,
42 42 grep as grepmod,
43 43 hbisect,
44 44 help,
45 45 hg,
46 46 logcmdutil,
47 47 merge as mergemod,
48 48 mergestate as mergestatemod,
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 requirements,
58 58 revsetlang,
59 59 rewriteutil,
60 60 scmutil,
61 61 server,
62 62 shelve as shelvemod,
63 63 state as statemod,
64 64 streamclone,
65 65 tags as tagsmod,
66 66 ui as uimod,
67 67 util,
68 68 verify as verifymod,
69 69 vfs as vfsmod,
70 70 wireprotoserver,
71 71 )
72 72 from .utils import (
73 73 dateutil,
74 74 stringutil,
75 75 urlutil,
76 76 )
77 77
78 78 table = {}
79 79 table.update(debugcommandsmod.command._table)
80 80
81 81 command = registrar.command(table)
82 82 INTENT_READONLY = registrar.INTENT_READONLY
83 83
84 84 # common command options
85 85
86 86 globalopts = [
87 87 (
88 88 b'R',
89 89 b'repository',
90 90 b'',
91 91 _(b'repository root directory or name of overlay bundle file'),
92 92 _(b'REPO'),
93 93 ),
94 94 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
95 95 (
96 96 b'y',
97 97 b'noninteractive',
98 98 None,
99 99 _(
100 100 b'do not prompt, automatically pick the first choice for all prompts'
101 101 ),
102 102 ),
103 103 (b'q', b'quiet', None, _(b'suppress output')),
104 104 (b'v', b'verbose', None, _(b'enable additional output')),
105 105 (
106 106 b'',
107 107 b'color',
108 108 b'',
109 109 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
110 110 # and should not be translated
111 111 _(b"when to colorize (boolean, always, auto, never, or debug)"),
112 112 _(b'TYPE'),
113 113 ),
114 114 (
115 115 b'',
116 116 b'config',
117 117 [],
118 118 _(b'set/override config option (use \'section.name=value\')'),
119 119 _(b'CONFIG'),
120 120 ),
121 121 (b'', b'debug', None, _(b'enable debugging output')),
122 122 (b'', b'debugger', None, _(b'start debugger')),
123 123 (
124 124 b'',
125 125 b'encoding',
126 126 encoding.encoding,
127 127 _(b'set the charset encoding'),
128 128 _(b'ENCODE'),
129 129 ),
130 130 (
131 131 b'',
132 132 b'encodingmode',
133 133 encoding.encodingmode,
134 134 _(b'set the charset encoding mode'),
135 135 _(b'MODE'),
136 136 ),
137 137 (b'', b'traceback', None, _(b'always print a traceback on exception')),
138 138 (b'', b'time', None, _(b'time how long the command takes')),
139 139 (b'', b'profile', None, _(b'print command execution profile')),
140 140 (b'', b'version', None, _(b'output version information and exit')),
141 141 (b'h', b'help', None, _(b'display help and exit')),
142 142 (b'', b'hidden', False, _(b'consider hidden changesets')),
143 143 (
144 144 b'',
145 145 b'pager',
146 146 b'auto',
147 147 _(b"when to paginate (boolean, always, auto, or never)"),
148 148 _(b'TYPE'),
149 149 ),
150 150 ]
151 151
152 152 dryrunopts = cmdutil.dryrunopts
153 153 remoteopts = cmdutil.remoteopts
154 154 walkopts = cmdutil.walkopts
155 155 commitopts = cmdutil.commitopts
156 156 commitopts2 = cmdutil.commitopts2
157 157 commitopts3 = cmdutil.commitopts3
158 158 formatteropts = cmdutil.formatteropts
159 159 templateopts = cmdutil.templateopts
160 160 logopts = cmdutil.logopts
161 161 diffopts = cmdutil.diffopts
162 162 diffwsopts = cmdutil.diffwsopts
163 163 diffopts2 = cmdutil.diffopts2
164 164 mergetoolopts = cmdutil.mergetoolopts
165 165 similarityopts = cmdutil.similarityopts
166 166 subrepoopts = cmdutil.subrepoopts
167 167 debugrevlogopts = cmdutil.debugrevlogopts
168 168
169 169 # Commands start here, listed alphabetically
170 170
171 171
172 172 @command(
173 173 b'abort',
174 174 dryrunopts,
175 175 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
176 176 helpbasic=True,
177 177 )
178 178 def abort(ui, repo, **opts):
179 179 """abort an unfinished operation (EXPERIMENTAL)
180 180
181 181 Aborts a multistep operation like graft, histedit, rebase, merge,
182 182 and unshelve if they are in an unfinished state.
183 183
184 184 use --dry-run/-n to dry run the command.
185 185 """
186 186 dryrun = opts.get('dry_run')
187 187 abortstate = cmdutil.getunfinishedstate(repo)
188 188 if not abortstate:
189 189 raise error.StateError(_(b'no operation in progress'))
190 190 if not abortstate.abortfunc:
191 191 raise error.InputError(
192 192 (
193 193 _(b"%s in progress but does not support 'hg abort'")
194 194 % (abortstate._opname)
195 195 ),
196 196 hint=abortstate.hint(),
197 197 )
198 198 if dryrun:
199 199 ui.status(
200 200 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
201 201 )
202 202 return
203 203 return abortstate.abortfunc(ui, repo)
204 204
205 205
206 206 @command(
207 207 b'add',
208 208 walkopts + subrepoopts + dryrunopts,
209 209 _(b'[OPTION]... [FILE]...'),
210 210 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
211 211 helpbasic=True,
212 212 inferrepo=True,
213 213 )
214 214 def add(ui, repo, *pats, **opts):
215 215 """add the specified files on the next commit
216 216
217 217 Schedule files to be version controlled and added to the
218 218 repository.
219 219
220 220 The files will be added to the repository at the next commit. To
221 221 undo an add before that, see :hg:`forget`.
222 222
223 223 If no names are given, add all files to the repository (except
224 224 files matching ``.hgignore``).
225 225
226 226 .. container:: verbose
227 227
228 228 Examples:
229 229
230 230 - New (unknown) files are added
231 231 automatically by :hg:`add`::
232 232
233 233 $ ls
234 234 foo.c
235 235 $ hg status
236 236 ? foo.c
237 237 $ hg add
238 238 adding foo.c
239 239 $ hg status
240 240 A foo.c
241 241
242 242 - Specific files to be added can be specified::
243 243
244 244 $ ls
245 245 bar.c foo.c
246 246 $ hg status
247 247 ? bar.c
248 248 ? foo.c
249 249 $ hg add bar.c
250 250 $ hg status
251 251 A bar.c
252 252 ? foo.c
253 253
254 254 Returns 0 if all files are successfully added.
255 255 """
256 256
257 257 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 258 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 259 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 260 return rejected and 1 or 0
261 261
262 262
263 263 @command(
264 264 b'addremove',
265 265 similarityopts + subrepoopts + walkopts + dryrunopts,
266 266 _(b'[OPTION]... [FILE]...'),
267 267 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 268 inferrepo=True,
269 269 )
270 270 def addremove(ui, repo, *pats, **opts):
271 271 """add all new files, delete all missing files
272 272
273 273 Add all new files and remove all missing files from the
274 274 repository.
275 275
276 276 Unless names are given, new files are ignored if they match any of
277 277 the patterns in ``.hgignore``. As with add, these changes take
278 278 effect at the next commit.
279 279
280 280 Use the -s/--similarity option to detect renamed files. This
281 281 option takes a percentage between 0 (disabled) and 100 (files must
282 282 be identical) as its parameter. With a parameter greater than 0,
283 283 this compares every removed file with every added file and records
284 284 those similar enough as renames. Detecting renamed files this way
285 285 can be expensive. After using this option, :hg:`status -C` can be
286 286 used to check which files were identified as moved or renamed. If
287 287 not specified, -s/--similarity defaults to 100 and only renames of
288 288 identical files are detected.
289 289
290 290 .. container:: verbose
291 291
292 292 Examples:
293 293
294 294 - A number of files (bar.c and foo.c) are new,
295 295 while foobar.c has been removed (without using :hg:`remove`)
296 296 from the repository::
297 297
298 298 $ ls
299 299 bar.c foo.c
300 300 $ hg status
301 301 ! foobar.c
302 302 ? bar.c
303 303 ? foo.c
304 304 $ hg addremove
305 305 adding bar.c
306 306 adding foo.c
307 307 removing foobar.c
308 308 $ hg status
309 309 A bar.c
310 310 A foo.c
311 311 R foobar.c
312 312
313 313 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 314 Afterwards, it was edited slightly::
315 315
316 316 $ ls
317 317 foo.c
318 318 $ hg status
319 319 ! foobar.c
320 320 ? foo.c
321 321 $ hg addremove --similarity 90
322 322 removing foobar.c
323 323 adding foo.c
324 324 recording removal of foobar.c as rename to foo.c (94% similar)
325 325 $ hg status -C
326 326 A foo.c
327 327 foobar.c
328 328 R foobar.c
329 329
330 330 Returns 0 if all files are successfully added.
331 331 """
332 332 opts = pycompat.byteskwargs(opts)
333 333 if not opts.get(b'similarity'):
334 334 opts[b'similarity'] = b'100'
335 335 matcher = scmutil.match(repo[None], pats, opts)
336 336 relative = scmutil.anypats(pats, opts)
337 337 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 338 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339 339
340 340
341 341 @command(
342 342 b'annotate|blame',
343 343 [
344 344 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 345 (
346 346 b'',
347 347 b'follow',
348 348 None,
349 349 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 350 ),
351 351 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 352 (b'a', b'text', None, _(b'treat all files as text')),
353 353 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 354 (b'f', b'file', None, _(b'list the filename')),
355 355 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 356 (b'n', b'number', None, _(b'list the revision number (default)')),
357 357 (b'c', b'changeset', None, _(b'list the changeset')),
358 358 (
359 359 b'l',
360 360 b'line-number',
361 361 None,
362 362 _(b'show line number at the first appearance'),
363 363 ),
364 364 (
365 365 b'',
366 366 b'skip',
367 367 [],
368 368 _(b'revset to not display (EXPERIMENTAL)'),
369 369 _(b'REV'),
370 370 ),
371 371 ]
372 372 + diffwsopts
373 373 + walkopts
374 374 + formatteropts,
375 375 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 376 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 377 helpbasic=True,
378 378 inferrepo=True,
379 379 )
380 380 def annotate(ui, repo, *pats, **opts):
381 381 """show changeset information by line for each file
382 382
383 383 List changes in files, showing the revision id responsible for
384 384 each line.
385 385
386 386 This command is useful for discovering when a change was made and
387 387 by whom.
388 388
389 389 If you include --file, --user, or --date, the revision number is
390 390 suppressed unless you also include --number.
391 391
392 392 Without the -a/--text option, annotate will avoid processing files
393 393 it detects as binary. With -a, annotate will annotate the file
394 394 anyway, although the results will probably be neither useful
395 395 nor desirable.
396 396
397 397 .. container:: verbose
398 398
399 399 Template:
400 400
401 401 The following keywords are supported in addition to the common template
402 402 keywords and functions. See also :hg:`help templates`.
403 403
404 404 :lines: List of lines with annotation data.
405 405 :path: String. Repository-absolute path of the specified file.
406 406
407 407 And each entry of ``{lines}`` provides the following sub-keywords in
408 408 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409 409
410 410 :line: String. Line content.
411 411 :lineno: Integer. Line number at that revision.
412 412 :path: String. Repository-absolute path of the file at that revision.
413 413
414 414 See :hg:`help templates.operators` for the list expansion syntax.
415 415
416 416 Returns 0 on success.
417 417 """
418 418 opts = pycompat.byteskwargs(opts)
419 419 if not pats:
420 420 raise error.InputError(
421 421 _(b'at least one filename or pattern is required')
422 422 )
423 423
424 424 if opts.get(b'follow'):
425 425 # --follow is deprecated and now just an alias for -f/--file
426 426 # to mimic the behavior of Mercurial before version 1.5
427 427 opts[b'file'] = True
428 428
429 429 if (
430 430 not opts.get(b'user')
431 431 and not opts.get(b'changeset')
432 432 and not opts.get(b'date')
433 433 and not opts.get(b'file')
434 434 ):
435 435 opts[b'number'] = True
436 436
437 437 linenumber = opts.get(b'line_number') is not None
438 438 if (
439 439 linenumber
440 440 and (not opts.get(b'changeset'))
441 441 and (not opts.get(b'number'))
442 442 ):
443 443 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444 444
445 445 rev = opts.get(b'rev')
446 446 if rev:
447 447 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 448 ctx = logcmdutil.revsingle(repo, rev)
449 449
450 450 ui.pager(b'annotate')
451 451 rootfm = ui.formatter(b'annotate', opts)
452 452 if ui.debugflag:
453 453 shorthex = pycompat.identity
454 454 else:
455 455
456 456 def shorthex(h):
457 457 return h[:12]
458 458
459 459 if ui.quiet:
460 460 datefunc = dateutil.shortdate
461 461 else:
462 462 datefunc = dateutil.datestr
463 463 if ctx.rev() is None:
464 464 if opts.get(b'changeset'):
465 465 # omit "+" suffix which is appended to node hex
466 466 def formatrev(rev):
467 467 if rev == wdirrev:
468 468 return b'%d' % ctx.p1().rev()
469 469 else:
470 470 return b'%d' % rev
471 471
472 472 else:
473 473
474 474 def formatrev(rev):
475 475 if rev == wdirrev:
476 476 return b'%d+' % ctx.p1().rev()
477 477 else:
478 478 return b'%d ' % rev
479 479
480 480 def formathex(h):
481 481 if h == repo.nodeconstants.wdirhex:
482 482 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 483 else:
484 484 return b'%s ' % shorthex(h)
485 485
486 486 else:
487 487 formatrev = b'%d'.__mod__
488 488 formathex = shorthex
489 489
490 490 opmap = [
491 491 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 492 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 493 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 494 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 495 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 496 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 497 ]
498 498 opnamemap = {
499 499 b'rev': b'number',
500 500 b'node': b'changeset',
501 501 b'path': b'file',
502 502 b'lineno': b'line_number',
503 503 }
504 504
505 505 if rootfm.isplain():
506 506
507 507 def makefunc(get, fmt):
508 508 return lambda x: fmt(get(x))
509 509
510 510 else:
511 511
512 512 def makefunc(get, fmt):
513 513 return get
514 514
515 515 datahint = rootfm.datahint()
516 516 funcmap = [
517 517 (makefunc(get, fmt), sep)
518 518 for fn, sep, get, fmt in opmap
519 519 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 520 ]
521 521 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 522 fields = b' '.join(
523 523 fn
524 524 for fn, sep, get, fmt in opmap
525 525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 526 )
527 527
528 528 def bad(x, y):
529 529 raise error.InputError(b"%s: %s" % (x, y))
530 530
531 531 m = scmutil.match(ctx, pats, opts, badfn=bad)
532 532
533 533 follow = not opts.get(b'no_follow')
534 534 diffopts = patch.difffeatureopts(
535 535 ui, opts, section=b'annotate', whitespace=True
536 536 )
537 537 skiprevs = opts.get(b'skip')
538 538 if skiprevs:
539 539 skiprevs = logcmdutil.revrange(repo, skiprevs)
540 540
541 541 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 542 for abs in ctx.walk(m):
543 543 fctx = ctx[abs]
544 544 rootfm.startitem()
545 545 rootfm.data(path=abs)
546 546 if not opts.get(b'text') and fctx.isbinary():
547 547 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 548 continue
549 549
550 550 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 551 lines = fctx.annotate(
552 552 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 553 )
554 554 if not lines:
555 555 fm.end()
556 556 continue
557 557 formats = []
558 558 pieces = []
559 559
560 560 for f, sep in funcmap:
561 561 l = [f(n) for n in lines]
562 562 if fm.isplain():
563 563 sizes = [encoding.colwidth(x) for x in l]
564 564 ml = max(sizes)
565 565 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 566 else:
567 567 formats.append([b'%s'] * len(l))
568 568 pieces.append(l)
569 569
570 570 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 571 fm.startitem()
572 572 fm.context(fctx=n.fctx)
573 573 fm.write(fields, b"".join(f), *p)
574 574 if n.skip:
575 575 fmt = b"* %s"
576 576 else:
577 577 fmt = b": %s"
578 578 fm.write(b'line', fmt, n.text)
579 579
580 580 if not lines[-1].text.endswith(b'\n'):
581 581 fm.plain(b'\n')
582 582 fm.end()
583 583
584 584 rootfm.end()
585 585
586 586
587 587 @command(
588 588 b'archive',
589 589 [
590 590 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 591 (
592 592 b'p',
593 593 b'prefix',
594 594 b'',
595 595 _(b'directory prefix for files in archive'),
596 596 _(b'PREFIX'),
597 597 ),
598 598 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 599 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 600 ]
601 601 + subrepoopts
602 602 + walkopts,
603 603 _(b'[OPTION]... DEST'),
604 604 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 605 )
606 606 def archive(ui, repo, dest, **opts):
607 607 """create an unversioned archive of a repository revision
608 608
609 609 By default, the revision used is the parent of the working
610 610 directory; use -r/--rev to specify a different revision.
611 611
612 612 The archive type is automatically detected based on file
613 613 extension (to override, use -t/--type).
614 614
615 615 .. container:: verbose
616 616
617 617 Examples:
618 618
619 619 - create a zip file containing the 1.0 release::
620 620
621 621 hg archive -r 1.0 project-1.0.zip
622 622
623 623 - create a tarball excluding .hg files::
624 624
625 625 hg archive project.tar.gz -X ".hg*"
626 626
627 627 Valid types are:
628 628
629 629 :``files``: a directory full of files (default)
630 630 :``tar``: tar archive, uncompressed
631 631 :``tbz2``: tar archive, compressed using bzip2
632 632 :``tgz``: tar archive, compressed using gzip
633 633 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 634 :``uzip``: zip archive, uncompressed
635 635 :``zip``: zip archive, compressed using deflate
636 636
637 637 The exact name of the destination archive or directory is given
638 638 using a format string; see :hg:`help export` for details.
639 639
640 640 Each member added to an archive file has a directory prefix
641 641 prepended. Use -p/--prefix to specify a format string for the
642 642 prefix. The default is the basename of the archive, with suffixes
643 643 removed.
644 644
645 645 Returns 0 on success.
646 646 """
647 647
648 648 opts = pycompat.byteskwargs(opts)
649 649 rev = opts.get(b'rev')
650 650 if rev:
651 651 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 652 ctx = logcmdutil.revsingle(repo, rev)
653 653 if not ctx:
654 654 raise error.InputError(
655 655 _(b'no working directory: please specify a revision')
656 656 )
657 657 node = ctx.node()
658 658 dest = cmdutil.makefilename(ctx, dest)
659 659 if os.path.realpath(dest) == repo.root:
660 660 raise error.InputError(_(b'repository root cannot be destination'))
661 661
662 662 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 663 prefix = opts.get(b'prefix')
664 664
665 665 if dest == b'-':
666 666 if kind == b'files':
667 667 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 668 dest = cmdutil.makefileobj(ctx, dest)
669 669 if not prefix:
670 670 prefix = os.path.basename(repo.root) + b'-%h'
671 671
672 672 prefix = cmdutil.makefilename(ctx, prefix)
673 673 match = scmutil.match(ctx, [], opts)
674 674 archival.archive(
675 675 repo,
676 676 dest,
677 677 node,
678 678 kind,
679 679 not opts.get(b'no_decode'),
680 680 match,
681 681 prefix,
682 682 subrepos=opts.get(b'subrepos'),
683 683 )
684 684
685 685
686 686 @command(
687 687 b'backout',
688 688 [
689 689 (
690 690 b'',
691 691 b'merge',
692 692 None,
693 693 _(b'merge with old dirstate parent after backout'),
694 694 ),
695 695 (
696 696 b'',
697 697 b'commit',
698 698 None,
699 699 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 700 ),
701 701 (b'', b'no-commit', None, _(b'do not commit')),
702 702 (
703 703 b'',
704 704 b'parent',
705 705 b'',
706 706 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 707 _(b'REV'),
708 708 ),
709 709 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 710 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 711 ]
712 712 + mergetoolopts
713 713 + walkopts
714 714 + commitopts
715 715 + commitopts2,
716 716 _(b'[OPTION]... [-r] REV'),
717 717 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 718 )
719 719 def backout(ui, repo, node=None, rev=None, **opts):
720 720 """reverse effect of earlier changeset
721 721
722 722 Prepare a new changeset with the effect of REV undone in the
723 723 current working directory. If no conflicts were encountered,
724 724 it will be committed immediately.
725 725
726 726 If REV is the parent of the working directory, then this new changeset
727 727 is committed automatically (unless --no-commit is specified).
728 728
729 729 .. note::
730 730
731 731 :hg:`backout` cannot be used to fix either an unwanted or
732 732 incorrect merge.
733 733
734 734 .. container:: verbose
735 735
736 736 Examples:
737 737
738 738 - Reverse the effect of the parent of the working directory.
739 739 This backout will be committed immediately::
740 740
741 741 hg backout -r .
742 742
743 743 - Reverse the effect of previous bad revision 23::
744 744
745 745 hg backout -r 23
746 746
747 747 - Reverse the effect of previous bad revision 23 and
748 748 leave changes uncommitted::
749 749
750 750 hg backout -r 23 --no-commit
751 751 hg commit -m "Backout revision 23"
752 752
753 753 By default, the pending changeset will have one parent,
754 754 maintaining a linear history. With --merge, the pending
755 755 changeset will instead have two parents: the old parent of the
756 756 working directory and a new child of REV that simply undoes REV.
757 757
758 758 Before version 1.7, the behavior without --merge was equivalent
759 759 to specifying --merge followed by :hg:`update --clean .` to
760 760 cancel the merge and leave the child of REV as a head to be
761 761 merged separately.
762 762
763 763 See :hg:`help dates` for a list of formats valid for -d/--date.
764 764
765 765 See :hg:`help revert` for a way to restore files to the state
766 766 of another revision.
767 767
768 768 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 769 files.
770 770 """
771 771 with repo.wlock(), repo.lock():
772 772 return _dobackout(ui, repo, node, rev, **opts)
773 773
774 774
775 775 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 776 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 777 opts = pycompat.byteskwargs(opts)
778 778
779 779 if rev and node:
780 780 raise error.InputError(_(b"please specify just one revision"))
781 781
782 782 if not rev:
783 783 rev = node
784 784
785 785 if not rev:
786 786 raise error.InputError(_(b"please specify a revision to backout"))
787 787
788 788 date = opts.get(b'date')
789 789 if date:
790 790 opts[b'date'] = dateutil.parsedate(date)
791 791
792 792 cmdutil.checkunfinished(repo)
793 793 cmdutil.bailifchanged(repo)
794 794 ctx = logcmdutil.revsingle(repo, rev)
795 795 node = ctx.node()
796 796
797 797 op1, op2 = repo.dirstate.parents()
798 798 if not repo.changelog.isancestor(node, op1):
799 799 raise error.InputError(
800 800 _(b'cannot backout change that is not an ancestor')
801 801 )
802 802
803 803 p1, p2 = repo.changelog.parents(node)
804 804 if p1 == repo.nullid:
805 805 raise error.InputError(_(b'cannot backout a change with no parents'))
806 806 if p2 != repo.nullid:
807 807 if not opts.get(b'parent'):
808 808 raise error.InputError(_(b'cannot backout a merge changeset'))
809 809 p = repo.lookup(opts[b'parent'])
810 810 if p not in (p1, p2):
811 811 raise error.InputError(
812 812 _(b'%s is not a parent of %s') % (short(p), short(node))
813 813 )
814 814 parent = p
815 815 else:
816 816 if opts.get(b'parent'):
817 817 raise error.InputError(
818 818 _(b'cannot use --parent on non-merge changeset')
819 819 )
820 820 parent = p1
821 821
822 822 # the backout should appear on the same branch
823 823 branch = repo.dirstate.branch()
824 824 bheads = repo.branchheads(branch)
825 825 rctx = scmutil.revsingle(repo, hex(parent))
826 826 if not opts.get(b'merge') and op1 != node:
827 827 with dirstateguard.dirstateguard(repo, b'backout'):
828 828 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 829 with ui.configoverride(overrides, b'backout'):
830 830 stats = mergemod.back_out(ctx, parent=repo[parent])
831 831 repo.setparents(op1, op2)
832 832 hg._showstats(repo, stats)
833 833 if stats.unresolvedcount:
834 834 repo.ui.status(
835 835 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 836 )
837 837 return 1
838 838 else:
839 839 hg.clean(repo, node, show_stats=False)
840 840 repo.dirstate.setbranch(branch)
841 841 cmdutil.revert(ui, repo, rctx)
842 842
843 843 if opts.get(b'no_commit'):
844 844 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 845 ui.status(msg % short(node))
846 846 return 0
847 847
848 848 def commitfunc(ui, repo, message, match, opts):
849 849 editform = b'backout'
850 850 e = cmdutil.getcommiteditor(
851 851 editform=editform, **pycompat.strkwargs(opts)
852 852 )
853 853 if not message:
854 854 # we don't translate commit messages
855 855 message = b"Backed out changeset %s" % short(node)
856 856 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 857 return repo.commit(
858 858 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 859 )
860 860
861 861 # save to detect changes
862 862 tip = repo.changelog.tip()
863 863
864 864 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 865 if not newnode:
866 866 ui.status(_(b"nothing changed\n"))
867 867 return 1
868 868 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869 869
870 870 def nice(node):
871 871 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872 872
873 873 ui.status(
874 874 _(b'changeset %s backs out changeset %s\n')
875 875 % (nice(newnode), nice(node))
876 876 )
877 877 if opts.get(b'merge') and op1 != node:
878 878 hg.clean(repo, op1, show_stats=False)
879 879 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 880 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 881 with ui.configoverride(overrides, b'backout'):
882 882 return hg.merge(repo[b'tip'])
883 883 return 0
884 884
885 885
886 886 @command(
887 887 b'bisect',
888 888 [
889 889 (b'r', b'reset', False, _(b'reset bisect state')),
890 890 (b'g', b'good', False, _(b'mark changeset good')),
891 891 (b'b', b'bad', False, _(b'mark changeset bad')),
892 892 (b's', b'skip', False, _(b'skip testing changeset')),
893 893 (b'e', b'extend', False, _(b'extend the bisect range')),
894 894 (
895 895 b'c',
896 896 b'command',
897 897 b'',
898 898 _(b'use command to check changeset state'),
899 899 _(b'CMD'),
900 900 ),
901 901 (b'U', b'noupdate', False, _(b'do not update to target')),
902 902 ],
903 903 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 904 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 905 )
906 906 def bisect(
907 907 ui,
908 908 repo,
909 909 positional_1=None,
910 910 positional_2=None,
911 911 command=None,
912 912 reset=None,
913 913 good=None,
914 914 bad=None,
915 915 skip=None,
916 916 extend=None,
917 917 noupdate=None,
918 918 ):
919 919 """subdivision search of changesets
920 920
921 921 This command helps to find changesets which introduce problems. To
922 922 use, mark the earliest changeset you know exhibits the problem as
923 923 bad, then mark the latest changeset which is free from the problem
924 924 as good. Bisect will update your working directory to a revision
925 925 for testing (unless the -U/--noupdate option is specified). Once
926 926 you have performed tests, mark the working directory as good or
927 927 bad, and bisect will either update to another candidate changeset
928 928 or announce that it has found the bad revision.
929 929
930 930 As a shortcut, you can also use the revision argument to mark a
931 931 revision as good or bad without checking it out first.
932 932
933 933 If you supply a command, it will be used for automatic bisection.
934 934 The environment variable HG_NODE will contain the ID of the
935 935 changeset being tested. The exit status of the command will be
936 936 used to mark revisions as good or bad: status 0 means good, 125
937 937 means to skip the revision, 127 (command not found) will abort the
938 938 bisection, and any other non-zero exit status means the revision
939 939 is bad.
940 940
941 941 .. container:: verbose
942 942
943 943 Some examples:
944 944
945 945 - start a bisection with known bad revision 34, and good revision 12::
946 946
947 947 hg bisect --bad 34
948 948 hg bisect --good 12
949 949
950 950 - advance the current bisection by marking current revision as good or
951 951 bad::
952 952
953 953 hg bisect --good
954 954 hg bisect --bad
955 955
956 956 - mark the current revision, or a known revision, to be skipped (e.g. if
957 957 that revision is not usable because of another issue)::
958 958
959 959 hg bisect --skip
960 960 hg bisect --skip 23
961 961
962 962 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963 963
964 964 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965 965
966 966 - forget the current bisection::
967 967
968 968 hg bisect --reset
969 969
970 970 - use 'make && make tests' to automatically find the first broken
971 971 revision::
972 972
973 973 hg bisect --reset
974 974 hg bisect --bad 34
975 975 hg bisect --good 12
976 976 hg bisect --command "make && make tests"
977 977
978 978 - see all changesets whose states are already known in the current
979 979 bisection::
980 980
981 981 hg log -r "bisect(pruned)"
982 982
983 983 - see the changeset currently being bisected (especially useful
984 984 if running with -U/--noupdate)::
985 985
986 986 hg log -r "bisect(current)"
987 987
988 988 - see all changesets that took part in the current bisection::
989 989
990 990 hg log -r "bisect(range)"
991 991
992 992 - you can even get a nice graph::
993 993
994 994 hg log --graph -r "bisect(range)"
995 995
996 996 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997 997
998 998 Returns 0 on success.
999 999 """
1000 1000 rev = []
1001 1001 # backward compatibility
1002 1002 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1003 1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 1004 cmd = positional_1
1005 1005 rev.append(positional_2)
1006 1006 if cmd == b"good":
1007 1007 good = True
1008 1008 elif cmd == b"bad":
1009 1009 bad = True
1010 1010 else:
1011 1011 reset = True
1012 1012 elif positional_2:
1013 1013 raise error.InputError(_(b'incompatible arguments'))
1014 1014 elif positional_1 is not None:
1015 1015 rev.append(positional_1)
1016 1016
1017 1017 incompatibles = {
1018 1018 b'--bad': bad,
1019 1019 b'--command': bool(command),
1020 1020 b'--extend': extend,
1021 1021 b'--good': good,
1022 1022 b'--reset': reset,
1023 1023 b'--skip': skip,
1024 1024 }
1025 1025
1026 1026 enabled = [x for x in incompatibles if incompatibles[x]]
1027 1027
1028 1028 if len(enabled) > 1:
1029 1029 raise error.InputError(
1030 1030 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1031 1031 )
1032 1032
1033 1033 if reset:
1034 1034 hbisect.resetstate(repo)
1035 1035 return
1036 1036
1037 1037 state = hbisect.load_state(repo)
1038 1038
1039 1039 if rev:
1040 1040 nodes = [repo[i].node() for i in logcmdutil.revrange(repo, rev)]
1041 1041 else:
1042 1042 nodes = [repo.lookup(b'.')]
1043 1043
1044 1044 # update state
1045 1045 if good or bad or skip:
1046 1046 if good:
1047 1047 state[b'good'] += nodes
1048 1048 elif bad:
1049 1049 state[b'bad'] += nodes
1050 1050 elif skip:
1051 1051 state[b'skip'] += nodes
1052 1052 hbisect.save_state(repo, state)
1053 1053 if not (state[b'good'] and state[b'bad']):
1054 1054 return
1055 1055
1056 1056 def mayupdate(repo, node, show_stats=True):
1057 1057 """common used update sequence"""
1058 1058 if noupdate:
1059 1059 return
1060 1060 cmdutil.checkunfinished(repo)
1061 1061 cmdutil.bailifchanged(repo)
1062 1062 return hg.clean(repo, node, show_stats=show_stats)
1063 1063
1064 1064 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1065 1065
1066 1066 if command:
1067 1067 changesets = 1
1068 1068 if noupdate:
1069 1069 try:
1070 1070 node = state[b'current'][0]
1071 1071 except LookupError:
1072 1072 raise error.StateError(
1073 1073 _(
1074 1074 b'current bisect revision is unknown - '
1075 1075 b'start a new bisect to fix'
1076 1076 )
1077 1077 )
1078 1078 else:
1079 1079 node, p2 = repo.dirstate.parents()
1080 1080 if p2 != repo.nullid:
1081 1081 raise error.StateError(_(b'current bisect revision is a merge'))
1082 1082 if rev:
1083 1083 if not nodes:
1084 1084 raise error.InputError(_(b'empty revision set'))
1085 1085 node = repo[nodes[-1]].node()
1086 1086 with hbisect.restore_state(repo, state, node):
1087 1087 while changesets:
1088 1088 # update state
1089 1089 state[b'current'] = [node]
1090 1090 hbisect.save_state(repo, state)
1091 1091 status = ui.system(
1092 1092 command,
1093 1093 environ={b'HG_NODE': hex(node)},
1094 1094 blockedtag=b'bisect_check',
1095 1095 )
1096 1096 if status == 125:
1097 1097 transition = b"skip"
1098 1098 elif status == 0:
1099 1099 transition = b"good"
1100 1100 # status < 0 means process was killed
1101 1101 elif status == 127:
1102 1102 raise error.Abort(_(b"failed to execute %s") % command)
1103 1103 elif status < 0:
1104 1104 raise error.Abort(_(b"%s killed") % command)
1105 1105 else:
1106 1106 transition = b"bad"
1107 1107 state[transition].append(node)
1108 1108 ctx = repo[node]
1109 1109 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1110 1110 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1111 1111 hbisect.checkstate(state)
1112 1112 # bisect
1113 1113 nodes, changesets, bgood = hbisect.bisect(repo, state)
1114 1114 # update to next check
1115 1115 node = nodes[0]
1116 1116 mayupdate(repo, node, show_stats=False)
1117 1117 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1118 1118 return
1119 1119
1120 1120 hbisect.checkstate(state)
1121 1121
1122 1122 # actually bisect
1123 1123 nodes, changesets, good = hbisect.bisect(repo, state)
1124 1124 if extend:
1125 1125 if not changesets:
1126 1126 extendctx = hbisect.extendrange(repo, state, nodes, good)
1127 1127 if extendctx is not None:
1128 1128 ui.write(
1129 1129 _(b"Extending search to changeset %s\n")
1130 1130 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1131 1131 )
1132 1132 state[b'current'] = [extendctx.node()]
1133 1133 hbisect.save_state(repo, state)
1134 1134 return mayupdate(repo, extendctx.node())
1135 1135 raise error.StateError(_(b"nothing to extend"))
1136 1136
1137 1137 if changesets == 0:
1138 1138 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1139 1139 else:
1140 1140 assert len(nodes) == 1 # only a single node can be tested next
1141 1141 node = nodes[0]
1142 1142 # compute the approximate number of remaining tests
1143 1143 tests, size = 0, 2
1144 1144 while size <= changesets:
1145 1145 tests, size = tests + 1, size * 2
1146 1146 rev = repo.changelog.rev(node)
1147 1147 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1148 1148 ui.write(
1149 1149 _(
1150 1150 b"Testing changeset %s "
1151 1151 b"(%d changesets remaining, ~%d tests)\n"
1152 1152 )
1153 1153 % (summary, changesets, tests)
1154 1154 )
1155 1155 state[b'current'] = [node]
1156 1156 hbisect.save_state(repo, state)
1157 1157 return mayupdate(repo, node)
1158 1158
1159 1159
1160 1160 @command(
1161 1161 b'bookmarks|bookmark',
1162 1162 [
1163 1163 (b'f', b'force', False, _(b'force')),
1164 1164 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1165 1165 (b'd', b'delete', False, _(b'delete a given bookmark')),
1166 1166 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1167 1167 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1168 1168 (b'l', b'list', False, _(b'list existing bookmarks')),
1169 1169 ]
1170 1170 + formatteropts,
1171 1171 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1172 1172 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1173 1173 )
1174 1174 def bookmark(ui, repo, *names, **opts):
1175 1175 """create a new bookmark or list existing bookmarks
1176 1176
1177 1177 Bookmarks are labels on changesets to help track lines of development.
1178 1178 Bookmarks are unversioned and can be moved, renamed and deleted.
1179 1179 Deleting or moving a bookmark has no effect on the associated changesets.
1180 1180
1181 1181 Creating or updating to a bookmark causes it to be marked as 'active'.
1182 1182 The active bookmark is indicated with a '*'.
1183 1183 When a commit is made, the active bookmark will advance to the new commit.
1184 1184 A plain :hg:`update` will also advance an active bookmark, if possible.
1185 1185 Updating away from a bookmark will cause it to be deactivated.
1186 1186
1187 1187 Bookmarks can be pushed and pulled between repositories (see
1188 1188 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1189 1189 diverged, a new 'divergent bookmark' of the form 'name@path' will
1190 1190 be created. Using :hg:`merge` will resolve the divergence.
1191 1191
1192 1192 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1193 1193 the active bookmark's name.
1194 1194
1195 1195 A bookmark named '@' has the special property that :hg:`clone` will
1196 1196 check it out by default if it exists.
1197 1197
1198 1198 .. container:: verbose
1199 1199
1200 1200 Template:
1201 1201
1202 1202 The following keywords are supported in addition to the common template
1203 1203 keywords and functions such as ``{bookmark}``. See also
1204 1204 :hg:`help templates`.
1205 1205
1206 1206 :active: Boolean. True if the bookmark is active.
1207 1207
1208 1208 Examples:
1209 1209
1210 1210 - create an active bookmark for a new line of development::
1211 1211
1212 1212 hg book new-feature
1213 1213
1214 1214 - create an inactive bookmark as a place marker::
1215 1215
1216 1216 hg book -i reviewed
1217 1217
1218 1218 - create an inactive bookmark on another changeset::
1219 1219
1220 1220 hg book -r .^ tested
1221 1221
1222 1222 - rename bookmark turkey to dinner::
1223 1223
1224 1224 hg book -m turkey dinner
1225 1225
1226 1226 - move the '@' bookmark from another branch::
1227 1227
1228 1228 hg book -f @
1229 1229
1230 1230 - print only the active bookmark name::
1231 1231
1232 1232 hg book -ql .
1233 1233 """
1234 1234 opts = pycompat.byteskwargs(opts)
1235 1235 force = opts.get(b'force')
1236 1236 rev = opts.get(b'rev')
1237 1237 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1238 1238
1239 1239 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1240 1240 if action:
1241 1241 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1242 1242 elif names or rev:
1243 1243 action = b'add'
1244 1244 elif inactive:
1245 1245 action = b'inactive' # meaning deactivate
1246 1246 else:
1247 1247 action = b'list'
1248 1248
1249 1249 cmdutil.check_incompatible_arguments(
1250 1250 opts, b'inactive', [b'delete', b'list']
1251 1251 )
1252 1252 if not names and action in {b'add', b'delete'}:
1253 1253 raise error.InputError(_(b"bookmark name required"))
1254 1254
1255 1255 if action in {b'add', b'delete', b'rename', b'inactive'}:
1256 1256 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1257 1257 if action == b'delete':
1258 1258 names = pycompat.maplist(repo._bookmarks.expandname, names)
1259 1259 bookmarks.delete(repo, tr, names)
1260 1260 elif action == b'rename':
1261 1261 if not names:
1262 1262 raise error.InputError(_(b"new bookmark name required"))
1263 1263 elif len(names) > 1:
1264 1264 raise error.InputError(
1265 1265 _(b"only one new bookmark name allowed")
1266 1266 )
1267 1267 oldname = repo._bookmarks.expandname(opts[b'rename'])
1268 1268 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1269 1269 elif action == b'add':
1270 1270 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1271 1271 elif action == b'inactive':
1272 1272 if len(repo._bookmarks) == 0:
1273 1273 ui.status(_(b"no bookmarks set\n"))
1274 1274 elif not repo._activebookmark:
1275 1275 ui.status(_(b"no active bookmark\n"))
1276 1276 else:
1277 1277 bookmarks.deactivate(repo)
1278 1278 elif action == b'list':
1279 1279 names = pycompat.maplist(repo._bookmarks.expandname, names)
1280 1280 with ui.formatter(b'bookmarks', opts) as fm:
1281 1281 bookmarks.printbookmarks(ui, repo, fm, names)
1282 1282 else:
1283 1283 raise error.ProgrammingError(b'invalid action: %s' % action)
1284 1284
1285 1285
1286 1286 @command(
1287 1287 b'branch',
1288 1288 [
1289 1289 (
1290 1290 b'f',
1291 1291 b'force',
1292 1292 None,
1293 1293 _(b'set branch name even if it shadows an existing branch'),
1294 1294 ),
1295 1295 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1296 1296 (
1297 1297 b'r',
1298 1298 b'rev',
1299 1299 [],
1300 1300 _(b'change branches of the given revs (EXPERIMENTAL)'),
1301 1301 ),
1302 1302 ],
1303 1303 _(b'[-fC] [NAME]'),
1304 1304 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1305 1305 )
1306 1306 def branch(ui, repo, label=None, **opts):
1307 1307 """set or show the current branch name
1308 1308
1309 1309 .. note::
1310 1310
1311 1311 Branch names are permanent and global. Use :hg:`bookmark` to create a
1312 1312 light-weight bookmark instead. See :hg:`help glossary` for more
1313 1313 information about named branches and bookmarks.
1314 1314
1315 1315 With no argument, show the current branch name. With one argument,
1316 1316 set the working directory branch name (the branch will not exist
1317 1317 in the repository until the next commit). Standard practice
1318 1318 recommends that primary development take place on the 'default'
1319 1319 branch.
1320 1320
1321 1321 Unless -f/--force is specified, branch will not let you set a
1322 1322 branch name that already exists.
1323 1323
1324 1324 Use -C/--clean to reset the working directory branch to that of
1325 1325 the parent of the working directory, negating a previous branch
1326 1326 change.
1327 1327
1328 1328 Use the command :hg:`update` to switch to an existing branch. Use
1329 1329 :hg:`commit --close-branch` to mark this branch head as closed.
1330 1330 When all heads of a branch are closed, the branch will be
1331 1331 considered closed.
1332 1332
1333 1333 Returns 0 on success.
1334 1334 """
1335 1335 opts = pycompat.byteskwargs(opts)
1336 1336 revs = opts.get(b'rev')
1337 1337 if label:
1338 1338 label = label.strip()
1339 1339
1340 1340 if not opts.get(b'clean') and not label:
1341 1341 if revs:
1342 1342 raise error.InputError(
1343 1343 _(b"no branch name specified for the revisions")
1344 1344 )
1345 1345 ui.write(b"%s\n" % repo.dirstate.branch())
1346 1346 return
1347 1347
1348 1348 with repo.wlock():
1349 1349 if opts.get(b'clean'):
1350 1350 label = repo[b'.'].branch()
1351 1351 repo.dirstate.setbranch(label)
1352 1352 ui.status(_(b'reset working directory to branch %s\n') % label)
1353 1353 elif label:
1354 1354
1355 1355 scmutil.checknewlabel(repo, label, b'branch')
1356 1356 if revs:
1357 1357 return cmdutil.changebranch(ui, repo, revs, label, opts)
1358 1358
1359 1359 if not opts.get(b'force') and label in repo.branchmap():
1360 1360 if label not in [p.branch() for p in repo[None].parents()]:
1361 1361 raise error.InputError(
1362 1362 _(b'a branch of the same name already exists'),
1363 1363 # i18n: "it" refers to an existing branch
1364 1364 hint=_(b"use 'hg update' to switch to it"),
1365 1365 )
1366 1366
1367 1367 repo.dirstate.setbranch(label)
1368 1368 ui.status(_(b'marked working directory as branch %s\n') % label)
1369 1369
1370 1370 # find any open named branches aside from default
1371 1371 for n, h, t, c in repo.branchmap().iterbranches():
1372 1372 if n != b"default" and not c:
1373 1373 return 0
1374 1374 ui.status(
1375 1375 _(
1376 1376 b'(branches are permanent and global, '
1377 1377 b'did you want a bookmark?)\n'
1378 1378 )
1379 1379 )
1380 1380
1381 1381
1382 1382 @command(
1383 1383 b'branches',
1384 1384 [
1385 1385 (
1386 1386 b'a',
1387 1387 b'active',
1388 1388 False,
1389 1389 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1390 1390 ),
1391 1391 (b'c', b'closed', False, _(b'show normal and closed branches')),
1392 1392 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1393 1393 ]
1394 1394 + formatteropts,
1395 1395 _(b'[-c]'),
1396 1396 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1397 1397 intents={INTENT_READONLY},
1398 1398 )
1399 1399 def branches(ui, repo, active=False, closed=False, **opts):
1400 1400 """list repository named branches
1401 1401
1402 1402 List the repository's named branches, indicating which ones are
1403 1403 inactive. If -c/--closed is specified, also list branches which have
1404 1404 been marked closed (see :hg:`commit --close-branch`).
1405 1405
1406 1406 Use the command :hg:`update` to switch to an existing branch.
1407 1407
1408 1408 .. container:: verbose
1409 1409
1410 1410 Template:
1411 1411
1412 1412 The following keywords are supported in addition to the common template
1413 1413 keywords and functions such as ``{branch}``. See also
1414 1414 :hg:`help templates`.
1415 1415
1416 1416 :active: Boolean. True if the branch is active.
1417 1417 :closed: Boolean. True if the branch is closed.
1418 1418 :current: Boolean. True if it is the current branch.
1419 1419
1420 1420 Returns 0.
1421 1421 """
1422 1422
1423 1423 opts = pycompat.byteskwargs(opts)
1424 1424 revs = opts.get(b'rev')
1425 1425 selectedbranches = None
1426 1426 if revs:
1427 1427 revs = logcmdutil.revrange(repo, revs)
1428 1428 getbi = repo.revbranchcache().branchinfo
1429 1429 selectedbranches = {getbi(r)[0] for r in revs}
1430 1430
1431 1431 ui.pager(b'branches')
1432 1432 fm = ui.formatter(b'branches', opts)
1433 1433 hexfunc = fm.hexfunc
1434 1434
1435 1435 allheads = set(repo.heads())
1436 1436 branches = []
1437 1437 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1438 1438 if selectedbranches is not None and tag not in selectedbranches:
1439 1439 continue
1440 1440 isactive = False
1441 1441 if not isclosed:
1442 1442 openheads = set(repo.branchmap().iteropen(heads))
1443 1443 isactive = bool(openheads & allheads)
1444 1444 branches.append((tag, repo[tip], isactive, not isclosed))
1445 1445 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1446 1446
1447 1447 for tag, ctx, isactive, isopen in branches:
1448 1448 if active and not isactive:
1449 1449 continue
1450 1450 if isactive:
1451 1451 label = b'branches.active'
1452 1452 notice = b''
1453 1453 elif not isopen:
1454 1454 if not closed:
1455 1455 continue
1456 1456 label = b'branches.closed'
1457 1457 notice = _(b' (closed)')
1458 1458 else:
1459 1459 label = b'branches.inactive'
1460 1460 notice = _(b' (inactive)')
1461 1461 current = tag == repo.dirstate.branch()
1462 1462 if current:
1463 1463 label = b'branches.current'
1464 1464
1465 1465 fm.startitem()
1466 1466 fm.write(b'branch', b'%s', tag, label=label)
1467 1467 rev = ctx.rev()
1468 1468 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1469 1469 fmt = b' ' * padsize + b' %d:%s'
1470 1470 fm.condwrite(
1471 1471 not ui.quiet,
1472 1472 b'rev node',
1473 1473 fmt,
1474 1474 rev,
1475 1475 hexfunc(ctx.node()),
1476 1476 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1477 1477 )
1478 1478 fm.context(ctx=ctx)
1479 1479 fm.data(active=isactive, closed=not isopen, current=current)
1480 1480 if not ui.quiet:
1481 1481 fm.plain(notice)
1482 1482 fm.plain(b'\n')
1483 1483 fm.end()
1484 1484
1485 1485
1486 1486 @command(
1487 1487 b'bundle',
1488 1488 [
1489 1489 (
1490 1490 b'f',
1491 1491 b'force',
1492 1492 None,
1493 1493 _(b'run even when the destination is unrelated'),
1494 1494 ),
1495 1495 (
1496 1496 b'r',
1497 1497 b'rev',
1498 1498 [],
1499 1499 _(b'a changeset intended to be added to the destination'),
1500 1500 _(b'REV'),
1501 1501 ),
1502 1502 (
1503 1503 b'b',
1504 1504 b'branch',
1505 1505 [],
1506 1506 _(b'a specific branch you would like to bundle'),
1507 1507 _(b'BRANCH'),
1508 1508 ),
1509 1509 (
1510 1510 b'',
1511 1511 b'base',
1512 1512 [],
1513 1513 _(b'a base changeset assumed to be available at the destination'),
1514 1514 _(b'REV'),
1515 1515 ),
1516 1516 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1517 1517 (
1518 1518 b't',
1519 1519 b'type',
1520 1520 b'bzip2',
1521 1521 _(b'bundle compression type to use'),
1522 1522 _(b'TYPE'),
1523 1523 ),
1524 1524 ]
1525 1525 + remoteopts,
1526 1526 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1527 1527 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1528 1528 )
1529 1529 def bundle(ui, repo, fname, *dests, **opts):
1530 1530 """create a bundle file
1531 1531
1532 1532 Generate a bundle file containing data to be transferred to another
1533 1533 repository.
1534 1534
1535 1535 To create a bundle containing all changesets, use -a/--all
1536 1536 (or --base null). Otherwise, hg assumes the destination will have
1537 1537 all the nodes you specify with --base parameters. Otherwise, hg
1538 1538 will assume the repository has all the nodes in destination, or
1539 1539 default-push/default if no destination is specified, where destination
1540 1540 is the repositories you provide through DEST option.
1541 1541
1542 1542 You can change bundle format with the -t/--type option. See
1543 1543 :hg:`help bundlespec` for documentation on this format. By default,
1544 1544 the most appropriate format is used and compression defaults to
1545 1545 bzip2.
1546 1546
1547 1547 The bundle file can then be transferred using conventional means
1548 1548 and applied to another repository with the unbundle or pull
1549 1549 command. This is useful when direct push and pull are not
1550 1550 available or when exporting an entire repository is undesirable.
1551 1551
1552 1552 Applying bundles preserves all changeset contents including
1553 1553 permissions, copy/rename information, and revision history.
1554 1554
1555 1555 Returns 0 on success, 1 if no changes found.
1556 1556 """
1557 1557 opts = pycompat.byteskwargs(opts)
1558 1558 revs = None
1559 1559 if b'rev' in opts:
1560 1560 revstrings = opts[b'rev']
1561 1561 revs = logcmdutil.revrange(repo, revstrings)
1562 1562 if revstrings and not revs:
1563 1563 raise error.InputError(_(b'no commits to bundle'))
1564 1564
1565 1565 bundletype = opts.get(b'type', b'bzip2').lower()
1566 1566 try:
1567 1567 bundlespec = bundlecaches.parsebundlespec(
1568 1568 repo, bundletype, strict=False
1569 1569 )
1570 1570 except error.UnsupportedBundleSpecification as e:
1571 1571 raise error.InputError(
1572 1572 pycompat.bytestr(e),
1573 1573 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1574 1574 )
1575 1575 cgversion = bundlespec.contentopts[b"cg.version"]
1576 1576
1577 1577 # Packed bundles are a pseudo bundle format for now.
1578 1578 if cgversion == b's1':
1579 1579 raise error.InputError(
1580 1580 _(b'packed bundles cannot be produced by "hg bundle"'),
1581 1581 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1582 1582 )
1583 1583
1584 1584 if opts.get(b'all'):
1585 1585 if dests:
1586 1586 raise error.InputError(
1587 1587 _(b"--all is incompatible with specifying destinations")
1588 1588 )
1589 1589 if opts.get(b'base'):
1590 1590 ui.warn(_(b"ignoring --base because --all was specified\n"))
1591 1591 base = [nullrev]
1592 1592 else:
1593 1593 base = logcmdutil.revrange(repo, opts.get(b'base'))
1594 1594 if cgversion not in changegroup.supportedoutgoingversions(repo):
1595 1595 raise error.Abort(
1596 1596 _(b"repository does not support bundle version %s") % cgversion
1597 1597 )
1598 1598
1599 1599 if base:
1600 1600 if dests:
1601 1601 raise error.InputError(
1602 1602 _(b"--base is incompatible with specifying destinations")
1603 1603 )
1604 1604 common = [repo[rev].node() for rev in base]
1605 1605 heads = [repo[r].node() for r in revs] if revs else None
1606 1606 outgoing = discovery.outgoing(repo, common, heads)
1607 1607 missing = outgoing.missing
1608 1608 excluded = outgoing.excluded
1609 1609 else:
1610 1610 missing = set()
1611 1611 excluded = set()
1612 1612 for path in urlutil.get_push_paths(repo, ui, dests):
1613 1613 other = hg.peer(repo, opts, path.rawloc)
1614 1614 if revs is not None:
1615 1615 hex_revs = [repo[r].hex() for r in revs]
1616 1616 else:
1617 1617 hex_revs = None
1618 1618 branches = (path.branch, [])
1619 1619 head_revs, checkout = hg.addbranchrevs(
1620 1620 repo, repo, branches, hex_revs
1621 1621 )
1622 1622 heads = (
1623 1623 head_revs
1624 1624 and pycompat.maplist(repo.lookup, head_revs)
1625 1625 or head_revs
1626 1626 )
1627 1627 outgoing = discovery.findcommonoutgoing(
1628 1628 repo,
1629 1629 other,
1630 1630 onlyheads=heads,
1631 1631 force=opts.get(b'force'),
1632 1632 portable=True,
1633 1633 )
1634 1634 missing.update(outgoing.missing)
1635 1635 excluded.update(outgoing.excluded)
1636 1636
1637 1637 if not missing:
1638 1638 scmutil.nochangesfound(ui, repo, not base and excluded)
1639 1639 return 1
1640 1640
1641 1641 if heads:
1642 1642 outgoing = discovery.outgoing(
1643 1643 repo, missingroots=missing, ancestorsof=heads
1644 1644 )
1645 1645 else:
1646 1646 outgoing = discovery.outgoing(repo, missingroots=missing)
1647 1647 outgoing.excluded = sorted(excluded)
1648 1648
1649 1649 if cgversion == b'01': # bundle1
1650 1650 bversion = b'HG10' + bundlespec.wirecompression
1651 1651 bcompression = None
1652 1652 elif cgversion in (b'02', b'03'):
1653 1653 bversion = b'HG20'
1654 1654 bcompression = bundlespec.wirecompression
1655 1655 else:
1656 1656 raise error.ProgrammingError(
1657 1657 b'bundle: unexpected changegroup version %s' % cgversion
1658 1658 )
1659 1659
1660 1660 # TODO compression options should be derived from bundlespec parsing.
1661 1661 # This is a temporary hack to allow adjusting bundle compression
1662 1662 # level without a) formalizing the bundlespec changes to declare it
1663 1663 # b) introducing a command flag.
1664 1664 compopts = {}
1665 1665 complevel = ui.configint(
1666 1666 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1667 1667 )
1668 1668 if complevel is None:
1669 1669 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1670 1670 if complevel is not None:
1671 1671 compopts[b'level'] = complevel
1672 1672
1673 1673 compthreads = ui.configint(
1674 1674 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1675 1675 )
1676 1676 if compthreads is None:
1677 1677 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1678 1678 if compthreads is not None:
1679 1679 compopts[b'threads'] = compthreads
1680 1680
1681 1681 # Bundling of obsmarker and phases is optional as not all clients
1682 1682 # support the necessary features.
1683 1683 cfg = ui.configbool
1684 1684 contentopts = {
1685 1685 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1686 1686 b'obsolescence-mandatory': cfg(
1687 1687 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1688 1688 ),
1689 1689 b'phases': cfg(b'experimental', b'bundle-phases'),
1690 1690 }
1691 1691 bundlespec.contentopts.update(contentopts)
1692 1692
1693 1693 bundle2.writenewbundle(
1694 1694 ui,
1695 1695 repo,
1696 1696 b'bundle',
1697 1697 fname,
1698 1698 bversion,
1699 1699 outgoing,
1700 1700 bundlespec.contentopts,
1701 1701 compression=bcompression,
1702 1702 compopts=compopts,
1703 1703 )
1704 1704
1705 1705
1706 1706 @command(
1707 1707 b'cat',
1708 1708 [
1709 1709 (
1710 1710 b'o',
1711 1711 b'output',
1712 1712 b'',
1713 1713 _(b'print output to file with formatted name'),
1714 1714 _(b'FORMAT'),
1715 1715 ),
1716 1716 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1717 1717 (b'', b'decode', None, _(b'apply any matching decode filter')),
1718 1718 ]
1719 1719 + walkopts
1720 1720 + formatteropts,
1721 1721 _(b'[OPTION]... FILE...'),
1722 1722 helpcategory=command.CATEGORY_FILE_CONTENTS,
1723 1723 inferrepo=True,
1724 1724 intents={INTENT_READONLY},
1725 1725 )
1726 1726 def cat(ui, repo, file1, *pats, **opts):
1727 1727 """output the current or given revision of files
1728 1728
1729 1729 Print the specified files as they were at the given revision. If
1730 1730 no revision is given, the parent of the working directory is used.
1731 1731
1732 1732 Output may be to a file, in which case the name of the file is
1733 1733 given using a template string. See :hg:`help templates`. In addition
1734 1734 to the common template keywords, the following formatting rules are
1735 1735 supported:
1736 1736
1737 1737 :``%%``: literal "%" character
1738 1738 :``%s``: basename of file being printed
1739 1739 :``%d``: dirname of file being printed, or '.' if in repository root
1740 1740 :``%p``: root-relative path name of file being printed
1741 1741 :``%H``: changeset hash (40 hexadecimal digits)
1742 1742 :``%R``: changeset revision number
1743 1743 :``%h``: short-form changeset hash (12 hexadecimal digits)
1744 1744 :``%r``: zero-padded changeset revision number
1745 1745 :``%b``: basename of the exporting repository
1746 1746 :``\\``: literal "\\" character
1747 1747
1748 1748 .. container:: verbose
1749 1749
1750 1750 Template:
1751 1751
1752 1752 The following keywords are supported in addition to the common template
1753 1753 keywords and functions. See also :hg:`help templates`.
1754 1754
1755 1755 :data: String. File content.
1756 1756 :path: String. Repository-absolute path of the file.
1757 1757
1758 1758 Returns 0 on success.
1759 1759 """
1760 1760 opts = pycompat.byteskwargs(opts)
1761 1761 rev = opts.get(b'rev')
1762 1762 if rev:
1763 1763 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1764 1764 ctx = logcmdutil.revsingle(repo, rev)
1765 1765 m = scmutil.match(ctx, (file1,) + pats, opts)
1766 1766 fntemplate = opts.pop(b'output', b'')
1767 1767 if cmdutil.isstdiofilename(fntemplate):
1768 1768 fntemplate = b''
1769 1769
1770 1770 if fntemplate:
1771 1771 fm = formatter.nullformatter(ui, b'cat', opts)
1772 1772 else:
1773 1773 ui.pager(b'cat')
1774 1774 fm = ui.formatter(b'cat', opts)
1775 1775 with fm:
1776 1776 return cmdutil.cat(
1777 1777 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1778 1778 )
1779 1779
1780 1780
1781 1781 @command(
1782 1782 b'clone',
1783 1783 [
1784 1784 (
1785 1785 b'U',
1786 1786 b'noupdate',
1787 1787 None,
1788 1788 _(
1789 1789 b'the clone will include an empty working '
1790 1790 b'directory (only a repository)'
1791 1791 ),
1792 1792 ),
1793 1793 (
1794 1794 b'u',
1795 1795 b'updaterev',
1796 1796 b'',
1797 1797 _(b'revision, tag, or branch to check out'),
1798 1798 _(b'REV'),
1799 1799 ),
1800 1800 (
1801 1801 b'r',
1802 1802 b'rev',
1803 1803 [],
1804 1804 _(
1805 1805 b'do not clone everything, but include this changeset'
1806 1806 b' and its ancestors'
1807 1807 ),
1808 1808 _(b'REV'),
1809 1809 ),
1810 1810 (
1811 1811 b'b',
1812 1812 b'branch',
1813 1813 [],
1814 1814 _(
1815 1815 b'do not clone everything, but include this branch\'s'
1816 1816 b' changesets and their ancestors'
1817 1817 ),
1818 1818 _(b'BRANCH'),
1819 1819 ),
1820 1820 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1821 1821 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1822 1822 (b'', b'stream', None, _(b'clone with minimal data processing')),
1823 1823 ]
1824 1824 + remoteopts,
1825 1825 _(b'[OPTION]... SOURCE [DEST]'),
1826 1826 helpcategory=command.CATEGORY_REPO_CREATION,
1827 1827 helpbasic=True,
1828 1828 norepo=True,
1829 1829 )
1830 1830 def clone(ui, source, dest=None, **opts):
1831 1831 """make a copy of an existing repository
1832 1832
1833 1833 Create a copy of an existing repository in a new directory.
1834 1834
1835 1835 If no destination directory name is specified, it defaults to the
1836 1836 basename of the source.
1837 1837
1838 1838 The location of the source is added to the new repository's
1839 1839 ``.hg/hgrc`` file, as the default to be used for future pulls.
1840 1840
1841 1841 Only local paths and ``ssh://`` URLs are supported as
1842 1842 destinations. For ``ssh://`` destinations, no working directory or
1843 1843 ``.hg/hgrc`` will be created on the remote side.
1844 1844
1845 1845 If the source repository has a bookmark called '@' set, that
1846 1846 revision will be checked out in the new repository by default.
1847 1847
1848 1848 To check out a particular version, use -u/--update, or
1849 1849 -U/--noupdate to create a clone with no working directory.
1850 1850
1851 1851 To pull only a subset of changesets, specify one or more revisions
1852 1852 identifiers with -r/--rev or branches with -b/--branch. The
1853 1853 resulting clone will contain only the specified changesets and
1854 1854 their ancestors. These options (or 'clone src#rev dest') imply
1855 1855 --pull, even for local source repositories.
1856 1856
1857 1857 In normal clone mode, the remote normalizes repository data into a common
1858 1858 exchange format and the receiving end translates this data into its local
1859 1859 storage format. --stream activates a different clone mode that essentially
1860 1860 copies repository files from the remote with minimal data processing. This
1861 1861 significantly reduces the CPU cost of a clone both remotely and locally.
1862 1862 However, it often increases the transferred data size by 30-40%. This can
1863 1863 result in substantially faster clones where I/O throughput is plentiful,
1864 1864 especially for larger repositories. A side-effect of --stream clones is
1865 1865 that storage settings and requirements on the remote are applied locally:
1866 1866 a modern client may inherit legacy or inefficient storage used by the
1867 1867 remote or a legacy Mercurial client may not be able to clone from a
1868 1868 modern Mercurial remote.
1869 1869
1870 1870 .. note::
1871 1871
1872 1872 Specifying a tag will include the tagged changeset but not the
1873 1873 changeset containing the tag.
1874 1874
1875 1875 .. container:: verbose
1876 1876
1877 1877 For efficiency, hardlinks are used for cloning whenever the
1878 1878 source and destination are on the same filesystem (note this
1879 1879 applies only to the repository data, not to the working
1880 1880 directory). Some filesystems, such as AFS, implement hardlinking
1881 1881 incorrectly, but do not report errors. In these cases, use the
1882 1882 --pull option to avoid hardlinking.
1883 1883
1884 1884 Mercurial will update the working directory to the first applicable
1885 1885 revision from this list:
1886 1886
1887 1887 a) null if -U or the source repository has no changesets
1888 1888 b) if -u . and the source repository is local, the first parent of
1889 1889 the source repository's working directory
1890 1890 c) the changeset specified with -u (if a branch name, this means the
1891 1891 latest head of that branch)
1892 1892 d) the changeset specified with -r
1893 1893 e) the tipmost head specified with -b
1894 1894 f) the tipmost head specified with the url#branch source syntax
1895 1895 g) the revision marked with the '@' bookmark, if present
1896 1896 h) the tipmost head of the default branch
1897 1897 i) tip
1898 1898
1899 1899 When cloning from servers that support it, Mercurial may fetch
1900 1900 pre-generated data from a server-advertised URL or inline from the
1901 1901 same stream. When this is done, hooks operating on incoming changesets
1902 1902 and changegroups may fire more than once, once for each pre-generated
1903 1903 bundle and as well as for any additional remaining data. In addition,
1904 1904 if an error occurs, the repository may be rolled back to a partial
1905 1905 clone. This behavior may change in future releases.
1906 1906 See :hg:`help -e clonebundles` for more.
1907 1907
1908 1908 Examples:
1909 1909
1910 1910 - clone a remote repository to a new directory named hg/::
1911 1911
1912 1912 hg clone https://www.mercurial-scm.org/repo/hg/
1913 1913
1914 1914 - create a lightweight local clone::
1915 1915
1916 1916 hg clone project/ project-feature/
1917 1917
1918 1918 - clone from an absolute path on an ssh server (note double-slash)::
1919 1919
1920 1920 hg clone ssh://user@server//home/projects/alpha/
1921 1921
1922 1922 - do a streaming clone while checking out a specified version::
1923 1923
1924 1924 hg clone --stream http://server/repo -u 1.5
1925 1925
1926 1926 - create a repository without changesets after a particular revision::
1927 1927
1928 1928 hg clone -r 04e544 experimental/ good/
1929 1929
1930 1930 - clone (and track) a particular named branch::
1931 1931
1932 1932 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1933 1933
1934 1934 See :hg:`help urls` for details on specifying URLs.
1935 1935
1936 1936 Returns 0 on success.
1937 1937 """
1938 1938 opts = pycompat.byteskwargs(opts)
1939 1939 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1940 1940
1941 1941 # --include/--exclude can come from narrow or sparse.
1942 1942 includepats, excludepats = None, None
1943 1943
1944 1944 # hg.clone() differentiates between None and an empty set. So make sure
1945 1945 # patterns are sets if narrow is requested without patterns.
1946 1946 if opts.get(b'narrow'):
1947 1947 includepats = set()
1948 1948 excludepats = set()
1949 1949
1950 1950 if opts.get(b'include'):
1951 1951 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1952 1952 if opts.get(b'exclude'):
1953 1953 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1954 1954
1955 1955 r = hg.clone(
1956 1956 ui,
1957 1957 opts,
1958 1958 source,
1959 1959 dest,
1960 1960 pull=opts.get(b'pull'),
1961 1961 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1962 1962 revs=opts.get(b'rev'),
1963 1963 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1964 1964 branch=opts.get(b'branch'),
1965 1965 shareopts=opts.get(b'shareopts'),
1966 1966 storeincludepats=includepats,
1967 1967 storeexcludepats=excludepats,
1968 1968 depth=opts.get(b'depth') or None,
1969 1969 )
1970 1970
1971 1971 return r is None
1972 1972
1973 1973
1974 1974 @command(
1975 1975 b'commit|ci',
1976 1976 [
1977 1977 (
1978 1978 b'A',
1979 1979 b'addremove',
1980 1980 None,
1981 1981 _(b'mark new/missing files as added/removed before committing'),
1982 1982 ),
1983 1983 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1984 1984 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1985 1985 (b's', b'secret', None, _(b'use the secret phase for committing')),
1986 1986 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1987 1987 (
1988 1988 b'',
1989 1989 b'force-close-branch',
1990 1990 None,
1991 1991 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1992 1992 ),
1993 1993 (b'i', b'interactive', None, _(b'use interactive mode')),
1994 1994 ]
1995 1995 + walkopts
1996 1996 + commitopts
1997 1997 + commitopts2
1998 1998 + subrepoopts,
1999 1999 _(b'[OPTION]... [FILE]...'),
2000 2000 helpcategory=command.CATEGORY_COMMITTING,
2001 2001 helpbasic=True,
2002 2002 inferrepo=True,
2003 2003 )
2004 2004 def commit(ui, repo, *pats, **opts):
2005 2005 """commit the specified files or all outstanding changes
2006 2006
2007 2007 Commit changes to the given files into the repository. Unlike a
2008 2008 centralized SCM, this operation is a local operation. See
2009 2009 :hg:`push` for a way to actively distribute your changes.
2010 2010
2011 2011 If a list of files is omitted, all changes reported by :hg:`status`
2012 2012 will be committed.
2013 2013
2014 2014 If you are committing the result of a merge, do not provide any
2015 2015 filenames or -I/-X filters.
2016 2016
2017 2017 If no commit message is specified, Mercurial starts your
2018 2018 configured editor where you can enter a message. In case your
2019 2019 commit fails, you will find a backup of your message in
2020 2020 ``.hg/last-message.txt``.
2021 2021
2022 2022 The --close-branch flag can be used to mark the current branch
2023 2023 head closed. When all heads of a branch are closed, the branch
2024 2024 will be considered closed and no longer listed.
2025 2025
2026 2026 The --amend flag can be used to amend the parent of the
2027 2027 working directory with a new commit that contains the changes
2028 2028 in the parent in addition to those currently reported by :hg:`status`,
2029 2029 if there are any. The old commit is stored in a backup bundle in
2030 2030 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2031 2031 on how to restore it).
2032 2032
2033 2033 Message, user and date are taken from the amended commit unless
2034 2034 specified. When a message isn't specified on the command line,
2035 2035 the editor will open with the message of the amended commit.
2036 2036
2037 2037 It is not possible to amend public changesets (see :hg:`help phases`)
2038 2038 or changesets that have children.
2039 2039
2040 2040 See :hg:`help dates` for a list of formats valid for -d/--date.
2041 2041
2042 2042 Returns 0 on success, 1 if nothing changed.
2043 2043
2044 2044 .. container:: verbose
2045 2045
2046 2046 Examples:
2047 2047
2048 2048 - commit all files ending in .py::
2049 2049
2050 2050 hg commit --include "set:**.py"
2051 2051
2052 2052 - commit all non-binary files::
2053 2053
2054 2054 hg commit --exclude "set:binary()"
2055 2055
2056 2056 - amend the current commit and set the date to now::
2057 2057
2058 2058 hg commit --amend --date now
2059 2059 """
2060 2060 with repo.wlock(), repo.lock():
2061 2061 return _docommit(ui, repo, *pats, **opts)
2062 2062
2063 2063
2064 2064 def _docommit(ui, repo, *pats, **opts):
2065 2065 if opts.get('interactive'):
2066 2066 opts.pop('interactive')
2067 2067 ret = cmdutil.dorecord(
2068 2068 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2069 2069 )
2070 2070 # ret can be 0 (no changes to record) or the value returned by
2071 2071 # commit(), 1 if nothing changed or None on success.
2072 2072 return 1 if ret == 0 else ret
2073 2073
2074 2074 if opts.get('subrepos'):
2075 2075 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2076 2076 # Let --subrepos on the command line override config setting.
2077 2077 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2078 2078
2079 2079 cmdutil.checkunfinished(repo, commit=True)
2080 2080
2081 2081 branch = repo[None].branch()
2082 2082 bheads = repo.branchheads(branch)
2083 2083 tip = repo.changelog.tip()
2084 2084
2085 2085 extra = {}
2086 2086 if opts.get('close_branch') or opts.get('force_close_branch'):
2087 2087 extra[b'close'] = b'1'
2088 2088
2089 2089 if repo[b'.'].closesbranch():
2090 2090 raise error.InputError(
2091 2091 _(b'current revision is already a branch closing head')
2092 2092 )
2093 2093 elif not bheads:
2094 2094 raise error.InputError(
2095 2095 _(b'branch "%s" has no heads to close') % branch
2096 2096 )
2097 2097 elif (
2098 2098 branch == repo[b'.'].branch()
2099 2099 and repo[b'.'].node() not in bheads
2100 2100 and not opts.get('force_close_branch')
2101 2101 ):
2102 2102 hint = _(
2103 2103 b'use --force-close-branch to close branch from a non-head'
2104 2104 b' changeset'
2105 2105 )
2106 2106 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2107 2107 elif opts.get('amend'):
2108 2108 if (
2109 2109 repo[b'.'].p1().branch() != branch
2110 2110 and repo[b'.'].p2().branch() != branch
2111 2111 ):
2112 2112 raise error.InputError(_(b'can only close branch heads'))
2113 2113
2114 2114 if opts.get('amend'):
2115 2115 if ui.configbool(b'ui', b'commitsubrepos'):
2116 2116 raise error.InputError(
2117 2117 _(b'cannot amend with ui.commitsubrepos enabled')
2118 2118 )
2119 2119
2120 2120 old = repo[b'.']
2121 2121 rewriteutil.precheck(repo, [old.rev()], b'amend')
2122 2122
2123 2123 # Currently histedit gets confused if an amend happens while histedit
2124 2124 # is in progress. Since we have a checkunfinished command, we are
2125 2125 # temporarily honoring it.
2126 2126 #
2127 2127 # Note: eventually this guard will be removed. Please do not expect
2128 2128 # this behavior to remain.
2129 2129 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2130 2130 cmdutil.checkunfinished(repo)
2131 2131
2132 2132 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2133 2133 opts = pycompat.byteskwargs(opts)
2134 2134 if node == old.node():
2135 2135 ui.status(_(b"nothing changed\n"))
2136 2136 return 1
2137 2137 else:
2138 2138
2139 2139 def commitfunc(ui, repo, message, match, opts):
2140 2140 overrides = {}
2141 2141 if opts.get(b'secret'):
2142 2142 overrides[(b'phases', b'new-commit')] = b'secret'
2143 2143
2144 2144 baseui = repo.baseui
2145 2145 with baseui.configoverride(overrides, b'commit'):
2146 2146 with ui.configoverride(overrides, b'commit'):
2147 2147 editform = cmdutil.mergeeditform(
2148 2148 repo[None], b'commit.normal'
2149 2149 )
2150 2150 editor = cmdutil.getcommiteditor(
2151 2151 editform=editform, **pycompat.strkwargs(opts)
2152 2152 )
2153 2153 return repo.commit(
2154 2154 message,
2155 2155 opts.get(b'user'),
2156 2156 opts.get(b'date'),
2157 2157 match,
2158 2158 editor=editor,
2159 2159 extra=extra,
2160 2160 )
2161 2161
2162 2162 opts = pycompat.byteskwargs(opts)
2163 2163 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2164 2164
2165 2165 if not node:
2166 2166 stat = cmdutil.postcommitstatus(repo, pats, opts)
2167 2167 if stat.deleted:
2168 2168 ui.status(
2169 2169 _(
2170 2170 b"nothing changed (%d missing files, see "
2171 2171 b"'hg status')\n"
2172 2172 )
2173 2173 % len(stat.deleted)
2174 2174 )
2175 2175 else:
2176 2176 ui.status(_(b"nothing changed\n"))
2177 2177 return 1
2178 2178
2179 2179 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2180 2180
2181 2181 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2182 2182 status(
2183 2183 ui,
2184 2184 repo,
2185 2185 modified=True,
2186 2186 added=True,
2187 2187 removed=True,
2188 2188 deleted=True,
2189 2189 unknown=True,
2190 2190 subrepos=opts.get(b'subrepos'),
2191 2191 )
2192 2192
2193 2193
2194 2194 @command(
2195 2195 b'config|showconfig|debugconfig',
2196 2196 [
2197 2197 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2198 2198 # This is experimental because we need
2199 2199 # * reasonable behavior around aliases,
2200 2200 # * decide if we display [debug] [experimental] and [devel] section par
2201 2201 # default
2202 2202 # * some way to display "generic" config entry (the one matching
2203 2203 # regexp,
2204 2204 # * proper display of the different value type
2205 2205 # * a better way to handle <DYNAMIC> values (and variable types),
2206 2206 # * maybe some type information ?
2207 2207 (
2208 2208 b'',
2209 2209 b'exp-all-known',
2210 2210 None,
2211 2211 _(b'show all known config option (EXPERIMENTAL)'),
2212 2212 ),
2213 2213 (b'e', b'edit', None, _(b'edit user config')),
2214 2214 (b'l', b'local', None, _(b'edit repository config')),
2215 2215 (b'', b'source', None, _(b'show source of configuration value')),
2216 2216 (
2217 2217 b'',
2218 2218 b'shared',
2219 2219 None,
2220 2220 _(b'edit shared source repository config (EXPERIMENTAL)'),
2221 2221 ),
2222 2222 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2223 2223 (b'g', b'global', None, _(b'edit global config')),
2224 2224 ]
2225 2225 + formatteropts,
2226 2226 _(b'[-u] [NAME]...'),
2227 2227 helpcategory=command.CATEGORY_HELP,
2228 2228 optionalrepo=True,
2229 2229 intents={INTENT_READONLY},
2230 2230 )
2231 2231 def config(ui, repo, *values, **opts):
2232 2232 """show combined config settings from all hgrc files
2233 2233
2234 2234 With no arguments, print names and values of all config items.
2235 2235
2236 2236 With one argument of the form section.name, print just the value
2237 2237 of that config item.
2238 2238
2239 2239 With multiple arguments, print names and values of all config
2240 2240 items with matching section names or section.names.
2241 2241
2242 2242 With --edit, start an editor on the user-level config file. With
2243 2243 --global, edit the system-wide config file. With --local, edit the
2244 2244 repository-level config file.
2245 2245
2246 2246 With --source, the source (filename and line number) is printed
2247 2247 for each config item.
2248 2248
2249 2249 See :hg:`help config` for more information about config files.
2250 2250
2251 2251 .. container:: verbose
2252 2252
2253 2253 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2254 2254 This file is not shared across shares when in share-safe mode.
2255 2255
2256 2256 Template:
2257 2257
2258 2258 The following keywords are supported. See also :hg:`help templates`.
2259 2259
2260 2260 :name: String. Config name.
2261 2261 :source: String. Filename and line number where the item is defined.
2262 2262 :value: String. Config value.
2263 2263
2264 2264 The --shared flag can be used to edit the config file of shared source
2265 2265 repository. It only works when you have shared using the experimental
2266 2266 share safe feature.
2267 2267
2268 2268 Returns 0 on success, 1 if NAME does not exist.
2269 2269
2270 2270 """
2271 2271
2272 2272 opts = pycompat.byteskwargs(opts)
2273 2273 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2274 2274 if any(opts.get(o) for o in editopts):
2275 2275 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2276 2276 if opts.get(b'local'):
2277 2277 if not repo:
2278 2278 raise error.InputError(
2279 2279 _(b"can't use --local outside a repository")
2280 2280 )
2281 2281 paths = [repo.vfs.join(b'hgrc')]
2282 2282 elif opts.get(b'global'):
2283 2283 paths = rcutil.systemrcpath()
2284 2284 elif opts.get(b'shared'):
2285 2285 if not repo.shared():
2286 2286 raise error.InputError(
2287 2287 _(b"repository is not shared; can't use --shared")
2288 2288 )
2289 2289 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2290 2290 raise error.InputError(
2291 2291 _(
2292 2292 b"share safe feature not enabled; "
2293 2293 b"unable to edit shared source repository config"
2294 2294 )
2295 2295 )
2296 2296 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2297 2297 elif opts.get(b'non_shared'):
2298 2298 paths = [repo.vfs.join(b'hgrc-not-shared')]
2299 2299 else:
2300 2300 paths = rcutil.userrcpath()
2301 2301
2302 2302 for f in paths:
2303 2303 if os.path.exists(f):
2304 2304 break
2305 2305 else:
2306 2306 if opts.get(b'global'):
2307 2307 samplehgrc = uimod.samplehgrcs[b'global']
2308 2308 elif opts.get(b'local'):
2309 2309 samplehgrc = uimod.samplehgrcs[b'local']
2310 2310 else:
2311 2311 samplehgrc = uimod.samplehgrcs[b'user']
2312 2312
2313 2313 f = paths[0]
2314 2314 fp = open(f, b"wb")
2315 2315 fp.write(util.tonativeeol(samplehgrc))
2316 2316 fp.close()
2317 2317
2318 2318 editor = ui.geteditor()
2319 2319 ui.system(
2320 2320 b"%s \"%s\"" % (editor, f),
2321 2321 onerr=error.InputError,
2322 2322 errprefix=_(b"edit failed"),
2323 2323 blockedtag=b'config_edit',
2324 2324 )
2325 2325 return
2326 2326 ui.pager(b'config')
2327 2327 fm = ui.formatter(b'config', opts)
2328 2328 for t, f in rcutil.rccomponents():
2329 2329 if t == b'path':
2330 2330 ui.debug(b'read config from: %s\n' % f)
2331 2331 elif t == b'resource':
2332 2332 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2333 2333 elif t == b'items':
2334 2334 # Don't print anything for 'items'.
2335 2335 pass
2336 2336 else:
2337 2337 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2338 2338 untrusted = bool(opts.get(b'untrusted'))
2339 2339
2340 2340 selsections = selentries = []
2341 2341 if values:
2342 2342 selsections = [v for v in values if b'.' not in v]
2343 2343 selentries = [v for v in values if b'.' in v]
2344 2344 uniquesel = len(selentries) == 1 and not selsections
2345 2345 selsections = set(selsections)
2346 2346 selentries = set(selentries)
2347 2347
2348 2348 matched = False
2349 2349 all_known = opts[b'exp_all_known']
2350 2350 show_source = ui.debugflag or opts.get(b'source')
2351 2351 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2352 2352 for section, name, value in entries:
2353 2353 source = ui.configsource(section, name, untrusted)
2354 2354 value = pycompat.bytestr(value)
2355 2355 defaultvalue = ui.configdefault(section, name)
2356 2356 if fm.isplain():
2357 2357 source = source or b'none'
2358 2358 value = value.replace(b'\n', b'\\n')
2359 2359 entryname = section + b'.' + name
2360 2360 if values and not (section in selsections or entryname in selentries):
2361 2361 continue
2362 2362 fm.startitem()
2363 2363 fm.condwrite(show_source, b'source', b'%s: ', source)
2364 2364 if uniquesel:
2365 2365 fm.data(name=entryname)
2366 2366 fm.write(b'value', b'%s\n', value)
2367 2367 else:
2368 2368 fm.write(b'name value', b'%s=%s\n', entryname, value)
2369 2369 if formatter.isprintable(defaultvalue):
2370 2370 fm.data(defaultvalue=defaultvalue)
2371 2371 elif isinstance(defaultvalue, list) and all(
2372 2372 formatter.isprintable(e) for e in defaultvalue
2373 2373 ):
2374 2374 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2375 2375 # TODO: no idea how to process unsupported defaultvalue types
2376 2376 matched = True
2377 2377 fm.end()
2378 2378 if matched:
2379 2379 return 0
2380 2380 return 1
2381 2381
2382 2382
2383 2383 @command(
2384 2384 b'continue',
2385 2385 dryrunopts,
2386 2386 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2387 2387 helpbasic=True,
2388 2388 )
2389 2389 def continuecmd(ui, repo, **opts):
2390 2390 """resumes an interrupted operation (EXPERIMENTAL)
2391 2391
2392 2392 Finishes a multistep operation like graft, histedit, rebase, merge,
2393 2393 and unshelve if they are in an interrupted state.
2394 2394
2395 2395 use --dry-run/-n to dry run the command.
2396 2396 """
2397 2397 dryrun = opts.get('dry_run')
2398 2398 contstate = cmdutil.getunfinishedstate(repo)
2399 2399 if not contstate:
2400 2400 raise error.StateError(_(b'no operation in progress'))
2401 2401 if not contstate.continuefunc:
2402 2402 raise error.StateError(
2403 2403 (
2404 2404 _(b"%s in progress but does not support 'hg continue'")
2405 2405 % (contstate._opname)
2406 2406 ),
2407 2407 hint=contstate.continuemsg(),
2408 2408 )
2409 2409 if dryrun:
2410 2410 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2411 2411 return
2412 2412 return contstate.continuefunc(ui, repo)
2413 2413
2414 2414
2415 2415 @command(
2416 2416 b'copy|cp',
2417 2417 [
2418 2418 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2419 2419 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2420 2420 (
2421 2421 b'',
2422 2422 b'at-rev',
2423 2423 b'',
2424 2424 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2425 2425 _(b'REV'),
2426 2426 ),
2427 2427 (
2428 2428 b'f',
2429 2429 b'force',
2430 2430 None,
2431 2431 _(b'forcibly copy over an existing managed file'),
2432 2432 ),
2433 2433 ]
2434 2434 + walkopts
2435 2435 + dryrunopts,
2436 2436 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2437 2437 helpcategory=command.CATEGORY_FILE_CONTENTS,
2438 2438 )
2439 2439 def copy(ui, repo, *pats, **opts):
2440 2440 """mark files as copied for the next commit
2441 2441
2442 2442 Mark dest as having copies of source files. If dest is a
2443 2443 directory, copies are put in that directory. If dest is a file,
2444 2444 the source must be a single file.
2445 2445
2446 2446 By default, this command copies the contents of files as they
2447 2447 exist in the working directory. If invoked with -A/--after, the
2448 2448 operation is recorded, but no copying is performed.
2449 2449
2450 2450 To undo marking a destination file as copied, use --forget. With that
2451 2451 option, all given (positional) arguments are unmarked as copies. The
2452 2452 destination file(s) will be left in place (still tracked). Note that
2453 2453 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2454 2454
2455 2455 This command takes effect with the next commit by default.
2456 2456
2457 2457 Returns 0 on success, 1 if errors are encountered.
2458 2458 """
2459 2459 opts = pycompat.byteskwargs(opts)
2460 2460 with repo.wlock():
2461 2461 return cmdutil.copy(ui, repo, pats, opts)
2462 2462
2463 2463
2464 2464 @command(
2465 2465 b'debugcommands',
2466 2466 [],
2467 2467 _(b'[COMMAND]'),
2468 2468 helpcategory=command.CATEGORY_HELP,
2469 2469 norepo=True,
2470 2470 )
2471 2471 def debugcommands(ui, cmd=b'', *args):
2472 2472 """list all available commands and options"""
2473 2473 for cmd, vals in sorted(pycompat.iteritems(table)):
2474 2474 cmd = cmd.split(b'|')[0]
2475 2475 opts = b', '.join([i[1] for i in vals[1]])
2476 2476 ui.write(b'%s: %s\n' % (cmd, opts))
2477 2477
2478 2478
2479 2479 @command(
2480 2480 b'debugcomplete',
2481 2481 [(b'o', b'options', None, _(b'show the command options'))],
2482 2482 _(b'[-o] CMD'),
2483 2483 helpcategory=command.CATEGORY_HELP,
2484 2484 norepo=True,
2485 2485 )
2486 2486 def debugcomplete(ui, cmd=b'', **opts):
2487 2487 """returns the completion list associated with the given command"""
2488 2488
2489 2489 if opts.get('options'):
2490 2490 options = []
2491 2491 otables = [globalopts]
2492 2492 if cmd:
2493 2493 aliases, entry = cmdutil.findcmd(cmd, table, False)
2494 2494 otables.append(entry[1])
2495 2495 for t in otables:
2496 2496 for o in t:
2497 2497 if b"(DEPRECATED)" in o[3]:
2498 2498 continue
2499 2499 if o[0]:
2500 2500 options.append(b'-%s' % o[0])
2501 2501 options.append(b'--%s' % o[1])
2502 2502 ui.write(b"%s\n" % b"\n".join(options))
2503 2503 return
2504 2504
2505 2505 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2506 2506 if ui.verbose:
2507 2507 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2508 2508 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2509 2509
2510 2510
2511 2511 @command(
2512 2512 b'diff',
2513 2513 [
2514 2514 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2515 2515 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2516 2516 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2517 2517 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2518 2518 ]
2519 2519 + diffopts
2520 2520 + diffopts2
2521 2521 + walkopts
2522 2522 + subrepoopts,
2523 2523 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2524 2524 helpcategory=command.CATEGORY_FILE_CONTENTS,
2525 2525 helpbasic=True,
2526 2526 inferrepo=True,
2527 2527 intents={INTENT_READONLY},
2528 2528 )
2529 2529 def diff(ui, repo, *pats, **opts):
2530 2530 """diff repository (or selected files)
2531 2531
2532 2532 Show differences between revisions for the specified files.
2533 2533
2534 2534 Differences between files are shown using the unified diff format.
2535 2535
2536 2536 .. note::
2537 2537
2538 2538 :hg:`diff` may generate unexpected results for merges, as it will
2539 2539 default to comparing against the working directory's first
2540 2540 parent changeset if no revisions are specified.
2541 2541
2542 2542 By default, the working directory files are compared to its first parent. To
2543 2543 see the differences from another revision, use --from. To see the difference
2544 2544 to another revision, use --to. For example, :hg:`diff --from .^` will show
2545 2545 the differences from the working copy's grandparent to the working copy,
2546 2546 :hg:`diff --to .` will show the diff from the working copy to its parent
2547 2547 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2548 2548 show the diff between those two revisions.
2549 2549
2550 2550 Alternatively you can specify -c/--change with a revision to see the changes
2551 2551 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2552 2552 equivalent to :hg:`diff --from 42^ --to 42`)
2553 2553
2554 2554 Without the -a/--text option, diff will avoid generating diffs of
2555 2555 files it detects as binary. With -a, diff will generate a diff
2556 2556 anyway, probably with undesirable results.
2557 2557
2558 2558 Use the -g/--git option to generate diffs in the git extended diff
2559 2559 format. For more information, read :hg:`help diffs`.
2560 2560
2561 2561 .. container:: verbose
2562 2562
2563 2563 Examples:
2564 2564
2565 2565 - compare a file in the current working directory to its parent::
2566 2566
2567 2567 hg diff foo.c
2568 2568
2569 2569 - compare two historical versions of a directory, with rename info::
2570 2570
2571 2571 hg diff --git --from 1.0 --to 1.2 lib/
2572 2572
2573 2573 - get change stats relative to the last change on some date::
2574 2574
2575 2575 hg diff --stat --from "date('may 2')"
2576 2576
2577 2577 - diff all newly-added files that contain a keyword::
2578 2578
2579 2579 hg diff "set:added() and grep(GNU)"
2580 2580
2581 2581 - compare a revision and its parents::
2582 2582
2583 2583 hg diff -c 9353 # compare against first parent
2584 2584 hg diff --from 9353^ --to 9353 # same using revset syntax
2585 2585 hg diff --from 9353^2 --to 9353 # compare against the second parent
2586 2586
2587 2587 Returns 0 on success.
2588 2588 """
2589 2589
2590 2590 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2591 2591 opts = pycompat.byteskwargs(opts)
2592 2592 revs = opts.get(b'rev')
2593 2593 change = opts.get(b'change')
2594 2594 from_rev = opts.get(b'from')
2595 2595 to_rev = opts.get(b'to')
2596 2596 stat = opts.get(b'stat')
2597 2597 reverse = opts.get(b'reverse')
2598 2598
2599 2599 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2600 2600 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2601 2601 if change:
2602 2602 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2603 2603 ctx2 = logcmdutil.revsingle(repo, change, None)
2604 2604 ctx1 = logcmdutil.diff_parent(ctx2)
2605 2605 elif from_rev or to_rev:
2606 2606 repo = scmutil.unhidehashlikerevs(
2607 2607 repo, [from_rev] + [to_rev], b'nowarn'
2608 2608 )
2609 2609 ctx1 = logcmdutil.revsingle(repo, from_rev, None)
2610 2610 ctx2 = logcmdutil.revsingle(repo, to_rev, None)
2611 2611 else:
2612 2612 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2613 2613 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
2614 2614
2615 2615 if reverse:
2616 2616 ctxleft = ctx2
2617 2617 ctxright = ctx1
2618 2618 else:
2619 2619 ctxleft = ctx1
2620 2620 ctxright = ctx2
2621 2621
2622 2622 diffopts = patch.diffallopts(ui, opts)
2623 2623 m = scmutil.match(ctx2, pats, opts)
2624 2624 m = repo.narrowmatch(m)
2625 2625 ui.pager(b'diff')
2626 2626 logcmdutil.diffordiffstat(
2627 2627 ui,
2628 2628 repo,
2629 2629 diffopts,
2630 2630 ctxleft,
2631 2631 ctxright,
2632 2632 m,
2633 2633 stat=stat,
2634 2634 listsubrepos=opts.get(b'subrepos'),
2635 2635 root=opts.get(b'root'),
2636 2636 )
2637 2637
2638 2638
2639 2639 @command(
2640 2640 b'export',
2641 2641 [
2642 2642 (
2643 2643 b'B',
2644 2644 b'bookmark',
2645 2645 b'',
2646 2646 _(b'export changes only reachable by given bookmark'),
2647 2647 _(b'BOOKMARK'),
2648 2648 ),
2649 2649 (
2650 2650 b'o',
2651 2651 b'output',
2652 2652 b'',
2653 2653 _(b'print output to file with formatted name'),
2654 2654 _(b'FORMAT'),
2655 2655 ),
2656 2656 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2657 2657 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2658 2658 ]
2659 2659 + diffopts
2660 2660 + formatteropts,
2661 2661 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2662 2662 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2663 2663 helpbasic=True,
2664 2664 intents={INTENT_READONLY},
2665 2665 )
2666 2666 def export(ui, repo, *changesets, **opts):
2667 2667 """dump the header and diffs for one or more changesets
2668 2668
2669 2669 Print the changeset header and diffs for one or more revisions.
2670 2670 If no revision is given, the parent of the working directory is used.
2671 2671
2672 2672 The information shown in the changeset header is: author, date,
2673 2673 branch name (if non-default), changeset hash, parent(s) and commit
2674 2674 comment.
2675 2675
2676 2676 .. note::
2677 2677
2678 2678 :hg:`export` may generate unexpected diff output for merge
2679 2679 changesets, as it will compare the merge changeset against its
2680 2680 first parent only.
2681 2681
2682 2682 Output may be to a file, in which case the name of the file is
2683 2683 given using a template string. See :hg:`help templates`. In addition
2684 2684 to the common template keywords, the following formatting rules are
2685 2685 supported:
2686 2686
2687 2687 :``%%``: literal "%" character
2688 2688 :``%H``: changeset hash (40 hexadecimal digits)
2689 2689 :``%N``: number of patches being generated
2690 2690 :``%R``: changeset revision number
2691 2691 :``%b``: basename of the exporting repository
2692 2692 :``%h``: short-form changeset hash (12 hexadecimal digits)
2693 2693 :``%m``: first line of the commit message (only alphanumeric characters)
2694 2694 :``%n``: zero-padded sequence number, starting at 1
2695 2695 :``%r``: zero-padded changeset revision number
2696 2696 :``\\``: literal "\\" character
2697 2697
2698 2698 Without the -a/--text option, export will avoid generating diffs
2699 2699 of files it detects as binary. With -a, export will generate a
2700 2700 diff anyway, probably with undesirable results.
2701 2701
2702 2702 With -B/--bookmark changesets reachable by the given bookmark are
2703 2703 selected.
2704 2704
2705 2705 Use the -g/--git option to generate diffs in the git extended diff
2706 2706 format. See :hg:`help diffs` for more information.
2707 2707
2708 2708 With the --switch-parent option, the diff will be against the
2709 2709 second parent. It can be useful to review a merge.
2710 2710
2711 2711 .. container:: verbose
2712 2712
2713 2713 Template:
2714 2714
2715 2715 The following keywords are supported in addition to the common template
2716 2716 keywords and functions. See also :hg:`help templates`.
2717 2717
2718 2718 :diff: String. Diff content.
2719 2719 :parents: List of strings. Parent nodes of the changeset.
2720 2720
2721 2721 Examples:
2722 2722
2723 2723 - use export and import to transplant a bugfix to the current
2724 2724 branch::
2725 2725
2726 2726 hg export -r 9353 | hg import -
2727 2727
2728 2728 - export all the changesets between two revisions to a file with
2729 2729 rename information::
2730 2730
2731 2731 hg export --git -r 123:150 > changes.txt
2732 2732
2733 2733 - split outgoing changes into a series of patches with
2734 2734 descriptive names::
2735 2735
2736 2736 hg export -r "outgoing()" -o "%n-%m.patch"
2737 2737
2738 2738 Returns 0 on success.
2739 2739 """
2740 2740 opts = pycompat.byteskwargs(opts)
2741 2741 bookmark = opts.get(b'bookmark')
2742 2742 changesets += tuple(opts.get(b'rev', []))
2743 2743
2744 2744 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2745 2745
2746 2746 if bookmark:
2747 2747 if bookmark not in repo._bookmarks:
2748 2748 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2749 2749
2750 2750 revs = scmutil.bookmarkrevs(repo, bookmark)
2751 2751 else:
2752 2752 if not changesets:
2753 2753 changesets = [b'.']
2754 2754
2755 2755 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2756 2756 revs = logcmdutil.revrange(repo, changesets)
2757 2757
2758 2758 if not revs:
2759 2759 raise error.InputError(_(b"export requires at least one changeset"))
2760 2760 if len(revs) > 1:
2761 2761 ui.note(_(b'exporting patches:\n'))
2762 2762 else:
2763 2763 ui.note(_(b'exporting patch:\n'))
2764 2764
2765 2765 fntemplate = opts.get(b'output')
2766 2766 if cmdutil.isstdiofilename(fntemplate):
2767 2767 fntemplate = b''
2768 2768
2769 2769 if fntemplate:
2770 2770 fm = formatter.nullformatter(ui, b'export', opts)
2771 2771 else:
2772 2772 ui.pager(b'export')
2773 2773 fm = ui.formatter(b'export', opts)
2774 2774 with fm:
2775 2775 cmdutil.export(
2776 2776 repo,
2777 2777 revs,
2778 2778 fm,
2779 2779 fntemplate=fntemplate,
2780 2780 switch_parent=opts.get(b'switch_parent'),
2781 2781 opts=patch.diffallopts(ui, opts),
2782 2782 )
2783 2783
2784 2784
2785 2785 @command(
2786 2786 b'files',
2787 2787 [
2788 2788 (
2789 2789 b'r',
2790 2790 b'rev',
2791 2791 b'',
2792 2792 _(b'search the repository as it is in REV'),
2793 2793 _(b'REV'),
2794 2794 ),
2795 2795 (
2796 2796 b'0',
2797 2797 b'print0',
2798 2798 None,
2799 2799 _(b'end filenames with NUL, for use with xargs'),
2800 2800 ),
2801 2801 ]
2802 2802 + walkopts
2803 2803 + formatteropts
2804 2804 + subrepoopts,
2805 2805 _(b'[OPTION]... [FILE]...'),
2806 2806 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2807 2807 intents={INTENT_READONLY},
2808 2808 )
2809 2809 def files(ui, repo, *pats, **opts):
2810 2810 """list tracked files
2811 2811
2812 2812 Print files under Mercurial control in the working directory or
2813 2813 specified revision for given files (excluding removed files).
2814 2814 Files can be specified as filenames or filesets.
2815 2815
2816 2816 If no files are given to match, this command prints the names
2817 2817 of all files under Mercurial control.
2818 2818
2819 2819 .. container:: verbose
2820 2820
2821 2821 Template:
2822 2822
2823 2823 The following keywords are supported in addition to the common template
2824 2824 keywords and functions. See also :hg:`help templates`.
2825 2825
2826 2826 :flags: String. Character denoting file's symlink and executable bits.
2827 2827 :path: String. Repository-absolute path of the file.
2828 2828 :size: Integer. Size of the file in bytes.
2829 2829
2830 2830 Examples:
2831 2831
2832 2832 - list all files under the current directory::
2833 2833
2834 2834 hg files .
2835 2835
2836 2836 - shows sizes and flags for current revision::
2837 2837
2838 2838 hg files -vr .
2839 2839
2840 2840 - list all files named README::
2841 2841
2842 2842 hg files -I "**/README"
2843 2843
2844 2844 - list all binary files::
2845 2845
2846 2846 hg files "set:binary()"
2847 2847
2848 2848 - find files containing a regular expression::
2849 2849
2850 2850 hg files "set:grep('bob')"
2851 2851
2852 2852 - search tracked file contents with xargs and grep::
2853 2853
2854 2854 hg files -0 | xargs -0 grep foo
2855 2855
2856 2856 See :hg:`help patterns` and :hg:`help filesets` for more information
2857 2857 on specifying file patterns.
2858 2858
2859 2859 Returns 0 if a match is found, 1 otherwise.
2860 2860
2861 2861 """
2862 2862
2863 2863 opts = pycompat.byteskwargs(opts)
2864 2864 rev = opts.get(b'rev')
2865 2865 if rev:
2866 2866 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2867 2867 ctx = logcmdutil.revsingle(repo, rev, None)
2868 2868
2869 2869 end = b'\n'
2870 2870 if opts.get(b'print0'):
2871 2871 end = b'\0'
2872 2872 fmt = b'%s' + end
2873 2873
2874 2874 m = scmutil.match(ctx, pats, opts)
2875 2875 ui.pager(b'files')
2876 2876 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2877 2877 with ui.formatter(b'files', opts) as fm:
2878 2878 return cmdutil.files(
2879 2879 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2880 2880 )
2881 2881
2882 2882
2883 2883 @command(
2884 2884 b'forget',
2885 2885 [
2886 2886 (b'i', b'interactive', None, _(b'use interactive mode')),
2887 2887 ]
2888 2888 + walkopts
2889 2889 + dryrunopts,
2890 2890 _(b'[OPTION]... FILE...'),
2891 2891 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2892 2892 helpbasic=True,
2893 2893 inferrepo=True,
2894 2894 )
2895 2895 def forget(ui, repo, *pats, **opts):
2896 2896 """forget the specified files on the next commit
2897 2897
2898 2898 Mark the specified files so they will no longer be tracked
2899 2899 after the next commit.
2900 2900
2901 2901 This only removes files from the current branch, not from the
2902 2902 entire project history, and it does not delete them from the
2903 2903 working directory.
2904 2904
2905 2905 To delete the file from the working directory, see :hg:`remove`.
2906 2906
2907 2907 To undo a forget before the next commit, see :hg:`add`.
2908 2908
2909 2909 .. container:: verbose
2910 2910
2911 2911 Examples:
2912 2912
2913 2913 - forget newly-added binary files::
2914 2914
2915 2915 hg forget "set:added() and binary()"
2916 2916
2917 2917 - forget files that would be excluded by .hgignore::
2918 2918
2919 2919 hg forget "set:hgignore()"
2920 2920
2921 2921 Returns 0 on success.
2922 2922 """
2923 2923
2924 2924 opts = pycompat.byteskwargs(opts)
2925 2925 if not pats:
2926 2926 raise error.InputError(_(b'no files specified'))
2927 2927
2928 2928 m = scmutil.match(repo[None], pats, opts)
2929 2929 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2930 2930 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2931 2931 rejected = cmdutil.forget(
2932 2932 ui,
2933 2933 repo,
2934 2934 m,
2935 2935 prefix=b"",
2936 2936 uipathfn=uipathfn,
2937 2937 explicitonly=False,
2938 2938 dryrun=dryrun,
2939 2939 interactive=interactive,
2940 2940 )[0]
2941 2941 return rejected and 1 or 0
2942 2942
2943 2943
2944 2944 @command(
2945 2945 b'graft',
2946 2946 [
2947 2947 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2948 2948 (
2949 2949 b'',
2950 2950 b'base',
2951 2951 b'',
2952 2952 _(b'base revision when doing the graft merge (ADVANCED)'),
2953 2953 _(b'REV'),
2954 2954 ),
2955 2955 (b'c', b'continue', False, _(b'resume interrupted graft')),
2956 2956 (b'', b'stop', False, _(b'stop interrupted graft')),
2957 2957 (b'', b'abort', False, _(b'abort interrupted graft')),
2958 2958 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2959 2959 (b'', b'log', None, _(b'append graft info to log message')),
2960 2960 (
2961 2961 b'',
2962 2962 b'no-commit',
2963 2963 None,
2964 2964 _(b"don't commit, just apply the changes in working directory"),
2965 2965 ),
2966 2966 (b'f', b'force', False, _(b'force graft')),
2967 2967 (
2968 2968 b'D',
2969 2969 b'currentdate',
2970 2970 False,
2971 2971 _(b'record the current date as commit date'),
2972 2972 ),
2973 2973 (
2974 2974 b'U',
2975 2975 b'currentuser',
2976 2976 False,
2977 2977 _(b'record the current user as committer'),
2978 2978 ),
2979 2979 ]
2980 2980 + commitopts2
2981 2981 + mergetoolopts
2982 2982 + dryrunopts,
2983 2983 _(b'[OPTION]... [-r REV]... REV...'),
2984 2984 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2985 2985 )
2986 2986 def graft(ui, repo, *revs, **opts):
2987 2987 """copy changes from other branches onto the current branch
2988 2988
2989 2989 This command uses Mercurial's merge logic to copy individual
2990 2990 changes from other branches without merging branches in the
2991 2991 history graph. This is sometimes known as 'backporting' or
2992 2992 'cherry-picking'. By default, graft will copy user, date, and
2993 2993 description from the source changesets.
2994 2994
2995 2995 Changesets that are ancestors of the current revision, that have
2996 2996 already been grafted, or that are merges will be skipped.
2997 2997
2998 2998 If --log is specified, log messages will have a comment appended
2999 2999 of the form::
3000 3000
3001 3001 (grafted from CHANGESETHASH)
3002 3002
3003 3003 If --force is specified, revisions will be grafted even if they
3004 3004 are already ancestors of, or have been grafted to, the destination.
3005 3005 This is useful when the revisions have since been backed out.
3006 3006
3007 3007 If a graft merge results in conflicts, the graft process is
3008 3008 interrupted so that the current merge can be manually resolved.
3009 3009 Once all conflicts are addressed, the graft process can be
3010 3010 continued with the -c/--continue option.
3011 3011
3012 3012 The -c/--continue option reapplies all the earlier options.
3013 3013
3014 3014 .. container:: verbose
3015 3015
3016 3016 The --base option exposes more of how graft internally uses merge with a
3017 3017 custom base revision. --base can be used to specify another ancestor than
3018 3018 the first and only parent.
3019 3019
3020 3020 The command::
3021 3021
3022 3022 hg graft -r 345 --base 234
3023 3023
3024 3024 is thus pretty much the same as::
3025 3025
3026 3026 hg diff --from 234 --to 345 | hg import
3027 3027
3028 3028 but using merge to resolve conflicts and track moved files.
3029 3029
3030 3030 The result of a merge can thus be backported as a single commit by
3031 3031 specifying one of the merge parents as base, and thus effectively
3032 3032 grafting the changes from the other side.
3033 3033
3034 3034 It is also possible to collapse multiple changesets and clean up history
3035 3035 by specifying another ancestor as base, much like rebase --collapse
3036 3036 --keep.
3037 3037
3038 3038 The commit message can be tweaked after the fact using commit --amend .
3039 3039
3040 3040 For using non-ancestors as the base to backout changes, see the backout
3041 3041 command and the hidden --parent option.
3042 3042
3043 3043 .. container:: verbose
3044 3044
3045 3045 Examples:
3046 3046
3047 3047 - copy a single change to the stable branch and edit its description::
3048 3048
3049 3049 hg update stable
3050 3050 hg graft --edit 9393
3051 3051
3052 3052 - graft a range of changesets with one exception, updating dates::
3053 3053
3054 3054 hg graft -D "2085::2093 and not 2091"
3055 3055
3056 3056 - continue a graft after resolving conflicts::
3057 3057
3058 3058 hg graft -c
3059 3059
3060 3060 - show the source of a grafted changeset::
3061 3061
3062 3062 hg log --debug -r .
3063 3063
3064 3064 - show revisions sorted by date::
3065 3065
3066 3066 hg log -r "sort(all(), date)"
3067 3067
3068 3068 - backport the result of a merge as a single commit::
3069 3069
3070 3070 hg graft -r 123 --base 123^
3071 3071
3072 3072 - land a feature branch as one changeset::
3073 3073
3074 3074 hg up -cr default
3075 3075 hg graft -r featureX --base "ancestor('featureX', 'default')"
3076 3076
3077 3077 See :hg:`help revisions` for more about specifying revisions.
3078 3078
3079 3079 Returns 0 on successful completion, 1 if there are unresolved files.
3080 3080 """
3081 3081 with repo.wlock():
3082 3082 return _dograft(ui, repo, *revs, **opts)
3083 3083
3084 3084
3085 3085 def _dograft(ui, repo, *revs, **opts):
3086 3086 if revs and opts.get('rev'):
3087 3087 ui.warn(
3088 3088 _(
3089 3089 b'warning: inconsistent use of --rev might give unexpected '
3090 3090 b'revision ordering!\n'
3091 3091 )
3092 3092 )
3093 3093
3094 3094 revs = list(revs)
3095 3095 revs.extend(opts.get('rev'))
3096 3096 # a dict of data to be stored in state file
3097 3097 statedata = {}
3098 3098 # list of new nodes created by ongoing graft
3099 3099 statedata[b'newnodes'] = []
3100 3100
3101 3101 cmdutil.resolve_commit_options(ui, opts)
3102 3102
3103 3103 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3104 3104
3105 3105 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3106 3106
3107 3107 cont = False
3108 3108 if opts.get('no_commit'):
3109 3109 cmdutil.check_incompatible_arguments(
3110 3110 opts,
3111 3111 'no_commit',
3112 3112 ['edit', 'currentuser', 'currentdate', 'log'],
3113 3113 )
3114 3114
3115 3115 graftstate = statemod.cmdstate(repo, b'graftstate')
3116 3116
3117 3117 if opts.get('stop'):
3118 3118 cmdutil.check_incompatible_arguments(
3119 3119 opts,
3120 3120 'stop',
3121 3121 [
3122 3122 'edit',
3123 3123 'log',
3124 3124 'user',
3125 3125 'date',
3126 3126 'currentdate',
3127 3127 'currentuser',
3128 3128 'rev',
3129 3129 ],
3130 3130 )
3131 3131 return _stopgraft(ui, repo, graftstate)
3132 3132 elif opts.get('abort'):
3133 3133 cmdutil.check_incompatible_arguments(
3134 3134 opts,
3135 3135 'abort',
3136 3136 [
3137 3137 'edit',
3138 3138 'log',
3139 3139 'user',
3140 3140 'date',
3141 3141 'currentdate',
3142 3142 'currentuser',
3143 3143 'rev',
3144 3144 ],
3145 3145 )
3146 3146 return cmdutil.abortgraft(ui, repo, graftstate)
3147 3147 elif opts.get('continue'):
3148 3148 cont = True
3149 3149 if revs:
3150 3150 raise error.InputError(_(b"can't specify --continue and revisions"))
3151 3151 # read in unfinished revisions
3152 3152 if graftstate.exists():
3153 3153 statedata = cmdutil.readgraftstate(repo, graftstate)
3154 3154 if statedata.get(b'date'):
3155 3155 opts['date'] = statedata[b'date']
3156 3156 if statedata.get(b'user'):
3157 3157 opts['user'] = statedata[b'user']
3158 3158 if statedata.get(b'log'):
3159 3159 opts['log'] = True
3160 3160 if statedata.get(b'no_commit'):
3161 3161 opts['no_commit'] = statedata.get(b'no_commit')
3162 3162 if statedata.get(b'base'):
3163 3163 opts['base'] = statedata.get(b'base')
3164 3164 nodes = statedata[b'nodes']
3165 3165 revs = [repo[node].rev() for node in nodes]
3166 3166 else:
3167 3167 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3168 3168 else:
3169 3169 if not revs:
3170 3170 raise error.InputError(_(b'no revisions specified'))
3171 3171 cmdutil.checkunfinished(repo)
3172 3172 cmdutil.bailifchanged(repo)
3173 3173 revs = logcmdutil.revrange(repo, revs)
3174 3174
3175 3175 skipped = set()
3176 3176 basectx = None
3177 3177 if opts.get('base'):
3178 3178 basectx = logcmdutil.revsingle(repo, opts['base'], None)
3179 3179 if basectx is None:
3180 3180 # check for merges
3181 3181 for rev in repo.revs(b'%ld and merge()', revs):
3182 3182 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3183 3183 skipped.add(rev)
3184 3184 revs = [r for r in revs if r not in skipped]
3185 3185 if not revs:
3186 3186 return -1
3187 3187 if basectx is not None and len(revs) != 1:
3188 3188 raise error.InputError(_(b'only one revision allowed with --base '))
3189 3189
3190 3190 # Don't check in the --continue case, in effect retaining --force across
3191 3191 # --continues. That's because without --force, any revisions we decided to
3192 3192 # skip would have been filtered out here, so they wouldn't have made their
3193 3193 # way to the graftstate. With --force, any revisions we would have otherwise
3194 3194 # skipped would not have been filtered out, and if they hadn't been applied
3195 3195 # already, they'd have been in the graftstate.
3196 3196 if not (cont or opts.get('force')) and basectx is None:
3197 3197 # check for ancestors of dest branch
3198 3198 ancestors = repo.revs(b'%ld & (::.)', revs)
3199 3199 for rev in ancestors:
3200 3200 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3201 3201
3202 3202 revs = [r for r in revs if r not in ancestors]
3203 3203
3204 3204 if not revs:
3205 3205 return -1
3206 3206
3207 3207 # analyze revs for earlier grafts
3208 3208 ids = {}
3209 3209 for ctx in repo.set(b"%ld", revs):
3210 3210 ids[ctx.hex()] = ctx.rev()
3211 3211 n = ctx.extra().get(b'source')
3212 3212 if n:
3213 3213 ids[n] = ctx.rev()
3214 3214
3215 3215 # check ancestors for earlier grafts
3216 3216 ui.debug(b'scanning for duplicate grafts\n')
3217 3217
3218 3218 # The only changesets we can be sure doesn't contain grafts of any
3219 3219 # revs, are the ones that are common ancestors of *all* revs:
3220 3220 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3221 3221 ctx = repo[rev]
3222 3222 n = ctx.extra().get(b'source')
3223 3223 if n in ids:
3224 3224 try:
3225 3225 r = repo[n].rev()
3226 3226 except error.RepoLookupError:
3227 3227 r = None
3228 3228 if r in revs:
3229 3229 ui.warn(
3230 3230 _(
3231 3231 b'skipping revision %d:%s '
3232 3232 b'(already grafted to %d:%s)\n'
3233 3233 )
3234 3234 % (r, repo[r], rev, ctx)
3235 3235 )
3236 3236 revs.remove(r)
3237 3237 elif ids[n] in revs:
3238 3238 if r is None:
3239 3239 ui.warn(
3240 3240 _(
3241 3241 b'skipping already grafted revision %d:%s '
3242 3242 b'(%d:%s also has unknown origin %s)\n'
3243 3243 )
3244 3244 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3245 3245 )
3246 3246 else:
3247 3247 ui.warn(
3248 3248 _(
3249 3249 b'skipping already grafted revision %d:%s '
3250 3250 b'(%d:%s also has origin %d:%s)\n'
3251 3251 )
3252 3252 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3253 3253 )
3254 3254 revs.remove(ids[n])
3255 3255 elif ctx.hex() in ids:
3256 3256 r = ids[ctx.hex()]
3257 3257 if r in revs:
3258 3258 ui.warn(
3259 3259 _(
3260 3260 b'skipping already grafted revision %d:%s '
3261 3261 b'(was grafted from %d:%s)\n'
3262 3262 )
3263 3263 % (r, repo[r], rev, ctx)
3264 3264 )
3265 3265 revs.remove(r)
3266 3266 if not revs:
3267 3267 return -1
3268 3268
3269 3269 if opts.get('no_commit'):
3270 3270 statedata[b'no_commit'] = True
3271 3271 if opts.get('base'):
3272 3272 statedata[b'base'] = opts['base']
3273 3273 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3274 3274 desc = b'%d:%s "%s"' % (
3275 3275 ctx.rev(),
3276 3276 ctx,
3277 3277 ctx.description().split(b'\n', 1)[0],
3278 3278 )
3279 3279 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3280 3280 if names:
3281 3281 desc += b' (%s)' % b' '.join(names)
3282 3282 ui.status(_(b'grafting %s\n') % desc)
3283 3283 if opts.get('dry_run'):
3284 3284 continue
3285 3285
3286 3286 source = ctx.extra().get(b'source')
3287 3287 extra = {}
3288 3288 if source:
3289 3289 extra[b'source'] = source
3290 3290 extra[b'intermediate-source'] = ctx.hex()
3291 3291 else:
3292 3292 extra[b'source'] = ctx.hex()
3293 3293 user = ctx.user()
3294 3294 if opts.get('user'):
3295 3295 user = opts['user']
3296 3296 statedata[b'user'] = user
3297 3297 date = ctx.date()
3298 3298 if opts.get('date'):
3299 3299 date = opts['date']
3300 3300 statedata[b'date'] = date
3301 3301 message = ctx.description()
3302 3302 if opts.get('log'):
3303 3303 message += b'\n(grafted from %s)' % ctx.hex()
3304 3304 statedata[b'log'] = True
3305 3305
3306 3306 # we don't merge the first commit when continuing
3307 3307 if not cont:
3308 3308 # perform the graft merge with p1(rev) as 'ancestor'
3309 3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3310 3310 base = ctx.p1() if basectx is None else basectx
3311 3311 with ui.configoverride(overrides, b'graft'):
3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3312 stats = mergemod.graft(
3313 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3314 )
3313 3315 # report any conflicts
3314 3316 if stats.unresolvedcount > 0:
3315 3317 # write out state for --continue
3316 3318 nodes = [repo[rev].hex() for rev in revs[pos:]]
3317 3319 statedata[b'nodes'] = nodes
3318 3320 stateversion = 1
3319 3321 graftstate.save(stateversion, statedata)
3320 3322 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3321 3323 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3322 3324 return 1
3323 3325 else:
3324 3326 cont = False
3325 3327
3326 3328 # commit if --no-commit is false
3327 3329 if not opts.get('no_commit'):
3328 3330 node = repo.commit(
3329 3331 text=message, user=user, date=date, extra=extra, editor=editor
3330 3332 )
3331 3333 if node is None:
3332 3334 ui.warn(
3333 3335 _(b'note: graft of %d:%s created no changes to commit\n')
3334 3336 % (ctx.rev(), ctx)
3335 3337 )
3336 3338 # checking that newnodes exist because old state files won't have it
3337 3339 elif statedata.get(b'newnodes') is not None:
3338 3340 nn = statedata[b'newnodes']
3339 3341 assert isinstance(nn, list) # list of bytes
3340 3342 nn.append(node)
3341 3343
3342 3344 # remove state when we complete successfully
3343 3345 if not opts.get('dry_run'):
3344 3346 graftstate.delete()
3345 3347
3346 3348 return 0
3347 3349
3348 3350
3349 3351 def _stopgraft(ui, repo, graftstate):
3350 3352 """stop the interrupted graft"""
3351 3353 if not graftstate.exists():
3352 3354 raise error.StateError(_(b"no interrupted graft found"))
3353 3355 pctx = repo[b'.']
3354 3356 mergemod.clean_update(pctx)
3355 3357 graftstate.delete()
3356 3358 ui.status(_(b"stopped the interrupted graft\n"))
3357 3359 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3358 3360 return 0
3359 3361
3360 3362
3361 3363 statemod.addunfinished(
3362 3364 b'graft',
3363 3365 fname=b'graftstate',
3364 3366 clearable=True,
3365 3367 stopflag=True,
3366 3368 continueflag=True,
3367 3369 abortfunc=cmdutil.hgabortgraft,
3368 3370 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3369 3371 )
3370 3372
3371 3373
3372 3374 @command(
3373 3375 b'grep',
3374 3376 [
3375 3377 (b'0', b'print0', None, _(b'end fields with NUL')),
3376 3378 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3377 3379 (
3378 3380 b'',
3379 3381 b'diff',
3380 3382 None,
3381 3383 _(
3382 3384 b'search revision differences for when the pattern was added '
3383 3385 b'or removed'
3384 3386 ),
3385 3387 ),
3386 3388 (b'a', b'text', None, _(b'treat all files as text')),
3387 3389 (
3388 3390 b'f',
3389 3391 b'follow',
3390 3392 None,
3391 3393 _(
3392 3394 b'follow changeset history,'
3393 3395 b' or file history across copies and renames'
3394 3396 ),
3395 3397 ),
3396 3398 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3397 3399 (
3398 3400 b'l',
3399 3401 b'files-with-matches',
3400 3402 None,
3401 3403 _(b'print only filenames and revisions that match'),
3402 3404 ),
3403 3405 (b'n', b'line-number', None, _(b'print matching line numbers')),
3404 3406 (
3405 3407 b'r',
3406 3408 b'rev',
3407 3409 [],
3408 3410 _(b'search files changed within revision range'),
3409 3411 _(b'REV'),
3410 3412 ),
3411 3413 (
3412 3414 b'',
3413 3415 b'all-files',
3414 3416 None,
3415 3417 _(
3416 3418 b'include all files in the changeset while grepping (DEPRECATED)'
3417 3419 ),
3418 3420 ),
3419 3421 (b'u', b'user', None, _(b'list the author (long with -v)')),
3420 3422 (b'd', b'date', None, _(b'list the date (short with -q)')),
3421 3423 ]
3422 3424 + formatteropts
3423 3425 + walkopts,
3424 3426 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3425 3427 helpcategory=command.CATEGORY_FILE_CONTENTS,
3426 3428 inferrepo=True,
3427 3429 intents={INTENT_READONLY},
3428 3430 )
3429 3431 def grep(ui, repo, pattern, *pats, **opts):
3430 3432 """search for a pattern in specified files
3431 3433
3432 3434 Search the working directory or revision history for a regular
3433 3435 expression in the specified files for the entire repository.
3434 3436
3435 3437 By default, grep searches the repository files in the working
3436 3438 directory and prints the files where it finds a match. To specify
3437 3439 historical revisions instead of the working directory, use the
3438 3440 --rev flag.
3439 3441
3440 3442 To search instead historical revision differences that contains a
3441 3443 change in match status ("-" for a match that becomes a non-match,
3442 3444 or "+" for a non-match that becomes a match), use the --diff flag.
3443 3445
3444 3446 PATTERN can be any Python (roughly Perl-compatible) regular
3445 3447 expression.
3446 3448
3447 3449 If no FILEs are specified and the --rev flag isn't supplied, all
3448 3450 files in the working directory are searched. When using the --rev
3449 3451 flag and specifying FILEs, use the --follow argument to also
3450 3452 follow the specified FILEs across renames and copies.
3451 3453
3452 3454 .. container:: verbose
3453 3455
3454 3456 Template:
3455 3457
3456 3458 The following keywords are supported in addition to the common template
3457 3459 keywords and functions. See also :hg:`help templates`.
3458 3460
3459 3461 :change: String. Character denoting insertion ``+`` or removal ``-``.
3460 3462 Available if ``--diff`` is specified.
3461 3463 :lineno: Integer. Line number of the match.
3462 3464 :path: String. Repository-absolute path of the file.
3463 3465 :texts: List of text chunks.
3464 3466
3465 3467 And each entry of ``{texts}`` provides the following sub-keywords.
3466 3468
3467 3469 :matched: Boolean. True if the chunk matches the specified pattern.
3468 3470 :text: String. Chunk content.
3469 3471
3470 3472 See :hg:`help templates.operators` for the list expansion syntax.
3471 3473
3472 3474 Returns 0 if a match is found, 1 otherwise.
3473 3475
3474 3476 """
3475 3477 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3476 3478 opts = pycompat.byteskwargs(opts)
3477 3479 diff = opts.get(b'all') or opts.get(b'diff')
3478 3480 follow = opts.get(b'follow')
3479 3481 if opts.get(b'all_files') is None and not diff:
3480 3482 opts[b'all_files'] = True
3481 3483 plaingrep = (
3482 3484 opts.get(b'all_files')
3483 3485 and not opts.get(b'rev')
3484 3486 and not opts.get(b'follow')
3485 3487 )
3486 3488 all_files = opts.get(b'all_files')
3487 3489 if plaingrep:
3488 3490 opts[b'rev'] = [b'wdir()']
3489 3491
3490 3492 reflags = re.M
3491 3493 if opts.get(b'ignore_case'):
3492 3494 reflags |= re.I
3493 3495 try:
3494 3496 regexp = util.re.compile(pattern, reflags)
3495 3497 except re.error as inst:
3496 3498 ui.warn(
3497 3499 _(b"grep: invalid match pattern: %s\n")
3498 3500 % stringutil.forcebytestr(inst)
3499 3501 )
3500 3502 return 1
3501 3503 sep, eol = b':', b'\n'
3502 3504 if opts.get(b'print0'):
3503 3505 sep = eol = b'\0'
3504 3506
3505 3507 searcher = grepmod.grepsearcher(
3506 3508 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3507 3509 )
3508 3510
3509 3511 getfile = searcher._getfile
3510 3512
3511 3513 uipathfn = scmutil.getuipathfn(repo)
3512 3514
3513 3515 def display(fm, fn, ctx, pstates, states):
3514 3516 rev = scmutil.intrev(ctx)
3515 3517 if fm.isplain():
3516 3518 formatuser = ui.shortuser
3517 3519 else:
3518 3520 formatuser = pycompat.bytestr
3519 3521 if ui.quiet:
3520 3522 datefmt = b'%Y-%m-%d'
3521 3523 else:
3522 3524 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3523 3525 found = False
3524 3526
3525 3527 @util.cachefunc
3526 3528 def binary():
3527 3529 flog = getfile(fn)
3528 3530 try:
3529 3531 return stringutil.binary(flog.read(ctx.filenode(fn)))
3530 3532 except error.WdirUnsupported:
3531 3533 return ctx[fn].isbinary()
3532 3534
3533 3535 fieldnamemap = {b'linenumber': b'lineno'}
3534 3536 if diff:
3535 3537 iter = grepmod.difflinestates(pstates, states)
3536 3538 else:
3537 3539 iter = [(b'', l) for l in states]
3538 3540 for change, l in iter:
3539 3541 fm.startitem()
3540 3542 fm.context(ctx=ctx)
3541 3543 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3542 3544 fm.plain(uipathfn(fn), label=b'grep.filename')
3543 3545
3544 3546 cols = [
3545 3547 (b'rev', b'%d', rev, not plaingrep, b''),
3546 3548 (
3547 3549 b'linenumber',
3548 3550 b'%d',
3549 3551 l.linenum,
3550 3552 opts.get(b'line_number'),
3551 3553 b'',
3552 3554 ),
3553 3555 ]
3554 3556 if diff:
3555 3557 cols.append(
3556 3558 (
3557 3559 b'change',
3558 3560 b'%s',
3559 3561 change,
3560 3562 True,
3561 3563 b'grep.inserted '
3562 3564 if change == b'+'
3563 3565 else b'grep.deleted ',
3564 3566 )
3565 3567 )
3566 3568 cols.extend(
3567 3569 [
3568 3570 (
3569 3571 b'user',
3570 3572 b'%s',
3571 3573 formatuser(ctx.user()),
3572 3574 opts.get(b'user'),
3573 3575 b'',
3574 3576 ),
3575 3577 (
3576 3578 b'date',
3577 3579 b'%s',
3578 3580 fm.formatdate(ctx.date(), datefmt),
3579 3581 opts.get(b'date'),
3580 3582 b'',
3581 3583 ),
3582 3584 ]
3583 3585 )
3584 3586 for name, fmt, data, cond, extra_label in cols:
3585 3587 if cond:
3586 3588 fm.plain(sep, label=b'grep.sep')
3587 3589 field = fieldnamemap.get(name, name)
3588 3590 label = extra_label + (b'grep.%s' % name)
3589 3591 fm.condwrite(cond, field, fmt, data, label=label)
3590 3592 if not opts.get(b'files_with_matches'):
3591 3593 fm.plain(sep, label=b'grep.sep')
3592 3594 if not opts.get(b'text') and binary():
3593 3595 fm.plain(_(b" Binary file matches"))
3594 3596 else:
3595 3597 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3596 3598 fm.plain(eol)
3597 3599 found = True
3598 3600 if opts.get(b'files_with_matches'):
3599 3601 break
3600 3602 return found
3601 3603
3602 3604 def displaymatches(fm, l):
3603 3605 p = 0
3604 3606 for s, e in l.findpos(regexp):
3605 3607 if p < s:
3606 3608 fm.startitem()
3607 3609 fm.write(b'text', b'%s', l.line[p:s])
3608 3610 fm.data(matched=False)
3609 3611 fm.startitem()
3610 3612 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3611 3613 fm.data(matched=True)
3612 3614 p = e
3613 3615 if p < len(l.line):
3614 3616 fm.startitem()
3615 3617 fm.write(b'text', b'%s', l.line[p:])
3616 3618 fm.data(matched=False)
3617 3619 fm.end()
3618 3620
3619 3621 found = False
3620 3622
3621 3623 wopts = logcmdutil.walkopts(
3622 3624 pats=pats,
3623 3625 opts=opts,
3624 3626 revspec=opts[b'rev'],
3625 3627 include_pats=opts[b'include'],
3626 3628 exclude_pats=opts[b'exclude'],
3627 3629 follow=follow,
3628 3630 force_changelog_traversal=all_files,
3629 3631 filter_revisions_by_pats=not all_files,
3630 3632 )
3631 3633 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3632 3634
3633 3635 ui.pager(b'grep')
3634 3636 fm = ui.formatter(b'grep', opts)
3635 3637 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3636 3638 r = display(fm, fn, ctx, pstates, states)
3637 3639 found = found or r
3638 3640 if r and not diff and not all_files:
3639 3641 searcher.skipfile(fn, ctx.rev())
3640 3642 fm.end()
3641 3643
3642 3644 return not found
3643 3645
3644 3646
3645 3647 @command(
3646 3648 b'heads',
3647 3649 [
3648 3650 (
3649 3651 b'r',
3650 3652 b'rev',
3651 3653 b'',
3652 3654 _(b'show only heads which are descendants of STARTREV'),
3653 3655 _(b'STARTREV'),
3654 3656 ),
3655 3657 (b't', b'topo', False, _(b'show topological heads only')),
3656 3658 (
3657 3659 b'a',
3658 3660 b'active',
3659 3661 False,
3660 3662 _(b'show active branchheads only (DEPRECATED)'),
3661 3663 ),
3662 3664 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3663 3665 ]
3664 3666 + templateopts,
3665 3667 _(b'[-ct] [-r STARTREV] [REV]...'),
3666 3668 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3667 3669 intents={INTENT_READONLY},
3668 3670 )
3669 3671 def heads(ui, repo, *branchrevs, **opts):
3670 3672 """show branch heads
3671 3673
3672 3674 With no arguments, show all open branch heads in the repository.
3673 3675 Branch heads are changesets that have no descendants on the
3674 3676 same branch. They are where development generally takes place and
3675 3677 are the usual targets for update and merge operations.
3676 3678
3677 3679 If one or more REVs are given, only open branch heads on the
3678 3680 branches associated with the specified changesets are shown. This
3679 3681 means that you can use :hg:`heads .` to see the heads on the
3680 3682 currently checked-out branch.
3681 3683
3682 3684 If -c/--closed is specified, also show branch heads marked closed
3683 3685 (see :hg:`commit --close-branch`).
3684 3686
3685 3687 If STARTREV is specified, only those heads that are descendants of
3686 3688 STARTREV will be displayed.
3687 3689
3688 3690 If -t/--topo is specified, named branch mechanics will be ignored and only
3689 3691 topological heads (changesets with no children) will be shown.
3690 3692
3691 3693 Returns 0 if matching heads are found, 1 if not.
3692 3694 """
3693 3695
3694 3696 opts = pycompat.byteskwargs(opts)
3695 3697 start = None
3696 3698 rev = opts.get(b'rev')
3697 3699 if rev:
3698 3700 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3699 3701 start = logcmdutil.revsingle(repo, rev, None).node()
3700 3702
3701 3703 if opts.get(b'topo'):
3702 3704 heads = [repo[h] for h in repo.heads(start)]
3703 3705 else:
3704 3706 heads = []
3705 3707 for branch in repo.branchmap():
3706 3708 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3707 3709 heads = [repo[h] for h in heads]
3708 3710
3709 3711 if branchrevs:
3710 3712 branches = {
3711 3713 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3712 3714 }
3713 3715 heads = [h for h in heads if h.branch() in branches]
3714 3716
3715 3717 if opts.get(b'active') and branchrevs:
3716 3718 dagheads = repo.heads(start)
3717 3719 heads = [h for h in heads if h.node() in dagheads]
3718 3720
3719 3721 if branchrevs:
3720 3722 haveheads = {h.branch() for h in heads}
3721 3723 if branches - haveheads:
3722 3724 headless = b', '.join(b for b in branches - haveheads)
3723 3725 msg = _(b'no open branch heads found on branches %s')
3724 3726 if opts.get(b'rev'):
3725 3727 msg += _(b' (started at %s)') % opts[b'rev']
3726 3728 ui.warn((msg + b'\n') % headless)
3727 3729
3728 3730 if not heads:
3729 3731 return 1
3730 3732
3731 3733 ui.pager(b'heads')
3732 3734 heads = sorted(heads, key=lambda x: -(x.rev()))
3733 3735 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3734 3736 for ctx in heads:
3735 3737 displayer.show(ctx)
3736 3738 displayer.close()
3737 3739
3738 3740
3739 3741 @command(
3740 3742 b'help',
3741 3743 [
3742 3744 (b'e', b'extension', None, _(b'show only help for extensions')),
3743 3745 (b'c', b'command', None, _(b'show only help for commands')),
3744 3746 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3745 3747 (
3746 3748 b's',
3747 3749 b'system',
3748 3750 [],
3749 3751 _(b'show help for specific platform(s)'),
3750 3752 _(b'PLATFORM'),
3751 3753 ),
3752 3754 ],
3753 3755 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3754 3756 helpcategory=command.CATEGORY_HELP,
3755 3757 norepo=True,
3756 3758 intents={INTENT_READONLY},
3757 3759 )
3758 3760 def help_(ui, name=None, **opts):
3759 3761 """show help for a given topic or a help overview
3760 3762
3761 3763 With no arguments, print a list of commands with short help messages.
3762 3764
3763 3765 Given a topic, extension, or command name, print help for that
3764 3766 topic.
3765 3767
3766 3768 Returns 0 if successful.
3767 3769 """
3768 3770
3769 3771 keep = opts.get('system') or []
3770 3772 if len(keep) == 0:
3771 3773 if pycompat.sysplatform.startswith(b'win'):
3772 3774 keep.append(b'windows')
3773 3775 elif pycompat.sysplatform == b'OpenVMS':
3774 3776 keep.append(b'vms')
3775 3777 elif pycompat.sysplatform == b'plan9':
3776 3778 keep.append(b'plan9')
3777 3779 else:
3778 3780 keep.append(b'unix')
3779 3781 keep.append(pycompat.sysplatform.lower())
3780 3782 if ui.verbose:
3781 3783 keep.append(b'verbose')
3782 3784
3783 3785 commands = sys.modules[__name__]
3784 3786 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3785 3787 ui.pager(b'help')
3786 3788 ui.write(formatted)
3787 3789
3788 3790
3789 3791 @command(
3790 3792 b'identify|id',
3791 3793 [
3792 3794 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3793 3795 (b'n', b'num', None, _(b'show local revision number')),
3794 3796 (b'i', b'id', None, _(b'show global revision id')),
3795 3797 (b'b', b'branch', None, _(b'show branch')),
3796 3798 (b't', b'tags', None, _(b'show tags')),
3797 3799 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3798 3800 ]
3799 3801 + remoteopts
3800 3802 + formatteropts,
3801 3803 _(b'[-nibtB] [-r REV] [SOURCE]'),
3802 3804 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3803 3805 optionalrepo=True,
3804 3806 intents={INTENT_READONLY},
3805 3807 )
3806 3808 def identify(
3807 3809 ui,
3808 3810 repo,
3809 3811 source=None,
3810 3812 rev=None,
3811 3813 num=None,
3812 3814 id=None,
3813 3815 branch=None,
3814 3816 tags=None,
3815 3817 bookmarks=None,
3816 3818 **opts
3817 3819 ):
3818 3820 """identify the working directory or specified revision
3819 3821
3820 3822 Print a summary identifying the repository state at REV using one or
3821 3823 two parent hash identifiers, followed by a "+" if the working
3822 3824 directory has uncommitted changes, the branch name (if not default),
3823 3825 a list of tags, and a list of bookmarks.
3824 3826
3825 3827 When REV is not given, print a summary of the current state of the
3826 3828 repository including the working directory. Specify -r. to get information
3827 3829 of the working directory parent without scanning uncommitted changes.
3828 3830
3829 3831 Specifying a path to a repository root or Mercurial bundle will
3830 3832 cause lookup to operate on that repository/bundle.
3831 3833
3832 3834 .. container:: verbose
3833 3835
3834 3836 Template:
3835 3837
3836 3838 The following keywords are supported in addition to the common template
3837 3839 keywords and functions. See also :hg:`help templates`.
3838 3840
3839 3841 :dirty: String. Character ``+`` denoting if the working directory has
3840 3842 uncommitted changes.
3841 3843 :id: String. One or two nodes, optionally followed by ``+``.
3842 3844 :parents: List of strings. Parent nodes of the changeset.
3843 3845
3844 3846 Examples:
3845 3847
3846 3848 - generate a build identifier for the working directory::
3847 3849
3848 3850 hg id --id > build-id.dat
3849 3851
3850 3852 - find the revision corresponding to a tag::
3851 3853
3852 3854 hg id -n -r 1.3
3853 3855
3854 3856 - check the most recent revision of a remote repository::
3855 3857
3856 3858 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3857 3859
3858 3860 See :hg:`log` for generating more information about specific revisions,
3859 3861 including full hash identifiers.
3860 3862
3861 3863 Returns 0 if successful.
3862 3864 """
3863 3865
3864 3866 opts = pycompat.byteskwargs(opts)
3865 3867 if not repo and not source:
3866 3868 raise error.InputError(
3867 3869 _(b"there is no Mercurial repository here (.hg not found)")
3868 3870 )
3869 3871
3870 3872 default = not (num or id or branch or tags or bookmarks)
3871 3873 output = []
3872 3874 revs = []
3873 3875
3874 3876 peer = None
3875 3877 try:
3876 3878 if source:
3877 3879 source, branches = urlutil.get_unique_pull_path(
3878 3880 b'identify', repo, ui, source
3879 3881 )
3880 3882 # only pass ui when no repo
3881 3883 peer = hg.peer(repo or ui, opts, source)
3882 3884 repo = peer.local()
3883 3885 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3884 3886
3885 3887 fm = ui.formatter(b'identify', opts)
3886 3888 fm.startitem()
3887 3889
3888 3890 if not repo:
3889 3891 if num or branch or tags:
3890 3892 raise error.InputError(
3891 3893 _(b"can't query remote revision number, branch, or tags")
3892 3894 )
3893 3895 if not rev and revs:
3894 3896 rev = revs[0]
3895 3897 if not rev:
3896 3898 rev = b"tip"
3897 3899
3898 3900 remoterev = peer.lookup(rev)
3899 3901 hexrev = fm.hexfunc(remoterev)
3900 3902 if default or id:
3901 3903 output = [hexrev]
3902 3904 fm.data(id=hexrev)
3903 3905
3904 3906 @util.cachefunc
3905 3907 def getbms():
3906 3908 bms = []
3907 3909
3908 3910 if b'bookmarks' in peer.listkeys(b'namespaces'):
3909 3911 hexremoterev = hex(remoterev)
3910 3912 bms = [
3911 3913 bm
3912 3914 for bm, bmr in pycompat.iteritems(
3913 3915 peer.listkeys(b'bookmarks')
3914 3916 )
3915 3917 if bmr == hexremoterev
3916 3918 ]
3917 3919
3918 3920 return sorted(bms)
3919 3921
3920 3922 if fm.isplain():
3921 3923 if bookmarks:
3922 3924 output.extend(getbms())
3923 3925 elif default and not ui.quiet:
3924 3926 # multiple bookmarks for a single parent separated by '/'
3925 3927 bm = b'/'.join(getbms())
3926 3928 if bm:
3927 3929 output.append(bm)
3928 3930 else:
3929 3931 fm.data(node=hex(remoterev))
3930 3932 if bookmarks or b'bookmarks' in fm.datahint():
3931 3933 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3932 3934 else:
3933 3935 if rev:
3934 3936 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3935 3937 ctx = logcmdutil.revsingle(repo, rev, None)
3936 3938
3937 3939 if ctx.rev() is None:
3938 3940 ctx = repo[None]
3939 3941 parents = ctx.parents()
3940 3942 taglist = []
3941 3943 for p in parents:
3942 3944 taglist.extend(p.tags())
3943 3945
3944 3946 dirty = b""
3945 3947 if ctx.dirty(missing=True, merge=False, branch=False):
3946 3948 dirty = b'+'
3947 3949 fm.data(dirty=dirty)
3948 3950
3949 3951 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3950 3952 if default or id:
3951 3953 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3952 3954 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3953 3955
3954 3956 if num:
3955 3957 numoutput = [b"%d" % p.rev() for p in parents]
3956 3958 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3957 3959
3958 3960 fm.data(
3959 3961 parents=fm.formatlist(
3960 3962 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3961 3963 )
3962 3964 )
3963 3965 else:
3964 3966 hexoutput = fm.hexfunc(ctx.node())
3965 3967 if default or id:
3966 3968 output = [hexoutput]
3967 3969 fm.data(id=hexoutput)
3968 3970
3969 3971 if num:
3970 3972 output.append(pycompat.bytestr(ctx.rev()))
3971 3973 taglist = ctx.tags()
3972 3974
3973 3975 if default and not ui.quiet:
3974 3976 b = ctx.branch()
3975 3977 if b != b'default':
3976 3978 output.append(b"(%s)" % b)
3977 3979
3978 3980 # multiple tags for a single parent separated by '/'
3979 3981 t = b'/'.join(taglist)
3980 3982 if t:
3981 3983 output.append(t)
3982 3984
3983 3985 # multiple bookmarks for a single parent separated by '/'
3984 3986 bm = b'/'.join(ctx.bookmarks())
3985 3987 if bm:
3986 3988 output.append(bm)
3987 3989 else:
3988 3990 if branch:
3989 3991 output.append(ctx.branch())
3990 3992
3991 3993 if tags:
3992 3994 output.extend(taglist)
3993 3995
3994 3996 if bookmarks:
3995 3997 output.extend(ctx.bookmarks())
3996 3998
3997 3999 fm.data(node=ctx.hex())
3998 4000 fm.data(branch=ctx.branch())
3999 4001 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4000 4002 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4001 4003 fm.context(ctx=ctx)
4002 4004
4003 4005 fm.plain(b"%s\n" % b' '.join(output))
4004 4006 fm.end()
4005 4007 finally:
4006 4008 if peer:
4007 4009 peer.close()
4008 4010
4009 4011
4010 4012 @command(
4011 4013 b'import|patch',
4012 4014 [
4013 4015 (
4014 4016 b'p',
4015 4017 b'strip',
4016 4018 1,
4017 4019 _(
4018 4020 b'directory strip option for patch. This has the same '
4019 4021 b'meaning as the corresponding patch option'
4020 4022 ),
4021 4023 _(b'NUM'),
4022 4024 ),
4023 4025 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4024 4026 (b'', b'secret', None, _(b'use the secret phase for committing')),
4025 4027 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4026 4028 (
4027 4029 b'f',
4028 4030 b'force',
4029 4031 None,
4030 4032 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4031 4033 ),
4032 4034 (
4033 4035 b'',
4034 4036 b'no-commit',
4035 4037 None,
4036 4038 _(b"don't commit, just update the working directory"),
4037 4039 ),
4038 4040 (
4039 4041 b'',
4040 4042 b'bypass',
4041 4043 None,
4042 4044 _(b"apply patch without touching the working directory"),
4043 4045 ),
4044 4046 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4045 4047 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4046 4048 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4047 4049 (
4048 4050 b'',
4049 4051 b'import-branch',
4050 4052 None,
4051 4053 _(b'use any branch information in patch (implied by --exact)'),
4052 4054 ),
4053 4055 ]
4054 4056 + commitopts
4055 4057 + commitopts2
4056 4058 + similarityopts,
4057 4059 _(b'[OPTION]... PATCH...'),
4058 4060 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4059 4061 )
4060 4062 def import_(ui, repo, patch1=None, *patches, **opts):
4061 4063 """import an ordered set of patches
4062 4064
4063 4065 Import a list of patches and commit them individually (unless
4064 4066 --no-commit is specified).
4065 4067
4066 4068 To read a patch from standard input (stdin), use "-" as the patch
4067 4069 name. If a URL is specified, the patch will be downloaded from
4068 4070 there.
4069 4071
4070 4072 Import first applies changes to the working directory (unless
4071 4073 --bypass is specified), import will abort if there are outstanding
4072 4074 changes.
4073 4075
4074 4076 Use --bypass to apply and commit patches directly to the
4075 4077 repository, without affecting the working directory. Without
4076 4078 --exact, patches will be applied on top of the working directory
4077 4079 parent revision.
4078 4080
4079 4081 You can import a patch straight from a mail message. Even patches
4080 4082 as attachments work (to use the body part, it must have type
4081 4083 text/plain or text/x-patch). From and Subject headers of email
4082 4084 message are used as default committer and commit message. All
4083 4085 text/plain body parts before first diff are added to the commit
4084 4086 message.
4085 4087
4086 4088 If the imported patch was generated by :hg:`export`, user and
4087 4089 description from patch override values from message headers and
4088 4090 body. Values given on command line with -m/--message and -u/--user
4089 4091 override these.
4090 4092
4091 4093 If --exact is specified, import will set the working directory to
4092 4094 the parent of each patch before applying it, and will abort if the
4093 4095 resulting changeset has a different ID than the one recorded in
4094 4096 the patch. This will guard against various ways that portable
4095 4097 patch formats and mail systems might fail to transfer Mercurial
4096 4098 data or metadata. See :hg:`bundle` for lossless transmission.
4097 4099
4098 4100 Use --partial to ensure a changeset will be created from the patch
4099 4101 even if some hunks fail to apply. Hunks that fail to apply will be
4100 4102 written to a <target-file>.rej file. Conflicts can then be resolved
4101 4103 by hand before :hg:`commit --amend` is run to update the created
4102 4104 changeset. This flag exists to let people import patches that
4103 4105 partially apply without losing the associated metadata (author,
4104 4106 date, description, ...).
4105 4107
4106 4108 .. note::
4107 4109
4108 4110 When no hunks apply cleanly, :hg:`import --partial` will create
4109 4111 an empty changeset, importing only the patch metadata.
4110 4112
4111 4113 With -s/--similarity, hg will attempt to discover renames and
4112 4114 copies in the patch in the same way as :hg:`addremove`.
4113 4115
4114 4116 It is possible to use external patch programs to perform the patch
4115 4117 by setting the ``ui.patch`` configuration option. For the default
4116 4118 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4117 4119 See :hg:`help config` for more information about configuration
4118 4120 files and how to use these options.
4119 4121
4120 4122 See :hg:`help dates` for a list of formats valid for -d/--date.
4121 4123
4122 4124 .. container:: verbose
4123 4125
4124 4126 Examples:
4125 4127
4126 4128 - import a traditional patch from a website and detect renames::
4127 4129
4128 4130 hg import -s 80 http://example.com/bugfix.patch
4129 4131
4130 4132 - import a changeset from an hgweb server::
4131 4133
4132 4134 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4133 4135
4134 4136 - import all the patches in an Unix-style mbox::
4135 4137
4136 4138 hg import incoming-patches.mbox
4137 4139
4138 4140 - import patches from stdin::
4139 4141
4140 4142 hg import -
4141 4143
4142 4144 - attempt to exactly restore an exported changeset (not always
4143 4145 possible)::
4144 4146
4145 4147 hg import --exact proposed-fix.patch
4146 4148
4147 4149 - use an external tool to apply a patch which is too fuzzy for
4148 4150 the default internal tool.
4149 4151
4150 4152 hg import --config ui.patch="patch --merge" fuzzy.patch
4151 4153
4152 4154 - change the default fuzzing from 2 to a less strict 7
4153 4155
4154 4156 hg import --config ui.fuzz=7 fuzz.patch
4155 4157
4156 4158 Returns 0 on success, 1 on partial success (see --partial).
4157 4159 """
4158 4160
4159 4161 cmdutil.check_incompatible_arguments(
4160 4162 opts, 'no_commit', ['bypass', 'secret']
4161 4163 )
4162 4164 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4163 4165 opts = pycompat.byteskwargs(opts)
4164 4166 if not patch1:
4165 4167 raise error.InputError(_(b'need at least one patch to import'))
4166 4168
4167 4169 patches = (patch1,) + patches
4168 4170
4169 4171 date = opts.get(b'date')
4170 4172 if date:
4171 4173 opts[b'date'] = dateutil.parsedate(date)
4172 4174
4173 4175 exact = opts.get(b'exact')
4174 4176 update = not opts.get(b'bypass')
4175 4177 try:
4176 4178 sim = float(opts.get(b'similarity') or 0)
4177 4179 except ValueError:
4178 4180 raise error.InputError(_(b'similarity must be a number'))
4179 4181 if sim < 0 or sim > 100:
4180 4182 raise error.InputError(_(b'similarity must be between 0 and 100'))
4181 4183 if sim and not update:
4182 4184 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4183 4185
4184 4186 base = opts[b"base"]
4185 4187 msgs = []
4186 4188 ret = 0
4187 4189
4188 4190 with repo.wlock():
4189 4191 if update:
4190 4192 cmdutil.checkunfinished(repo)
4191 4193 if exact or not opts.get(b'force'):
4192 4194 cmdutil.bailifchanged(repo)
4193 4195
4194 4196 if not opts.get(b'no_commit'):
4195 4197 lock = repo.lock
4196 4198 tr = lambda: repo.transaction(b'import')
4197 4199 dsguard = util.nullcontextmanager
4198 4200 else:
4199 4201 lock = util.nullcontextmanager
4200 4202 tr = util.nullcontextmanager
4201 4203 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 4204 with lock(), tr(), dsguard():
4203 4205 parents = repo[None].parents()
4204 4206 for patchurl in patches:
4205 4207 if patchurl == b'-':
4206 4208 ui.status(_(b'applying patch from stdin\n'))
4207 4209 patchfile = ui.fin
4208 4210 patchurl = b'stdin' # for error message
4209 4211 else:
4210 4212 patchurl = os.path.join(base, patchurl)
4211 4213 ui.status(_(b'applying %s\n') % patchurl)
4212 4214 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213 4215
4214 4216 haspatch = False
4215 4217 for hunk in patch.split(patchfile):
4216 4218 with patch.extract(ui, hunk) as patchdata:
4217 4219 msg, node, rej = cmdutil.tryimportone(
4218 4220 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 4221 )
4220 4222 if msg:
4221 4223 haspatch = True
4222 4224 ui.note(msg + b'\n')
4223 4225 if update or exact:
4224 4226 parents = repo[None].parents()
4225 4227 else:
4226 4228 parents = [repo[node]]
4227 4229 if rej:
4228 4230 ui.write_err(_(b"patch applied partially\n"))
4229 4231 ui.write_err(
4230 4232 _(
4231 4233 b"(fix the .rej files and run "
4232 4234 b"`hg commit --amend`)\n"
4233 4235 )
4234 4236 )
4235 4237 ret = 1
4236 4238 break
4237 4239
4238 4240 if not haspatch:
4239 4241 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4240 4242
4241 4243 if msgs:
4242 4244 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 4245 return ret
4244 4246
4245 4247
4246 4248 @command(
4247 4249 b'incoming|in',
4248 4250 [
4249 4251 (
4250 4252 b'f',
4251 4253 b'force',
4252 4254 None,
4253 4255 _(b'run even if remote repository is unrelated'),
4254 4256 ),
4255 4257 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 4258 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 4259 (
4258 4260 b'r',
4259 4261 b'rev',
4260 4262 [],
4261 4263 _(b'a remote changeset intended to be added'),
4262 4264 _(b'REV'),
4263 4265 ),
4264 4266 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 4267 (
4266 4268 b'b',
4267 4269 b'branch',
4268 4270 [],
4269 4271 _(b'a specific branch you would like to pull'),
4270 4272 _(b'BRANCH'),
4271 4273 ),
4272 4274 ]
4273 4275 + logopts
4274 4276 + remoteopts
4275 4277 + subrepoopts,
4276 4278 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 4279 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 4280 )
4279 4281 def incoming(ui, repo, source=b"default", **opts):
4280 4282 """show new changesets found in source
4281 4283
4282 4284 Show new changesets found in the specified path/URL or the default
4283 4285 pull location. These are the changesets that would have been pulled
4284 4286 by :hg:`pull` at the time you issued this command.
4285 4287
4286 4288 See pull for valid source format details.
4287 4289
4288 4290 .. container:: verbose
4289 4291
4290 4292 With -B/--bookmarks, the result of bookmark comparison between
4291 4293 local and remote repositories is displayed. With -v/--verbose,
4292 4294 status is also displayed for each bookmark like below::
4293 4295
4294 4296 BM1 01234567890a added
4295 4297 BM2 1234567890ab advanced
4296 4298 BM3 234567890abc diverged
4297 4299 BM4 34567890abcd changed
4298 4300
4299 4301 The action taken locally when pulling depends on the
4300 4302 status of each bookmark:
4301 4303
4302 4304 :``added``: pull will create it
4303 4305 :``advanced``: pull will update it
4304 4306 :``diverged``: pull will create a divergent bookmark
4305 4307 :``changed``: result depends on remote changesets
4306 4308
4307 4309 From the point of view of pulling behavior, bookmark
4308 4310 existing only in the remote repository are treated as ``added``,
4309 4311 even if it is in fact locally deleted.
4310 4312
4311 4313 .. container:: verbose
4312 4314
4313 4315 For remote repository, using --bundle avoids downloading the
4314 4316 changesets twice if the incoming is followed by a pull.
4315 4317
4316 4318 Examples:
4317 4319
4318 4320 - show incoming changes with patches and full description::
4319 4321
4320 4322 hg incoming -vp
4321 4323
4322 4324 - show incoming changes excluding merges, store a bundle::
4323 4325
4324 4326 hg in -vpM --bundle incoming.hg
4325 4327 hg pull incoming.hg
4326 4328
4327 4329 - briefly list changes inside a bundle::
4328 4330
4329 4331 hg in changes.hg -T "{desc|firstline}\\n"
4330 4332
4331 4333 Returns 0 if there are incoming changes, 1 otherwise.
4332 4334 """
4333 4335 opts = pycompat.byteskwargs(opts)
4334 4336 if opts.get(b'graph'):
4335 4337 logcmdutil.checkunsupportedgraphflags([], opts)
4336 4338
4337 4339 def display(other, chlist, displayer):
4338 4340 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 4341 logcmdutil.displaygraph(
4340 4342 ui, repo, revdag, displayer, graphmod.asciiedges
4341 4343 )
4342 4344
4343 4345 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 4346 return 0
4345 4347
4346 4348 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4347 4349
4348 4350 if opts.get(b'bookmarks'):
4349 4351 srcs = urlutil.get_pull_paths(repo, ui, [source])
4350 4352 for path in srcs:
4351 4353 source, branches = urlutil.parseurl(
4352 4354 path.rawloc, opts.get(b'branch')
4353 4355 )
4354 4356 other = hg.peer(repo, opts, source)
4355 4357 try:
4356 4358 if b'bookmarks' not in other.listkeys(b'namespaces'):
4357 4359 ui.warn(_(b"remote doesn't support bookmarks\n"))
4358 4360 return 0
4359 4361 ui.pager(b'incoming')
4360 4362 ui.status(
4361 4363 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4362 4364 )
4363 4365 return bookmarks.incoming(
4364 4366 ui, repo, other, mode=path.bookmarks_mode
4365 4367 )
4366 4368 finally:
4367 4369 other.close()
4368 4370
4369 4371 return hg.incoming(ui, repo, source, opts)
4370 4372
4371 4373
4372 4374 @command(
4373 4375 b'init',
4374 4376 remoteopts,
4375 4377 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4376 4378 helpcategory=command.CATEGORY_REPO_CREATION,
4377 4379 helpbasic=True,
4378 4380 norepo=True,
4379 4381 )
4380 4382 def init(ui, dest=b".", **opts):
4381 4383 """create a new repository in the given directory
4382 4384
4383 4385 Initialize a new repository in the given directory. If the given
4384 4386 directory does not exist, it will be created.
4385 4387
4386 4388 If no directory is given, the current directory is used.
4387 4389
4388 4390 It is possible to specify an ``ssh://`` URL as the destination.
4389 4391 See :hg:`help urls` for more information.
4390 4392
4391 4393 Returns 0 on success.
4392 4394 """
4393 4395 opts = pycompat.byteskwargs(opts)
4394 4396 path = urlutil.get_clone_path(ui, dest)[1]
4395 4397 peer = hg.peer(ui, opts, path, create=True)
4396 4398 peer.close()
4397 4399
4398 4400
4399 4401 @command(
4400 4402 b'locate',
4401 4403 [
4402 4404 (
4403 4405 b'r',
4404 4406 b'rev',
4405 4407 b'',
4406 4408 _(b'search the repository as it is in REV'),
4407 4409 _(b'REV'),
4408 4410 ),
4409 4411 (
4410 4412 b'0',
4411 4413 b'print0',
4412 4414 None,
4413 4415 _(b'end filenames with NUL, for use with xargs'),
4414 4416 ),
4415 4417 (
4416 4418 b'f',
4417 4419 b'fullpath',
4418 4420 None,
4419 4421 _(b'print complete paths from the filesystem root'),
4420 4422 ),
4421 4423 ]
4422 4424 + walkopts,
4423 4425 _(b'[OPTION]... [PATTERN]...'),
4424 4426 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4425 4427 )
4426 4428 def locate(ui, repo, *pats, **opts):
4427 4429 """locate files matching specific patterns (DEPRECATED)
4428 4430
4429 4431 Print files under Mercurial control in the working directory whose
4430 4432 names match the given patterns.
4431 4433
4432 4434 By default, this command searches all directories in the working
4433 4435 directory. To search just the current directory and its
4434 4436 subdirectories, use "--include .".
4435 4437
4436 4438 If no patterns are given to match, this command prints the names
4437 4439 of all files under Mercurial control in the working directory.
4438 4440
4439 4441 If you want to feed the output of this command into the "xargs"
4440 4442 command, use the -0 option to both this command and "xargs". This
4441 4443 will avoid the problem of "xargs" treating single filenames that
4442 4444 contain whitespace as multiple filenames.
4443 4445
4444 4446 See :hg:`help files` for a more versatile command.
4445 4447
4446 4448 Returns 0 if a match is found, 1 otherwise.
4447 4449 """
4448 4450 opts = pycompat.byteskwargs(opts)
4449 4451 if opts.get(b'print0'):
4450 4452 end = b'\0'
4451 4453 else:
4452 4454 end = b'\n'
4453 4455 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4454 4456
4455 4457 ret = 1
4456 4458 m = scmutil.match(
4457 4459 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4458 4460 )
4459 4461
4460 4462 ui.pager(b'locate')
4461 4463 if ctx.rev() is None:
4462 4464 # When run on the working copy, "locate" includes removed files, so
4463 4465 # we get the list of files from the dirstate.
4464 4466 filesgen = sorted(repo.dirstate.matches(m))
4465 4467 else:
4466 4468 filesgen = ctx.matches(m)
4467 4469 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4468 4470 for abs in filesgen:
4469 4471 if opts.get(b'fullpath'):
4470 4472 ui.write(repo.wjoin(abs), end)
4471 4473 else:
4472 4474 ui.write(uipathfn(abs), end)
4473 4475 ret = 0
4474 4476
4475 4477 return ret
4476 4478
4477 4479
4478 4480 @command(
4479 4481 b'log|history',
4480 4482 [
4481 4483 (
4482 4484 b'f',
4483 4485 b'follow',
4484 4486 None,
4485 4487 _(
4486 4488 b'follow changeset history, or file history across copies and renames'
4487 4489 ),
4488 4490 ),
4489 4491 (
4490 4492 b'',
4491 4493 b'follow-first',
4492 4494 None,
4493 4495 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4494 4496 ),
4495 4497 (
4496 4498 b'd',
4497 4499 b'date',
4498 4500 b'',
4499 4501 _(b'show revisions matching date spec'),
4500 4502 _(b'DATE'),
4501 4503 ),
4502 4504 (b'C', b'copies', None, _(b'show copied files')),
4503 4505 (
4504 4506 b'k',
4505 4507 b'keyword',
4506 4508 [],
4507 4509 _(b'do case-insensitive search for a given text'),
4508 4510 _(b'TEXT'),
4509 4511 ),
4510 4512 (
4511 4513 b'r',
4512 4514 b'rev',
4513 4515 [],
4514 4516 _(b'revisions to select or follow from'),
4515 4517 _(b'REV'),
4516 4518 ),
4517 4519 (
4518 4520 b'L',
4519 4521 b'line-range',
4520 4522 [],
4521 4523 _(b'follow line range of specified file (EXPERIMENTAL)'),
4522 4524 _(b'FILE,RANGE'),
4523 4525 ),
4524 4526 (
4525 4527 b'',
4526 4528 b'removed',
4527 4529 None,
4528 4530 _(b'include revisions where files were removed'),
4529 4531 ),
4530 4532 (
4531 4533 b'm',
4532 4534 b'only-merges',
4533 4535 None,
4534 4536 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4535 4537 ),
4536 4538 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4537 4539 (
4538 4540 b'',
4539 4541 b'only-branch',
4540 4542 [],
4541 4543 _(
4542 4544 b'show only changesets within the given named branch (DEPRECATED)'
4543 4545 ),
4544 4546 _(b'BRANCH'),
4545 4547 ),
4546 4548 (
4547 4549 b'b',
4548 4550 b'branch',
4549 4551 [],
4550 4552 _(b'show changesets within the given named branch'),
4551 4553 _(b'BRANCH'),
4552 4554 ),
4553 4555 (
4554 4556 b'B',
4555 4557 b'bookmark',
4556 4558 [],
4557 4559 _(b"show changesets within the given bookmark"),
4558 4560 _(b'BOOKMARK'),
4559 4561 ),
4560 4562 (
4561 4563 b'P',
4562 4564 b'prune',
4563 4565 [],
4564 4566 _(b'do not display revision or any of its ancestors'),
4565 4567 _(b'REV'),
4566 4568 ),
4567 4569 ]
4568 4570 + logopts
4569 4571 + walkopts,
4570 4572 _(b'[OPTION]... [FILE]'),
4571 4573 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4572 4574 helpbasic=True,
4573 4575 inferrepo=True,
4574 4576 intents={INTENT_READONLY},
4575 4577 )
4576 4578 def log(ui, repo, *pats, **opts):
4577 4579 """show revision history of entire repository or files
4578 4580
4579 4581 Print the revision history of the specified files or the entire
4580 4582 project.
4581 4583
4582 4584 If no revision range is specified, the default is ``tip:0`` unless
4583 4585 --follow is set.
4584 4586
4585 4587 File history is shown without following rename or copy history of
4586 4588 files. Use -f/--follow with a filename to follow history across
4587 4589 renames and copies. --follow without a filename will only show
4588 4590 ancestors of the starting revisions. The starting revisions can be
4589 4591 specified by -r/--rev, which default to the working directory parent.
4590 4592
4591 4593 By default this command prints revision number and changeset id,
4592 4594 tags, non-trivial parents, user, date and time, and a summary for
4593 4595 each commit. When the -v/--verbose switch is used, the list of
4594 4596 changed files and full commit message are shown.
4595 4597
4596 4598 With --graph the revisions are shown as an ASCII art DAG with the most
4597 4599 recent changeset at the top.
4598 4600 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4599 4601 involved in an unresolved merge conflict, '_' closes a branch,
4600 4602 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4601 4603 changeset from the lines below is a parent of the 'o' merge on the same
4602 4604 line.
4603 4605 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4604 4606 of a '|' indicates one or more revisions in a path are omitted.
4605 4607
4606 4608 .. container:: verbose
4607 4609
4608 4610 Use -L/--line-range FILE,M:N options to follow the history of lines
4609 4611 from M to N in FILE. With -p/--patch only diff hunks affecting
4610 4612 specified line range will be shown. This option requires --follow;
4611 4613 it can be specified multiple times. Currently, this option is not
4612 4614 compatible with --graph. This option is experimental.
4613 4615
4614 4616 .. note::
4615 4617
4616 4618 :hg:`log --patch` may generate unexpected diff output for merge
4617 4619 changesets, as it will only compare the merge changeset against
4618 4620 its first parent. Also, only files different from BOTH parents
4619 4621 will appear in files:.
4620 4622
4621 4623 .. note::
4622 4624
4623 4625 For performance reasons, :hg:`log FILE` may omit duplicate changes
4624 4626 made on branches and will not show removals or mode changes. To
4625 4627 see all such changes, use the --removed switch.
4626 4628
4627 4629 .. container:: verbose
4628 4630
4629 4631 .. note::
4630 4632
4631 4633 The history resulting from -L/--line-range options depends on diff
4632 4634 options; for instance if white-spaces are ignored, respective changes
4633 4635 with only white-spaces in specified line range will not be listed.
4634 4636
4635 4637 .. container:: verbose
4636 4638
4637 4639 Some examples:
4638 4640
4639 4641 - changesets with full descriptions and file lists::
4640 4642
4641 4643 hg log -v
4642 4644
4643 4645 - changesets ancestral to the working directory::
4644 4646
4645 4647 hg log -f
4646 4648
4647 4649 - last 10 commits on the current branch::
4648 4650
4649 4651 hg log -l 10 -b .
4650 4652
4651 4653 - changesets showing all modifications of a file, including removals::
4652 4654
4653 4655 hg log --removed file.c
4654 4656
4655 4657 - all changesets that touch a directory, with diffs, excluding merges::
4656 4658
4657 4659 hg log -Mp lib/
4658 4660
4659 4661 - all revision numbers that match a keyword::
4660 4662
4661 4663 hg log -k bug --template "{rev}\\n"
4662 4664
4663 4665 - the full hash identifier of the working directory parent::
4664 4666
4665 4667 hg log -r . --template "{node}\\n"
4666 4668
4667 4669 - list available log templates::
4668 4670
4669 4671 hg log -T list
4670 4672
4671 4673 - check if a given changeset is included in a tagged release::
4672 4674
4673 4675 hg log -r "a21ccf and ancestor(1.9)"
4674 4676
4675 4677 - find all changesets by some user in a date range::
4676 4678
4677 4679 hg log -k alice -d "may 2008 to jul 2008"
4678 4680
4679 4681 - summary of all changesets after the last tag::
4680 4682
4681 4683 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4682 4684
4683 4685 - changesets touching lines 13 to 23 for file.c::
4684 4686
4685 4687 hg log -L file.c,13:23
4686 4688
4687 4689 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4688 4690 main.c with patch::
4689 4691
4690 4692 hg log -L file.c,13:23 -L main.c,2:6 -p
4691 4693
4692 4694 See :hg:`help dates` for a list of formats valid for -d/--date.
4693 4695
4694 4696 See :hg:`help revisions` for more about specifying and ordering
4695 4697 revisions.
4696 4698
4697 4699 See :hg:`help templates` for more about pre-packaged styles and
4698 4700 specifying custom templates. The default template used by the log
4699 4701 command can be customized via the ``command-templates.log`` configuration
4700 4702 setting.
4701 4703
4702 4704 Returns 0 on success.
4703 4705
4704 4706 """
4705 4707 opts = pycompat.byteskwargs(opts)
4706 4708 linerange = opts.get(b'line_range')
4707 4709
4708 4710 if linerange and not opts.get(b'follow'):
4709 4711 raise error.InputError(_(b'--line-range requires --follow'))
4710 4712
4711 4713 if linerange and pats:
4712 4714 # TODO: take pats as patterns with no line-range filter
4713 4715 raise error.InputError(
4714 4716 _(b'FILE arguments are not compatible with --line-range option')
4715 4717 )
4716 4718
4717 4719 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4718 4720 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4719 4721 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4720 4722 if linerange:
4721 4723 # TODO: should follow file history from logcmdutil._initialrevs(),
4722 4724 # then filter the result by logcmdutil._makerevset() and --limit
4723 4725 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4724 4726
4725 4727 getcopies = None
4726 4728 if opts.get(b'copies'):
4727 4729 endrev = None
4728 4730 if revs:
4729 4731 endrev = revs.max() + 1
4730 4732 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4731 4733
4732 4734 ui.pager(b'log')
4733 4735 displayer = logcmdutil.changesetdisplayer(
4734 4736 ui, repo, opts, differ, buffered=True
4735 4737 )
4736 4738 if opts.get(b'graph'):
4737 4739 displayfn = logcmdutil.displaygraphrevs
4738 4740 else:
4739 4741 displayfn = logcmdutil.displayrevs
4740 4742 displayfn(ui, repo, revs, displayer, getcopies)
4741 4743
4742 4744
4743 4745 @command(
4744 4746 b'manifest',
4745 4747 [
4746 4748 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4747 4749 (b'', b'all', False, _(b"list files from all revisions")),
4748 4750 ]
4749 4751 + formatteropts,
4750 4752 _(b'[-r REV]'),
4751 4753 helpcategory=command.CATEGORY_MAINTENANCE,
4752 4754 intents={INTENT_READONLY},
4753 4755 )
4754 4756 def manifest(ui, repo, node=None, rev=None, **opts):
4755 4757 """output the current or given revision of the project manifest
4756 4758
4757 4759 Print a list of version controlled files for the given revision.
4758 4760 If no revision is given, the first parent of the working directory
4759 4761 is used, or the null revision if no revision is checked out.
4760 4762
4761 4763 With -v, print file permissions, symlink and executable bits.
4762 4764 With --debug, print file revision hashes.
4763 4765
4764 4766 If option --all is specified, the list of all files from all revisions
4765 4767 is printed. This includes deleted and renamed files.
4766 4768
4767 4769 Returns 0 on success.
4768 4770 """
4769 4771 opts = pycompat.byteskwargs(opts)
4770 4772 fm = ui.formatter(b'manifest', opts)
4771 4773
4772 4774 if opts.get(b'all'):
4773 4775 if rev or node:
4774 4776 raise error.InputError(_(b"can't specify a revision with --all"))
4775 4777
4776 4778 res = set()
4777 4779 for rev in repo:
4778 4780 ctx = repo[rev]
4779 4781 res |= set(ctx.files())
4780 4782
4781 4783 ui.pager(b'manifest')
4782 4784 for f in sorted(res):
4783 4785 fm.startitem()
4784 4786 fm.write(b"path", b'%s\n', f)
4785 4787 fm.end()
4786 4788 return
4787 4789
4788 4790 if rev and node:
4789 4791 raise error.InputError(_(b"please specify just one revision"))
4790 4792
4791 4793 if not node:
4792 4794 node = rev
4793 4795
4794 4796 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4795 4797 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4796 4798 if node:
4797 4799 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4798 4800 ctx = logcmdutil.revsingle(repo, node)
4799 4801 mf = ctx.manifest()
4800 4802 ui.pager(b'manifest')
4801 4803 for f in ctx:
4802 4804 fm.startitem()
4803 4805 fm.context(ctx=ctx)
4804 4806 fl = ctx[f].flags()
4805 4807 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4806 4808 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4807 4809 fm.write(b'path', b'%s\n', f)
4808 4810 fm.end()
4809 4811
4810 4812
4811 4813 @command(
4812 4814 b'merge',
4813 4815 [
4814 4816 (
4815 4817 b'f',
4816 4818 b'force',
4817 4819 None,
4818 4820 _(b'force a merge including outstanding changes (DEPRECATED)'),
4819 4821 ),
4820 4822 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4821 4823 (
4822 4824 b'P',
4823 4825 b'preview',
4824 4826 None,
4825 4827 _(b'review revisions to merge (no merge is performed)'),
4826 4828 ),
4827 4829 (b'', b'abort', None, _(b'abort the ongoing merge')),
4828 4830 ]
4829 4831 + mergetoolopts,
4830 4832 _(b'[-P] [[-r] REV]'),
4831 4833 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4832 4834 helpbasic=True,
4833 4835 )
4834 4836 def merge(ui, repo, node=None, **opts):
4835 4837 """merge another revision into working directory
4836 4838
4837 4839 The current working directory is updated with all changes made in
4838 4840 the requested revision since the last common predecessor revision.
4839 4841
4840 4842 Files that changed between either parent are marked as changed for
4841 4843 the next commit and a commit must be performed before any further
4842 4844 updates to the repository are allowed. The next commit will have
4843 4845 two parents.
4844 4846
4845 4847 ``--tool`` can be used to specify the merge tool used for file
4846 4848 merges. It overrides the HGMERGE environment variable and your
4847 4849 configuration files. See :hg:`help merge-tools` for options.
4848 4850
4849 4851 If no revision is specified, the working directory's parent is a
4850 4852 head revision, and the current branch contains exactly one other
4851 4853 head, the other head is merged with by default. Otherwise, an
4852 4854 explicit revision with which to merge must be provided.
4853 4855
4854 4856 See :hg:`help resolve` for information on handling file conflicts.
4855 4857
4856 4858 To undo an uncommitted merge, use :hg:`merge --abort` which
4857 4859 will check out a clean copy of the original merge parent, losing
4858 4860 all changes.
4859 4861
4860 4862 Returns 0 on success, 1 if there are unresolved files.
4861 4863 """
4862 4864
4863 4865 opts = pycompat.byteskwargs(opts)
4864 4866 abort = opts.get(b'abort')
4865 4867 if abort and repo.dirstate.p2() == repo.nullid:
4866 4868 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4867 4869 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4868 4870 if abort:
4869 4871 state = cmdutil.getunfinishedstate(repo)
4870 4872 if state and state._opname != b'merge':
4871 4873 raise error.StateError(
4872 4874 _(b'cannot abort merge with %s in progress') % (state._opname),
4873 4875 hint=state.hint(),
4874 4876 )
4875 4877 if node:
4876 4878 raise error.InputError(_(b"cannot specify a node with --abort"))
4877 4879 return hg.abortmerge(repo.ui, repo)
4878 4880
4879 4881 if opts.get(b'rev') and node:
4880 4882 raise error.InputError(_(b"please specify just one revision"))
4881 4883 if not node:
4882 4884 node = opts.get(b'rev')
4883 4885
4884 4886 if node:
4885 4887 ctx = logcmdutil.revsingle(repo, node)
4886 4888 else:
4887 4889 if ui.configbool(b'commands', b'merge.require-rev'):
4888 4890 raise error.InputError(
4889 4891 _(
4890 4892 b'configuration requires specifying revision to merge '
4891 4893 b'with'
4892 4894 )
4893 4895 )
4894 4896 ctx = repo[destutil.destmerge(repo)]
4895 4897
4896 4898 if ctx.node() is None:
4897 4899 raise error.InputError(
4898 4900 _(b'merging with the working copy has no effect')
4899 4901 )
4900 4902
4901 4903 if opts.get(b'preview'):
4902 4904 # find nodes that are ancestors of p2 but not of p1
4903 4905 p1 = repo[b'.'].node()
4904 4906 p2 = ctx.node()
4905 4907 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4906 4908
4907 4909 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4908 4910 for node in nodes:
4909 4911 displayer.show(repo[node])
4910 4912 displayer.close()
4911 4913 return 0
4912 4914
4913 4915 # ui.forcemerge is an internal variable, do not document
4914 4916 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4915 4917 with ui.configoverride(overrides, b'merge'):
4916 4918 force = opts.get(b'force')
4917 4919 labels = [b'working copy', b'merge rev', b'common ancestor']
4918 4920 return hg.merge(ctx, force=force, labels=labels)
4919 4921
4920 4922
4921 4923 statemod.addunfinished(
4922 4924 b'merge',
4923 4925 fname=None,
4924 4926 clearable=True,
4925 4927 allowcommit=True,
4926 4928 cmdmsg=_(b'outstanding uncommitted merge'),
4927 4929 abortfunc=hg.abortmerge,
4928 4930 statushint=_(
4929 4931 b'To continue: hg commit\nTo abort: hg merge --abort'
4930 4932 ),
4931 4933 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4932 4934 )
4933 4935
4934 4936
4935 4937 @command(
4936 4938 b'outgoing|out',
4937 4939 [
4938 4940 (
4939 4941 b'f',
4940 4942 b'force',
4941 4943 None,
4942 4944 _(b'run even when the destination is unrelated'),
4943 4945 ),
4944 4946 (
4945 4947 b'r',
4946 4948 b'rev',
4947 4949 [],
4948 4950 _(b'a changeset intended to be included in the destination'),
4949 4951 _(b'REV'),
4950 4952 ),
4951 4953 (b'n', b'newest-first', None, _(b'show newest record first')),
4952 4954 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4953 4955 (
4954 4956 b'b',
4955 4957 b'branch',
4956 4958 [],
4957 4959 _(b'a specific branch you would like to push'),
4958 4960 _(b'BRANCH'),
4959 4961 ),
4960 4962 ]
4961 4963 + logopts
4962 4964 + remoteopts
4963 4965 + subrepoopts,
4964 4966 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4965 4967 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4966 4968 )
4967 4969 def outgoing(ui, repo, *dests, **opts):
4968 4970 """show changesets not found in the destination
4969 4971
4970 4972 Show changesets not found in the specified destination repository
4971 4973 or the default push location. These are the changesets that would
4972 4974 be pushed if a push was requested.
4973 4975
4974 4976 See pull for details of valid destination formats.
4975 4977
4976 4978 .. container:: verbose
4977 4979
4978 4980 With -B/--bookmarks, the result of bookmark comparison between
4979 4981 local and remote repositories is displayed. With -v/--verbose,
4980 4982 status is also displayed for each bookmark like below::
4981 4983
4982 4984 BM1 01234567890a added
4983 4985 BM2 deleted
4984 4986 BM3 234567890abc advanced
4985 4987 BM4 34567890abcd diverged
4986 4988 BM5 4567890abcde changed
4987 4989
4988 4990 The action taken when pushing depends on the
4989 4991 status of each bookmark:
4990 4992
4991 4993 :``added``: push with ``-B`` will create it
4992 4994 :``deleted``: push with ``-B`` will delete it
4993 4995 :``advanced``: push will update it
4994 4996 :``diverged``: push with ``-B`` will update it
4995 4997 :``changed``: push with ``-B`` will update it
4996 4998
4997 4999 From the point of view of pushing behavior, bookmarks
4998 5000 existing only in the remote repository are treated as
4999 5001 ``deleted``, even if it is in fact added remotely.
5000 5002
5001 5003 Returns 0 if there are outgoing changes, 1 otherwise.
5002 5004 """
5003 5005 opts = pycompat.byteskwargs(opts)
5004 5006 if opts.get(b'bookmarks'):
5005 5007 for path in urlutil.get_push_paths(repo, ui, dests):
5006 5008 dest = path.pushloc or path.loc
5007 5009 other = hg.peer(repo, opts, dest)
5008 5010 try:
5009 5011 if b'bookmarks' not in other.listkeys(b'namespaces'):
5010 5012 ui.warn(_(b"remote doesn't support bookmarks\n"))
5011 5013 return 0
5012 5014 ui.status(
5013 5015 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5014 5016 )
5015 5017 ui.pager(b'outgoing')
5016 5018 return bookmarks.outgoing(ui, repo, other)
5017 5019 finally:
5018 5020 other.close()
5019 5021
5020 5022 return hg.outgoing(ui, repo, dests, opts)
5021 5023
5022 5024
5023 5025 @command(
5024 5026 b'parents',
5025 5027 [
5026 5028 (
5027 5029 b'r',
5028 5030 b'rev',
5029 5031 b'',
5030 5032 _(b'show parents of the specified revision'),
5031 5033 _(b'REV'),
5032 5034 ),
5033 5035 ]
5034 5036 + templateopts,
5035 5037 _(b'[-r REV] [FILE]'),
5036 5038 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5037 5039 inferrepo=True,
5038 5040 )
5039 5041 def parents(ui, repo, file_=None, **opts):
5040 5042 """show the parents of the working directory or revision (DEPRECATED)
5041 5043
5042 5044 Print the working directory's parent revisions. If a revision is
5043 5045 given via -r/--rev, the parent of that revision will be printed.
5044 5046 If a file argument is given, the revision in which the file was
5045 5047 last changed (before the working directory revision or the
5046 5048 argument to --rev if given) is printed.
5047 5049
5048 5050 This command is equivalent to::
5049 5051
5050 5052 hg log -r "p1()+p2()" or
5051 5053 hg log -r "p1(REV)+p2(REV)" or
5052 5054 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5053 5055 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5054 5056
5055 5057 See :hg:`summary` and :hg:`help revsets` for related information.
5056 5058
5057 5059 Returns 0 on success.
5058 5060 """
5059 5061
5060 5062 opts = pycompat.byteskwargs(opts)
5061 5063 rev = opts.get(b'rev')
5062 5064 if rev:
5063 5065 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5064 5066 ctx = logcmdutil.revsingle(repo, rev, None)
5065 5067
5066 5068 if file_:
5067 5069 m = scmutil.match(ctx, (file_,), opts)
5068 5070 if m.anypats() or len(m.files()) != 1:
5069 5071 raise error.InputError(_(b'can only specify an explicit filename'))
5070 5072 file_ = m.files()[0]
5071 5073 filenodes = []
5072 5074 for cp in ctx.parents():
5073 5075 if not cp:
5074 5076 continue
5075 5077 try:
5076 5078 filenodes.append(cp.filenode(file_))
5077 5079 except error.LookupError:
5078 5080 pass
5079 5081 if not filenodes:
5080 5082 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5081 5083 p = []
5082 5084 for fn in filenodes:
5083 5085 fctx = repo.filectx(file_, fileid=fn)
5084 5086 p.append(fctx.node())
5085 5087 else:
5086 5088 p = [cp.node() for cp in ctx.parents()]
5087 5089
5088 5090 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5089 5091 for n in p:
5090 5092 if n != repo.nullid:
5091 5093 displayer.show(repo[n])
5092 5094 displayer.close()
5093 5095
5094 5096
5095 5097 @command(
5096 5098 b'paths',
5097 5099 formatteropts,
5098 5100 _(b'[NAME]'),
5099 5101 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5100 5102 optionalrepo=True,
5101 5103 intents={INTENT_READONLY},
5102 5104 )
5103 5105 def paths(ui, repo, search=None, **opts):
5104 5106 """show aliases for remote repositories
5105 5107
5106 5108 Show definition of symbolic path name NAME. If no name is given,
5107 5109 show definition of all available names.
5108 5110
5109 5111 Option -q/--quiet suppresses all output when searching for NAME
5110 5112 and shows only the path names when listing all definitions.
5111 5113
5112 5114 Path names are defined in the [paths] section of your
5113 5115 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5114 5116 repository, ``.hg/hgrc`` is used, too.
5115 5117
5116 5118 The path names ``default`` and ``default-push`` have a special
5117 5119 meaning. When performing a push or pull operation, they are used
5118 5120 as fallbacks if no location is specified on the command-line.
5119 5121 When ``default-push`` is set, it will be used for push and
5120 5122 ``default`` will be used for pull; otherwise ``default`` is used
5121 5123 as the fallback for both. When cloning a repository, the clone
5122 5124 source is written as ``default`` in ``.hg/hgrc``.
5123 5125
5124 5126 .. note::
5125 5127
5126 5128 ``default`` and ``default-push`` apply to all inbound (e.g.
5127 5129 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5128 5130 and :hg:`bundle`) operations.
5129 5131
5130 5132 See :hg:`help urls` for more information.
5131 5133
5132 5134 .. container:: verbose
5133 5135
5134 5136 Template:
5135 5137
5136 5138 The following keywords are supported. See also :hg:`help templates`.
5137 5139
5138 5140 :name: String. Symbolic name of the path alias.
5139 5141 :pushurl: String. URL for push operations.
5140 5142 :url: String. URL or directory path for the other operations.
5141 5143
5142 5144 Returns 0 on success.
5143 5145 """
5144 5146
5145 5147 opts = pycompat.byteskwargs(opts)
5146 5148
5147 5149 pathitems = urlutil.list_paths(ui, search)
5148 5150 ui.pager(b'paths')
5149 5151
5150 5152 fm = ui.formatter(b'paths', opts)
5151 5153 if fm.isplain():
5152 5154 hidepassword = urlutil.hidepassword
5153 5155 else:
5154 5156 hidepassword = bytes
5155 5157 if ui.quiet:
5156 5158 namefmt = b'%s\n'
5157 5159 else:
5158 5160 namefmt = b'%s = '
5159 5161 showsubopts = not search and not ui.quiet
5160 5162
5161 5163 for name, path in pathitems:
5162 5164 fm.startitem()
5163 5165 fm.condwrite(not search, b'name', namefmt, name)
5164 5166 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5165 5167 for subopt, value in sorted(path.suboptions.items()):
5166 5168 assert subopt not in (b'name', b'url')
5167 5169 if showsubopts:
5168 5170 fm.plain(b'%s:%s = ' % (name, subopt))
5169 5171 if isinstance(value, bool):
5170 5172 if value:
5171 5173 value = b'yes'
5172 5174 else:
5173 5175 value = b'no'
5174 5176 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5175 5177
5176 5178 fm.end()
5177 5179
5178 5180 if search and not pathitems:
5179 5181 if not ui.quiet:
5180 5182 ui.warn(_(b"not found!\n"))
5181 5183 return 1
5182 5184 else:
5183 5185 return 0
5184 5186
5185 5187
5186 5188 @command(
5187 5189 b'phase',
5188 5190 [
5189 5191 (b'p', b'public', False, _(b'set changeset phase to public')),
5190 5192 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5191 5193 (b's', b'secret', False, _(b'set changeset phase to secret')),
5192 5194 (b'f', b'force', False, _(b'allow to move boundary backward')),
5193 5195 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5194 5196 ],
5195 5197 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5196 5198 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5197 5199 )
5198 5200 def phase(ui, repo, *revs, **opts):
5199 5201 """set or show the current phase name
5200 5202
5201 5203 With no argument, show the phase name of the current revision(s).
5202 5204
5203 5205 With one of -p/--public, -d/--draft or -s/--secret, change the
5204 5206 phase value of the specified revisions.
5205 5207
5206 5208 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5207 5209 lower phase to a higher phase. Phases are ordered as follows::
5208 5210
5209 5211 public < draft < secret
5210 5212
5211 5213 Returns 0 on success, 1 if some phases could not be changed.
5212 5214
5213 5215 (For more information about the phases concept, see :hg:`help phases`.)
5214 5216 """
5215 5217 opts = pycompat.byteskwargs(opts)
5216 5218 # search for a unique phase argument
5217 5219 targetphase = None
5218 5220 for idx, name in enumerate(phases.cmdphasenames):
5219 5221 if opts[name]:
5220 5222 if targetphase is not None:
5221 5223 raise error.InputError(_(b'only one phase can be specified'))
5222 5224 targetphase = idx
5223 5225
5224 5226 # look for specified revision
5225 5227 revs = list(revs)
5226 5228 revs.extend(opts[b'rev'])
5227 5229 if revs:
5228 5230 revs = logcmdutil.revrange(repo, revs)
5229 5231 else:
5230 5232 # display both parents as the second parent phase can influence
5231 5233 # the phase of a merge commit
5232 5234 revs = [c.rev() for c in repo[None].parents()]
5233 5235
5234 5236 ret = 0
5235 5237 if targetphase is None:
5236 5238 # display
5237 5239 for r in revs:
5238 5240 ctx = repo[r]
5239 5241 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5240 5242 else:
5241 5243 with repo.lock(), repo.transaction(b"phase") as tr:
5242 5244 # set phase
5243 5245 if not revs:
5244 5246 raise error.InputError(_(b'empty revision set'))
5245 5247 nodes = [repo[r].node() for r in revs]
5246 5248 # moving revision from public to draft may hide them
5247 5249 # We have to check result on an unfiltered repository
5248 5250 unfi = repo.unfiltered()
5249 5251 getphase = unfi._phasecache.phase
5250 5252 olddata = [getphase(unfi, r) for r in unfi]
5251 5253 phases.advanceboundary(repo, tr, targetphase, nodes)
5252 5254 if opts[b'force']:
5253 5255 phases.retractboundary(repo, tr, targetphase, nodes)
5254 5256 getphase = unfi._phasecache.phase
5255 5257 newdata = [getphase(unfi, r) for r in unfi]
5256 5258 changes = sum(newdata[r] != olddata[r] for r in unfi)
5257 5259 cl = unfi.changelog
5258 5260 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5259 5261 if rejected:
5260 5262 ui.warn(
5261 5263 _(
5262 5264 b'cannot move %i changesets to a higher '
5263 5265 b'phase, use --force\n'
5264 5266 )
5265 5267 % len(rejected)
5266 5268 )
5267 5269 ret = 1
5268 5270 if changes:
5269 5271 msg = _(b'phase changed for %i changesets\n') % changes
5270 5272 if ret:
5271 5273 ui.status(msg)
5272 5274 else:
5273 5275 ui.note(msg)
5274 5276 else:
5275 5277 ui.warn(_(b'no phases changed\n'))
5276 5278 return ret
5277 5279
5278 5280
5279 5281 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5280 5282 """Run after a changegroup has been added via pull/unbundle
5281 5283
5282 5284 This takes arguments below:
5283 5285
5284 5286 :modheads: change of heads by pull/unbundle
5285 5287 :optupdate: updating working directory is needed or not
5286 5288 :checkout: update destination revision (or None to default destination)
5287 5289 :brev: a name, which might be a bookmark to be activated after updating
5288 5290
5289 5291 return True if update raise any conflict, False otherwise.
5290 5292 """
5291 5293 if modheads == 0:
5292 5294 return False
5293 5295 if optupdate:
5294 5296 try:
5295 5297 return hg.updatetotally(ui, repo, checkout, brev)
5296 5298 except error.UpdateAbort as inst:
5297 5299 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5298 5300 hint = inst.hint
5299 5301 raise error.UpdateAbort(msg, hint=hint)
5300 5302 if modheads is not None and modheads > 1:
5301 5303 currentbranchheads = len(repo.branchheads())
5302 5304 if currentbranchheads == modheads:
5303 5305 ui.status(
5304 5306 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5305 5307 )
5306 5308 elif currentbranchheads > 1:
5307 5309 ui.status(
5308 5310 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5309 5311 )
5310 5312 else:
5311 5313 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5312 5314 elif not ui.configbool(b'commands', b'update.requiredest'):
5313 5315 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5314 5316 return False
5315 5317
5316 5318
5317 5319 @command(
5318 5320 b'pull',
5319 5321 [
5320 5322 (
5321 5323 b'u',
5322 5324 b'update',
5323 5325 None,
5324 5326 _(b'update to new branch head if new descendants were pulled'),
5325 5327 ),
5326 5328 (
5327 5329 b'f',
5328 5330 b'force',
5329 5331 None,
5330 5332 _(b'run even when remote repository is unrelated'),
5331 5333 ),
5332 5334 (
5333 5335 b'',
5334 5336 b'confirm',
5335 5337 None,
5336 5338 _(b'confirm pull before applying changes'),
5337 5339 ),
5338 5340 (
5339 5341 b'r',
5340 5342 b'rev',
5341 5343 [],
5342 5344 _(b'a remote changeset intended to be added'),
5343 5345 _(b'REV'),
5344 5346 ),
5345 5347 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5346 5348 (
5347 5349 b'b',
5348 5350 b'branch',
5349 5351 [],
5350 5352 _(b'a specific branch you would like to pull'),
5351 5353 _(b'BRANCH'),
5352 5354 ),
5353 5355 ]
5354 5356 + remoteopts,
5355 5357 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5356 5358 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5357 5359 helpbasic=True,
5358 5360 )
5359 5361 def pull(ui, repo, *sources, **opts):
5360 5362 """pull changes from the specified source
5361 5363
5362 5364 Pull changes from a remote repository to a local one.
5363 5365
5364 5366 This finds all changes from the repository at the specified path
5365 5367 or URL and adds them to a local repository (the current one unless
5366 5368 -R is specified). By default, this does not update the copy of the
5367 5369 project in the working directory.
5368 5370
5369 5371 When cloning from servers that support it, Mercurial may fetch
5370 5372 pre-generated data. When this is done, hooks operating on incoming
5371 5373 changesets and changegroups may fire more than once, once for each
5372 5374 pre-generated bundle and as well as for any additional remaining
5373 5375 data. See :hg:`help -e clonebundles` for more.
5374 5376
5375 5377 Use :hg:`incoming` if you want to see what would have been added
5376 5378 by a pull at the time you issued this command. If you then decide
5377 5379 to add those changes to the repository, you should use :hg:`pull
5378 5380 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5379 5381
5380 5382 If SOURCE is omitted, the 'default' path will be used.
5381 5383 See :hg:`help urls` for more information.
5382 5384
5383 5385 If multiple sources are specified, they will be pulled sequentially as if
5384 5386 the command was run multiple time. If --update is specify and the command
5385 5387 will stop at the first failed --update.
5386 5388
5387 5389 Specifying bookmark as ``.`` is equivalent to specifying the active
5388 5390 bookmark's name.
5389 5391
5390 5392 Returns 0 on success, 1 if an update had unresolved files.
5391 5393 """
5392 5394
5393 5395 opts = pycompat.byteskwargs(opts)
5394 5396 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5395 5397 b'update'
5396 5398 ):
5397 5399 msg = _(b'update destination required by configuration')
5398 5400 hint = _(b'use hg pull followed by hg update DEST')
5399 5401 raise error.InputError(msg, hint=hint)
5400 5402
5401 5403 for path in urlutil.get_pull_paths(repo, ui, sources):
5402 5404 source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch'))
5403 5405 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5404 5406 ui.flush()
5405 5407 other = hg.peer(repo, opts, source)
5406 5408 update_conflict = None
5407 5409 try:
5408 5410 revs, checkout = hg.addbranchrevs(
5409 5411 repo, other, branches, opts.get(b'rev')
5410 5412 )
5411 5413
5412 5414 pullopargs = {}
5413 5415
5414 5416 nodes = None
5415 5417 if opts.get(b'bookmark') or revs:
5416 5418 # The list of bookmark used here is the same used to actually update
5417 5419 # the bookmark names, to avoid the race from issue 4689 and we do
5418 5420 # all lookup and bookmark queries in one go so they see the same
5419 5421 # version of the server state (issue 4700).
5420 5422 nodes = []
5421 5423 fnodes = []
5422 5424 revs = revs or []
5423 5425 if revs and not other.capable(b'lookup'):
5424 5426 err = _(
5425 5427 b"other repository doesn't support revision lookup, "
5426 5428 b"so a rev cannot be specified."
5427 5429 )
5428 5430 raise error.Abort(err)
5429 5431 with other.commandexecutor() as e:
5430 5432 fremotebookmarks = e.callcommand(
5431 5433 b'listkeys', {b'namespace': b'bookmarks'}
5432 5434 )
5433 5435 for r in revs:
5434 5436 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5435 5437 remotebookmarks = fremotebookmarks.result()
5436 5438 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5437 5439 pullopargs[b'remotebookmarks'] = remotebookmarks
5438 5440 for b in opts.get(b'bookmark', []):
5439 5441 b = repo._bookmarks.expandname(b)
5440 5442 if b not in remotebookmarks:
5441 5443 raise error.InputError(
5442 5444 _(b'remote bookmark %s not found!') % b
5443 5445 )
5444 5446 nodes.append(remotebookmarks[b])
5445 5447 for i, rev in enumerate(revs):
5446 5448 node = fnodes[i].result()
5447 5449 nodes.append(node)
5448 5450 if rev == checkout:
5449 5451 checkout = node
5450 5452
5451 5453 wlock = util.nullcontextmanager()
5452 5454 if opts.get(b'update'):
5453 5455 wlock = repo.wlock()
5454 5456 with wlock:
5455 5457 pullopargs.update(opts.get(b'opargs', {}))
5456 5458 modheads = exchange.pull(
5457 5459 repo,
5458 5460 other,
5459 5461 path=path,
5460 5462 heads=nodes,
5461 5463 force=opts.get(b'force'),
5462 5464 bookmarks=opts.get(b'bookmark', ()),
5463 5465 opargs=pullopargs,
5464 5466 confirm=opts.get(b'confirm'),
5465 5467 ).cgresult
5466 5468
5467 5469 # brev is a name, which might be a bookmark to be activated at
5468 5470 # the end of the update. In other words, it is an explicit
5469 5471 # destination of the update
5470 5472 brev = None
5471 5473
5472 5474 if checkout:
5473 5475 checkout = repo.unfiltered().changelog.rev(checkout)
5474 5476
5475 5477 # order below depends on implementation of
5476 5478 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 5479 # because 'checkout' is determined without it.
5478 5480 if opts.get(b'rev'):
5479 5481 brev = opts[b'rev'][0]
5480 5482 elif opts.get(b'branch'):
5481 5483 brev = opts[b'branch'][0]
5482 5484 else:
5483 5485 brev = branches[0]
5484 5486 repo._subtoppath = source
5485 5487 try:
5486 5488 update_conflict = postincoming(
5487 5489 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 5490 )
5489 5491 except error.FilteredRepoLookupError as exc:
5490 5492 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 5493 exc.args = (msg,) + exc.args[1:]
5492 5494 raise
5493 5495 finally:
5494 5496 del repo._subtoppath
5495 5497
5496 5498 finally:
5497 5499 other.close()
5498 5500 # skip the remaining pull source if they are some conflict.
5499 5501 if update_conflict:
5500 5502 break
5501 5503 if update_conflict:
5502 5504 return 1
5503 5505 else:
5504 5506 return 0
5505 5507
5506 5508
5507 5509 @command(
5508 5510 b'purge|clean',
5509 5511 [
5510 5512 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5511 5513 (b'', b'all', None, _(b'purge ignored files too')),
5512 5514 (b'i', b'ignored', None, _(b'purge only ignored files')),
5513 5515 (b'', b'dirs', None, _(b'purge empty directories')),
5514 5516 (b'', b'files', None, _(b'purge files')),
5515 5517 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5516 5518 (
5517 5519 b'0',
5518 5520 b'print0',
5519 5521 None,
5520 5522 _(
5521 5523 b'end filenames with NUL, for use with xargs'
5522 5524 b' (implies -p/--print)'
5523 5525 ),
5524 5526 ),
5525 5527 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5526 5528 ]
5527 5529 + cmdutil.walkopts,
5528 5530 _(b'hg purge [OPTION]... [DIR]...'),
5529 5531 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5530 5532 )
5531 5533 def purge(ui, repo, *dirs, **opts):
5532 5534 """removes files not tracked by Mercurial
5533 5535
5534 5536 Delete files not known to Mercurial. This is useful to test local
5535 5537 and uncommitted changes in an otherwise-clean source tree.
5536 5538
5537 5539 This means that purge will delete the following by default:
5538 5540
5539 5541 - Unknown files: files marked with "?" by :hg:`status`
5540 5542 - Empty directories: in fact Mercurial ignores directories unless
5541 5543 they contain files under source control management
5542 5544
5543 5545 But it will leave untouched:
5544 5546
5545 5547 - Modified and unmodified tracked files
5546 5548 - Ignored files (unless -i or --all is specified)
5547 5549 - New files added to the repository (with :hg:`add`)
5548 5550
5549 5551 The --files and --dirs options can be used to direct purge to delete
5550 5552 only files, only directories, or both. If neither option is given,
5551 5553 both will be deleted.
5552 5554
5553 5555 If directories are given on the command line, only files in these
5554 5556 directories are considered.
5555 5557
5556 5558 Be careful with purge, as you could irreversibly delete some files
5557 5559 you forgot to add to the repository. If you only want to print the
5558 5560 list of files that this program would delete, use the --print
5559 5561 option.
5560 5562 """
5561 5563 opts = pycompat.byteskwargs(opts)
5562 5564 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5563 5565
5564 5566 act = not opts.get(b'print')
5565 5567 eol = b'\n'
5566 5568 if opts.get(b'print0'):
5567 5569 eol = b'\0'
5568 5570 act = False # --print0 implies --print
5569 5571 if opts.get(b'all', False):
5570 5572 ignored = True
5571 5573 unknown = True
5572 5574 else:
5573 5575 ignored = opts.get(b'ignored', False)
5574 5576 unknown = not ignored
5575 5577
5576 5578 removefiles = opts.get(b'files')
5577 5579 removedirs = opts.get(b'dirs')
5578 5580 confirm = opts.get(b'confirm')
5579 5581 if confirm is None:
5580 5582 try:
5581 5583 extensions.find(b'purge')
5582 5584 confirm = False
5583 5585 except KeyError:
5584 5586 confirm = True
5585 5587
5586 5588 if not removefiles and not removedirs:
5587 5589 removefiles = True
5588 5590 removedirs = True
5589 5591
5590 5592 match = scmutil.match(repo[None], dirs, opts)
5591 5593
5592 5594 paths = mergemod.purge(
5593 5595 repo,
5594 5596 match,
5595 5597 unknown=unknown,
5596 5598 ignored=ignored,
5597 5599 removeemptydirs=removedirs,
5598 5600 removefiles=removefiles,
5599 5601 abortonerror=opts.get(b'abort_on_err'),
5600 5602 noop=not act,
5601 5603 confirm=confirm,
5602 5604 )
5603 5605
5604 5606 for path in paths:
5605 5607 if not act:
5606 5608 ui.write(b'%s%s' % (path, eol))
5607 5609
5608 5610
5609 5611 @command(
5610 5612 b'push',
5611 5613 [
5612 5614 (b'f', b'force', None, _(b'force push')),
5613 5615 (
5614 5616 b'r',
5615 5617 b'rev',
5616 5618 [],
5617 5619 _(b'a changeset intended to be included in the destination'),
5618 5620 _(b'REV'),
5619 5621 ),
5620 5622 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5621 5623 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5622 5624 (
5623 5625 b'b',
5624 5626 b'branch',
5625 5627 [],
5626 5628 _(b'a specific branch you would like to push'),
5627 5629 _(b'BRANCH'),
5628 5630 ),
5629 5631 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5630 5632 (
5631 5633 b'',
5632 5634 b'pushvars',
5633 5635 [],
5634 5636 _(b'variables that can be sent to server (ADVANCED)'),
5635 5637 ),
5636 5638 (
5637 5639 b'',
5638 5640 b'publish',
5639 5641 False,
5640 5642 _(b'push the changeset as public (EXPERIMENTAL)'),
5641 5643 ),
5642 5644 ]
5643 5645 + remoteopts,
5644 5646 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5645 5647 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5646 5648 helpbasic=True,
5647 5649 )
5648 5650 def push(ui, repo, *dests, **opts):
5649 5651 """push changes to the specified destination
5650 5652
5651 5653 Push changesets from the local repository to the specified
5652 5654 destination.
5653 5655
5654 5656 This operation is symmetrical to pull: it is identical to a pull
5655 5657 in the destination repository from the current one.
5656 5658
5657 5659 By default, push will not allow creation of new heads at the
5658 5660 destination, since multiple heads would make it unclear which head
5659 5661 to use. In this situation, it is recommended to pull and merge
5660 5662 before pushing.
5661 5663
5662 5664 Use --new-branch if you want to allow push to create a new named
5663 5665 branch that is not present at the destination. This allows you to
5664 5666 only create a new branch without forcing other changes.
5665 5667
5666 5668 .. note::
5667 5669
5668 5670 Extra care should be taken with the -f/--force option,
5669 5671 which will push all new heads on all branches, an action which will
5670 5672 almost always cause confusion for collaborators.
5671 5673
5672 5674 If -r/--rev is used, the specified revision and all its ancestors
5673 5675 will be pushed to the remote repository.
5674 5676
5675 5677 If -B/--bookmark is used, the specified bookmarked revision, its
5676 5678 ancestors, and the bookmark will be pushed to the remote
5677 5679 repository. Specifying ``.`` is equivalent to specifying the active
5678 5680 bookmark's name. Use the --all-bookmarks option for pushing all
5679 5681 current bookmarks.
5680 5682
5681 5683 Please see :hg:`help urls` for important details about ``ssh://``
5682 5684 URLs. If DESTINATION is omitted, a default path will be used.
5683 5685
5684 5686 When passed multiple destinations, push will process them one after the
5685 5687 other, but stop should an error occur.
5686 5688
5687 5689 .. container:: verbose
5688 5690
5689 5691 The --pushvars option sends strings to the server that become
5690 5692 environment variables prepended with ``HG_USERVAR_``. For example,
5691 5693 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5692 5694 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5693 5695
5694 5696 pushvars can provide for user-overridable hooks as well as set debug
5695 5697 levels. One example is having a hook that blocks commits containing
5696 5698 conflict markers, but enables the user to override the hook if the file
5697 5699 is using conflict markers for testing purposes or the file format has
5698 5700 strings that look like conflict markers.
5699 5701
5700 5702 By default, servers will ignore `--pushvars`. To enable it add the
5701 5703 following to your configuration file::
5702 5704
5703 5705 [push]
5704 5706 pushvars.server = true
5705 5707
5706 5708 Returns 0 if push was successful, 1 if nothing to push.
5707 5709 """
5708 5710
5709 5711 opts = pycompat.byteskwargs(opts)
5710 5712
5711 5713 if opts.get(b'all_bookmarks'):
5712 5714 cmdutil.check_incompatible_arguments(
5713 5715 opts,
5714 5716 b'all_bookmarks',
5715 5717 [b'bookmark', b'rev'],
5716 5718 )
5717 5719 opts[b'bookmark'] = list(repo._bookmarks)
5718 5720
5719 5721 if opts.get(b'bookmark'):
5720 5722 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5721 5723 for b in opts[b'bookmark']:
5722 5724 # translate -B options to -r so changesets get pushed
5723 5725 b = repo._bookmarks.expandname(b)
5724 5726 if b in repo._bookmarks:
5725 5727 opts.setdefault(b'rev', []).append(b)
5726 5728 else:
5727 5729 # if we try to push a deleted bookmark, translate it to null
5728 5730 # this lets simultaneous -r, -b options continue working
5729 5731 opts.setdefault(b'rev', []).append(b"null")
5730 5732
5731 5733 some_pushed = False
5732 5734 result = 0
5733 5735 for path in urlutil.get_push_paths(repo, ui, dests):
5734 5736 dest = path.pushloc or path.loc
5735 5737 branches = (path.branch, opts.get(b'branch') or [])
5736 5738 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5737 5739 revs, checkout = hg.addbranchrevs(
5738 5740 repo, repo, branches, opts.get(b'rev')
5739 5741 )
5740 5742 other = hg.peer(repo, opts, dest)
5741 5743
5742 5744 try:
5743 5745 if revs:
5744 5746 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5745 5747 if not revs:
5746 5748 raise error.InputError(
5747 5749 _(b"specified revisions evaluate to an empty set"),
5748 5750 hint=_(b"use different revision arguments"),
5749 5751 )
5750 5752 elif path.pushrev:
5751 5753 # It doesn't make any sense to specify ancestor revisions. So limit
5752 5754 # to DAG heads to make discovery simpler.
5753 5755 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5754 5756 revs = scmutil.revrange(repo, [expr])
5755 5757 revs = [repo[rev].node() for rev in revs]
5756 5758 if not revs:
5757 5759 raise error.InputError(
5758 5760 _(
5759 5761 b'default push revset for path evaluates to an empty set'
5760 5762 )
5761 5763 )
5762 5764 elif ui.configbool(b'commands', b'push.require-revs'):
5763 5765 raise error.InputError(
5764 5766 _(b'no revisions specified to push'),
5765 5767 hint=_(b'did you mean "hg push -r ."?'),
5766 5768 )
5767 5769
5768 5770 repo._subtoppath = dest
5769 5771 try:
5770 5772 # push subrepos depth-first for coherent ordering
5771 5773 c = repo[b'.']
5772 5774 subs = c.substate # only repos that are committed
5773 5775 for s in sorted(subs):
5774 5776 sub_result = c.sub(s).push(opts)
5775 5777 if sub_result == 0:
5776 5778 return 1
5777 5779 finally:
5778 5780 del repo._subtoppath
5779 5781
5780 5782 opargs = dict(
5781 5783 opts.get(b'opargs', {})
5782 5784 ) # copy opargs since we may mutate it
5783 5785 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5784 5786
5785 5787 pushop = exchange.push(
5786 5788 repo,
5787 5789 other,
5788 5790 opts.get(b'force'),
5789 5791 revs=revs,
5790 5792 newbranch=opts.get(b'new_branch'),
5791 5793 bookmarks=opts.get(b'bookmark', ()),
5792 5794 publish=opts.get(b'publish'),
5793 5795 opargs=opargs,
5794 5796 )
5795 5797
5796 5798 if pushop.cgresult == 0:
5797 5799 result = 1
5798 5800 elif pushop.cgresult is not None:
5799 5801 some_pushed = True
5800 5802
5801 5803 if pushop.bkresult is not None:
5802 5804 if pushop.bkresult == 2:
5803 5805 result = 2
5804 5806 elif not result and pushop.bkresult:
5805 5807 result = 2
5806 5808
5807 5809 if result:
5808 5810 break
5809 5811
5810 5812 finally:
5811 5813 other.close()
5812 5814 if result == 0 and not some_pushed:
5813 5815 result = 1
5814 5816 return result
5815 5817
5816 5818
5817 5819 @command(
5818 5820 b'recover',
5819 5821 [
5820 5822 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5821 5823 ],
5822 5824 helpcategory=command.CATEGORY_MAINTENANCE,
5823 5825 )
5824 5826 def recover(ui, repo, **opts):
5825 5827 """roll back an interrupted transaction
5826 5828
5827 5829 Recover from an interrupted commit or pull.
5828 5830
5829 5831 This command tries to fix the repository status after an
5830 5832 interrupted operation. It should only be necessary when Mercurial
5831 5833 suggests it.
5832 5834
5833 5835 Returns 0 if successful, 1 if nothing to recover or verify fails.
5834 5836 """
5835 5837 ret = repo.recover()
5836 5838 if ret:
5837 5839 if opts['verify']:
5838 5840 return hg.verify(repo)
5839 5841 else:
5840 5842 msg = _(
5841 5843 b"(verify step skipped, run `hg verify` to check your "
5842 5844 b"repository content)\n"
5843 5845 )
5844 5846 ui.warn(msg)
5845 5847 return 0
5846 5848 return 1
5847 5849
5848 5850
5849 5851 @command(
5850 5852 b'remove|rm',
5851 5853 [
5852 5854 (b'A', b'after', None, _(b'record delete for missing files')),
5853 5855 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5854 5856 ]
5855 5857 + subrepoopts
5856 5858 + walkopts
5857 5859 + dryrunopts,
5858 5860 _(b'[OPTION]... FILE...'),
5859 5861 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5860 5862 helpbasic=True,
5861 5863 inferrepo=True,
5862 5864 )
5863 5865 def remove(ui, repo, *pats, **opts):
5864 5866 """remove the specified files on the next commit
5865 5867
5866 5868 Schedule the indicated files for removal from the current branch.
5867 5869
5868 5870 This command schedules the files to be removed at the next commit.
5869 5871 To undo a remove before that, see :hg:`revert`. To undo added
5870 5872 files, see :hg:`forget`.
5871 5873
5872 5874 .. container:: verbose
5873 5875
5874 5876 -A/--after can be used to remove only files that have already
5875 5877 been deleted, -f/--force can be used to force deletion, and -Af
5876 5878 can be used to remove files from the next revision without
5877 5879 deleting them from the working directory.
5878 5880
5879 5881 The following table details the behavior of remove for different
5880 5882 file states (columns) and option combinations (rows). The file
5881 5883 states are Added [A], Clean [C], Modified [M] and Missing [!]
5882 5884 (as reported by :hg:`status`). The actions are Warn, Remove
5883 5885 (from branch) and Delete (from disk):
5884 5886
5885 5887 ========= == == == ==
5886 5888 opt/state A C M !
5887 5889 ========= == == == ==
5888 5890 none W RD W R
5889 5891 -f R RD RD R
5890 5892 -A W W W R
5891 5893 -Af R R R R
5892 5894 ========= == == == ==
5893 5895
5894 5896 .. note::
5895 5897
5896 5898 :hg:`remove` never deletes files in Added [A] state from the
5897 5899 working directory, not even if ``--force`` is specified.
5898 5900
5899 5901 Returns 0 on success, 1 if any warnings encountered.
5900 5902 """
5901 5903
5902 5904 opts = pycompat.byteskwargs(opts)
5903 5905 after, force = opts.get(b'after'), opts.get(b'force')
5904 5906 dryrun = opts.get(b'dry_run')
5905 5907 if not pats and not after:
5906 5908 raise error.InputError(_(b'no files specified'))
5907 5909
5908 5910 m = scmutil.match(repo[None], pats, opts)
5909 5911 subrepos = opts.get(b'subrepos')
5910 5912 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5911 5913 return cmdutil.remove(
5912 5914 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5913 5915 )
5914 5916
5915 5917
5916 5918 @command(
5917 5919 b'rename|move|mv',
5918 5920 [
5919 5921 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5920 5922 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5921 5923 (
5922 5924 b'',
5923 5925 b'at-rev',
5924 5926 b'',
5925 5927 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5926 5928 _(b'REV'),
5927 5929 ),
5928 5930 (
5929 5931 b'f',
5930 5932 b'force',
5931 5933 None,
5932 5934 _(b'forcibly move over an existing managed file'),
5933 5935 ),
5934 5936 ]
5935 5937 + walkopts
5936 5938 + dryrunopts,
5937 5939 _(b'[OPTION]... SOURCE... DEST'),
5938 5940 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5939 5941 )
5940 5942 def rename(ui, repo, *pats, **opts):
5941 5943 """rename files; equivalent of copy + remove
5942 5944
5943 5945 Mark dest as copies of sources; mark sources for deletion. If dest
5944 5946 is a directory, copies are put in that directory. If dest is a
5945 5947 file, there can only be one source.
5946 5948
5947 5949 By default, this command copies the contents of files as they
5948 5950 exist in the working directory. If invoked with -A/--after, the
5949 5951 operation is recorded, but no copying is performed.
5950 5952
5951 5953 To undo marking a destination file as renamed, use --forget. With that
5952 5954 option, all given (positional) arguments are unmarked as renames. The
5953 5955 destination file(s) will be left in place (still tracked). The source
5954 5956 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5955 5957 the same way as :hg:`copy --forget`.
5956 5958
5957 5959 This command takes effect with the next commit by default.
5958 5960
5959 5961 Returns 0 on success, 1 if errors are encountered.
5960 5962 """
5961 5963 opts = pycompat.byteskwargs(opts)
5962 5964 with repo.wlock():
5963 5965 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5964 5966
5965 5967
5966 5968 @command(
5967 5969 b'resolve',
5968 5970 [
5969 5971 (b'a', b'all', None, _(b'select all unresolved files')),
5970 5972 (b'l', b'list', None, _(b'list state of files needing merge')),
5971 5973 (b'm', b'mark', None, _(b'mark files as resolved')),
5972 5974 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5973 5975 (b'n', b'no-status', None, _(b'hide status prefix')),
5974 5976 (b'', b're-merge', None, _(b're-merge files')),
5975 5977 ]
5976 5978 + mergetoolopts
5977 5979 + walkopts
5978 5980 + formatteropts,
5979 5981 _(b'[OPTION]... [FILE]...'),
5980 5982 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5981 5983 inferrepo=True,
5982 5984 )
5983 5985 def resolve(ui, repo, *pats, **opts):
5984 5986 """redo merges or set/view the merge status of files
5985 5987
5986 5988 Merges with unresolved conflicts are often the result of
5987 5989 non-interactive merging using the ``internal:merge`` configuration
5988 5990 setting, or a command-line merge tool like ``diff3``. The resolve
5989 5991 command is used to manage the files involved in a merge, after
5990 5992 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5991 5993 working directory must have two parents). See :hg:`help
5992 5994 merge-tools` for information on configuring merge tools.
5993 5995
5994 5996 The resolve command can be used in the following ways:
5995 5997
5996 5998 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5997 5999 the specified files, discarding any previous merge attempts. Re-merging
5998 6000 is not performed for files already marked as resolved. Use ``--all/-a``
5999 6001 to select all unresolved files. ``--tool`` can be used to specify
6000 6002 the merge tool used for the given files. It overrides the HGMERGE
6001 6003 environment variable and your configuration files. Previous file
6002 6004 contents are saved with a ``.orig`` suffix.
6003 6005
6004 6006 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6005 6007 (e.g. after having manually fixed-up the files). The default is
6006 6008 to mark all unresolved files.
6007 6009
6008 6010 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6009 6011 default is to mark all resolved files.
6010 6012
6011 6013 - :hg:`resolve -l`: list files which had or still have conflicts.
6012 6014 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6013 6015 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6014 6016 the list. See :hg:`help filesets` for details.
6015 6017
6016 6018 .. note::
6017 6019
6018 6020 Mercurial will not let you commit files with unresolved merge
6019 6021 conflicts. You must use :hg:`resolve -m ...` before you can
6020 6022 commit after a conflicting merge.
6021 6023
6022 6024 .. container:: verbose
6023 6025
6024 6026 Template:
6025 6027
6026 6028 The following keywords are supported in addition to the common template
6027 6029 keywords and functions. See also :hg:`help templates`.
6028 6030
6029 6031 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6030 6032 :path: String. Repository-absolute path of the file.
6031 6033
6032 6034 Returns 0 on success, 1 if any files fail a resolve attempt.
6033 6035 """
6034 6036
6035 6037 opts = pycompat.byteskwargs(opts)
6036 6038 confirm = ui.configbool(b'commands', b'resolve.confirm')
6037 6039 flaglist = b'all mark unmark list no_status re_merge'.split()
6038 6040 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6039 6041
6040 6042 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6041 6043 if actioncount > 1:
6042 6044 raise error.InputError(_(b"too many actions specified"))
6043 6045 elif actioncount == 0 and ui.configbool(
6044 6046 b'commands', b'resolve.explicit-re-merge'
6045 6047 ):
6046 6048 hint = _(b'use --mark, --unmark, --list or --re-merge')
6047 6049 raise error.InputError(_(b'no action specified'), hint=hint)
6048 6050 if pats and all:
6049 6051 raise error.InputError(_(b"can't specify --all and patterns"))
6050 6052 if not (all or pats or show or mark or unmark):
6051 6053 raise error.InputError(
6052 6054 _(b'no files or directories specified'),
6053 6055 hint=b'use --all to re-merge all unresolved files',
6054 6056 )
6055 6057
6056 6058 if confirm:
6057 6059 if all:
6058 6060 if ui.promptchoice(
6059 6061 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6060 6062 ):
6061 6063 raise error.CanceledError(_(b'user quit'))
6062 6064 if mark and not pats:
6063 6065 if ui.promptchoice(
6064 6066 _(
6065 6067 b'mark all unresolved files as resolved (yn)?'
6066 6068 b'$$ &Yes $$ &No'
6067 6069 )
6068 6070 ):
6069 6071 raise error.CanceledError(_(b'user quit'))
6070 6072 if unmark and not pats:
6071 6073 if ui.promptchoice(
6072 6074 _(
6073 6075 b'mark all resolved files as unresolved (yn)?'
6074 6076 b'$$ &Yes $$ &No'
6075 6077 )
6076 6078 ):
6077 6079 raise error.CanceledError(_(b'user quit'))
6078 6080
6079 6081 uipathfn = scmutil.getuipathfn(repo)
6080 6082
6081 6083 if show:
6082 6084 ui.pager(b'resolve')
6083 6085 fm = ui.formatter(b'resolve', opts)
6084 6086 ms = mergestatemod.mergestate.read(repo)
6085 6087 wctx = repo[None]
6086 6088 m = scmutil.match(wctx, pats, opts)
6087 6089
6088 6090 # Labels and keys based on merge state. Unresolved path conflicts show
6089 6091 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6090 6092 # resolved conflicts.
6091 6093 mergestateinfo = {
6092 6094 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6093 6095 b'resolve.unresolved',
6094 6096 b'U',
6095 6097 ),
6096 6098 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6097 6099 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6098 6100 b'resolve.unresolved',
6099 6101 b'P',
6100 6102 ),
6101 6103 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6102 6104 b'resolve.resolved',
6103 6105 b'R',
6104 6106 ),
6105 6107 }
6106 6108
6107 6109 for f in ms:
6108 6110 if not m(f):
6109 6111 continue
6110 6112
6111 6113 label, key = mergestateinfo[ms[f]]
6112 6114 fm.startitem()
6113 6115 fm.context(ctx=wctx)
6114 6116 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6115 6117 fm.data(path=f)
6116 6118 fm.plain(b'%s\n' % uipathfn(f), label=label)
6117 6119 fm.end()
6118 6120 return 0
6119 6121
6120 6122 with repo.wlock():
6121 6123 ms = mergestatemod.mergestate.read(repo)
6122 6124
6123 6125 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6124 6126 raise error.StateError(
6125 6127 _(b'resolve command not applicable when not merging')
6126 6128 )
6127 6129
6128 6130 wctx = repo[None]
6129 6131 m = scmutil.match(wctx, pats, opts)
6130 6132 ret = 0
6131 6133 didwork = False
6132 6134
6133 6135 hasconflictmarkers = []
6134 6136 if mark:
6135 6137 markcheck = ui.config(b'commands', b'resolve.mark-check')
6136 6138 if markcheck not in [b'warn', b'abort']:
6137 6139 # Treat all invalid / unrecognized values as 'none'.
6138 6140 markcheck = False
6139 6141 for f in ms:
6140 6142 if not m(f):
6141 6143 continue
6142 6144
6143 6145 didwork = True
6144 6146
6145 6147 # path conflicts must be resolved manually
6146 6148 if ms[f] in (
6147 6149 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6148 6150 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6149 6151 ):
6150 6152 if mark:
6151 6153 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6152 6154 elif unmark:
6153 6155 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6154 6156 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6155 6157 ui.warn(
6156 6158 _(b'%s: path conflict must be resolved manually\n')
6157 6159 % uipathfn(f)
6158 6160 )
6159 6161 continue
6160 6162
6161 6163 if mark:
6162 6164 if markcheck:
6163 6165 fdata = repo.wvfs.tryread(f)
6164 6166 if (
6165 6167 filemerge.hasconflictmarkers(fdata)
6166 6168 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6167 6169 ):
6168 6170 hasconflictmarkers.append(f)
6169 6171 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6170 6172 elif unmark:
6171 6173 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6172 6174 else:
6173 6175 # backup pre-resolve (merge uses .orig for its own purposes)
6174 6176 a = repo.wjoin(f)
6175 6177 try:
6176 6178 util.copyfile(a, a + b".resolve")
6177 6179 except (IOError, OSError) as inst:
6178 6180 if inst.errno != errno.ENOENT:
6179 6181 raise
6180 6182
6181 6183 try:
6182 6184 # preresolve file
6183 6185 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6184 6186 with ui.configoverride(overrides, b'resolve'):
6185 6187 r = ms.resolve(f, wctx)
6186 6188 if r:
6187 6189 ret = 1
6188 6190 finally:
6189 6191 ms.commit()
6190 6192
6191 6193 # replace filemerge's .orig file with our resolve file
6192 6194 try:
6193 6195 util.rename(
6194 6196 a + b".resolve", scmutil.backuppath(ui, repo, f)
6195 6197 )
6196 6198 except OSError as inst:
6197 6199 if inst.errno != errno.ENOENT:
6198 6200 raise
6199 6201
6200 6202 if hasconflictmarkers:
6201 6203 ui.warn(
6202 6204 _(
6203 6205 b'warning: the following files still have conflict '
6204 6206 b'markers:\n'
6205 6207 )
6206 6208 + b''.join(
6207 6209 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6208 6210 )
6209 6211 )
6210 6212 if markcheck == b'abort' and not all and not pats:
6211 6213 raise error.StateError(
6212 6214 _(b'conflict markers detected'),
6213 6215 hint=_(b'use --all to mark anyway'),
6214 6216 )
6215 6217
6216 6218 ms.commit()
6217 6219 branchmerge = repo.dirstate.p2() != repo.nullid
6218 6220 # resolve is not doing a parent change here, however, `record updates`
6219 6221 # will call some dirstate API that at intended for parent changes call.
6220 6222 # Ideally we would not need this and could implement a lighter version
6221 6223 # of the recordupdateslogic that will not have to deal with the part
6222 6224 # related to parent changes. However this would requires that:
6223 6225 # - we are sure we passed around enough information at update/merge
6224 6226 # time to no longer needs it at `hg resolve time`
6225 6227 # - we are sure we store that information well enough to be able to reuse it
6226 6228 # - we are the necessary logic to reuse it right.
6227 6229 #
6228 6230 # All this should eventually happens, but in the mean time, we use this
6229 6231 # context manager slightly out of the context it should be.
6230 6232 with repo.dirstate.parentchange():
6231 6233 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6232 6234
6233 6235 if not didwork and pats:
6234 6236 hint = None
6235 6237 if not any([p for p in pats if p.find(b':') >= 0]):
6236 6238 pats = [b'path:%s' % p for p in pats]
6237 6239 m = scmutil.match(wctx, pats, opts)
6238 6240 for f in ms:
6239 6241 if not m(f):
6240 6242 continue
6241 6243
6242 6244 def flag(o):
6243 6245 if o == b're_merge':
6244 6246 return b'--re-merge '
6245 6247 return b'-%s ' % o[0:1]
6246 6248
6247 6249 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6248 6250 hint = _(b"(try: hg resolve %s%s)\n") % (
6249 6251 flags,
6250 6252 b' '.join(pats),
6251 6253 )
6252 6254 break
6253 6255 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6254 6256 if hint:
6255 6257 ui.warn(hint)
6256 6258
6257 6259 unresolvedf = ms.unresolvedcount()
6258 6260 if not unresolvedf:
6259 6261 ui.status(_(b'(no more unresolved files)\n'))
6260 6262 cmdutil.checkafterresolved(repo)
6261 6263
6262 6264 return ret
6263 6265
6264 6266
6265 6267 @command(
6266 6268 b'revert',
6267 6269 [
6268 6270 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6269 6271 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6270 6272 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6271 6273 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6272 6274 (b'i', b'interactive', None, _(b'interactively select the changes')),
6273 6275 ]
6274 6276 + walkopts
6275 6277 + dryrunopts,
6276 6278 _(b'[OPTION]... [-r REV] [NAME]...'),
6277 6279 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6278 6280 )
6279 6281 def revert(ui, repo, *pats, **opts):
6280 6282 """restore files to their checkout state
6281 6283
6282 6284 .. note::
6283 6285
6284 6286 To check out earlier revisions, you should use :hg:`update REV`.
6285 6287 To cancel an uncommitted merge (and lose your changes),
6286 6288 use :hg:`merge --abort`.
6287 6289
6288 6290 With no revision specified, revert the specified files or directories
6289 6291 to the contents they had in the parent of the working directory.
6290 6292 This restores the contents of files to an unmodified
6291 6293 state and unschedules adds, removes, copies, and renames. If the
6292 6294 working directory has two parents, you must explicitly specify a
6293 6295 revision.
6294 6296
6295 6297 Using the -r/--rev or -d/--date options, revert the given files or
6296 6298 directories to their states as of a specific revision. Because
6297 6299 revert does not change the working directory parents, this will
6298 6300 cause these files to appear modified. This can be helpful to "back
6299 6301 out" some or all of an earlier change. See :hg:`backout` for a
6300 6302 related method.
6301 6303
6302 6304 Modified files are saved with a .orig suffix before reverting.
6303 6305 To disable these backups, use --no-backup. It is possible to store
6304 6306 the backup files in a custom directory relative to the root of the
6305 6307 repository by setting the ``ui.origbackuppath`` configuration
6306 6308 option.
6307 6309
6308 6310 See :hg:`help dates` for a list of formats valid for -d/--date.
6309 6311
6310 6312 See :hg:`help backout` for a way to reverse the effect of an
6311 6313 earlier changeset.
6312 6314
6313 6315 Returns 0 on success.
6314 6316 """
6315 6317
6316 6318 opts = pycompat.byteskwargs(opts)
6317 6319 if opts.get(b"date"):
6318 6320 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6319 6321 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6320 6322
6321 6323 parent, p2 = repo.dirstate.parents()
6322 6324 if not opts.get(b'rev') and p2 != repo.nullid:
6323 6325 # revert after merge is a trap for new users (issue2915)
6324 6326 raise error.InputError(
6325 6327 _(b'uncommitted merge with no revision specified'),
6326 6328 hint=_(b"use 'hg update' or see 'hg help revert'"),
6327 6329 )
6328 6330
6329 6331 rev = opts.get(b'rev')
6330 6332 if rev:
6331 6333 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6332 6334 ctx = logcmdutil.revsingle(repo, rev)
6333 6335
6334 6336 if not (
6335 6337 pats
6336 6338 or opts.get(b'include')
6337 6339 or opts.get(b'exclude')
6338 6340 or opts.get(b'all')
6339 6341 or opts.get(b'interactive')
6340 6342 ):
6341 6343 msg = _(b"no files or directories specified")
6342 6344 if p2 != repo.nullid:
6343 6345 hint = _(
6344 6346 b"uncommitted merge, use --all to discard all changes,"
6345 6347 b" or 'hg update -C .' to abort the merge"
6346 6348 )
6347 6349 raise error.InputError(msg, hint=hint)
6348 6350 dirty = any(repo.status())
6349 6351 node = ctx.node()
6350 6352 if node != parent:
6351 6353 if dirty:
6352 6354 hint = (
6353 6355 _(
6354 6356 b"uncommitted changes, use --all to discard all"
6355 6357 b" changes, or 'hg update %d' to update"
6356 6358 )
6357 6359 % ctx.rev()
6358 6360 )
6359 6361 else:
6360 6362 hint = (
6361 6363 _(
6362 6364 b"use --all to revert all files,"
6363 6365 b" or 'hg update %d' to update"
6364 6366 )
6365 6367 % ctx.rev()
6366 6368 )
6367 6369 elif dirty:
6368 6370 hint = _(b"uncommitted changes, use --all to discard all changes")
6369 6371 else:
6370 6372 hint = _(b"use --all to revert all files")
6371 6373 raise error.InputError(msg, hint=hint)
6372 6374
6373 6375 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6374 6376
6375 6377
6376 6378 @command(
6377 6379 b'rollback',
6378 6380 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6379 6381 helpcategory=command.CATEGORY_MAINTENANCE,
6380 6382 )
6381 6383 def rollback(ui, repo, **opts):
6382 6384 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6383 6385
6384 6386 Please use :hg:`commit --amend` instead of rollback to correct
6385 6387 mistakes in the last commit.
6386 6388
6387 6389 This command should be used with care. There is only one level of
6388 6390 rollback, and there is no way to undo a rollback. It will also
6389 6391 restore the dirstate at the time of the last transaction, losing
6390 6392 any dirstate changes since that time. This command does not alter
6391 6393 the working directory.
6392 6394
6393 6395 Transactions are used to encapsulate the effects of all commands
6394 6396 that create new changesets or propagate existing changesets into a
6395 6397 repository.
6396 6398
6397 6399 .. container:: verbose
6398 6400
6399 6401 For example, the following commands are transactional, and their
6400 6402 effects can be rolled back:
6401 6403
6402 6404 - commit
6403 6405 - import
6404 6406 - pull
6405 6407 - push (with this repository as the destination)
6406 6408 - unbundle
6407 6409
6408 6410 To avoid permanent data loss, rollback will refuse to rollback a
6409 6411 commit transaction if it isn't checked out. Use --force to
6410 6412 override this protection.
6411 6413
6412 6414 The rollback command can be entirely disabled by setting the
6413 6415 ``ui.rollback`` configuration setting to false. If you're here
6414 6416 because you want to use rollback and it's disabled, you can
6415 6417 re-enable the command by setting ``ui.rollback`` to true.
6416 6418
6417 6419 This command is not intended for use on public repositories. Once
6418 6420 changes are visible for pull by other users, rolling a transaction
6419 6421 back locally is ineffective (someone else may already have pulled
6420 6422 the changes). Furthermore, a race is possible with readers of the
6421 6423 repository; for example an in-progress pull from the repository
6422 6424 may fail if a rollback is performed.
6423 6425
6424 6426 Returns 0 on success, 1 if no rollback data is available.
6425 6427 """
6426 6428 if not ui.configbool(b'ui', b'rollback'):
6427 6429 raise error.Abort(
6428 6430 _(b'rollback is disabled because it is unsafe'),
6429 6431 hint=b'see `hg help -v rollback` for information',
6430 6432 )
6431 6433 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6432 6434
6433 6435
6434 6436 @command(
6435 6437 b'root',
6436 6438 [] + formatteropts,
6437 6439 intents={INTENT_READONLY},
6438 6440 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6439 6441 )
6440 6442 def root(ui, repo, **opts):
6441 6443 """print the root (top) of the current working directory
6442 6444
6443 6445 Print the root directory of the current repository.
6444 6446
6445 6447 .. container:: verbose
6446 6448
6447 6449 Template:
6448 6450
6449 6451 The following keywords are supported in addition to the common template
6450 6452 keywords and functions. See also :hg:`help templates`.
6451 6453
6452 6454 :hgpath: String. Path to the .hg directory.
6453 6455 :storepath: String. Path to the directory holding versioned data.
6454 6456
6455 6457 Returns 0 on success.
6456 6458 """
6457 6459 opts = pycompat.byteskwargs(opts)
6458 6460 with ui.formatter(b'root', opts) as fm:
6459 6461 fm.startitem()
6460 6462 fm.write(b'reporoot', b'%s\n', repo.root)
6461 6463 fm.data(hgpath=repo.path, storepath=repo.spath)
6462 6464
6463 6465
6464 6466 @command(
6465 6467 b'serve',
6466 6468 [
6467 6469 (
6468 6470 b'A',
6469 6471 b'accesslog',
6470 6472 b'',
6471 6473 _(b'name of access log file to write to'),
6472 6474 _(b'FILE'),
6473 6475 ),
6474 6476 (b'd', b'daemon', None, _(b'run server in background')),
6475 6477 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6476 6478 (
6477 6479 b'E',
6478 6480 b'errorlog',
6479 6481 b'',
6480 6482 _(b'name of error log file to write to'),
6481 6483 _(b'FILE'),
6482 6484 ),
6483 6485 # use string type, then we can check if something was passed
6484 6486 (
6485 6487 b'p',
6486 6488 b'port',
6487 6489 b'',
6488 6490 _(b'port to listen on (default: 8000)'),
6489 6491 _(b'PORT'),
6490 6492 ),
6491 6493 (
6492 6494 b'a',
6493 6495 b'address',
6494 6496 b'',
6495 6497 _(b'address to listen on (default: all interfaces)'),
6496 6498 _(b'ADDR'),
6497 6499 ),
6498 6500 (
6499 6501 b'',
6500 6502 b'prefix',
6501 6503 b'',
6502 6504 _(b'prefix path to serve from (default: server root)'),
6503 6505 _(b'PREFIX'),
6504 6506 ),
6505 6507 (
6506 6508 b'n',
6507 6509 b'name',
6508 6510 b'',
6509 6511 _(b'name to show in web pages (default: working directory)'),
6510 6512 _(b'NAME'),
6511 6513 ),
6512 6514 (
6513 6515 b'',
6514 6516 b'web-conf',
6515 6517 b'',
6516 6518 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6517 6519 _(b'FILE'),
6518 6520 ),
6519 6521 (
6520 6522 b'',
6521 6523 b'webdir-conf',
6522 6524 b'',
6523 6525 _(b'name of the hgweb config file (DEPRECATED)'),
6524 6526 _(b'FILE'),
6525 6527 ),
6526 6528 (
6527 6529 b'',
6528 6530 b'pid-file',
6529 6531 b'',
6530 6532 _(b'name of file to write process ID to'),
6531 6533 _(b'FILE'),
6532 6534 ),
6533 6535 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6534 6536 (
6535 6537 b'',
6536 6538 b'cmdserver',
6537 6539 b'',
6538 6540 _(b'for remote clients (ADVANCED)'),
6539 6541 _(b'MODE'),
6540 6542 ),
6541 6543 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6542 6544 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6543 6545 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6544 6546 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6545 6547 (b'', b'print-url', None, _(b'start and print only the URL')),
6546 6548 ]
6547 6549 + subrepoopts,
6548 6550 _(b'[OPTION]...'),
6549 6551 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6550 6552 helpbasic=True,
6551 6553 optionalrepo=True,
6552 6554 )
6553 6555 def serve(ui, repo, **opts):
6554 6556 """start stand-alone webserver
6555 6557
6556 6558 Start a local HTTP repository browser and pull server. You can use
6557 6559 this for ad-hoc sharing and browsing of repositories. It is
6558 6560 recommended to use a real web server to serve a repository for
6559 6561 longer periods of time.
6560 6562
6561 6563 Please note that the server does not implement access control.
6562 6564 This means that, by default, anybody can read from the server and
6563 6565 nobody can write to it by default. Set the ``web.allow-push``
6564 6566 option to ``*`` to allow everybody to push to the server. You
6565 6567 should use a real web server if you need to authenticate users.
6566 6568
6567 6569 By default, the server logs accesses to stdout and errors to
6568 6570 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6569 6571 files.
6570 6572
6571 6573 To have the server choose a free port number to listen on, specify
6572 6574 a port number of 0; in this case, the server will print the port
6573 6575 number it uses.
6574 6576
6575 6577 Returns 0 on success.
6576 6578 """
6577 6579
6578 6580 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6579 6581 opts = pycompat.byteskwargs(opts)
6580 6582 if opts[b"print_url"] and ui.verbose:
6581 6583 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6582 6584
6583 6585 if opts[b"stdio"]:
6584 6586 if repo is None:
6585 6587 raise error.RepoError(
6586 6588 _(b"there is no Mercurial repository here (.hg not found)")
6587 6589 )
6588 6590 s = wireprotoserver.sshserver(ui, repo)
6589 6591 s.serve_forever()
6590 6592 return
6591 6593
6592 6594 service = server.createservice(ui, repo, opts)
6593 6595 return server.runservice(opts, initfn=service.init, runfn=service.run)
6594 6596
6595 6597
6596 6598 @command(
6597 6599 b'shelve',
6598 6600 [
6599 6601 (
6600 6602 b'A',
6601 6603 b'addremove',
6602 6604 None,
6603 6605 _(b'mark new/missing files as added/removed before shelving'),
6604 6606 ),
6605 6607 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6606 6608 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6607 6609 (
6608 6610 b'',
6609 6611 b'date',
6610 6612 b'',
6611 6613 _(b'shelve with the specified commit date'),
6612 6614 _(b'DATE'),
6613 6615 ),
6614 6616 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6615 6617 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6616 6618 (
6617 6619 b'k',
6618 6620 b'keep',
6619 6621 False,
6620 6622 _(b'shelve, but keep changes in the working directory'),
6621 6623 ),
6622 6624 (b'l', b'list', None, _(b'list current shelves')),
6623 6625 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6624 6626 (
6625 6627 b'n',
6626 6628 b'name',
6627 6629 b'',
6628 6630 _(b'use the given name for the shelved commit'),
6629 6631 _(b'NAME'),
6630 6632 ),
6631 6633 (
6632 6634 b'p',
6633 6635 b'patch',
6634 6636 None,
6635 6637 _(
6636 6638 b'output patches for changes (provide the names of the shelved '
6637 6639 b'changes as positional arguments)'
6638 6640 ),
6639 6641 ),
6640 6642 (b'i', b'interactive', None, _(b'interactive mode')),
6641 6643 (
6642 6644 b'',
6643 6645 b'stat',
6644 6646 None,
6645 6647 _(
6646 6648 b'output diffstat-style summary of changes (provide the names of '
6647 6649 b'the shelved changes as positional arguments)'
6648 6650 ),
6649 6651 ),
6650 6652 ]
6651 6653 + cmdutil.walkopts,
6652 6654 _(b'hg shelve [OPTION]... [FILE]...'),
6653 6655 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6654 6656 )
6655 6657 def shelve(ui, repo, *pats, **opts):
6656 6658 """save and set aside changes from the working directory
6657 6659
6658 6660 Shelving takes files that "hg status" reports as not clean, saves
6659 6661 the modifications to a bundle (a shelved change), and reverts the
6660 6662 files so that their state in the working directory becomes clean.
6661 6663
6662 6664 To restore these changes to the working directory, using "hg
6663 6665 unshelve"; this will work even if you switch to a different
6664 6666 commit.
6665 6667
6666 6668 When no files are specified, "hg shelve" saves all not-clean
6667 6669 files. If specific files or directories are named, only changes to
6668 6670 those files are shelved.
6669 6671
6670 6672 In bare shelve (when no files are specified, without interactive,
6671 6673 include and exclude option), shelving remembers information if the
6672 6674 working directory was on newly created branch, in other words working
6673 6675 directory was on different branch than its first parent. In this
6674 6676 situation unshelving restores branch information to the working directory.
6675 6677
6676 6678 Each shelved change has a name that makes it easier to find later.
6677 6679 The name of a shelved change defaults to being based on the active
6678 6680 bookmark, or if there is no active bookmark, the current named
6679 6681 branch. To specify a different name, use ``--name``.
6680 6682
6681 6683 To see a list of existing shelved changes, use the ``--list``
6682 6684 option. For each shelved change, this will print its name, age,
6683 6685 and description; use ``--patch`` or ``--stat`` for more details.
6684 6686
6685 6687 To delete specific shelved changes, use ``--delete``. To delete
6686 6688 all shelved changes, use ``--cleanup``.
6687 6689 """
6688 6690 opts = pycompat.byteskwargs(opts)
6689 6691 allowables = [
6690 6692 (b'addremove', {b'create'}), # 'create' is pseudo action
6691 6693 (b'unknown', {b'create'}),
6692 6694 (b'cleanup', {b'cleanup'}),
6693 6695 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6694 6696 (b'delete', {b'delete'}),
6695 6697 (b'edit', {b'create'}),
6696 6698 (b'keep', {b'create'}),
6697 6699 (b'list', {b'list'}),
6698 6700 (b'message', {b'create'}),
6699 6701 (b'name', {b'create'}),
6700 6702 (b'patch', {b'patch', b'list'}),
6701 6703 (b'stat', {b'stat', b'list'}),
6702 6704 ]
6703 6705
6704 6706 def checkopt(opt):
6705 6707 if opts.get(opt):
6706 6708 for i, allowable in allowables:
6707 6709 if opts[i] and opt not in allowable:
6708 6710 raise error.InputError(
6709 6711 _(
6710 6712 b"options '--%s' and '--%s' may not be "
6711 6713 b"used together"
6712 6714 )
6713 6715 % (opt, i)
6714 6716 )
6715 6717 return True
6716 6718
6717 6719 if checkopt(b'cleanup'):
6718 6720 if pats:
6719 6721 raise error.InputError(
6720 6722 _(b"cannot specify names when using '--cleanup'")
6721 6723 )
6722 6724 return shelvemod.cleanupcmd(ui, repo)
6723 6725 elif checkopt(b'delete'):
6724 6726 return shelvemod.deletecmd(ui, repo, pats)
6725 6727 elif checkopt(b'list'):
6726 6728 return shelvemod.listcmd(ui, repo, pats, opts)
6727 6729 elif checkopt(b'patch') or checkopt(b'stat'):
6728 6730 return shelvemod.patchcmds(ui, repo, pats, opts)
6729 6731 else:
6730 6732 return shelvemod.createcmd(ui, repo, pats, opts)
6731 6733
6732 6734
6733 6735 _NOTTERSE = b'nothing'
6734 6736
6735 6737
6736 6738 @command(
6737 6739 b'status|st',
6738 6740 [
6739 6741 (b'A', b'all', None, _(b'show status of all files')),
6740 6742 (b'm', b'modified', None, _(b'show only modified files')),
6741 6743 (b'a', b'added', None, _(b'show only added files')),
6742 6744 (b'r', b'removed', None, _(b'show only removed files')),
6743 6745 (b'd', b'deleted', None, _(b'show only missing files')),
6744 6746 (b'c', b'clean', None, _(b'show only files without changes')),
6745 6747 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6746 6748 (b'i', b'ignored', None, _(b'show only ignored files')),
6747 6749 (b'n', b'no-status', None, _(b'hide status prefix')),
6748 6750 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6749 6751 (
6750 6752 b'C',
6751 6753 b'copies',
6752 6754 None,
6753 6755 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6754 6756 ),
6755 6757 (
6756 6758 b'0',
6757 6759 b'print0',
6758 6760 None,
6759 6761 _(b'end filenames with NUL, for use with xargs'),
6760 6762 ),
6761 6763 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6762 6764 (
6763 6765 b'',
6764 6766 b'change',
6765 6767 b'',
6766 6768 _(b'list the changed files of a revision'),
6767 6769 _(b'REV'),
6768 6770 ),
6769 6771 ]
6770 6772 + walkopts
6771 6773 + subrepoopts
6772 6774 + formatteropts,
6773 6775 _(b'[OPTION]... [FILE]...'),
6774 6776 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6775 6777 helpbasic=True,
6776 6778 inferrepo=True,
6777 6779 intents={INTENT_READONLY},
6778 6780 )
6779 6781 def status(ui, repo, *pats, **opts):
6780 6782 """show changed files in the working directory
6781 6783
6782 6784 Show status of files in the repository. If names are given, only
6783 6785 files that match are shown. Files that are clean or ignored or
6784 6786 the source of a copy/move operation, are not listed unless
6785 6787 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6786 6788 Unless options described with "show only ..." are given, the
6787 6789 options -mardu are used.
6788 6790
6789 6791 Option -q/--quiet hides untracked (unknown and ignored) files
6790 6792 unless explicitly requested with -u/--unknown or -i/--ignored.
6791 6793
6792 6794 .. note::
6793 6795
6794 6796 :hg:`status` may appear to disagree with diff if permissions have
6795 6797 changed or a merge has occurred. The standard diff format does
6796 6798 not report permission changes and diff only reports changes
6797 6799 relative to one merge parent.
6798 6800
6799 6801 If one revision is given, it is used as the base revision.
6800 6802 If two revisions are given, the differences between them are
6801 6803 shown. The --change option can also be used as a shortcut to list
6802 6804 the changed files of a revision from its first parent.
6803 6805
6804 6806 The codes used to show the status of files are::
6805 6807
6806 6808 M = modified
6807 6809 A = added
6808 6810 R = removed
6809 6811 C = clean
6810 6812 ! = missing (deleted by non-hg command, but still tracked)
6811 6813 ? = not tracked
6812 6814 I = ignored
6813 6815 = origin of the previous file (with --copies)
6814 6816
6815 6817 .. container:: verbose
6816 6818
6817 6819 The -t/--terse option abbreviates the output by showing only the directory
6818 6820 name if all the files in it share the same status. The option takes an
6819 6821 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6820 6822 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6821 6823 for 'ignored' and 'c' for clean.
6822 6824
6823 6825 It abbreviates only those statuses which are passed. Note that clean and
6824 6826 ignored files are not displayed with '--terse ic' unless the -c/--clean
6825 6827 and -i/--ignored options are also used.
6826 6828
6827 6829 The -v/--verbose option shows information when the repository is in an
6828 6830 unfinished merge, shelve, rebase state etc. You can have this behavior
6829 6831 turned on by default by enabling the ``commands.status.verbose`` option.
6830 6832
6831 6833 You can skip displaying some of these states by setting
6832 6834 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6833 6835 'histedit', 'merge', 'rebase', or 'unshelve'.
6834 6836
6835 6837 Template:
6836 6838
6837 6839 The following keywords are supported in addition to the common template
6838 6840 keywords and functions. See also :hg:`help templates`.
6839 6841
6840 6842 :path: String. Repository-absolute path of the file.
6841 6843 :source: String. Repository-absolute path of the file originated from.
6842 6844 Available if ``--copies`` is specified.
6843 6845 :status: String. Character denoting file's status.
6844 6846
6845 6847 Examples:
6846 6848
6847 6849 - show changes in the working directory relative to a
6848 6850 changeset::
6849 6851
6850 6852 hg status --rev 9353
6851 6853
6852 6854 - show changes in the working directory relative to the
6853 6855 current directory (see :hg:`help patterns` for more information)::
6854 6856
6855 6857 hg status re:
6856 6858
6857 6859 - show all changes including copies in an existing changeset::
6858 6860
6859 6861 hg status --copies --change 9353
6860 6862
6861 6863 - get a NUL separated list of added files, suitable for xargs::
6862 6864
6863 6865 hg status -an0
6864 6866
6865 6867 - show more information about the repository status, abbreviating
6866 6868 added, removed, modified, deleted, and untracked paths::
6867 6869
6868 6870 hg status -v -t mardu
6869 6871
6870 6872 Returns 0 on success.
6871 6873
6872 6874 """
6873 6875
6874 6876 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6875 6877 opts = pycompat.byteskwargs(opts)
6876 6878 revs = opts.get(b'rev', [])
6877 6879 change = opts.get(b'change', b'')
6878 6880 terse = opts.get(b'terse', _NOTTERSE)
6879 6881 if terse is _NOTTERSE:
6880 6882 if revs:
6881 6883 terse = b''
6882 6884 else:
6883 6885 terse = ui.config(b'commands', b'status.terse')
6884 6886
6885 6887 if revs and terse:
6886 6888 msg = _(b'cannot use --terse with --rev')
6887 6889 raise error.InputError(msg)
6888 6890 elif change:
6889 6891 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6890 6892 ctx2 = logcmdutil.revsingle(repo, change, None)
6891 6893 ctx1 = ctx2.p1()
6892 6894 else:
6893 6895 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6894 6896 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
6895 6897
6896 6898 forcerelativevalue = None
6897 6899 if ui.hasconfig(b'commands', b'status.relative'):
6898 6900 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6899 6901 uipathfn = scmutil.getuipathfn(
6900 6902 repo,
6901 6903 legacyrelativevalue=bool(pats),
6902 6904 forcerelativevalue=forcerelativevalue,
6903 6905 )
6904 6906
6905 6907 if opts.get(b'print0'):
6906 6908 end = b'\0'
6907 6909 else:
6908 6910 end = b'\n'
6909 6911 states = b'modified added removed deleted unknown ignored clean'.split()
6910 6912 show = [k for k in states if opts.get(k)]
6911 6913 if opts.get(b'all'):
6912 6914 show += ui.quiet and (states[:4] + [b'clean']) or states
6913 6915
6914 6916 if not show:
6915 6917 if ui.quiet:
6916 6918 show = states[:4]
6917 6919 else:
6918 6920 show = states[:5]
6919 6921
6920 6922 m = scmutil.match(ctx2, pats, opts)
6921 6923 if terse:
6922 6924 # we need to compute clean and unknown to terse
6923 6925 stat = repo.status(
6924 6926 ctx1.node(),
6925 6927 ctx2.node(),
6926 6928 m,
6927 6929 b'ignored' in show or b'i' in terse,
6928 6930 clean=True,
6929 6931 unknown=True,
6930 6932 listsubrepos=opts.get(b'subrepos'),
6931 6933 )
6932 6934
6933 6935 stat = cmdutil.tersedir(stat, terse)
6934 6936 else:
6935 6937 stat = repo.status(
6936 6938 ctx1.node(),
6937 6939 ctx2.node(),
6938 6940 m,
6939 6941 b'ignored' in show,
6940 6942 b'clean' in show,
6941 6943 b'unknown' in show,
6942 6944 opts.get(b'subrepos'),
6943 6945 )
6944 6946
6945 6947 changestates = zip(
6946 6948 states,
6947 6949 pycompat.iterbytestr(b'MAR!?IC'),
6948 6950 [getattr(stat, s.decode('utf8')) for s in states],
6949 6951 )
6950 6952
6951 6953 copy = {}
6952 6954 if (
6953 6955 opts.get(b'all')
6954 6956 or opts.get(b'copies')
6955 6957 or ui.configbool(b'ui', b'statuscopies')
6956 6958 ) and not opts.get(b'no_status'):
6957 6959 copy = copies.pathcopies(ctx1, ctx2, m)
6958 6960
6959 6961 morestatus = None
6960 6962 if (
6961 6963 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6962 6964 and not ui.plain()
6963 6965 and not opts.get(b'print0')
6964 6966 ):
6965 6967 morestatus = cmdutil.readmorestatus(repo)
6966 6968
6967 6969 ui.pager(b'status')
6968 6970 fm = ui.formatter(b'status', opts)
6969 6971 fmt = b'%s' + end
6970 6972 showchar = not opts.get(b'no_status')
6971 6973
6972 6974 for state, char, files in changestates:
6973 6975 if state in show:
6974 6976 label = b'status.' + state
6975 6977 for f in files:
6976 6978 fm.startitem()
6977 6979 fm.context(ctx=ctx2)
6978 6980 fm.data(itemtype=b'file', path=f)
6979 6981 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6980 6982 fm.plain(fmt % uipathfn(f), label=label)
6981 6983 if f in copy:
6982 6984 fm.data(source=copy[f])
6983 6985 fm.plain(
6984 6986 (b' %s' + end) % uipathfn(copy[f]),
6985 6987 label=b'status.copied',
6986 6988 )
6987 6989 if morestatus:
6988 6990 morestatus.formatfile(f, fm)
6989 6991
6990 6992 if morestatus:
6991 6993 morestatus.formatfooter(fm)
6992 6994 fm.end()
6993 6995
6994 6996
6995 6997 @command(
6996 6998 b'summary|sum',
6997 6999 [(b'', b'remote', None, _(b'check for push and pull'))],
6998 7000 b'[--remote]',
6999 7001 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7000 7002 helpbasic=True,
7001 7003 intents={INTENT_READONLY},
7002 7004 )
7003 7005 def summary(ui, repo, **opts):
7004 7006 """summarize working directory state
7005 7007
7006 7008 This generates a brief summary of the working directory state,
7007 7009 including parents, branch, commit status, phase and available updates.
7008 7010
7009 7011 With the --remote option, this will check the default paths for
7010 7012 incoming and outgoing changes. This can be time-consuming.
7011 7013
7012 7014 Returns 0 on success.
7013 7015 """
7014 7016
7015 7017 opts = pycompat.byteskwargs(opts)
7016 7018 ui.pager(b'summary')
7017 7019 ctx = repo[None]
7018 7020 parents = ctx.parents()
7019 7021 pnode = parents[0].node()
7020 7022 marks = []
7021 7023
7022 7024 try:
7023 7025 ms = mergestatemod.mergestate.read(repo)
7024 7026 except error.UnsupportedMergeRecords as e:
7025 7027 s = b' '.join(e.recordtypes)
7026 7028 ui.warn(
7027 7029 _(b'warning: merge state has unsupported record types: %s\n') % s
7028 7030 )
7029 7031 unresolved = []
7030 7032 else:
7031 7033 unresolved = list(ms.unresolved())
7032 7034
7033 7035 for p in parents:
7034 7036 # label with log.changeset (instead of log.parent) since this
7035 7037 # shows a working directory parent *changeset*:
7036 7038 # i18n: column positioning for "hg summary"
7037 7039 ui.write(
7038 7040 _(b'parent: %d:%s ') % (p.rev(), p),
7039 7041 label=logcmdutil.changesetlabels(p),
7040 7042 )
7041 7043 ui.write(b' '.join(p.tags()), label=b'log.tag')
7042 7044 if p.bookmarks():
7043 7045 marks.extend(p.bookmarks())
7044 7046 if p.rev() == -1:
7045 7047 if not len(repo):
7046 7048 ui.write(_(b' (empty repository)'))
7047 7049 else:
7048 7050 ui.write(_(b' (no revision checked out)'))
7049 7051 if p.obsolete():
7050 7052 ui.write(_(b' (obsolete)'))
7051 7053 if p.isunstable():
7052 7054 instabilities = (
7053 7055 ui.label(instability, b'trouble.%s' % instability)
7054 7056 for instability in p.instabilities()
7055 7057 )
7056 7058 ui.write(b' (' + b', '.join(instabilities) + b')')
7057 7059 ui.write(b'\n')
7058 7060 if p.description():
7059 7061 ui.status(
7060 7062 b' ' + p.description().splitlines()[0].strip() + b'\n',
7061 7063 label=b'log.summary',
7062 7064 )
7063 7065
7064 7066 branch = ctx.branch()
7065 7067 bheads = repo.branchheads(branch)
7066 7068 # i18n: column positioning for "hg summary"
7067 7069 m = _(b'branch: %s\n') % branch
7068 7070 if branch != b'default':
7069 7071 ui.write(m, label=b'log.branch')
7070 7072 else:
7071 7073 ui.status(m, label=b'log.branch')
7072 7074
7073 7075 if marks:
7074 7076 active = repo._activebookmark
7075 7077 # i18n: column positioning for "hg summary"
7076 7078 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7077 7079 if active is not None:
7078 7080 if active in marks:
7079 7081 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7080 7082 marks.remove(active)
7081 7083 else:
7082 7084 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7083 7085 for m in marks:
7084 7086 ui.write(b' ' + m, label=b'log.bookmark')
7085 7087 ui.write(b'\n', label=b'log.bookmark')
7086 7088
7087 7089 status = repo.status(unknown=True)
7088 7090
7089 7091 c = repo.dirstate.copies()
7090 7092 copied, renamed = [], []
7091 7093 for d, s in pycompat.iteritems(c):
7092 7094 if s in status.removed:
7093 7095 status.removed.remove(s)
7094 7096 renamed.append(d)
7095 7097 else:
7096 7098 copied.append(d)
7097 7099 if d in status.added:
7098 7100 status.added.remove(d)
7099 7101
7100 7102 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7101 7103
7102 7104 labels = [
7103 7105 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7104 7106 (ui.label(_(b'%d added'), b'status.added'), status.added),
7105 7107 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7106 7108 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7107 7109 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7108 7110 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7109 7111 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7110 7112 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7111 7113 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7112 7114 ]
7113 7115 t = []
7114 7116 for l, s in labels:
7115 7117 if s:
7116 7118 t.append(l % len(s))
7117 7119
7118 7120 t = b', '.join(t)
7119 7121 cleanworkdir = False
7120 7122
7121 7123 if repo.vfs.exists(b'graftstate'):
7122 7124 t += _(b' (graft in progress)')
7123 7125 if repo.vfs.exists(b'updatestate'):
7124 7126 t += _(b' (interrupted update)')
7125 7127 elif len(parents) > 1:
7126 7128 t += _(b' (merge)')
7127 7129 elif branch != parents[0].branch():
7128 7130 t += _(b' (new branch)')
7129 7131 elif parents[0].closesbranch() and pnode in repo.branchheads(
7130 7132 branch, closed=True
7131 7133 ):
7132 7134 t += _(b' (head closed)')
7133 7135 elif not (
7134 7136 status.modified
7135 7137 or status.added
7136 7138 or status.removed
7137 7139 or renamed
7138 7140 or copied
7139 7141 or subs
7140 7142 ):
7141 7143 t += _(b' (clean)')
7142 7144 cleanworkdir = True
7143 7145 elif pnode not in bheads:
7144 7146 t += _(b' (new branch head)')
7145 7147
7146 7148 if parents:
7147 7149 pendingphase = max(p.phase() for p in parents)
7148 7150 else:
7149 7151 pendingphase = phases.public
7150 7152
7151 7153 if pendingphase > phases.newcommitphase(ui):
7152 7154 t += b' (%s)' % phases.phasenames[pendingphase]
7153 7155
7154 7156 if cleanworkdir:
7155 7157 # i18n: column positioning for "hg summary"
7156 7158 ui.status(_(b'commit: %s\n') % t.strip())
7157 7159 else:
7158 7160 # i18n: column positioning for "hg summary"
7159 7161 ui.write(_(b'commit: %s\n') % t.strip())
7160 7162
7161 7163 # all ancestors of branch heads - all ancestors of parent = new csets
7162 7164 new = len(
7163 7165 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7164 7166 )
7165 7167
7166 7168 if new == 0:
7167 7169 # i18n: column positioning for "hg summary"
7168 7170 ui.status(_(b'update: (current)\n'))
7169 7171 elif pnode not in bheads:
7170 7172 # i18n: column positioning for "hg summary"
7171 7173 ui.write(_(b'update: %d new changesets (update)\n') % new)
7172 7174 else:
7173 7175 # i18n: column positioning for "hg summary"
7174 7176 ui.write(
7175 7177 _(b'update: %d new changesets, %d branch heads (merge)\n')
7176 7178 % (new, len(bheads))
7177 7179 )
7178 7180
7179 7181 t = []
7180 7182 draft = len(repo.revs(b'draft()'))
7181 7183 if draft:
7182 7184 t.append(_(b'%d draft') % draft)
7183 7185 secret = len(repo.revs(b'secret()'))
7184 7186 if secret:
7185 7187 t.append(_(b'%d secret') % secret)
7186 7188
7187 7189 if draft or secret:
7188 7190 ui.status(_(b'phases: %s\n') % b', '.join(t))
7189 7191
7190 7192 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7191 7193 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7192 7194 numtrouble = len(repo.revs(trouble + b"()"))
7193 7195 # We write all the possibilities to ease translation
7194 7196 troublemsg = {
7195 7197 b"orphan": _(b"orphan: %d changesets"),
7196 7198 b"contentdivergent": _(b"content-divergent: %d changesets"),
7197 7199 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7198 7200 }
7199 7201 if numtrouble > 0:
7200 7202 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7201 7203
7202 7204 cmdutil.summaryhooks(ui, repo)
7203 7205
7204 7206 if opts.get(b'remote'):
7205 7207 needsincoming, needsoutgoing = True, True
7206 7208 else:
7207 7209 needsincoming, needsoutgoing = False, False
7208 7210 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7209 7211 if i:
7210 7212 needsincoming = True
7211 7213 if o:
7212 7214 needsoutgoing = True
7213 7215 if not needsincoming and not needsoutgoing:
7214 7216 return
7215 7217
7216 7218 def getincoming():
7217 7219 # XXX We should actually skip this if no default is specified, instead
7218 7220 # of passing "default" which will resolve as "./default/" if no default
7219 7221 # path is defined.
7220 7222 source, branches = urlutil.get_unique_pull_path(
7221 7223 b'summary', repo, ui, b'default'
7222 7224 )
7223 7225 sbranch = branches[0]
7224 7226 try:
7225 7227 other = hg.peer(repo, {}, source)
7226 7228 except error.RepoError:
7227 7229 if opts.get(b'remote'):
7228 7230 raise
7229 7231 return source, sbranch, None, None, None
7230 7232 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7231 7233 if revs:
7232 7234 revs = [other.lookup(rev) for rev in revs]
7233 7235 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7234 7236 with repo.ui.silent():
7235 7237 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7236 7238 return source, sbranch, other, commoninc, commoninc[1]
7237 7239
7238 7240 if needsincoming:
7239 7241 source, sbranch, sother, commoninc, incoming = getincoming()
7240 7242 else:
7241 7243 source = sbranch = sother = commoninc = incoming = None
7242 7244
7243 7245 def getoutgoing():
7244 7246 # XXX We should actually skip this if no default is specified, instead
7245 7247 # of passing "default" which will resolve as "./default/" if no default
7246 7248 # path is defined.
7247 7249 d = None
7248 7250 if b'default-push' in ui.paths:
7249 7251 d = b'default-push'
7250 7252 elif b'default' in ui.paths:
7251 7253 d = b'default'
7252 7254 if d is not None:
7253 7255 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7254 7256 dest = path.pushloc or path.loc
7255 7257 dbranch = path.branch
7256 7258 else:
7257 7259 dest = b'default'
7258 7260 dbranch = None
7259 7261 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7260 7262 if source != dest:
7261 7263 try:
7262 7264 dother = hg.peer(repo, {}, dest)
7263 7265 except error.RepoError:
7264 7266 if opts.get(b'remote'):
7265 7267 raise
7266 7268 return dest, dbranch, None, None
7267 7269 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7268 7270 elif sother is None:
7269 7271 # there is no explicit destination peer, but source one is invalid
7270 7272 return dest, dbranch, None, None
7271 7273 else:
7272 7274 dother = sother
7273 7275 if source != dest or (sbranch is not None and sbranch != dbranch):
7274 7276 common = None
7275 7277 else:
7276 7278 common = commoninc
7277 7279 if revs:
7278 7280 revs = [repo.lookup(rev) for rev in revs]
7279 7281 with repo.ui.silent():
7280 7282 outgoing = discovery.findcommonoutgoing(
7281 7283 repo, dother, onlyheads=revs, commoninc=common
7282 7284 )
7283 7285 return dest, dbranch, dother, outgoing
7284 7286
7285 7287 if needsoutgoing:
7286 7288 dest, dbranch, dother, outgoing = getoutgoing()
7287 7289 else:
7288 7290 dest = dbranch = dother = outgoing = None
7289 7291
7290 7292 if opts.get(b'remote'):
7291 7293 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7292 7294 # The former always sets `sother` (or raises an exception if it can't);
7293 7295 # the latter always sets `outgoing`.
7294 7296 assert sother is not None
7295 7297 assert outgoing is not None
7296 7298
7297 7299 t = []
7298 7300 if incoming:
7299 7301 t.append(_(b'1 or more incoming'))
7300 7302 o = outgoing.missing
7301 7303 if o:
7302 7304 t.append(_(b'%d outgoing') % len(o))
7303 7305 other = dother or sother
7304 7306 if b'bookmarks' in other.listkeys(b'namespaces'):
7305 7307 counts = bookmarks.summary(repo, other)
7306 7308 if counts[0] > 0:
7307 7309 t.append(_(b'%d incoming bookmarks') % counts[0])
7308 7310 if counts[1] > 0:
7309 7311 t.append(_(b'%d outgoing bookmarks') % counts[1])
7310 7312
7311 7313 if t:
7312 7314 # i18n: column positioning for "hg summary"
7313 7315 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7314 7316 else:
7315 7317 # i18n: column positioning for "hg summary"
7316 7318 ui.status(_(b'remote: (synced)\n'))
7317 7319
7318 7320 cmdutil.summaryremotehooks(
7319 7321 ui,
7320 7322 repo,
7321 7323 opts,
7322 7324 (
7323 7325 (source, sbranch, sother, commoninc),
7324 7326 (dest, dbranch, dother, outgoing),
7325 7327 ),
7326 7328 )
7327 7329
7328 7330
7329 7331 @command(
7330 7332 b'tag',
7331 7333 [
7332 7334 (b'f', b'force', None, _(b'force tag')),
7333 7335 (b'l', b'local', None, _(b'make the tag local')),
7334 7336 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7335 7337 (b'', b'remove', None, _(b'remove a tag')),
7336 7338 # -l/--local is already there, commitopts cannot be used
7337 7339 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7338 7340 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7339 7341 ]
7340 7342 + commitopts2,
7341 7343 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7342 7344 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7343 7345 )
7344 7346 def tag(ui, repo, name1, *names, **opts):
7345 7347 """add one or more tags for the current or given revision
7346 7348
7347 7349 Name a particular revision using <name>.
7348 7350
7349 7351 Tags are used to name particular revisions of the repository and are
7350 7352 very useful to compare different revisions, to go back to significant
7351 7353 earlier versions or to mark branch points as releases, etc. Changing
7352 7354 an existing tag is normally disallowed; use -f/--force to override.
7353 7355
7354 7356 If no revision is given, the parent of the working directory is
7355 7357 used.
7356 7358
7357 7359 To facilitate version control, distribution, and merging of tags,
7358 7360 they are stored as a file named ".hgtags" which is managed similarly
7359 7361 to other project files and can be hand-edited if necessary. This
7360 7362 also means that tagging creates a new commit. The file
7361 7363 ".hg/localtags" is used for local tags (not shared among
7362 7364 repositories).
7363 7365
7364 7366 Tag commits are usually made at the head of a branch. If the parent
7365 7367 of the working directory is not a branch head, :hg:`tag` aborts; use
7366 7368 -f/--force to force the tag commit to be based on a non-head
7367 7369 changeset.
7368 7370
7369 7371 See :hg:`help dates` for a list of formats valid for -d/--date.
7370 7372
7371 7373 Since tag names have priority over branch names during revision
7372 7374 lookup, using an existing branch name as a tag name is discouraged.
7373 7375
7374 7376 Returns 0 on success.
7375 7377 """
7376 7378 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7377 7379 opts = pycompat.byteskwargs(opts)
7378 7380 with repo.wlock(), repo.lock():
7379 7381 rev_ = b"."
7380 7382 names = [t.strip() for t in (name1,) + names]
7381 7383 if len(names) != len(set(names)):
7382 7384 raise error.InputError(_(b'tag names must be unique'))
7383 7385 for n in names:
7384 7386 scmutil.checknewlabel(repo, n, b'tag')
7385 7387 if not n:
7386 7388 raise error.InputError(
7387 7389 _(b'tag names cannot consist entirely of whitespace')
7388 7390 )
7389 7391 if opts.get(b'rev'):
7390 7392 rev_ = opts[b'rev']
7391 7393 message = opts.get(b'message')
7392 7394 if opts.get(b'remove'):
7393 7395 if opts.get(b'local'):
7394 7396 expectedtype = b'local'
7395 7397 else:
7396 7398 expectedtype = b'global'
7397 7399
7398 7400 for n in names:
7399 7401 if repo.tagtype(n) == b'global':
7400 7402 alltags = tagsmod.findglobaltags(ui, repo)
7401 7403 if alltags[n][0] == repo.nullid:
7402 7404 raise error.InputError(
7403 7405 _(b"tag '%s' is already removed") % n
7404 7406 )
7405 7407 if not repo.tagtype(n):
7406 7408 raise error.InputError(_(b"tag '%s' does not exist") % n)
7407 7409 if repo.tagtype(n) != expectedtype:
7408 7410 if expectedtype == b'global':
7409 7411 raise error.InputError(
7410 7412 _(b"tag '%s' is not a global tag") % n
7411 7413 )
7412 7414 else:
7413 7415 raise error.InputError(
7414 7416 _(b"tag '%s' is not a local tag") % n
7415 7417 )
7416 7418 rev_ = b'null'
7417 7419 if not message:
7418 7420 # we don't translate commit messages
7419 7421 message = b'Removed tag %s' % b', '.join(names)
7420 7422 elif not opts.get(b'force'):
7421 7423 for n in names:
7422 7424 if n in repo.tags():
7423 7425 raise error.InputError(
7424 7426 _(b"tag '%s' already exists (use -f to force)") % n
7425 7427 )
7426 7428 if not opts.get(b'local'):
7427 7429 p1, p2 = repo.dirstate.parents()
7428 7430 if p2 != repo.nullid:
7429 7431 raise error.StateError(_(b'uncommitted merge'))
7430 7432 bheads = repo.branchheads()
7431 7433 if not opts.get(b'force') and bheads and p1 not in bheads:
7432 7434 raise error.InputError(
7433 7435 _(
7434 7436 b'working directory is not at a branch head '
7435 7437 b'(use -f to force)'
7436 7438 )
7437 7439 )
7438 7440 node = logcmdutil.revsingle(repo, rev_).node()
7439 7441
7440 7442 if not message:
7441 7443 # we don't translate commit messages
7442 7444 message = b'Added tag %s for changeset %s' % (
7443 7445 b', '.join(names),
7444 7446 short(node),
7445 7447 )
7446 7448
7447 7449 date = opts.get(b'date')
7448 7450 if date:
7449 7451 date = dateutil.parsedate(date)
7450 7452
7451 7453 if opts.get(b'remove'):
7452 7454 editform = b'tag.remove'
7453 7455 else:
7454 7456 editform = b'tag.add'
7455 7457 editor = cmdutil.getcommiteditor(
7456 7458 editform=editform, **pycompat.strkwargs(opts)
7457 7459 )
7458 7460
7459 7461 # don't allow tagging the null rev
7460 7462 if (
7461 7463 not opts.get(b'remove')
7462 7464 and logcmdutil.revsingle(repo, rev_).rev() == nullrev
7463 7465 ):
7464 7466 raise error.InputError(_(b"cannot tag null revision"))
7465 7467
7466 7468 tagsmod.tag(
7467 7469 repo,
7468 7470 names,
7469 7471 node,
7470 7472 message,
7471 7473 opts.get(b'local'),
7472 7474 opts.get(b'user'),
7473 7475 date,
7474 7476 editor=editor,
7475 7477 )
7476 7478
7477 7479
7478 7480 @command(
7479 7481 b'tags',
7480 7482 formatteropts,
7481 7483 b'',
7482 7484 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7483 7485 intents={INTENT_READONLY},
7484 7486 )
7485 7487 def tags(ui, repo, **opts):
7486 7488 """list repository tags
7487 7489
7488 7490 This lists both regular and local tags. When the -v/--verbose
7489 7491 switch is used, a third column "local" is printed for local tags.
7490 7492 When the -q/--quiet switch is used, only the tag name is printed.
7491 7493
7492 7494 .. container:: verbose
7493 7495
7494 7496 Template:
7495 7497
7496 7498 The following keywords are supported in addition to the common template
7497 7499 keywords and functions such as ``{tag}``. See also
7498 7500 :hg:`help templates`.
7499 7501
7500 7502 :type: String. ``local`` for local tags.
7501 7503
7502 7504 Returns 0 on success.
7503 7505 """
7504 7506
7505 7507 opts = pycompat.byteskwargs(opts)
7506 7508 ui.pager(b'tags')
7507 7509 fm = ui.formatter(b'tags', opts)
7508 7510 hexfunc = fm.hexfunc
7509 7511
7510 7512 for t, n in reversed(repo.tagslist()):
7511 7513 hn = hexfunc(n)
7512 7514 label = b'tags.normal'
7513 7515 tagtype = repo.tagtype(t)
7514 7516 if not tagtype or tagtype == b'global':
7515 7517 tagtype = b''
7516 7518 else:
7517 7519 label = b'tags.' + tagtype
7518 7520
7519 7521 fm.startitem()
7520 7522 fm.context(repo=repo)
7521 7523 fm.write(b'tag', b'%s', t, label=label)
7522 7524 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7523 7525 fm.condwrite(
7524 7526 not ui.quiet,
7525 7527 b'rev node',
7526 7528 fmt,
7527 7529 repo.changelog.rev(n),
7528 7530 hn,
7529 7531 label=label,
7530 7532 )
7531 7533 fm.condwrite(
7532 7534 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7533 7535 )
7534 7536 fm.plain(b'\n')
7535 7537 fm.end()
7536 7538
7537 7539
7538 7540 @command(
7539 7541 b'tip',
7540 7542 [
7541 7543 (b'p', b'patch', None, _(b'show patch')),
7542 7544 (b'g', b'git', None, _(b'use git extended diff format')),
7543 7545 ]
7544 7546 + templateopts,
7545 7547 _(b'[-p] [-g]'),
7546 7548 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7547 7549 )
7548 7550 def tip(ui, repo, **opts):
7549 7551 """show the tip revision (DEPRECATED)
7550 7552
7551 7553 The tip revision (usually just called the tip) is the changeset
7552 7554 most recently added to the repository (and therefore the most
7553 7555 recently changed head).
7554 7556
7555 7557 If you have just made a commit, that commit will be the tip. If
7556 7558 you have just pulled changes from another repository, the tip of
7557 7559 that repository becomes the current tip. The "tip" tag is special
7558 7560 and cannot be renamed or assigned to a different changeset.
7559 7561
7560 7562 This command is deprecated, please use :hg:`heads` instead.
7561 7563
7562 7564 Returns 0 on success.
7563 7565 """
7564 7566 opts = pycompat.byteskwargs(opts)
7565 7567 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7566 7568 displayer.show(repo[b'tip'])
7567 7569 displayer.close()
7568 7570
7569 7571
7570 7572 @command(
7571 7573 b'unbundle',
7572 7574 [
7573 7575 (
7574 7576 b'u',
7575 7577 b'update',
7576 7578 None,
7577 7579 _(b'update to new branch head if changesets were unbundled'),
7578 7580 )
7579 7581 ],
7580 7582 _(b'[-u] FILE...'),
7581 7583 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7582 7584 )
7583 7585 def unbundle(ui, repo, fname1, *fnames, **opts):
7584 7586 """apply one or more bundle files
7585 7587
7586 7588 Apply one or more bundle files generated by :hg:`bundle`.
7587 7589
7588 7590 Returns 0 on success, 1 if an update has unresolved files.
7589 7591 """
7590 7592 fnames = (fname1,) + fnames
7591 7593
7592 7594 with repo.lock():
7593 7595 for fname in fnames:
7594 7596 f = hg.openpath(ui, fname)
7595 7597 gen = exchange.readbundle(ui, f, fname)
7596 7598 if isinstance(gen, streamclone.streamcloneapplier):
7597 7599 raise error.InputError(
7598 7600 _(
7599 7601 b'packed bundles cannot be applied with '
7600 7602 b'"hg unbundle"'
7601 7603 ),
7602 7604 hint=_(b'use "hg debugapplystreamclonebundle"'),
7603 7605 )
7604 7606 url = b'bundle:' + fname
7605 7607 try:
7606 7608 txnname = b'unbundle'
7607 7609 if not isinstance(gen, bundle2.unbundle20):
7608 7610 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7609 7611 with repo.transaction(txnname) as tr:
7610 7612 op = bundle2.applybundle(
7611 7613 repo, gen, tr, source=b'unbundle', url=url
7612 7614 )
7613 7615 except error.BundleUnknownFeatureError as exc:
7614 7616 raise error.Abort(
7615 7617 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7616 7618 hint=_(
7617 7619 b"see https://mercurial-scm.org/"
7618 7620 b"wiki/BundleFeature for more "
7619 7621 b"information"
7620 7622 ),
7621 7623 )
7622 7624 modheads = bundle2.combinechangegroupresults(op)
7623 7625
7624 7626 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7625 7627 return 1
7626 7628 else:
7627 7629 return 0
7628 7630
7629 7631
7630 7632 @command(
7631 7633 b'unshelve',
7632 7634 [
7633 7635 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7634 7636 (
7635 7637 b'c',
7636 7638 b'continue',
7637 7639 None,
7638 7640 _(b'continue an incomplete unshelve operation'),
7639 7641 ),
7640 7642 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7641 7643 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7642 7644 (
7643 7645 b'n',
7644 7646 b'name',
7645 7647 b'',
7646 7648 _(b'restore shelved change with given name'),
7647 7649 _(b'NAME'),
7648 7650 ),
7649 7651 (b't', b'tool', b'', _(b'specify merge tool')),
7650 7652 (
7651 7653 b'',
7652 7654 b'date',
7653 7655 b'',
7654 7656 _(b'set date for temporary commits (DEPRECATED)'),
7655 7657 _(b'DATE'),
7656 7658 ),
7657 7659 ],
7658 7660 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7659 7661 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7660 7662 )
7661 7663 def unshelve(ui, repo, *shelved, **opts):
7662 7664 """restore a shelved change to the working directory
7663 7665
7664 7666 This command accepts an optional name of a shelved change to
7665 7667 restore. If none is given, the most recent shelved change is used.
7666 7668
7667 7669 If a shelved change is applied successfully, the bundle that
7668 7670 contains the shelved changes is moved to a backup location
7669 7671 (.hg/shelve-backup).
7670 7672
7671 7673 Since you can restore a shelved change on top of an arbitrary
7672 7674 commit, it is possible that unshelving will result in a conflict
7673 7675 between your changes and the commits you are unshelving onto. If
7674 7676 this occurs, you must resolve the conflict, then use
7675 7677 ``--continue`` to complete the unshelve operation. (The bundle
7676 7678 will not be moved until you successfully complete the unshelve.)
7677 7679
7678 7680 (Alternatively, you can use ``--abort`` to abandon an unshelve
7679 7681 that causes a conflict. This reverts the unshelved changes, and
7680 7682 leaves the bundle in place.)
7681 7683
7682 7684 If bare shelved change (without interactive, include and exclude
7683 7685 option) was done on newly created branch it would restore branch
7684 7686 information to the working directory.
7685 7687
7686 7688 After a successful unshelve, the shelved changes are stored in a
7687 7689 backup directory. Only the N most recent backups are kept. N
7688 7690 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7689 7691 configuration option.
7690 7692
7691 7693 .. container:: verbose
7692 7694
7693 7695 Timestamp in seconds is used to decide order of backups. More
7694 7696 than ``maxbackups`` backups are kept, if same timestamp
7695 7697 prevents from deciding exact order of them, for safety.
7696 7698
7697 7699 Selected changes can be unshelved with ``--interactive`` flag.
7698 7700 The working directory is updated with the selected changes, and
7699 7701 only the unselected changes remain shelved.
7700 7702 Note: The whole shelve is applied to working directory first before
7701 7703 running interactively. So, this will bring up all the conflicts between
7702 7704 working directory and the shelve, irrespective of which changes will be
7703 7705 unshelved.
7704 7706 """
7705 7707 with repo.wlock():
7706 7708 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7707 7709
7708 7710
7709 7711 statemod.addunfinished(
7710 7712 b'unshelve',
7711 7713 fname=b'shelvedstate',
7712 7714 continueflag=True,
7713 7715 abortfunc=shelvemod.hgabortunshelve,
7714 7716 continuefunc=shelvemod.hgcontinueunshelve,
7715 7717 cmdmsg=_(b'unshelve already in progress'),
7716 7718 )
7717 7719
7718 7720
7719 7721 @command(
7720 7722 b'update|up|checkout|co',
7721 7723 [
7722 7724 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7723 7725 (b'c', b'check', None, _(b'require clean working directory')),
7724 7726 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7725 7727 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7726 7728 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7727 7729 ]
7728 7730 + mergetoolopts,
7729 7731 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7730 7732 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7731 7733 helpbasic=True,
7732 7734 )
7733 7735 def update(ui, repo, node=None, **opts):
7734 7736 """update working directory (or switch revisions)
7735 7737
7736 7738 Update the repository's working directory to the specified
7737 7739 changeset. If no changeset is specified, update to the tip of the
7738 7740 current named branch and move the active bookmark (see :hg:`help
7739 7741 bookmarks`).
7740 7742
7741 7743 Update sets the working directory's parent revision to the specified
7742 7744 changeset (see :hg:`help parents`).
7743 7745
7744 7746 If the changeset is not a descendant or ancestor of the working
7745 7747 directory's parent and there are uncommitted changes, the update is
7746 7748 aborted. With the -c/--check option, the working directory is checked
7747 7749 for uncommitted changes; if none are found, the working directory is
7748 7750 updated to the specified changeset.
7749 7751
7750 7752 .. container:: verbose
7751 7753
7752 7754 The -C/--clean, -c/--check, and -m/--merge options control what
7753 7755 happens if the working directory contains uncommitted changes.
7754 7756 At most of one of them can be specified.
7755 7757
7756 7758 1. If no option is specified, and if
7757 7759 the requested changeset is an ancestor or descendant of
7758 7760 the working directory's parent, the uncommitted changes
7759 7761 are merged into the requested changeset and the merged
7760 7762 result is left uncommitted. If the requested changeset is
7761 7763 not an ancestor or descendant (that is, it is on another
7762 7764 branch), the update is aborted and the uncommitted changes
7763 7765 are preserved.
7764 7766
7765 7767 2. With the -m/--merge option, the update is allowed even if the
7766 7768 requested changeset is not an ancestor or descendant of
7767 7769 the working directory's parent.
7768 7770
7769 7771 3. With the -c/--check option, the update is aborted and the
7770 7772 uncommitted changes are preserved.
7771 7773
7772 7774 4. With the -C/--clean option, uncommitted changes are discarded and
7773 7775 the working directory is updated to the requested changeset.
7774 7776
7775 7777 To cancel an uncommitted merge (and lose your changes), use
7776 7778 :hg:`merge --abort`.
7777 7779
7778 7780 Use null as the changeset to remove the working directory (like
7779 7781 :hg:`clone -U`).
7780 7782
7781 7783 If you want to revert just one file to an older revision, use
7782 7784 :hg:`revert [-r REV] NAME`.
7783 7785
7784 7786 See :hg:`help dates` for a list of formats valid for -d/--date.
7785 7787
7786 7788 Returns 0 on success, 1 if there are unresolved files.
7787 7789 """
7788 7790 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7789 7791 rev = opts.get('rev')
7790 7792 date = opts.get('date')
7791 7793 clean = opts.get('clean')
7792 7794 check = opts.get('check')
7793 7795 merge = opts.get('merge')
7794 7796 if rev and node:
7795 7797 raise error.InputError(_(b"please specify just one revision"))
7796 7798
7797 7799 if ui.configbool(b'commands', b'update.requiredest'):
7798 7800 if not node and not rev and not date:
7799 7801 raise error.InputError(
7800 7802 _(b'you must specify a destination'),
7801 7803 hint=_(b'for example: hg update ".::"'),
7802 7804 )
7803 7805
7804 7806 if rev is None or rev == b'':
7805 7807 rev = node
7806 7808
7807 7809 if date and rev is not None:
7808 7810 raise error.InputError(_(b"you can't specify a revision and a date"))
7809 7811
7810 7812 updatecheck = None
7811 7813 if check or merge is not None and not merge:
7812 7814 updatecheck = b'abort'
7813 7815 elif merge or check is not None and not check:
7814 7816 updatecheck = b'none'
7815 7817
7816 7818 with repo.wlock():
7817 7819 cmdutil.clearunfinished(repo)
7818 7820 if date:
7819 7821 rev = cmdutil.finddate(ui, repo, date)
7820 7822
7821 7823 # if we defined a bookmark, we have to remember the original name
7822 7824 brev = rev
7823 7825 if rev:
7824 7826 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7825 7827 ctx = logcmdutil.revsingle(repo, rev, default=None)
7826 7828 rev = ctx.rev()
7827 7829 hidden = ctx.hidden()
7828 7830 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7829 7831 with ui.configoverride(overrides, b'update'):
7830 7832 ret = hg.updatetotally(
7831 7833 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7832 7834 )
7833 7835 if hidden:
7834 7836 ctxstr = ctx.hex()[:12]
7835 7837 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7836 7838
7837 7839 if ctx.obsolete():
7838 7840 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7839 7841 ui.warn(b"(%s)\n" % obsfatemsg)
7840 7842 return ret
7841 7843
7842 7844
7843 7845 @command(
7844 7846 b'verify',
7845 7847 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7846 7848 helpcategory=command.CATEGORY_MAINTENANCE,
7847 7849 )
7848 7850 def verify(ui, repo, **opts):
7849 7851 """verify the integrity of the repository
7850 7852
7851 7853 Verify the integrity of the current repository.
7852 7854
7853 7855 This will perform an extensive check of the repository's
7854 7856 integrity, validating the hashes and checksums of each entry in
7855 7857 the changelog, manifest, and tracked files, as well as the
7856 7858 integrity of their crosslinks and indices.
7857 7859
7858 7860 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7859 7861 for more information about recovery from corruption of the
7860 7862 repository.
7861 7863
7862 7864 Returns 0 on success, 1 if errors are encountered.
7863 7865 """
7864 7866 opts = pycompat.byteskwargs(opts)
7865 7867
7866 7868 level = None
7867 7869 if opts[b'full']:
7868 7870 level = verifymod.VERIFY_FULL
7869 7871 return hg.verify(repo, level)
7870 7872
7871 7873
7872 7874 @command(
7873 7875 b'version',
7874 7876 [] + formatteropts,
7875 7877 helpcategory=command.CATEGORY_HELP,
7876 7878 norepo=True,
7877 7879 intents={INTENT_READONLY},
7878 7880 )
7879 7881 def version_(ui, **opts):
7880 7882 """output version and copyright information
7881 7883
7882 7884 .. container:: verbose
7883 7885
7884 7886 Template:
7885 7887
7886 7888 The following keywords are supported. See also :hg:`help templates`.
7887 7889
7888 7890 :extensions: List of extensions.
7889 7891 :ver: String. Version number.
7890 7892
7891 7893 And each entry of ``{extensions}`` provides the following sub-keywords
7892 7894 in addition to ``{ver}``.
7893 7895
7894 7896 :bundled: Boolean. True if included in the release.
7895 7897 :name: String. Extension name.
7896 7898 """
7897 7899 opts = pycompat.byteskwargs(opts)
7898 7900 if ui.verbose:
7899 7901 ui.pager(b'version')
7900 7902 fm = ui.formatter(b"version", opts)
7901 7903 fm.startitem()
7902 7904 fm.write(
7903 7905 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7904 7906 )
7905 7907 license = _(
7906 7908 b"(see https://mercurial-scm.org for more information)\n"
7907 7909 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7908 7910 b"This is free software; see the source for copying conditions. "
7909 7911 b"There is NO\nwarranty; "
7910 7912 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7911 7913 )
7912 7914 if not ui.quiet:
7913 7915 fm.plain(license)
7914 7916
7915 7917 if ui.verbose:
7916 7918 fm.plain(_(b"\nEnabled extensions:\n\n"))
7917 7919 # format names and versions into columns
7918 7920 names = []
7919 7921 vers = []
7920 7922 isinternals = []
7921 7923 for name, module in sorted(extensions.extensions()):
7922 7924 names.append(name)
7923 7925 vers.append(extensions.moduleversion(module) or None)
7924 7926 isinternals.append(extensions.ismoduleinternal(module))
7925 7927 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7926 7928 if names:
7927 7929 namefmt = b" %%-%ds " % max(len(n) for n in names)
7928 7930 places = [_(b"external"), _(b"internal")]
7929 7931 for n, v, p in zip(names, vers, isinternals):
7930 7932 fn.startitem()
7931 7933 fn.condwrite(ui.verbose, b"name", namefmt, n)
7932 7934 if ui.verbose:
7933 7935 fn.plain(b"%s " % places[p])
7934 7936 fn.data(bundled=p)
7935 7937 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7936 7938 if ui.verbose:
7937 7939 fn.plain(b"\n")
7938 7940 fn.end()
7939 7941 fm.end()
7940 7942
7941 7943
7942 7944 def loadcmdtable(ui, name, cmdtable):
7943 7945 """Load command functions from specified cmdtable"""
7944 7946 overrides = [cmd for cmd in cmdtable if cmd in table]
7945 7947 if overrides:
7946 7948 ui.warn(
7947 7949 _(b"extension '%s' overrides commands: %s\n")
7948 7950 % (name, b" ".join(overrides))
7949 7951 )
7950 7952 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now