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