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