##// END OF EJS Templates
status: when extracting arguments from `opts`, use the same default values...
Kyle Lippincott -
r49292:eaad6829 default
parent child Browse files
Show More
@@ -1,7950 +1,7950 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 3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3313 3313 # report any conflicts
3314 3314 if stats.unresolvedcount > 0:
3315 3315 # write out state for --continue
3316 3316 nodes = [repo[rev].hex() for rev in revs[pos:]]
3317 3317 statedata[b'nodes'] = nodes
3318 3318 stateversion = 1
3319 3319 graftstate.save(stateversion, statedata)
3320 3320 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3321 3321 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3322 3322 return 1
3323 3323 else:
3324 3324 cont = False
3325 3325
3326 3326 # commit if --no-commit is false
3327 3327 if not opts.get('no_commit'):
3328 3328 node = repo.commit(
3329 3329 text=message, user=user, date=date, extra=extra, editor=editor
3330 3330 )
3331 3331 if node is None:
3332 3332 ui.warn(
3333 3333 _(b'note: graft of %d:%s created no changes to commit\n')
3334 3334 % (ctx.rev(), ctx)
3335 3335 )
3336 3336 # checking that newnodes exist because old state files won't have it
3337 3337 elif statedata.get(b'newnodes') is not None:
3338 3338 nn = statedata[b'newnodes']
3339 3339 assert isinstance(nn, list) # list of bytes
3340 3340 nn.append(node)
3341 3341
3342 3342 # remove state when we complete successfully
3343 3343 if not opts.get('dry_run'):
3344 3344 graftstate.delete()
3345 3345
3346 3346 return 0
3347 3347
3348 3348
3349 3349 def _stopgraft(ui, repo, graftstate):
3350 3350 """stop the interrupted graft"""
3351 3351 if not graftstate.exists():
3352 3352 raise error.StateError(_(b"no interrupted graft found"))
3353 3353 pctx = repo[b'.']
3354 3354 mergemod.clean_update(pctx)
3355 3355 graftstate.delete()
3356 3356 ui.status(_(b"stopped the interrupted graft\n"))
3357 3357 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3358 3358 return 0
3359 3359
3360 3360
3361 3361 statemod.addunfinished(
3362 3362 b'graft',
3363 3363 fname=b'graftstate',
3364 3364 clearable=True,
3365 3365 stopflag=True,
3366 3366 continueflag=True,
3367 3367 abortfunc=cmdutil.hgabortgraft,
3368 3368 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3369 3369 )
3370 3370
3371 3371
3372 3372 @command(
3373 3373 b'grep',
3374 3374 [
3375 3375 (b'0', b'print0', None, _(b'end fields with NUL')),
3376 3376 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3377 3377 (
3378 3378 b'',
3379 3379 b'diff',
3380 3380 None,
3381 3381 _(
3382 3382 b'search revision differences for when the pattern was added '
3383 3383 b'or removed'
3384 3384 ),
3385 3385 ),
3386 3386 (b'a', b'text', None, _(b'treat all files as text')),
3387 3387 (
3388 3388 b'f',
3389 3389 b'follow',
3390 3390 None,
3391 3391 _(
3392 3392 b'follow changeset history,'
3393 3393 b' or file history across copies and renames'
3394 3394 ),
3395 3395 ),
3396 3396 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3397 3397 (
3398 3398 b'l',
3399 3399 b'files-with-matches',
3400 3400 None,
3401 3401 _(b'print only filenames and revisions that match'),
3402 3402 ),
3403 3403 (b'n', b'line-number', None, _(b'print matching line numbers')),
3404 3404 (
3405 3405 b'r',
3406 3406 b'rev',
3407 3407 [],
3408 3408 _(b'search files changed within revision range'),
3409 3409 _(b'REV'),
3410 3410 ),
3411 3411 (
3412 3412 b'',
3413 3413 b'all-files',
3414 3414 None,
3415 3415 _(
3416 3416 b'include all files in the changeset while grepping (DEPRECATED)'
3417 3417 ),
3418 3418 ),
3419 3419 (b'u', b'user', None, _(b'list the author (long with -v)')),
3420 3420 (b'd', b'date', None, _(b'list the date (short with -q)')),
3421 3421 ]
3422 3422 + formatteropts
3423 3423 + walkopts,
3424 3424 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3425 3425 helpcategory=command.CATEGORY_FILE_CONTENTS,
3426 3426 inferrepo=True,
3427 3427 intents={INTENT_READONLY},
3428 3428 )
3429 3429 def grep(ui, repo, pattern, *pats, **opts):
3430 3430 """search for a pattern in specified files
3431 3431
3432 3432 Search the working directory or revision history for a regular
3433 3433 expression in the specified files for the entire repository.
3434 3434
3435 3435 By default, grep searches the repository files in the working
3436 3436 directory and prints the files where it finds a match. To specify
3437 3437 historical revisions instead of the working directory, use the
3438 3438 --rev flag.
3439 3439
3440 3440 To search instead historical revision differences that contains a
3441 3441 change in match status ("-" for a match that becomes a non-match,
3442 3442 or "+" for a non-match that becomes a match), use the --diff flag.
3443 3443
3444 3444 PATTERN can be any Python (roughly Perl-compatible) regular
3445 3445 expression.
3446 3446
3447 3447 If no FILEs are specified and the --rev flag isn't supplied, all
3448 3448 files in the working directory are searched. When using the --rev
3449 3449 flag and specifying FILEs, use the --follow argument to also
3450 3450 follow the specified FILEs across renames and copies.
3451 3451
3452 3452 .. container:: verbose
3453 3453
3454 3454 Template:
3455 3455
3456 3456 The following keywords are supported in addition to the common template
3457 3457 keywords and functions. See also :hg:`help templates`.
3458 3458
3459 3459 :change: String. Character denoting insertion ``+`` or removal ``-``.
3460 3460 Available if ``--diff`` is specified.
3461 3461 :lineno: Integer. Line number of the match.
3462 3462 :path: String. Repository-absolute path of the file.
3463 3463 :texts: List of text chunks.
3464 3464
3465 3465 And each entry of ``{texts}`` provides the following sub-keywords.
3466 3466
3467 3467 :matched: Boolean. True if the chunk matches the specified pattern.
3468 3468 :text: String. Chunk content.
3469 3469
3470 3470 See :hg:`help templates.operators` for the list expansion syntax.
3471 3471
3472 3472 Returns 0 if a match is found, 1 otherwise.
3473 3473
3474 3474 """
3475 3475 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3476 3476 opts = pycompat.byteskwargs(opts)
3477 3477 diff = opts.get(b'all') or opts.get(b'diff')
3478 3478 follow = opts.get(b'follow')
3479 3479 if opts.get(b'all_files') is None and not diff:
3480 3480 opts[b'all_files'] = True
3481 3481 plaingrep = (
3482 3482 opts.get(b'all_files')
3483 3483 and not opts.get(b'rev')
3484 3484 and not opts.get(b'follow')
3485 3485 )
3486 3486 all_files = opts.get(b'all_files')
3487 3487 if plaingrep:
3488 3488 opts[b'rev'] = [b'wdir()']
3489 3489
3490 3490 reflags = re.M
3491 3491 if opts.get(b'ignore_case'):
3492 3492 reflags |= re.I
3493 3493 try:
3494 3494 regexp = util.re.compile(pattern, reflags)
3495 3495 except re.error as inst:
3496 3496 ui.warn(
3497 3497 _(b"grep: invalid match pattern: %s\n")
3498 3498 % stringutil.forcebytestr(inst)
3499 3499 )
3500 3500 return 1
3501 3501 sep, eol = b':', b'\n'
3502 3502 if opts.get(b'print0'):
3503 3503 sep = eol = b'\0'
3504 3504
3505 3505 searcher = grepmod.grepsearcher(
3506 3506 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3507 3507 )
3508 3508
3509 3509 getfile = searcher._getfile
3510 3510
3511 3511 uipathfn = scmutil.getuipathfn(repo)
3512 3512
3513 3513 def display(fm, fn, ctx, pstates, states):
3514 3514 rev = scmutil.intrev(ctx)
3515 3515 if fm.isplain():
3516 3516 formatuser = ui.shortuser
3517 3517 else:
3518 3518 formatuser = pycompat.bytestr
3519 3519 if ui.quiet:
3520 3520 datefmt = b'%Y-%m-%d'
3521 3521 else:
3522 3522 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3523 3523 found = False
3524 3524
3525 3525 @util.cachefunc
3526 3526 def binary():
3527 3527 flog = getfile(fn)
3528 3528 try:
3529 3529 return stringutil.binary(flog.read(ctx.filenode(fn)))
3530 3530 except error.WdirUnsupported:
3531 3531 return ctx[fn].isbinary()
3532 3532
3533 3533 fieldnamemap = {b'linenumber': b'lineno'}
3534 3534 if diff:
3535 3535 iter = grepmod.difflinestates(pstates, states)
3536 3536 else:
3537 3537 iter = [(b'', l) for l in states]
3538 3538 for change, l in iter:
3539 3539 fm.startitem()
3540 3540 fm.context(ctx=ctx)
3541 3541 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3542 3542 fm.plain(uipathfn(fn), label=b'grep.filename')
3543 3543
3544 3544 cols = [
3545 3545 (b'rev', b'%d', rev, not plaingrep, b''),
3546 3546 (
3547 3547 b'linenumber',
3548 3548 b'%d',
3549 3549 l.linenum,
3550 3550 opts.get(b'line_number'),
3551 3551 b'',
3552 3552 ),
3553 3553 ]
3554 3554 if diff:
3555 3555 cols.append(
3556 3556 (
3557 3557 b'change',
3558 3558 b'%s',
3559 3559 change,
3560 3560 True,
3561 3561 b'grep.inserted '
3562 3562 if change == b'+'
3563 3563 else b'grep.deleted ',
3564 3564 )
3565 3565 )
3566 3566 cols.extend(
3567 3567 [
3568 3568 (
3569 3569 b'user',
3570 3570 b'%s',
3571 3571 formatuser(ctx.user()),
3572 3572 opts.get(b'user'),
3573 3573 b'',
3574 3574 ),
3575 3575 (
3576 3576 b'date',
3577 3577 b'%s',
3578 3578 fm.formatdate(ctx.date(), datefmt),
3579 3579 opts.get(b'date'),
3580 3580 b'',
3581 3581 ),
3582 3582 ]
3583 3583 )
3584 3584 for name, fmt, data, cond, extra_label in cols:
3585 3585 if cond:
3586 3586 fm.plain(sep, label=b'grep.sep')
3587 3587 field = fieldnamemap.get(name, name)
3588 3588 label = extra_label + (b'grep.%s' % name)
3589 3589 fm.condwrite(cond, field, fmt, data, label=label)
3590 3590 if not opts.get(b'files_with_matches'):
3591 3591 fm.plain(sep, label=b'grep.sep')
3592 3592 if not opts.get(b'text') and binary():
3593 3593 fm.plain(_(b" Binary file matches"))
3594 3594 else:
3595 3595 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3596 3596 fm.plain(eol)
3597 3597 found = True
3598 3598 if opts.get(b'files_with_matches'):
3599 3599 break
3600 3600 return found
3601 3601
3602 3602 def displaymatches(fm, l):
3603 3603 p = 0
3604 3604 for s, e in l.findpos(regexp):
3605 3605 if p < s:
3606 3606 fm.startitem()
3607 3607 fm.write(b'text', b'%s', l.line[p:s])
3608 3608 fm.data(matched=False)
3609 3609 fm.startitem()
3610 3610 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3611 3611 fm.data(matched=True)
3612 3612 p = e
3613 3613 if p < len(l.line):
3614 3614 fm.startitem()
3615 3615 fm.write(b'text', b'%s', l.line[p:])
3616 3616 fm.data(matched=False)
3617 3617 fm.end()
3618 3618
3619 3619 found = False
3620 3620
3621 3621 wopts = logcmdutil.walkopts(
3622 3622 pats=pats,
3623 3623 opts=opts,
3624 3624 revspec=opts[b'rev'],
3625 3625 include_pats=opts[b'include'],
3626 3626 exclude_pats=opts[b'exclude'],
3627 3627 follow=follow,
3628 3628 force_changelog_traversal=all_files,
3629 3629 filter_revisions_by_pats=not all_files,
3630 3630 )
3631 3631 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3632 3632
3633 3633 ui.pager(b'grep')
3634 3634 fm = ui.formatter(b'grep', opts)
3635 3635 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3636 3636 r = display(fm, fn, ctx, pstates, states)
3637 3637 found = found or r
3638 3638 if r and not diff and not all_files:
3639 3639 searcher.skipfile(fn, ctx.rev())
3640 3640 fm.end()
3641 3641
3642 3642 return not found
3643 3643
3644 3644
3645 3645 @command(
3646 3646 b'heads',
3647 3647 [
3648 3648 (
3649 3649 b'r',
3650 3650 b'rev',
3651 3651 b'',
3652 3652 _(b'show only heads which are descendants of STARTREV'),
3653 3653 _(b'STARTREV'),
3654 3654 ),
3655 3655 (b't', b'topo', False, _(b'show topological heads only')),
3656 3656 (
3657 3657 b'a',
3658 3658 b'active',
3659 3659 False,
3660 3660 _(b'show active branchheads only (DEPRECATED)'),
3661 3661 ),
3662 3662 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3663 3663 ]
3664 3664 + templateopts,
3665 3665 _(b'[-ct] [-r STARTREV] [REV]...'),
3666 3666 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3667 3667 intents={INTENT_READONLY},
3668 3668 )
3669 3669 def heads(ui, repo, *branchrevs, **opts):
3670 3670 """show branch heads
3671 3671
3672 3672 With no arguments, show all open branch heads in the repository.
3673 3673 Branch heads are changesets that have no descendants on the
3674 3674 same branch. They are where development generally takes place and
3675 3675 are the usual targets for update and merge operations.
3676 3676
3677 3677 If one or more REVs are given, only open branch heads on the
3678 3678 branches associated with the specified changesets are shown. This
3679 3679 means that you can use :hg:`heads .` to see the heads on the
3680 3680 currently checked-out branch.
3681 3681
3682 3682 If -c/--closed is specified, also show branch heads marked closed
3683 3683 (see :hg:`commit --close-branch`).
3684 3684
3685 3685 If STARTREV is specified, only those heads that are descendants of
3686 3686 STARTREV will be displayed.
3687 3687
3688 3688 If -t/--topo is specified, named branch mechanics will be ignored and only
3689 3689 topological heads (changesets with no children) will be shown.
3690 3690
3691 3691 Returns 0 if matching heads are found, 1 if not.
3692 3692 """
3693 3693
3694 3694 opts = pycompat.byteskwargs(opts)
3695 3695 start = None
3696 3696 rev = opts.get(b'rev')
3697 3697 if rev:
3698 3698 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3699 3699 start = logcmdutil.revsingle(repo, rev, None).node()
3700 3700
3701 3701 if opts.get(b'topo'):
3702 3702 heads = [repo[h] for h in repo.heads(start)]
3703 3703 else:
3704 3704 heads = []
3705 3705 for branch in repo.branchmap():
3706 3706 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3707 3707 heads = [repo[h] for h in heads]
3708 3708
3709 3709 if branchrevs:
3710 3710 branches = {
3711 3711 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3712 3712 }
3713 3713 heads = [h for h in heads if h.branch() in branches]
3714 3714
3715 3715 if opts.get(b'active') and branchrevs:
3716 3716 dagheads = repo.heads(start)
3717 3717 heads = [h for h in heads if h.node() in dagheads]
3718 3718
3719 3719 if branchrevs:
3720 3720 haveheads = {h.branch() for h in heads}
3721 3721 if branches - haveheads:
3722 3722 headless = b', '.join(b for b in branches - haveheads)
3723 3723 msg = _(b'no open branch heads found on branches %s')
3724 3724 if opts.get(b'rev'):
3725 3725 msg += _(b' (started at %s)') % opts[b'rev']
3726 3726 ui.warn((msg + b'\n') % headless)
3727 3727
3728 3728 if not heads:
3729 3729 return 1
3730 3730
3731 3731 ui.pager(b'heads')
3732 3732 heads = sorted(heads, key=lambda x: -(x.rev()))
3733 3733 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3734 3734 for ctx in heads:
3735 3735 displayer.show(ctx)
3736 3736 displayer.close()
3737 3737
3738 3738
3739 3739 @command(
3740 3740 b'help',
3741 3741 [
3742 3742 (b'e', b'extension', None, _(b'show only help for extensions')),
3743 3743 (b'c', b'command', None, _(b'show only help for commands')),
3744 3744 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3745 3745 (
3746 3746 b's',
3747 3747 b'system',
3748 3748 [],
3749 3749 _(b'show help for specific platform(s)'),
3750 3750 _(b'PLATFORM'),
3751 3751 ),
3752 3752 ],
3753 3753 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3754 3754 helpcategory=command.CATEGORY_HELP,
3755 3755 norepo=True,
3756 3756 intents={INTENT_READONLY},
3757 3757 )
3758 3758 def help_(ui, name=None, **opts):
3759 3759 """show help for a given topic or a help overview
3760 3760
3761 3761 With no arguments, print a list of commands with short help messages.
3762 3762
3763 3763 Given a topic, extension, or command name, print help for that
3764 3764 topic.
3765 3765
3766 3766 Returns 0 if successful.
3767 3767 """
3768 3768
3769 3769 keep = opts.get('system') or []
3770 3770 if len(keep) == 0:
3771 3771 if pycompat.sysplatform.startswith(b'win'):
3772 3772 keep.append(b'windows')
3773 3773 elif pycompat.sysplatform == b'OpenVMS':
3774 3774 keep.append(b'vms')
3775 3775 elif pycompat.sysplatform == b'plan9':
3776 3776 keep.append(b'plan9')
3777 3777 else:
3778 3778 keep.append(b'unix')
3779 3779 keep.append(pycompat.sysplatform.lower())
3780 3780 if ui.verbose:
3781 3781 keep.append(b'verbose')
3782 3782
3783 3783 commands = sys.modules[__name__]
3784 3784 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3785 3785 ui.pager(b'help')
3786 3786 ui.write(formatted)
3787 3787
3788 3788
3789 3789 @command(
3790 3790 b'identify|id',
3791 3791 [
3792 3792 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3793 3793 (b'n', b'num', None, _(b'show local revision number')),
3794 3794 (b'i', b'id', None, _(b'show global revision id')),
3795 3795 (b'b', b'branch', None, _(b'show branch')),
3796 3796 (b't', b'tags', None, _(b'show tags')),
3797 3797 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3798 3798 ]
3799 3799 + remoteopts
3800 3800 + formatteropts,
3801 3801 _(b'[-nibtB] [-r REV] [SOURCE]'),
3802 3802 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3803 3803 optionalrepo=True,
3804 3804 intents={INTENT_READONLY},
3805 3805 )
3806 3806 def identify(
3807 3807 ui,
3808 3808 repo,
3809 3809 source=None,
3810 3810 rev=None,
3811 3811 num=None,
3812 3812 id=None,
3813 3813 branch=None,
3814 3814 tags=None,
3815 3815 bookmarks=None,
3816 3816 **opts
3817 3817 ):
3818 3818 """identify the working directory or specified revision
3819 3819
3820 3820 Print a summary identifying the repository state at REV using one or
3821 3821 two parent hash identifiers, followed by a "+" if the working
3822 3822 directory has uncommitted changes, the branch name (if not default),
3823 3823 a list of tags, and a list of bookmarks.
3824 3824
3825 3825 When REV is not given, print a summary of the current state of the
3826 3826 repository including the working directory. Specify -r. to get information
3827 3827 of the working directory parent without scanning uncommitted changes.
3828 3828
3829 3829 Specifying a path to a repository root or Mercurial bundle will
3830 3830 cause lookup to operate on that repository/bundle.
3831 3831
3832 3832 .. container:: verbose
3833 3833
3834 3834 Template:
3835 3835
3836 3836 The following keywords are supported in addition to the common template
3837 3837 keywords and functions. See also :hg:`help templates`.
3838 3838
3839 3839 :dirty: String. Character ``+`` denoting if the working directory has
3840 3840 uncommitted changes.
3841 3841 :id: String. One or two nodes, optionally followed by ``+``.
3842 3842 :parents: List of strings. Parent nodes of the changeset.
3843 3843
3844 3844 Examples:
3845 3845
3846 3846 - generate a build identifier for the working directory::
3847 3847
3848 3848 hg id --id > build-id.dat
3849 3849
3850 3850 - find the revision corresponding to a tag::
3851 3851
3852 3852 hg id -n -r 1.3
3853 3853
3854 3854 - check the most recent revision of a remote repository::
3855 3855
3856 3856 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3857 3857
3858 3858 See :hg:`log` for generating more information about specific revisions,
3859 3859 including full hash identifiers.
3860 3860
3861 3861 Returns 0 if successful.
3862 3862 """
3863 3863
3864 3864 opts = pycompat.byteskwargs(opts)
3865 3865 if not repo and not source:
3866 3866 raise error.InputError(
3867 3867 _(b"there is no Mercurial repository here (.hg not found)")
3868 3868 )
3869 3869
3870 3870 default = not (num or id or branch or tags or bookmarks)
3871 3871 output = []
3872 3872 revs = []
3873 3873
3874 3874 peer = None
3875 3875 try:
3876 3876 if source:
3877 3877 source, branches = urlutil.get_unique_pull_path(
3878 3878 b'identify', repo, ui, source
3879 3879 )
3880 3880 # only pass ui when no repo
3881 3881 peer = hg.peer(repo or ui, opts, source)
3882 3882 repo = peer.local()
3883 3883 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3884 3884
3885 3885 fm = ui.formatter(b'identify', opts)
3886 3886 fm.startitem()
3887 3887
3888 3888 if not repo:
3889 3889 if num or branch or tags:
3890 3890 raise error.InputError(
3891 3891 _(b"can't query remote revision number, branch, or tags")
3892 3892 )
3893 3893 if not rev and revs:
3894 3894 rev = revs[0]
3895 3895 if not rev:
3896 3896 rev = b"tip"
3897 3897
3898 3898 remoterev = peer.lookup(rev)
3899 3899 hexrev = fm.hexfunc(remoterev)
3900 3900 if default or id:
3901 3901 output = [hexrev]
3902 3902 fm.data(id=hexrev)
3903 3903
3904 3904 @util.cachefunc
3905 3905 def getbms():
3906 3906 bms = []
3907 3907
3908 3908 if b'bookmarks' in peer.listkeys(b'namespaces'):
3909 3909 hexremoterev = hex(remoterev)
3910 3910 bms = [
3911 3911 bm
3912 3912 for bm, bmr in pycompat.iteritems(
3913 3913 peer.listkeys(b'bookmarks')
3914 3914 )
3915 3915 if bmr == hexremoterev
3916 3916 ]
3917 3917
3918 3918 return sorted(bms)
3919 3919
3920 3920 if fm.isplain():
3921 3921 if bookmarks:
3922 3922 output.extend(getbms())
3923 3923 elif default and not ui.quiet:
3924 3924 # multiple bookmarks for a single parent separated by '/'
3925 3925 bm = b'/'.join(getbms())
3926 3926 if bm:
3927 3927 output.append(bm)
3928 3928 else:
3929 3929 fm.data(node=hex(remoterev))
3930 3930 if bookmarks or b'bookmarks' in fm.datahint():
3931 3931 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3932 3932 else:
3933 3933 if rev:
3934 3934 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3935 3935 ctx = logcmdutil.revsingle(repo, rev, None)
3936 3936
3937 3937 if ctx.rev() is None:
3938 3938 ctx = repo[None]
3939 3939 parents = ctx.parents()
3940 3940 taglist = []
3941 3941 for p in parents:
3942 3942 taglist.extend(p.tags())
3943 3943
3944 3944 dirty = b""
3945 3945 if ctx.dirty(missing=True, merge=False, branch=False):
3946 3946 dirty = b'+'
3947 3947 fm.data(dirty=dirty)
3948 3948
3949 3949 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3950 3950 if default or id:
3951 3951 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3952 3952 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3953 3953
3954 3954 if num:
3955 3955 numoutput = [b"%d" % p.rev() for p in parents]
3956 3956 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3957 3957
3958 3958 fm.data(
3959 3959 parents=fm.formatlist(
3960 3960 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3961 3961 )
3962 3962 )
3963 3963 else:
3964 3964 hexoutput = fm.hexfunc(ctx.node())
3965 3965 if default or id:
3966 3966 output = [hexoutput]
3967 3967 fm.data(id=hexoutput)
3968 3968
3969 3969 if num:
3970 3970 output.append(pycompat.bytestr(ctx.rev()))
3971 3971 taglist = ctx.tags()
3972 3972
3973 3973 if default and not ui.quiet:
3974 3974 b = ctx.branch()
3975 3975 if b != b'default':
3976 3976 output.append(b"(%s)" % b)
3977 3977
3978 3978 # multiple tags for a single parent separated by '/'
3979 3979 t = b'/'.join(taglist)
3980 3980 if t:
3981 3981 output.append(t)
3982 3982
3983 3983 # multiple bookmarks for a single parent separated by '/'
3984 3984 bm = b'/'.join(ctx.bookmarks())
3985 3985 if bm:
3986 3986 output.append(bm)
3987 3987 else:
3988 3988 if branch:
3989 3989 output.append(ctx.branch())
3990 3990
3991 3991 if tags:
3992 3992 output.extend(taglist)
3993 3993
3994 3994 if bookmarks:
3995 3995 output.extend(ctx.bookmarks())
3996 3996
3997 3997 fm.data(node=ctx.hex())
3998 3998 fm.data(branch=ctx.branch())
3999 3999 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4000 4000 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4001 4001 fm.context(ctx=ctx)
4002 4002
4003 4003 fm.plain(b"%s\n" % b' '.join(output))
4004 4004 fm.end()
4005 4005 finally:
4006 4006 if peer:
4007 4007 peer.close()
4008 4008
4009 4009
4010 4010 @command(
4011 4011 b'import|patch',
4012 4012 [
4013 4013 (
4014 4014 b'p',
4015 4015 b'strip',
4016 4016 1,
4017 4017 _(
4018 4018 b'directory strip option for patch. This has the same '
4019 4019 b'meaning as the corresponding patch option'
4020 4020 ),
4021 4021 _(b'NUM'),
4022 4022 ),
4023 4023 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4024 4024 (b'', b'secret', None, _(b'use the secret phase for committing')),
4025 4025 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4026 4026 (
4027 4027 b'f',
4028 4028 b'force',
4029 4029 None,
4030 4030 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4031 4031 ),
4032 4032 (
4033 4033 b'',
4034 4034 b'no-commit',
4035 4035 None,
4036 4036 _(b"don't commit, just update the working directory"),
4037 4037 ),
4038 4038 (
4039 4039 b'',
4040 4040 b'bypass',
4041 4041 None,
4042 4042 _(b"apply patch without touching the working directory"),
4043 4043 ),
4044 4044 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4045 4045 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4046 4046 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4047 4047 (
4048 4048 b'',
4049 4049 b'import-branch',
4050 4050 None,
4051 4051 _(b'use any branch information in patch (implied by --exact)'),
4052 4052 ),
4053 4053 ]
4054 4054 + commitopts
4055 4055 + commitopts2
4056 4056 + similarityopts,
4057 4057 _(b'[OPTION]... PATCH...'),
4058 4058 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4059 4059 )
4060 4060 def import_(ui, repo, patch1=None, *patches, **opts):
4061 4061 """import an ordered set of patches
4062 4062
4063 4063 Import a list of patches and commit them individually (unless
4064 4064 --no-commit is specified).
4065 4065
4066 4066 To read a patch from standard input (stdin), use "-" as the patch
4067 4067 name. If a URL is specified, the patch will be downloaded from
4068 4068 there.
4069 4069
4070 4070 Import first applies changes to the working directory (unless
4071 4071 --bypass is specified), import will abort if there are outstanding
4072 4072 changes.
4073 4073
4074 4074 Use --bypass to apply and commit patches directly to the
4075 4075 repository, without affecting the working directory. Without
4076 4076 --exact, patches will be applied on top of the working directory
4077 4077 parent revision.
4078 4078
4079 4079 You can import a patch straight from a mail message. Even patches
4080 4080 as attachments work (to use the body part, it must have type
4081 4081 text/plain or text/x-patch). From and Subject headers of email
4082 4082 message are used as default committer and commit message. All
4083 4083 text/plain body parts before first diff are added to the commit
4084 4084 message.
4085 4085
4086 4086 If the imported patch was generated by :hg:`export`, user and
4087 4087 description from patch override values from message headers and
4088 4088 body. Values given on command line with -m/--message and -u/--user
4089 4089 override these.
4090 4090
4091 4091 If --exact is specified, import will set the working directory to
4092 4092 the parent of each patch before applying it, and will abort if the
4093 4093 resulting changeset has a different ID than the one recorded in
4094 4094 the patch. This will guard against various ways that portable
4095 4095 patch formats and mail systems might fail to transfer Mercurial
4096 4096 data or metadata. See :hg:`bundle` for lossless transmission.
4097 4097
4098 4098 Use --partial to ensure a changeset will be created from the patch
4099 4099 even if some hunks fail to apply. Hunks that fail to apply will be
4100 4100 written to a <target-file>.rej file. Conflicts can then be resolved
4101 4101 by hand before :hg:`commit --amend` is run to update the created
4102 4102 changeset. This flag exists to let people import patches that
4103 4103 partially apply without losing the associated metadata (author,
4104 4104 date, description, ...).
4105 4105
4106 4106 .. note::
4107 4107
4108 4108 When no hunks apply cleanly, :hg:`import --partial` will create
4109 4109 an empty changeset, importing only the patch metadata.
4110 4110
4111 4111 With -s/--similarity, hg will attempt to discover renames and
4112 4112 copies in the patch in the same way as :hg:`addremove`.
4113 4113
4114 4114 It is possible to use external patch programs to perform the patch
4115 4115 by setting the ``ui.patch`` configuration option. For the default
4116 4116 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4117 4117 See :hg:`help config` for more information about configuration
4118 4118 files and how to use these options.
4119 4119
4120 4120 See :hg:`help dates` for a list of formats valid for -d/--date.
4121 4121
4122 4122 .. container:: verbose
4123 4123
4124 4124 Examples:
4125 4125
4126 4126 - import a traditional patch from a website and detect renames::
4127 4127
4128 4128 hg import -s 80 http://example.com/bugfix.patch
4129 4129
4130 4130 - import a changeset from an hgweb server::
4131 4131
4132 4132 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4133 4133
4134 4134 - import all the patches in an Unix-style mbox::
4135 4135
4136 4136 hg import incoming-patches.mbox
4137 4137
4138 4138 - import patches from stdin::
4139 4139
4140 4140 hg import -
4141 4141
4142 4142 - attempt to exactly restore an exported changeset (not always
4143 4143 possible)::
4144 4144
4145 4145 hg import --exact proposed-fix.patch
4146 4146
4147 4147 - use an external tool to apply a patch which is too fuzzy for
4148 4148 the default internal tool.
4149 4149
4150 4150 hg import --config ui.patch="patch --merge" fuzzy.patch
4151 4151
4152 4152 - change the default fuzzing from 2 to a less strict 7
4153 4153
4154 4154 hg import --config ui.fuzz=7 fuzz.patch
4155 4155
4156 4156 Returns 0 on success, 1 on partial success (see --partial).
4157 4157 """
4158 4158
4159 4159 cmdutil.check_incompatible_arguments(
4160 4160 opts, 'no_commit', ['bypass', 'secret']
4161 4161 )
4162 4162 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4163 4163 opts = pycompat.byteskwargs(opts)
4164 4164 if not patch1:
4165 4165 raise error.InputError(_(b'need at least one patch to import'))
4166 4166
4167 4167 patches = (patch1,) + patches
4168 4168
4169 4169 date = opts.get(b'date')
4170 4170 if date:
4171 4171 opts[b'date'] = dateutil.parsedate(date)
4172 4172
4173 4173 exact = opts.get(b'exact')
4174 4174 update = not opts.get(b'bypass')
4175 4175 try:
4176 4176 sim = float(opts.get(b'similarity') or 0)
4177 4177 except ValueError:
4178 4178 raise error.InputError(_(b'similarity must be a number'))
4179 4179 if sim < 0 or sim > 100:
4180 4180 raise error.InputError(_(b'similarity must be between 0 and 100'))
4181 4181 if sim and not update:
4182 4182 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4183 4183
4184 4184 base = opts[b"base"]
4185 4185 msgs = []
4186 4186 ret = 0
4187 4187
4188 4188 with repo.wlock():
4189 4189 if update:
4190 4190 cmdutil.checkunfinished(repo)
4191 4191 if exact or not opts.get(b'force'):
4192 4192 cmdutil.bailifchanged(repo)
4193 4193
4194 4194 if not opts.get(b'no_commit'):
4195 4195 lock = repo.lock
4196 4196 tr = lambda: repo.transaction(b'import')
4197 4197 dsguard = util.nullcontextmanager
4198 4198 else:
4199 4199 lock = util.nullcontextmanager
4200 4200 tr = util.nullcontextmanager
4201 4201 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 4202 with lock(), tr(), dsguard():
4203 4203 parents = repo[None].parents()
4204 4204 for patchurl in patches:
4205 4205 if patchurl == b'-':
4206 4206 ui.status(_(b'applying patch from stdin\n'))
4207 4207 patchfile = ui.fin
4208 4208 patchurl = b'stdin' # for error message
4209 4209 else:
4210 4210 patchurl = os.path.join(base, patchurl)
4211 4211 ui.status(_(b'applying %s\n') % patchurl)
4212 4212 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213 4213
4214 4214 haspatch = False
4215 4215 for hunk in patch.split(patchfile):
4216 4216 with patch.extract(ui, hunk) as patchdata:
4217 4217 msg, node, rej = cmdutil.tryimportone(
4218 4218 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 4219 )
4220 4220 if msg:
4221 4221 haspatch = True
4222 4222 ui.note(msg + b'\n')
4223 4223 if update or exact:
4224 4224 parents = repo[None].parents()
4225 4225 else:
4226 4226 parents = [repo[node]]
4227 4227 if rej:
4228 4228 ui.write_err(_(b"patch applied partially\n"))
4229 4229 ui.write_err(
4230 4230 _(
4231 4231 b"(fix the .rej files and run "
4232 4232 b"`hg commit --amend`)\n"
4233 4233 )
4234 4234 )
4235 4235 ret = 1
4236 4236 break
4237 4237
4238 4238 if not haspatch:
4239 4239 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4240 4240
4241 4241 if msgs:
4242 4242 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 4243 return ret
4244 4244
4245 4245
4246 4246 @command(
4247 4247 b'incoming|in',
4248 4248 [
4249 4249 (
4250 4250 b'f',
4251 4251 b'force',
4252 4252 None,
4253 4253 _(b'run even if remote repository is unrelated'),
4254 4254 ),
4255 4255 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 4256 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 4257 (
4258 4258 b'r',
4259 4259 b'rev',
4260 4260 [],
4261 4261 _(b'a remote changeset intended to be added'),
4262 4262 _(b'REV'),
4263 4263 ),
4264 4264 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 4265 (
4266 4266 b'b',
4267 4267 b'branch',
4268 4268 [],
4269 4269 _(b'a specific branch you would like to pull'),
4270 4270 _(b'BRANCH'),
4271 4271 ),
4272 4272 ]
4273 4273 + logopts
4274 4274 + remoteopts
4275 4275 + subrepoopts,
4276 4276 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 4277 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 4278 )
4279 4279 def incoming(ui, repo, source=b"default", **opts):
4280 4280 """show new changesets found in source
4281 4281
4282 4282 Show new changesets found in the specified path/URL or the default
4283 4283 pull location. These are the changesets that would have been pulled
4284 4284 by :hg:`pull` at the time you issued this command.
4285 4285
4286 4286 See pull for valid source format details.
4287 4287
4288 4288 .. container:: verbose
4289 4289
4290 4290 With -B/--bookmarks, the result of bookmark comparison between
4291 4291 local and remote repositories is displayed. With -v/--verbose,
4292 4292 status is also displayed for each bookmark like below::
4293 4293
4294 4294 BM1 01234567890a added
4295 4295 BM2 1234567890ab advanced
4296 4296 BM3 234567890abc diverged
4297 4297 BM4 34567890abcd changed
4298 4298
4299 4299 The action taken locally when pulling depends on the
4300 4300 status of each bookmark:
4301 4301
4302 4302 :``added``: pull will create it
4303 4303 :``advanced``: pull will update it
4304 4304 :``diverged``: pull will create a divergent bookmark
4305 4305 :``changed``: result depends on remote changesets
4306 4306
4307 4307 From the point of view of pulling behavior, bookmark
4308 4308 existing only in the remote repository are treated as ``added``,
4309 4309 even if it is in fact locally deleted.
4310 4310
4311 4311 .. container:: verbose
4312 4312
4313 4313 For remote repository, using --bundle avoids downloading the
4314 4314 changesets twice if the incoming is followed by a pull.
4315 4315
4316 4316 Examples:
4317 4317
4318 4318 - show incoming changes with patches and full description::
4319 4319
4320 4320 hg incoming -vp
4321 4321
4322 4322 - show incoming changes excluding merges, store a bundle::
4323 4323
4324 4324 hg in -vpM --bundle incoming.hg
4325 4325 hg pull incoming.hg
4326 4326
4327 4327 - briefly list changes inside a bundle::
4328 4328
4329 4329 hg in changes.hg -T "{desc|firstline}\\n"
4330 4330
4331 4331 Returns 0 if there are incoming changes, 1 otherwise.
4332 4332 """
4333 4333 opts = pycompat.byteskwargs(opts)
4334 4334 if opts.get(b'graph'):
4335 4335 logcmdutil.checkunsupportedgraphflags([], opts)
4336 4336
4337 4337 def display(other, chlist, displayer):
4338 4338 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 4339 logcmdutil.displaygraph(
4340 4340 ui, repo, revdag, displayer, graphmod.asciiedges
4341 4341 )
4342 4342
4343 4343 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 4344 return 0
4345 4345
4346 4346 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4347 4347
4348 4348 if opts.get(b'bookmarks'):
4349 4349 srcs = urlutil.get_pull_paths(repo, ui, [source])
4350 4350 for path in srcs:
4351 4351 source, branches = urlutil.parseurl(
4352 4352 path.rawloc, opts.get(b'branch')
4353 4353 )
4354 4354 other = hg.peer(repo, opts, source)
4355 4355 try:
4356 4356 if b'bookmarks' not in other.listkeys(b'namespaces'):
4357 4357 ui.warn(_(b"remote doesn't support bookmarks\n"))
4358 4358 return 0
4359 4359 ui.pager(b'incoming')
4360 4360 ui.status(
4361 4361 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4362 4362 )
4363 4363 return bookmarks.incoming(
4364 4364 ui, repo, other, mode=path.bookmarks_mode
4365 4365 )
4366 4366 finally:
4367 4367 other.close()
4368 4368
4369 4369 return hg.incoming(ui, repo, source, opts)
4370 4370
4371 4371
4372 4372 @command(
4373 4373 b'init',
4374 4374 remoteopts,
4375 4375 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4376 4376 helpcategory=command.CATEGORY_REPO_CREATION,
4377 4377 helpbasic=True,
4378 4378 norepo=True,
4379 4379 )
4380 4380 def init(ui, dest=b".", **opts):
4381 4381 """create a new repository in the given directory
4382 4382
4383 4383 Initialize a new repository in the given directory. If the given
4384 4384 directory does not exist, it will be created.
4385 4385
4386 4386 If no directory is given, the current directory is used.
4387 4387
4388 4388 It is possible to specify an ``ssh://`` URL as the destination.
4389 4389 See :hg:`help urls` for more information.
4390 4390
4391 4391 Returns 0 on success.
4392 4392 """
4393 4393 opts = pycompat.byteskwargs(opts)
4394 4394 path = urlutil.get_clone_path(ui, dest)[1]
4395 4395 peer = hg.peer(ui, opts, path, create=True)
4396 4396 peer.close()
4397 4397
4398 4398
4399 4399 @command(
4400 4400 b'locate',
4401 4401 [
4402 4402 (
4403 4403 b'r',
4404 4404 b'rev',
4405 4405 b'',
4406 4406 _(b'search the repository as it is in REV'),
4407 4407 _(b'REV'),
4408 4408 ),
4409 4409 (
4410 4410 b'0',
4411 4411 b'print0',
4412 4412 None,
4413 4413 _(b'end filenames with NUL, for use with xargs'),
4414 4414 ),
4415 4415 (
4416 4416 b'f',
4417 4417 b'fullpath',
4418 4418 None,
4419 4419 _(b'print complete paths from the filesystem root'),
4420 4420 ),
4421 4421 ]
4422 4422 + walkopts,
4423 4423 _(b'[OPTION]... [PATTERN]...'),
4424 4424 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4425 4425 )
4426 4426 def locate(ui, repo, *pats, **opts):
4427 4427 """locate files matching specific patterns (DEPRECATED)
4428 4428
4429 4429 Print files under Mercurial control in the working directory whose
4430 4430 names match the given patterns.
4431 4431
4432 4432 By default, this command searches all directories in the working
4433 4433 directory. To search just the current directory and its
4434 4434 subdirectories, use "--include .".
4435 4435
4436 4436 If no patterns are given to match, this command prints the names
4437 4437 of all files under Mercurial control in the working directory.
4438 4438
4439 4439 If you want to feed the output of this command into the "xargs"
4440 4440 command, use the -0 option to both this command and "xargs". This
4441 4441 will avoid the problem of "xargs" treating single filenames that
4442 4442 contain whitespace as multiple filenames.
4443 4443
4444 4444 See :hg:`help files` for a more versatile command.
4445 4445
4446 4446 Returns 0 if a match is found, 1 otherwise.
4447 4447 """
4448 4448 opts = pycompat.byteskwargs(opts)
4449 4449 if opts.get(b'print0'):
4450 4450 end = b'\0'
4451 4451 else:
4452 4452 end = b'\n'
4453 4453 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4454 4454
4455 4455 ret = 1
4456 4456 m = scmutil.match(
4457 4457 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4458 4458 )
4459 4459
4460 4460 ui.pager(b'locate')
4461 4461 if ctx.rev() is None:
4462 4462 # When run on the working copy, "locate" includes removed files, so
4463 4463 # we get the list of files from the dirstate.
4464 4464 filesgen = sorted(repo.dirstate.matches(m))
4465 4465 else:
4466 4466 filesgen = ctx.matches(m)
4467 4467 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4468 4468 for abs in filesgen:
4469 4469 if opts.get(b'fullpath'):
4470 4470 ui.write(repo.wjoin(abs), end)
4471 4471 else:
4472 4472 ui.write(uipathfn(abs), end)
4473 4473 ret = 0
4474 4474
4475 4475 return ret
4476 4476
4477 4477
4478 4478 @command(
4479 4479 b'log|history',
4480 4480 [
4481 4481 (
4482 4482 b'f',
4483 4483 b'follow',
4484 4484 None,
4485 4485 _(
4486 4486 b'follow changeset history, or file history across copies and renames'
4487 4487 ),
4488 4488 ),
4489 4489 (
4490 4490 b'',
4491 4491 b'follow-first',
4492 4492 None,
4493 4493 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4494 4494 ),
4495 4495 (
4496 4496 b'd',
4497 4497 b'date',
4498 4498 b'',
4499 4499 _(b'show revisions matching date spec'),
4500 4500 _(b'DATE'),
4501 4501 ),
4502 4502 (b'C', b'copies', None, _(b'show copied files')),
4503 4503 (
4504 4504 b'k',
4505 4505 b'keyword',
4506 4506 [],
4507 4507 _(b'do case-insensitive search for a given text'),
4508 4508 _(b'TEXT'),
4509 4509 ),
4510 4510 (
4511 4511 b'r',
4512 4512 b'rev',
4513 4513 [],
4514 4514 _(b'revisions to select or follow from'),
4515 4515 _(b'REV'),
4516 4516 ),
4517 4517 (
4518 4518 b'L',
4519 4519 b'line-range',
4520 4520 [],
4521 4521 _(b'follow line range of specified file (EXPERIMENTAL)'),
4522 4522 _(b'FILE,RANGE'),
4523 4523 ),
4524 4524 (
4525 4525 b'',
4526 4526 b'removed',
4527 4527 None,
4528 4528 _(b'include revisions where files were removed'),
4529 4529 ),
4530 4530 (
4531 4531 b'm',
4532 4532 b'only-merges',
4533 4533 None,
4534 4534 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4535 4535 ),
4536 4536 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4537 4537 (
4538 4538 b'',
4539 4539 b'only-branch',
4540 4540 [],
4541 4541 _(
4542 4542 b'show only changesets within the given named branch (DEPRECATED)'
4543 4543 ),
4544 4544 _(b'BRANCH'),
4545 4545 ),
4546 4546 (
4547 4547 b'b',
4548 4548 b'branch',
4549 4549 [],
4550 4550 _(b'show changesets within the given named branch'),
4551 4551 _(b'BRANCH'),
4552 4552 ),
4553 4553 (
4554 4554 b'B',
4555 4555 b'bookmark',
4556 4556 [],
4557 4557 _(b"show changesets within the given bookmark"),
4558 4558 _(b'BOOKMARK'),
4559 4559 ),
4560 4560 (
4561 4561 b'P',
4562 4562 b'prune',
4563 4563 [],
4564 4564 _(b'do not display revision or any of its ancestors'),
4565 4565 _(b'REV'),
4566 4566 ),
4567 4567 ]
4568 4568 + logopts
4569 4569 + walkopts,
4570 4570 _(b'[OPTION]... [FILE]'),
4571 4571 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4572 4572 helpbasic=True,
4573 4573 inferrepo=True,
4574 4574 intents={INTENT_READONLY},
4575 4575 )
4576 4576 def log(ui, repo, *pats, **opts):
4577 4577 """show revision history of entire repository or files
4578 4578
4579 4579 Print the revision history of the specified files or the entire
4580 4580 project.
4581 4581
4582 4582 If no revision range is specified, the default is ``tip:0`` unless
4583 4583 --follow is set.
4584 4584
4585 4585 File history is shown without following rename or copy history of
4586 4586 files. Use -f/--follow with a filename to follow history across
4587 4587 renames and copies. --follow without a filename will only show
4588 4588 ancestors of the starting revisions. The starting revisions can be
4589 4589 specified by -r/--rev, which default to the working directory parent.
4590 4590
4591 4591 By default this command prints revision number and changeset id,
4592 4592 tags, non-trivial parents, user, date and time, and a summary for
4593 4593 each commit. When the -v/--verbose switch is used, the list of
4594 4594 changed files and full commit message are shown.
4595 4595
4596 4596 With --graph the revisions are shown as an ASCII art DAG with the most
4597 4597 recent changeset at the top.
4598 4598 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4599 4599 involved in an unresolved merge conflict, '_' closes a branch,
4600 4600 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4601 4601 changeset from the lines below is a parent of the 'o' merge on the same
4602 4602 line.
4603 4603 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4604 4604 of a '|' indicates one or more revisions in a path are omitted.
4605 4605
4606 4606 .. container:: verbose
4607 4607
4608 4608 Use -L/--line-range FILE,M:N options to follow the history of lines
4609 4609 from M to N in FILE. With -p/--patch only diff hunks affecting
4610 4610 specified line range will be shown. This option requires --follow;
4611 4611 it can be specified multiple times. Currently, this option is not
4612 4612 compatible with --graph. This option is experimental.
4613 4613
4614 4614 .. note::
4615 4615
4616 4616 :hg:`log --patch` may generate unexpected diff output for merge
4617 4617 changesets, as it will only compare the merge changeset against
4618 4618 its first parent. Also, only files different from BOTH parents
4619 4619 will appear in files:.
4620 4620
4621 4621 .. note::
4622 4622
4623 4623 For performance reasons, :hg:`log FILE` may omit duplicate changes
4624 4624 made on branches and will not show removals or mode changes. To
4625 4625 see all such changes, use the --removed switch.
4626 4626
4627 4627 .. container:: verbose
4628 4628
4629 4629 .. note::
4630 4630
4631 4631 The history resulting from -L/--line-range options depends on diff
4632 4632 options; for instance if white-spaces are ignored, respective changes
4633 4633 with only white-spaces in specified line range will not be listed.
4634 4634
4635 4635 .. container:: verbose
4636 4636
4637 4637 Some examples:
4638 4638
4639 4639 - changesets with full descriptions and file lists::
4640 4640
4641 4641 hg log -v
4642 4642
4643 4643 - changesets ancestral to the working directory::
4644 4644
4645 4645 hg log -f
4646 4646
4647 4647 - last 10 commits on the current branch::
4648 4648
4649 4649 hg log -l 10 -b .
4650 4650
4651 4651 - changesets showing all modifications of a file, including removals::
4652 4652
4653 4653 hg log --removed file.c
4654 4654
4655 4655 - all changesets that touch a directory, with diffs, excluding merges::
4656 4656
4657 4657 hg log -Mp lib/
4658 4658
4659 4659 - all revision numbers that match a keyword::
4660 4660
4661 4661 hg log -k bug --template "{rev}\\n"
4662 4662
4663 4663 - the full hash identifier of the working directory parent::
4664 4664
4665 4665 hg log -r . --template "{node}\\n"
4666 4666
4667 4667 - list available log templates::
4668 4668
4669 4669 hg log -T list
4670 4670
4671 4671 - check if a given changeset is included in a tagged release::
4672 4672
4673 4673 hg log -r "a21ccf and ancestor(1.9)"
4674 4674
4675 4675 - find all changesets by some user in a date range::
4676 4676
4677 4677 hg log -k alice -d "may 2008 to jul 2008"
4678 4678
4679 4679 - summary of all changesets after the last tag::
4680 4680
4681 4681 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4682 4682
4683 4683 - changesets touching lines 13 to 23 for file.c::
4684 4684
4685 4685 hg log -L file.c,13:23
4686 4686
4687 4687 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4688 4688 main.c with patch::
4689 4689
4690 4690 hg log -L file.c,13:23 -L main.c,2:6 -p
4691 4691
4692 4692 See :hg:`help dates` for a list of formats valid for -d/--date.
4693 4693
4694 4694 See :hg:`help revisions` for more about specifying and ordering
4695 4695 revisions.
4696 4696
4697 4697 See :hg:`help templates` for more about pre-packaged styles and
4698 4698 specifying custom templates. The default template used by the log
4699 4699 command can be customized via the ``command-templates.log`` configuration
4700 4700 setting.
4701 4701
4702 4702 Returns 0 on success.
4703 4703
4704 4704 """
4705 4705 opts = pycompat.byteskwargs(opts)
4706 4706 linerange = opts.get(b'line_range')
4707 4707
4708 4708 if linerange and not opts.get(b'follow'):
4709 4709 raise error.InputError(_(b'--line-range requires --follow'))
4710 4710
4711 4711 if linerange and pats:
4712 4712 # TODO: take pats as patterns with no line-range filter
4713 4713 raise error.InputError(
4714 4714 _(b'FILE arguments are not compatible with --line-range option')
4715 4715 )
4716 4716
4717 4717 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4718 4718 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4719 4719 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4720 4720 if linerange:
4721 4721 # TODO: should follow file history from logcmdutil._initialrevs(),
4722 4722 # then filter the result by logcmdutil._makerevset() and --limit
4723 4723 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4724 4724
4725 4725 getcopies = None
4726 4726 if opts.get(b'copies'):
4727 4727 endrev = None
4728 4728 if revs:
4729 4729 endrev = revs.max() + 1
4730 4730 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4731 4731
4732 4732 ui.pager(b'log')
4733 4733 displayer = logcmdutil.changesetdisplayer(
4734 4734 ui, repo, opts, differ, buffered=True
4735 4735 )
4736 4736 if opts.get(b'graph'):
4737 4737 displayfn = logcmdutil.displaygraphrevs
4738 4738 else:
4739 4739 displayfn = logcmdutil.displayrevs
4740 4740 displayfn(ui, repo, revs, displayer, getcopies)
4741 4741
4742 4742
4743 4743 @command(
4744 4744 b'manifest',
4745 4745 [
4746 4746 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4747 4747 (b'', b'all', False, _(b"list files from all revisions")),
4748 4748 ]
4749 4749 + formatteropts,
4750 4750 _(b'[-r REV]'),
4751 4751 helpcategory=command.CATEGORY_MAINTENANCE,
4752 4752 intents={INTENT_READONLY},
4753 4753 )
4754 4754 def manifest(ui, repo, node=None, rev=None, **opts):
4755 4755 """output the current or given revision of the project manifest
4756 4756
4757 4757 Print a list of version controlled files for the given revision.
4758 4758 If no revision is given, the first parent of the working directory
4759 4759 is used, or the null revision if no revision is checked out.
4760 4760
4761 4761 With -v, print file permissions, symlink and executable bits.
4762 4762 With --debug, print file revision hashes.
4763 4763
4764 4764 If option --all is specified, the list of all files from all revisions
4765 4765 is printed. This includes deleted and renamed files.
4766 4766
4767 4767 Returns 0 on success.
4768 4768 """
4769 4769 opts = pycompat.byteskwargs(opts)
4770 4770 fm = ui.formatter(b'manifest', opts)
4771 4771
4772 4772 if opts.get(b'all'):
4773 4773 if rev or node:
4774 4774 raise error.InputError(_(b"can't specify a revision with --all"))
4775 4775
4776 4776 res = set()
4777 4777 for rev in repo:
4778 4778 ctx = repo[rev]
4779 4779 res |= set(ctx.files())
4780 4780
4781 4781 ui.pager(b'manifest')
4782 4782 for f in sorted(res):
4783 4783 fm.startitem()
4784 4784 fm.write(b"path", b'%s\n', f)
4785 4785 fm.end()
4786 4786 return
4787 4787
4788 4788 if rev and node:
4789 4789 raise error.InputError(_(b"please specify just one revision"))
4790 4790
4791 4791 if not node:
4792 4792 node = rev
4793 4793
4794 4794 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4795 4795 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4796 4796 if node:
4797 4797 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4798 4798 ctx = logcmdutil.revsingle(repo, node)
4799 4799 mf = ctx.manifest()
4800 4800 ui.pager(b'manifest')
4801 4801 for f in ctx:
4802 4802 fm.startitem()
4803 4803 fm.context(ctx=ctx)
4804 4804 fl = ctx[f].flags()
4805 4805 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4806 4806 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4807 4807 fm.write(b'path', b'%s\n', f)
4808 4808 fm.end()
4809 4809
4810 4810
4811 4811 @command(
4812 4812 b'merge',
4813 4813 [
4814 4814 (
4815 4815 b'f',
4816 4816 b'force',
4817 4817 None,
4818 4818 _(b'force a merge including outstanding changes (DEPRECATED)'),
4819 4819 ),
4820 4820 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4821 4821 (
4822 4822 b'P',
4823 4823 b'preview',
4824 4824 None,
4825 4825 _(b'review revisions to merge (no merge is performed)'),
4826 4826 ),
4827 4827 (b'', b'abort', None, _(b'abort the ongoing merge')),
4828 4828 ]
4829 4829 + mergetoolopts,
4830 4830 _(b'[-P] [[-r] REV]'),
4831 4831 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4832 4832 helpbasic=True,
4833 4833 )
4834 4834 def merge(ui, repo, node=None, **opts):
4835 4835 """merge another revision into working directory
4836 4836
4837 4837 The current working directory is updated with all changes made in
4838 4838 the requested revision since the last common predecessor revision.
4839 4839
4840 4840 Files that changed between either parent are marked as changed for
4841 4841 the next commit and a commit must be performed before any further
4842 4842 updates to the repository are allowed. The next commit will have
4843 4843 two parents.
4844 4844
4845 4845 ``--tool`` can be used to specify the merge tool used for file
4846 4846 merges. It overrides the HGMERGE environment variable and your
4847 4847 configuration files. See :hg:`help merge-tools` for options.
4848 4848
4849 4849 If no revision is specified, the working directory's parent is a
4850 4850 head revision, and the current branch contains exactly one other
4851 4851 head, the other head is merged with by default. Otherwise, an
4852 4852 explicit revision with which to merge must be provided.
4853 4853
4854 4854 See :hg:`help resolve` for information on handling file conflicts.
4855 4855
4856 4856 To undo an uncommitted merge, use :hg:`merge --abort` which
4857 4857 will check out a clean copy of the original merge parent, losing
4858 4858 all changes.
4859 4859
4860 4860 Returns 0 on success, 1 if there are unresolved files.
4861 4861 """
4862 4862
4863 4863 opts = pycompat.byteskwargs(opts)
4864 4864 abort = opts.get(b'abort')
4865 4865 if abort and repo.dirstate.p2() == repo.nullid:
4866 4866 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4867 4867 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4868 4868 if abort:
4869 4869 state = cmdutil.getunfinishedstate(repo)
4870 4870 if state and state._opname != b'merge':
4871 4871 raise error.StateError(
4872 4872 _(b'cannot abort merge with %s in progress') % (state._opname),
4873 4873 hint=state.hint(),
4874 4874 )
4875 4875 if node:
4876 4876 raise error.InputError(_(b"cannot specify a node with --abort"))
4877 4877 return hg.abortmerge(repo.ui, repo)
4878 4878
4879 4879 if opts.get(b'rev') and node:
4880 4880 raise error.InputError(_(b"please specify just one revision"))
4881 4881 if not node:
4882 4882 node = opts.get(b'rev')
4883 4883
4884 4884 if node:
4885 4885 ctx = logcmdutil.revsingle(repo, node)
4886 4886 else:
4887 4887 if ui.configbool(b'commands', b'merge.require-rev'):
4888 4888 raise error.InputError(
4889 4889 _(
4890 4890 b'configuration requires specifying revision to merge '
4891 4891 b'with'
4892 4892 )
4893 4893 )
4894 4894 ctx = repo[destutil.destmerge(repo)]
4895 4895
4896 4896 if ctx.node() is None:
4897 4897 raise error.InputError(
4898 4898 _(b'merging with the working copy has no effect')
4899 4899 )
4900 4900
4901 4901 if opts.get(b'preview'):
4902 4902 # find nodes that are ancestors of p2 but not of p1
4903 4903 p1 = repo[b'.'].node()
4904 4904 p2 = ctx.node()
4905 4905 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4906 4906
4907 4907 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4908 4908 for node in nodes:
4909 4909 displayer.show(repo[node])
4910 4910 displayer.close()
4911 4911 return 0
4912 4912
4913 4913 # ui.forcemerge is an internal variable, do not document
4914 4914 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4915 4915 with ui.configoverride(overrides, b'merge'):
4916 4916 force = opts.get(b'force')
4917 4917 labels = [b'working copy', b'merge rev']
4918 4918 return hg.merge(ctx, force=force, labels=labels)
4919 4919
4920 4920
4921 4921 statemod.addunfinished(
4922 4922 b'merge',
4923 4923 fname=None,
4924 4924 clearable=True,
4925 4925 allowcommit=True,
4926 4926 cmdmsg=_(b'outstanding uncommitted merge'),
4927 4927 abortfunc=hg.abortmerge,
4928 4928 statushint=_(
4929 4929 b'To continue: hg commit\nTo abort: hg merge --abort'
4930 4930 ),
4931 4931 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4932 4932 )
4933 4933
4934 4934
4935 4935 @command(
4936 4936 b'outgoing|out',
4937 4937 [
4938 4938 (
4939 4939 b'f',
4940 4940 b'force',
4941 4941 None,
4942 4942 _(b'run even when the destination is unrelated'),
4943 4943 ),
4944 4944 (
4945 4945 b'r',
4946 4946 b'rev',
4947 4947 [],
4948 4948 _(b'a changeset intended to be included in the destination'),
4949 4949 _(b'REV'),
4950 4950 ),
4951 4951 (b'n', b'newest-first', None, _(b'show newest record first')),
4952 4952 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4953 4953 (
4954 4954 b'b',
4955 4955 b'branch',
4956 4956 [],
4957 4957 _(b'a specific branch you would like to push'),
4958 4958 _(b'BRANCH'),
4959 4959 ),
4960 4960 ]
4961 4961 + logopts
4962 4962 + remoteopts
4963 4963 + subrepoopts,
4964 4964 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4965 4965 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4966 4966 )
4967 4967 def outgoing(ui, repo, *dests, **opts):
4968 4968 """show changesets not found in the destination
4969 4969
4970 4970 Show changesets not found in the specified destination repository
4971 4971 or the default push location. These are the changesets that would
4972 4972 be pushed if a push was requested.
4973 4973
4974 4974 See pull for details of valid destination formats.
4975 4975
4976 4976 .. container:: verbose
4977 4977
4978 4978 With -B/--bookmarks, the result of bookmark comparison between
4979 4979 local and remote repositories is displayed. With -v/--verbose,
4980 4980 status is also displayed for each bookmark like below::
4981 4981
4982 4982 BM1 01234567890a added
4983 4983 BM2 deleted
4984 4984 BM3 234567890abc advanced
4985 4985 BM4 34567890abcd diverged
4986 4986 BM5 4567890abcde changed
4987 4987
4988 4988 The action taken when pushing depends on the
4989 4989 status of each bookmark:
4990 4990
4991 4991 :``added``: push with ``-B`` will create it
4992 4992 :``deleted``: push with ``-B`` will delete it
4993 4993 :``advanced``: push will update it
4994 4994 :``diverged``: push with ``-B`` will update it
4995 4995 :``changed``: push with ``-B`` will update it
4996 4996
4997 4997 From the point of view of pushing behavior, bookmarks
4998 4998 existing only in the remote repository are treated as
4999 4999 ``deleted``, even if it is in fact added remotely.
5000 5000
5001 5001 Returns 0 if there are outgoing changes, 1 otherwise.
5002 5002 """
5003 5003 opts = pycompat.byteskwargs(opts)
5004 5004 if opts.get(b'bookmarks'):
5005 5005 for path in urlutil.get_push_paths(repo, ui, dests):
5006 5006 dest = path.pushloc or path.loc
5007 5007 other = hg.peer(repo, opts, dest)
5008 5008 try:
5009 5009 if b'bookmarks' not in other.listkeys(b'namespaces'):
5010 5010 ui.warn(_(b"remote doesn't support bookmarks\n"))
5011 5011 return 0
5012 5012 ui.status(
5013 5013 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5014 5014 )
5015 5015 ui.pager(b'outgoing')
5016 5016 return bookmarks.outgoing(ui, repo, other)
5017 5017 finally:
5018 5018 other.close()
5019 5019
5020 5020 return hg.outgoing(ui, repo, dests, opts)
5021 5021
5022 5022
5023 5023 @command(
5024 5024 b'parents',
5025 5025 [
5026 5026 (
5027 5027 b'r',
5028 5028 b'rev',
5029 5029 b'',
5030 5030 _(b'show parents of the specified revision'),
5031 5031 _(b'REV'),
5032 5032 ),
5033 5033 ]
5034 5034 + templateopts,
5035 5035 _(b'[-r REV] [FILE]'),
5036 5036 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5037 5037 inferrepo=True,
5038 5038 )
5039 5039 def parents(ui, repo, file_=None, **opts):
5040 5040 """show the parents of the working directory or revision (DEPRECATED)
5041 5041
5042 5042 Print the working directory's parent revisions. If a revision is
5043 5043 given via -r/--rev, the parent of that revision will be printed.
5044 5044 If a file argument is given, the revision in which the file was
5045 5045 last changed (before the working directory revision or the
5046 5046 argument to --rev if given) is printed.
5047 5047
5048 5048 This command is equivalent to::
5049 5049
5050 5050 hg log -r "p1()+p2()" or
5051 5051 hg log -r "p1(REV)+p2(REV)" or
5052 5052 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5053 5053 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5054 5054
5055 5055 See :hg:`summary` and :hg:`help revsets` for related information.
5056 5056
5057 5057 Returns 0 on success.
5058 5058 """
5059 5059
5060 5060 opts = pycompat.byteskwargs(opts)
5061 5061 rev = opts.get(b'rev')
5062 5062 if rev:
5063 5063 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5064 5064 ctx = logcmdutil.revsingle(repo, rev, None)
5065 5065
5066 5066 if file_:
5067 5067 m = scmutil.match(ctx, (file_,), opts)
5068 5068 if m.anypats() or len(m.files()) != 1:
5069 5069 raise error.InputError(_(b'can only specify an explicit filename'))
5070 5070 file_ = m.files()[0]
5071 5071 filenodes = []
5072 5072 for cp in ctx.parents():
5073 5073 if not cp:
5074 5074 continue
5075 5075 try:
5076 5076 filenodes.append(cp.filenode(file_))
5077 5077 except error.LookupError:
5078 5078 pass
5079 5079 if not filenodes:
5080 5080 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5081 5081 p = []
5082 5082 for fn in filenodes:
5083 5083 fctx = repo.filectx(file_, fileid=fn)
5084 5084 p.append(fctx.node())
5085 5085 else:
5086 5086 p = [cp.node() for cp in ctx.parents()]
5087 5087
5088 5088 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5089 5089 for n in p:
5090 5090 if n != repo.nullid:
5091 5091 displayer.show(repo[n])
5092 5092 displayer.close()
5093 5093
5094 5094
5095 5095 @command(
5096 5096 b'paths',
5097 5097 formatteropts,
5098 5098 _(b'[NAME]'),
5099 5099 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5100 5100 optionalrepo=True,
5101 5101 intents={INTENT_READONLY},
5102 5102 )
5103 5103 def paths(ui, repo, search=None, **opts):
5104 5104 """show aliases for remote repositories
5105 5105
5106 5106 Show definition of symbolic path name NAME. If no name is given,
5107 5107 show definition of all available names.
5108 5108
5109 5109 Option -q/--quiet suppresses all output when searching for NAME
5110 5110 and shows only the path names when listing all definitions.
5111 5111
5112 5112 Path names are defined in the [paths] section of your
5113 5113 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5114 5114 repository, ``.hg/hgrc`` is used, too.
5115 5115
5116 5116 The path names ``default`` and ``default-push`` have a special
5117 5117 meaning. When performing a push or pull operation, they are used
5118 5118 as fallbacks if no location is specified on the command-line.
5119 5119 When ``default-push`` is set, it will be used for push and
5120 5120 ``default`` will be used for pull; otherwise ``default`` is used
5121 5121 as the fallback for both. When cloning a repository, the clone
5122 5122 source is written as ``default`` in ``.hg/hgrc``.
5123 5123
5124 5124 .. note::
5125 5125
5126 5126 ``default`` and ``default-push`` apply to all inbound (e.g.
5127 5127 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5128 5128 and :hg:`bundle`) operations.
5129 5129
5130 5130 See :hg:`help urls` for more information.
5131 5131
5132 5132 .. container:: verbose
5133 5133
5134 5134 Template:
5135 5135
5136 5136 The following keywords are supported. See also :hg:`help templates`.
5137 5137
5138 5138 :name: String. Symbolic name of the path alias.
5139 5139 :pushurl: String. URL for push operations.
5140 5140 :url: String. URL or directory path for the other operations.
5141 5141
5142 5142 Returns 0 on success.
5143 5143 """
5144 5144
5145 5145 opts = pycompat.byteskwargs(opts)
5146 5146
5147 5147 pathitems = urlutil.list_paths(ui, search)
5148 5148 ui.pager(b'paths')
5149 5149
5150 5150 fm = ui.formatter(b'paths', opts)
5151 5151 if fm.isplain():
5152 5152 hidepassword = urlutil.hidepassword
5153 5153 else:
5154 5154 hidepassword = bytes
5155 5155 if ui.quiet:
5156 5156 namefmt = b'%s\n'
5157 5157 else:
5158 5158 namefmt = b'%s = '
5159 5159 showsubopts = not search and not ui.quiet
5160 5160
5161 5161 for name, path in pathitems:
5162 5162 fm.startitem()
5163 5163 fm.condwrite(not search, b'name', namefmt, name)
5164 5164 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5165 5165 for subopt, value in sorted(path.suboptions.items()):
5166 5166 assert subopt not in (b'name', b'url')
5167 5167 if showsubopts:
5168 5168 fm.plain(b'%s:%s = ' % (name, subopt))
5169 5169 if isinstance(value, bool):
5170 5170 if value:
5171 5171 value = b'yes'
5172 5172 else:
5173 5173 value = b'no'
5174 5174 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5175 5175
5176 5176 fm.end()
5177 5177
5178 5178 if search and not pathitems:
5179 5179 if not ui.quiet:
5180 5180 ui.warn(_(b"not found!\n"))
5181 5181 return 1
5182 5182 else:
5183 5183 return 0
5184 5184
5185 5185
5186 5186 @command(
5187 5187 b'phase',
5188 5188 [
5189 5189 (b'p', b'public', False, _(b'set changeset phase to public')),
5190 5190 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5191 5191 (b's', b'secret', False, _(b'set changeset phase to secret')),
5192 5192 (b'f', b'force', False, _(b'allow to move boundary backward')),
5193 5193 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5194 5194 ],
5195 5195 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5196 5196 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5197 5197 )
5198 5198 def phase(ui, repo, *revs, **opts):
5199 5199 """set or show the current phase name
5200 5200
5201 5201 With no argument, show the phase name of the current revision(s).
5202 5202
5203 5203 With one of -p/--public, -d/--draft or -s/--secret, change the
5204 5204 phase value of the specified revisions.
5205 5205
5206 5206 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5207 5207 lower phase to a higher phase. Phases are ordered as follows::
5208 5208
5209 5209 public < draft < secret
5210 5210
5211 5211 Returns 0 on success, 1 if some phases could not be changed.
5212 5212
5213 5213 (For more information about the phases concept, see :hg:`help phases`.)
5214 5214 """
5215 5215 opts = pycompat.byteskwargs(opts)
5216 5216 # search for a unique phase argument
5217 5217 targetphase = None
5218 5218 for idx, name in enumerate(phases.cmdphasenames):
5219 5219 if opts[name]:
5220 5220 if targetphase is not None:
5221 5221 raise error.InputError(_(b'only one phase can be specified'))
5222 5222 targetphase = idx
5223 5223
5224 5224 # look for specified revision
5225 5225 revs = list(revs)
5226 5226 revs.extend(opts[b'rev'])
5227 5227 if revs:
5228 5228 revs = logcmdutil.revrange(repo, revs)
5229 5229 else:
5230 5230 # display both parents as the second parent phase can influence
5231 5231 # the phase of a merge commit
5232 5232 revs = [c.rev() for c in repo[None].parents()]
5233 5233
5234 5234 ret = 0
5235 5235 if targetphase is None:
5236 5236 # display
5237 5237 for r in revs:
5238 5238 ctx = repo[r]
5239 5239 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5240 5240 else:
5241 5241 with repo.lock(), repo.transaction(b"phase") as tr:
5242 5242 # set phase
5243 5243 if not revs:
5244 5244 raise error.InputError(_(b'empty revision set'))
5245 5245 nodes = [repo[r].node() for r in revs]
5246 5246 # moving revision from public to draft may hide them
5247 5247 # We have to check result on an unfiltered repository
5248 5248 unfi = repo.unfiltered()
5249 5249 getphase = unfi._phasecache.phase
5250 5250 olddata = [getphase(unfi, r) for r in unfi]
5251 5251 phases.advanceboundary(repo, tr, targetphase, nodes)
5252 5252 if opts[b'force']:
5253 5253 phases.retractboundary(repo, tr, targetphase, nodes)
5254 5254 getphase = unfi._phasecache.phase
5255 5255 newdata = [getphase(unfi, r) for r in unfi]
5256 5256 changes = sum(newdata[r] != olddata[r] for r in unfi)
5257 5257 cl = unfi.changelog
5258 5258 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5259 5259 if rejected:
5260 5260 ui.warn(
5261 5261 _(
5262 5262 b'cannot move %i changesets to a higher '
5263 5263 b'phase, use --force\n'
5264 5264 )
5265 5265 % len(rejected)
5266 5266 )
5267 5267 ret = 1
5268 5268 if changes:
5269 5269 msg = _(b'phase changed for %i changesets\n') % changes
5270 5270 if ret:
5271 5271 ui.status(msg)
5272 5272 else:
5273 5273 ui.note(msg)
5274 5274 else:
5275 5275 ui.warn(_(b'no phases changed\n'))
5276 5276 return ret
5277 5277
5278 5278
5279 5279 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5280 5280 """Run after a changegroup has been added via pull/unbundle
5281 5281
5282 5282 This takes arguments below:
5283 5283
5284 5284 :modheads: change of heads by pull/unbundle
5285 5285 :optupdate: updating working directory is needed or not
5286 5286 :checkout: update destination revision (or None to default destination)
5287 5287 :brev: a name, which might be a bookmark to be activated after updating
5288 5288
5289 5289 return True if update raise any conflict, False otherwise.
5290 5290 """
5291 5291 if modheads == 0:
5292 5292 return False
5293 5293 if optupdate:
5294 5294 try:
5295 5295 return hg.updatetotally(ui, repo, checkout, brev)
5296 5296 except error.UpdateAbort as inst:
5297 5297 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5298 5298 hint = inst.hint
5299 5299 raise error.UpdateAbort(msg, hint=hint)
5300 5300 if modheads is not None and modheads > 1:
5301 5301 currentbranchheads = len(repo.branchheads())
5302 5302 if currentbranchheads == modheads:
5303 5303 ui.status(
5304 5304 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5305 5305 )
5306 5306 elif currentbranchheads > 1:
5307 5307 ui.status(
5308 5308 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5309 5309 )
5310 5310 else:
5311 5311 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5312 5312 elif not ui.configbool(b'commands', b'update.requiredest'):
5313 5313 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5314 5314 return False
5315 5315
5316 5316
5317 5317 @command(
5318 5318 b'pull',
5319 5319 [
5320 5320 (
5321 5321 b'u',
5322 5322 b'update',
5323 5323 None,
5324 5324 _(b'update to new branch head if new descendants were pulled'),
5325 5325 ),
5326 5326 (
5327 5327 b'f',
5328 5328 b'force',
5329 5329 None,
5330 5330 _(b'run even when remote repository is unrelated'),
5331 5331 ),
5332 5332 (
5333 5333 b'',
5334 5334 b'confirm',
5335 5335 None,
5336 5336 _(b'confirm pull before applying changes'),
5337 5337 ),
5338 5338 (
5339 5339 b'r',
5340 5340 b'rev',
5341 5341 [],
5342 5342 _(b'a remote changeset intended to be added'),
5343 5343 _(b'REV'),
5344 5344 ),
5345 5345 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5346 5346 (
5347 5347 b'b',
5348 5348 b'branch',
5349 5349 [],
5350 5350 _(b'a specific branch you would like to pull'),
5351 5351 _(b'BRANCH'),
5352 5352 ),
5353 5353 ]
5354 5354 + remoteopts,
5355 5355 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5356 5356 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5357 5357 helpbasic=True,
5358 5358 )
5359 5359 def pull(ui, repo, *sources, **opts):
5360 5360 """pull changes from the specified source
5361 5361
5362 5362 Pull changes from a remote repository to a local one.
5363 5363
5364 5364 This finds all changes from the repository at the specified path
5365 5365 or URL and adds them to a local repository (the current one unless
5366 5366 -R is specified). By default, this does not update the copy of the
5367 5367 project in the working directory.
5368 5368
5369 5369 When cloning from servers that support it, Mercurial may fetch
5370 5370 pre-generated data. When this is done, hooks operating on incoming
5371 5371 changesets and changegroups may fire more than once, once for each
5372 5372 pre-generated bundle and as well as for any additional remaining
5373 5373 data. See :hg:`help -e clonebundles` for more.
5374 5374
5375 5375 Use :hg:`incoming` if you want to see what would have been added
5376 5376 by a pull at the time you issued this command. If you then decide
5377 5377 to add those changes to the repository, you should use :hg:`pull
5378 5378 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5379 5379
5380 5380 If SOURCE is omitted, the 'default' path will be used.
5381 5381 See :hg:`help urls` for more information.
5382 5382
5383 5383 If multiple sources are specified, they will be pulled sequentially as if
5384 5384 the command was run multiple time. If --update is specify and the command
5385 5385 will stop at the first failed --update.
5386 5386
5387 5387 Specifying bookmark as ``.`` is equivalent to specifying the active
5388 5388 bookmark's name.
5389 5389
5390 5390 Returns 0 on success, 1 if an update had unresolved files.
5391 5391 """
5392 5392
5393 5393 opts = pycompat.byteskwargs(opts)
5394 5394 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5395 5395 b'update'
5396 5396 ):
5397 5397 msg = _(b'update destination required by configuration')
5398 5398 hint = _(b'use hg pull followed by hg update DEST')
5399 5399 raise error.InputError(msg, hint=hint)
5400 5400
5401 5401 for path in urlutil.get_pull_paths(repo, ui, sources):
5402 5402 source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch'))
5403 5403 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5404 5404 ui.flush()
5405 5405 other = hg.peer(repo, opts, source)
5406 5406 update_conflict = None
5407 5407 try:
5408 5408 revs, checkout = hg.addbranchrevs(
5409 5409 repo, other, branches, opts.get(b'rev')
5410 5410 )
5411 5411
5412 5412 pullopargs = {}
5413 5413
5414 5414 nodes = None
5415 5415 if opts.get(b'bookmark') or revs:
5416 5416 # The list of bookmark used here is the same used to actually update
5417 5417 # the bookmark names, to avoid the race from issue 4689 and we do
5418 5418 # all lookup and bookmark queries in one go so they see the same
5419 5419 # version of the server state (issue 4700).
5420 5420 nodes = []
5421 5421 fnodes = []
5422 5422 revs = revs or []
5423 5423 if revs and not other.capable(b'lookup'):
5424 5424 err = _(
5425 5425 b"other repository doesn't support revision lookup, "
5426 5426 b"so a rev cannot be specified."
5427 5427 )
5428 5428 raise error.Abort(err)
5429 5429 with other.commandexecutor() as e:
5430 5430 fremotebookmarks = e.callcommand(
5431 5431 b'listkeys', {b'namespace': b'bookmarks'}
5432 5432 )
5433 5433 for r in revs:
5434 5434 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5435 5435 remotebookmarks = fremotebookmarks.result()
5436 5436 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5437 5437 pullopargs[b'remotebookmarks'] = remotebookmarks
5438 5438 for b in opts.get(b'bookmark', []):
5439 5439 b = repo._bookmarks.expandname(b)
5440 5440 if b not in remotebookmarks:
5441 5441 raise error.InputError(
5442 5442 _(b'remote bookmark %s not found!') % b
5443 5443 )
5444 5444 nodes.append(remotebookmarks[b])
5445 5445 for i, rev in enumerate(revs):
5446 5446 node = fnodes[i].result()
5447 5447 nodes.append(node)
5448 5448 if rev == checkout:
5449 5449 checkout = node
5450 5450
5451 5451 wlock = util.nullcontextmanager()
5452 5452 if opts.get(b'update'):
5453 5453 wlock = repo.wlock()
5454 5454 with wlock:
5455 5455 pullopargs.update(opts.get(b'opargs', {}))
5456 5456 modheads = exchange.pull(
5457 5457 repo,
5458 5458 other,
5459 5459 path=path,
5460 5460 heads=nodes,
5461 5461 force=opts.get(b'force'),
5462 5462 bookmarks=opts.get(b'bookmark', ()),
5463 5463 opargs=pullopargs,
5464 5464 confirm=opts.get(b'confirm'),
5465 5465 ).cgresult
5466 5466
5467 5467 # brev is a name, which might be a bookmark to be activated at
5468 5468 # the end of the update. In other words, it is an explicit
5469 5469 # destination of the update
5470 5470 brev = None
5471 5471
5472 5472 if checkout:
5473 5473 checkout = repo.unfiltered().changelog.rev(checkout)
5474 5474
5475 5475 # order below depends on implementation of
5476 5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 5477 # because 'checkout' is determined without it.
5478 5478 if opts.get(b'rev'):
5479 5479 brev = opts[b'rev'][0]
5480 5480 elif opts.get(b'branch'):
5481 5481 brev = opts[b'branch'][0]
5482 5482 else:
5483 5483 brev = branches[0]
5484 5484 repo._subtoppath = source
5485 5485 try:
5486 5486 update_conflict = postincoming(
5487 5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 5488 )
5489 5489 except error.FilteredRepoLookupError as exc:
5490 5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 5491 exc.args = (msg,) + exc.args[1:]
5492 5492 raise
5493 5493 finally:
5494 5494 del repo._subtoppath
5495 5495
5496 5496 finally:
5497 5497 other.close()
5498 5498 # skip the remaining pull source if they are some conflict.
5499 5499 if update_conflict:
5500 5500 break
5501 5501 if update_conflict:
5502 5502 return 1
5503 5503 else:
5504 5504 return 0
5505 5505
5506 5506
5507 5507 @command(
5508 5508 b'purge|clean',
5509 5509 [
5510 5510 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5511 5511 (b'', b'all', None, _(b'purge ignored files too')),
5512 5512 (b'i', b'ignored', None, _(b'purge only ignored files')),
5513 5513 (b'', b'dirs', None, _(b'purge empty directories')),
5514 5514 (b'', b'files', None, _(b'purge files')),
5515 5515 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5516 5516 (
5517 5517 b'0',
5518 5518 b'print0',
5519 5519 None,
5520 5520 _(
5521 5521 b'end filenames with NUL, for use with xargs'
5522 5522 b' (implies -p/--print)'
5523 5523 ),
5524 5524 ),
5525 5525 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5526 5526 ]
5527 5527 + cmdutil.walkopts,
5528 5528 _(b'hg purge [OPTION]... [DIR]...'),
5529 5529 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5530 5530 )
5531 5531 def purge(ui, repo, *dirs, **opts):
5532 5532 """removes files not tracked by Mercurial
5533 5533
5534 5534 Delete files not known to Mercurial. This is useful to test local
5535 5535 and uncommitted changes in an otherwise-clean source tree.
5536 5536
5537 5537 This means that purge will delete the following by default:
5538 5538
5539 5539 - Unknown files: files marked with "?" by :hg:`status`
5540 5540 - Empty directories: in fact Mercurial ignores directories unless
5541 5541 they contain files under source control management
5542 5542
5543 5543 But it will leave untouched:
5544 5544
5545 5545 - Modified and unmodified tracked files
5546 5546 - Ignored files (unless -i or --all is specified)
5547 5547 - New files added to the repository (with :hg:`add`)
5548 5548
5549 5549 The --files and --dirs options can be used to direct purge to delete
5550 5550 only files, only directories, or both. If neither option is given,
5551 5551 both will be deleted.
5552 5552
5553 5553 If directories are given on the command line, only files in these
5554 5554 directories are considered.
5555 5555
5556 5556 Be careful with purge, as you could irreversibly delete some files
5557 5557 you forgot to add to the repository. If you only want to print the
5558 5558 list of files that this program would delete, use the --print
5559 5559 option.
5560 5560 """
5561 5561 opts = pycompat.byteskwargs(opts)
5562 5562 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5563 5563
5564 5564 act = not opts.get(b'print')
5565 5565 eol = b'\n'
5566 5566 if opts.get(b'print0'):
5567 5567 eol = b'\0'
5568 5568 act = False # --print0 implies --print
5569 5569 if opts.get(b'all', False):
5570 5570 ignored = True
5571 5571 unknown = True
5572 5572 else:
5573 5573 ignored = opts.get(b'ignored', False)
5574 5574 unknown = not ignored
5575 5575
5576 5576 removefiles = opts.get(b'files')
5577 5577 removedirs = opts.get(b'dirs')
5578 5578 confirm = opts.get(b'confirm')
5579 5579 if confirm is None:
5580 5580 try:
5581 5581 extensions.find(b'purge')
5582 5582 confirm = False
5583 5583 except KeyError:
5584 5584 confirm = True
5585 5585
5586 5586 if not removefiles and not removedirs:
5587 5587 removefiles = True
5588 5588 removedirs = True
5589 5589
5590 5590 match = scmutil.match(repo[None], dirs, opts)
5591 5591
5592 5592 paths = mergemod.purge(
5593 5593 repo,
5594 5594 match,
5595 5595 unknown=unknown,
5596 5596 ignored=ignored,
5597 5597 removeemptydirs=removedirs,
5598 5598 removefiles=removefiles,
5599 5599 abortonerror=opts.get(b'abort_on_err'),
5600 5600 noop=not act,
5601 5601 confirm=confirm,
5602 5602 )
5603 5603
5604 5604 for path in paths:
5605 5605 if not act:
5606 5606 ui.write(b'%s%s' % (path, eol))
5607 5607
5608 5608
5609 5609 @command(
5610 5610 b'push',
5611 5611 [
5612 5612 (b'f', b'force', None, _(b'force push')),
5613 5613 (
5614 5614 b'r',
5615 5615 b'rev',
5616 5616 [],
5617 5617 _(b'a changeset intended to be included in the destination'),
5618 5618 _(b'REV'),
5619 5619 ),
5620 5620 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5621 5621 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5622 5622 (
5623 5623 b'b',
5624 5624 b'branch',
5625 5625 [],
5626 5626 _(b'a specific branch you would like to push'),
5627 5627 _(b'BRANCH'),
5628 5628 ),
5629 5629 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5630 5630 (
5631 5631 b'',
5632 5632 b'pushvars',
5633 5633 [],
5634 5634 _(b'variables that can be sent to server (ADVANCED)'),
5635 5635 ),
5636 5636 (
5637 5637 b'',
5638 5638 b'publish',
5639 5639 False,
5640 5640 _(b'push the changeset as public (EXPERIMENTAL)'),
5641 5641 ),
5642 5642 ]
5643 5643 + remoteopts,
5644 5644 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5645 5645 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5646 5646 helpbasic=True,
5647 5647 )
5648 5648 def push(ui, repo, *dests, **opts):
5649 5649 """push changes to the specified destination
5650 5650
5651 5651 Push changesets from the local repository to the specified
5652 5652 destination.
5653 5653
5654 5654 This operation is symmetrical to pull: it is identical to a pull
5655 5655 in the destination repository from the current one.
5656 5656
5657 5657 By default, push will not allow creation of new heads at the
5658 5658 destination, since multiple heads would make it unclear which head
5659 5659 to use. In this situation, it is recommended to pull and merge
5660 5660 before pushing.
5661 5661
5662 5662 Use --new-branch if you want to allow push to create a new named
5663 5663 branch that is not present at the destination. This allows you to
5664 5664 only create a new branch without forcing other changes.
5665 5665
5666 5666 .. note::
5667 5667
5668 5668 Extra care should be taken with the -f/--force option,
5669 5669 which will push all new heads on all branches, an action which will
5670 5670 almost always cause confusion for collaborators.
5671 5671
5672 5672 If -r/--rev is used, the specified revision and all its ancestors
5673 5673 will be pushed to the remote repository.
5674 5674
5675 5675 If -B/--bookmark is used, the specified bookmarked revision, its
5676 5676 ancestors, and the bookmark will be pushed to the remote
5677 5677 repository. Specifying ``.`` is equivalent to specifying the active
5678 5678 bookmark's name. Use the --all-bookmarks option for pushing all
5679 5679 current bookmarks.
5680 5680
5681 5681 Please see :hg:`help urls` for important details about ``ssh://``
5682 5682 URLs. If DESTINATION is omitted, a default path will be used.
5683 5683
5684 5684 When passed multiple destinations, push will process them one after the
5685 5685 other, but stop should an error occur.
5686 5686
5687 5687 .. container:: verbose
5688 5688
5689 5689 The --pushvars option sends strings to the server that become
5690 5690 environment variables prepended with ``HG_USERVAR_``. For example,
5691 5691 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5692 5692 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5693 5693
5694 5694 pushvars can provide for user-overridable hooks as well as set debug
5695 5695 levels. One example is having a hook that blocks commits containing
5696 5696 conflict markers, but enables the user to override the hook if the file
5697 5697 is using conflict markers for testing purposes or the file format has
5698 5698 strings that look like conflict markers.
5699 5699
5700 5700 By default, servers will ignore `--pushvars`. To enable it add the
5701 5701 following to your configuration file::
5702 5702
5703 5703 [push]
5704 5704 pushvars.server = true
5705 5705
5706 5706 Returns 0 if push was successful, 1 if nothing to push.
5707 5707 """
5708 5708
5709 5709 opts = pycompat.byteskwargs(opts)
5710 5710
5711 5711 if opts.get(b'all_bookmarks'):
5712 5712 cmdutil.check_incompatible_arguments(
5713 5713 opts,
5714 5714 b'all_bookmarks',
5715 5715 [b'bookmark', b'rev'],
5716 5716 )
5717 5717 opts[b'bookmark'] = list(repo._bookmarks)
5718 5718
5719 5719 if opts.get(b'bookmark'):
5720 5720 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5721 5721 for b in opts[b'bookmark']:
5722 5722 # translate -B options to -r so changesets get pushed
5723 5723 b = repo._bookmarks.expandname(b)
5724 5724 if b in repo._bookmarks:
5725 5725 opts.setdefault(b'rev', []).append(b)
5726 5726 else:
5727 5727 # if we try to push a deleted bookmark, translate it to null
5728 5728 # this lets simultaneous -r, -b options continue working
5729 5729 opts.setdefault(b'rev', []).append(b"null")
5730 5730
5731 5731 some_pushed = False
5732 5732 result = 0
5733 5733 for path in urlutil.get_push_paths(repo, ui, dests):
5734 5734 dest = path.pushloc or path.loc
5735 5735 branches = (path.branch, opts.get(b'branch') or [])
5736 5736 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5737 5737 revs, checkout = hg.addbranchrevs(
5738 5738 repo, repo, branches, opts.get(b'rev')
5739 5739 )
5740 5740 other = hg.peer(repo, opts, dest)
5741 5741
5742 5742 try:
5743 5743 if revs:
5744 5744 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5745 5745 if not revs:
5746 5746 raise error.InputError(
5747 5747 _(b"specified revisions evaluate to an empty set"),
5748 5748 hint=_(b"use different revision arguments"),
5749 5749 )
5750 5750 elif path.pushrev:
5751 5751 # It doesn't make any sense to specify ancestor revisions. So limit
5752 5752 # to DAG heads to make discovery simpler.
5753 5753 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5754 5754 revs = scmutil.revrange(repo, [expr])
5755 5755 revs = [repo[rev].node() for rev in revs]
5756 5756 if not revs:
5757 5757 raise error.InputError(
5758 5758 _(
5759 5759 b'default push revset for path evaluates to an empty set'
5760 5760 )
5761 5761 )
5762 5762 elif ui.configbool(b'commands', b'push.require-revs'):
5763 5763 raise error.InputError(
5764 5764 _(b'no revisions specified to push'),
5765 5765 hint=_(b'did you mean "hg push -r ."?'),
5766 5766 )
5767 5767
5768 5768 repo._subtoppath = dest
5769 5769 try:
5770 5770 # push subrepos depth-first for coherent ordering
5771 5771 c = repo[b'.']
5772 5772 subs = c.substate # only repos that are committed
5773 5773 for s in sorted(subs):
5774 5774 sub_result = c.sub(s).push(opts)
5775 5775 if sub_result == 0:
5776 5776 return 1
5777 5777 finally:
5778 5778 del repo._subtoppath
5779 5779
5780 5780 opargs = dict(
5781 5781 opts.get(b'opargs', {})
5782 5782 ) # copy opargs since we may mutate it
5783 5783 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5784 5784
5785 5785 pushop = exchange.push(
5786 5786 repo,
5787 5787 other,
5788 5788 opts.get(b'force'),
5789 5789 revs=revs,
5790 5790 newbranch=opts.get(b'new_branch'),
5791 5791 bookmarks=opts.get(b'bookmark', ()),
5792 5792 publish=opts.get(b'publish'),
5793 5793 opargs=opargs,
5794 5794 )
5795 5795
5796 5796 if pushop.cgresult == 0:
5797 5797 result = 1
5798 5798 elif pushop.cgresult is not None:
5799 5799 some_pushed = True
5800 5800
5801 5801 if pushop.bkresult is not None:
5802 5802 if pushop.bkresult == 2:
5803 5803 result = 2
5804 5804 elif not result and pushop.bkresult:
5805 5805 result = 2
5806 5806
5807 5807 if result:
5808 5808 break
5809 5809
5810 5810 finally:
5811 5811 other.close()
5812 5812 if result == 0 and not some_pushed:
5813 5813 result = 1
5814 5814 return result
5815 5815
5816 5816
5817 5817 @command(
5818 5818 b'recover',
5819 5819 [
5820 5820 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5821 5821 ],
5822 5822 helpcategory=command.CATEGORY_MAINTENANCE,
5823 5823 )
5824 5824 def recover(ui, repo, **opts):
5825 5825 """roll back an interrupted transaction
5826 5826
5827 5827 Recover from an interrupted commit or pull.
5828 5828
5829 5829 This command tries to fix the repository status after an
5830 5830 interrupted operation. It should only be necessary when Mercurial
5831 5831 suggests it.
5832 5832
5833 5833 Returns 0 if successful, 1 if nothing to recover or verify fails.
5834 5834 """
5835 5835 ret = repo.recover()
5836 5836 if ret:
5837 5837 if opts['verify']:
5838 5838 return hg.verify(repo)
5839 5839 else:
5840 5840 msg = _(
5841 5841 b"(verify step skipped, run `hg verify` to check your "
5842 5842 b"repository content)\n"
5843 5843 )
5844 5844 ui.warn(msg)
5845 5845 return 0
5846 5846 return 1
5847 5847
5848 5848
5849 5849 @command(
5850 5850 b'remove|rm',
5851 5851 [
5852 5852 (b'A', b'after', None, _(b'record delete for missing files')),
5853 5853 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5854 5854 ]
5855 5855 + subrepoopts
5856 5856 + walkopts
5857 5857 + dryrunopts,
5858 5858 _(b'[OPTION]... FILE...'),
5859 5859 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5860 5860 helpbasic=True,
5861 5861 inferrepo=True,
5862 5862 )
5863 5863 def remove(ui, repo, *pats, **opts):
5864 5864 """remove the specified files on the next commit
5865 5865
5866 5866 Schedule the indicated files for removal from the current branch.
5867 5867
5868 5868 This command schedules the files to be removed at the next commit.
5869 5869 To undo a remove before that, see :hg:`revert`. To undo added
5870 5870 files, see :hg:`forget`.
5871 5871
5872 5872 .. container:: verbose
5873 5873
5874 5874 -A/--after can be used to remove only files that have already
5875 5875 been deleted, -f/--force can be used to force deletion, and -Af
5876 5876 can be used to remove files from the next revision without
5877 5877 deleting them from the working directory.
5878 5878
5879 5879 The following table details the behavior of remove for different
5880 5880 file states (columns) and option combinations (rows). The file
5881 5881 states are Added [A], Clean [C], Modified [M] and Missing [!]
5882 5882 (as reported by :hg:`status`). The actions are Warn, Remove
5883 5883 (from branch) and Delete (from disk):
5884 5884
5885 5885 ========= == == == ==
5886 5886 opt/state A C M !
5887 5887 ========= == == == ==
5888 5888 none W RD W R
5889 5889 -f R RD RD R
5890 5890 -A W W W R
5891 5891 -Af R R R R
5892 5892 ========= == == == ==
5893 5893
5894 5894 .. note::
5895 5895
5896 5896 :hg:`remove` never deletes files in Added [A] state from the
5897 5897 working directory, not even if ``--force`` is specified.
5898 5898
5899 5899 Returns 0 on success, 1 if any warnings encountered.
5900 5900 """
5901 5901
5902 5902 opts = pycompat.byteskwargs(opts)
5903 5903 after, force = opts.get(b'after'), opts.get(b'force')
5904 5904 dryrun = opts.get(b'dry_run')
5905 5905 if not pats and not after:
5906 5906 raise error.InputError(_(b'no files specified'))
5907 5907
5908 5908 m = scmutil.match(repo[None], pats, opts)
5909 5909 subrepos = opts.get(b'subrepos')
5910 5910 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5911 5911 return cmdutil.remove(
5912 5912 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5913 5913 )
5914 5914
5915 5915
5916 5916 @command(
5917 5917 b'rename|move|mv',
5918 5918 [
5919 5919 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5920 5920 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5921 5921 (
5922 5922 b'',
5923 5923 b'at-rev',
5924 5924 b'',
5925 5925 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5926 5926 _(b'REV'),
5927 5927 ),
5928 5928 (
5929 5929 b'f',
5930 5930 b'force',
5931 5931 None,
5932 5932 _(b'forcibly move over an existing managed file'),
5933 5933 ),
5934 5934 ]
5935 5935 + walkopts
5936 5936 + dryrunopts,
5937 5937 _(b'[OPTION]... SOURCE... DEST'),
5938 5938 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5939 5939 )
5940 5940 def rename(ui, repo, *pats, **opts):
5941 5941 """rename files; equivalent of copy + remove
5942 5942
5943 5943 Mark dest as copies of sources; mark sources for deletion. If dest
5944 5944 is a directory, copies are put in that directory. If dest is a
5945 5945 file, there can only be one source.
5946 5946
5947 5947 By default, this command copies the contents of files as they
5948 5948 exist in the working directory. If invoked with -A/--after, the
5949 5949 operation is recorded, but no copying is performed.
5950 5950
5951 5951 To undo marking a destination file as renamed, use --forget. With that
5952 5952 option, all given (positional) arguments are unmarked as renames. The
5953 5953 destination file(s) will be left in place (still tracked). The source
5954 5954 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5955 5955 the same way as :hg:`copy --forget`.
5956 5956
5957 5957 This command takes effect with the next commit by default.
5958 5958
5959 5959 Returns 0 on success, 1 if errors are encountered.
5960 5960 """
5961 5961 opts = pycompat.byteskwargs(opts)
5962 5962 with repo.wlock():
5963 5963 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5964 5964
5965 5965
5966 5966 @command(
5967 5967 b'resolve',
5968 5968 [
5969 5969 (b'a', b'all', None, _(b'select all unresolved files')),
5970 5970 (b'l', b'list', None, _(b'list state of files needing merge')),
5971 5971 (b'm', b'mark', None, _(b'mark files as resolved')),
5972 5972 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5973 5973 (b'n', b'no-status', None, _(b'hide status prefix')),
5974 5974 (b'', b're-merge', None, _(b're-merge files')),
5975 5975 ]
5976 5976 + mergetoolopts
5977 5977 + walkopts
5978 5978 + formatteropts,
5979 5979 _(b'[OPTION]... [FILE]...'),
5980 5980 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5981 5981 inferrepo=True,
5982 5982 )
5983 5983 def resolve(ui, repo, *pats, **opts):
5984 5984 """redo merges or set/view the merge status of files
5985 5985
5986 5986 Merges with unresolved conflicts are often the result of
5987 5987 non-interactive merging using the ``internal:merge`` configuration
5988 5988 setting, or a command-line merge tool like ``diff3``. The resolve
5989 5989 command is used to manage the files involved in a merge, after
5990 5990 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5991 5991 working directory must have two parents). See :hg:`help
5992 5992 merge-tools` for information on configuring merge tools.
5993 5993
5994 5994 The resolve command can be used in the following ways:
5995 5995
5996 5996 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5997 5997 the specified files, discarding any previous merge attempts. Re-merging
5998 5998 is not performed for files already marked as resolved. Use ``--all/-a``
5999 5999 to select all unresolved files. ``--tool`` can be used to specify
6000 6000 the merge tool used for the given files. It overrides the HGMERGE
6001 6001 environment variable and your configuration files. Previous file
6002 6002 contents are saved with a ``.orig`` suffix.
6003 6003
6004 6004 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6005 6005 (e.g. after having manually fixed-up the files). The default is
6006 6006 to mark all unresolved files.
6007 6007
6008 6008 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6009 6009 default is to mark all resolved files.
6010 6010
6011 6011 - :hg:`resolve -l`: list files which had or still have conflicts.
6012 6012 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6013 6013 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6014 6014 the list. See :hg:`help filesets` for details.
6015 6015
6016 6016 .. note::
6017 6017
6018 6018 Mercurial will not let you commit files with unresolved merge
6019 6019 conflicts. You must use :hg:`resolve -m ...` before you can
6020 6020 commit after a conflicting merge.
6021 6021
6022 6022 .. container:: verbose
6023 6023
6024 6024 Template:
6025 6025
6026 6026 The following keywords are supported in addition to the common template
6027 6027 keywords and functions. See also :hg:`help templates`.
6028 6028
6029 6029 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6030 6030 :path: String. Repository-absolute path of the file.
6031 6031
6032 6032 Returns 0 on success, 1 if any files fail a resolve attempt.
6033 6033 """
6034 6034
6035 6035 opts = pycompat.byteskwargs(opts)
6036 6036 confirm = ui.configbool(b'commands', b'resolve.confirm')
6037 6037 flaglist = b'all mark unmark list no_status re_merge'.split()
6038 6038 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6039 6039
6040 6040 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6041 6041 if actioncount > 1:
6042 6042 raise error.InputError(_(b"too many actions specified"))
6043 6043 elif actioncount == 0 and ui.configbool(
6044 6044 b'commands', b'resolve.explicit-re-merge'
6045 6045 ):
6046 6046 hint = _(b'use --mark, --unmark, --list or --re-merge')
6047 6047 raise error.InputError(_(b'no action specified'), hint=hint)
6048 6048 if pats and all:
6049 6049 raise error.InputError(_(b"can't specify --all and patterns"))
6050 6050 if not (all or pats or show or mark or unmark):
6051 6051 raise error.InputError(
6052 6052 _(b'no files or directories specified'),
6053 6053 hint=b'use --all to re-merge all unresolved files',
6054 6054 )
6055 6055
6056 6056 if confirm:
6057 6057 if all:
6058 6058 if ui.promptchoice(
6059 6059 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6060 6060 ):
6061 6061 raise error.CanceledError(_(b'user quit'))
6062 6062 if mark and not pats:
6063 6063 if ui.promptchoice(
6064 6064 _(
6065 6065 b'mark all unresolved files as resolved (yn)?'
6066 6066 b'$$ &Yes $$ &No'
6067 6067 )
6068 6068 ):
6069 6069 raise error.CanceledError(_(b'user quit'))
6070 6070 if unmark and not pats:
6071 6071 if ui.promptchoice(
6072 6072 _(
6073 6073 b'mark all resolved files as unresolved (yn)?'
6074 6074 b'$$ &Yes $$ &No'
6075 6075 )
6076 6076 ):
6077 6077 raise error.CanceledError(_(b'user quit'))
6078 6078
6079 6079 uipathfn = scmutil.getuipathfn(repo)
6080 6080
6081 6081 if show:
6082 6082 ui.pager(b'resolve')
6083 6083 fm = ui.formatter(b'resolve', opts)
6084 6084 ms = mergestatemod.mergestate.read(repo)
6085 6085 wctx = repo[None]
6086 6086 m = scmutil.match(wctx, pats, opts)
6087 6087
6088 6088 # Labels and keys based on merge state. Unresolved path conflicts show
6089 6089 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6090 6090 # resolved conflicts.
6091 6091 mergestateinfo = {
6092 6092 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6093 6093 b'resolve.unresolved',
6094 6094 b'U',
6095 6095 ),
6096 6096 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6097 6097 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6098 6098 b'resolve.unresolved',
6099 6099 b'P',
6100 6100 ),
6101 6101 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6102 6102 b'resolve.resolved',
6103 6103 b'R',
6104 6104 ),
6105 6105 }
6106 6106
6107 6107 for f in ms:
6108 6108 if not m(f):
6109 6109 continue
6110 6110
6111 6111 label, key = mergestateinfo[ms[f]]
6112 6112 fm.startitem()
6113 6113 fm.context(ctx=wctx)
6114 6114 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6115 6115 fm.data(path=f)
6116 6116 fm.plain(b'%s\n' % uipathfn(f), label=label)
6117 6117 fm.end()
6118 6118 return 0
6119 6119
6120 6120 with repo.wlock():
6121 6121 ms = mergestatemod.mergestate.read(repo)
6122 6122
6123 6123 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6124 6124 raise error.StateError(
6125 6125 _(b'resolve command not applicable when not merging')
6126 6126 )
6127 6127
6128 6128 wctx = repo[None]
6129 6129 m = scmutil.match(wctx, pats, opts)
6130 6130 ret = 0
6131 6131 didwork = False
6132 6132
6133 6133 hasconflictmarkers = []
6134 6134 if mark:
6135 6135 markcheck = ui.config(b'commands', b'resolve.mark-check')
6136 6136 if markcheck not in [b'warn', b'abort']:
6137 6137 # Treat all invalid / unrecognized values as 'none'.
6138 6138 markcheck = False
6139 6139 for f in ms:
6140 6140 if not m(f):
6141 6141 continue
6142 6142
6143 6143 didwork = True
6144 6144
6145 6145 # path conflicts must be resolved manually
6146 6146 if ms[f] in (
6147 6147 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6148 6148 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6149 6149 ):
6150 6150 if mark:
6151 6151 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6152 6152 elif unmark:
6153 6153 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6154 6154 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6155 6155 ui.warn(
6156 6156 _(b'%s: path conflict must be resolved manually\n')
6157 6157 % uipathfn(f)
6158 6158 )
6159 6159 continue
6160 6160
6161 6161 if mark:
6162 6162 if markcheck:
6163 6163 fdata = repo.wvfs.tryread(f)
6164 6164 if (
6165 6165 filemerge.hasconflictmarkers(fdata)
6166 6166 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6167 6167 ):
6168 6168 hasconflictmarkers.append(f)
6169 6169 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6170 6170 elif unmark:
6171 6171 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6172 6172 else:
6173 6173 # backup pre-resolve (merge uses .orig for its own purposes)
6174 6174 a = repo.wjoin(f)
6175 6175 try:
6176 6176 util.copyfile(a, a + b".resolve")
6177 6177 except (IOError, OSError) as inst:
6178 6178 if inst.errno != errno.ENOENT:
6179 6179 raise
6180 6180
6181 6181 try:
6182 6182 # preresolve file
6183 6183 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6184 6184 with ui.configoverride(overrides, b'resolve'):
6185 6185 r = ms.resolve(f, wctx)
6186 6186 if r:
6187 6187 ret = 1
6188 6188 finally:
6189 6189 ms.commit()
6190 6190
6191 6191 # replace filemerge's .orig file with our resolve file
6192 6192 try:
6193 6193 util.rename(
6194 6194 a + b".resolve", scmutil.backuppath(ui, repo, f)
6195 6195 )
6196 6196 except OSError as inst:
6197 6197 if inst.errno != errno.ENOENT:
6198 6198 raise
6199 6199
6200 6200 if hasconflictmarkers:
6201 6201 ui.warn(
6202 6202 _(
6203 6203 b'warning: the following files still have conflict '
6204 6204 b'markers:\n'
6205 6205 )
6206 6206 + b''.join(
6207 6207 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6208 6208 )
6209 6209 )
6210 6210 if markcheck == b'abort' and not all and not pats:
6211 6211 raise error.StateError(
6212 6212 _(b'conflict markers detected'),
6213 6213 hint=_(b'use --all to mark anyway'),
6214 6214 )
6215 6215
6216 6216 ms.commit()
6217 6217 branchmerge = repo.dirstate.p2() != repo.nullid
6218 6218 # resolve is not doing a parent change here, however, `record updates`
6219 6219 # will call some dirstate API that at intended for parent changes call.
6220 6220 # Ideally we would not need this and could implement a lighter version
6221 6221 # of the recordupdateslogic that will not have to deal with the part
6222 6222 # related to parent changes. However this would requires that:
6223 6223 # - we are sure we passed around enough information at update/merge
6224 6224 # time to no longer needs it at `hg resolve time`
6225 6225 # - we are sure we store that information well enough to be able to reuse it
6226 6226 # - we are the necessary logic to reuse it right.
6227 6227 #
6228 6228 # All this should eventually happens, but in the mean time, we use this
6229 6229 # context manager slightly out of the context it should be.
6230 6230 with repo.dirstate.parentchange():
6231 6231 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6232 6232
6233 6233 if not didwork and pats:
6234 6234 hint = None
6235 6235 if not any([p for p in pats if p.find(b':') >= 0]):
6236 6236 pats = [b'path:%s' % p for p in pats]
6237 6237 m = scmutil.match(wctx, pats, opts)
6238 6238 for f in ms:
6239 6239 if not m(f):
6240 6240 continue
6241 6241
6242 6242 def flag(o):
6243 6243 if o == b're_merge':
6244 6244 return b'--re-merge '
6245 6245 return b'-%s ' % o[0:1]
6246 6246
6247 6247 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6248 6248 hint = _(b"(try: hg resolve %s%s)\n") % (
6249 6249 flags,
6250 6250 b' '.join(pats),
6251 6251 )
6252 6252 break
6253 6253 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6254 6254 if hint:
6255 6255 ui.warn(hint)
6256 6256
6257 6257 unresolvedf = ms.unresolvedcount()
6258 6258 if not unresolvedf:
6259 6259 ui.status(_(b'(no more unresolved files)\n'))
6260 6260 cmdutil.checkafterresolved(repo)
6261 6261
6262 6262 return ret
6263 6263
6264 6264
6265 6265 @command(
6266 6266 b'revert',
6267 6267 [
6268 6268 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6269 6269 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6270 6270 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6271 6271 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6272 6272 (b'i', b'interactive', None, _(b'interactively select the changes')),
6273 6273 ]
6274 6274 + walkopts
6275 6275 + dryrunopts,
6276 6276 _(b'[OPTION]... [-r REV] [NAME]...'),
6277 6277 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6278 6278 )
6279 6279 def revert(ui, repo, *pats, **opts):
6280 6280 """restore files to their checkout state
6281 6281
6282 6282 .. note::
6283 6283
6284 6284 To check out earlier revisions, you should use :hg:`update REV`.
6285 6285 To cancel an uncommitted merge (and lose your changes),
6286 6286 use :hg:`merge --abort`.
6287 6287
6288 6288 With no revision specified, revert the specified files or directories
6289 6289 to the contents they had in the parent of the working directory.
6290 6290 This restores the contents of files to an unmodified
6291 6291 state and unschedules adds, removes, copies, and renames. If the
6292 6292 working directory has two parents, you must explicitly specify a
6293 6293 revision.
6294 6294
6295 6295 Using the -r/--rev or -d/--date options, revert the given files or
6296 6296 directories to their states as of a specific revision. Because
6297 6297 revert does not change the working directory parents, this will
6298 6298 cause these files to appear modified. This can be helpful to "back
6299 6299 out" some or all of an earlier change. See :hg:`backout` for a
6300 6300 related method.
6301 6301
6302 6302 Modified files are saved with a .orig suffix before reverting.
6303 6303 To disable these backups, use --no-backup. It is possible to store
6304 6304 the backup files in a custom directory relative to the root of the
6305 6305 repository by setting the ``ui.origbackuppath`` configuration
6306 6306 option.
6307 6307
6308 6308 See :hg:`help dates` for a list of formats valid for -d/--date.
6309 6309
6310 6310 See :hg:`help backout` for a way to reverse the effect of an
6311 6311 earlier changeset.
6312 6312
6313 6313 Returns 0 on success.
6314 6314 """
6315 6315
6316 6316 opts = pycompat.byteskwargs(opts)
6317 6317 if opts.get(b"date"):
6318 6318 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6319 6319 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6320 6320
6321 6321 parent, p2 = repo.dirstate.parents()
6322 6322 if not opts.get(b'rev') and p2 != repo.nullid:
6323 6323 # revert after merge is a trap for new users (issue2915)
6324 6324 raise error.InputError(
6325 6325 _(b'uncommitted merge with no revision specified'),
6326 6326 hint=_(b"use 'hg update' or see 'hg help revert'"),
6327 6327 )
6328 6328
6329 6329 rev = opts.get(b'rev')
6330 6330 if rev:
6331 6331 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6332 6332 ctx = logcmdutil.revsingle(repo, rev)
6333 6333
6334 6334 if not (
6335 6335 pats
6336 6336 or opts.get(b'include')
6337 6337 or opts.get(b'exclude')
6338 6338 or opts.get(b'all')
6339 6339 or opts.get(b'interactive')
6340 6340 ):
6341 6341 msg = _(b"no files or directories specified")
6342 6342 if p2 != repo.nullid:
6343 6343 hint = _(
6344 6344 b"uncommitted merge, use --all to discard all changes,"
6345 6345 b" or 'hg update -C .' to abort the merge"
6346 6346 )
6347 6347 raise error.InputError(msg, hint=hint)
6348 6348 dirty = any(repo.status())
6349 6349 node = ctx.node()
6350 6350 if node != parent:
6351 6351 if dirty:
6352 6352 hint = (
6353 6353 _(
6354 6354 b"uncommitted changes, use --all to discard all"
6355 6355 b" changes, or 'hg update %d' to update"
6356 6356 )
6357 6357 % ctx.rev()
6358 6358 )
6359 6359 else:
6360 6360 hint = (
6361 6361 _(
6362 6362 b"use --all to revert all files,"
6363 6363 b" or 'hg update %d' to update"
6364 6364 )
6365 6365 % ctx.rev()
6366 6366 )
6367 6367 elif dirty:
6368 6368 hint = _(b"uncommitted changes, use --all to discard all changes")
6369 6369 else:
6370 6370 hint = _(b"use --all to revert all files")
6371 6371 raise error.InputError(msg, hint=hint)
6372 6372
6373 6373 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6374 6374
6375 6375
6376 6376 @command(
6377 6377 b'rollback',
6378 6378 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6379 6379 helpcategory=command.CATEGORY_MAINTENANCE,
6380 6380 )
6381 6381 def rollback(ui, repo, **opts):
6382 6382 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6383 6383
6384 6384 Please use :hg:`commit --amend` instead of rollback to correct
6385 6385 mistakes in the last commit.
6386 6386
6387 6387 This command should be used with care. There is only one level of
6388 6388 rollback, and there is no way to undo a rollback. It will also
6389 6389 restore the dirstate at the time of the last transaction, losing
6390 6390 any dirstate changes since that time. This command does not alter
6391 6391 the working directory.
6392 6392
6393 6393 Transactions are used to encapsulate the effects of all commands
6394 6394 that create new changesets or propagate existing changesets into a
6395 6395 repository.
6396 6396
6397 6397 .. container:: verbose
6398 6398
6399 6399 For example, the following commands are transactional, and their
6400 6400 effects can be rolled back:
6401 6401
6402 6402 - commit
6403 6403 - import
6404 6404 - pull
6405 6405 - push (with this repository as the destination)
6406 6406 - unbundle
6407 6407
6408 6408 To avoid permanent data loss, rollback will refuse to rollback a
6409 6409 commit transaction if it isn't checked out. Use --force to
6410 6410 override this protection.
6411 6411
6412 6412 The rollback command can be entirely disabled by setting the
6413 6413 ``ui.rollback`` configuration setting to false. If you're here
6414 6414 because you want to use rollback and it's disabled, you can
6415 6415 re-enable the command by setting ``ui.rollback`` to true.
6416 6416
6417 6417 This command is not intended for use on public repositories. Once
6418 6418 changes are visible for pull by other users, rolling a transaction
6419 6419 back locally is ineffective (someone else may already have pulled
6420 6420 the changes). Furthermore, a race is possible with readers of the
6421 6421 repository; for example an in-progress pull from the repository
6422 6422 may fail if a rollback is performed.
6423 6423
6424 6424 Returns 0 on success, 1 if no rollback data is available.
6425 6425 """
6426 6426 if not ui.configbool(b'ui', b'rollback'):
6427 6427 raise error.Abort(
6428 6428 _(b'rollback is disabled because it is unsafe'),
6429 6429 hint=b'see `hg help -v rollback` for information',
6430 6430 )
6431 6431 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6432 6432
6433 6433
6434 6434 @command(
6435 6435 b'root',
6436 6436 [] + formatteropts,
6437 6437 intents={INTENT_READONLY},
6438 6438 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6439 6439 )
6440 6440 def root(ui, repo, **opts):
6441 6441 """print the root (top) of the current working directory
6442 6442
6443 6443 Print the root directory of the current repository.
6444 6444
6445 6445 .. container:: verbose
6446 6446
6447 6447 Template:
6448 6448
6449 6449 The following keywords are supported in addition to the common template
6450 6450 keywords and functions. See also :hg:`help templates`.
6451 6451
6452 6452 :hgpath: String. Path to the .hg directory.
6453 6453 :storepath: String. Path to the directory holding versioned data.
6454 6454
6455 6455 Returns 0 on success.
6456 6456 """
6457 6457 opts = pycompat.byteskwargs(opts)
6458 6458 with ui.formatter(b'root', opts) as fm:
6459 6459 fm.startitem()
6460 6460 fm.write(b'reporoot', b'%s\n', repo.root)
6461 6461 fm.data(hgpath=repo.path, storepath=repo.spath)
6462 6462
6463 6463
6464 6464 @command(
6465 6465 b'serve',
6466 6466 [
6467 6467 (
6468 6468 b'A',
6469 6469 b'accesslog',
6470 6470 b'',
6471 6471 _(b'name of access log file to write to'),
6472 6472 _(b'FILE'),
6473 6473 ),
6474 6474 (b'd', b'daemon', None, _(b'run server in background')),
6475 6475 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6476 6476 (
6477 6477 b'E',
6478 6478 b'errorlog',
6479 6479 b'',
6480 6480 _(b'name of error log file to write to'),
6481 6481 _(b'FILE'),
6482 6482 ),
6483 6483 # use string type, then we can check if something was passed
6484 6484 (
6485 6485 b'p',
6486 6486 b'port',
6487 6487 b'',
6488 6488 _(b'port to listen on (default: 8000)'),
6489 6489 _(b'PORT'),
6490 6490 ),
6491 6491 (
6492 6492 b'a',
6493 6493 b'address',
6494 6494 b'',
6495 6495 _(b'address to listen on (default: all interfaces)'),
6496 6496 _(b'ADDR'),
6497 6497 ),
6498 6498 (
6499 6499 b'',
6500 6500 b'prefix',
6501 6501 b'',
6502 6502 _(b'prefix path to serve from (default: server root)'),
6503 6503 _(b'PREFIX'),
6504 6504 ),
6505 6505 (
6506 6506 b'n',
6507 6507 b'name',
6508 6508 b'',
6509 6509 _(b'name to show in web pages (default: working directory)'),
6510 6510 _(b'NAME'),
6511 6511 ),
6512 6512 (
6513 6513 b'',
6514 6514 b'web-conf',
6515 6515 b'',
6516 6516 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6517 6517 _(b'FILE'),
6518 6518 ),
6519 6519 (
6520 6520 b'',
6521 6521 b'webdir-conf',
6522 6522 b'',
6523 6523 _(b'name of the hgweb config file (DEPRECATED)'),
6524 6524 _(b'FILE'),
6525 6525 ),
6526 6526 (
6527 6527 b'',
6528 6528 b'pid-file',
6529 6529 b'',
6530 6530 _(b'name of file to write process ID to'),
6531 6531 _(b'FILE'),
6532 6532 ),
6533 6533 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6534 6534 (
6535 6535 b'',
6536 6536 b'cmdserver',
6537 6537 b'',
6538 6538 _(b'for remote clients (ADVANCED)'),
6539 6539 _(b'MODE'),
6540 6540 ),
6541 6541 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6542 6542 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6543 6543 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6544 6544 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6545 6545 (b'', b'print-url', None, _(b'start and print only the URL')),
6546 6546 ]
6547 6547 + subrepoopts,
6548 6548 _(b'[OPTION]...'),
6549 6549 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6550 6550 helpbasic=True,
6551 6551 optionalrepo=True,
6552 6552 )
6553 6553 def serve(ui, repo, **opts):
6554 6554 """start stand-alone webserver
6555 6555
6556 6556 Start a local HTTP repository browser and pull server. You can use
6557 6557 this for ad-hoc sharing and browsing of repositories. It is
6558 6558 recommended to use a real web server to serve a repository for
6559 6559 longer periods of time.
6560 6560
6561 6561 Please note that the server does not implement access control.
6562 6562 This means that, by default, anybody can read from the server and
6563 6563 nobody can write to it by default. Set the ``web.allow-push``
6564 6564 option to ``*`` to allow everybody to push to the server. You
6565 6565 should use a real web server if you need to authenticate users.
6566 6566
6567 6567 By default, the server logs accesses to stdout and errors to
6568 6568 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6569 6569 files.
6570 6570
6571 6571 To have the server choose a free port number to listen on, specify
6572 6572 a port number of 0; in this case, the server will print the port
6573 6573 number it uses.
6574 6574
6575 6575 Returns 0 on success.
6576 6576 """
6577 6577
6578 6578 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6579 6579 opts = pycompat.byteskwargs(opts)
6580 6580 if opts[b"print_url"] and ui.verbose:
6581 6581 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6582 6582
6583 6583 if opts[b"stdio"]:
6584 6584 if repo is None:
6585 6585 raise error.RepoError(
6586 6586 _(b"there is no Mercurial repository here (.hg not found)")
6587 6587 )
6588 6588 s = wireprotoserver.sshserver(ui, repo)
6589 6589 s.serve_forever()
6590 6590 return
6591 6591
6592 6592 service = server.createservice(ui, repo, opts)
6593 6593 return server.runservice(opts, initfn=service.init, runfn=service.run)
6594 6594
6595 6595
6596 6596 @command(
6597 6597 b'shelve',
6598 6598 [
6599 6599 (
6600 6600 b'A',
6601 6601 b'addremove',
6602 6602 None,
6603 6603 _(b'mark new/missing files as added/removed before shelving'),
6604 6604 ),
6605 6605 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6606 6606 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6607 6607 (
6608 6608 b'',
6609 6609 b'date',
6610 6610 b'',
6611 6611 _(b'shelve with the specified commit date'),
6612 6612 _(b'DATE'),
6613 6613 ),
6614 6614 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6615 6615 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6616 6616 (
6617 6617 b'k',
6618 6618 b'keep',
6619 6619 False,
6620 6620 _(b'shelve, but keep changes in the working directory'),
6621 6621 ),
6622 6622 (b'l', b'list', None, _(b'list current shelves')),
6623 6623 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6624 6624 (
6625 6625 b'n',
6626 6626 b'name',
6627 6627 b'',
6628 6628 _(b'use the given name for the shelved commit'),
6629 6629 _(b'NAME'),
6630 6630 ),
6631 6631 (
6632 6632 b'p',
6633 6633 b'patch',
6634 6634 None,
6635 6635 _(
6636 6636 b'output patches for changes (provide the names of the shelved '
6637 6637 b'changes as positional arguments)'
6638 6638 ),
6639 6639 ),
6640 6640 (b'i', b'interactive', None, _(b'interactive mode')),
6641 6641 (
6642 6642 b'',
6643 6643 b'stat',
6644 6644 None,
6645 6645 _(
6646 6646 b'output diffstat-style summary of changes (provide the names of '
6647 6647 b'the shelved changes as positional arguments)'
6648 6648 ),
6649 6649 ),
6650 6650 ]
6651 6651 + cmdutil.walkopts,
6652 6652 _(b'hg shelve [OPTION]... [FILE]...'),
6653 6653 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6654 6654 )
6655 6655 def shelve(ui, repo, *pats, **opts):
6656 6656 """save and set aside changes from the working directory
6657 6657
6658 6658 Shelving takes files that "hg status" reports as not clean, saves
6659 6659 the modifications to a bundle (a shelved change), and reverts the
6660 6660 files so that their state in the working directory becomes clean.
6661 6661
6662 6662 To restore these changes to the working directory, using "hg
6663 6663 unshelve"; this will work even if you switch to a different
6664 6664 commit.
6665 6665
6666 6666 When no files are specified, "hg shelve" saves all not-clean
6667 6667 files. If specific files or directories are named, only changes to
6668 6668 those files are shelved.
6669 6669
6670 6670 In bare shelve (when no files are specified, without interactive,
6671 6671 include and exclude option), shelving remembers information if the
6672 6672 working directory was on newly created branch, in other words working
6673 6673 directory was on different branch than its first parent. In this
6674 6674 situation unshelving restores branch information to the working directory.
6675 6675
6676 6676 Each shelved change has a name that makes it easier to find later.
6677 6677 The name of a shelved change defaults to being based on the active
6678 6678 bookmark, or if there is no active bookmark, the current named
6679 6679 branch. To specify a different name, use ``--name``.
6680 6680
6681 6681 To see a list of existing shelved changes, use the ``--list``
6682 6682 option. For each shelved change, this will print its name, age,
6683 6683 and description; use ``--patch`` or ``--stat`` for more details.
6684 6684
6685 6685 To delete specific shelved changes, use ``--delete``. To delete
6686 6686 all shelved changes, use ``--cleanup``.
6687 6687 """
6688 6688 opts = pycompat.byteskwargs(opts)
6689 6689 allowables = [
6690 6690 (b'addremove', {b'create'}), # 'create' is pseudo action
6691 6691 (b'unknown', {b'create'}),
6692 6692 (b'cleanup', {b'cleanup'}),
6693 6693 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6694 6694 (b'delete', {b'delete'}),
6695 6695 (b'edit', {b'create'}),
6696 6696 (b'keep', {b'create'}),
6697 6697 (b'list', {b'list'}),
6698 6698 (b'message', {b'create'}),
6699 6699 (b'name', {b'create'}),
6700 6700 (b'patch', {b'patch', b'list'}),
6701 6701 (b'stat', {b'stat', b'list'}),
6702 6702 ]
6703 6703
6704 6704 def checkopt(opt):
6705 6705 if opts.get(opt):
6706 6706 for i, allowable in allowables:
6707 6707 if opts[i] and opt not in allowable:
6708 6708 raise error.InputError(
6709 6709 _(
6710 6710 b"options '--%s' and '--%s' may not be "
6711 6711 b"used together"
6712 6712 )
6713 6713 % (opt, i)
6714 6714 )
6715 6715 return True
6716 6716
6717 6717 if checkopt(b'cleanup'):
6718 6718 if pats:
6719 6719 raise error.InputError(
6720 6720 _(b"cannot specify names when using '--cleanup'")
6721 6721 )
6722 6722 return shelvemod.cleanupcmd(ui, repo)
6723 6723 elif checkopt(b'delete'):
6724 6724 return shelvemod.deletecmd(ui, repo, pats)
6725 6725 elif checkopt(b'list'):
6726 6726 return shelvemod.listcmd(ui, repo, pats, opts)
6727 6727 elif checkopt(b'patch') or checkopt(b'stat'):
6728 6728 return shelvemod.patchcmds(ui, repo, pats, opts)
6729 6729 else:
6730 6730 return shelvemod.createcmd(ui, repo, pats, opts)
6731 6731
6732 6732
6733 6733 _NOTTERSE = b'nothing'
6734 6734
6735 6735
6736 6736 @command(
6737 6737 b'status|st',
6738 6738 [
6739 6739 (b'A', b'all', None, _(b'show status of all files')),
6740 6740 (b'm', b'modified', None, _(b'show only modified files')),
6741 6741 (b'a', b'added', None, _(b'show only added files')),
6742 6742 (b'r', b'removed', None, _(b'show only removed files')),
6743 6743 (b'd', b'deleted', None, _(b'show only missing files')),
6744 6744 (b'c', b'clean', None, _(b'show only files without changes')),
6745 6745 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6746 6746 (b'i', b'ignored', None, _(b'show only ignored files')),
6747 6747 (b'n', b'no-status', None, _(b'hide status prefix')),
6748 6748 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6749 6749 (
6750 6750 b'C',
6751 6751 b'copies',
6752 6752 None,
6753 6753 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6754 6754 ),
6755 6755 (
6756 6756 b'0',
6757 6757 b'print0',
6758 6758 None,
6759 6759 _(b'end filenames with NUL, for use with xargs'),
6760 6760 ),
6761 6761 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6762 6762 (
6763 6763 b'',
6764 6764 b'change',
6765 6765 b'',
6766 6766 _(b'list the changed files of a revision'),
6767 6767 _(b'REV'),
6768 6768 ),
6769 6769 ]
6770 6770 + walkopts
6771 6771 + subrepoopts
6772 6772 + formatteropts,
6773 6773 _(b'[OPTION]... [FILE]...'),
6774 6774 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6775 6775 helpbasic=True,
6776 6776 inferrepo=True,
6777 6777 intents={INTENT_READONLY},
6778 6778 )
6779 6779 def status(ui, repo, *pats, **opts):
6780 6780 """show changed files in the working directory
6781 6781
6782 6782 Show status of files in the repository. If names are given, only
6783 6783 files that match are shown. Files that are clean or ignored or
6784 6784 the source of a copy/move operation, are not listed unless
6785 6785 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6786 6786 Unless options described with "show only ..." are given, the
6787 6787 options -mardu are used.
6788 6788
6789 6789 Option -q/--quiet hides untracked (unknown and ignored) files
6790 6790 unless explicitly requested with -u/--unknown or -i/--ignored.
6791 6791
6792 6792 .. note::
6793 6793
6794 6794 :hg:`status` may appear to disagree with diff if permissions have
6795 6795 changed or a merge has occurred. The standard diff format does
6796 6796 not report permission changes and diff only reports changes
6797 6797 relative to one merge parent.
6798 6798
6799 6799 If one revision is given, it is used as the base revision.
6800 6800 If two revisions are given, the differences between them are
6801 6801 shown. The --change option can also be used as a shortcut to list
6802 6802 the changed files of a revision from its first parent.
6803 6803
6804 6804 The codes used to show the status of files are::
6805 6805
6806 6806 M = modified
6807 6807 A = added
6808 6808 R = removed
6809 6809 C = clean
6810 6810 ! = missing (deleted by non-hg command, but still tracked)
6811 6811 ? = not tracked
6812 6812 I = ignored
6813 6813 = origin of the previous file (with --copies)
6814 6814
6815 6815 .. container:: verbose
6816 6816
6817 6817 The -t/--terse option abbreviates the output by showing only the directory
6818 6818 name if all the files in it share the same status. The option takes an
6819 6819 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6820 6820 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6821 6821 for 'ignored' and 'c' for clean.
6822 6822
6823 6823 It abbreviates only those statuses which are passed. Note that clean and
6824 6824 ignored files are not displayed with '--terse ic' unless the -c/--clean
6825 6825 and -i/--ignored options are also used.
6826 6826
6827 6827 The -v/--verbose option shows information when the repository is in an
6828 6828 unfinished merge, shelve, rebase state etc. You can have this behavior
6829 6829 turned on by default by enabling the ``commands.status.verbose`` option.
6830 6830
6831 6831 You can skip displaying some of these states by setting
6832 6832 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6833 6833 'histedit', 'merge', 'rebase', or 'unshelve'.
6834 6834
6835 6835 Template:
6836 6836
6837 6837 The following keywords are supported in addition to the common template
6838 6838 keywords and functions. See also :hg:`help templates`.
6839 6839
6840 6840 :path: String. Repository-absolute path of the file.
6841 6841 :source: String. Repository-absolute path of the file originated from.
6842 6842 Available if ``--copies`` is specified.
6843 6843 :status: String. Character denoting file's status.
6844 6844
6845 6845 Examples:
6846 6846
6847 6847 - show changes in the working directory relative to a
6848 6848 changeset::
6849 6849
6850 6850 hg status --rev 9353
6851 6851
6852 6852 - show changes in the working directory relative to the
6853 6853 current directory (see :hg:`help patterns` for more information)::
6854 6854
6855 6855 hg status re:
6856 6856
6857 6857 - show all changes including copies in an existing changeset::
6858 6858
6859 6859 hg status --copies --change 9353
6860 6860
6861 6861 - get a NUL separated list of added files, suitable for xargs::
6862 6862
6863 6863 hg status -an0
6864 6864
6865 6865 - show more information about the repository status, abbreviating
6866 6866 added, removed, modified, deleted, and untracked paths::
6867 6867
6868 6868 hg status -v -t mardu
6869 6869
6870 6870 Returns 0 on success.
6871 6871
6872 6872 """
6873 6873
6874 6874 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6875 6875 opts = pycompat.byteskwargs(opts)
6876 revs = opts.get(b'rev')
6877 change = opts.get(b'change')
6878 terse = opts.get(b'terse')
6876 revs = opts.get(b'rev', [])
6877 change = opts.get(b'change', b'')
6878 terse = opts.get(b'terse', _NOTTERSE)
6879 6879 if terse is _NOTTERSE:
6880 6880 if revs:
6881 6881 terse = b''
6882 6882 else:
6883 6883 terse = ui.config(b'commands', b'status.terse')
6884 6884
6885 6885 if revs and terse:
6886 6886 msg = _(b'cannot use --terse with --rev')
6887 6887 raise error.InputError(msg)
6888 6888 elif change:
6889 6889 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6890 6890 ctx2 = logcmdutil.revsingle(repo, change, None)
6891 6891 ctx1 = ctx2.p1()
6892 6892 else:
6893 6893 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6894 6894 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
6895 6895
6896 6896 forcerelativevalue = None
6897 6897 if ui.hasconfig(b'commands', b'status.relative'):
6898 6898 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6899 6899 uipathfn = scmutil.getuipathfn(
6900 6900 repo,
6901 6901 legacyrelativevalue=bool(pats),
6902 6902 forcerelativevalue=forcerelativevalue,
6903 6903 )
6904 6904
6905 6905 if opts.get(b'print0'):
6906 6906 end = b'\0'
6907 6907 else:
6908 6908 end = b'\n'
6909 6909 states = b'modified added removed deleted unknown ignored clean'.split()
6910 6910 show = [k for k in states if opts.get(k)]
6911 6911 if opts.get(b'all'):
6912 6912 show += ui.quiet and (states[:4] + [b'clean']) or states
6913 6913
6914 6914 if not show:
6915 6915 if ui.quiet:
6916 6916 show = states[:4]
6917 6917 else:
6918 6918 show = states[:5]
6919 6919
6920 6920 m = scmutil.match(ctx2, pats, opts)
6921 6921 if terse:
6922 6922 # we need to compute clean and unknown to terse
6923 6923 stat = repo.status(
6924 6924 ctx1.node(),
6925 6925 ctx2.node(),
6926 6926 m,
6927 6927 b'ignored' in show or b'i' in terse,
6928 6928 clean=True,
6929 6929 unknown=True,
6930 6930 listsubrepos=opts.get(b'subrepos'),
6931 6931 )
6932 6932
6933 6933 stat = cmdutil.tersedir(stat, terse)
6934 6934 else:
6935 6935 stat = repo.status(
6936 6936 ctx1.node(),
6937 6937 ctx2.node(),
6938 6938 m,
6939 6939 b'ignored' in show,
6940 6940 b'clean' in show,
6941 6941 b'unknown' in show,
6942 6942 opts.get(b'subrepos'),
6943 6943 )
6944 6944
6945 6945 changestates = zip(
6946 6946 states,
6947 6947 pycompat.iterbytestr(b'MAR!?IC'),
6948 6948 [getattr(stat, s.decode('utf8')) for s in states],
6949 6949 )
6950 6950
6951 6951 copy = {}
6952 6952 if (
6953 6953 opts.get(b'all')
6954 6954 or opts.get(b'copies')
6955 6955 or ui.configbool(b'ui', b'statuscopies')
6956 6956 ) and not opts.get(b'no_status'):
6957 6957 copy = copies.pathcopies(ctx1, ctx2, m)
6958 6958
6959 6959 morestatus = None
6960 6960 if (
6961 6961 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6962 6962 and not ui.plain()
6963 6963 and not opts.get(b'print0')
6964 6964 ):
6965 6965 morestatus = cmdutil.readmorestatus(repo)
6966 6966
6967 6967 ui.pager(b'status')
6968 6968 fm = ui.formatter(b'status', opts)
6969 6969 fmt = b'%s' + end
6970 6970 showchar = not opts.get(b'no_status')
6971 6971
6972 6972 for state, char, files in changestates:
6973 6973 if state in show:
6974 6974 label = b'status.' + state
6975 6975 for f in files:
6976 6976 fm.startitem()
6977 6977 fm.context(ctx=ctx2)
6978 6978 fm.data(itemtype=b'file', path=f)
6979 6979 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6980 6980 fm.plain(fmt % uipathfn(f), label=label)
6981 6981 if f in copy:
6982 6982 fm.data(source=copy[f])
6983 6983 fm.plain(
6984 6984 (b' %s' + end) % uipathfn(copy[f]),
6985 6985 label=b'status.copied',
6986 6986 )
6987 6987 if morestatus:
6988 6988 morestatus.formatfile(f, fm)
6989 6989
6990 6990 if morestatus:
6991 6991 morestatus.formatfooter(fm)
6992 6992 fm.end()
6993 6993
6994 6994
6995 6995 @command(
6996 6996 b'summary|sum',
6997 6997 [(b'', b'remote', None, _(b'check for push and pull'))],
6998 6998 b'[--remote]',
6999 6999 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7000 7000 helpbasic=True,
7001 7001 intents={INTENT_READONLY},
7002 7002 )
7003 7003 def summary(ui, repo, **opts):
7004 7004 """summarize working directory state
7005 7005
7006 7006 This generates a brief summary of the working directory state,
7007 7007 including parents, branch, commit status, phase and available updates.
7008 7008
7009 7009 With the --remote option, this will check the default paths for
7010 7010 incoming and outgoing changes. This can be time-consuming.
7011 7011
7012 7012 Returns 0 on success.
7013 7013 """
7014 7014
7015 7015 opts = pycompat.byteskwargs(opts)
7016 7016 ui.pager(b'summary')
7017 7017 ctx = repo[None]
7018 7018 parents = ctx.parents()
7019 7019 pnode = parents[0].node()
7020 7020 marks = []
7021 7021
7022 7022 try:
7023 7023 ms = mergestatemod.mergestate.read(repo)
7024 7024 except error.UnsupportedMergeRecords as e:
7025 7025 s = b' '.join(e.recordtypes)
7026 7026 ui.warn(
7027 7027 _(b'warning: merge state has unsupported record types: %s\n') % s
7028 7028 )
7029 7029 unresolved = []
7030 7030 else:
7031 7031 unresolved = list(ms.unresolved())
7032 7032
7033 7033 for p in parents:
7034 7034 # label with log.changeset (instead of log.parent) since this
7035 7035 # shows a working directory parent *changeset*:
7036 7036 # i18n: column positioning for "hg summary"
7037 7037 ui.write(
7038 7038 _(b'parent: %d:%s ') % (p.rev(), p),
7039 7039 label=logcmdutil.changesetlabels(p),
7040 7040 )
7041 7041 ui.write(b' '.join(p.tags()), label=b'log.tag')
7042 7042 if p.bookmarks():
7043 7043 marks.extend(p.bookmarks())
7044 7044 if p.rev() == -1:
7045 7045 if not len(repo):
7046 7046 ui.write(_(b' (empty repository)'))
7047 7047 else:
7048 7048 ui.write(_(b' (no revision checked out)'))
7049 7049 if p.obsolete():
7050 7050 ui.write(_(b' (obsolete)'))
7051 7051 if p.isunstable():
7052 7052 instabilities = (
7053 7053 ui.label(instability, b'trouble.%s' % instability)
7054 7054 for instability in p.instabilities()
7055 7055 )
7056 7056 ui.write(b' (' + b', '.join(instabilities) + b')')
7057 7057 ui.write(b'\n')
7058 7058 if p.description():
7059 7059 ui.status(
7060 7060 b' ' + p.description().splitlines()[0].strip() + b'\n',
7061 7061 label=b'log.summary',
7062 7062 )
7063 7063
7064 7064 branch = ctx.branch()
7065 7065 bheads = repo.branchheads(branch)
7066 7066 # i18n: column positioning for "hg summary"
7067 7067 m = _(b'branch: %s\n') % branch
7068 7068 if branch != b'default':
7069 7069 ui.write(m, label=b'log.branch')
7070 7070 else:
7071 7071 ui.status(m, label=b'log.branch')
7072 7072
7073 7073 if marks:
7074 7074 active = repo._activebookmark
7075 7075 # i18n: column positioning for "hg summary"
7076 7076 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7077 7077 if active is not None:
7078 7078 if active in marks:
7079 7079 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7080 7080 marks.remove(active)
7081 7081 else:
7082 7082 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7083 7083 for m in marks:
7084 7084 ui.write(b' ' + m, label=b'log.bookmark')
7085 7085 ui.write(b'\n', label=b'log.bookmark')
7086 7086
7087 7087 status = repo.status(unknown=True)
7088 7088
7089 7089 c = repo.dirstate.copies()
7090 7090 copied, renamed = [], []
7091 7091 for d, s in pycompat.iteritems(c):
7092 7092 if s in status.removed:
7093 7093 status.removed.remove(s)
7094 7094 renamed.append(d)
7095 7095 else:
7096 7096 copied.append(d)
7097 7097 if d in status.added:
7098 7098 status.added.remove(d)
7099 7099
7100 7100 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7101 7101
7102 7102 labels = [
7103 7103 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7104 7104 (ui.label(_(b'%d added'), b'status.added'), status.added),
7105 7105 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7106 7106 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7107 7107 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7108 7108 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7109 7109 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7110 7110 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7111 7111 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7112 7112 ]
7113 7113 t = []
7114 7114 for l, s in labels:
7115 7115 if s:
7116 7116 t.append(l % len(s))
7117 7117
7118 7118 t = b', '.join(t)
7119 7119 cleanworkdir = False
7120 7120
7121 7121 if repo.vfs.exists(b'graftstate'):
7122 7122 t += _(b' (graft in progress)')
7123 7123 if repo.vfs.exists(b'updatestate'):
7124 7124 t += _(b' (interrupted update)')
7125 7125 elif len(parents) > 1:
7126 7126 t += _(b' (merge)')
7127 7127 elif branch != parents[0].branch():
7128 7128 t += _(b' (new branch)')
7129 7129 elif parents[0].closesbranch() and pnode in repo.branchheads(
7130 7130 branch, closed=True
7131 7131 ):
7132 7132 t += _(b' (head closed)')
7133 7133 elif not (
7134 7134 status.modified
7135 7135 or status.added
7136 7136 or status.removed
7137 7137 or renamed
7138 7138 or copied
7139 7139 or subs
7140 7140 ):
7141 7141 t += _(b' (clean)')
7142 7142 cleanworkdir = True
7143 7143 elif pnode not in bheads:
7144 7144 t += _(b' (new branch head)')
7145 7145
7146 7146 if parents:
7147 7147 pendingphase = max(p.phase() for p in parents)
7148 7148 else:
7149 7149 pendingphase = phases.public
7150 7150
7151 7151 if pendingphase > phases.newcommitphase(ui):
7152 7152 t += b' (%s)' % phases.phasenames[pendingphase]
7153 7153
7154 7154 if cleanworkdir:
7155 7155 # i18n: column positioning for "hg summary"
7156 7156 ui.status(_(b'commit: %s\n') % t.strip())
7157 7157 else:
7158 7158 # i18n: column positioning for "hg summary"
7159 7159 ui.write(_(b'commit: %s\n') % t.strip())
7160 7160
7161 7161 # all ancestors of branch heads - all ancestors of parent = new csets
7162 7162 new = len(
7163 7163 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7164 7164 )
7165 7165
7166 7166 if new == 0:
7167 7167 # i18n: column positioning for "hg summary"
7168 7168 ui.status(_(b'update: (current)\n'))
7169 7169 elif pnode not in bheads:
7170 7170 # i18n: column positioning for "hg summary"
7171 7171 ui.write(_(b'update: %d new changesets (update)\n') % new)
7172 7172 else:
7173 7173 # i18n: column positioning for "hg summary"
7174 7174 ui.write(
7175 7175 _(b'update: %d new changesets, %d branch heads (merge)\n')
7176 7176 % (new, len(bheads))
7177 7177 )
7178 7178
7179 7179 t = []
7180 7180 draft = len(repo.revs(b'draft()'))
7181 7181 if draft:
7182 7182 t.append(_(b'%d draft') % draft)
7183 7183 secret = len(repo.revs(b'secret()'))
7184 7184 if secret:
7185 7185 t.append(_(b'%d secret') % secret)
7186 7186
7187 7187 if draft or secret:
7188 7188 ui.status(_(b'phases: %s\n') % b', '.join(t))
7189 7189
7190 7190 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7191 7191 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7192 7192 numtrouble = len(repo.revs(trouble + b"()"))
7193 7193 # We write all the possibilities to ease translation
7194 7194 troublemsg = {
7195 7195 b"orphan": _(b"orphan: %d changesets"),
7196 7196 b"contentdivergent": _(b"content-divergent: %d changesets"),
7197 7197 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7198 7198 }
7199 7199 if numtrouble > 0:
7200 7200 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7201 7201
7202 7202 cmdutil.summaryhooks(ui, repo)
7203 7203
7204 7204 if opts.get(b'remote'):
7205 7205 needsincoming, needsoutgoing = True, True
7206 7206 else:
7207 7207 needsincoming, needsoutgoing = False, False
7208 7208 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7209 7209 if i:
7210 7210 needsincoming = True
7211 7211 if o:
7212 7212 needsoutgoing = True
7213 7213 if not needsincoming and not needsoutgoing:
7214 7214 return
7215 7215
7216 7216 def getincoming():
7217 7217 # XXX We should actually skip this if no default is specified, instead
7218 7218 # of passing "default" which will resolve as "./default/" if no default
7219 7219 # path is defined.
7220 7220 source, branches = urlutil.get_unique_pull_path(
7221 7221 b'summary', repo, ui, b'default'
7222 7222 )
7223 7223 sbranch = branches[0]
7224 7224 try:
7225 7225 other = hg.peer(repo, {}, source)
7226 7226 except error.RepoError:
7227 7227 if opts.get(b'remote'):
7228 7228 raise
7229 7229 return source, sbranch, None, None, None
7230 7230 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7231 7231 if revs:
7232 7232 revs = [other.lookup(rev) for rev in revs]
7233 7233 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7234 7234 with repo.ui.silent():
7235 7235 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7236 7236 return source, sbranch, other, commoninc, commoninc[1]
7237 7237
7238 7238 if needsincoming:
7239 7239 source, sbranch, sother, commoninc, incoming = getincoming()
7240 7240 else:
7241 7241 source = sbranch = sother = commoninc = incoming = None
7242 7242
7243 7243 def getoutgoing():
7244 7244 # XXX We should actually skip this if no default is specified, instead
7245 7245 # of passing "default" which will resolve as "./default/" if no default
7246 7246 # path is defined.
7247 7247 d = None
7248 7248 if b'default-push' in ui.paths:
7249 7249 d = b'default-push'
7250 7250 elif b'default' in ui.paths:
7251 7251 d = b'default'
7252 7252 if d is not None:
7253 7253 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7254 7254 dest = path.pushloc or path.loc
7255 7255 dbranch = path.branch
7256 7256 else:
7257 7257 dest = b'default'
7258 7258 dbranch = None
7259 7259 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7260 7260 if source != dest:
7261 7261 try:
7262 7262 dother = hg.peer(repo, {}, dest)
7263 7263 except error.RepoError:
7264 7264 if opts.get(b'remote'):
7265 7265 raise
7266 7266 return dest, dbranch, None, None
7267 7267 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7268 7268 elif sother is None:
7269 7269 # there is no explicit destination peer, but source one is invalid
7270 7270 return dest, dbranch, None, None
7271 7271 else:
7272 7272 dother = sother
7273 7273 if source != dest or (sbranch is not None and sbranch != dbranch):
7274 7274 common = None
7275 7275 else:
7276 7276 common = commoninc
7277 7277 if revs:
7278 7278 revs = [repo.lookup(rev) for rev in revs]
7279 7279 with repo.ui.silent():
7280 7280 outgoing = discovery.findcommonoutgoing(
7281 7281 repo, dother, onlyheads=revs, commoninc=common
7282 7282 )
7283 7283 return dest, dbranch, dother, outgoing
7284 7284
7285 7285 if needsoutgoing:
7286 7286 dest, dbranch, dother, outgoing = getoutgoing()
7287 7287 else:
7288 7288 dest = dbranch = dother = outgoing = None
7289 7289
7290 7290 if opts.get(b'remote'):
7291 7291 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7292 7292 # The former always sets `sother` (or raises an exception if it can't);
7293 7293 # the latter always sets `outgoing`.
7294 7294 assert sother is not None
7295 7295 assert outgoing is not None
7296 7296
7297 7297 t = []
7298 7298 if incoming:
7299 7299 t.append(_(b'1 or more incoming'))
7300 7300 o = outgoing.missing
7301 7301 if o:
7302 7302 t.append(_(b'%d outgoing') % len(o))
7303 7303 other = dother or sother
7304 7304 if b'bookmarks' in other.listkeys(b'namespaces'):
7305 7305 counts = bookmarks.summary(repo, other)
7306 7306 if counts[0] > 0:
7307 7307 t.append(_(b'%d incoming bookmarks') % counts[0])
7308 7308 if counts[1] > 0:
7309 7309 t.append(_(b'%d outgoing bookmarks') % counts[1])
7310 7310
7311 7311 if t:
7312 7312 # i18n: column positioning for "hg summary"
7313 7313 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7314 7314 else:
7315 7315 # i18n: column positioning for "hg summary"
7316 7316 ui.status(_(b'remote: (synced)\n'))
7317 7317
7318 7318 cmdutil.summaryremotehooks(
7319 7319 ui,
7320 7320 repo,
7321 7321 opts,
7322 7322 (
7323 7323 (source, sbranch, sother, commoninc),
7324 7324 (dest, dbranch, dother, outgoing),
7325 7325 ),
7326 7326 )
7327 7327
7328 7328
7329 7329 @command(
7330 7330 b'tag',
7331 7331 [
7332 7332 (b'f', b'force', None, _(b'force tag')),
7333 7333 (b'l', b'local', None, _(b'make the tag local')),
7334 7334 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7335 7335 (b'', b'remove', None, _(b'remove a tag')),
7336 7336 # -l/--local is already there, commitopts cannot be used
7337 7337 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7338 7338 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7339 7339 ]
7340 7340 + commitopts2,
7341 7341 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7342 7342 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7343 7343 )
7344 7344 def tag(ui, repo, name1, *names, **opts):
7345 7345 """add one or more tags for the current or given revision
7346 7346
7347 7347 Name a particular revision using <name>.
7348 7348
7349 7349 Tags are used to name particular revisions of the repository and are
7350 7350 very useful to compare different revisions, to go back to significant
7351 7351 earlier versions or to mark branch points as releases, etc. Changing
7352 7352 an existing tag is normally disallowed; use -f/--force to override.
7353 7353
7354 7354 If no revision is given, the parent of the working directory is
7355 7355 used.
7356 7356
7357 7357 To facilitate version control, distribution, and merging of tags,
7358 7358 they are stored as a file named ".hgtags" which is managed similarly
7359 7359 to other project files and can be hand-edited if necessary. This
7360 7360 also means that tagging creates a new commit. The file
7361 7361 ".hg/localtags" is used for local tags (not shared among
7362 7362 repositories).
7363 7363
7364 7364 Tag commits are usually made at the head of a branch. If the parent
7365 7365 of the working directory is not a branch head, :hg:`tag` aborts; use
7366 7366 -f/--force to force the tag commit to be based on a non-head
7367 7367 changeset.
7368 7368
7369 7369 See :hg:`help dates` for a list of formats valid for -d/--date.
7370 7370
7371 7371 Since tag names have priority over branch names during revision
7372 7372 lookup, using an existing branch name as a tag name is discouraged.
7373 7373
7374 7374 Returns 0 on success.
7375 7375 """
7376 7376 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7377 7377 opts = pycompat.byteskwargs(opts)
7378 7378 with repo.wlock(), repo.lock():
7379 7379 rev_ = b"."
7380 7380 names = [t.strip() for t in (name1,) + names]
7381 7381 if len(names) != len(set(names)):
7382 7382 raise error.InputError(_(b'tag names must be unique'))
7383 7383 for n in names:
7384 7384 scmutil.checknewlabel(repo, n, b'tag')
7385 7385 if not n:
7386 7386 raise error.InputError(
7387 7387 _(b'tag names cannot consist entirely of whitespace')
7388 7388 )
7389 7389 if opts.get(b'rev'):
7390 7390 rev_ = opts[b'rev']
7391 7391 message = opts.get(b'message')
7392 7392 if opts.get(b'remove'):
7393 7393 if opts.get(b'local'):
7394 7394 expectedtype = b'local'
7395 7395 else:
7396 7396 expectedtype = b'global'
7397 7397
7398 7398 for n in names:
7399 7399 if repo.tagtype(n) == b'global':
7400 7400 alltags = tagsmod.findglobaltags(ui, repo)
7401 7401 if alltags[n][0] == repo.nullid:
7402 7402 raise error.InputError(
7403 7403 _(b"tag '%s' is already removed") % n
7404 7404 )
7405 7405 if not repo.tagtype(n):
7406 7406 raise error.InputError(_(b"tag '%s' does not exist") % n)
7407 7407 if repo.tagtype(n) != expectedtype:
7408 7408 if expectedtype == b'global':
7409 7409 raise error.InputError(
7410 7410 _(b"tag '%s' is not a global tag") % n
7411 7411 )
7412 7412 else:
7413 7413 raise error.InputError(
7414 7414 _(b"tag '%s' is not a local tag") % n
7415 7415 )
7416 7416 rev_ = b'null'
7417 7417 if not message:
7418 7418 # we don't translate commit messages
7419 7419 message = b'Removed tag %s' % b', '.join(names)
7420 7420 elif not opts.get(b'force'):
7421 7421 for n in names:
7422 7422 if n in repo.tags():
7423 7423 raise error.InputError(
7424 7424 _(b"tag '%s' already exists (use -f to force)") % n
7425 7425 )
7426 7426 if not opts.get(b'local'):
7427 7427 p1, p2 = repo.dirstate.parents()
7428 7428 if p2 != repo.nullid:
7429 7429 raise error.StateError(_(b'uncommitted merge'))
7430 7430 bheads = repo.branchheads()
7431 7431 if not opts.get(b'force') and bheads and p1 not in bheads:
7432 7432 raise error.InputError(
7433 7433 _(
7434 7434 b'working directory is not at a branch head '
7435 7435 b'(use -f to force)'
7436 7436 )
7437 7437 )
7438 7438 node = logcmdutil.revsingle(repo, rev_).node()
7439 7439
7440 7440 if not message:
7441 7441 # we don't translate commit messages
7442 7442 message = b'Added tag %s for changeset %s' % (
7443 7443 b', '.join(names),
7444 7444 short(node),
7445 7445 )
7446 7446
7447 7447 date = opts.get(b'date')
7448 7448 if date:
7449 7449 date = dateutil.parsedate(date)
7450 7450
7451 7451 if opts.get(b'remove'):
7452 7452 editform = b'tag.remove'
7453 7453 else:
7454 7454 editform = b'tag.add'
7455 7455 editor = cmdutil.getcommiteditor(
7456 7456 editform=editform, **pycompat.strkwargs(opts)
7457 7457 )
7458 7458
7459 7459 # don't allow tagging the null rev
7460 7460 if (
7461 7461 not opts.get(b'remove')
7462 7462 and logcmdutil.revsingle(repo, rev_).rev() == nullrev
7463 7463 ):
7464 7464 raise error.InputError(_(b"cannot tag null revision"))
7465 7465
7466 7466 tagsmod.tag(
7467 7467 repo,
7468 7468 names,
7469 7469 node,
7470 7470 message,
7471 7471 opts.get(b'local'),
7472 7472 opts.get(b'user'),
7473 7473 date,
7474 7474 editor=editor,
7475 7475 )
7476 7476
7477 7477
7478 7478 @command(
7479 7479 b'tags',
7480 7480 formatteropts,
7481 7481 b'',
7482 7482 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7483 7483 intents={INTENT_READONLY},
7484 7484 )
7485 7485 def tags(ui, repo, **opts):
7486 7486 """list repository tags
7487 7487
7488 7488 This lists both regular and local tags. When the -v/--verbose
7489 7489 switch is used, a third column "local" is printed for local tags.
7490 7490 When the -q/--quiet switch is used, only the tag name is printed.
7491 7491
7492 7492 .. container:: verbose
7493 7493
7494 7494 Template:
7495 7495
7496 7496 The following keywords are supported in addition to the common template
7497 7497 keywords and functions such as ``{tag}``. See also
7498 7498 :hg:`help templates`.
7499 7499
7500 7500 :type: String. ``local`` for local tags.
7501 7501
7502 7502 Returns 0 on success.
7503 7503 """
7504 7504
7505 7505 opts = pycompat.byteskwargs(opts)
7506 7506 ui.pager(b'tags')
7507 7507 fm = ui.formatter(b'tags', opts)
7508 7508 hexfunc = fm.hexfunc
7509 7509
7510 7510 for t, n in reversed(repo.tagslist()):
7511 7511 hn = hexfunc(n)
7512 7512 label = b'tags.normal'
7513 7513 tagtype = repo.tagtype(t)
7514 7514 if not tagtype or tagtype == b'global':
7515 7515 tagtype = b''
7516 7516 else:
7517 7517 label = b'tags.' + tagtype
7518 7518
7519 7519 fm.startitem()
7520 7520 fm.context(repo=repo)
7521 7521 fm.write(b'tag', b'%s', t, label=label)
7522 7522 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7523 7523 fm.condwrite(
7524 7524 not ui.quiet,
7525 7525 b'rev node',
7526 7526 fmt,
7527 7527 repo.changelog.rev(n),
7528 7528 hn,
7529 7529 label=label,
7530 7530 )
7531 7531 fm.condwrite(
7532 7532 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7533 7533 )
7534 7534 fm.plain(b'\n')
7535 7535 fm.end()
7536 7536
7537 7537
7538 7538 @command(
7539 7539 b'tip',
7540 7540 [
7541 7541 (b'p', b'patch', None, _(b'show patch')),
7542 7542 (b'g', b'git', None, _(b'use git extended diff format')),
7543 7543 ]
7544 7544 + templateopts,
7545 7545 _(b'[-p] [-g]'),
7546 7546 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7547 7547 )
7548 7548 def tip(ui, repo, **opts):
7549 7549 """show the tip revision (DEPRECATED)
7550 7550
7551 7551 The tip revision (usually just called the tip) is the changeset
7552 7552 most recently added to the repository (and therefore the most
7553 7553 recently changed head).
7554 7554
7555 7555 If you have just made a commit, that commit will be the tip. If
7556 7556 you have just pulled changes from another repository, the tip of
7557 7557 that repository becomes the current tip. The "tip" tag is special
7558 7558 and cannot be renamed or assigned to a different changeset.
7559 7559
7560 7560 This command is deprecated, please use :hg:`heads` instead.
7561 7561
7562 7562 Returns 0 on success.
7563 7563 """
7564 7564 opts = pycompat.byteskwargs(opts)
7565 7565 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7566 7566 displayer.show(repo[b'tip'])
7567 7567 displayer.close()
7568 7568
7569 7569
7570 7570 @command(
7571 7571 b'unbundle',
7572 7572 [
7573 7573 (
7574 7574 b'u',
7575 7575 b'update',
7576 7576 None,
7577 7577 _(b'update to new branch head if changesets were unbundled'),
7578 7578 )
7579 7579 ],
7580 7580 _(b'[-u] FILE...'),
7581 7581 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7582 7582 )
7583 7583 def unbundle(ui, repo, fname1, *fnames, **opts):
7584 7584 """apply one or more bundle files
7585 7585
7586 7586 Apply one or more bundle files generated by :hg:`bundle`.
7587 7587
7588 7588 Returns 0 on success, 1 if an update has unresolved files.
7589 7589 """
7590 7590 fnames = (fname1,) + fnames
7591 7591
7592 7592 with repo.lock():
7593 7593 for fname in fnames:
7594 7594 f = hg.openpath(ui, fname)
7595 7595 gen = exchange.readbundle(ui, f, fname)
7596 7596 if isinstance(gen, streamclone.streamcloneapplier):
7597 7597 raise error.InputError(
7598 7598 _(
7599 7599 b'packed bundles cannot be applied with '
7600 7600 b'"hg unbundle"'
7601 7601 ),
7602 7602 hint=_(b'use "hg debugapplystreamclonebundle"'),
7603 7603 )
7604 7604 url = b'bundle:' + fname
7605 7605 try:
7606 7606 txnname = b'unbundle'
7607 7607 if not isinstance(gen, bundle2.unbundle20):
7608 7608 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7609 7609 with repo.transaction(txnname) as tr:
7610 7610 op = bundle2.applybundle(
7611 7611 repo, gen, tr, source=b'unbundle', url=url
7612 7612 )
7613 7613 except error.BundleUnknownFeatureError as exc:
7614 7614 raise error.Abort(
7615 7615 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7616 7616 hint=_(
7617 7617 b"see https://mercurial-scm.org/"
7618 7618 b"wiki/BundleFeature for more "
7619 7619 b"information"
7620 7620 ),
7621 7621 )
7622 7622 modheads = bundle2.combinechangegroupresults(op)
7623 7623
7624 7624 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7625 7625 return 1
7626 7626 else:
7627 7627 return 0
7628 7628
7629 7629
7630 7630 @command(
7631 7631 b'unshelve',
7632 7632 [
7633 7633 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7634 7634 (
7635 7635 b'c',
7636 7636 b'continue',
7637 7637 None,
7638 7638 _(b'continue an incomplete unshelve operation'),
7639 7639 ),
7640 7640 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7641 7641 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7642 7642 (
7643 7643 b'n',
7644 7644 b'name',
7645 7645 b'',
7646 7646 _(b'restore shelved change with given name'),
7647 7647 _(b'NAME'),
7648 7648 ),
7649 7649 (b't', b'tool', b'', _(b'specify merge tool')),
7650 7650 (
7651 7651 b'',
7652 7652 b'date',
7653 7653 b'',
7654 7654 _(b'set date for temporary commits (DEPRECATED)'),
7655 7655 _(b'DATE'),
7656 7656 ),
7657 7657 ],
7658 7658 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7659 7659 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7660 7660 )
7661 7661 def unshelve(ui, repo, *shelved, **opts):
7662 7662 """restore a shelved change to the working directory
7663 7663
7664 7664 This command accepts an optional name of a shelved change to
7665 7665 restore. If none is given, the most recent shelved change is used.
7666 7666
7667 7667 If a shelved change is applied successfully, the bundle that
7668 7668 contains the shelved changes is moved to a backup location
7669 7669 (.hg/shelve-backup).
7670 7670
7671 7671 Since you can restore a shelved change on top of an arbitrary
7672 7672 commit, it is possible that unshelving will result in a conflict
7673 7673 between your changes and the commits you are unshelving onto. If
7674 7674 this occurs, you must resolve the conflict, then use
7675 7675 ``--continue`` to complete the unshelve operation. (The bundle
7676 7676 will not be moved until you successfully complete the unshelve.)
7677 7677
7678 7678 (Alternatively, you can use ``--abort`` to abandon an unshelve
7679 7679 that causes a conflict. This reverts the unshelved changes, and
7680 7680 leaves the bundle in place.)
7681 7681
7682 7682 If bare shelved change (without interactive, include and exclude
7683 7683 option) was done on newly created branch it would restore branch
7684 7684 information to the working directory.
7685 7685
7686 7686 After a successful unshelve, the shelved changes are stored in a
7687 7687 backup directory. Only the N most recent backups are kept. N
7688 7688 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7689 7689 configuration option.
7690 7690
7691 7691 .. container:: verbose
7692 7692
7693 7693 Timestamp in seconds is used to decide order of backups. More
7694 7694 than ``maxbackups`` backups are kept, if same timestamp
7695 7695 prevents from deciding exact order of them, for safety.
7696 7696
7697 7697 Selected changes can be unshelved with ``--interactive`` flag.
7698 7698 The working directory is updated with the selected changes, and
7699 7699 only the unselected changes remain shelved.
7700 7700 Note: The whole shelve is applied to working directory first before
7701 7701 running interactively. So, this will bring up all the conflicts between
7702 7702 working directory and the shelve, irrespective of which changes will be
7703 7703 unshelved.
7704 7704 """
7705 7705 with repo.wlock():
7706 7706 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7707 7707
7708 7708
7709 7709 statemod.addunfinished(
7710 7710 b'unshelve',
7711 7711 fname=b'shelvedstate',
7712 7712 continueflag=True,
7713 7713 abortfunc=shelvemod.hgabortunshelve,
7714 7714 continuefunc=shelvemod.hgcontinueunshelve,
7715 7715 cmdmsg=_(b'unshelve already in progress'),
7716 7716 )
7717 7717
7718 7718
7719 7719 @command(
7720 7720 b'update|up|checkout|co',
7721 7721 [
7722 7722 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7723 7723 (b'c', b'check', None, _(b'require clean working directory')),
7724 7724 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7725 7725 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7726 7726 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7727 7727 ]
7728 7728 + mergetoolopts,
7729 7729 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7730 7730 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7731 7731 helpbasic=True,
7732 7732 )
7733 7733 def update(ui, repo, node=None, **opts):
7734 7734 """update working directory (or switch revisions)
7735 7735
7736 7736 Update the repository's working directory to the specified
7737 7737 changeset. If no changeset is specified, update to the tip of the
7738 7738 current named branch and move the active bookmark (see :hg:`help
7739 7739 bookmarks`).
7740 7740
7741 7741 Update sets the working directory's parent revision to the specified
7742 7742 changeset (see :hg:`help parents`).
7743 7743
7744 7744 If the changeset is not a descendant or ancestor of the working
7745 7745 directory's parent and there are uncommitted changes, the update is
7746 7746 aborted. With the -c/--check option, the working directory is checked
7747 7747 for uncommitted changes; if none are found, the working directory is
7748 7748 updated to the specified changeset.
7749 7749
7750 7750 .. container:: verbose
7751 7751
7752 7752 The -C/--clean, -c/--check, and -m/--merge options control what
7753 7753 happens if the working directory contains uncommitted changes.
7754 7754 At most of one of them can be specified.
7755 7755
7756 7756 1. If no option is specified, and if
7757 7757 the requested changeset is an ancestor or descendant of
7758 7758 the working directory's parent, the uncommitted changes
7759 7759 are merged into the requested changeset and the merged
7760 7760 result is left uncommitted. If the requested changeset is
7761 7761 not an ancestor or descendant (that is, it is on another
7762 7762 branch), the update is aborted and the uncommitted changes
7763 7763 are preserved.
7764 7764
7765 7765 2. With the -m/--merge option, the update is allowed even if the
7766 7766 requested changeset is not an ancestor or descendant of
7767 7767 the working directory's parent.
7768 7768
7769 7769 3. With the -c/--check option, the update is aborted and the
7770 7770 uncommitted changes are preserved.
7771 7771
7772 7772 4. With the -C/--clean option, uncommitted changes are discarded and
7773 7773 the working directory is updated to the requested changeset.
7774 7774
7775 7775 To cancel an uncommitted merge (and lose your changes), use
7776 7776 :hg:`merge --abort`.
7777 7777
7778 7778 Use null as the changeset to remove the working directory (like
7779 7779 :hg:`clone -U`).
7780 7780
7781 7781 If you want to revert just one file to an older revision, use
7782 7782 :hg:`revert [-r REV] NAME`.
7783 7783
7784 7784 See :hg:`help dates` for a list of formats valid for -d/--date.
7785 7785
7786 7786 Returns 0 on success, 1 if there are unresolved files.
7787 7787 """
7788 7788 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7789 7789 rev = opts.get('rev')
7790 7790 date = opts.get('date')
7791 7791 clean = opts.get('clean')
7792 7792 check = opts.get('check')
7793 7793 merge = opts.get('merge')
7794 7794 if rev and node:
7795 7795 raise error.InputError(_(b"please specify just one revision"))
7796 7796
7797 7797 if ui.configbool(b'commands', b'update.requiredest'):
7798 7798 if not node and not rev and not date:
7799 7799 raise error.InputError(
7800 7800 _(b'you must specify a destination'),
7801 7801 hint=_(b'for example: hg update ".::"'),
7802 7802 )
7803 7803
7804 7804 if rev is None or rev == b'':
7805 7805 rev = node
7806 7806
7807 7807 if date and rev is not None:
7808 7808 raise error.InputError(_(b"you can't specify a revision and a date"))
7809 7809
7810 7810 updatecheck = None
7811 7811 if check or merge is not None and not merge:
7812 7812 updatecheck = b'abort'
7813 7813 elif merge or check is not None and not check:
7814 7814 updatecheck = b'none'
7815 7815
7816 7816 with repo.wlock():
7817 7817 cmdutil.clearunfinished(repo)
7818 7818 if date:
7819 7819 rev = cmdutil.finddate(ui, repo, date)
7820 7820
7821 7821 # if we defined a bookmark, we have to remember the original name
7822 7822 brev = rev
7823 7823 if rev:
7824 7824 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7825 7825 ctx = logcmdutil.revsingle(repo, rev, default=None)
7826 7826 rev = ctx.rev()
7827 7827 hidden = ctx.hidden()
7828 7828 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7829 7829 with ui.configoverride(overrides, b'update'):
7830 7830 ret = hg.updatetotally(
7831 7831 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7832 7832 )
7833 7833 if hidden:
7834 7834 ctxstr = ctx.hex()[:12]
7835 7835 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7836 7836
7837 7837 if ctx.obsolete():
7838 7838 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7839 7839 ui.warn(b"(%s)\n" % obsfatemsg)
7840 7840 return ret
7841 7841
7842 7842
7843 7843 @command(
7844 7844 b'verify',
7845 7845 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7846 7846 helpcategory=command.CATEGORY_MAINTENANCE,
7847 7847 )
7848 7848 def verify(ui, repo, **opts):
7849 7849 """verify the integrity of the repository
7850 7850
7851 7851 Verify the integrity of the current repository.
7852 7852
7853 7853 This will perform an extensive check of the repository's
7854 7854 integrity, validating the hashes and checksums of each entry in
7855 7855 the changelog, manifest, and tracked files, as well as the
7856 7856 integrity of their crosslinks and indices.
7857 7857
7858 7858 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7859 7859 for more information about recovery from corruption of the
7860 7860 repository.
7861 7861
7862 7862 Returns 0 on success, 1 if errors are encountered.
7863 7863 """
7864 7864 opts = pycompat.byteskwargs(opts)
7865 7865
7866 7866 level = None
7867 7867 if opts[b'full']:
7868 7868 level = verifymod.VERIFY_FULL
7869 7869 return hg.verify(repo, level)
7870 7870
7871 7871
7872 7872 @command(
7873 7873 b'version',
7874 7874 [] + formatteropts,
7875 7875 helpcategory=command.CATEGORY_HELP,
7876 7876 norepo=True,
7877 7877 intents={INTENT_READONLY},
7878 7878 )
7879 7879 def version_(ui, **opts):
7880 7880 """output version and copyright information
7881 7881
7882 7882 .. container:: verbose
7883 7883
7884 7884 Template:
7885 7885
7886 7886 The following keywords are supported. See also :hg:`help templates`.
7887 7887
7888 7888 :extensions: List of extensions.
7889 7889 :ver: String. Version number.
7890 7890
7891 7891 And each entry of ``{extensions}`` provides the following sub-keywords
7892 7892 in addition to ``{ver}``.
7893 7893
7894 7894 :bundled: Boolean. True if included in the release.
7895 7895 :name: String. Extension name.
7896 7896 """
7897 7897 opts = pycompat.byteskwargs(opts)
7898 7898 if ui.verbose:
7899 7899 ui.pager(b'version')
7900 7900 fm = ui.formatter(b"version", opts)
7901 7901 fm.startitem()
7902 7902 fm.write(
7903 7903 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7904 7904 )
7905 7905 license = _(
7906 7906 b"(see https://mercurial-scm.org for more information)\n"
7907 7907 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7908 7908 b"This is free software; see the source for copying conditions. "
7909 7909 b"There is NO\nwarranty; "
7910 7910 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7911 7911 )
7912 7912 if not ui.quiet:
7913 7913 fm.plain(license)
7914 7914
7915 7915 if ui.verbose:
7916 7916 fm.plain(_(b"\nEnabled extensions:\n\n"))
7917 7917 # format names and versions into columns
7918 7918 names = []
7919 7919 vers = []
7920 7920 isinternals = []
7921 7921 for name, module in sorted(extensions.extensions()):
7922 7922 names.append(name)
7923 7923 vers.append(extensions.moduleversion(module) or None)
7924 7924 isinternals.append(extensions.ismoduleinternal(module))
7925 7925 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7926 7926 if names:
7927 7927 namefmt = b" %%-%ds " % max(len(n) for n in names)
7928 7928 places = [_(b"external"), _(b"internal")]
7929 7929 for n, v, p in zip(names, vers, isinternals):
7930 7930 fn.startitem()
7931 7931 fn.condwrite(ui.verbose, b"name", namefmt, n)
7932 7932 if ui.verbose:
7933 7933 fn.plain(b"%s " % places[p])
7934 7934 fn.data(bundled=p)
7935 7935 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7936 7936 if ui.verbose:
7937 7937 fn.plain(b"\n")
7938 7938 fn.end()
7939 7939 fm.end()
7940 7940
7941 7941
7942 7942 def loadcmdtable(ui, name, cmdtable):
7943 7943 """Load command functions from specified cmdtable"""
7944 7944 overrides = [cmd for cmd in cmdtable if cmd in table]
7945 7945 if overrides:
7946 7946 ui.warn(
7947 7947 _(b"extension '%s' overrides commands: %s\n")
7948 7948 % (name, b" ".join(overrides))
7949 7949 )
7950 7950 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now