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