##// END OF EJS Templates
outgoing: merge the code handling --graph with the main one...
marmoute -
r47677:efc6f6a7 default
parent child Browse files
Show More
@@ -1,7940 +1,7924 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import errno
11 11 import os
12 12 import re
13 13 import sys
14 14
15 15 from .i18n import _
16 16 from .node import (
17 17 hex,
18 18 nullid,
19 19 nullrev,
20 20 short,
21 21 wdirhex,
22 22 wdirrev,
23 23 )
24 24 from .pycompat import open
25 25 from . import (
26 26 archival,
27 27 bookmarks,
28 28 bundle2,
29 29 bundlecaches,
30 30 changegroup,
31 31 cmdutil,
32 32 copies,
33 33 debugcommands as debugcommandsmod,
34 34 destutil,
35 35 dirstateguard,
36 36 discovery,
37 37 encoding,
38 38 error,
39 39 exchange,
40 40 extensions,
41 41 filemerge,
42 42 formatter,
43 43 graphmod,
44 44 grep as grepmod,
45 45 hbisect,
46 46 help,
47 47 hg,
48 48 logcmdutil,
49 49 merge as mergemod,
50 50 mergestate as mergestatemod,
51 51 narrowspec,
52 52 obsolete,
53 53 obsutil,
54 54 patch,
55 55 phases,
56 56 pycompat,
57 57 rcutil,
58 58 registrar,
59 59 requirements,
60 60 revsetlang,
61 61 rewriteutil,
62 62 scmutil,
63 63 server,
64 64 shelve as shelvemod,
65 65 state as statemod,
66 66 streamclone,
67 67 tags as tagsmod,
68 68 ui as uimod,
69 69 util,
70 70 verify as verifymod,
71 71 vfs as vfsmod,
72 72 wireprotoserver,
73 73 )
74 74 from .utils import (
75 75 dateutil,
76 76 stringutil,
77 77 urlutil,
78 78 )
79 79
80 80 if pycompat.TYPE_CHECKING:
81 81 from typing import (
82 82 List,
83 83 )
84 84
85 85
86 86 table = {}
87 87 table.update(debugcommandsmod.command._table)
88 88
89 89 command = registrar.command(table)
90 90 INTENT_READONLY = registrar.INTENT_READONLY
91 91
92 92 # common command options
93 93
94 94 globalopts = [
95 95 (
96 96 b'R',
97 97 b'repository',
98 98 b'',
99 99 _(b'repository root directory or name of overlay bundle file'),
100 100 _(b'REPO'),
101 101 ),
102 102 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
103 103 (
104 104 b'y',
105 105 b'noninteractive',
106 106 None,
107 107 _(
108 108 b'do not prompt, automatically pick the first choice for all prompts'
109 109 ),
110 110 ),
111 111 (b'q', b'quiet', None, _(b'suppress output')),
112 112 (b'v', b'verbose', None, _(b'enable additional output')),
113 113 (
114 114 b'',
115 115 b'color',
116 116 b'',
117 117 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
118 118 # and should not be translated
119 119 _(b"when to colorize (boolean, always, auto, never, or debug)"),
120 120 _(b'TYPE'),
121 121 ),
122 122 (
123 123 b'',
124 124 b'config',
125 125 [],
126 126 _(b'set/override config option (use \'section.name=value\')'),
127 127 _(b'CONFIG'),
128 128 ),
129 129 (b'', b'debug', None, _(b'enable debugging output')),
130 130 (b'', b'debugger', None, _(b'start debugger')),
131 131 (
132 132 b'',
133 133 b'encoding',
134 134 encoding.encoding,
135 135 _(b'set the charset encoding'),
136 136 _(b'ENCODE'),
137 137 ),
138 138 (
139 139 b'',
140 140 b'encodingmode',
141 141 encoding.encodingmode,
142 142 _(b'set the charset encoding mode'),
143 143 _(b'MODE'),
144 144 ),
145 145 (b'', b'traceback', None, _(b'always print a traceback on exception')),
146 146 (b'', b'time', None, _(b'time how long the command takes')),
147 147 (b'', b'profile', None, _(b'print command execution profile')),
148 148 (b'', b'version', None, _(b'output version information and exit')),
149 149 (b'h', b'help', None, _(b'display help and exit')),
150 150 (b'', b'hidden', False, _(b'consider hidden changesets')),
151 151 (
152 152 b'',
153 153 b'pager',
154 154 b'auto',
155 155 _(b"when to paginate (boolean, always, auto, or never)"),
156 156 _(b'TYPE'),
157 157 ),
158 158 ]
159 159
160 160 dryrunopts = cmdutil.dryrunopts
161 161 remoteopts = cmdutil.remoteopts
162 162 walkopts = cmdutil.walkopts
163 163 commitopts = cmdutil.commitopts
164 164 commitopts2 = cmdutil.commitopts2
165 165 commitopts3 = cmdutil.commitopts3
166 166 formatteropts = cmdutil.formatteropts
167 167 templateopts = cmdutil.templateopts
168 168 logopts = cmdutil.logopts
169 169 diffopts = cmdutil.diffopts
170 170 diffwsopts = cmdutil.diffwsopts
171 171 diffopts2 = cmdutil.diffopts2
172 172 mergetoolopts = cmdutil.mergetoolopts
173 173 similarityopts = cmdutil.similarityopts
174 174 subrepoopts = cmdutil.subrepoopts
175 175 debugrevlogopts = cmdutil.debugrevlogopts
176 176
177 177 # Commands start here, listed alphabetically
178 178
179 179
180 180 @command(
181 181 b'abort',
182 182 dryrunopts,
183 183 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
184 184 helpbasic=True,
185 185 )
186 186 def abort(ui, repo, **opts):
187 187 """abort an unfinished operation (EXPERIMENTAL)
188 188
189 189 Aborts a multistep operation like graft, histedit, rebase, merge,
190 190 and unshelve if they are in an unfinished state.
191 191
192 192 use --dry-run/-n to dry run the command.
193 193 """
194 194 dryrun = opts.get('dry_run')
195 195 abortstate = cmdutil.getunfinishedstate(repo)
196 196 if not abortstate:
197 197 raise error.StateError(_(b'no operation in progress'))
198 198 if not abortstate.abortfunc:
199 199 raise error.InputError(
200 200 (
201 201 _(b"%s in progress but does not support 'hg abort'")
202 202 % (abortstate._opname)
203 203 ),
204 204 hint=abortstate.hint(),
205 205 )
206 206 if dryrun:
207 207 ui.status(
208 208 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
209 209 )
210 210 return
211 211 return abortstate.abortfunc(ui, repo)
212 212
213 213
214 214 @command(
215 215 b'add',
216 216 walkopts + subrepoopts + dryrunopts,
217 217 _(b'[OPTION]... [FILE]...'),
218 218 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
219 219 helpbasic=True,
220 220 inferrepo=True,
221 221 )
222 222 def add(ui, repo, *pats, **opts):
223 223 """add the specified files on the next commit
224 224
225 225 Schedule files to be version controlled and added to the
226 226 repository.
227 227
228 228 The files will be added to the repository at the next commit. To
229 229 undo an add before that, see :hg:`forget`.
230 230
231 231 If no names are given, add all files to the repository (except
232 232 files matching ``.hgignore``).
233 233
234 234 .. container:: verbose
235 235
236 236 Examples:
237 237
238 238 - New (unknown) files are added
239 239 automatically by :hg:`add`::
240 240
241 241 $ ls
242 242 foo.c
243 243 $ hg status
244 244 ? foo.c
245 245 $ hg add
246 246 adding foo.c
247 247 $ hg status
248 248 A foo.c
249 249
250 250 - Specific files to be added can be specified::
251 251
252 252 $ ls
253 253 bar.c foo.c
254 254 $ hg status
255 255 ? bar.c
256 256 ? foo.c
257 257 $ hg add bar.c
258 258 $ hg status
259 259 A bar.c
260 260 ? foo.c
261 261
262 262 Returns 0 if all files are successfully added.
263 263 """
264 264
265 265 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
266 266 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
267 267 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
268 268 return rejected and 1 or 0
269 269
270 270
271 271 @command(
272 272 b'addremove',
273 273 similarityopts + subrepoopts + walkopts + dryrunopts,
274 274 _(b'[OPTION]... [FILE]...'),
275 275 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
276 276 inferrepo=True,
277 277 )
278 278 def addremove(ui, repo, *pats, **opts):
279 279 """add all new files, delete all missing files
280 280
281 281 Add all new files and remove all missing files from the
282 282 repository.
283 283
284 284 Unless names are given, new files are ignored if they match any of
285 285 the patterns in ``.hgignore``. As with add, these changes take
286 286 effect at the next commit.
287 287
288 288 Use the -s/--similarity option to detect renamed files. This
289 289 option takes a percentage between 0 (disabled) and 100 (files must
290 290 be identical) as its parameter. With a parameter greater than 0,
291 291 this compares every removed file with every added file and records
292 292 those similar enough as renames. Detecting renamed files this way
293 293 can be expensive. After using this option, :hg:`status -C` can be
294 294 used to check which files were identified as moved or renamed. If
295 295 not specified, -s/--similarity defaults to 100 and only renames of
296 296 identical files are detected.
297 297
298 298 .. container:: verbose
299 299
300 300 Examples:
301 301
302 302 - A number of files (bar.c and foo.c) are new,
303 303 while foobar.c has been removed (without using :hg:`remove`)
304 304 from the repository::
305 305
306 306 $ ls
307 307 bar.c foo.c
308 308 $ hg status
309 309 ! foobar.c
310 310 ? bar.c
311 311 ? foo.c
312 312 $ hg addremove
313 313 adding bar.c
314 314 adding foo.c
315 315 removing foobar.c
316 316 $ hg status
317 317 A bar.c
318 318 A foo.c
319 319 R foobar.c
320 320
321 321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 322 Afterwards, it was edited slightly::
323 323
324 324 $ ls
325 325 foo.c
326 326 $ hg status
327 327 ! foobar.c
328 328 ? foo.c
329 329 $ hg addremove --similarity 90
330 330 removing foobar.c
331 331 adding foo.c
332 332 recording removal of foobar.c as rename to foo.c (94% similar)
333 333 $ hg status -C
334 334 A foo.c
335 335 foobar.c
336 336 R foobar.c
337 337
338 338 Returns 0 if all files are successfully added.
339 339 """
340 340 opts = pycompat.byteskwargs(opts)
341 341 if not opts.get(b'similarity'):
342 342 opts[b'similarity'] = b'100'
343 343 matcher = scmutil.match(repo[None], pats, opts)
344 344 relative = scmutil.anypats(pats, opts)
345 345 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
346 346 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
347 347
348 348
349 349 @command(
350 350 b'annotate|blame',
351 351 [
352 352 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
353 353 (
354 354 b'',
355 355 b'follow',
356 356 None,
357 357 _(b'follow copies/renames and list the filename (DEPRECATED)'),
358 358 ),
359 359 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
360 360 (b'a', b'text', None, _(b'treat all files as text')),
361 361 (b'u', b'user', None, _(b'list the author (long with -v)')),
362 362 (b'f', b'file', None, _(b'list the filename')),
363 363 (b'd', b'date', None, _(b'list the date (short with -q)')),
364 364 (b'n', b'number', None, _(b'list the revision number (default)')),
365 365 (b'c', b'changeset', None, _(b'list the changeset')),
366 366 (
367 367 b'l',
368 368 b'line-number',
369 369 None,
370 370 _(b'show line number at the first appearance'),
371 371 ),
372 372 (
373 373 b'',
374 374 b'skip',
375 375 [],
376 376 _(b'revset to not display (EXPERIMENTAL)'),
377 377 _(b'REV'),
378 378 ),
379 379 ]
380 380 + diffwsopts
381 381 + walkopts
382 382 + formatteropts,
383 383 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
384 384 helpcategory=command.CATEGORY_FILE_CONTENTS,
385 385 helpbasic=True,
386 386 inferrepo=True,
387 387 )
388 388 def annotate(ui, repo, *pats, **opts):
389 389 """show changeset information by line for each file
390 390
391 391 List changes in files, showing the revision id responsible for
392 392 each line.
393 393
394 394 This command is useful for discovering when a change was made and
395 395 by whom.
396 396
397 397 If you include --file, --user, or --date, the revision number is
398 398 suppressed unless you also include --number.
399 399
400 400 Without the -a/--text option, annotate will avoid processing files
401 401 it detects as binary. With -a, annotate will annotate the file
402 402 anyway, although the results will probably be neither useful
403 403 nor desirable.
404 404
405 405 .. container:: verbose
406 406
407 407 Template:
408 408
409 409 The following keywords are supported in addition to the common template
410 410 keywords and functions. See also :hg:`help templates`.
411 411
412 412 :lines: List of lines with annotation data.
413 413 :path: String. Repository-absolute path of the specified file.
414 414
415 415 And each entry of ``{lines}`` provides the following sub-keywords in
416 416 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
417 417
418 418 :line: String. Line content.
419 419 :lineno: Integer. Line number at that revision.
420 420 :path: String. Repository-absolute path of the file at that revision.
421 421
422 422 See :hg:`help templates.operators` for the list expansion syntax.
423 423
424 424 Returns 0 on success.
425 425 """
426 426 opts = pycompat.byteskwargs(opts)
427 427 if not pats:
428 428 raise error.InputError(
429 429 _(b'at least one filename or pattern is required')
430 430 )
431 431
432 432 if opts.get(b'follow'):
433 433 # --follow is deprecated and now just an alias for -f/--file
434 434 # to mimic the behavior of Mercurial before version 1.5
435 435 opts[b'file'] = True
436 436
437 437 if (
438 438 not opts.get(b'user')
439 439 and not opts.get(b'changeset')
440 440 and not opts.get(b'date')
441 441 and not opts.get(b'file')
442 442 ):
443 443 opts[b'number'] = True
444 444
445 445 linenumber = opts.get(b'line_number') is not None
446 446 if (
447 447 linenumber
448 448 and (not opts.get(b'changeset'))
449 449 and (not opts.get(b'number'))
450 450 ):
451 451 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
452 452
453 453 rev = opts.get(b'rev')
454 454 if rev:
455 455 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
456 456 ctx = scmutil.revsingle(repo, rev)
457 457
458 458 ui.pager(b'annotate')
459 459 rootfm = ui.formatter(b'annotate', opts)
460 460 if ui.debugflag:
461 461 shorthex = pycompat.identity
462 462 else:
463 463
464 464 def shorthex(h):
465 465 return h[:12]
466 466
467 467 if ui.quiet:
468 468 datefunc = dateutil.shortdate
469 469 else:
470 470 datefunc = dateutil.datestr
471 471 if ctx.rev() is None:
472 472 if opts.get(b'changeset'):
473 473 # omit "+" suffix which is appended to node hex
474 474 def formatrev(rev):
475 475 if rev == wdirrev:
476 476 return b'%d' % ctx.p1().rev()
477 477 else:
478 478 return b'%d' % rev
479 479
480 480 else:
481 481
482 482 def formatrev(rev):
483 483 if rev == wdirrev:
484 484 return b'%d+' % ctx.p1().rev()
485 485 else:
486 486 return b'%d ' % rev
487 487
488 488 def formathex(h):
489 489 if h == wdirhex:
490 490 return b'%s+' % shorthex(hex(ctx.p1().node()))
491 491 else:
492 492 return b'%s ' % shorthex(h)
493 493
494 494 else:
495 495 formatrev = b'%d'.__mod__
496 496 formathex = shorthex
497 497
498 498 opmap = [
499 499 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
500 500 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
501 501 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
502 502 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
503 503 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
504 504 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
505 505 ]
506 506 opnamemap = {
507 507 b'rev': b'number',
508 508 b'node': b'changeset',
509 509 b'path': b'file',
510 510 b'lineno': b'line_number',
511 511 }
512 512
513 513 if rootfm.isplain():
514 514
515 515 def makefunc(get, fmt):
516 516 return lambda x: fmt(get(x))
517 517
518 518 else:
519 519
520 520 def makefunc(get, fmt):
521 521 return get
522 522
523 523 datahint = rootfm.datahint()
524 524 funcmap = [
525 525 (makefunc(get, fmt), sep)
526 526 for fn, sep, get, fmt in opmap
527 527 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
528 528 ]
529 529 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
530 530 fields = b' '.join(
531 531 fn
532 532 for fn, sep, get, fmt in opmap
533 533 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
534 534 )
535 535
536 536 def bad(x, y):
537 537 raise error.Abort(b"%s: %s" % (x, y))
538 538
539 539 m = scmutil.match(ctx, pats, opts, badfn=bad)
540 540
541 541 follow = not opts.get(b'no_follow')
542 542 diffopts = patch.difffeatureopts(
543 543 ui, opts, section=b'annotate', whitespace=True
544 544 )
545 545 skiprevs = opts.get(b'skip')
546 546 if skiprevs:
547 547 skiprevs = scmutil.revrange(repo, skiprevs)
548 548
549 549 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
550 550 for abs in ctx.walk(m):
551 551 fctx = ctx[abs]
552 552 rootfm.startitem()
553 553 rootfm.data(path=abs)
554 554 if not opts.get(b'text') and fctx.isbinary():
555 555 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
556 556 continue
557 557
558 558 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
559 559 lines = fctx.annotate(
560 560 follow=follow, skiprevs=skiprevs, diffopts=diffopts
561 561 )
562 562 if not lines:
563 563 fm.end()
564 564 continue
565 565 formats = []
566 566 pieces = []
567 567
568 568 for f, sep in funcmap:
569 569 l = [f(n) for n in lines]
570 570 if fm.isplain():
571 571 sizes = [encoding.colwidth(x) for x in l]
572 572 ml = max(sizes)
573 573 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
574 574 else:
575 575 formats.append([b'%s'] * len(l))
576 576 pieces.append(l)
577 577
578 578 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
579 579 fm.startitem()
580 580 fm.context(fctx=n.fctx)
581 581 fm.write(fields, b"".join(f), *p)
582 582 if n.skip:
583 583 fmt = b"* %s"
584 584 else:
585 585 fmt = b": %s"
586 586 fm.write(b'line', fmt, n.text)
587 587
588 588 if not lines[-1].text.endswith(b'\n'):
589 589 fm.plain(b'\n')
590 590 fm.end()
591 591
592 592 rootfm.end()
593 593
594 594
595 595 @command(
596 596 b'archive',
597 597 [
598 598 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
599 599 (
600 600 b'p',
601 601 b'prefix',
602 602 b'',
603 603 _(b'directory prefix for files in archive'),
604 604 _(b'PREFIX'),
605 605 ),
606 606 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
607 607 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
608 608 ]
609 609 + subrepoopts
610 610 + walkopts,
611 611 _(b'[OPTION]... DEST'),
612 612 helpcategory=command.CATEGORY_IMPORT_EXPORT,
613 613 )
614 614 def archive(ui, repo, dest, **opts):
615 615 """create an unversioned archive of a repository revision
616 616
617 617 By default, the revision used is the parent of the working
618 618 directory; use -r/--rev to specify a different revision.
619 619
620 620 The archive type is automatically detected based on file
621 621 extension (to override, use -t/--type).
622 622
623 623 .. container:: verbose
624 624
625 625 Examples:
626 626
627 627 - create a zip file containing the 1.0 release::
628 628
629 629 hg archive -r 1.0 project-1.0.zip
630 630
631 631 - create a tarball excluding .hg files::
632 632
633 633 hg archive project.tar.gz -X ".hg*"
634 634
635 635 Valid types are:
636 636
637 637 :``files``: a directory full of files (default)
638 638 :``tar``: tar archive, uncompressed
639 639 :``tbz2``: tar archive, compressed using bzip2
640 640 :``tgz``: tar archive, compressed using gzip
641 641 :``txz``: tar archive, compressed using lzma (only in Python 3)
642 642 :``uzip``: zip archive, uncompressed
643 643 :``zip``: zip archive, compressed using deflate
644 644
645 645 The exact name of the destination archive or directory is given
646 646 using a format string; see :hg:`help export` for details.
647 647
648 648 Each member added to an archive file has a directory prefix
649 649 prepended. Use -p/--prefix to specify a format string for the
650 650 prefix. The default is the basename of the archive, with suffixes
651 651 removed.
652 652
653 653 Returns 0 on success.
654 654 """
655 655
656 656 opts = pycompat.byteskwargs(opts)
657 657 rev = opts.get(b'rev')
658 658 if rev:
659 659 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
660 660 ctx = scmutil.revsingle(repo, rev)
661 661 if not ctx:
662 662 raise error.InputError(
663 663 _(b'no working directory: please specify a revision')
664 664 )
665 665 node = ctx.node()
666 666 dest = cmdutil.makefilename(ctx, dest)
667 667 if os.path.realpath(dest) == repo.root:
668 668 raise error.InputError(_(b'repository root cannot be destination'))
669 669
670 670 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
671 671 prefix = opts.get(b'prefix')
672 672
673 673 if dest == b'-':
674 674 if kind == b'files':
675 675 raise error.InputError(_(b'cannot archive plain files to stdout'))
676 676 dest = cmdutil.makefileobj(ctx, dest)
677 677 if not prefix:
678 678 prefix = os.path.basename(repo.root) + b'-%h'
679 679
680 680 prefix = cmdutil.makefilename(ctx, prefix)
681 681 match = scmutil.match(ctx, [], opts)
682 682 archival.archive(
683 683 repo,
684 684 dest,
685 685 node,
686 686 kind,
687 687 not opts.get(b'no_decode'),
688 688 match,
689 689 prefix,
690 690 subrepos=opts.get(b'subrepos'),
691 691 )
692 692
693 693
694 694 @command(
695 695 b'backout',
696 696 [
697 697 (
698 698 b'',
699 699 b'merge',
700 700 None,
701 701 _(b'merge with old dirstate parent after backout'),
702 702 ),
703 703 (
704 704 b'',
705 705 b'commit',
706 706 None,
707 707 _(b'commit if no conflicts were encountered (DEPRECATED)'),
708 708 ),
709 709 (b'', b'no-commit', None, _(b'do not commit')),
710 710 (
711 711 b'',
712 712 b'parent',
713 713 b'',
714 714 _(b'parent to choose when backing out merge (DEPRECATED)'),
715 715 _(b'REV'),
716 716 ),
717 717 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
718 718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
719 719 ]
720 720 + mergetoolopts
721 721 + walkopts
722 722 + commitopts
723 723 + commitopts2,
724 724 _(b'[OPTION]... [-r] REV'),
725 725 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
726 726 )
727 727 def backout(ui, repo, node=None, rev=None, **opts):
728 728 """reverse effect of earlier changeset
729 729
730 730 Prepare a new changeset with the effect of REV undone in the
731 731 current working directory. If no conflicts were encountered,
732 732 it will be committed immediately.
733 733
734 734 If REV is the parent of the working directory, then this new changeset
735 735 is committed automatically (unless --no-commit is specified).
736 736
737 737 .. note::
738 738
739 739 :hg:`backout` cannot be used to fix either an unwanted or
740 740 incorrect merge.
741 741
742 742 .. container:: verbose
743 743
744 744 Examples:
745 745
746 746 - Reverse the effect of the parent of the working directory.
747 747 This backout will be committed immediately::
748 748
749 749 hg backout -r .
750 750
751 751 - Reverse the effect of previous bad revision 23::
752 752
753 753 hg backout -r 23
754 754
755 755 - Reverse the effect of previous bad revision 23 and
756 756 leave changes uncommitted::
757 757
758 758 hg backout -r 23 --no-commit
759 759 hg commit -m "Backout revision 23"
760 760
761 761 By default, the pending changeset will have one parent,
762 762 maintaining a linear history. With --merge, the pending
763 763 changeset will instead have two parents: the old parent of the
764 764 working directory and a new child of REV that simply undoes REV.
765 765
766 766 Before version 1.7, the behavior without --merge was equivalent
767 767 to specifying --merge followed by :hg:`update --clean .` to
768 768 cancel the merge and leave the child of REV as a head to be
769 769 merged separately.
770 770
771 771 See :hg:`help dates` for a list of formats valid for -d/--date.
772 772
773 773 See :hg:`help revert` for a way to restore files to the state
774 774 of another revision.
775 775
776 776 Returns 0 on success, 1 if nothing to backout or there are unresolved
777 777 files.
778 778 """
779 779 with repo.wlock(), repo.lock():
780 780 return _dobackout(ui, repo, node, rev, **opts)
781 781
782 782
783 783 def _dobackout(ui, repo, node=None, rev=None, **opts):
784 784 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
785 785 opts = pycompat.byteskwargs(opts)
786 786
787 787 if rev and node:
788 788 raise error.InputError(_(b"please specify just one revision"))
789 789
790 790 if not rev:
791 791 rev = node
792 792
793 793 if not rev:
794 794 raise error.InputError(_(b"please specify a revision to backout"))
795 795
796 796 date = opts.get(b'date')
797 797 if date:
798 798 opts[b'date'] = dateutil.parsedate(date)
799 799
800 800 cmdutil.checkunfinished(repo)
801 801 cmdutil.bailifchanged(repo)
802 802 ctx = scmutil.revsingle(repo, rev)
803 803 node = ctx.node()
804 804
805 805 op1, op2 = repo.dirstate.parents()
806 806 if not repo.changelog.isancestor(node, op1):
807 807 raise error.InputError(
808 808 _(b'cannot backout change that is not an ancestor')
809 809 )
810 810
811 811 p1, p2 = repo.changelog.parents(node)
812 812 if p1 == nullid:
813 813 raise error.InputError(_(b'cannot backout a change with no parents'))
814 814 if p2 != nullid:
815 815 if not opts.get(b'parent'):
816 816 raise error.InputError(_(b'cannot backout a merge changeset'))
817 817 p = repo.lookup(opts[b'parent'])
818 818 if p not in (p1, p2):
819 819 raise error.InputError(
820 820 _(b'%s is not a parent of %s') % (short(p), short(node))
821 821 )
822 822 parent = p
823 823 else:
824 824 if opts.get(b'parent'):
825 825 raise error.InputError(
826 826 _(b'cannot use --parent on non-merge changeset')
827 827 )
828 828 parent = p1
829 829
830 830 # the backout should appear on the same branch
831 831 branch = repo.dirstate.branch()
832 832 bheads = repo.branchheads(branch)
833 833 rctx = scmutil.revsingle(repo, hex(parent))
834 834 if not opts.get(b'merge') and op1 != node:
835 835 with dirstateguard.dirstateguard(repo, b'backout'):
836 836 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
837 837 with ui.configoverride(overrides, b'backout'):
838 838 stats = mergemod.back_out(ctx, parent=repo[parent])
839 839 repo.setparents(op1, op2)
840 840 hg._showstats(repo, stats)
841 841 if stats.unresolvedcount:
842 842 repo.ui.status(
843 843 _(b"use 'hg resolve' to retry unresolved file merges\n")
844 844 )
845 845 return 1
846 846 else:
847 847 hg.clean(repo, node, show_stats=False)
848 848 repo.dirstate.setbranch(branch)
849 849 cmdutil.revert(ui, repo, rctx)
850 850
851 851 if opts.get(b'no_commit'):
852 852 msg = _(b"changeset %s backed out, don't forget to commit.\n")
853 853 ui.status(msg % short(node))
854 854 return 0
855 855
856 856 def commitfunc(ui, repo, message, match, opts):
857 857 editform = b'backout'
858 858 e = cmdutil.getcommiteditor(
859 859 editform=editform, **pycompat.strkwargs(opts)
860 860 )
861 861 if not message:
862 862 # we don't translate commit messages
863 863 message = b"Backed out changeset %s" % short(node)
864 864 e = cmdutil.getcommiteditor(edit=True, editform=editform)
865 865 return repo.commit(
866 866 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
867 867 )
868 868
869 869 # save to detect changes
870 870 tip = repo.changelog.tip()
871 871
872 872 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
873 873 if not newnode:
874 874 ui.status(_(b"nothing changed\n"))
875 875 return 1
876 876 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
877 877
878 878 def nice(node):
879 879 return b'%d:%s' % (repo.changelog.rev(node), short(node))
880 880
881 881 ui.status(
882 882 _(b'changeset %s backs out changeset %s\n')
883 883 % (nice(newnode), nice(node))
884 884 )
885 885 if opts.get(b'merge') and op1 != node:
886 886 hg.clean(repo, op1, show_stats=False)
887 887 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
888 888 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
889 889 with ui.configoverride(overrides, b'backout'):
890 890 return hg.merge(repo[b'tip'])
891 891 return 0
892 892
893 893
894 894 @command(
895 895 b'bisect',
896 896 [
897 897 (b'r', b'reset', False, _(b'reset bisect state')),
898 898 (b'g', b'good', False, _(b'mark changeset good')),
899 899 (b'b', b'bad', False, _(b'mark changeset bad')),
900 900 (b's', b'skip', False, _(b'skip testing changeset')),
901 901 (b'e', b'extend', False, _(b'extend the bisect range')),
902 902 (
903 903 b'c',
904 904 b'command',
905 905 b'',
906 906 _(b'use command to check changeset state'),
907 907 _(b'CMD'),
908 908 ),
909 909 (b'U', b'noupdate', False, _(b'do not update to target')),
910 910 ],
911 911 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
912 912 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
913 913 )
914 914 def bisect(
915 915 ui,
916 916 repo,
917 917 positional_1=None,
918 918 positional_2=None,
919 919 command=None,
920 920 reset=None,
921 921 good=None,
922 922 bad=None,
923 923 skip=None,
924 924 extend=None,
925 925 noupdate=None,
926 926 ):
927 927 """subdivision search of changesets
928 928
929 929 This command helps to find changesets which introduce problems. To
930 930 use, mark the earliest changeset you know exhibits the problem as
931 931 bad, then mark the latest changeset which is free from the problem
932 932 as good. Bisect will update your working directory to a revision
933 933 for testing (unless the -U/--noupdate option is specified). Once
934 934 you have performed tests, mark the working directory as good or
935 935 bad, and bisect will either update to another candidate changeset
936 936 or announce that it has found the bad revision.
937 937
938 938 As a shortcut, you can also use the revision argument to mark a
939 939 revision as good or bad without checking it out first.
940 940
941 941 If you supply a command, it will be used for automatic bisection.
942 942 The environment variable HG_NODE will contain the ID of the
943 943 changeset being tested. The exit status of the command will be
944 944 used to mark revisions as good or bad: status 0 means good, 125
945 945 means to skip the revision, 127 (command not found) will abort the
946 946 bisection, and any other non-zero exit status means the revision
947 947 is bad.
948 948
949 949 .. container:: verbose
950 950
951 951 Some examples:
952 952
953 953 - start a bisection with known bad revision 34, and good revision 12::
954 954
955 955 hg bisect --bad 34
956 956 hg bisect --good 12
957 957
958 958 - advance the current bisection by marking current revision as good or
959 959 bad::
960 960
961 961 hg bisect --good
962 962 hg bisect --bad
963 963
964 964 - mark the current revision, or a known revision, to be skipped (e.g. if
965 965 that revision is not usable because of another issue)::
966 966
967 967 hg bisect --skip
968 968 hg bisect --skip 23
969 969
970 970 - skip all revisions that do not touch directories ``foo`` or ``bar``::
971 971
972 972 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
973 973
974 974 - forget the current bisection::
975 975
976 976 hg bisect --reset
977 977
978 978 - use 'make && make tests' to automatically find the first broken
979 979 revision::
980 980
981 981 hg bisect --reset
982 982 hg bisect --bad 34
983 983 hg bisect --good 12
984 984 hg bisect --command "make && make tests"
985 985
986 986 - see all changesets whose states are already known in the current
987 987 bisection::
988 988
989 989 hg log -r "bisect(pruned)"
990 990
991 991 - see the changeset currently being bisected (especially useful
992 992 if running with -U/--noupdate)::
993 993
994 994 hg log -r "bisect(current)"
995 995
996 996 - see all changesets that took part in the current bisection::
997 997
998 998 hg log -r "bisect(range)"
999 999
1000 1000 - you can even get a nice graph::
1001 1001
1002 1002 hg log --graph -r "bisect(range)"
1003 1003
1004 1004 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1005 1005
1006 1006 Returns 0 on success.
1007 1007 """
1008 1008 rev = []
1009 1009 # backward compatibility
1010 1010 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1011 1011 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1012 1012 cmd = positional_1
1013 1013 rev.append(positional_2)
1014 1014 if cmd == b"good":
1015 1015 good = True
1016 1016 elif cmd == b"bad":
1017 1017 bad = True
1018 1018 else:
1019 1019 reset = True
1020 1020 elif positional_2:
1021 1021 raise error.InputError(_(b'incompatible arguments'))
1022 1022 elif positional_1 is not None:
1023 1023 rev.append(positional_1)
1024 1024
1025 1025 incompatibles = {
1026 1026 b'--bad': bad,
1027 1027 b'--command': bool(command),
1028 1028 b'--extend': extend,
1029 1029 b'--good': good,
1030 1030 b'--reset': reset,
1031 1031 b'--skip': skip,
1032 1032 }
1033 1033
1034 1034 enabled = [x for x in incompatibles if incompatibles[x]]
1035 1035
1036 1036 if len(enabled) > 1:
1037 1037 raise error.InputError(
1038 1038 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1039 1039 )
1040 1040
1041 1041 if reset:
1042 1042 hbisect.resetstate(repo)
1043 1043 return
1044 1044
1045 1045 state = hbisect.load_state(repo)
1046 1046
1047 1047 if rev:
1048 1048 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1049 1049 else:
1050 1050 nodes = [repo.lookup(b'.')]
1051 1051
1052 1052 # update state
1053 1053 if good or bad or skip:
1054 1054 if good:
1055 1055 state[b'good'] += nodes
1056 1056 elif bad:
1057 1057 state[b'bad'] += nodes
1058 1058 elif skip:
1059 1059 state[b'skip'] += nodes
1060 1060 hbisect.save_state(repo, state)
1061 1061 if not (state[b'good'] and state[b'bad']):
1062 1062 return
1063 1063
1064 1064 def mayupdate(repo, node, show_stats=True):
1065 1065 """common used update sequence"""
1066 1066 if noupdate:
1067 1067 return
1068 1068 cmdutil.checkunfinished(repo)
1069 1069 cmdutil.bailifchanged(repo)
1070 1070 return hg.clean(repo, node, show_stats=show_stats)
1071 1071
1072 1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1073 1073
1074 1074 if command:
1075 1075 changesets = 1
1076 1076 if noupdate:
1077 1077 try:
1078 1078 node = state[b'current'][0]
1079 1079 except LookupError:
1080 1080 raise error.StateError(
1081 1081 _(
1082 1082 b'current bisect revision is unknown - '
1083 1083 b'start a new bisect to fix'
1084 1084 )
1085 1085 )
1086 1086 else:
1087 1087 node, p2 = repo.dirstate.parents()
1088 1088 if p2 != nullid:
1089 1089 raise error.StateError(_(b'current bisect revision is a merge'))
1090 1090 if rev:
1091 1091 if not nodes:
1092 1092 raise error.Abort(_(b'empty revision set'))
1093 1093 node = repo[nodes[-1]].node()
1094 1094 with hbisect.restore_state(repo, state, node):
1095 1095 while changesets:
1096 1096 # update state
1097 1097 state[b'current'] = [node]
1098 1098 hbisect.save_state(repo, state)
1099 1099 status = ui.system(
1100 1100 command,
1101 1101 environ={b'HG_NODE': hex(node)},
1102 1102 blockedtag=b'bisect_check',
1103 1103 )
1104 1104 if status == 125:
1105 1105 transition = b"skip"
1106 1106 elif status == 0:
1107 1107 transition = b"good"
1108 1108 # status < 0 means process was killed
1109 1109 elif status == 127:
1110 1110 raise error.Abort(_(b"failed to execute %s") % command)
1111 1111 elif status < 0:
1112 1112 raise error.Abort(_(b"%s killed") % command)
1113 1113 else:
1114 1114 transition = b"bad"
1115 1115 state[transition].append(node)
1116 1116 ctx = repo[node]
1117 1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1118 1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1119 1119 hbisect.checkstate(state)
1120 1120 # bisect
1121 1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1122 1122 # update to next check
1123 1123 node = nodes[0]
1124 1124 mayupdate(repo, node, show_stats=False)
1125 1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1126 1126 return
1127 1127
1128 1128 hbisect.checkstate(state)
1129 1129
1130 1130 # actually bisect
1131 1131 nodes, changesets, good = hbisect.bisect(repo, state)
1132 1132 if extend:
1133 1133 if not changesets:
1134 1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1135 1135 if extendctx is not None:
1136 1136 ui.write(
1137 1137 _(b"Extending search to changeset %s\n")
1138 1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1139 1139 )
1140 1140 state[b'current'] = [extendctx.node()]
1141 1141 hbisect.save_state(repo, state)
1142 1142 return mayupdate(repo, extendctx.node())
1143 1143 raise error.StateError(_(b"nothing to extend"))
1144 1144
1145 1145 if changesets == 0:
1146 1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1147 1147 else:
1148 1148 assert len(nodes) == 1 # only a single node can be tested next
1149 1149 node = nodes[0]
1150 1150 # compute the approximate number of remaining tests
1151 1151 tests, size = 0, 2
1152 1152 while size <= changesets:
1153 1153 tests, size = tests + 1, size * 2
1154 1154 rev = repo.changelog.rev(node)
1155 1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1156 1156 ui.write(
1157 1157 _(
1158 1158 b"Testing changeset %s "
1159 1159 b"(%d changesets remaining, ~%d tests)\n"
1160 1160 )
1161 1161 % (summary, changesets, tests)
1162 1162 )
1163 1163 state[b'current'] = [node]
1164 1164 hbisect.save_state(repo, state)
1165 1165 return mayupdate(repo, node)
1166 1166
1167 1167
1168 1168 @command(
1169 1169 b'bookmarks|bookmark',
1170 1170 [
1171 1171 (b'f', b'force', False, _(b'force')),
1172 1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1173 1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1174 1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1175 1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1176 1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1177 1177 ]
1178 1178 + formatteropts,
1179 1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1180 1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1181 1181 )
1182 1182 def bookmark(ui, repo, *names, **opts):
1183 1183 """create a new bookmark or list existing bookmarks
1184 1184
1185 1185 Bookmarks are labels on changesets to help track lines of development.
1186 1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1187 1187 Deleting or moving a bookmark has no effect on the associated changesets.
1188 1188
1189 1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1190 1190 The active bookmark is indicated with a '*'.
1191 1191 When a commit is made, the active bookmark will advance to the new commit.
1192 1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1193 1193 Updating away from a bookmark will cause it to be deactivated.
1194 1194
1195 1195 Bookmarks can be pushed and pulled between repositories (see
1196 1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1197 1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1198 1198 be created. Using :hg:`merge` will resolve the divergence.
1199 1199
1200 1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1201 1201 the active bookmark's name.
1202 1202
1203 1203 A bookmark named '@' has the special property that :hg:`clone` will
1204 1204 check it out by default if it exists.
1205 1205
1206 1206 .. container:: verbose
1207 1207
1208 1208 Template:
1209 1209
1210 1210 The following keywords are supported in addition to the common template
1211 1211 keywords and functions such as ``{bookmark}``. See also
1212 1212 :hg:`help templates`.
1213 1213
1214 1214 :active: Boolean. True if the bookmark is active.
1215 1215
1216 1216 Examples:
1217 1217
1218 1218 - create an active bookmark for a new line of development::
1219 1219
1220 1220 hg book new-feature
1221 1221
1222 1222 - create an inactive bookmark as a place marker::
1223 1223
1224 1224 hg book -i reviewed
1225 1225
1226 1226 - create an inactive bookmark on another changeset::
1227 1227
1228 1228 hg book -r .^ tested
1229 1229
1230 1230 - rename bookmark turkey to dinner::
1231 1231
1232 1232 hg book -m turkey dinner
1233 1233
1234 1234 - move the '@' bookmark from another branch::
1235 1235
1236 1236 hg book -f @
1237 1237
1238 1238 - print only the active bookmark name::
1239 1239
1240 1240 hg book -ql .
1241 1241 """
1242 1242 opts = pycompat.byteskwargs(opts)
1243 1243 force = opts.get(b'force')
1244 1244 rev = opts.get(b'rev')
1245 1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1246 1246
1247 1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1248 1248 if action:
1249 1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1250 1250 elif names or rev:
1251 1251 action = b'add'
1252 1252 elif inactive:
1253 1253 action = b'inactive' # meaning deactivate
1254 1254 else:
1255 1255 action = b'list'
1256 1256
1257 1257 cmdutil.check_incompatible_arguments(
1258 1258 opts, b'inactive', [b'delete', b'list']
1259 1259 )
1260 1260 if not names and action in {b'add', b'delete'}:
1261 1261 raise error.InputError(_(b"bookmark name required"))
1262 1262
1263 1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1264 1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1265 1265 if action == b'delete':
1266 1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 1267 bookmarks.delete(repo, tr, names)
1268 1268 elif action == b'rename':
1269 1269 if not names:
1270 1270 raise error.InputError(_(b"new bookmark name required"))
1271 1271 elif len(names) > 1:
1272 1272 raise error.InputError(
1273 1273 _(b"only one new bookmark name allowed")
1274 1274 )
1275 1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1276 1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1277 1277 elif action == b'add':
1278 1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1279 1279 elif action == b'inactive':
1280 1280 if len(repo._bookmarks) == 0:
1281 1281 ui.status(_(b"no bookmarks set\n"))
1282 1282 elif not repo._activebookmark:
1283 1283 ui.status(_(b"no active bookmark\n"))
1284 1284 else:
1285 1285 bookmarks.deactivate(repo)
1286 1286 elif action == b'list':
1287 1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1288 1288 with ui.formatter(b'bookmarks', opts) as fm:
1289 1289 bookmarks.printbookmarks(ui, repo, fm, names)
1290 1290 else:
1291 1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1292 1292
1293 1293
1294 1294 @command(
1295 1295 b'branch',
1296 1296 [
1297 1297 (
1298 1298 b'f',
1299 1299 b'force',
1300 1300 None,
1301 1301 _(b'set branch name even if it shadows an existing branch'),
1302 1302 ),
1303 1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1304 1304 (
1305 1305 b'r',
1306 1306 b'rev',
1307 1307 [],
1308 1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1309 1309 ),
1310 1310 ],
1311 1311 _(b'[-fC] [NAME]'),
1312 1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1313 1313 )
1314 1314 def branch(ui, repo, label=None, **opts):
1315 1315 """set or show the current branch name
1316 1316
1317 1317 .. note::
1318 1318
1319 1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1320 1320 light-weight bookmark instead. See :hg:`help glossary` for more
1321 1321 information about named branches and bookmarks.
1322 1322
1323 1323 With no argument, show the current branch name. With one argument,
1324 1324 set the working directory branch name (the branch will not exist
1325 1325 in the repository until the next commit). Standard practice
1326 1326 recommends that primary development take place on the 'default'
1327 1327 branch.
1328 1328
1329 1329 Unless -f/--force is specified, branch will not let you set a
1330 1330 branch name that already exists.
1331 1331
1332 1332 Use -C/--clean to reset the working directory branch to that of
1333 1333 the parent of the working directory, negating a previous branch
1334 1334 change.
1335 1335
1336 1336 Use the command :hg:`update` to switch to an existing branch. Use
1337 1337 :hg:`commit --close-branch` to mark this branch head as closed.
1338 1338 When all heads of a branch are closed, the branch will be
1339 1339 considered closed.
1340 1340
1341 1341 Returns 0 on success.
1342 1342 """
1343 1343 opts = pycompat.byteskwargs(opts)
1344 1344 revs = opts.get(b'rev')
1345 1345 if label:
1346 1346 label = label.strip()
1347 1347
1348 1348 if not opts.get(b'clean') and not label:
1349 1349 if revs:
1350 1350 raise error.InputError(
1351 1351 _(b"no branch name specified for the revisions")
1352 1352 )
1353 1353 ui.write(b"%s\n" % repo.dirstate.branch())
1354 1354 return
1355 1355
1356 1356 with repo.wlock():
1357 1357 if opts.get(b'clean'):
1358 1358 label = repo[b'.'].branch()
1359 1359 repo.dirstate.setbranch(label)
1360 1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1361 1361 elif label:
1362 1362
1363 1363 scmutil.checknewlabel(repo, label, b'branch')
1364 1364 if revs:
1365 1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1366 1366
1367 1367 if not opts.get(b'force') and label in repo.branchmap():
1368 1368 if label not in [p.branch() for p in repo[None].parents()]:
1369 1369 raise error.InputError(
1370 1370 _(b'a branch of the same name already exists'),
1371 1371 # i18n: "it" refers to an existing branch
1372 1372 hint=_(b"use 'hg update' to switch to it"),
1373 1373 )
1374 1374
1375 1375 repo.dirstate.setbranch(label)
1376 1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1377 1377
1378 1378 # find any open named branches aside from default
1379 1379 for n, h, t, c in repo.branchmap().iterbranches():
1380 1380 if n != b"default" and not c:
1381 1381 return 0
1382 1382 ui.status(
1383 1383 _(
1384 1384 b'(branches are permanent and global, '
1385 1385 b'did you want a bookmark?)\n'
1386 1386 )
1387 1387 )
1388 1388
1389 1389
1390 1390 @command(
1391 1391 b'branches',
1392 1392 [
1393 1393 (
1394 1394 b'a',
1395 1395 b'active',
1396 1396 False,
1397 1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1398 1398 ),
1399 1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1400 1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1401 1401 ]
1402 1402 + formatteropts,
1403 1403 _(b'[-c]'),
1404 1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1405 1405 intents={INTENT_READONLY},
1406 1406 )
1407 1407 def branches(ui, repo, active=False, closed=False, **opts):
1408 1408 """list repository named branches
1409 1409
1410 1410 List the repository's named branches, indicating which ones are
1411 1411 inactive. If -c/--closed is specified, also list branches which have
1412 1412 been marked closed (see :hg:`commit --close-branch`).
1413 1413
1414 1414 Use the command :hg:`update` to switch to an existing branch.
1415 1415
1416 1416 .. container:: verbose
1417 1417
1418 1418 Template:
1419 1419
1420 1420 The following keywords are supported in addition to the common template
1421 1421 keywords and functions such as ``{branch}``. See also
1422 1422 :hg:`help templates`.
1423 1423
1424 1424 :active: Boolean. True if the branch is active.
1425 1425 :closed: Boolean. True if the branch is closed.
1426 1426 :current: Boolean. True if it is the current branch.
1427 1427
1428 1428 Returns 0.
1429 1429 """
1430 1430
1431 1431 opts = pycompat.byteskwargs(opts)
1432 1432 revs = opts.get(b'rev')
1433 1433 selectedbranches = None
1434 1434 if revs:
1435 1435 revs = scmutil.revrange(repo, revs)
1436 1436 getbi = repo.revbranchcache().branchinfo
1437 1437 selectedbranches = {getbi(r)[0] for r in revs}
1438 1438
1439 1439 ui.pager(b'branches')
1440 1440 fm = ui.formatter(b'branches', opts)
1441 1441 hexfunc = fm.hexfunc
1442 1442
1443 1443 allheads = set(repo.heads())
1444 1444 branches = []
1445 1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1446 1446 if selectedbranches is not None and tag not in selectedbranches:
1447 1447 continue
1448 1448 isactive = False
1449 1449 if not isclosed:
1450 1450 openheads = set(repo.branchmap().iteropen(heads))
1451 1451 isactive = bool(openheads & allheads)
1452 1452 branches.append((tag, repo[tip], isactive, not isclosed))
1453 1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1454 1454
1455 1455 for tag, ctx, isactive, isopen in branches:
1456 1456 if active and not isactive:
1457 1457 continue
1458 1458 if isactive:
1459 1459 label = b'branches.active'
1460 1460 notice = b''
1461 1461 elif not isopen:
1462 1462 if not closed:
1463 1463 continue
1464 1464 label = b'branches.closed'
1465 1465 notice = _(b' (closed)')
1466 1466 else:
1467 1467 label = b'branches.inactive'
1468 1468 notice = _(b' (inactive)')
1469 1469 current = tag == repo.dirstate.branch()
1470 1470 if current:
1471 1471 label = b'branches.current'
1472 1472
1473 1473 fm.startitem()
1474 1474 fm.write(b'branch', b'%s', tag, label=label)
1475 1475 rev = ctx.rev()
1476 1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1477 1477 fmt = b' ' * padsize + b' %d:%s'
1478 1478 fm.condwrite(
1479 1479 not ui.quiet,
1480 1480 b'rev node',
1481 1481 fmt,
1482 1482 rev,
1483 1483 hexfunc(ctx.node()),
1484 1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1485 1485 )
1486 1486 fm.context(ctx=ctx)
1487 1487 fm.data(active=isactive, closed=not isopen, current=current)
1488 1488 if not ui.quiet:
1489 1489 fm.plain(notice)
1490 1490 fm.plain(b'\n')
1491 1491 fm.end()
1492 1492
1493 1493
1494 1494 @command(
1495 1495 b'bundle',
1496 1496 [
1497 1497 (
1498 1498 b'f',
1499 1499 b'force',
1500 1500 None,
1501 1501 _(b'run even when the destination is unrelated'),
1502 1502 ),
1503 1503 (
1504 1504 b'r',
1505 1505 b'rev',
1506 1506 [],
1507 1507 _(b'a changeset intended to be added to the destination'),
1508 1508 _(b'REV'),
1509 1509 ),
1510 1510 (
1511 1511 b'b',
1512 1512 b'branch',
1513 1513 [],
1514 1514 _(b'a specific branch you would like to bundle'),
1515 1515 _(b'BRANCH'),
1516 1516 ),
1517 1517 (
1518 1518 b'',
1519 1519 b'base',
1520 1520 [],
1521 1521 _(b'a base changeset assumed to be available at the destination'),
1522 1522 _(b'REV'),
1523 1523 ),
1524 1524 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1525 1525 (
1526 1526 b't',
1527 1527 b'type',
1528 1528 b'bzip2',
1529 1529 _(b'bundle compression type to use'),
1530 1530 _(b'TYPE'),
1531 1531 ),
1532 1532 ]
1533 1533 + remoteopts,
1534 1534 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1535 1535 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1536 1536 )
1537 1537 def bundle(ui, repo, fname, dest=None, **opts):
1538 1538 """create a bundle file
1539 1539
1540 1540 Generate a bundle file containing data to be transferred to another
1541 1541 repository.
1542 1542
1543 1543 To create a bundle containing all changesets, use -a/--all
1544 1544 (or --base null). Otherwise, hg assumes the destination will have
1545 1545 all the nodes you specify with --base parameters. Otherwise, hg
1546 1546 will assume the repository has all the nodes in destination, or
1547 1547 default-push/default if no destination is specified, where destination
1548 1548 is the repository you provide through DEST option.
1549 1549
1550 1550 You can change bundle format with the -t/--type option. See
1551 1551 :hg:`help bundlespec` for documentation on this format. By default,
1552 1552 the most appropriate format is used and compression defaults to
1553 1553 bzip2.
1554 1554
1555 1555 The bundle file can then be transferred using conventional means
1556 1556 and applied to another repository with the unbundle or pull
1557 1557 command. This is useful when direct push and pull are not
1558 1558 available or when exporting an entire repository is undesirable.
1559 1559
1560 1560 Applying bundles preserves all changeset contents including
1561 1561 permissions, copy/rename information, and revision history.
1562 1562
1563 1563 Returns 0 on success, 1 if no changes found.
1564 1564 """
1565 1565 opts = pycompat.byteskwargs(opts)
1566 1566 revs = None
1567 1567 if b'rev' in opts:
1568 1568 revstrings = opts[b'rev']
1569 1569 revs = scmutil.revrange(repo, revstrings)
1570 1570 if revstrings and not revs:
1571 1571 raise error.InputError(_(b'no commits to bundle'))
1572 1572
1573 1573 bundletype = opts.get(b'type', b'bzip2').lower()
1574 1574 try:
1575 1575 bundlespec = bundlecaches.parsebundlespec(
1576 1576 repo, bundletype, strict=False
1577 1577 )
1578 1578 except error.UnsupportedBundleSpecification as e:
1579 1579 raise error.InputError(
1580 1580 pycompat.bytestr(e),
1581 1581 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1582 1582 )
1583 1583 cgversion = bundlespec.contentopts[b"cg.version"]
1584 1584
1585 1585 # Packed bundles are a pseudo bundle format for now.
1586 1586 if cgversion == b's1':
1587 1587 raise error.InputError(
1588 1588 _(b'packed bundles cannot be produced by "hg bundle"'),
1589 1589 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1590 1590 )
1591 1591
1592 1592 if opts.get(b'all'):
1593 1593 if dest:
1594 1594 raise error.InputError(
1595 1595 _(b"--all is incompatible with specifying a destination")
1596 1596 )
1597 1597 if opts.get(b'base'):
1598 1598 ui.warn(_(b"ignoring --base because --all was specified\n"))
1599 1599 base = [nullrev]
1600 1600 else:
1601 1601 base = scmutil.revrange(repo, opts.get(b'base'))
1602 1602 if cgversion not in changegroup.supportedoutgoingversions(repo):
1603 1603 raise error.Abort(
1604 1604 _(b"repository does not support bundle version %s") % cgversion
1605 1605 )
1606 1606
1607 1607 if base:
1608 1608 if dest:
1609 1609 raise error.InputError(
1610 1610 _(b"--base is incompatible with specifying a destination")
1611 1611 )
1612 1612 common = [repo[rev].node() for rev in base]
1613 1613 heads = [repo[r].node() for r in revs] if revs else None
1614 1614 outgoing = discovery.outgoing(repo, common, heads)
1615 1615 else:
1616 1616 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1617 1617 dest, branches = urlutil.parseurl(dest, opts.get(b'branch'))
1618 1618 other = hg.peer(repo, opts, dest)
1619 1619 revs = [repo[r].hex() for r in revs]
1620 1620 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1621 1621 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1622 1622 outgoing = discovery.findcommonoutgoing(
1623 1623 repo,
1624 1624 other,
1625 1625 onlyheads=heads,
1626 1626 force=opts.get(b'force'),
1627 1627 portable=True,
1628 1628 )
1629 1629
1630 1630 if not outgoing.missing:
1631 1631 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1632 1632 return 1
1633 1633
1634 1634 if cgversion == b'01': # bundle1
1635 1635 bversion = b'HG10' + bundlespec.wirecompression
1636 1636 bcompression = None
1637 1637 elif cgversion in (b'02', b'03'):
1638 1638 bversion = b'HG20'
1639 1639 bcompression = bundlespec.wirecompression
1640 1640 else:
1641 1641 raise error.ProgrammingError(
1642 1642 b'bundle: unexpected changegroup version %s' % cgversion
1643 1643 )
1644 1644
1645 1645 # TODO compression options should be derived from bundlespec parsing.
1646 1646 # This is a temporary hack to allow adjusting bundle compression
1647 1647 # level without a) formalizing the bundlespec changes to declare it
1648 1648 # b) introducing a command flag.
1649 1649 compopts = {}
1650 1650 complevel = ui.configint(
1651 1651 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1652 1652 )
1653 1653 if complevel is None:
1654 1654 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1655 1655 if complevel is not None:
1656 1656 compopts[b'level'] = complevel
1657 1657
1658 1658 compthreads = ui.configint(
1659 1659 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1660 1660 )
1661 1661 if compthreads is None:
1662 1662 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1663 1663 if compthreads is not None:
1664 1664 compopts[b'threads'] = compthreads
1665 1665
1666 1666 # Bundling of obsmarker and phases is optional as not all clients
1667 1667 # support the necessary features.
1668 1668 cfg = ui.configbool
1669 1669 contentopts = {
1670 1670 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1671 1671 b'obsolescence-mandatory': cfg(
1672 1672 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1673 1673 ),
1674 1674 b'phases': cfg(b'experimental', b'bundle-phases'),
1675 1675 }
1676 1676 bundlespec.contentopts.update(contentopts)
1677 1677
1678 1678 bundle2.writenewbundle(
1679 1679 ui,
1680 1680 repo,
1681 1681 b'bundle',
1682 1682 fname,
1683 1683 bversion,
1684 1684 outgoing,
1685 1685 bundlespec.contentopts,
1686 1686 compression=bcompression,
1687 1687 compopts=compopts,
1688 1688 )
1689 1689
1690 1690
1691 1691 @command(
1692 1692 b'cat',
1693 1693 [
1694 1694 (
1695 1695 b'o',
1696 1696 b'output',
1697 1697 b'',
1698 1698 _(b'print output to file with formatted name'),
1699 1699 _(b'FORMAT'),
1700 1700 ),
1701 1701 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1702 1702 (b'', b'decode', None, _(b'apply any matching decode filter')),
1703 1703 ]
1704 1704 + walkopts
1705 1705 + formatteropts,
1706 1706 _(b'[OPTION]... FILE...'),
1707 1707 helpcategory=command.CATEGORY_FILE_CONTENTS,
1708 1708 inferrepo=True,
1709 1709 intents={INTENT_READONLY},
1710 1710 )
1711 1711 def cat(ui, repo, file1, *pats, **opts):
1712 1712 """output the current or given revision of files
1713 1713
1714 1714 Print the specified files as they were at the given revision. If
1715 1715 no revision is given, the parent of the working directory is used.
1716 1716
1717 1717 Output may be to a file, in which case the name of the file is
1718 1718 given using a template string. See :hg:`help templates`. In addition
1719 1719 to the common template keywords, the following formatting rules are
1720 1720 supported:
1721 1721
1722 1722 :``%%``: literal "%" character
1723 1723 :``%s``: basename of file being printed
1724 1724 :``%d``: dirname of file being printed, or '.' if in repository root
1725 1725 :``%p``: root-relative path name of file being printed
1726 1726 :``%H``: changeset hash (40 hexadecimal digits)
1727 1727 :``%R``: changeset revision number
1728 1728 :``%h``: short-form changeset hash (12 hexadecimal digits)
1729 1729 :``%r``: zero-padded changeset revision number
1730 1730 :``%b``: basename of the exporting repository
1731 1731 :``\\``: literal "\\" character
1732 1732
1733 1733 .. container:: verbose
1734 1734
1735 1735 Template:
1736 1736
1737 1737 The following keywords are supported in addition to the common template
1738 1738 keywords and functions. See also :hg:`help templates`.
1739 1739
1740 1740 :data: String. File content.
1741 1741 :path: String. Repository-absolute path of the file.
1742 1742
1743 1743 Returns 0 on success.
1744 1744 """
1745 1745 opts = pycompat.byteskwargs(opts)
1746 1746 rev = opts.get(b'rev')
1747 1747 if rev:
1748 1748 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1749 1749 ctx = scmutil.revsingle(repo, rev)
1750 1750 m = scmutil.match(ctx, (file1,) + pats, opts)
1751 1751 fntemplate = opts.pop(b'output', b'')
1752 1752 if cmdutil.isstdiofilename(fntemplate):
1753 1753 fntemplate = b''
1754 1754
1755 1755 if fntemplate:
1756 1756 fm = formatter.nullformatter(ui, b'cat', opts)
1757 1757 else:
1758 1758 ui.pager(b'cat')
1759 1759 fm = ui.formatter(b'cat', opts)
1760 1760 with fm:
1761 1761 return cmdutil.cat(
1762 1762 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1763 1763 )
1764 1764
1765 1765
1766 1766 @command(
1767 1767 b'clone',
1768 1768 [
1769 1769 (
1770 1770 b'U',
1771 1771 b'noupdate',
1772 1772 None,
1773 1773 _(
1774 1774 b'the clone will include an empty working '
1775 1775 b'directory (only a repository)'
1776 1776 ),
1777 1777 ),
1778 1778 (
1779 1779 b'u',
1780 1780 b'updaterev',
1781 1781 b'',
1782 1782 _(b'revision, tag, or branch to check out'),
1783 1783 _(b'REV'),
1784 1784 ),
1785 1785 (
1786 1786 b'r',
1787 1787 b'rev',
1788 1788 [],
1789 1789 _(
1790 1790 b'do not clone everything, but include this changeset'
1791 1791 b' and its ancestors'
1792 1792 ),
1793 1793 _(b'REV'),
1794 1794 ),
1795 1795 (
1796 1796 b'b',
1797 1797 b'branch',
1798 1798 [],
1799 1799 _(
1800 1800 b'do not clone everything, but include this branch\'s'
1801 1801 b' changesets and their ancestors'
1802 1802 ),
1803 1803 _(b'BRANCH'),
1804 1804 ),
1805 1805 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1806 1806 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1807 1807 (b'', b'stream', None, _(b'clone with minimal data processing')),
1808 1808 ]
1809 1809 + remoteopts,
1810 1810 _(b'[OPTION]... SOURCE [DEST]'),
1811 1811 helpcategory=command.CATEGORY_REPO_CREATION,
1812 1812 helpbasic=True,
1813 1813 norepo=True,
1814 1814 )
1815 1815 def clone(ui, source, dest=None, **opts):
1816 1816 """make a copy of an existing repository
1817 1817
1818 1818 Create a copy of an existing repository in a new directory.
1819 1819
1820 1820 If no destination directory name is specified, it defaults to the
1821 1821 basename of the source.
1822 1822
1823 1823 The location of the source is added to the new repository's
1824 1824 ``.hg/hgrc`` file, as the default to be used for future pulls.
1825 1825
1826 1826 Only local paths and ``ssh://`` URLs are supported as
1827 1827 destinations. For ``ssh://`` destinations, no working directory or
1828 1828 ``.hg/hgrc`` will be created on the remote side.
1829 1829
1830 1830 If the source repository has a bookmark called '@' set, that
1831 1831 revision will be checked out in the new repository by default.
1832 1832
1833 1833 To check out a particular version, use -u/--update, or
1834 1834 -U/--noupdate to create a clone with no working directory.
1835 1835
1836 1836 To pull only a subset of changesets, specify one or more revisions
1837 1837 identifiers with -r/--rev or branches with -b/--branch. The
1838 1838 resulting clone will contain only the specified changesets and
1839 1839 their ancestors. These options (or 'clone src#rev dest') imply
1840 1840 --pull, even for local source repositories.
1841 1841
1842 1842 In normal clone mode, the remote normalizes repository data into a common
1843 1843 exchange format and the receiving end translates this data into its local
1844 1844 storage format. --stream activates a different clone mode that essentially
1845 1845 copies repository files from the remote with minimal data processing. This
1846 1846 significantly reduces the CPU cost of a clone both remotely and locally.
1847 1847 However, it often increases the transferred data size by 30-40%. This can
1848 1848 result in substantially faster clones where I/O throughput is plentiful,
1849 1849 especially for larger repositories. A side-effect of --stream clones is
1850 1850 that storage settings and requirements on the remote are applied locally:
1851 1851 a modern client may inherit legacy or inefficient storage used by the
1852 1852 remote or a legacy Mercurial client may not be able to clone from a
1853 1853 modern Mercurial remote.
1854 1854
1855 1855 .. note::
1856 1856
1857 1857 Specifying a tag will include the tagged changeset but not the
1858 1858 changeset containing the tag.
1859 1859
1860 1860 .. container:: verbose
1861 1861
1862 1862 For efficiency, hardlinks are used for cloning whenever the
1863 1863 source and destination are on the same filesystem (note this
1864 1864 applies only to the repository data, not to the working
1865 1865 directory). Some filesystems, such as AFS, implement hardlinking
1866 1866 incorrectly, but do not report errors. In these cases, use the
1867 1867 --pull option to avoid hardlinking.
1868 1868
1869 1869 Mercurial will update the working directory to the first applicable
1870 1870 revision from this list:
1871 1871
1872 1872 a) null if -U or the source repository has no changesets
1873 1873 b) if -u . and the source repository is local, the first parent of
1874 1874 the source repository's working directory
1875 1875 c) the changeset specified with -u (if a branch name, this means the
1876 1876 latest head of that branch)
1877 1877 d) the changeset specified with -r
1878 1878 e) the tipmost head specified with -b
1879 1879 f) the tipmost head specified with the url#branch source syntax
1880 1880 g) the revision marked with the '@' bookmark, if present
1881 1881 h) the tipmost head of the default branch
1882 1882 i) tip
1883 1883
1884 1884 When cloning from servers that support it, Mercurial may fetch
1885 1885 pre-generated data from a server-advertised URL or inline from the
1886 1886 same stream. When this is done, hooks operating on incoming changesets
1887 1887 and changegroups may fire more than once, once for each pre-generated
1888 1888 bundle and as well as for any additional remaining data. In addition,
1889 1889 if an error occurs, the repository may be rolled back to a partial
1890 1890 clone. This behavior may change in future releases.
1891 1891 See :hg:`help -e clonebundles` for more.
1892 1892
1893 1893 Examples:
1894 1894
1895 1895 - clone a remote repository to a new directory named hg/::
1896 1896
1897 1897 hg clone https://www.mercurial-scm.org/repo/hg/
1898 1898
1899 1899 - create a lightweight local clone::
1900 1900
1901 1901 hg clone project/ project-feature/
1902 1902
1903 1903 - clone from an absolute path on an ssh server (note double-slash)::
1904 1904
1905 1905 hg clone ssh://user@server//home/projects/alpha/
1906 1906
1907 1907 - do a streaming clone while checking out a specified version::
1908 1908
1909 1909 hg clone --stream http://server/repo -u 1.5
1910 1910
1911 1911 - create a repository without changesets after a particular revision::
1912 1912
1913 1913 hg clone -r 04e544 experimental/ good/
1914 1914
1915 1915 - clone (and track) a particular named branch::
1916 1916
1917 1917 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1918 1918
1919 1919 See :hg:`help urls` for details on specifying URLs.
1920 1920
1921 1921 Returns 0 on success.
1922 1922 """
1923 1923 opts = pycompat.byteskwargs(opts)
1924 1924 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1925 1925
1926 1926 # --include/--exclude can come from narrow or sparse.
1927 1927 includepats, excludepats = None, None
1928 1928
1929 1929 # hg.clone() differentiates between None and an empty set. So make sure
1930 1930 # patterns are sets if narrow is requested without patterns.
1931 1931 if opts.get(b'narrow'):
1932 1932 includepats = set()
1933 1933 excludepats = set()
1934 1934
1935 1935 if opts.get(b'include'):
1936 1936 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1937 1937 if opts.get(b'exclude'):
1938 1938 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1939 1939
1940 1940 r = hg.clone(
1941 1941 ui,
1942 1942 opts,
1943 1943 source,
1944 1944 dest,
1945 1945 pull=opts.get(b'pull'),
1946 1946 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1947 1947 revs=opts.get(b'rev'),
1948 1948 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1949 1949 branch=opts.get(b'branch'),
1950 1950 shareopts=opts.get(b'shareopts'),
1951 1951 storeincludepats=includepats,
1952 1952 storeexcludepats=excludepats,
1953 1953 depth=opts.get(b'depth') or None,
1954 1954 )
1955 1955
1956 1956 return r is None
1957 1957
1958 1958
1959 1959 @command(
1960 1960 b'commit|ci',
1961 1961 [
1962 1962 (
1963 1963 b'A',
1964 1964 b'addremove',
1965 1965 None,
1966 1966 _(b'mark new/missing files as added/removed before committing'),
1967 1967 ),
1968 1968 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1969 1969 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1970 1970 (b's', b'secret', None, _(b'use the secret phase for committing')),
1971 1971 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1972 1972 (
1973 1973 b'',
1974 1974 b'force-close-branch',
1975 1975 None,
1976 1976 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1977 1977 ),
1978 1978 (b'i', b'interactive', None, _(b'use interactive mode')),
1979 1979 ]
1980 1980 + walkopts
1981 1981 + commitopts
1982 1982 + commitopts2
1983 1983 + subrepoopts,
1984 1984 _(b'[OPTION]... [FILE]...'),
1985 1985 helpcategory=command.CATEGORY_COMMITTING,
1986 1986 helpbasic=True,
1987 1987 inferrepo=True,
1988 1988 )
1989 1989 def commit(ui, repo, *pats, **opts):
1990 1990 """commit the specified files or all outstanding changes
1991 1991
1992 1992 Commit changes to the given files into the repository. Unlike a
1993 1993 centralized SCM, this operation is a local operation. See
1994 1994 :hg:`push` for a way to actively distribute your changes.
1995 1995
1996 1996 If a list of files is omitted, all changes reported by :hg:`status`
1997 1997 will be committed.
1998 1998
1999 1999 If you are committing the result of a merge, do not provide any
2000 2000 filenames or -I/-X filters.
2001 2001
2002 2002 If no commit message is specified, Mercurial starts your
2003 2003 configured editor where you can enter a message. In case your
2004 2004 commit fails, you will find a backup of your message in
2005 2005 ``.hg/last-message.txt``.
2006 2006
2007 2007 The --close-branch flag can be used to mark the current branch
2008 2008 head closed. When all heads of a branch are closed, the branch
2009 2009 will be considered closed and no longer listed.
2010 2010
2011 2011 The --amend flag can be used to amend the parent of the
2012 2012 working directory with a new commit that contains the changes
2013 2013 in the parent in addition to those currently reported by :hg:`status`,
2014 2014 if there are any. The old commit is stored in a backup bundle in
2015 2015 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2016 2016 on how to restore it).
2017 2017
2018 2018 Message, user and date are taken from the amended commit unless
2019 2019 specified. When a message isn't specified on the command line,
2020 2020 the editor will open with the message of the amended commit.
2021 2021
2022 2022 It is not possible to amend public changesets (see :hg:`help phases`)
2023 2023 or changesets that have children.
2024 2024
2025 2025 See :hg:`help dates` for a list of formats valid for -d/--date.
2026 2026
2027 2027 Returns 0 on success, 1 if nothing changed.
2028 2028
2029 2029 .. container:: verbose
2030 2030
2031 2031 Examples:
2032 2032
2033 2033 - commit all files ending in .py::
2034 2034
2035 2035 hg commit --include "set:**.py"
2036 2036
2037 2037 - commit all non-binary files::
2038 2038
2039 2039 hg commit --exclude "set:binary()"
2040 2040
2041 2041 - amend the current commit and set the date to now::
2042 2042
2043 2043 hg commit --amend --date now
2044 2044 """
2045 2045 with repo.wlock(), repo.lock():
2046 2046 return _docommit(ui, repo, *pats, **opts)
2047 2047
2048 2048
2049 2049 def _docommit(ui, repo, *pats, **opts):
2050 2050 if opts.get('interactive'):
2051 2051 opts.pop('interactive')
2052 2052 ret = cmdutil.dorecord(
2053 2053 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2054 2054 )
2055 2055 # ret can be 0 (no changes to record) or the value returned by
2056 2056 # commit(), 1 if nothing changed or None on success.
2057 2057 return 1 if ret == 0 else ret
2058 2058
2059 2059 opts = pycompat.byteskwargs(opts)
2060 2060 if opts.get(b'subrepos'):
2061 2061 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2062 2062 # Let --subrepos on the command line override config setting.
2063 2063 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2064 2064
2065 2065 cmdutil.checkunfinished(repo, commit=True)
2066 2066
2067 2067 branch = repo[None].branch()
2068 2068 bheads = repo.branchheads(branch)
2069 2069 tip = repo.changelog.tip()
2070 2070
2071 2071 extra = {}
2072 2072 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2073 2073 extra[b'close'] = b'1'
2074 2074
2075 2075 if repo[b'.'].closesbranch():
2076 2076 raise error.InputError(
2077 2077 _(b'current revision is already a branch closing head')
2078 2078 )
2079 2079 elif not bheads:
2080 2080 raise error.InputError(
2081 2081 _(b'branch "%s" has no heads to close') % branch
2082 2082 )
2083 2083 elif (
2084 2084 branch == repo[b'.'].branch()
2085 2085 and repo[b'.'].node() not in bheads
2086 2086 and not opts.get(b'force_close_branch')
2087 2087 ):
2088 2088 hint = _(
2089 2089 b'use --force-close-branch to close branch from a non-head'
2090 2090 b' changeset'
2091 2091 )
2092 2092 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2093 2093 elif opts.get(b'amend'):
2094 2094 if (
2095 2095 repo[b'.'].p1().branch() != branch
2096 2096 and repo[b'.'].p2().branch() != branch
2097 2097 ):
2098 2098 raise error.InputError(_(b'can only close branch heads'))
2099 2099
2100 2100 if opts.get(b'amend'):
2101 2101 if ui.configbool(b'ui', b'commitsubrepos'):
2102 2102 raise error.InputError(
2103 2103 _(b'cannot amend with ui.commitsubrepos enabled')
2104 2104 )
2105 2105
2106 2106 old = repo[b'.']
2107 2107 rewriteutil.precheck(repo, [old.rev()], b'amend')
2108 2108
2109 2109 # Currently histedit gets confused if an amend happens while histedit
2110 2110 # is in progress. Since we have a checkunfinished command, we are
2111 2111 # temporarily honoring it.
2112 2112 #
2113 2113 # Note: eventually this guard will be removed. Please do not expect
2114 2114 # this behavior to remain.
2115 2115 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2116 2116 cmdutil.checkunfinished(repo)
2117 2117
2118 2118 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2119 2119 if node == old.node():
2120 2120 ui.status(_(b"nothing changed\n"))
2121 2121 return 1
2122 2122 else:
2123 2123
2124 2124 def commitfunc(ui, repo, message, match, opts):
2125 2125 overrides = {}
2126 2126 if opts.get(b'secret'):
2127 2127 overrides[(b'phases', b'new-commit')] = b'secret'
2128 2128
2129 2129 baseui = repo.baseui
2130 2130 with baseui.configoverride(overrides, b'commit'):
2131 2131 with ui.configoverride(overrides, b'commit'):
2132 2132 editform = cmdutil.mergeeditform(
2133 2133 repo[None], b'commit.normal'
2134 2134 )
2135 2135 editor = cmdutil.getcommiteditor(
2136 2136 editform=editform, **pycompat.strkwargs(opts)
2137 2137 )
2138 2138 return repo.commit(
2139 2139 message,
2140 2140 opts.get(b'user'),
2141 2141 opts.get(b'date'),
2142 2142 match,
2143 2143 editor=editor,
2144 2144 extra=extra,
2145 2145 )
2146 2146
2147 2147 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2148 2148
2149 2149 if not node:
2150 2150 stat = cmdutil.postcommitstatus(repo, pats, opts)
2151 2151 if stat.deleted:
2152 2152 ui.status(
2153 2153 _(
2154 2154 b"nothing changed (%d missing files, see "
2155 2155 b"'hg status')\n"
2156 2156 )
2157 2157 % len(stat.deleted)
2158 2158 )
2159 2159 else:
2160 2160 ui.status(_(b"nothing changed\n"))
2161 2161 return 1
2162 2162
2163 2163 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2164 2164
2165 2165 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2166 2166 status(
2167 2167 ui,
2168 2168 repo,
2169 2169 modified=True,
2170 2170 added=True,
2171 2171 removed=True,
2172 2172 deleted=True,
2173 2173 unknown=True,
2174 2174 subrepos=opts.get(b'subrepos'),
2175 2175 )
2176 2176
2177 2177
2178 2178 @command(
2179 2179 b'config|showconfig|debugconfig',
2180 2180 [
2181 2181 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2182 2182 (b'e', b'edit', None, _(b'edit user config')),
2183 2183 (b'l', b'local', None, _(b'edit repository config')),
2184 2184 (
2185 2185 b'',
2186 2186 b'shared',
2187 2187 None,
2188 2188 _(b'edit shared source repository config (EXPERIMENTAL)'),
2189 2189 ),
2190 2190 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2191 2191 (b'g', b'global', None, _(b'edit global config')),
2192 2192 ]
2193 2193 + formatteropts,
2194 2194 _(b'[-u] [NAME]...'),
2195 2195 helpcategory=command.CATEGORY_HELP,
2196 2196 optionalrepo=True,
2197 2197 intents={INTENT_READONLY},
2198 2198 )
2199 2199 def config(ui, repo, *values, **opts):
2200 2200 """show combined config settings from all hgrc files
2201 2201
2202 2202 With no arguments, print names and values of all config items.
2203 2203
2204 2204 With one argument of the form section.name, print just the value
2205 2205 of that config item.
2206 2206
2207 2207 With multiple arguments, print names and values of all config
2208 2208 items with matching section names or section.names.
2209 2209
2210 2210 With --edit, start an editor on the user-level config file. With
2211 2211 --global, edit the system-wide config file. With --local, edit the
2212 2212 repository-level config file.
2213 2213
2214 2214 With --debug, the source (filename and line number) is printed
2215 2215 for each config item.
2216 2216
2217 2217 See :hg:`help config` for more information about config files.
2218 2218
2219 2219 .. container:: verbose
2220 2220
2221 2221 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2222 2222 This file is not shared across shares when in share-safe mode.
2223 2223
2224 2224 Template:
2225 2225
2226 2226 The following keywords are supported. See also :hg:`help templates`.
2227 2227
2228 2228 :name: String. Config name.
2229 2229 :source: String. Filename and line number where the item is defined.
2230 2230 :value: String. Config value.
2231 2231
2232 2232 The --shared flag can be used to edit the config file of shared source
2233 2233 repository. It only works when you have shared using the experimental
2234 2234 share safe feature.
2235 2235
2236 2236 Returns 0 on success, 1 if NAME does not exist.
2237 2237
2238 2238 """
2239 2239
2240 2240 opts = pycompat.byteskwargs(opts)
2241 2241 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2242 2242 if any(opts.get(o) for o in editopts):
2243 2243 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2244 2244 if opts.get(b'local'):
2245 2245 if not repo:
2246 2246 raise error.InputError(
2247 2247 _(b"can't use --local outside a repository")
2248 2248 )
2249 2249 paths = [repo.vfs.join(b'hgrc')]
2250 2250 elif opts.get(b'global'):
2251 2251 paths = rcutil.systemrcpath()
2252 2252 elif opts.get(b'shared'):
2253 2253 if not repo.shared():
2254 2254 raise error.InputError(
2255 2255 _(b"repository is not shared; can't use --shared")
2256 2256 )
2257 2257 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2258 2258 raise error.InputError(
2259 2259 _(
2260 2260 b"share safe feature not enabled; "
2261 2261 b"unable to edit shared source repository config"
2262 2262 )
2263 2263 )
2264 2264 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2265 2265 elif opts.get(b'non_shared'):
2266 2266 paths = [repo.vfs.join(b'hgrc-not-shared')]
2267 2267 else:
2268 2268 paths = rcutil.userrcpath()
2269 2269
2270 2270 for f in paths:
2271 2271 if os.path.exists(f):
2272 2272 break
2273 2273 else:
2274 2274 if opts.get(b'global'):
2275 2275 samplehgrc = uimod.samplehgrcs[b'global']
2276 2276 elif opts.get(b'local'):
2277 2277 samplehgrc = uimod.samplehgrcs[b'local']
2278 2278 else:
2279 2279 samplehgrc = uimod.samplehgrcs[b'user']
2280 2280
2281 2281 f = paths[0]
2282 2282 fp = open(f, b"wb")
2283 2283 fp.write(util.tonativeeol(samplehgrc))
2284 2284 fp.close()
2285 2285
2286 2286 editor = ui.geteditor()
2287 2287 ui.system(
2288 2288 b"%s \"%s\"" % (editor, f),
2289 2289 onerr=error.InputError,
2290 2290 errprefix=_(b"edit failed"),
2291 2291 blockedtag=b'config_edit',
2292 2292 )
2293 2293 return
2294 2294 ui.pager(b'config')
2295 2295 fm = ui.formatter(b'config', opts)
2296 2296 for t, f in rcutil.rccomponents():
2297 2297 if t == b'path':
2298 2298 ui.debug(b'read config from: %s\n' % f)
2299 2299 elif t == b'resource':
2300 2300 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2301 2301 elif t == b'items':
2302 2302 # Don't print anything for 'items'.
2303 2303 pass
2304 2304 else:
2305 2305 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2306 2306 untrusted = bool(opts.get(b'untrusted'))
2307 2307
2308 2308 selsections = selentries = []
2309 2309 if values:
2310 2310 selsections = [v for v in values if b'.' not in v]
2311 2311 selentries = [v for v in values if b'.' in v]
2312 2312 uniquesel = len(selentries) == 1 and not selsections
2313 2313 selsections = set(selsections)
2314 2314 selentries = set(selentries)
2315 2315
2316 2316 matched = False
2317 2317 for section, name, value in ui.walkconfig(untrusted=untrusted):
2318 2318 source = ui.configsource(section, name, untrusted)
2319 2319 value = pycompat.bytestr(value)
2320 2320 defaultvalue = ui.configdefault(section, name)
2321 2321 if fm.isplain():
2322 2322 source = source or b'none'
2323 2323 value = value.replace(b'\n', b'\\n')
2324 2324 entryname = section + b'.' + name
2325 2325 if values and not (section in selsections or entryname in selentries):
2326 2326 continue
2327 2327 fm.startitem()
2328 2328 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2329 2329 if uniquesel:
2330 2330 fm.data(name=entryname)
2331 2331 fm.write(b'value', b'%s\n', value)
2332 2332 else:
2333 2333 fm.write(b'name value', b'%s=%s\n', entryname, value)
2334 2334 if formatter.isprintable(defaultvalue):
2335 2335 fm.data(defaultvalue=defaultvalue)
2336 2336 elif isinstance(defaultvalue, list) and all(
2337 2337 formatter.isprintable(e) for e in defaultvalue
2338 2338 ):
2339 2339 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2340 2340 # TODO: no idea how to process unsupported defaultvalue types
2341 2341 matched = True
2342 2342 fm.end()
2343 2343 if matched:
2344 2344 return 0
2345 2345 return 1
2346 2346
2347 2347
2348 2348 @command(
2349 2349 b'continue',
2350 2350 dryrunopts,
2351 2351 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2352 2352 helpbasic=True,
2353 2353 )
2354 2354 def continuecmd(ui, repo, **opts):
2355 2355 """resumes an interrupted operation (EXPERIMENTAL)
2356 2356
2357 2357 Finishes a multistep operation like graft, histedit, rebase, merge,
2358 2358 and unshelve if they are in an interrupted state.
2359 2359
2360 2360 use --dry-run/-n to dry run the command.
2361 2361 """
2362 2362 dryrun = opts.get('dry_run')
2363 2363 contstate = cmdutil.getunfinishedstate(repo)
2364 2364 if not contstate:
2365 2365 raise error.StateError(_(b'no operation in progress'))
2366 2366 if not contstate.continuefunc:
2367 2367 raise error.StateError(
2368 2368 (
2369 2369 _(b"%s in progress but does not support 'hg continue'")
2370 2370 % (contstate._opname)
2371 2371 ),
2372 2372 hint=contstate.continuemsg(),
2373 2373 )
2374 2374 if dryrun:
2375 2375 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2376 2376 return
2377 2377 return contstate.continuefunc(ui, repo)
2378 2378
2379 2379
2380 2380 @command(
2381 2381 b'copy|cp',
2382 2382 [
2383 2383 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2384 2384 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2385 2385 (
2386 2386 b'',
2387 2387 b'at-rev',
2388 2388 b'',
2389 2389 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2390 2390 _(b'REV'),
2391 2391 ),
2392 2392 (
2393 2393 b'f',
2394 2394 b'force',
2395 2395 None,
2396 2396 _(b'forcibly copy over an existing managed file'),
2397 2397 ),
2398 2398 ]
2399 2399 + walkopts
2400 2400 + dryrunopts,
2401 2401 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2402 2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2403 2403 )
2404 2404 def copy(ui, repo, *pats, **opts):
2405 2405 """mark files as copied for the next commit
2406 2406
2407 2407 Mark dest as having copies of source files. If dest is a
2408 2408 directory, copies are put in that directory. If dest is a file,
2409 2409 the source must be a single file.
2410 2410
2411 2411 By default, this command copies the contents of files as they
2412 2412 exist in the working directory. If invoked with -A/--after, the
2413 2413 operation is recorded, but no copying is performed.
2414 2414
2415 2415 To undo marking a destination file as copied, use --forget. With that
2416 2416 option, all given (positional) arguments are unmarked as copies. The
2417 2417 destination file(s) will be left in place (still tracked). Note that
2418 2418 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2419 2419
2420 2420 This command takes effect with the next commit by default.
2421 2421
2422 2422 Returns 0 on success, 1 if errors are encountered.
2423 2423 """
2424 2424 opts = pycompat.byteskwargs(opts)
2425 2425 with repo.wlock():
2426 2426 return cmdutil.copy(ui, repo, pats, opts)
2427 2427
2428 2428
2429 2429 @command(
2430 2430 b'debugcommands',
2431 2431 [],
2432 2432 _(b'[COMMAND]'),
2433 2433 helpcategory=command.CATEGORY_HELP,
2434 2434 norepo=True,
2435 2435 )
2436 2436 def debugcommands(ui, cmd=b'', *args):
2437 2437 """list all available commands and options"""
2438 2438 for cmd, vals in sorted(pycompat.iteritems(table)):
2439 2439 cmd = cmd.split(b'|')[0]
2440 2440 opts = b', '.join([i[1] for i in vals[1]])
2441 2441 ui.write(b'%s: %s\n' % (cmd, opts))
2442 2442
2443 2443
2444 2444 @command(
2445 2445 b'debugcomplete',
2446 2446 [(b'o', b'options', None, _(b'show the command options'))],
2447 2447 _(b'[-o] CMD'),
2448 2448 helpcategory=command.CATEGORY_HELP,
2449 2449 norepo=True,
2450 2450 )
2451 2451 def debugcomplete(ui, cmd=b'', **opts):
2452 2452 """returns the completion list associated with the given command"""
2453 2453
2454 2454 if opts.get('options'):
2455 2455 options = []
2456 2456 otables = [globalopts]
2457 2457 if cmd:
2458 2458 aliases, entry = cmdutil.findcmd(cmd, table, False)
2459 2459 otables.append(entry[1])
2460 2460 for t in otables:
2461 2461 for o in t:
2462 2462 if b"(DEPRECATED)" in o[3]:
2463 2463 continue
2464 2464 if o[0]:
2465 2465 options.append(b'-%s' % o[0])
2466 2466 options.append(b'--%s' % o[1])
2467 2467 ui.write(b"%s\n" % b"\n".join(options))
2468 2468 return
2469 2469
2470 2470 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2471 2471 if ui.verbose:
2472 2472 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2473 2473 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2474 2474
2475 2475
2476 2476 @command(
2477 2477 b'diff',
2478 2478 [
2479 2479 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2480 2480 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2481 2481 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2482 2482 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2483 2483 ]
2484 2484 + diffopts
2485 2485 + diffopts2
2486 2486 + walkopts
2487 2487 + subrepoopts,
2488 2488 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2489 2489 helpcategory=command.CATEGORY_FILE_CONTENTS,
2490 2490 helpbasic=True,
2491 2491 inferrepo=True,
2492 2492 intents={INTENT_READONLY},
2493 2493 )
2494 2494 def diff(ui, repo, *pats, **opts):
2495 2495 """diff repository (or selected files)
2496 2496
2497 2497 Show differences between revisions for the specified files.
2498 2498
2499 2499 Differences between files are shown using the unified diff format.
2500 2500
2501 2501 .. note::
2502 2502
2503 2503 :hg:`diff` may generate unexpected results for merges, as it will
2504 2504 default to comparing against the working directory's first
2505 2505 parent changeset if no revisions are specified.
2506 2506
2507 2507 By default, the working directory files are compared to its first parent. To
2508 2508 see the differences from another revision, use --from. To see the difference
2509 2509 to another revision, use --to. For example, :hg:`diff --from .^` will show
2510 2510 the differences from the working copy's grandparent to the working copy,
2511 2511 :hg:`diff --to .` will show the diff from the working copy to its parent
2512 2512 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2513 2513 show the diff between those two revisions.
2514 2514
2515 2515 Alternatively you can specify -c/--change with a revision to see the changes
2516 2516 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2517 2517 equivalent to :hg:`diff --from 42^ --to 42`)
2518 2518
2519 2519 Without the -a/--text option, diff will avoid generating diffs of
2520 2520 files it detects as binary. With -a, diff will generate a diff
2521 2521 anyway, probably with undesirable results.
2522 2522
2523 2523 Use the -g/--git option to generate diffs in the git extended diff
2524 2524 format. For more information, read :hg:`help diffs`.
2525 2525
2526 2526 .. container:: verbose
2527 2527
2528 2528 Examples:
2529 2529
2530 2530 - compare a file in the current working directory to its parent::
2531 2531
2532 2532 hg diff foo.c
2533 2533
2534 2534 - compare two historical versions of a directory, with rename info::
2535 2535
2536 2536 hg diff --git --from 1.0 --to 1.2 lib/
2537 2537
2538 2538 - get change stats relative to the last change on some date::
2539 2539
2540 2540 hg diff --stat --from "date('may 2')"
2541 2541
2542 2542 - diff all newly-added files that contain a keyword::
2543 2543
2544 2544 hg diff "set:added() and grep(GNU)"
2545 2545
2546 2546 - compare a revision and its parents::
2547 2547
2548 2548 hg diff -c 9353 # compare against first parent
2549 2549 hg diff --from 9353^ --to 9353 # same using revset syntax
2550 2550 hg diff --from 9353^2 --to 9353 # compare against the second parent
2551 2551
2552 2552 Returns 0 on success.
2553 2553 """
2554 2554
2555 2555 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2556 2556 opts = pycompat.byteskwargs(opts)
2557 2557 revs = opts.get(b'rev')
2558 2558 change = opts.get(b'change')
2559 2559 from_rev = opts.get(b'from')
2560 2560 to_rev = opts.get(b'to')
2561 2561 stat = opts.get(b'stat')
2562 2562 reverse = opts.get(b'reverse')
2563 2563
2564 2564 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2565 2565 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2566 2566 if change:
2567 2567 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2568 2568 ctx2 = scmutil.revsingle(repo, change, None)
2569 2569 ctx1 = logcmdutil.diff_parent(ctx2)
2570 2570 elif from_rev or to_rev:
2571 2571 repo = scmutil.unhidehashlikerevs(
2572 2572 repo, [from_rev] + [to_rev], b'nowarn'
2573 2573 )
2574 2574 ctx1 = scmutil.revsingle(repo, from_rev, None)
2575 2575 ctx2 = scmutil.revsingle(repo, to_rev, None)
2576 2576 else:
2577 2577 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2578 2578 ctx1, ctx2 = scmutil.revpair(repo, revs)
2579 2579
2580 2580 if reverse:
2581 2581 ctxleft = ctx2
2582 2582 ctxright = ctx1
2583 2583 else:
2584 2584 ctxleft = ctx1
2585 2585 ctxright = ctx2
2586 2586
2587 2587 diffopts = patch.diffallopts(ui, opts)
2588 2588 m = scmutil.match(ctx2, pats, opts)
2589 2589 m = repo.narrowmatch(m)
2590 2590 ui.pager(b'diff')
2591 2591 logcmdutil.diffordiffstat(
2592 2592 ui,
2593 2593 repo,
2594 2594 diffopts,
2595 2595 ctxleft,
2596 2596 ctxright,
2597 2597 m,
2598 2598 stat=stat,
2599 2599 listsubrepos=opts.get(b'subrepos'),
2600 2600 root=opts.get(b'root'),
2601 2601 )
2602 2602
2603 2603
2604 2604 @command(
2605 2605 b'export',
2606 2606 [
2607 2607 (
2608 2608 b'B',
2609 2609 b'bookmark',
2610 2610 b'',
2611 2611 _(b'export changes only reachable by given bookmark'),
2612 2612 _(b'BOOKMARK'),
2613 2613 ),
2614 2614 (
2615 2615 b'o',
2616 2616 b'output',
2617 2617 b'',
2618 2618 _(b'print output to file with formatted name'),
2619 2619 _(b'FORMAT'),
2620 2620 ),
2621 2621 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2622 2622 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2623 2623 ]
2624 2624 + diffopts
2625 2625 + formatteropts,
2626 2626 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2627 2627 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2628 2628 helpbasic=True,
2629 2629 intents={INTENT_READONLY},
2630 2630 )
2631 2631 def export(ui, repo, *changesets, **opts):
2632 2632 """dump the header and diffs for one or more changesets
2633 2633
2634 2634 Print the changeset header and diffs for one or more revisions.
2635 2635 If no revision is given, the parent of the working directory is used.
2636 2636
2637 2637 The information shown in the changeset header is: author, date,
2638 2638 branch name (if non-default), changeset hash, parent(s) and commit
2639 2639 comment.
2640 2640
2641 2641 .. note::
2642 2642
2643 2643 :hg:`export` may generate unexpected diff output for merge
2644 2644 changesets, as it will compare the merge changeset against its
2645 2645 first parent only.
2646 2646
2647 2647 Output may be to a file, in which case the name of the file is
2648 2648 given using a template string. See :hg:`help templates`. In addition
2649 2649 to the common template keywords, the following formatting rules are
2650 2650 supported:
2651 2651
2652 2652 :``%%``: literal "%" character
2653 2653 :``%H``: changeset hash (40 hexadecimal digits)
2654 2654 :``%N``: number of patches being generated
2655 2655 :``%R``: changeset revision number
2656 2656 :``%b``: basename of the exporting repository
2657 2657 :``%h``: short-form changeset hash (12 hexadecimal digits)
2658 2658 :``%m``: first line of the commit message (only alphanumeric characters)
2659 2659 :``%n``: zero-padded sequence number, starting at 1
2660 2660 :``%r``: zero-padded changeset revision number
2661 2661 :``\\``: literal "\\" character
2662 2662
2663 2663 Without the -a/--text option, export will avoid generating diffs
2664 2664 of files it detects as binary. With -a, export will generate a
2665 2665 diff anyway, probably with undesirable results.
2666 2666
2667 2667 With -B/--bookmark changesets reachable by the given bookmark are
2668 2668 selected.
2669 2669
2670 2670 Use the -g/--git option to generate diffs in the git extended diff
2671 2671 format. See :hg:`help diffs` for more information.
2672 2672
2673 2673 With the --switch-parent option, the diff will be against the
2674 2674 second parent. It can be useful to review a merge.
2675 2675
2676 2676 .. container:: verbose
2677 2677
2678 2678 Template:
2679 2679
2680 2680 The following keywords are supported in addition to the common template
2681 2681 keywords and functions. See also :hg:`help templates`.
2682 2682
2683 2683 :diff: String. Diff content.
2684 2684 :parents: List of strings. Parent nodes of the changeset.
2685 2685
2686 2686 Examples:
2687 2687
2688 2688 - use export and import to transplant a bugfix to the current
2689 2689 branch::
2690 2690
2691 2691 hg export -r 9353 | hg import -
2692 2692
2693 2693 - export all the changesets between two revisions to a file with
2694 2694 rename information::
2695 2695
2696 2696 hg export --git -r 123:150 > changes.txt
2697 2697
2698 2698 - split outgoing changes into a series of patches with
2699 2699 descriptive names::
2700 2700
2701 2701 hg export -r "outgoing()" -o "%n-%m.patch"
2702 2702
2703 2703 Returns 0 on success.
2704 2704 """
2705 2705 opts = pycompat.byteskwargs(opts)
2706 2706 bookmark = opts.get(b'bookmark')
2707 2707 changesets += tuple(opts.get(b'rev', []))
2708 2708
2709 2709 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2710 2710
2711 2711 if bookmark:
2712 2712 if bookmark not in repo._bookmarks:
2713 2713 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2714 2714
2715 2715 revs = scmutil.bookmarkrevs(repo, bookmark)
2716 2716 else:
2717 2717 if not changesets:
2718 2718 changesets = [b'.']
2719 2719
2720 2720 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2721 2721 revs = scmutil.revrange(repo, changesets)
2722 2722
2723 2723 if not revs:
2724 2724 raise error.InputError(_(b"export requires at least one changeset"))
2725 2725 if len(revs) > 1:
2726 2726 ui.note(_(b'exporting patches:\n'))
2727 2727 else:
2728 2728 ui.note(_(b'exporting patch:\n'))
2729 2729
2730 2730 fntemplate = opts.get(b'output')
2731 2731 if cmdutil.isstdiofilename(fntemplate):
2732 2732 fntemplate = b''
2733 2733
2734 2734 if fntemplate:
2735 2735 fm = formatter.nullformatter(ui, b'export', opts)
2736 2736 else:
2737 2737 ui.pager(b'export')
2738 2738 fm = ui.formatter(b'export', opts)
2739 2739 with fm:
2740 2740 cmdutil.export(
2741 2741 repo,
2742 2742 revs,
2743 2743 fm,
2744 2744 fntemplate=fntemplate,
2745 2745 switch_parent=opts.get(b'switch_parent'),
2746 2746 opts=patch.diffallopts(ui, opts),
2747 2747 )
2748 2748
2749 2749
2750 2750 @command(
2751 2751 b'files',
2752 2752 [
2753 2753 (
2754 2754 b'r',
2755 2755 b'rev',
2756 2756 b'',
2757 2757 _(b'search the repository as it is in REV'),
2758 2758 _(b'REV'),
2759 2759 ),
2760 2760 (
2761 2761 b'0',
2762 2762 b'print0',
2763 2763 None,
2764 2764 _(b'end filenames with NUL, for use with xargs'),
2765 2765 ),
2766 2766 ]
2767 2767 + walkopts
2768 2768 + formatteropts
2769 2769 + subrepoopts,
2770 2770 _(b'[OPTION]... [FILE]...'),
2771 2771 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2772 2772 intents={INTENT_READONLY},
2773 2773 )
2774 2774 def files(ui, repo, *pats, **opts):
2775 2775 """list tracked files
2776 2776
2777 2777 Print files under Mercurial control in the working directory or
2778 2778 specified revision for given files (excluding removed files).
2779 2779 Files can be specified as filenames or filesets.
2780 2780
2781 2781 If no files are given to match, this command prints the names
2782 2782 of all files under Mercurial control.
2783 2783
2784 2784 .. container:: verbose
2785 2785
2786 2786 Template:
2787 2787
2788 2788 The following keywords are supported in addition to the common template
2789 2789 keywords and functions. See also :hg:`help templates`.
2790 2790
2791 2791 :flags: String. Character denoting file's symlink and executable bits.
2792 2792 :path: String. Repository-absolute path of the file.
2793 2793 :size: Integer. Size of the file in bytes.
2794 2794
2795 2795 Examples:
2796 2796
2797 2797 - list all files under the current directory::
2798 2798
2799 2799 hg files .
2800 2800
2801 2801 - shows sizes and flags for current revision::
2802 2802
2803 2803 hg files -vr .
2804 2804
2805 2805 - list all files named README::
2806 2806
2807 2807 hg files -I "**/README"
2808 2808
2809 2809 - list all binary files::
2810 2810
2811 2811 hg files "set:binary()"
2812 2812
2813 2813 - find files containing a regular expression::
2814 2814
2815 2815 hg files "set:grep('bob')"
2816 2816
2817 2817 - search tracked file contents with xargs and grep::
2818 2818
2819 2819 hg files -0 | xargs -0 grep foo
2820 2820
2821 2821 See :hg:`help patterns` and :hg:`help filesets` for more information
2822 2822 on specifying file patterns.
2823 2823
2824 2824 Returns 0 if a match is found, 1 otherwise.
2825 2825
2826 2826 """
2827 2827
2828 2828 opts = pycompat.byteskwargs(opts)
2829 2829 rev = opts.get(b'rev')
2830 2830 if rev:
2831 2831 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2832 2832 ctx = scmutil.revsingle(repo, rev, None)
2833 2833
2834 2834 end = b'\n'
2835 2835 if opts.get(b'print0'):
2836 2836 end = b'\0'
2837 2837 fmt = b'%s' + end
2838 2838
2839 2839 m = scmutil.match(ctx, pats, opts)
2840 2840 ui.pager(b'files')
2841 2841 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2842 2842 with ui.formatter(b'files', opts) as fm:
2843 2843 return cmdutil.files(
2844 2844 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2845 2845 )
2846 2846
2847 2847
2848 2848 @command(
2849 2849 b'forget',
2850 2850 [
2851 2851 (b'i', b'interactive', None, _(b'use interactive mode')),
2852 2852 ]
2853 2853 + walkopts
2854 2854 + dryrunopts,
2855 2855 _(b'[OPTION]... FILE...'),
2856 2856 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2857 2857 helpbasic=True,
2858 2858 inferrepo=True,
2859 2859 )
2860 2860 def forget(ui, repo, *pats, **opts):
2861 2861 """forget the specified files on the next commit
2862 2862
2863 2863 Mark the specified files so they will no longer be tracked
2864 2864 after the next commit.
2865 2865
2866 2866 This only removes files from the current branch, not from the
2867 2867 entire project history, and it does not delete them from the
2868 2868 working directory.
2869 2869
2870 2870 To delete the file from the working directory, see :hg:`remove`.
2871 2871
2872 2872 To undo a forget before the next commit, see :hg:`add`.
2873 2873
2874 2874 .. container:: verbose
2875 2875
2876 2876 Examples:
2877 2877
2878 2878 - forget newly-added binary files::
2879 2879
2880 2880 hg forget "set:added() and binary()"
2881 2881
2882 2882 - forget files that would be excluded by .hgignore::
2883 2883
2884 2884 hg forget "set:hgignore()"
2885 2885
2886 2886 Returns 0 on success.
2887 2887 """
2888 2888
2889 2889 opts = pycompat.byteskwargs(opts)
2890 2890 if not pats:
2891 2891 raise error.InputError(_(b'no files specified'))
2892 2892
2893 2893 m = scmutil.match(repo[None], pats, opts)
2894 2894 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2895 2895 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2896 2896 rejected = cmdutil.forget(
2897 2897 ui,
2898 2898 repo,
2899 2899 m,
2900 2900 prefix=b"",
2901 2901 uipathfn=uipathfn,
2902 2902 explicitonly=False,
2903 2903 dryrun=dryrun,
2904 2904 interactive=interactive,
2905 2905 )[0]
2906 2906 return rejected and 1 or 0
2907 2907
2908 2908
2909 2909 @command(
2910 2910 b'graft',
2911 2911 [
2912 2912 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2913 2913 (
2914 2914 b'',
2915 2915 b'base',
2916 2916 b'',
2917 2917 _(b'base revision when doing the graft merge (ADVANCED)'),
2918 2918 _(b'REV'),
2919 2919 ),
2920 2920 (b'c', b'continue', False, _(b'resume interrupted graft')),
2921 2921 (b'', b'stop', False, _(b'stop interrupted graft')),
2922 2922 (b'', b'abort', False, _(b'abort interrupted graft')),
2923 2923 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2924 2924 (b'', b'log', None, _(b'append graft info to log message')),
2925 2925 (
2926 2926 b'',
2927 2927 b'no-commit',
2928 2928 None,
2929 2929 _(b"don't commit, just apply the changes in working directory"),
2930 2930 ),
2931 2931 (b'f', b'force', False, _(b'force graft')),
2932 2932 (
2933 2933 b'D',
2934 2934 b'currentdate',
2935 2935 False,
2936 2936 _(b'record the current date as commit date'),
2937 2937 ),
2938 2938 (
2939 2939 b'U',
2940 2940 b'currentuser',
2941 2941 False,
2942 2942 _(b'record the current user as committer'),
2943 2943 ),
2944 2944 ]
2945 2945 + commitopts2
2946 2946 + mergetoolopts
2947 2947 + dryrunopts,
2948 2948 _(b'[OPTION]... [-r REV]... REV...'),
2949 2949 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2950 2950 )
2951 2951 def graft(ui, repo, *revs, **opts):
2952 2952 """copy changes from other branches onto the current branch
2953 2953
2954 2954 This command uses Mercurial's merge logic to copy individual
2955 2955 changes from other branches without merging branches in the
2956 2956 history graph. This is sometimes known as 'backporting' or
2957 2957 'cherry-picking'. By default, graft will copy user, date, and
2958 2958 description from the source changesets.
2959 2959
2960 2960 Changesets that are ancestors of the current revision, that have
2961 2961 already been grafted, or that are merges will be skipped.
2962 2962
2963 2963 If --log is specified, log messages will have a comment appended
2964 2964 of the form::
2965 2965
2966 2966 (grafted from CHANGESETHASH)
2967 2967
2968 2968 If --force is specified, revisions will be grafted even if they
2969 2969 are already ancestors of, or have been grafted to, the destination.
2970 2970 This is useful when the revisions have since been backed out.
2971 2971
2972 2972 If a graft merge results in conflicts, the graft process is
2973 2973 interrupted so that the current merge can be manually resolved.
2974 2974 Once all conflicts are addressed, the graft process can be
2975 2975 continued with the -c/--continue option.
2976 2976
2977 2977 The -c/--continue option reapplies all the earlier options.
2978 2978
2979 2979 .. container:: verbose
2980 2980
2981 2981 The --base option exposes more of how graft internally uses merge with a
2982 2982 custom base revision. --base can be used to specify another ancestor than
2983 2983 the first and only parent.
2984 2984
2985 2985 The command::
2986 2986
2987 2987 hg graft -r 345 --base 234
2988 2988
2989 2989 is thus pretty much the same as::
2990 2990
2991 2991 hg diff --from 234 --to 345 | hg import
2992 2992
2993 2993 but using merge to resolve conflicts and track moved files.
2994 2994
2995 2995 The result of a merge can thus be backported as a single commit by
2996 2996 specifying one of the merge parents as base, and thus effectively
2997 2997 grafting the changes from the other side.
2998 2998
2999 2999 It is also possible to collapse multiple changesets and clean up history
3000 3000 by specifying another ancestor as base, much like rebase --collapse
3001 3001 --keep.
3002 3002
3003 3003 The commit message can be tweaked after the fact using commit --amend .
3004 3004
3005 3005 For using non-ancestors as the base to backout changes, see the backout
3006 3006 command and the hidden --parent option.
3007 3007
3008 3008 .. container:: verbose
3009 3009
3010 3010 Examples:
3011 3011
3012 3012 - copy a single change to the stable branch and edit its description::
3013 3013
3014 3014 hg update stable
3015 3015 hg graft --edit 9393
3016 3016
3017 3017 - graft a range of changesets with one exception, updating dates::
3018 3018
3019 3019 hg graft -D "2085::2093 and not 2091"
3020 3020
3021 3021 - continue a graft after resolving conflicts::
3022 3022
3023 3023 hg graft -c
3024 3024
3025 3025 - show the source of a grafted changeset::
3026 3026
3027 3027 hg log --debug -r .
3028 3028
3029 3029 - show revisions sorted by date::
3030 3030
3031 3031 hg log -r "sort(all(), date)"
3032 3032
3033 3033 - backport the result of a merge as a single commit::
3034 3034
3035 3035 hg graft -r 123 --base 123^
3036 3036
3037 3037 - land a feature branch as one changeset::
3038 3038
3039 3039 hg up -cr default
3040 3040 hg graft -r featureX --base "ancestor('featureX', 'default')"
3041 3041
3042 3042 See :hg:`help revisions` for more about specifying revisions.
3043 3043
3044 3044 Returns 0 on successful completion, 1 if there are unresolved files.
3045 3045 """
3046 3046 with repo.wlock():
3047 3047 return _dograft(ui, repo, *revs, **opts)
3048 3048
3049 3049
3050 3050 def _dograft(ui, repo, *revs, **opts):
3051 3051 opts = pycompat.byteskwargs(opts)
3052 3052 if revs and opts.get(b'rev'):
3053 3053 ui.warn(
3054 3054 _(
3055 3055 b'warning: inconsistent use of --rev might give unexpected '
3056 3056 b'revision ordering!\n'
3057 3057 )
3058 3058 )
3059 3059
3060 3060 revs = list(revs)
3061 3061 revs.extend(opts.get(b'rev'))
3062 3062 # a dict of data to be stored in state file
3063 3063 statedata = {}
3064 3064 # list of new nodes created by ongoing graft
3065 3065 statedata[b'newnodes'] = []
3066 3066
3067 3067 cmdutil.resolvecommitoptions(ui, opts)
3068 3068
3069 3069 editor = cmdutil.getcommiteditor(
3070 3070 editform=b'graft', **pycompat.strkwargs(opts)
3071 3071 )
3072 3072
3073 3073 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3074 3074
3075 3075 cont = False
3076 3076 if opts.get(b'no_commit'):
3077 3077 cmdutil.check_incompatible_arguments(
3078 3078 opts,
3079 3079 b'no_commit',
3080 3080 [b'edit', b'currentuser', b'currentdate', b'log'],
3081 3081 )
3082 3082
3083 3083 graftstate = statemod.cmdstate(repo, b'graftstate')
3084 3084
3085 3085 if opts.get(b'stop'):
3086 3086 cmdutil.check_incompatible_arguments(
3087 3087 opts,
3088 3088 b'stop',
3089 3089 [
3090 3090 b'edit',
3091 3091 b'log',
3092 3092 b'user',
3093 3093 b'date',
3094 3094 b'currentdate',
3095 3095 b'currentuser',
3096 3096 b'rev',
3097 3097 ],
3098 3098 )
3099 3099 return _stopgraft(ui, repo, graftstate)
3100 3100 elif opts.get(b'abort'):
3101 3101 cmdutil.check_incompatible_arguments(
3102 3102 opts,
3103 3103 b'abort',
3104 3104 [
3105 3105 b'edit',
3106 3106 b'log',
3107 3107 b'user',
3108 3108 b'date',
3109 3109 b'currentdate',
3110 3110 b'currentuser',
3111 3111 b'rev',
3112 3112 ],
3113 3113 )
3114 3114 return cmdutil.abortgraft(ui, repo, graftstate)
3115 3115 elif opts.get(b'continue'):
3116 3116 cont = True
3117 3117 if revs:
3118 3118 raise error.InputError(_(b"can't specify --continue and revisions"))
3119 3119 # read in unfinished revisions
3120 3120 if graftstate.exists():
3121 3121 statedata = cmdutil.readgraftstate(repo, graftstate)
3122 3122 if statedata.get(b'date'):
3123 3123 opts[b'date'] = statedata[b'date']
3124 3124 if statedata.get(b'user'):
3125 3125 opts[b'user'] = statedata[b'user']
3126 3126 if statedata.get(b'log'):
3127 3127 opts[b'log'] = True
3128 3128 if statedata.get(b'no_commit'):
3129 3129 opts[b'no_commit'] = statedata.get(b'no_commit')
3130 3130 if statedata.get(b'base'):
3131 3131 opts[b'base'] = statedata.get(b'base')
3132 3132 nodes = statedata[b'nodes']
3133 3133 revs = [repo[node].rev() for node in nodes]
3134 3134 else:
3135 3135 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3136 3136 else:
3137 3137 if not revs:
3138 3138 raise error.InputError(_(b'no revisions specified'))
3139 3139 cmdutil.checkunfinished(repo)
3140 3140 cmdutil.bailifchanged(repo)
3141 3141 revs = scmutil.revrange(repo, revs)
3142 3142
3143 3143 skipped = set()
3144 3144 basectx = None
3145 3145 if opts.get(b'base'):
3146 3146 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3147 3147 if basectx is None:
3148 3148 # check for merges
3149 3149 for rev in repo.revs(b'%ld and merge()', revs):
3150 3150 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3151 3151 skipped.add(rev)
3152 3152 revs = [r for r in revs if r not in skipped]
3153 3153 if not revs:
3154 3154 return -1
3155 3155 if basectx is not None and len(revs) != 1:
3156 3156 raise error.InputError(_(b'only one revision allowed with --base '))
3157 3157
3158 3158 # Don't check in the --continue case, in effect retaining --force across
3159 3159 # --continues. That's because without --force, any revisions we decided to
3160 3160 # skip would have been filtered out here, so they wouldn't have made their
3161 3161 # way to the graftstate. With --force, any revisions we would have otherwise
3162 3162 # skipped would not have been filtered out, and if they hadn't been applied
3163 3163 # already, they'd have been in the graftstate.
3164 3164 if not (cont or opts.get(b'force')) and basectx is None:
3165 3165 # check for ancestors of dest branch
3166 3166 ancestors = repo.revs(b'%ld & (::.)', revs)
3167 3167 for rev in ancestors:
3168 3168 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3169 3169
3170 3170 revs = [r for r in revs if r not in ancestors]
3171 3171
3172 3172 if not revs:
3173 3173 return -1
3174 3174
3175 3175 # analyze revs for earlier grafts
3176 3176 ids = {}
3177 3177 for ctx in repo.set(b"%ld", revs):
3178 3178 ids[ctx.hex()] = ctx.rev()
3179 3179 n = ctx.extra().get(b'source')
3180 3180 if n:
3181 3181 ids[n] = ctx.rev()
3182 3182
3183 3183 # check ancestors for earlier grafts
3184 3184 ui.debug(b'scanning for duplicate grafts\n')
3185 3185
3186 3186 # The only changesets we can be sure doesn't contain grafts of any
3187 3187 # revs, are the ones that are common ancestors of *all* revs:
3188 3188 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3189 3189 ctx = repo[rev]
3190 3190 n = ctx.extra().get(b'source')
3191 3191 if n in ids:
3192 3192 try:
3193 3193 r = repo[n].rev()
3194 3194 except error.RepoLookupError:
3195 3195 r = None
3196 3196 if r in revs:
3197 3197 ui.warn(
3198 3198 _(
3199 3199 b'skipping revision %d:%s '
3200 3200 b'(already grafted to %d:%s)\n'
3201 3201 )
3202 3202 % (r, repo[r], rev, ctx)
3203 3203 )
3204 3204 revs.remove(r)
3205 3205 elif ids[n] in revs:
3206 3206 if r is None:
3207 3207 ui.warn(
3208 3208 _(
3209 3209 b'skipping already grafted revision %d:%s '
3210 3210 b'(%d:%s also has unknown origin %s)\n'
3211 3211 )
3212 3212 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3213 3213 )
3214 3214 else:
3215 3215 ui.warn(
3216 3216 _(
3217 3217 b'skipping already grafted revision %d:%s '
3218 3218 b'(%d:%s also has origin %d:%s)\n'
3219 3219 )
3220 3220 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3221 3221 )
3222 3222 revs.remove(ids[n])
3223 3223 elif ctx.hex() in ids:
3224 3224 r = ids[ctx.hex()]
3225 3225 if r in revs:
3226 3226 ui.warn(
3227 3227 _(
3228 3228 b'skipping already grafted revision %d:%s '
3229 3229 b'(was grafted from %d:%s)\n'
3230 3230 )
3231 3231 % (r, repo[r], rev, ctx)
3232 3232 )
3233 3233 revs.remove(r)
3234 3234 if not revs:
3235 3235 return -1
3236 3236
3237 3237 if opts.get(b'no_commit'):
3238 3238 statedata[b'no_commit'] = True
3239 3239 if opts.get(b'base'):
3240 3240 statedata[b'base'] = opts[b'base']
3241 3241 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3242 3242 desc = b'%d:%s "%s"' % (
3243 3243 ctx.rev(),
3244 3244 ctx,
3245 3245 ctx.description().split(b'\n', 1)[0],
3246 3246 )
3247 3247 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3248 3248 if names:
3249 3249 desc += b' (%s)' % b' '.join(names)
3250 3250 ui.status(_(b'grafting %s\n') % desc)
3251 3251 if opts.get(b'dry_run'):
3252 3252 continue
3253 3253
3254 3254 source = ctx.extra().get(b'source')
3255 3255 extra = {}
3256 3256 if source:
3257 3257 extra[b'source'] = source
3258 3258 extra[b'intermediate-source'] = ctx.hex()
3259 3259 else:
3260 3260 extra[b'source'] = ctx.hex()
3261 3261 user = ctx.user()
3262 3262 if opts.get(b'user'):
3263 3263 user = opts[b'user']
3264 3264 statedata[b'user'] = user
3265 3265 date = ctx.date()
3266 3266 if opts.get(b'date'):
3267 3267 date = opts[b'date']
3268 3268 statedata[b'date'] = date
3269 3269 message = ctx.description()
3270 3270 if opts.get(b'log'):
3271 3271 message += b'\n(grafted from %s)' % ctx.hex()
3272 3272 statedata[b'log'] = True
3273 3273
3274 3274 # we don't merge the first commit when continuing
3275 3275 if not cont:
3276 3276 # perform the graft merge with p1(rev) as 'ancestor'
3277 3277 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3278 3278 base = ctx.p1() if basectx is None else basectx
3279 3279 with ui.configoverride(overrides, b'graft'):
3280 3280 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3281 3281 # report any conflicts
3282 3282 if stats.unresolvedcount > 0:
3283 3283 # write out state for --continue
3284 3284 nodes = [repo[rev].hex() for rev in revs[pos:]]
3285 3285 statedata[b'nodes'] = nodes
3286 3286 stateversion = 1
3287 3287 graftstate.save(stateversion, statedata)
3288 3288 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3289 3289 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3290 3290 return 1
3291 3291 else:
3292 3292 cont = False
3293 3293
3294 3294 # commit if --no-commit is false
3295 3295 if not opts.get(b'no_commit'):
3296 3296 node = repo.commit(
3297 3297 text=message, user=user, date=date, extra=extra, editor=editor
3298 3298 )
3299 3299 if node is None:
3300 3300 ui.warn(
3301 3301 _(b'note: graft of %d:%s created no changes to commit\n')
3302 3302 % (ctx.rev(), ctx)
3303 3303 )
3304 3304 # checking that newnodes exist because old state files won't have it
3305 3305 elif statedata.get(b'newnodes') is not None:
3306 3306 nn = statedata[b'newnodes'] # type: List[bytes]
3307 3307 nn.append(node)
3308 3308
3309 3309 # remove state when we complete successfully
3310 3310 if not opts.get(b'dry_run'):
3311 3311 graftstate.delete()
3312 3312
3313 3313 return 0
3314 3314
3315 3315
3316 3316 def _stopgraft(ui, repo, graftstate):
3317 3317 """stop the interrupted graft"""
3318 3318 if not graftstate.exists():
3319 3319 raise error.StateError(_(b"no interrupted graft found"))
3320 3320 pctx = repo[b'.']
3321 3321 mergemod.clean_update(pctx)
3322 3322 graftstate.delete()
3323 3323 ui.status(_(b"stopped the interrupted graft\n"))
3324 3324 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3325 3325 return 0
3326 3326
3327 3327
3328 3328 statemod.addunfinished(
3329 3329 b'graft',
3330 3330 fname=b'graftstate',
3331 3331 clearable=True,
3332 3332 stopflag=True,
3333 3333 continueflag=True,
3334 3334 abortfunc=cmdutil.hgabortgraft,
3335 3335 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3336 3336 )
3337 3337
3338 3338
3339 3339 @command(
3340 3340 b'grep',
3341 3341 [
3342 3342 (b'0', b'print0', None, _(b'end fields with NUL')),
3343 3343 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3344 3344 (
3345 3345 b'',
3346 3346 b'diff',
3347 3347 None,
3348 3348 _(
3349 3349 b'search revision differences for when the pattern was added '
3350 3350 b'or removed'
3351 3351 ),
3352 3352 ),
3353 3353 (b'a', b'text', None, _(b'treat all files as text')),
3354 3354 (
3355 3355 b'f',
3356 3356 b'follow',
3357 3357 None,
3358 3358 _(
3359 3359 b'follow changeset history,'
3360 3360 b' or file history across copies and renames'
3361 3361 ),
3362 3362 ),
3363 3363 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3364 3364 (
3365 3365 b'l',
3366 3366 b'files-with-matches',
3367 3367 None,
3368 3368 _(b'print only filenames and revisions that match'),
3369 3369 ),
3370 3370 (b'n', b'line-number', None, _(b'print matching line numbers')),
3371 3371 (
3372 3372 b'r',
3373 3373 b'rev',
3374 3374 [],
3375 3375 _(b'search files changed within revision range'),
3376 3376 _(b'REV'),
3377 3377 ),
3378 3378 (
3379 3379 b'',
3380 3380 b'all-files',
3381 3381 None,
3382 3382 _(
3383 3383 b'include all files in the changeset while grepping (DEPRECATED)'
3384 3384 ),
3385 3385 ),
3386 3386 (b'u', b'user', None, _(b'list the author (long with -v)')),
3387 3387 (b'd', b'date', None, _(b'list the date (short with -q)')),
3388 3388 ]
3389 3389 + formatteropts
3390 3390 + walkopts,
3391 3391 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3392 3392 helpcategory=command.CATEGORY_FILE_CONTENTS,
3393 3393 inferrepo=True,
3394 3394 intents={INTENT_READONLY},
3395 3395 )
3396 3396 def grep(ui, repo, pattern, *pats, **opts):
3397 3397 """search for a pattern in specified files
3398 3398
3399 3399 Search the working directory or revision history for a regular
3400 3400 expression in the specified files for the entire repository.
3401 3401
3402 3402 By default, grep searches the repository files in the working
3403 3403 directory and prints the files where it finds a match. To specify
3404 3404 historical revisions instead of the working directory, use the
3405 3405 --rev flag.
3406 3406
3407 3407 To search instead historical revision differences that contains a
3408 3408 change in match status ("-" for a match that becomes a non-match,
3409 3409 or "+" for a non-match that becomes a match), use the --diff flag.
3410 3410
3411 3411 PATTERN can be any Python (roughly Perl-compatible) regular
3412 3412 expression.
3413 3413
3414 3414 If no FILEs are specified and the --rev flag isn't supplied, all
3415 3415 files in the working directory are searched. When using the --rev
3416 3416 flag and specifying FILEs, use the --follow argument to also
3417 3417 follow the specified FILEs across renames and copies.
3418 3418
3419 3419 .. container:: verbose
3420 3420
3421 3421 Template:
3422 3422
3423 3423 The following keywords are supported in addition to the common template
3424 3424 keywords and functions. See also :hg:`help templates`.
3425 3425
3426 3426 :change: String. Character denoting insertion ``+`` or removal ``-``.
3427 3427 Available if ``--diff`` is specified.
3428 3428 :lineno: Integer. Line number of the match.
3429 3429 :path: String. Repository-absolute path of the file.
3430 3430 :texts: List of text chunks.
3431 3431
3432 3432 And each entry of ``{texts}`` provides the following sub-keywords.
3433 3433
3434 3434 :matched: Boolean. True if the chunk matches the specified pattern.
3435 3435 :text: String. Chunk content.
3436 3436
3437 3437 See :hg:`help templates.operators` for the list expansion syntax.
3438 3438
3439 3439 Returns 0 if a match is found, 1 otherwise.
3440 3440
3441 3441 """
3442 3442 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3443 3443 opts = pycompat.byteskwargs(opts)
3444 3444 diff = opts.get(b'all') or opts.get(b'diff')
3445 3445 follow = opts.get(b'follow')
3446 3446 if opts.get(b'all_files') is None and not diff:
3447 3447 opts[b'all_files'] = True
3448 3448 plaingrep = (
3449 3449 opts.get(b'all_files')
3450 3450 and not opts.get(b'rev')
3451 3451 and not opts.get(b'follow')
3452 3452 )
3453 3453 all_files = opts.get(b'all_files')
3454 3454 if plaingrep:
3455 3455 opts[b'rev'] = [b'wdir()']
3456 3456
3457 3457 reflags = re.M
3458 3458 if opts.get(b'ignore_case'):
3459 3459 reflags |= re.I
3460 3460 try:
3461 3461 regexp = util.re.compile(pattern, reflags)
3462 3462 except re.error as inst:
3463 3463 ui.warn(
3464 3464 _(b"grep: invalid match pattern: %s\n")
3465 3465 % stringutil.forcebytestr(inst)
3466 3466 )
3467 3467 return 1
3468 3468 sep, eol = b':', b'\n'
3469 3469 if opts.get(b'print0'):
3470 3470 sep = eol = b'\0'
3471 3471
3472 3472 searcher = grepmod.grepsearcher(
3473 3473 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3474 3474 )
3475 3475
3476 3476 getfile = searcher._getfile
3477 3477
3478 3478 uipathfn = scmutil.getuipathfn(repo)
3479 3479
3480 3480 def display(fm, fn, ctx, pstates, states):
3481 3481 rev = scmutil.intrev(ctx)
3482 3482 if fm.isplain():
3483 3483 formatuser = ui.shortuser
3484 3484 else:
3485 3485 formatuser = pycompat.bytestr
3486 3486 if ui.quiet:
3487 3487 datefmt = b'%Y-%m-%d'
3488 3488 else:
3489 3489 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3490 3490 found = False
3491 3491
3492 3492 @util.cachefunc
3493 3493 def binary():
3494 3494 flog = getfile(fn)
3495 3495 try:
3496 3496 return stringutil.binary(flog.read(ctx.filenode(fn)))
3497 3497 except error.WdirUnsupported:
3498 3498 return ctx[fn].isbinary()
3499 3499
3500 3500 fieldnamemap = {b'linenumber': b'lineno'}
3501 3501 if diff:
3502 3502 iter = grepmod.difflinestates(pstates, states)
3503 3503 else:
3504 3504 iter = [(b'', l) for l in states]
3505 3505 for change, l in iter:
3506 3506 fm.startitem()
3507 3507 fm.context(ctx=ctx)
3508 3508 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3509 3509 fm.plain(uipathfn(fn), label=b'grep.filename')
3510 3510
3511 3511 cols = [
3512 3512 (b'rev', b'%d', rev, not plaingrep, b''),
3513 3513 (
3514 3514 b'linenumber',
3515 3515 b'%d',
3516 3516 l.linenum,
3517 3517 opts.get(b'line_number'),
3518 3518 b'',
3519 3519 ),
3520 3520 ]
3521 3521 if diff:
3522 3522 cols.append(
3523 3523 (
3524 3524 b'change',
3525 3525 b'%s',
3526 3526 change,
3527 3527 True,
3528 3528 b'grep.inserted '
3529 3529 if change == b'+'
3530 3530 else b'grep.deleted ',
3531 3531 )
3532 3532 )
3533 3533 cols.extend(
3534 3534 [
3535 3535 (
3536 3536 b'user',
3537 3537 b'%s',
3538 3538 formatuser(ctx.user()),
3539 3539 opts.get(b'user'),
3540 3540 b'',
3541 3541 ),
3542 3542 (
3543 3543 b'date',
3544 3544 b'%s',
3545 3545 fm.formatdate(ctx.date(), datefmt),
3546 3546 opts.get(b'date'),
3547 3547 b'',
3548 3548 ),
3549 3549 ]
3550 3550 )
3551 3551 for name, fmt, data, cond, extra_label in cols:
3552 3552 if cond:
3553 3553 fm.plain(sep, label=b'grep.sep')
3554 3554 field = fieldnamemap.get(name, name)
3555 3555 label = extra_label + (b'grep.%s' % name)
3556 3556 fm.condwrite(cond, field, fmt, data, label=label)
3557 3557 if not opts.get(b'files_with_matches'):
3558 3558 fm.plain(sep, label=b'grep.sep')
3559 3559 if not opts.get(b'text') and binary():
3560 3560 fm.plain(_(b" Binary file matches"))
3561 3561 else:
3562 3562 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3563 3563 fm.plain(eol)
3564 3564 found = True
3565 3565 if opts.get(b'files_with_matches'):
3566 3566 break
3567 3567 return found
3568 3568
3569 3569 def displaymatches(fm, l):
3570 3570 p = 0
3571 3571 for s, e in l.findpos(regexp):
3572 3572 if p < s:
3573 3573 fm.startitem()
3574 3574 fm.write(b'text', b'%s', l.line[p:s])
3575 3575 fm.data(matched=False)
3576 3576 fm.startitem()
3577 3577 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3578 3578 fm.data(matched=True)
3579 3579 p = e
3580 3580 if p < len(l.line):
3581 3581 fm.startitem()
3582 3582 fm.write(b'text', b'%s', l.line[p:])
3583 3583 fm.data(matched=False)
3584 3584 fm.end()
3585 3585
3586 3586 found = False
3587 3587
3588 3588 wopts = logcmdutil.walkopts(
3589 3589 pats=pats,
3590 3590 opts=opts,
3591 3591 revspec=opts[b'rev'],
3592 3592 include_pats=opts[b'include'],
3593 3593 exclude_pats=opts[b'exclude'],
3594 3594 follow=follow,
3595 3595 force_changelog_traversal=all_files,
3596 3596 filter_revisions_by_pats=not all_files,
3597 3597 )
3598 3598 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3599 3599
3600 3600 ui.pager(b'grep')
3601 3601 fm = ui.formatter(b'grep', opts)
3602 3602 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3603 3603 r = display(fm, fn, ctx, pstates, states)
3604 3604 found = found or r
3605 3605 if r and not diff and not all_files:
3606 3606 searcher.skipfile(fn, ctx.rev())
3607 3607 fm.end()
3608 3608
3609 3609 return not found
3610 3610
3611 3611
3612 3612 @command(
3613 3613 b'heads',
3614 3614 [
3615 3615 (
3616 3616 b'r',
3617 3617 b'rev',
3618 3618 b'',
3619 3619 _(b'show only heads which are descendants of STARTREV'),
3620 3620 _(b'STARTREV'),
3621 3621 ),
3622 3622 (b't', b'topo', False, _(b'show topological heads only')),
3623 3623 (
3624 3624 b'a',
3625 3625 b'active',
3626 3626 False,
3627 3627 _(b'show active branchheads only (DEPRECATED)'),
3628 3628 ),
3629 3629 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3630 3630 ]
3631 3631 + templateopts,
3632 3632 _(b'[-ct] [-r STARTREV] [REV]...'),
3633 3633 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3634 3634 intents={INTENT_READONLY},
3635 3635 )
3636 3636 def heads(ui, repo, *branchrevs, **opts):
3637 3637 """show branch heads
3638 3638
3639 3639 With no arguments, show all open branch heads in the repository.
3640 3640 Branch heads are changesets that have no descendants on the
3641 3641 same branch. They are where development generally takes place and
3642 3642 are the usual targets for update and merge operations.
3643 3643
3644 3644 If one or more REVs are given, only open branch heads on the
3645 3645 branches associated with the specified changesets are shown. This
3646 3646 means that you can use :hg:`heads .` to see the heads on the
3647 3647 currently checked-out branch.
3648 3648
3649 3649 If -c/--closed is specified, also show branch heads marked closed
3650 3650 (see :hg:`commit --close-branch`).
3651 3651
3652 3652 If STARTREV is specified, only those heads that are descendants of
3653 3653 STARTREV will be displayed.
3654 3654
3655 3655 If -t/--topo is specified, named branch mechanics will be ignored and only
3656 3656 topological heads (changesets with no children) will be shown.
3657 3657
3658 3658 Returns 0 if matching heads are found, 1 if not.
3659 3659 """
3660 3660
3661 3661 opts = pycompat.byteskwargs(opts)
3662 3662 start = None
3663 3663 rev = opts.get(b'rev')
3664 3664 if rev:
3665 3665 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3666 3666 start = scmutil.revsingle(repo, rev, None).node()
3667 3667
3668 3668 if opts.get(b'topo'):
3669 3669 heads = [repo[h] for h in repo.heads(start)]
3670 3670 else:
3671 3671 heads = []
3672 3672 for branch in repo.branchmap():
3673 3673 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3674 3674 heads = [repo[h] for h in heads]
3675 3675
3676 3676 if branchrevs:
3677 3677 branches = {
3678 3678 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3679 3679 }
3680 3680 heads = [h for h in heads if h.branch() in branches]
3681 3681
3682 3682 if opts.get(b'active') and branchrevs:
3683 3683 dagheads = repo.heads(start)
3684 3684 heads = [h for h in heads if h.node() in dagheads]
3685 3685
3686 3686 if branchrevs:
3687 3687 haveheads = {h.branch() for h in heads}
3688 3688 if branches - haveheads:
3689 3689 headless = b', '.join(b for b in branches - haveheads)
3690 3690 msg = _(b'no open branch heads found on branches %s')
3691 3691 if opts.get(b'rev'):
3692 3692 msg += _(b' (started at %s)') % opts[b'rev']
3693 3693 ui.warn((msg + b'\n') % headless)
3694 3694
3695 3695 if not heads:
3696 3696 return 1
3697 3697
3698 3698 ui.pager(b'heads')
3699 3699 heads = sorted(heads, key=lambda x: -(x.rev()))
3700 3700 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3701 3701 for ctx in heads:
3702 3702 displayer.show(ctx)
3703 3703 displayer.close()
3704 3704
3705 3705
3706 3706 @command(
3707 3707 b'help',
3708 3708 [
3709 3709 (b'e', b'extension', None, _(b'show only help for extensions')),
3710 3710 (b'c', b'command', None, _(b'show only help for commands')),
3711 3711 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3712 3712 (
3713 3713 b's',
3714 3714 b'system',
3715 3715 [],
3716 3716 _(b'show help for specific platform(s)'),
3717 3717 _(b'PLATFORM'),
3718 3718 ),
3719 3719 ],
3720 3720 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3721 3721 helpcategory=command.CATEGORY_HELP,
3722 3722 norepo=True,
3723 3723 intents={INTENT_READONLY},
3724 3724 )
3725 3725 def help_(ui, name=None, **opts):
3726 3726 """show help for a given topic or a help overview
3727 3727
3728 3728 With no arguments, print a list of commands with short help messages.
3729 3729
3730 3730 Given a topic, extension, or command name, print help for that
3731 3731 topic.
3732 3732
3733 3733 Returns 0 if successful.
3734 3734 """
3735 3735
3736 3736 keep = opts.get('system') or []
3737 3737 if len(keep) == 0:
3738 3738 if pycompat.sysplatform.startswith(b'win'):
3739 3739 keep.append(b'windows')
3740 3740 elif pycompat.sysplatform == b'OpenVMS':
3741 3741 keep.append(b'vms')
3742 3742 elif pycompat.sysplatform == b'plan9':
3743 3743 keep.append(b'plan9')
3744 3744 else:
3745 3745 keep.append(b'unix')
3746 3746 keep.append(pycompat.sysplatform.lower())
3747 3747 if ui.verbose:
3748 3748 keep.append(b'verbose')
3749 3749
3750 3750 commands = sys.modules[__name__]
3751 3751 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3752 3752 ui.pager(b'help')
3753 3753 ui.write(formatted)
3754 3754
3755 3755
3756 3756 @command(
3757 3757 b'identify|id',
3758 3758 [
3759 3759 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3760 3760 (b'n', b'num', None, _(b'show local revision number')),
3761 3761 (b'i', b'id', None, _(b'show global revision id')),
3762 3762 (b'b', b'branch', None, _(b'show branch')),
3763 3763 (b't', b'tags', None, _(b'show tags')),
3764 3764 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3765 3765 ]
3766 3766 + remoteopts
3767 3767 + formatteropts,
3768 3768 _(b'[-nibtB] [-r REV] [SOURCE]'),
3769 3769 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3770 3770 optionalrepo=True,
3771 3771 intents={INTENT_READONLY},
3772 3772 )
3773 3773 def identify(
3774 3774 ui,
3775 3775 repo,
3776 3776 source=None,
3777 3777 rev=None,
3778 3778 num=None,
3779 3779 id=None,
3780 3780 branch=None,
3781 3781 tags=None,
3782 3782 bookmarks=None,
3783 3783 **opts
3784 3784 ):
3785 3785 """identify the working directory or specified revision
3786 3786
3787 3787 Print a summary identifying the repository state at REV using one or
3788 3788 two parent hash identifiers, followed by a "+" if the working
3789 3789 directory has uncommitted changes, the branch name (if not default),
3790 3790 a list of tags, and a list of bookmarks.
3791 3791
3792 3792 When REV is not given, print a summary of the current state of the
3793 3793 repository including the working directory. Specify -r. to get information
3794 3794 of the working directory parent without scanning uncommitted changes.
3795 3795
3796 3796 Specifying a path to a repository root or Mercurial bundle will
3797 3797 cause lookup to operate on that repository/bundle.
3798 3798
3799 3799 .. container:: verbose
3800 3800
3801 3801 Template:
3802 3802
3803 3803 The following keywords are supported in addition to the common template
3804 3804 keywords and functions. See also :hg:`help templates`.
3805 3805
3806 3806 :dirty: String. Character ``+`` denoting if the working directory has
3807 3807 uncommitted changes.
3808 3808 :id: String. One or two nodes, optionally followed by ``+``.
3809 3809 :parents: List of strings. Parent nodes of the changeset.
3810 3810
3811 3811 Examples:
3812 3812
3813 3813 - generate a build identifier for the working directory::
3814 3814
3815 3815 hg id --id > build-id.dat
3816 3816
3817 3817 - find the revision corresponding to a tag::
3818 3818
3819 3819 hg id -n -r 1.3
3820 3820
3821 3821 - check the most recent revision of a remote repository::
3822 3822
3823 3823 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3824 3824
3825 3825 See :hg:`log` for generating more information about specific revisions,
3826 3826 including full hash identifiers.
3827 3827
3828 3828 Returns 0 if successful.
3829 3829 """
3830 3830
3831 3831 opts = pycompat.byteskwargs(opts)
3832 3832 if not repo and not source:
3833 3833 raise error.InputError(
3834 3834 _(b"there is no Mercurial repository here (.hg not found)")
3835 3835 )
3836 3836
3837 3837 default = not (num or id or branch or tags or bookmarks)
3838 3838 output = []
3839 3839 revs = []
3840 3840
3841 3841 peer = None
3842 3842 try:
3843 3843 if source:
3844 3844 source, branches = urlutil.parseurl(ui.expandpath(source))
3845 3845 # only pass ui when no repo
3846 3846 peer = hg.peer(repo or ui, opts, source)
3847 3847 repo = peer.local()
3848 3848 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3849 3849
3850 3850 fm = ui.formatter(b'identify', opts)
3851 3851 fm.startitem()
3852 3852
3853 3853 if not repo:
3854 3854 if num or branch or tags:
3855 3855 raise error.InputError(
3856 3856 _(b"can't query remote revision number, branch, or tags")
3857 3857 )
3858 3858 if not rev and revs:
3859 3859 rev = revs[0]
3860 3860 if not rev:
3861 3861 rev = b"tip"
3862 3862
3863 3863 remoterev = peer.lookup(rev)
3864 3864 hexrev = fm.hexfunc(remoterev)
3865 3865 if default or id:
3866 3866 output = [hexrev]
3867 3867 fm.data(id=hexrev)
3868 3868
3869 3869 @util.cachefunc
3870 3870 def getbms():
3871 3871 bms = []
3872 3872
3873 3873 if b'bookmarks' in peer.listkeys(b'namespaces'):
3874 3874 hexremoterev = hex(remoterev)
3875 3875 bms = [
3876 3876 bm
3877 3877 for bm, bmr in pycompat.iteritems(
3878 3878 peer.listkeys(b'bookmarks')
3879 3879 )
3880 3880 if bmr == hexremoterev
3881 3881 ]
3882 3882
3883 3883 return sorted(bms)
3884 3884
3885 3885 if fm.isplain():
3886 3886 if bookmarks:
3887 3887 output.extend(getbms())
3888 3888 elif default and not ui.quiet:
3889 3889 # multiple bookmarks for a single parent separated by '/'
3890 3890 bm = b'/'.join(getbms())
3891 3891 if bm:
3892 3892 output.append(bm)
3893 3893 else:
3894 3894 fm.data(node=hex(remoterev))
3895 3895 if bookmarks or b'bookmarks' in fm.datahint():
3896 3896 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3897 3897 else:
3898 3898 if rev:
3899 3899 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3900 3900 ctx = scmutil.revsingle(repo, rev, None)
3901 3901
3902 3902 if ctx.rev() is None:
3903 3903 ctx = repo[None]
3904 3904 parents = ctx.parents()
3905 3905 taglist = []
3906 3906 for p in parents:
3907 3907 taglist.extend(p.tags())
3908 3908
3909 3909 dirty = b""
3910 3910 if ctx.dirty(missing=True, merge=False, branch=False):
3911 3911 dirty = b'+'
3912 3912 fm.data(dirty=dirty)
3913 3913
3914 3914 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3915 3915 if default or id:
3916 3916 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3917 3917 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3918 3918
3919 3919 if num:
3920 3920 numoutput = [b"%d" % p.rev() for p in parents]
3921 3921 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3922 3922
3923 3923 fm.data(
3924 3924 parents=fm.formatlist(
3925 3925 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3926 3926 )
3927 3927 )
3928 3928 else:
3929 3929 hexoutput = fm.hexfunc(ctx.node())
3930 3930 if default or id:
3931 3931 output = [hexoutput]
3932 3932 fm.data(id=hexoutput)
3933 3933
3934 3934 if num:
3935 3935 output.append(pycompat.bytestr(ctx.rev()))
3936 3936 taglist = ctx.tags()
3937 3937
3938 3938 if default and not ui.quiet:
3939 3939 b = ctx.branch()
3940 3940 if b != b'default':
3941 3941 output.append(b"(%s)" % b)
3942 3942
3943 3943 # multiple tags for a single parent separated by '/'
3944 3944 t = b'/'.join(taglist)
3945 3945 if t:
3946 3946 output.append(t)
3947 3947
3948 3948 # multiple bookmarks for a single parent separated by '/'
3949 3949 bm = b'/'.join(ctx.bookmarks())
3950 3950 if bm:
3951 3951 output.append(bm)
3952 3952 else:
3953 3953 if branch:
3954 3954 output.append(ctx.branch())
3955 3955
3956 3956 if tags:
3957 3957 output.extend(taglist)
3958 3958
3959 3959 if bookmarks:
3960 3960 output.extend(ctx.bookmarks())
3961 3961
3962 3962 fm.data(node=ctx.hex())
3963 3963 fm.data(branch=ctx.branch())
3964 3964 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3965 3965 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3966 3966 fm.context(ctx=ctx)
3967 3967
3968 3968 fm.plain(b"%s\n" % b' '.join(output))
3969 3969 fm.end()
3970 3970 finally:
3971 3971 if peer:
3972 3972 peer.close()
3973 3973
3974 3974
3975 3975 @command(
3976 3976 b'import|patch',
3977 3977 [
3978 3978 (
3979 3979 b'p',
3980 3980 b'strip',
3981 3981 1,
3982 3982 _(
3983 3983 b'directory strip option for patch. This has the same '
3984 3984 b'meaning as the corresponding patch option'
3985 3985 ),
3986 3986 _(b'NUM'),
3987 3987 ),
3988 3988 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3989 3989 (b'', b'secret', None, _(b'use the secret phase for committing')),
3990 3990 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3991 3991 (
3992 3992 b'f',
3993 3993 b'force',
3994 3994 None,
3995 3995 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3996 3996 ),
3997 3997 (
3998 3998 b'',
3999 3999 b'no-commit',
4000 4000 None,
4001 4001 _(b"don't commit, just update the working directory"),
4002 4002 ),
4003 4003 (
4004 4004 b'',
4005 4005 b'bypass',
4006 4006 None,
4007 4007 _(b"apply patch without touching the working directory"),
4008 4008 ),
4009 4009 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4010 4010 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4011 4011 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4012 4012 (
4013 4013 b'',
4014 4014 b'import-branch',
4015 4015 None,
4016 4016 _(b'use any branch information in patch (implied by --exact)'),
4017 4017 ),
4018 4018 ]
4019 4019 + commitopts
4020 4020 + commitopts2
4021 4021 + similarityopts,
4022 4022 _(b'[OPTION]... PATCH...'),
4023 4023 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4024 4024 )
4025 4025 def import_(ui, repo, patch1=None, *patches, **opts):
4026 4026 """import an ordered set of patches
4027 4027
4028 4028 Import a list of patches and commit them individually (unless
4029 4029 --no-commit is specified).
4030 4030
4031 4031 To read a patch from standard input (stdin), use "-" as the patch
4032 4032 name. If a URL is specified, the patch will be downloaded from
4033 4033 there.
4034 4034
4035 4035 Import first applies changes to the working directory (unless
4036 4036 --bypass is specified), import will abort if there are outstanding
4037 4037 changes.
4038 4038
4039 4039 Use --bypass to apply and commit patches directly to the
4040 4040 repository, without affecting the working directory. Without
4041 4041 --exact, patches will be applied on top of the working directory
4042 4042 parent revision.
4043 4043
4044 4044 You can import a patch straight from a mail message. Even patches
4045 4045 as attachments work (to use the body part, it must have type
4046 4046 text/plain or text/x-patch). From and Subject headers of email
4047 4047 message are used as default committer and commit message. All
4048 4048 text/plain body parts before first diff are added to the commit
4049 4049 message.
4050 4050
4051 4051 If the imported patch was generated by :hg:`export`, user and
4052 4052 description from patch override values from message headers and
4053 4053 body. Values given on command line with -m/--message and -u/--user
4054 4054 override these.
4055 4055
4056 4056 If --exact is specified, import will set the working directory to
4057 4057 the parent of each patch before applying it, and will abort if the
4058 4058 resulting changeset has a different ID than the one recorded in
4059 4059 the patch. This will guard against various ways that portable
4060 4060 patch formats and mail systems might fail to transfer Mercurial
4061 4061 data or metadata. See :hg:`bundle` for lossless transmission.
4062 4062
4063 4063 Use --partial to ensure a changeset will be created from the patch
4064 4064 even if some hunks fail to apply. Hunks that fail to apply will be
4065 4065 written to a <target-file>.rej file. Conflicts can then be resolved
4066 4066 by hand before :hg:`commit --amend` is run to update the created
4067 4067 changeset. This flag exists to let people import patches that
4068 4068 partially apply without losing the associated metadata (author,
4069 4069 date, description, ...).
4070 4070
4071 4071 .. note::
4072 4072
4073 4073 When no hunks apply cleanly, :hg:`import --partial` will create
4074 4074 an empty changeset, importing only the patch metadata.
4075 4075
4076 4076 With -s/--similarity, hg will attempt to discover renames and
4077 4077 copies in the patch in the same way as :hg:`addremove`.
4078 4078
4079 4079 It is possible to use external patch programs to perform the patch
4080 4080 by setting the ``ui.patch`` configuration option. For the default
4081 4081 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4082 4082 See :hg:`help config` for more information about configuration
4083 4083 files and how to use these options.
4084 4084
4085 4085 See :hg:`help dates` for a list of formats valid for -d/--date.
4086 4086
4087 4087 .. container:: verbose
4088 4088
4089 4089 Examples:
4090 4090
4091 4091 - import a traditional patch from a website and detect renames::
4092 4092
4093 4093 hg import -s 80 http://example.com/bugfix.patch
4094 4094
4095 4095 - import a changeset from an hgweb server::
4096 4096
4097 4097 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4098 4098
4099 4099 - import all the patches in an Unix-style mbox::
4100 4100
4101 4101 hg import incoming-patches.mbox
4102 4102
4103 4103 - import patches from stdin::
4104 4104
4105 4105 hg import -
4106 4106
4107 4107 - attempt to exactly restore an exported changeset (not always
4108 4108 possible)::
4109 4109
4110 4110 hg import --exact proposed-fix.patch
4111 4111
4112 4112 - use an external tool to apply a patch which is too fuzzy for
4113 4113 the default internal tool.
4114 4114
4115 4115 hg import --config ui.patch="patch --merge" fuzzy.patch
4116 4116
4117 4117 - change the default fuzzing from 2 to a less strict 7
4118 4118
4119 4119 hg import --config ui.fuzz=7 fuzz.patch
4120 4120
4121 4121 Returns 0 on success, 1 on partial success (see --partial).
4122 4122 """
4123 4123
4124 4124 cmdutil.check_incompatible_arguments(
4125 4125 opts, 'no_commit', ['bypass', 'secret']
4126 4126 )
4127 4127 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4128 4128 opts = pycompat.byteskwargs(opts)
4129 4129 if not patch1:
4130 4130 raise error.InputError(_(b'need at least one patch to import'))
4131 4131
4132 4132 patches = (patch1,) + patches
4133 4133
4134 4134 date = opts.get(b'date')
4135 4135 if date:
4136 4136 opts[b'date'] = dateutil.parsedate(date)
4137 4137
4138 4138 exact = opts.get(b'exact')
4139 4139 update = not opts.get(b'bypass')
4140 4140 try:
4141 4141 sim = float(opts.get(b'similarity') or 0)
4142 4142 except ValueError:
4143 4143 raise error.InputError(_(b'similarity must be a number'))
4144 4144 if sim < 0 or sim > 100:
4145 4145 raise error.InputError(_(b'similarity must be between 0 and 100'))
4146 4146 if sim and not update:
4147 4147 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4148 4148
4149 4149 base = opts[b"base"]
4150 4150 msgs = []
4151 4151 ret = 0
4152 4152
4153 4153 with repo.wlock():
4154 4154 if update:
4155 4155 cmdutil.checkunfinished(repo)
4156 4156 if exact or not opts.get(b'force'):
4157 4157 cmdutil.bailifchanged(repo)
4158 4158
4159 4159 if not opts.get(b'no_commit'):
4160 4160 lock = repo.lock
4161 4161 tr = lambda: repo.transaction(b'import')
4162 4162 dsguard = util.nullcontextmanager
4163 4163 else:
4164 4164 lock = util.nullcontextmanager
4165 4165 tr = util.nullcontextmanager
4166 4166 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4167 4167 with lock(), tr(), dsguard():
4168 4168 parents = repo[None].parents()
4169 4169 for patchurl in patches:
4170 4170 if patchurl == b'-':
4171 4171 ui.status(_(b'applying patch from stdin\n'))
4172 4172 patchfile = ui.fin
4173 4173 patchurl = b'stdin' # for error message
4174 4174 else:
4175 4175 patchurl = os.path.join(base, patchurl)
4176 4176 ui.status(_(b'applying %s\n') % patchurl)
4177 4177 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4178 4178
4179 4179 haspatch = False
4180 4180 for hunk in patch.split(patchfile):
4181 4181 with patch.extract(ui, hunk) as patchdata:
4182 4182 msg, node, rej = cmdutil.tryimportone(
4183 4183 ui, repo, patchdata, parents, opts, msgs, hg.clean
4184 4184 )
4185 4185 if msg:
4186 4186 haspatch = True
4187 4187 ui.note(msg + b'\n')
4188 4188 if update or exact:
4189 4189 parents = repo[None].parents()
4190 4190 else:
4191 4191 parents = [repo[node]]
4192 4192 if rej:
4193 4193 ui.write_err(_(b"patch applied partially\n"))
4194 4194 ui.write_err(
4195 4195 _(
4196 4196 b"(fix the .rej files and run "
4197 4197 b"`hg commit --amend`)\n"
4198 4198 )
4199 4199 )
4200 4200 ret = 1
4201 4201 break
4202 4202
4203 4203 if not haspatch:
4204 4204 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4205 4205
4206 4206 if msgs:
4207 4207 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4208 4208 return ret
4209 4209
4210 4210
4211 4211 @command(
4212 4212 b'incoming|in',
4213 4213 [
4214 4214 (
4215 4215 b'f',
4216 4216 b'force',
4217 4217 None,
4218 4218 _(b'run even if remote repository is unrelated'),
4219 4219 ),
4220 4220 (b'n', b'newest-first', None, _(b'show newest record first')),
4221 4221 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4222 4222 (
4223 4223 b'r',
4224 4224 b'rev',
4225 4225 [],
4226 4226 _(b'a remote changeset intended to be added'),
4227 4227 _(b'REV'),
4228 4228 ),
4229 4229 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4230 4230 (
4231 4231 b'b',
4232 4232 b'branch',
4233 4233 [],
4234 4234 _(b'a specific branch you would like to pull'),
4235 4235 _(b'BRANCH'),
4236 4236 ),
4237 4237 ]
4238 4238 + logopts
4239 4239 + remoteopts
4240 4240 + subrepoopts,
4241 4241 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4242 4242 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4243 4243 )
4244 4244 def incoming(ui, repo, source=b"default", **opts):
4245 4245 """show new changesets found in source
4246 4246
4247 4247 Show new changesets found in the specified path/URL or the default
4248 4248 pull location. These are the changesets that would have been pulled
4249 4249 by :hg:`pull` at the time you issued this command.
4250 4250
4251 4251 See pull for valid source format details.
4252 4252
4253 4253 .. container:: verbose
4254 4254
4255 4255 With -B/--bookmarks, the result of bookmark comparison between
4256 4256 local and remote repositories is displayed. With -v/--verbose,
4257 4257 status is also displayed for each bookmark like below::
4258 4258
4259 4259 BM1 01234567890a added
4260 4260 BM2 1234567890ab advanced
4261 4261 BM3 234567890abc diverged
4262 4262 BM4 34567890abcd changed
4263 4263
4264 4264 The action taken locally when pulling depends on the
4265 4265 status of each bookmark:
4266 4266
4267 4267 :``added``: pull will create it
4268 4268 :``advanced``: pull will update it
4269 4269 :``diverged``: pull will create a divergent bookmark
4270 4270 :``changed``: result depends on remote changesets
4271 4271
4272 4272 From the point of view of pulling behavior, bookmark
4273 4273 existing only in the remote repository are treated as ``added``,
4274 4274 even if it is in fact locally deleted.
4275 4275
4276 4276 .. container:: verbose
4277 4277
4278 4278 For remote repository, using --bundle avoids downloading the
4279 4279 changesets twice if the incoming is followed by a pull.
4280 4280
4281 4281 Examples:
4282 4282
4283 4283 - show incoming changes with patches and full description::
4284 4284
4285 4285 hg incoming -vp
4286 4286
4287 4287 - show incoming changes excluding merges, store a bundle::
4288 4288
4289 4289 hg in -vpM --bundle incoming.hg
4290 4290 hg pull incoming.hg
4291 4291
4292 4292 - briefly list changes inside a bundle::
4293 4293
4294 4294 hg in changes.hg -T "{desc|firstline}\\n"
4295 4295
4296 4296 Returns 0 if there are incoming changes, 1 otherwise.
4297 4297 """
4298 4298 opts = pycompat.byteskwargs(opts)
4299 4299 if opts.get(b'graph'):
4300 4300 logcmdutil.checkunsupportedgraphflags([], opts)
4301 4301
4302 4302 def display(other, chlist, displayer):
4303 4303 revdag = logcmdutil.graphrevs(other, chlist, opts)
4304 4304 logcmdutil.displaygraph(
4305 4305 ui, repo, revdag, displayer, graphmod.asciiedges
4306 4306 )
4307 4307
4308 4308 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4309 4309 return 0
4310 4310
4311 4311 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4312 4312
4313 4313 if opts.get(b'bookmarks'):
4314 4314 source, branches = urlutil.parseurl(
4315 4315 ui.expandpath(source), opts.get(b'branch')
4316 4316 )
4317 4317 other = hg.peer(repo, opts, source)
4318 4318 try:
4319 4319 if b'bookmarks' not in other.listkeys(b'namespaces'):
4320 4320 ui.warn(_(b"remote doesn't support bookmarks\n"))
4321 4321 return 0
4322 4322 ui.pager(b'incoming')
4323 4323 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
4324 4324 return bookmarks.incoming(ui, repo, other)
4325 4325 finally:
4326 4326 other.close()
4327 4327
4328 4328 repo._subtoppath = ui.expandpath(source)
4329 4329 try:
4330 4330 return hg.incoming(ui, repo, source, opts)
4331 4331 finally:
4332 4332 del repo._subtoppath
4333 4333
4334 4334
4335 4335 @command(
4336 4336 b'init',
4337 4337 remoteopts,
4338 4338 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4339 4339 helpcategory=command.CATEGORY_REPO_CREATION,
4340 4340 helpbasic=True,
4341 4341 norepo=True,
4342 4342 )
4343 4343 def init(ui, dest=b".", **opts):
4344 4344 """create a new repository in the given directory
4345 4345
4346 4346 Initialize a new repository in the given directory. If the given
4347 4347 directory does not exist, it will be created.
4348 4348
4349 4349 If no directory is given, the current directory is used.
4350 4350
4351 4351 It is possible to specify an ``ssh://`` URL as the destination.
4352 4352 See :hg:`help urls` for more information.
4353 4353
4354 4354 Returns 0 on success.
4355 4355 """
4356 4356 opts = pycompat.byteskwargs(opts)
4357 4357 peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
4358 4358 peer.close()
4359 4359
4360 4360
4361 4361 @command(
4362 4362 b'locate',
4363 4363 [
4364 4364 (
4365 4365 b'r',
4366 4366 b'rev',
4367 4367 b'',
4368 4368 _(b'search the repository as it is in REV'),
4369 4369 _(b'REV'),
4370 4370 ),
4371 4371 (
4372 4372 b'0',
4373 4373 b'print0',
4374 4374 None,
4375 4375 _(b'end filenames with NUL, for use with xargs'),
4376 4376 ),
4377 4377 (
4378 4378 b'f',
4379 4379 b'fullpath',
4380 4380 None,
4381 4381 _(b'print complete paths from the filesystem root'),
4382 4382 ),
4383 4383 ]
4384 4384 + walkopts,
4385 4385 _(b'[OPTION]... [PATTERN]...'),
4386 4386 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4387 4387 )
4388 4388 def locate(ui, repo, *pats, **opts):
4389 4389 """locate files matching specific patterns (DEPRECATED)
4390 4390
4391 4391 Print files under Mercurial control in the working directory whose
4392 4392 names match the given patterns.
4393 4393
4394 4394 By default, this command searches all directories in the working
4395 4395 directory. To search just the current directory and its
4396 4396 subdirectories, use "--include .".
4397 4397
4398 4398 If no patterns are given to match, this command prints the names
4399 4399 of all files under Mercurial control in the working directory.
4400 4400
4401 4401 If you want to feed the output of this command into the "xargs"
4402 4402 command, use the -0 option to both this command and "xargs". This
4403 4403 will avoid the problem of "xargs" treating single filenames that
4404 4404 contain whitespace as multiple filenames.
4405 4405
4406 4406 See :hg:`help files` for a more versatile command.
4407 4407
4408 4408 Returns 0 if a match is found, 1 otherwise.
4409 4409 """
4410 4410 opts = pycompat.byteskwargs(opts)
4411 4411 if opts.get(b'print0'):
4412 4412 end = b'\0'
4413 4413 else:
4414 4414 end = b'\n'
4415 4415 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4416 4416
4417 4417 ret = 1
4418 4418 m = scmutil.match(
4419 4419 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4420 4420 )
4421 4421
4422 4422 ui.pager(b'locate')
4423 4423 if ctx.rev() is None:
4424 4424 # When run on the working copy, "locate" includes removed files, so
4425 4425 # we get the list of files from the dirstate.
4426 4426 filesgen = sorted(repo.dirstate.matches(m))
4427 4427 else:
4428 4428 filesgen = ctx.matches(m)
4429 4429 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4430 4430 for abs in filesgen:
4431 4431 if opts.get(b'fullpath'):
4432 4432 ui.write(repo.wjoin(abs), end)
4433 4433 else:
4434 4434 ui.write(uipathfn(abs), end)
4435 4435 ret = 0
4436 4436
4437 4437 return ret
4438 4438
4439 4439
4440 4440 @command(
4441 4441 b'log|history',
4442 4442 [
4443 4443 (
4444 4444 b'f',
4445 4445 b'follow',
4446 4446 None,
4447 4447 _(
4448 4448 b'follow changeset history, or file history across copies and renames'
4449 4449 ),
4450 4450 ),
4451 4451 (
4452 4452 b'',
4453 4453 b'follow-first',
4454 4454 None,
4455 4455 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4456 4456 ),
4457 4457 (
4458 4458 b'd',
4459 4459 b'date',
4460 4460 b'',
4461 4461 _(b'show revisions matching date spec'),
4462 4462 _(b'DATE'),
4463 4463 ),
4464 4464 (b'C', b'copies', None, _(b'show copied files')),
4465 4465 (
4466 4466 b'k',
4467 4467 b'keyword',
4468 4468 [],
4469 4469 _(b'do case-insensitive search for a given text'),
4470 4470 _(b'TEXT'),
4471 4471 ),
4472 4472 (
4473 4473 b'r',
4474 4474 b'rev',
4475 4475 [],
4476 4476 _(b'revisions to select or follow from'),
4477 4477 _(b'REV'),
4478 4478 ),
4479 4479 (
4480 4480 b'L',
4481 4481 b'line-range',
4482 4482 [],
4483 4483 _(b'follow line range of specified file (EXPERIMENTAL)'),
4484 4484 _(b'FILE,RANGE'),
4485 4485 ),
4486 4486 (
4487 4487 b'',
4488 4488 b'removed',
4489 4489 None,
4490 4490 _(b'include revisions where files were removed'),
4491 4491 ),
4492 4492 (
4493 4493 b'm',
4494 4494 b'only-merges',
4495 4495 None,
4496 4496 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4497 4497 ),
4498 4498 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4499 4499 (
4500 4500 b'',
4501 4501 b'only-branch',
4502 4502 [],
4503 4503 _(
4504 4504 b'show only changesets within the given named branch (DEPRECATED)'
4505 4505 ),
4506 4506 _(b'BRANCH'),
4507 4507 ),
4508 4508 (
4509 4509 b'b',
4510 4510 b'branch',
4511 4511 [],
4512 4512 _(b'show changesets within the given named branch'),
4513 4513 _(b'BRANCH'),
4514 4514 ),
4515 4515 (
4516 4516 b'B',
4517 4517 b'bookmark',
4518 4518 [],
4519 4519 _(b"show changesets within the given bookmark"),
4520 4520 _(b'BOOKMARK'),
4521 4521 ),
4522 4522 (
4523 4523 b'P',
4524 4524 b'prune',
4525 4525 [],
4526 4526 _(b'do not display revision or any of its ancestors'),
4527 4527 _(b'REV'),
4528 4528 ),
4529 4529 ]
4530 4530 + logopts
4531 4531 + walkopts,
4532 4532 _(b'[OPTION]... [FILE]'),
4533 4533 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4534 4534 helpbasic=True,
4535 4535 inferrepo=True,
4536 4536 intents={INTENT_READONLY},
4537 4537 )
4538 4538 def log(ui, repo, *pats, **opts):
4539 4539 """show revision history of entire repository or files
4540 4540
4541 4541 Print the revision history of the specified files or the entire
4542 4542 project.
4543 4543
4544 4544 If no revision range is specified, the default is ``tip:0`` unless
4545 4545 --follow is set.
4546 4546
4547 4547 File history is shown without following rename or copy history of
4548 4548 files. Use -f/--follow with a filename to follow history across
4549 4549 renames and copies. --follow without a filename will only show
4550 4550 ancestors of the starting revisions. The starting revisions can be
4551 4551 specified by -r/--rev, which default to the working directory parent.
4552 4552
4553 4553 By default this command prints revision number and changeset id,
4554 4554 tags, non-trivial parents, user, date and time, and a summary for
4555 4555 each commit. When the -v/--verbose switch is used, the list of
4556 4556 changed files and full commit message are shown.
4557 4557
4558 4558 With --graph the revisions are shown as an ASCII art DAG with the most
4559 4559 recent changeset at the top.
4560 4560 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4561 4561 involved in an unresolved merge conflict, '_' closes a branch,
4562 4562 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4563 4563 changeset from the lines below is a parent of the 'o' merge on the same
4564 4564 line.
4565 4565 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4566 4566 of a '|' indicates one or more revisions in a path are omitted.
4567 4567
4568 4568 .. container:: verbose
4569 4569
4570 4570 Use -L/--line-range FILE,M:N options to follow the history of lines
4571 4571 from M to N in FILE. With -p/--patch only diff hunks affecting
4572 4572 specified line range will be shown. This option requires --follow;
4573 4573 it can be specified multiple times. Currently, this option is not
4574 4574 compatible with --graph. This option is experimental.
4575 4575
4576 4576 .. note::
4577 4577
4578 4578 :hg:`log --patch` may generate unexpected diff output for merge
4579 4579 changesets, as it will only compare the merge changeset against
4580 4580 its first parent. Also, only files different from BOTH parents
4581 4581 will appear in files:.
4582 4582
4583 4583 .. note::
4584 4584
4585 4585 For performance reasons, :hg:`log FILE` may omit duplicate changes
4586 4586 made on branches and will not show removals or mode changes. To
4587 4587 see all such changes, use the --removed switch.
4588 4588
4589 4589 .. container:: verbose
4590 4590
4591 4591 .. note::
4592 4592
4593 4593 The history resulting from -L/--line-range options depends on diff
4594 4594 options; for instance if white-spaces are ignored, respective changes
4595 4595 with only white-spaces in specified line range will not be listed.
4596 4596
4597 4597 .. container:: verbose
4598 4598
4599 4599 Some examples:
4600 4600
4601 4601 - changesets with full descriptions and file lists::
4602 4602
4603 4603 hg log -v
4604 4604
4605 4605 - changesets ancestral to the working directory::
4606 4606
4607 4607 hg log -f
4608 4608
4609 4609 - last 10 commits on the current branch::
4610 4610
4611 4611 hg log -l 10 -b .
4612 4612
4613 4613 - changesets showing all modifications of a file, including removals::
4614 4614
4615 4615 hg log --removed file.c
4616 4616
4617 4617 - all changesets that touch a directory, with diffs, excluding merges::
4618 4618
4619 4619 hg log -Mp lib/
4620 4620
4621 4621 - all revision numbers that match a keyword::
4622 4622
4623 4623 hg log -k bug --template "{rev}\\n"
4624 4624
4625 4625 - the full hash identifier of the working directory parent::
4626 4626
4627 4627 hg log -r . --template "{node}\\n"
4628 4628
4629 4629 - list available log templates::
4630 4630
4631 4631 hg log -T list
4632 4632
4633 4633 - check if a given changeset is included in a tagged release::
4634 4634
4635 4635 hg log -r "a21ccf and ancestor(1.9)"
4636 4636
4637 4637 - find all changesets by some user in a date range::
4638 4638
4639 4639 hg log -k alice -d "may 2008 to jul 2008"
4640 4640
4641 4641 - summary of all changesets after the last tag::
4642 4642
4643 4643 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4644 4644
4645 4645 - changesets touching lines 13 to 23 for file.c::
4646 4646
4647 4647 hg log -L file.c,13:23
4648 4648
4649 4649 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4650 4650 main.c with patch::
4651 4651
4652 4652 hg log -L file.c,13:23 -L main.c,2:6 -p
4653 4653
4654 4654 See :hg:`help dates` for a list of formats valid for -d/--date.
4655 4655
4656 4656 See :hg:`help revisions` for more about specifying and ordering
4657 4657 revisions.
4658 4658
4659 4659 See :hg:`help templates` for more about pre-packaged styles and
4660 4660 specifying custom templates. The default template used by the log
4661 4661 command can be customized via the ``command-templates.log`` configuration
4662 4662 setting.
4663 4663
4664 4664 Returns 0 on success.
4665 4665
4666 4666 """
4667 4667 opts = pycompat.byteskwargs(opts)
4668 4668 linerange = opts.get(b'line_range')
4669 4669
4670 4670 if linerange and not opts.get(b'follow'):
4671 4671 raise error.InputError(_(b'--line-range requires --follow'))
4672 4672
4673 4673 if linerange and pats:
4674 4674 # TODO: take pats as patterns with no line-range filter
4675 4675 raise error.InputError(
4676 4676 _(b'FILE arguments are not compatible with --line-range option')
4677 4677 )
4678 4678
4679 4679 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4680 4680 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4681 4681 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4682 4682 if linerange:
4683 4683 # TODO: should follow file history from logcmdutil._initialrevs(),
4684 4684 # then filter the result by logcmdutil._makerevset() and --limit
4685 4685 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4686 4686
4687 4687 getcopies = None
4688 4688 if opts.get(b'copies'):
4689 4689 endrev = None
4690 4690 if revs:
4691 4691 endrev = revs.max() + 1
4692 4692 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4693 4693
4694 4694 ui.pager(b'log')
4695 4695 displayer = logcmdutil.changesetdisplayer(
4696 4696 ui, repo, opts, differ, buffered=True
4697 4697 )
4698 4698 if opts.get(b'graph'):
4699 4699 displayfn = logcmdutil.displaygraphrevs
4700 4700 else:
4701 4701 displayfn = logcmdutil.displayrevs
4702 4702 displayfn(ui, repo, revs, displayer, getcopies)
4703 4703
4704 4704
4705 4705 @command(
4706 4706 b'manifest',
4707 4707 [
4708 4708 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4709 4709 (b'', b'all', False, _(b"list files from all revisions")),
4710 4710 ]
4711 4711 + formatteropts,
4712 4712 _(b'[-r REV]'),
4713 4713 helpcategory=command.CATEGORY_MAINTENANCE,
4714 4714 intents={INTENT_READONLY},
4715 4715 )
4716 4716 def manifest(ui, repo, node=None, rev=None, **opts):
4717 4717 """output the current or given revision of the project manifest
4718 4718
4719 4719 Print a list of version controlled files for the given revision.
4720 4720 If no revision is given, the first parent of the working directory
4721 4721 is used, or the null revision if no revision is checked out.
4722 4722
4723 4723 With -v, print file permissions, symlink and executable bits.
4724 4724 With --debug, print file revision hashes.
4725 4725
4726 4726 If option --all is specified, the list of all files from all revisions
4727 4727 is printed. This includes deleted and renamed files.
4728 4728
4729 4729 Returns 0 on success.
4730 4730 """
4731 4731 opts = pycompat.byteskwargs(opts)
4732 4732 fm = ui.formatter(b'manifest', opts)
4733 4733
4734 4734 if opts.get(b'all'):
4735 4735 if rev or node:
4736 4736 raise error.InputError(_(b"can't specify a revision with --all"))
4737 4737
4738 4738 res = set()
4739 4739 for rev in repo:
4740 4740 ctx = repo[rev]
4741 4741 res |= set(ctx.files())
4742 4742
4743 4743 ui.pager(b'manifest')
4744 4744 for f in sorted(res):
4745 4745 fm.startitem()
4746 4746 fm.write(b"path", b'%s\n', f)
4747 4747 fm.end()
4748 4748 return
4749 4749
4750 4750 if rev and node:
4751 4751 raise error.InputError(_(b"please specify just one revision"))
4752 4752
4753 4753 if not node:
4754 4754 node = rev
4755 4755
4756 4756 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4757 4757 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4758 4758 if node:
4759 4759 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4760 4760 ctx = scmutil.revsingle(repo, node)
4761 4761 mf = ctx.manifest()
4762 4762 ui.pager(b'manifest')
4763 4763 for f in ctx:
4764 4764 fm.startitem()
4765 4765 fm.context(ctx=ctx)
4766 4766 fl = ctx[f].flags()
4767 4767 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4768 4768 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4769 4769 fm.write(b'path', b'%s\n', f)
4770 4770 fm.end()
4771 4771
4772 4772
4773 4773 @command(
4774 4774 b'merge',
4775 4775 [
4776 4776 (
4777 4777 b'f',
4778 4778 b'force',
4779 4779 None,
4780 4780 _(b'force a merge including outstanding changes (DEPRECATED)'),
4781 4781 ),
4782 4782 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4783 4783 (
4784 4784 b'P',
4785 4785 b'preview',
4786 4786 None,
4787 4787 _(b'review revisions to merge (no merge is performed)'),
4788 4788 ),
4789 4789 (b'', b'abort', None, _(b'abort the ongoing merge')),
4790 4790 ]
4791 4791 + mergetoolopts,
4792 4792 _(b'[-P] [[-r] REV]'),
4793 4793 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4794 4794 helpbasic=True,
4795 4795 )
4796 4796 def merge(ui, repo, node=None, **opts):
4797 4797 """merge another revision into working directory
4798 4798
4799 4799 The current working directory is updated with all changes made in
4800 4800 the requested revision since the last common predecessor revision.
4801 4801
4802 4802 Files that changed between either parent are marked as changed for
4803 4803 the next commit and a commit must be performed before any further
4804 4804 updates to the repository are allowed. The next commit will have
4805 4805 two parents.
4806 4806
4807 4807 ``--tool`` can be used to specify the merge tool used for file
4808 4808 merges. It overrides the HGMERGE environment variable and your
4809 4809 configuration files. See :hg:`help merge-tools` for options.
4810 4810
4811 4811 If no revision is specified, the working directory's parent is a
4812 4812 head revision, and the current branch contains exactly one other
4813 4813 head, the other head is merged with by default. Otherwise, an
4814 4814 explicit revision with which to merge must be provided.
4815 4815
4816 4816 See :hg:`help resolve` for information on handling file conflicts.
4817 4817
4818 4818 To undo an uncommitted merge, use :hg:`merge --abort` which
4819 4819 will check out a clean copy of the original merge parent, losing
4820 4820 all changes.
4821 4821
4822 4822 Returns 0 on success, 1 if there are unresolved files.
4823 4823 """
4824 4824
4825 4825 opts = pycompat.byteskwargs(opts)
4826 4826 abort = opts.get(b'abort')
4827 4827 if abort and repo.dirstate.p2() == nullid:
4828 4828 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4829 4829 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4830 4830 if abort:
4831 4831 state = cmdutil.getunfinishedstate(repo)
4832 4832 if state and state._opname != b'merge':
4833 4833 raise error.StateError(
4834 4834 _(b'cannot abort merge with %s in progress') % (state._opname),
4835 4835 hint=state.hint(),
4836 4836 )
4837 4837 if node:
4838 4838 raise error.InputError(_(b"cannot specify a node with --abort"))
4839 4839 return hg.abortmerge(repo.ui, repo)
4840 4840
4841 4841 if opts.get(b'rev') and node:
4842 4842 raise error.InputError(_(b"please specify just one revision"))
4843 4843 if not node:
4844 4844 node = opts.get(b'rev')
4845 4845
4846 4846 if node:
4847 4847 ctx = scmutil.revsingle(repo, node)
4848 4848 else:
4849 4849 if ui.configbool(b'commands', b'merge.require-rev'):
4850 4850 raise error.InputError(
4851 4851 _(
4852 4852 b'configuration requires specifying revision to merge '
4853 4853 b'with'
4854 4854 )
4855 4855 )
4856 4856 ctx = repo[destutil.destmerge(repo)]
4857 4857
4858 4858 if ctx.node() is None:
4859 4859 raise error.InputError(
4860 4860 _(b'merging with the working copy has no effect')
4861 4861 )
4862 4862
4863 4863 if opts.get(b'preview'):
4864 4864 # find nodes that are ancestors of p2 but not of p1
4865 4865 p1 = repo[b'.'].node()
4866 4866 p2 = ctx.node()
4867 4867 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4868 4868
4869 4869 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4870 4870 for node in nodes:
4871 4871 displayer.show(repo[node])
4872 4872 displayer.close()
4873 4873 return 0
4874 4874
4875 4875 # ui.forcemerge is an internal variable, do not document
4876 4876 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4877 4877 with ui.configoverride(overrides, b'merge'):
4878 4878 force = opts.get(b'force')
4879 4879 labels = [b'working copy', b'merge rev']
4880 4880 return hg.merge(ctx, force=force, labels=labels)
4881 4881
4882 4882
4883 4883 statemod.addunfinished(
4884 4884 b'merge',
4885 4885 fname=None,
4886 4886 clearable=True,
4887 4887 allowcommit=True,
4888 4888 cmdmsg=_(b'outstanding uncommitted merge'),
4889 4889 abortfunc=hg.abortmerge,
4890 4890 statushint=_(
4891 4891 b'To continue: hg commit\nTo abort: hg merge --abort'
4892 4892 ),
4893 4893 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4894 4894 )
4895 4895
4896 4896
4897 4897 @command(
4898 4898 b'outgoing|out',
4899 4899 [
4900 4900 (
4901 4901 b'f',
4902 4902 b'force',
4903 4903 None,
4904 4904 _(b'run even when the destination is unrelated'),
4905 4905 ),
4906 4906 (
4907 4907 b'r',
4908 4908 b'rev',
4909 4909 [],
4910 4910 _(b'a changeset intended to be included in the destination'),
4911 4911 _(b'REV'),
4912 4912 ),
4913 4913 (b'n', b'newest-first', None, _(b'show newest record first')),
4914 4914 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4915 4915 (
4916 4916 b'b',
4917 4917 b'branch',
4918 4918 [],
4919 4919 _(b'a specific branch you would like to push'),
4920 4920 _(b'BRANCH'),
4921 4921 ),
4922 4922 ]
4923 4923 + logopts
4924 4924 + remoteopts
4925 4925 + subrepoopts,
4926 4926 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4927 4927 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4928 4928 )
4929 4929 def outgoing(ui, repo, dest=None, **opts):
4930 4930 """show changesets not found in the destination
4931 4931
4932 4932 Show changesets not found in the specified destination repository
4933 4933 or the default push location. These are the changesets that would
4934 4934 be pushed if a push was requested.
4935 4935
4936 4936 See pull for details of valid destination formats.
4937 4937
4938 4938 .. container:: verbose
4939 4939
4940 4940 With -B/--bookmarks, the result of bookmark comparison between
4941 4941 local and remote repositories is displayed. With -v/--verbose,
4942 4942 status is also displayed for each bookmark like below::
4943 4943
4944 4944 BM1 01234567890a added
4945 4945 BM2 deleted
4946 4946 BM3 234567890abc advanced
4947 4947 BM4 34567890abcd diverged
4948 4948 BM5 4567890abcde changed
4949 4949
4950 4950 The action taken when pushing depends on the
4951 4951 status of each bookmark:
4952 4952
4953 4953 :``added``: push with ``-B`` will create it
4954 4954 :``deleted``: push with ``-B`` will delete it
4955 4955 :``advanced``: push will update it
4956 4956 :``diverged``: push with ``-B`` will update it
4957 4957 :``changed``: push with ``-B`` will update it
4958 4958
4959 4959 From the point of view of pushing behavior, bookmarks
4960 4960 existing only in the remote repository are treated as
4961 4961 ``deleted``, even if it is in fact added remotely.
4962 4962
4963 4963 Returns 0 if there are outgoing changes, 1 otherwise.
4964 4964 """
4965 4965 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4966 4966 # style URLs, so don't overwrite dest.
4967 4967 path = ui.getpath(dest, default=(b'default-push', b'default'))
4968 4968 if not path:
4969 4969 raise error.ConfigError(
4970 4970 _(b'default repository not configured!'),
4971 4971 hint=_(b"see 'hg help config.paths'"),
4972 4972 )
4973 4973
4974 4974 opts = pycompat.byteskwargs(opts)
4975 if opts.get(b'graph'):
4976 logcmdutil.checkunsupportedgraphflags([], opts)
4977 o, other = hg._outgoing(ui, repo, dest, opts)
4978 if not o:
4979 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4980 return
4981
4982 revdag = logcmdutil.graphrevs(repo, o, opts)
4983 ui.pager(b'outgoing')
4984 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4985 logcmdutil.displaygraph(
4986 ui, repo, revdag, displayer, graphmod.asciiedges
4987 )
4988 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4989 return 0
4990
4991 4975 if opts.get(b'bookmarks'):
4992 4976 dest = path.pushloc or path.loc
4993 4977 other = hg.peer(repo, opts, dest)
4994 4978 try:
4995 4979 if b'bookmarks' not in other.listkeys(b'namespaces'):
4996 4980 ui.warn(_(b"remote doesn't support bookmarks\n"))
4997 4981 return 0
4998 4982 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
4999 4983 ui.pager(b'outgoing')
5000 4984 return bookmarks.outgoing(ui, repo, other)
5001 4985 finally:
5002 4986 other.close()
5003 4987
5004 4988 repo._subtoppath = path.pushloc or path.loc
5005 4989 try:
5006 4990 return hg.outgoing(ui, repo, dest, opts)
5007 4991 finally:
5008 4992 del repo._subtoppath
5009 4993
5010 4994
5011 4995 @command(
5012 4996 b'parents',
5013 4997 [
5014 4998 (
5015 4999 b'r',
5016 5000 b'rev',
5017 5001 b'',
5018 5002 _(b'show parents of the specified revision'),
5019 5003 _(b'REV'),
5020 5004 ),
5021 5005 ]
5022 5006 + templateopts,
5023 5007 _(b'[-r REV] [FILE]'),
5024 5008 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5025 5009 inferrepo=True,
5026 5010 )
5027 5011 def parents(ui, repo, file_=None, **opts):
5028 5012 """show the parents of the working directory or revision (DEPRECATED)
5029 5013
5030 5014 Print the working directory's parent revisions. If a revision is
5031 5015 given via -r/--rev, the parent of that revision will be printed.
5032 5016 If a file argument is given, the revision in which the file was
5033 5017 last changed (before the working directory revision or the
5034 5018 argument to --rev if given) is printed.
5035 5019
5036 5020 This command is equivalent to::
5037 5021
5038 5022 hg log -r "p1()+p2()" or
5039 5023 hg log -r "p1(REV)+p2(REV)" or
5040 5024 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5041 5025 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5042 5026
5043 5027 See :hg:`summary` and :hg:`help revsets` for related information.
5044 5028
5045 5029 Returns 0 on success.
5046 5030 """
5047 5031
5048 5032 opts = pycompat.byteskwargs(opts)
5049 5033 rev = opts.get(b'rev')
5050 5034 if rev:
5051 5035 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5052 5036 ctx = scmutil.revsingle(repo, rev, None)
5053 5037
5054 5038 if file_:
5055 5039 m = scmutil.match(ctx, (file_,), opts)
5056 5040 if m.anypats() or len(m.files()) != 1:
5057 5041 raise error.InputError(_(b'can only specify an explicit filename'))
5058 5042 file_ = m.files()[0]
5059 5043 filenodes = []
5060 5044 for cp in ctx.parents():
5061 5045 if not cp:
5062 5046 continue
5063 5047 try:
5064 5048 filenodes.append(cp.filenode(file_))
5065 5049 except error.LookupError:
5066 5050 pass
5067 5051 if not filenodes:
5068 5052 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5069 5053 p = []
5070 5054 for fn in filenodes:
5071 5055 fctx = repo.filectx(file_, fileid=fn)
5072 5056 p.append(fctx.node())
5073 5057 else:
5074 5058 p = [cp.node() for cp in ctx.parents()]
5075 5059
5076 5060 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5077 5061 for n in p:
5078 5062 if n != nullid:
5079 5063 displayer.show(repo[n])
5080 5064 displayer.close()
5081 5065
5082 5066
5083 5067 @command(
5084 5068 b'paths',
5085 5069 formatteropts,
5086 5070 _(b'[NAME]'),
5087 5071 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5088 5072 optionalrepo=True,
5089 5073 intents={INTENT_READONLY},
5090 5074 )
5091 5075 def paths(ui, repo, search=None, **opts):
5092 5076 """show aliases for remote repositories
5093 5077
5094 5078 Show definition of symbolic path name NAME. If no name is given,
5095 5079 show definition of all available names.
5096 5080
5097 5081 Option -q/--quiet suppresses all output when searching for NAME
5098 5082 and shows only the path names when listing all definitions.
5099 5083
5100 5084 Path names are defined in the [paths] section of your
5101 5085 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5102 5086 repository, ``.hg/hgrc`` is used, too.
5103 5087
5104 5088 The path names ``default`` and ``default-push`` have a special
5105 5089 meaning. When performing a push or pull operation, they are used
5106 5090 as fallbacks if no location is specified on the command-line.
5107 5091 When ``default-push`` is set, it will be used for push and
5108 5092 ``default`` will be used for pull; otherwise ``default`` is used
5109 5093 as the fallback for both. When cloning a repository, the clone
5110 5094 source is written as ``default`` in ``.hg/hgrc``.
5111 5095
5112 5096 .. note::
5113 5097
5114 5098 ``default`` and ``default-push`` apply to all inbound (e.g.
5115 5099 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5116 5100 and :hg:`bundle`) operations.
5117 5101
5118 5102 See :hg:`help urls` for more information.
5119 5103
5120 5104 .. container:: verbose
5121 5105
5122 5106 Template:
5123 5107
5124 5108 The following keywords are supported. See also :hg:`help templates`.
5125 5109
5126 5110 :name: String. Symbolic name of the path alias.
5127 5111 :pushurl: String. URL for push operations.
5128 5112 :url: String. URL or directory path for the other operations.
5129 5113
5130 5114 Returns 0 on success.
5131 5115 """
5132 5116
5133 5117 opts = pycompat.byteskwargs(opts)
5134 5118 ui.pager(b'paths')
5135 5119 if search:
5136 5120 pathitems = [
5137 5121 (name, path)
5138 5122 for name, path in pycompat.iteritems(ui.paths)
5139 5123 if name == search
5140 5124 ]
5141 5125 else:
5142 5126 pathitems = sorted(pycompat.iteritems(ui.paths))
5143 5127
5144 5128 fm = ui.formatter(b'paths', opts)
5145 5129 if fm.isplain():
5146 5130 hidepassword = urlutil.hidepassword
5147 5131 else:
5148 5132 hidepassword = bytes
5149 5133 if ui.quiet:
5150 5134 namefmt = b'%s\n'
5151 5135 else:
5152 5136 namefmt = b'%s = '
5153 5137 showsubopts = not search and not ui.quiet
5154 5138
5155 5139 for name, path in pathitems:
5156 5140 fm.startitem()
5157 5141 fm.condwrite(not search, b'name', namefmt, name)
5158 5142 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5159 5143 for subopt, value in sorted(path.suboptions.items()):
5160 5144 assert subopt not in (b'name', b'url')
5161 5145 if showsubopts:
5162 5146 fm.plain(b'%s:%s = ' % (name, subopt))
5163 5147 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5164 5148
5165 5149 fm.end()
5166 5150
5167 5151 if search and not pathitems:
5168 5152 if not ui.quiet:
5169 5153 ui.warn(_(b"not found!\n"))
5170 5154 return 1
5171 5155 else:
5172 5156 return 0
5173 5157
5174 5158
5175 5159 @command(
5176 5160 b'phase',
5177 5161 [
5178 5162 (b'p', b'public', False, _(b'set changeset phase to public')),
5179 5163 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5180 5164 (b's', b'secret', False, _(b'set changeset phase to secret')),
5181 5165 (b'f', b'force', False, _(b'allow to move boundary backward')),
5182 5166 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5183 5167 ],
5184 5168 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5185 5169 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5186 5170 )
5187 5171 def phase(ui, repo, *revs, **opts):
5188 5172 """set or show the current phase name
5189 5173
5190 5174 With no argument, show the phase name of the current revision(s).
5191 5175
5192 5176 With one of -p/--public, -d/--draft or -s/--secret, change the
5193 5177 phase value of the specified revisions.
5194 5178
5195 5179 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5196 5180 lower phase to a higher phase. Phases are ordered as follows::
5197 5181
5198 5182 public < draft < secret
5199 5183
5200 5184 Returns 0 on success, 1 if some phases could not be changed.
5201 5185
5202 5186 (For more information about the phases concept, see :hg:`help phases`.)
5203 5187 """
5204 5188 opts = pycompat.byteskwargs(opts)
5205 5189 # search for a unique phase argument
5206 5190 targetphase = None
5207 5191 for idx, name in enumerate(phases.cmdphasenames):
5208 5192 if opts[name]:
5209 5193 if targetphase is not None:
5210 5194 raise error.InputError(_(b'only one phase can be specified'))
5211 5195 targetphase = idx
5212 5196
5213 5197 # look for specified revision
5214 5198 revs = list(revs)
5215 5199 revs.extend(opts[b'rev'])
5216 5200 if not revs:
5217 5201 # display both parents as the second parent phase can influence
5218 5202 # the phase of a merge commit
5219 5203 revs = [c.rev() for c in repo[None].parents()]
5220 5204
5221 5205 revs = scmutil.revrange(repo, revs)
5222 5206
5223 5207 ret = 0
5224 5208 if targetphase is None:
5225 5209 # display
5226 5210 for r in revs:
5227 5211 ctx = repo[r]
5228 5212 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5229 5213 else:
5230 5214 with repo.lock(), repo.transaction(b"phase") as tr:
5231 5215 # set phase
5232 5216 if not revs:
5233 5217 raise error.InputError(_(b'empty revision set'))
5234 5218 nodes = [repo[r].node() for r in revs]
5235 5219 # moving revision from public to draft may hide them
5236 5220 # We have to check result on an unfiltered repository
5237 5221 unfi = repo.unfiltered()
5238 5222 getphase = unfi._phasecache.phase
5239 5223 olddata = [getphase(unfi, r) for r in unfi]
5240 5224 phases.advanceboundary(repo, tr, targetphase, nodes)
5241 5225 if opts[b'force']:
5242 5226 phases.retractboundary(repo, tr, targetphase, nodes)
5243 5227 getphase = unfi._phasecache.phase
5244 5228 newdata = [getphase(unfi, r) for r in unfi]
5245 5229 changes = sum(newdata[r] != olddata[r] for r in unfi)
5246 5230 cl = unfi.changelog
5247 5231 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5248 5232 if rejected:
5249 5233 ui.warn(
5250 5234 _(
5251 5235 b'cannot move %i changesets to a higher '
5252 5236 b'phase, use --force\n'
5253 5237 )
5254 5238 % len(rejected)
5255 5239 )
5256 5240 ret = 1
5257 5241 if changes:
5258 5242 msg = _(b'phase changed for %i changesets\n') % changes
5259 5243 if ret:
5260 5244 ui.status(msg)
5261 5245 else:
5262 5246 ui.note(msg)
5263 5247 else:
5264 5248 ui.warn(_(b'no phases changed\n'))
5265 5249 return ret
5266 5250
5267 5251
5268 5252 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5269 5253 """Run after a changegroup has been added via pull/unbundle
5270 5254
5271 5255 This takes arguments below:
5272 5256
5273 5257 :modheads: change of heads by pull/unbundle
5274 5258 :optupdate: updating working directory is needed or not
5275 5259 :checkout: update destination revision (or None to default destination)
5276 5260 :brev: a name, which might be a bookmark to be activated after updating
5277 5261
5278 5262 return True if update raise any conflict, False otherwise.
5279 5263 """
5280 5264 if modheads == 0:
5281 5265 return False
5282 5266 if optupdate:
5283 5267 try:
5284 5268 return hg.updatetotally(ui, repo, checkout, brev)
5285 5269 except error.UpdateAbort as inst:
5286 5270 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5287 5271 hint = inst.hint
5288 5272 raise error.UpdateAbort(msg, hint=hint)
5289 5273 if modheads is not None and modheads > 1:
5290 5274 currentbranchheads = len(repo.branchheads())
5291 5275 if currentbranchheads == modheads:
5292 5276 ui.status(
5293 5277 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5294 5278 )
5295 5279 elif currentbranchheads > 1:
5296 5280 ui.status(
5297 5281 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5298 5282 )
5299 5283 else:
5300 5284 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5301 5285 elif not ui.configbool(b'commands', b'update.requiredest'):
5302 5286 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5303 5287 return False
5304 5288
5305 5289
5306 5290 @command(
5307 5291 b'pull',
5308 5292 [
5309 5293 (
5310 5294 b'u',
5311 5295 b'update',
5312 5296 None,
5313 5297 _(b'update to new branch head if new descendants were pulled'),
5314 5298 ),
5315 5299 (
5316 5300 b'f',
5317 5301 b'force',
5318 5302 None,
5319 5303 _(b'run even when remote repository is unrelated'),
5320 5304 ),
5321 5305 (
5322 5306 b'',
5323 5307 b'confirm',
5324 5308 None,
5325 5309 _(b'confirm pull before applying changes'),
5326 5310 ),
5327 5311 (
5328 5312 b'r',
5329 5313 b'rev',
5330 5314 [],
5331 5315 _(b'a remote changeset intended to be added'),
5332 5316 _(b'REV'),
5333 5317 ),
5334 5318 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5335 5319 (
5336 5320 b'b',
5337 5321 b'branch',
5338 5322 [],
5339 5323 _(b'a specific branch you would like to pull'),
5340 5324 _(b'BRANCH'),
5341 5325 ),
5342 5326 ]
5343 5327 + remoteopts,
5344 5328 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5345 5329 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5346 5330 helpbasic=True,
5347 5331 )
5348 5332 def pull(ui, repo, *sources, **opts):
5349 5333 """pull changes from the specified source
5350 5334
5351 5335 Pull changes from a remote repository to a local one.
5352 5336
5353 5337 This finds all changes from the repository at the specified path
5354 5338 or URL and adds them to a local repository (the current one unless
5355 5339 -R is specified). By default, this does not update the copy of the
5356 5340 project in the working directory.
5357 5341
5358 5342 When cloning from servers that support it, Mercurial may fetch
5359 5343 pre-generated data. When this is done, hooks operating on incoming
5360 5344 changesets and changegroups may fire more than once, once for each
5361 5345 pre-generated bundle and as well as for any additional remaining
5362 5346 data. See :hg:`help -e clonebundles` for more.
5363 5347
5364 5348 Use :hg:`incoming` if you want to see what would have been added
5365 5349 by a pull at the time you issued this command. If you then decide
5366 5350 to add those changes to the repository, you should use :hg:`pull
5367 5351 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5368 5352
5369 5353 If SOURCE is omitted, the 'default' path will be used.
5370 5354 See :hg:`help urls` for more information.
5371 5355
5372 5356 If multiple sources are specified, they will be pulled sequentially as if
5373 5357 the command was run multiple time. If --update is specify and the command
5374 5358 will stop at the first failed --update.
5375 5359
5376 5360 Specifying bookmark as ``.`` is equivalent to specifying the active
5377 5361 bookmark's name.
5378 5362
5379 5363 Returns 0 on success, 1 if an update had unresolved files.
5380 5364 """
5381 5365
5382 5366 opts = pycompat.byteskwargs(opts)
5383 5367 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5384 5368 b'update'
5385 5369 ):
5386 5370 msg = _(b'update destination required by configuration')
5387 5371 hint = _(b'use hg pull followed by hg update DEST')
5388 5372 raise error.InputError(msg, hint=hint)
5389 5373
5390 5374 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5391 5375 for source, branches in sources:
5392 5376 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5393 5377 ui.flush()
5394 5378 other = hg.peer(repo, opts, source)
5395 5379 update_conflict = None
5396 5380 try:
5397 5381 revs, checkout = hg.addbranchrevs(
5398 5382 repo, other, branches, opts.get(b'rev')
5399 5383 )
5400 5384
5401 5385 pullopargs = {}
5402 5386
5403 5387 nodes = None
5404 5388 if opts.get(b'bookmark') or revs:
5405 5389 # The list of bookmark used here is the same used to actually update
5406 5390 # the bookmark names, to avoid the race from issue 4689 and we do
5407 5391 # all lookup and bookmark queries in one go so they see the same
5408 5392 # version of the server state (issue 4700).
5409 5393 nodes = []
5410 5394 fnodes = []
5411 5395 revs = revs or []
5412 5396 if revs and not other.capable(b'lookup'):
5413 5397 err = _(
5414 5398 b"other repository doesn't support revision lookup, "
5415 5399 b"so a rev cannot be specified."
5416 5400 )
5417 5401 raise error.Abort(err)
5418 5402 with other.commandexecutor() as e:
5419 5403 fremotebookmarks = e.callcommand(
5420 5404 b'listkeys', {b'namespace': b'bookmarks'}
5421 5405 )
5422 5406 for r in revs:
5423 5407 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5424 5408 remotebookmarks = fremotebookmarks.result()
5425 5409 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5426 5410 pullopargs[b'remotebookmarks'] = remotebookmarks
5427 5411 for b in opts.get(b'bookmark', []):
5428 5412 b = repo._bookmarks.expandname(b)
5429 5413 if b not in remotebookmarks:
5430 5414 raise error.InputError(
5431 5415 _(b'remote bookmark %s not found!') % b
5432 5416 )
5433 5417 nodes.append(remotebookmarks[b])
5434 5418 for i, rev in enumerate(revs):
5435 5419 node = fnodes[i].result()
5436 5420 nodes.append(node)
5437 5421 if rev == checkout:
5438 5422 checkout = node
5439 5423
5440 5424 wlock = util.nullcontextmanager()
5441 5425 if opts.get(b'update'):
5442 5426 wlock = repo.wlock()
5443 5427 with wlock:
5444 5428 pullopargs.update(opts.get(b'opargs', {}))
5445 5429 modheads = exchange.pull(
5446 5430 repo,
5447 5431 other,
5448 5432 heads=nodes,
5449 5433 force=opts.get(b'force'),
5450 5434 bookmarks=opts.get(b'bookmark', ()),
5451 5435 opargs=pullopargs,
5452 5436 confirm=opts.get(b'confirm'),
5453 5437 ).cgresult
5454 5438
5455 5439 # brev is a name, which might be a bookmark to be activated at
5456 5440 # the end of the update. In other words, it is an explicit
5457 5441 # destination of the update
5458 5442 brev = None
5459 5443
5460 5444 if checkout:
5461 5445 checkout = repo.unfiltered().changelog.rev(checkout)
5462 5446
5463 5447 # order below depends on implementation of
5464 5448 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5465 5449 # because 'checkout' is determined without it.
5466 5450 if opts.get(b'rev'):
5467 5451 brev = opts[b'rev'][0]
5468 5452 elif opts.get(b'branch'):
5469 5453 brev = opts[b'branch'][0]
5470 5454 else:
5471 5455 brev = branches[0]
5472 5456 repo._subtoppath = source
5473 5457 try:
5474 5458 update_conflict = postincoming(
5475 5459 ui, repo, modheads, opts.get(b'update'), checkout, brev
5476 5460 )
5477 5461 except error.FilteredRepoLookupError as exc:
5478 5462 msg = _(b'cannot update to target: %s') % exc.args[0]
5479 5463 exc.args = (msg,) + exc.args[1:]
5480 5464 raise
5481 5465 finally:
5482 5466 del repo._subtoppath
5483 5467
5484 5468 finally:
5485 5469 other.close()
5486 5470 # skip the remaining pull source if they are some conflict.
5487 5471 if update_conflict:
5488 5472 break
5489 5473 if update_conflict:
5490 5474 return 1
5491 5475 else:
5492 5476 return 0
5493 5477
5494 5478
5495 5479 @command(
5496 5480 b'purge|clean',
5497 5481 [
5498 5482 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5499 5483 (b'', b'all', None, _(b'purge ignored files too')),
5500 5484 (b'i', b'ignored', None, _(b'purge only ignored files')),
5501 5485 (b'', b'dirs', None, _(b'purge empty directories')),
5502 5486 (b'', b'files', None, _(b'purge files')),
5503 5487 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5504 5488 (
5505 5489 b'0',
5506 5490 b'print0',
5507 5491 None,
5508 5492 _(
5509 5493 b'end filenames with NUL, for use with xargs'
5510 5494 b' (implies -p/--print)'
5511 5495 ),
5512 5496 ),
5513 5497 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5514 5498 ]
5515 5499 + cmdutil.walkopts,
5516 5500 _(b'hg purge [OPTION]... [DIR]...'),
5517 5501 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5518 5502 )
5519 5503 def purge(ui, repo, *dirs, **opts):
5520 5504 """removes files not tracked by Mercurial
5521 5505
5522 5506 Delete files not known to Mercurial. This is useful to test local
5523 5507 and uncommitted changes in an otherwise-clean source tree.
5524 5508
5525 5509 This means that purge will delete the following by default:
5526 5510
5527 5511 - Unknown files: files marked with "?" by :hg:`status`
5528 5512 - Empty directories: in fact Mercurial ignores directories unless
5529 5513 they contain files under source control management
5530 5514
5531 5515 But it will leave untouched:
5532 5516
5533 5517 - Modified and unmodified tracked files
5534 5518 - Ignored files (unless -i or --all is specified)
5535 5519 - New files added to the repository (with :hg:`add`)
5536 5520
5537 5521 The --files and --dirs options can be used to direct purge to delete
5538 5522 only files, only directories, or both. If neither option is given,
5539 5523 both will be deleted.
5540 5524
5541 5525 If directories are given on the command line, only files in these
5542 5526 directories are considered.
5543 5527
5544 5528 Be careful with purge, as you could irreversibly delete some files
5545 5529 you forgot to add to the repository. If you only want to print the
5546 5530 list of files that this program would delete, use the --print
5547 5531 option.
5548 5532 """
5549 5533 opts = pycompat.byteskwargs(opts)
5550 5534 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5551 5535
5552 5536 act = not opts.get(b'print')
5553 5537 eol = b'\n'
5554 5538 if opts.get(b'print0'):
5555 5539 eol = b'\0'
5556 5540 act = False # --print0 implies --print
5557 5541 if opts.get(b'all', False):
5558 5542 ignored = True
5559 5543 unknown = True
5560 5544 else:
5561 5545 ignored = opts.get(b'ignored', False)
5562 5546 unknown = not ignored
5563 5547
5564 5548 removefiles = opts.get(b'files')
5565 5549 removedirs = opts.get(b'dirs')
5566 5550 confirm = opts.get(b'confirm')
5567 5551 if confirm is None:
5568 5552 try:
5569 5553 extensions.find(b'purge')
5570 5554 confirm = False
5571 5555 except KeyError:
5572 5556 confirm = True
5573 5557
5574 5558 if not removefiles and not removedirs:
5575 5559 removefiles = True
5576 5560 removedirs = True
5577 5561
5578 5562 match = scmutil.match(repo[None], dirs, opts)
5579 5563
5580 5564 paths = mergemod.purge(
5581 5565 repo,
5582 5566 match,
5583 5567 unknown=unknown,
5584 5568 ignored=ignored,
5585 5569 removeemptydirs=removedirs,
5586 5570 removefiles=removefiles,
5587 5571 abortonerror=opts.get(b'abort_on_err'),
5588 5572 noop=not act,
5589 5573 confirm=confirm,
5590 5574 )
5591 5575
5592 5576 for path in paths:
5593 5577 if not act:
5594 5578 ui.write(b'%s%s' % (path, eol))
5595 5579
5596 5580
5597 5581 @command(
5598 5582 b'push',
5599 5583 [
5600 5584 (b'f', b'force', None, _(b'force push')),
5601 5585 (
5602 5586 b'r',
5603 5587 b'rev',
5604 5588 [],
5605 5589 _(b'a changeset intended to be included in the destination'),
5606 5590 _(b'REV'),
5607 5591 ),
5608 5592 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5609 5593 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5610 5594 (
5611 5595 b'b',
5612 5596 b'branch',
5613 5597 [],
5614 5598 _(b'a specific branch you would like to push'),
5615 5599 _(b'BRANCH'),
5616 5600 ),
5617 5601 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5618 5602 (
5619 5603 b'',
5620 5604 b'pushvars',
5621 5605 [],
5622 5606 _(b'variables that can be sent to server (ADVANCED)'),
5623 5607 ),
5624 5608 (
5625 5609 b'',
5626 5610 b'publish',
5627 5611 False,
5628 5612 _(b'push the changeset as public (EXPERIMENTAL)'),
5629 5613 ),
5630 5614 ]
5631 5615 + remoteopts,
5632 5616 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5633 5617 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5634 5618 helpbasic=True,
5635 5619 )
5636 5620 def push(ui, repo, *dests, **opts):
5637 5621 """push changes to the specified destination
5638 5622
5639 5623 Push changesets from the local repository to the specified
5640 5624 destination.
5641 5625
5642 5626 This operation is symmetrical to pull: it is identical to a pull
5643 5627 in the destination repository from the current one.
5644 5628
5645 5629 By default, push will not allow creation of new heads at the
5646 5630 destination, since multiple heads would make it unclear which head
5647 5631 to use. In this situation, it is recommended to pull and merge
5648 5632 before pushing.
5649 5633
5650 5634 Use --new-branch if you want to allow push to create a new named
5651 5635 branch that is not present at the destination. This allows you to
5652 5636 only create a new branch without forcing other changes.
5653 5637
5654 5638 .. note::
5655 5639
5656 5640 Extra care should be taken with the -f/--force option,
5657 5641 which will push all new heads on all branches, an action which will
5658 5642 almost always cause confusion for collaborators.
5659 5643
5660 5644 If -r/--rev is used, the specified revision and all its ancestors
5661 5645 will be pushed to the remote repository.
5662 5646
5663 5647 If -B/--bookmark is used, the specified bookmarked revision, its
5664 5648 ancestors, and the bookmark will be pushed to the remote
5665 5649 repository. Specifying ``.`` is equivalent to specifying the active
5666 5650 bookmark's name. Use the --all-bookmarks option for pushing all
5667 5651 current bookmarks.
5668 5652
5669 5653 Please see :hg:`help urls` for important details about ``ssh://``
5670 5654 URLs. If DESTINATION is omitted, a default path will be used.
5671 5655
5672 5656 When passed multiple destinations, push will process them one after the
5673 5657 other, but stop should an error occur.
5674 5658
5675 5659 .. container:: verbose
5676 5660
5677 5661 The --pushvars option sends strings to the server that become
5678 5662 environment variables prepended with ``HG_USERVAR_``. For example,
5679 5663 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5680 5664 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5681 5665
5682 5666 pushvars can provide for user-overridable hooks as well as set debug
5683 5667 levels. One example is having a hook that blocks commits containing
5684 5668 conflict markers, but enables the user to override the hook if the file
5685 5669 is using conflict markers for testing purposes or the file format has
5686 5670 strings that look like conflict markers.
5687 5671
5688 5672 By default, servers will ignore `--pushvars`. To enable it add the
5689 5673 following to your configuration file::
5690 5674
5691 5675 [push]
5692 5676 pushvars.server = true
5693 5677
5694 5678 Returns 0 if push was successful, 1 if nothing to push.
5695 5679 """
5696 5680
5697 5681 opts = pycompat.byteskwargs(opts)
5698 5682
5699 5683 if opts.get(b'all_bookmarks'):
5700 5684 cmdutil.check_incompatible_arguments(
5701 5685 opts,
5702 5686 b'all_bookmarks',
5703 5687 [b'bookmark', b'rev'],
5704 5688 )
5705 5689 opts[b'bookmark'] = list(repo._bookmarks)
5706 5690
5707 5691 if opts.get(b'bookmark'):
5708 5692 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5709 5693 for b in opts[b'bookmark']:
5710 5694 # translate -B options to -r so changesets get pushed
5711 5695 b = repo._bookmarks.expandname(b)
5712 5696 if b in repo._bookmarks:
5713 5697 opts.setdefault(b'rev', []).append(b)
5714 5698 else:
5715 5699 # if we try to push a deleted bookmark, translate it to null
5716 5700 # this lets simultaneous -r, -b options continue working
5717 5701 opts.setdefault(b'rev', []).append(b"null")
5718 5702
5719 5703 some_pushed = False
5720 5704 result = 0
5721 5705 for path in urlutil.get_push_paths(repo, ui, dests):
5722 5706 if not path:
5723 5707 raise error.ConfigError(
5724 5708 _(b'default repository not configured!'),
5725 5709 hint=_(b"see 'hg help config.paths'"),
5726 5710 )
5727 5711 dest = path.pushloc or path.loc
5728 5712 branches = (path.branch, opts.get(b'branch') or [])
5729 5713 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5730 5714 revs, checkout = hg.addbranchrevs(
5731 5715 repo, repo, branches, opts.get(b'rev')
5732 5716 )
5733 5717 other = hg.peer(repo, opts, dest)
5734 5718
5735 5719 try:
5736 5720 if revs:
5737 5721 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5738 5722 if not revs:
5739 5723 raise error.InputError(
5740 5724 _(b"specified revisions evaluate to an empty set"),
5741 5725 hint=_(b"use different revision arguments"),
5742 5726 )
5743 5727 elif path.pushrev:
5744 5728 # It doesn't make any sense to specify ancestor revisions. So limit
5745 5729 # to DAG heads to make discovery simpler.
5746 5730 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5747 5731 revs = scmutil.revrange(repo, [expr])
5748 5732 revs = [repo[rev].node() for rev in revs]
5749 5733 if not revs:
5750 5734 raise error.InputError(
5751 5735 _(
5752 5736 b'default push revset for path evaluates to an empty set'
5753 5737 )
5754 5738 )
5755 5739 elif ui.configbool(b'commands', b'push.require-revs'):
5756 5740 raise error.InputError(
5757 5741 _(b'no revisions specified to push'),
5758 5742 hint=_(b'did you mean "hg push -r ."?'),
5759 5743 )
5760 5744
5761 5745 repo._subtoppath = dest
5762 5746 try:
5763 5747 # push subrepos depth-first for coherent ordering
5764 5748 c = repo[b'.']
5765 5749 subs = c.substate # only repos that are committed
5766 5750 for s in sorted(subs):
5767 5751 sub_result = c.sub(s).push(opts)
5768 5752 if sub_result == 0:
5769 5753 return 1
5770 5754 finally:
5771 5755 del repo._subtoppath
5772 5756
5773 5757 opargs = dict(
5774 5758 opts.get(b'opargs', {})
5775 5759 ) # copy opargs since we may mutate it
5776 5760 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5777 5761
5778 5762 pushop = exchange.push(
5779 5763 repo,
5780 5764 other,
5781 5765 opts.get(b'force'),
5782 5766 revs=revs,
5783 5767 newbranch=opts.get(b'new_branch'),
5784 5768 bookmarks=opts.get(b'bookmark', ()),
5785 5769 publish=opts.get(b'publish'),
5786 5770 opargs=opargs,
5787 5771 )
5788 5772
5789 5773 if pushop.cgresult == 0:
5790 5774 result = 1
5791 5775 elif pushop.cgresult is not None:
5792 5776 some_pushed = True
5793 5777
5794 5778 if pushop.bkresult is not None:
5795 5779 if pushop.bkresult == 2:
5796 5780 result = 2
5797 5781 elif not result and pushop.bkresult:
5798 5782 result = 2
5799 5783
5800 5784 if result:
5801 5785 break
5802 5786
5803 5787 finally:
5804 5788 other.close()
5805 5789 if result == 0 and not some_pushed:
5806 5790 result = 1
5807 5791 return result
5808 5792
5809 5793
5810 5794 @command(
5811 5795 b'recover',
5812 5796 [
5813 5797 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5814 5798 ],
5815 5799 helpcategory=command.CATEGORY_MAINTENANCE,
5816 5800 )
5817 5801 def recover(ui, repo, **opts):
5818 5802 """roll back an interrupted transaction
5819 5803
5820 5804 Recover from an interrupted commit or pull.
5821 5805
5822 5806 This command tries to fix the repository status after an
5823 5807 interrupted operation. It should only be necessary when Mercurial
5824 5808 suggests it.
5825 5809
5826 5810 Returns 0 if successful, 1 if nothing to recover or verify fails.
5827 5811 """
5828 5812 ret = repo.recover()
5829 5813 if ret:
5830 5814 if opts['verify']:
5831 5815 return hg.verify(repo)
5832 5816 else:
5833 5817 msg = _(
5834 5818 b"(verify step skipped, run `hg verify` to check your "
5835 5819 b"repository content)\n"
5836 5820 )
5837 5821 ui.warn(msg)
5838 5822 return 0
5839 5823 return 1
5840 5824
5841 5825
5842 5826 @command(
5843 5827 b'remove|rm',
5844 5828 [
5845 5829 (b'A', b'after', None, _(b'record delete for missing files')),
5846 5830 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5847 5831 ]
5848 5832 + subrepoopts
5849 5833 + walkopts
5850 5834 + dryrunopts,
5851 5835 _(b'[OPTION]... FILE...'),
5852 5836 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5853 5837 helpbasic=True,
5854 5838 inferrepo=True,
5855 5839 )
5856 5840 def remove(ui, repo, *pats, **opts):
5857 5841 """remove the specified files on the next commit
5858 5842
5859 5843 Schedule the indicated files for removal from the current branch.
5860 5844
5861 5845 This command schedules the files to be removed at the next commit.
5862 5846 To undo a remove before that, see :hg:`revert`. To undo added
5863 5847 files, see :hg:`forget`.
5864 5848
5865 5849 .. container:: verbose
5866 5850
5867 5851 -A/--after can be used to remove only files that have already
5868 5852 been deleted, -f/--force can be used to force deletion, and -Af
5869 5853 can be used to remove files from the next revision without
5870 5854 deleting them from the working directory.
5871 5855
5872 5856 The following table details the behavior of remove for different
5873 5857 file states (columns) and option combinations (rows). The file
5874 5858 states are Added [A], Clean [C], Modified [M] and Missing [!]
5875 5859 (as reported by :hg:`status`). The actions are Warn, Remove
5876 5860 (from branch) and Delete (from disk):
5877 5861
5878 5862 ========= == == == ==
5879 5863 opt/state A C M !
5880 5864 ========= == == == ==
5881 5865 none W RD W R
5882 5866 -f R RD RD R
5883 5867 -A W W W R
5884 5868 -Af R R R R
5885 5869 ========= == == == ==
5886 5870
5887 5871 .. note::
5888 5872
5889 5873 :hg:`remove` never deletes files in Added [A] state from the
5890 5874 working directory, not even if ``--force`` is specified.
5891 5875
5892 5876 Returns 0 on success, 1 if any warnings encountered.
5893 5877 """
5894 5878
5895 5879 opts = pycompat.byteskwargs(opts)
5896 5880 after, force = opts.get(b'after'), opts.get(b'force')
5897 5881 dryrun = opts.get(b'dry_run')
5898 5882 if not pats and not after:
5899 5883 raise error.InputError(_(b'no files specified'))
5900 5884
5901 5885 m = scmutil.match(repo[None], pats, opts)
5902 5886 subrepos = opts.get(b'subrepos')
5903 5887 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5904 5888 return cmdutil.remove(
5905 5889 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5906 5890 )
5907 5891
5908 5892
5909 5893 @command(
5910 5894 b'rename|move|mv',
5911 5895 [
5912 5896 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5913 5897 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5914 5898 (
5915 5899 b'',
5916 5900 b'at-rev',
5917 5901 b'',
5918 5902 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5919 5903 _(b'REV'),
5920 5904 ),
5921 5905 (
5922 5906 b'f',
5923 5907 b'force',
5924 5908 None,
5925 5909 _(b'forcibly move over an existing managed file'),
5926 5910 ),
5927 5911 ]
5928 5912 + walkopts
5929 5913 + dryrunopts,
5930 5914 _(b'[OPTION]... SOURCE... DEST'),
5931 5915 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5932 5916 )
5933 5917 def rename(ui, repo, *pats, **opts):
5934 5918 """rename files; equivalent of copy + remove
5935 5919
5936 5920 Mark dest as copies of sources; mark sources for deletion. If dest
5937 5921 is a directory, copies are put in that directory. If dest is a
5938 5922 file, there can only be one source.
5939 5923
5940 5924 By default, this command copies the contents of files as they
5941 5925 exist in the working directory. If invoked with -A/--after, the
5942 5926 operation is recorded, but no copying is performed.
5943 5927
5944 5928 To undo marking a destination file as renamed, use --forget. With that
5945 5929 option, all given (positional) arguments are unmarked as renames. The
5946 5930 destination file(s) will be left in place (still tracked). The source
5947 5931 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5948 5932 the same way as :hg:`copy --forget`.
5949 5933
5950 5934 This command takes effect with the next commit by default.
5951 5935
5952 5936 Returns 0 on success, 1 if errors are encountered.
5953 5937 """
5954 5938 opts = pycompat.byteskwargs(opts)
5955 5939 with repo.wlock():
5956 5940 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5957 5941
5958 5942
5959 5943 @command(
5960 5944 b'resolve',
5961 5945 [
5962 5946 (b'a', b'all', None, _(b'select all unresolved files')),
5963 5947 (b'l', b'list', None, _(b'list state of files needing merge')),
5964 5948 (b'm', b'mark', None, _(b'mark files as resolved')),
5965 5949 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5966 5950 (b'n', b'no-status', None, _(b'hide status prefix')),
5967 5951 (b'', b're-merge', None, _(b're-merge files')),
5968 5952 ]
5969 5953 + mergetoolopts
5970 5954 + walkopts
5971 5955 + formatteropts,
5972 5956 _(b'[OPTION]... [FILE]...'),
5973 5957 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5974 5958 inferrepo=True,
5975 5959 )
5976 5960 def resolve(ui, repo, *pats, **opts):
5977 5961 """redo merges or set/view the merge status of files
5978 5962
5979 5963 Merges with unresolved conflicts are often the result of
5980 5964 non-interactive merging using the ``internal:merge`` configuration
5981 5965 setting, or a command-line merge tool like ``diff3``. The resolve
5982 5966 command is used to manage the files involved in a merge, after
5983 5967 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5984 5968 working directory must have two parents). See :hg:`help
5985 5969 merge-tools` for information on configuring merge tools.
5986 5970
5987 5971 The resolve command can be used in the following ways:
5988 5972
5989 5973 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5990 5974 the specified files, discarding any previous merge attempts. Re-merging
5991 5975 is not performed for files already marked as resolved. Use ``--all/-a``
5992 5976 to select all unresolved files. ``--tool`` can be used to specify
5993 5977 the merge tool used for the given files. It overrides the HGMERGE
5994 5978 environment variable and your configuration files. Previous file
5995 5979 contents are saved with a ``.orig`` suffix.
5996 5980
5997 5981 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5998 5982 (e.g. after having manually fixed-up the files). The default is
5999 5983 to mark all unresolved files.
6000 5984
6001 5985 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6002 5986 default is to mark all resolved files.
6003 5987
6004 5988 - :hg:`resolve -l`: list files which had or still have conflicts.
6005 5989 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6006 5990 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6007 5991 the list. See :hg:`help filesets` for details.
6008 5992
6009 5993 .. note::
6010 5994
6011 5995 Mercurial will not let you commit files with unresolved merge
6012 5996 conflicts. You must use :hg:`resolve -m ...` before you can
6013 5997 commit after a conflicting merge.
6014 5998
6015 5999 .. container:: verbose
6016 6000
6017 6001 Template:
6018 6002
6019 6003 The following keywords are supported in addition to the common template
6020 6004 keywords and functions. See also :hg:`help templates`.
6021 6005
6022 6006 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6023 6007 :path: String. Repository-absolute path of the file.
6024 6008
6025 6009 Returns 0 on success, 1 if any files fail a resolve attempt.
6026 6010 """
6027 6011
6028 6012 opts = pycompat.byteskwargs(opts)
6029 6013 confirm = ui.configbool(b'commands', b'resolve.confirm')
6030 6014 flaglist = b'all mark unmark list no_status re_merge'.split()
6031 6015 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6032 6016
6033 6017 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6034 6018 if actioncount > 1:
6035 6019 raise error.InputError(_(b"too many actions specified"))
6036 6020 elif actioncount == 0 and ui.configbool(
6037 6021 b'commands', b'resolve.explicit-re-merge'
6038 6022 ):
6039 6023 hint = _(b'use --mark, --unmark, --list or --re-merge')
6040 6024 raise error.InputError(_(b'no action specified'), hint=hint)
6041 6025 if pats and all:
6042 6026 raise error.InputError(_(b"can't specify --all and patterns"))
6043 6027 if not (all or pats or show or mark or unmark):
6044 6028 raise error.InputError(
6045 6029 _(b'no files or directories specified'),
6046 6030 hint=b'use --all to re-merge all unresolved files',
6047 6031 )
6048 6032
6049 6033 if confirm:
6050 6034 if all:
6051 6035 if ui.promptchoice(
6052 6036 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6053 6037 ):
6054 6038 raise error.CanceledError(_(b'user quit'))
6055 6039 if mark and not pats:
6056 6040 if ui.promptchoice(
6057 6041 _(
6058 6042 b'mark all unresolved files as resolved (yn)?'
6059 6043 b'$$ &Yes $$ &No'
6060 6044 )
6061 6045 ):
6062 6046 raise error.CanceledError(_(b'user quit'))
6063 6047 if unmark and not pats:
6064 6048 if ui.promptchoice(
6065 6049 _(
6066 6050 b'mark all resolved files as unresolved (yn)?'
6067 6051 b'$$ &Yes $$ &No'
6068 6052 )
6069 6053 ):
6070 6054 raise error.CanceledError(_(b'user quit'))
6071 6055
6072 6056 uipathfn = scmutil.getuipathfn(repo)
6073 6057
6074 6058 if show:
6075 6059 ui.pager(b'resolve')
6076 6060 fm = ui.formatter(b'resolve', opts)
6077 6061 ms = mergestatemod.mergestate.read(repo)
6078 6062 wctx = repo[None]
6079 6063 m = scmutil.match(wctx, pats, opts)
6080 6064
6081 6065 # Labels and keys based on merge state. Unresolved path conflicts show
6082 6066 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6083 6067 # resolved conflicts.
6084 6068 mergestateinfo = {
6085 6069 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6086 6070 b'resolve.unresolved',
6087 6071 b'U',
6088 6072 ),
6089 6073 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6090 6074 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6091 6075 b'resolve.unresolved',
6092 6076 b'P',
6093 6077 ),
6094 6078 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6095 6079 b'resolve.resolved',
6096 6080 b'R',
6097 6081 ),
6098 6082 }
6099 6083
6100 6084 for f in ms:
6101 6085 if not m(f):
6102 6086 continue
6103 6087
6104 6088 label, key = mergestateinfo[ms[f]]
6105 6089 fm.startitem()
6106 6090 fm.context(ctx=wctx)
6107 6091 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6108 6092 fm.data(path=f)
6109 6093 fm.plain(b'%s\n' % uipathfn(f), label=label)
6110 6094 fm.end()
6111 6095 return 0
6112 6096
6113 6097 with repo.wlock():
6114 6098 ms = mergestatemod.mergestate.read(repo)
6115 6099
6116 6100 if not (ms.active() or repo.dirstate.p2() != nullid):
6117 6101 raise error.StateError(
6118 6102 _(b'resolve command not applicable when not merging')
6119 6103 )
6120 6104
6121 6105 wctx = repo[None]
6122 6106 m = scmutil.match(wctx, pats, opts)
6123 6107 ret = 0
6124 6108 didwork = False
6125 6109
6126 6110 tocomplete = []
6127 6111 hasconflictmarkers = []
6128 6112 if mark:
6129 6113 markcheck = ui.config(b'commands', b'resolve.mark-check')
6130 6114 if markcheck not in [b'warn', b'abort']:
6131 6115 # Treat all invalid / unrecognized values as 'none'.
6132 6116 markcheck = False
6133 6117 for f in ms:
6134 6118 if not m(f):
6135 6119 continue
6136 6120
6137 6121 didwork = True
6138 6122
6139 6123 # path conflicts must be resolved manually
6140 6124 if ms[f] in (
6141 6125 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6142 6126 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6143 6127 ):
6144 6128 if mark:
6145 6129 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6146 6130 elif unmark:
6147 6131 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6148 6132 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6149 6133 ui.warn(
6150 6134 _(b'%s: path conflict must be resolved manually\n')
6151 6135 % uipathfn(f)
6152 6136 )
6153 6137 continue
6154 6138
6155 6139 if mark:
6156 6140 if markcheck:
6157 6141 fdata = repo.wvfs.tryread(f)
6158 6142 if (
6159 6143 filemerge.hasconflictmarkers(fdata)
6160 6144 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6161 6145 ):
6162 6146 hasconflictmarkers.append(f)
6163 6147 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6164 6148 elif unmark:
6165 6149 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6166 6150 else:
6167 6151 # backup pre-resolve (merge uses .orig for its own purposes)
6168 6152 a = repo.wjoin(f)
6169 6153 try:
6170 6154 util.copyfile(a, a + b".resolve")
6171 6155 except (IOError, OSError) as inst:
6172 6156 if inst.errno != errno.ENOENT:
6173 6157 raise
6174 6158
6175 6159 try:
6176 6160 # preresolve file
6177 6161 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6178 6162 with ui.configoverride(overrides, b'resolve'):
6179 6163 complete, r = ms.preresolve(f, wctx)
6180 6164 if not complete:
6181 6165 tocomplete.append(f)
6182 6166 elif r:
6183 6167 ret = 1
6184 6168 finally:
6185 6169 ms.commit()
6186 6170
6187 6171 # replace filemerge's .orig file with our resolve file, but only
6188 6172 # for merges that are complete
6189 6173 if complete:
6190 6174 try:
6191 6175 util.rename(
6192 6176 a + b".resolve", scmutil.backuppath(ui, repo, f)
6193 6177 )
6194 6178 except OSError as inst:
6195 6179 if inst.errno != errno.ENOENT:
6196 6180 raise
6197 6181
6198 6182 if hasconflictmarkers:
6199 6183 ui.warn(
6200 6184 _(
6201 6185 b'warning: the following files still have conflict '
6202 6186 b'markers:\n'
6203 6187 )
6204 6188 + b''.join(
6205 6189 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6206 6190 )
6207 6191 )
6208 6192 if markcheck == b'abort' and not all and not pats:
6209 6193 raise error.StateError(
6210 6194 _(b'conflict markers detected'),
6211 6195 hint=_(b'use --all to mark anyway'),
6212 6196 )
6213 6197
6214 6198 for f in tocomplete:
6215 6199 try:
6216 6200 # resolve file
6217 6201 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6218 6202 with ui.configoverride(overrides, b'resolve'):
6219 6203 r = ms.resolve(f, wctx)
6220 6204 if r:
6221 6205 ret = 1
6222 6206 finally:
6223 6207 ms.commit()
6224 6208
6225 6209 # replace filemerge's .orig file with our resolve file
6226 6210 a = repo.wjoin(f)
6227 6211 try:
6228 6212 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6229 6213 except OSError as inst:
6230 6214 if inst.errno != errno.ENOENT:
6231 6215 raise
6232 6216
6233 6217 ms.commit()
6234 6218 branchmerge = repo.dirstate.p2() != nullid
6235 6219 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6236 6220
6237 6221 if not didwork and pats:
6238 6222 hint = None
6239 6223 if not any([p for p in pats if p.find(b':') >= 0]):
6240 6224 pats = [b'path:%s' % p for p in pats]
6241 6225 m = scmutil.match(wctx, pats, opts)
6242 6226 for f in ms:
6243 6227 if not m(f):
6244 6228 continue
6245 6229
6246 6230 def flag(o):
6247 6231 if o == b're_merge':
6248 6232 return b'--re-merge '
6249 6233 return b'-%s ' % o[0:1]
6250 6234
6251 6235 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6252 6236 hint = _(b"(try: hg resolve %s%s)\n") % (
6253 6237 flags,
6254 6238 b' '.join(pats),
6255 6239 )
6256 6240 break
6257 6241 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6258 6242 if hint:
6259 6243 ui.warn(hint)
6260 6244
6261 6245 unresolvedf = ms.unresolvedcount()
6262 6246 if not unresolvedf:
6263 6247 ui.status(_(b'(no more unresolved files)\n'))
6264 6248 cmdutil.checkafterresolved(repo)
6265 6249
6266 6250 return ret
6267 6251
6268 6252
6269 6253 @command(
6270 6254 b'revert',
6271 6255 [
6272 6256 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6273 6257 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6274 6258 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6275 6259 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6276 6260 (b'i', b'interactive', None, _(b'interactively select the changes')),
6277 6261 ]
6278 6262 + walkopts
6279 6263 + dryrunopts,
6280 6264 _(b'[OPTION]... [-r REV] [NAME]...'),
6281 6265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6282 6266 )
6283 6267 def revert(ui, repo, *pats, **opts):
6284 6268 """restore files to their checkout state
6285 6269
6286 6270 .. note::
6287 6271
6288 6272 To check out earlier revisions, you should use :hg:`update REV`.
6289 6273 To cancel an uncommitted merge (and lose your changes),
6290 6274 use :hg:`merge --abort`.
6291 6275
6292 6276 With no revision specified, revert the specified files or directories
6293 6277 to the contents they had in the parent of the working directory.
6294 6278 This restores the contents of files to an unmodified
6295 6279 state and unschedules adds, removes, copies, and renames. If the
6296 6280 working directory has two parents, you must explicitly specify a
6297 6281 revision.
6298 6282
6299 6283 Using the -r/--rev or -d/--date options, revert the given files or
6300 6284 directories to their states as of a specific revision. Because
6301 6285 revert does not change the working directory parents, this will
6302 6286 cause these files to appear modified. This can be helpful to "back
6303 6287 out" some or all of an earlier change. See :hg:`backout` for a
6304 6288 related method.
6305 6289
6306 6290 Modified files are saved with a .orig suffix before reverting.
6307 6291 To disable these backups, use --no-backup. It is possible to store
6308 6292 the backup files in a custom directory relative to the root of the
6309 6293 repository by setting the ``ui.origbackuppath`` configuration
6310 6294 option.
6311 6295
6312 6296 See :hg:`help dates` for a list of formats valid for -d/--date.
6313 6297
6314 6298 See :hg:`help backout` for a way to reverse the effect of an
6315 6299 earlier changeset.
6316 6300
6317 6301 Returns 0 on success.
6318 6302 """
6319 6303
6320 6304 opts = pycompat.byteskwargs(opts)
6321 6305 if opts.get(b"date"):
6322 6306 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6323 6307 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6324 6308
6325 6309 parent, p2 = repo.dirstate.parents()
6326 6310 if not opts.get(b'rev') and p2 != nullid:
6327 6311 # revert after merge is a trap for new users (issue2915)
6328 6312 raise error.InputError(
6329 6313 _(b'uncommitted merge with no revision specified'),
6330 6314 hint=_(b"use 'hg update' or see 'hg help revert'"),
6331 6315 )
6332 6316
6333 6317 rev = opts.get(b'rev')
6334 6318 if rev:
6335 6319 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6336 6320 ctx = scmutil.revsingle(repo, rev)
6337 6321
6338 6322 if not (
6339 6323 pats
6340 6324 or opts.get(b'include')
6341 6325 or opts.get(b'exclude')
6342 6326 or opts.get(b'all')
6343 6327 or opts.get(b'interactive')
6344 6328 ):
6345 6329 msg = _(b"no files or directories specified")
6346 6330 if p2 != nullid:
6347 6331 hint = _(
6348 6332 b"uncommitted merge, use --all to discard all changes,"
6349 6333 b" or 'hg update -C .' to abort the merge"
6350 6334 )
6351 6335 raise error.InputError(msg, hint=hint)
6352 6336 dirty = any(repo.status())
6353 6337 node = ctx.node()
6354 6338 if node != parent:
6355 6339 if dirty:
6356 6340 hint = (
6357 6341 _(
6358 6342 b"uncommitted changes, use --all to discard all"
6359 6343 b" changes, or 'hg update %d' to update"
6360 6344 )
6361 6345 % ctx.rev()
6362 6346 )
6363 6347 else:
6364 6348 hint = (
6365 6349 _(
6366 6350 b"use --all to revert all files,"
6367 6351 b" or 'hg update %d' to update"
6368 6352 )
6369 6353 % ctx.rev()
6370 6354 )
6371 6355 elif dirty:
6372 6356 hint = _(b"uncommitted changes, use --all to discard all changes")
6373 6357 else:
6374 6358 hint = _(b"use --all to revert all files")
6375 6359 raise error.InputError(msg, hint=hint)
6376 6360
6377 6361 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6378 6362
6379 6363
6380 6364 @command(
6381 6365 b'rollback',
6382 6366 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6383 6367 helpcategory=command.CATEGORY_MAINTENANCE,
6384 6368 )
6385 6369 def rollback(ui, repo, **opts):
6386 6370 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6387 6371
6388 6372 Please use :hg:`commit --amend` instead of rollback to correct
6389 6373 mistakes in the last commit.
6390 6374
6391 6375 This command should be used with care. There is only one level of
6392 6376 rollback, and there is no way to undo a rollback. It will also
6393 6377 restore the dirstate at the time of the last transaction, losing
6394 6378 any dirstate changes since that time. This command does not alter
6395 6379 the working directory.
6396 6380
6397 6381 Transactions are used to encapsulate the effects of all commands
6398 6382 that create new changesets or propagate existing changesets into a
6399 6383 repository.
6400 6384
6401 6385 .. container:: verbose
6402 6386
6403 6387 For example, the following commands are transactional, and their
6404 6388 effects can be rolled back:
6405 6389
6406 6390 - commit
6407 6391 - import
6408 6392 - pull
6409 6393 - push (with this repository as the destination)
6410 6394 - unbundle
6411 6395
6412 6396 To avoid permanent data loss, rollback will refuse to rollback a
6413 6397 commit transaction if it isn't checked out. Use --force to
6414 6398 override this protection.
6415 6399
6416 6400 The rollback command can be entirely disabled by setting the
6417 6401 ``ui.rollback`` configuration setting to false. If you're here
6418 6402 because you want to use rollback and it's disabled, you can
6419 6403 re-enable the command by setting ``ui.rollback`` to true.
6420 6404
6421 6405 This command is not intended for use on public repositories. Once
6422 6406 changes are visible for pull by other users, rolling a transaction
6423 6407 back locally is ineffective (someone else may already have pulled
6424 6408 the changes). Furthermore, a race is possible with readers of the
6425 6409 repository; for example an in-progress pull from the repository
6426 6410 may fail if a rollback is performed.
6427 6411
6428 6412 Returns 0 on success, 1 if no rollback data is available.
6429 6413 """
6430 6414 if not ui.configbool(b'ui', b'rollback'):
6431 6415 raise error.Abort(
6432 6416 _(b'rollback is disabled because it is unsafe'),
6433 6417 hint=b'see `hg help -v rollback` for information',
6434 6418 )
6435 6419 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6436 6420
6437 6421
6438 6422 @command(
6439 6423 b'root',
6440 6424 [] + formatteropts,
6441 6425 intents={INTENT_READONLY},
6442 6426 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6443 6427 )
6444 6428 def root(ui, repo, **opts):
6445 6429 """print the root (top) of the current working directory
6446 6430
6447 6431 Print the root directory of the current repository.
6448 6432
6449 6433 .. container:: verbose
6450 6434
6451 6435 Template:
6452 6436
6453 6437 The following keywords are supported in addition to the common template
6454 6438 keywords and functions. See also :hg:`help templates`.
6455 6439
6456 6440 :hgpath: String. Path to the .hg directory.
6457 6441 :storepath: String. Path to the directory holding versioned data.
6458 6442
6459 6443 Returns 0 on success.
6460 6444 """
6461 6445 opts = pycompat.byteskwargs(opts)
6462 6446 with ui.formatter(b'root', opts) as fm:
6463 6447 fm.startitem()
6464 6448 fm.write(b'reporoot', b'%s\n', repo.root)
6465 6449 fm.data(hgpath=repo.path, storepath=repo.spath)
6466 6450
6467 6451
6468 6452 @command(
6469 6453 b'serve',
6470 6454 [
6471 6455 (
6472 6456 b'A',
6473 6457 b'accesslog',
6474 6458 b'',
6475 6459 _(b'name of access log file to write to'),
6476 6460 _(b'FILE'),
6477 6461 ),
6478 6462 (b'd', b'daemon', None, _(b'run server in background')),
6479 6463 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6480 6464 (
6481 6465 b'E',
6482 6466 b'errorlog',
6483 6467 b'',
6484 6468 _(b'name of error log file to write to'),
6485 6469 _(b'FILE'),
6486 6470 ),
6487 6471 # use string type, then we can check if something was passed
6488 6472 (
6489 6473 b'p',
6490 6474 b'port',
6491 6475 b'',
6492 6476 _(b'port to listen on (default: 8000)'),
6493 6477 _(b'PORT'),
6494 6478 ),
6495 6479 (
6496 6480 b'a',
6497 6481 b'address',
6498 6482 b'',
6499 6483 _(b'address to listen on (default: all interfaces)'),
6500 6484 _(b'ADDR'),
6501 6485 ),
6502 6486 (
6503 6487 b'',
6504 6488 b'prefix',
6505 6489 b'',
6506 6490 _(b'prefix path to serve from (default: server root)'),
6507 6491 _(b'PREFIX'),
6508 6492 ),
6509 6493 (
6510 6494 b'n',
6511 6495 b'name',
6512 6496 b'',
6513 6497 _(b'name to show in web pages (default: working directory)'),
6514 6498 _(b'NAME'),
6515 6499 ),
6516 6500 (
6517 6501 b'',
6518 6502 b'web-conf',
6519 6503 b'',
6520 6504 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6521 6505 _(b'FILE'),
6522 6506 ),
6523 6507 (
6524 6508 b'',
6525 6509 b'webdir-conf',
6526 6510 b'',
6527 6511 _(b'name of the hgweb config file (DEPRECATED)'),
6528 6512 _(b'FILE'),
6529 6513 ),
6530 6514 (
6531 6515 b'',
6532 6516 b'pid-file',
6533 6517 b'',
6534 6518 _(b'name of file to write process ID to'),
6535 6519 _(b'FILE'),
6536 6520 ),
6537 6521 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6538 6522 (
6539 6523 b'',
6540 6524 b'cmdserver',
6541 6525 b'',
6542 6526 _(b'for remote clients (ADVANCED)'),
6543 6527 _(b'MODE'),
6544 6528 ),
6545 6529 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6546 6530 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6547 6531 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6548 6532 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6549 6533 (b'', b'print-url', None, _(b'start and print only the URL')),
6550 6534 ]
6551 6535 + subrepoopts,
6552 6536 _(b'[OPTION]...'),
6553 6537 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6554 6538 helpbasic=True,
6555 6539 optionalrepo=True,
6556 6540 )
6557 6541 def serve(ui, repo, **opts):
6558 6542 """start stand-alone webserver
6559 6543
6560 6544 Start a local HTTP repository browser and pull server. You can use
6561 6545 this for ad-hoc sharing and browsing of repositories. It is
6562 6546 recommended to use a real web server to serve a repository for
6563 6547 longer periods of time.
6564 6548
6565 6549 Please note that the server does not implement access control.
6566 6550 This means that, by default, anybody can read from the server and
6567 6551 nobody can write to it by default. Set the ``web.allow-push``
6568 6552 option to ``*`` to allow everybody to push to the server. You
6569 6553 should use a real web server if you need to authenticate users.
6570 6554
6571 6555 By default, the server logs accesses to stdout and errors to
6572 6556 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6573 6557 files.
6574 6558
6575 6559 To have the server choose a free port number to listen on, specify
6576 6560 a port number of 0; in this case, the server will print the port
6577 6561 number it uses.
6578 6562
6579 6563 Returns 0 on success.
6580 6564 """
6581 6565
6582 6566 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6583 6567 opts = pycompat.byteskwargs(opts)
6584 6568 if opts[b"print_url"] and ui.verbose:
6585 6569 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6586 6570
6587 6571 if opts[b"stdio"]:
6588 6572 if repo is None:
6589 6573 raise error.RepoError(
6590 6574 _(b"there is no Mercurial repository here (.hg not found)")
6591 6575 )
6592 6576 s = wireprotoserver.sshserver(ui, repo)
6593 6577 s.serve_forever()
6594 6578 return
6595 6579
6596 6580 service = server.createservice(ui, repo, opts)
6597 6581 return server.runservice(opts, initfn=service.init, runfn=service.run)
6598 6582
6599 6583
6600 6584 @command(
6601 6585 b'shelve',
6602 6586 [
6603 6587 (
6604 6588 b'A',
6605 6589 b'addremove',
6606 6590 None,
6607 6591 _(b'mark new/missing files as added/removed before shelving'),
6608 6592 ),
6609 6593 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6610 6594 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6611 6595 (
6612 6596 b'',
6613 6597 b'date',
6614 6598 b'',
6615 6599 _(b'shelve with the specified commit date'),
6616 6600 _(b'DATE'),
6617 6601 ),
6618 6602 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6619 6603 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6620 6604 (
6621 6605 b'k',
6622 6606 b'keep',
6623 6607 False,
6624 6608 _(b'shelve, but keep changes in the working directory'),
6625 6609 ),
6626 6610 (b'l', b'list', None, _(b'list current shelves')),
6627 6611 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6628 6612 (
6629 6613 b'n',
6630 6614 b'name',
6631 6615 b'',
6632 6616 _(b'use the given name for the shelved commit'),
6633 6617 _(b'NAME'),
6634 6618 ),
6635 6619 (
6636 6620 b'p',
6637 6621 b'patch',
6638 6622 None,
6639 6623 _(
6640 6624 b'output patches for changes (provide the names of the shelved '
6641 6625 b'changes as positional arguments)'
6642 6626 ),
6643 6627 ),
6644 6628 (b'i', b'interactive', None, _(b'interactive mode')),
6645 6629 (
6646 6630 b'',
6647 6631 b'stat',
6648 6632 None,
6649 6633 _(
6650 6634 b'output diffstat-style summary of changes (provide the names of '
6651 6635 b'the shelved changes as positional arguments)'
6652 6636 ),
6653 6637 ),
6654 6638 ]
6655 6639 + cmdutil.walkopts,
6656 6640 _(b'hg shelve [OPTION]... [FILE]...'),
6657 6641 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6658 6642 )
6659 6643 def shelve(ui, repo, *pats, **opts):
6660 6644 """save and set aside changes from the working directory
6661 6645
6662 6646 Shelving takes files that "hg status" reports as not clean, saves
6663 6647 the modifications to a bundle (a shelved change), and reverts the
6664 6648 files so that their state in the working directory becomes clean.
6665 6649
6666 6650 To restore these changes to the working directory, using "hg
6667 6651 unshelve"; this will work even if you switch to a different
6668 6652 commit.
6669 6653
6670 6654 When no files are specified, "hg shelve" saves all not-clean
6671 6655 files. If specific files or directories are named, only changes to
6672 6656 those files are shelved.
6673 6657
6674 6658 In bare shelve (when no files are specified, without interactive,
6675 6659 include and exclude option), shelving remembers information if the
6676 6660 working directory was on newly created branch, in other words working
6677 6661 directory was on different branch than its first parent. In this
6678 6662 situation unshelving restores branch information to the working directory.
6679 6663
6680 6664 Each shelved change has a name that makes it easier to find later.
6681 6665 The name of a shelved change defaults to being based on the active
6682 6666 bookmark, or if there is no active bookmark, the current named
6683 6667 branch. To specify a different name, use ``--name``.
6684 6668
6685 6669 To see a list of existing shelved changes, use the ``--list``
6686 6670 option. For each shelved change, this will print its name, age,
6687 6671 and description; use ``--patch`` or ``--stat`` for more details.
6688 6672
6689 6673 To delete specific shelved changes, use ``--delete``. To delete
6690 6674 all shelved changes, use ``--cleanup``.
6691 6675 """
6692 6676 opts = pycompat.byteskwargs(opts)
6693 6677 allowables = [
6694 6678 (b'addremove', {b'create'}), # 'create' is pseudo action
6695 6679 (b'unknown', {b'create'}),
6696 6680 (b'cleanup', {b'cleanup'}),
6697 6681 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6698 6682 (b'delete', {b'delete'}),
6699 6683 (b'edit', {b'create'}),
6700 6684 (b'keep', {b'create'}),
6701 6685 (b'list', {b'list'}),
6702 6686 (b'message', {b'create'}),
6703 6687 (b'name', {b'create'}),
6704 6688 (b'patch', {b'patch', b'list'}),
6705 6689 (b'stat', {b'stat', b'list'}),
6706 6690 ]
6707 6691
6708 6692 def checkopt(opt):
6709 6693 if opts.get(opt):
6710 6694 for i, allowable in allowables:
6711 6695 if opts[i] and opt not in allowable:
6712 6696 raise error.InputError(
6713 6697 _(
6714 6698 b"options '--%s' and '--%s' may not be "
6715 6699 b"used together"
6716 6700 )
6717 6701 % (opt, i)
6718 6702 )
6719 6703 return True
6720 6704
6721 6705 if checkopt(b'cleanup'):
6722 6706 if pats:
6723 6707 raise error.InputError(
6724 6708 _(b"cannot specify names when using '--cleanup'")
6725 6709 )
6726 6710 return shelvemod.cleanupcmd(ui, repo)
6727 6711 elif checkopt(b'delete'):
6728 6712 return shelvemod.deletecmd(ui, repo, pats)
6729 6713 elif checkopt(b'list'):
6730 6714 return shelvemod.listcmd(ui, repo, pats, opts)
6731 6715 elif checkopt(b'patch') or checkopt(b'stat'):
6732 6716 return shelvemod.patchcmds(ui, repo, pats, opts)
6733 6717 else:
6734 6718 return shelvemod.createcmd(ui, repo, pats, opts)
6735 6719
6736 6720
6737 6721 _NOTTERSE = b'nothing'
6738 6722
6739 6723
6740 6724 @command(
6741 6725 b'status|st',
6742 6726 [
6743 6727 (b'A', b'all', None, _(b'show status of all files')),
6744 6728 (b'm', b'modified', None, _(b'show only modified files')),
6745 6729 (b'a', b'added', None, _(b'show only added files')),
6746 6730 (b'r', b'removed', None, _(b'show only removed files')),
6747 6731 (b'd', b'deleted', None, _(b'show only missing files')),
6748 6732 (b'c', b'clean', None, _(b'show only files without changes')),
6749 6733 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6750 6734 (b'i', b'ignored', None, _(b'show only ignored files')),
6751 6735 (b'n', b'no-status', None, _(b'hide status prefix')),
6752 6736 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6753 6737 (
6754 6738 b'C',
6755 6739 b'copies',
6756 6740 None,
6757 6741 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6758 6742 ),
6759 6743 (
6760 6744 b'0',
6761 6745 b'print0',
6762 6746 None,
6763 6747 _(b'end filenames with NUL, for use with xargs'),
6764 6748 ),
6765 6749 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6766 6750 (
6767 6751 b'',
6768 6752 b'change',
6769 6753 b'',
6770 6754 _(b'list the changed files of a revision'),
6771 6755 _(b'REV'),
6772 6756 ),
6773 6757 ]
6774 6758 + walkopts
6775 6759 + subrepoopts
6776 6760 + formatteropts,
6777 6761 _(b'[OPTION]... [FILE]...'),
6778 6762 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6779 6763 helpbasic=True,
6780 6764 inferrepo=True,
6781 6765 intents={INTENT_READONLY},
6782 6766 )
6783 6767 def status(ui, repo, *pats, **opts):
6784 6768 """show changed files in the working directory
6785 6769
6786 6770 Show status of files in the repository. If names are given, only
6787 6771 files that match are shown. Files that are clean or ignored or
6788 6772 the source of a copy/move operation, are not listed unless
6789 6773 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6790 6774 Unless options described with "show only ..." are given, the
6791 6775 options -mardu are used.
6792 6776
6793 6777 Option -q/--quiet hides untracked (unknown and ignored) files
6794 6778 unless explicitly requested with -u/--unknown or -i/--ignored.
6795 6779
6796 6780 .. note::
6797 6781
6798 6782 :hg:`status` may appear to disagree with diff if permissions have
6799 6783 changed or a merge has occurred. The standard diff format does
6800 6784 not report permission changes and diff only reports changes
6801 6785 relative to one merge parent.
6802 6786
6803 6787 If one revision is given, it is used as the base revision.
6804 6788 If two revisions are given, the differences between them are
6805 6789 shown. The --change option can also be used as a shortcut to list
6806 6790 the changed files of a revision from its first parent.
6807 6791
6808 6792 The codes used to show the status of files are::
6809 6793
6810 6794 M = modified
6811 6795 A = added
6812 6796 R = removed
6813 6797 C = clean
6814 6798 ! = missing (deleted by non-hg command, but still tracked)
6815 6799 ? = not tracked
6816 6800 I = ignored
6817 6801 = origin of the previous file (with --copies)
6818 6802
6819 6803 .. container:: verbose
6820 6804
6821 6805 The -t/--terse option abbreviates the output by showing only the directory
6822 6806 name if all the files in it share the same status. The option takes an
6823 6807 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6824 6808 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6825 6809 for 'ignored' and 'c' for clean.
6826 6810
6827 6811 It abbreviates only those statuses which are passed. Note that clean and
6828 6812 ignored files are not displayed with '--terse ic' unless the -c/--clean
6829 6813 and -i/--ignored options are also used.
6830 6814
6831 6815 The -v/--verbose option shows information when the repository is in an
6832 6816 unfinished merge, shelve, rebase state etc. You can have this behavior
6833 6817 turned on by default by enabling the ``commands.status.verbose`` option.
6834 6818
6835 6819 You can skip displaying some of these states by setting
6836 6820 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6837 6821 'histedit', 'merge', 'rebase', or 'unshelve'.
6838 6822
6839 6823 Template:
6840 6824
6841 6825 The following keywords are supported in addition to the common template
6842 6826 keywords and functions. See also :hg:`help templates`.
6843 6827
6844 6828 :path: String. Repository-absolute path of the file.
6845 6829 :source: String. Repository-absolute path of the file originated from.
6846 6830 Available if ``--copies`` is specified.
6847 6831 :status: String. Character denoting file's status.
6848 6832
6849 6833 Examples:
6850 6834
6851 6835 - show changes in the working directory relative to a
6852 6836 changeset::
6853 6837
6854 6838 hg status --rev 9353
6855 6839
6856 6840 - show changes in the working directory relative to the
6857 6841 current directory (see :hg:`help patterns` for more information)::
6858 6842
6859 6843 hg status re:
6860 6844
6861 6845 - show all changes including copies in an existing changeset::
6862 6846
6863 6847 hg status --copies --change 9353
6864 6848
6865 6849 - get a NUL separated list of added files, suitable for xargs::
6866 6850
6867 6851 hg status -an0
6868 6852
6869 6853 - show more information about the repository status, abbreviating
6870 6854 added, removed, modified, deleted, and untracked paths::
6871 6855
6872 6856 hg status -v -t mardu
6873 6857
6874 6858 Returns 0 on success.
6875 6859
6876 6860 """
6877 6861
6878 6862 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6879 6863 opts = pycompat.byteskwargs(opts)
6880 6864 revs = opts.get(b'rev')
6881 6865 change = opts.get(b'change')
6882 6866 terse = opts.get(b'terse')
6883 6867 if terse is _NOTTERSE:
6884 6868 if revs:
6885 6869 terse = b''
6886 6870 else:
6887 6871 terse = ui.config(b'commands', b'status.terse')
6888 6872
6889 6873 if revs and terse:
6890 6874 msg = _(b'cannot use --terse with --rev')
6891 6875 raise error.InputError(msg)
6892 6876 elif change:
6893 6877 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6894 6878 ctx2 = scmutil.revsingle(repo, change, None)
6895 6879 ctx1 = ctx2.p1()
6896 6880 else:
6897 6881 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6898 6882 ctx1, ctx2 = scmutil.revpair(repo, revs)
6899 6883
6900 6884 forcerelativevalue = None
6901 6885 if ui.hasconfig(b'commands', b'status.relative'):
6902 6886 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6903 6887 uipathfn = scmutil.getuipathfn(
6904 6888 repo,
6905 6889 legacyrelativevalue=bool(pats),
6906 6890 forcerelativevalue=forcerelativevalue,
6907 6891 )
6908 6892
6909 6893 if opts.get(b'print0'):
6910 6894 end = b'\0'
6911 6895 else:
6912 6896 end = b'\n'
6913 6897 states = b'modified added removed deleted unknown ignored clean'.split()
6914 6898 show = [k for k in states if opts.get(k)]
6915 6899 if opts.get(b'all'):
6916 6900 show += ui.quiet and (states[:4] + [b'clean']) or states
6917 6901
6918 6902 if not show:
6919 6903 if ui.quiet:
6920 6904 show = states[:4]
6921 6905 else:
6922 6906 show = states[:5]
6923 6907
6924 6908 m = scmutil.match(ctx2, pats, opts)
6925 6909 if terse:
6926 6910 # we need to compute clean and unknown to terse
6927 6911 stat = repo.status(
6928 6912 ctx1.node(),
6929 6913 ctx2.node(),
6930 6914 m,
6931 6915 b'ignored' in show or b'i' in terse,
6932 6916 clean=True,
6933 6917 unknown=True,
6934 6918 listsubrepos=opts.get(b'subrepos'),
6935 6919 )
6936 6920
6937 6921 stat = cmdutil.tersedir(stat, terse)
6938 6922 else:
6939 6923 stat = repo.status(
6940 6924 ctx1.node(),
6941 6925 ctx2.node(),
6942 6926 m,
6943 6927 b'ignored' in show,
6944 6928 b'clean' in show,
6945 6929 b'unknown' in show,
6946 6930 opts.get(b'subrepos'),
6947 6931 )
6948 6932
6949 6933 changestates = zip(
6950 6934 states,
6951 6935 pycompat.iterbytestr(b'MAR!?IC'),
6952 6936 [getattr(stat, s.decode('utf8')) for s in states],
6953 6937 )
6954 6938
6955 6939 copy = {}
6956 6940 if (
6957 6941 opts.get(b'all')
6958 6942 or opts.get(b'copies')
6959 6943 or ui.configbool(b'ui', b'statuscopies')
6960 6944 ) and not opts.get(b'no_status'):
6961 6945 copy = copies.pathcopies(ctx1, ctx2, m)
6962 6946
6963 6947 morestatus = None
6964 6948 if (
6965 6949 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6966 6950 and not ui.plain()
6967 6951 and not opts.get(b'print0')
6968 6952 ):
6969 6953 morestatus = cmdutil.readmorestatus(repo)
6970 6954
6971 6955 ui.pager(b'status')
6972 6956 fm = ui.formatter(b'status', opts)
6973 6957 fmt = b'%s' + end
6974 6958 showchar = not opts.get(b'no_status')
6975 6959
6976 6960 for state, char, files in changestates:
6977 6961 if state in show:
6978 6962 label = b'status.' + state
6979 6963 for f in files:
6980 6964 fm.startitem()
6981 6965 fm.context(ctx=ctx2)
6982 6966 fm.data(itemtype=b'file', path=f)
6983 6967 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6984 6968 fm.plain(fmt % uipathfn(f), label=label)
6985 6969 if f in copy:
6986 6970 fm.data(source=copy[f])
6987 6971 fm.plain(
6988 6972 (b' %s' + end) % uipathfn(copy[f]),
6989 6973 label=b'status.copied',
6990 6974 )
6991 6975 if morestatus:
6992 6976 morestatus.formatfile(f, fm)
6993 6977
6994 6978 if morestatus:
6995 6979 morestatus.formatfooter(fm)
6996 6980 fm.end()
6997 6981
6998 6982
6999 6983 @command(
7000 6984 b'summary|sum',
7001 6985 [(b'', b'remote', None, _(b'check for push and pull'))],
7002 6986 b'[--remote]',
7003 6987 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7004 6988 helpbasic=True,
7005 6989 intents={INTENT_READONLY},
7006 6990 )
7007 6991 def summary(ui, repo, **opts):
7008 6992 """summarize working directory state
7009 6993
7010 6994 This generates a brief summary of the working directory state,
7011 6995 including parents, branch, commit status, phase and available updates.
7012 6996
7013 6997 With the --remote option, this will check the default paths for
7014 6998 incoming and outgoing changes. This can be time-consuming.
7015 6999
7016 7000 Returns 0 on success.
7017 7001 """
7018 7002
7019 7003 opts = pycompat.byteskwargs(opts)
7020 7004 ui.pager(b'summary')
7021 7005 ctx = repo[None]
7022 7006 parents = ctx.parents()
7023 7007 pnode = parents[0].node()
7024 7008 marks = []
7025 7009
7026 7010 try:
7027 7011 ms = mergestatemod.mergestate.read(repo)
7028 7012 except error.UnsupportedMergeRecords as e:
7029 7013 s = b' '.join(e.recordtypes)
7030 7014 ui.warn(
7031 7015 _(b'warning: merge state has unsupported record types: %s\n') % s
7032 7016 )
7033 7017 unresolved = []
7034 7018 else:
7035 7019 unresolved = list(ms.unresolved())
7036 7020
7037 7021 for p in parents:
7038 7022 # label with log.changeset (instead of log.parent) since this
7039 7023 # shows a working directory parent *changeset*:
7040 7024 # i18n: column positioning for "hg summary"
7041 7025 ui.write(
7042 7026 _(b'parent: %d:%s ') % (p.rev(), p),
7043 7027 label=logcmdutil.changesetlabels(p),
7044 7028 )
7045 7029 ui.write(b' '.join(p.tags()), label=b'log.tag')
7046 7030 if p.bookmarks():
7047 7031 marks.extend(p.bookmarks())
7048 7032 if p.rev() == -1:
7049 7033 if not len(repo):
7050 7034 ui.write(_(b' (empty repository)'))
7051 7035 else:
7052 7036 ui.write(_(b' (no revision checked out)'))
7053 7037 if p.obsolete():
7054 7038 ui.write(_(b' (obsolete)'))
7055 7039 if p.isunstable():
7056 7040 instabilities = (
7057 7041 ui.label(instability, b'trouble.%s' % instability)
7058 7042 for instability in p.instabilities()
7059 7043 )
7060 7044 ui.write(b' (' + b', '.join(instabilities) + b')')
7061 7045 ui.write(b'\n')
7062 7046 if p.description():
7063 7047 ui.status(
7064 7048 b' ' + p.description().splitlines()[0].strip() + b'\n',
7065 7049 label=b'log.summary',
7066 7050 )
7067 7051
7068 7052 branch = ctx.branch()
7069 7053 bheads = repo.branchheads(branch)
7070 7054 # i18n: column positioning for "hg summary"
7071 7055 m = _(b'branch: %s\n') % branch
7072 7056 if branch != b'default':
7073 7057 ui.write(m, label=b'log.branch')
7074 7058 else:
7075 7059 ui.status(m, label=b'log.branch')
7076 7060
7077 7061 if marks:
7078 7062 active = repo._activebookmark
7079 7063 # i18n: column positioning for "hg summary"
7080 7064 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7081 7065 if active is not None:
7082 7066 if active in marks:
7083 7067 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7084 7068 marks.remove(active)
7085 7069 else:
7086 7070 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7087 7071 for m in marks:
7088 7072 ui.write(b' ' + m, label=b'log.bookmark')
7089 7073 ui.write(b'\n', label=b'log.bookmark')
7090 7074
7091 7075 status = repo.status(unknown=True)
7092 7076
7093 7077 c = repo.dirstate.copies()
7094 7078 copied, renamed = [], []
7095 7079 for d, s in pycompat.iteritems(c):
7096 7080 if s in status.removed:
7097 7081 status.removed.remove(s)
7098 7082 renamed.append(d)
7099 7083 else:
7100 7084 copied.append(d)
7101 7085 if d in status.added:
7102 7086 status.added.remove(d)
7103 7087
7104 7088 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7105 7089
7106 7090 labels = [
7107 7091 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7108 7092 (ui.label(_(b'%d added'), b'status.added'), status.added),
7109 7093 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7110 7094 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7111 7095 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7112 7096 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7113 7097 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7114 7098 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7115 7099 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7116 7100 ]
7117 7101 t = []
7118 7102 for l, s in labels:
7119 7103 if s:
7120 7104 t.append(l % len(s))
7121 7105
7122 7106 t = b', '.join(t)
7123 7107 cleanworkdir = False
7124 7108
7125 7109 if repo.vfs.exists(b'graftstate'):
7126 7110 t += _(b' (graft in progress)')
7127 7111 if repo.vfs.exists(b'updatestate'):
7128 7112 t += _(b' (interrupted update)')
7129 7113 elif len(parents) > 1:
7130 7114 t += _(b' (merge)')
7131 7115 elif branch != parents[0].branch():
7132 7116 t += _(b' (new branch)')
7133 7117 elif parents[0].closesbranch() and pnode in repo.branchheads(
7134 7118 branch, closed=True
7135 7119 ):
7136 7120 t += _(b' (head closed)')
7137 7121 elif not (
7138 7122 status.modified
7139 7123 or status.added
7140 7124 or status.removed
7141 7125 or renamed
7142 7126 or copied
7143 7127 or subs
7144 7128 ):
7145 7129 t += _(b' (clean)')
7146 7130 cleanworkdir = True
7147 7131 elif pnode not in bheads:
7148 7132 t += _(b' (new branch head)')
7149 7133
7150 7134 if parents:
7151 7135 pendingphase = max(p.phase() for p in parents)
7152 7136 else:
7153 7137 pendingphase = phases.public
7154 7138
7155 7139 if pendingphase > phases.newcommitphase(ui):
7156 7140 t += b' (%s)' % phases.phasenames[pendingphase]
7157 7141
7158 7142 if cleanworkdir:
7159 7143 # i18n: column positioning for "hg summary"
7160 7144 ui.status(_(b'commit: %s\n') % t.strip())
7161 7145 else:
7162 7146 # i18n: column positioning for "hg summary"
7163 7147 ui.write(_(b'commit: %s\n') % t.strip())
7164 7148
7165 7149 # all ancestors of branch heads - all ancestors of parent = new csets
7166 7150 new = len(
7167 7151 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7168 7152 )
7169 7153
7170 7154 if new == 0:
7171 7155 # i18n: column positioning for "hg summary"
7172 7156 ui.status(_(b'update: (current)\n'))
7173 7157 elif pnode not in bheads:
7174 7158 # i18n: column positioning for "hg summary"
7175 7159 ui.write(_(b'update: %d new changesets (update)\n') % new)
7176 7160 else:
7177 7161 # i18n: column positioning for "hg summary"
7178 7162 ui.write(
7179 7163 _(b'update: %d new changesets, %d branch heads (merge)\n')
7180 7164 % (new, len(bheads))
7181 7165 )
7182 7166
7183 7167 t = []
7184 7168 draft = len(repo.revs(b'draft()'))
7185 7169 if draft:
7186 7170 t.append(_(b'%d draft') % draft)
7187 7171 secret = len(repo.revs(b'secret()'))
7188 7172 if secret:
7189 7173 t.append(_(b'%d secret') % secret)
7190 7174
7191 7175 if draft or secret:
7192 7176 ui.status(_(b'phases: %s\n') % b', '.join(t))
7193 7177
7194 7178 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7195 7179 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7196 7180 numtrouble = len(repo.revs(trouble + b"()"))
7197 7181 # We write all the possibilities to ease translation
7198 7182 troublemsg = {
7199 7183 b"orphan": _(b"orphan: %d changesets"),
7200 7184 b"contentdivergent": _(b"content-divergent: %d changesets"),
7201 7185 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7202 7186 }
7203 7187 if numtrouble > 0:
7204 7188 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7205 7189
7206 7190 cmdutil.summaryhooks(ui, repo)
7207 7191
7208 7192 if opts.get(b'remote'):
7209 7193 needsincoming, needsoutgoing = True, True
7210 7194 else:
7211 7195 needsincoming, needsoutgoing = False, False
7212 7196 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7213 7197 if i:
7214 7198 needsincoming = True
7215 7199 if o:
7216 7200 needsoutgoing = True
7217 7201 if not needsincoming and not needsoutgoing:
7218 7202 return
7219 7203
7220 7204 def getincoming():
7221 7205 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7222 7206 sbranch = branches[0]
7223 7207 try:
7224 7208 other = hg.peer(repo, {}, source)
7225 7209 except error.RepoError:
7226 7210 if opts.get(b'remote'):
7227 7211 raise
7228 7212 return source, sbranch, None, None, None
7229 7213 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7230 7214 if revs:
7231 7215 revs = [other.lookup(rev) for rev in revs]
7232 7216 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7233 7217 repo.ui.pushbuffer()
7234 7218 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7235 7219 repo.ui.popbuffer()
7236 7220 return source, sbranch, other, commoninc, commoninc[1]
7237 7221
7238 7222 if needsincoming:
7239 7223 source, sbranch, sother, commoninc, incoming = getincoming()
7240 7224 else:
7241 7225 source = sbranch = sother = commoninc = incoming = None
7242 7226
7243 7227 def getoutgoing():
7244 7228 dest, branches = urlutil.parseurl(
7245 7229 ui.expandpath(b'default-push', b'default')
7246 7230 )
7247 7231 dbranch = branches[0]
7248 7232 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7249 7233 if source != dest:
7250 7234 try:
7251 7235 dother = hg.peer(repo, {}, dest)
7252 7236 except error.RepoError:
7253 7237 if opts.get(b'remote'):
7254 7238 raise
7255 7239 return dest, dbranch, None, None
7256 7240 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7257 7241 elif sother is None:
7258 7242 # there is no explicit destination peer, but source one is invalid
7259 7243 return dest, dbranch, None, None
7260 7244 else:
7261 7245 dother = sother
7262 7246 if source != dest or (sbranch is not None and sbranch != dbranch):
7263 7247 common = None
7264 7248 else:
7265 7249 common = commoninc
7266 7250 if revs:
7267 7251 revs = [repo.lookup(rev) for rev in revs]
7268 7252 repo.ui.pushbuffer()
7269 7253 outgoing = discovery.findcommonoutgoing(
7270 7254 repo, dother, onlyheads=revs, commoninc=common
7271 7255 )
7272 7256 repo.ui.popbuffer()
7273 7257 return dest, dbranch, dother, outgoing
7274 7258
7275 7259 if needsoutgoing:
7276 7260 dest, dbranch, dother, outgoing = getoutgoing()
7277 7261 else:
7278 7262 dest = dbranch = dother = outgoing = None
7279 7263
7280 7264 if opts.get(b'remote'):
7281 7265 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7282 7266 # The former always sets `sother` (or raises an exception if it can't);
7283 7267 # the latter always sets `outgoing`.
7284 7268 assert sother is not None
7285 7269 assert outgoing is not None
7286 7270
7287 7271 t = []
7288 7272 if incoming:
7289 7273 t.append(_(b'1 or more incoming'))
7290 7274 o = outgoing.missing
7291 7275 if o:
7292 7276 t.append(_(b'%d outgoing') % len(o))
7293 7277 other = dother or sother
7294 7278 if b'bookmarks' in other.listkeys(b'namespaces'):
7295 7279 counts = bookmarks.summary(repo, other)
7296 7280 if counts[0] > 0:
7297 7281 t.append(_(b'%d incoming bookmarks') % counts[0])
7298 7282 if counts[1] > 0:
7299 7283 t.append(_(b'%d outgoing bookmarks') % counts[1])
7300 7284
7301 7285 if t:
7302 7286 # i18n: column positioning for "hg summary"
7303 7287 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7304 7288 else:
7305 7289 # i18n: column positioning for "hg summary"
7306 7290 ui.status(_(b'remote: (synced)\n'))
7307 7291
7308 7292 cmdutil.summaryremotehooks(
7309 7293 ui,
7310 7294 repo,
7311 7295 opts,
7312 7296 (
7313 7297 (source, sbranch, sother, commoninc),
7314 7298 (dest, dbranch, dother, outgoing),
7315 7299 ),
7316 7300 )
7317 7301
7318 7302
7319 7303 @command(
7320 7304 b'tag',
7321 7305 [
7322 7306 (b'f', b'force', None, _(b'force tag')),
7323 7307 (b'l', b'local', None, _(b'make the tag local')),
7324 7308 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7325 7309 (b'', b'remove', None, _(b'remove a tag')),
7326 7310 # -l/--local is already there, commitopts cannot be used
7327 7311 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7328 7312 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7329 7313 ]
7330 7314 + commitopts2,
7331 7315 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7332 7316 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7333 7317 )
7334 7318 def tag(ui, repo, name1, *names, **opts):
7335 7319 """add one or more tags for the current or given revision
7336 7320
7337 7321 Name a particular revision using <name>.
7338 7322
7339 7323 Tags are used to name particular revisions of the repository and are
7340 7324 very useful to compare different revisions, to go back to significant
7341 7325 earlier versions or to mark branch points as releases, etc. Changing
7342 7326 an existing tag is normally disallowed; use -f/--force to override.
7343 7327
7344 7328 If no revision is given, the parent of the working directory is
7345 7329 used.
7346 7330
7347 7331 To facilitate version control, distribution, and merging of tags,
7348 7332 they are stored as a file named ".hgtags" which is managed similarly
7349 7333 to other project files and can be hand-edited if necessary. This
7350 7334 also means that tagging creates a new commit. The file
7351 7335 ".hg/localtags" is used for local tags (not shared among
7352 7336 repositories).
7353 7337
7354 7338 Tag commits are usually made at the head of a branch. If the parent
7355 7339 of the working directory is not a branch head, :hg:`tag` aborts; use
7356 7340 -f/--force to force the tag commit to be based on a non-head
7357 7341 changeset.
7358 7342
7359 7343 See :hg:`help dates` for a list of formats valid for -d/--date.
7360 7344
7361 7345 Since tag names have priority over branch names during revision
7362 7346 lookup, using an existing branch name as a tag name is discouraged.
7363 7347
7364 7348 Returns 0 on success.
7365 7349 """
7366 7350 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7367 7351 opts = pycompat.byteskwargs(opts)
7368 7352 with repo.wlock(), repo.lock():
7369 7353 rev_ = b"."
7370 7354 names = [t.strip() for t in (name1,) + names]
7371 7355 if len(names) != len(set(names)):
7372 7356 raise error.InputError(_(b'tag names must be unique'))
7373 7357 for n in names:
7374 7358 scmutil.checknewlabel(repo, n, b'tag')
7375 7359 if not n:
7376 7360 raise error.InputError(
7377 7361 _(b'tag names cannot consist entirely of whitespace')
7378 7362 )
7379 7363 if opts.get(b'rev'):
7380 7364 rev_ = opts[b'rev']
7381 7365 message = opts.get(b'message')
7382 7366 if opts.get(b'remove'):
7383 7367 if opts.get(b'local'):
7384 7368 expectedtype = b'local'
7385 7369 else:
7386 7370 expectedtype = b'global'
7387 7371
7388 7372 for n in names:
7389 7373 if repo.tagtype(n) == b'global':
7390 7374 alltags = tagsmod.findglobaltags(ui, repo)
7391 7375 if alltags[n][0] == nullid:
7392 7376 raise error.InputError(
7393 7377 _(b"tag '%s' is already removed") % n
7394 7378 )
7395 7379 if not repo.tagtype(n):
7396 7380 raise error.InputError(_(b"tag '%s' does not exist") % n)
7397 7381 if repo.tagtype(n) != expectedtype:
7398 7382 if expectedtype == b'global':
7399 7383 raise error.InputError(
7400 7384 _(b"tag '%s' is not a global tag") % n
7401 7385 )
7402 7386 else:
7403 7387 raise error.InputError(
7404 7388 _(b"tag '%s' is not a local tag") % n
7405 7389 )
7406 7390 rev_ = b'null'
7407 7391 if not message:
7408 7392 # we don't translate commit messages
7409 7393 message = b'Removed tag %s' % b', '.join(names)
7410 7394 elif not opts.get(b'force'):
7411 7395 for n in names:
7412 7396 if n in repo.tags():
7413 7397 raise error.InputError(
7414 7398 _(b"tag '%s' already exists (use -f to force)") % n
7415 7399 )
7416 7400 if not opts.get(b'local'):
7417 7401 p1, p2 = repo.dirstate.parents()
7418 7402 if p2 != nullid:
7419 7403 raise error.StateError(_(b'uncommitted merge'))
7420 7404 bheads = repo.branchheads()
7421 7405 if not opts.get(b'force') and bheads and p1 not in bheads:
7422 7406 raise error.InputError(
7423 7407 _(
7424 7408 b'working directory is not at a branch head '
7425 7409 b'(use -f to force)'
7426 7410 )
7427 7411 )
7428 7412 node = scmutil.revsingle(repo, rev_).node()
7429 7413
7430 7414 if not message:
7431 7415 # we don't translate commit messages
7432 7416 message = b'Added tag %s for changeset %s' % (
7433 7417 b', '.join(names),
7434 7418 short(node),
7435 7419 )
7436 7420
7437 7421 date = opts.get(b'date')
7438 7422 if date:
7439 7423 date = dateutil.parsedate(date)
7440 7424
7441 7425 if opts.get(b'remove'):
7442 7426 editform = b'tag.remove'
7443 7427 else:
7444 7428 editform = b'tag.add'
7445 7429 editor = cmdutil.getcommiteditor(
7446 7430 editform=editform, **pycompat.strkwargs(opts)
7447 7431 )
7448 7432
7449 7433 # don't allow tagging the null rev
7450 7434 if (
7451 7435 not opts.get(b'remove')
7452 7436 and scmutil.revsingle(repo, rev_).rev() == nullrev
7453 7437 ):
7454 7438 raise error.InputError(_(b"cannot tag null revision"))
7455 7439
7456 7440 tagsmod.tag(
7457 7441 repo,
7458 7442 names,
7459 7443 node,
7460 7444 message,
7461 7445 opts.get(b'local'),
7462 7446 opts.get(b'user'),
7463 7447 date,
7464 7448 editor=editor,
7465 7449 )
7466 7450
7467 7451
7468 7452 @command(
7469 7453 b'tags',
7470 7454 formatteropts,
7471 7455 b'',
7472 7456 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7473 7457 intents={INTENT_READONLY},
7474 7458 )
7475 7459 def tags(ui, repo, **opts):
7476 7460 """list repository tags
7477 7461
7478 7462 This lists both regular and local tags. When the -v/--verbose
7479 7463 switch is used, a third column "local" is printed for local tags.
7480 7464 When the -q/--quiet switch is used, only the tag name is printed.
7481 7465
7482 7466 .. container:: verbose
7483 7467
7484 7468 Template:
7485 7469
7486 7470 The following keywords are supported in addition to the common template
7487 7471 keywords and functions such as ``{tag}``. See also
7488 7472 :hg:`help templates`.
7489 7473
7490 7474 :type: String. ``local`` for local tags.
7491 7475
7492 7476 Returns 0 on success.
7493 7477 """
7494 7478
7495 7479 opts = pycompat.byteskwargs(opts)
7496 7480 ui.pager(b'tags')
7497 7481 fm = ui.formatter(b'tags', opts)
7498 7482 hexfunc = fm.hexfunc
7499 7483
7500 7484 for t, n in reversed(repo.tagslist()):
7501 7485 hn = hexfunc(n)
7502 7486 label = b'tags.normal'
7503 7487 tagtype = repo.tagtype(t)
7504 7488 if not tagtype or tagtype == b'global':
7505 7489 tagtype = b''
7506 7490 else:
7507 7491 label = b'tags.' + tagtype
7508 7492
7509 7493 fm.startitem()
7510 7494 fm.context(repo=repo)
7511 7495 fm.write(b'tag', b'%s', t, label=label)
7512 7496 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7513 7497 fm.condwrite(
7514 7498 not ui.quiet,
7515 7499 b'rev node',
7516 7500 fmt,
7517 7501 repo.changelog.rev(n),
7518 7502 hn,
7519 7503 label=label,
7520 7504 )
7521 7505 fm.condwrite(
7522 7506 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7523 7507 )
7524 7508 fm.plain(b'\n')
7525 7509 fm.end()
7526 7510
7527 7511
7528 7512 @command(
7529 7513 b'tip',
7530 7514 [
7531 7515 (b'p', b'patch', None, _(b'show patch')),
7532 7516 (b'g', b'git', None, _(b'use git extended diff format')),
7533 7517 ]
7534 7518 + templateopts,
7535 7519 _(b'[-p] [-g]'),
7536 7520 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7537 7521 )
7538 7522 def tip(ui, repo, **opts):
7539 7523 """show the tip revision (DEPRECATED)
7540 7524
7541 7525 The tip revision (usually just called the tip) is the changeset
7542 7526 most recently added to the repository (and therefore the most
7543 7527 recently changed head).
7544 7528
7545 7529 If you have just made a commit, that commit will be the tip. If
7546 7530 you have just pulled changes from another repository, the tip of
7547 7531 that repository becomes the current tip. The "tip" tag is special
7548 7532 and cannot be renamed or assigned to a different changeset.
7549 7533
7550 7534 This command is deprecated, please use :hg:`heads` instead.
7551 7535
7552 7536 Returns 0 on success.
7553 7537 """
7554 7538 opts = pycompat.byteskwargs(opts)
7555 7539 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7556 7540 displayer.show(repo[b'tip'])
7557 7541 displayer.close()
7558 7542
7559 7543
7560 7544 @command(
7561 7545 b'unbundle',
7562 7546 [
7563 7547 (
7564 7548 b'u',
7565 7549 b'update',
7566 7550 None,
7567 7551 _(b'update to new branch head if changesets were unbundled'),
7568 7552 )
7569 7553 ],
7570 7554 _(b'[-u] FILE...'),
7571 7555 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7572 7556 )
7573 7557 def unbundle(ui, repo, fname1, *fnames, **opts):
7574 7558 """apply one or more bundle files
7575 7559
7576 7560 Apply one or more bundle files generated by :hg:`bundle`.
7577 7561
7578 7562 Returns 0 on success, 1 if an update has unresolved files.
7579 7563 """
7580 7564 fnames = (fname1,) + fnames
7581 7565
7582 7566 with repo.lock():
7583 7567 for fname in fnames:
7584 7568 f = hg.openpath(ui, fname)
7585 7569 gen = exchange.readbundle(ui, f, fname)
7586 7570 if isinstance(gen, streamclone.streamcloneapplier):
7587 7571 raise error.InputError(
7588 7572 _(
7589 7573 b'packed bundles cannot be applied with '
7590 7574 b'"hg unbundle"'
7591 7575 ),
7592 7576 hint=_(b'use "hg debugapplystreamclonebundle"'),
7593 7577 )
7594 7578 url = b'bundle:' + fname
7595 7579 try:
7596 7580 txnname = b'unbundle'
7597 7581 if not isinstance(gen, bundle2.unbundle20):
7598 7582 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7599 7583 with repo.transaction(txnname) as tr:
7600 7584 op = bundle2.applybundle(
7601 7585 repo, gen, tr, source=b'unbundle', url=url
7602 7586 )
7603 7587 except error.BundleUnknownFeatureError as exc:
7604 7588 raise error.Abort(
7605 7589 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7606 7590 hint=_(
7607 7591 b"see https://mercurial-scm.org/"
7608 7592 b"wiki/BundleFeature for more "
7609 7593 b"information"
7610 7594 ),
7611 7595 )
7612 7596 modheads = bundle2.combinechangegroupresults(op)
7613 7597
7614 7598 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7615 7599 return 1
7616 7600 else:
7617 7601 return 0
7618 7602
7619 7603
7620 7604 @command(
7621 7605 b'unshelve',
7622 7606 [
7623 7607 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7624 7608 (
7625 7609 b'c',
7626 7610 b'continue',
7627 7611 None,
7628 7612 _(b'continue an incomplete unshelve operation'),
7629 7613 ),
7630 7614 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7631 7615 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7632 7616 (
7633 7617 b'n',
7634 7618 b'name',
7635 7619 b'',
7636 7620 _(b'restore shelved change with given name'),
7637 7621 _(b'NAME'),
7638 7622 ),
7639 7623 (b't', b'tool', b'', _(b'specify merge tool')),
7640 7624 (
7641 7625 b'',
7642 7626 b'date',
7643 7627 b'',
7644 7628 _(b'set date for temporary commits (DEPRECATED)'),
7645 7629 _(b'DATE'),
7646 7630 ),
7647 7631 ],
7648 7632 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7649 7633 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7650 7634 )
7651 7635 def unshelve(ui, repo, *shelved, **opts):
7652 7636 """restore a shelved change to the working directory
7653 7637
7654 7638 This command accepts an optional name of a shelved change to
7655 7639 restore. If none is given, the most recent shelved change is used.
7656 7640
7657 7641 If a shelved change is applied successfully, the bundle that
7658 7642 contains the shelved changes is moved to a backup location
7659 7643 (.hg/shelve-backup).
7660 7644
7661 7645 Since you can restore a shelved change on top of an arbitrary
7662 7646 commit, it is possible that unshelving will result in a conflict
7663 7647 between your changes and the commits you are unshelving onto. If
7664 7648 this occurs, you must resolve the conflict, then use
7665 7649 ``--continue`` to complete the unshelve operation. (The bundle
7666 7650 will not be moved until you successfully complete the unshelve.)
7667 7651
7668 7652 (Alternatively, you can use ``--abort`` to abandon an unshelve
7669 7653 that causes a conflict. This reverts the unshelved changes, and
7670 7654 leaves the bundle in place.)
7671 7655
7672 7656 If bare shelved change (without interactive, include and exclude
7673 7657 option) was done on newly created branch it would restore branch
7674 7658 information to the working directory.
7675 7659
7676 7660 After a successful unshelve, the shelved changes are stored in a
7677 7661 backup directory. Only the N most recent backups are kept. N
7678 7662 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7679 7663 configuration option.
7680 7664
7681 7665 .. container:: verbose
7682 7666
7683 7667 Timestamp in seconds is used to decide order of backups. More
7684 7668 than ``maxbackups`` backups are kept, if same timestamp
7685 7669 prevents from deciding exact order of them, for safety.
7686 7670
7687 7671 Selected changes can be unshelved with ``--interactive`` flag.
7688 7672 The working directory is updated with the selected changes, and
7689 7673 only the unselected changes remain shelved.
7690 7674 Note: The whole shelve is applied to working directory first before
7691 7675 running interactively. So, this will bring up all the conflicts between
7692 7676 working directory and the shelve, irrespective of which changes will be
7693 7677 unshelved.
7694 7678 """
7695 7679 with repo.wlock():
7696 7680 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7697 7681
7698 7682
7699 7683 statemod.addunfinished(
7700 7684 b'unshelve',
7701 7685 fname=b'shelvedstate',
7702 7686 continueflag=True,
7703 7687 abortfunc=shelvemod.hgabortunshelve,
7704 7688 continuefunc=shelvemod.hgcontinueunshelve,
7705 7689 cmdmsg=_(b'unshelve already in progress'),
7706 7690 )
7707 7691
7708 7692
7709 7693 @command(
7710 7694 b'update|up|checkout|co',
7711 7695 [
7712 7696 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7713 7697 (b'c', b'check', None, _(b'require clean working directory')),
7714 7698 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7715 7699 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7716 7700 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7717 7701 ]
7718 7702 + mergetoolopts,
7719 7703 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7720 7704 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7721 7705 helpbasic=True,
7722 7706 )
7723 7707 def update(ui, repo, node=None, **opts):
7724 7708 """update working directory (or switch revisions)
7725 7709
7726 7710 Update the repository's working directory to the specified
7727 7711 changeset. If no changeset is specified, update to the tip of the
7728 7712 current named branch and move the active bookmark (see :hg:`help
7729 7713 bookmarks`).
7730 7714
7731 7715 Update sets the working directory's parent revision to the specified
7732 7716 changeset (see :hg:`help parents`).
7733 7717
7734 7718 If the changeset is not a descendant or ancestor of the working
7735 7719 directory's parent and there are uncommitted changes, the update is
7736 7720 aborted. With the -c/--check option, the working directory is checked
7737 7721 for uncommitted changes; if none are found, the working directory is
7738 7722 updated to the specified changeset.
7739 7723
7740 7724 .. container:: verbose
7741 7725
7742 7726 The -C/--clean, -c/--check, and -m/--merge options control what
7743 7727 happens if the working directory contains uncommitted changes.
7744 7728 At most of one of them can be specified.
7745 7729
7746 7730 1. If no option is specified, and if
7747 7731 the requested changeset is an ancestor or descendant of
7748 7732 the working directory's parent, the uncommitted changes
7749 7733 are merged into the requested changeset and the merged
7750 7734 result is left uncommitted. If the requested changeset is
7751 7735 not an ancestor or descendant (that is, it is on another
7752 7736 branch), the update is aborted and the uncommitted changes
7753 7737 are preserved.
7754 7738
7755 7739 2. With the -m/--merge option, the update is allowed even if the
7756 7740 requested changeset is not an ancestor or descendant of
7757 7741 the working directory's parent.
7758 7742
7759 7743 3. With the -c/--check option, the update is aborted and the
7760 7744 uncommitted changes are preserved.
7761 7745
7762 7746 4. With the -C/--clean option, uncommitted changes are discarded and
7763 7747 the working directory is updated to the requested changeset.
7764 7748
7765 7749 To cancel an uncommitted merge (and lose your changes), use
7766 7750 :hg:`merge --abort`.
7767 7751
7768 7752 Use null as the changeset to remove the working directory (like
7769 7753 :hg:`clone -U`).
7770 7754
7771 7755 If you want to revert just one file to an older revision, use
7772 7756 :hg:`revert [-r REV] NAME`.
7773 7757
7774 7758 See :hg:`help dates` for a list of formats valid for -d/--date.
7775 7759
7776 7760 Returns 0 on success, 1 if there are unresolved files.
7777 7761 """
7778 7762 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7779 7763 rev = opts.get('rev')
7780 7764 date = opts.get('date')
7781 7765 clean = opts.get('clean')
7782 7766 check = opts.get('check')
7783 7767 merge = opts.get('merge')
7784 7768 if rev and node:
7785 7769 raise error.InputError(_(b"please specify just one revision"))
7786 7770
7787 7771 if ui.configbool(b'commands', b'update.requiredest'):
7788 7772 if not node and not rev and not date:
7789 7773 raise error.InputError(
7790 7774 _(b'you must specify a destination'),
7791 7775 hint=_(b'for example: hg update ".::"'),
7792 7776 )
7793 7777
7794 7778 if rev is None or rev == b'':
7795 7779 rev = node
7796 7780
7797 7781 if date and rev is not None:
7798 7782 raise error.InputError(_(b"you can't specify a revision and a date"))
7799 7783
7800 7784 updatecheck = None
7801 7785 if check:
7802 7786 updatecheck = b'abort'
7803 7787 elif merge:
7804 7788 updatecheck = b'none'
7805 7789
7806 7790 with repo.wlock():
7807 7791 cmdutil.clearunfinished(repo)
7808 7792 if date:
7809 7793 rev = cmdutil.finddate(ui, repo, date)
7810 7794
7811 7795 # if we defined a bookmark, we have to remember the original name
7812 7796 brev = rev
7813 7797 if rev:
7814 7798 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7815 7799 ctx = scmutil.revsingle(repo, rev, default=None)
7816 7800 rev = ctx.rev()
7817 7801 hidden = ctx.hidden()
7818 7802 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7819 7803 with ui.configoverride(overrides, b'update'):
7820 7804 ret = hg.updatetotally(
7821 7805 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7822 7806 )
7823 7807 if hidden:
7824 7808 ctxstr = ctx.hex()[:12]
7825 7809 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7826 7810
7827 7811 if ctx.obsolete():
7828 7812 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7829 7813 ui.warn(b"(%s)\n" % obsfatemsg)
7830 7814 return ret
7831 7815
7832 7816
7833 7817 @command(
7834 7818 b'verify',
7835 7819 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7836 7820 helpcategory=command.CATEGORY_MAINTENANCE,
7837 7821 )
7838 7822 def verify(ui, repo, **opts):
7839 7823 """verify the integrity of the repository
7840 7824
7841 7825 Verify the integrity of the current repository.
7842 7826
7843 7827 This will perform an extensive check of the repository's
7844 7828 integrity, validating the hashes and checksums of each entry in
7845 7829 the changelog, manifest, and tracked files, as well as the
7846 7830 integrity of their crosslinks and indices.
7847 7831
7848 7832 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7849 7833 for more information about recovery from corruption of the
7850 7834 repository.
7851 7835
7852 7836 Returns 0 on success, 1 if errors are encountered.
7853 7837 """
7854 7838 opts = pycompat.byteskwargs(opts)
7855 7839
7856 7840 level = None
7857 7841 if opts[b'full']:
7858 7842 level = verifymod.VERIFY_FULL
7859 7843 return hg.verify(repo, level)
7860 7844
7861 7845
7862 7846 @command(
7863 7847 b'version',
7864 7848 [] + formatteropts,
7865 7849 helpcategory=command.CATEGORY_HELP,
7866 7850 norepo=True,
7867 7851 intents={INTENT_READONLY},
7868 7852 )
7869 7853 def version_(ui, **opts):
7870 7854 """output version and copyright information
7871 7855
7872 7856 .. container:: verbose
7873 7857
7874 7858 Template:
7875 7859
7876 7860 The following keywords are supported. See also :hg:`help templates`.
7877 7861
7878 7862 :extensions: List of extensions.
7879 7863 :ver: String. Version number.
7880 7864
7881 7865 And each entry of ``{extensions}`` provides the following sub-keywords
7882 7866 in addition to ``{ver}``.
7883 7867
7884 7868 :bundled: Boolean. True if included in the release.
7885 7869 :name: String. Extension name.
7886 7870 """
7887 7871 opts = pycompat.byteskwargs(opts)
7888 7872 if ui.verbose:
7889 7873 ui.pager(b'version')
7890 7874 fm = ui.formatter(b"version", opts)
7891 7875 fm.startitem()
7892 7876 fm.write(
7893 7877 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7894 7878 )
7895 7879 license = _(
7896 7880 b"(see https://mercurial-scm.org for more information)\n"
7897 7881 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7898 7882 b"This is free software; see the source for copying conditions. "
7899 7883 b"There is NO\nwarranty; "
7900 7884 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7901 7885 )
7902 7886 if not ui.quiet:
7903 7887 fm.plain(license)
7904 7888
7905 7889 if ui.verbose:
7906 7890 fm.plain(_(b"\nEnabled extensions:\n\n"))
7907 7891 # format names and versions into columns
7908 7892 names = []
7909 7893 vers = []
7910 7894 isinternals = []
7911 7895 for name, module in sorted(extensions.extensions()):
7912 7896 names.append(name)
7913 7897 vers.append(extensions.moduleversion(module) or None)
7914 7898 isinternals.append(extensions.ismoduleinternal(module))
7915 7899 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7916 7900 if names:
7917 7901 namefmt = b" %%-%ds " % max(len(n) for n in names)
7918 7902 places = [_(b"external"), _(b"internal")]
7919 7903 for n, v, p in zip(names, vers, isinternals):
7920 7904 fn.startitem()
7921 7905 fn.condwrite(ui.verbose, b"name", namefmt, n)
7922 7906 if ui.verbose:
7923 7907 fn.plain(b"%s " % places[p])
7924 7908 fn.data(bundled=p)
7925 7909 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7926 7910 if ui.verbose:
7927 7911 fn.plain(b"\n")
7928 7912 fn.end()
7929 7913 fm.end()
7930 7914
7931 7915
7932 7916 def loadcmdtable(ui, name, cmdtable):
7933 7917 """Load command functions from specified cmdtable"""
7934 7918 overrides = [cmd for cmd in cmdtable if cmd in table]
7935 7919 if overrides:
7936 7920 ui.warn(
7937 7921 _(b"extension '%s' overrides commands: %s\n")
7938 7922 % (name, b" ".join(overrides))
7939 7923 )
7940 7924 table.update(cmdtable)
@@ -1,1551 +1,1563 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 graphmod,
35 36 httppeer,
36 37 localrepo,
37 38 lock,
38 39 logcmdutil,
39 40 logexchange,
40 41 merge as mergemod,
41 42 mergestate as mergestatemod,
42 43 narrowspec,
43 44 phases,
44 45 requirements,
45 46 scmutil,
46 47 sshpeer,
47 48 statichttprepo,
48 49 ui as uimod,
49 50 unionrepo,
50 51 url,
51 52 util,
52 53 verify as verifymod,
53 54 vfs as vfsmod,
54 55 )
55 56 from .utils import (
56 57 hashutil,
57 58 stringutil,
58 59 urlutil,
59 60 )
60 61
61 62
62 63 release = lock.release
63 64
64 65 # shared features
65 66 sharedbookmarks = b'bookmarks'
66 67
67 68
68 69 def _local(path):
69 70 path = util.expandpath(urlutil.urllocalpath(path))
70 71
71 72 try:
72 73 # we use os.stat() directly here instead of os.path.isfile()
73 74 # because the latter started returning `False` on invalid path
74 75 # exceptions starting in 3.8 and we care about handling
75 76 # invalid paths specially here.
76 77 st = os.stat(path)
77 78 isfile = stat.S_ISREG(st.st_mode)
78 79 # Python 2 raises TypeError, Python 3 ValueError.
79 80 except (TypeError, ValueError) as e:
80 81 raise error.Abort(
81 82 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
82 83 )
83 84 except OSError:
84 85 isfile = False
85 86
86 87 return isfile and bundlerepo or localrepo
87 88
88 89
89 90 def addbranchrevs(lrepo, other, branches, revs):
90 91 peer = other.peer() # a courtesy to callers using a localrepo for other
91 92 hashbranch, branches = branches
92 93 if not hashbranch and not branches:
93 94 x = revs or None
94 95 if revs:
95 96 y = revs[0]
96 97 else:
97 98 y = None
98 99 return x, y
99 100 if revs:
100 101 revs = list(revs)
101 102 else:
102 103 revs = []
103 104
104 105 if not peer.capable(b'branchmap'):
105 106 if branches:
106 107 raise error.Abort(_(b"remote branch lookup not supported"))
107 108 revs.append(hashbranch)
108 109 return revs, revs[0]
109 110
110 111 with peer.commandexecutor() as e:
111 112 branchmap = e.callcommand(b'branchmap', {}).result()
112 113
113 114 def primary(branch):
114 115 if branch == b'.':
115 116 if not lrepo:
116 117 raise error.Abort(_(b"dirstate branch not accessible"))
117 118 branch = lrepo.dirstate.branch()
118 119 if branch in branchmap:
119 120 revs.extend(hex(r) for r in reversed(branchmap[branch]))
120 121 return True
121 122 else:
122 123 return False
123 124
124 125 for branch in branches:
125 126 if not primary(branch):
126 127 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
127 128 if hashbranch:
128 129 if not primary(hashbranch):
129 130 revs.append(hashbranch)
130 131 return revs, revs[0]
131 132
132 133
133 134 def parseurl(path, branches=None):
134 135 '''parse url#branch, returning (url, (branch, branches))'''
135 136 msg = b'parseurl(...) moved to mercurial.utils.urlutil'
136 137 util.nouideprecwarn(msg, b'6.0', stacklevel=2)
137 138 return urlutil.parseurl(path, branches=branches)
138 139
139 140
140 141 schemes = {
141 142 b'bundle': bundlerepo,
142 143 b'union': unionrepo,
143 144 b'file': _local,
144 145 b'http': httppeer,
145 146 b'https': httppeer,
146 147 b'ssh': sshpeer,
147 148 b'static-http': statichttprepo,
148 149 }
149 150
150 151
151 152 def _peerlookup(path):
152 153 u = urlutil.url(path)
153 154 scheme = u.scheme or b'file'
154 155 thing = schemes.get(scheme) or schemes[b'file']
155 156 try:
156 157 return thing(path)
157 158 except TypeError:
158 159 # we can't test callable(thing) because 'thing' can be an unloaded
159 160 # module that implements __call__
160 161 if not util.safehasattr(thing, b'instance'):
161 162 raise
162 163 return thing
163 164
164 165
165 166 def islocal(repo):
166 167 '''return true if repo (or path pointing to repo) is local'''
167 168 if isinstance(repo, bytes):
168 169 try:
169 170 return _peerlookup(repo).islocal(repo)
170 171 except AttributeError:
171 172 return False
172 173 return repo.local()
173 174
174 175
175 176 def openpath(ui, path, sendaccept=True):
176 177 '''open path with open if local, url.open if remote'''
177 178 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
178 179 if pathurl.islocal():
179 180 return util.posixfile(pathurl.localpath(), b'rb')
180 181 else:
181 182 return url.open(ui, path, sendaccept=sendaccept)
182 183
183 184
184 185 # a list of (ui, repo) functions called for wire peer initialization
185 186 wirepeersetupfuncs = []
186 187
187 188
188 189 def _peerorrepo(
189 190 ui, path, create=False, presetupfuncs=None, intents=None, createopts=None
190 191 ):
191 192 """return a repository object for the specified path"""
192 193 obj = _peerlookup(path).instance(
193 194 ui, path, create, intents=intents, createopts=createopts
194 195 )
195 196 ui = getattr(obj, "ui", ui)
196 197 for f in presetupfuncs or []:
197 198 f(ui, obj)
198 199 ui.log(b'extension', b'- executing reposetup hooks\n')
199 200 with util.timedcm('all reposetup') as allreposetupstats:
200 201 for name, module in extensions.extensions(ui):
201 202 ui.log(b'extension', b' - running reposetup for %s\n', name)
202 203 hook = getattr(module, 'reposetup', None)
203 204 if hook:
204 205 with util.timedcm('reposetup %r', name) as stats:
205 206 hook(ui, obj)
206 207 ui.log(
207 208 b'extension', b' > reposetup for %s took %s\n', name, stats
208 209 )
209 210 ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats)
210 211 if not obj.local():
211 212 for f in wirepeersetupfuncs:
212 213 f(ui, obj)
213 214 return obj
214 215
215 216
216 217 def repository(
217 218 ui,
218 219 path=b'',
219 220 create=False,
220 221 presetupfuncs=None,
221 222 intents=None,
222 223 createopts=None,
223 224 ):
224 225 """return a repository object for the specified path"""
225 226 peer = _peerorrepo(
226 227 ui,
227 228 path,
228 229 create,
229 230 presetupfuncs=presetupfuncs,
230 231 intents=intents,
231 232 createopts=createopts,
232 233 )
233 234 repo = peer.local()
234 235 if not repo:
235 236 raise error.Abort(
236 237 _(b"repository '%s' is not local") % (path or peer.url())
237 238 )
238 239 return repo.filtered(b'visible')
239 240
240 241
241 242 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
242 243 '''return a repository peer for the specified path'''
243 244 rui = remoteui(uiorrepo, opts)
244 245 return _peerorrepo(
245 246 rui, path, create, intents=intents, createopts=createopts
246 247 ).peer()
247 248
248 249
249 250 def defaultdest(source):
250 251 """return default destination of clone if none is given
251 252
252 253 >>> defaultdest(b'foo')
253 254 'foo'
254 255 >>> defaultdest(b'/foo/bar')
255 256 'bar'
256 257 >>> defaultdest(b'/')
257 258 ''
258 259 >>> defaultdest(b'')
259 260 ''
260 261 >>> defaultdest(b'http://example.org/')
261 262 ''
262 263 >>> defaultdest(b'http://example.org/foo/')
263 264 'foo'
264 265 """
265 266 path = urlutil.url(source).path
266 267 if not path:
267 268 return b''
268 269 return os.path.basename(os.path.normpath(path))
269 270
270 271
271 272 def sharedreposource(repo):
272 273 """Returns repository object for source repository of a shared repo.
273 274
274 275 If repo is not a shared repository, returns None.
275 276 """
276 277 if repo.sharedpath == repo.path:
277 278 return None
278 279
279 280 if util.safehasattr(repo, b'srcrepo') and repo.srcrepo:
280 281 return repo.srcrepo
281 282
282 283 # the sharedpath always ends in the .hg; we want the path to the repo
283 284 source = repo.vfs.split(repo.sharedpath)[0]
284 285 srcurl, branches = urlutil.parseurl(source)
285 286 srcrepo = repository(repo.ui, srcurl)
286 287 repo.srcrepo = srcrepo
287 288 return srcrepo
288 289
289 290
290 291 def share(
291 292 ui,
292 293 source,
293 294 dest=None,
294 295 update=True,
295 296 bookmarks=True,
296 297 defaultpath=None,
297 298 relative=False,
298 299 ):
299 300 '''create a shared repository'''
300 301
301 302 if not islocal(source):
302 303 raise error.Abort(_(b'can only share local repositories'))
303 304
304 305 if not dest:
305 306 dest = defaultdest(source)
306 307 else:
307 308 dest = ui.expandpath(dest)
308 309
309 310 if isinstance(source, bytes):
310 311 origsource = ui.expandpath(source)
311 312 source, branches = urlutil.parseurl(origsource)
312 313 srcrepo = repository(ui, source)
313 314 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
314 315 else:
315 316 srcrepo = source.local()
316 317 checkout = None
317 318
318 319 shareditems = set()
319 320 if bookmarks:
320 321 shareditems.add(sharedbookmarks)
321 322
322 323 r = repository(
323 324 ui,
324 325 dest,
325 326 create=True,
326 327 createopts={
327 328 b'sharedrepo': srcrepo,
328 329 b'sharedrelative': relative,
329 330 b'shareditems': shareditems,
330 331 },
331 332 )
332 333
333 334 postshare(srcrepo, r, defaultpath=defaultpath)
334 335 r = repository(ui, dest)
335 336 _postshareupdate(r, update, checkout=checkout)
336 337 return r
337 338
338 339
339 340 def _prependsourcehgrc(repo):
340 341 """copies the source repo config and prepend it in current repo .hg/hgrc
341 342 on unshare. This is only done if the share was perfomed using share safe
342 343 method where we share config of source in shares"""
343 344 srcvfs = vfsmod.vfs(repo.sharedpath)
344 345 dstvfs = vfsmod.vfs(repo.path)
345 346
346 347 if not srcvfs.exists(b'hgrc'):
347 348 return
348 349
349 350 currentconfig = b''
350 351 if dstvfs.exists(b'hgrc'):
351 352 currentconfig = dstvfs.read(b'hgrc')
352 353
353 354 with dstvfs(b'hgrc', b'wb') as fp:
354 355 sourceconfig = srcvfs.read(b'hgrc')
355 356 fp.write(b"# Config copied from shared source\n")
356 357 fp.write(sourceconfig)
357 358 fp.write(b'\n')
358 359 fp.write(currentconfig)
359 360
360 361
361 362 def unshare(ui, repo):
362 363 """convert a shared repository to a normal one
363 364
364 365 Copy the store data to the repo and remove the sharedpath data.
365 366
366 367 Returns a new repository object representing the unshared repository.
367 368
368 369 The passed repository object is not usable after this function is
369 370 called.
370 371 """
371 372
372 373 with repo.lock():
373 374 # we use locks here because if we race with commit, we
374 375 # can end up with extra data in the cloned revlogs that's
375 376 # not pointed to by changesets, thus causing verify to
376 377 # fail
377 378 destlock = copystore(ui, repo, repo.path)
378 379 with destlock or util.nullcontextmanager():
379 380 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
380 381 # we were sharing .hg/hgrc of the share source with the current
381 382 # repo. We need to copy that while unsharing otherwise it can
382 383 # disable hooks and other checks
383 384 _prependsourcehgrc(repo)
384 385
385 386 sharefile = repo.vfs.join(b'sharedpath')
386 387 util.rename(sharefile, sharefile + b'.old')
387 388
388 389 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
389 390 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
390 391 scmutil.writereporequirements(repo)
391 392
392 393 # Removing share changes some fundamental properties of the repo instance.
393 394 # So we instantiate a new repo object and operate on it rather than
394 395 # try to keep the existing repo usable.
395 396 newrepo = repository(repo.baseui, repo.root, create=False)
396 397
397 398 # TODO: figure out how to access subrepos that exist, but were previously
398 399 # removed from .hgsub
399 400 c = newrepo[b'.']
400 401 subs = c.substate
401 402 for s in sorted(subs):
402 403 c.sub(s).unshare()
403 404
404 405 localrepo.poisonrepository(repo)
405 406
406 407 return newrepo
407 408
408 409
409 410 def postshare(sourcerepo, destrepo, defaultpath=None):
410 411 """Called after a new shared repo is created.
411 412
412 413 The new repo only has a requirements file and pointer to the source.
413 414 This function configures additional shared data.
414 415
415 416 Extensions can wrap this function and write additional entries to
416 417 destrepo/.hg/shared to indicate additional pieces of data to be shared.
417 418 """
418 419 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
419 420 if default:
420 421 template = b'[paths]\ndefault = %s\n'
421 422 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
422 423 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
423 424 with destrepo.wlock():
424 425 narrowspec.copytoworkingcopy(destrepo)
425 426
426 427
427 428 def _postshareupdate(repo, update, checkout=None):
428 429 """Maybe perform a working directory update after a shared repo is created.
429 430
430 431 ``update`` can be a boolean or a revision to update to.
431 432 """
432 433 if not update:
433 434 return
434 435
435 436 repo.ui.status(_(b"updating working directory\n"))
436 437 if update is not True:
437 438 checkout = update
438 439 for test in (checkout, b'default', b'tip'):
439 440 if test is None:
440 441 continue
441 442 try:
442 443 uprev = repo.lookup(test)
443 444 break
444 445 except error.RepoLookupError:
445 446 continue
446 447 _update(repo, uprev)
447 448
448 449
449 450 def copystore(ui, srcrepo, destpath):
450 451 """copy files from store of srcrepo in destpath
451 452
452 453 returns destlock
453 454 """
454 455 destlock = None
455 456 try:
456 457 hardlink = None
457 458 topic = _(b'linking') if hardlink else _(b'copying')
458 459 with ui.makeprogress(topic, unit=_(b'files')) as progress:
459 460 num = 0
460 461 srcpublishing = srcrepo.publishing()
461 462 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
462 463 dstvfs = vfsmod.vfs(destpath)
463 464 for f in srcrepo.store.copylist():
464 465 if srcpublishing and f.endswith(b'phaseroots'):
465 466 continue
466 467 dstbase = os.path.dirname(f)
467 468 if dstbase and not dstvfs.exists(dstbase):
468 469 dstvfs.mkdir(dstbase)
469 470 if srcvfs.exists(f):
470 471 if f.endswith(b'data'):
471 472 # 'dstbase' may be empty (e.g. revlog format 0)
472 473 lockfile = os.path.join(dstbase, b"lock")
473 474 # lock to avoid premature writing to the target
474 475 destlock = lock.lock(dstvfs, lockfile)
475 476 hardlink, n = util.copyfiles(
476 477 srcvfs.join(f), dstvfs.join(f), hardlink, progress
477 478 )
478 479 num += n
479 480 if hardlink:
480 481 ui.debug(b"linked %d files\n" % num)
481 482 else:
482 483 ui.debug(b"copied %d files\n" % num)
483 484 return destlock
484 485 except: # re-raises
485 486 release(destlock)
486 487 raise
487 488
488 489
489 490 def clonewithshare(
490 491 ui,
491 492 peeropts,
492 493 sharepath,
493 494 source,
494 495 srcpeer,
495 496 dest,
496 497 pull=False,
497 498 rev=None,
498 499 update=True,
499 500 stream=False,
500 501 ):
501 502 """Perform a clone using a shared repo.
502 503
503 504 The store for the repository will be located at <sharepath>/.hg. The
504 505 specified revisions will be cloned or pulled from "source". A shared repo
505 506 will be created at "dest" and a working copy will be created if "update" is
506 507 True.
507 508 """
508 509 revs = None
509 510 if rev:
510 511 if not srcpeer.capable(b'lookup'):
511 512 raise error.Abort(
512 513 _(
513 514 b"src repository does not support "
514 515 b"revision lookup and so doesn't "
515 516 b"support clone by revision"
516 517 )
517 518 )
518 519
519 520 # TODO this is batchable.
520 521 remoterevs = []
521 522 for r in rev:
522 523 with srcpeer.commandexecutor() as e:
523 524 remoterevs.append(
524 525 e.callcommand(
525 526 b'lookup',
526 527 {
527 528 b'key': r,
528 529 },
529 530 ).result()
530 531 )
531 532 revs = remoterevs
532 533
533 534 # Obtain a lock before checking for or cloning the pooled repo otherwise
534 535 # 2 clients may race creating or populating it.
535 536 pooldir = os.path.dirname(sharepath)
536 537 # lock class requires the directory to exist.
537 538 try:
538 539 util.makedir(pooldir, False)
539 540 except OSError as e:
540 541 if e.errno != errno.EEXIST:
541 542 raise
542 543
543 544 poolvfs = vfsmod.vfs(pooldir)
544 545 basename = os.path.basename(sharepath)
545 546
546 547 with lock.lock(poolvfs, b'%s.lock' % basename):
547 548 if os.path.exists(sharepath):
548 549 ui.status(
549 550 _(b'(sharing from existing pooled repository %s)\n') % basename
550 551 )
551 552 else:
552 553 ui.status(
553 554 _(b'(sharing from new pooled repository %s)\n') % basename
554 555 )
555 556 # Always use pull mode because hardlinks in share mode don't work
556 557 # well. Never update because working copies aren't necessary in
557 558 # share mode.
558 559 clone(
559 560 ui,
560 561 peeropts,
561 562 source,
562 563 dest=sharepath,
563 564 pull=True,
564 565 revs=rev,
565 566 update=False,
566 567 stream=stream,
567 568 )
568 569
569 570 # Resolve the value to put in [paths] section for the source.
570 571 if islocal(source):
571 572 defaultpath = os.path.abspath(urlutil.urllocalpath(source))
572 573 else:
573 574 defaultpath = source
574 575
575 576 sharerepo = repository(ui, path=sharepath)
576 577 destrepo = share(
577 578 ui,
578 579 sharerepo,
579 580 dest=dest,
580 581 update=False,
581 582 bookmarks=False,
582 583 defaultpath=defaultpath,
583 584 )
584 585
585 586 # We need to perform a pull against the dest repo to fetch bookmarks
586 587 # and other non-store data that isn't shared by default. In the case of
587 588 # non-existing shared repo, this means we pull from the remote twice. This
588 589 # is a bit weird. But at the time it was implemented, there wasn't an easy
589 590 # way to pull just non-changegroup data.
590 591 exchange.pull(destrepo, srcpeer, heads=revs)
591 592
592 593 _postshareupdate(destrepo, update)
593 594
594 595 return srcpeer, peer(ui, peeropts, dest)
595 596
596 597
597 598 # Recomputing caches is often slow on big repos, so copy them.
598 599 def _copycache(srcrepo, dstcachedir, fname):
599 600 """copy a cache from srcrepo to destcachedir (if it exists)"""
600 601 srcfname = srcrepo.cachevfs.join(fname)
601 602 dstfname = os.path.join(dstcachedir, fname)
602 603 if os.path.exists(srcfname):
603 604 if not os.path.exists(dstcachedir):
604 605 os.mkdir(dstcachedir)
605 606 util.copyfile(srcfname, dstfname)
606 607
607 608
608 609 def clone(
609 610 ui,
610 611 peeropts,
611 612 source,
612 613 dest=None,
613 614 pull=False,
614 615 revs=None,
615 616 update=True,
616 617 stream=False,
617 618 branch=None,
618 619 shareopts=None,
619 620 storeincludepats=None,
620 621 storeexcludepats=None,
621 622 depth=None,
622 623 ):
623 624 """Make a copy of an existing repository.
624 625
625 626 Create a copy of an existing repository in a new directory. The
626 627 source and destination are URLs, as passed to the repository
627 628 function. Returns a pair of repository peers, the source and
628 629 newly created destination.
629 630
630 631 The location of the source is added to the new repository's
631 632 .hg/hgrc file, as the default to be used for future pulls and
632 633 pushes.
633 634
634 635 If an exception is raised, the partly cloned/updated destination
635 636 repository will be deleted.
636 637
637 638 Arguments:
638 639
639 640 source: repository object or URL
640 641
641 642 dest: URL of destination repository to create (defaults to base
642 643 name of source repository)
643 644
644 645 pull: always pull from source repository, even in local case or if the
645 646 server prefers streaming
646 647
647 648 stream: stream raw data uncompressed from repository (fast over
648 649 LAN, slow over WAN)
649 650
650 651 revs: revision to clone up to (implies pull=True)
651 652
652 653 update: update working directory after clone completes, if
653 654 destination is local repository (True means update to default rev,
654 655 anything else is treated as a revision)
655 656
656 657 branch: branches to clone
657 658
658 659 shareopts: dict of options to control auto sharing behavior. The "pool" key
659 660 activates auto sharing mode and defines the directory for stores. The
660 661 "mode" key determines how to construct the directory name of the shared
661 662 repository. "identity" means the name is derived from the node of the first
662 663 changeset in the repository. "remote" means the name is derived from the
663 664 remote's path/URL. Defaults to "identity."
664 665
665 666 storeincludepats and storeexcludepats: sets of file patterns to include and
666 667 exclude in the repository copy, respectively. If not defined, all files
667 668 will be included (a "full" clone). Otherwise a "narrow" clone containing
668 669 only the requested files will be performed. If ``storeincludepats`` is not
669 670 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
670 671 ``path:.``. If both are empty sets, no files will be cloned.
671 672 """
672 673
673 674 if isinstance(source, bytes):
674 675 origsource = ui.expandpath(source)
675 676 source, branches = urlutil.parseurl(origsource, branch)
676 677 srcpeer = peer(ui, peeropts, source)
677 678 else:
678 679 srcpeer = source.peer() # in case we were called with a localrepo
679 680 branches = (None, branch or [])
680 681 origsource = source = srcpeer.url()
681 682 srclock = destlock = cleandir = None
682 683 destpeer = None
683 684 try:
684 685 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
685 686
686 687 if dest is None:
687 688 dest = defaultdest(source)
688 689 if dest:
689 690 ui.status(_(b"destination directory: %s\n") % dest)
690 691 else:
691 692 dest = ui.expandpath(dest)
692 693
693 694 dest = urlutil.urllocalpath(dest)
694 695 source = urlutil.urllocalpath(source)
695 696
696 697 if not dest:
697 698 raise error.InputError(_(b"empty destination path is not valid"))
698 699
699 700 destvfs = vfsmod.vfs(dest, expandpath=True)
700 701 if destvfs.lexists():
701 702 if not destvfs.isdir():
702 703 raise error.InputError(
703 704 _(b"destination '%s' already exists") % dest
704 705 )
705 706 elif destvfs.listdir():
706 707 raise error.InputError(
707 708 _(b"destination '%s' is not empty") % dest
708 709 )
709 710
710 711 createopts = {}
711 712 narrow = False
712 713
713 714 if storeincludepats is not None:
714 715 narrowspec.validatepatterns(storeincludepats)
715 716 narrow = True
716 717
717 718 if storeexcludepats is not None:
718 719 narrowspec.validatepatterns(storeexcludepats)
719 720 narrow = True
720 721
721 722 if narrow:
722 723 # Include everything by default if only exclusion patterns defined.
723 724 if storeexcludepats and not storeincludepats:
724 725 storeincludepats = {b'path:.'}
725 726
726 727 createopts[b'narrowfiles'] = True
727 728
728 729 if depth:
729 730 createopts[b'shallowfilestore'] = True
730 731
731 732 if srcpeer.capable(b'lfs-serve'):
732 733 # Repository creation honors the config if it disabled the extension, so
733 734 # we can't just announce that lfs will be enabled. This check avoids
734 735 # saying that lfs will be enabled, and then saying it's an unknown
735 736 # feature. The lfs creation option is set in either case so that a
736 737 # requirement is added. If the extension is explicitly disabled but the
737 738 # requirement is set, the clone aborts early, before transferring any
738 739 # data.
739 740 createopts[b'lfs'] = True
740 741
741 742 if extensions.disabled_help(b'lfs'):
742 743 ui.status(
743 744 _(
744 745 b'(remote is using large file support (lfs), but it is '
745 746 b'explicitly disabled in the local configuration)\n'
746 747 )
747 748 )
748 749 else:
749 750 ui.status(
750 751 _(
751 752 b'(remote is using large file support (lfs); lfs will '
752 753 b'be enabled for this repository)\n'
753 754 )
754 755 )
755 756
756 757 shareopts = shareopts or {}
757 758 sharepool = shareopts.get(b'pool')
758 759 sharenamemode = shareopts.get(b'mode')
759 760 if sharepool and islocal(dest):
760 761 sharepath = None
761 762 if sharenamemode == b'identity':
762 763 # Resolve the name from the initial changeset in the remote
763 764 # repository. This returns nullid when the remote is empty. It
764 765 # raises RepoLookupError if revision 0 is filtered or otherwise
765 766 # not available. If we fail to resolve, sharing is not enabled.
766 767 try:
767 768 with srcpeer.commandexecutor() as e:
768 769 rootnode = e.callcommand(
769 770 b'lookup',
770 771 {
771 772 b'key': b'0',
772 773 },
773 774 ).result()
774 775
775 776 if rootnode != nullid:
776 777 sharepath = os.path.join(sharepool, hex(rootnode))
777 778 else:
778 779 ui.status(
779 780 _(
780 781 b'(not using pooled storage: '
781 782 b'remote appears to be empty)\n'
782 783 )
783 784 )
784 785 except error.RepoLookupError:
785 786 ui.status(
786 787 _(
787 788 b'(not using pooled storage: '
788 789 b'unable to resolve identity of remote)\n'
789 790 )
790 791 )
791 792 elif sharenamemode == b'remote':
792 793 sharepath = os.path.join(
793 794 sharepool, hex(hashutil.sha1(source).digest())
794 795 )
795 796 else:
796 797 raise error.Abort(
797 798 _(b'unknown share naming mode: %s') % sharenamemode
798 799 )
799 800
800 801 # TODO this is a somewhat arbitrary restriction.
801 802 if narrow:
802 803 ui.status(
803 804 _(b'(pooled storage not supported for narrow clones)\n')
804 805 )
805 806 sharepath = None
806 807
807 808 if sharepath:
808 809 return clonewithshare(
809 810 ui,
810 811 peeropts,
811 812 sharepath,
812 813 source,
813 814 srcpeer,
814 815 dest,
815 816 pull=pull,
816 817 rev=revs,
817 818 update=update,
818 819 stream=stream,
819 820 )
820 821
821 822 srcrepo = srcpeer.local()
822 823
823 824 abspath = origsource
824 825 if islocal(origsource):
825 826 abspath = os.path.abspath(urlutil.urllocalpath(origsource))
826 827
827 828 if islocal(dest):
828 829 cleandir = dest
829 830
830 831 copy = False
831 832 if (
832 833 srcrepo
833 834 and srcrepo.cancopy()
834 835 and islocal(dest)
835 836 and not phases.hassecret(srcrepo)
836 837 ):
837 838 copy = not pull and not revs
838 839
839 840 # TODO this is a somewhat arbitrary restriction.
840 841 if narrow:
841 842 copy = False
842 843
843 844 if copy:
844 845 try:
845 846 # we use a lock here because if we race with commit, we
846 847 # can end up with extra data in the cloned revlogs that's
847 848 # not pointed to by changesets, thus causing verify to
848 849 # fail
849 850 srclock = srcrepo.lock(wait=False)
850 851 except error.LockError:
851 852 copy = False
852 853
853 854 if copy:
854 855 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
855 856 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
856 857 if not os.path.exists(dest):
857 858 util.makedirs(dest)
858 859 else:
859 860 # only clean up directories we create ourselves
860 861 cleandir = hgdir
861 862 try:
862 863 destpath = hgdir
863 864 util.makedir(destpath, notindexed=True)
864 865 except OSError as inst:
865 866 if inst.errno == errno.EEXIST:
866 867 cleandir = None
867 868 raise error.Abort(
868 869 _(b"destination '%s' already exists") % dest
869 870 )
870 871 raise
871 872
872 873 destlock = copystore(ui, srcrepo, destpath)
873 874 # copy bookmarks over
874 875 srcbookmarks = srcrepo.vfs.join(b'bookmarks')
875 876 dstbookmarks = os.path.join(destpath, b'bookmarks')
876 877 if os.path.exists(srcbookmarks):
877 878 util.copyfile(srcbookmarks, dstbookmarks)
878 879
879 880 dstcachedir = os.path.join(destpath, b'cache')
880 881 for cache in cacheutil.cachetocopy(srcrepo):
881 882 _copycache(srcrepo, dstcachedir, cache)
882 883
883 884 # we need to re-init the repo after manually copying the data
884 885 # into it
885 886 destpeer = peer(srcrepo, peeropts, dest)
886 887 srcrepo.hook(b'outgoing', source=b'clone', node=nullhex)
887 888 else:
888 889 try:
889 890 # only pass ui when no srcrepo
890 891 destpeer = peer(
891 892 srcrepo or ui,
892 893 peeropts,
893 894 dest,
894 895 create=True,
895 896 createopts=createopts,
896 897 )
897 898 except OSError as inst:
898 899 if inst.errno == errno.EEXIST:
899 900 cleandir = None
900 901 raise error.Abort(
901 902 _(b"destination '%s' already exists") % dest
902 903 )
903 904 raise
904 905
905 906 if revs:
906 907 if not srcpeer.capable(b'lookup'):
907 908 raise error.Abort(
908 909 _(
909 910 b"src repository does not support "
910 911 b"revision lookup and so doesn't "
911 912 b"support clone by revision"
912 913 )
913 914 )
914 915
915 916 # TODO this is batchable.
916 917 remoterevs = []
917 918 for rev in revs:
918 919 with srcpeer.commandexecutor() as e:
919 920 remoterevs.append(
920 921 e.callcommand(
921 922 b'lookup',
922 923 {
923 924 b'key': rev,
924 925 },
925 926 ).result()
926 927 )
927 928 revs = remoterevs
928 929
929 930 checkout = revs[0]
930 931 else:
931 932 revs = None
932 933 local = destpeer.local()
933 934 if local:
934 935 if narrow:
935 936 with local.wlock(), local.lock():
936 937 local.setnarrowpats(storeincludepats, storeexcludepats)
937 938 narrowspec.copytoworkingcopy(local)
938 939
939 940 u = urlutil.url(abspath)
940 941 defaulturl = bytes(u)
941 942 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
942 943 if not stream:
943 944 if pull:
944 945 stream = False
945 946 else:
946 947 stream = None
947 948 # internal config: ui.quietbookmarkmove
948 949 overrides = {(b'ui', b'quietbookmarkmove'): True}
949 950 with local.ui.configoverride(overrides, b'clone'):
950 951 exchange.pull(
951 952 local,
952 953 srcpeer,
953 954 revs,
954 955 streamclonerequested=stream,
955 956 includepats=storeincludepats,
956 957 excludepats=storeexcludepats,
957 958 depth=depth,
958 959 )
959 960 elif srcrepo:
960 961 # TODO lift restriction once exchange.push() accepts narrow
961 962 # push.
962 963 if narrow:
963 964 raise error.Abort(
964 965 _(
965 966 b'narrow clone not available for '
966 967 b'remote destinations'
967 968 )
968 969 )
969 970
970 971 exchange.push(
971 972 srcrepo,
972 973 destpeer,
973 974 revs=revs,
974 975 bookmarks=srcrepo._bookmarks.keys(),
975 976 )
976 977 else:
977 978 raise error.Abort(
978 979 _(b"clone from remote to remote not supported")
979 980 )
980 981
981 982 cleandir = None
982 983
983 984 destrepo = destpeer.local()
984 985 if destrepo:
985 986 template = uimod.samplehgrcs[b'cloned']
986 987 u = urlutil.url(abspath)
987 988 u.passwd = None
988 989 defaulturl = bytes(u)
989 990 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
990 991 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
991 992
992 993 if ui.configbool(b'experimental', b'remotenames'):
993 994 logexchange.pullremotenames(destrepo, srcpeer)
994 995
995 996 if update:
996 997 if update is not True:
997 998 with srcpeer.commandexecutor() as e:
998 999 checkout = e.callcommand(
999 1000 b'lookup',
1000 1001 {
1001 1002 b'key': update,
1002 1003 },
1003 1004 ).result()
1004 1005
1005 1006 uprev = None
1006 1007 status = None
1007 1008 if checkout is not None:
1008 1009 # Some extensions (at least hg-git and hg-subversion) have
1009 1010 # a peer.lookup() implementation that returns a name instead
1010 1011 # of a nodeid. We work around it here until we've figured
1011 1012 # out a better solution.
1012 1013 if len(checkout) == 20 and checkout in destrepo:
1013 1014 uprev = checkout
1014 1015 elif scmutil.isrevsymbol(destrepo, checkout):
1015 1016 uprev = scmutil.revsymbol(destrepo, checkout).node()
1016 1017 else:
1017 1018 if update is not True:
1018 1019 try:
1019 1020 uprev = destrepo.lookup(update)
1020 1021 except error.RepoLookupError:
1021 1022 pass
1022 1023 if uprev is None:
1023 1024 try:
1024 1025 if destrepo._activebookmark:
1025 1026 uprev = destrepo.lookup(destrepo._activebookmark)
1026 1027 update = destrepo._activebookmark
1027 1028 else:
1028 1029 uprev = destrepo._bookmarks[b'@']
1029 1030 update = b'@'
1030 1031 bn = destrepo[uprev].branch()
1031 1032 if bn == b'default':
1032 1033 status = _(b"updating to bookmark %s\n" % update)
1033 1034 else:
1034 1035 status = (
1035 1036 _(b"updating to bookmark %s on branch %s\n")
1036 1037 ) % (update, bn)
1037 1038 except KeyError:
1038 1039 try:
1039 1040 uprev = destrepo.branchtip(b'default')
1040 1041 except error.RepoLookupError:
1041 1042 uprev = destrepo.lookup(b'tip')
1042 1043 if not status:
1043 1044 bn = destrepo[uprev].branch()
1044 1045 status = _(b"updating to branch %s\n") % bn
1045 1046 destrepo.ui.status(status)
1046 1047 _update(destrepo, uprev)
1047 1048 if update in destrepo._bookmarks:
1048 1049 bookmarks.activate(destrepo, update)
1049 1050 if destlock is not None:
1050 1051 release(destlock)
1051 1052 # here is a tiny windows were someone could end up writing the
1052 1053 # repository before the cache are sure to be warm. This is "fine"
1053 1054 # as the only "bad" outcome would be some slowness. That potential
1054 1055 # slowness already affect reader.
1055 1056 with destrepo.lock():
1056 1057 destrepo.updatecaches(full=True)
1057 1058 finally:
1058 1059 release(srclock, destlock)
1059 1060 if cleandir is not None:
1060 1061 shutil.rmtree(cleandir, True)
1061 1062 if srcpeer is not None:
1062 1063 srcpeer.close()
1063 1064 if destpeer and destpeer.local() is None:
1064 1065 destpeer.close()
1065 1066 return srcpeer, destpeer
1066 1067
1067 1068
1068 1069 def _showstats(repo, stats, quietempty=False):
1069 1070 if quietempty and stats.isempty():
1070 1071 return
1071 1072 repo.ui.status(
1072 1073 _(
1073 1074 b"%d files updated, %d files merged, "
1074 1075 b"%d files removed, %d files unresolved\n"
1075 1076 )
1076 1077 % (
1077 1078 stats.updatedcount,
1078 1079 stats.mergedcount,
1079 1080 stats.removedcount,
1080 1081 stats.unresolvedcount,
1081 1082 )
1082 1083 )
1083 1084
1084 1085
1085 1086 def updaterepo(repo, node, overwrite, updatecheck=None):
1086 1087 """Update the working directory to node.
1087 1088
1088 1089 When overwrite is set, changes are clobbered, merged else
1089 1090
1090 1091 returns stats (see pydoc mercurial.merge.applyupdates)"""
1091 1092 repo.ui.deprecwarn(
1092 1093 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
1093 1094 b'5.7',
1094 1095 )
1095 1096 return mergemod._update(
1096 1097 repo,
1097 1098 node,
1098 1099 branchmerge=False,
1099 1100 force=overwrite,
1100 1101 labels=[b'working copy', b'destination'],
1101 1102 updatecheck=updatecheck,
1102 1103 )
1103 1104
1104 1105
1105 1106 def update(repo, node, quietempty=False, updatecheck=None):
1106 1107 """update the working directory to node"""
1107 1108 stats = mergemod.update(repo[node], updatecheck=updatecheck)
1108 1109 _showstats(repo, stats, quietempty)
1109 1110 if stats.unresolvedcount:
1110 1111 repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))
1111 1112 return stats.unresolvedcount > 0
1112 1113
1113 1114
1114 1115 # naming conflict in clone()
1115 1116 _update = update
1116 1117
1117 1118
1118 1119 def clean(repo, node, show_stats=True, quietempty=False):
1119 1120 """forcibly switch the working directory to node, clobbering changes"""
1120 1121 stats = mergemod.clean_update(repo[node])
1121 1122 assert stats.unresolvedcount == 0
1122 1123 if show_stats:
1123 1124 _showstats(repo, stats, quietempty)
1124 1125 return False
1125 1126
1126 1127
1127 1128 # naming conflict in updatetotally()
1128 1129 _clean = clean
1129 1130
1130 1131 _VALID_UPDATECHECKS = {
1131 1132 mergemod.UPDATECHECK_ABORT,
1132 1133 mergemod.UPDATECHECK_NONE,
1133 1134 mergemod.UPDATECHECK_LINEAR,
1134 1135 mergemod.UPDATECHECK_NO_CONFLICT,
1135 1136 }
1136 1137
1137 1138
1138 1139 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
1139 1140 """Update the working directory with extra care for non-file components
1140 1141
1141 1142 This takes care of non-file components below:
1142 1143
1143 1144 :bookmark: might be advanced or (in)activated
1144 1145
1145 1146 This takes arguments below:
1146 1147
1147 1148 :checkout: to which revision the working directory is updated
1148 1149 :brev: a name, which might be a bookmark to be activated after updating
1149 1150 :clean: whether changes in the working directory can be discarded
1150 1151 :updatecheck: how to deal with a dirty working directory
1151 1152
1152 1153 Valid values for updatecheck are the UPDATECHECK_* constants
1153 1154 defined in the merge module. Passing `None` will result in using the
1154 1155 configured default.
1155 1156
1156 1157 * ABORT: abort if the working directory is dirty
1157 1158 * NONE: don't check (merge working directory changes into destination)
1158 1159 * LINEAR: check that update is linear before merging working directory
1159 1160 changes into destination
1160 1161 * NO_CONFLICT: check that the update does not result in file merges
1161 1162
1162 1163 This returns whether conflict is detected at updating or not.
1163 1164 """
1164 1165 if updatecheck is None:
1165 1166 updatecheck = ui.config(b'commands', b'update.check')
1166 1167 if updatecheck not in _VALID_UPDATECHECKS:
1167 1168 # If not configured, or invalid value configured
1168 1169 updatecheck = mergemod.UPDATECHECK_LINEAR
1169 1170 if updatecheck not in _VALID_UPDATECHECKS:
1170 1171 raise ValueError(
1171 1172 r'Invalid updatecheck value %r (can accept %r)'
1172 1173 % (updatecheck, _VALID_UPDATECHECKS)
1173 1174 )
1174 1175 with repo.wlock():
1175 1176 movemarkfrom = None
1176 1177 warndest = False
1177 1178 if checkout is None:
1178 1179 updata = destutil.destupdate(repo, clean=clean)
1179 1180 checkout, movemarkfrom, brev = updata
1180 1181 warndest = True
1181 1182
1182 1183 if clean:
1183 1184 ret = _clean(repo, checkout)
1184 1185 else:
1185 1186 if updatecheck == mergemod.UPDATECHECK_ABORT:
1186 1187 cmdutil.bailifchanged(repo, merge=False)
1187 1188 updatecheck = mergemod.UPDATECHECK_NONE
1188 1189 ret = _update(repo, checkout, updatecheck=updatecheck)
1189 1190
1190 1191 if not ret and movemarkfrom:
1191 1192 if movemarkfrom == repo[b'.'].node():
1192 1193 pass # no-op update
1193 1194 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
1194 1195 b = ui.label(repo._activebookmark, b'bookmarks.active')
1195 1196 ui.status(_(b"updating bookmark %s\n") % b)
1196 1197 else:
1197 1198 # this can happen with a non-linear update
1198 1199 b = ui.label(repo._activebookmark, b'bookmarks')
1199 1200 ui.status(_(b"(leaving bookmark %s)\n") % b)
1200 1201 bookmarks.deactivate(repo)
1201 1202 elif brev in repo._bookmarks:
1202 1203 if brev != repo._activebookmark:
1203 1204 b = ui.label(brev, b'bookmarks.active')
1204 1205 ui.status(_(b"(activating bookmark %s)\n") % b)
1205 1206 bookmarks.activate(repo, brev)
1206 1207 elif brev:
1207 1208 if repo._activebookmark:
1208 1209 b = ui.label(repo._activebookmark, b'bookmarks')
1209 1210 ui.status(_(b"(leaving bookmark %s)\n") % b)
1210 1211 bookmarks.deactivate(repo)
1211 1212
1212 1213 if warndest:
1213 1214 destutil.statusotherdests(ui, repo)
1214 1215
1215 1216 return ret
1216 1217
1217 1218
1218 1219 def merge(
1219 1220 ctx,
1220 1221 force=False,
1221 1222 remind=True,
1222 1223 labels=None,
1223 1224 ):
1224 1225 """Branch merge with node, resolving changes. Return true if any
1225 1226 unresolved conflicts."""
1226 1227 repo = ctx.repo()
1227 1228 stats = mergemod.merge(ctx, force=force, labels=labels)
1228 1229 _showstats(repo, stats)
1229 1230 if stats.unresolvedcount:
1230 1231 repo.ui.status(
1231 1232 _(
1232 1233 b"use 'hg resolve' to retry unresolved file merges "
1233 1234 b"or 'hg merge --abort' to abandon\n"
1234 1235 )
1235 1236 )
1236 1237 elif remind:
1237 1238 repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
1238 1239 return stats.unresolvedcount > 0
1239 1240
1240 1241
1241 1242 def abortmerge(ui, repo):
1242 1243 ms = mergestatemod.mergestate.read(repo)
1243 1244 if ms.active():
1244 1245 # there were conflicts
1245 1246 node = ms.localctx.hex()
1246 1247 else:
1247 1248 # there were no conficts, mergestate was not stored
1248 1249 node = repo[b'.'].hex()
1249 1250
1250 1251 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
1251 1252 stats = mergemod.clean_update(repo[node])
1252 1253 assert stats.unresolvedcount == 0
1253 1254 _showstats(repo, stats)
1254 1255
1255 1256
1256 1257 def _incoming(
1257 1258 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
1258 1259 ):
1259 1260 """
1260 1261 Helper for incoming / gincoming.
1261 1262 displaychlist gets called with
1262 1263 (remoterepo, incomingchangesetlist, displayer) parameters,
1263 1264 and is supposed to contain only code that can't be unified.
1264 1265 """
1265 1266 source, branches = urlutil.parseurl(
1266 1267 ui.expandpath(source), opts.get(b'branch')
1267 1268 )
1268 1269 other = peer(repo, opts, source)
1269 1270 cleanupfn = other.close
1270 1271 try:
1271 1272 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
1272 1273 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
1273 1274
1274 1275 if revs:
1275 1276 revs = [other.lookup(rev) for rev in revs]
1276 1277 other, chlist, cleanupfn = bundlerepo.getremotechanges(
1277 1278 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
1278 1279 )
1279 1280
1280 1281 if not chlist:
1281 1282 ui.status(_(b"no changes found\n"))
1282 1283 return subreporecurse()
1283 1284 ui.pager(b'incoming')
1284 1285 displayer = logcmdutil.changesetdisplayer(
1285 1286 ui, other, opts, buffered=buffered
1286 1287 )
1287 1288 displaychlist(other, chlist, displayer)
1288 1289 displayer.close()
1289 1290 finally:
1290 1291 cleanupfn()
1291 1292 subreporecurse()
1292 1293 return 0 # exit code is zero since we found incoming changes
1293 1294
1294 1295
1295 1296 def incoming(ui, repo, source, opts):
1296 1297 def subreporecurse():
1297 1298 ret = 1
1298 1299 if opts.get(b'subrepos'):
1299 1300 ctx = repo[None]
1300 1301 for subpath in sorted(ctx.substate):
1301 1302 sub = ctx.sub(subpath)
1302 1303 ret = min(ret, sub.incoming(ui, source, opts))
1303 1304 return ret
1304 1305
1305 1306 def display(other, chlist, displayer):
1306 1307 limit = logcmdutil.getlimit(opts)
1307 1308 if opts.get(b'newest_first'):
1308 1309 chlist.reverse()
1309 1310 count = 0
1310 1311 for n in chlist:
1311 1312 if limit is not None and count >= limit:
1312 1313 break
1313 1314 parents = [p for p in other.changelog.parents(n) if p != nullid]
1314 1315 if opts.get(b'no_merges') and len(parents) == 2:
1315 1316 continue
1316 1317 count += 1
1317 1318 displayer.show(other[n])
1318 1319
1319 1320 return _incoming(display, subreporecurse, ui, repo, source, opts)
1320 1321
1321 1322
1322 1323 def _outgoing(ui, repo, dest, opts):
1323 1324 path = ui.getpath(dest, default=(b'default-push', b'default'))
1324 1325 if not path:
1325 1326 raise error.Abort(
1326 1327 _(b'default repository not configured!'),
1327 1328 hint=_(b"see 'hg help config.paths'"),
1328 1329 )
1329 1330 dest = path.pushloc or path.loc
1330 1331 branches = path.branch, opts.get(b'branch') or []
1331 1332
1332 1333 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1333 1334 revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
1334 1335 if revs:
1335 1336 revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]
1336 1337
1337 1338 other = peer(repo, opts, dest)
1338 1339 try:
1339 1340 outgoing = discovery.findcommonoutgoing(
1340 1341 repo, other, revs, force=opts.get(b'force')
1341 1342 )
1342 1343 o = outgoing.missing
1343 1344 if not o:
1344 1345 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
1345 1346 return o, other
1346 1347 except: # re-raises
1347 1348 other.close()
1348 1349 raise
1349 1350
1350 1351
1351 1352 def _outgoing_recurse(ui, repo, dest, opts):
1352 1353 ret = 1
1353 1354 if opts.get(b'subrepos'):
1354 1355 ctx = repo[None]
1355 1356 for subpath in sorted(ctx.substate):
1356 1357 sub = ctx.sub(subpath)
1357 1358 ret = min(ret, sub.outgoing(ui, dest, opts))
1358 1359 return ret
1359 1360
1360 1361
1361 1362 def _outgoing_filter(repo, revs, opts):
1362 1363 """apply revision filtering/ordering option for outgoing"""
1363 1364 limit = logcmdutil.getlimit(opts)
1364 1365 no_merges = opts.get(b'no_merges')
1365 1366 if opts.get(b'newest_first'):
1366 1367 revs.reverse()
1367 1368 if limit is None and not no_merges:
1368 1369 for r in revs:
1369 1370 yield r
1370 1371 return
1371 1372
1372 1373 count = 0
1373 1374 cl = repo.changelog
1374 1375 for n in revs:
1375 1376 if limit is not None and count >= limit:
1376 1377 break
1377 1378 parents = [p for p in cl.parents(n) if p != nullid]
1378 1379 if no_merges and len(parents) == 2:
1379 1380 continue
1380 1381 count += 1
1381 1382 yield n
1382 1383
1383 1384
1384 1385 def outgoing(ui, repo, dest, opts):
1385
1386 if opts.get(b'graph'):
1387 logcmdutil.checkunsupportedgraphflags([], opts)
1386 1388 o, other = _outgoing(ui, repo, dest, opts)
1387 1389 ret = 1
1388 1390 try:
1389 1391 if o:
1390 1392 ret = 0
1391 1393
1392 ui.pager(b'outgoing')
1393 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1394 for n in _outgoing_filter(repo, o, opts):
1395 displayer.show(repo[n])
1396 displayer.close()
1394 if opts.get(b'graph'):
1395 revdag = logcmdutil.graphrevs(repo, o, opts)
1396 ui.pager(b'outgoing')
1397 displayer = logcmdutil.changesetdisplayer(
1398 ui, repo, opts, buffered=True
1399 )
1400 logcmdutil.displaygraph(
1401 ui, repo, revdag, displayer, graphmod.asciiedges
1402 )
1403 else:
1404 ui.pager(b'outgoing')
1405 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1406 for n in _outgoing_filter(repo, o, opts):
1407 displayer.show(repo[n])
1408 displayer.close()
1397 1409 cmdutil.outgoinghooks(ui, repo, other, opts, o)
1398 1410 ret = min(ret, _outgoing_recurse(ui, repo, dest, opts))
1399 1411 return ret # exit code is zero since we found outgoing changes
1400 1412 finally:
1401 1413 other.close()
1402 1414
1403 1415
1404 1416 def verify(repo, level=None):
1405 1417 """verify the consistency of a repository"""
1406 1418 ret = verifymod.verify(repo, level=level)
1407 1419
1408 1420 # Broken subrepo references in hidden csets don't seem worth worrying about,
1409 1421 # since they can't be pushed/pulled, and --hidden can be used if they are a
1410 1422 # concern.
1411 1423
1412 1424 # pathto() is needed for -R case
1413 1425 revs = repo.revs(
1414 1426 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
1415 1427 )
1416 1428
1417 1429 if revs:
1418 1430 repo.ui.status(_(b'checking subrepo links\n'))
1419 1431 for rev in revs:
1420 1432 ctx = repo[rev]
1421 1433 try:
1422 1434 for subpath in ctx.substate:
1423 1435 try:
1424 1436 ret = (
1425 1437 ctx.sub(subpath, allowcreate=False).verify() or ret
1426 1438 )
1427 1439 except error.RepoError as e:
1428 1440 repo.ui.warn(b'%d: %s\n' % (rev, e))
1429 1441 except Exception:
1430 1442 repo.ui.warn(
1431 1443 _(b'.hgsubstate is corrupt in revision %s\n')
1432 1444 % short(ctx.node())
1433 1445 )
1434 1446
1435 1447 return ret
1436 1448
1437 1449
1438 1450 def remoteui(src, opts):
1439 1451 """build a remote ui from ui or repo and opts"""
1440 1452 if util.safehasattr(src, b'baseui'): # looks like a repository
1441 1453 dst = src.baseui.copy() # drop repo-specific config
1442 1454 src = src.ui # copy target options from repo
1443 1455 else: # assume it's a global ui object
1444 1456 dst = src.copy() # keep all global options
1445 1457
1446 1458 # copy ssh-specific options
1447 1459 for o in b'ssh', b'remotecmd':
1448 1460 v = opts.get(o) or src.config(b'ui', o)
1449 1461 if v:
1450 1462 dst.setconfig(b"ui", o, v, b'copied')
1451 1463
1452 1464 # copy bundle-specific options
1453 1465 r = src.config(b'bundle', b'mainreporoot')
1454 1466 if r:
1455 1467 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
1456 1468
1457 1469 # copy selected local settings to the remote ui
1458 1470 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
1459 1471 for key, val in src.configitems(sect):
1460 1472 dst.setconfig(sect, key, val, b'copied')
1461 1473 v = src.config(b'web', b'cacerts')
1462 1474 if v:
1463 1475 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
1464 1476
1465 1477 return dst
1466 1478
1467 1479
1468 1480 # Files of interest
1469 1481 # Used to check if the repository has changed looking at mtime and size of
1470 1482 # these files.
1471 1483 foi = [
1472 1484 (b'spath', b'00changelog.i'),
1473 1485 (b'spath', b'phaseroots'), # ! phase can change content at the same size
1474 1486 (b'spath', b'obsstore'),
1475 1487 (b'path', b'bookmarks'), # ! bookmark can change content at the same size
1476 1488 ]
1477 1489
1478 1490
1479 1491 class cachedlocalrepo(object):
1480 1492 """Holds a localrepository that can be cached and reused."""
1481 1493
1482 1494 def __init__(self, repo):
1483 1495 """Create a new cached repo from an existing repo.
1484 1496
1485 1497 We assume the passed in repo was recently created. If the
1486 1498 repo has changed between when it was created and when it was
1487 1499 turned into a cache, it may not refresh properly.
1488 1500 """
1489 1501 assert isinstance(repo, localrepo.localrepository)
1490 1502 self._repo = repo
1491 1503 self._state, self.mtime = self._repostate()
1492 1504 self._filtername = repo.filtername
1493 1505
1494 1506 def fetch(self):
1495 1507 """Refresh (if necessary) and return a repository.
1496 1508
1497 1509 If the cached instance is out of date, it will be recreated
1498 1510 automatically and returned.
1499 1511
1500 1512 Returns a tuple of the repo and a boolean indicating whether a new
1501 1513 repo instance was created.
1502 1514 """
1503 1515 # We compare the mtimes and sizes of some well-known files to
1504 1516 # determine if the repo changed. This is not precise, as mtimes
1505 1517 # are susceptible to clock skew and imprecise filesystems and
1506 1518 # file content can change while maintaining the same size.
1507 1519
1508 1520 state, mtime = self._repostate()
1509 1521 if state == self._state:
1510 1522 return self._repo, False
1511 1523
1512 1524 repo = repository(self._repo.baseui, self._repo.url())
1513 1525 if self._filtername:
1514 1526 self._repo = repo.filtered(self._filtername)
1515 1527 else:
1516 1528 self._repo = repo.unfiltered()
1517 1529 self._state = state
1518 1530 self.mtime = mtime
1519 1531
1520 1532 return self._repo, True
1521 1533
1522 1534 def _repostate(self):
1523 1535 state = []
1524 1536 maxmtime = -1
1525 1537 for attr, fname in foi:
1526 1538 prefix = getattr(self._repo, attr)
1527 1539 p = os.path.join(prefix, fname)
1528 1540 try:
1529 1541 st = os.stat(p)
1530 1542 except OSError:
1531 1543 st = os.stat(prefix)
1532 1544 state.append((st[stat.ST_MTIME], st.st_size))
1533 1545 maxmtime = max(maxmtime, st[stat.ST_MTIME])
1534 1546
1535 1547 return tuple(state), maxmtime
1536 1548
1537 1549 def copy(self):
1538 1550 """Obtain a copy of this class instance.
1539 1551
1540 1552 A new localrepository instance is obtained. The new instance should be
1541 1553 completely independent of the original.
1542 1554 """
1543 1555 repo = repository(self._repo.baseui, self._repo.origroot)
1544 1556 if self._filtername:
1545 1557 repo = repo.filtered(self._filtername)
1546 1558 else:
1547 1559 repo = repo.unfiltered()
1548 1560 c = cachedlocalrepo(repo)
1549 1561 c._state = self._state
1550 1562 c.mtime = self.mtime
1551 1563 return c
@@ -1,1315 +1,1316 b''
1 1 This file contains testcases that tend to be related to special cases or less
2 2 common commands affecting largefile.
3 3
4 4 $ hg init requirements
5 5 $ cd requirements
6 6
7 7 # largefiles not loaded by default.
8 8
9 9 $ hg config extensions
10 10 [1]
11 11
12 12 # Adding largefiles to requires file will auto-load largefiles extension.
13 13
14 14 $ echo largefiles >> .hg/requires
15 15 $ hg config extensions
16 16 extensions.largefiles=
17 17
18 18 # But only if there is no config entry for the extension already.
19 19
20 20 $ cat > .hg/hgrc << EOF
21 21 > [extensions]
22 22 > largefiles=!
23 23 > EOF
24 24
25 25 $ hg config extensions
26 26 abort: repository requires features unknown to this Mercurial: largefiles
27 27 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
28 28 [255]
29 29
30 30 $ cat > .hg/hgrc << EOF
31 31 > [extensions]
32 32 > largefiles=
33 33 > EOF
34 34
35 35 $ hg config extensions
36 36 extensions.largefiles=
37 37
38 38 $ cat > .hg/hgrc << EOF
39 39 > [extensions]
40 40 > largefiles = missing.py
41 41 > EOF
42 42
43 43 $ hg config extensions
44 44 \*\*\* failed to import extension largefiles from missing.py: [Errno *] $ENOENT$: 'missing.py' (glob)
45 45 abort: repository requires features unknown to this Mercurial: largefiles
46 46 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
47 47 [255]
48 48
49 49 $ cd ..
50 50
51 51 Each sections should be independent of each others.
52 52
53 53 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
54 54 $ mkdir "${USERCACHE}"
55 55 $ cat >> $HGRCPATH <<EOF
56 56 > [extensions]
57 57 > largefiles=
58 58 > purge=
59 59 > rebase=
60 60 > transplant=
61 61 > [phases]
62 62 > publish=False
63 63 > [largefiles]
64 64 > minsize=2
65 65 > patterns=glob:**.dat
66 66 > usercache=${USERCACHE}
67 67 > [hooks]
68 68 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
69 69 > EOF
70 70
71 71
72 72
73 73 Test copies and moves from a directory other than root (issue3516)
74 74 =========================================================================
75 75
76 76 $ hg init lf_cpmv
77 77 $ cd lf_cpmv
78 78 $ mkdir dira
79 79 $ mkdir dira/dirb
80 80 $ touch dira/dirb/largefile
81 81 $ hg add --large dira/dirb/largefile
82 82 $ hg commit -m "added"
83 83 Invoking status precommit hook
84 84 A dira/dirb/largefile
85 85 $ cd dira
86 86 $ hg cp dirb/largefile foo/largefile
87 87
88 88 TODO: Ideally, this should mention the largefile, not the standin
89 89 $ hg log -T '{rev}\n' --stat 'set:clean()'
90 90 0
91 91 .hglf/dira/dirb/largefile | 1 +
92 92 1 files changed, 1 insertions(+), 0 deletions(-)
93 93
94 94 $ hg ci -m "deep copy"
95 95 Invoking status precommit hook
96 96 A dira/foo/largefile
97 97 $ find . | sort
98 98 .
99 99 ./dirb
100 100 ./dirb/largefile
101 101 ./foo
102 102 ./foo/largefile
103 103 $ hg mv foo/largefile baz/largefile
104 104 $ hg ci -m "moved"
105 105 Invoking status precommit hook
106 106 A dira/baz/largefile
107 107 R dira/foo/largefile
108 108 $ find . | sort
109 109 .
110 110 ./baz
111 111 ./baz/largefile
112 112 ./dirb
113 113 ./dirb/largefile
114 114 $ cd ..
115 115 $ hg mv dira dirc
116 116 moving .hglf/dira/baz/largefile to .hglf/dirc/baz/largefile
117 117 moving .hglf/dira/dirb/largefile to .hglf/dirc/dirb/largefile
118 118 $ find * | sort
119 119 dirc
120 120 dirc/baz
121 121 dirc/baz/largefile
122 122 dirc/dirb
123 123 dirc/dirb/largefile
124 124
125 125 $ hg clone -q . ../fetch
126 126 $ hg --config extensions.fetch= fetch ../fetch
127 127 abort: uncommitted changes
128 128 [20]
129 129 $ hg up -qC
130 130 $ cd ..
131 131
132 132 Clone a local repository owned by another user
133 133 ===================================================
134 134
135 135 #if unix-permissions
136 136
137 137 We have to simulate that here by setting $HOME and removing write permissions
138 138 $ ORIGHOME="$HOME"
139 139 $ mkdir alice
140 140 $ HOME="`pwd`/alice"
141 141 $ cd alice
142 142 $ hg init pubrepo
143 143 $ cd pubrepo
144 144 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
145 145 $ hg add --large a-large-file
146 146 $ hg commit -m "Add a large file"
147 147 Invoking status precommit hook
148 148 A a-large-file
149 149 $ cd ..
150 150 $ chmod -R a-w pubrepo
151 151 $ cd ..
152 152 $ mkdir bob
153 153 $ HOME="`pwd`/bob"
154 154 $ cd bob
155 155 $ hg clone --pull ../alice/pubrepo pubrepo
156 156 requesting all changes
157 157 adding changesets
158 158 adding manifests
159 159 adding file changes
160 160 added 1 changesets with 1 changes to 1 files
161 161 new changesets 09a186cfa6da (1 drafts)
162 162 updating to branch default
163 163 getting changed largefiles
164 164 1 largefiles updated, 0 removed
165 165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
166 166 $ cd ..
167 167 $ chmod -R u+w alice/pubrepo
168 168 $ HOME="$ORIGHOME"
169 169
170 170 #endif
171 171
172 172
173 173 Symlink to a large largefile should behave the same as a symlink to a normal file
174 174 =====================================================================================
175 175
176 176 #if symlink
177 177
178 178 $ hg init largesymlink
179 179 $ cd largesymlink
180 180 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
181 181 $ hg add --large largefile
182 182 $ hg commit -m "commit a large file"
183 183 Invoking status precommit hook
184 184 A largefile
185 185 $ ln -s largefile largelink
186 186 $ hg add largelink
187 187 $ hg commit -m "commit a large symlink"
188 188 Invoking status precommit hook
189 189 A largelink
190 190 $ rm -f largelink
191 191 $ hg up >/dev/null
192 192 $ test -f largelink
193 193 [1]
194 194 $ test -L largelink
195 195 [1]
196 196 $ rm -f largelink # make next part of the test independent of the previous
197 197 $ hg up -C >/dev/null
198 198 $ test -f largelink
199 199 $ test -L largelink
200 200 $ cd ..
201 201
202 202 #endif
203 203
204 204
205 205 test for pattern matching on 'hg status':
206 206 ==============================================
207 207
208 208
209 209 to boost performance, largefiles checks whether specified patterns are
210 210 related to largefiles in working directory (NOT to STANDIN) or not.
211 211
212 212 $ hg init statusmatch
213 213 $ cd statusmatch
214 214
215 215 $ mkdir -p a/b/c/d
216 216 $ echo normal > a/b/c/d/e.normal.txt
217 217 $ hg add a/b/c/d/e.normal.txt
218 218 $ echo large > a/b/c/d/e.large.txt
219 219 $ hg add --large a/b/c/d/e.large.txt
220 220 $ mkdir -p a/b/c/x
221 221 $ echo normal > a/b/c/x/y.normal.txt
222 222 $ hg add a/b/c/x/y.normal.txt
223 223 $ hg commit -m 'add files'
224 224 Invoking status precommit hook
225 225 A a/b/c/d/e.large.txt
226 226 A a/b/c/d/e.normal.txt
227 227 A a/b/c/x/y.normal.txt
228 228
229 229 (1) no pattern: no performance boost
230 230 $ hg status -A
231 231 C a/b/c/d/e.large.txt
232 232 C a/b/c/d/e.normal.txt
233 233 C a/b/c/x/y.normal.txt
234 234
235 235 (2) pattern not related to largefiles: performance boost
236 236 $ hg status -A a/b/c/x
237 237 C a/b/c/x/y.normal.txt
238 238
239 239 (3) pattern related to largefiles: no performance boost
240 240 $ hg status -A a/b/c/d
241 241 C a/b/c/d/e.large.txt
242 242 C a/b/c/d/e.normal.txt
243 243
244 244 (4) pattern related to STANDIN (not to largefiles): performance boost
245 245 $ hg status -A .hglf/a
246 246 C .hglf/a/b/c/d/e.large.txt
247 247
248 248 (5) mixed case: no performance boost
249 249 $ hg status -A a/b/c/x a/b/c/d
250 250 C a/b/c/d/e.large.txt
251 251 C a/b/c/d/e.normal.txt
252 252 C a/b/c/x/y.normal.txt
253 253
254 254 verify that largefiles doesn't break filesets
255 255
256 256 $ hg log --rev . --exclude "set:binary()"
257 257 changeset: 0:41bd42f10efa
258 258 tag: tip
259 259 user: test
260 260 date: Thu Jan 01 00:00:00 1970 +0000
261 261 summary: add files
262 262
263 263 sharing a largefile repo automatically enables largefiles on the share
264 264
265 265 $ hg share --config extensions.share= . ../shared_lfrepo
266 266 updating working directory
267 267 getting changed largefiles
268 268 1 largefiles updated, 0 removed
269 269 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
270 270 $ grep largefiles ../shared_lfrepo/.hg/requires
271 271 largefiles
272 272
273 273 verify that large files in subrepos handled properly
274 274 $ hg init subrepo
275 275 $ echo "subrepo = subrepo" > .hgsub
276 276 $ hg add .hgsub
277 277 $ hg ci -m "add subrepo"
278 278 Invoking status precommit hook
279 279 A .hgsub
280 280 ? .hgsubstate
281 281 $ echo "rev 1" > subrepo/large.txt
282 282 $ hg add --large subrepo/large.txt
283 283 $ hg sum
284 284 parent: 1:8ee150ea2e9c tip
285 285 add subrepo
286 286 branch: default
287 287 commit: 1 subrepos
288 288 update: (current)
289 289 phases: 2 draft
290 290 $ hg st
291 291 $ hg st -S
292 292 A subrepo/large.txt
293 293 $ hg ci -S -m "commit top repo"
294 294 committing subrepository subrepo
295 295 Invoking status precommit hook
296 296 A large.txt
297 297 Invoking status precommit hook
298 298 M .hgsubstate
299 299 # No differences
300 300 $ hg st -S
301 301 $ hg sum
302 302 parent: 2:ce4cd0c527a6 tip
303 303 commit top repo
304 304 branch: default
305 305 commit: (clean)
306 306 update: (current)
307 307 phases: 3 draft
308 308 $ echo "rev 2" > subrepo/large.txt
309 309 $ hg st -S
310 310 M subrepo/large.txt
311 311 $ hg sum
312 312 parent: 2:ce4cd0c527a6 tip
313 313 commit top repo
314 314 branch: default
315 315 commit: 1 subrepos
316 316 update: (current)
317 317 phases: 3 draft
318 318 $ hg ci -m "this commit should fail without -S"
319 319 abort: uncommitted changes in subrepository "subrepo"
320 320 (use --subrepos for recursive commit)
321 321 [255]
322 322
323 323 Add a normal file to the subrepo, then test archiving
324 324
325 325 $ echo 'normal file' > subrepo/normal.txt
326 326 $ touch large.dat
327 327 $ mv subrepo/large.txt subrepo/renamed-large.txt
328 328 $ hg addremove -S --dry-run
329 329 adding large.dat as a largefile
330 330 removing subrepo/large.txt
331 331 adding subrepo/normal.txt
332 332 adding subrepo/renamed-large.txt
333 333 $ hg status -S
334 334 ! subrepo/large.txt
335 335 ? large.dat
336 336 ? subrepo/normal.txt
337 337 ? subrepo/renamed-large.txt
338 338
339 339 $ hg addremove --dry-run subrepo
340 340 removing subrepo/large.txt
341 341 adding subrepo/normal.txt
342 342 adding subrepo/renamed-large.txt
343 343 $ hg status -S
344 344 ! subrepo/large.txt
345 345 ? large.dat
346 346 ? subrepo/normal.txt
347 347 ? subrepo/renamed-large.txt
348 348 $ cd ..
349 349
350 350 $ hg -R statusmatch addremove --dry-run statusmatch/subrepo
351 351 removing statusmatch/subrepo/large.txt
352 352 adding statusmatch/subrepo/normal.txt
353 353 adding statusmatch/subrepo/renamed-large.txt
354 354 $ hg -R statusmatch status -S
355 355 ! subrepo/large.txt
356 356 ? large.dat
357 357 ? subrepo/normal.txt
358 358 ? subrepo/renamed-large.txt
359 359
360 360 $ hg -R statusmatch addremove --dry-run -S
361 361 adding large.dat as a largefile
362 362 removing subrepo/large.txt
363 363 adding subrepo/normal.txt
364 364 adding subrepo/renamed-large.txt
365 365 $ cd statusmatch
366 366
367 367 $ mv subrepo/renamed-large.txt subrepo/large.txt
368 368 $ hg addremove subrepo
369 369 adding subrepo/normal.txt
370 370 $ hg forget subrepo/normal.txt
371 371
372 372 $ hg addremove -S
373 373 adding large.dat as a largefile
374 374 adding subrepo/normal.txt
375 375 $ rm large.dat
376 376
377 377 $ hg addremove subrepo
378 378 $ hg addremove -S
379 379 removing large.dat
380 380
381 381 Lock in subrepo, otherwise the change isn't archived
382 382
383 383 $ hg ci -S -m "add normal file to top level"
384 384 committing subrepository subrepo
385 385 Invoking status precommit hook
386 386 M large.txt
387 387 A normal.txt
388 388 Invoking status precommit hook
389 389 M .hgsubstate
390 390 $ hg archive -S ../lf_subrepo_archive
391 391 $ find ../lf_subrepo_archive | sort
392 392 ../lf_subrepo_archive
393 393 ../lf_subrepo_archive/.hg_archival.txt
394 394 ../lf_subrepo_archive/.hgsub
395 395 ../lf_subrepo_archive/.hgsubstate
396 396 ../lf_subrepo_archive/a
397 397 ../lf_subrepo_archive/a/b
398 398 ../lf_subrepo_archive/a/b/c
399 399 ../lf_subrepo_archive/a/b/c/d
400 400 ../lf_subrepo_archive/a/b/c/d/e.large.txt
401 401 ../lf_subrepo_archive/a/b/c/d/e.normal.txt
402 402 ../lf_subrepo_archive/a/b/c/x
403 403 ../lf_subrepo_archive/a/b/c/x/y.normal.txt
404 404 ../lf_subrepo_archive/subrepo
405 405 ../lf_subrepo_archive/subrepo/large.txt
406 406 ../lf_subrepo_archive/subrepo/normal.txt
407 407 $ cat ../lf_subrepo_archive/.hg_archival.txt
408 408 repo: 41bd42f10efa43698cc02052ea0977771cba506d
409 409 node: d56a95e6522858bc08a724c4fe2bdee066d1c30b
410 410 branch: default
411 411 latesttag: null
412 412 latesttagdistance: 4
413 413 changessincelatesttag: 4
414 414
415 415 Test update with subrepos.
416 416
417 417 $ hg update 0
418 418 getting changed largefiles
419 419 0 largefiles updated, 1 removed
420 420 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
421 421 $ hg status -S
422 422 $ hg update tip
423 423 getting changed largefiles
424 424 1 largefiles updated, 0 removed
425 425 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
426 426 $ hg status -S
427 427 # modify a large file
428 428 $ echo "modified" > subrepo/large.txt
429 429 $ hg st -S
430 430 M subrepo/large.txt
431 431 # update -C should revert the change.
432 432 $ hg update -C
433 433 getting changed largefiles
434 434 1 largefiles updated, 0 removed
435 435 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
436 436 $ hg status -S
437 437
438 438 Forget doesn't change the content of the file
439 439 $ echo 'pre-forget content' > subrepo/large.txt
440 440 $ hg forget -v subrepo/large.txt
441 441 removing subrepo/large.txt
442 442 $ cat subrepo/large.txt
443 443 pre-forget content
444 444
445 445 Test reverting a forgotten file
446 446 $ hg revert -R subrepo subrepo/large.txt
447 447 $ hg status -SA subrepo/large.txt
448 448 C subrepo/large.txt
449 449
450 450 $ hg rm -v subrepo/large.txt
451 451 removing subrepo/large.txt
452 452 $ hg revert -R subrepo subrepo/large.txt
453 453 $ rm subrepo/large.txt
454 454 $ hg addremove -S
455 455 removing subrepo/large.txt
456 456 $ hg st -S
457 457 R subrepo/large.txt
458 458
459 459 Test archiving a revision that references a subrepo that is not yet
460 460 cloned (see test-subrepo-recursion.t):
461 461
462 462 $ hg clone -U . ../empty
463 463 $ cd ../empty
464 464 $ hg archive --subrepos -r tip ../archive.tar.gz
465 465 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
466 466 $ cd ..
467 467
468 468
469 469
470 470
471 471
472 472
473 473 Test addremove, forget and others
474 474 ==============================================
475 475
476 476 Test that addremove picks up largefiles prior to the initial commit (issue3541)
477 477
478 478 $ hg init addrm2
479 479 $ cd addrm2
480 480 $ touch large.dat
481 481 $ touch large2.dat
482 482 $ touch normal
483 483 $ hg add --large large.dat
484 484 $ hg addremove -v
485 485 adding large2.dat as a largefile
486 486 adding normal
487 487
488 488 Test that forgetting all largefiles reverts to islfilesrepo() == False
489 489 (addremove will add *.dat as normal files now)
490 490 $ hg forget large.dat
491 491 $ hg forget large2.dat
492 492 $ hg addremove -v
493 493 adding large.dat
494 494 adding large2.dat
495 495
496 496 Test commit's addremove option prior to the first commit
497 497 $ hg forget large.dat
498 498 $ hg forget large2.dat
499 499 $ hg add --large large.dat
500 500 $ hg ci -Am "commit"
501 501 adding large2.dat as a largefile
502 502 Invoking status precommit hook
503 503 A large.dat
504 504 A large2.dat
505 505 A normal
506 506 $ find .hglf | sort
507 507 .hglf
508 508 .hglf/large.dat
509 509 .hglf/large2.dat
510 510
511 511 Test actions on largefiles using relative paths from subdir
512 512
513 513 $ mkdir sub
514 514 $ cd sub
515 515 $ echo anotherlarge > anotherlarge
516 516 $ hg add --large anotherlarge
517 517 $ hg st
518 518 A sub/anotherlarge
519 519 $ hg st anotherlarge
520 520 A anotherlarge
521 521 $ hg commit -m anotherlarge anotherlarge
522 522 Invoking status precommit hook
523 523 A sub/anotherlarge
524 524 $ hg log anotherlarge
525 525 changeset: 1:9627a577c5e9
526 526 tag: tip
527 527 user: test
528 528 date: Thu Jan 01 00:00:00 1970 +0000
529 529 summary: anotherlarge
530 530
531 531 $ hg --debug log -T '{rev}: {desc}\n' ../sub/anotherlarge
532 532 updated patterns: ../.hglf/sub/../sub/anotherlarge, ../sub/anotherlarge
533 533 1: anotherlarge
534 534
535 535 $ hg log -G anotherlarge
536 536 @ changeset: 1:9627a577c5e9
537 537 | tag: tip
538 538 ~ user: test
539 539 date: Thu Jan 01 00:00:00 1970 +0000
540 540 summary: anotherlarge
541 541
542 542
543 543 $ hg log glob:another*
544 544 changeset: 1:9627a577c5e9
545 545 tag: tip
546 546 user: test
547 547 date: Thu Jan 01 00:00:00 1970 +0000
548 548 summary: anotherlarge
549 549
550 550 $ hg --debug log -T '{rev}: {desc}\n' -G glob:another*
551 551 updated patterns: glob:../.hglf/sub/another*, glob:another*
552 552 @ 1: anotherlarge
553 553 |
554 554 ~
555 555
556 556 #if no-msys
557 557 $ hg --debug log -T '{rev}: {desc}\n' 'glob:../.hglf/sub/another*' # no-msys
558 558 updated patterns: glob:../.hglf/sub/another*
559 559 1: anotherlarge
560 560
561 561 $ hg --debug log -G -T '{rev}: {desc}\n' 'glob:../.hglf/sub/another*' # no-msys
562 562 updated patterns: glob:../.hglf/sub/another*
563 563 @ 1: anotherlarge
564 564 |
565 565 ~
566 566 #endif
567 567
568 568 $ echo more >> anotherlarge
569 569 $ hg st .
570 570 M anotherlarge
571 571 $ hg cat anotherlarge
572 572 anotherlarge
573 573 $ hg revert anotherlarge
574 574 $ hg st
575 575 ? sub/anotherlarge.orig
576 576
577 577 Test orig files go where we want them
578 578 $ echo moremore >> anotherlarge
579 579 $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups'
580 580 creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub
581 581 saving current version of ../.hglf/sub/anotherlarge as ../.hg/origbackups/.hglf/sub/anotherlarge
582 582 reverting ../.hglf/sub/anotherlarge
583 583 creating directory: $TESTTMP/addrm2/.hg/origbackups/sub
584 584 found 90c622cf65cebe75c5842f9136c459333faf392e in store
585 585 found 90c622cf65cebe75c5842f9136c459333faf392e in store
586 586 $ ls ../.hg/origbackups/sub
587 587 anotherlarge
588 588 $ cd ..
589 589
590 590 Test glob logging from the root dir
591 591 $ hg log glob:**another*
592 592 changeset: 1:9627a577c5e9
593 593 tag: tip
594 594 user: test
595 595 date: Thu Jan 01 00:00:00 1970 +0000
596 596 summary: anotherlarge
597 597
598 598 $ hg log -G glob:**another*
599 599 @ changeset: 1:9627a577c5e9
600 600 | tag: tip
601 601 ~ user: test
602 602 date: Thu Jan 01 00:00:00 1970 +0000
603 603 summary: anotherlarge
604 604
605 605
606 606 $ cd ..
607 607
608 608 Log from outer space
609 609 $ hg --debug log -R addrm2 -T '{rev}: {desc}\n' 'addrm2/sub/anotherlarge'
610 610 updated patterns: addrm2/.hglf/sub/anotherlarge, addrm2/sub/anotherlarge
611 611 1: anotherlarge
612 612 $ hg --debug log -R addrm2 -T '{rev}: {desc}\n' 'addrm2/.hglf/sub/anotherlarge'
613 613 updated patterns: addrm2/.hglf/sub/anotherlarge
614 614 1: anotherlarge
615 615
616 616
617 617 Check error message while exchange
618 618 =========================================================
619 619
620 620 issue3651: summary/outgoing with largefiles shows "no remote repo"
621 621 unexpectedly
622 622
623 623 $ mkdir issue3651
624 624 $ cd issue3651
625 625
626 626 $ hg init src
627 627 $ echo a > src/a
628 628 $ hg -R src add --large src/a
629 629 $ hg -R src commit -m '#0'
630 630 Invoking status precommit hook
631 631 A a
632 632
633 633 check messages when no remote repository is specified:
634 634 "no remote repo" route for "hg outgoing --large" is not tested here,
635 635 because it can't be reproduced easily.
636 636
637 637 $ hg init clone1
638 638 $ hg -R clone1 -q pull src
639 639 $ hg -R clone1 -q update
640 640 $ hg -R clone1 paths | grep default
641 641 [1]
642 642
643 643 $ hg -R clone1 summary --large
644 644 parent: 0:fc0bd45326d3 tip
645 645 #0
646 646 branch: default
647 647 commit: (clean)
648 648 update: (current)
649 649 phases: 1 draft
650 650 largefiles: (no remote repo)
651 651
652 652 check messages when there is no files to upload:
653 653
654 654 $ hg -q clone src clone2
655 655 $ hg -R clone2 paths | grep default
656 656 default = $TESTTMP/issue3651/src
657 657
658 658 $ hg -R clone2 summary --large
659 659 parent: 0:fc0bd45326d3 tip
660 660 #0
661 661 branch: default
662 662 commit: (clean)
663 663 update: (current)
664 664 phases: 1 draft
665 665 largefiles: (no files to upload)
666 666 $ hg -R clone2 outgoing --large
667 667 comparing with $TESTTMP/issue3651/src
668 668 searching for changes
669 669 no changes found
670 670 largefiles: no files to upload
671 671 [1]
672 672
673 673 $ hg -R clone2 outgoing --large --graph --template "{rev}"
674 674 comparing with $TESTTMP/issue3651/src
675 675 searching for changes
676 676 no changes found
677 677 largefiles: no files to upload
678 [1]
678 679
679 680 check messages when there are files to upload:
680 681
681 682 $ echo b > clone2/b
682 683 $ hg -R clone2 add --large clone2/b
683 684 $ hg -R clone2 commit -m '#1'
684 685 Invoking status precommit hook
685 686 A b
686 687 $ hg -R clone2 summary --large
687 688 parent: 1:1acbe71ce432 tip
688 689 #1
689 690 branch: default
690 691 commit: (clean)
691 692 update: (current)
692 693 phases: 2 draft
693 694 largefiles: 1 entities for 1 files to upload
694 695 $ hg -R clone2 outgoing --large
695 696 comparing with $TESTTMP/issue3651/src
696 697 searching for changes
697 698 changeset: 1:1acbe71ce432
698 699 tag: tip
699 700 user: test
700 701 date: Thu Jan 01 00:00:00 1970 +0000
701 702 summary: #1
702 703
703 704 largefiles to upload (1 entities):
704 705 b
705 706
706 707 $ hg -R clone2 outgoing --large --graph --template "{rev}"
707 708 comparing with $TESTTMP/issue3651/src
708 709 searching for changes
709 710 @ 1
710 711
711 712 largefiles to upload (1 entities):
712 713 b
713 714
714 715
715 716 $ cp clone2/b clone2/b1
716 717 $ cp clone2/b clone2/b2
717 718 $ hg -R clone2 add --large clone2/b1 clone2/b2
718 719 $ hg -R clone2 commit -m '#2: add largefiles referring same entity'
719 720 Invoking status precommit hook
720 721 A b1
721 722 A b2
722 723 $ hg -R clone2 summary --large
723 724 parent: 2:6095d0695d70 tip
724 725 #2: add largefiles referring same entity
725 726 branch: default
726 727 commit: (clean)
727 728 update: (current)
728 729 phases: 3 draft
729 730 largefiles: 1 entities for 3 files to upload
730 731 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
731 732 comparing with $TESTTMP/issue3651/src
732 733 searching for changes
733 734 1:1acbe71ce432
734 735 2:6095d0695d70
735 736 largefiles to upload (1 entities):
736 737 b
737 738 b1
738 739 b2
739 740
740 741 $ hg -R clone2 cat -r 1 clone2/.hglf/b
741 742 89e6c98d92887913cadf06b2adb97f26cde4849b
742 743 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
743 744 comparing with $TESTTMP/issue3651/src
744 745 query 1; heads
745 746 searching for changes
746 747 all remote heads known locally
747 748 1:1acbe71ce432
748 749 2:6095d0695d70
749 750 finding outgoing largefiles: 0/2 revisions (0.00%)
750 751 finding outgoing largefiles: 1/2 revisions (50.00%)
751 752 largefiles to upload (1 entities):
752 753 b
753 754 89e6c98d92887913cadf06b2adb97f26cde4849b
754 755 b1
755 756 89e6c98d92887913cadf06b2adb97f26cde4849b
756 757 b2
757 758 89e6c98d92887913cadf06b2adb97f26cde4849b
758 759
759 760
760 761 $ echo bbb > clone2/b
761 762 $ hg -R clone2 commit -m '#3: add new largefile entity as existing file'
762 763 Invoking status precommit hook
763 764 M b
764 765 $ echo bbbb > clone2/b
765 766 $ hg -R clone2 commit -m '#4: add new largefile entity as existing file'
766 767 Invoking status precommit hook
767 768 M b
768 769 $ cp clone2/b1 clone2/b
769 770 $ hg -R clone2 commit -m '#5: refer existing largefile entity again'
770 771 Invoking status precommit hook
771 772 M b
772 773 $ hg -R clone2 summary --large
773 774 parent: 5:036794ea641c tip
774 775 #5: refer existing largefile entity again
775 776 branch: default
776 777 commit: (clean)
777 778 update: (current)
778 779 phases: 6 draft
779 780 largefiles: 3 entities for 3 files to upload
780 781 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
781 782 comparing with $TESTTMP/issue3651/src
782 783 searching for changes
783 784 1:1acbe71ce432
784 785 2:6095d0695d70
785 786 3:7983dce246cc
786 787 4:233f12ada4ae
787 788 5:036794ea641c
788 789 largefiles to upload (3 entities):
789 790 b
790 791 b1
791 792 b2
792 793
793 794 $ hg -R clone2 cat -r 3 clone2/.hglf/b
794 795 c801c9cfe94400963fcb683246217d5db77f9a9a
795 796 $ hg -R clone2 cat -r 4 clone2/.hglf/b
796 797 13f9ed0898e315bf59dc2973fec52037b6f441a2
797 798 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
798 799 comparing with $TESTTMP/issue3651/src
799 800 query 1; heads
800 801 searching for changes
801 802 all remote heads known locally
802 803 1:1acbe71ce432
803 804 2:6095d0695d70
804 805 3:7983dce246cc
805 806 4:233f12ada4ae
806 807 5:036794ea641c
807 808 finding outgoing largefiles: 0/5 revisions (0.00%)
808 809 finding outgoing largefiles: 1/5 revisions (20.00%)
809 810 finding outgoing largefiles: 2/5 revisions (40.00%)
810 811 finding outgoing largefiles: 3/5 revisions (60.00%)
811 812 finding outgoing largefiles: 4/5 revisions (80.00%)
812 813 largefiles to upload (3 entities):
813 814 b
814 815 13f9ed0898e315bf59dc2973fec52037b6f441a2
815 816 89e6c98d92887913cadf06b2adb97f26cde4849b
816 817 c801c9cfe94400963fcb683246217d5db77f9a9a
817 818 b1
818 819 89e6c98d92887913cadf06b2adb97f26cde4849b
819 820 b2
820 821 89e6c98d92887913cadf06b2adb97f26cde4849b
821 822
822 823
823 824 Pushing revision #1 causes uploading entity 89e6c98d9288, which is
824 825 shared also by largefiles b1, b2 in revision #2 and b in revision #5.
825 826
826 827 Then, entity 89e6c98d9288 is not treated as "outgoing entity" at "hg
827 828 summary" and "hg outgoing", even though files in outgoing revision #2
828 829 and #5 refer it.
829 830
830 831 $ hg -R clone2 push -r 1 -q
831 832 $ hg -R clone2 summary --large
832 833 parent: 5:036794ea641c tip
833 834 #5: refer existing largefile entity again
834 835 branch: default
835 836 commit: (clean)
836 837 update: (current)
837 838 phases: 6 draft
838 839 largefiles: 2 entities for 1 files to upload
839 840 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
840 841 comparing with $TESTTMP/issue3651/src
841 842 searching for changes
842 843 2:6095d0695d70
843 844 3:7983dce246cc
844 845 4:233f12ada4ae
845 846 5:036794ea641c
846 847 largefiles to upload (2 entities):
847 848 b
848 849
849 850 $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" --debug --config progress.debug=true
850 851 comparing with $TESTTMP/issue3651/src
851 852 query 1; heads
852 853 searching for changes
853 854 all remote heads known locally
854 855 2:6095d0695d70
855 856 3:7983dce246cc
856 857 4:233f12ada4ae
857 858 5:036794ea641c
858 859 finding outgoing largefiles: 0/4 revisions (0.00%)
859 860 finding outgoing largefiles: 1/4 revisions (25.00%)
860 861 finding outgoing largefiles: 2/4 revisions (50.00%)
861 862 finding outgoing largefiles: 3/4 revisions (75.00%)
862 863 largefiles to upload (2 entities):
863 864 b
864 865 13f9ed0898e315bf59dc2973fec52037b6f441a2
865 866 c801c9cfe94400963fcb683246217d5db77f9a9a
866 867
867 868
868 869 $ cd ..
869 870
870 871 merge action 'd' for 'local renamed directory to d2/g' which has no filename
871 872 ==================================================================================
872 873
873 874 $ hg init merge-action
874 875 $ cd merge-action
875 876 $ touch l
876 877 $ hg add --large l
877 878 $ mkdir d1
878 879 $ touch d1/f
879 880 $ hg ci -Aqm0
880 881 Invoking status precommit hook
881 882 A d1/f
882 883 A l
883 884 $ echo > d1/f
884 885 $ touch d1/g
885 886 $ hg ci -Aqm1
886 887 Invoking status precommit hook
887 888 M d1/f
888 889 A d1/g
889 890 $ hg up -qr0
890 891 $ hg mv d1 d2
891 892 moving d1/f to d2/f
892 893 $ hg ci -qm2
893 894 Invoking status precommit hook
894 895 A d2/f
895 896 R d1/f
896 897 $ hg merge
897 898 merging d2/f and d1/f to d2/f
898 899 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
899 900 (branch merge, don't forget to commit)
900 901 $ cd ..
901 902
902 903
903 904 Merge conflicts:
904 905 =====================
905 906
906 907 $ hg init merge
907 908 $ cd merge
908 909 $ echo 0 > f-different
909 910 $ echo 0 > f-same
910 911 $ echo 0 > f-unchanged-1
911 912 $ echo 0 > f-unchanged-2
912 913 $ hg add --large *
913 914 $ hg ci -m0
914 915 Invoking status precommit hook
915 916 A f-different
916 917 A f-same
917 918 A f-unchanged-1
918 919 A f-unchanged-2
919 920 $ echo tmp1 > f-unchanged-1
920 921 $ echo tmp1 > f-unchanged-2
921 922 $ echo tmp1 > f-same
922 923 $ hg ci -m1
923 924 Invoking status precommit hook
924 925 M f-same
925 926 M f-unchanged-1
926 927 M f-unchanged-2
927 928 $ echo 2 > f-different
928 929 $ echo 0 > f-unchanged-1
929 930 $ echo 1 > f-unchanged-2
930 931 $ echo 1 > f-same
931 932 $ hg ci -m2
932 933 Invoking status precommit hook
933 934 M f-different
934 935 M f-same
935 936 M f-unchanged-1
936 937 M f-unchanged-2
937 938 $ hg up -qr0
938 939 $ echo tmp2 > f-unchanged-1
939 940 $ echo tmp2 > f-unchanged-2
940 941 $ echo tmp2 > f-same
941 942 $ hg ci -m3
942 943 Invoking status precommit hook
943 944 M f-same
944 945 M f-unchanged-1
945 946 M f-unchanged-2
946 947 created new head
947 948 $ echo 1 > f-different
948 949 $ echo 1 > f-unchanged-1
949 950 $ echo 0 > f-unchanged-2
950 951 $ echo 1 > f-same
951 952 $ hg ci -m4
952 953 Invoking status precommit hook
953 954 M f-different
954 955 M f-same
955 956 M f-unchanged-1
956 957 M f-unchanged-2
957 958 $ hg merge
958 959 largefile f-different has a merge conflict
959 960 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
960 961 you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a.
961 962 what do you want to do? l
962 963 getting changed largefiles
963 964 1 largefiles updated, 0 removed
964 965 0 files updated, 4 files merged, 0 files removed, 0 files unresolved
965 966 (branch merge, don't forget to commit)
966 967 $ cat f-different
967 968 1
968 969 $ cat f-same
969 970 1
970 971 $ cat f-unchanged-1
971 972 1
972 973 $ cat f-unchanged-2
973 974 1
974 975 $ cd ..
975 976
976 977 Test largefile insulation (do not enabled a side effect
977 978 ========================================================
978 979
979 980 Check whether "largefiles" feature is supported only in repositories
980 981 enabling largefiles extension.
981 982
982 983 $ mkdir individualenabling
983 984 $ cd individualenabling
984 985
985 986 $ hg init enabledlocally
986 987 $ echo large > enabledlocally/large
987 988 $ hg -R enabledlocally add --large enabledlocally/large
988 989 $ hg -R enabledlocally commit -m '#0'
989 990 Invoking status precommit hook
990 991 A large
991 992
992 993 $ hg init notenabledlocally
993 994 $ echo large > notenabledlocally/large
994 995 $ hg -R notenabledlocally add --large notenabledlocally/large
995 996 $ hg -R notenabledlocally commit -m '#0'
996 997 Invoking status precommit hook
997 998 A large
998 999
999 1000 $ cat >> $HGRCPATH <<EOF
1000 1001 > [extensions]
1001 1002 > # disable globally
1002 1003 > largefiles=!
1003 1004 > EOF
1004 1005 $ cat >> enabledlocally/.hg/hgrc <<EOF
1005 1006 > [extensions]
1006 1007 > # enable locally
1007 1008 > largefiles=
1008 1009 > EOF
1009 1010 $ hg -R enabledlocally root
1010 1011 $TESTTMP/individualenabling/enabledlocally
1011 1012 $ hg -R notenabledlocally root
1012 1013 abort: repository requires features unknown to this Mercurial: largefiles
1013 1014 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
1014 1015 [255]
1015 1016
1016 1017 $ hg init push-dst
1017 1018 $ hg -R enabledlocally push push-dst
1018 1019 pushing to push-dst
1019 1020 abort: required features are not supported in the destination: largefiles
1020 1021 [255]
1021 1022
1022 1023 $ hg init pull-src
1023 1024 $ hg -R pull-src pull enabledlocally
1024 1025 pulling from enabledlocally
1025 1026 abort: required features are not supported in the destination: largefiles
1026 1027 [255]
1027 1028
1028 1029 $ hg clone enabledlocally clone-dst
1029 1030 abort: repository requires features unknown to this Mercurial: largefiles
1030 1031 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
1031 1032 [255]
1032 1033 $ test -d clone-dst
1033 1034 [1]
1034 1035 $ hg clone --pull enabledlocally clone-pull-dst
1035 1036 abort: required features are not supported in the destination: largefiles
1036 1037 [255]
1037 1038 $ test -d clone-pull-dst
1038 1039 [1]
1039 1040
1040 1041 #if serve
1041 1042
1042 1043 Test largefiles specific peer setup, when largefiles is enabled
1043 1044 locally (issue4109)
1044 1045
1045 1046 $ hg showconfig extensions | grep largefiles
1046 1047 extensions.largefiles=!
1047 1048 $ mkdir -p $TESTTMP/individualenabling/usercache
1048 1049
1049 1050 $ hg serve -R enabledlocally -d -p $HGPORT --pid-file hg.pid
1050 1051 $ cat hg.pid >> $DAEMON_PIDS
1051 1052
1052 1053 $ hg init pull-dst
1053 1054 $ cat > pull-dst/.hg/hgrc <<EOF
1054 1055 > [extensions]
1055 1056 > # enable locally
1056 1057 > largefiles=
1057 1058 > [largefiles]
1058 1059 > # ignore system cache to force largefiles specific wire proto access
1059 1060 > usercache=$TESTTMP/individualenabling/usercache
1060 1061 > EOF
1061 1062 $ hg -R pull-dst -q pull -u http://localhost:$HGPORT
1062 1063
1063 1064 $ killdaemons.py
1064 1065 #endif
1065 1066
1066 1067 Test overridden functions work correctly even for repos disabling
1067 1068 largefiles (issue4547)
1068 1069
1069 1070 $ hg showconfig extensions | grep largefiles
1070 1071 extensions.largefiles=!
1071 1072
1072 1073 (test updating implied by clone)
1073 1074
1074 1075 $ hg init enabled-but-no-largefiles
1075 1076 $ echo normal1 > enabled-but-no-largefiles/normal1
1076 1077 $ hg -R enabled-but-no-largefiles add enabled-but-no-largefiles/normal1
1077 1078 $ hg -R enabled-but-no-largefiles commit -m '#0@enabled-but-no-largefiles'
1078 1079 Invoking status precommit hook
1079 1080 A normal1
1080 1081 $ cat >> enabled-but-no-largefiles/.hg/hgrc <<EOF
1081 1082 > [extensions]
1082 1083 > # enable locally
1083 1084 > largefiles=
1084 1085 > EOF
1085 1086 $ hg clone -q enabled-but-no-largefiles no-largefiles
1086 1087
1087 1088 $ echo normal2 > enabled-but-no-largefiles/normal2
1088 1089 $ hg -R enabled-but-no-largefiles add enabled-but-no-largefiles/normal2
1089 1090 $ hg -R enabled-but-no-largefiles commit -m '#1@enabled-but-no-largefiles'
1090 1091 Invoking status precommit hook
1091 1092 A normal2
1092 1093
1093 1094 $ echo normal3 > no-largefiles/normal3
1094 1095 $ hg -R no-largefiles add no-largefiles/normal3
1095 1096 $ hg -R no-largefiles commit -m '#1@no-largefiles'
1096 1097 Invoking status precommit hook
1097 1098 A normal3
1098 1099
1099 1100 $ hg -R no-largefiles -q pull --rebase
1100 1101 Invoking status precommit hook
1101 1102 A normal3
1102 1103
1103 1104 (test reverting)
1104 1105
1105 1106 $ hg init subrepo-root
1106 1107 $ cat >> subrepo-root/.hg/hgrc <<EOF
1107 1108 > [extensions]
1108 1109 > # enable locally
1109 1110 > largefiles=
1110 1111 > EOF
1111 1112 $ echo large > subrepo-root/large
1112 1113 $ mkdir -p subrepo-root/dir/subdir
1113 1114 $ echo large2 > subrepo-root/dir/subdir/large.bin
1114 1115 $ hg -R subrepo-root add --large subrepo-root/large subrepo-root/dir/subdir/large.bin
1115 1116 $ hg clone -q no-largefiles subrepo-root/no-largefiles
1116 1117 $ cat > subrepo-root/.hgsub <<EOF
1117 1118 > no-largefiles = no-largefiles
1118 1119 > EOF
1119 1120 $ hg -R subrepo-root add subrepo-root/.hgsub
1120 1121 $ hg -R subrepo-root commit -m '#0'
1121 1122 Invoking status precommit hook
1122 1123 A .hgsub
1123 1124 A dir/subdir/large.bin
1124 1125 A large
1125 1126 ? .hgsubstate
1126 1127 $ echo dirty >> subrepo-root/large
1127 1128 $ echo dirty >> subrepo-root/no-largefiles/normal1
1128 1129 $ hg -R subrepo-root status -S
1129 1130 M large
1130 1131 M no-largefiles/normal1
1131 1132 $ hg -R subrepo-root extdiff -p echo -S --config extensions.extdiff=
1132 1133 "*\\no-largefiles\\normal1" "*\\no-largefiles\\normal1" (glob) (windows !)
1133 1134 */no-largefiles/normal1 */no-largefiles/normal1 (glob) (no-windows !)
1134 1135 [1]
1135 1136 $ hg -R subrepo-root revert --all
1136 1137 reverting subrepo-root/.hglf/large
1137 1138 reverting subrepo no-largefiles
1138 1139 reverting subrepo-root/no-largefiles/normal1
1139 1140
1140 1141 Move (and then undo) a directory move with only largefiles.
1141 1142
1142 1143 $ cd subrepo-root
1143 1144 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1144 1145 .hglf/
1145 1146 .hglf/dir/
1146 1147 .hglf/dir/subdir/
1147 1148 .hglf/dir/subdir/large.bin
1148 1149 .hglf/large
1149 1150 dir/
1150 1151 dir/subdir/
1151 1152 dir/subdir/large.bin
1152 1153 large
1153 1154 large.orig
1154 1155
1155 1156 $ hg mv dir/subdir dir/subdir2
1156 1157 moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin
1157 1158
1158 1159 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1159 1160 .hglf/
1160 1161 .hglf/dir/
1161 1162 .hglf/dir/subdir2/
1162 1163 .hglf/dir/subdir2/large.bin
1163 1164 .hglf/large
1164 1165 dir/
1165 1166 dir/subdir2/
1166 1167 dir/subdir2/large.bin
1167 1168 large
1168 1169 large.orig
1169 1170 $ hg status -C
1170 1171 A dir/subdir2/large.bin
1171 1172 dir/subdir/large.bin
1172 1173 R dir/subdir/large.bin
1173 1174 ? large.orig
1174 1175
1175 1176 $ echo 'modified' > dir/subdir2/large.bin
1176 1177 $ hg status -C
1177 1178 A dir/subdir2/large.bin
1178 1179 dir/subdir/large.bin
1179 1180 R dir/subdir/large.bin
1180 1181 ? large.orig
1181 1182
1182 1183 $ hg revert --all
1183 1184 forgetting .hglf/dir/subdir2/large.bin
1184 1185 undeleting .hglf/dir/subdir/large.bin
1185 1186 reverting subrepo no-largefiles
1186 1187
1187 1188 $ hg status -C
1188 1189 ? dir/subdir2/large.bin
1189 1190 ? large.orig
1190 1191
1191 1192 The content of the forgotten file shouldn't be clobbered
1192 1193
1193 1194 $ cat dir/subdir2/large.bin
1194 1195 modified
1195 1196
1196 1197 The standin for subdir2 should be deleted, not just dropped
1197 1198
1198 1199 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1199 1200 .hglf/
1200 1201 .hglf/dir/
1201 1202 .hglf/dir/subdir/
1202 1203 .hglf/dir/subdir/large.bin
1203 1204 .hglf/large
1204 1205 dir/
1205 1206 dir/subdir/
1206 1207 dir/subdir/large.bin
1207 1208 dir/subdir2/
1208 1209 dir/subdir2/large.bin
1209 1210 large
1210 1211 large.orig
1211 1212
1212 1213 $ rm -r dir/subdir2
1213 1214
1214 1215 'subdir' should not be in the destination. It would be if the subdir2 directory
1215 1216 existed under .hglf/.
1216 1217 $ hg mv dir/subdir dir/subdir2
1217 1218 moving .hglf/dir/subdir/large.bin to .hglf/dir/subdir2/large.bin
1218 1219
1219 1220 $ hg status -C
1220 1221 A dir/subdir2/large.bin
1221 1222 dir/subdir/large.bin
1222 1223 R dir/subdir/large.bin
1223 1224 ? large.orig
1224 1225
1225 1226 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1226 1227 .hglf/
1227 1228 .hglf/dir/
1228 1229 .hglf/dir/subdir2/
1229 1230 .hglf/dir/subdir2/large.bin
1230 1231 .hglf/large
1231 1232 dir/
1232 1233 dir/subdir2/
1233 1234 dir/subdir2/large.bin
1234 1235 large
1235 1236 large.orig
1236 1237
1237 1238 Start from scratch, and rename something other than the final path component.
1238 1239
1239 1240 $ hg up -qC .
1240 1241 $ hg --config extensions.purge= purge
1241 1242
1242 1243 $ hg mv dir/subdir dir2/subdir
1243 1244 moving .hglf/dir/subdir/large.bin to .hglf/dir2/subdir/large.bin
1244 1245
1245 1246 $ hg status -C
1246 1247 A dir2/subdir/large.bin
1247 1248 dir/subdir/large.bin
1248 1249 R dir/subdir/large.bin
1249 1250
1250 1251 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1251 1252 .hglf/
1252 1253 .hglf/dir2/
1253 1254 .hglf/dir2/subdir/
1254 1255 .hglf/dir2/subdir/large.bin
1255 1256 .hglf/large
1256 1257 dir2/
1257 1258 dir2/subdir/
1258 1259 dir2/subdir/large.bin
1259 1260 large
1260 1261
1261 1262 $ hg revert --all
1262 1263 forgetting .hglf/dir2/subdir/large.bin
1263 1264 undeleting .hglf/dir/subdir/large.bin
1264 1265 reverting subrepo no-largefiles
1265 1266
1266 1267 $ hg status -C
1267 1268 ? dir2/subdir/large.bin
1268 1269
1269 1270 $ "$PYTHON" $TESTDIR/list-tree.py .hglf dir* large*
1270 1271 .hglf/
1271 1272 .hglf/dir/
1272 1273 .hglf/dir/subdir/
1273 1274 .hglf/dir/subdir/large.bin
1274 1275 .hglf/large
1275 1276 dir/
1276 1277 dir/subdir/
1277 1278 dir/subdir/large.bin
1278 1279 dir2/
1279 1280 dir2/subdir/
1280 1281 dir2/subdir/large.bin
1281 1282 large
1282 1283
1283 1284 $ cd ../..
1284 1285
1285 1286 Test "pull --rebase" when rebase is enabled before largefiles (issue3861)
1286 1287 =========================================================================
1287 1288
1288 1289 $ hg showconfig extensions | grep largefiles
1289 1290 extensions.largefiles=!
1290 1291
1291 1292 $ mkdir issue3861
1292 1293 $ cd issue3861
1293 1294 $ hg init src
1294 1295 $ hg clone -q src dst
1295 1296 $ echo a > src/a
1296 1297 $ hg -R src commit -Aqm "#0"
1297 1298 Invoking status precommit hook
1298 1299 A a
1299 1300
1300 1301 $ cat >> dst/.hg/hgrc <<EOF
1301 1302 > [extensions]
1302 1303 > largefiles=
1303 1304 > EOF
1304 1305 $ hg -R dst pull --rebase
1305 1306 pulling from $TESTTMP/issue3861/src
1306 1307 requesting all changes
1307 1308 adding changesets
1308 1309 adding manifests
1309 1310 adding file changes
1310 1311 added 1 changesets with 1 changes to 1 files
1311 1312 new changesets bf5e395ced2c (1 drafts)
1312 1313 nothing to rebase - updating instead
1313 1314 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1314 1315
1315 1316 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now