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