##// END OF EJS Templates
outgoing: accept multiple destinations...
marmoute -
r47693:d4e4ccb7 default
parent child Browse files
Show More
@@ -1,7915 +1,7909 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 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4926 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4927 4927 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4928 4928 )
4929 def outgoing(ui, repo, dest=None, **opts):
4929 def outgoing(ui, repo, *dests, **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 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4966 # style URLs, so don't overwrite dest.
4967 path = ui.getpath(dest, default=(b'default-push', b'default'))
4968 if not path:
4969 raise error.ConfigError(
4970 _(b'default repository not configured!'),
4971 hint=_(b"see 'hg help config.paths'"),
4972 )
4973
4974 4965 opts = pycompat.byteskwargs(opts)
4975 4966 if opts.get(b'bookmarks'):
4967 for path in urlutil.get_push_paths(repo, ui, dests):
4976 4968 dest = path.pushloc or path.loc
4977 4969 other = hg.peer(repo, opts, dest)
4978 4970 try:
4979 4971 if b'bookmarks' not in other.listkeys(b'namespaces'):
4980 4972 ui.warn(_(b"remote doesn't support bookmarks\n"))
4981 4973 return 0
4982 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
4974 ui.status(
4975 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
4976 )
4983 4977 ui.pager(b'outgoing')
4984 4978 return bookmarks.outgoing(ui, repo, other)
4985 4979 finally:
4986 4980 other.close()
4987 4981
4988 return hg.outgoing(ui, repo, dest, opts)
4982 return hg.outgoing(ui, repo, dests, opts)
4989 4983
4990 4984
4991 4985 @command(
4992 4986 b'parents',
4993 4987 [
4994 4988 (
4995 4989 b'r',
4996 4990 b'rev',
4997 4991 b'',
4998 4992 _(b'show parents of the specified revision'),
4999 4993 _(b'REV'),
5000 4994 ),
5001 4995 ]
5002 4996 + templateopts,
5003 4997 _(b'[-r REV] [FILE]'),
5004 4998 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5005 4999 inferrepo=True,
5006 5000 )
5007 5001 def parents(ui, repo, file_=None, **opts):
5008 5002 """show the parents of the working directory or revision (DEPRECATED)
5009 5003
5010 5004 Print the working directory's parent revisions. If a revision is
5011 5005 given via -r/--rev, the parent of that revision will be printed.
5012 5006 If a file argument is given, the revision in which the file was
5013 5007 last changed (before the working directory revision or the
5014 5008 argument to --rev if given) is printed.
5015 5009
5016 5010 This command is equivalent to::
5017 5011
5018 5012 hg log -r "p1()+p2()" or
5019 5013 hg log -r "p1(REV)+p2(REV)" or
5020 5014 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5021 5015 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5022 5016
5023 5017 See :hg:`summary` and :hg:`help revsets` for related information.
5024 5018
5025 5019 Returns 0 on success.
5026 5020 """
5027 5021
5028 5022 opts = pycompat.byteskwargs(opts)
5029 5023 rev = opts.get(b'rev')
5030 5024 if rev:
5031 5025 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5032 5026 ctx = scmutil.revsingle(repo, rev, None)
5033 5027
5034 5028 if file_:
5035 5029 m = scmutil.match(ctx, (file_,), opts)
5036 5030 if m.anypats() or len(m.files()) != 1:
5037 5031 raise error.InputError(_(b'can only specify an explicit filename'))
5038 5032 file_ = m.files()[0]
5039 5033 filenodes = []
5040 5034 for cp in ctx.parents():
5041 5035 if not cp:
5042 5036 continue
5043 5037 try:
5044 5038 filenodes.append(cp.filenode(file_))
5045 5039 except error.LookupError:
5046 5040 pass
5047 5041 if not filenodes:
5048 5042 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5049 5043 p = []
5050 5044 for fn in filenodes:
5051 5045 fctx = repo.filectx(file_, fileid=fn)
5052 5046 p.append(fctx.node())
5053 5047 else:
5054 5048 p = [cp.node() for cp in ctx.parents()]
5055 5049
5056 5050 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5057 5051 for n in p:
5058 5052 if n != nullid:
5059 5053 displayer.show(repo[n])
5060 5054 displayer.close()
5061 5055
5062 5056
5063 5057 @command(
5064 5058 b'paths',
5065 5059 formatteropts,
5066 5060 _(b'[NAME]'),
5067 5061 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5068 5062 optionalrepo=True,
5069 5063 intents={INTENT_READONLY},
5070 5064 )
5071 5065 def paths(ui, repo, search=None, **opts):
5072 5066 """show aliases for remote repositories
5073 5067
5074 5068 Show definition of symbolic path name NAME. If no name is given,
5075 5069 show definition of all available names.
5076 5070
5077 5071 Option -q/--quiet suppresses all output when searching for NAME
5078 5072 and shows only the path names when listing all definitions.
5079 5073
5080 5074 Path names are defined in the [paths] section of your
5081 5075 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5082 5076 repository, ``.hg/hgrc`` is used, too.
5083 5077
5084 5078 The path names ``default`` and ``default-push`` have a special
5085 5079 meaning. When performing a push or pull operation, they are used
5086 5080 as fallbacks if no location is specified on the command-line.
5087 5081 When ``default-push`` is set, it will be used for push and
5088 5082 ``default`` will be used for pull; otherwise ``default`` is used
5089 5083 as the fallback for both. When cloning a repository, the clone
5090 5084 source is written as ``default`` in ``.hg/hgrc``.
5091 5085
5092 5086 .. note::
5093 5087
5094 5088 ``default`` and ``default-push`` apply to all inbound (e.g.
5095 5089 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5096 5090 and :hg:`bundle`) operations.
5097 5091
5098 5092 See :hg:`help urls` for more information.
5099 5093
5100 5094 .. container:: verbose
5101 5095
5102 5096 Template:
5103 5097
5104 5098 The following keywords are supported. See also :hg:`help templates`.
5105 5099
5106 5100 :name: String. Symbolic name of the path alias.
5107 5101 :pushurl: String. URL for push operations.
5108 5102 :url: String. URL or directory path for the other operations.
5109 5103
5110 5104 Returns 0 on success.
5111 5105 """
5112 5106
5113 5107 opts = pycompat.byteskwargs(opts)
5114 5108 ui.pager(b'paths')
5115 5109 if search:
5116 5110 pathitems = [
5117 5111 (name, path)
5118 5112 for name, path in pycompat.iteritems(ui.paths)
5119 5113 if name == search
5120 5114 ]
5121 5115 else:
5122 5116 pathitems = sorted(pycompat.iteritems(ui.paths))
5123 5117
5124 5118 fm = ui.formatter(b'paths', opts)
5125 5119 if fm.isplain():
5126 5120 hidepassword = urlutil.hidepassword
5127 5121 else:
5128 5122 hidepassword = bytes
5129 5123 if ui.quiet:
5130 5124 namefmt = b'%s\n'
5131 5125 else:
5132 5126 namefmt = b'%s = '
5133 5127 showsubopts = not search and not ui.quiet
5134 5128
5135 5129 for name, path in pathitems:
5136 5130 fm.startitem()
5137 5131 fm.condwrite(not search, b'name', namefmt, name)
5138 5132 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5139 5133 for subopt, value in sorted(path.suboptions.items()):
5140 5134 assert subopt not in (b'name', b'url')
5141 5135 if showsubopts:
5142 5136 fm.plain(b'%s:%s = ' % (name, subopt))
5143 5137 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5144 5138
5145 5139 fm.end()
5146 5140
5147 5141 if search and not pathitems:
5148 5142 if not ui.quiet:
5149 5143 ui.warn(_(b"not found!\n"))
5150 5144 return 1
5151 5145 else:
5152 5146 return 0
5153 5147
5154 5148
5155 5149 @command(
5156 5150 b'phase',
5157 5151 [
5158 5152 (b'p', b'public', False, _(b'set changeset phase to public')),
5159 5153 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5160 5154 (b's', b'secret', False, _(b'set changeset phase to secret')),
5161 5155 (b'f', b'force', False, _(b'allow to move boundary backward')),
5162 5156 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5163 5157 ],
5164 5158 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5165 5159 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5166 5160 )
5167 5161 def phase(ui, repo, *revs, **opts):
5168 5162 """set or show the current phase name
5169 5163
5170 5164 With no argument, show the phase name of the current revision(s).
5171 5165
5172 5166 With one of -p/--public, -d/--draft or -s/--secret, change the
5173 5167 phase value of the specified revisions.
5174 5168
5175 5169 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5176 5170 lower phase to a higher phase. Phases are ordered as follows::
5177 5171
5178 5172 public < draft < secret
5179 5173
5180 5174 Returns 0 on success, 1 if some phases could not be changed.
5181 5175
5182 5176 (For more information about the phases concept, see :hg:`help phases`.)
5183 5177 """
5184 5178 opts = pycompat.byteskwargs(opts)
5185 5179 # search for a unique phase argument
5186 5180 targetphase = None
5187 5181 for idx, name in enumerate(phases.cmdphasenames):
5188 5182 if opts[name]:
5189 5183 if targetphase is not None:
5190 5184 raise error.InputError(_(b'only one phase can be specified'))
5191 5185 targetphase = idx
5192 5186
5193 5187 # look for specified revision
5194 5188 revs = list(revs)
5195 5189 revs.extend(opts[b'rev'])
5196 5190 if not revs:
5197 5191 # display both parents as the second parent phase can influence
5198 5192 # the phase of a merge commit
5199 5193 revs = [c.rev() for c in repo[None].parents()]
5200 5194
5201 5195 revs = scmutil.revrange(repo, revs)
5202 5196
5203 5197 ret = 0
5204 5198 if targetphase is None:
5205 5199 # display
5206 5200 for r in revs:
5207 5201 ctx = repo[r]
5208 5202 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5209 5203 else:
5210 5204 with repo.lock(), repo.transaction(b"phase") as tr:
5211 5205 # set phase
5212 5206 if not revs:
5213 5207 raise error.InputError(_(b'empty revision set'))
5214 5208 nodes = [repo[r].node() for r in revs]
5215 5209 # moving revision from public to draft may hide them
5216 5210 # We have to check result on an unfiltered repository
5217 5211 unfi = repo.unfiltered()
5218 5212 getphase = unfi._phasecache.phase
5219 5213 olddata = [getphase(unfi, r) for r in unfi]
5220 5214 phases.advanceboundary(repo, tr, targetphase, nodes)
5221 5215 if opts[b'force']:
5222 5216 phases.retractboundary(repo, tr, targetphase, nodes)
5223 5217 getphase = unfi._phasecache.phase
5224 5218 newdata = [getphase(unfi, r) for r in unfi]
5225 5219 changes = sum(newdata[r] != olddata[r] for r in unfi)
5226 5220 cl = unfi.changelog
5227 5221 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5228 5222 if rejected:
5229 5223 ui.warn(
5230 5224 _(
5231 5225 b'cannot move %i changesets to a higher '
5232 5226 b'phase, use --force\n'
5233 5227 )
5234 5228 % len(rejected)
5235 5229 )
5236 5230 ret = 1
5237 5231 if changes:
5238 5232 msg = _(b'phase changed for %i changesets\n') % changes
5239 5233 if ret:
5240 5234 ui.status(msg)
5241 5235 else:
5242 5236 ui.note(msg)
5243 5237 else:
5244 5238 ui.warn(_(b'no phases changed\n'))
5245 5239 return ret
5246 5240
5247 5241
5248 5242 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5249 5243 """Run after a changegroup has been added via pull/unbundle
5250 5244
5251 5245 This takes arguments below:
5252 5246
5253 5247 :modheads: change of heads by pull/unbundle
5254 5248 :optupdate: updating working directory is needed or not
5255 5249 :checkout: update destination revision (or None to default destination)
5256 5250 :brev: a name, which might be a bookmark to be activated after updating
5257 5251
5258 5252 return True if update raise any conflict, False otherwise.
5259 5253 """
5260 5254 if modheads == 0:
5261 5255 return False
5262 5256 if optupdate:
5263 5257 try:
5264 5258 return hg.updatetotally(ui, repo, checkout, brev)
5265 5259 except error.UpdateAbort as inst:
5266 5260 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5267 5261 hint = inst.hint
5268 5262 raise error.UpdateAbort(msg, hint=hint)
5269 5263 if modheads is not None and modheads > 1:
5270 5264 currentbranchheads = len(repo.branchheads())
5271 5265 if currentbranchheads == modheads:
5272 5266 ui.status(
5273 5267 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5274 5268 )
5275 5269 elif currentbranchheads > 1:
5276 5270 ui.status(
5277 5271 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5278 5272 )
5279 5273 else:
5280 5274 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5281 5275 elif not ui.configbool(b'commands', b'update.requiredest'):
5282 5276 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5283 5277 return False
5284 5278
5285 5279
5286 5280 @command(
5287 5281 b'pull',
5288 5282 [
5289 5283 (
5290 5284 b'u',
5291 5285 b'update',
5292 5286 None,
5293 5287 _(b'update to new branch head if new descendants were pulled'),
5294 5288 ),
5295 5289 (
5296 5290 b'f',
5297 5291 b'force',
5298 5292 None,
5299 5293 _(b'run even when remote repository is unrelated'),
5300 5294 ),
5301 5295 (
5302 5296 b'',
5303 5297 b'confirm',
5304 5298 None,
5305 5299 _(b'confirm pull before applying changes'),
5306 5300 ),
5307 5301 (
5308 5302 b'r',
5309 5303 b'rev',
5310 5304 [],
5311 5305 _(b'a remote changeset intended to be added'),
5312 5306 _(b'REV'),
5313 5307 ),
5314 5308 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5315 5309 (
5316 5310 b'b',
5317 5311 b'branch',
5318 5312 [],
5319 5313 _(b'a specific branch you would like to pull'),
5320 5314 _(b'BRANCH'),
5321 5315 ),
5322 5316 ]
5323 5317 + remoteopts,
5324 5318 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5325 5319 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5326 5320 helpbasic=True,
5327 5321 )
5328 5322 def pull(ui, repo, *sources, **opts):
5329 5323 """pull changes from the specified source
5330 5324
5331 5325 Pull changes from a remote repository to a local one.
5332 5326
5333 5327 This finds all changes from the repository at the specified path
5334 5328 or URL and adds them to a local repository (the current one unless
5335 5329 -R is specified). By default, this does not update the copy of the
5336 5330 project in the working directory.
5337 5331
5338 5332 When cloning from servers that support it, Mercurial may fetch
5339 5333 pre-generated data. When this is done, hooks operating on incoming
5340 5334 changesets and changegroups may fire more than once, once for each
5341 5335 pre-generated bundle and as well as for any additional remaining
5342 5336 data. See :hg:`help -e clonebundles` for more.
5343 5337
5344 5338 Use :hg:`incoming` if you want to see what would have been added
5345 5339 by a pull at the time you issued this command. If you then decide
5346 5340 to add those changes to the repository, you should use :hg:`pull
5347 5341 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5348 5342
5349 5343 If SOURCE is omitted, the 'default' path will be used.
5350 5344 See :hg:`help urls` for more information.
5351 5345
5352 5346 If multiple sources are specified, they will be pulled sequentially as if
5353 5347 the command was run multiple time. If --update is specify and the command
5354 5348 will stop at the first failed --update.
5355 5349
5356 5350 Specifying bookmark as ``.`` is equivalent to specifying the active
5357 5351 bookmark's name.
5358 5352
5359 5353 Returns 0 on success, 1 if an update had unresolved files.
5360 5354 """
5361 5355
5362 5356 opts = pycompat.byteskwargs(opts)
5363 5357 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5364 5358 b'update'
5365 5359 ):
5366 5360 msg = _(b'update destination required by configuration')
5367 5361 hint = _(b'use hg pull followed by hg update DEST')
5368 5362 raise error.InputError(msg, hint=hint)
5369 5363
5370 5364 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5371 5365 for source, branches in sources:
5372 5366 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5373 5367 ui.flush()
5374 5368 other = hg.peer(repo, opts, source)
5375 5369 update_conflict = None
5376 5370 try:
5377 5371 revs, checkout = hg.addbranchrevs(
5378 5372 repo, other, branches, opts.get(b'rev')
5379 5373 )
5380 5374
5381 5375 pullopargs = {}
5382 5376
5383 5377 nodes = None
5384 5378 if opts.get(b'bookmark') or revs:
5385 5379 # The list of bookmark used here is the same used to actually update
5386 5380 # the bookmark names, to avoid the race from issue 4689 and we do
5387 5381 # all lookup and bookmark queries in one go so they see the same
5388 5382 # version of the server state (issue 4700).
5389 5383 nodes = []
5390 5384 fnodes = []
5391 5385 revs = revs or []
5392 5386 if revs and not other.capable(b'lookup'):
5393 5387 err = _(
5394 5388 b"other repository doesn't support revision lookup, "
5395 5389 b"so a rev cannot be specified."
5396 5390 )
5397 5391 raise error.Abort(err)
5398 5392 with other.commandexecutor() as e:
5399 5393 fremotebookmarks = e.callcommand(
5400 5394 b'listkeys', {b'namespace': b'bookmarks'}
5401 5395 )
5402 5396 for r in revs:
5403 5397 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5404 5398 remotebookmarks = fremotebookmarks.result()
5405 5399 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5406 5400 pullopargs[b'remotebookmarks'] = remotebookmarks
5407 5401 for b in opts.get(b'bookmark', []):
5408 5402 b = repo._bookmarks.expandname(b)
5409 5403 if b not in remotebookmarks:
5410 5404 raise error.InputError(
5411 5405 _(b'remote bookmark %s not found!') % b
5412 5406 )
5413 5407 nodes.append(remotebookmarks[b])
5414 5408 for i, rev in enumerate(revs):
5415 5409 node = fnodes[i].result()
5416 5410 nodes.append(node)
5417 5411 if rev == checkout:
5418 5412 checkout = node
5419 5413
5420 5414 wlock = util.nullcontextmanager()
5421 5415 if opts.get(b'update'):
5422 5416 wlock = repo.wlock()
5423 5417 with wlock:
5424 5418 pullopargs.update(opts.get(b'opargs', {}))
5425 5419 modheads = exchange.pull(
5426 5420 repo,
5427 5421 other,
5428 5422 heads=nodes,
5429 5423 force=opts.get(b'force'),
5430 5424 bookmarks=opts.get(b'bookmark', ()),
5431 5425 opargs=pullopargs,
5432 5426 confirm=opts.get(b'confirm'),
5433 5427 ).cgresult
5434 5428
5435 5429 # brev is a name, which might be a bookmark to be activated at
5436 5430 # the end of the update. In other words, it is an explicit
5437 5431 # destination of the update
5438 5432 brev = None
5439 5433
5440 5434 if checkout:
5441 5435 checkout = repo.unfiltered().changelog.rev(checkout)
5442 5436
5443 5437 # order below depends on implementation of
5444 5438 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5445 5439 # because 'checkout' is determined without it.
5446 5440 if opts.get(b'rev'):
5447 5441 brev = opts[b'rev'][0]
5448 5442 elif opts.get(b'branch'):
5449 5443 brev = opts[b'branch'][0]
5450 5444 else:
5451 5445 brev = branches[0]
5452 5446 repo._subtoppath = source
5453 5447 try:
5454 5448 update_conflict = postincoming(
5455 5449 ui, repo, modheads, opts.get(b'update'), checkout, brev
5456 5450 )
5457 5451 except error.FilteredRepoLookupError as exc:
5458 5452 msg = _(b'cannot update to target: %s') % exc.args[0]
5459 5453 exc.args = (msg,) + exc.args[1:]
5460 5454 raise
5461 5455 finally:
5462 5456 del repo._subtoppath
5463 5457
5464 5458 finally:
5465 5459 other.close()
5466 5460 # skip the remaining pull source if they are some conflict.
5467 5461 if update_conflict:
5468 5462 break
5469 5463 if update_conflict:
5470 5464 return 1
5471 5465 else:
5472 5466 return 0
5473 5467
5474 5468
5475 5469 @command(
5476 5470 b'purge|clean',
5477 5471 [
5478 5472 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5479 5473 (b'', b'all', None, _(b'purge ignored files too')),
5480 5474 (b'i', b'ignored', None, _(b'purge only ignored files')),
5481 5475 (b'', b'dirs', None, _(b'purge empty directories')),
5482 5476 (b'', b'files', None, _(b'purge files')),
5483 5477 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5484 5478 (
5485 5479 b'0',
5486 5480 b'print0',
5487 5481 None,
5488 5482 _(
5489 5483 b'end filenames with NUL, for use with xargs'
5490 5484 b' (implies -p/--print)'
5491 5485 ),
5492 5486 ),
5493 5487 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5494 5488 ]
5495 5489 + cmdutil.walkopts,
5496 5490 _(b'hg purge [OPTION]... [DIR]...'),
5497 5491 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5498 5492 )
5499 5493 def purge(ui, repo, *dirs, **opts):
5500 5494 """removes files not tracked by Mercurial
5501 5495
5502 5496 Delete files not known to Mercurial. This is useful to test local
5503 5497 and uncommitted changes in an otherwise-clean source tree.
5504 5498
5505 5499 This means that purge will delete the following by default:
5506 5500
5507 5501 - Unknown files: files marked with "?" by :hg:`status`
5508 5502 - Empty directories: in fact Mercurial ignores directories unless
5509 5503 they contain files under source control management
5510 5504
5511 5505 But it will leave untouched:
5512 5506
5513 5507 - Modified and unmodified tracked files
5514 5508 - Ignored files (unless -i or --all is specified)
5515 5509 - New files added to the repository (with :hg:`add`)
5516 5510
5517 5511 The --files and --dirs options can be used to direct purge to delete
5518 5512 only files, only directories, or both. If neither option is given,
5519 5513 both will be deleted.
5520 5514
5521 5515 If directories are given on the command line, only files in these
5522 5516 directories are considered.
5523 5517
5524 5518 Be careful with purge, as you could irreversibly delete some files
5525 5519 you forgot to add to the repository. If you only want to print the
5526 5520 list of files that this program would delete, use the --print
5527 5521 option.
5528 5522 """
5529 5523 opts = pycompat.byteskwargs(opts)
5530 5524 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5531 5525
5532 5526 act = not opts.get(b'print')
5533 5527 eol = b'\n'
5534 5528 if opts.get(b'print0'):
5535 5529 eol = b'\0'
5536 5530 act = False # --print0 implies --print
5537 5531 if opts.get(b'all', False):
5538 5532 ignored = True
5539 5533 unknown = True
5540 5534 else:
5541 5535 ignored = opts.get(b'ignored', False)
5542 5536 unknown = not ignored
5543 5537
5544 5538 removefiles = opts.get(b'files')
5545 5539 removedirs = opts.get(b'dirs')
5546 5540 confirm = opts.get(b'confirm')
5547 5541 if confirm is None:
5548 5542 try:
5549 5543 extensions.find(b'purge')
5550 5544 confirm = False
5551 5545 except KeyError:
5552 5546 confirm = True
5553 5547
5554 5548 if not removefiles and not removedirs:
5555 5549 removefiles = True
5556 5550 removedirs = True
5557 5551
5558 5552 match = scmutil.match(repo[None], dirs, opts)
5559 5553
5560 5554 paths = mergemod.purge(
5561 5555 repo,
5562 5556 match,
5563 5557 unknown=unknown,
5564 5558 ignored=ignored,
5565 5559 removeemptydirs=removedirs,
5566 5560 removefiles=removefiles,
5567 5561 abortonerror=opts.get(b'abort_on_err'),
5568 5562 noop=not act,
5569 5563 confirm=confirm,
5570 5564 )
5571 5565
5572 5566 for path in paths:
5573 5567 if not act:
5574 5568 ui.write(b'%s%s' % (path, eol))
5575 5569
5576 5570
5577 5571 @command(
5578 5572 b'push',
5579 5573 [
5580 5574 (b'f', b'force', None, _(b'force push')),
5581 5575 (
5582 5576 b'r',
5583 5577 b'rev',
5584 5578 [],
5585 5579 _(b'a changeset intended to be included in the destination'),
5586 5580 _(b'REV'),
5587 5581 ),
5588 5582 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5589 5583 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5590 5584 (
5591 5585 b'b',
5592 5586 b'branch',
5593 5587 [],
5594 5588 _(b'a specific branch you would like to push'),
5595 5589 _(b'BRANCH'),
5596 5590 ),
5597 5591 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5598 5592 (
5599 5593 b'',
5600 5594 b'pushvars',
5601 5595 [],
5602 5596 _(b'variables that can be sent to server (ADVANCED)'),
5603 5597 ),
5604 5598 (
5605 5599 b'',
5606 5600 b'publish',
5607 5601 False,
5608 5602 _(b'push the changeset as public (EXPERIMENTAL)'),
5609 5603 ),
5610 5604 ]
5611 5605 + remoteopts,
5612 5606 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5613 5607 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5614 5608 helpbasic=True,
5615 5609 )
5616 5610 def push(ui, repo, *dests, **opts):
5617 5611 """push changes to the specified destination
5618 5612
5619 5613 Push changesets from the local repository to the specified
5620 5614 destination.
5621 5615
5622 5616 This operation is symmetrical to pull: it is identical to a pull
5623 5617 in the destination repository from the current one.
5624 5618
5625 5619 By default, push will not allow creation of new heads at the
5626 5620 destination, since multiple heads would make it unclear which head
5627 5621 to use. In this situation, it is recommended to pull and merge
5628 5622 before pushing.
5629 5623
5630 5624 Use --new-branch if you want to allow push to create a new named
5631 5625 branch that is not present at the destination. This allows you to
5632 5626 only create a new branch without forcing other changes.
5633 5627
5634 5628 .. note::
5635 5629
5636 5630 Extra care should be taken with the -f/--force option,
5637 5631 which will push all new heads on all branches, an action which will
5638 5632 almost always cause confusion for collaborators.
5639 5633
5640 5634 If -r/--rev is used, the specified revision and all its ancestors
5641 5635 will be pushed to the remote repository.
5642 5636
5643 5637 If -B/--bookmark is used, the specified bookmarked revision, its
5644 5638 ancestors, and the bookmark will be pushed to the remote
5645 5639 repository. Specifying ``.`` is equivalent to specifying the active
5646 5640 bookmark's name. Use the --all-bookmarks option for pushing all
5647 5641 current bookmarks.
5648 5642
5649 5643 Please see :hg:`help urls` for important details about ``ssh://``
5650 5644 URLs. If DESTINATION is omitted, a default path will be used.
5651 5645
5652 5646 When passed multiple destinations, push will process them one after the
5653 5647 other, but stop should an error occur.
5654 5648
5655 5649 .. container:: verbose
5656 5650
5657 5651 The --pushvars option sends strings to the server that become
5658 5652 environment variables prepended with ``HG_USERVAR_``. For example,
5659 5653 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5660 5654 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5661 5655
5662 5656 pushvars can provide for user-overridable hooks as well as set debug
5663 5657 levels. One example is having a hook that blocks commits containing
5664 5658 conflict markers, but enables the user to override the hook if the file
5665 5659 is using conflict markers for testing purposes or the file format has
5666 5660 strings that look like conflict markers.
5667 5661
5668 5662 By default, servers will ignore `--pushvars`. To enable it add the
5669 5663 following to your configuration file::
5670 5664
5671 5665 [push]
5672 5666 pushvars.server = true
5673 5667
5674 5668 Returns 0 if push was successful, 1 if nothing to push.
5675 5669 """
5676 5670
5677 5671 opts = pycompat.byteskwargs(opts)
5678 5672
5679 5673 if opts.get(b'all_bookmarks'):
5680 5674 cmdutil.check_incompatible_arguments(
5681 5675 opts,
5682 5676 b'all_bookmarks',
5683 5677 [b'bookmark', b'rev'],
5684 5678 )
5685 5679 opts[b'bookmark'] = list(repo._bookmarks)
5686 5680
5687 5681 if opts.get(b'bookmark'):
5688 5682 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5689 5683 for b in opts[b'bookmark']:
5690 5684 # translate -B options to -r so changesets get pushed
5691 5685 b = repo._bookmarks.expandname(b)
5692 5686 if b in repo._bookmarks:
5693 5687 opts.setdefault(b'rev', []).append(b)
5694 5688 else:
5695 5689 # if we try to push a deleted bookmark, translate it to null
5696 5690 # this lets simultaneous -r, -b options continue working
5697 5691 opts.setdefault(b'rev', []).append(b"null")
5698 5692
5699 5693 some_pushed = False
5700 5694 result = 0
5701 5695 for path in urlutil.get_push_paths(repo, ui, dests):
5702 5696 dest = path.pushloc or path.loc
5703 5697 branches = (path.branch, opts.get(b'branch') or [])
5704 5698 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5705 5699 revs, checkout = hg.addbranchrevs(
5706 5700 repo, repo, branches, opts.get(b'rev')
5707 5701 )
5708 5702 other = hg.peer(repo, opts, dest)
5709 5703
5710 5704 try:
5711 5705 if revs:
5712 5706 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5713 5707 if not revs:
5714 5708 raise error.InputError(
5715 5709 _(b"specified revisions evaluate to an empty set"),
5716 5710 hint=_(b"use different revision arguments"),
5717 5711 )
5718 5712 elif path.pushrev:
5719 5713 # It doesn't make any sense to specify ancestor revisions. So limit
5720 5714 # to DAG heads to make discovery simpler.
5721 5715 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5722 5716 revs = scmutil.revrange(repo, [expr])
5723 5717 revs = [repo[rev].node() for rev in revs]
5724 5718 if not revs:
5725 5719 raise error.InputError(
5726 5720 _(
5727 5721 b'default push revset for path evaluates to an empty set'
5728 5722 )
5729 5723 )
5730 5724 elif ui.configbool(b'commands', b'push.require-revs'):
5731 5725 raise error.InputError(
5732 5726 _(b'no revisions specified to push'),
5733 5727 hint=_(b'did you mean "hg push -r ."?'),
5734 5728 )
5735 5729
5736 5730 repo._subtoppath = dest
5737 5731 try:
5738 5732 # push subrepos depth-first for coherent ordering
5739 5733 c = repo[b'.']
5740 5734 subs = c.substate # only repos that are committed
5741 5735 for s in sorted(subs):
5742 5736 sub_result = c.sub(s).push(opts)
5743 5737 if sub_result == 0:
5744 5738 return 1
5745 5739 finally:
5746 5740 del repo._subtoppath
5747 5741
5748 5742 opargs = dict(
5749 5743 opts.get(b'opargs', {})
5750 5744 ) # copy opargs since we may mutate it
5751 5745 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5752 5746
5753 5747 pushop = exchange.push(
5754 5748 repo,
5755 5749 other,
5756 5750 opts.get(b'force'),
5757 5751 revs=revs,
5758 5752 newbranch=opts.get(b'new_branch'),
5759 5753 bookmarks=opts.get(b'bookmark', ()),
5760 5754 publish=opts.get(b'publish'),
5761 5755 opargs=opargs,
5762 5756 )
5763 5757
5764 5758 if pushop.cgresult == 0:
5765 5759 result = 1
5766 5760 elif pushop.cgresult is not None:
5767 5761 some_pushed = True
5768 5762
5769 5763 if pushop.bkresult is not None:
5770 5764 if pushop.bkresult == 2:
5771 5765 result = 2
5772 5766 elif not result and pushop.bkresult:
5773 5767 result = 2
5774 5768
5775 5769 if result:
5776 5770 break
5777 5771
5778 5772 finally:
5779 5773 other.close()
5780 5774 if result == 0 and not some_pushed:
5781 5775 result = 1
5782 5776 return result
5783 5777
5784 5778
5785 5779 @command(
5786 5780 b'recover',
5787 5781 [
5788 5782 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5789 5783 ],
5790 5784 helpcategory=command.CATEGORY_MAINTENANCE,
5791 5785 )
5792 5786 def recover(ui, repo, **opts):
5793 5787 """roll back an interrupted transaction
5794 5788
5795 5789 Recover from an interrupted commit or pull.
5796 5790
5797 5791 This command tries to fix the repository status after an
5798 5792 interrupted operation. It should only be necessary when Mercurial
5799 5793 suggests it.
5800 5794
5801 5795 Returns 0 if successful, 1 if nothing to recover or verify fails.
5802 5796 """
5803 5797 ret = repo.recover()
5804 5798 if ret:
5805 5799 if opts['verify']:
5806 5800 return hg.verify(repo)
5807 5801 else:
5808 5802 msg = _(
5809 5803 b"(verify step skipped, run `hg verify` to check your "
5810 5804 b"repository content)\n"
5811 5805 )
5812 5806 ui.warn(msg)
5813 5807 return 0
5814 5808 return 1
5815 5809
5816 5810
5817 5811 @command(
5818 5812 b'remove|rm',
5819 5813 [
5820 5814 (b'A', b'after', None, _(b'record delete for missing files')),
5821 5815 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5822 5816 ]
5823 5817 + subrepoopts
5824 5818 + walkopts
5825 5819 + dryrunopts,
5826 5820 _(b'[OPTION]... FILE...'),
5827 5821 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5828 5822 helpbasic=True,
5829 5823 inferrepo=True,
5830 5824 )
5831 5825 def remove(ui, repo, *pats, **opts):
5832 5826 """remove the specified files on the next commit
5833 5827
5834 5828 Schedule the indicated files for removal from the current branch.
5835 5829
5836 5830 This command schedules the files to be removed at the next commit.
5837 5831 To undo a remove before that, see :hg:`revert`. To undo added
5838 5832 files, see :hg:`forget`.
5839 5833
5840 5834 .. container:: verbose
5841 5835
5842 5836 -A/--after can be used to remove only files that have already
5843 5837 been deleted, -f/--force can be used to force deletion, and -Af
5844 5838 can be used to remove files from the next revision without
5845 5839 deleting them from the working directory.
5846 5840
5847 5841 The following table details the behavior of remove for different
5848 5842 file states (columns) and option combinations (rows). The file
5849 5843 states are Added [A], Clean [C], Modified [M] and Missing [!]
5850 5844 (as reported by :hg:`status`). The actions are Warn, Remove
5851 5845 (from branch) and Delete (from disk):
5852 5846
5853 5847 ========= == == == ==
5854 5848 opt/state A C M !
5855 5849 ========= == == == ==
5856 5850 none W RD W R
5857 5851 -f R RD RD R
5858 5852 -A W W W R
5859 5853 -Af R R R R
5860 5854 ========= == == == ==
5861 5855
5862 5856 .. note::
5863 5857
5864 5858 :hg:`remove` never deletes files in Added [A] state from the
5865 5859 working directory, not even if ``--force`` is specified.
5866 5860
5867 5861 Returns 0 on success, 1 if any warnings encountered.
5868 5862 """
5869 5863
5870 5864 opts = pycompat.byteskwargs(opts)
5871 5865 after, force = opts.get(b'after'), opts.get(b'force')
5872 5866 dryrun = opts.get(b'dry_run')
5873 5867 if not pats and not after:
5874 5868 raise error.InputError(_(b'no files specified'))
5875 5869
5876 5870 m = scmutil.match(repo[None], pats, opts)
5877 5871 subrepos = opts.get(b'subrepos')
5878 5872 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5879 5873 return cmdutil.remove(
5880 5874 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5881 5875 )
5882 5876
5883 5877
5884 5878 @command(
5885 5879 b'rename|move|mv',
5886 5880 [
5887 5881 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5888 5882 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5889 5883 (
5890 5884 b'',
5891 5885 b'at-rev',
5892 5886 b'',
5893 5887 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5894 5888 _(b'REV'),
5895 5889 ),
5896 5890 (
5897 5891 b'f',
5898 5892 b'force',
5899 5893 None,
5900 5894 _(b'forcibly move over an existing managed file'),
5901 5895 ),
5902 5896 ]
5903 5897 + walkopts
5904 5898 + dryrunopts,
5905 5899 _(b'[OPTION]... SOURCE... DEST'),
5906 5900 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5907 5901 )
5908 5902 def rename(ui, repo, *pats, **opts):
5909 5903 """rename files; equivalent of copy + remove
5910 5904
5911 5905 Mark dest as copies of sources; mark sources for deletion. If dest
5912 5906 is a directory, copies are put in that directory. If dest is a
5913 5907 file, there can only be one source.
5914 5908
5915 5909 By default, this command copies the contents of files as they
5916 5910 exist in the working directory. If invoked with -A/--after, the
5917 5911 operation is recorded, but no copying is performed.
5918 5912
5919 5913 To undo marking a destination file as renamed, use --forget. With that
5920 5914 option, all given (positional) arguments are unmarked as renames. The
5921 5915 destination file(s) will be left in place (still tracked). The source
5922 5916 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5923 5917 the same way as :hg:`copy --forget`.
5924 5918
5925 5919 This command takes effect with the next commit by default.
5926 5920
5927 5921 Returns 0 on success, 1 if errors are encountered.
5928 5922 """
5929 5923 opts = pycompat.byteskwargs(opts)
5930 5924 with repo.wlock():
5931 5925 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5932 5926
5933 5927
5934 5928 @command(
5935 5929 b'resolve',
5936 5930 [
5937 5931 (b'a', b'all', None, _(b'select all unresolved files')),
5938 5932 (b'l', b'list', None, _(b'list state of files needing merge')),
5939 5933 (b'm', b'mark', None, _(b'mark files as resolved')),
5940 5934 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5941 5935 (b'n', b'no-status', None, _(b'hide status prefix')),
5942 5936 (b'', b're-merge', None, _(b're-merge files')),
5943 5937 ]
5944 5938 + mergetoolopts
5945 5939 + walkopts
5946 5940 + formatteropts,
5947 5941 _(b'[OPTION]... [FILE]...'),
5948 5942 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5949 5943 inferrepo=True,
5950 5944 )
5951 5945 def resolve(ui, repo, *pats, **opts):
5952 5946 """redo merges or set/view the merge status of files
5953 5947
5954 5948 Merges with unresolved conflicts are often the result of
5955 5949 non-interactive merging using the ``internal:merge`` configuration
5956 5950 setting, or a command-line merge tool like ``diff3``. The resolve
5957 5951 command is used to manage the files involved in a merge, after
5958 5952 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5959 5953 working directory must have two parents). See :hg:`help
5960 5954 merge-tools` for information on configuring merge tools.
5961 5955
5962 5956 The resolve command can be used in the following ways:
5963 5957
5964 5958 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5965 5959 the specified files, discarding any previous merge attempts. Re-merging
5966 5960 is not performed for files already marked as resolved. Use ``--all/-a``
5967 5961 to select all unresolved files. ``--tool`` can be used to specify
5968 5962 the merge tool used for the given files. It overrides the HGMERGE
5969 5963 environment variable and your configuration files. Previous file
5970 5964 contents are saved with a ``.orig`` suffix.
5971 5965
5972 5966 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5973 5967 (e.g. after having manually fixed-up the files). The default is
5974 5968 to mark all unresolved files.
5975 5969
5976 5970 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5977 5971 default is to mark all resolved files.
5978 5972
5979 5973 - :hg:`resolve -l`: list files which had or still have conflicts.
5980 5974 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5981 5975 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5982 5976 the list. See :hg:`help filesets` for details.
5983 5977
5984 5978 .. note::
5985 5979
5986 5980 Mercurial will not let you commit files with unresolved merge
5987 5981 conflicts. You must use :hg:`resolve -m ...` before you can
5988 5982 commit after a conflicting merge.
5989 5983
5990 5984 .. container:: verbose
5991 5985
5992 5986 Template:
5993 5987
5994 5988 The following keywords are supported in addition to the common template
5995 5989 keywords and functions. See also :hg:`help templates`.
5996 5990
5997 5991 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5998 5992 :path: String. Repository-absolute path of the file.
5999 5993
6000 5994 Returns 0 on success, 1 if any files fail a resolve attempt.
6001 5995 """
6002 5996
6003 5997 opts = pycompat.byteskwargs(opts)
6004 5998 confirm = ui.configbool(b'commands', b'resolve.confirm')
6005 5999 flaglist = b'all mark unmark list no_status re_merge'.split()
6006 6000 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6007 6001
6008 6002 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6009 6003 if actioncount > 1:
6010 6004 raise error.InputError(_(b"too many actions specified"))
6011 6005 elif actioncount == 0 and ui.configbool(
6012 6006 b'commands', b'resolve.explicit-re-merge'
6013 6007 ):
6014 6008 hint = _(b'use --mark, --unmark, --list or --re-merge')
6015 6009 raise error.InputError(_(b'no action specified'), hint=hint)
6016 6010 if pats and all:
6017 6011 raise error.InputError(_(b"can't specify --all and patterns"))
6018 6012 if not (all or pats or show or mark or unmark):
6019 6013 raise error.InputError(
6020 6014 _(b'no files or directories specified'),
6021 6015 hint=b'use --all to re-merge all unresolved files',
6022 6016 )
6023 6017
6024 6018 if confirm:
6025 6019 if all:
6026 6020 if ui.promptchoice(
6027 6021 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6028 6022 ):
6029 6023 raise error.CanceledError(_(b'user quit'))
6030 6024 if mark and not pats:
6031 6025 if ui.promptchoice(
6032 6026 _(
6033 6027 b'mark all unresolved files as resolved (yn)?'
6034 6028 b'$$ &Yes $$ &No'
6035 6029 )
6036 6030 ):
6037 6031 raise error.CanceledError(_(b'user quit'))
6038 6032 if unmark and not pats:
6039 6033 if ui.promptchoice(
6040 6034 _(
6041 6035 b'mark all resolved files as unresolved (yn)?'
6042 6036 b'$$ &Yes $$ &No'
6043 6037 )
6044 6038 ):
6045 6039 raise error.CanceledError(_(b'user quit'))
6046 6040
6047 6041 uipathfn = scmutil.getuipathfn(repo)
6048 6042
6049 6043 if show:
6050 6044 ui.pager(b'resolve')
6051 6045 fm = ui.formatter(b'resolve', opts)
6052 6046 ms = mergestatemod.mergestate.read(repo)
6053 6047 wctx = repo[None]
6054 6048 m = scmutil.match(wctx, pats, opts)
6055 6049
6056 6050 # Labels and keys based on merge state. Unresolved path conflicts show
6057 6051 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6058 6052 # resolved conflicts.
6059 6053 mergestateinfo = {
6060 6054 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6061 6055 b'resolve.unresolved',
6062 6056 b'U',
6063 6057 ),
6064 6058 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6065 6059 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6066 6060 b'resolve.unresolved',
6067 6061 b'P',
6068 6062 ),
6069 6063 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6070 6064 b'resolve.resolved',
6071 6065 b'R',
6072 6066 ),
6073 6067 }
6074 6068
6075 6069 for f in ms:
6076 6070 if not m(f):
6077 6071 continue
6078 6072
6079 6073 label, key = mergestateinfo[ms[f]]
6080 6074 fm.startitem()
6081 6075 fm.context(ctx=wctx)
6082 6076 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6083 6077 fm.data(path=f)
6084 6078 fm.plain(b'%s\n' % uipathfn(f), label=label)
6085 6079 fm.end()
6086 6080 return 0
6087 6081
6088 6082 with repo.wlock():
6089 6083 ms = mergestatemod.mergestate.read(repo)
6090 6084
6091 6085 if not (ms.active() or repo.dirstate.p2() != nullid):
6092 6086 raise error.StateError(
6093 6087 _(b'resolve command not applicable when not merging')
6094 6088 )
6095 6089
6096 6090 wctx = repo[None]
6097 6091 m = scmutil.match(wctx, pats, opts)
6098 6092 ret = 0
6099 6093 didwork = False
6100 6094
6101 6095 tocomplete = []
6102 6096 hasconflictmarkers = []
6103 6097 if mark:
6104 6098 markcheck = ui.config(b'commands', b'resolve.mark-check')
6105 6099 if markcheck not in [b'warn', b'abort']:
6106 6100 # Treat all invalid / unrecognized values as 'none'.
6107 6101 markcheck = False
6108 6102 for f in ms:
6109 6103 if not m(f):
6110 6104 continue
6111 6105
6112 6106 didwork = True
6113 6107
6114 6108 # path conflicts must be resolved manually
6115 6109 if ms[f] in (
6116 6110 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6117 6111 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6118 6112 ):
6119 6113 if mark:
6120 6114 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6121 6115 elif unmark:
6122 6116 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6123 6117 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6124 6118 ui.warn(
6125 6119 _(b'%s: path conflict must be resolved manually\n')
6126 6120 % uipathfn(f)
6127 6121 )
6128 6122 continue
6129 6123
6130 6124 if mark:
6131 6125 if markcheck:
6132 6126 fdata = repo.wvfs.tryread(f)
6133 6127 if (
6134 6128 filemerge.hasconflictmarkers(fdata)
6135 6129 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6136 6130 ):
6137 6131 hasconflictmarkers.append(f)
6138 6132 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6139 6133 elif unmark:
6140 6134 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6141 6135 else:
6142 6136 # backup pre-resolve (merge uses .orig for its own purposes)
6143 6137 a = repo.wjoin(f)
6144 6138 try:
6145 6139 util.copyfile(a, a + b".resolve")
6146 6140 except (IOError, OSError) as inst:
6147 6141 if inst.errno != errno.ENOENT:
6148 6142 raise
6149 6143
6150 6144 try:
6151 6145 # preresolve file
6152 6146 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6153 6147 with ui.configoverride(overrides, b'resolve'):
6154 6148 complete, r = ms.preresolve(f, wctx)
6155 6149 if not complete:
6156 6150 tocomplete.append(f)
6157 6151 elif r:
6158 6152 ret = 1
6159 6153 finally:
6160 6154 ms.commit()
6161 6155
6162 6156 # replace filemerge's .orig file with our resolve file, but only
6163 6157 # for merges that are complete
6164 6158 if complete:
6165 6159 try:
6166 6160 util.rename(
6167 6161 a + b".resolve", scmutil.backuppath(ui, repo, f)
6168 6162 )
6169 6163 except OSError as inst:
6170 6164 if inst.errno != errno.ENOENT:
6171 6165 raise
6172 6166
6173 6167 if hasconflictmarkers:
6174 6168 ui.warn(
6175 6169 _(
6176 6170 b'warning: the following files still have conflict '
6177 6171 b'markers:\n'
6178 6172 )
6179 6173 + b''.join(
6180 6174 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6181 6175 )
6182 6176 )
6183 6177 if markcheck == b'abort' and not all and not pats:
6184 6178 raise error.StateError(
6185 6179 _(b'conflict markers detected'),
6186 6180 hint=_(b'use --all to mark anyway'),
6187 6181 )
6188 6182
6189 6183 for f in tocomplete:
6190 6184 try:
6191 6185 # resolve file
6192 6186 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6193 6187 with ui.configoverride(overrides, b'resolve'):
6194 6188 r = ms.resolve(f, wctx)
6195 6189 if r:
6196 6190 ret = 1
6197 6191 finally:
6198 6192 ms.commit()
6199 6193
6200 6194 # replace filemerge's .orig file with our resolve file
6201 6195 a = repo.wjoin(f)
6202 6196 try:
6203 6197 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6204 6198 except OSError as inst:
6205 6199 if inst.errno != errno.ENOENT:
6206 6200 raise
6207 6201
6208 6202 ms.commit()
6209 6203 branchmerge = repo.dirstate.p2() != nullid
6210 6204 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6211 6205
6212 6206 if not didwork and pats:
6213 6207 hint = None
6214 6208 if not any([p for p in pats if p.find(b':') >= 0]):
6215 6209 pats = [b'path:%s' % p for p in pats]
6216 6210 m = scmutil.match(wctx, pats, opts)
6217 6211 for f in ms:
6218 6212 if not m(f):
6219 6213 continue
6220 6214
6221 6215 def flag(o):
6222 6216 if o == b're_merge':
6223 6217 return b'--re-merge '
6224 6218 return b'-%s ' % o[0:1]
6225 6219
6226 6220 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6227 6221 hint = _(b"(try: hg resolve %s%s)\n") % (
6228 6222 flags,
6229 6223 b' '.join(pats),
6230 6224 )
6231 6225 break
6232 6226 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6233 6227 if hint:
6234 6228 ui.warn(hint)
6235 6229
6236 6230 unresolvedf = ms.unresolvedcount()
6237 6231 if not unresolvedf:
6238 6232 ui.status(_(b'(no more unresolved files)\n'))
6239 6233 cmdutil.checkafterresolved(repo)
6240 6234
6241 6235 return ret
6242 6236
6243 6237
6244 6238 @command(
6245 6239 b'revert',
6246 6240 [
6247 6241 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6248 6242 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6249 6243 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6250 6244 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6251 6245 (b'i', b'interactive', None, _(b'interactively select the changes')),
6252 6246 ]
6253 6247 + walkopts
6254 6248 + dryrunopts,
6255 6249 _(b'[OPTION]... [-r REV] [NAME]...'),
6256 6250 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6257 6251 )
6258 6252 def revert(ui, repo, *pats, **opts):
6259 6253 """restore files to their checkout state
6260 6254
6261 6255 .. note::
6262 6256
6263 6257 To check out earlier revisions, you should use :hg:`update REV`.
6264 6258 To cancel an uncommitted merge (and lose your changes),
6265 6259 use :hg:`merge --abort`.
6266 6260
6267 6261 With no revision specified, revert the specified files or directories
6268 6262 to the contents they had in the parent of the working directory.
6269 6263 This restores the contents of files to an unmodified
6270 6264 state and unschedules adds, removes, copies, and renames. If the
6271 6265 working directory has two parents, you must explicitly specify a
6272 6266 revision.
6273 6267
6274 6268 Using the -r/--rev or -d/--date options, revert the given files or
6275 6269 directories to their states as of a specific revision. Because
6276 6270 revert does not change the working directory parents, this will
6277 6271 cause these files to appear modified. This can be helpful to "back
6278 6272 out" some or all of an earlier change. See :hg:`backout` for a
6279 6273 related method.
6280 6274
6281 6275 Modified files are saved with a .orig suffix before reverting.
6282 6276 To disable these backups, use --no-backup. It is possible to store
6283 6277 the backup files in a custom directory relative to the root of the
6284 6278 repository by setting the ``ui.origbackuppath`` configuration
6285 6279 option.
6286 6280
6287 6281 See :hg:`help dates` for a list of formats valid for -d/--date.
6288 6282
6289 6283 See :hg:`help backout` for a way to reverse the effect of an
6290 6284 earlier changeset.
6291 6285
6292 6286 Returns 0 on success.
6293 6287 """
6294 6288
6295 6289 opts = pycompat.byteskwargs(opts)
6296 6290 if opts.get(b"date"):
6297 6291 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6298 6292 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6299 6293
6300 6294 parent, p2 = repo.dirstate.parents()
6301 6295 if not opts.get(b'rev') and p2 != nullid:
6302 6296 # revert after merge is a trap for new users (issue2915)
6303 6297 raise error.InputError(
6304 6298 _(b'uncommitted merge with no revision specified'),
6305 6299 hint=_(b"use 'hg update' or see 'hg help revert'"),
6306 6300 )
6307 6301
6308 6302 rev = opts.get(b'rev')
6309 6303 if rev:
6310 6304 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6311 6305 ctx = scmutil.revsingle(repo, rev)
6312 6306
6313 6307 if not (
6314 6308 pats
6315 6309 or opts.get(b'include')
6316 6310 or opts.get(b'exclude')
6317 6311 or opts.get(b'all')
6318 6312 or opts.get(b'interactive')
6319 6313 ):
6320 6314 msg = _(b"no files or directories specified")
6321 6315 if p2 != nullid:
6322 6316 hint = _(
6323 6317 b"uncommitted merge, use --all to discard all changes,"
6324 6318 b" or 'hg update -C .' to abort the merge"
6325 6319 )
6326 6320 raise error.InputError(msg, hint=hint)
6327 6321 dirty = any(repo.status())
6328 6322 node = ctx.node()
6329 6323 if node != parent:
6330 6324 if dirty:
6331 6325 hint = (
6332 6326 _(
6333 6327 b"uncommitted changes, use --all to discard all"
6334 6328 b" changes, or 'hg update %d' to update"
6335 6329 )
6336 6330 % ctx.rev()
6337 6331 )
6338 6332 else:
6339 6333 hint = (
6340 6334 _(
6341 6335 b"use --all to revert all files,"
6342 6336 b" or 'hg update %d' to update"
6343 6337 )
6344 6338 % ctx.rev()
6345 6339 )
6346 6340 elif dirty:
6347 6341 hint = _(b"uncommitted changes, use --all to discard all changes")
6348 6342 else:
6349 6343 hint = _(b"use --all to revert all files")
6350 6344 raise error.InputError(msg, hint=hint)
6351 6345
6352 6346 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6353 6347
6354 6348
6355 6349 @command(
6356 6350 b'rollback',
6357 6351 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6358 6352 helpcategory=command.CATEGORY_MAINTENANCE,
6359 6353 )
6360 6354 def rollback(ui, repo, **opts):
6361 6355 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6362 6356
6363 6357 Please use :hg:`commit --amend` instead of rollback to correct
6364 6358 mistakes in the last commit.
6365 6359
6366 6360 This command should be used with care. There is only one level of
6367 6361 rollback, and there is no way to undo a rollback. It will also
6368 6362 restore the dirstate at the time of the last transaction, losing
6369 6363 any dirstate changes since that time. This command does not alter
6370 6364 the working directory.
6371 6365
6372 6366 Transactions are used to encapsulate the effects of all commands
6373 6367 that create new changesets or propagate existing changesets into a
6374 6368 repository.
6375 6369
6376 6370 .. container:: verbose
6377 6371
6378 6372 For example, the following commands are transactional, and their
6379 6373 effects can be rolled back:
6380 6374
6381 6375 - commit
6382 6376 - import
6383 6377 - pull
6384 6378 - push (with this repository as the destination)
6385 6379 - unbundle
6386 6380
6387 6381 To avoid permanent data loss, rollback will refuse to rollback a
6388 6382 commit transaction if it isn't checked out. Use --force to
6389 6383 override this protection.
6390 6384
6391 6385 The rollback command can be entirely disabled by setting the
6392 6386 ``ui.rollback`` configuration setting to false. If you're here
6393 6387 because you want to use rollback and it's disabled, you can
6394 6388 re-enable the command by setting ``ui.rollback`` to true.
6395 6389
6396 6390 This command is not intended for use on public repositories. Once
6397 6391 changes are visible for pull by other users, rolling a transaction
6398 6392 back locally is ineffective (someone else may already have pulled
6399 6393 the changes). Furthermore, a race is possible with readers of the
6400 6394 repository; for example an in-progress pull from the repository
6401 6395 may fail if a rollback is performed.
6402 6396
6403 6397 Returns 0 on success, 1 if no rollback data is available.
6404 6398 """
6405 6399 if not ui.configbool(b'ui', b'rollback'):
6406 6400 raise error.Abort(
6407 6401 _(b'rollback is disabled because it is unsafe'),
6408 6402 hint=b'see `hg help -v rollback` for information',
6409 6403 )
6410 6404 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6411 6405
6412 6406
6413 6407 @command(
6414 6408 b'root',
6415 6409 [] + formatteropts,
6416 6410 intents={INTENT_READONLY},
6417 6411 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6418 6412 )
6419 6413 def root(ui, repo, **opts):
6420 6414 """print the root (top) of the current working directory
6421 6415
6422 6416 Print the root directory of the current repository.
6423 6417
6424 6418 .. container:: verbose
6425 6419
6426 6420 Template:
6427 6421
6428 6422 The following keywords are supported in addition to the common template
6429 6423 keywords and functions. See also :hg:`help templates`.
6430 6424
6431 6425 :hgpath: String. Path to the .hg directory.
6432 6426 :storepath: String. Path to the directory holding versioned data.
6433 6427
6434 6428 Returns 0 on success.
6435 6429 """
6436 6430 opts = pycompat.byteskwargs(opts)
6437 6431 with ui.formatter(b'root', opts) as fm:
6438 6432 fm.startitem()
6439 6433 fm.write(b'reporoot', b'%s\n', repo.root)
6440 6434 fm.data(hgpath=repo.path, storepath=repo.spath)
6441 6435
6442 6436
6443 6437 @command(
6444 6438 b'serve',
6445 6439 [
6446 6440 (
6447 6441 b'A',
6448 6442 b'accesslog',
6449 6443 b'',
6450 6444 _(b'name of access log file to write to'),
6451 6445 _(b'FILE'),
6452 6446 ),
6453 6447 (b'd', b'daemon', None, _(b'run server in background')),
6454 6448 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6455 6449 (
6456 6450 b'E',
6457 6451 b'errorlog',
6458 6452 b'',
6459 6453 _(b'name of error log file to write to'),
6460 6454 _(b'FILE'),
6461 6455 ),
6462 6456 # use string type, then we can check if something was passed
6463 6457 (
6464 6458 b'p',
6465 6459 b'port',
6466 6460 b'',
6467 6461 _(b'port to listen on (default: 8000)'),
6468 6462 _(b'PORT'),
6469 6463 ),
6470 6464 (
6471 6465 b'a',
6472 6466 b'address',
6473 6467 b'',
6474 6468 _(b'address to listen on (default: all interfaces)'),
6475 6469 _(b'ADDR'),
6476 6470 ),
6477 6471 (
6478 6472 b'',
6479 6473 b'prefix',
6480 6474 b'',
6481 6475 _(b'prefix path to serve from (default: server root)'),
6482 6476 _(b'PREFIX'),
6483 6477 ),
6484 6478 (
6485 6479 b'n',
6486 6480 b'name',
6487 6481 b'',
6488 6482 _(b'name to show in web pages (default: working directory)'),
6489 6483 _(b'NAME'),
6490 6484 ),
6491 6485 (
6492 6486 b'',
6493 6487 b'web-conf',
6494 6488 b'',
6495 6489 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6496 6490 _(b'FILE'),
6497 6491 ),
6498 6492 (
6499 6493 b'',
6500 6494 b'webdir-conf',
6501 6495 b'',
6502 6496 _(b'name of the hgweb config file (DEPRECATED)'),
6503 6497 _(b'FILE'),
6504 6498 ),
6505 6499 (
6506 6500 b'',
6507 6501 b'pid-file',
6508 6502 b'',
6509 6503 _(b'name of file to write process ID to'),
6510 6504 _(b'FILE'),
6511 6505 ),
6512 6506 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6513 6507 (
6514 6508 b'',
6515 6509 b'cmdserver',
6516 6510 b'',
6517 6511 _(b'for remote clients (ADVANCED)'),
6518 6512 _(b'MODE'),
6519 6513 ),
6520 6514 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6521 6515 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6522 6516 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6523 6517 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6524 6518 (b'', b'print-url', None, _(b'start and print only the URL')),
6525 6519 ]
6526 6520 + subrepoopts,
6527 6521 _(b'[OPTION]...'),
6528 6522 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6529 6523 helpbasic=True,
6530 6524 optionalrepo=True,
6531 6525 )
6532 6526 def serve(ui, repo, **opts):
6533 6527 """start stand-alone webserver
6534 6528
6535 6529 Start a local HTTP repository browser and pull server. You can use
6536 6530 this for ad-hoc sharing and browsing of repositories. It is
6537 6531 recommended to use a real web server to serve a repository for
6538 6532 longer periods of time.
6539 6533
6540 6534 Please note that the server does not implement access control.
6541 6535 This means that, by default, anybody can read from the server and
6542 6536 nobody can write to it by default. Set the ``web.allow-push``
6543 6537 option to ``*`` to allow everybody to push to the server. You
6544 6538 should use a real web server if you need to authenticate users.
6545 6539
6546 6540 By default, the server logs accesses to stdout and errors to
6547 6541 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6548 6542 files.
6549 6543
6550 6544 To have the server choose a free port number to listen on, specify
6551 6545 a port number of 0; in this case, the server will print the port
6552 6546 number it uses.
6553 6547
6554 6548 Returns 0 on success.
6555 6549 """
6556 6550
6557 6551 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6558 6552 opts = pycompat.byteskwargs(opts)
6559 6553 if opts[b"print_url"] and ui.verbose:
6560 6554 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6561 6555
6562 6556 if opts[b"stdio"]:
6563 6557 if repo is None:
6564 6558 raise error.RepoError(
6565 6559 _(b"there is no Mercurial repository here (.hg not found)")
6566 6560 )
6567 6561 s = wireprotoserver.sshserver(ui, repo)
6568 6562 s.serve_forever()
6569 6563 return
6570 6564
6571 6565 service = server.createservice(ui, repo, opts)
6572 6566 return server.runservice(opts, initfn=service.init, runfn=service.run)
6573 6567
6574 6568
6575 6569 @command(
6576 6570 b'shelve',
6577 6571 [
6578 6572 (
6579 6573 b'A',
6580 6574 b'addremove',
6581 6575 None,
6582 6576 _(b'mark new/missing files as added/removed before shelving'),
6583 6577 ),
6584 6578 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6585 6579 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6586 6580 (
6587 6581 b'',
6588 6582 b'date',
6589 6583 b'',
6590 6584 _(b'shelve with the specified commit date'),
6591 6585 _(b'DATE'),
6592 6586 ),
6593 6587 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6594 6588 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6595 6589 (
6596 6590 b'k',
6597 6591 b'keep',
6598 6592 False,
6599 6593 _(b'shelve, but keep changes in the working directory'),
6600 6594 ),
6601 6595 (b'l', b'list', None, _(b'list current shelves')),
6602 6596 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6603 6597 (
6604 6598 b'n',
6605 6599 b'name',
6606 6600 b'',
6607 6601 _(b'use the given name for the shelved commit'),
6608 6602 _(b'NAME'),
6609 6603 ),
6610 6604 (
6611 6605 b'p',
6612 6606 b'patch',
6613 6607 None,
6614 6608 _(
6615 6609 b'output patches for changes (provide the names of the shelved '
6616 6610 b'changes as positional arguments)'
6617 6611 ),
6618 6612 ),
6619 6613 (b'i', b'interactive', None, _(b'interactive mode')),
6620 6614 (
6621 6615 b'',
6622 6616 b'stat',
6623 6617 None,
6624 6618 _(
6625 6619 b'output diffstat-style summary of changes (provide the names of '
6626 6620 b'the shelved changes as positional arguments)'
6627 6621 ),
6628 6622 ),
6629 6623 ]
6630 6624 + cmdutil.walkopts,
6631 6625 _(b'hg shelve [OPTION]... [FILE]...'),
6632 6626 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6633 6627 )
6634 6628 def shelve(ui, repo, *pats, **opts):
6635 6629 """save and set aside changes from the working directory
6636 6630
6637 6631 Shelving takes files that "hg status" reports as not clean, saves
6638 6632 the modifications to a bundle (a shelved change), and reverts the
6639 6633 files so that their state in the working directory becomes clean.
6640 6634
6641 6635 To restore these changes to the working directory, using "hg
6642 6636 unshelve"; this will work even if you switch to a different
6643 6637 commit.
6644 6638
6645 6639 When no files are specified, "hg shelve" saves all not-clean
6646 6640 files. If specific files or directories are named, only changes to
6647 6641 those files are shelved.
6648 6642
6649 6643 In bare shelve (when no files are specified, without interactive,
6650 6644 include and exclude option), shelving remembers information if the
6651 6645 working directory was on newly created branch, in other words working
6652 6646 directory was on different branch than its first parent. In this
6653 6647 situation unshelving restores branch information to the working directory.
6654 6648
6655 6649 Each shelved change has a name that makes it easier to find later.
6656 6650 The name of a shelved change defaults to being based on the active
6657 6651 bookmark, or if there is no active bookmark, the current named
6658 6652 branch. To specify a different name, use ``--name``.
6659 6653
6660 6654 To see a list of existing shelved changes, use the ``--list``
6661 6655 option. For each shelved change, this will print its name, age,
6662 6656 and description; use ``--patch`` or ``--stat`` for more details.
6663 6657
6664 6658 To delete specific shelved changes, use ``--delete``. To delete
6665 6659 all shelved changes, use ``--cleanup``.
6666 6660 """
6667 6661 opts = pycompat.byteskwargs(opts)
6668 6662 allowables = [
6669 6663 (b'addremove', {b'create'}), # 'create' is pseudo action
6670 6664 (b'unknown', {b'create'}),
6671 6665 (b'cleanup', {b'cleanup'}),
6672 6666 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6673 6667 (b'delete', {b'delete'}),
6674 6668 (b'edit', {b'create'}),
6675 6669 (b'keep', {b'create'}),
6676 6670 (b'list', {b'list'}),
6677 6671 (b'message', {b'create'}),
6678 6672 (b'name', {b'create'}),
6679 6673 (b'patch', {b'patch', b'list'}),
6680 6674 (b'stat', {b'stat', b'list'}),
6681 6675 ]
6682 6676
6683 6677 def checkopt(opt):
6684 6678 if opts.get(opt):
6685 6679 for i, allowable in allowables:
6686 6680 if opts[i] and opt not in allowable:
6687 6681 raise error.InputError(
6688 6682 _(
6689 6683 b"options '--%s' and '--%s' may not be "
6690 6684 b"used together"
6691 6685 )
6692 6686 % (opt, i)
6693 6687 )
6694 6688 return True
6695 6689
6696 6690 if checkopt(b'cleanup'):
6697 6691 if pats:
6698 6692 raise error.InputError(
6699 6693 _(b"cannot specify names when using '--cleanup'")
6700 6694 )
6701 6695 return shelvemod.cleanupcmd(ui, repo)
6702 6696 elif checkopt(b'delete'):
6703 6697 return shelvemod.deletecmd(ui, repo, pats)
6704 6698 elif checkopt(b'list'):
6705 6699 return shelvemod.listcmd(ui, repo, pats, opts)
6706 6700 elif checkopt(b'patch') or checkopt(b'stat'):
6707 6701 return shelvemod.patchcmds(ui, repo, pats, opts)
6708 6702 else:
6709 6703 return shelvemod.createcmd(ui, repo, pats, opts)
6710 6704
6711 6705
6712 6706 _NOTTERSE = b'nothing'
6713 6707
6714 6708
6715 6709 @command(
6716 6710 b'status|st',
6717 6711 [
6718 6712 (b'A', b'all', None, _(b'show status of all files')),
6719 6713 (b'm', b'modified', None, _(b'show only modified files')),
6720 6714 (b'a', b'added', None, _(b'show only added files')),
6721 6715 (b'r', b'removed', None, _(b'show only removed files')),
6722 6716 (b'd', b'deleted', None, _(b'show only missing files')),
6723 6717 (b'c', b'clean', None, _(b'show only files without changes')),
6724 6718 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6725 6719 (b'i', b'ignored', None, _(b'show only ignored files')),
6726 6720 (b'n', b'no-status', None, _(b'hide status prefix')),
6727 6721 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6728 6722 (
6729 6723 b'C',
6730 6724 b'copies',
6731 6725 None,
6732 6726 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6733 6727 ),
6734 6728 (
6735 6729 b'0',
6736 6730 b'print0',
6737 6731 None,
6738 6732 _(b'end filenames with NUL, for use with xargs'),
6739 6733 ),
6740 6734 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6741 6735 (
6742 6736 b'',
6743 6737 b'change',
6744 6738 b'',
6745 6739 _(b'list the changed files of a revision'),
6746 6740 _(b'REV'),
6747 6741 ),
6748 6742 ]
6749 6743 + walkopts
6750 6744 + subrepoopts
6751 6745 + formatteropts,
6752 6746 _(b'[OPTION]... [FILE]...'),
6753 6747 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6754 6748 helpbasic=True,
6755 6749 inferrepo=True,
6756 6750 intents={INTENT_READONLY},
6757 6751 )
6758 6752 def status(ui, repo, *pats, **opts):
6759 6753 """show changed files in the working directory
6760 6754
6761 6755 Show status of files in the repository. If names are given, only
6762 6756 files that match are shown. Files that are clean or ignored or
6763 6757 the source of a copy/move operation, are not listed unless
6764 6758 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6765 6759 Unless options described with "show only ..." are given, the
6766 6760 options -mardu are used.
6767 6761
6768 6762 Option -q/--quiet hides untracked (unknown and ignored) files
6769 6763 unless explicitly requested with -u/--unknown or -i/--ignored.
6770 6764
6771 6765 .. note::
6772 6766
6773 6767 :hg:`status` may appear to disagree with diff if permissions have
6774 6768 changed or a merge has occurred. The standard diff format does
6775 6769 not report permission changes and diff only reports changes
6776 6770 relative to one merge parent.
6777 6771
6778 6772 If one revision is given, it is used as the base revision.
6779 6773 If two revisions are given, the differences between them are
6780 6774 shown. The --change option can also be used as a shortcut to list
6781 6775 the changed files of a revision from its first parent.
6782 6776
6783 6777 The codes used to show the status of files are::
6784 6778
6785 6779 M = modified
6786 6780 A = added
6787 6781 R = removed
6788 6782 C = clean
6789 6783 ! = missing (deleted by non-hg command, but still tracked)
6790 6784 ? = not tracked
6791 6785 I = ignored
6792 6786 = origin of the previous file (with --copies)
6793 6787
6794 6788 .. container:: verbose
6795 6789
6796 6790 The -t/--terse option abbreviates the output by showing only the directory
6797 6791 name if all the files in it share the same status. The option takes an
6798 6792 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6799 6793 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6800 6794 for 'ignored' and 'c' for clean.
6801 6795
6802 6796 It abbreviates only those statuses which are passed. Note that clean and
6803 6797 ignored files are not displayed with '--terse ic' unless the -c/--clean
6804 6798 and -i/--ignored options are also used.
6805 6799
6806 6800 The -v/--verbose option shows information when the repository is in an
6807 6801 unfinished merge, shelve, rebase state etc. You can have this behavior
6808 6802 turned on by default by enabling the ``commands.status.verbose`` option.
6809 6803
6810 6804 You can skip displaying some of these states by setting
6811 6805 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6812 6806 'histedit', 'merge', 'rebase', or 'unshelve'.
6813 6807
6814 6808 Template:
6815 6809
6816 6810 The following keywords are supported in addition to the common template
6817 6811 keywords and functions. See also :hg:`help templates`.
6818 6812
6819 6813 :path: String. Repository-absolute path of the file.
6820 6814 :source: String. Repository-absolute path of the file originated from.
6821 6815 Available if ``--copies`` is specified.
6822 6816 :status: String. Character denoting file's status.
6823 6817
6824 6818 Examples:
6825 6819
6826 6820 - show changes in the working directory relative to a
6827 6821 changeset::
6828 6822
6829 6823 hg status --rev 9353
6830 6824
6831 6825 - show changes in the working directory relative to the
6832 6826 current directory (see :hg:`help patterns` for more information)::
6833 6827
6834 6828 hg status re:
6835 6829
6836 6830 - show all changes including copies in an existing changeset::
6837 6831
6838 6832 hg status --copies --change 9353
6839 6833
6840 6834 - get a NUL separated list of added files, suitable for xargs::
6841 6835
6842 6836 hg status -an0
6843 6837
6844 6838 - show more information about the repository status, abbreviating
6845 6839 added, removed, modified, deleted, and untracked paths::
6846 6840
6847 6841 hg status -v -t mardu
6848 6842
6849 6843 Returns 0 on success.
6850 6844
6851 6845 """
6852 6846
6853 6847 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6854 6848 opts = pycompat.byteskwargs(opts)
6855 6849 revs = opts.get(b'rev')
6856 6850 change = opts.get(b'change')
6857 6851 terse = opts.get(b'terse')
6858 6852 if terse is _NOTTERSE:
6859 6853 if revs:
6860 6854 terse = b''
6861 6855 else:
6862 6856 terse = ui.config(b'commands', b'status.terse')
6863 6857
6864 6858 if revs and terse:
6865 6859 msg = _(b'cannot use --terse with --rev')
6866 6860 raise error.InputError(msg)
6867 6861 elif change:
6868 6862 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6869 6863 ctx2 = scmutil.revsingle(repo, change, None)
6870 6864 ctx1 = ctx2.p1()
6871 6865 else:
6872 6866 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6873 6867 ctx1, ctx2 = scmutil.revpair(repo, revs)
6874 6868
6875 6869 forcerelativevalue = None
6876 6870 if ui.hasconfig(b'commands', b'status.relative'):
6877 6871 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6878 6872 uipathfn = scmutil.getuipathfn(
6879 6873 repo,
6880 6874 legacyrelativevalue=bool(pats),
6881 6875 forcerelativevalue=forcerelativevalue,
6882 6876 )
6883 6877
6884 6878 if opts.get(b'print0'):
6885 6879 end = b'\0'
6886 6880 else:
6887 6881 end = b'\n'
6888 6882 states = b'modified added removed deleted unknown ignored clean'.split()
6889 6883 show = [k for k in states if opts.get(k)]
6890 6884 if opts.get(b'all'):
6891 6885 show += ui.quiet and (states[:4] + [b'clean']) or states
6892 6886
6893 6887 if not show:
6894 6888 if ui.quiet:
6895 6889 show = states[:4]
6896 6890 else:
6897 6891 show = states[:5]
6898 6892
6899 6893 m = scmutil.match(ctx2, pats, opts)
6900 6894 if terse:
6901 6895 # we need to compute clean and unknown to terse
6902 6896 stat = repo.status(
6903 6897 ctx1.node(),
6904 6898 ctx2.node(),
6905 6899 m,
6906 6900 b'ignored' in show or b'i' in terse,
6907 6901 clean=True,
6908 6902 unknown=True,
6909 6903 listsubrepos=opts.get(b'subrepos'),
6910 6904 )
6911 6905
6912 6906 stat = cmdutil.tersedir(stat, terse)
6913 6907 else:
6914 6908 stat = repo.status(
6915 6909 ctx1.node(),
6916 6910 ctx2.node(),
6917 6911 m,
6918 6912 b'ignored' in show,
6919 6913 b'clean' in show,
6920 6914 b'unknown' in show,
6921 6915 opts.get(b'subrepos'),
6922 6916 )
6923 6917
6924 6918 changestates = zip(
6925 6919 states,
6926 6920 pycompat.iterbytestr(b'MAR!?IC'),
6927 6921 [getattr(stat, s.decode('utf8')) for s in states],
6928 6922 )
6929 6923
6930 6924 copy = {}
6931 6925 if (
6932 6926 opts.get(b'all')
6933 6927 or opts.get(b'copies')
6934 6928 or ui.configbool(b'ui', b'statuscopies')
6935 6929 ) and not opts.get(b'no_status'):
6936 6930 copy = copies.pathcopies(ctx1, ctx2, m)
6937 6931
6938 6932 morestatus = None
6939 6933 if (
6940 6934 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6941 6935 and not ui.plain()
6942 6936 and not opts.get(b'print0')
6943 6937 ):
6944 6938 morestatus = cmdutil.readmorestatus(repo)
6945 6939
6946 6940 ui.pager(b'status')
6947 6941 fm = ui.formatter(b'status', opts)
6948 6942 fmt = b'%s' + end
6949 6943 showchar = not opts.get(b'no_status')
6950 6944
6951 6945 for state, char, files in changestates:
6952 6946 if state in show:
6953 6947 label = b'status.' + state
6954 6948 for f in files:
6955 6949 fm.startitem()
6956 6950 fm.context(ctx=ctx2)
6957 6951 fm.data(itemtype=b'file', path=f)
6958 6952 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6959 6953 fm.plain(fmt % uipathfn(f), label=label)
6960 6954 if f in copy:
6961 6955 fm.data(source=copy[f])
6962 6956 fm.plain(
6963 6957 (b' %s' + end) % uipathfn(copy[f]),
6964 6958 label=b'status.copied',
6965 6959 )
6966 6960 if morestatus:
6967 6961 morestatus.formatfile(f, fm)
6968 6962
6969 6963 if morestatus:
6970 6964 morestatus.formatfooter(fm)
6971 6965 fm.end()
6972 6966
6973 6967
6974 6968 @command(
6975 6969 b'summary|sum',
6976 6970 [(b'', b'remote', None, _(b'check for push and pull'))],
6977 6971 b'[--remote]',
6978 6972 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6979 6973 helpbasic=True,
6980 6974 intents={INTENT_READONLY},
6981 6975 )
6982 6976 def summary(ui, repo, **opts):
6983 6977 """summarize working directory state
6984 6978
6985 6979 This generates a brief summary of the working directory state,
6986 6980 including parents, branch, commit status, phase and available updates.
6987 6981
6988 6982 With the --remote option, this will check the default paths for
6989 6983 incoming and outgoing changes. This can be time-consuming.
6990 6984
6991 6985 Returns 0 on success.
6992 6986 """
6993 6987
6994 6988 opts = pycompat.byteskwargs(opts)
6995 6989 ui.pager(b'summary')
6996 6990 ctx = repo[None]
6997 6991 parents = ctx.parents()
6998 6992 pnode = parents[0].node()
6999 6993 marks = []
7000 6994
7001 6995 try:
7002 6996 ms = mergestatemod.mergestate.read(repo)
7003 6997 except error.UnsupportedMergeRecords as e:
7004 6998 s = b' '.join(e.recordtypes)
7005 6999 ui.warn(
7006 7000 _(b'warning: merge state has unsupported record types: %s\n') % s
7007 7001 )
7008 7002 unresolved = []
7009 7003 else:
7010 7004 unresolved = list(ms.unresolved())
7011 7005
7012 7006 for p in parents:
7013 7007 # label with log.changeset (instead of log.parent) since this
7014 7008 # shows a working directory parent *changeset*:
7015 7009 # i18n: column positioning for "hg summary"
7016 7010 ui.write(
7017 7011 _(b'parent: %d:%s ') % (p.rev(), p),
7018 7012 label=logcmdutil.changesetlabels(p),
7019 7013 )
7020 7014 ui.write(b' '.join(p.tags()), label=b'log.tag')
7021 7015 if p.bookmarks():
7022 7016 marks.extend(p.bookmarks())
7023 7017 if p.rev() == -1:
7024 7018 if not len(repo):
7025 7019 ui.write(_(b' (empty repository)'))
7026 7020 else:
7027 7021 ui.write(_(b' (no revision checked out)'))
7028 7022 if p.obsolete():
7029 7023 ui.write(_(b' (obsolete)'))
7030 7024 if p.isunstable():
7031 7025 instabilities = (
7032 7026 ui.label(instability, b'trouble.%s' % instability)
7033 7027 for instability in p.instabilities()
7034 7028 )
7035 7029 ui.write(b' (' + b', '.join(instabilities) + b')')
7036 7030 ui.write(b'\n')
7037 7031 if p.description():
7038 7032 ui.status(
7039 7033 b' ' + p.description().splitlines()[0].strip() + b'\n',
7040 7034 label=b'log.summary',
7041 7035 )
7042 7036
7043 7037 branch = ctx.branch()
7044 7038 bheads = repo.branchheads(branch)
7045 7039 # i18n: column positioning for "hg summary"
7046 7040 m = _(b'branch: %s\n') % branch
7047 7041 if branch != b'default':
7048 7042 ui.write(m, label=b'log.branch')
7049 7043 else:
7050 7044 ui.status(m, label=b'log.branch')
7051 7045
7052 7046 if marks:
7053 7047 active = repo._activebookmark
7054 7048 # i18n: column positioning for "hg summary"
7055 7049 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7056 7050 if active is not None:
7057 7051 if active in marks:
7058 7052 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7059 7053 marks.remove(active)
7060 7054 else:
7061 7055 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7062 7056 for m in marks:
7063 7057 ui.write(b' ' + m, label=b'log.bookmark')
7064 7058 ui.write(b'\n', label=b'log.bookmark')
7065 7059
7066 7060 status = repo.status(unknown=True)
7067 7061
7068 7062 c = repo.dirstate.copies()
7069 7063 copied, renamed = [], []
7070 7064 for d, s in pycompat.iteritems(c):
7071 7065 if s in status.removed:
7072 7066 status.removed.remove(s)
7073 7067 renamed.append(d)
7074 7068 else:
7075 7069 copied.append(d)
7076 7070 if d in status.added:
7077 7071 status.added.remove(d)
7078 7072
7079 7073 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7080 7074
7081 7075 labels = [
7082 7076 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7083 7077 (ui.label(_(b'%d added'), b'status.added'), status.added),
7084 7078 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7085 7079 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7086 7080 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7087 7081 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7088 7082 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7089 7083 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7090 7084 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7091 7085 ]
7092 7086 t = []
7093 7087 for l, s in labels:
7094 7088 if s:
7095 7089 t.append(l % len(s))
7096 7090
7097 7091 t = b', '.join(t)
7098 7092 cleanworkdir = False
7099 7093
7100 7094 if repo.vfs.exists(b'graftstate'):
7101 7095 t += _(b' (graft in progress)')
7102 7096 if repo.vfs.exists(b'updatestate'):
7103 7097 t += _(b' (interrupted update)')
7104 7098 elif len(parents) > 1:
7105 7099 t += _(b' (merge)')
7106 7100 elif branch != parents[0].branch():
7107 7101 t += _(b' (new branch)')
7108 7102 elif parents[0].closesbranch() and pnode in repo.branchheads(
7109 7103 branch, closed=True
7110 7104 ):
7111 7105 t += _(b' (head closed)')
7112 7106 elif not (
7113 7107 status.modified
7114 7108 or status.added
7115 7109 or status.removed
7116 7110 or renamed
7117 7111 or copied
7118 7112 or subs
7119 7113 ):
7120 7114 t += _(b' (clean)')
7121 7115 cleanworkdir = True
7122 7116 elif pnode not in bheads:
7123 7117 t += _(b' (new branch head)')
7124 7118
7125 7119 if parents:
7126 7120 pendingphase = max(p.phase() for p in parents)
7127 7121 else:
7128 7122 pendingphase = phases.public
7129 7123
7130 7124 if pendingphase > phases.newcommitphase(ui):
7131 7125 t += b' (%s)' % phases.phasenames[pendingphase]
7132 7126
7133 7127 if cleanworkdir:
7134 7128 # i18n: column positioning for "hg summary"
7135 7129 ui.status(_(b'commit: %s\n') % t.strip())
7136 7130 else:
7137 7131 # i18n: column positioning for "hg summary"
7138 7132 ui.write(_(b'commit: %s\n') % t.strip())
7139 7133
7140 7134 # all ancestors of branch heads - all ancestors of parent = new csets
7141 7135 new = len(
7142 7136 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7143 7137 )
7144 7138
7145 7139 if new == 0:
7146 7140 # i18n: column positioning for "hg summary"
7147 7141 ui.status(_(b'update: (current)\n'))
7148 7142 elif pnode not in bheads:
7149 7143 # i18n: column positioning for "hg summary"
7150 7144 ui.write(_(b'update: %d new changesets (update)\n') % new)
7151 7145 else:
7152 7146 # i18n: column positioning for "hg summary"
7153 7147 ui.write(
7154 7148 _(b'update: %d new changesets, %d branch heads (merge)\n')
7155 7149 % (new, len(bheads))
7156 7150 )
7157 7151
7158 7152 t = []
7159 7153 draft = len(repo.revs(b'draft()'))
7160 7154 if draft:
7161 7155 t.append(_(b'%d draft') % draft)
7162 7156 secret = len(repo.revs(b'secret()'))
7163 7157 if secret:
7164 7158 t.append(_(b'%d secret') % secret)
7165 7159
7166 7160 if draft or secret:
7167 7161 ui.status(_(b'phases: %s\n') % b', '.join(t))
7168 7162
7169 7163 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7170 7164 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7171 7165 numtrouble = len(repo.revs(trouble + b"()"))
7172 7166 # We write all the possibilities to ease translation
7173 7167 troublemsg = {
7174 7168 b"orphan": _(b"orphan: %d changesets"),
7175 7169 b"contentdivergent": _(b"content-divergent: %d changesets"),
7176 7170 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7177 7171 }
7178 7172 if numtrouble > 0:
7179 7173 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7180 7174
7181 7175 cmdutil.summaryhooks(ui, repo)
7182 7176
7183 7177 if opts.get(b'remote'):
7184 7178 needsincoming, needsoutgoing = True, True
7185 7179 else:
7186 7180 needsincoming, needsoutgoing = False, False
7187 7181 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7188 7182 if i:
7189 7183 needsincoming = True
7190 7184 if o:
7191 7185 needsoutgoing = True
7192 7186 if not needsincoming and not needsoutgoing:
7193 7187 return
7194 7188
7195 7189 def getincoming():
7196 7190 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7197 7191 sbranch = branches[0]
7198 7192 try:
7199 7193 other = hg.peer(repo, {}, source)
7200 7194 except error.RepoError:
7201 7195 if opts.get(b'remote'):
7202 7196 raise
7203 7197 return source, sbranch, None, None, None
7204 7198 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7205 7199 if revs:
7206 7200 revs = [other.lookup(rev) for rev in revs]
7207 7201 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7208 7202 repo.ui.pushbuffer()
7209 7203 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7210 7204 repo.ui.popbuffer()
7211 7205 return source, sbranch, other, commoninc, commoninc[1]
7212 7206
7213 7207 if needsincoming:
7214 7208 source, sbranch, sother, commoninc, incoming = getincoming()
7215 7209 else:
7216 7210 source = sbranch = sother = commoninc = incoming = None
7217 7211
7218 7212 def getoutgoing():
7219 7213 dest, branches = urlutil.parseurl(
7220 7214 ui.expandpath(b'default-push', b'default')
7221 7215 )
7222 7216 dbranch = branches[0]
7223 7217 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7224 7218 if source != dest:
7225 7219 try:
7226 7220 dother = hg.peer(repo, {}, dest)
7227 7221 except error.RepoError:
7228 7222 if opts.get(b'remote'):
7229 7223 raise
7230 7224 return dest, dbranch, None, None
7231 7225 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7232 7226 elif sother is None:
7233 7227 # there is no explicit destination peer, but source one is invalid
7234 7228 return dest, dbranch, None, None
7235 7229 else:
7236 7230 dother = sother
7237 7231 if source != dest or (sbranch is not None and sbranch != dbranch):
7238 7232 common = None
7239 7233 else:
7240 7234 common = commoninc
7241 7235 if revs:
7242 7236 revs = [repo.lookup(rev) for rev in revs]
7243 7237 repo.ui.pushbuffer()
7244 7238 outgoing = discovery.findcommonoutgoing(
7245 7239 repo, dother, onlyheads=revs, commoninc=common
7246 7240 )
7247 7241 repo.ui.popbuffer()
7248 7242 return dest, dbranch, dother, outgoing
7249 7243
7250 7244 if needsoutgoing:
7251 7245 dest, dbranch, dother, outgoing = getoutgoing()
7252 7246 else:
7253 7247 dest = dbranch = dother = outgoing = None
7254 7248
7255 7249 if opts.get(b'remote'):
7256 7250 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7257 7251 # The former always sets `sother` (or raises an exception if it can't);
7258 7252 # the latter always sets `outgoing`.
7259 7253 assert sother is not None
7260 7254 assert outgoing is not None
7261 7255
7262 7256 t = []
7263 7257 if incoming:
7264 7258 t.append(_(b'1 or more incoming'))
7265 7259 o = outgoing.missing
7266 7260 if o:
7267 7261 t.append(_(b'%d outgoing') % len(o))
7268 7262 other = dother or sother
7269 7263 if b'bookmarks' in other.listkeys(b'namespaces'):
7270 7264 counts = bookmarks.summary(repo, other)
7271 7265 if counts[0] > 0:
7272 7266 t.append(_(b'%d incoming bookmarks') % counts[0])
7273 7267 if counts[1] > 0:
7274 7268 t.append(_(b'%d outgoing bookmarks') % counts[1])
7275 7269
7276 7270 if t:
7277 7271 # i18n: column positioning for "hg summary"
7278 7272 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7279 7273 else:
7280 7274 # i18n: column positioning for "hg summary"
7281 7275 ui.status(_(b'remote: (synced)\n'))
7282 7276
7283 7277 cmdutil.summaryremotehooks(
7284 7278 ui,
7285 7279 repo,
7286 7280 opts,
7287 7281 (
7288 7282 (source, sbranch, sother, commoninc),
7289 7283 (dest, dbranch, dother, outgoing),
7290 7284 ),
7291 7285 )
7292 7286
7293 7287
7294 7288 @command(
7295 7289 b'tag',
7296 7290 [
7297 7291 (b'f', b'force', None, _(b'force tag')),
7298 7292 (b'l', b'local', None, _(b'make the tag local')),
7299 7293 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7300 7294 (b'', b'remove', None, _(b'remove a tag')),
7301 7295 # -l/--local is already there, commitopts cannot be used
7302 7296 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7303 7297 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7304 7298 ]
7305 7299 + commitopts2,
7306 7300 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7307 7301 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7308 7302 )
7309 7303 def tag(ui, repo, name1, *names, **opts):
7310 7304 """add one or more tags for the current or given revision
7311 7305
7312 7306 Name a particular revision using <name>.
7313 7307
7314 7308 Tags are used to name particular revisions of the repository and are
7315 7309 very useful to compare different revisions, to go back to significant
7316 7310 earlier versions or to mark branch points as releases, etc. Changing
7317 7311 an existing tag is normally disallowed; use -f/--force to override.
7318 7312
7319 7313 If no revision is given, the parent of the working directory is
7320 7314 used.
7321 7315
7322 7316 To facilitate version control, distribution, and merging of tags,
7323 7317 they are stored as a file named ".hgtags" which is managed similarly
7324 7318 to other project files and can be hand-edited if necessary. This
7325 7319 also means that tagging creates a new commit. The file
7326 7320 ".hg/localtags" is used for local tags (not shared among
7327 7321 repositories).
7328 7322
7329 7323 Tag commits are usually made at the head of a branch. If the parent
7330 7324 of the working directory is not a branch head, :hg:`tag` aborts; use
7331 7325 -f/--force to force the tag commit to be based on a non-head
7332 7326 changeset.
7333 7327
7334 7328 See :hg:`help dates` for a list of formats valid for -d/--date.
7335 7329
7336 7330 Since tag names have priority over branch names during revision
7337 7331 lookup, using an existing branch name as a tag name is discouraged.
7338 7332
7339 7333 Returns 0 on success.
7340 7334 """
7341 7335 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7342 7336 opts = pycompat.byteskwargs(opts)
7343 7337 with repo.wlock(), repo.lock():
7344 7338 rev_ = b"."
7345 7339 names = [t.strip() for t in (name1,) + names]
7346 7340 if len(names) != len(set(names)):
7347 7341 raise error.InputError(_(b'tag names must be unique'))
7348 7342 for n in names:
7349 7343 scmutil.checknewlabel(repo, n, b'tag')
7350 7344 if not n:
7351 7345 raise error.InputError(
7352 7346 _(b'tag names cannot consist entirely of whitespace')
7353 7347 )
7354 7348 if opts.get(b'rev'):
7355 7349 rev_ = opts[b'rev']
7356 7350 message = opts.get(b'message')
7357 7351 if opts.get(b'remove'):
7358 7352 if opts.get(b'local'):
7359 7353 expectedtype = b'local'
7360 7354 else:
7361 7355 expectedtype = b'global'
7362 7356
7363 7357 for n in names:
7364 7358 if repo.tagtype(n) == b'global':
7365 7359 alltags = tagsmod.findglobaltags(ui, repo)
7366 7360 if alltags[n][0] == nullid:
7367 7361 raise error.InputError(
7368 7362 _(b"tag '%s' is already removed") % n
7369 7363 )
7370 7364 if not repo.tagtype(n):
7371 7365 raise error.InputError(_(b"tag '%s' does not exist") % n)
7372 7366 if repo.tagtype(n) != expectedtype:
7373 7367 if expectedtype == b'global':
7374 7368 raise error.InputError(
7375 7369 _(b"tag '%s' is not a global tag") % n
7376 7370 )
7377 7371 else:
7378 7372 raise error.InputError(
7379 7373 _(b"tag '%s' is not a local tag") % n
7380 7374 )
7381 7375 rev_ = b'null'
7382 7376 if not message:
7383 7377 # we don't translate commit messages
7384 7378 message = b'Removed tag %s' % b', '.join(names)
7385 7379 elif not opts.get(b'force'):
7386 7380 for n in names:
7387 7381 if n in repo.tags():
7388 7382 raise error.InputError(
7389 7383 _(b"tag '%s' already exists (use -f to force)") % n
7390 7384 )
7391 7385 if not opts.get(b'local'):
7392 7386 p1, p2 = repo.dirstate.parents()
7393 7387 if p2 != nullid:
7394 7388 raise error.StateError(_(b'uncommitted merge'))
7395 7389 bheads = repo.branchheads()
7396 7390 if not opts.get(b'force') and bheads and p1 not in bheads:
7397 7391 raise error.InputError(
7398 7392 _(
7399 7393 b'working directory is not at a branch head '
7400 7394 b'(use -f to force)'
7401 7395 )
7402 7396 )
7403 7397 node = scmutil.revsingle(repo, rev_).node()
7404 7398
7405 7399 if not message:
7406 7400 # we don't translate commit messages
7407 7401 message = b'Added tag %s for changeset %s' % (
7408 7402 b', '.join(names),
7409 7403 short(node),
7410 7404 )
7411 7405
7412 7406 date = opts.get(b'date')
7413 7407 if date:
7414 7408 date = dateutil.parsedate(date)
7415 7409
7416 7410 if opts.get(b'remove'):
7417 7411 editform = b'tag.remove'
7418 7412 else:
7419 7413 editform = b'tag.add'
7420 7414 editor = cmdutil.getcommiteditor(
7421 7415 editform=editform, **pycompat.strkwargs(opts)
7422 7416 )
7423 7417
7424 7418 # don't allow tagging the null rev
7425 7419 if (
7426 7420 not opts.get(b'remove')
7427 7421 and scmutil.revsingle(repo, rev_).rev() == nullrev
7428 7422 ):
7429 7423 raise error.InputError(_(b"cannot tag null revision"))
7430 7424
7431 7425 tagsmod.tag(
7432 7426 repo,
7433 7427 names,
7434 7428 node,
7435 7429 message,
7436 7430 opts.get(b'local'),
7437 7431 opts.get(b'user'),
7438 7432 date,
7439 7433 editor=editor,
7440 7434 )
7441 7435
7442 7436
7443 7437 @command(
7444 7438 b'tags',
7445 7439 formatteropts,
7446 7440 b'',
7447 7441 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7448 7442 intents={INTENT_READONLY},
7449 7443 )
7450 7444 def tags(ui, repo, **opts):
7451 7445 """list repository tags
7452 7446
7453 7447 This lists both regular and local tags. When the -v/--verbose
7454 7448 switch is used, a third column "local" is printed for local tags.
7455 7449 When the -q/--quiet switch is used, only the tag name is printed.
7456 7450
7457 7451 .. container:: verbose
7458 7452
7459 7453 Template:
7460 7454
7461 7455 The following keywords are supported in addition to the common template
7462 7456 keywords and functions such as ``{tag}``. See also
7463 7457 :hg:`help templates`.
7464 7458
7465 7459 :type: String. ``local`` for local tags.
7466 7460
7467 7461 Returns 0 on success.
7468 7462 """
7469 7463
7470 7464 opts = pycompat.byteskwargs(opts)
7471 7465 ui.pager(b'tags')
7472 7466 fm = ui.formatter(b'tags', opts)
7473 7467 hexfunc = fm.hexfunc
7474 7468
7475 7469 for t, n in reversed(repo.tagslist()):
7476 7470 hn = hexfunc(n)
7477 7471 label = b'tags.normal'
7478 7472 tagtype = repo.tagtype(t)
7479 7473 if not tagtype or tagtype == b'global':
7480 7474 tagtype = b''
7481 7475 else:
7482 7476 label = b'tags.' + tagtype
7483 7477
7484 7478 fm.startitem()
7485 7479 fm.context(repo=repo)
7486 7480 fm.write(b'tag', b'%s', t, label=label)
7487 7481 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7488 7482 fm.condwrite(
7489 7483 not ui.quiet,
7490 7484 b'rev node',
7491 7485 fmt,
7492 7486 repo.changelog.rev(n),
7493 7487 hn,
7494 7488 label=label,
7495 7489 )
7496 7490 fm.condwrite(
7497 7491 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7498 7492 )
7499 7493 fm.plain(b'\n')
7500 7494 fm.end()
7501 7495
7502 7496
7503 7497 @command(
7504 7498 b'tip',
7505 7499 [
7506 7500 (b'p', b'patch', None, _(b'show patch')),
7507 7501 (b'g', b'git', None, _(b'use git extended diff format')),
7508 7502 ]
7509 7503 + templateopts,
7510 7504 _(b'[-p] [-g]'),
7511 7505 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7512 7506 )
7513 7507 def tip(ui, repo, **opts):
7514 7508 """show the tip revision (DEPRECATED)
7515 7509
7516 7510 The tip revision (usually just called the tip) is the changeset
7517 7511 most recently added to the repository (and therefore the most
7518 7512 recently changed head).
7519 7513
7520 7514 If you have just made a commit, that commit will be the tip. If
7521 7515 you have just pulled changes from another repository, the tip of
7522 7516 that repository becomes the current tip. The "tip" tag is special
7523 7517 and cannot be renamed or assigned to a different changeset.
7524 7518
7525 7519 This command is deprecated, please use :hg:`heads` instead.
7526 7520
7527 7521 Returns 0 on success.
7528 7522 """
7529 7523 opts = pycompat.byteskwargs(opts)
7530 7524 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7531 7525 displayer.show(repo[b'tip'])
7532 7526 displayer.close()
7533 7527
7534 7528
7535 7529 @command(
7536 7530 b'unbundle',
7537 7531 [
7538 7532 (
7539 7533 b'u',
7540 7534 b'update',
7541 7535 None,
7542 7536 _(b'update to new branch head if changesets were unbundled'),
7543 7537 )
7544 7538 ],
7545 7539 _(b'[-u] FILE...'),
7546 7540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7547 7541 )
7548 7542 def unbundle(ui, repo, fname1, *fnames, **opts):
7549 7543 """apply one or more bundle files
7550 7544
7551 7545 Apply one or more bundle files generated by :hg:`bundle`.
7552 7546
7553 7547 Returns 0 on success, 1 if an update has unresolved files.
7554 7548 """
7555 7549 fnames = (fname1,) + fnames
7556 7550
7557 7551 with repo.lock():
7558 7552 for fname in fnames:
7559 7553 f = hg.openpath(ui, fname)
7560 7554 gen = exchange.readbundle(ui, f, fname)
7561 7555 if isinstance(gen, streamclone.streamcloneapplier):
7562 7556 raise error.InputError(
7563 7557 _(
7564 7558 b'packed bundles cannot be applied with '
7565 7559 b'"hg unbundle"'
7566 7560 ),
7567 7561 hint=_(b'use "hg debugapplystreamclonebundle"'),
7568 7562 )
7569 7563 url = b'bundle:' + fname
7570 7564 try:
7571 7565 txnname = b'unbundle'
7572 7566 if not isinstance(gen, bundle2.unbundle20):
7573 7567 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7574 7568 with repo.transaction(txnname) as tr:
7575 7569 op = bundle2.applybundle(
7576 7570 repo, gen, tr, source=b'unbundle', url=url
7577 7571 )
7578 7572 except error.BundleUnknownFeatureError as exc:
7579 7573 raise error.Abort(
7580 7574 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7581 7575 hint=_(
7582 7576 b"see https://mercurial-scm.org/"
7583 7577 b"wiki/BundleFeature for more "
7584 7578 b"information"
7585 7579 ),
7586 7580 )
7587 7581 modheads = bundle2.combinechangegroupresults(op)
7588 7582
7589 7583 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7590 7584 return 1
7591 7585 else:
7592 7586 return 0
7593 7587
7594 7588
7595 7589 @command(
7596 7590 b'unshelve',
7597 7591 [
7598 7592 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7599 7593 (
7600 7594 b'c',
7601 7595 b'continue',
7602 7596 None,
7603 7597 _(b'continue an incomplete unshelve operation'),
7604 7598 ),
7605 7599 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7606 7600 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7607 7601 (
7608 7602 b'n',
7609 7603 b'name',
7610 7604 b'',
7611 7605 _(b'restore shelved change with given name'),
7612 7606 _(b'NAME'),
7613 7607 ),
7614 7608 (b't', b'tool', b'', _(b'specify merge tool')),
7615 7609 (
7616 7610 b'',
7617 7611 b'date',
7618 7612 b'',
7619 7613 _(b'set date for temporary commits (DEPRECATED)'),
7620 7614 _(b'DATE'),
7621 7615 ),
7622 7616 ],
7623 7617 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7624 7618 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7625 7619 )
7626 7620 def unshelve(ui, repo, *shelved, **opts):
7627 7621 """restore a shelved change to the working directory
7628 7622
7629 7623 This command accepts an optional name of a shelved change to
7630 7624 restore. If none is given, the most recent shelved change is used.
7631 7625
7632 7626 If a shelved change is applied successfully, the bundle that
7633 7627 contains the shelved changes is moved to a backup location
7634 7628 (.hg/shelve-backup).
7635 7629
7636 7630 Since you can restore a shelved change on top of an arbitrary
7637 7631 commit, it is possible that unshelving will result in a conflict
7638 7632 between your changes and the commits you are unshelving onto. If
7639 7633 this occurs, you must resolve the conflict, then use
7640 7634 ``--continue`` to complete the unshelve operation. (The bundle
7641 7635 will not be moved until you successfully complete the unshelve.)
7642 7636
7643 7637 (Alternatively, you can use ``--abort`` to abandon an unshelve
7644 7638 that causes a conflict. This reverts the unshelved changes, and
7645 7639 leaves the bundle in place.)
7646 7640
7647 7641 If bare shelved change (without interactive, include and exclude
7648 7642 option) was done on newly created branch it would restore branch
7649 7643 information to the working directory.
7650 7644
7651 7645 After a successful unshelve, the shelved changes are stored in a
7652 7646 backup directory. Only the N most recent backups are kept. N
7653 7647 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7654 7648 configuration option.
7655 7649
7656 7650 .. container:: verbose
7657 7651
7658 7652 Timestamp in seconds is used to decide order of backups. More
7659 7653 than ``maxbackups`` backups are kept, if same timestamp
7660 7654 prevents from deciding exact order of them, for safety.
7661 7655
7662 7656 Selected changes can be unshelved with ``--interactive`` flag.
7663 7657 The working directory is updated with the selected changes, and
7664 7658 only the unselected changes remain shelved.
7665 7659 Note: The whole shelve is applied to working directory first before
7666 7660 running interactively. So, this will bring up all the conflicts between
7667 7661 working directory and the shelve, irrespective of which changes will be
7668 7662 unshelved.
7669 7663 """
7670 7664 with repo.wlock():
7671 7665 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7672 7666
7673 7667
7674 7668 statemod.addunfinished(
7675 7669 b'unshelve',
7676 7670 fname=b'shelvedstate',
7677 7671 continueflag=True,
7678 7672 abortfunc=shelvemod.hgabortunshelve,
7679 7673 continuefunc=shelvemod.hgcontinueunshelve,
7680 7674 cmdmsg=_(b'unshelve already in progress'),
7681 7675 )
7682 7676
7683 7677
7684 7678 @command(
7685 7679 b'update|up|checkout|co',
7686 7680 [
7687 7681 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7688 7682 (b'c', b'check', None, _(b'require clean working directory')),
7689 7683 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7690 7684 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7691 7685 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7692 7686 ]
7693 7687 + mergetoolopts,
7694 7688 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7695 7689 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7696 7690 helpbasic=True,
7697 7691 )
7698 7692 def update(ui, repo, node=None, **opts):
7699 7693 """update working directory (or switch revisions)
7700 7694
7701 7695 Update the repository's working directory to the specified
7702 7696 changeset. If no changeset is specified, update to the tip of the
7703 7697 current named branch and move the active bookmark (see :hg:`help
7704 7698 bookmarks`).
7705 7699
7706 7700 Update sets the working directory's parent revision to the specified
7707 7701 changeset (see :hg:`help parents`).
7708 7702
7709 7703 If the changeset is not a descendant or ancestor of the working
7710 7704 directory's parent and there are uncommitted changes, the update is
7711 7705 aborted. With the -c/--check option, the working directory is checked
7712 7706 for uncommitted changes; if none are found, the working directory is
7713 7707 updated to the specified changeset.
7714 7708
7715 7709 .. container:: verbose
7716 7710
7717 7711 The -C/--clean, -c/--check, and -m/--merge options control what
7718 7712 happens if the working directory contains uncommitted changes.
7719 7713 At most of one of them can be specified.
7720 7714
7721 7715 1. If no option is specified, and if
7722 7716 the requested changeset is an ancestor or descendant of
7723 7717 the working directory's parent, the uncommitted changes
7724 7718 are merged into the requested changeset and the merged
7725 7719 result is left uncommitted. If the requested changeset is
7726 7720 not an ancestor or descendant (that is, it is on another
7727 7721 branch), the update is aborted and the uncommitted changes
7728 7722 are preserved.
7729 7723
7730 7724 2. With the -m/--merge option, the update is allowed even if the
7731 7725 requested changeset is not an ancestor or descendant of
7732 7726 the working directory's parent.
7733 7727
7734 7728 3. With the -c/--check option, the update is aborted and the
7735 7729 uncommitted changes are preserved.
7736 7730
7737 7731 4. With the -C/--clean option, uncommitted changes are discarded and
7738 7732 the working directory is updated to the requested changeset.
7739 7733
7740 7734 To cancel an uncommitted merge (and lose your changes), use
7741 7735 :hg:`merge --abort`.
7742 7736
7743 7737 Use null as the changeset to remove the working directory (like
7744 7738 :hg:`clone -U`).
7745 7739
7746 7740 If you want to revert just one file to an older revision, use
7747 7741 :hg:`revert [-r REV] NAME`.
7748 7742
7749 7743 See :hg:`help dates` for a list of formats valid for -d/--date.
7750 7744
7751 7745 Returns 0 on success, 1 if there are unresolved files.
7752 7746 """
7753 7747 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7754 7748 rev = opts.get('rev')
7755 7749 date = opts.get('date')
7756 7750 clean = opts.get('clean')
7757 7751 check = opts.get('check')
7758 7752 merge = opts.get('merge')
7759 7753 if rev and node:
7760 7754 raise error.InputError(_(b"please specify just one revision"))
7761 7755
7762 7756 if ui.configbool(b'commands', b'update.requiredest'):
7763 7757 if not node and not rev and not date:
7764 7758 raise error.InputError(
7765 7759 _(b'you must specify a destination'),
7766 7760 hint=_(b'for example: hg update ".::"'),
7767 7761 )
7768 7762
7769 7763 if rev is None or rev == b'':
7770 7764 rev = node
7771 7765
7772 7766 if date and rev is not None:
7773 7767 raise error.InputError(_(b"you can't specify a revision and a date"))
7774 7768
7775 7769 updatecheck = None
7776 7770 if check:
7777 7771 updatecheck = b'abort'
7778 7772 elif merge:
7779 7773 updatecheck = b'none'
7780 7774
7781 7775 with repo.wlock():
7782 7776 cmdutil.clearunfinished(repo)
7783 7777 if date:
7784 7778 rev = cmdutil.finddate(ui, repo, date)
7785 7779
7786 7780 # if we defined a bookmark, we have to remember the original name
7787 7781 brev = rev
7788 7782 if rev:
7789 7783 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7790 7784 ctx = scmutil.revsingle(repo, rev, default=None)
7791 7785 rev = ctx.rev()
7792 7786 hidden = ctx.hidden()
7793 7787 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7794 7788 with ui.configoverride(overrides, b'update'):
7795 7789 ret = hg.updatetotally(
7796 7790 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7797 7791 )
7798 7792 if hidden:
7799 7793 ctxstr = ctx.hex()[:12]
7800 7794 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7801 7795
7802 7796 if ctx.obsolete():
7803 7797 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7804 7798 ui.warn(b"(%s)\n" % obsfatemsg)
7805 7799 return ret
7806 7800
7807 7801
7808 7802 @command(
7809 7803 b'verify',
7810 7804 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7811 7805 helpcategory=command.CATEGORY_MAINTENANCE,
7812 7806 )
7813 7807 def verify(ui, repo, **opts):
7814 7808 """verify the integrity of the repository
7815 7809
7816 7810 Verify the integrity of the current repository.
7817 7811
7818 7812 This will perform an extensive check of the repository's
7819 7813 integrity, validating the hashes and checksums of each entry in
7820 7814 the changelog, manifest, and tracked files, as well as the
7821 7815 integrity of their crosslinks and indices.
7822 7816
7823 7817 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7824 7818 for more information about recovery from corruption of the
7825 7819 repository.
7826 7820
7827 7821 Returns 0 on success, 1 if errors are encountered.
7828 7822 """
7829 7823 opts = pycompat.byteskwargs(opts)
7830 7824
7831 7825 level = None
7832 7826 if opts[b'full']:
7833 7827 level = verifymod.VERIFY_FULL
7834 7828 return hg.verify(repo, level)
7835 7829
7836 7830
7837 7831 @command(
7838 7832 b'version',
7839 7833 [] + formatteropts,
7840 7834 helpcategory=command.CATEGORY_HELP,
7841 7835 norepo=True,
7842 7836 intents={INTENT_READONLY},
7843 7837 )
7844 7838 def version_(ui, **opts):
7845 7839 """output version and copyright information
7846 7840
7847 7841 .. container:: verbose
7848 7842
7849 7843 Template:
7850 7844
7851 7845 The following keywords are supported. See also :hg:`help templates`.
7852 7846
7853 7847 :extensions: List of extensions.
7854 7848 :ver: String. Version number.
7855 7849
7856 7850 And each entry of ``{extensions}`` provides the following sub-keywords
7857 7851 in addition to ``{ver}``.
7858 7852
7859 7853 :bundled: Boolean. True if included in the release.
7860 7854 :name: String. Extension name.
7861 7855 """
7862 7856 opts = pycompat.byteskwargs(opts)
7863 7857 if ui.verbose:
7864 7858 ui.pager(b'version')
7865 7859 fm = ui.formatter(b"version", opts)
7866 7860 fm.startitem()
7867 7861 fm.write(
7868 7862 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7869 7863 )
7870 7864 license = _(
7871 7865 b"(see https://mercurial-scm.org for more information)\n"
7872 7866 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7873 7867 b"This is free software; see the source for copying conditions. "
7874 7868 b"There is NO\nwarranty; "
7875 7869 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7876 7870 )
7877 7871 if not ui.quiet:
7878 7872 fm.plain(license)
7879 7873
7880 7874 if ui.verbose:
7881 7875 fm.plain(_(b"\nEnabled extensions:\n\n"))
7882 7876 # format names and versions into columns
7883 7877 names = []
7884 7878 vers = []
7885 7879 isinternals = []
7886 7880 for name, module in sorted(extensions.extensions()):
7887 7881 names.append(name)
7888 7882 vers.append(extensions.moduleversion(module) or None)
7889 7883 isinternals.append(extensions.ismoduleinternal(module))
7890 7884 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7891 7885 if names:
7892 7886 namefmt = b" %%-%ds " % max(len(n) for n in names)
7893 7887 places = [_(b"external"), _(b"internal")]
7894 7888 for n, v, p in zip(names, vers, isinternals):
7895 7889 fn.startitem()
7896 7890 fn.condwrite(ui.verbose, b"name", namefmt, n)
7897 7891 if ui.verbose:
7898 7892 fn.plain(b"%s " % places[p])
7899 7893 fn.data(bundled=p)
7900 7894 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7901 7895 if ui.verbose:
7902 7896 fn.plain(b"\n")
7903 7897 fn.end()
7904 7898 fm.end()
7905 7899
7906 7900
7907 7901 def loadcmdtable(ui, name, cmdtable):
7908 7902 """Load command functions from specified cmdtable"""
7909 7903 overrides = [cmd for cmd in cmdtable if cmd in table]
7910 7904 if overrides:
7911 7905 ui.warn(
7912 7906 _(b"extension '%s' overrides commands: %s\n")
7913 7907 % (name, b" ".join(overrides))
7914 7908 )
7915 7909 table.update(cmdtable)
@@ -1,1572 +1,1576 b''
1 1 # hg.py - repository classes for mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 5 #
6 6 # This software may be used and distributed according to the terms of the
7 7 # GNU General Public License version 2 or any later version.
8 8
9 9 from __future__ import absolute_import
10 10
11 11 import errno
12 12 import os
13 13 import shutil
14 14 import stat
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullhex,
20 20 nullid,
21 21 short,
22 22 )
23 23 from .pycompat import getattr
24 24
25 25 from . import (
26 26 bookmarks,
27 27 bundlerepo,
28 28 cacheutil,
29 29 cmdutil,
30 30 destutil,
31 31 discovery,
32 32 error,
33 33 exchange,
34 34 extensions,
35 35 graphmod,
36 36 httppeer,
37 37 localrepo,
38 38 lock,
39 39 logcmdutil,
40 40 logexchange,
41 41 merge as mergemod,
42 42 mergestate as mergestatemod,
43 43 narrowspec,
44 44 phases,
45 45 requirements,
46 46 scmutil,
47 47 sshpeer,
48 48 statichttprepo,
49 49 ui as uimod,
50 50 unionrepo,
51 51 url,
52 52 util,
53 53 verify as verifymod,
54 54 vfs as vfsmod,
55 55 )
56 56 from .utils import (
57 57 hashutil,
58 58 stringutil,
59 59 urlutil,
60 60 )
61 61
62 62
63 63 release = lock.release
64 64
65 65 # shared features
66 66 sharedbookmarks = b'bookmarks'
67 67
68 68
69 69 def _local(path):
70 70 path = util.expandpath(urlutil.urllocalpath(path))
71 71
72 72 try:
73 73 # we use os.stat() directly here instead of os.path.isfile()
74 74 # because the latter started returning `False` on invalid path
75 75 # exceptions starting in 3.8 and we care about handling
76 76 # invalid paths specially here.
77 77 st = os.stat(path)
78 78 isfile = stat.S_ISREG(st.st_mode)
79 79 # Python 2 raises TypeError, Python 3 ValueError.
80 80 except (TypeError, ValueError) as e:
81 81 raise error.Abort(
82 82 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
83 83 )
84 84 except OSError:
85 85 isfile = False
86 86
87 87 return isfile and bundlerepo or localrepo
88 88
89 89
90 90 def addbranchrevs(lrepo, other, branches, revs):
91 91 peer = other.peer() # a courtesy to callers using a localrepo for other
92 92 hashbranch, branches = branches
93 93 if not hashbranch and not branches:
94 94 x = revs or None
95 95 if revs:
96 96 y = revs[0]
97 97 else:
98 98 y = None
99 99 return x, y
100 100 if revs:
101 101 revs = list(revs)
102 102 else:
103 103 revs = []
104 104
105 105 if not peer.capable(b'branchmap'):
106 106 if branches:
107 107 raise error.Abort(_(b"remote branch lookup not supported"))
108 108 revs.append(hashbranch)
109 109 return revs, revs[0]
110 110
111 111 with peer.commandexecutor() as e:
112 112 branchmap = e.callcommand(b'branchmap', {}).result()
113 113
114 114 def primary(branch):
115 115 if branch == b'.':
116 116 if not lrepo:
117 117 raise error.Abort(_(b"dirstate branch not accessible"))
118 118 branch = lrepo.dirstate.branch()
119 119 if branch in branchmap:
120 120 revs.extend(hex(r) for r in reversed(branchmap[branch]))
121 121 return True
122 122 else:
123 123 return False
124 124
125 125 for branch in branches:
126 126 if not primary(branch):
127 127 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
128 128 if hashbranch:
129 129 if not primary(hashbranch):
130 130 revs.append(hashbranch)
131 131 return revs, revs[0]
132 132
133 133
134 134 def parseurl(path, branches=None):
135 135 '''parse url#branch, returning (url, (branch, branches))'''
136 136 msg = b'parseurl(...) moved to mercurial.utils.urlutil'
137 137 util.nouideprecwarn(msg, b'6.0', stacklevel=2)
138 138 return urlutil.parseurl(path, branches=branches)
139 139
140 140
141 141 schemes = {
142 142 b'bundle': bundlerepo,
143 143 b'union': unionrepo,
144 144 b'file': _local,
145 145 b'http': httppeer,
146 146 b'https': httppeer,
147 147 b'ssh': sshpeer,
148 148 b'static-http': statichttprepo,
149 149 }
150 150
151 151
152 152 def _peerlookup(path):
153 153 u = urlutil.url(path)
154 154 scheme = u.scheme or b'file'
155 155 thing = schemes.get(scheme) or schemes[b'file']
156 156 try:
157 157 return thing(path)
158 158 except TypeError:
159 159 # we can't test callable(thing) because 'thing' can be an unloaded
160 160 # module that implements __call__
161 161 if not util.safehasattr(thing, b'instance'):
162 162 raise
163 163 return thing
164 164
165 165
166 166 def islocal(repo):
167 167 '''return true if repo (or path pointing to repo) is local'''
168 168 if isinstance(repo, bytes):
169 169 try:
170 170 return _peerlookup(repo).islocal(repo)
171 171 except AttributeError:
172 172 return False
173 173 return repo.local()
174 174
175 175
176 176 def openpath(ui, path, sendaccept=True):
177 177 '''open path with open if local, url.open if remote'''
178 178 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
179 179 if pathurl.islocal():
180 180 return util.posixfile(pathurl.localpath(), b'rb')
181 181 else:
182 182 return url.open(ui, path, sendaccept=sendaccept)
183 183
184 184
185 185 # a list of (ui, repo) functions called for wire peer initialization
186 186 wirepeersetupfuncs = []
187 187
188 188
189 189 def _peerorrepo(
190 190 ui, path, create=False, presetupfuncs=None, intents=None, createopts=None
191 191 ):
192 192 """return a repository object for the specified path"""
193 193 obj = _peerlookup(path).instance(
194 194 ui, path, create, intents=intents, createopts=createopts
195 195 )
196 196 ui = getattr(obj, "ui", ui)
197 197 for f in presetupfuncs or []:
198 198 f(ui, obj)
199 199 ui.log(b'extension', b'- executing reposetup hooks\n')
200 200 with util.timedcm('all reposetup') as allreposetupstats:
201 201 for name, module in extensions.extensions(ui):
202 202 ui.log(b'extension', b' - running reposetup for %s\n', name)
203 203 hook = getattr(module, 'reposetup', None)
204 204 if hook:
205 205 with util.timedcm('reposetup %r', name) as stats:
206 206 hook(ui, obj)
207 207 ui.log(
208 208 b'extension', b' > reposetup for %s took %s\n', name, stats
209 209 )
210 210 ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats)
211 211 if not obj.local():
212 212 for f in wirepeersetupfuncs:
213 213 f(ui, obj)
214 214 return obj
215 215
216 216
217 217 def repository(
218 218 ui,
219 219 path=b'',
220 220 create=False,
221 221 presetupfuncs=None,
222 222 intents=None,
223 223 createopts=None,
224 224 ):
225 225 """return a repository object for the specified path"""
226 226 peer = _peerorrepo(
227 227 ui,
228 228 path,
229 229 create,
230 230 presetupfuncs=presetupfuncs,
231 231 intents=intents,
232 232 createopts=createopts,
233 233 )
234 234 repo = peer.local()
235 235 if not repo:
236 236 raise error.Abort(
237 237 _(b"repository '%s' is not local") % (path or peer.url())
238 238 )
239 239 return repo.filtered(b'visible')
240 240
241 241
242 242 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
243 243 '''return a repository peer for the specified path'''
244 244 rui = remoteui(uiorrepo, opts)
245 245 return _peerorrepo(
246 246 rui, path, create, intents=intents, createopts=createopts
247 247 ).peer()
248 248
249 249
250 250 def defaultdest(source):
251 251 """return default destination of clone if none is given
252 252
253 253 >>> defaultdest(b'foo')
254 254 'foo'
255 255 >>> defaultdest(b'/foo/bar')
256 256 'bar'
257 257 >>> defaultdest(b'/')
258 258 ''
259 259 >>> defaultdest(b'')
260 260 ''
261 261 >>> defaultdest(b'http://example.org/')
262 262 ''
263 263 >>> defaultdest(b'http://example.org/foo/')
264 264 'foo'
265 265 """
266 266 path = urlutil.url(source).path
267 267 if not path:
268 268 return b''
269 269 return os.path.basename(os.path.normpath(path))
270 270
271 271
272 272 def sharedreposource(repo):
273 273 """Returns repository object for source repository of a shared repo.
274 274
275 275 If repo is not a shared repository, returns None.
276 276 """
277 277 if repo.sharedpath == repo.path:
278 278 return None
279 279
280 280 if util.safehasattr(repo, b'srcrepo') and repo.srcrepo:
281 281 return repo.srcrepo
282 282
283 283 # the sharedpath always ends in the .hg; we want the path to the repo
284 284 source = repo.vfs.split(repo.sharedpath)[0]
285 285 srcurl, branches = urlutil.parseurl(source)
286 286 srcrepo = repository(repo.ui, srcurl)
287 287 repo.srcrepo = srcrepo
288 288 return srcrepo
289 289
290 290
291 291 def share(
292 292 ui,
293 293 source,
294 294 dest=None,
295 295 update=True,
296 296 bookmarks=True,
297 297 defaultpath=None,
298 298 relative=False,
299 299 ):
300 300 '''create a shared repository'''
301 301
302 302 if not islocal(source):
303 303 raise error.Abort(_(b'can only share local repositories'))
304 304
305 305 if not dest:
306 306 dest = defaultdest(source)
307 307 else:
308 308 dest = ui.expandpath(dest)
309 309
310 310 if isinstance(source, bytes):
311 311 origsource = ui.expandpath(source)
312 312 source, branches = urlutil.parseurl(origsource)
313 313 srcrepo = repository(ui, source)
314 314 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
315 315 else:
316 316 srcrepo = source.local()
317 317 checkout = None
318 318
319 319 shareditems = set()
320 320 if bookmarks:
321 321 shareditems.add(sharedbookmarks)
322 322
323 323 r = repository(
324 324 ui,
325 325 dest,
326 326 create=True,
327 327 createopts={
328 328 b'sharedrepo': srcrepo,
329 329 b'sharedrelative': relative,
330 330 b'shareditems': shareditems,
331 331 },
332 332 )
333 333
334 334 postshare(srcrepo, r, defaultpath=defaultpath)
335 335 r = repository(ui, dest)
336 336 _postshareupdate(r, update, checkout=checkout)
337 337 return r
338 338
339 339
340 340 def _prependsourcehgrc(repo):
341 341 """copies the source repo config and prepend it in current repo .hg/hgrc
342 342 on unshare. This is only done if the share was perfomed using share safe
343 343 method where we share config of source in shares"""
344 344 srcvfs = vfsmod.vfs(repo.sharedpath)
345 345 dstvfs = vfsmod.vfs(repo.path)
346 346
347 347 if not srcvfs.exists(b'hgrc'):
348 348 return
349 349
350 350 currentconfig = b''
351 351 if dstvfs.exists(b'hgrc'):
352 352 currentconfig = dstvfs.read(b'hgrc')
353 353
354 354 with dstvfs(b'hgrc', b'wb') as fp:
355 355 sourceconfig = srcvfs.read(b'hgrc')
356 356 fp.write(b"# Config copied from shared source\n")
357 357 fp.write(sourceconfig)
358 358 fp.write(b'\n')
359 359 fp.write(currentconfig)
360 360
361 361
362 362 def unshare(ui, repo):
363 363 """convert a shared repository to a normal one
364 364
365 365 Copy the store data to the repo and remove the sharedpath data.
366 366
367 367 Returns a new repository object representing the unshared repository.
368 368
369 369 The passed repository object is not usable after this function is
370 370 called.
371 371 """
372 372
373 373 with repo.lock():
374 374 # we use locks here because if we race with commit, we
375 375 # can end up with extra data in the cloned revlogs that's
376 376 # not pointed to by changesets, thus causing verify to
377 377 # fail
378 378 destlock = copystore(ui, repo, repo.path)
379 379 with destlock or util.nullcontextmanager():
380 380 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
381 381 # we were sharing .hg/hgrc of the share source with the current
382 382 # repo. We need to copy that while unsharing otherwise it can
383 383 # disable hooks and other checks
384 384 _prependsourcehgrc(repo)
385 385
386 386 sharefile = repo.vfs.join(b'sharedpath')
387 387 util.rename(sharefile, sharefile + b'.old')
388 388
389 389 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
390 390 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
391 391 scmutil.writereporequirements(repo)
392 392
393 393 # Removing share changes some fundamental properties of the repo instance.
394 394 # So we instantiate a new repo object and operate on it rather than
395 395 # try to keep the existing repo usable.
396 396 newrepo = repository(repo.baseui, repo.root, create=False)
397 397
398 398 # TODO: figure out how to access subrepos that exist, but were previously
399 399 # removed from .hgsub
400 400 c = newrepo[b'.']
401 401 subs = c.substate
402 402 for s in sorted(subs):
403 403 c.sub(s).unshare()
404 404
405 405 localrepo.poisonrepository(repo)
406 406
407 407 return newrepo
408 408
409 409
410 410 def postshare(sourcerepo, destrepo, defaultpath=None):
411 411 """Called after a new shared repo is created.
412 412
413 413 The new repo only has a requirements file and pointer to the source.
414 414 This function configures additional shared data.
415 415
416 416 Extensions can wrap this function and write additional entries to
417 417 destrepo/.hg/shared to indicate additional pieces of data to be shared.
418 418 """
419 419 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
420 420 if default:
421 421 template = b'[paths]\ndefault = %s\n'
422 422 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
423 423 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
424 424 with destrepo.wlock():
425 425 narrowspec.copytoworkingcopy(destrepo)
426 426
427 427
428 428 def _postshareupdate(repo, update, checkout=None):
429 429 """Maybe perform a working directory update after a shared repo is created.
430 430
431 431 ``update`` can be a boolean or a revision to update to.
432 432 """
433 433 if not update:
434 434 return
435 435
436 436 repo.ui.status(_(b"updating working directory\n"))
437 437 if update is not True:
438 438 checkout = update
439 439 for test in (checkout, b'default', b'tip'):
440 440 if test is None:
441 441 continue
442 442 try:
443 443 uprev = repo.lookup(test)
444 444 break
445 445 except error.RepoLookupError:
446 446 continue
447 447 _update(repo, uprev)
448 448
449 449
450 450 def copystore(ui, srcrepo, destpath):
451 451 """copy files from store of srcrepo in destpath
452 452
453 453 returns destlock
454 454 """
455 455 destlock = None
456 456 try:
457 457 hardlink = None
458 458 topic = _(b'linking') if hardlink else _(b'copying')
459 459 with ui.makeprogress(topic, unit=_(b'files')) as progress:
460 460 num = 0
461 461 srcpublishing = srcrepo.publishing()
462 462 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
463 463 dstvfs = vfsmod.vfs(destpath)
464 464 for f in srcrepo.store.copylist():
465 465 if srcpublishing and f.endswith(b'phaseroots'):
466 466 continue
467 467 dstbase = os.path.dirname(f)
468 468 if dstbase and not dstvfs.exists(dstbase):
469 469 dstvfs.mkdir(dstbase)
470 470 if srcvfs.exists(f):
471 471 if f.endswith(b'data'):
472 472 # 'dstbase' may be empty (e.g. revlog format 0)
473 473 lockfile = os.path.join(dstbase, b"lock")
474 474 # lock to avoid premature writing to the target
475 475 destlock = lock.lock(dstvfs, lockfile)
476 476 hardlink, n = util.copyfiles(
477 477 srcvfs.join(f), dstvfs.join(f), hardlink, progress
478 478 )
479 479 num += n
480 480 if hardlink:
481 481 ui.debug(b"linked %d files\n" % num)
482 482 else:
483 483 ui.debug(b"copied %d files\n" % num)
484 484 return destlock
485 485 except: # re-raises
486 486 release(destlock)
487 487 raise
488 488
489 489
490 490 def clonewithshare(
491 491 ui,
492 492 peeropts,
493 493 sharepath,
494 494 source,
495 495 srcpeer,
496 496 dest,
497 497 pull=False,
498 498 rev=None,
499 499 update=True,
500 500 stream=False,
501 501 ):
502 502 """Perform a clone using a shared repo.
503 503
504 504 The store for the repository will be located at <sharepath>/.hg. The
505 505 specified revisions will be cloned or pulled from "source". A shared repo
506 506 will be created at "dest" and a working copy will be created if "update" is
507 507 True.
508 508 """
509 509 revs = None
510 510 if rev:
511 511 if not srcpeer.capable(b'lookup'):
512 512 raise error.Abort(
513 513 _(
514 514 b"src repository does not support "
515 515 b"revision lookup and so doesn't "
516 516 b"support clone by revision"
517 517 )
518 518 )
519 519
520 520 # TODO this is batchable.
521 521 remoterevs = []
522 522 for r in rev:
523 523 with srcpeer.commandexecutor() as e:
524 524 remoterevs.append(
525 525 e.callcommand(
526 526 b'lookup',
527 527 {
528 528 b'key': r,
529 529 },
530 530 ).result()
531 531 )
532 532 revs = remoterevs
533 533
534 534 # Obtain a lock before checking for or cloning the pooled repo otherwise
535 535 # 2 clients may race creating or populating it.
536 536 pooldir = os.path.dirname(sharepath)
537 537 # lock class requires the directory to exist.
538 538 try:
539 539 util.makedir(pooldir, False)
540 540 except OSError as e:
541 541 if e.errno != errno.EEXIST:
542 542 raise
543 543
544 544 poolvfs = vfsmod.vfs(pooldir)
545 545 basename = os.path.basename(sharepath)
546 546
547 547 with lock.lock(poolvfs, b'%s.lock' % basename):
548 548 if os.path.exists(sharepath):
549 549 ui.status(
550 550 _(b'(sharing from existing pooled repository %s)\n') % basename
551 551 )
552 552 else:
553 553 ui.status(
554 554 _(b'(sharing from new pooled repository %s)\n') % basename
555 555 )
556 556 # Always use pull mode because hardlinks in share mode don't work
557 557 # well. Never update because working copies aren't necessary in
558 558 # share mode.
559 559 clone(
560 560 ui,
561 561 peeropts,
562 562 source,
563 563 dest=sharepath,
564 564 pull=True,
565 565 revs=rev,
566 566 update=False,
567 567 stream=stream,
568 568 )
569 569
570 570 # Resolve the value to put in [paths] section for the source.
571 571 if islocal(source):
572 572 defaultpath = os.path.abspath(urlutil.urllocalpath(source))
573 573 else:
574 574 defaultpath = source
575 575
576 576 sharerepo = repository(ui, path=sharepath)
577 577 destrepo = share(
578 578 ui,
579 579 sharerepo,
580 580 dest=dest,
581 581 update=False,
582 582 bookmarks=False,
583 583 defaultpath=defaultpath,
584 584 )
585 585
586 586 # We need to perform a pull against the dest repo to fetch bookmarks
587 587 # and other non-store data that isn't shared by default. In the case of
588 588 # non-existing shared repo, this means we pull from the remote twice. This
589 589 # is a bit weird. But at the time it was implemented, there wasn't an easy
590 590 # way to pull just non-changegroup data.
591 591 exchange.pull(destrepo, srcpeer, heads=revs)
592 592
593 593 _postshareupdate(destrepo, update)
594 594
595 595 return srcpeer, peer(ui, peeropts, dest)
596 596
597 597
598 598 # Recomputing caches is often slow on big repos, so copy them.
599 599 def _copycache(srcrepo, dstcachedir, fname):
600 600 """copy a cache from srcrepo to destcachedir (if it exists)"""
601 601 srcfname = srcrepo.cachevfs.join(fname)
602 602 dstfname = os.path.join(dstcachedir, fname)
603 603 if os.path.exists(srcfname):
604 604 if not os.path.exists(dstcachedir):
605 605 os.mkdir(dstcachedir)
606 606 util.copyfile(srcfname, dstfname)
607 607
608 608
609 609 def clone(
610 610 ui,
611 611 peeropts,
612 612 source,
613 613 dest=None,
614 614 pull=False,
615 615 revs=None,
616 616 update=True,
617 617 stream=False,
618 618 branch=None,
619 619 shareopts=None,
620 620 storeincludepats=None,
621 621 storeexcludepats=None,
622 622 depth=None,
623 623 ):
624 624 """Make a copy of an existing repository.
625 625
626 626 Create a copy of an existing repository in a new directory. The
627 627 source and destination are URLs, as passed to the repository
628 628 function. Returns a pair of repository peers, the source and
629 629 newly created destination.
630 630
631 631 The location of the source is added to the new repository's
632 632 .hg/hgrc file, as the default to be used for future pulls and
633 633 pushes.
634 634
635 635 If an exception is raised, the partly cloned/updated destination
636 636 repository will be deleted.
637 637
638 638 Arguments:
639 639
640 640 source: repository object or URL
641 641
642 642 dest: URL of destination repository to create (defaults to base
643 643 name of source repository)
644 644
645 645 pull: always pull from source repository, even in local case or if the
646 646 server prefers streaming
647 647
648 648 stream: stream raw data uncompressed from repository (fast over
649 649 LAN, slow over WAN)
650 650
651 651 revs: revision to clone up to (implies pull=True)
652 652
653 653 update: update working directory after clone completes, if
654 654 destination is local repository (True means update to default rev,
655 655 anything else is treated as a revision)
656 656
657 657 branch: branches to clone
658 658
659 659 shareopts: dict of options to control auto sharing behavior. The "pool" key
660 660 activates auto sharing mode and defines the directory for stores. The
661 661 "mode" key determines how to construct the directory name of the shared
662 662 repository. "identity" means the name is derived from the node of the first
663 663 changeset in the repository. "remote" means the name is derived from the
664 664 remote's path/URL. Defaults to "identity."
665 665
666 666 storeincludepats and storeexcludepats: sets of file patterns to include and
667 667 exclude in the repository copy, respectively. If not defined, all files
668 668 will be included (a "full" clone). Otherwise a "narrow" clone containing
669 669 only the requested files will be performed. If ``storeincludepats`` is not
670 670 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
671 671 ``path:.``. If both are empty sets, no files will be cloned.
672 672 """
673 673
674 674 if isinstance(source, bytes):
675 675 origsource = ui.expandpath(source)
676 676 source, branches = urlutil.parseurl(origsource, branch)
677 677 srcpeer = peer(ui, peeropts, source)
678 678 else:
679 679 srcpeer = source.peer() # in case we were called with a localrepo
680 680 branches = (None, branch or [])
681 681 origsource = source = srcpeer.url()
682 682 srclock = destlock = cleandir = None
683 683 destpeer = None
684 684 try:
685 685 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
686 686
687 687 if dest is None:
688 688 dest = defaultdest(source)
689 689 if dest:
690 690 ui.status(_(b"destination directory: %s\n") % dest)
691 691 else:
692 692 dest = ui.expandpath(dest)
693 693
694 694 dest = urlutil.urllocalpath(dest)
695 695 source = urlutil.urllocalpath(source)
696 696
697 697 if not dest:
698 698 raise error.InputError(_(b"empty destination path is not valid"))
699 699
700 700 destvfs = vfsmod.vfs(dest, expandpath=True)
701 701 if destvfs.lexists():
702 702 if not destvfs.isdir():
703 703 raise error.InputError(
704 704 _(b"destination '%s' already exists") % dest
705 705 )
706 706 elif destvfs.listdir():
707 707 raise error.InputError(
708 708 _(b"destination '%s' is not empty") % dest
709 709 )
710 710
711 711 createopts = {}
712 712 narrow = False
713 713
714 714 if storeincludepats is not None:
715 715 narrowspec.validatepatterns(storeincludepats)
716 716 narrow = True
717 717
718 718 if storeexcludepats is not None:
719 719 narrowspec.validatepatterns(storeexcludepats)
720 720 narrow = True
721 721
722 722 if narrow:
723 723 # Include everything by default if only exclusion patterns defined.
724 724 if storeexcludepats and not storeincludepats:
725 725 storeincludepats = {b'path:.'}
726 726
727 727 createopts[b'narrowfiles'] = True
728 728
729 729 if depth:
730 730 createopts[b'shallowfilestore'] = True
731 731
732 732 if srcpeer.capable(b'lfs-serve'):
733 733 # Repository creation honors the config if it disabled the extension, so
734 734 # we can't just announce that lfs will be enabled. This check avoids
735 735 # saying that lfs will be enabled, and then saying it's an unknown
736 736 # feature. The lfs creation option is set in either case so that a
737 737 # requirement is added. If the extension is explicitly disabled but the
738 738 # requirement is set, the clone aborts early, before transferring any
739 739 # data.
740 740 createopts[b'lfs'] = True
741 741
742 742 if extensions.disabled_help(b'lfs'):
743 743 ui.status(
744 744 _(
745 745 b'(remote is using large file support (lfs), but it is '
746 746 b'explicitly disabled in the local configuration)\n'
747 747 )
748 748 )
749 749 else:
750 750 ui.status(
751 751 _(
752 752 b'(remote is using large file support (lfs); lfs will '
753 753 b'be enabled for this repository)\n'
754 754 )
755 755 )
756 756
757 757 shareopts = shareopts or {}
758 758 sharepool = shareopts.get(b'pool')
759 759 sharenamemode = shareopts.get(b'mode')
760 760 if sharepool and islocal(dest):
761 761 sharepath = None
762 762 if sharenamemode == b'identity':
763 763 # Resolve the name from the initial changeset in the remote
764 764 # repository. This returns nullid when the remote is empty. It
765 765 # raises RepoLookupError if revision 0 is filtered or otherwise
766 766 # not available. If we fail to resolve, sharing is not enabled.
767 767 try:
768 768 with srcpeer.commandexecutor() as e:
769 769 rootnode = e.callcommand(
770 770 b'lookup',
771 771 {
772 772 b'key': b'0',
773 773 },
774 774 ).result()
775 775
776 776 if rootnode != nullid:
777 777 sharepath = os.path.join(sharepool, hex(rootnode))
778 778 else:
779 779 ui.status(
780 780 _(
781 781 b'(not using pooled storage: '
782 782 b'remote appears to be empty)\n'
783 783 )
784 784 )
785 785 except error.RepoLookupError:
786 786 ui.status(
787 787 _(
788 788 b'(not using pooled storage: '
789 789 b'unable to resolve identity of remote)\n'
790 790 )
791 791 )
792 792 elif sharenamemode == b'remote':
793 793 sharepath = os.path.join(
794 794 sharepool, hex(hashutil.sha1(source).digest())
795 795 )
796 796 else:
797 797 raise error.Abort(
798 798 _(b'unknown share naming mode: %s') % sharenamemode
799 799 )
800 800
801 801 # TODO this is a somewhat arbitrary restriction.
802 802 if narrow:
803 803 ui.status(
804 804 _(b'(pooled storage not supported for narrow clones)\n')
805 805 )
806 806 sharepath = None
807 807
808 808 if sharepath:
809 809 return clonewithshare(
810 810 ui,
811 811 peeropts,
812 812 sharepath,
813 813 source,
814 814 srcpeer,
815 815 dest,
816 816 pull=pull,
817 817 rev=revs,
818 818 update=update,
819 819 stream=stream,
820 820 )
821 821
822 822 srcrepo = srcpeer.local()
823 823
824 824 abspath = origsource
825 825 if islocal(origsource):
826 826 abspath = os.path.abspath(urlutil.urllocalpath(origsource))
827 827
828 828 if islocal(dest):
829 829 cleandir = dest
830 830
831 831 copy = False
832 832 if (
833 833 srcrepo
834 834 and srcrepo.cancopy()
835 835 and islocal(dest)
836 836 and not phases.hassecret(srcrepo)
837 837 ):
838 838 copy = not pull and not revs
839 839
840 840 # TODO this is a somewhat arbitrary restriction.
841 841 if narrow:
842 842 copy = False
843 843
844 844 if copy:
845 845 try:
846 846 # we use a lock here because if we race with commit, we
847 847 # can end up with extra data in the cloned revlogs that's
848 848 # not pointed to by changesets, thus causing verify to
849 849 # fail
850 850 srclock = srcrepo.lock(wait=False)
851 851 except error.LockError:
852 852 copy = False
853 853
854 854 if copy:
855 855 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
856 856 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
857 857 if not os.path.exists(dest):
858 858 util.makedirs(dest)
859 859 else:
860 860 # only clean up directories we create ourselves
861 861 cleandir = hgdir
862 862 try:
863 863 destpath = hgdir
864 864 util.makedir(destpath, notindexed=True)
865 865 except OSError as inst:
866 866 if inst.errno == errno.EEXIST:
867 867 cleandir = None
868 868 raise error.Abort(
869 869 _(b"destination '%s' already exists") % dest
870 870 )
871 871 raise
872 872
873 873 destlock = copystore(ui, srcrepo, destpath)
874 874 # copy bookmarks over
875 875 srcbookmarks = srcrepo.vfs.join(b'bookmarks')
876 876 dstbookmarks = os.path.join(destpath, b'bookmarks')
877 877 if os.path.exists(srcbookmarks):
878 878 util.copyfile(srcbookmarks, dstbookmarks)
879 879
880 880 dstcachedir = os.path.join(destpath, b'cache')
881 881 for cache in cacheutil.cachetocopy(srcrepo):
882 882 _copycache(srcrepo, dstcachedir, cache)
883 883
884 884 # we need to re-init the repo after manually copying the data
885 885 # into it
886 886 destpeer = peer(srcrepo, peeropts, dest)
887 887 srcrepo.hook(b'outgoing', source=b'clone', node=nullhex)
888 888 else:
889 889 try:
890 890 # only pass ui when no srcrepo
891 891 destpeer = peer(
892 892 srcrepo or ui,
893 893 peeropts,
894 894 dest,
895 895 create=True,
896 896 createopts=createopts,
897 897 )
898 898 except OSError as inst:
899 899 if inst.errno == errno.EEXIST:
900 900 cleandir = None
901 901 raise error.Abort(
902 902 _(b"destination '%s' already exists") % dest
903 903 )
904 904 raise
905 905
906 906 if revs:
907 907 if not srcpeer.capable(b'lookup'):
908 908 raise error.Abort(
909 909 _(
910 910 b"src repository does not support "
911 911 b"revision lookup and so doesn't "
912 912 b"support clone by revision"
913 913 )
914 914 )
915 915
916 916 # TODO this is batchable.
917 917 remoterevs = []
918 918 for rev in revs:
919 919 with srcpeer.commandexecutor() as e:
920 920 remoterevs.append(
921 921 e.callcommand(
922 922 b'lookup',
923 923 {
924 924 b'key': rev,
925 925 },
926 926 ).result()
927 927 )
928 928 revs = remoterevs
929 929
930 930 checkout = revs[0]
931 931 else:
932 932 revs = None
933 933 local = destpeer.local()
934 934 if local:
935 935 if narrow:
936 936 with local.wlock(), local.lock():
937 937 local.setnarrowpats(storeincludepats, storeexcludepats)
938 938 narrowspec.copytoworkingcopy(local)
939 939
940 940 u = urlutil.url(abspath)
941 941 defaulturl = bytes(u)
942 942 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
943 943 if not stream:
944 944 if pull:
945 945 stream = False
946 946 else:
947 947 stream = None
948 948 # internal config: ui.quietbookmarkmove
949 949 overrides = {(b'ui', b'quietbookmarkmove'): True}
950 950 with local.ui.configoverride(overrides, b'clone'):
951 951 exchange.pull(
952 952 local,
953 953 srcpeer,
954 954 revs,
955 955 streamclonerequested=stream,
956 956 includepats=storeincludepats,
957 957 excludepats=storeexcludepats,
958 958 depth=depth,
959 959 )
960 960 elif srcrepo:
961 961 # TODO lift restriction once exchange.push() accepts narrow
962 962 # push.
963 963 if narrow:
964 964 raise error.Abort(
965 965 _(
966 966 b'narrow clone not available for '
967 967 b'remote destinations'
968 968 )
969 969 )
970 970
971 971 exchange.push(
972 972 srcrepo,
973 973 destpeer,
974 974 revs=revs,
975 975 bookmarks=srcrepo._bookmarks.keys(),
976 976 )
977 977 else:
978 978 raise error.Abort(
979 979 _(b"clone from remote to remote not supported")
980 980 )
981 981
982 982 cleandir = None
983 983
984 984 destrepo = destpeer.local()
985 985 if destrepo:
986 986 template = uimod.samplehgrcs[b'cloned']
987 987 u = urlutil.url(abspath)
988 988 u.passwd = None
989 989 defaulturl = bytes(u)
990 990 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
991 991 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
992 992
993 993 if ui.configbool(b'experimental', b'remotenames'):
994 994 logexchange.pullremotenames(destrepo, srcpeer)
995 995
996 996 if update:
997 997 if update is not True:
998 998 with srcpeer.commandexecutor() as e:
999 999 checkout = e.callcommand(
1000 1000 b'lookup',
1001 1001 {
1002 1002 b'key': update,
1003 1003 },
1004 1004 ).result()
1005 1005
1006 1006 uprev = None
1007 1007 status = None
1008 1008 if checkout is not None:
1009 1009 # Some extensions (at least hg-git and hg-subversion) have
1010 1010 # a peer.lookup() implementation that returns a name instead
1011 1011 # of a nodeid. We work around it here until we've figured
1012 1012 # out a better solution.
1013 1013 if len(checkout) == 20 and checkout in destrepo:
1014 1014 uprev = checkout
1015 1015 elif scmutil.isrevsymbol(destrepo, checkout):
1016 1016 uprev = scmutil.revsymbol(destrepo, checkout).node()
1017 1017 else:
1018 1018 if update is not True:
1019 1019 try:
1020 1020 uprev = destrepo.lookup(update)
1021 1021 except error.RepoLookupError:
1022 1022 pass
1023 1023 if uprev is None:
1024 1024 try:
1025 1025 if destrepo._activebookmark:
1026 1026 uprev = destrepo.lookup(destrepo._activebookmark)
1027 1027 update = destrepo._activebookmark
1028 1028 else:
1029 1029 uprev = destrepo._bookmarks[b'@']
1030 1030 update = b'@'
1031 1031 bn = destrepo[uprev].branch()
1032 1032 if bn == b'default':
1033 1033 status = _(b"updating to bookmark %s\n" % update)
1034 1034 else:
1035 1035 status = (
1036 1036 _(b"updating to bookmark %s on branch %s\n")
1037 1037 ) % (update, bn)
1038 1038 except KeyError:
1039 1039 try:
1040 1040 uprev = destrepo.branchtip(b'default')
1041 1041 except error.RepoLookupError:
1042 1042 uprev = destrepo.lookup(b'tip')
1043 1043 if not status:
1044 1044 bn = destrepo[uprev].branch()
1045 1045 status = _(b"updating to branch %s\n") % bn
1046 1046 destrepo.ui.status(status)
1047 1047 _update(destrepo, uprev)
1048 1048 if update in destrepo._bookmarks:
1049 1049 bookmarks.activate(destrepo, update)
1050 1050 if destlock is not None:
1051 1051 release(destlock)
1052 1052 # here is a tiny windows were someone could end up writing the
1053 1053 # repository before the cache are sure to be warm. This is "fine"
1054 1054 # as the only "bad" outcome would be some slowness. That potential
1055 1055 # slowness already affect reader.
1056 1056 with destrepo.lock():
1057 1057 destrepo.updatecaches(full=True)
1058 1058 finally:
1059 1059 release(srclock, destlock)
1060 1060 if cleandir is not None:
1061 1061 shutil.rmtree(cleandir, True)
1062 1062 if srcpeer is not None:
1063 1063 srcpeer.close()
1064 1064 if destpeer and destpeer.local() is None:
1065 1065 destpeer.close()
1066 1066 return srcpeer, destpeer
1067 1067
1068 1068
1069 1069 def _showstats(repo, stats, quietempty=False):
1070 1070 if quietempty and stats.isempty():
1071 1071 return
1072 1072 repo.ui.status(
1073 1073 _(
1074 1074 b"%d files updated, %d files merged, "
1075 1075 b"%d files removed, %d files unresolved\n"
1076 1076 )
1077 1077 % (
1078 1078 stats.updatedcount,
1079 1079 stats.mergedcount,
1080 1080 stats.removedcount,
1081 1081 stats.unresolvedcount,
1082 1082 )
1083 1083 )
1084 1084
1085 1085
1086 1086 def updaterepo(repo, node, overwrite, updatecheck=None):
1087 1087 """Update the working directory to node.
1088 1088
1089 1089 When overwrite is set, changes are clobbered, merged else
1090 1090
1091 1091 returns stats (see pydoc mercurial.merge.applyupdates)"""
1092 1092 repo.ui.deprecwarn(
1093 1093 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
1094 1094 b'5.7',
1095 1095 )
1096 1096 return mergemod._update(
1097 1097 repo,
1098 1098 node,
1099 1099 branchmerge=False,
1100 1100 force=overwrite,
1101 1101 labels=[b'working copy', b'destination'],
1102 1102 updatecheck=updatecheck,
1103 1103 )
1104 1104
1105 1105
1106 1106 def update(repo, node, quietempty=False, updatecheck=None):
1107 1107 """update the working directory to node"""
1108 1108 stats = mergemod.update(repo[node], updatecheck=updatecheck)
1109 1109 _showstats(repo, stats, quietempty)
1110 1110 if stats.unresolvedcount:
1111 1111 repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))
1112 1112 return stats.unresolvedcount > 0
1113 1113
1114 1114
1115 1115 # naming conflict in clone()
1116 1116 _update = update
1117 1117
1118 1118
1119 1119 def clean(repo, node, show_stats=True, quietempty=False):
1120 1120 """forcibly switch the working directory to node, clobbering changes"""
1121 1121 stats = mergemod.clean_update(repo[node])
1122 1122 assert stats.unresolvedcount == 0
1123 1123 if show_stats:
1124 1124 _showstats(repo, stats, quietempty)
1125 1125 return False
1126 1126
1127 1127
1128 1128 # naming conflict in updatetotally()
1129 1129 _clean = clean
1130 1130
1131 1131 _VALID_UPDATECHECKS = {
1132 1132 mergemod.UPDATECHECK_ABORT,
1133 1133 mergemod.UPDATECHECK_NONE,
1134 1134 mergemod.UPDATECHECK_LINEAR,
1135 1135 mergemod.UPDATECHECK_NO_CONFLICT,
1136 1136 }
1137 1137
1138 1138
1139 1139 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
1140 1140 """Update the working directory with extra care for non-file components
1141 1141
1142 1142 This takes care of non-file components below:
1143 1143
1144 1144 :bookmark: might be advanced or (in)activated
1145 1145
1146 1146 This takes arguments below:
1147 1147
1148 1148 :checkout: to which revision the working directory is updated
1149 1149 :brev: a name, which might be a bookmark to be activated after updating
1150 1150 :clean: whether changes in the working directory can be discarded
1151 1151 :updatecheck: how to deal with a dirty working directory
1152 1152
1153 1153 Valid values for updatecheck are the UPDATECHECK_* constants
1154 1154 defined in the merge module. Passing `None` will result in using the
1155 1155 configured default.
1156 1156
1157 1157 * ABORT: abort if the working directory is dirty
1158 1158 * NONE: don't check (merge working directory changes into destination)
1159 1159 * LINEAR: check that update is linear before merging working directory
1160 1160 changes into destination
1161 1161 * NO_CONFLICT: check that the update does not result in file merges
1162 1162
1163 1163 This returns whether conflict is detected at updating or not.
1164 1164 """
1165 1165 if updatecheck is None:
1166 1166 updatecheck = ui.config(b'commands', b'update.check')
1167 1167 if updatecheck not in _VALID_UPDATECHECKS:
1168 1168 # If not configured, or invalid value configured
1169 1169 updatecheck = mergemod.UPDATECHECK_LINEAR
1170 1170 if updatecheck not in _VALID_UPDATECHECKS:
1171 1171 raise ValueError(
1172 1172 r'Invalid updatecheck value %r (can accept %r)'
1173 1173 % (updatecheck, _VALID_UPDATECHECKS)
1174 1174 )
1175 1175 with repo.wlock():
1176 1176 movemarkfrom = None
1177 1177 warndest = False
1178 1178 if checkout is None:
1179 1179 updata = destutil.destupdate(repo, clean=clean)
1180 1180 checkout, movemarkfrom, brev = updata
1181 1181 warndest = True
1182 1182
1183 1183 if clean:
1184 1184 ret = _clean(repo, checkout)
1185 1185 else:
1186 1186 if updatecheck == mergemod.UPDATECHECK_ABORT:
1187 1187 cmdutil.bailifchanged(repo, merge=False)
1188 1188 updatecheck = mergemod.UPDATECHECK_NONE
1189 1189 ret = _update(repo, checkout, updatecheck=updatecheck)
1190 1190
1191 1191 if not ret and movemarkfrom:
1192 1192 if movemarkfrom == repo[b'.'].node():
1193 1193 pass # no-op update
1194 1194 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
1195 1195 b = ui.label(repo._activebookmark, b'bookmarks.active')
1196 1196 ui.status(_(b"updating bookmark %s\n") % b)
1197 1197 else:
1198 1198 # this can happen with a non-linear update
1199 1199 b = ui.label(repo._activebookmark, b'bookmarks')
1200 1200 ui.status(_(b"(leaving bookmark %s)\n") % b)
1201 1201 bookmarks.deactivate(repo)
1202 1202 elif brev in repo._bookmarks:
1203 1203 if brev != repo._activebookmark:
1204 1204 b = ui.label(brev, b'bookmarks.active')
1205 1205 ui.status(_(b"(activating bookmark %s)\n") % b)
1206 1206 bookmarks.activate(repo, brev)
1207 1207 elif brev:
1208 1208 if repo._activebookmark:
1209 1209 b = ui.label(repo._activebookmark, b'bookmarks')
1210 1210 ui.status(_(b"(leaving bookmark %s)\n") % b)
1211 1211 bookmarks.deactivate(repo)
1212 1212
1213 1213 if warndest:
1214 1214 destutil.statusotherdests(ui, repo)
1215 1215
1216 1216 return ret
1217 1217
1218 1218
1219 1219 def merge(
1220 1220 ctx,
1221 1221 force=False,
1222 1222 remind=True,
1223 1223 labels=None,
1224 1224 ):
1225 1225 """Branch merge with node, resolving changes. Return true if any
1226 1226 unresolved conflicts."""
1227 1227 repo = ctx.repo()
1228 1228 stats = mergemod.merge(ctx, force=force, labels=labels)
1229 1229 _showstats(repo, stats)
1230 1230 if stats.unresolvedcount:
1231 1231 repo.ui.status(
1232 1232 _(
1233 1233 b"use 'hg resolve' to retry unresolved file merges "
1234 1234 b"or 'hg merge --abort' to abandon\n"
1235 1235 )
1236 1236 )
1237 1237 elif remind:
1238 1238 repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
1239 1239 return stats.unresolvedcount > 0
1240 1240
1241 1241
1242 1242 def abortmerge(ui, repo):
1243 1243 ms = mergestatemod.mergestate.read(repo)
1244 1244 if ms.active():
1245 1245 # there were conflicts
1246 1246 node = ms.localctx.hex()
1247 1247 else:
1248 1248 # there were no conficts, mergestate was not stored
1249 1249 node = repo[b'.'].hex()
1250 1250
1251 1251 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
1252 1252 stats = mergemod.clean_update(repo[node])
1253 1253 assert stats.unresolvedcount == 0
1254 1254 _showstats(repo, stats)
1255 1255
1256 1256
1257 1257 def _incoming(
1258 1258 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
1259 1259 ):
1260 1260 """
1261 1261 Helper for incoming / gincoming.
1262 1262 displaychlist gets called with
1263 1263 (remoterepo, incomingchangesetlist, displayer) parameters,
1264 1264 and is supposed to contain only code that can't be unified.
1265 1265 """
1266 1266 source, branches = urlutil.parseurl(
1267 1267 ui.expandpath(source), opts.get(b'branch')
1268 1268 )
1269 1269 other = peer(repo, opts, source)
1270 1270 cleanupfn = other.close
1271 1271 try:
1272 1272 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
1273 1273 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
1274 1274
1275 1275 if revs:
1276 1276 revs = [other.lookup(rev) for rev in revs]
1277 1277 other, chlist, cleanupfn = bundlerepo.getremotechanges(
1278 1278 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
1279 1279 )
1280 1280
1281 1281 if not chlist:
1282 1282 ui.status(_(b"no changes found\n"))
1283 1283 return subreporecurse()
1284 1284 ui.pager(b'incoming')
1285 1285 displayer = logcmdutil.changesetdisplayer(
1286 1286 ui, other, opts, buffered=buffered
1287 1287 )
1288 1288 displaychlist(other, chlist, displayer)
1289 1289 displayer.close()
1290 1290 finally:
1291 1291 cleanupfn()
1292 1292 subreporecurse()
1293 1293 return 0 # exit code is zero since we found incoming changes
1294 1294
1295 1295
1296 1296 def incoming(ui, repo, source, opts):
1297 1297 def subreporecurse():
1298 1298 ret = 1
1299 1299 if opts.get(b'subrepos'):
1300 1300 ctx = repo[None]
1301 1301 for subpath in sorted(ctx.substate):
1302 1302 sub = ctx.sub(subpath)
1303 1303 ret = min(ret, sub.incoming(ui, source, opts))
1304 1304 return ret
1305 1305
1306 1306 def display(other, chlist, displayer):
1307 1307 limit = logcmdutil.getlimit(opts)
1308 1308 if opts.get(b'newest_first'):
1309 1309 chlist.reverse()
1310 1310 count = 0
1311 1311 for n in chlist:
1312 1312 if limit is not None and count >= limit:
1313 1313 break
1314 1314 parents = [p for p in other.changelog.parents(n) if p != nullid]
1315 1315 if opts.get(b'no_merges') and len(parents) == 2:
1316 1316 continue
1317 1317 count += 1
1318 1318 displayer.show(other[n])
1319 1319
1320 1320 return _incoming(display, subreporecurse, ui, repo, source, opts)
1321 1321
1322 1322
1323 def _outgoing(ui, repo, dest, opts, subpath=None):
1324 path = ui.getpath(dest, default=(b'default-push', b'default'))
1325 if not path:
1326 raise error.Abort(
1327 _(b'default repository not configured!'),
1328 hint=_(b"see 'hg help config.paths'"),
1329 )
1323 def _outgoing(ui, repo, dests, opts, subpath=None):
1324 out = set()
1325 others = []
1326 for path in urlutil.get_push_paths(repo, ui, dests):
1330 1327 dest = path.pushloc or path.loc
1331 1328 if subpath is not None:
1332 1329 subpath = urlutil.url(subpath)
1333 1330 if subpath.isabs():
1334 1331 dest = bytes(subpath)
1335 1332 else:
1336 1333 p = urlutil.url(dest)
1337 1334 p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
1338 1335 dest = bytes(p)
1339
1340 1336 branches = path.branch, opts.get(b'branch') or []
1341 1337
1342 1338 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1343 1339 revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
1344 1340 if revs:
1345 1341 revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]
1346 1342
1347 1343 other = peer(repo, opts, dest)
1348 1344 try:
1349 1345 outgoing = discovery.findcommonoutgoing(
1350 1346 repo, other, revs, force=opts.get(b'force')
1351 1347 )
1352 1348 o = outgoing.missing
1349 out.update(o)
1353 1350 if not o:
1354 1351 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
1355 return o, other
1352 others.append(other)
1356 1353 except: # re-raises
1357 1354 other.close()
1358 1355 raise
1356 # make sure this is ordered by revision number
1357 outgoing_revs = list(out)
1358 cl = repo.changelog
1359 outgoing_revs.sort(key=cl.rev)
1360 return outgoing_revs, others
1359 1361
1360 1362
1361 def _outgoing_recurse(ui, repo, dest, opts):
1363 def _outgoing_recurse(ui, repo, dests, opts):
1362 1364 ret = 1
1363 1365 if opts.get(b'subrepos'):
1364 1366 ctx = repo[None]
1365 1367 for subpath in sorted(ctx.substate):
1366 1368 sub = ctx.sub(subpath)
1367 ret = min(ret, sub.outgoing(ui, dest, opts))
1369 ret = min(ret, sub.outgoing(ui, dests, opts))
1368 1370 return ret
1369 1371
1370 1372
1371 1373 def _outgoing_filter(repo, revs, opts):
1372 1374 """apply revision filtering/ordering option for outgoing"""
1373 1375 limit = logcmdutil.getlimit(opts)
1374 1376 no_merges = opts.get(b'no_merges')
1375 1377 if opts.get(b'newest_first'):
1376 1378 revs.reverse()
1377 1379 if limit is None and not no_merges:
1378 1380 for r in revs:
1379 1381 yield r
1380 1382 return
1381 1383
1382 1384 count = 0
1383 1385 cl = repo.changelog
1384 1386 for n in revs:
1385 1387 if limit is not None and count >= limit:
1386 1388 break
1387 1389 parents = [p for p in cl.parents(n) if p != nullid]
1388 1390 if no_merges and len(parents) == 2:
1389 1391 continue
1390 1392 count += 1
1391 1393 yield n
1392 1394
1393 1395
1394 def outgoing(ui, repo, dest, opts, subpath=None):
1396 def outgoing(ui, repo, dests, opts, subpath=None):
1395 1397 if opts.get(b'graph'):
1396 1398 logcmdutil.checkunsupportedgraphflags([], opts)
1397 o, other = _outgoing(ui, repo, dest, opts, subpath=subpath)
1399 o, others = _outgoing(ui, repo, dests, opts, subpath=subpath)
1398 1400 ret = 1
1399 1401 try:
1400 1402 if o:
1401 1403 ret = 0
1402 1404
1403 1405 if opts.get(b'graph'):
1404 1406 revdag = logcmdutil.graphrevs(repo, o, opts)
1405 1407 ui.pager(b'outgoing')
1406 1408 displayer = logcmdutil.changesetdisplayer(
1407 1409 ui, repo, opts, buffered=True
1408 1410 )
1409 1411 logcmdutil.displaygraph(
1410 1412 ui, repo, revdag, displayer, graphmod.asciiedges
1411 1413 )
1412 1414 else:
1413 1415 ui.pager(b'outgoing')
1414 1416 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1415 1417 for n in _outgoing_filter(repo, o, opts):
1416 1418 displayer.show(repo[n])
1417 1419 displayer.close()
1418 cmdutil.outgoinghooks(ui, repo, other, opts, o)
1419 ret = min(ret, _outgoing_recurse(ui, repo, dest, opts))
1420 for oth in others:
1421 cmdutil.outgoinghooks(ui, repo, oth, opts, o)
1422 ret = min(ret, _outgoing_recurse(ui, repo, dests, opts))
1420 1423 return ret # exit code is zero since we found outgoing changes
1421 1424 finally:
1422 other.close()
1425 for oth in others:
1426 oth.close()
1423 1427
1424 1428
1425 1429 def verify(repo, level=None):
1426 1430 """verify the consistency of a repository"""
1427 1431 ret = verifymod.verify(repo, level=level)
1428 1432
1429 1433 # Broken subrepo references in hidden csets don't seem worth worrying about,
1430 1434 # since they can't be pushed/pulled, and --hidden can be used if they are a
1431 1435 # concern.
1432 1436
1433 1437 # pathto() is needed for -R case
1434 1438 revs = repo.revs(
1435 1439 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
1436 1440 )
1437 1441
1438 1442 if revs:
1439 1443 repo.ui.status(_(b'checking subrepo links\n'))
1440 1444 for rev in revs:
1441 1445 ctx = repo[rev]
1442 1446 try:
1443 1447 for subpath in ctx.substate:
1444 1448 try:
1445 1449 ret = (
1446 1450 ctx.sub(subpath, allowcreate=False).verify() or ret
1447 1451 )
1448 1452 except error.RepoError as e:
1449 1453 repo.ui.warn(b'%d: %s\n' % (rev, e))
1450 1454 except Exception:
1451 1455 repo.ui.warn(
1452 1456 _(b'.hgsubstate is corrupt in revision %s\n')
1453 1457 % short(ctx.node())
1454 1458 )
1455 1459
1456 1460 return ret
1457 1461
1458 1462
1459 1463 def remoteui(src, opts):
1460 1464 """build a remote ui from ui or repo and opts"""
1461 1465 if util.safehasattr(src, b'baseui'): # looks like a repository
1462 1466 dst = src.baseui.copy() # drop repo-specific config
1463 1467 src = src.ui # copy target options from repo
1464 1468 else: # assume it's a global ui object
1465 1469 dst = src.copy() # keep all global options
1466 1470
1467 1471 # copy ssh-specific options
1468 1472 for o in b'ssh', b'remotecmd':
1469 1473 v = opts.get(o) or src.config(b'ui', o)
1470 1474 if v:
1471 1475 dst.setconfig(b"ui", o, v, b'copied')
1472 1476
1473 1477 # copy bundle-specific options
1474 1478 r = src.config(b'bundle', b'mainreporoot')
1475 1479 if r:
1476 1480 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
1477 1481
1478 1482 # copy selected local settings to the remote ui
1479 1483 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
1480 1484 for key, val in src.configitems(sect):
1481 1485 dst.setconfig(sect, key, val, b'copied')
1482 1486 v = src.config(b'web', b'cacerts')
1483 1487 if v:
1484 1488 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
1485 1489
1486 1490 return dst
1487 1491
1488 1492
1489 1493 # Files of interest
1490 1494 # Used to check if the repository has changed looking at mtime and size of
1491 1495 # these files.
1492 1496 foi = [
1493 1497 (b'spath', b'00changelog.i'),
1494 1498 (b'spath', b'phaseroots'), # ! phase can change content at the same size
1495 1499 (b'spath', b'obsstore'),
1496 1500 (b'path', b'bookmarks'), # ! bookmark can change content at the same size
1497 1501 ]
1498 1502
1499 1503
1500 1504 class cachedlocalrepo(object):
1501 1505 """Holds a localrepository that can be cached and reused."""
1502 1506
1503 1507 def __init__(self, repo):
1504 1508 """Create a new cached repo from an existing repo.
1505 1509
1506 1510 We assume the passed in repo was recently created. If the
1507 1511 repo has changed between when it was created and when it was
1508 1512 turned into a cache, it may not refresh properly.
1509 1513 """
1510 1514 assert isinstance(repo, localrepo.localrepository)
1511 1515 self._repo = repo
1512 1516 self._state, self.mtime = self._repostate()
1513 1517 self._filtername = repo.filtername
1514 1518
1515 1519 def fetch(self):
1516 1520 """Refresh (if necessary) and return a repository.
1517 1521
1518 1522 If the cached instance is out of date, it will be recreated
1519 1523 automatically and returned.
1520 1524
1521 1525 Returns a tuple of the repo and a boolean indicating whether a new
1522 1526 repo instance was created.
1523 1527 """
1524 1528 # We compare the mtimes and sizes of some well-known files to
1525 1529 # determine if the repo changed. This is not precise, as mtimes
1526 1530 # are susceptible to clock skew and imprecise filesystems and
1527 1531 # file content can change while maintaining the same size.
1528 1532
1529 1533 state, mtime = self._repostate()
1530 1534 if state == self._state:
1531 1535 return self._repo, False
1532 1536
1533 1537 repo = repository(self._repo.baseui, self._repo.url())
1534 1538 if self._filtername:
1535 1539 self._repo = repo.filtered(self._filtername)
1536 1540 else:
1537 1541 self._repo = repo.unfiltered()
1538 1542 self._state = state
1539 1543 self.mtime = mtime
1540 1544
1541 1545 return self._repo, True
1542 1546
1543 1547 def _repostate(self):
1544 1548 state = []
1545 1549 maxmtime = -1
1546 1550 for attr, fname in foi:
1547 1551 prefix = getattr(self._repo, attr)
1548 1552 p = os.path.join(prefix, fname)
1549 1553 try:
1550 1554 st = os.stat(p)
1551 1555 except OSError:
1552 1556 st = os.stat(prefix)
1553 1557 state.append((st[stat.ST_MTIME], st.st_size))
1554 1558 maxmtime = max(maxmtime, st[stat.ST_MTIME])
1555 1559
1556 1560 return tuple(state), maxmtime
1557 1561
1558 1562 def copy(self):
1559 1563 """Obtain a copy of this class instance.
1560 1564
1561 1565 A new localrepository instance is obtained. The new instance should be
1562 1566 completely independent of the original.
1563 1567 """
1564 1568 repo = repository(self._repo.baseui, self._repo.origroot)
1565 1569 if self._filtername:
1566 1570 repo = repo.filtered(self._filtername)
1567 1571 else:
1568 1572 repo = repo.unfiltered()
1569 1573 c = cachedlocalrepo(repo)
1570 1574 c._state = self._state
1571 1575 c.mtime = self.mtime
1572 1576 return c
@@ -1,518 +1,598 b''
1 1 ====================================================
2 2 Test push/pull from multiple source at the same time
3 3 ====================================================
4 4
5 5
6 6 Setup
7 7 =====
8 8
9 9 main repository
10 10 ---------------
11 11
12 12 $ . $RUNTESTDIR/testlib/common.sh
13 13 $ hg init main-repo
14 14 $ cd main-repo
15 15 $ mkcommit A
16 16 $ mkcommit B
17 17 $ mkcommit C
18 18 $ mkcommit D
19 19 $ mkcommit E
20 20 $ hg up 'desc(B)'
21 21 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
22 22 $ mkcommit F
23 23 created new head
24 24 $ mkcommit G
25 25 $ hg up 'desc(C)'
26 26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
27 27 $ mkcommit H
28 28 created new head
29 29 $ hg up null --quiet
30 30 $ hg log -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
31 31 o H 7
32 32 |
33 33 | o E 4
34 34 | |
35 35 | o D 3
36 36 |/
37 37 o C 2
38 38 |
39 39 | o G 6
40 40 | |
41 41 | o F 5
42 42 |/
43 43 o B 1
44 44 |
45 45 o A 0
46 46
47 47 $ cd ..
48 48
49 49 Various other repositories
50 50 --------------------------
51 51
52 52 $ hg clone main-repo branch-E --rev 4 -U
53 53 adding changesets
54 54 adding manifests
55 55 adding file changes
56 56 added 5 changesets with 5 changes to 5 files
57 57 new changesets 4a2df7238c3b:a603bfb5a83e
58 58 $ hg clone main-repo branch-G --rev 6 -U
59 59 adding changesets
60 60 adding manifests
61 61 adding file changes
62 62 added 4 changesets with 4 changes to 4 files
63 63 new changesets 4a2df7238c3b:c521a06b234b
64 64 $ hg clone main-repo branch-H --rev 7 -U
65 65 adding changesets
66 66 adding manifests
67 67 adding file changes
68 68 added 4 changesets with 4 changes to 4 files
69 69 new changesets 4a2df7238c3b:40faebb2ec45
70 70
71 71 Test simple bare operation
72 72 ==========================
73 73
74 74 pull
75 75 ----
76 76
77 77 $ hg clone main-repo test-repo-bare --rev 0 -U
78 78 adding changesets
79 79 adding manifests
80 80 adding file changes
81 81 added 1 changesets with 1 changes to 1 files
82 82 new changesets 4a2df7238c3b
83 83
84 84 $ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H
85 85 pulling from ./branch-E
86 86 searching for changes
87 87 adding changesets
88 88 adding manifests
89 89 adding file changes
90 90 added 4 changesets with 4 changes to 4 files
91 91 new changesets 27547f69f254:a603bfb5a83e
92 92 (run 'hg update' to get a working copy)
93 93 pulling from ./branch-G
94 94 searching for changes
95 95 adding changesets
96 96 adding manifests
97 97 adding file changes
98 98 added 2 changesets with 2 changes to 2 files (+1 heads)
99 99 new changesets 2f3a4c5c1417:c521a06b234b
100 100 (run 'hg heads' to see heads, 'hg merge' to merge)
101 101 pulling from ./branch-H
102 102 searching for changes
103 103 adding changesets
104 104 adding manifests
105 105 adding file changes
106 106 added 1 changesets with 1 changes to 1 files (+1 heads)
107 107 new changesets 40faebb2ec45
108 108 (run 'hg heads .' to see heads, 'hg merge' to merge)
109 109 $ hg log -R test-repo-bare -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
110 110 o H 7
111 111 |
112 112 | o E 4
113 113 | |
114 114 | o D 3
115 115 |/
116 116 o C 2
117 117 |
118 118 | o G 6
119 119 | |
120 120 | o F 5
121 121 |/
122 122 o B 1
123 123 |
124 124 o A 0
125 125
126 126
127 127 push
128 128 ----
129 129
130 130 $ cp -R ./branch-E ./branch-E-push
131 131 $ cp -R ./branch-G ./branch-G-push
132 132 $ cp -R ./branch-H ./branch-H-push
133 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
134 comparing with ./branch-E-push
135 searching for changes
136 comparing with ./branch-G-push
137 searching for changes
138 comparing with ./branch-H-push
139 searching for changes
140 o changeset: 7:40faebb2ec45
141 | tag: tip
142 | parent: 2:f838bfaca5c7
143 | user: test
144 | date: Thu Jan 01 00:00:00 1970 +0000
145 | summary: H
146 |
147 | o changeset: 6:c521a06b234b
148 | | user: test
149 | | date: Thu Jan 01 00:00:00 1970 +0000
150 | | summary: G
151 | |
152 | o changeset: 5:2f3a4c5c1417
153 | parent: 1:27547f69f254
154 | user: test
155 | date: Thu Jan 01 00:00:00 1970 +0000
156 | summary: F
157 |
158 | o changeset: 4:a603bfb5a83e
159 | | user: test
160 | | date: Thu Jan 01 00:00:00 1970 +0000
161 | | summary: E
162 | |
163 | o changeset: 3:b3325c91a4d9
164 |/ user: test
165 | date: Thu Jan 01 00:00:00 1970 +0000
166 | summary: D
167 |
168 o changeset: 2:f838bfaca5c7
169 user: test
170 date: Thu Jan 01 00:00:00 1970 +0000
171 summary: C
172
133 173 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
134 174 pushing to ./branch-E-push
135 175 searching for changes
136 176 adding changesets
137 177 adding manifests
138 178 adding file changes
139 179 added 3 changesets with 3 changes to 3 files (+2 heads)
140 180 pushing to ./branch-G-push
141 181 searching for changes
142 182 adding changesets
143 183 adding manifests
144 184 adding file changes
145 185 added 4 changesets with 4 changes to 4 files (+2 heads)
146 186 pushing to ./branch-H-push
147 187 searching for changes
148 188 adding changesets
149 189 adding manifests
150 190 adding file changes
151 191 added 4 changesets with 4 changes to 4 files (+2 heads)
152 192 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
153 193 o H 7
154 194 |
155 195 | o E 4
156 196 | |
157 197 | o D 3
158 198 |/
159 199 o C 2
160 200 |
161 201 | o G 6
162 202 | |
163 203 | o F 5
164 204 |/
165 205 o B 1
166 206 |
167 207 o A 0
168 208
169 209 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
170 210 o H 7
171 211 |
172 212 | o E 6
173 213 | |
174 214 | o D 5
175 215 |/
176 216 o C 4
177 217 |
178 218 | o G 3
179 219 | |
180 220 | o F 2
181 221 |/
182 222 o B 1
183 223 |
184 224 o A 0
185 225
186 226 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
187 227 o G 7
188 228 |
189 229 o F 6
190 230 |
191 231 | o E 5
192 232 | |
193 233 | o D 4
194 234 | |
195 235 | | o H 3
196 236 | |/
197 237 | o C 2
198 238 |/
199 239 o B 1
200 240 |
201 241 o A 0
202 242
203 243 $ rm -rf ./*-push
204 244
205 245 Test operation with a target
206 246 ============================
207 247
208 248 pull
209 249 ----
210 250
211 251 $ hg clone main-repo test-repo-rev --rev 0 -U
212 252 adding changesets
213 253 adding manifests
214 254 adding file changes
215 255 added 1 changesets with 1 changes to 1 files
216 256 new changesets 4a2df7238c3b
217 257
218 258 pulling an explicite revision
219 259
220 260 $ node_b=`hg log -R main-repo --rev 'desc(B)' -T '{node}'`
221 261 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev $node_b
222 262 pulling from ./branch-E
223 263 searching for changes
224 264 adding changesets
225 265 adding manifests
226 266 adding file changes
227 267 added 1 changesets with 1 changes to 1 files
228 268 new changesets 27547f69f254
229 269 (run 'hg update' to get a working copy)
230 270 pulling from ./branch-G
231 271 no changes found
232 272 pulling from ./branch-H
233 273 no changes found
234 274 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
235 275 o B 1
236 276 |
237 277 o A 0
238 278
239 279
240 280 pulling a branch head, the branch head resolve to different revision on the
241 281 different repositories.
242 282
243 283 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev default
244 284 pulling from ./branch-E
245 285 searching for changes
246 286 adding changesets
247 287 adding manifests
248 288 adding file changes
249 289 added 3 changesets with 3 changes to 3 files
250 290 new changesets f838bfaca5c7:a603bfb5a83e
251 291 (run 'hg update' to get a working copy)
252 292 pulling from ./branch-G
253 293 searching for changes
254 294 adding changesets
255 295 adding manifests
256 296 adding file changes
257 297 added 2 changesets with 2 changes to 2 files (+1 heads)
258 298 new changesets 2f3a4c5c1417:c521a06b234b
259 299 (run 'hg heads' to see heads, 'hg merge' to merge)
260 300 pulling from ./branch-H
261 301 searching for changes
262 302 adding changesets
263 303 adding manifests
264 304 adding file changes
265 305 added 1 changesets with 1 changes to 1 files (+1 heads)
266 306 new changesets 40faebb2ec45
267 307 (run 'hg heads .' to see heads, 'hg merge' to merge)
268 308 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
269 309 o H 7
270 310 |
271 311 | o E 4
272 312 | |
273 313 | o D 3
274 314 |/
275 315 o C 2
276 316 |
277 317 | o G 6
278 318 | |
279 319 | o F 5
280 320 |/
281 321 o B 1
282 322 |
283 323 o A 0
284 324
285 325
286 326 push
287 327 ----
288 328
289 329 We only push a specific branch with --rev
290 330
291 331 $ cp -R ./branch-E ./branch-E-push
292 332 $ cp -R ./branch-G ./branch-G-push
293 333 $ cp -R ./branch-H ./branch-H-push
334 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
335 comparing with ./branch-E-push
336 searching for changes
337 comparing with ./branch-G-push
338 searching for changes
339 comparing with ./branch-H-push
340 searching for changes
341 no changes found
342 o changeset: 7:40faebb2ec45
343 | tag: tip
344 | parent: 2:f838bfaca5c7
345 | user: test
346 | date: Thu Jan 01 00:00:00 1970 +0000
347 | summary: H
348 |
349 o changeset: 2:f838bfaca5c7
350 user: test
351 date: Thu Jan 01 00:00:00 1970 +0000
352 summary: C
353
294 354 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
295 355 pushing to ./branch-E-push
296 356 searching for changes
297 357 adding changesets
298 358 adding manifests
299 359 adding file changes
300 360 added 1 changesets with 1 changes to 1 files (+1 heads)
301 361 pushing to ./branch-G-push
302 362 searching for changes
303 363 adding changesets
304 364 adding manifests
305 365 adding file changes
306 366 added 2 changesets with 2 changes to 2 files (+1 heads)
307 367 pushing to ./branch-H-push
308 368 searching for changes
309 369 no changes found
310 370 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
311 371 o H 5
312 372 |
313 373 | o E 4
314 374 | |
315 375 | o D 3
316 376 |/
317 377 o C 2
318 378 |
319 379 o B 1
320 380 |
321 381 o A 0
322 382
323 383 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
324 384 o H 5
325 385 |
326 386 o C 4
327 387 |
328 388 | o G 3
329 389 | |
330 390 | o F 2
331 391 |/
332 392 o B 1
333 393 |
334 394 o A 0
335 395
336 396 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
337 397 o H 3
338 398 |
339 399 o C 2
340 400 |
341 401 o B 1
342 402 |
343 403 o A 0
344 404
345 405 $ rm -rf ./*-push
346 406
347 407 Same push, but the first one is a no-op
348 408
349 409 $ cp -R ./branch-E ./branch-E-push
350 410 $ cp -R ./branch-G ./branch-G-push
351 411 $ cp -R ./branch-H ./branch-H-push
412 $ hg out -G -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
413 comparing with ./branch-G-push
414 searching for changes
415 comparing with ./branch-H-push
416 searching for changes
417 no changes found
418 comparing with ./branch-E-push
419 searching for changes
420 o changeset: 7:40faebb2ec45
421 | tag: tip
422 | parent: 2:f838bfaca5c7
423 | user: test
424 | date: Thu Jan 01 00:00:00 1970 +0000
425 | summary: H
426 |
427 o changeset: 2:f838bfaca5c7
428 user: test
429 date: Thu Jan 01 00:00:00 1970 +0000
430 summary: C
431
352 432 $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
353 433 pushing to ./branch-G-push
354 434 searching for changes
355 435 adding changesets
356 436 adding manifests
357 437 adding file changes
358 438 added 2 changesets with 2 changes to 2 files (+1 heads)
359 439 pushing to ./branch-H-push
360 440 searching for changes
361 441 no changes found
362 442 pushing to ./branch-E-push
363 443 searching for changes
364 444 adding changesets
365 445 adding manifests
366 446 adding file changes
367 447 added 1 changesets with 1 changes to 1 files (+1 heads)
368 448 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
369 449 o H 5
370 450 |
371 451 | o E 4
372 452 | |
373 453 | o D 3
374 454 |/
375 455 o C 2
376 456 |
377 457 o B 1
378 458 |
379 459 o A 0
380 460
381 461 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
382 462 o H 5
383 463 |
384 464 o C 4
385 465 |
386 466 | o G 3
387 467 | |
388 468 | o F 2
389 469 |/
390 470 o B 1
391 471 |
392 472 o A 0
393 473
394 474 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
395 475 o H 3
396 476 |
397 477 o C 2
398 478 |
399 479 o B 1
400 480 |
401 481 o A 0
402 482
403 483 $ rm -rf ./*-push
404 484
405 485
406 486 Test with --update
407 487 ==================
408 488
409 489 update without conflicts
410 490 ------------------------
411 491
412 492 $ hg clone main-repo test-repo-update --rev 0
413 493 adding changesets
414 494 adding manifests
415 495 adding file changes
416 496 added 1 changesets with 1 changes to 1 files
417 497 new changesets 4a2df7238c3b
418 498 updating to branch default
419 499 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
420 500
421 501 We update for each pull, so the first on get into a branch independant from the
422 502 other and stay there. This is the expected behavior.
423 503
424 504 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
425 505 @ A 0
426 506
427 507 $ hg pull -R test-repo-update ./branch-E ./branch-G ./branch-H --update
428 508 pulling from ./branch-E
429 509 searching for changes
430 510 adding changesets
431 511 adding manifests
432 512 adding file changes
433 513 added 4 changesets with 4 changes to 4 files
434 514 new changesets 27547f69f254:a603bfb5a83e
435 515 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
436 516 pulling from ./branch-G
437 517 searching for changes
438 518 adding changesets
439 519 adding manifests
440 520 adding file changes
441 521 added 2 changesets with 2 changes to 2 files (+1 heads)
442 522 new changesets 2f3a4c5c1417:c521a06b234b
443 523 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
444 524 updated to "a603bfb5a83e: E"
445 525 1 other heads for branch "default"
446 526 pulling from ./branch-H
447 527 searching for changes
448 528 adding changesets
449 529 adding manifests
450 530 adding file changes
451 531 added 1 changesets with 1 changes to 1 files (+1 heads)
452 532 new changesets 40faebb2ec45
453 533 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
454 534 updated to "a603bfb5a83e: E"
455 535 2 other heads for branch "default"
456 536 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
457 537 o H 7
458 538 |
459 539 | @ E 4
460 540 | |
461 541 | o D 3
462 542 |/
463 543 o C 2
464 544 |
465 545 | o G 6
466 546 | |
467 547 | o F 5
468 548 |/
469 549 o B 1
470 550 |
471 551 o A 0
472 552
473 553
474 554 update with conflicts
475 555 ---------------------
476 556
477 557 $ hg clone main-repo test-repo-conflict --rev 0
478 558 adding changesets
479 559 adding manifests
480 560 adding file changes
481 561 added 1 changesets with 1 changes to 1 files
482 562 new changesets 4a2df7238c3b
483 563 updating to branch default
484 564 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
485 565
486 566 The update has conflict and interrupt the pull.
487 567
488 568 $ echo this-will-conflict > test-repo-conflict/D
489 569 $ hg add -R test-repo-conflict test-repo-conflict/D
490 570 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
491 571 @ A 0
492 572
493 573 $ hg pull -R test-repo-conflict ./branch-E ./branch-G ./branch-H --update
494 574 pulling from ./branch-E
495 575 searching for changes
496 576 adding changesets
497 577 adding manifests
498 578 adding file changes
499 579 added 4 changesets with 4 changes to 4 files
500 580 new changesets 27547f69f254:a603bfb5a83e
501 581 merging D
502 582 warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
503 583 3 files updated, 0 files merged, 0 files removed, 1 files unresolved
504 584 use 'hg resolve' to retry unresolved file merges
505 585 [1]
506 586 $ hg -R test-repo-conflict resolve -l
507 587 U D
508 588 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
509 589 @ E 4
510 590 |
511 591 o D 3
512 592 |
513 593 o C 2
514 594 |
515 595 o B 1
516 596 |
517 597 % A 0
518 598
General Comments 0
You need to be logged in to leave comments. Login now