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