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