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