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