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