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