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