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