##// END OF EJS Templates
diff: deprecate -r option...
Martin von Zweigbergk -
r46723:aa4dbc14 default
parent child Browse files
Show More
@@ -1,7747 +1,7747 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 positional_1=None,
911 911 positional_2=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 rev = []
1002 1002 # backward compatibility
1003 1003 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1004 1004 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1005 1005 cmd = positional_1
1006 1006 rev.append(positional_2)
1007 1007 if cmd == b"good":
1008 1008 good = True
1009 1009 elif cmd == b"bad":
1010 1010 bad = True
1011 1011 else:
1012 1012 reset = True
1013 1013 elif positional_2:
1014 1014 raise error.InputError(_(b'incompatible arguments'))
1015 1015 elif positional_1 is not None:
1016 1016 rev.append(positional_1)
1017 1017
1018 1018 incompatibles = {
1019 1019 b'--bad': bad,
1020 1020 b'--command': bool(command),
1021 1021 b'--extend': extend,
1022 1022 b'--good': good,
1023 1023 b'--reset': reset,
1024 1024 b'--skip': skip,
1025 1025 }
1026 1026
1027 1027 enabled = [x for x in incompatibles if incompatibles[x]]
1028 1028
1029 1029 if len(enabled) > 1:
1030 1030 raise error.InputError(
1031 1031 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1032 1032 )
1033 1033
1034 1034 if reset:
1035 1035 hbisect.resetstate(repo)
1036 1036 return
1037 1037
1038 1038 state = hbisect.load_state(repo)
1039 1039
1040 1040 if rev:
1041 1041 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1042 1042 else:
1043 1043 nodes = [repo.lookup(b'.')]
1044 1044
1045 1045 # update state
1046 1046 if good or bad or skip:
1047 1047 if good:
1048 1048 state[b'good'] += nodes
1049 1049 elif bad:
1050 1050 state[b'bad'] += nodes
1051 1051 elif skip:
1052 1052 state[b'skip'] += nodes
1053 1053 hbisect.save_state(repo, state)
1054 1054 if not (state[b'good'] and state[b'bad']):
1055 1055 return
1056 1056
1057 1057 def mayupdate(repo, node, show_stats=True):
1058 1058 """common used update sequence"""
1059 1059 if noupdate:
1060 1060 return
1061 1061 cmdutil.checkunfinished(repo)
1062 1062 cmdutil.bailifchanged(repo)
1063 1063 return hg.clean(repo, node, show_stats=show_stats)
1064 1064
1065 1065 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1066 1066
1067 1067 if command:
1068 1068 changesets = 1
1069 1069 if noupdate:
1070 1070 try:
1071 1071 node = state[b'current'][0]
1072 1072 except LookupError:
1073 1073 raise error.StateError(
1074 1074 _(
1075 1075 b'current bisect revision is unknown - '
1076 1076 b'start a new bisect to fix'
1077 1077 )
1078 1078 )
1079 1079 else:
1080 1080 node, p2 = repo.dirstate.parents()
1081 1081 if p2 != nullid:
1082 1082 raise error.StateError(_(b'current bisect revision is a merge'))
1083 1083 if rev:
1084 1084 if not nodes:
1085 1085 raise error.Abort(_(b'empty revision set'))
1086 1086 node = repo[nodes.last()].node()
1087 1087 with hbisect.restore_state(repo, state, node):
1088 1088 while changesets:
1089 1089 # update state
1090 1090 state[b'current'] = [node]
1091 1091 hbisect.save_state(repo, state)
1092 1092 status = ui.system(
1093 1093 command,
1094 1094 environ={b'HG_NODE': hex(node)},
1095 1095 blockedtag=b'bisect_check',
1096 1096 )
1097 1097 if status == 125:
1098 1098 transition = b"skip"
1099 1099 elif status == 0:
1100 1100 transition = b"good"
1101 1101 # status < 0 means process was killed
1102 1102 elif status == 127:
1103 1103 raise error.Abort(_(b"failed to execute %s") % command)
1104 1104 elif status < 0:
1105 1105 raise error.Abort(_(b"%s killed") % command)
1106 1106 else:
1107 1107 transition = b"bad"
1108 1108 state[transition].append(node)
1109 1109 ctx = repo[node]
1110 1110 ui.status(
1111 1111 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1112 1112 )
1113 1113 hbisect.checkstate(state)
1114 1114 # bisect
1115 1115 nodes, changesets, bgood = hbisect.bisect(repo, state)
1116 1116 # update to next check
1117 1117 node = nodes[0]
1118 1118 mayupdate(repo, node, show_stats=False)
1119 1119 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1120 1120 return
1121 1121
1122 1122 hbisect.checkstate(state)
1123 1123
1124 1124 # actually bisect
1125 1125 nodes, changesets, good = hbisect.bisect(repo, state)
1126 1126 if extend:
1127 1127 if not changesets:
1128 1128 extendnode = hbisect.extendrange(repo, state, nodes, good)
1129 1129 if extendnode is not None:
1130 1130 ui.write(
1131 1131 _(b"Extending search to changeset %d:%s\n")
1132 1132 % (extendnode.rev(), extendnode)
1133 1133 )
1134 1134 state[b'current'] = [extendnode.node()]
1135 1135 hbisect.save_state(repo, state)
1136 1136 return mayupdate(repo, extendnode.node())
1137 1137 raise error.StateError(_(b"nothing to extend"))
1138 1138
1139 1139 if changesets == 0:
1140 1140 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1141 1141 else:
1142 1142 assert len(nodes) == 1 # only a single node can be tested next
1143 1143 node = nodes[0]
1144 1144 # compute the approximate number of remaining tests
1145 1145 tests, size = 0, 2
1146 1146 while size <= changesets:
1147 1147 tests, size = tests + 1, size * 2
1148 1148 rev = repo.changelog.rev(node)
1149 1149 ui.write(
1150 1150 _(
1151 1151 b"Testing changeset %d:%s "
1152 1152 b"(%d changesets remaining, ~%d tests)\n"
1153 1153 )
1154 1154 % (rev, short(node), changesets, tests)
1155 1155 )
1156 1156 state[b'current'] = [node]
1157 1157 hbisect.save_state(repo, state)
1158 1158 return mayupdate(repo, node)
1159 1159
1160 1160
1161 1161 @command(
1162 1162 b'bookmarks|bookmark',
1163 1163 [
1164 1164 (b'f', b'force', False, _(b'force')),
1165 1165 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1166 1166 (b'd', b'delete', False, _(b'delete a given bookmark')),
1167 1167 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1168 1168 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1169 1169 (b'l', b'list', False, _(b'list existing bookmarks')),
1170 1170 ]
1171 1171 + formatteropts,
1172 1172 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1173 1173 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1174 1174 )
1175 1175 def bookmark(ui, repo, *names, **opts):
1176 1176 """create a new bookmark or list existing bookmarks
1177 1177
1178 1178 Bookmarks are labels on changesets to help track lines of development.
1179 1179 Bookmarks are unversioned and can be moved, renamed and deleted.
1180 1180 Deleting or moving a bookmark has no effect on the associated changesets.
1181 1181
1182 1182 Creating or updating to a bookmark causes it to be marked as 'active'.
1183 1183 The active bookmark is indicated with a '*'.
1184 1184 When a commit is made, the active bookmark will advance to the new commit.
1185 1185 A plain :hg:`update` will also advance an active bookmark, if possible.
1186 1186 Updating away from a bookmark will cause it to be deactivated.
1187 1187
1188 1188 Bookmarks can be pushed and pulled between repositories (see
1189 1189 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1190 1190 diverged, a new 'divergent bookmark' of the form 'name@path' will
1191 1191 be created. Using :hg:`merge` will resolve the divergence.
1192 1192
1193 1193 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1194 1194 the active bookmark's name.
1195 1195
1196 1196 A bookmark named '@' has the special property that :hg:`clone` will
1197 1197 check it out by default if it exists.
1198 1198
1199 1199 .. container:: verbose
1200 1200
1201 1201 Template:
1202 1202
1203 1203 The following keywords are supported in addition to the common template
1204 1204 keywords and functions such as ``{bookmark}``. See also
1205 1205 :hg:`help templates`.
1206 1206
1207 1207 :active: Boolean. True if the bookmark is active.
1208 1208
1209 1209 Examples:
1210 1210
1211 1211 - create an active bookmark for a new line of development::
1212 1212
1213 1213 hg book new-feature
1214 1214
1215 1215 - create an inactive bookmark as a place marker::
1216 1216
1217 1217 hg book -i reviewed
1218 1218
1219 1219 - create an inactive bookmark on another changeset::
1220 1220
1221 1221 hg book -r .^ tested
1222 1222
1223 1223 - rename bookmark turkey to dinner::
1224 1224
1225 1225 hg book -m turkey dinner
1226 1226
1227 1227 - move the '@' bookmark from another branch::
1228 1228
1229 1229 hg book -f @
1230 1230
1231 1231 - print only the active bookmark name::
1232 1232
1233 1233 hg book -ql .
1234 1234 """
1235 1235 opts = pycompat.byteskwargs(opts)
1236 1236 force = opts.get(b'force')
1237 1237 rev = opts.get(b'rev')
1238 1238 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1239 1239
1240 1240 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1241 1241 if action:
1242 1242 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1243 1243 elif names or rev:
1244 1244 action = b'add'
1245 1245 elif inactive:
1246 1246 action = b'inactive' # meaning deactivate
1247 1247 else:
1248 1248 action = b'list'
1249 1249
1250 1250 cmdutil.check_incompatible_arguments(
1251 1251 opts, b'inactive', [b'delete', b'list']
1252 1252 )
1253 1253 if not names and action in {b'add', b'delete'}:
1254 1254 raise error.InputError(_(b"bookmark name required"))
1255 1255
1256 1256 if action in {b'add', b'delete', b'rename', b'inactive'}:
1257 1257 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1258 1258 if action == b'delete':
1259 1259 names = pycompat.maplist(repo._bookmarks.expandname, names)
1260 1260 bookmarks.delete(repo, tr, names)
1261 1261 elif action == b'rename':
1262 1262 if not names:
1263 1263 raise error.InputError(_(b"new bookmark name required"))
1264 1264 elif len(names) > 1:
1265 1265 raise error.InputError(
1266 1266 _(b"only one new bookmark name allowed")
1267 1267 )
1268 1268 oldname = repo._bookmarks.expandname(opts[b'rename'])
1269 1269 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1270 1270 elif action == b'add':
1271 1271 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1272 1272 elif action == b'inactive':
1273 1273 if len(repo._bookmarks) == 0:
1274 1274 ui.status(_(b"no bookmarks set\n"))
1275 1275 elif not repo._activebookmark:
1276 1276 ui.status(_(b"no active bookmark\n"))
1277 1277 else:
1278 1278 bookmarks.deactivate(repo)
1279 1279 elif action == b'list':
1280 1280 names = pycompat.maplist(repo._bookmarks.expandname, names)
1281 1281 with ui.formatter(b'bookmarks', opts) as fm:
1282 1282 bookmarks.printbookmarks(ui, repo, fm, names)
1283 1283 else:
1284 1284 raise error.ProgrammingError(b'invalid action: %s' % action)
1285 1285
1286 1286
1287 1287 @command(
1288 1288 b'branch',
1289 1289 [
1290 1290 (
1291 1291 b'f',
1292 1292 b'force',
1293 1293 None,
1294 1294 _(b'set branch name even if it shadows an existing branch'),
1295 1295 ),
1296 1296 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1297 1297 (
1298 1298 b'r',
1299 1299 b'rev',
1300 1300 [],
1301 1301 _(b'change branches of the given revs (EXPERIMENTAL)'),
1302 1302 ),
1303 1303 ],
1304 1304 _(b'[-fC] [NAME]'),
1305 1305 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1306 1306 )
1307 1307 def branch(ui, repo, label=None, **opts):
1308 1308 """set or show the current branch name
1309 1309
1310 1310 .. note::
1311 1311
1312 1312 Branch names are permanent and global. Use :hg:`bookmark` to create a
1313 1313 light-weight bookmark instead. See :hg:`help glossary` for more
1314 1314 information about named branches and bookmarks.
1315 1315
1316 1316 With no argument, show the current branch name. With one argument,
1317 1317 set the working directory branch name (the branch will not exist
1318 1318 in the repository until the next commit). Standard practice
1319 1319 recommends that primary development take place on the 'default'
1320 1320 branch.
1321 1321
1322 1322 Unless -f/--force is specified, branch will not let you set a
1323 1323 branch name that already exists.
1324 1324
1325 1325 Use -C/--clean to reset the working directory branch to that of
1326 1326 the parent of the working directory, negating a previous branch
1327 1327 change.
1328 1328
1329 1329 Use the command :hg:`update` to switch to an existing branch. Use
1330 1330 :hg:`commit --close-branch` to mark this branch head as closed.
1331 1331 When all heads of a branch are closed, the branch will be
1332 1332 considered closed.
1333 1333
1334 1334 Returns 0 on success.
1335 1335 """
1336 1336 opts = pycompat.byteskwargs(opts)
1337 1337 revs = opts.get(b'rev')
1338 1338 if label:
1339 1339 label = label.strip()
1340 1340
1341 1341 if not opts.get(b'clean') and not label:
1342 1342 if revs:
1343 1343 raise error.InputError(
1344 1344 _(b"no branch name specified for the revisions")
1345 1345 )
1346 1346 ui.write(b"%s\n" % repo.dirstate.branch())
1347 1347 return
1348 1348
1349 1349 with repo.wlock():
1350 1350 if opts.get(b'clean'):
1351 1351 label = repo[b'.'].branch()
1352 1352 repo.dirstate.setbranch(label)
1353 1353 ui.status(_(b'reset working directory to branch %s\n') % label)
1354 1354 elif label:
1355 1355
1356 1356 scmutil.checknewlabel(repo, label, b'branch')
1357 1357 if revs:
1358 1358 return cmdutil.changebranch(ui, repo, revs, label, opts)
1359 1359
1360 1360 if not opts.get(b'force') and label in repo.branchmap():
1361 1361 if label not in [p.branch() for p in repo[None].parents()]:
1362 1362 raise error.InputError(
1363 1363 _(b'a branch of the same name already exists'),
1364 1364 # i18n: "it" refers to an existing branch
1365 1365 hint=_(b"use 'hg update' to switch to it"),
1366 1366 )
1367 1367
1368 1368 repo.dirstate.setbranch(label)
1369 1369 ui.status(_(b'marked working directory as branch %s\n') % label)
1370 1370
1371 1371 # find any open named branches aside from default
1372 1372 for n, h, t, c in repo.branchmap().iterbranches():
1373 1373 if n != b"default" and not c:
1374 1374 return 0
1375 1375 ui.status(
1376 1376 _(
1377 1377 b'(branches are permanent and global, '
1378 1378 b'did you want a bookmark?)\n'
1379 1379 )
1380 1380 )
1381 1381
1382 1382
1383 1383 @command(
1384 1384 b'branches',
1385 1385 [
1386 1386 (
1387 1387 b'a',
1388 1388 b'active',
1389 1389 False,
1390 1390 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1391 1391 ),
1392 1392 (b'c', b'closed', False, _(b'show normal and closed branches')),
1393 1393 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1394 1394 ]
1395 1395 + formatteropts,
1396 1396 _(b'[-c]'),
1397 1397 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1398 1398 intents={INTENT_READONLY},
1399 1399 )
1400 1400 def branches(ui, repo, active=False, closed=False, **opts):
1401 1401 """list repository named branches
1402 1402
1403 1403 List the repository's named branches, indicating which ones are
1404 1404 inactive. If -c/--closed is specified, also list branches which have
1405 1405 been marked closed (see :hg:`commit --close-branch`).
1406 1406
1407 1407 Use the command :hg:`update` to switch to an existing branch.
1408 1408
1409 1409 .. container:: verbose
1410 1410
1411 1411 Template:
1412 1412
1413 1413 The following keywords are supported in addition to the common template
1414 1414 keywords and functions such as ``{branch}``. See also
1415 1415 :hg:`help templates`.
1416 1416
1417 1417 :active: Boolean. True if the branch is active.
1418 1418 :closed: Boolean. True if the branch is closed.
1419 1419 :current: Boolean. True if it is the current branch.
1420 1420
1421 1421 Returns 0.
1422 1422 """
1423 1423
1424 1424 opts = pycompat.byteskwargs(opts)
1425 1425 revs = opts.get(b'rev')
1426 1426 selectedbranches = None
1427 1427 if revs:
1428 1428 revs = scmutil.revrange(repo, revs)
1429 1429 getbi = repo.revbranchcache().branchinfo
1430 1430 selectedbranches = {getbi(r)[0] for r in revs}
1431 1431
1432 1432 ui.pager(b'branches')
1433 1433 fm = ui.formatter(b'branches', opts)
1434 1434 hexfunc = fm.hexfunc
1435 1435
1436 1436 allheads = set(repo.heads())
1437 1437 branches = []
1438 1438 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1439 1439 if selectedbranches is not None and tag not in selectedbranches:
1440 1440 continue
1441 1441 isactive = False
1442 1442 if not isclosed:
1443 1443 openheads = set(repo.branchmap().iteropen(heads))
1444 1444 isactive = bool(openheads & allheads)
1445 1445 branches.append((tag, repo[tip], isactive, not isclosed))
1446 1446 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1447 1447
1448 1448 for tag, ctx, isactive, isopen in branches:
1449 1449 if active and not isactive:
1450 1450 continue
1451 1451 if isactive:
1452 1452 label = b'branches.active'
1453 1453 notice = b''
1454 1454 elif not isopen:
1455 1455 if not closed:
1456 1456 continue
1457 1457 label = b'branches.closed'
1458 1458 notice = _(b' (closed)')
1459 1459 else:
1460 1460 label = b'branches.inactive'
1461 1461 notice = _(b' (inactive)')
1462 1462 current = tag == repo.dirstate.branch()
1463 1463 if current:
1464 1464 label = b'branches.current'
1465 1465
1466 1466 fm.startitem()
1467 1467 fm.write(b'branch', b'%s', tag, label=label)
1468 1468 rev = ctx.rev()
1469 1469 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1470 1470 fmt = b' ' * padsize + b' %d:%s'
1471 1471 fm.condwrite(
1472 1472 not ui.quiet,
1473 1473 b'rev node',
1474 1474 fmt,
1475 1475 rev,
1476 1476 hexfunc(ctx.node()),
1477 1477 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1478 1478 )
1479 1479 fm.context(ctx=ctx)
1480 1480 fm.data(active=isactive, closed=not isopen, current=current)
1481 1481 if not ui.quiet:
1482 1482 fm.plain(notice)
1483 1483 fm.plain(b'\n')
1484 1484 fm.end()
1485 1485
1486 1486
1487 1487 @command(
1488 1488 b'bundle',
1489 1489 [
1490 1490 (
1491 1491 b'f',
1492 1492 b'force',
1493 1493 None,
1494 1494 _(b'run even when the destination is unrelated'),
1495 1495 ),
1496 1496 (
1497 1497 b'r',
1498 1498 b'rev',
1499 1499 [],
1500 1500 _(b'a changeset intended to be added to the destination'),
1501 1501 _(b'REV'),
1502 1502 ),
1503 1503 (
1504 1504 b'b',
1505 1505 b'branch',
1506 1506 [],
1507 1507 _(b'a specific branch you would like to bundle'),
1508 1508 _(b'BRANCH'),
1509 1509 ),
1510 1510 (
1511 1511 b'',
1512 1512 b'base',
1513 1513 [],
1514 1514 _(b'a base changeset assumed to be available at the destination'),
1515 1515 _(b'REV'),
1516 1516 ),
1517 1517 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1518 1518 (
1519 1519 b't',
1520 1520 b'type',
1521 1521 b'bzip2',
1522 1522 _(b'bundle compression type to use'),
1523 1523 _(b'TYPE'),
1524 1524 ),
1525 1525 ]
1526 1526 + remoteopts,
1527 1527 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1528 1528 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1529 1529 )
1530 1530 def bundle(ui, repo, fname, dest=None, **opts):
1531 1531 """create a bundle file
1532 1532
1533 1533 Generate a bundle file containing data to be transferred to another
1534 1534 repository.
1535 1535
1536 1536 To create a bundle containing all changesets, use -a/--all
1537 1537 (or --base null). Otherwise, hg assumes the destination will have
1538 1538 all the nodes you specify with --base parameters. Otherwise, hg
1539 1539 will assume the repository has all the nodes in destination, or
1540 1540 default-push/default if no destination is specified, where destination
1541 1541 is the repository you provide through DEST option.
1542 1542
1543 1543 You can change bundle format with the -t/--type option. See
1544 1544 :hg:`help bundlespec` for documentation on this format. By default,
1545 1545 the most appropriate format is used and compression defaults to
1546 1546 bzip2.
1547 1547
1548 1548 The bundle file can then be transferred using conventional means
1549 1549 and applied to another repository with the unbundle or pull
1550 1550 command. This is useful when direct push and pull are not
1551 1551 available or when exporting an entire repository is undesirable.
1552 1552
1553 1553 Applying bundles preserves all changeset contents including
1554 1554 permissions, copy/rename information, and revision history.
1555 1555
1556 1556 Returns 0 on success, 1 if no changes found.
1557 1557 """
1558 1558 opts = pycompat.byteskwargs(opts)
1559 1559 revs = None
1560 1560 if b'rev' in opts:
1561 1561 revstrings = opts[b'rev']
1562 1562 revs = scmutil.revrange(repo, revstrings)
1563 1563 if revstrings and not revs:
1564 1564 raise error.InputError(_(b'no commits to bundle'))
1565 1565
1566 1566 bundletype = opts.get(b'type', b'bzip2').lower()
1567 1567 try:
1568 1568 bundlespec = bundlecaches.parsebundlespec(
1569 1569 repo, bundletype, strict=False
1570 1570 )
1571 1571 except error.UnsupportedBundleSpecification as e:
1572 1572 raise error.InputError(
1573 1573 pycompat.bytestr(e),
1574 1574 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1575 1575 )
1576 1576 cgversion = bundlespec.contentopts[b"cg.version"]
1577 1577
1578 1578 # Packed bundles are a pseudo bundle format for now.
1579 1579 if cgversion == b's1':
1580 1580 raise error.InputError(
1581 1581 _(b'packed bundles cannot be produced by "hg bundle"'),
1582 1582 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1583 1583 )
1584 1584
1585 1585 if opts.get(b'all'):
1586 1586 if dest:
1587 1587 raise error.InputError(
1588 1588 _(b"--all is incompatible with specifying a destination")
1589 1589 )
1590 1590 if opts.get(b'base'):
1591 1591 ui.warn(_(b"ignoring --base because --all was specified\n"))
1592 1592 base = [nullrev]
1593 1593 else:
1594 1594 base = scmutil.revrange(repo, opts.get(b'base'))
1595 1595 if cgversion not in changegroup.supportedoutgoingversions(repo):
1596 1596 raise error.Abort(
1597 1597 _(b"repository does not support bundle version %s") % cgversion
1598 1598 )
1599 1599
1600 1600 if base:
1601 1601 if dest:
1602 1602 raise error.InputError(
1603 1603 _(b"--base is incompatible with specifying a destination")
1604 1604 )
1605 1605 common = [repo[rev].node() for rev in base]
1606 1606 heads = [repo[r].node() for r in revs] if revs else None
1607 1607 outgoing = discovery.outgoing(repo, common, heads)
1608 1608 else:
1609 1609 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1610 1610 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1611 1611 other = hg.peer(repo, opts, dest)
1612 1612 revs = [repo[r].hex() for r in revs]
1613 1613 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1614 1614 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1615 1615 outgoing = discovery.findcommonoutgoing(
1616 1616 repo,
1617 1617 other,
1618 1618 onlyheads=heads,
1619 1619 force=opts.get(b'force'),
1620 1620 portable=True,
1621 1621 )
1622 1622
1623 1623 if not outgoing.missing:
1624 1624 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1625 1625 return 1
1626 1626
1627 1627 if cgversion == b'01': # bundle1
1628 1628 bversion = b'HG10' + bundlespec.wirecompression
1629 1629 bcompression = None
1630 1630 elif cgversion in (b'02', b'03'):
1631 1631 bversion = b'HG20'
1632 1632 bcompression = bundlespec.wirecompression
1633 1633 else:
1634 1634 raise error.ProgrammingError(
1635 1635 b'bundle: unexpected changegroup version %s' % cgversion
1636 1636 )
1637 1637
1638 1638 # TODO compression options should be derived from bundlespec parsing.
1639 1639 # This is a temporary hack to allow adjusting bundle compression
1640 1640 # level without a) formalizing the bundlespec changes to declare it
1641 1641 # b) introducing a command flag.
1642 1642 compopts = {}
1643 1643 complevel = ui.configint(
1644 1644 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1645 1645 )
1646 1646 if complevel is None:
1647 1647 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1648 1648 if complevel is not None:
1649 1649 compopts[b'level'] = complevel
1650 1650
1651 1651 # Allow overriding the bundling of obsmarker in phases through
1652 1652 # configuration while we don't have a bundle version that include them
1653 1653 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1654 1654 bundlespec.contentopts[b'obsolescence'] = True
1655 1655 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1656 1656 bundlespec.contentopts[b'phases'] = True
1657 1657
1658 1658 bundle2.writenewbundle(
1659 1659 ui,
1660 1660 repo,
1661 1661 b'bundle',
1662 1662 fname,
1663 1663 bversion,
1664 1664 outgoing,
1665 1665 bundlespec.contentopts,
1666 1666 compression=bcompression,
1667 1667 compopts=compopts,
1668 1668 )
1669 1669
1670 1670
1671 1671 @command(
1672 1672 b'cat',
1673 1673 [
1674 1674 (
1675 1675 b'o',
1676 1676 b'output',
1677 1677 b'',
1678 1678 _(b'print output to file with formatted name'),
1679 1679 _(b'FORMAT'),
1680 1680 ),
1681 1681 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1682 1682 (b'', b'decode', None, _(b'apply any matching decode filter')),
1683 1683 ]
1684 1684 + walkopts
1685 1685 + formatteropts,
1686 1686 _(b'[OPTION]... FILE...'),
1687 1687 helpcategory=command.CATEGORY_FILE_CONTENTS,
1688 1688 inferrepo=True,
1689 1689 intents={INTENT_READONLY},
1690 1690 )
1691 1691 def cat(ui, repo, file1, *pats, **opts):
1692 1692 """output the current or given revision of files
1693 1693
1694 1694 Print the specified files as they were at the given revision. If
1695 1695 no revision is given, the parent of the working directory is used.
1696 1696
1697 1697 Output may be to a file, in which case the name of the file is
1698 1698 given using a template string. See :hg:`help templates`. In addition
1699 1699 to the common template keywords, the following formatting rules are
1700 1700 supported:
1701 1701
1702 1702 :``%%``: literal "%" character
1703 1703 :``%s``: basename of file being printed
1704 1704 :``%d``: dirname of file being printed, or '.' if in repository root
1705 1705 :``%p``: root-relative path name of file being printed
1706 1706 :``%H``: changeset hash (40 hexadecimal digits)
1707 1707 :``%R``: changeset revision number
1708 1708 :``%h``: short-form changeset hash (12 hexadecimal digits)
1709 1709 :``%r``: zero-padded changeset revision number
1710 1710 :``%b``: basename of the exporting repository
1711 1711 :``\\``: literal "\\" character
1712 1712
1713 1713 .. container:: verbose
1714 1714
1715 1715 Template:
1716 1716
1717 1717 The following keywords are supported in addition to the common template
1718 1718 keywords and functions. See also :hg:`help templates`.
1719 1719
1720 1720 :data: String. File content.
1721 1721 :path: String. Repository-absolute path of the file.
1722 1722
1723 1723 Returns 0 on success.
1724 1724 """
1725 1725 opts = pycompat.byteskwargs(opts)
1726 1726 rev = opts.get(b'rev')
1727 1727 if rev:
1728 1728 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1729 1729 ctx = scmutil.revsingle(repo, rev)
1730 1730 m = scmutil.match(ctx, (file1,) + pats, opts)
1731 1731 fntemplate = opts.pop(b'output', b'')
1732 1732 if cmdutil.isstdiofilename(fntemplate):
1733 1733 fntemplate = b''
1734 1734
1735 1735 if fntemplate:
1736 1736 fm = formatter.nullformatter(ui, b'cat', opts)
1737 1737 else:
1738 1738 ui.pager(b'cat')
1739 1739 fm = ui.formatter(b'cat', opts)
1740 1740 with fm:
1741 1741 return cmdutil.cat(
1742 1742 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1743 1743 )
1744 1744
1745 1745
1746 1746 @command(
1747 1747 b'clone',
1748 1748 [
1749 1749 (
1750 1750 b'U',
1751 1751 b'noupdate',
1752 1752 None,
1753 1753 _(
1754 1754 b'the clone will include an empty working '
1755 1755 b'directory (only a repository)'
1756 1756 ),
1757 1757 ),
1758 1758 (
1759 1759 b'u',
1760 1760 b'updaterev',
1761 1761 b'',
1762 1762 _(b'revision, tag, or branch to check out'),
1763 1763 _(b'REV'),
1764 1764 ),
1765 1765 (
1766 1766 b'r',
1767 1767 b'rev',
1768 1768 [],
1769 1769 _(
1770 1770 b'do not clone everything, but include this changeset'
1771 1771 b' and its ancestors'
1772 1772 ),
1773 1773 _(b'REV'),
1774 1774 ),
1775 1775 (
1776 1776 b'b',
1777 1777 b'branch',
1778 1778 [],
1779 1779 _(
1780 1780 b'do not clone everything, but include this branch\'s'
1781 1781 b' changesets and their ancestors'
1782 1782 ),
1783 1783 _(b'BRANCH'),
1784 1784 ),
1785 1785 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1786 1786 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1787 1787 (b'', b'stream', None, _(b'clone with minimal data processing')),
1788 1788 ]
1789 1789 + remoteopts,
1790 1790 _(b'[OPTION]... SOURCE [DEST]'),
1791 1791 helpcategory=command.CATEGORY_REPO_CREATION,
1792 1792 helpbasic=True,
1793 1793 norepo=True,
1794 1794 )
1795 1795 def clone(ui, source, dest=None, **opts):
1796 1796 """make a copy of an existing repository
1797 1797
1798 1798 Create a copy of an existing repository in a new directory.
1799 1799
1800 1800 If no destination directory name is specified, it defaults to the
1801 1801 basename of the source.
1802 1802
1803 1803 The location of the source is added to the new repository's
1804 1804 ``.hg/hgrc`` file, as the default to be used for future pulls.
1805 1805
1806 1806 Only local paths and ``ssh://`` URLs are supported as
1807 1807 destinations. For ``ssh://`` destinations, no working directory or
1808 1808 ``.hg/hgrc`` will be created on the remote side.
1809 1809
1810 1810 If the source repository has a bookmark called '@' set, that
1811 1811 revision will be checked out in the new repository by default.
1812 1812
1813 1813 To check out a particular version, use -u/--update, or
1814 1814 -U/--noupdate to create a clone with no working directory.
1815 1815
1816 1816 To pull only a subset of changesets, specify one or more revisions
1817 1817 identifiers with -r/--rev or branches with -b/--branch. The
1818 1818 resulting clone will contain only the specified changesets and
1819 1819 their ancestors. These options (or 'clone src#rev dest') imply
1820 1820 --pull, even for local source repositories.
1821 1821
1822 1822 In normal clone mode, the remote normalizes repository data into a common
1823 1823 exchange format and the receiving end translates this data into its local
1824 1824 storage format. --stream activates a different clone mode that essentially
1825 1825 copies repository files from the remote with minimal data processing. This
1826 1826 significantly reduces the CPU cost of a clone both remotely and locally.
1827 1827 However, it often increases the transferred data size by 30-40%. This can
1828 1828 result in substantially faster clones where I/O throughput is plentiful,
1829 1829 especially for larger repositories. A side-effect of --stream clones is
1830 1830 that storage settings and requirements on the remote are applied locally:
1831 1831 a modern client may inherit legacy or inefficient storage used by the
1832 1832 remote or a legacy Mercurial client may not be able to clone from a
1833 1833 modern Mercurial remote.
1834 1834
1835 1835 .. note::
1836 1836
1837 1837 Specifying a tag will include the tagged changeset but not the
1838 1838 changeset containing the tag.
1839 1839
1840 1840 .. container:: verbose
1841 1841
1842 1842 For efficiency, hardlinks are used for cloning whenever the
1843 1843 source and destination are on the same filesystem (note this
1844 1844 applies only to the repository data, not to the working
1845 1845 directory). Some filesystems, such as AFS, implement hardlinking
1846 1846 incorrectly, but do not report errors. In these cases, use the
1847 1847 --pull option to avoid hardlinking.
1848 1848
1849 1849 Mercurial will update the working directory to the first applicable
1850 1850 revision from this list:
1851 1851
1852 1852 a) null if -U or the source repository has no changesets
1853 1853 b) if -u . and the source repository is local, the first parent of
1854 1854 the source repository's working directory
1855 1855 c) the changeset specified with -u (if a branch name, this means the
1856 1856 latest head of that branch)
1857 1857 d) the changeset specified with -r
1858 1858 e) the tipmost head specified with -b
1859 1859 f) the tipmost head specified with the url#branch source syntax
1860 1860 g) the revision marked with the '@' bookmark, if present
1861 1861 h) the tipmost head of the default branch
1862 1862 i) tip
1863 1863
1864 1864 When cloning from servers that support it, Mercurial may fetch
1865 1865 pre-generated data from a server-advertised URL or inline from the
1866 1866 same stream. When this is done, hooks operating on incoming changesets
1867 1867 and changegroups may fire more than once, once for each pre-generated
1868 1868 bundle and as well as for any additional remaining data. In addition,
1869 1869 if an error occurs, the repository may be rolled back to a partial
1870 1870 clone. This behavior may change in future releases.
1871 1871 See :hg:`help -e clonebundles` for more.
1872 1872
1873 1873 Examples:
1874 1874
1875 1875 - clone a remote repository to a new directory named hg/::
1876 1876
1877 1877 hg clone https://www.mercurial-scm.org/repo/hg/
1878 1878
1879 1879 - create a lightweight local clone::
1880 1880
1881 1881 hg clone project/ project-feature/
1882 1882
1883 1883 - clone from an absolute path on an ssh server (note double-slash)::
1884 1884
1885 1885 hg clone ssh://user@server//home/projects/alpha/
1886 1886
1887 1887 - do a streaming clone while checking out a specified version::
1888 1888
1889 1889 hg clone --stream http://server/repo -u 1.5
1890 1890
1891 1891 - create a repository without changesets after a particular revision::
1892 1892
1893 1893 hg clone -r 04e544 experimental/ good/
1894 1894
1895 1895 - clone (and track) a particular named branch::
1896 1896
1897 1897 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1898 1898
1899 1899 See :hg:`help urls` for details on specifying URLs.
1900 1900
1901 1901 Returns 0 on success.
1902 1902 """
1903 1903 opts = pycompat.byteskwargs(opts)
1904 1904 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1905 1905
1906 1906 # --include/--exclude can come from narrow or sparse.
1907 1907 includepats, excludepats = None, None
1908 1908
1909 1909 # hg.clone() differentiates between None and an empty set. So make sure
1910 1910 # patterns are sets if narrow is requested without patterns.
1911 1911 if opts.get(b'narrow'):
1912 1912 includepats = set()
1913 1913 excludepats = set()
1914 1914
1915 1915 if opts.get(b'include'):
1916 1916 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1917 1917 if opts.get(b'exclude'):
1918 1918 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1919 1919
1920 1920 r = hg.clone(
1921 1921 ui,
1922 1922 opts,
1923 1923 source,
1924 1924 dest,
1925 1925 pull=opts.get(b'pull'),
1926 1926 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1927 1927 revs=opts.get(b'rev'),
1928 1928 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1929 1929 branch=opts.get(b'branch'),
1930 1930 shareopts=opts.get(b'shareopts'),
1931 1931 storeincludepats=includepats,
1932 1932 storeexcludepats=excludepats,
1933 1933 depth=opts.get(b'depth') or None,
1934 1934 )
1935 1935
1936 1936 return r is None
1937 1937
1938 1938
1939 1939 @command(
1940 1940 b'commit|ci',
1941 1941 [
1942 1942 (
1943 1943 b'A',
1944 1944 b'addremove',
1945 1945 None,
1946 1946 _(b'mark new/missing files as added/removed before committing'),
1947 1947 ),
1948 1948 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1949 1949 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1950 1950 (b's', b'secret', None, _(b'use the secret phase for committing')),
1951 1951 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1952 1952 (
1953 1953 b'',
1954 1954 b'force-close-branch',
1955 1955 None,
1956 1956 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1957 1957 ),
1958 1958 (b'i', b'interactive', None, _(b'use interactive mode')),
1959 1959 ]
1960 1960 + walkopts
1961 1961 + commitopts
1962 1962 + commitopts2
1963 1963 + subrepoopts,
1964 1964 _(b'[OPTION]... [FILE]...'),
1965 1965 helpcategory=command.CATEGORY_COMMITTING,
1966 1966 helpbasic=True,
1967 1967 inferrepo=True,
1968 1968 )
1969 1969 def commit(ui, repo, *pats, **opts):
1970 1970 """commit the specified files or all outstanding changes
1971 1971
1972 1972 Commit changes to the given files into the repository. Unlike a
1973 1973 centralized SCM, this operation is a local operation. See
1974 1974 :hg:`push` for a way to actively distribute your changes.
1975 1975
1976 1976 If a list of files is omitted, all changes reported by :hg:`status`
1977 1977 will be committed.
1978 1978
1979 1979 If you are committing the result of a merge, do not provide any
1980 1980 filenames or -I/-X filters.
1981 1981
1982 1982 If no commit message is specified, Mercurial starts your
1983 1983 configured editor where you can enter a message. In case your
1984 1984 commit fails, you will find a backup of your message in
1985 1985 ``.hg/last-message.txt``.
1986 1986
1987 1987 The --close-branch flag can be used to mark the current branch
1988 1988 head closed. When all heads of a branch are closed, the branch
1989 1989 will be considered closed and no longer listed.
1990 1990
1991 1991 The --amend flag can be used to amend the parent of the
1992 1992 working directory with a new commit that contains the changes
1993 1993 in the parent in addition to those currently reported by :hg:`status`,
1994 1994 if there are any. The old commit is stored in a backup bundle in
1995 1995 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1996 1996 on how to restore it).
1997 1997
1998 1998 Message, user and date are taken from the amended commit unless
1999 1999 specified. When a message isn't specified on the command line,
2000 2000 the editor will open with the message of the amended commit.
2001 2001
2002 2002 It is not possible to amend public changesets (see :hg:`help phases`)
2003 2003 or changesets that have children.
2004 2004
2005 2005 See :hg:`help dates` for a list of formats valid for -d/--date.
2006 2006
2007 2007 Returns 0 on success, 1 if nothing changed.
2008 2008
2009 2009 .. container:: verbose
2010 2010
2011 2011 Examples:
2012 2012
2013 2013 - commit all files ending in .py::
2014 2014
2015 2015 hg commit --include "set:**.py"
2016 2016
2017 2017 - commit all non-binary files::
2018 2018
2019 2019 hg commit --exclude "set:binary()"
2020 2020
2021 2021 - amend the current commit and set the date to now::
2022 2022
2023 2023 hg commit --amend --date now
2024 2024 """
2025 2025 with repo.wlock(), repo.lock():
2026 2026 return _docommit(ui, repo, *pats, **opts)
2027 2027
2028 2028
2029 2029 def _docommit(ui, repo, *pats, **opts):
2030 2030 if opts.get('interactive'):
2031 2031 opts.pop('interactive')
2032 2032 ret = cmdutil.dorecord(
2033 2033 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2034 2034 )
2035 2035 # ret can be 0 (no changes to record) or the value returned by
2036 2036 # commit(), 1 if nothing changed or None on success.
2037 2037 return 1 if ret == 0 else ret
2038 2038
2039 2039 opts = pycompat.byteskwargs(opts)
2040 2040 if opts.get(b'subrepos'):
2041 2041 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2042 2042 # Let --subrepos on the command line override config setting.
2043 2043 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2044 2044
2045 2045 cmdutil.checkunfinished(repo, commit=True)
2046 2046
2047 2047 branch = repo[None].branch()
2048 2048 bheads = repo.branchheads(branch)
2049 2049 tip = repo.changelog.tip()
2050 2050
2051 2051 extra = {}
2052 2052 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2053 2053 extra[b'close'] = b'1'
2054 2054
2055 2055 if repo[b'.'].closesbranch():
2056 2056 raise error.InputError(
2057 2057 _(b'current revision is already a branch closing head')
2058 2058 )
2059 2059 elif not bheads:
2060 2060 raise error.InputError(
2061 2061 _(b'branch "%s" has no heads to close') % branch
2062 2062 )
2063 2063 elif (
2064 2064 branch == repo[b'.'].branch()
2065 2065 and repo[b'.'].node() not in bheads
2066 2066 and not opts.get(b'force_close_branch')
2067 2067 ):
2068 2068 hint = _(
2069 2069 b'use --force-close-branch to close branch from a non-head'
2070 2070 b' changeset'
2071 2071 )
2072 2072 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2073 2073 elif opts.get(b'amend'):
2074 2074 if (
2075 2075 repo[b'.'].p1().branch() != branch
2076 2076 and repo[b'.'].p2().branch() != branch
2077 2077 ):
2078 2078 raise error.InputError(_(b'can only close branch heads'))
2079 2079
2080 2080 if opts.get(b'amend'):
2081 2081 if ui.configbool(b'ui', b'commitsubrepos'):
2082 2082 raise error.InputError(
2083 2083 _(b'cannot amend with ui.commitsubrepos enabled')
2084 2084 )
2085 2085
2086 2086 old = repo[b'.']
2087 2087 rewriteutil.precheck(repo, [old.rev()], b'amend')
2088 2088
2089 2089 # Currently histedit gets confused if an amend happens while histedit
2090 2090 # is in progress. Since we have a checkunfinished command, we are
2091 2091 # temporarily honoring it.
2092 2092 #
2093 2093 # Note: eventually this guard will be removed. Please do not expect
2094 2094 # this behavior to remain.
2095 2095 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2096 2096 cmdutil.checkunfinished(repo)
2097 2097
2098 2098 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2099 2099 if node == old.node():
2100 2100 ui.status(_(b"nothing changed\n"))
2101 2101 return 1
2102 2102 else:
2103 2103
2104 2104 def commitfunc(ui, repo, message, match, opts):
2105 2105 overrides = {}
2106 2106 if opts.get(b'secret'):
2107 2107 overrides[(b'phases', b'new-commit')] = b'secret'
2108 2108
2109 2109 baseui = repo.baseui
2110 2110 with baseui.configoverride(overrides, b'commit'):
2111 2111 with ui.configoverride(overrides, b'commit'):
2112 2112 editform = cmdutil.mergeeditform(
2113 2113 repo[None], b'commit.normal'
2114 2114 )
2115 2115 editor = cmdutil.getcommiteditor(
2116 2116 editform=editform, **pycompat.strkwargs(opts)
2117 2117 )
2118 2118 return repo.commit(
2119 2119 message,
2120 2120 opts.get(b'user'),
2121 2121 opts.get(b'date'),
2122 2122 match,
2123 2123 editor=editor,
2124 2124 extra=extra,
2125 2125 )
2126 2126
2127 2127 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2128 2128
2129 2129 if not node:
2130 2130 stat = cmdutil.postcommitstatus(repo, pats, opts)
2131 2131 if stat.deleted:
2132 2132 ui.status(
2133 2133 _(
2134 2134 b"nothing changed (%d missing files, see "
2135 2135 b"'hg status')\n"
2136 2136 )
2137 2137 % len(stat.deleted)
2138 2138 )
2139 2139 else:
2140 2140 ui.status(_(b"nothing changed\n"))
2141 2141 return 1
2142 2142
2143 2143 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2144 2144
2145 2145 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2146 2146 status(
2147 2147 ui,
2148 2148 repo,
2149 2149 modified=True,
2150 2150 added=True,
2151 2151 removed=True,
2152 2152 deleted=True,
2153 2153 unknown=True,
2154 2154 subrepos=opts.get(b'subrepos'),
2155 2155 )
2156 2156
2157 2157
2158 2158 @command(
2159 2159 b'config|showconfig|debugconfig',
2160 2160 [
2161 2161 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2162 2162 (b'e', b'edit', None, _(b'edit user config')),
2163 2163 (b'l', b'local', None, _(b'edit repository config')),
2164 2164 (
2165 2165 b'',
2166 2166 b'shared',
2167 2167 None,
2168 2168 _(b'edit shared source repository config (EXPERIMENTAL)'),
2169 2169 ),
2170 2170 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2171 2171 (b'g', b'global', None, _(b'edit global config')),
2172 2172 ]
2173 2173 + formatteropts,
2174 2174 _(b'[-u] [NAME]...'),
2175 2175 helpcategory=command.CATEGORY_HELP,
2176 2176 optionalrepo=True,
2177 2177 intents={INTENT_READONLY},
2178 2178 )
2179 2179 def config(ui, repo, *values, **opts):
2180 2180 """show combined config settings from all hgrc files
2181 2181
2182 2182 With no arguments, print names and values of all config items.
2183 2183
2184 2184 With one argument of the form section.name, print just the value
2185 2185 of that config item.
2186 2186
2187 2187 With multiple arguments, print names and values of all config
2188 2188 items with matching section names or section.names.
2189 2189
2190 2190 With --edit, start an editor on the user-level config file. With
2191 2191 --global, edit the system-wide config file. With --local, edit the
2192 2192 repository-level config file.
2193 2193
2194 2194 With --debug, the source (filename and line number) is printed
2195 2195 for each config item.
2196 2196
2197 2197 See :hg:`help config` for more information about config files.
2198 2198
2199 2199 .. container:: verbose
2200 2200
2201 2201 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2202 2202 This file is not shared across shares when in share-safe mode.
2203 2203
2204 2204 Template:
2205 2205
2206 2206 The following keywords are supported. See also :hg:`help templates`.
2207 2207
2208 2208 :name: String. Config name.
2209 2209 :source: String. Filename and line number where the item is defined.
2210 2210 :value: String. Config value.
2211 2211
2212 2212 The --shared flag can be used to edit the config file of shared source
2213 2213 repository. It only works when you have shared using the experimental
2214 2214 share safe feature.
2215 2215
2216 2216 Returns 0 on success, 1 if NAME does not exist.
2217 2217
2218 2218 """
2219 2219
2220 2220 opts = pycompat.byteskwargs(opts)
2221 2221 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2222 2222 if any(opts.get(o) for o in editopts):
2223 2223 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2224 2224 if opts.get(b'local'):
2225 2225 if not repo:
2226 2226 raise error.InputError(
2227 2227 _(b"can't use --local outside a repository")
2228 2228 )
2229 2229 paths = [repo.vfs.join(b'hgrc')]
2230 2230 elif opts.get(b'global'):
2231 2231 paths = rcutil.systemrcpath()
2232 2232 elif opts.get(b'shared'):
2233 2233 if not repo.shared():
2234 2234 raise error.InputError(
2235 2235 _(b"repository is not shared; can't use --shared")
2236 2236 )
2237 2237 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2238 2238 raise error.InputError(
2239 2239 _(
2240 2240 b"share safe feature not enabled; "
2241 2241 b"unable to edit shared source repository config"
2242 2242 )
2243 2243 )
2244 2244 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2245 2245 elif opts.get(b'non_shared'):
2246 2246 paths = [repo.vfs.join(b'hgrc-not-shared')]
2247 2247 else:
2248 2248 paths = rcutil.userrcpath()
2249 2249
2250 2250 for f in paths:
2251 2251 if os.path.exists(f):
2252 2252 break
2253 2253 else:
2254 2254 if opts.get(b'global'):
2255 2255 samplehgrc = uimod.samplehgrcs[b'global']
2256 2256 elif opts.get(b'local'):
2257 2257 samplehgrc = uimod.samplehgrcs[b'local']
2258 2258 else:
2259 2259 samplehgrc = uimod.samplehgrcs[b'user']
2260 2260
2261 2261 f = paths[0]
2262 2262 fp = open(f, b"wb")
2263 2263 fp.write(util.tonativeeol(samplehgrc))
2264 2264 fp.close()
2265 2265
2266 2266 editor = ui.geteditor()
2267 2267 ui.system(
2268 2268 b"%s \"%s\"" % (editor, f),
2269 2269 onerr=error.InputError,
2270 2270 errprefix=_(b"edit failed"),
2271 2271 blockedtag=b'config_edit',
2272 2272 )
2273 2273 return
2274 2274 ui.pager(b'config')
2275 2275 fm = ui.formatter(b'config', opts)
2276 2276 for t, f in rcutil.rccomponents():
2277 2277 if t == b'path':
2278 2278 ui.debug(b'read config from: %s\n' % f)
2279 2279 elif t == b'resource':
2280 2280 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2281 2281 elif t == b'items':
2282 2282 # Don't print anything for 'items'.
2283 2283 pass
2284 2284 else:
2285 2285 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2286 2286 untrusted = bool(opts.get(b'untrusted'))
2287 2287
2288 2288 selsections = selentries = []
2289 2289 if values:
2290 2290 selsections = [v for v in values if b'.' not in v]
2291 2291 selentries = [v for v in values if b'.' in v]
2292 2292 uniquesel = len(selentries) == 1 and not selsections
2293 2293 selsections = set(selsections)
2294 2294 selentries = set(selentries)
2295 2295
2296 2296 matched = False
2297 2297 for section, name, value in ui.walkconfig(untrusted=untrusted):
2298 2298 source = ui.configsource(section, name, untrusted)
2299 2299 value = pycompat.bytestr(value)
2300 2300 defaultvalue = ui.configdefault(section, name)
2301 2301 if fm.isplain():
2302 2302 source = source or b'none'
2303 2303 value = value.replace(b'\n', b'\\n')
2304 2304 entryname = section + b'.' + name
2305 2305 if values and not (section in selsections or entryname in selentries):
2306 2306 continue
2307 2307 fm.startitem()
2308 2308 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2309 2309 if uniquesel:
2310 2310 fm.data(name=entryname)
2311 2311 fm.write(b'value', b'%s\n', value)
2312 2312 else:
2313 2313 fm.write(b'name value', b'%s=%s\n', entryname, value)
2314 2314 if formatter.isprintable(defaultvalue):
2315 2315 fm.data(defaultvalue=defaultvalue)
2316 2316 elif isinstance(defaultvalue, list) and all(
2317 2317 formatter.isprintable(e) for e in defaultvalue
2318 2318 ):
2319 2319 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2320 2320 # TODO: no idea how to process unsupported defaultvalue types
2321 2321 matched = True
2322 2322 fm.end()
2323 2323 if matched:
2324 2324 return 0
2325 2325 return 1
2326 2326
2327 2327
2328 2328 @command(
2329 2329 b'continue',
2330 2330 dryrunopts,
2331 2331 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2332 2332 helpbasic=True,
2333 2333 )
2334 2334 def continuecmd(ui, repo, **opts):
2335 2335 """resumes an interrupted operation (EXPERIMENTAL)
2336 2336
2337 2337 Finishes a multistep operation like graft, histedit, rebase, merge,
2338 2338 and unshelve if they are in an interrupted state.
2339 2339
2340 2340 use --dry-run/-n to dry run the command.
2341 2341 """
2342 2342 dryrun = opts.get('dry_run')
2343 2343 contstate = cmdutil.getunfinishedstate(repo)
2344 2344 if not contstate:
2345 2345 raise error.StateError(_(b'no operation in progress'))
2346 2346 if not contstate.continuefunc:
2347 2347 raise error.StateError(
2348 2348 (
2349 2349 _(b"%s in progress but does not support 'hg continue'")
2350 2350 % (contstate._opname)
2351 2351 ),
2352 2352 hint=contstate.continuemsg(),
2353 2353 )
2354 2354 if dryrun:
2355 2355 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2356 2356 return
2357 2357 return contstate.continuefunc(ui, repo)
2358 2358
2359 2359
2360 2360 @command(
2361 2361 b'copy|cp',
2362 2362 [
2363 2363 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2364 2364 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2365 2365 (
2366 2366 b'',
2367 2367 b'at-rev',
2368 2368 b'',
2369 2369 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2370 2370 _(b'REV'),
2371 2371 ),
2372 2372 (
2373 2373 b'f',
2374 2374 b'force',
2375 2375 None,
2376 2376 _(b'forcibly copy over an existing managed file'),
2377 2377 ),
2378 2378 ]
2379 2379 + walkopts
2380 2380 + dryrunopts,
2381 2381 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2382 2382 helpcategory=command.CATEGORY_FILE_CONTENTS,
2383 2383 )
2384 2384 def copy(ui, repo, *pats, **opts):
2385 2385 """mark files as copied for the next commit
2386 2386
2387 2387 Mark dest as having copies of source files. If dest is a
2388 2388 directory, copies are put in that directory. If dest is a file,
2389 2389 the source must be a single file.
2390 2390
2391 2391 By default, this command copies the contents of files as they
2392 2392 exist in the working directory. If invoked with -A/--after, the
2393 2393 operation is recorded, but no copying is performed.
2394 2394
2395 2395 To undo marking a destination file as copied, use --forget. With that
2396 2396 option, all given (positional) arguments are unmarked as copies. The
2397 2397 destination file(s) will be left in place (still tracked).
2398 2398
2399 2399 This command takes effect with the next commit by default.
2400 2400
2401 2401 Returns 0 on success, 1 if errors are encountered.
2402 2402 """
2403 2403 opts = pycompat.byteskwargs(opts)
2404 2404 with repo.wlock():
2405 2405 return cmdutil.copy(ui, repo, pats, opts)
2406 2406
2407 2407
2408 2408 @command(
2409 2409 b'debugcommands',
2410 2410 [],
2411 2411 _(b'[COMMAND]'),
2412 2412 helpcategory=command.CATEGORY_HELP,
2413 2413 norepo=True,
2414 2414 )
2415 2415 def debugcommands(ui, cmd=b'', *args):
2416 2416 """list all available commands and options"""
2417 2417 for cmd, vals in sorted(pycompat.iteritems(table)):
2418 2418 cmd = cmd.split(b'|')[0]
2419 2419 opts = b', '.join([i[1] for i in vals[1]])
2420 2420 ui.write(b'%s: %s\n' % (cmd, opts))
2421 2421
2422 2422
2423 2423 @command(
2424 2424 b'debugcomplete',
2425 2425 [(b'o', b'options', None, _(b'show the command options'))],
2426 2426 _(b'[-o] CMD'),
2427 2427 helpcategory=command.CATEGORY_HELP,
2428 2428 norepo=True,
2429 2429 )
2430 2430 def debugcomplete(ui, cmd=b'', **opts):
2431 2431 """returns the completion list associated with the given command"""
2432 2432
2433 2433 if opts.get('options'):
2434 2434 options = []
2435 2435 otables = [globalopts]
2436 2436 if cmd:
2437 2437 aliases, entry = cmdutil.findcmd(cmd, table, False)
2438 2438 otables.append(entry[1])
2439 2439 for t in otables:
2440 2440 for o in t:
2441 2441 if b"(DEPRECATED)" in o[3]:
2442 2442 continue
2443 2443 if o[0]:
2444 2444 options.append(b'-%s' % o[0])
2445 2445 options.append(b'--%s' % o[1])
2446 2446 ui.write(b"%s\n" % b"\n".join(options))
2447 2447 return
2448 2448
2449 2449 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2450 2450 if ui.verbose:
2451 2451 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2452 2452 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2453 2453
2454 2454
2455 2455 @command(
2456 2456 b'diff',
2457 2457 [
2458 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2458 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2459 2459 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2460 2460 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2461 2461 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2462 2462 ]
2463 2463 + diffopts
2464 2464 + diffopts2
2465 2465 + walkopts
2466 2466 + subrepoopts,
2467 2467 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2468 2468 helpcategory=command.CATEGORY_FILE_CONTENTS,
2469 2469 helpbasic=True,
2470 2470 inferrepo=True,
2471 2471 intents={INTENT_READONLY},
2472 2472 )
2473 2473 def diff(ui, repo, *pats, **opts):
2474 2474 """diff repository (or selected files)
2475 2475
2476 2476 Show differences between revisions for the specified files.
2477 2477
2478 2478 Differences between files are shown using the unified diff format.
2479 2479
2480 2480 .. note::
2481 2481
2482 2482 :hg:`diff` may generate unexpected results for merges, as it will
2483 2483 default to comparing against the working directory's first
2484 2484 parent changeset if no revisions are specified.
2485 2485
2486 2486 By default, the working directory files are compared to its first parent. To
2487 2487 see the differences from another revision, use --from. To see the difference
2488 2488 to another revision, use --to. For example, :hg:`diff --from .^` will show
2489 2489 the differences from the working copy's grandparent to the working copy,
2490 2490 :hg:`diff --to .` will show the diff from the working copy to its parent
2491 2491 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2492 2492 show the diff between those two revisions.
2493 2493
2494 2494 Alternatively you can specify -c/--change with a revision to see the changes
2495 2495 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2496 2496 equivalent to :hg:`diff --from 42^ --to 42`)
2497 2497
2498 2498 Without the -a/--text option, diff will avoid generating diffs of
2499 2499 files it detects as binary. With -a, diff will generate a diff
2500 2500 anyway, probably with undesirable results.
2501 2501
2502 2502 Use the -g/--git option to generate diffs in the git extended diff
2503 2503 format. For more information, read :hg:`help diffs`.
2504 2504
2505 2505 .. container:: verbose
2506 2506
2507 2507 Examples:
2508 2508
2509 2509 - compare a file in the current working directory to its parent::
2510 2510
2511 2511 hg diff foo.c
2512 2512
2513 2513 - compare two historical versions of a directory, with rename info::
2514 2514
2515 2515 hg diff --git --from 1.0 --to 1.2 lib/
2516 2516
2517 2517 - get change stats relative to the last change on some date::
2518 2518
2519 2519 hg diff --stat --from "date('may 2')"
2520 2520
2521 2521 - diff all newly-added files that contain a keyword::
2522 2522
2523 2523 hg diff "set:added() and grep(GNU)"
2524 2524
2525 2525 - compare a revision and its parents::
2526 2526
2527 2527 hg diff -c 9353 # compare against first parent
2528 2528 hg diff --from 9353^ --to 9353 # same using revset syntax
2529 2529 hg diff --from 9353^2 --to 9353 # compare against the second parent
2530 2530
2531 2531 Returns 0 on success.
2532 2532 """
2533 2533
2534 2534 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2535 2535 opts = pycompat.byteskwargs(opts)
2536 2536 revs = opts.get(b'rev')
2537 2537 change = opts.get(b'change')
2538 2538 from_rev = opts.get(b'from')
2539 2539 to_rev = opts.get(b'to')
2540 2540 stat = opts.get(b'stat')
2541 2541 reverse = opts.get(b'reverse')
2542 2542
2543 2543 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2544 2544 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2545 2545 if change:
2546 2546 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2547 2547 ctx2 = scmutil.revsingle(repo, change, None)
2548 2548 ctx1 = ctx2.p1()
2549 2549 elif from_rev or to_rev:
2550 2550 repo = scmutil.unhidehashlikerevs(
2551 2551 repo, [from_rev] + [to_rev], b'nowarn'
2552 2552 )
2553 2553 ctx1 = scmutil.revsingle(repo, from_rev, None)
2554 2554 ctx2 = scmutil.revsingle(repo, to_rev, None)
2555 2555 else:
2556 2556 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2557 2557 ctx1, ctx2 = scmutil.revpair(repo, revs)
2558 2558
2559 2559 if reverse:
2560 2560 ctxleft = ctx2
2561 2561 ctxright = ctx1
2562 2562 else:
2563 2563 ctxleft = ctx1
2564 2564 ctxright = ctx2
2565 2565
2566 2566 diffopts = patch.diffallopts(ui, opts)
2567 2567 m = scmutil.match(ctx2, pats, opts)
2568 2568 m = repo.narrowmatch(m)
2569 2569 ui.pager(b'diff')
2570 2570 logcmdutil.diffordiffstat(
2571 2571 ui,
2572 2572 repo,
2573 2573 diffopts,
2574 2574 ctxleft,
2575 2575 ctxright,
2576 2576 m,
2577 2577 stat=stat,
2578 2578 listsubrepos=opts.get(b'subrepos'),
2579 2579 root=opts.get(b'root'),
2580 2580 )
2581 2581
2582 2582
2583 2583 @command(
2584 2584 b'export',
2585 2585 [
2586 2586 (
2587 2587 b'B',
2588 2588 b'bookmark',
2589 2589 b'',
2590 2590 _(b'export changes only reachable by given bookmark'),
2591 2591 _(b'BOOKMARK'),
2592 2592 ),
2593 2593 (
2594 2594 b'o',
2595 2595 b'output',
2596 2596 b'',
2597 2597 _(b'print output to file with formatted name'),
2598 2598 _(b'FORMAT'),
2599 2599 ),
2600 2600 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2601 2601 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2602 2602 ]
2603 2603 + diffopts
2604 2604 + formatteropts,
2605 2605 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2606 2606 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2607 2607 helpbasic=True,
2608 2608 intents={INTENT_READONLY},
2609 2609 )
2610 2610 def export(ui, repo, *changesets, **opts):
2611 2611 """dump the header and diffs for one or more changesets
2612 2612
2613 2613 Print the changeset header and diffs for one or more revisions.
2614 2614 If no revision is given, the parent of the working directory is used.
2615 2615
2616 2616 The information shown in the changeset header is: author, date,
2617 2617 branch name (if non-default), changeset hash, parent(s) and commit
2618 2618 comment.
2619 2619
2620 2620 .. note::
2621 2621
2622 2622 :hg:`export` may generate unexpected diff output for merge
2623 2623 changesets, as it will compare the merge changeset against its
2624 2624 first parent only.
2625 2625
2626 2626 Output may be to a file, in which case the name of the file is
2627 2627 given using a template string. See :hg:`help templates`. In addition
2628 2628 to the common template keywords, the following formatting rules are
2629 2629 supported:
2630 2630
2631 2631 :``%%``: literal "%" character
2632 2632 :``%H``: changeset hash (40 hexadecimal digits)
2633 2633 :``%N``: number of patches being generated
2634 2634 :``%R``: changeset revision number
2635 2635 :``%b``: basename of the exporting repository
2636 2636 :``%h``: short-form changeset hash (12 hexadecimal digits)
2637 2637 :``%m``: first line of the commit message (only alphanumeric characters)
2638 2638 :``%n``: zero-padded sequence number, starting at 1
2639 2639 :``%r``: zero-padded changeset revision number
2640 2640 :``\\``: literal "\\" character
2641 2641
2642 2642 Without the -a/--text option, export will avoid generating diffs
2643 2643 of files it detects as binary. With -a, export will generate a
2644 2644 diff anyway, probably with undesirable results.
2645 2645
2646 2646 With -B/--bookmark changesets reachable by the given bookmark are
2647 2647 selected.
2648 2648
2649 2649 Use the -g/--git option to generate diffs in the git extended diff
2650 2650 format. See :hg:`help diffs` for more information.
2651 2651
2652 2652 With the --switch-parent option, the diff will be against the
2653 2653 second parent. It can be useful to review a merge.
2654 2654
2655 2655 .. container:: verbose
2656 2656
2657 2657 Template:
2658 2658
2659 2659 The following keywords are supported in addition to the common template
2660 2660 keywords and functions. See also :hg:`help templates`.
2661 2661
2662 2662 :diff: String. Diff content.
2663 2663 :parents: List of strings. Parent nodes of the changeset.
2664 2664
2665 2665 Examples:
2666 2666
2667 2667 - use export and import to transplant a bugfix to the current
2668 2668 branch::
2669 2669
2670 2670 hg export -r 9353 | hg import -
2671 2671
2672 2672 - export all the changesets between two revisions to a file with
2673 2673 rename information::
2674 2674
2675 2675 hg export --git -r 123:150 > changes.txt
2676 2676
2677 2677 - split outgoing changes into a series of patches with
2678 2678 descriptive names::
2679 2679
2680 2680 hg export -r "outgoing()" -o "%n-%m.patch"
2681 2681
2682 2682 Returns 0 on success.
2683 2683 """
2684 2684 opts = pycompat.byteskwargs(opts)
2685 2685 bookmark = opts.get(b'bookmark')
2686 2686 changesets += tuple(opts.get(b'rev', []))
2687 2687
2688 2688 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2689 2689
2690 2690 if bookmark:
2691 2691 if bookmark not in repo._bookmarks:
2692 2692 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2693 2693
2694 2694 revs = scmutil.bookmarkrevs(repo, bookmark)
2695 2695 else:
2696 2696 if not changesets:
2697 2697 changesets = [b'.']
2698 2698
2699 2699 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2700 2700 revs = scmutil.revrange(repo, changesets)
2701 2701
2702 2702 if not revs:
2703 2703 raise error.InputError(_(b"export requires at least one changeset"))
2704 2704 if len(revs) > 1:
2705 2705 ui.note(_(b'exporting patches:\n'))
2706 2706 else:
2707 2707 ui.note(_(b'exporting patch:\n'))
2708 2708
2709 2709 fntemplate = opts.get(b'output')
2710 2710 if cmdutil.isstdiofilename(fntemplate):
2711 2711 fntemplate = b''
2712 2712
2713 2713 if fntemplate:
2714 2714 fm = formatter.nullformatter(ui, b'export', opts)
2715 2715 else:
2716 2716 ui.pager(b'export')
2717 2717 fm = ui.formatter(b'export', opts)
2718 2718 with fm:
2719 2719 cmdutil.export(
2720 2720 repo,
2721 2721 revs,
2722 2722 fm,
2723 2723 fntemplate=fntemplate,
2724 2724 switch_parent=opts.get(b'switch_parent'),
2725 2725 opts=patch.diffallopts(ui, opts),
2726 2726 )
2727 2727
2728 2728
2729 2729 @command(
2730 2730 b'files',
2731 2731 [
2732 2732 (
2733 2733 b'r',
2734 2734 b'rev',
2735 2735 b'',
2736 2736 _(b'search the repository as it is in REV'),
2737 2737 _(b'REV'),
2738 2738 ),
2739 2739 (
2740 2740 b'0',
2741 2741 b'print0',
2742 2742 None,
2743 2743 _(b'end filenames with NUL, for use with xargs'),
2744 2744 ),
2745 2745 ]
2746 2746 + walkopts
2747 2747 + formatteropts
2748 2748 + subrepoopts,
2749 2749 _(b'[OPTION]... [FILE]...'),
2750 2750 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2751 2751 intents={INTENT_READONLY},
2752 2752 )
2753 2753 def files(ui, repo, *pats, **opts):
2754 2754 """list tracked files
2755 2755
2756 2756 Print files under Mercurial control in the working directory or
2757 2757 specified revision for given files (excluding removed files).
2758 2758 Files can be specified as filenames or filesets.
2759 2759
2760 2760 If no files are given to match, this command prints the names
2761 2761 of all files under Mercurial control.
2762 2762
2763 2763 .. container:: verbose
2764 2764
2765 2765 Template:
2766 2766
2767 2767 The following keywords are supported in addition to the common template
2768 2768 keywords and functions. See also :hg:`help templates`.
2769 2769
2770 2770 :flags: String. Character denoting file's symlink and executable bits.
2771 2771 :path: String. Repository-absolute path of the file.
2772 2772 :size: Integer. Size of the file in bytes.
2773 2773
2774 2774 Examples:
2775 2775
2776 2776 - list all files under the current directory::
2777 2777
2778 2778 hg files .
2779 2779
2780 2780 - shows sizes and flags for current revision::
2781 2781
2782 2782 hg files -vr .
2783 2783
2784 2784 - list all files named README::
2785 2785
2786 2786 hg files -I "**/README"
2787 2787
2788 2788 - list all binary files::
2789 2789
2790 2790 hg files "set:binary()"
2791 2791
2792 2792 - find files containing a regular expression::
2793 2793
2794 2794 hg files "set:grep('bob')"
2795 2795
2796 2796 - search tracked file contents with xargs and grep::
2797 2797
2798 2798 hg files -0 | xargs -0 grep foo
2799 2799
2800 2800 See :hg:`help patterns` and :hg:`help filesets` for more information
2801 2801 on specifying file patterns.
2802 2802
2803 2803 Returns 0 if a match is found, 1 otherwise.
2804 2804
2805 2805 """
2806 2806
2807 2807 opts = pycompat.byteskwargs(opts)
2808 2808 rev = opts.get(b'rev')
2809 2809 if rev:
2810 2810 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2811 2811 ctx = scmutil.revsingle(repo, rev, None)
2812 2812
2813 2813 end = b'\n'
2814 2814 if opts.get(b'print0'):
2815 2815 end = b'\0'
2816 2816 fmt = b'%s' + end
2817 2817
2818 2818 m = scmutil.match(ctx, pats, opts)
2819 2819 ui.pager(b'files')
2820 2820 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2821 2821 with ui.formatter(b'files', opts) as fm:
2822 2822 return cmdutil.files(
2823 2823 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2824 2824 )
2825 2825
2826 2826
2827 2827 @command(
2828 2828 b'forget',
2829 2829 [
2830 2830 (b'i', b'interactive', None, _(b'use interactive mode')),
2831 2831 ]
2832 2832 + walkopts
2833 2833 + dryrunopts,
2834 2834 _(b'[OPTION]... FILE...'),
2835 2835 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2836 2836 helpbasic=True,
2837 2837 inferrepo=True,
2838 2838 )
2839 2839 def forget(ui, repo, *pats, **opts):
2840 2840 """forget the specified files on the next commit
2841 2841
2842 2842 Mark the specified files so they will no longer be tracked
2843 2843 after the next commit.
2844 2844
2845 2845 This only removes files from the current branch, not from the
2846 2846 entire project history, and it does not delete them from the
2847 2847 working directory.
2848 2848
2849 2849 To delete the file from the working directory, see :hg:`remove`.
2850 2850
2851 2851 To undo a forget before the next commit, see :hg:`add`.
2852 2852
2853 2853 .. container:: verbose
2854 2854
2855 2855 Examples:
2856 2856
2857 2857 - forget newly-added binary files::
2858 2858
2859 2859 hg forget "set:added() and binary()"
2860 2860
2861 2861 - forget files that would be excluded by .hgignore::
2862 2862
2863 2863 hg forget "set:hgignore()"
2864 2864
2865 2865 Returns 0 on success.
2866 2866 """
2867 2867
2868 2868 opts = pycompat.byteskwargs(opts)
2869 2869 if not pats:
2870 2870 raise error.InputError(_(b'no files specified'))
2871 2871
2872 2872 m = scmutil.match(repo[None], pats, opts)
2873 2873 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2874 2874 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2875 2875 rejected = cmdutil.forget(
2876 2876 ui,
2877 2877 repo,
2878 2878 m,
2879 2879 prefix=b"",
2880 2880 uipathfn=uipathfn,
2881 2881 explicitonly=False,
2882 2882 dryrun=dryrun,
2883 2883 interactive=interactive,
2884 2884 )[0]
2885 2885 return rejected and 1 or 0
2886 2886
2887 2887
2888 2888 @command(
2889 2889 b'graft',
2890 2890 [
2891 2891 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2892 2892 (
2893 2893 b'',
2894 2894 b'base',
2895 2895 b'',
2896 2896 _(b'base revision when doing the graft merge (ADVANCED)'),
2897 2897 _(b'REV'),
2898 2898 ),
2899 2899 (b'c', b'continue', False, _(b'resume interrupted graft')),
2900 2900 (b'', b'stop', False, _(b'stop interrupted graft')),
2901 2901 (b'', b'abort', False, _(b'abort interrupted graft')),
2902 2902 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2903 2903 (b'', b'log', None, _(b'append graft info to log message')),
2904 2904 (
2905 2905 b'',
2906 2906 b'no-commit',
2907 2907 None,
2908 2908 _(b"don't commit, just apply the changes in working directory"),
2909 2909 ),
2910 2910 (b'f', b'force', False, _(b'force graft')),
2911 2911 (
2912 2912 b'D',
2913 2913 b'currentdate',
2914 2914 False,
2915 2915 _(b'record the current date as commit date'),
2916 2916 ),
2917 2917 (
2918 2918 b'U',
2919 2919 b'currentuser',
2920 2920 False,
2921 2921 _(b'record the current user as committer'),
2922 2922 ),
2923 2923 ]
2924 2924 + commitopts2
2925 2925 + mergetoolopts
2926 2926 + dryrunopts,
2927 2927 _(b'[OPTION]... [-r REV]... REV...'),
2928 2928 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2929 2929 )
2930 2930 def graft(ui, repo, *revs, **opts):
2931 2931 """copy changes from other branches onto the current branch
2932 2932
2933 2933 This command uses Mercurial's merge logic to copy individual
2934 2934 changes from other branches without merging branches in the
2935 2935 history graph. This is sometimes known as 'backporting' or
2936 2936 'cherry-picking'. By default, graft will copy user, date, and
2937 2937 description from the source changesets.
2938 2938
2939 2939 Changesets that are ancestors of the current revision, that have
2940 2940 already been grafted, or that are merges will be skipped.
2941 2941
2942 2942 If --log is specified, log messages will have a comment appended
2943 2943 of the form::
2944 2944
2945 2945 (grafted from CHANGESETHASH)
2946 2946
2947 2947 If --force is specified, revisions will be grafted even if they
2948 2948 are already ancestors of, or have been grafted to, the destination.
2949 2949 This is useful when the revisions have since been backed out.
2950 2950
2951 2951 If a graft merge results in conflicts, the graft process is
2952 2952 interrupted so that the current merge can be manually resolved.
2953 2953 Once all conflicts are addressed, the graft process can be
2954 2954 continued with the -c/--continue option.
2955 2955
2956 2956 The -c/--continue option reapplies all the earlier options.
2957 2957
2958 2958 .. container:: verbose
2959 2959
2960 2960 The --base option exposes more of how graft internally uses merge with a
2961 2961 custom base revision. --base can be used to specify another ancestor than
2962 2962 the first and only parent.
2963 2963
2964 2964 The command::
2965 2965
2966 2966 hg graft -r 345 --base 234
2967 2967
2968 2968 is thus pretty much the same as::
2969 2969
2970 2970 hg diff --from 234 --to 345 | hg import
2971 2971
2972 2972 but using merge to resolve conflicts and track moved files.
2973 2973
2974 2974 The result of a merge can thus be backported as a single commit by
2975 2975 specifying one of the merge parents as base, and thus effectively
2976 2976 grafting the changes from the other side.
2977 2977
2978 2978 It is also possible to collapse multiple changesets and clean up history
2979 2979 by specifying another ancestor as base, much like rebase --collapse
2980 2980 --keep.
2981 2981
2982 2982 The commit message can be tweaked after the fact using commit --amend .
2983 2983
2984 2984 For using non-ancestors as the base to backout changes, see the backout
2985 2985 command and the hidden --parent option.
2986 2986
2987 2987 .. container:: verbose
2988 2988
2989 2989 Examples:
2990 2990
2991 2991 - copy a single change to the stable branch and edit its description::
2992 2992
2993 2993 hg update stable
2994 2994 hg graft --edit 9393
2995 2995
2996 2996 - graft a range of changesets with one exception, updating dates::
2997 2997
2998 2998 hg graft -D "2085::2093 and not 2091"
2999 2999
3000 3000 - continue a graft after resolving conflicts::
3001 3001
3002 3002 hg graft -c
3003 3003
3004 3004 - show the source of a grafted changeset::
3005 3005
3006 3006 hg log --debug -r .
3007 3007
3008 3008 - show revisions sorted by date::
3009 3009
3010 3010 hg log -r "sort(all(), date)"
3011 3011
3012 3012 - backport the result of a merge as a single commit::
3013 3013
3014 3014 hg graft -r 123 --base 123^
3015 3015
3016 3016 - land a feature branch as one changeset::
3017 3017
3018 3018 hg up -cr default
3019 3019 hg graft -r featureX --base "ancestor('featureX', 'default')"
3020 3020
3021 3021 See :hg:`help revisions` for more about specifying revisions.
3022 3022
3023 3023 Returns 0 on successful completion, 1 if there are unresolved files.
3024 3024 """
3025 3025 with repo.wlock():
3026 3026 return _dograft(ui, repo, *revs, **opts)
3027 3027
3028 3028
3029 3029 def _dograft(ui, repo, *revs, **opts):
3030 3030 opts = pycompat.byteskwargs(opts)
3031 3031 if revs and opts.get(b'rev'):
3032 3032 ui.warn(
3033 3033 _(
3034 3034 b'warning: inconsistent use of --rev might give unexpected '
3035 3035 b'revision ordering!\n'
3036 3036 )
3037 3037 )
3038 3038
3039 3039 revs = list(revs)
3040 3040 revs.extend(opts.get(b'rev'))
3041 3041 # a dict of data to be stored in state file
3042 3042 statedata = {}
3043 3043 # list of new nodes created by ongoing graft
3044 3044 statedata[b'newnodes'] = []
3045 3045
3046 3046 cmdutil.resolvecommitoptions(ui, opts)
3047 3047
3048 3048 editor = cmdutil.getcommiteditor(
3049 3049 editform=b'graft', **pycompat.strkwargs(opts)
3050 3050 )
3051 3051
3052 3052 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3053 3053
3054 3054 cont = False
3055 3055 if opts.get(b'no_commit'):
3056 3056 cmdutil.check_incompatible_arguments(
3057 3057 opts,
3058 3058 b'no_commit',
3059 3059 [b'edit', b'currentuser', b'currentdate', b'log'],
3060 3060 )
3061 3061
3062 3062 graftstate = statemod.cmdstate(repo, b'graftstate')
3063 3063
3064 3064 if opts.get(b'stop'):
3065 3065 cmdutil.check_incompatible_arguments(
3066 3066 opts,
3067 3067 b'stop',
3068 3068 [
3069 3069 b'edit',
3070 3070 b'log',
3071 3071 b'user',
3072 3072 b'date',
3073 3073 b'currentdate',
3074 3074 b'currentuser',
3075 3075 b'rev',
3076 3076 ],
3077 3077 )
3078 3078 return _stopgraft(ui, repo, graftstate)
3079 3079 elif opts.get(b'abort'):
3080 3080 cmdutil.check_incompatible_arguments(
3081 3081 opts,
3082 3082 b'abort',
3083 3083 [
3084 3084 b'edit',
3085 3085 b'log',
3086 3086 b'user',
3087 3087 b'date',
3088 3088 b'currentdate',
3089 3089 b'currentuser',
3090 3090 b'rev',
3091 3091 ],
3092 3092 )
3093 3093 return cmdutil.abortgraft(ui, repo, graftstate)
3094 3094 elif opts.get(b'continue'):
3095 3095 cont = True
3096 3096 if revs:
3097 3097 raise error.InputError(_(b"can't specify --continue and revisions"))
3098 3098 # read in unfinished revisions
3099 3099 if graftstate.exists():
3100 3100 statedata = cmdutil.readgraftstate(repo, graftstate)
3101 3101 if statedata.get(b'date'):
3102 3102 opts[b'date'] = statedata[b'date']
3103 3103 if statedata.get(b'user'):
3104 3104 opts[b'user'] = statedata[b'user']
3105 3105 if statedata.get(b'log'):
3106 3106 opts[b'log'] = True
3107 3107 if statedata.get(b'no_commit'):
3108 3108 opts[b'no_commit'] = statedata.get(b'no_commit')
3109 3109 if statedata.get(b'base'):
3110 3110 opts[b'base'] = statedata.get(b'base')
3111 3111 nodes = statedata[b'nodes']
3112 3112 revs = [repo[node].rev() for node in nodes]
3113 3113 else:
3114 3114 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3115 3115 else:
3116 3116 if not revs:
3117 3117 raise error.InputError(_(b'no revisions specified'))
3118 3118 cmdutil.checkunfinished(repo)
3119 3119 cmdutil.bailifchanged(repo)
3120 3120 revs = scmutil.revrange(repo, revs)
3121 3121
3122 3122 skipped = set()
3123 3123 basectx = None
3124 3124 if opts.get(b'base'):
3125 3125 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3126 3126 if basectx is None:
3127 3127 # check for merges
3128 3128 for rev in repo.revs(b'%ld and merge()', revs):
3129 3129 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3130 3130 skipped.add(rev)
3131 3131 revs = [r for r in revs if r not in skipped]
3132 3132 if not revs:
3133 3133 return -1
3134 3134 if basectx is not None and len(revs) != 1:
3135 3135 raise error.InputError(_(b'only one revision allowed with --base '))
3136 3136
3137 3137 # Don't check in the --continue case, in effect retaining --force across
3138 3138 # --continues. That's because without --force, any revisions we decided to
3139 3139 # skip would have been filtered out here, so they wouldn't have made their
3140 3140 # way to the graftstate. With --force, any revisions we would have otherwise
3141 3141 # skipped would not have been filtered out, and if they hadn't been applied
3142 3142 # already, they'd have been in the graftstate.
3143 3143 if not (cont or opts.get(b'force')) and basectx is None:
3144 3144 # check for ancestors of dest branch
3145 3145 ancestors = repo.revs(b'%ld & (::.)', revs)
3146 3146 for rev in ancestors:
3147 3147 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3148 3148
3149 3149 revs = [r for r in revs if r not in ancestors]
3150 3150
3151 3151 if not revs:
3152 3152 return -1
3153 3153
3154 3154 # analyze revs for earlier grafts
3155 3155 ids = {}
3156 3156 for ctx in repo.set(b"%ld", revs):
3157 3157 ids[ctx.hex()] = ctx.rev()
3158 3158 n = ctx.extra().get(b'source')
3159 3159 if n:
3160 3160 ids[n] = ctx.rev()
3161 3161
3162 3162 # check ancestors for earlier grafts
3163 3163 ui.debug(b'scanning for duplicate grafts\n')
3164 3164
3165 3165 # The only changesets we can be sure doesn't contain grafts of any
3166 3166 # revs, are the ones that are common ancestors of *all* revs:
3167 3167 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3168 3168 ctx = repo[rev]
3169 3169 n = ctx.extra().get(b'source')
3170 3170 if n in ids:
3171 3171 try:
3172 3172 r = repo[n].rev()
3173 3173 except error.RepoLookupError:
3174 3174 r = None
3175 3175 if r in revs:
3176 3176 ui.warn(
3177 3177 _(
3178 3178 b'skipping revision %d:%s '
3179 3179 b'(already grafted to %d:%s)\n'
3180 3180 )
3181 3181 % (r, repo[r], rev, ctx)
3182 3182 )
3183 3183 revs.remove(r)
3184 3184 elif ids[n] in revs:
3185 3185 if r is None:
3186 3186 ui.warn(
3187 3187 _(
3188 3188 b'skipping already grafted revision %d:%s '
3189 3189 b'(%d:%s also has unknown origin %s)\n'
3190 3190 )
3191 3191 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3192 3192 )
3193 3193 else:
3194 3194 ui.warn(
3195 3195 _(
3196 3196 b'skipping already grafted revision %d:%s '
3197 3197 b'(%d:%s also has origin %d:%s)\n'
3198 3198 )
3199 3199 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3200 3200 )
3201 3201 revs.remove(ids[n])
3202 3202 elif ctx.hex() in ids:
3203 3203 r = ids[ctx.hex()]
3204 3204 if r in revs:
3205 3205 ui.warn(
3206 3206 _(
3207 3207 b'skipping already grafted revision %d:%s '
3208 3208 b'(was grafted from %d:%s)\n'
3209 3209 )
3210 3210 % (r, repo[r], rev, ctx)
3211 3211 )
3212 3212 revs.remove(r)
3213 3213 if not revs:
3214 3214 return -1
3215 3215
3216 3216 if opts.get(b'no_commit'):
3217 3217 statedata[b'no_commit'] = True
3218 3218 if opts.get(b'base'):
3219 3219 statedata[b'base'] = opts[b'base']
3220 3220 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3221 3221 desc = b'%d:%s "%s"' % (
3222 3222 ctx.rev(),
3223 3223 ctx,
3224 3224 ctx.description().split(b'\n', 1)[0],
3225 3225 )
3226 3226 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3227 3227 if names:
3228 3228 desc += b' (%s)' % b' '.join(names)
3229 3229 ui.status(_(b'grafting %s\n') % desc)
3230 3230 if opts.get(b'dry_run'):
3231 3231 continue
3232 3232
3233 3233 source = ctx.extra().get(b'source')
3234 3234 extra = {}
3235 3235 if source:
3236 3236 extra[b'source'] = source
3237 3237 extra[b'intermediate-source'] = ctx.hex()
3238 3238 else:
3239 3239 extra[b'source'] = ctx.hex()
3240 3240 user = ctx.user()
3241 3241 if opts.get(b'user'):
3242 3242 user = opts[b'user']
3243 3243 statedata[b'user'] = user
3244 3244 date = ctx.date()
3245 3245 if opts.get(b'date'):
3246 3246 date = opts[b'date']
3247 3247 statedata[b'date'] = date
3248 3248 message = ctx.description()
3249 3249 if opts.get(b'log'):
3250 3250 message += b'\n(grafted from %s)' % ctx.hex()
3251 3251 statedata[b'log'] = True
3252 3252
3253 3253 # we don't merge the first commit when continuing
3254 3254 if not cont:
3255 3255 # perform the graft merge with p1(rev) as 'ancestor'
3256 3256 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3257 3257 base = ctx.p1() if basectx is None else basectx
3258 3258 with ui.configoverride(overrides, b'graft'):
3259 3259 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3260 3260 # report any conflicts
3261 3261 if stats.unresolvedcount > 0:
3262 3262 # write out state for --continue
3263 3263 nodes = [repo[rev].hex() for rev in revs[pos:]]
3264 3264 statedata[b'nodes'] = nodes
3265 3265 stateversion = 1
3266 3266 graftstate.save(stateversion, statedata)
3267 3267 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3268 3268 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3269 3269 return 1
3270 3270 else:
3271 3271 cont = False
3272 3272
3273 3273 # commit if --no-commit is false
3274 3274 if not opts.get(b'no_commit'):
3275 3275 node = repo.commit(
3276 3276 text=message, user=user, date=date, extra=extra, editor=editor
3277 3277 )
3278 3278 if node is None:
3279 3279 ui.warn(
3280 3280 _(b'note: graft of %d:%s created no changes to commit\n')
3281 3281 % (ctx.rev(), ctx)
3282 3282 )
3283 3283 # checking that newnodes exist because old state files won't have it
3284 3284 elif statedata.get(b'newnodes') is not None:
3285 3285 statedata[b'newnodes'].append(node)
3286 3286
3287 3287 # remove state when we complete successfully
3288 3288 if not opts.get(b'dry_run'):
3289 3289 graftstate.delete()
3290 3290
3291 3291 return 0
3292 3292
3293 3293
3294 3294 def _stopgraft(ui, repo, graftstate):
3295 3295 """stop the interrupted graft"""
3296 3296 if not graftstate.exists():
3297 3297 raise error.StateError(_(b"no interrupted graft found"))
3298 3298 pctx = repo[b'.']
3299 3299 mergemod.clean_update(pctx)
3300 3300 graftstate.delete()
3301 3301 ui.status(_(b"stopped the interrupted graft\n"))
3302 3302 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3303 3303 return 0
3304 3304
3305 3305
3306 3306 statemod.addunfinished(
3307 3307 b'graft',
3308 3308 fname=b'graftstate',
3309 3309 clearable=True,
3310 3310 stopflag=True,
3311 3311 continueflag=True,
3312 3312 abortfunc=cmdutil.hgabortgraft,
3313 3313 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3314 3314 )
3315 3315
3316 3316
3317 3317 @command(
3318 3318 b'grep',
3319 3319 [
3320 3320 (b'0', b'print0', None, _(b'end fields with NUL')),
3321 3321 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3322 3322 (
3323 3323 b'',
3324 3324 b'diff',
3325 3325 None,
3326 3326 _(
3327 3327 b'search revision differences for when the pattern was added '
3328 3328 b'or removed'
3329 3329 ),
3330 3330 ),
3331 3331 (b'a', b'text', None, _(b'treat all files as text')),
3332 3332 (
3333 3333 b'f',
3334 3334 b'follow',
3335 3335 None,
3336 3336 _(
3337 3337 b'follow changeset history,'
3338 3338 b' or file history across copies and renames'
3339 3339 ),
3340 3340 ),
3341 3341 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3342 3342 (
3343 3343 b'l',
3344 3344 b'files-with-matches',
3345 3345 None,
3346 3346 _(b'print only filenames and revisions that match'),
3347 3347 ),
3348 3348 (b'n', b'line-number', None, _(b'print matching line numbers')),
3349 3349 (
3350 3350 b'r',
3351 3351 b'rev',
3352 3352 [],
3353 3353 _(b'search files changed within revision range'),
3354 3354 _(b'REV'),
3355 3355 ),
3356 3356 (
3357 3357 b'',
3358 3358 b'all-files',
3359 3359 None,
3360 3360 _(
3361 3361 b'include all files in the changeset while grepping (DEPRECATED)'
3362 3362 ),
3363 3363 ),
3364 3364 (b'u', b'user', None, _(b'list the author (long with -v)')),
3365 3365 (b'd', b'date', None, _(b'list the date (short with -q)')),
3366 3366 ]
3367 3367 + formatteropts
3368 3368 + walkopts,
3369 3369 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3370 3370 helpcategory=command.CATEGORY_FILE_CONTENTS,
3371 3371 inferrepo=True,
3372 3372 intents={INTENT_READONLY},
3373 3373 )
3374 3374 def grep(ui, repo, pattern, *pats, **opts):
3375 3375 """search for a pattern in specified files
3376 3376
3377 3377 Search the working directory or revision history for a regular
3378 3378 expression in the specified files for the entire repository.
3379 3379
3380 3380 By default, grep searches the repository files in the working
3381 3381 directory and prints the files where it finds a match. To specify
3382 3382 historical revisions instead of the working directory, use the
3383 3383 --rev flag.
3384 3384
3385 3385 To search instead historical revision differences that contains a
3386 3386 change in match status ("-" for a match that becomes a non-match,
3387 3387 or "+" for a non-match that becomes a match), use the --diff flag.
3388 3388
3389 3389 PATTERN can be any Python (roughly Perl-compatible) regular
3390 3390 expression.
3391 3391
3392 3392 If no FILEs are specified and the --rev flag isn't supplied, all
3393 3393 files in the working directory are searched. When using the --rev
3394 3394 flag and specifying FILEs, use the --follow argument to also
3395 3395 follow the specified FILEs across renames and copies.
3396 3396
3397 3397 .. container:: verbose
3398 3398
3399 3399 Template:
3400 3400
3401 3401 The following keywords are supported in addition to the common template
3402 3402 keywords and functions. See also :hg:`help templates`.
3403 3403
3404 3404 :change: String. Character denoting insertion ``+`` or removal ``-``.
3405 3405 Available if ``--diff`` is specified.
3406 3406 :lineno: Integer. Line number of the match.
3407 3407 :path: String. Repository-absolute path of the file.
3408 3408 :texts: List of text chunks.
3409 3409
3410 3410 And each entry of ``{texts}`` provides the following sub-keywords.
3411 3411
3412 3412 :matched: Boolean. True if the chunk matches the specified pattern.
3413 3413 :text: String. Chunk content.
3414 3414
3415 3415 See :hg:`help templates.operators` for the list expansion syntax.
3416 3416
3417 3417 Returns 0 if a match is found, 1 otherwise.
3418 3418
3419 3419 """
3420 3420 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3421 3421 opts = pycompat.byteskwargs(opts)
3422 3422 diff = opts.get(b'all') or opts.get(b'diff')
3423 3423 follow = opts.get(b'follow')
3424 3424 if opts.get(b'all_files') is None and not diff:
3425 3425 opts[b'all_files'] = True
3426 3426 plaingrep = (
3427 3427 opts.get(b'all_files')
3428 3428 and not opts.get(b'rev')
3429 3429 and not opts.get(b'follow')
3430 3430 )
3431 3431 all_files = opts.get(b'all_files')
3432 3432 if plaingrep:
3433 3433 opts[b'rev'] = [b'wdir()']
3434 3434
3435 3435 reflags = re.M
3436 3436 if opts.get(b'ignore_case'):
3437 3437 reflags |= re.I
3438 3438 try:
3439 3439 regexp = util.re.compile(pattern, reflags)
3440 3440 except re.error as inst:
3441 3441 ui.warn(
3442 3442 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3443 3443 )
3444 3444 return 1
3445 3445 sep, eol = b':', b'\n'
3446 3446 if opts.get(b'print0'):
3447 3447 sep = eol = b'\0'
3448 3448
3449 3449 searcher = grepmod.grepsearcher(
3450 3450 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3451 3451 )
3452 3452
3453 3453 getfile = searcher._getfile
3454 3454
3455 3455 uipathfn = scmutil.getuipathfn(repo)
3456 3456
3457 3457 def display(fm, fn, ctx, pstates, states):
3458 3458 rev = scmutil.intrev(ctx)
3459 3459 if fm.isplain():
3460 3460 formatuser = ui.shortuser
3461 3461 else:
3462 3462 formatuser = pycompat.bytestr
3463 3463 if ui.quiet:
3464 3464 datefmt = b'%Y-%m-%d'
3465 3465 else:
3466 3466 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3467 3467 found = False
3468 3468
3469 3469 @util.cachefunc
3470 3470 def binary():
3471 3471 flog = getfile(fn)
3472 3472 try:
3473 3473 return stringutil.binary(flog.read(ctx.filenode(fn)))
3474 3474 except error.WdirUnsupported:
3475 3475 return ctx[fn].isbinary()
3476 3476
3477 3477 fieldnamemap = {b'linenumber': b'lineno'}
3478 3478 if diff:
3479 3479 iter = grepmod.difflinestates(pstates, states)
3480 3480 else:
3481 3481 iter = [(b'', l) for l in states]
3482 3482 for change, l in iter:
3483 3483 fm.startitem()
3484 3484 fm.context(ctx=ctx)
3485 3485 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3486 3486 fm.plain(uipathfn(fn), label=b'grep.filename')
3487 3487
3488 3488 cols = [
3489 3489 (b'rev', b'%d', rev, not plaingrep, b''),
3490 3490 (
3491 3491 b'linenumber',
3492 3492 b'%d',
3493 3493 l.linenum,
3494 3494 opts.get(b'line_number'),
3495 3495 b'',
3496 3496 ),
3497 3497 ]
3498 3498 if diff:
3499 3499 cols.append(
3500 3500 (
3501 3501 b'change',
3502 3502 b'%s',
3503 3503 change,
3504 3504 True,
3505 3505 b'grep.inserted '
3506 3506 if change == b'+'
3507 3507 else b'grep.deleted ',
3508 3508 )
3509 3509 )
3510 3510 cols.extend(
3511 3511 [
3512 3512 (
3513 3513 b'user',
3514 3514 b'%s',
3515 3515 formatuser(ctx.user()),
3516 3516 opts.get(b'user'),
3517 3517 b'',
3518 3518 ),
3519 3519 (
3520 3520 b'date',
3521 3521 b'%s',
3522 3522 fm.formatdate(ctx.date(), datefmt),
3523 3523 opts.get(b'date'),
3524 3524 b'',
3525 3525 ),
3526 3526 ]
3527 3527 )
3528 3528 for name, fmt, data, cond, extra_label in cols:
3529 3529 if cond:
3530 3530 fm.plain(sep, label=b'grep.sep')
3531 3531 field = fieldnamemap.get(name, name)
3532 3532 label = extra_label + (b'grep.%s' % name)
3533 3533 fm.condwrite(cond, field, fmt, data, label=label)
3534 3534 if not opts.get(b'files_with_matches'):
3535 3535 fm.plain(sep, label=b'grep.sep')
3536 3536 if not opts.get(b'text') and binary():
3537 3537 fm.plain(_(b" Binary file matches"))
3538 3538 else:
3539 3539 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3540 3540 fm.plain(eol)
3541 3541 found = True
3542 3542 if opts.get(b'files_with_matches'):
3543 3543 break
3544 3544 return found
3545 3545
3546 3546 def displaymatches(fm, l):
3547 3547 p = 0
3548 3548 for s, e in l.findpos(regexp):
3549 3549 if p < s:
3550 3550 fm.startitem()
3551 3551 fm.write(b'text', b'%s', l.line[p:s])
3552 3552 fm.data(matched=False)
3553 3553 fm.startitem()
3554 3554 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3555 3555 fm.data(matched=True)
3556 3556 p = e
3557 3557 if p < len(l.line):
3558 3558 fm.startitem()
3559 3559 fm.write(b'text', b'%s', l.line[p:])
3560 3560 fm.data(matched=False)
3561 3561 fm.end()
3562 3562
3563 3563 found = False
3564 3564
3565 3565 wopts = logcmdutil.walkopts(
3566 3566 pats=pats,
3567 3567 opts=opts,
3568 3568 revspec=opts[b'rev'],
3569 3569 include_pats=opts[b'include'],
3570 3570 exclude_pats=opts[b'exclude'],
3571 3571 follow=follow,
3572 3572 force_changelog_traversal=all_files,
3573 3573 filter_revisions_by_pats=not all_files,
3574 3574 )
3575 3575 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3576 3576
3577 3577 ui.pager(b'grep')
3578 3578 fm = ui.formatter(b'grep', opts)
3579 3579 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3580 3580 r = display(fm, fn, ctx, pstates, states)
3581 3581 found = found or r
3582 3582 if r and not diff and not all_files:
3583 3583 searcher.skipfile(fn, ctx.rev())
3584 3584 fm.end()
3585 3585
3586 3586 return not found
3587 3587
3588 3588
3589 3589 @command(
3590 3590 b'heads',
3591 3591 [
3592 3592 (
3593 3593 b'r',
3594 3594 b'rev',
3595 3595 b'',
3596 3596 _(b'show only heads which are descendants of STARTREV'),
3597 3597 _(b'STARTREV'),
3598 3598 ),
3599 3599 (b't', b'topo', False, _(b'show topological heads only')),
3600 3600 (
3601 3601 b'a',
3602 3602 b'active',
3603 3603 False,
3604 3604 _(b'show active branchheads only (DEPRECATED)'),
3605 3605 ),
3606 3606 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3607 3607 ]
3608 3608 + templateopts,
3609 3609 _(b'[-ct] [-r STARTREV] [REV]...'),
3610 3610 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3611 3611 intents={INTENT_READONLY},
3612 3612 )
3613 3613 def heads(ui, repo, *branchrevs, **opts):
3614 3614 """show branch heads
3615 3615
3616 3616 With no arguments, show all open branch heads in the repository.
3617 3617 Branch heads are changesets that have no descendants on the
3618 3618 same branch. They are where development generally takes place and
3619 3619 are the usual targets for update and merge operations.
3620 3620
3621 3621 If one or more REVs are given, only open branch heads on the
3622 3622 branches associated with the specified changesets are shown. This
3623 3623 means that you can use :hg:`heads .` to see the heads on the
3624 3624 currently checked-out branch.
3625 3625
3626 3626 If -c/--closed is specified, also show branch heads marked closed
3627 3627 (see :hg:`commit --close-branch`).
3628 3628
3629 3629 If STARTREV is specified, only those heads that are descendants of
3630 3630 STARTREV will be displayed.
3631 3631
3632 3632 If -t/--topo is specified, named branch mechanics will be ignored and only
3633 3633 topological heads (changesets with no children) will be shown.
3634 3634
3635 3635 Returns 0 if matching heads are found, 1 if not.
3636 3636 """
3637 3637
3638 3638 opts = pycompat.byteskwargs(opts)
3639 3639 start = None
3640 3640 rev = opts.get(b'rev')
3641 3641 if rev:
3642 3642 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3643 3643 start = scmutil.revsingle(repo, rev, None).node()
3644 3644
3645 3645 if opts.get(b'topo'):
3646 3646 heads = [repo[h] for h in repo.heads(start)]
3647 3647 else:
3648 3648 heads = []
3649 3649 for branch in repo.branchmap():
3650 3650 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3651 3651 heads = [repo[h] for h in heads]
3652 3652
3653 3653 if branchrevs:
3654 3654 branches = {
3655 3655 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3656 3656 }
3657 3657 heads = [h for h in heads if h.branch() in branches]
3658 3658
3659 3659 if opts.get(b'active') and branchrevs:
3660 3660 dagheads = repo.heads(start)
3661 3661 heads = [h for h in heads if h.node() in dagheads]
3662 3662
3663 3663 if branchrevs:
3664 3664 haveheads = {h.branch() for h in heads}
3665 3665 if branches - haveheads:
3666 3666 headless = b', '.join(b for b in branches - haveheads)
3667 3667 msg = _(b'no open branch heads found on branches %s')
3668 3668 if opts.get(b'rev'):
3669 3669 msg += _(b' (started at %s)') % opts[b'rev']
3670 3670 ui.warn((msg + b'\n') % headless)
3671 3671
3672 3672 if not heads:
3673 3673 return 1
3674 3674
3675 3675 ui.pager(b'heads')
3676 3676 heads = sorted(heads, key=lambda x: -(x.rev()))
3677 3677 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3678 3678 for ctx in heads:
3679 3679 displayer.show(ctx)
3680 3680 displayer.close()
3681 3681
3682 3682
3683 3683 @command(
3684 3684 b'help',
3685 3685 [
3686 3686 (b'e', b'extension', None, _(b'show only help for extensions')),
3687 3687 (b'c', b'command', None, _(b'show only help for commands')),
3688 3688 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3689 3689 (
3690 3690 b's',
3691 3691 b'system',
3692 3692 [],
3693 3693 _(b'show help for specific platform(s)'),
3694 3694 _(b'PLATFORM'),
3695 3695 ),
3696 3696 ],
3697 3697 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3698 3698 helpcategory=command.CATEGORY_HELP,
3699 3699 norepo=True,
3700 3700 intents={INTENT_READONLY},
3701 3701 )
3702 3702 def help_(ui, name=None, **opts):
3703 3703 """show help for a given topic or a help overview
3704 3704
3705 3705 With no arguments, print a list of commands with short help messages.
3706 3706
3707 3707 Given a topic, extension, or command name, print help for that
3708 3708 topic.
3709 3709
3710 3710 Returns 0 if successful.
3711 3711 """
3712 3712
3713 3713 keep = opts.get('system') or []
3714 3714 if len(keep) == 0:
3715 3715 if pycompat.sysplatform.startswith(b'win'):
3716 3716 keep.append(b'windows')
3717 3717 elif pycompat.sysplatform == b'OpenVMS':
3718 3718 keep.append(b'vms')
3719 3719 elif pycompat.sysplatform == b'plan9':
3720 3720 keep.append(b'plan9')
3721 3721 else:
3722 3722 keep.append(b'unix')
3723 3723 keep.append(pycompat.sysplatform.lower())
3724 3724 if ui.verbose:
3725 3725 keep.append(b'verbose')
3726 3726
3727 3727 commands = sys.modules[__name__]
3728 3728 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3729 3729 ui.pager(b'help')
3730 3730 ui.write(formatted)
3731 3731
3732 3732
3733 3733 @command(
3734 3734 b'identify|id',
3735 3735 [
3736 3736 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3737 3737 (b'n', b'num', None, _(b'show local revision number')),
3738 3738 (b'i', b'id', None, _(b'show global revision id')),
3739 3739 (b'b', b'branch', None, _(b'show branch')),
3740 3740 (b't', b'tags', None, _(b'show tags')),
3741 3741 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3742 3742 ]
3743 3743 + remoteopts
3744 3744 + formatteropts,
3745 3745 _(b'[-nibtB] [-r REV] [SOURCE]'),
3746 3746 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3747 3747 optionalrepo=True,
3748 3748 intents={INTENT_READONLY},
3749 3749 )
3750 3750 def identify(
3751 3751 ui,
3752 3752 repo,
3753 3753 source=None,
3754 3754 rev=None,
3755 3755 num=None,
3756 3756 id=None,
3757 3757 branch=None,
3758 3758 tags=None,
3759 3759 bookmarks=None,
3760 3760 **opts
3761 3761 ):
3762 3762 """identify the working directory or specified revision
3763 3763
3764 3764 Print a summary identifying the repository state at REV using one or
3765 3765 two parent hash identifiers, followed by a "+" if the working
3766 3766 directory has uncommitted changes, the branch name (if not default),
3767 3767 a list of tags, and a list of bookmarks.
3768 3768
3769 3769 When REV is not given, print a summary of the current state of the
3770 3770 repository including the working directory. Specify -r. to get information
3771 3771 of the working directory parent without scanning uncommitted changes.
3772 3772
3773 3773 Specifying a path to a repository root or Mercurial bundle will
3774 3774 cause lookup to operate on that repository/bundle.
3775 3775
3776 3776 .. container:: verbose
3777 3777
3778 3778 Template:
3779 3779
3780 3780 The following keywords are supported in addition to the common template
3781 3781 keywords and functions. See also :hg:`help templates`.
3782 3782
3783 3783 :dirty: String. Character ``+`` denoting if the working directory has
3784 3784 uncommitted changes.
3785 3785 :id: String. One or two nodes, optionally followed by ``+``.
3786 3786 :parents: List of strings. Parent nodes of the changeset.
3787 3787
3788 3788 Examples:
3789 3789
3790 3790 - generate a build identifier for the working directory::
3791 3791
3792 3792 hg id --id > build-id.dat
3793 3793
3794 3794 - find the revision corresponding to a tag::
3795 3795
3796 3796 hg id -n -r 1.3
3797 3797
3798 3798 - check the most recent revision of a remote repository::
3799 3799
3800 3800 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3801 3801
3802 3802 See :hg:`log` for generating more information about specific revisions,
3803 3803 including full hash identifiers.
3804 3804
3805 3805 Returns 0 if successful.
3806 3806 """
3807 3807
3808 3808 opts = pycompat.byteskwargs(opts)
3809 3809 if not repo and not source:
3810 3810 raise error.InputError(
3811 3811 _(b"there is no Mercurial repository here (.hg not found)")
3812 3812 )
3813 3813
3814 3814 default = not (num or id or branch or tags or bookmarks)
3815 3815 output = []
3816 3816 revs = []
3817 3817
3818 3818 if source:
3819 3819 source, branches = hg.parseurl(ui.expandpath(source))
3820 3820 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3821 3821 repo = peer.local()
3822 3822 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3823 3823
3824 3824 fm = ui.formatter(b'identify', opts)
3825 3825 fm.startitem()
3826 3826
3827 3827 if not repo:
3828 3828 if num or branch or tags:
3829 3829 raise error.InputError(
3830 3830 _(b"can't query remote revision number, branch, or tags")
3831 3831 )
3832 3832 if not rev and revs:
3833 3833 rev = revs[0]
3834 3834 if not rev:
3835 3835 rev = b"tip"
3836 3836
3837 3837 remoterev = peer.lookup(rev)
3838 3838 hexrev = fm.hexfunc(remoterev)
3839 3839 if default or id:
3840 3840 output = [hexrev]
3841 3841 fm.data(id=hexrev)
3842 3842
3843 3843 @util.cachefunc
3844 3844 def getbms():
3845 3845 bms = []
3846 3846
3847 3847 if b'bookmarks' in peer.listkeys(b'namespaces'):
3848 3848 hexremoterev = hex(remoterev)
3849 3849 bms = [
3850 3850 bm
3851 3851 for bm, bmr in pycompat.iteritems(
3852 3852 peer.listkeys(b'bookmarks')
3853 3853 )
3854 3854 if bmr == hexremoterev
3855 3855 ]
3856 3856
3857 3857 return sorted(bms)
3858 3858
3859 3859 if fm.isplain():
3860 3860 if bookmarks:
3861 3861 output.extend(getbms())
3862 3862 elif default and not ui.quiet:
3863 3863 # multiple bookmarks for a single parent separated by '/'
3864 3864 bm = b'/'.join(getbms())
3865 3865 if bm:
3866 3866 output.append(bm)
3867 3867 else:
3868 3868 fm.data(node=hex(remoterev))
3869 3869 if bookmarks or b'bookmarks' in fm.datahint():
3870 3870 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3871 3871 else:
3872 3872 if rev:
3873 3873 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3874 3874 ctx = scmutil.revsingle(repo, rev, None)
3875 3875
3876 3876 if ctx.rev() is None:
3877 3877 ctx = repo[None]
3878 3878 parents = ctx.parents()
3879 3879 taglist = []
3880 3880 for p in parents:
3881 3881 taglist.extend(p.tags())
3882 3882
3883 3883 dirty = b""
3884 3884 if ctx.dirty(missing=True, merge=False, branch=False):
3885 3885 dirty = b'+'
3886 3886 fm.data(dirty=dirty)
3887 3887
3888 3888 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3889 3889 if default or id:
3890 3890 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3891 3891 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3892 3892
3893 3893 if num:
3894 3894 numoutput = [b"%d" % p.rev() for p in parents]
3895 3895 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3896 3896
3897 3897 fm.data(
3898 3898 parents=fm.formatlist(
3899 3899 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3900 3900 )
3901 3901 )
3902 3902 else:
3903 3903 hexoutput = fm.hexfunc(ctx.node())
3904 3904 if default or id:
3905 3905 output = [hexoutput]
3906 3906 fm.data(id=hexoutput)
3907 3907
3908 3908 if num:
3909 3909 output.append(pycompat.bytestr(ctx.rev()))
3910 3910 taglist = ctx.tags()
3911 3911
3912 3912 if default and not ui.quiet:
3913 3913 b = ctx.branch()
3914 3914 if b != b'default':
3915 3915 output.append(b"(%s)" % b)
3916 3916
3917 3917 # multiple tags for a single parent separated by '/'
3918 3918 t = b'/'.join(taglist)
3919 3919 if t:
3920 3920 output.append(t)
3921 3921
3922 3922 # multiple bookmarks for a single parent separated by '/'
3923 3923 bm = b'/'.join(ctx.bookmarks())
3924 3924 if bm:
3925 3925 output.append(bm)
3926 3926 else:
3927 3927 if branch:
3928 3928 output.append(ctx.branch())
3929 3929
3930 3930 if tags:
3931 3931 output.extend(taglist)
3932 3932
3933 3933 if bookmarks:
3934 3934 output.extend(ctx.bookmarks())
3935 3935
3936 3936 fm.data(node=ctx.hex())
3937 3937 fm.data(branch=ctx.branch())
3938 3938 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3939 3939 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3940 3940 fm.context(ctx=ctx)
3941 3941
3942 3942 fm.plain(b"%s\n" % b' '.join(output))
3943 3943 fm.end()
3944 3944
3945 3945
3946 3946 @command(
3947 3947 b'import|patch',
3948 3948 [
3949 3949 (
3950 3950 b'p',
3951 3951 b'strip',
3952 3952 1,
3953 3953 _(
3954 3954 b'directory strip option for patch. This has the same '
3955 3955 b'meaning as the corresponding patch option'
3956 3956 ),
3957 3957 _(b'NUM'),
3958 3958 ),
3959 3959 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3960 3960 (b'', b'secret', None, _(b'use the secret phase for committing')),
3961 3961 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3962 3962 (
3963 3963 b'f',
3964 3964 b'force',
3965 3965 None,
3966 3966 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3967 3967 ),
3968 3968 (
3969 3969 b'',
3970 3970 b'no-commit',
3971 3971 None,
3972 3972 _(b"don't commit, just update the working directory"),
3973 3973 ),
3974 3974 (
3975 3975 b'',
3976 3976 b'bypass',
3977 3977 None,
3978 3978 _(b"apply patch without touching the working directory"),
3979 3979 ),
3980 3980 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3981 3981 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3982 3982 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3983 3983 (
3984 3984 b'',
3985 3985 b'import-branch',
3986 3986 None,
3987 3987 _(b'use any branch information in patch (implied by --exact)'),
3988 3988 ),
3989 3989 ]
3990 3990 + commitopts
3991 3991 + commitopts2
3992 3992 + similarityopts,
3993 3993 _(b'[OPTION]... PATCH...'),
3994 3994 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3995 3995 )
3996 3996 def import_(ui, repo, patch1=None, *patches, **opts):
3997 3997 """import an ordered set of patches
3998 3998
3999 3999 Import a list of patches and commit them individually (unless
4000 4000 --no-commit is specified).
4001 4001
4002 4002 To read a patch from standard input (stdin), use "-" as the patch
4003 4003 name. If a URL is specified, the patch will be downloaded from
4004 4004 there.
4005 4005
4006 4006 Import first applies changes to the working directory (unless
4007 4007 --bypass is specified), import will abort if there are outstanding
4008 4008 changes.
4009 4009
4010 4010 Use --bypass to apply and commit patches directly to the
4011 4011 repository, without affecting the working directory. Without
4012 4012 --exact, patches will be applied on top of the working directory
4013 4013 parent revision.
4014 4014
4015 4015 You can import a patch straight from a mail message. Even patches
4016 4016 as attachments work (to use the body part, it must have type
4017 4017 text/plain or text/x-patch). From and Subject headers of email
4018 4018 message are used as default committer and commit message. All
4019 4019 text/plain body parts before first diff are added to the commit
4020 4020 message.
4021 4021
4022 4022 If the imported patch was generated by :hg:`export`, user and
4023 4023 description from patch override values from message headers and
4024 4024 body. Values given on command line with -m/--message and -u/--user
4025 4025 override these.
4026 4026
4027 4027 If --exact is specified, import will set the working directory to
4028 4028 the parent of each patch before applying it, and will abort if the
4029 4029 resulting changeset has a different ID than the one recorded in
4030 4030 the patch. This will guard against various ways that portable
4031 4031 patch formats and mail systems might fail to transfer Mercurial
4032 4032 data or metadata. See :hg:`bundle` for lossless transmission.
4033 4033
4034 4034 Use --partial to ensure a changeset will be created from the patch
4035 4035 even if some hunks fail to apply. Hunks that fail to apply will be
4036 4036 written to a <target-file>.rej file. Conflicts can then be resolved
4037 4037 by hand before :hg:`commit --amend` is run to update the created
4038 4038 changeset. This flag exists to let people import patches that
4039 4039 partially apply without losing the associated metadata (author,
4040 4040 date, description, ...).
4041 4041
4042 4042 .. note::
4043 4043
4044 4044 When no hunks apply cleanly, :hg:`import --partial` will create
4045 4045 an empty changeset, importing only the patch metadata.
4046 4046
4047 4047 With -s/--similarity, hg will attempt to discover renames and
4048 4048 copies in the patch in the same way as :hg:`addremove`.
4049 4049
4050 4050 It is possible to use external patch programs to perform the patch
4051 4051 by setting the ``ui.patch`` configuration option. For the default
4052 4052 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4053 4053 See :hg:`help config` for more information about configuration
4054 4054 files and how to use these options.
4055 4055
4056 4056 See :hg:`help dates` for a list of formats valid for -d/--date.
4057 4057
4058 4058 .. container:: verbose
4059 4059
4060 4060 Examples:
4061 4061
4062 4062 - import a traditional patch from a website and detect renames::
4063 4063
4064 4064 hg import -s 80 http://example.com/bugfix.patch
4065 4065
4066 4066 - import a changeset from an hgweb server::
4067 4067
4068 4068 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4069 4069
4070 4070 - import all the patches in an Unix-style mbox::
4071 4071
4072 4072 hg import incoming-patches.mbox
4073 4073
4074 4074 - import patches from stdin::
4075 4075
4076 4076 hg import -
4077 4077
4078 4078 - attempt to exactly restore an exported changeset (not always
4079 4079 possible)::
4080 4080
4081 4081 hg import --exact proposed-fix.patch
4082 4082
4083 4083 - use an external tool to apply a patch which is too fuzzy for
4084 4084 the default internal tool.
4085 4085
4086 4086 hg import --config ui.patch="patch --merge" fuzzy.patch
4087 4087
4088 4088 - change the default fuzzing from 2 to a less strict 7
4089 4089
4090 4090 hg import --config ui.fuzz=7 fuzz.patch
4091 4091
4092 4092 Returns 0 on success, 1 on partial success (see --partial).
4093 4093 """
4094 4094
4095 4095 cmdutil.check_incompatible_arguments(
4096 4096 opts, 'no_commit', ['bypass', 'secret']
4097 4097 )
4098 4098 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4099 4099 opts = pycompat.byteskwargs(opts)
4100 4100 if not patch1:
4101 4101 raise error.InputError(_(b'need at least one patch to import'))
4102 4102
4103 4103 patches = (patch1,) + patches
4104 4104
4105 4105 date = opts.get(b'date')
4106 4106 if date:
4107 4107 opts[b'date'] = dateutil.parsedate(date)
4108 4108
4109 4109 exact = opts.get(b'exact')
4110 4110 update = not opts.get(b'bypass')
4111 4111 try:
4112 4112 sim = float(opts.get(b'similarity') or 0)
4113 4113 except ValueError:
4114 4114 raise error.InputError(_(b'similarity must be a number'))
4115 4115 if sim < 0 or sim > 100:
4116 4116 raise error.InputError(_(b'similarity must be between 0 and 100'))
4117 4117 if sim and not update:
4118 4118 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4119 4119
4120 4120 base = opts[b"base"]
4121 4121 msgs = []
4122 4122 ret = 0
4123 4123
4124 4124 with repo.wlock():
4125 4125 if update:
4126 4126 cmdutil.checkunfinished(repo)
4127 4127 if exact or not opts.get(b'force'):
4128 4128 cmdutil.bailifchanged(repo)
4129 4129
4130 4130 if not opts.get(b'no_commit'):
4131 4131 lock = repo.lock
4132 4132 tr = lambda: repo.transaction(b'import')
4133 4133 dsguard = util.nullcontextmanager
4134 4134 else:
4135 4135 lock = util.nullcontextmanager
4136 4136 tr = util.nullcontextmanager
4137 4137 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4138 4138 with lock(), tr(), dsguard():
4139 4139 parents = repo[None].parents()
4140 4140 for patchurl in patches:
4141 4141 if patchurl == b'-':
4142 4142 ui.status(_(b'applying patch from stdin\n'))
4143 4143 patchfile = ui.fin
4144 4144 patchurl = b'stdin' # for error message
4145 4145 else:
4146 4146 patchurl = os.path.join(base, patchurl)
4147 4147 ui.status(_(b'applying %s\n') % patchurl)
4148 4148 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4149 4149
4150 4150 haspatch = False
4151 4151 for hunk in patch.split(patchfile):
4152 4152 with patch.extract(ui, hunk) as patchdata:
4153 4153 msg, node, rej = cmdutil.tryimportone(
4154 4154 ui, repo, patchdata, parents, opts, msgs, hg.clean
4155 4155 )
4156 4156 if msg:
4157 4157 haspatch = True
4158 4158 ui.note(msg + b'\n')
4159 4159 if update or exact:
4160 4160 parents = repo[None].parents()
4161 4161 else:
4162 4162 parents = [repo[node]]
4163 4163 if rej:
4164 4164 ui.write_err(_(b"patch applied partially\n"))
4165 4165 ui.write_err(
4166 4166 _(
4167 4167 b"(fix the .rej files and run "
4168 4168 b"`hg commit --amend`)\n"
4169 4169 )
4170 4170 )
4171 4171 ret = 1
4172 4172 break
4173 4173
4174 4174 if not haspatch:
4175 4175 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4176 4176
4177 4177 if msgs:
4178 4178 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4179 4179 return ret
4180 4180
4181 4181
4182 4182 @command(
4183 4183 b'incoming|in',
4184 4184 [
4185 4185 (
4186 4186 b'f',
4187 4187 b'force',
4188 4188 None,
4189 4189 _(b'run even if remote repository is unrelated'),
4190 4190 ),
4191 4191 (b'n', b'newest-first', None, _(b'show newest record first')),
4192 4192 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4193 4193 (
4194 4194 b'r',
4195 4195 b'rev',
4196 4196 [],
4197 4197 _(b'a remote changeset intended to be added'),
4198 4198 _(b'REV'),
4199 4199 ),
4200 4200 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4201 4201 (
4202 4202 b'b',
4203 4203 b'branch',
4204 4204 [],
4205 4205 _(b'a specific branch you would like to pull'),
4206 4206 _(b'BRANCH'),
4207 4207 ),
4208 4208 ]
4209 4209 + logopts
4210 4210 + remoteopts
4211 4211 + subrepoopts,
4212 4212 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4213 4213 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4214 4214 )
4215 4215 def incoming(ui, repo, source=b"default", **opts):
4216 4216 """show new changesets found in source
4217 4217
4218 4218 Show new changesets found in the specified path/URL or the default
4219 4219 pull location. These are the changesets that would have been pulled
4220 4220 by :hg:`pull` at the time you issued this command.
4221 4221
4222 4222 See pull for valid source format details.
4223 4223
4224 4224 .. container:: verbose
4225 4225
4226 4226 With -B/--bookmarks, the result of bookmark comparison between
4227 4227 local and remote repositories is displayed. With -v/--verbose,
4228 4228 status is also displayed for each bookmark like below::
4229 4229
4230 4230 BM1 01234567890a added
4231 4231 BM2 1234567890ab advanced
4232 4232 BM3 234567890abc diverged
4233 4233 BM4 34567890abcd changed
4234 4234
4235 4235 The action taken locally when pulling depends on the
4236 4236 status of each bookmark:
4237 4237
4238 4238 :``added``: pull will create it
4239 4239 :``advanced``: pull will update it
4240 4240 :``diverged``: pull will create a divergent bookmark
4241 4241 :``changed``: result depends on remote changesets
4242 4242
4243 4243 From the point of view of pulling behavior, bookmark
4244 4244 existing only in the remote repository are treated as ``added``,
4245 4245 even if it is in fact locally deleted.
4246 4246
4247 4247 .. container:: verbose
4248 4248
4249 4249 For remote repository, using --bundle avoids downloading the
4250 4250 changesets twice if the incoming is followed by a pull.
4251 4251
4252 4252 Examples:
4253 4253
4254 4254 - show incoming changes with patches and full description::
4255 4255
4256 4256 hg incoming -vp
4257 4257
4258 4258 - show incoming changes excluding merges, store a bundle::
4259 4259
4260 4260 hg in -vpM --bundle incoming.hg
4261 4261 hg pull incoming.hg
4262 4262
4263 4263 - briefly list changes inside a bundle::
4264 4264
4265 4265 hg in changes.hg -T "{desc|firstline}\\n"
4266 4266
4267 4267 Returns 0 if there are incoming changes, 1 otherwise.
4268 4268 """
4269 4269 opts = pycompat.byteskwargs(opts)
4270 4270 if opts.get(b'graph'):
4271 4271 logcmdutil.checkunsupportedgraphflags([], opts)
4272 4272
4273 4273 def display(other, chlist, displayer):
4274 4274 revdag = logcmdutil.graphrevs(other, chlist, opts)
4275 4275 logcmdutil.displaygraph(
4276 4276 ui, repo, revdag, displayer, graphmod.asciiedges
4277 4277 )
4278 4278
4279 4279 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4280 4280 return 0
4281 4281
4282 4282 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4283 4283
4284 4284 if opts.get(b'bookmarks'):
4285 4285 source, branches = hg.parseurl(
4286 4286 ui.expandpath(source), opts.get(b'branch')
4287 4287 )
4288 4288 other = hg.peer(repo, opts, source)
4289 4289 if b'bookmarks' not in other.listkeys(b'namespaces'):
4290 4290 ui.warn(_(b"remote doesn't support bookmarks\n"))
4291 4291 return 0
4292 4292 ui.pager(b'incoming')
4293 4293 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4294 4294 return bookmarks.incoming(ui, repo, other)
4295 4295
4296 4296 repo._subtoppath = ui.expandpath(source)
4297 4297 try:
4298 4298 return hg.incoming(ui, repo, source, opts)
4299 4299 finally:
4300 4300 del repo._subtoppath
4301 4301
4302 4302
4303 4303 @command(
4304 4304 b'init',
4305 4305 remoteopts,
4306 4306 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4307 4307 helpcategory=command.CATEGORY_REPO_CREATION,
4308 4308 helpbasic=True,
4309 4309 norepo=True,
4310 4310 )
4311 4311 def init(ui, dest=b".", **opts):
4312 4312 """create a new repository in the given directory
4313 4313
4314 4314 Initialize a new repository in the given directory. If the given
4315 4315 directory does not exist, it will be created.
4316 4316
4317 4317 If no directory is given, the current directory is used.
4318 4318
4319 4319 It is possible to specify an ``ssh://`` URL as the destination.
4320 4320 See :hg:`help urls` for more information.
4321 4321
4322 4322 Returns 0 on success.
4323 4323 """
4324 4324 opts = pycompat.byteskwargs(opts)
4325 4325 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4326 4326
4327 4327
4328 4328 @command(
4329 4329 b'locate',
4330 4330 [
4331 4331 (
4332 4332 b'r',
4333 4333 b'rev',
4334 4334 b'',
4335 4335 _(b'search the repository as it is in REV'),
4336 4336 _(b'REV'),
4337 4337 ),
4338 4338 (
4339 4339 b'0',
4340 4340 b'print0',
4341 4341 None,
4342 4342 _(b'end filenames with NUL, for use with xargs'),
4343 4343 ),
4344 4344 (
4345 4345 b'f',
4346 4346 b'fullpath',
4347 4347 None,
4348 4348 _(b'print complete paths from the filesystem root'),
4349 4349 ),
4350 4350 ]
4351 4351 + walkopts,
4352 4352 _(b'[OPTION]... [PATTERN]...'),
4353 4353 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4354 4354 )
4355 4355 def locate(ui, repo, *pats, **opts):
4356 4356 """locate files matching specific patterns (DEPRECATED)
4357 4357
4358 4358 Print files under Mercurial control in the working directory whose
4359 4359 names match the given patterns.
4360 4360
4361 4361 By default, this command searches all directories in the working
4362 4362 directory. To search just the current directory and its
4363 4363 subdirectories, use "--include .".
4364 4364
4365 4365 If no patterns are given to match, this command prints the names
4366 4366 of all files under Mercurial control in the working directory.
4367 4367
4368 4368 If you want to feed the output of this command into the "xargs"
4369 4369 command, use the -0 option to both this command and "xargs". This
4370 4370 will avoid the problem of "xargs" treating single filenames that
4371 4371 contain whitespace as multiple filenames.
4372 4372
4373 4373 See :hg:`help files` for a more versatile command.
4374 4374
4375 4375 Returns 0 if a match is found, 1 otherwise.
4376 4376 """
4377 4377 opts = pycompat.byteskwargs(opts)
4378 4378 if opts.get(b'print0'):
4379 4379 end = b'\0'
4380 4380 else:
4381 4381 end = b'\n'
4382 4382 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4383 4383
4384 4384 ret = 1
4385 4385 m = scmutil.match(
4386 4386 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4387 4387 )
4388 4388
4389 4389 ui.pager(b'locate')
4390 4390 if ctx.rev() is None:
4391 4391 # When run on the working copy, "locate" includes removed files, so
4392 4392 # we get the list of files from the dirstate.
4393 4393 filesgen = sorted(repo.dirstate.matches(m))
4394 4394 else:
4395 4395 filesgen = ctx.matches(m)
4396 4396 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4397 4397 for abs in filesgen:
4398 4398 if opts.get(b'fullpath'):
4399 4399 ui.write(repo.wjoin(abs), end)
4400 4400 else:
4401 4401 ui.write(uipathfn(abs), end)
4402 4402 ret = 0
4403 4403
4404 4404 return ret
4405 4405
4406 4406
4407 4407 @command(
4408 4408 b'log|history',
4409 4409 [
4410 4410 (
4411 4411 b'f',
4412 4412 b'follow',
4413 4413 None,
4414 4414 _(
4415 4415 b'follow changeset history, or file history across copies and renames'
4416 4416 ),
4417 4417 ),
4418 4418 (
4419 4419 b'',
4420 4420 b'follow-first',
4421 4421 None,
4422 4422 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4423 4423 ),
4424 4424 (
4425 4425 b'd',
4426 4426 b'date',
4427 4427 b'',
4428 4428 _(b'show revisions matching date spec'),
4429 4429 _(b'DATE'),
4430 4430 ),
4431 4431 (b'C', b'copies', None, _(b'show copied files')),
4432 4432 (
4433 4433 b'k',
4434 4434 b'keyword',
4435 4435 [],
4436 4436 _(b'do case-insensitive search for a given text'),
4437 4437 _(b'TEXT'),
4438 4438 ),
4439 4439 (
4440 4440 b'r',
4441 4441 b'rev',
4442 4442 [],
4443 4443 _(b'show the specified revision or revset'),
4444 4444 _(b'REV'),
4445 4445 ),
4446 4446 (
4447 4447 b'L',
4448 4448 b'line-range',
4449 4449 [],
4450 4450 _(b'follow line range of specified file (EXPERIMENTAL)'),
4451 4451 _(b'FILE,RANGE'),
4452 4452 ),
4453 4453 (
4454 4454 b'',
4455 4455 b'removed',
4456 4456 None,
4457 4457 _(b'include revisions where files were removed'),
4458 4458 ),
4459 4459 (
4460 4460 b'm',
4461 4461 b'only-merges',
4462 4462 None,
4463 4463 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4464 4464 ),
4465 4465 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4466 4466 (
4467 4467 b'',
4468 4468 b'only-branch',
4469 4469 [],
4470 4470 _(
4471 4471 b'show only changesets within the given named branch (DEPRECATED)'
4472 4472 ),
4473 4473 _(b'BRANCH'),
4474 4474 ),
4475 4475 (
4476 4476 b'b',
4477 4477 b'branch',
4478 4478 [],
4479 4479 _(b'show changesets within the given named branch'),
4480 4480 _(b'BRANCH'),
4481 4481 ),
4482 4482 (
4483 4483 b'B',
4484 4484 b'bookmark',
4485 4485 [],
4486 4486 _(b"show changesets within the given bookmark"),
4487 4487 _(b'BOOKMARK'),
4488 4488 ),
4489 4489 (
4490 4490 b'P',
4491 4491 b'prune',
4492 4492 [],
4493 4493 _(b'do not display revision or any of its ancestors'),
4494 4494 _(b'REV'),
4495 4495 ),
4496 4496 ]
4497 4497 + logopts
4498 4498 + walkopts,
4499 4499 _(b'[OPTION]... [FILE]'),
4500 4500 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4501 4501 helpbasic=True,
4502 4502 inferrepo=True,
4503 4503 intents={INTENT_READONLY},
4504 4504 )
4505 4505 def log(ui, repo, *pats, **opts):
4506 4506 """show revision history of entire repository or files
4507 4507
4508 4508 Print the revision history of the specified files or the entire
4509 4509 project.
4510 4510
4511 4511 If no revision range is specified, the default is ``tip:0`` unless
4512 4512 --follow is set, in which case the working directory parent is
4513 4513 used as the starting revision.
4514 4514
4515 4515 File history is shown without following rename or copy history of
4516 4516 files. Use -f/--follow with a filename to follow history across
4517 4517 renames and copies. --follow without a filename will only show
4518 4518 ancestors of the starting revision.
4519 4519
4520 4520 By default this command prints revision number and changeset id,
4521 4521 tags, non-trivial parents, user, date and time, and a summary for
4522 4522 each commit. When the -v/--verbose switch is used, the list of
4523 4523 changed files and full commit message are shown.
4524 4524
4525 4525 With --graph the revisions are shown as an ASCII art DAG with the most
4526 4526 recent changeset at the top.
4527 4527 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4528 4528 involved in an unresolved merge conflict, '_' closes a branch,
4529 4529 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4530 4530 changeset from the lines below is a parent of the 'o' merge on the same
4531 4531 line.
4532 4532 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4533 4533 of a '|' indicates one or more revisions in a path are omitted.
4534 4534
4535 4535 .. container:: verbose
4536 4536
4537 4537 Use -L/--line-range FILE,M:N options to follow the history of lines
4538 4538 from M to N in FILE. With -p/--patch only diff hunks affecting
4539 4539 specified line range will be shown. This option requires --follow;
4540 4540 it can be specified multiple times. Currently, this option is not
4541 4541 compatible with --graph. This option is experimental.
4542 4542
4543 4543 .. note::
4544 4544
4545 4545 :hg:`log --patch` may generate unexpected diff output for merge
4546 4546 changesets, as it will only compare the merge changeset against
4547 4547 its first parent. Also, only files different from BOTH parents
4548 4548 will appear in files:.
4549 4549
4550 4550 .. note::
4551 4551
4552 4552 For performance reasons, :hg:`log FILE` may omit duplicate changes
4553 4553 made on branches and will not show removals or mode changes. To
4554 4554 see all such changes, use the --removed switch.
4555 4555
4556 4556 .. container:: verbose
4557 4557
4558 4558 .. note::
4559 4559
4560 4560 The history resulting from -L/--line-range options depends on diff
4561 4561 options; for instance if white-spaces are ignored, respective changes
4562 4562 with only white-spaces in specified line range will not be listed.
4563 4563
4564 4564 .. container:: verbose
4565 4565
4566 4566 Some examples:
4567 4567
4568 4568 - changesets with full descriptions and file lists::
4569 4569
4570 4570 hg log -v
4571 4571
4572 4572 - changesets ancestral to the working directory::
4573 4573
4574 4574 hg log -f
4575 4575
4576 4576 - last 10 commits on the current branch::
4577 4577
4578 4578 hg log -l 10 -b .
4579 4579
4580 4580 - changesets showing all modifications of a file, including removals::
4581 4581
4582 4582 hg log --removed file.c
4583 4583
4584 4584 - all changesets that touch a directory, with diffs, excluding merges::
4585 4585
4586 4586 hg log -Mp lib/
4587 4587
4588 4588 - all revision numbers that match a keyword::
4589 4589
4590 4590 hg log -k bug --template "{rev}\\n"
4591 4591
4592 4592 - the full hash identifier of the working directory parent::
4593 4593
4594 4594 hg log -r . --template "{node}\\n"
4595 4595
4596 4596 - list available log templates::
4597 4597
4598 4598 hg log -T list
4599 4599
4600 4600 - check if a given changeset is included in a tagged release::
4601 4601
4602 4602 hg log -r "a21ccf and ancestor(1.9)"
4603 4603
4604 4604 - find all changesets by some user in a date range::
4605 4605
4606 4606 hg log -k alice -d "may 2008 to jul 2008"
4607 4607
4608 4608 - summary of all changesets after the last tag::
4609 4609
4610 4610 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4611 4611
4612 4612 - changesets touching lines 13 to 23 for file.c::
4613 4613
4614 4614 hg log -L file.c,13:23
4615 4615
4616 4616 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4617 4617 main.c with patch::
4618 4618
4619 4619 hg log -L file.c,13:23 -L main.c,2:6 -p
4620 4620
4621 4621 See :hg:`help dates` for a list of formats valid for -d/--date.
4622 4622
4623 4623 See :hg:`help revisions` for more about specifying and ordering
4624 4624 revisions.
4625 4625
4626 4626 See :hg:`help templates` for more about pre-packaged styles and
4627 4627 specifying custom templates. The default template used by the log
4628 4628 command can be customized via the ``command-templates.log`` configuration
4629 4629 setting.
4630 4630
4631 4631 Returns 0 on success.
4632 4632
4633 4633 """
4634 4634 opts = pycompat.byteskwargs(opts)
4635 4635 linerange = opts.get(b'line_range')
4636 4636
4637 4637 if linerange and not opts.get(b'follow'):
4638 4638 raise error.InputError(_(b'--line-range requires --follow'))
4639 4639
4640 4640 if linerange and pats:
4641 4641 # TODO: take pats as patterns with no line-range filter
4642 4642 raise error.InputError(
4643 4643 _(b'FILE arguments are not compatible with --line-range option')
4644 4644 )
4645 4645
4646 4646 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4647 4647 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4648 4648 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4649 4649 if linerange:
4650 4650 # TODO: should follow file history from logcmdutil._initialrevs(),
4651 4651 # then filter the result by logcmdutil._makerevset() and --limit
4652 4652 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4653 4653
4654 4654 getcopies = None
4655 4655 if opts.get(b'copies'):
4656 4656 endrev = None
4657 4657 if revs:
4658 4658 endrev = revs.max() + 1
4659 4659 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4660 4660
4661 4661 ui.pager(b'log')
4662 4662 displayer = logcmdutil.changesetdisplayer(
4663 4663 ui, repo, opts, differ, buffered=True
4664 4664 )
4665 4665 if opts.get(b'graph'):
4666 4666 displayfn = logcmdutil.displaygraphrevs
4667 4667 else:
4668 4668 displayfn = logcmdutil.displayrevs
4669 4669 displayfn(ui, repo, revs, displayer, getcopies)
4670 4670
4671 4671
4672 4672 @command(
4673 4673 b'manifest',
4674 4674 [
4675 4675 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4676 4676 (b'', b'all', False, _(b"list files from all revisions")),
4677 4677 ]
4678 4678 + formatteropts,
4679 4679 _(b'[-r REV]'),
4680 4680 helpcategory=command.CATEGORY_MAINTENANCE,
4681 4681 intents={INTENT_READONLY},
4682 4682 )
4683 4683 def manifest(ui, repo, node=None, rev=None, **opts):
4684 4684 """output the current or given revision of the project manifest
4685 4685
4686 4686 Print a list of version controlled files for the given revision.
4687 4687 If no revision is given, the first parent of the working directory
4688 4688 is used, or the null revision if no revision is checked out.
4689 4689
4690 4690 With -v, print file permissions, symlink and executable bits.
4691 4691 With --debug, print file revision hashes.
4692 4692
4693 4693 If option --all is specified, the list of all files from all revisions
4694 4694 is printed. This includes deleted and renamed files.
4695 4695
4696 4696 Returns 0 on success.
4697 4697 """
4698 4698 opts = pycompat.byteskwargs(opts)
4699 4699 fm = ui.formatter(b'manifest', opts)
4700 4700
4701 4701 if opts.get(b'all'):
4702 4702 if rev or node:
4703 4703 raise error.InputError(_(b"can't specify a revision with --all"))
4704 4704
4705 4705 res = set()
4706 4706 for rev in repo:
4707 4707 ctx = repo[rev]
4708 4708 res |= set(ctx.files())
4709 4709
4710 4710 ui.pager(b'manifest')
4711 4711 for f in sorted(res):
4712 4712 fm.startitem()
4713 4713 fm.write(b"path", b'%s\n', f)
4714 4714 fm.end()
4715 4715 return
4716 4716
4717 4717 if rev and node:
4718 4718 raise error.InputError(_(b"please specify just one revision"))
4719 4719
4720 4720 if not node:
4721 4721 node = rev
4722 4722
4723 4723 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4724 4724 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4725 4725 if node:
4726 4726 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4727 4727 ctx = scmutil.revsingle(repo, node)
4728 4728 mf = ctx.manifest()
4729 4729 ui.pager(b'manifest')
4730 4730 for f in ctx:
4731 4731 fm.startitem()
4732 4732 fm.context(ctx=ctx)
4733 4733 fl = ctx[f].flags()
4734 4734 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4735 4735 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4736 4736 fm.write(b'path', b'%s\n', f)
4737 4737 fm.end()
4738 4738
4739 4739
4740 4740 @command(
4741 4741 b'merge',
4742 4742 [
4743 4743 (
4744 4744 b'f',
4745 4745 b'force',
4746 4746 None,
4747 4747 _(b'force a merge including outstanding changes (DEPRECATED)'),
4748 4748 ),
4749 4749 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4750 4750 (
4751 4751 b'P',
4752 4752 b'preview',
4753 4753 None,
4754 4754 _(b'review revisions to merge (no merge is performed)'),
4755 4755 ),
4756 4756 (b'', b'abort', None, _(b'abort the ongoing merge')),
4757 4757 ]
4758 4758 + mergetoolopts,
4759 4759 _(b'[-P] [[-r] REV]'),
4760 4760 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4761 4761 helpbasic=True,
4762 4762 )
4763 4763 def merge(ui, repo, node=None, **opts):
4764 4764 """merge another revision into working directory
4765 4765
4766 4766 The current working directory is updated with all changes made in
4767 4767 the requested revision since the last common predecessor revision.
4768 4768
4769 4769 Files that changed between either parent are marked as changed for
4770 4770 the next commit and a commit must be performed before any further
4771 4771 updates to the repository are allowed. The next commit will have
4772 4772 two parents.
4773 4773
4774 4774 ``--tool`` can be used to specify the merge tool used for file
4775 4775 merges. It overrides the HGMERGE environment variable and your
4776 4776 configuration files. See :hg:`help merge-tools` for options.
4777 4777
4778 4778 If no revision is specified, the working directory's parent is a
4779 4779 head revision, and the current branch contains exactly one other
4780 4780 head, the other head is merged with by default. Otherwise, an
4781 4781 explicit revision with which to merge must be provided.
4782 4782
4783 4783 See :hg:`help resolve` for information on handling file conflicts.
4784 4784
4785 4785 To undo an uncommitted merge, use :hg:`merge --abort` which
4786 4786 will check out a clean copy of the original merge parent, losing
4787 4787 all changes.
4788 4788
4789 4789 Returns 0 on success, 1 if there are unresolved files.
4790 4790 """
4791 4791
4792 4792 opts = pycompat.byteskwargs(opts)
4793 4793 abort = opts.get(b'abort')
4794 4794 if abort and repo.dirstate.p2() == nullid:
4795 4795 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4796 4796 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4797 4797 if abort:
4798 4798 state = cmdutil.getunfinishedstate(repo)
4799 4799 if state and state._opname != b'merge':
4800 4800 raise error.StateError(
4801 4801 _(b'cannot abort merge with %s in progress') % (state._opname),
4802 4802 hint=state.hint(),
4803 4803 )
4804 4804 if node:
4805 4805 raise error.InputError(_(b"cannot specify a node with --abort"))
4806 4806 return hg.abortmerge(repo.ui, repo)
4807 4807
4808 4808 if opts.get(b'rev') and node:
4809 4809 raise error.InputError(_(b"please specify just one revision"))
4810 4810 if not node:
4811 4811 node = opts.get(b'rev')
4812 4812
4813 4813 if node:
4814 4814 ctx = scmutil.revsingle(repo, node)
4815 4815 else:
4816 4816 if ui.configbool(b'commands', b'merge.require-rev'):
4817 4817 raise error.InputError(
4818 4818 _(
4819 4819 b'configuration requires specifying revision to merge '
4820 4820 b'with'
4821 4821 )
4822 4822 )
4823 4823 ctx = repo[destutil.destmerge(repo)]
4824 4824
4825 4825 if ctx.node() is None:
4826 4826 raise error.InputError(
4827 4827 _(b'merging with the working copy has no effect')
4828 4828 )
4829 4829
4830 4830 if opts.get(b'preview'):
4831 4831 # find nodes that are ancestors of p2 but not of p1
4832 4832 p1 = repo[b'.'].node()
4833 4833 p2 = ctx.node()
4834 4834 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4835 4835
4836 4836 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4837 4837 for node in nodes:
4838 4838 displayer.show(repo[node])
4839 4839 displayer.close()
4840 4840 return 0
4841 4841
4842 4842 # ui.forcemerge is an internal variable, do not document
4843 4843 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4844 4844 with ui.configoverride(overrides, b'merge'):
4845 4845 force = opts.get(b'force')
4846 4846 labels = [b'working copy', b'merge rev']
4847 4847 return hg.merge(ctx, force=force, labels=labels)
4848 4848
4849 4849
4850 4850 statemod.addunfinished(
4851 4851 b'merge',
4852 4852 fname=None,
4853 4853 clearable=True,
4854 4854 allowcommit=True,
4855 4855 cmdmsg=_(b'outstanding uncommitted merge'),
4856 4856 abortfunc=hg.abortmerge,
4857 4857 statushint=_(
4858 4858 b'To continue: hg commit\nTo abort: hg merge --abort'
4859 4859 ),
4860 4860 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4861 4861 )
4862 4862
4863 4863
4864 4864 @command(
4865 4865 b'outgoing|out',
4866 4866 [
4867 4867 (
4868 4868 b'f',
4869 4869 b'force',
4870 4870 None,
4871 4871 _(b'run even when the destination is unrelated'),
4872 4872 ),
4873 4873 (
4874 4874 b'r',
4875 4875 b'rev',
4876 4876 [],
4877 4877 _(b'a changeset intended to be included in the destination'),
4878 4878 _(b'REV'),
4879 4879 ),
4880 4880 (b'n', b'newest-first', None, _(b'show newest record first')),
4881 4881 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4882 4882 (
4883 4883 b'b',
4884 4884 b'branch',
4885 4885 [],
4886 4886 _(b'a specific branch you would like to push'),
4887 4887 _(b'BRANCH'),
4888 4888 ),
4889 4889 ]
4890 4890 + logopts
4891 4891 + remoteopts
4892 4892 + subrepoopts,
4893 4893 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4894 4894 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4895 4895 )
4896 4896 def outgoing(ui, repo, dest=None, **opts):
4897 4897 """show changesets not found in the destination
4898 4898
4899 4899 Show changesets not found in the specified destination repository
4900 4900 or the default push location. These are the changesets that would
4901 4901 be pushed if a push was requested.
4902 4902
4903 4903 See pull for details of valid destination formats.
4904 4904
4905 4905 .. container:: verbose
4906 4906
4907 4907 With -B/--bookmarks, the result of bookmark comparison between
4908 4908 local and remote repositories is displayed. With -v/--verbose,
4909 4909 status is also displayed for each bookmark like below::
4910 4910
4911 4911 BM1 01234567890a added
4912 4912 BM2 deleted
4913 4913 BM3 234567890abc advanced
4914 4914 BM4 34567890abcd diverged
4915 4915 BM5 4567890abcde changed
4916 4916
4917 4917 The action taken when pushing depends on the
4918 4918 status of each bookmark:
4919 4919
4920 4920 :``added``: push with ``-B`` will create it
4921 4921 :``deleted``: push with ``-B`` will delete it
4922 4922 :``advanced``: push will update it
4923 4923 :``diverged``: push with ``-B`` will update it
4924 4924 :``changed``: push with ``-B`` will update it
4925 4925
4926 4926 From the point of view of pushing behavior, bookmarks
4927 4927 existing only in the remote repository are treated as
4928 4928 ``deleted``, even if it is in fact added remotely.
4929 4929
4930 4930 Returns 0 if there are outgoing changes, 1 otherwise.
4931 4931 """
4932 4932 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4933 4933 # style URLs, so don't overwrite dest.
4934 4934 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4935 4935 if not path:
4936 4936 raise error.ConfigError(
4937 4937 _(b'default repository not configured!'),
4938 4938 hint=_(b"see 'hg help config.paths'"),
4939 4939 )
4940 4940
4941 4941 opts = pycompat.byteskwargs(opts)
4942 4942 if opts.get(b'graph'):
4943 4943 logcmdutil.checkunsupportedgraphflags([], opts)
4944 4944 o, other = hg._outgoing(ui, repo, dest, opts)
4945 4945 if not o:
4946 4946 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4947 4947 return
4948 4948
4949 4949 revdag = logcmdutil.graphrevs(repo, o, opts)
4950 4950 ui.pager(b'outgoing')
4951 4951 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4952 4952 logcmdutil.displaygraph(
4953 4953 ui, repo, revdag, displayer, graphmod.asciiedges
4954 4954 )
4955 4955 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4956 4956 return 0
4957 4957
4958 4958 if opts.get(b'bookmarks'):
4959 4959 dest = path.pushloc or path.loc
4960 4960 other = hg.peer(repo, opts, dest)
4961 4961 if b'bookmarks' not in other.listkeys(b'namespaces'):
4962 4962 ui.warn(_(b"remote doesn't support bookmarks\n"))
4963 4963 return 0
4964 4964 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4965 4965 ui.pager(b'outgoing')
4966 4966 return bookmarks.outgoing(ui, repo, other)
4967 4967
4968 4968 repo._subtoppath = path.pushloc or path.loc
4969 4969 try:
4970 4970 return hg.outgoing(ui, repo, dest, opts)
4971 4971 finally:
4972 4972 del repo._subtoppath
4973 4973
4974 4974
4975 4975 @command(
4976 4976 b'parents',
4977 4977 [
4978 4978 (
4979 4979 b'r',
4980 4980 b'rev',
4981 4981 b'',
4982 4982 _(b'show parents of the specified revision'),
4983 4983 _(b'REV'),
4984 4984 ),
4985 4985 ]
4986 4986 + templateopts,
4987 4987 _(b'[-r REV] [FILE]'),
4988 4988 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4989 4989 inferrepo=True,
4990 4990 )
4991 4991 def parents(ui, repo, file_=None, **opts):
4992 4992 """show the parents of the working directory or revision (DEPRECATED)
4993 4993
4994 4994 Print the working directory's parent revisions. If a revision is
4995 4995 given via -r/--rev, the parent of that revision will be printed.
4996 4996 If a file argument is given, the revision in which the file was
4997 4997 last changed (before the working directory revision or the
4998 4998 argument to --rev if given) is printed.
4999 4999
5000 5000 This command is equivalent to::
5001 5001
5002 5002 hg log -r "p1()+p2()" or
5003 5003 hg log -r "p1(REV)+p2(REV)" or
5004 5004 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5005 5005 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5006 5006
5007 5007 See :hg:`summary` and :hg:`help revsets` for related information.
5008 5008
5009 5009 Returns 0 on success.
5010 5010 """
5011 5011
5012 5012 opts = pycompat.byteskwargs(opts)
5013 5013 rev = opts.get(b'rev')
5014 5014 if rev:
5015 5015 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5016 5016 ctx = scmutil.revsingle(repo, rev, None)
5017 5017
5018 5018 if file_:
5019 5019 m = scmutil.match(ctx, (file_,), opts)
5020 5020 if m.anypats() or len(m.files()) != 1:
5021 5021 raise error.InputError(_(b'can only specify an explicit filename'))
5022 5022 file_ = m.files()[0]
5023 5023 filenodes = []
5024 5024 for cp in ctx.parents():
5025 5025 if not cp:
5026 5026 continue
5027 5027 try:
5028 5028 filenodes.append(cp.filenode(file_))
5029 5029 except error.LookupError:
5030 5030 pass
5031 5031 if not filenodes:
5032 5032 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5033 5033 p = []
5034 5034 for fn in filenodes:
5035 5035 fctx = repo.filectx(file_, fileid=fn)
5036 5036 p.append(fctx.node())
5037 5037 else:
5038 5038 p = [cp.node() for cp in ctx.parents()]
5039 5039
5040 5040 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5041 5041 for n in p:
5042 5042 if n != nullid:
5043 5043 displayer.show(repo[n])
5044 5044 displayer.close()
5045 5045
5046 5046
5047 5047 @command(
5048 5048 b'paths',
5049 5049 formatteropts,
5050 5050 _(b'[NAME]'),
5051 5051 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5052 5052 optionalrepo=True,
5053 5053 intents={INTENT_READONLY},
5054 5054 )
5055 5055 def paths(ui, repo, search=None, **opts):
5056 5056 """show aliases for remote repositories
5057 5057
5058 5058 Show definition of symbolic path name NAME. If no name is given,
5059 5059 show definition of all available names.
5060 5060
5061 5061 Option -q/--quiet suppresses all output when searching for NAME
5062 5062 and shows only the path names when listing all definitions.
5063 5063
5064 5064 Path names are defined in the [paths] section of your
5065 5065 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5066 5066 repository, ``.hg/hgrc`` is used, too.
5067 5067
5068 5068 The path names ``default`` and ``default-push`` have a special
5069 5069 meaning. When performing a push or pull operation, they are used
5070 5070 as fallbacks if no location is specified on the command-line.
5071 5071 When ``default-push`` is set, it will be used for push and
5072 5072 ``default`` will be used for pull; otherwise ``default`` is used
5073 5073 as the fallback for both. When cloning a repository, the clone
5074 5074 source is written as ``default`` in ``.hg/hgrc``.
5075 5075
5076 5076 .. note::
5077 5077
5078 5078 ``default`` and ``default-push`` apply to all inbound (e.g.
5079 5079 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5080 5080 and :hg:`bundle`) operations.
5081 5081
5082 5082 See :hg:`help urls` for more information.
5083 5083
5084 5084 .. container:: verbose
5085 5085
5086 5086 Template:
5087 5087
5088 5088 The following keywords are supported. See also :hg:`help templates`.
5089 5089
5090 5090 :name: String. Symbolic name of the path alias.
5091 5091 :pushurl: String. URL for push operations.
5092 5092 :url: String. URL or directory path for the other operations.
5093 5093
5094 5094 Returns 0 on success.
5095 5095 """
5096 5096
5097 5097 opts = pycompat.byteskwargs(opts)
5098 5098 ui.pager(b'paths')
5099 5099 if search:
5100 5100 pathitems = [
5101 5101 (name, path)
5102 5102 for name, path in pycompat.iteritems(ui.paths)
5103 5103 if name == search
5104 5104 ]
5105 5105 else:
5106 5106 pathitems = sorted(pycompat.iteritems(ui.paths))
5107 5107
5108 5108 fm = ui.formatter(b'paths', opts)
5109 5109 if fm.isplain():
5110 5110 hidepassword = util.hidepassword
5111 5111 else:
5112 5112 hidepassword = bytes
5113 5113 if ui.quiet:
5114 5114 namefmt = b'%s\n'
5115 5115 else:
5116 5116 namefmt = b'%s = '
5117 5117 showsubopts = not search and not ui.quiet
5118 5118
5119 5119 for name, path in pathitems:
5120 5120 fm.startitem()
5121 5121 fm.condwrite(not search, b'name', namefmt, name)
5122 5122 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5123 5123 for subopt, value in sorted(path.suboptions.items()):
5124 5124 assert subopt not in (b'name', b'url')
5125 5125 if showsubopts:
5126 5126 fm.plain(b'%s:%s = ' % (name, subopt))
5127 5127 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5128 5128
5129 5129 fm.end()
5130 5130
5131 5131 if search and not pathitems:
5132 5132 if not ui.quiet:
5133 5133 ui.warn(_(b"not found!\n"))
5134 5134 return 1
5135 5135 else:
5136 5136 return 0
5137 5137
5138 5138
5139 5139 @command(
5140 5140 b'phase',
5141 5141 [
5142 5142 (b'p', b'public', False, _(b'set changeset phase to public')),
5143 5143 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5144 5144 (b's', b'secret', False, _(b'set changeset phase to secret')),
5145 5145 (b'f', b'force', False, _(b'allow to move boundary backward')),
5146 5146 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5147 5147 ],
5148 5148 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5149 5149 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5150 5150 )
5151 5151 def phase(ui, repo, *revs, **opts):
5152 5152 """set or show the current phase name
5153 5153
5154 5154 With no argument, show the phase name of the current revision(s).
5155 5155
5156 5156 With one of -p/--public, -d/--draft or -s/--secret, change the
5157 5157 phase value of the specified revisions.
5158 5158
5159 5159 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5160 5160 lower phase to a higher phase. Phases are ordered as follows::
5161 5161
5162 5162 public < draft < secret
5163 5163
5164 5164 Returns 0 on success, 1 if some phases could not be changed.
5165 5165
5166 5166 (For more information about the phases concept, see :hg:`help phases`.)
5167 5167 """
5168 5168 opts = pycompat.byteskwargs(opts)
5169 5169 # search for a unique phase argument
5170 5170 targetphase = None
5171 5171 for idx, name in enumerate(phases.cmdphasenames):
5172 5172 if opts[name]:
5173 5173 if targetphase is not None:
5174 5174 raise error.InputError(_(b'only one phase can be specified'))
5175 5175 targetphase = idx
5176 5176
5177 5177 # look for specified revision
5178 5178 revs = list(revs)
5179 5179 revs.extend(opts[b'rev'])
5180 5180 if not revs:
5181 5181 # display both parents as the second parent phase can influence
5182 5182 # the phase of a merge commit
5183 5183 revs = [c.rev() for c in repo[None].parents()]
5184 5184
5185 5185 revs = scmutil.revrange(repo, revs)
5186 5186
5187 5187 ret = 0
5188 5188 if targetphase is None:
5189 5189 # display
5190 5190 for r in revs:
5191 5191 ctx = repo[r]
5192 5192 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5193 5193 else:
5194 5194 with repo.lock(), repo.transaction(b"phase") as tr:
5195 5195 # set phase
5196 5196 if not revs:
5197 5197 raise error.InputError(_(b'empty revision set'))
5198 5198 nodes = [repo[r].node() for r in revs]
5199 5199 # moving revision from public to draft may hide them
5200 5200 # We have to check result on an unfiltered repository
5201 5201 unfi = repo.unfiltered()
5202 5202 getphase = unfi._phasecache.phase
5203 5203 olddata = [getphase(unfi, r) for r in unfi]
5204 5204 phases.advanceboundary(repo, tr, targetphase, nodes)
5205 5205 if opts[b'force']:
5206 5206 phases.retractboundary(repo, tr, targetphase, nodes)
5207 5207 getphase = unfi._phasecache.phase
5208 5208 newdata = [getphase(unfi, r) for r in unfi]
5209 5209 changes = sum(newdata[r] != olddata[r] for r in unfi)
5210 5210 cl = unfi.changelog
5211 5211 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5212 5212 if rejected:
5213 5213 ui.warn(
5214 5214 _(
5215 5215 b'cannot move %i changesets to a higher '
5216 5216 b'phase, use --force\n'
5217 5217 )
5218 5218 % len(rejected)
5219 5219 )
5220 5220 ret = 1
5221 5221 if changes:
5222 5222 msg = _(b'phase changed for %i changesets\n') % changes
5223 5223 if ret:
5224 5224 ui.status(msg)
5225 5225 else:
5226 5226 ui.note(msg)
5227 5227 else:
5228 5228 ui.warn(_(b'no phases changed\n'))
5229 5229 return ret
5230 5230
5231 5231
5232 5232 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5233 5233 """Run after a changegroup has been added via pull/unbundle
5234 5234
5235 5235 This takes arguments below:
5236 5236
5237 5237 :modheads: change of heads by pull/unbundle
5238 5238 :optupdate: updating working directory is needed or not
5239 5239 :checkout: update destination revision (or None to default destination)
5240 5240 :brev: a name, which might be a bookmark to be activated after updating
5241 5241 """
5242 5242 if modheads == 0:
5243 5243 return
5244 5244 if optupdate:
5245 5245 try:
5246 5246 return hg.updatetotally(ui, repo, checkout, brev)
5247 5247 except error.UpdateAbort as inst:
5248 5248 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5249 5249 hint = inst.hint
5250 5250 raise error.UpdateAbort(msg, hint=hint)
5251 5251 if modheads is not None and modheads > 1:
5252 5252 currentbranchheads = len(repo.branchheads())
5253 5253 if currentbranchheads == modheads:
5254 5254 ui.status(
5255 5255 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5256 5256 )
5257 5257 elif currentbranchheads > 1:
5258 5258 ui.status(
5259 5259 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5260 5260 )
5261 5261 else:
5262 5262 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5263 5263 elif not ui.configbool(b'commands', b'update.requiredest'):
5264 5264 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5265 5265
5266 5266
5267 5267 @command(
5268 5268 b'pull',
5269 5269 [
5270 5270 (
5271 5271 b'u',
5272 5272 b'update',
5273 5273 None,
5274 5274 _(b'update to new branch head if new descendants were pulled'),
5275 5275 ),
5276 5276 (
5277 5277 b'f',
5278 5278 b'force',
5279 5279 None,
5280 5280 _(b'run even when remote repository is unrelated'),
5281 5281 ),
5282 5282 (
5283 5283 b'',
5284 5284 b'confirm',
5285 5285 None,
5286 5286 _(b'confirm pull before applying changes'),
5287 5287 ),
5288 5288 (
5289 5289 b'r',
5290 5290 b'rev',
5291 5291 [],
5292 5292 _(b'a remote changeset intended to be added'),
5293 5293 _(b'REV'),
5294 5294 ),
5295 5295 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5296 5296 (
5297 5297 b'b',
5298 5298 b'branch',
5299 5299 [],
5300 5300 _(b'a specific branch you would like to pull'),
5301 5301 _(b'BRANCH'),
5302 5302 ),
5303 5303 ]
5304 5304 + remoteopts,
5305 5305 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5306 5306 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5307 5307 helpbasic=True,
5308 5308 )
5309 5309 def pull(ui, repo, source=b"default", **opts):
5310 5310 """pull changes from the specified source
5311 5311
5312 5312 Pull changes from a remote repository to a local one.
5313 5313
5314 5314 This finds all changes from the repository at the specified path
5315 5315 or URL and adds them to a local repository (the current one unless
5316 5316 -R is specified). By default, this does not update the copy of the
5317 5317 project in the working directory.
5318 5318
5319 5319 When cloning from servers that support it, Mercurial may fetch
5320 5320 pre-generated data. When this is done, hooks operating on incoming
5321 5321 changesets and changegroups may fire more than once, once for each
5322 5322 pre-generated bundle and as well as for any additional remaining
5323 5323 data. See :hg:`help -e clonebundles` for more.
5324 5324
5325 5325 Use :hg:`incoming` if you want to see what would have been added
5326 5326 by a pull at the time you issued this command. If you then decide
5327 5327 to add those changes to the repository, you should use :hg:`pull
5328 5328 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5329 5329
5330 5330 If SOURCE is omitted, the 'default' path will be used.
5331 5331 See :hg:`help urls` for more information.
5332 5332
5333 5333 Specifying bookmark as ``.`` is equivalent to specifying the active
5334 5334 bookmark's name.
5335 5335
5336 5336 Returns 0 on success, 1 if an update had unresolved files.
5337 5337 """
5338 5338
5339 5339 opts = pycompat.byteskwargs(opts)
5340 5340 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5341 5341 b'update'
5342 5342 ):
5343 5343 msg = _(b'update destination required by configuration')
5344 5344 hint = _(b'use hg pull followed by hg update DEST')
5345 5345 raise error.InputError(msg, hint=hint)
5346 5346
5347 5347 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5348 5348 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5349 5349 ui.flush()
5350 5350 other = hg.peer(repo, opts, source)
5351 5351 try:
5352 5352 revs, checkout = hg.addbranchrevs(
5353 5353 repo, other, branches, opts.get(b'rev')
5354 5354 )
5355 5355
5356 5356 pullopargs = {}
5357 5357
5358 5358 nodes = None
5359 5359 if opts.get(b'bookmark') or revs:
5360 5360 # The list of bookmark used here is the same used to actually update
5361 5361 # the bookmark names, to avoid the race from issue 4689 and we do
5362 5362 # all lookup and bookmark queries in one go so they see the same
5363 5363 # version of the server state (issue 4700).
5364 5364 nodes = []
5365 5365 fnodes = []
5366 5366 revs = revs or []
5367 5367 if revs and not other.capable(b'lookup'):
5368 5368 err = _(
5369 5369 b"other repository doesn't support revision lookup, "
5370 5370 b"so a rev cannot be specified."
5371 5371 )
5372 5372 raise error.Abort(err)
5373 5373 with other.commandexecutor() as e:
5374 5374 fremotebookmarks = e.callcommand(
5375 5375 b'listkeys', {b'namespace': b'bookmarks'}
5376 5376 )
5377 5377 for r in revs:
5378 5378 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5379 5379 remotebookmarks = fremotebookmarks.result()
5380 5380 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5381 5381 pullopargs[b'remotebookmarks'] = remotebookmarks
5382 5382 for b in opts.get(b'bookmark', []):
5383 5383 b = repo._bookmarks.expandname(b)
5384 5384 if b not in remotebookmarks:
5385 5385 raise error.InputError(
5386 5386 _(b'remote bookmark %s not found!') % b
5387 5387 )
5388 5388 nodes.append(remotebookmarks[b])
5389 5389 for i, rev in enumerate(revs):
5390 5390 node = fnodes[i].result()
5391 5391 nodes.append(node)
5392 5392 if rev == checkout:
5393 5393 checkout = node
5394 5394
5395 5395 wlock = util.nullcontextmanager()
5396 5396 if opts.get(b'update'):
5397 5397 wlock = repo.wlock()
5398 5398 with wlock:
5399 5399 pullopargs.update(opts.get(b'opargs', {}))
5400 5400 modheads = exchange.pull(
5401 5401 repo,
5402 5402 other,
5403 5403 heads=nodes,
5404 5404 force=opts.get(b'force'),
5405 5405 bookmarks=opts.get(b'bookmark', ()),
5406 5406 opargs=pullopargs,
5407 5407 confirm=opts.get(b'confirm'),
5408 5408 ).cgresult
5409 5409
5410 5410 # brev is a name, which might be a bookmark to be activated at
5411 5411 # the end of the update. In other words, it is an explicit
5412 5412 # destination of the update
5413 5413 brev = None
5414 5414
5415 5415 if checkout:
5416 5416 checkout = repo.unfiltered().changelog.rev(checkout)
5417 5417
5418 5418 # order below depends on implementation of
5419 5419 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5420 5420 # because 'checkout' is determined without it.
5421 5421 if opts.get(b'rev'):
5422 5422 brev = opts[b'rev'][0]
5423 5423 elif opts.get(b'branch'):
5424 5424 brev = opts[b'branch'][0]
5425 5425 else:
5426 5426 brev = branches[0]
5427 5427 repo._subtoppath = source
5428 5428 try:
5429 5429 ret = postincoming(
5430 5430 ui, repo, modheads, opts.get(b'update'), checkout, brev
5431 5431 )
5432 5432 except error.FilteredRepoLookupError as exc:
5433 5433 msg = _(b'cannot update to target: %s') % exc.args[0]
5434 5434 exc.args = (msg,) + exc.args[1:]
5435 5435 raise
5436 5436 finally:
5437 5437 del repo._subtoppath
5438 5438
5439 5439 finally:
5440 5440 other.close()
5441 5441 return ret
5442 5442
5443 5443
5444 5444 @command(
5445 5445 b'push',
5446 5446 [
5447 5447 (b'f', b'force', None, _(b'force push')),
5448 5448 (
5449 5449 b'r',
5450 5450 b'rev',
5451 5451 [],
5452 5452 _(b'a changeset intended to be included in the destination'),
5453 5453 _(b'REV'),
5454 5454 ),
5455 5455 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5456 5456 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5457 5457 (
5458 5458 b'b',
5459 5459 b'branch',
5460 5460 [],
5461 5461 _(b'a specific branch you would like to push'),
5462 5462 _(b'BRANCH'),
5463 5463 ),
5464 5464 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5465 5465 (
5466 5466 b'',
5467 5467 b'pushvars',
5468 5468 [],
5469 5469 _(b'variables that can be sent to server (ADVANCED)'),
5470 5470 ),
5471 5471 (
5472 5472 b'',
5473 5473 b'publish',
5474 5474 False,
5475 5475 _(b'push the changeset as public (EXPERIMENTAL)'),
5476 5476 ),
5477 5477 ]
5478 5478 + remoteopts,
5479 5479 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5480 5480 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5481 5481 helpbasic=True,
5482 5482 )
5483 5483 def push(ui, repo, dest=None, **opts):
5484 5484 """push changes to the specified destination
5485 5485
5486 5486 Push changesets from the local repository to the specified
5487 5487 destination.
5488 5488
5489 5489 This operation is symmetrical to pull: it is identical to a pull
5490 5490 in the destination repository from the current one.
5491 5491
5492 5492 By default, push will not allow creation of new heads at the
5493 5493 destination, since multiple heads would make it unclear which head
5494 5494 to use. In this situation, it is recommended to pull and merge
5495 5495 before pushing.
5496 5496
5497 5497 Use --new-branch if you want to allow push to create a new named
5498 5498 branch that is not present at the destination. This allows you to
5499 5499 only create a new branch without forcing other changes.
5500 5500
5501 5501 .. note::
5502 5502
5503 5503 Extra care should be taken with the -f/--force option,
5504 5504 which will push all new heads on all branches, an action which will
5505 5505 almost always cause confusion for collaborators.
5506 5506
5507 5507 If -r/--rev is used, the specified revision and all its ancestors
5508 5508 will be pushed to the remote repository.
5509 5509
5510 5510 If -B/--bookmark is used, the specified bookmarked revision, its
5511 5511 ancestors, and the bookmark will be pushed to the remote
5512 5512 repository. Specifying ``.`` is equivalent to specifying the active
5513 5513 bookmark's name. Use the --all-bookmarks option for pushing all
5514 5514 current bookmarks.
5515 5515
5516 5516 Please see :hg:`help urls` for important details about ``ssh://``
5517 5517 URLs. If DESTINATION is omitted, a default path will be used.
5518 5518
5519 5519 .. container:: verbose
5520 5520
5521 5521 The --pushvars option sends strings to the server that become
5522 5522 environment variables prepended with ``HG_USERVAR_``. For example,
5523 5523 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5524 5524 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5525 5525
5526 5526 pushvars can provide for user-overridable hooks as well as set debug
5527 5527 levels. One example is having a hook that blocks commits containing
5528 5528 conflict markers, but enables the user to override the hook if the file
5529 5529 is using conflict markers for testing purposes or the file format has
5530 5530 strings that look like conflict markers.
5531 5531
5532 5532 By default, servers will ignore `--pushvars`. To enable it add the
5533 5533 following to your configuration file::
5534 5534
5535 5535 [push]
5536 5536 pushvars.server = true
5537 5537
5538 5538 Returns 0 if push was successful, 1 if nothing to push.
5539 5539 """
5540 5540
5541 5541 opts = pycompat.byteskwargs(opts)
5542 5542
5543 5543 if opts.get(b'all_bookmarks'):
5544 5544 cmdutil.check_incompatible_arguments(
5545 5545 opts,
5546 5546 b'all_bookmarks',
5547 5547 [b'bookmark', b'rev'],
5548 5548 )
5549 5549 opts[b'bookmark'] = list(repo._bookmarks)
5550 5550
5551 5551 if opts.get(b'bookmark'):
5552 5552 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5553 5553 for b in opts[b'bookmark']:
5554 5554 # translate -B options to -r so changesets get pushed
5555 5555 b = repo._bookmarks.expandname(b)
5556 5556 if b in repo._bookmarks:
5557 5557 opts.setdefault(b'rev', []).append(b)
5558 5558 else:
5559 5559 # if we try to push a deleted bookmark, translate it to null
5560 5560 # this lets simultaneous -r, -b options continue working
5561 5561 opts.setdefault(b'rev', []).append(b"null")
5562 5562
5563 5563 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5564 5564 if not path:
5565 5565 raise error.ConfigError(
5566 5566 _(b'default repository not configured!'),
5567 5567 hint=_(b"see 'hg help config.paths'"),
5568 5568 )
5569 5569 dest = path.pushloc or path.loc
5570 5570 branches = (path.branch, opts.get(b'branch') or [])
5571 5571 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5572 5572 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5573 5573 other = hg.peer(repo, opts, dest)
5574 5574
5575 5575 if revs:
5576 5576 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5577 5577 if not revs:
5578 5578 raise error.InputError(
5579 5579 _(b"specified revisions evaluate to an empty set"),
5580 5580 hint=_(b"use different revision arguments"),
5581 5581 )
5582 5582 elif path.pushrev:
5583 5583 # It doesn't make any sense to specify ancestor revisions. So limit
5584 5584 # to DAG heads to make discovery simpler.
5585 5585 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5586 5586 revs = scmutil.revrange(repo, [expr])
5587 5587 revs = [repo[rev].node() for rev in revs]
5588 5588 if not revs:
5589 5589 raise error.InputError(
5590 5590 _(b'default push revset for path evaluates to an empty set')
5591 5591 )
5592 5592 elif ui.configbool(b'commands', b'push.require-revs'):
5593 5593 raise error.InputError(
5594 5594 _(b'no revisions specified to push'),
5595 5595 hint=_(b'did you mean "hg push -r ."?'),
5596 5596 )
5597 5597
5598 5598 repo._subtoppath = dest
5599 5599 try:
5600 5600 # push subrepos depth-first for coherent ordering
5601 5601 c = repo[b'.']
5602 5602 subs = c.substate # only repos that are committed
5603 5603 for s in sorted(subs):
5604 5604 result = c.sub(s).push(opts)
5605 5605 if result == 0:
5606 5606 return not result
5607 5607 finally:
5608 5608 del repo._subtoppath
5609 5609
5610 5610 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5611 5611 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5612 5612
5613 5613 pushop = exchange.push(
5614 5614 repo,
5615 5615 other,
5616 5616 opts.get(b'force'),
5617 5617 revs=revs,
5618 5618 newbranch=opts.get(b'new_branch'),
5619 5619 bookmarks=opts.get(b'bookmark', ()),
5620 5620 publish=opts.get(b'publish'),
5621 5621 opargs=opargs,
5622 5622 )
5623 5623
5624 5624 result = not pushop.cgresult
5625 5625
5626 5626 if pushop.bkresult is not None:
5627 5627 if pushop.bkresult == 2:
5628 5628 result = 2
5629 5629 elif not result and pushop.bkresult:
5630 5630 result = 2
5631 5631
5632 5632 return result
5633 5633
5634 5634
5635 5635 @command(
5636 5636 b'recover',
5637 5637 [
5638 5638 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5639 5639 ],
5640 5640 helpcategory=command.CATEGORY_MAINTENANCE,
5641 5641 )
5642 5642 def recover(ui, repo, **opts):
5643 5643 """roll back an interrupted transaction
5644 5644
5645 5645 Recover from an interrupted commit or pull.
5646 5646
5647 5647 This command tries to fix the repository status after an
5648 5648 interrupted operation. It should only be necessary when Mercurial
5649 5649 suggests it.
5650 5650
5651 5651 Returns 0 if successful, 1 if nothing to recover or verify fails.
5652 5652 """
5653 5653 ret = repo.recover()
5654 5654 if ret:
5655 5655 if opts['verify']:
5656 5656 return hg.verify(repo)
5657 5657 else:
5658 5658 msg = _(
5659 5659 b"(verify step skipped, run `hg verify` to check your "
5660 5660 b"repository content)\n"
5661 5661 )
5662 5662 ui.warn(msg)
5663 5663 return 0
5664 5664 return 1
5665 5665
5666 5666
5667 5667 @command(
5668 5668 b'remove|rm',
5669 5669 [
5670 5670 (b'A', b'after', None, _(b'record delete for missing files')),
5671 5671 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5672 5672 ]
5673 5673 + subrepoopts
5674 5674 + walkopts
5675 5675 + dryrunopts,
5676 5676 _(b'[OPTION]... FILE...'),
5677 5677 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5678 5678 helpbasic=True,
5679 5679 inferrepo=True,
5680 5680 )
5681 5681 def remove(ui, repo, *pats, **opts):
5682 5682 """remove the specified files on the next commit
5683 5683
5684 5684 Schedule the indicated files for removal from the current branch.
5685 5685
5686 5686 This command schedules the files to be removed at the next commit.
5687 5687 To undo a remove before that, see :hg:`revert`. To undo added
5688 5688 files, see :hg:`forget`.
5689 5689
5690 5690 .. container:: verbose
5691 5691
5692 5692 -A/--after can be used to remove only files that have already
5693 5693 been deleted, -f/--force can be used to force deletion, and -Af
5694 5694 can be used to remove files from the next revision without
5695 5695 deleting them from the working directory.
5696 5696
5697 5697 The following table details the behavior of remove for different
5698 5698 file states (columns) and option combinations (rows). The file
5699 5699 states are Added [A], Clean [C], Modified [M] and Missing [!]
5700 5700 (as reported by :hg:`status`). The actions are Warn, Remove
5701 5701 (from branch) and Delete (from disk):
5702 5702
5703 5703 ========= == == == ==
5704 5704 opt/state A C M !
5705 5705 ========= == == == ==
5706 5706 none W RD W R
5707 5707 -f R RD RD R
5708 5708 -A W W W R
5709 5709 -Af R R R R
5710 5710 ========= == == == ==
5711 5711
5712 5712 .. note::
5713 5713
5714 5714 :hg:`remove` never deletes files in Added [A] state from the
5715 5715 working directory, not even if ``--force`` is specified.
5716 5716
5717 5717 Returns 0 on success, 1 if any warnings encountered.
5718 5718 """
5719 5719
5720 5720 opts = pycompat.byteskwargs(opts)
5721 5721 after, force = opts.get(b'after'), opts.get(b'force')
5722 5722 dryrun = opts.get(b'dry_run')
5723 5723 if not pats and not after:
5724 5724 raise error.InputError(_(b'no files specified'))
5725 5725
5726 5726 m = scmutil.match(repo[None], pats, opts)
5727 5727 subrepos = opts.get(b'subrepos')
5728 5728 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5729 5729 return cmdutil.remove(
5730 5730 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5731 5731 )
5732 5732
5733 5733
5734 5734 @command(
5735 5735 b'rename|move|mv',
5736 5736 [
5737 5737 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5738 5738 (
5739 5739 b'',
5740 5740 b'at-rev',
5741 5741 b'',
5742 5742 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5743 5743 _(b'REV'),
5744 5744 ),
5745 5745 (
5746 5746 b'f',
5747 5747 b'force',
5748 5748 None,
5749 5749 _(b'forcibly move over an existing managed file'),
5750 5750 ),
5751 5751 ]
5752 5752 + walkopts
5753 5753 + dryrunopts,
5754 5754 _(b'[OPTION]... SOURCE... DEST'),
5755 5755 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5756 5756 )
5757 5757 def rename(ui, repo, *pats, **opts):
5758 5758 """rename files; equivalent of copy + remove
5759 5759
5760 5760 Mark dest as copies of sources; mark sources for deletion. If dest
5761 5761 is a directory, copies are put in that directory. If dest is a
5762 5762 file, there can only be one source.
5763 5763
5764 5764 By default, this command copies the contents of files as they
5765 5765 exist in the working directory. If invoked with -A/--after, the
5766 5766 operation is recorded, but no copying is performed.
5767 5767
5768 5768 This command takes effect at the next commit. To undo a rename
5769 5769 before that, see :hg:`revert`.
5770 5770
5771 5771 Returns 0 on success, 1 if errors are encountered.
5772 5772 """
5773 5773 opts = pycompat.byteskwargs(opts)
5774 5774 with repo.wlock():
5775 5775 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5776 5776
5777 5777
5778 5778 @command(
5779 5779 b'resolve',
5780 5780 [
5781 5781 (b'a', b'all', None, _(b'select all unresolved files')),
5782 5782 (b'l', b'list', None, _(b'list state of files needing merge')),
5783 5783 (b'm', b'mark', None, _(b'mark files as resolved')),
5784 5784 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5785 5785 (b'n', b'no-status', None, _(b'hide status prefix')),
5786 5786 (b'', b're-merge', None, _(b're-merge files')),
5787 5787 ]
5788 5788 + mergetoolopts
5789 5789 + walkopts
5790 5790 + formatteropts,
5791 5791 _(b'[OPTION]... [FILE]...'),
5792 5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5793 5793 inferrepo=True,
5794 5794 )
5795 5795 def resolve(ui, repo, *pats, **opts):
5796 5796 """redo merges or set/view the merge status of files
5797 5797
5798 5798 Merges with unresolved conflicts are often the result of
5799 5799 non-interactive merging using the ``internal:merge`` configuration
5800 5800 setting, or a command-line merge tool like ``diff3``. The resolve
5801 5801 command is used to manage the files involved in a merge, after
5802 5802 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5803 5803 working directory must have two parents). See :hg:`help
5804 5804 merge-tools` for information on configuring merge tools.
5805 5805
5806 5806 The resolve command can be used in the following ways:
5807 5807
5808 5808 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5809 5809 the specified files, discarding any previous merge attempts. Re-merging
5810 5810 is not performed for files already marked as resolved. Use ``--all/-a``
5811 5811 to select all unresolved files. ``--tool`` can be used to specify
5812 5812 the merge tool used for the given files. It overrides the HGMERGE
5813 5813 environment variable and your configuration files. Previous file
5814 5814 contents are saved with a ``.orig`` suffix.
5815 5815
5816 5816 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5817 5817 (e.g. after having manually fixed-up the files). The default is
5818 5818 to mark all unresolved files.
5819 5819
5820 5820 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5821 5821 default is to mark all resolved files.
5822 5822
5823 5823 - :hg:`resolve -l`: list files which had or still have conflicts.
5824 5824 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5825 5825 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5826 5826 the list. See :hg:`help filesets` for details.
5827 5827
5828 5828 .. note::
5829 5829
5830 5830 Mercurial will not let you commit files with unresolved merge
5831 5831 conflicts. You must use :hg:`resolve -m ...` before you can
5832 5832 commit after a conflicting merge.
5833 5833
5834 5834 .. container:: verbose
5835 5835
5836 5836 Template:
5837 5837
5838 5838 The following keywords are supported in addition to the common template
5839 5839 keywords and functions. See also :hg:`help templates`.
5840 5840
5841 5841 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5842 5842 :path: String. Repository-absolute path of the file.
5843 5843
5844 5844 Returns 0 on success, 1 if any files fail a resolve attempt.
5845 5845 """
5846 5846
5847 5847 opts = pycompat.byteskwargs(opts)
5848 5848 confirm = ui.configbool(b'commands', b'resolve.confirm')
5849 5849 flaglist = b'all mark unmark list no_status re_merge'.split()
5850 5850 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5851 5851
5852 5852 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5853 5853 if actioncount > 1:
5854 5854 raise error.InputError(_(b"too many actions specified"))
5855 5855 elif actioncount == 0 and ui.configbool(
5856 5856 b'commands', b'resolve.explicit-re-merge'
5857 5857 ):
5858 5858 hint = _(b'use --mark, --unmark, --list or --re-merge')
5859 5859 raise error.InputError(_(b'no action specified'), hint=hint)
5860 5860 if pats and all:
5861 5861 raise error.InputError(_(b"can't specify --all and patterns"))
5862 5862 if not (all or pats or show or mark or unmark):
5863 5863 raise error.InputError(
5864 5864 _(b'no files or directories specified'),
5865 5865 hint=b'use --all to re-merge all unresolved files',
5866 5866 )
5867 5867
5868 5868 if confirm:
5869 5869 if all:
5870 5870 if ui.promptchoice(
5871 5871 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5872 5872 ):
5873 5873 raise error.CanceledError(_(b'user quit'))
5874 5874 if mark and not pats:
5875 5875 if ui.promptchoice(
5876 5876 _(
5877 5877 b'mark all unresolved files as resolved (yn)?'
5878 5878 b'$$ &Yes $$ &No'
5879 5879 )
5880 5880 ):
5881 5881 raise error.CanceledError(_(b'user quit'))
5882 5882 if unmark and not pats:
5883 5883 if ui.promptchoice(
5884 5884 _(
5885 5885 b'mark all resolved files as unresolved (yn)?'
5886 5886 b'$$ &Yes $$ &No'
5887 5887 )
5888 5888 ):
5889 5889 raise error.CanceledError(_(b'user quit'))
5890 5890
5891 5891 uipathfn = scmutil.getuipathfn(repo)
5892 5892
5893 5893 if show:
5894 5894 ui.pager(b'resolve')
5895 5895 fm = ui.formatter(b'resolve', opts)
5896 5896 ms = mergestatemod.mergestate.read(repo)
5897 5897 wctx = repo[None]
5898 5898 m = scmutil.match(wctx, pats, opts)
5899 5899
5900 5900 # Labels and keys based on merge state. Unresolved path conflicts show
5901 5901 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5902 5902 # resolved conflicts.
5903 5903 mergestateinfo = {
5904 5904 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5905 5905 b'resolve.unresolved',
5906 5906 b'U',
5907 5907 ),
5908 5908 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5909 5909 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5910 5910 b'resolve.unresolved',
5911 5911 b'P',
5912 5912 ),
5913 5913 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5914 5914 b'resolve.resolved',
5915 5915 b'R',
5916 5916 ),
5917 5917 }
5918 5918
5919 5919 for f in ms:
5920 5920 if not m(f):
5921 5921 continue
5922 5922
5923 5923 label, key = mergestateinfo[ms[f]]
5924 5924 fm.startitem()
5925 5925 fm.context(ctx=wctx)
5926 5926 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5927 5927 fm.data(path=f)
5928 5928 fm.plain(b'%s\n' % uipathfn(f), label=label)
5929 5929 fm.end()
5930 5930 return 0
5931 5931
5932 5932 with repo.wlock():
5933 5933 ms = mergestatemod.mergestate.read(repo)
5934 5934
5935 5935 if not (ms.active() or repo.dirstate.p2() != nullid):
5936 5936 raise error.StateError(
5937 5937 _(b'resolve command not applicable when not merging')
5938 5938 )
5939 5939
5940 5940 wctx = repo[None]
5941 5941 m = scmutil.match(wctx, pats, opts)
5942 5942 ret = 0
5943 5943 didwork = False
5944 5944
5945 5945 tocomplete = []
5946 5946 hasconflictmarkers = []
5947 5947 if mark:
5948 5948 markcheck = ui.config(b'commands', b'resolve.mark-check')
5949 5949 if markcheck not in [b'warn', b'abort']:
5950 5950 # Treat all invalid / unrecognized values as 'none'.
5951 5951 markcheck = False
5952 5952 for f in ms:
5953 5953 if not m(f):
5954 5954 continue
5955 5955
5956 5956 didwork = True
5957 5957
5958 5958 # path conflicts must be resolved manually
5959 5959 if ms[f] in (
5960 5960 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5961 5961 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5962 5962 ):
5963 5963 if mark:
5964 5964 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5965 5965 elif unmark:
5966 5966 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5967 5967 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5968 5968 ui.warn(
5969 5969 _(b'%s: path conflict must be resolved manually\n')
5970 5970 % uipathfn(f)
5971 5971 )
5972 5972 continue
5973 5973
5974 5974 if mark:
5975 5975 if markcheck:
5976 5976 fdata = repo.wvfs.tryread(f)
5977 5977 if (
5978 5978 filemerge.hasconflictmarkers(fdata)
5979 5979 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5980 5980 ):
5981 5981 hasconflictmarkers.append(f)
5982 5982 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5983 5983 elif unmark:
5984 5984 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5985 5985 else:
5986 5986 # backup pre-resolve (merge uses .orig for its own purposes)
5987 5987 a = repo.wjoin(f)
5988 5988 try:
5989 5989 util.copyfile(a, a + b".resolve")
5990 5990 except (IOError, OSError) as inst:
5991 5991 if inst.errno != errno.ENOENT:
5992 5992 raise
5993 5993
5994 5994 try:
5995 5995 # preresolve file
5996 5996 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5997 5997 with ui.configoverride(overrides, b'resolve'):
5998 5998 complete, r = ms.preresolve(f, wctx)
5999 5999 if not complete:
6000 6000 tocomplete.append(f)
6001 6001 elif r:
6002 6002 ret = 1
6003 6003 finally:
6004 6004 ms.commit()
6005 6005
6006 6006 # replace filemerge's .orig file with our resolve file, but only
6007 6007 # for merges that are complete
6008 6008 if complete:
6009 6009 try:
6010 6010 util.rename(
6011 6011 a + b".resolve", scmutil.backuppath(ui, repo, f)
6012 6012 )
6013 6013 except OSError as inst:
6014 6014 if inst.errno != errno.ENOENT:
6015 6015 raise
6016 6016
6017 6017 if hasconflictmarkers:
6018 6018 ui.warn(
6019 6019 _(
6020 6020 b'warning: the following files still have conflict '
6021 6021 b'markers:\n'
6022 6022 )
6023 6023 + b''.join(
6024 6024 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6025 6025 )
6026 6026 )
6027 6027 if markcheck == b'abort' and not all and not pats:
6028 6028 raise error.StateError(
6029 6029 _(b'conflict markers detected'),
6030 6030 hint=_(b'use --all to mark anyway'),
6031 6031 )
6032 6032
6033 6033 for f in tocomplete:
6034 6034 try:
6035 6035 # resolve file
6036 6036 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6037 6037 with ui.configoverride(overrides, b'resolve'):
6038 6038 r = ms.resolve(f, wctx)
6039 6039 if r:
6040 6040 ret = 1
6041 6041 finally:
6042 6042 ms.commit()
6043 6043
6044 6044 # replace filemerge's .orig file with our resolve file
6045 6045 a = repo.wjoin(f)
6046 6046 try:
6047 6047 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6048 6048 except OSError as inst:
6049 6049 if inst.errno != errno.ENOENT:
6050 6050 raise
6051 6051
6052 6052 ms.commit()
6053 6053 branchmerge = repo.dirstate.p2() != nullid
6054 6054 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6055 6055
6056 6056 if not didwork and pats:
6057 6057 hint = None
6058 6058 if not any([p for p in pats if p.find(b':') >= 0]):
6059 6059 pats = [b'path:%s' % p for p in pats]
6060 6060 m = scmutil.match(wctx, pats, opts)
6061 6061 for f in ms:
6062 6062 if not m(f):
6063 6063 continue
6064 6064
6065 6065 def flag(o):
6066 6066 if o == b're_merge':
6067 6067 return b'--re-merge '
6068 6068 return b'-%s ' % o[0:1]
6069 6069
6070 6070 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6071 6071 hint = _(b"(try: hg resolve %s%s)\n") % (
6072 6072 flags,
6073 6073 b' '.join(pats),
6074 6074 )
6075 6075 break
6076 6076 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6077 6077 if hint:
6078 6078 ui.warn(hint)
6079 6079
6080 6080 unresolvedf = list(ms.unresolved())
6081 6081 if not unresolvedf:
6082 6082 ui.status(_(b'(no more unresolved files)\n'))
6083 6083 cmdutil.checkafterresolved(repo)
6084 6084
6085 6085 return ret
6086 6086
6087 6087
6088 6088 @command(
6089 6089 b'revert',
6090 6090 [
6091 6091 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6092 6092 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6093 6093 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6094 6094 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6095 6095 (b'i', b'interactive', None, _(b'interactively select the changes')),
6096 6096 ]
6097 6097 + walkopts
6098 6098 + dryrunopts,
6099 6099 _(b'[OPTION]... [-r REV] [NAME]...'),
6100 6100 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6101 6101 )
6102 6102 def revert(ui, repo, *pats, **opts):
6103 6103 """restore files to their checkout state
6104 6104
6105 6105 .. note::
6106 6106
6107 6107 To check out earlier revisions, you should use :hg:`update REV`.
6108 6108 To cancel an uncommitted merge (and lose your changes),
6109 6109 use :hg:`merge --abort`.
6110 6110
6111 6111 With no revision specified, revert the specified files or directories
6112 6112 to the contents they had in the parent of the working directory.
6113 6113 This restores the contents of files to an unmodified
6114 6114 state and unschedules adds, removes, copies, and renames. If the
6115 6115 working directory has two parents, you must explicitly specify a
6116 6116 revision.
6117 6117
6118 6118 Using the -r/--rev or -d/--date options, revert the given files or
6119 6119 directories to their states as of a specific revision. Because
6120 6120 revert does not change the working directory parents, this will
6121 6121 cause these files to appear modified. This can be helpful to "back
6122 6122 out" some or all of an earlier change. See :hg:`backout` for a
6123 6123 related method.
6124 6124
6125 6125 Modified files are saved with a .orig suffix before reverting.
6126 6126 To disable these backups, use --no-backup. It is possible to store
6127 6127 the backup files in a custom directory relative to the root of the
6128 6128 repository by setting the ``ui.origbackuppath`` configuration
6129 6129 option.
6130 6130
6131 6131 See :hg:`help dates` for a list of formats valid for -d/--date.
6132 6132
6133 6133 See :hg:`help backout` for a way to reverse the effect of an
6134 6134 earlier changeset.
6135 6135
6136 6136 Returns 0 on success.
6137 6137 """
6138 6138
6139 6139 opts = pycompat.byteskwargs(opts)
6140 6140 if opts.get(b"date"):
6141 6141 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6142 6142 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6143 6143
6144 6144 parent, p2 = repo.dirstate.parents()
6145 6145 if not opts.get(b'rev') and p2 != nullid:
6146 6146 # revert after merge is a trap for new users (issue2915)
6147 6147 raise error.InputError(
6148 6148 _(b'uncommitted merge with no revision specified'),
6149 6149 hint=_(b"use 'hg update' or see 'hg help revert'"),
6150 6150 )
6151 6151
6152 6152 rev = opts.get(b'rev')
6153 6153 if rev:
6154 6154 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6155 6155 ctx = scmutil.revsingle(repo, rev)
6156 6156
6157 6157 if not (
6158 6158 pats
6159 6159 or opts.get(b'include')
6160 6160 or opts.get(b'exclude')
6161 6161 or opts.get(b'all')
6162 6162 or opts.get(b'interactive')
6163 6163 ):
6164 6164 msg = _(b"no files or directories specified")
6165 6165 if p2 != nullid:
6166 6166 hint = _(
6167 6167 b"uncommitted merge, use --all to discard all changes,"
6168 6168 b" or 'hg update -C .' to abort the merge"
6169 6169 )
6170 6170 raise error.InputError(msg, hint=hint)
6171 6171 dirty = any(repo.status())
6172 6172 node = ctx.node()
6173 6173 if node != parent:
6174 6174 if dirty:
6175 6175 hint = (
6176 6176 _(
6177 6177 b"uncommitted changes, use --all to discard all"
6178 6178 b" changes, or 'hg update %d' to update"
6179 6179 )
6180 6180 % ctx.rev()
6181 6181 )
6182 6182 else:
6183 6183 hint = (
6184 6184 _(
6185 6185 b"use --all to revert all files,"
6186 6186 b" or 'hg update %d' to update"
6187 6187 )
6188 6188 % ctx.rev()
6189 6189 )
6190 6190 elif dirty:
6191 6191 hint = _(b"uncommitted changes, use --all to discard all changes")
6192 6192 else:
6193 6193 hint = _(b"use --all to revert all files")
6194 6194 raise error.InputError(msg, hint=hint)
6195 6195
6196 6196 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6197 6197
6198 6198
6199 6199 @command(
6200 6200 b'rollback',
6201 6201 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6202 6202 helpcategory=command.CATEGORY_MAINTENANCE,
6203 6203 )
6204 6204 def rollback(ui, repo, **opts):
6205 6205 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6206 6206
6207 6207 Please use :hg:`commit --amend` instead of rollback to correct
6208 6208 mistakes in the last commit.
6209 6209
6210 6210 This command should be used with care. There is only one level of
6211 6211 rollback, and there is no way to undo a rollback. It will also
6212 6212 restore the dirstate at the time of the last transaction, losing
6213 6213 any dirstate changes since that time. This command does not alter
6214 6214 the working directory.
6215 6215
6216 6216 Transactions are used to encapsulate the effects of all commands
6217 6217 that create new changesets or propagate existing changesets into a
6218 6218 repository.
6219 6219
6220 6220 .. container:: verbose
6221 6221
6222 6222 For example, the following commands are transactional, and their
6223 6223 effects can be rolled back:
6224 6224
6225 6225 - commit
6226 6226 - import
6227 6227 - pull
6228 6228 - push (with this repository as the destination)
6229 6229 - unbundle
6230 6230
6231 6231 To avoid permanent data loss, rollback will refuse to rollback a
6232 6232 commit transaction if it isn't checked out. Use --force to
6233 6233 override this protection.
6234 6234
6235 6235 The rollback command can be entirely disabled by setting the
6236 6236 ``ui.rollback`` configuration setting to false. If you're here
6237 6237 because you want to use rollback and it's disabled, you can
6238 6238 re-enable the command by setting ``ui.rollback`` to true.
6239 6239
6240 6240 This command is not intended for use on public repositories. Once
6241 6241 changes are visible for pull by other users, rolling a transaction
6242 6242 back locally is ineffective (someone else may already have pulled
6243 6243 the changes). Furthermore, a race is possible with readers of the
6244 6244 repository; for example an in-progress pull from the repository
6245 6245 may fail if a rollback is performed.
6246 6246
6247 6247 Returns 0 on success, 1 if no rollback data is available.
6248 6248 """
6249 6249 if not ui.configbool(b'ui', b'rollback'):
6250 6250 raise error.Abort(
6251 6251 _(b'rollback is disabled because it is unsafe'),
6252 6252 hint=b'see `hg help -v rollback` for information',
6253 6253 )
6254 6254 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6255 6255
6256 6256
6257 6257 @command(
6258 6258 b'root',
6259 6259 [] + formatteropts,
6260 6260 intents={INTENT_READONLY},
6261 6261 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6262 6262 )
6263 6263 def root(ui, repo, **opts):
6264 6264 """print the root (top) of the current working directory
6265 6265
6266 6266 Print the root directory of the current repository.
6267 6267
6268 6268 .. container:: verbose
6269 6269
6270 6270 Template:
6271 6271
6272 6272 The following keywords are supported in addition to the common template
6273 6273 keywords and functions. See also :hg:`help templates`.
6274 6274
6275 6275 :hgpath: String. Path to the .hg directory.
6276 6276 :storepath: String. Path to the directory holding versioned data.
6277 6277
6278 6278 Returns 0 on success.
6279 6279 """
6280 6280 opts = pycompat.byteskwargs(opts)
6281 6281 with ui.formatter(b'root', opts) as fm:
6282 6282 fm.startitem()
6283 6283 fm.write(b'reporoot', b'%s\n', repo.root)
6284 6284 fm.data(hgpath=repo.path, storepath=repo.spath)
6285 6285
6286 6286
6287 6287 @command(
6288 6288 b'serve',
6289 6289 [
6290 6290 (
6291 6291 b'A',
6292 6292 b'accesslog',
6293 6293 b'',
6294 6294 _(b'name of access log file to write to'),
6295 6295 _(b'FILE'),
6296 6296 ),
6297 6297 (b'd', b'daemon', None, _(b'run server in background')),
6298 6298 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6299 6299 (
6300 6300 b'E',
6301 6301 b'errorlog',
6302 6302 b'',
6303 6303 _(b'name of error log file to write to'),
6304 6304 _(b'FILE'),
6305 6305 ),
6306 6306 # use string type, then we can check if something was passed
6307 6307 (
6308 6308 b'p',
6309 6309 b'port',
6310 6310 b'',
6311 6311 _(b'port to listen on (default: 8000)'),
6312 6312 _(b'PORT'),
6313 6313 ),
6314 6314 (
6315 6315 b'a',
6316 6316 b'address',
6317 6317 b'',
6318 6318 _(b'address to listen on (default: all interfaces)'),
6319 6319 _(b'ADDR'),
6320 6320 ),
6321 6321 (
6322 6322 b'',
6323 6323 b'prefix',
6324 6324 b'',
6325 6325 _(b'prefix path to serve from (default: server root)'),
6326 6326 _(b'PREFIX'),
6327 6327 ),
6328 6328 (
6329 6329 b'n',
6330 6330 b'name',
6331 6331 b'',
6332 6332 _(b'name to show in web pages (default: working directory)'),
6333 6333 _(b'NAME'),
6334 6334 ),
6335 6335 (
6336 6336 b'',
6337 6337 b'web-conf',
6338 6338 b'',
6339 6339 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6340 6340 _(b'FILE'),
6341 6341 ),
6342 6342 (
6343 6343 b'',
6344 6344 b'webdir-conf',
6345 6345 b'',
6346 6346 _(b'name of the hgweb config file (DEPRECATED)'),
6347 6347 _(b'FILE'),
6348 6348 ),
6349 6349 (
6350 6350 b'',
6351 6351 b'pid-file',
6352 6352 b'',
6353 6353 _(b'name of file to write process ID to'),
6354 6354 _(b'FILE'),
6355 6355 ),
6356 6356 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6357 6357 (
6358 6358 b'',
6359 6359 b'cmdserver',
6360 6360 b'',
6361 6361 _(b'for remote clients (ADVANCED)'),
6362 6362 _(b'MODE'),
6363 6363 ),
6364 6364 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6365 6365 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6366 6366 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6367 6367 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6368 6368 (b'', b'print-url', None, _(b'start and print only the URL')),
6369 6369 ]
6370 6370 + subrepoopts,
6371 6371 _(b'[OPTION]...'),
6372 6372 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6373 6373 helpbasic=True,
6374 6374 optionalrepo=True,
6375 6375 )
6376 6376 def serve(ui, repo, **opts):
6377 6377 """start stand-alone webserver
6378 6378
6379 6379 Start a local HTTP repository browser and pull server. You can use
6380 6380 this for ad-hoc sharing and browsing of repositories. It is
6381 6381 recommended to use a real web server to serve a repository for
6382 6382 longer periods of time.
6383 6383
6384 6384 Please note that the server does not implement access control.
6385 6385 This means that, by default, anybody can read from the server and
6386 6386 nobody can write to it by default. Set the ``web.allow-push``
6387 6387 option to ``*`` to allow everybody to push to the server. You
6388 6388 should use a real web server if you need to authenticate users.
6389 6389
6390 6390 By default, the server logs accesses to stdout and errors to
6391 6391 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6392 6392 files.
6393 6393
6394 6394 To have the server choose a free port number to listen on, specify
6395 6395 a port number of 0; in this case, the server will print the port
6396 6396 number it uses.
6397 6397
6398 6398 Returns 0 on success.
6399 6399 """
6400 6400
6401 6401 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6402 6402 opts = pycompat.byteskwargs(opts)
6403 6403 if opts[b"print_url"] and ui.verbose:
6404 6404 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6405 6405
6406 6406 if opts[b"stdio"]:
6407 6407 if repo is None:
6408 6408 raise error.RepoError(
6409 6409 _(b"there is no Mercurial repository here (.hg not found)")
6410 6410 )
6411 6411 s = wireprotoserver.sshserver(ui, repo)
6412 6412 s.serve_forever()
6413 6413 return
6414 6414
6415 6415 service = server.createservice(ui, repo, opts)
6416 6416 return server.runservice(opts, initfn=service.init, runfn=service.run)
6417 6417
6418 6418
6419 6419 @command(
6420 6420 b'shelve',
6421 6421 [
6422 6422 (
6423 6423 b'A',
6424 6424 b'addremove',
6425 6425 None,
6426 6426 _(b'mark new/missing files as added/removed before shelving'),
6427 6427 ),
6428 6428 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6429 6429 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6430 6430 (
6431 6431 b'',
6432 6432 b'date',
6433 6433 b'',
6434 6434 _(b'shelve with the specified commit date'),
6435 6435 _(b'DATE'),
6436 6436 ),
6437 6437 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6438 6438 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6439 6439 (
6440 6440 b'k',
6441 6441 b'keep',
6442 6442 False,
6443 6443 _(b'shelve, but keep changes in the working directory'),
6444 6444 ),
6445 6445 (b'l', b'list', None, _(b'list current shelves')),
6446 6446 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6447 6447 (
6448 6448 b'n',
6449 6449 b'name',
6450 6450 b'',
6451 6451 _(b'use the given name for the shelved commit'),
6452 6452 _(b'NAME'),
6453 6453 ),
6454 6454 (
6455 6455 b'p',
6456 6456 b'patch',
6457 6457 None,
6458 6458 _(
6459 6459 b'output patches for changes (provide the names of the shelved '
6460 6460 b'changes as positional arguments)'
6461 6461 ),
6462 6462 ),
6463 6463 (b'i', b'interactive', None, _(b'interactive mode')),
6464 6464 (
6465 6465 b'',
6466 6466 b'stat',
6467 6467 None,
6468 6468 _(
6469 6469 b'output diffstat-style summary of changes (provide the names of '
6470 6470 b'the shelved changes as positional arguments)'
6471 6471 ),
6472 6472 ),
6473 6473 ]
6474 6474 + cmdutil.walkopts,
6475 6475 _(b'hg shelve [OPTION]... [FILE]...'),
6476 6476 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6477 6477 )
6478 6478 def shelve(ui, repo, *pats, **opts):
6479 6479 """save and set aside changes from the working directory
6480 6480
6481 6481 Shelving takes files that "hg status" reports as not clean, saves
6482 6482 the modifications to a bundle (a shelved change), and reverts the
6483 6483 files so that their state in the working directory becomes clean.
6484 6484
6485 6485 To restore these changes to the working directory, using "hg
6486 6486 unshelve"; this will work even if you switch to a different
6487 6487 commit.
6488 6488
6489 6489 When no files are specified, "hg shelve" saves all not-clean
6490 6490 files. If specific files or directories are named, only changes to
6491 6491 those files are shelved.
6492 6492
6493 6493 In bare shelve (when no files are specified, without interactive,
6494 6494 include and exclude option), shelving remembers information if the
6495 6495 working directory was on newly created branch, in other words working
6496 6496 directory was on different branch than its first parent. In this
6497 6497 situation unshelving restores branch information to the working directory.
6498 6498
6499 6499 Each shelved change has a name that makes it easier to find later.
6500 6500 The name of a shelved change defaults to being based on the active
6501 6501 bookmark, or if there is no active bookmark, the current named
6502 6502 branch. To specify a different name, use ``--name``.
6503 6503
6504 6504 To see a list of existing shelved changes, use the ``--list``
6505 6505 option. For each shelved change, this will print its name, age,
6506 6506 and description; use ``--patch`` or ``--stat`` for more details.
6507 6507
6508 6508 To delete specific shelved changes, use ``--delete``. To delete
6509 6509 all shelved changes, use ``--cleanup``.
6510 6510 """
6511 6511 opts = pycompat.byteskwargs(opts)
6512 6512 allowables = [
6513 6513 (b'addremove', {b'create'}), # 'create' is pseudo action
6514 6514 (b'unknown', {b'create'}),
6515 6515 (b'cleanup', {b'cleanup'}),
6516 6516 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6517 6517 (b'delete', {b'delete'}),
6518 6518 (b'edit', {b'create'}),
6519 6519 (b'keep', {b'create'}),
6520 6520 (b'list', {b'list'}),
6521 6521 (b'message', {b'create'}),
6522 6522 (b'name', {b'create'}),
6523 6523 (b'patch', {b'patch', b'list'}),
6524 6524 (b'stat', {b'stat', b'list'}),
6525 6525 ]
6526 6526
6527 6527 def checkopt(opt):
6528 6528 if opts.get(opt):
6529 6529 for i, allowable in allowables:
6530 6530 if opts[i] and opt not in allowable:
6531 6531 raise error.InputError(
6532 6532 _(
6533 6533 b"options '--%s' and '--%s' may not be "
6534 6534 b"used together"
6535 6535 )
6536 6536 % (opt, i)
6537 6537 )
6538 6538 return True
6539 6539
6540 6540 if checkopt(b'cleanup'):
6541 6541 if pats:
6542 6542 raise error.InputError(
6543 6543 _(b"cannot specify names when using '--cleanup'")
6544 6544 )
6545 6545 return shelvemod.cleanupcmd(ui, repo)
6546 6546 elif checkopt(b'delete'):
6547 6547 return shelvemod.deletecmd(ui, repo, pats)
6548 6548 elif checkopt(b'list'):
6549 6549 return shelvemod.listcmd(ui, repo, pats, opts)
6550 6550 elif checkopt(b'patch') or checkopt(b'stat'):
6551 6551 return shelvemod.patchcmds(ui, repo, pats, opts)
6552 6552 else:
6553 6553 return shelvemod.createcmd(ui, repo, pats, opts)
6554 6554
6555 6555
6556 6556 _NOTTERSE = b'nothing'
6557 6557
6558 6558
6559 6559 @command(
6560 6560 b'status|st',
6561 6561 [
6562 6562 (b'A', b'all', None, _(b'show status of all files')),
6563 6563 (b'm', b'modified', None, _(b'show only modified files')),
6564 6564 (b'a', b'added', None, _(b'show only added files')),
6565 6565 (b'r', b'removed', None, _(b'show only removed files')),
6566 6566 (b'd', b'deleted', None, _(b'show only missing files')),
6567 6567 (b'c', b'clean', None, _(b'show only files without changes')),
6568 6568 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6569 6569 (b'i', b'ignored', None, _(b'show only ignored files')),
6570 6570 (b'n', b'no-status', None, _(b'hide status prefix')),
6571 6571 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6572 6572 (
6573 6573 b'C',
6574 6574 b'copies',
6575 6575 None,
6576 6576 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6577 6577 ),
6578 6578 (
6579 6579 b'0',
6580 6580 b'print0',
6581 6581 None,
6582 6582 _(b'end filenames with NUL, for use with xargs'),
6583 6583 ),
6584 6584 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6585 6585 (
6586 6586 b'',
6587 6587 b'change',
6588 6588 b'',
6589 6589 _(b'list the changed files of a revision'),
6590 6590 _(b'REV'),
6591 6591 ),
6592 6592 ]
6593 6593 + walkopts
6594 6594 + subrepoopts
6595 6595 + formatteropts,
6596 6596 _(b'[OPTION]... [FILE]...'),
6597 6597 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6598 6598 helpbasic=True,
6599 6599 inferrepo=True,
6600 6600 intents={INTENT_READONLY},
6601 6601 )
6602 6602 def status(ui, repo, *pats, **opts):
6603 6603 """show changed files in the working directory
6604 6604
6605 6605 Show status of files in the repository. If names are given, only
6606 6606 files that match are shown. Files that are clean or ignored or
6607 6607 the source of a copy/move operation, are not listed unless
6608 6608 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6609 6609 Unless options described with "show only ..." are given, the
6610 6610 options -mardu are used.
6611 6611
6612 6612 Option -q/--quiet hides untracked (unknown and ignored) files
6613 6613 unless explicitly requested with -u/--unknown or -i/--ignored.
6614 6614
6615 6615 .. note::
6616 6616
6617 6617 :hg:`status` may appear to disagree with diff if permissions have
6618 6618 changed or a merge has occurred. The standard diff format does
6619 6619 not report permission changes and diff only reports changes
6620 6620 relative to one merge parent.
6621 6621
6622 6622 If one revision is given, it is used as the base revision.
6623 6623 If two revisions are given, the differences between them are
6624 6624 shown. The --change option can also be used as a shortcut to list
6625 6625 the changed files of a revision from its first parent.
6626 6626
6627 6627 The codes used to show the status of files are::
6628 6628
6629 6629 M = modified
6630 6630 A = added
6631 6631 R = removed
6632 6632 C = clean
6633 6633 ! = missing (deleted by non-hg command, but still tracked)
6634 6634 ? = not tracked
6635 6635 I = ignored
6636 6636 = origin of the previous file (with --copies)
6637 6637
6638 6638 .. container:: verbose
6639 6639
6640 6640 The -t/--terse option abbreviates the output by showing only the directory
6641 6641 name if all the files in it share the same status. The option takes an
6642 6642 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6643 6643 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6644 6644 for 'ignored' and 'c' for clean.
6645 6645
6646 6646 It abbreviates only those statuses which are passed. Note that clean and
6647 6647 ignored files are not displayed with '--terse ic' unless the -c/--clean
6648 6648 and -i/--ignored options are also used.
6649 6649
6650 6650 The -v/--verbose option shows information when the repository is in an
6651 6651 unfinished merge, shelve, rebase state etc. You can have this behavior
6652 6652 turned on by default by enabling the ``commands.status.verbose`` option.
6653 6653
6654 6654 You can skip displaying some of these states by setting
6655 6655 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6656 6656 'histedit', 'merge', 'rebase', or 'unshelve'.
6657 6657
6658 6658 Template:
6659 6659
6660 6660 The following keywords are supported in addition to the common template
6661 6661 keywords and functions. See also :hg:`help templates`.
6662 6662
6663 6663 :path: String. Repository-absolute path of the file.
6664 6664 :source: String. Repository-absolute path of the file originated from.
6665 6665 Available if ``--copies`` is specified.
6666 6666 :status: String. Character denoting file's status.
6667 6667
6668 6668 Examples:
6669 6669
6670 6670 - show changes in the working directory relative to a
6671 6671 changeset::
6672 6672
6673 6673 hg status --rev 9353
6674 6674
6675 6675 - show changes in the working directory relative to the
6676 6676 current directory (see :hg:`help patterns` for more information)::
6677 6677
6678 6678 hg status re:
6679 6679
6680 6680 - show all changes including copies in an existing changeset::
6681 6681
6682 6682 hg status --copies --change 9353
6683 6683
6684 6684 - get a NUL separated list of added files, suitable for xargs::
6685 6685
6686 6686 hg status -an0
6687 6687
6688 6688 - show more information about the repository status, abbreviating
6689 6689 added, removed, modified, deleted, and untracked paths::
6690 6690
6691 6691 hg status -v -t mardu
6692 6692
6693 6693 Returns 0 on success.
6694 6694
6695 6695 """
6696 6696
6697 6697 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6698 6698 opts = pycompat.byteskwargs(opts)
6699 6699 revs = opts.get(b'rev')
6700 6700 change = opts.get(b'change')
6701 6701 terse = opts.get(b'terse')
6702 6702 if terse is _NOTTERSE:
6703 6703 if revs:
6704 6704 terse = b''
6705 6705 else:
6706 6706 terse = ui.config(b'commands', b'status.terse')
6707 6707
6708 6708 if revs and terse:
6709 6709 msg = _(b'cannot use --terse with --rev')
6710 6710 raise error.InputError(msg)
6711 6711 elif change:
6712 6712 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6713 6713 ctx2 = scmutil.revsingle(repo, change, None)
6714 6714 ctx1 = ctx2.p1()
6715 6715 else:
6716 6716 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6717 6717 ctx1, ctx2 = scmutil.revpair(repo, revs)
6718 6718
6719 6719 forcerelativevalue = None
6720 6720 if ui.hasconfig(b'commands', b'status.relative'):
6721 6721 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6722 6722 uipathfn = scmutil.getuipathfn(
6723 6723 repo,
6724 6724 legacyrelativevalue=bool(pats),
6725 6725 forcerelativevalue=forcerelativevalue,
6726 6726 )
6727 6727
6728 6728 if opts.get(b'print0'):
6729 6729 end = b'\0'
6730 6730 else:
6731 6731 end = b'\n'
6732 6732 states = b'modified added removed deleted unknown ignored clean'.split()
6733 6733 show = [k for k in states if opts.get(k)]
6734 6734 if opts.get(b'all'):
6735 6735 show += ui.quiet and (states[:4] + [b'clean']) or states
6736 6736
6737 6737 if not show:
6738 6738 if ui.quiet:
6739 6739 show = states[:4]
6740 6740 else:
6741 6741 show = states[:5]
6742 6742
6743 6743 m = scmutil.match(ctx2, pats, opts)
6744 6744 if terse:
6745 6745 # we need to compute clean and unknown to terse
6746 6746 stat = repo.status(
6747 6747 ctx1.node(),
6748 6748 ctx2.node(),
6749 6749 m,
6750 6750 b'ignored' in show or b'i' in terse,
6751 6751 clean=True,
6752 6752 unknown=True,
6753 6753 listsubrepos=opts.get(b'subrepos'),
6754 6754 )
6755 6755
6756 6756 stat = cmdutil.tersedir(stat, terse)
6757 6757 else:
6758 6758 stat = repo.status(
6759 6759 ctx1.node(),
6760 6760 ctx2.node(),
6761 6761 m,
6762 6762 b'ignored' in show,
6763 6763 b'clean' in show,
6764 6764 b'unknown' in show,
6765 6765 opts.get(b'subrepos'),
6766 6766 )
6767 6767
6768 6768 changestates = zip(
6769 6769 states,
6770 6770 pycompat.iterbytestr(b'MAR!?IC'),
6771 6771 [getattr(stat, s.decode('utf8')) for s in states],
6772 6772 )
6773 6773
6774 6774 copy = {}
6775 6775 if (
6776 6776 opts.get(b'all')
6777 6777 or opts.get(b'copies')
6778 6778 or ui.configbool(b'ui', b'statuscopies')
6779 6779 ) and not opts.get(b'no_status'):
6780 6780 copy = copies.pathcopies(ctx1, ctx2, m)
6781 6781
6782 6782 morestatus = None
6783 6783 if (
6784 6784 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6785 6785 and not ui.plain()
6786 6786 and not opts.get(b'print0')
6787 6787 ):
6788 6788 morestatus = cmdutil.readmorestatus(repo)
6789 6789
6790 6790 ui.pager(b'status')
6791 6791 fm = ui.formatter(b'status', opts)
6792 6792 fmt = b'%s' + end
6793 6793 showchar = not opts.get(b'no_status')
6794 6794
6795 6795 for state, char, files in changestates:
6796 6796 if state in show:
6797 6797 label = b'status.' + state
6798 6798 for f in files:
6799 6799 fm.startitem()
6800 6800 fm.context(ctx=ctx2)
6801 6801 fm.data(itemtype=b'file', path=f)
6802 6802 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6803 6803 fm.plain(fmt % uipathfn(f), label=label)
6804 6804 if f in copy:
6805 6805 fm.data(source=copy[f])
6806 6806 fm.plain(
6807 6807 (b' %s' + end) % uipathfn(copy[f]),
6808 6808 label=b'status.copied',
6809 6809 )
6810 6810 if morestatus:
6811 6811 morestatus.formatfile(f, fm)
6812 6812
6813 6813 if morestatus:
6814 6814 morestatus.formatfooter(fm)
6815 6815 fm.end()
6816 6816
6817 6817
6818 6818 @command(
6819 6819 b'summary|sum',
6820 6820 [(b'', b'remote', None, _(b'check for push and pull'))],
6821 6821 b'[--remote]',
6822 6822 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6823 6823 helpbasic=True,
6824 6824 intents={INTENT_READONLY},
6825 6825 )
6826 6826 def summary(ui, repo, **opts):
6827 6827 """summarize working directory state
6828 6828
6829 6829 This generates a brief summary of the working directory state,
6830 6830 including parents, branch, commit status, phase and available updates.
6831 6831
6832 6832 With the --remote option, this will check the default paths for
6833 6833 incoming and outgoing changes. This can be time-consuming.
6834 6834
6835 6835 Returns 0 on success.
6836 6836 """
6837 6837
6838 6838 opts = pycompat.byteskwargs(opts)
6839 6839 ui.pager(b'summary')
6840 6840 ctx = repo[None]
6841 6841 parents = ctx.parents()
6842 6842 pnode = parents[0].node()
6843 6843 marks = []
6844 6844
6845 6845 try:
6846 6846 ms = mergestatemod.mergestate.read(repo)
6847 6847 except error.UnsupportedMergeRecords as e:
6848 6848 s = b' '.join(e.recordtypes)
6849 6849 ui.warn(
6850 6850 _(b'warning: merge state has unsupported record types: %s\n') % s
6851 6851 )
6852 6852 unresolved = []
6853 6853 else:
6854 6854 unresolved = list(ms.unresolved())
6855 6855
6856 6856 for p in parents:
6857 6857 # label with log.changeset (instead of log.parent) since this
6858 6858 # shows a working directory parent *changeset*:
6859 6859 # i18n: column positioning for "hg summary"
6860 6860 ui.write(
6861 6861 _(b'parent: %d:%s ') % (p.rev(), p),
6862 6862 label=logcmdutil.changesetlabels(p),
6863 6863 )
6864 6864 ui.write(b' '.join(p.tags()), label=b'log.tag')
6865 6865 if p.bookmarks():
6866 6866 marks.extend(p.bookmarks())
6867 6867 if p.rev() == -1:
6868 6868 if not len(repo):
6869 6869 ui.write(_(b' (empty repository)'))
6870 6870 else:
6871 6871 ui.write(_(b' (no revision checked out)'))
6872 6872 if p.obsolete():
6873 6873 ui.write(_(b' (obsolete)'))
6874 6874 if p.isunstable():
6875 6875 instabilities = (
6876 6876 ui.label(instability, b'trouble.%s' % instability)
6877 6877 for instability in p.instabilities()
6878 6878 )
6879 6879 ui.write(b' (' + b', '.join(instabilities) + b')')
6880 6880 ui.write(b'\n')
6881 6881 if p.description():
6882 6882 ui.status(
6883 6883 b' ' + p.description().splitlines()[0].strip() + b'\n',
6884 6884 label=b'log.summary',
6885 6885 )
6886 6886
6887 6887 branch = ctx.branch()
6888 6888 bheads = repo.branchheads(branch)
6889 6889 # i18n: column positioning for "hg summary"
6890 6890 m = _(b'branch: %s\n') % branch
6891 6891 if branch != b'default':
6892 6892 ui.write(m, label=b'log.branch')
6893 6893 else:
6894 6894 ui.status(m, label=b'log.branch')
6895 6895
6896 6896 if marks:
6897 6897 active = repo._activebookmark
6898 6898 # i18n: column positioning for "hg summary"
6899 6899 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6900 6900 if active is not None:
6901 6901 if active in marks:
6902 6902 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6903 6903 marks.remove(active)
6904 6904 else:
6905 6905 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6906 6906 for m in marks:
6907 6907 ui.write(b' ' + m, label=b'log.bookmark')
6908 6908 ui.write(b'\n', label=b'log.bookmark')
6909 6909
6910 6910 status = repo.status(unknown=True)
6911 6911
6912 6912 c = repo.dirstate.copies()
6913 6913 copied, renamed = [], []
6914 6914 for d, s in pycompat.iteritems(c):
6915 6915 if s in status.removed:
6916 6916 status.removed.remove(s)
6917 6917 renamed.append(d)
6918 6918 else:
6919 6919 copied.append(d)
6920 6920 if d in status.added:
6921 6921 status.added.remove(d)
6922 6922
6923 6923 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6924 6924
6925 6925 labels = [
6926 6926 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6927 6927 (ui.label(_(b'%d added'), b'status.added'), status.added),
6928 6928 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6929 6929 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6930 6930 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6931 6931 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6932 6932 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6933 6933 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6934 6934 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6935 6935 ]
6936 6936 t = []
6937 6937 for l, s in labels:
6938 6938 if s:
6939 6939 t.append(l % len(s))
6940 6940
6941 6941 t = b', '.join(t)
6942 6942 cleanworkdir = False
6943 6943
6944 6944 if repo.vfs.exists(b'graftstate'):
6945 6945 t += _(b' (graft in progress)')
6946 6946 if repo.vfs.exists(b'updatestate'):
6947 6947 t += _(b' (interrupted update)')
6948 6948 elif len(parents) > 1:
6949 6949 t += _(b' (merge)')
6950 6950 elif branch != parents[0].branch():
6951 6951 t += _(b' (new branch)')
6952 6952 elif parents[0].closesbranch() and pnode in repo.branchheads(
6953 6953 branch, closed=True
6954 6954 ):
6955 6955 t += _(b' (head closed)')
6956 6956 elif not (
6957 6957 status.modified
6958 6958 or status.added
6959 6959 or status.removed
6960 6960 or renamed
6961 6961 or copied
6962 6962 or subs
6963 6963 ):
6964 6964 t += _(b' (clean)')
6965 6965 cleanworkdir = True
6966 6966 elif pnode not in bheads:
6967 6967 t += _(b' (new branch head)')
6968 6968
6969 6969 if parents:
6970 6970 pendingphase = max(p.phase() for p in parents)
6971 6971 else:
6972 6972 pendingphase = phases.public
6973 6973
6974 6974 if pendingphase > phases.newcommitphase(ui):
6975 6975 t += b' (%s)' % phases.phasenames[pendingphase]
6976 6976
6977 6977 if cleanworkdir:
6978 6978 # i18n: column positioning for "hg summary"
6979 6979 ui.status(_(b'commit: %s\n') % t.strip())
6980 6980 else:
6981 6981 # i18n: column positioning for "hg summary"
6982 6982 ui.write(_(b'commit: %s\n') % t.strip())
6983 6983
6984 6984 # all ancestors of branch heads - all ancestors of parent = new csets
6985 6985 new = len(
6986 6986 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6987 6987 )
6988 6988
6989 6989 if new == 0:
6990 6990 # i18n: column positioning for "hg summary"
6991 6991 ui.status(_(b'update: (current)\n'))
6992 6992 elif pnode not in bheads:
6993 6993 # i18n: column positioning for "hg summary"
6994 6994 ui.write(_(b'update: %d new changesets (update)\n') % new)
6995 6995 else:
6996 6996 # i18n: column positioning for "hg summary"
6997 6997 ui.write(
6998 6998 _(b'update: %d new changesets, %d branch heads (merge)\n')
6999 6999 % (new, len(bheads))
7000 7000 )
7001 7001
7002 7002 t = []
7003 7003 draft = len(repo.revs(b'draft()'))
7004 7004 if draft:
7005 7005 t.append(_(b'%d draft') % draft)
7006 7006 secret = len(repo.revs(b'secret()'))
7007 7007 if secret:
7008 7008 t.append(_(b'%d secret') % secret)
7009 7009
7010 7010 if draft or secret:
7011 7011 ui.status(_(b'phases: %s\n') % b', '.join(t))
7012 7012
7013 7013 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7014 7014 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7015 7015 numtrouble = len(repo.revs(trouble + b"()"))
7016 7016 # We write all the possibilities to ease translation
7017 7017 troublemsg = {
7018 7018 b"orphan": _(b"orphan: %d changesets"),
7019 7019 b"contentdivergent": _(b"content-divergent: %d changesets"),
7020 7020 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7021 7021 }
7022 7022 if numtrouble > 0:
7023 7023 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7024 7024
7025 7025 cmdutil.summaryhooks(ui, repo)
7026 7026
7027 7027 if opts.get(b'remote'):
7028 7028 needsincoming, needsoutgoing = True, True
7029 7029 else:
7030 7030 needsincoming, needsoutgoing = False, False
7031 7031 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7032 7032 if i:
7033 7033 needsincoming = True
7034 7034 if o:
7035 7035 needsoutgoing = True
7036 7036 if not needsincoming and not needsoutgoing:
7037 7037 return
7038 7038
7039 7039 def getincoming():
7040 7040 source, branches = hg.parseurl(ui.expandpath(b'default'))
7041 7041 sbranch = branches[0]
7042 7042 try:
7043 7043 other = hg.peer(repo, {}, source)
7044 7044 except error.RepoError:
7045 7045 if opts.get(b'remote'):
7046 7046 raise
7047 7047 return source, sbranch, None, None, None
7048 7048 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7049 7049 if revs:
7050 7050 revs = [other.lookup(rev) for rev in revs]
7051 7051 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7052 7052 repo.ui.pushbuffer()
7053 7053 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7054 7054 repo.ui.popbuffer()
7055 7055 return source, sbranch, other, commoninc, commoninc[1]
7056 7056
7057 7057 if needsincoming:
7058 7058 source, sbranch, sother, commoninc, incoming = getincoming()
7059 7059 else:
7060 7060 source = sbranch = sother = commoninc = incoming = None
7061 7061
7062 7062 def getoutgoing():
7063 7063 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7064 7064 dbranch = branches[0]
7065 7065 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7066 7066 if source != dest:
7067 7067 try:
7068 7068 dother = hg.peer(repo, {}, dest)
7069 7069 except error.RepoError:
7070 7070 if opts.get(b'remote'):
7071 7071 raise
7072 7072 return dest, dbranch, None, None
7073 7073 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7074 7074 elif sother is None:
7075 7075 # there is no explicit destination peer, but source one is invalid
7076 7076 return dest, dbranch, None, None
7077 7077 else:
7078 7078 dother = sother
7079 7079 if source != dest or (sbranch is not None and sbranch != dbranch):
7080 7080 common = None
7081 7081 else:
7082 7082 common = commoninc
7083 7083 if revs:
7084 7084 revs = [repo.lookup(rev) for rev in revs]
7085 7085 repo.ui.pushbuffer()
7086 7086 outgoing = discovery.findcommonoutgoing(
7087 7087 repo, dother, onlyheads=revs, commoninc=common
7088 7088 )
7089 7089 repo.ui.popbuffer()
7090 7090 return dest, dbranch, dother, outgoing
7091 7091
7092 7092 if needsoutgoing:
7093 7093 dest, dbranch, dother, outgoing = getoutgoing()
7094 7094 else:
7095 7095 dest = dbranch = dother = outgoing = None
7096 7096
7097 7097 if opts.get(b'remote'):
7098 7098 t = []
7099 7099 if incoming:
7100 7100 t.append(_(b'1 or more incoming'))
7101 7101 o = outgoing.missing
7102 7102 if o:
7103 7103 t.append(_(b'%d outgoing') % len(o))
7104 7104 other = dother or sother
7105 7105 if b'bookmarks' in other.listkeys(b'namespaces'):
7106 7106 counts = bookmarks.summary(repo, other)
7107 7107 if counts[0] > 0:
7108 7108 t.append(_(b'%d incoming bookmarks') % counts[0])
7109 7109 if counts[1] > 0:
7110 7110 t.append(_(b'%d outgoing bookmarks') % counts[1])
7111 7111
7112 7112 if t:
7113 7113 # i18n: column positioning for "hg summary"
7114 7114 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7115 7115 else:
7116 7116 # i18n: column positioning for "hg summary"
7117 7117 ui.status(_(b'remote: (synced)\n'))
7118 7118
7119 7119 cmdutil.summaryremotehooks(
7120 7120 ui,
7121 7121 repo,
7122 7122 opts,
7123 7123 (
7124 7124 (source, sbranch, sother, commoninc),
7125 7125 (dest, dbranch, dother, outgoing),
7126 7126 ),
7127 7127 )
7128 7128
7129 7129
7130 7130 @command(
7131 7131 b'tag',
7132 7132 [
7133 7133 (b'f', b'force', None, _(b'force tag')),
7134 7134 (b'l', b'local', None, _(b'make the tag local')),
7135 7135 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7136 7136 (b'', b'remove', None, _(b'remove a tag')),
7137 7137 # -l/--local is already there, commitopts cannot be used
7138 7138 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7139 7139 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7140 7140 ]
7141 7141 + commitopts2,
7142 7142 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7143 7143 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7144 7144 )
7145 7145 def tag(ui, repo, name1, *names, **opts):
7146 7146 """add one or more tags for the current or given revision
7147 7147
7148 7148 Name a particular revision using <name>.
7149 7149
7150 7150 Tags are used to name particular revisions of the repository and are
7151 7151 very useful to compare different revisions, to go back to significant
7152 7152 earlier versions or to mark branch points as releases, etc. Changing
7153 7153 an existing tag is normally disallowed; use -f/--force to override.
7154 7154
7155 7155 If no revision is given, the parent of the working directory is
7156 7156 used.
7157 7157
7158 7158 To facilitate version control, distribution, and merging of tags,
7159 7159 they are stored as a file named ".hgtags" which is managed similarly
7160 7160 to other project files and can be hand-edited if necessary. This
7161 7161 also means that tagging creates a new commit. The file
7162 7162 ".hg/localtags" is used for local tags (not shared among
7163 7163 repositories).
7164 7164
7165 7165 Tag commits are usually made at the head of a branch. If the parent
7166 7166 of the working directory is not a branch head, :hg:`tag` aborts; use
7167 7167 -f/--force to force the tag commit to be based on a non-head
7168 7168 changeset.
7169 7169
7170 7170 See :hg:`help dates` for a list of formats valid for -d/--date.
7171 7171
7172 7172 Since tag names have priority over branch names during revision
7173 7173 lookup, using an existing branch name as a tag name is discouraged.
7174 7174
7175 7175 Returns 0 on success.
7176 7176 """
7177 7177 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7178 7178 opts = pycompat.byteskwargs(opts)
7179 7179 with repo.wlock(), repo.lock():
7180 7180 rev_ = b"."
7181 7181 names = [t.strip() for t in (name1,) + names]
7182 7182 if len(names) != len(set(names)):
7183 7183 raise error.InputError(_(b'tag names must be unique'))
7184 7184 for n in names:
7185 7185 scmutil.checknewlabel(repo, n, b'tag')
7186 7186 if not n:
7187 7187 raise error.InputError(
7188 7188 _(b'tag names cannot consist entirely of whitespace')
7189 7189 )
7190 7190 if opts.get(b'rev'):
7191 7191 rev_ = opts[b'rev']
7192 7192 message = opts.get(b'message')
7193 7193 if opts.get(b'remove'):
7194 7194 if opts.get(b'local'):
7195 7195 expectedtype = b'local'
7196 7196 else:
7197 7197 expectedtype = b'global'
7198 7198
7199 7199 for n in names:
7200 7200 if repo.tagtype(n) == b'global':
7201 7201 alltags = tagsmod.findglobaltags(ui, repo)
7202 7202 if alltags[n][0] == nullid:
7203 7203 raise error.InputError(
7204 7204 _(b"tag '%s' is already removed") % n
7205 7205 )
7206 7206 if not repo.tagtype(n):
7207 7207 raise error.InputError(_(b"tag '%s' does not exist") % n)
7208 7208 if repo.tagtype(n) != expectedtype:
7209 7209 if expectedtype == b'global':
7210 7210 raise error.InputError(
7211 7211 _(b"tag '%s' is not a global tag") % n
7212 7212 )
7213 7213 else:
7214 7214 raise error.InputError(
7215 7215 _(b"tag '%s' is not a local tag") % n
7216 7216 )
7217 7217 rev_ = b'null'
7218 7218 if not message:
7219 7219 # we don't translate commit messages
7220 7220 message = b'Removed tag %s' % b', '.join(names)
7221 7221 elif not opts.get(b'force'):
7222 7222 for n in names:
7223 7223 if n in repo.tags():
7224 7224 raise error.InputError(
7225 7225 _(b"tag '%s' already exists (use -f to force)") % n
7226 7226 )
7227 7227 if not opts.get(b'local'):
7228 7228 p1, p2 = repo.dirstate.parents()
7229 7229 if p2 != nullid:
7230 7230 raise error.StateError(_(b'uncommitted merge'))
7231 7231 bheads = repo.branchheads()
7232 7232 if not opts.get(b'force') and bheads and p1 not in bheads:
7233 7233 raise error.InputError(
7234 7234 _(
7235 7235 b'working directory is not at a branch head '
7236 7236 b'(use -f to force)'
7237 7237 )
7238 7238 )
7239 7239 node = scmutil.revsingle(repo, rev_).node()
7240 7240
7241 7241 if not message:
7242 7242 # we don't translate commit messages
7243 7243 message = b'Added tag %s for changeset %s' % (
7244 7244 b', '.join(names),
7245 7245 short(node),
7246 7246 )
7247 7247
7248 7248 date = opts.get(b'date')
7249 7249 if date:
7250 7250 date = dateutil.parsedate(date)
7251 7251
7252 7252 if opts.get(b'remove'):
7253 7253 editform = b'tag.remove'
7254 7254 else:
7255 7255 editform = b'tag.add'
7256 7256 editor = cmdutil.getcommiteditor(
7257 7257 editform=editform, **pycompat.strkwargs(opts)
7258 7258 )
7259 7259
7260 7260 # don't allow tagging the null rev
7261 7261 if (
7262 7262 not opts.get(b'remove')
7263 7263 and scmutil.revsingle(repo, rev_).rev() == nullrev
7264 7264 ):
7265 7265 raise error.InputError(_(b"cannot tag null revision"))
7266 7266
7267 7267 tagsmod.tag(
7268 7268 repo,
7269 7269 names,
7270 7270 node,
7271 7271 message,
7272 7272 opts.get(b'local'),
7273 7273 opts.get(b'user'),
7274 7274 date,
7275 7275 editor=editor,
7276 7276 )
7277 7277
7278 7278
7279 7279 @command(
7280 7280 b'tags',
7281 7281 formatteropts,
7282 7282 b'',
7283 7283 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7284 7284 intents={INTENT_READONLY},
7285 7285 )
7286 7286 def tags(ui, repo, **opts):
7287 7287 """list repository tags
7288 7288
7289 7289 This lists both regular and local tags. When the -v/--verbose
7290 7290 switch is used, a third column "local" is printed for local tags.
7291 7291 When the -q/--quiet switch is used, only the tag name is printed.
7292 7292
7293 7293 .. container:: verbose
7294 7294
7295 7295 Template:
7296 7296
7297 7297 The following keywords are supported in addition to the common template
7298 7298 keywords and functions such as ``{tag}``. See also
7299 7299 :hg:`help templates`.
7300 7300
7301 7301 :type: String. ``local`` for local tags.
7302 7302
7303 7303 Returns 0 on success.
7304 7304 """
7305 7305
7306 7306 opts = pycompat.byteskwargs(opts)
7307 7307 ui.pager(b'tags')
7308 7308 fm = ui.formatter(b'tags', opts)
7309 7309 hexfunc = fm.hexfunc
7310 7310
7311 7311 for t, n in reversed(repo.tagslist()):
7312 7312 hn = hexfunc(n)
7313 7313 label = b'tags.normal'
7314 7314 tagtype = b''
7315 7315 if repo.tagtype(t) == b'local':
7316 7316 label = b'tags.local'
7317 7317 tagtype = b'local'
7318 7318
7319 7319 fm.startitem()
7320 7320 fm.context(repo=repo)
7321 7321 fm.write(b'tag', b'%s', t, label=label)
7322 7322 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7323 7323 fm.condwrite(
7324 7324 not ui.quiet,
7325 7325 b'rev node',
7326 7326 fmt,
7327 7327 repo.changelog.rev(n),
7328 7328 hn,
7329 7329 label=label,
7330 7330 )
7331 7331 fm.condwrite(
7332 7332 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7333 7333 )
7334 7334 fm.plain(b'\n')
7335 7335 fm.end()
7336 7336
7337 7337
7338 7338 @command(
7339 7339 b'tip',
7340 7340 [
7341 7341 (b'p', b'patch', None, _(b'show patch')),
7342 7342 (b'g', b'git', None, _(b'use git extended diff format')),
7343 7343 ]
7344 7344 + templateopts,
7345 7345 _(b'[-p] [-g]'),
7346 7346 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7347 7347 )
7348 7348 def tip(ui, repo, **opts):
7349 7349 """show the tip revision (DEPRECATED)
7350 7350
7351 7351 The tip revision (usually just called the tip) is the changeset
7352 7352 most recently added to the repository (and therefore the most
7353 7353 recently changed head).
7354 7354
7355 7355 If you have just made a commit, that commit will be the tip. If
7356 7356 you have just pulled changes from another repository, the tip of
7357 7357 that repository becomes the current tip. The "tip" tag is special
7358 7358 and cannot be renamed or assigned to a different changeset.
7359 7359
7360 7360 This command is deprecated, please use :hg:`heads` instead.
7361 7361
7362 7362 Returns 0 on success.
7363 7363 """
7364 7364 opts = pycompat.byteskwargs(opts)
7365 7365 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7366 7366 displayer.show(repo[b'tip'])
7367 7367 displayer.close()
7368 7368
7369 7369
7370 7370 @command(
7371 7371 b'unbundle',
7372 7372 [
7373 7373 (
7374 7374 b'u',
7375 7375 b'update',
7376 7376 None,
7377 7377 _(b'update to new branch head if changesets were unbundled'),
7378 7378 )
7379 7379 ],
7380 7380 _(b'[-u] FILE...'),
7381 7381 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7382 7382 )
7383 7383 def unbundle(ui, repo, fname1, *fnames, **opts):
7384 7384 """apply one or more bundle files
7385 7385
7386 7386 Apply one or more bundle files generated by :hg:`bundle`.
7387 7387
7388 7388 Returns 0 on success, 1 if an update has unresolved files.
7389 7389 """
7390 7390 fnames = (fname1,) + fnames
7391 7391
7392 7392 with repo.lock():
7393 7393 for fname in fnames:
7394 7394 f = hg.openpath(ui, fname)
7395 7395 gen = exchange.readbundle(ui, f, fname)
7396 7396 if isinstance(gen, streamclone.streamcloneapplier):
7397 7397 raise error.InputError(
7398 7398 _(
7399 7399 b'packed bundles cannot be applied with '
7400 7400 b'"hg unbundle"'
7401 7401 ),
7402 7402 hint=_(b'use "hg debugapplystreamclonebundle"'),
7403 7403 )
7404 7404 url = b'bundle:' + fname
7405 7405 try:
7406 7406 txnname = b'unbundle'
7407 7407 if not isinstance(gen, bundle2.unbundle20):
7408 7408 txnname = b'unbundle\n%s' % util.hidepassword(url)
7409 7409 with repo.transaction(txnname) as tr:
7410 7410 op = bundle2.applybundle(
7411 7411 repo, gen, tr, source=b'unbundle', url=url
7412 7412 )
7413 7413 except error.BundleUnknownFeatureError as exc:
7414 7414 raise error.Abort(
7415 7415 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7416 7416 hint=_(
7417 7417 b"see https://mercurial-scm.org/"
7418 7418 b"wiki/BundleFeature for more "
7419 7419 b"information"
7420 7420 ),
7421 7421 )
7422 7422 modheads = bundle2.combinechangegroupresults(op)
7423 7423
7424 7424 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7425 7425
7426 7426
7427 7427 @command(
7428 7428 b'unshelve',
7429 7429 [
7430 7430 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7431 7431 (
7432 7432 b'c',
7433 7433 b'continue',
7434 7434 None,
7435 7435 _(b'continue an incomplete unshelve operation'),
7436 7436 ),
7437 7437 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7438 7438 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7439 7439 (
7440 7440 b'n',
7441 7441 b'name',
7442 7442 b'',
7443 7443 _(b'restore shelved change with given name'),
7444 7444 _(b'NAME'),
7445 7445 ),
7446 7446 (b't', b'tool', b'', _(b'specify merge tool')),
7447 7447 (
7448 7448 b'',
7449 7449 b'date',
7450 7450 b'',
7451 7451 _(b'set date for temporary commits (DEPRECATED)'),
7452 7452 _(b'DATE'),
7453 7453 ),
7454 7454 ],
7455 7455 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7456 7456 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7457 7457 )
7458 7458 def unshelve(ui, repo, *shelved, **opts):
7459 7459 """restore a shelved change to the working directory
7460 7460
7461 7461 This command accepts an optional name of a shelved change to
7462 7462 restore. If none is given, the most recent shelved change is used.
7463 7463
7464 7464 If a shelved change is applied successfully, the bundle that
7465 7465 contains the shelved changes is moved to a backup location
7466 7466 (.hg/shelve-backup).
7467 7467
7468 7468 Since you can restore a shelved change on top of an arbitrary
7469 7469 commit, it is possible that unshelving will result in a conflict
7470 7470 between your changes and the commits you are unshelving onto. If
7471 7471 this occurs, you must resolve the conflict, then use
7472 7472 ``--continue`` to complete the unshelve operation. (The bundle
7473 7473 will not be moved until you successfully complete the unshelve.)
7474 7474
7475 7475 (Alternatively, you can use ``--abort`` to abandon an unshelve
7476 7476 that causes a conflict. This reverts the unshelved changes, and
7477 7477 leaves the bundle in place.)
7478 7478
7479 7479 If bare shelved change (without interactive, include and exclude
7480 7480 option) was done on newly created branch it would restore branch
7481 7481 information to the working directory.
7482 7482
7483 7483 After a successful unshelve, the shelved changes are stored in a
7484 7484 backup directory. Only the N most recent backups are kept. N
7485 7485 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7486 7486 configuration option.
7487 7487
7488 7488 .. container:: verbose
7489 7489
7490 7490 Timestamp in seconds is used to decide order of backups. More
7491 7491 than ``maxbackups`` backups are kept, if same timestamp
7492 7492 prevents from deciding exact order of them, for safety.
7493 7493
7494 7494 Selected changes can be unshelved with ``--interactive`` flag.
7495 7495 The working directory is updated with the selected changes, and
7496 7496 only the unselected changes remain shelved.
7497 7497 Note: The whole shelve is applied to working directory first before
7498 7498 running interactively. So, this will bring up all the conflicts between
7499 7499 working directory and the shelve, irrespective of which changes will be
7500 7500 unshelved.
7501 7501 """
7502 7502 with repo.wlock():
7503 7503 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7504 7504
7505 7505
7506 7506 statemod.addunfinished(
7507 7507 b'unshelve',
7508 7508 fname=b'shelvedstate',
7509 7509 continueflag=True,
7510 7510 abortfunc=shelvemod.hgabortunshelve,
7511 7511 continuefunc=shelvemod.hgcontinueunshelve,
7512 7512 cmdmsg=_(b'unshelve already in progress'),
7513 7513 )
7514 7514
7515 7515
7516 7516 @command(
7517 7517 b'update|up|checkout|co',
7518 7518 [
7519 7519 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7520 7520 (b'c', b'check', None, _(b'require clean working directory')),
7521 7521 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7522 7522 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7523 7523 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7524 7524 ]
7525 7525 + mergetoolopts,
7526 7526 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7527 7527 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7528 7528 helpbasic=True,
7529 7529 )
7530 7530 def update(ui, repo, node=None, **opts):
7531 7531 """update working directory (or switch revisions)
7532 7532
7533 7533 Update the repository's working directory to the specified
7534 7534 changeset. If no changeset is specified, update to the tip of the
7535 7535 current named branch and move the active bookmark (see :hg:`help
7536 7536 bookmarks`).
7537 7537
7538 7538 Update sets the working directory's parent revision to the specified
7539 7539 changeset (see :hg:`help parents`).
7540 7540
7541 7541 If the changeset is not a descendant or ancestor of the working
7542 7542 directory's parent and there are uncommitted changes, the update is
7543 7543 aborted. With the -c/--check option, the working directory is checked
7544 7544 for uncommitted changes; if none are found, the working directory is
7545 7545 updated to the specified changeset.
7546 7546
7547 7547 .. container:: verbose
7548 7548
7549 7549 The -C/--clean, -c/--check, and -m/--merge options control what
7550 7550 happens if the working directory contains uncommitted changes.
7551 7551 At most of one of them can be specified.
7552 7552
7553 7553 1. If no option is specified, and if
7554 7554 the requested changeset is an ancestor or descendant of
7555 7555 the working directory's parent, the uncommitted changes
7556 7556 are merged into the requested changeset and the merged
7557 7557 result is left uncommitted. If the requested changeset is
7558 7558 not an ancestor or descendant (that is, it is on another
7559 7559 branch), the update is aborted and the uncommitted changes
7560 7560 are preserved.
7561 7561
7562 7562 2. With the -m/--merge option, the update is allowed even if the
7563 7563 requested changeset is not an ancestor or descendant of
7564 7564 the working directory's parent.
7565 7565
7566 7566 3. With the -c/--check option, the update is aborted and the
7567 7567 uncommitted changes are preserved.
7568 7568
7569 7569 4. With the -C/--clean option, uncommitted changes are discarded and
7570 7570 the working directory is updated to the requested changeset.
7571 7571
7572 7572 To cancel an uncommitted merge (and lose your changes), use
7573 7573 :hg:`merge --abort`.
7574 7574
7575 7575 Use null as the changeset to remove the working directory (like
7576 7576 :hg:`clone -U`).
7577 7577
7578 7578 If you want to revert just one file to an older revision, use
7579 7579 :hg:`revert [-r REV] NAME`.
7580 7580
7581 7581 See :hg:`help dates` for a list of formats valid for -d/--date.
7582 7582
7583 7583 Returns 0 on success, 1 if there are unresolved files.
7584 7584 """
7585 7585 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7586 7586 rev = opts.get('rev')
7587 7587 date = opts.get('date')
7588 7588 clean = opts.get('clean')
7589 7589 check = opts.get('check')
7590 7590 merge = opts.get('merge')
7591 7591 if rev and node:
7592 7592 raise error.InputError(_(b"please specify just one revision"))
7593 7593
7594 7594 if ui.configbool(b'commands', b'update.requiredest'):
7595 7595 if not node and not rev and not date:
7596 7596 raise error.InputError(
7597 7597 _(b'you must specify a destination'),
7598 7598 hint=_(b'for example: hg update ".::"'),
7599 7599 )
7600 7600
7601 7601 if rev is None or rev == b'':
7602 7602 rev = node
7603 7603
7604 7604 if date and rev is not None:
7605 7605 raise error.InputError(_(b"you can't specify a revision and a date"))
7606 7606
7607 7607 updatecheck = None
7608 7608 if check:
7609 7609 updatecheck = b'abort'
7610 7610 elif merge:
7611 7611 updatecheck = b'none'
7612 7612
7613 7613 with repo.wlock():
7614 7614 cmdutil.clearunfinished(repo)
7615 7615 if date:
7616 7616 rev = cmdutil.finddate(ui, repo, date)
7617 7617
7618 7618 # if we defined a bookmark, we have to remember the original name
7619 7619 brev = rev
7620 7620 if rev:
7621 7621 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7622 7622 ctx = scmutil.revsingle(repo, rev, default=None)
7623 7623 rev = ctx.rev()
7624 7624 hidden = ctx.hidden()
7625 7625 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7626 7626 with ui.configoverride(overrides, b'update'):
7627 7627 ret = hg.updatetotally(
7628 7628 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7629 7629 )
7630 7630 if hidden:
7631 7631 ctxstr = ctx.hex()[:12]
7632 7632 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7633 7633
7634 7634 if ctx.obsolete():
7635 7635 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7636 7636 ui.warn(b"(%s)\n" % obsfatemsg)
7637 7637 return ret
7638 7638
7639 7639
7640 7640 @command(
7641 7641 b'verify',
7642 7642 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7643 7643 helpcategory=command.CATEGORY_MAINTENANCE,
7644 7644 )
7645 7645 def verify(ui, repo, **opts):
7646 7646 """verify the integrity of the repository
7647 7647
7648 7648 Verify the integrity of the current repository.
7649 7649
7650 7650 This will perform an extensive check of the repository's
7651 7651 integrity, validating the hashes and checksums of each entry in
7652 7652 the changelog, manifest, and tracked files, as well as the
7653 7653 integrity of their crosslinks and indices.
7654 7654
7655 7655 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7656 7656 for more information about recovery from corruption of the
7657 7657 repository.
7658 7658
7659 7659 Returns 0 on success, 1 if errors are encountered.
7660 7660 """
7661 7661 opts = pycompat.byteskwargs(opts)
7662 7662
7663 7663 level = None
7664 7664 if opts[b'full']:
7665 7665 level = verifymod.VERIFY_FULL
7666 7666 return hg.verify(repo, level)
7667 7667
7668 7668
7669 7669 @command(
7670 7670 b'version',
7671 7671 [] + formatteropts,
7672 7672 helpcategory=command.CATEGORY_HELP,
7673 7673 norepo=True,
7674 7674 intents={INTENT_READONLY},
7675 7675 )
7676 7676 def version_(ui, **opts):
7677 7677 """output version and copyright information
7678 7678
7679 7679 .. container:: verbose
7680 7680
7681 7681 Template:
7682 7682
7683 7683 The following keywords are supported. See also :hg:`help templates`.
7684 7684
7685 7685 :extensions: List of extensions.
7686 7686 :ver: String. Version number.
7687 7687
7688 7688 And each entry of ``{extensions}`` provides the following sub-keywords
7689 7689 in addition to ``{ver}``.
7690 7690
7691 7691 :bundled: Boolean. True if included in the release.
7692 7692 :name: String. Extension name.
7693 7693 """
7694 7694 opts = pycompat.byteskwargs(opts)
7695 7695 if ui.verbose:
7696 7696 ui.pager(b'version')
7697 7697 fm = ui.formatter(b"version", opts)
7698 7698 fm.startitem()
7699 7699 fm.write(
7700 7700 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7701 7701 )
7702 7702 license = _(
7703 7703 b"(see https://mercurial-scm.org for more information)\n"
7704 7704 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7705 7705 b"This is free software; see the source for copying conditions. "
7706 7706 b"There is NO\nwarranty; "
7707 7707 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7708 7708 )
7709 7709 if not ui.quiet:
7710 7710 fm.plain(license)
7711 7711
7712 7712 if ui.verbose:
7713 7713 fm.plain(_(b"\nEnabled extensions:\n\n"))
7714 7714 # format names and versions into columns
7715 7715 names = []
7716 7716 vers = []
7717 7717 isinternals = []
7718 7718 for name, module in sorted(extensions.extensions()):
7719 7719 names.append(name)
7720 7720 vers.append(extensions.moduleversion(module) or None)
7721 7721 isinternals.append(extensions.ismoduleinternal(module))
7722 7722 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7723 7723 if names:
7724 7724 namefmt = b" %%-%ds " % max(len(n) for n in names)
7725 7725 places = [_(b"external"), _(b"internal")]
7726 7726 for n, v, p in zip(names, vers, isinternals):
7727 7727 fn.startitem()
7728 7728 fn.condwrite(ui.verbose, b"name", namefmt, n)
7729 7729 if ui.verbose:
7730 7730 fn.plain(b"%s " % places[p])
7731 7731 fn.data(bundled=p)
7732 7732 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7733 7733 if ui.verbose:
7734 7734 fn.plain(b"\n")
7735 7735 fn.end()
7736 7736 fm.end()
7737 7737
7738 7738
7739 7739 def loadcmdtable(ui, name, cmdtable):
7740 7740 """Load command functions from specified cmdtable"""
7741 7741 overrides = [cmd for cmd in cmdtable if cmd in table]
7742 7742 if overrides:
7743 7743 ui.warn(
7744 7744 _(b"extension '%s' overrides commands: %s\n")
7745 7745 % (name, b" ".join(overrides))
7746 7746 )
7747 7747 table.update(cmdtable)
@@ -1,48 +1,49 b''
1 1 == New Features ==
2 2
3 3 * There is a new config section for templates used by hg commands. It
4 4 is called `[command-templates]`. Some existing config options have
5 5 been deprecated in favor of config options in the new
6 6 section. These are: `ui.logtemplate` to `command-templates.log`,
7 7 `ui.graphnodetemplate` to `command-templates.graphnode`,
8 8 `ui.mergemarkertemplate` to `command-templates.mergemarker`,
9 9 `ui.pre-merge-tool-output-template` to
10 10 `command-templates.pre-merge-tool-output`.
11 11
12 12 * There is a new set of config options for the template used for the
13 13 one-line commit summary displayed by various commands, such as `hg
14 14 rebase`. The main one is `command-templates.oneline-summary`. That
15 15 can be overridden per command with
16 16 `command-templates.oneline-summary.<command>`, where `<command>`
17 17 can be e.g. `rebase`. As part of this effort, the default format
18 18 from `hg rebase` was reorganized a bit.
19 19
20 20 * `hg strip`, from the strip extension, is now a core command, `hg
21 21 debugstrip`. The extension remains for compatibility.
22 22
23 23 * `hg diff` now supports `--from <rev>` and `--to <rev>` arguments as
24 clearer alternatives to `-r <revs>`.
24 clearer alternatives to `-r <revs>`. `-r <revs>` has been
25 deprecated.
25 26
26 27 * The memory footprint per changeset during pull/unbundle
27 28 operations has been further reduced.
28 29
29 30
30 31 == New Experimental Features ==
31 32
32 33 * `experimental.single-head-per-branch:public-changes-only` can be used
33 34 restrict the single head check to public revision. This is useful for
34 35 overlay repository that have both a publishing and non-publishing view
35 36 of the same storage.
36 37
37 38
38 39 == Bug Fixes ==
39 40
40 41
41 42
42 43 == Backwards Compatibility Changes ==
43 44
44 45
45 46
46 47 == Internal API Changes ==
47 48
48 49
@@ -1,3925 +1,3924 b''
1 1 Short help:
2 2
3 3 $ hg
4 4 Mercurial Distributed SCM
5 5
6 6 basic commands:
7 7
8 8 add add the specified files on the next commit
9 9 annotate show changeset information by line for each file
10 10 clone make a copy of an existing repository
11 11 commit commit the specified files or all outstanding changes
12 12 diff diff repository (or selected files)
13 13 export dump the header and diffs for one or more changesets
14 14 forget forget the specified files on the next commit
15 15 init create a new repository in the given directory
16 16 log show revision history of entire repository or files
17 17 merge merge another revision into working directory
18 18 pull pull changes from the specified source
19 19 push push changes to the specified destination
20 20 remove remove the specified files on the next commit
21 21 serve start stand-alone webserver
22 22 status show changed files in the working directory
23 23 summary summarize working directory state
24 24 update update working directory (or switch revisions)
25 25
26 26 (use 'hg help' for the full list of commands or 'hg -v' for details)
27 27
28 28 $ hg -q
29 29 add add the specified files on the next commit
30 30 annotate show changeset information by line for each file
31 31 clone make a copy of an existing repository
32 32 commit commit the specified files or all outstanding changes
33 33 diff diff repository (or selected files)
34 34 export dump the header and diffs for one or more changesets
35 35 forget forget the specified files on the next commit
36 36 init create a new repository in the given directory
37 37 log show revision history of entire repository or files
38 38 merge merge another revision into working directory
39 39 pull pull changes from the specified source
40 40 push push changes to the specified destination
41 41 remove remove the specified files on the next commit
42 42 serve start stand-alone webserver
43 43 status show changed files in the working directory
44 44 summary summarize working directory state
45 45 update update working directory (or switch revisions)
46 46
47 47 Extra extensions will be printed in help output in a non-reliable order since
48 48 the extension is unknown.
49 49 #if no-extraextensions
50 50
51 51 $ hg help
52 52 Mercurial Distributed SCM
53 53
54 54 list of commands:
55 55
56 56 Repository creation:
57 57
58 58 clone make a copy of an existing repository
59 59 init create a new repository in the given directory
60 60
61 61 Remote repository management:
62 62
63 63 incoming show new changesets found in source
64 64 outgoing show changesets not found in the destination
65 65 paths show aliases for remote repositories
66 66 pull pull changes from the specified source
67 67 push push changes to the specified destination
68 68 serve start stand-alone webserver
69 69
70 70 Change creation:
71 71
72 72 commit commit the specified files or all outstanding changes
73 73
74 74 Change manipulation:
75 75
76 76 backout reverse effect of earlier changeset
77 77 graft copy changes from other branches onto the current branch
78 78 merge merge another revision into working directory
79 79
80 80 Change organization:
81 81
82 82 bookmarks create a new bookmark or list existing bookmarks
83 83 branch set or show the current branch name
84 84 branches list repository named branches
85 85 phase set or show the current phase name
86 86 tag add one or more tags for the current or given revision
87 87 tags list repository tags
88 88
89 89 File content management:
90 90
91 91 annotate show changeset information by line for each file
92 92 cat output the current or given revision of files
93 93 copy mark files as copied for the next commit
94 94 diff diff repository (or selected files)
95 95 grep search for a pattern in specified files
96 96
97 97 Change navigation:
98 98
99 99 bisect subdivision search of changesets
100 100 heads show branch heads
101 101 identify identify the working directory or specified revision
102 102 log show revision history of entire repository or files
103 103
104 104 Working directory management:
105 105
106 106 add add the specified files on the next commit
107 107 addremove add all new files, delete all missing files
108 108 files list tracked files
109 109 forget forget the specified files on the next commit
110 110 remove remove the specified files on the next commit
111 111 rename rename files; equivalent of copy + remove
112 112 resolve redo merges or set/view the merge status of files
113 113 revert restore files to their checkout state
114 114 root print the root (top) of the current working directory
115 115 shelve save and set aside changes from the working directory
116 116 status show changed files in the working directory
117 117 summary summarize working directory state
118 118 unshelve restore a shelved change to the working directory
119 119 update update working directory (or switch revisions)
120 120
121 121 Change import/export:
122 122
123 123 archive create an unversioned archive of a repository revision
124 124 bundle create a bundle file
125 125 export dump the header and diffs for one or more changesets
126 126 import import an ordered set of patches
127 127 unbundle apply one or more bundle files
128 128
129 129 Repository maintenance:
130 130
131 131 manifest output the current or given revision of the project manifest
132 132 recover roll back an interrupted transaction
133 133 verify verify the integrity of the repository
134 134
135 135 Help:
136 136
137 137 config show combined config settings from all hgrc files
138 138 help show help for a given topic or a help overview
139 139 version output version and copyright information
140 140
141 141 additional help topics:
142 142
143 143 Mercurial identifiers:
144 144
145 145 filesets Specifying File Sets
146 146 hgignore Syntax for Mercurial Ignore Files
147 147 patterns File Name Patterns
148 148 revisions Specifying Revisions
149 149 urls URL Paths
150 150
151 151 Mercurial output:
152 152
153 153 color Colorizing Outputs
154 154 dates Date Formats
155 155 diffs Diff Formats
156 156 templating Template Usage
157 157
158 158 Mercurial configuration:
159 159
160 160 config Configuration Files
161 161 environment Environment Variables
162 162 extensions Using Additional Features
163 163 flags Command-line flags
164 164 hgweb Configuring hgweb
165 165 merge-tools Merge Tools
166 166 pager Pager Support
167 167
168 168 Concepts:
169 169
170 170 bundlespec Bundle File Formats
171 171 glossary Glossary
172 172 phases Working with Phases
173 173 subrepos Subrepositories
174 174
175 175 Miscellaneous:
176 176
177 177 deprecated Deprecated Features
178 178 internals Technical implementation topics
179 179 scripting Using Mercurial from scripts and automation
180 180
181 181 (use 'hg help -v' to show built-in aliases and global options)
182 182
183 183 $ hg -q help
184 184 Repository creation:
185 185
186 186 clone make a copy of an existing repository
187 187 init create a new repository in the given directory
188 188
189 189 Remote repository management:
190 190
191 191 incoming show new changesets found in source
192 192 outgoing show changesets not found in the destination
193 193 paths show aliases for remote repositories
194 194 pull pull changes from the specified source
195 195 push push changes to the specified destination
196 196 serve start stand-alone webserver
197 197
198 198 Change creation:
199 199
200 200 commit commit the specified files or all outstanding changes
201 201
202 202 Change manipulation:
203 203
204 204 backout reverse effect of earlier changeset
205 205 graft copy changes from other branches onto the current branch
206 206 merge merge another revision into working directory
207 207
208 208 Change organization:
209 209
210 210 bookmarks create a new bookmark or list existing bookmarks
211 211 branch set or show the current branch name
212 212 branches list repository named branches
213 213 phase set or show the current phase name
214 214 tag add one or more tags for the current or given revision
215 215 tags list repository tags
216 216
217 217 File content management:
218 218
219 219 annotate show changeset information by line for each file
220 220 cat output the current or given revision of files
221 221 copy mark files as copied for the next commit
222 222 diff diff repository (or selected files)
223 223 grep search for a pattern in specified files
224 224
225 225 Change navigation:
226 226
227 227 bisect subdivision search of changesets
228 228 heads show branch heads
229 229 identify identify the working directory or specified revision
230 230 log show revision history of entire repository or files
231 231
232 232 Working directory management:
233 233
234 234 add add the specified files on the next commit
235 235 addremove add all new files, delete all missing files
236 236 files list tracked files
237 237 forget forget the specified files on the next commit
238 238 remove remove the specified files on the next commit
239 239 rename rename files; equivalent of copy + remove
240 240 resolve redo merges or set/view the merge status of files
241 241 revert restore files to their checkout state
242 242 root print the root (top) of the current working directory
243 243 shelve save and set aside changes from the working directory
244 244 status show changed files in the working directory
245 245 summary summarize working directory state
246 246 unshelve restore a shelved change to the working directory
247 247 update update working directory (or switch revisions)
248 248
249 249 Change import/export:
250 250
251 251 archive create an unversioned archive of a repository revision
252 252 bundle create a bundle file
253 253 export dump the header and diffs for one or more changesets
254 254 import import an ordered set of patches
255 255 unbundle apply one or more bundle files
256 256
257 257 Repository maintenance:
258 258
259 259 manifest output the current or given revision of the project manifest
260 260 recover roll back an interrupted transaction
261 261 verify verify the integrity of the repository
262 262
263 263 Help:
264 264
265 265 config show combined config settings from all hgrc files
266 266 help show help for a given topic or a help overview
267 267 version output version and copyright information
268 268
269 269 additional help topics:
270 270
271 271 Mercurial identifiers:
272 272
273 273 filesets Specifying File Sets
274 274 hgignore Syntax for Mercurial Ignore Files
275 275 patterns File Name Patterns
276 276 revisions Specifying Revisions
277 277 urls URL Paths
278 278
279 279 Mercurial output:
280 280
281 281 color Colorizing Outputs
282 282 dates Date Formats
283 283 diffs Diff Formats
284 284 templating Template Usage
285 285
286 286 Mercurial configuration:
287 287
288 288 config Configuration Files
289 289 environment Environment Variables
290 290 extensions Using Additional Features
291 291 flags Command-line flags
292 292 hgweb Configuring hgweb
293 293 merge-tools Merge Tools
294 294 pager Pager Support
295 295
296 296 Concepts:
297 297
298 298 bundlespec Bundle File Formats
299 299 glossary Glossary
300 300 phases Working with Phases
301 301 subrepos Subrepositories
302 302
303 303 Miscellaneous:
304 304
305 305 deprecated Deprecated Features
306 306 internals Technical implementation topics
307 307 scripting Using Mercurial from scripts and automation
308 308
309 309 Test extension help:
310 310 $ hg help extensions --config extensions.rebase= --config extensions.children=
311 311 Using Additional Features
312 312 """""""""""""""""""""""""
313 313
314 314 Mercurial has the ability to add new features through the use of
315 315 extensions. Extensions may add new commands, add options to existing
316 316 commands, change the default behavior of commands, or implement hooks.
317 317
318 318 To enable the "foo" extension, either shipped with Mercurial or in the
319 319 Python search path, create an entry for it in your configuration file,
320 320 like this:
321 321
322 322 [extensions]
323 323 foo =
324 324
325 325 You may also specify the full path to an extension:
326 326
327 327 [extensions]
328 328 myfeature = ~/.hgext/myfeature.py
329 329
330 330 See 'hg help config' for more information on configuration files.
331 331
332 332 Extensions are not loaded by default for a variety of reasons: they can
333 333 increase startup overhead; they may be meant for advanced usage only; they
334 334 may provide potentially dangerous abilities (such as letting you destroy
335 335 or modify history); they might not be ready for prime time; or they may
336 336 alter some usual behaviors of stock Mercurial. It is thus up to the user
337 337 to activate extensions as needed.
338 338
339 339 To explicitly disable an extension enabled in a configuration file of
340 340 broader scope, prepend its path with !:
341 341
342 342 [extensions]
343 343 # disabling extension bar residing in /path/to/extension/bar.py
344 344 bar = !/path/to/extension/bar.py
345 345 # ditto, but no path was supplied for extension baz
346 346 baz = !
347 347
348 348 enabled extensions:
349 349
350 350 children command to display child changesets (DEPRECATED)
351 351 rebase command to move sets of revisions to a different ancestor
352 352
353 353 disabled extensions:
354 354
355 355 acl hooks for controlling repository access
356 356 blackbox log repository events to a blackbox for debugging
357 357 bugzilla hooks for integrating with the Bugzilla bug tracker
358 358 censor erase file content at a given revision
359 359 churn command to display statistics about repository history
360 360 clonebundles advertise pre-generated bundles to seed clones
361 361 closehead close arbitrary heads without checking them out first
362 362 convert import revisions from foreign VCS repositories into
363 363 Mercurial
364 364 eol automatically manage newlines in repository files
365 365 extdiff command to allow external programs to compare revisions
366 366 factotum http authentication with factotum
367 367 fastexport export repositories as git fast-import stream
368 368 githelp try mapping git commands to Mercurial commands
369 369 gpg commands to sign and verify changesets
370 370 hgk browse the repository in a graphical way
371 371 highlight syntax highlighting for hgweb (requires Pygments)
372 372 histedit interactive history editing
373 373 keyword expand keywords in tracked files
374 374 largefiles track large binary files
375 375 mq manage a stack of patches
376 376 notify hooks for sending email push notifications
377 377 patchbomb command to send changesets as (a series of) patch emails
378 378 purge command to delete untracked files from the working
379 379 directory
380 380 relink recreates hardlinks between repository clones
381 381 schemes extend schemes with shortcuts to repository swarms
382 382 share share a common history between several working directories
383 383 transplant command to transplant changesets from another branch
384 384 win32mbcs allow the use of MBCS paths with problematic encodings
385 385 zeroconf discover and advertise repositories on the local network
386 386
387 387 #endif
388 388
389 389 Verify that deprecated extensions are included if --verbose:
390 390
391 391 $ hg -v help extensions | grep children
392 392 children command to display child changesets (DEPRECATED)
393 393
394 394 Verify that extension keywords appear in help templates
395 395
396 396 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
397 397
398 398 Test short command list with verbose option
399 399
400 400 $ hg -v help shortlist
401 401 Mercurial Distributed SCM
402 402
403 403 basic commands:
404 404
405 405 abort abort an unfinished operation (EXPERIMENTAL)
406 406 add add the specified files on the next commit
407 407 annotate, blame
408 408 show changeset information by line for each file
409 409 clone make a copy of an existing repository
410 410 commit, ci commit the specified files or all outstanding changes
411 411 continue resumes an interrupted operation (EXPERIMENTAL)
412 412 diff diff repository (or selected files)
413 413 export dump the header and diffs for one or more changesets
414 414 forget forget the specified files on the next commit
415 415 init create a new repository in the given directory
416 416 log, history show revision history of entire repository or files
417 417 merge merge another revision into working directory
418 418 pull pull changes from the specified source
419 419 push push changes to the specified destination
420 420 remove, rm remove the specified files on the next commit
421 421 serve start stand-alone webserver
422 422 status, st show changed files in the working directory
423 423 summary, sum summarize working directory state
424 424 update, up, checkout, co
425 425 update working directory (or switch revisions)
426 426
427 427 global options ([+] can be repeated):
428 428
429 429 -R --repository REPO repository root directory or name of overlay bundle
430 430 file
431 431 --cwd DIR change working directory
432 432 -y --noninteractive do not prompt, automatically pick the first choice for
433 433 all prompts
434 434 -q --quiet suppress output
435 435 -v --verbose enable additional output
436 436 --color TYPE when to colorize (boolean, always, auto, never, or
437 437 debug)
438 438 --config CONFIG [+] set/override config option (use 'section.name=value')
439 439 --debug enable debugging output
440 440 --debugger start debugger
441 441 --encoding ENCODE set the charset encoding (default: ascii)
442 442 --encodingmode MODE set the charset encoding mode (default: strict)
443 443 --traceback always print a traceback on exception
444 444 --time time how long the command takes
445 445 --profile print command execution profile
446 446 --version output version information and exit
447 447 -h --help display help and exit
448 448 --hidden consider hidden changesets
449 449 --pager TYPE when to paginate (boolean, always, auto, or never)
450 450 (default: auto)
451 451
452 452 (use 'hg help' for the full list of commands)
453 453
454 454 $ hg add -h
455 455 hg add [OPTION]... [FILE]...
456 456
457 457 add the specified files on the next commit
458 458
459 459 Schedule files to be version controlled and added to the repository.
460 460
461 461 The files will be added to the repository at the next commit. To undo an
462 462 add before that, see 'hg forget'.
463 463
464 464 If no names are given, add all files to the repository (except files
465 465 matching ".hgignore").
466 466
467 467 Returns 0 if all files are successfully added.
468 468
469 469 options ([+] can be repeated):
470 470
471 471 -I --include PATTERN [+] include names matching the given patterns
472 472 -X --exclude PATTERN [+] exclude names matching the given patterns
473 473 -S --subrepos recurse into subrepositories
474 474 -n --dry-run do not perform actions, just print output
475 475
476 476 (some details hidden, use --verbose to show complete help)
477 477
478 478 Verbose help for add
479 479
480 480 $ hg add -hv
481 481 hg add [OPTION]... [FILE]...
482 482
483 483 add the specified files on the next commit
484 484
485 485 Schedule files to be version controlled and added to the repository.
486 486
487 487 The files will be added to the repository at the next commit. To undo an
488 488 add before that, see 'hg forget'.
489 489
490 490 If no names are given, add all files to the repository (except files
491 491 matching ".hgignore").
492 492
493 493 Examples:
494 494
495 495 - New (unknown) files are added automatically by 'hg add':
496 496
497 497 $ ls
498 498 foo.c
499 499 $ hg status
500 500 ? foo.c
501 501 $ hg add
502 502 adding foo.c
503 503 $ hg status
504 504 A foo.c
505 505
506 506 - Specific files to be added can be specified:
507 507
508 508 $ ls
509 509 bar.c foo.c
510 510 $ hg status
511 511 ? bar.c
512 512 ? foo.c
513 513 $ hg add bar.c
514 514 $ hg status
515 515 A bar.c
516 516 ? foo.c
517 517
518 518 Returns 0 if all files are successfully added.
519 519
520 520 options ([+] can be repeated):
521 521
522 522 -I --include PATTERN [+] include names matching the given patterns
523 523 -X --exclude PATTERN [+] exclude names matching the given patterns
524 524 -S --subrepos recurse into subrepositories
525 525 -n --dry-run do not perform actions, just print output
526 526
527 527 global options ([+] can be repeated):
528 528
529 529 -R --repository REPO repository root directory or name of overlay bundle
530 530 file
531 531 --cwd DIR change working directory
532 532 -y --noninteractive do not prompt, automatically pick the first choice for
533 533 all prompts
534 534 -q --quiet suppress output
535 535 -v --verbose enable additional output
536 536 --color TYPE when to colorize (boolean, always, auto, never, or
537 537 debug)
538 538 --config CONFIG [+] set/override config option (use 'section.name=value')
539 539 --debug enable debugging output
540 540 --debugger start debugger
541 541 --encoding ENCODE set the charset encoding (default: ascii)
542 542 --encodingmode MODE set the charset encoding mode (default: strict)
543 543 --traceback always print a traceback on exception
544 544 --time time how long the command takes
545 545 --profile print command execution profile
546 546 --version output version information and exit
547 547 -h --help display help and exit
548 548 --hidden consider hidden changesets
549 549 --pager TYPE when to paginate (boolean, always, auto, or never)
550 550 (default: auto)
551 551
552 552 Test the textwidth config option
553 553
554 554 $ hg root -h --config ui.textwidth=50
555 555 hg root
556 556
557 557 print the root (top) of the current working
558 558 directory
559 559
560 560 Print the root directory of the current
561 561 repository.
562 562
563 563 Returns 0 on success.
564 564
565 565 options:
566 566
567 567 -T --template TEMPLATE display with template
568 568
569 569 (some details hidden, use --verbose to show
570 570 complete help)
571 571
572 572 Test help option with version option
573 573
574 574 $ hg add -h --version
575 575 Mercurial Distributed SCM (version *) (glob)
576 576 (see https://mercurial-scm.org for more information)
577 577
578 578 Copyright (C) 2005-* Matt Mackall and others (glob)
579 579 This is free software; see the source for copying conditions. There is NO
580 580 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
581 581
582 582 $ hg add --skjdfks
583 583 hg add: option --skjdfks not recognized
584 584 hg add [OPTION]... [FILE]...
585 585
586 586 add the specified files on the next commit
587 587
588 588 options ([+] can be repeated):
589 589
590 590 -I --include PATTERN [+] include names matching the given patterns
591 591 -X --exclude PATTERN [+] exclude names matching the given patterns
592 592 -S --subrepos recurse into subrepositories
593 593 -n --dry-run do not perform actions, just print output
594 594
595 595 (use 'hg add -h' to show more help)
596 596 [255]
597 597
598 598 Test ambiguous command help
599 599
600 600 $ hg help ad
601 601 list of commands:
602 602
603 603 add add the specified files on the next commit
604 604 addremove add all new files, delete all missing files
605 605
606 606 (use 'hg help -v ad' to show built-in aliases and global options)
607 607
608 608 Test command without options
609 609
610 610 $ hg help verify
611 611 hg verify
612 612
613 613 verify the integrity of the repository
614 614
615 615 Verify the integrity of the current repository.
616 616
617 617 This will perform an extensive check of the repository's integrity,
618 618 validating the hashes and checksums of each entry in the changelog,
619 619 manifest, and tracked files, as well as the integrity of their crosslinks
620 620 and indices.
621 621
622 622 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
623 623 information about recovery from corruption of the repository.
624 624
625 625 Returns 0 on success, 1 if errors are encountered.
626 626
627 627 options:
628 628
629 629 (some details hidden, use --verbose to show complete help)
630 630
631 631 $ hg help diff
632 632 hg diff [OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...
633 633
634 634 diff repository (or selected files)
635 635
636 636 Show differences between revisions for the specified files.
637 637
638 638 Differences between files are shown using the unified diff format.
639 639
640 640 Note:
641 641 'hg diff' may generate unexpected results for merges, as it will
642 642 default to comparing against the working directory's first parent
643 643 changeset if no revisions are specified.
644 644
645 645 By default, the working directory files are compared to its first parent.
646 646 To see the differences from another revision, use --from. To see the
647 647 difference to another revision, use --to. For example, 'hg diff --from .^'
648 648 will show the differences from the working copy's grandparent to the
649 649 working copy, 'hg diff --to .' will show the diff from the working copy to
650 650 its parent (i.e. the reverse of the default), and 'hg diff --from 1.0 --to
651 651 1.2' will show the diff between those two revisions.
652 652
653 653 Alternatively you can specify -c/--change with a revision to see the
654 654 changes in that changeset relative to its first parent (i.e. 'hg diff -c
655 655 42' is equivalent to 'hg diff --from 42^ --to 42')
656 656
657 657 Without the -a/--text option, diff will avoid generating diffs of files it
658 658 detects as binary. With -a, diff will generate a diff anyway, probably
659 659 with undesirable results.
660 660
661 661 Use the -g/--git option to generate diffs in the git extended diff format.
662 662 For more information, read 'hg help diffs'.
663 663
664 664 Returns 0 on success.
665 665
666 666 options ([+] can be repeated):
667 667
668 -r --rev REV [+] revision
669 668 --from REV1 revision to diff from
670 669 --to REV2 revision to diff to
671 670 -c --change REV change made by revision
672 671 -a --text treat all files as text
673 672 -g --git use git extended diff format
674 673 --binary generate binary diffs in git mode (default)
675 674 --nodates omit dates from diff headers
676 675 --noprefix omit a/ and b/ prefixes from filenames
677 676 -p --show-function show which function each change is in
678 677 --reverse produce a diff that undoes the changes
679 678 -w --ignore-all-space ignore white space when comparing lines
680 679 -b --ignore-space-change ignore changes in the amount of white space
681 680 -B --ignore-blank-lines ignore changes whose lines are all blank
682 681 -Z --ignore-space-at-eol ignore changes in whitespace at EOL
683 682 -U --unified NUM number of lines of context to show
684 683 --stat output diffstat-style summary of changes
685 684 --root DIR produce diffs relative to subdirectory
686 685 -I --include PATTERN [+] include names matching the given patterns
687 686 -X --exclude PATTERN [+] exclude names matching the given patterns
688 687 -S --subrepos recurse into subrepositories
689 688
690 689 (some details hidden, use --verbose to show complete help)
691 690
692 691 $ hg help status
693 692 hg status [OPTION]... [FILE]...
694 693
695 694 aliases: st
696 695
697 696 show changed files in the working directory
698 697
699 698 Show status of files in the repository. If names are given, only files
700 699 that match are shown. Files that are clean or ignored or the source of a
701 700 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
702 701 -C/--copies or -A/--all are given. Unless options described with "show
703 702 only ..." are given, the options -mardu are used.
704 703
705 704 Option -q/--quiet hides untracked (unknown and ignored) files unless
706 705 explicitly requested with -u/--unknown or -i/--ignored.
707 706
708 707 Note:
709 708 'hg status' may appear to disagree with diff if permissions have
710 709 changed or a merge has occurred. The standard diff format does not
711 710 report permission changes and diff only reports changes relative to one
712 711 merge parent.
713 712
714 713 If one revision is given, it is used as the base revision. If two
715 714 revisions are given, the differences between them are shown. The --change
716 715 option can also be used as a shortcut to list the changed files of a
717 716 revision from its first parent.
718 717
719 718 The codes used to show the status of files are:
720 719
721 720 M = modified
722 721 A = added
723 722 R = removed
724 723 C = clean
725 724 ! = missing (deleted by non-hg command, but still tracked)
726 725 ? = not tracked
727 726 I = ignored
728 727 = origin of the previous file (with --copies)
729 728
730 729 Returns 0 on success.
731 730
732 731 options ([+] can be repeated):
733 732
734 733 -A --all show status of all files
735 734 -m --modified show only modified files
736 735 -a --added show only added files
737 736 -r --removed show only removed files
738 737 -d --deleted show only missing files
739 738 -c --clean show only files without changes
740 739 -u --unknown show only unknown (not tracked) files
741 740 -i --ignored show only ignored files
742 741 -n --no-status hide status prefix
743 742 -C --copies show source of copied files
744 743 -0 --print0 end filenames with NUL, for use with xargs
745 744 --rev REV [+] show difference from revision
746 745 --change REV list the changed files of a revision
747 746 -I --include PATTERN [+] include names matching the given patterns
748 747 -X --exclude PATTERN [+] exclude names matching the given patterns
749 748 -S --subrepos recurse into subrepositories
750 749 -T --template TEMPLATE display with template
751 750
752 751 (some details hidden, use --verbose to show complete help)
753 752
754 753 $ hg -q help status
755 754 hg status [OPTION]... [FILE]...
756 755
757 756 show changed files in the working directory
758 757
759 758 $ hg help foo
760 759 abort: no such help topic: foo
761 760 (try 'hg help --keyword foo')
762 761 [255]
763 762
764 763 $ hg skjdfks
765 764 hg: unknown command 'skjdfks'
766 765 (use 'hg help' for a list of commands)
767 766 [255]
768 767
769 768 Typoed command gives suggestion
770 769 $ hg puls
771 770 hg: unknown command 'puls'
772 771 (did you mean one of pull, push?)
773 772 [255]
774 773
775 774 Not enabled extension gets suggested
776 775
777 776 $ hg rebase
778 777 hg: unknown command 'rebase'
779 778 'rebase' is provided by the following extension:
780 779
781 780 rebase command to move sets of revisions to a different ancestor
782 781
783 782 (use 'hg help extensions' for information on enabling extensions)
784 783 [255]
785 784
786 785 Disabled extension gets suggested
787 786 $ hg --config extensions.rebase=! rebase
788 787 hg: unknown command 'rebase'
789 788 'rebase' is provided by the following extension:
790 789
791 790 rebase command to move sets of revisions to a different ancestor
792 791
793 792 (use 'hg help extensions' for information on enabling extensions)
794 793 [255]
795 794
796 795 Checking that help adapts based on the config:
797 796
798 797 $ hg help diff --config ui.tweakdefaults=true | egrep -e '^ *(-g|config)'
799 798 -g --[no-]git use git extended diff format (default: on from
800 799 config)
801 800
802 801 Make sure that we don't run afoul of the help system thinking that
803 802 this is a section and erroring out weirdly.
804 803
805 804 $ hg .log
806 805 hg: unknown command '.log'
807 806 (did you mean log?)
808 807 [255]
809 808
810 809 $ hg log.
811 810 hg: unknown command 'log.'
812 811 (did you mean log?)
813 812 [255]
814 813 $ hg pu.lh
815 814 hg: unknown command 'pu.lh'
816 815 (did you mean one of pull, push?)
817 816 [255]
818 817
819 818 $ cat > helpext.py <<EOF
820 819 > import os
821 820 > from mercurial import commands, fancyopts, registrar
822 821 >
823 822 > def func(arg):
824 823 > return '%sfoo' % arg
825 824 > class customopt(fancyopts.customopt):
826 825 > def newstate(self, oldstate, newparam, abort):
827 826 > return '%sbar' % oldstate
828 827 > cmdtable = {}
829 828 > command = registrar.command(cmdtable)
830 829 >
831 830 > @command(b'nohelp',
832 831 > [(b'', b'longdesc', 3, b'x'*67),
833 832 > (b'n', b'', None, b'normal desc'),
834 833 > (b'', b'newline', b'', b'line1\nline2'),
835 834 > (b'', b'default-off', False, b'enable X'),
836 835 > (b'', b'default-on', True, b'enable Y'),
837 836 > (b'', b'callableopt', func, b'adds foo'),
838 837 > (b'', b'customopt', customopt(''), b'adds bar'),
839 838 > (b'', b'customopt-withdefault', customopt('foo'), b'adds bar')],
840 839 > b'hg nohelp',
841 840 > norepo=True)
842 841 > @command(b'debugoptADV', [(b'', b'aopt', None, b'option is (ADVANCED)')])
843 842 > @command(b'debugoptDEP', [(b'', b'dopt', None, b'option is (DEPRECATED)')])
844 843 > @command(b'debugoptEXP', [(b'', b'eopt', None, b'option is (EXPERIMENTAL)')])
845 844 > def nohelp(ui, *args, **kwargs):
846 845 > pass
847 846 >
848 847 > @command(b'hashelp', [], b'hg hashelp', norepo=True)
849 848 > def hashelp(ui, *args, **kwargs):
850 849 > """Extension command's help"""
851 850 >
852 851 > def uisetup(ui):
853 852 > ui.setconfig(b'alias', b'shellalias', b'!echo hi', b'helpext')
854 853 > ui.setconfig(b'alias', b'hgalias', b'summary', b'helpext')
855 854 > ui.setconfig(b'alias', b'hgalias:doc', b'My doc', b'helpext')
856 855 > ui.setconfig(b'alias', b'hgalias:category', b'navigation', b'helpext')
857 856 > ui.setconfig(b'alias', b'hgaliasnodoc', b'summary', b'helpext')
858 857 >
859 858 > EOF
860 859 $ echo '[extensions]' >> $HGRCPATH
861 860 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
862 861
863 862 Test for aliases
864 863
865 864 $ hg help | grep hgalias
866 865 hgalias My doc
867 866
868 867 $ hg help hgalias
869 868 hg hgalias [--remote]
870 869
871 870 alias for: hg summary
872 871
873 872 My doc
874 873
875 874 defined by: helpext
876 875
877 876 options:
878 877
879 878 --remote check for push and pull
880 879
881 880 (some details hidden, use --verbose to show complete help)
882 881 $ hg help hgaliasnodoc
883 882 hg hgaliasnodoc [--remote]
884 883
885 884 alias for: hg summary
886 885
887 886 summarize working directory state
888 887
889 888 This generates a brief summary of the working directory state, including
890 889 parents, branch, commit status, phase and available updates.
891 890
892 891 With the --remote option, this will check the default paths for incoming
893 892 and outgoing changes. This can be time-consuming.
894 893
895 894 Returns 0 on success.
896 895
897 896 defined by: helpext
898 897
899 898 options:
900 899
901 900 --remote check for push and pull
902 901
903 902 (some details hidden, use --verbose to show complete help)
904 903
905 904 $ hg help shellalias
906 905 hg shellalias
907 906
908 907 shell alias for: echo hi
909 908
910 909 (no help text available)
911 910
912 911 defined by: helpext
913 912
914 913 (some details hidden, use --verbose to show complete help)
915 914
916 915 Test command with no help text
917 916
918 917 $ hg help nohelp
919 918 hg nohelp
920 919
921 920 (no help text available)
922 921
923 922 options:
924 923
925 924 --longdesc VALUE
926 925 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
927 926 xxxxxxxxxxxxxxxxxxxxxxx (default: 3)
928 927 -n -- normal desc
929 928 --newline VALUE line1 line2
930 929 --default-off enable X
931 930 --[no-]default-on enable Y (default: on)
932 931 --callableopt VALUE adds foo
933 932 --customopt VALUE adds bar
934 933 --customopt-withdefault VALUE adds bar (default: foo)
935 934
936 935 (some details hidden, use --verbose to show complete help)
937 936
938 937 Test that default list of commands includes extension commands that have help,
939 938 but not those that don't, except in verbose mode, when a keyword is passed, or
940 939 when help about the extension is requested.
941 940
942 941 #if no-extraextensions
943 942
944 943 $ hg help | grep hashelp
945 944 hashelp Extension command's help
946 945 $ hg help | grep nohelp
947 946 [1]
948 947 $ hg help -v | grep nohelp
949 948 nohelp (no help text available)
950 949
951 950 $ hg help -k nohelp
952 951 Commands:
953 952
954 953 nohelp hg nohelp
955 954
956 955 Extension Commands:
957 956
958 957 nohelp (no help text available)
959 958
960 959 $ hg help helpext
961 960 helpext extension - no help text available
962 961
963 962 list of commands:
964 963
965 964 hashelp Extension command's help
966 965 nohelp (no help text available)
967 966
968 967 (use 'hg help -v helpext' to show built-in aliases and global options)
969 968
970 969 #endif
971 970
972 971 Test list of internal help commands
973 972
974 973 $ hg help debug
975 974 debug commands (internal and unsupported):
976 975
977 976 debugancestor
978 977 find the ancestor revision of two revisions in a given index
979 978 debugantivirusrunning
980 979 attempt to trigger an antivirus scanner to see if one is active
981 980 debugapplystreamclonebundle
982 981 apply a stream clone bundle file
983 982 debugbackupbundle
984 983 lists the changesets available in backup bundles
985 984 debugbuilddag
986 985 builds a repo with a given DAG from scratch in the current
987 986 empty repo
988 987 debugbundle lists the contents of a bundle
989 988 debugcapabilities
990 989 lists the capabilities of a remote peer
991 990 debugchangedfiles
992 991 list the stored files changes for a revision
993 992 debugcheckstate
994 993 validate the correctness of the current dirstate
995 994 debugcolor show available color, effects or style
996 995 debugcommands
997 996 list all available commands and options
998 997 debugcomplete
999 998 returns the completion list associated with the given command
1000 999 debugcreatestreamclonebundle
1001 1000 create a stream clone bundle file
1002 1001 debugdag format the changelog or an index DAG as a concise textual
1003 1002 description
1004 1003 debugdata dump the contents of a data file revision
1005 1004 debugdate parse and display a date
1006 1005 debugdeltachain
1007 1006 dump information about delta chains in a revlog
1008 1007 debugdirstate
1009 1008 show the contents of the current dirstate
1010 1009 debugdiscovery
1011 1010 runs the changeset discovery protocol in isolation
1012 1011 debugdownload
1013 1012 download a resource using Mercurial logic and config
1014 1013 debugextensions
1015 1014 show information about active extensions
1016 1015 debugfileset parse and apply a fileset specification
1017 1016 debugformat display format information about the current repository
1018 1017 debugfsinfo show information detected about current filesystem
1019 1018 debuggetbundle
1020 1019 retrieves a bundle from a repo
1021 1020 debugignore display the combined ignore pattern and information about
1022 1021 ignored files
1023 1022 debugindex dump index data for a storage primitive
1024 1023 debugindexdot
1025 1024 dump an index DAG as a graphviz dot file
1026 1025 debugindexstats
1027 1026 show stats related to the changelog index
1028 1027 debuginstall test Mercurial installation
1029 1028 debugknown test whether node ids are known to a repo
1030 1029 debuglocks show or modify state of locks
1031 1030 debugmanifestfulltextcache
1032 1031 show, clear or amend the contents of the manifest fulltext
1033 1032 cache
1034 1033 debugmergestate
1035 1034 print merge state
1036 1035 debugnamecomplete
1037 1036 complete "names" - tags, open branch names, bookmark names
1038 1037 debugnodemap write and inspect on disk nodemap
1039 1038 debugobsolete
1040 1039 create arbitrary obsolete marker
1041 1040 debugoptADV (no help text available)
1042 1041 debugoptDEP (no help text available)
1043 1042 debugoptEXP (no help text available)
1044 1043 debugp1copies
1045 1044 dump copy information compared to p1
1046 1045 debugp2copies
1047 1046 dump copy information compared to p2
1048 1047 debugpathcomplete
1049 1048 complete part or all of a tracked path
1050 1049 debugpathcopies
1051 1050 show copies between two revisions
1052 1051 debugpeer establish a connection to a peer repository
1053 1052 debugpickmergetool
1054 1053 examine which merge tool is chosen for specified file
1055 1054 debugpushkey access the pushkey key/value protocol
1056 1055 debugpvec (no help text available)
1057 1056 debugrebuilddirstate
1058 1057 rebuild the dirstate as it would look like for the given
1059 1058 revision
1060 1059 debugrebuildfncache
1061 1060 rebuild the fncache file
1062 1061 debugrename dump rename information
1063 1062 debugrequires
1064 1063 print the current repo requirements
1065 1064 debugrevlog show data and statistics about a revlog
1066 1065 debugrevlogindex
1067 1066 dump the contents of a revlog index
1068 1067 debugrevspec parse and apply a revision specification
1069 1068 debugserve run a server with advanced settings
1070 1069 debugsetparents
1071 1070 manually set the parents of the current working directory
1072 1071 debugsidedata
1073 1072 dump the side data for a cl/manifest/file revision
1074 1073 debugssl test a secure connection to a server
1075 1074 debugstrip strip changesets and all their descendants from the repository
1076 1075 debugsub (no help text available)
1077 1076 debugsuccessorssets
1078 1077 show set of successors for revision
1079 1078 debugtagscache
1080 1079 display the contents of .hg/cache/hgtagsfnodes1
1081 1080 debugtemplate
1082 1081 parse and apply a template
1083 1082 debuguigetpass
1084 1083 show prompt to type password
1085 1084 debuguiprompt
1086 1085 show plain prompt
1087 1086 debugupdatecaches
1088 1087 warm all known caches in the repository
1089 1088 debugupgraderepo
1090 1089 upgrade a repository to use different features
1091 1090 debugwalk show how files match on given patterns
1092 1091 debugwhyunstable
1093 1092 explain instabilities of a changeset
1094 1093 debugwireargs
1095 1094 (no help text available)
1096 1095 debugwireproto
1097 1096 send wire protocol commands to a server
1098 1097
1099 1098 (use 'hg help -v debug' to show built-in aliases and global options)
1100 1099
1101 1100 internals topic renders index of available sub-topics
1102 1101
1103 1102 $ hg help internals
1104 1103 Technical implementation topics
1105 1104 """""""""""""""""""""""""""""""
1106 1105
1107 1106 To access a subtopic, use "hg help internals.{subtopic-name}"
1108 1107
1109 1108 bid-merge Bid Merge Algorithm
1110 1109 bundle2 Bundle2
1111 1110 bundles Bundles
1112 1111 cbor CBOR
1113 1112 censor Censor
1114 1113 changegroups Changegroups
1115 1114 config Config Registrar
1116 1115 extensions Extension API
1117 1116 mergestate Mergestate
1118 1117 requirements Repository Requirements
1119 1118 revlogs Revision Logs
1120 1119 wireprotocol Wire Protocol
1121 1120 wireprotocolrpc
1122 1121 Wire Protocol RPC
1123 1122 wireprotocolv2
1124 1123 Wire Protocol Version 2
1125 1124
1126 1125 sub-topics can be accessed
1127 1126
1128 1127 $ hg help internals.changegroups
1129 1128 Changegroups
1130 1129 """"""""""""
1131 1130
1132 1131 Changegroups are representations of repository revlog data, specifically
1133 1132 the changelog data, root/flat manifest data, treemanifest data, and
1134 1133 filelogs.
1135 1134
1136 1135 There are 3 versions of changegroups: "1", "2", and "3". From a high-
1137 1136 level, versions "1" and "2" are almost exactly the same, with the only
1138 1137 difference being an additional item in the *delta header*. Version "3"
1139 1138 adds support for storage flags in the *delta header* and optionally
1140 1139 exchanging treemanifests (enabled by setting an option on the
1141 1140 "changegroup" part in the bundle2).
1142 1141
1143 1142 Changegroups when not exchanging treemanifests consist of 3 logical
1144 1143 segments:
1145 1144
1146 1145 +---------------------------------+
1147 1146 | | | |
1148 1147 | changeset | manifest | filelogs |
1149 1148 | | | |
1150 1149 | | | |
1151 1150 +---------------------------------+
1152 1151
1153 1152 When exchanging treemanifests, there are 4 logical segments:
1154 1153
1155 1154 +-------------------------------------------------+
1156 1155 | | | | |
1157 1156 | changeset | root | treemanifests | filelogs |
1158 1157 | | manifest | | |
1159 1158 | | | | |
1160 1159 +-------------------------------------------------+
1161 1160
1162 1161 The principle building block of each segment is a *chunk*. A *chunk* is a
1163 1162 framed piece of data:
1164 1163
1165 1164 +---------------------------------------+
1166 1165 | | |
1167 1166 | length | data |
1168 1167 | (4 bytes) | (<length - 4> bytes) |
1169 1168 | | |
1170 1169 +---------------------------------------+
1171 1170
1172 1171 All integers are big-endian signed integers. Each chunk starts with a
1173 1172 32-bit integer indicating the length of the entire chunk (including the
1174 1173 length field itself).
1175 1174
1176 1175 There is a special case chunk that has a value of 0 for the length
1177 1176 ("0x00000000"). We call this an *empty chunk*.
1178 1177
1179 1178 Delta Groups
1180 1179 ============
1181 1180
1182 1181 A *delta group* expresses the content of a revlog as a series of deltas,
1183 1182 or patches against previous revisions.
1184 1183
1185 1184 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1186 1185 to signal the end of the delta group:
1187 1186
1188 1187 +------------------------------------------------------------------------+
1189 1188 | | | | | |
1190 1189 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1191 1190 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1192 1191 | | | | | |
1193 1192 +------------------------------------------------------------------------+
1194 1193
1195 1194 Each *chunk*'s data consists of the following:
1196 1195
1197 1196 +---------------------------------------+
1198 1197 | | |
1199 1198 | delta header | delta data |
1200 1199 | (various by version) | (various) |
1201 1200 | | |
1202 1201 +---------------------------------------+
1203 1202
1204 1203 The *delta data* is a series of *delta*s that describe a diff from an
1205 1204 existing entry (either that the recipient already has, or previously
1206 1205 specified in the bundle/changegroup).
1207 1206
1208 1207 The *delta header* is different between versions "1", "2", and "3" of the
1209 1208 changegroup format.
1210 1209
1211 1210 Version 1 (headerlen=80):
1212 1211
1213 1212 +------------------------------------------------------+
1214 1213 | | | | |
1215 1214 | node | p1 node | p2 node | link node |
1216 1215 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1217 1216 | | | | |
1218 1217 +------------------------------------------------------+
1219 1218
1220 1219 Version 2 (headerlen=100):
1221 1220
1222 1221 +------------------------------------------------------------------+
1223 1222 | | | | | |
1224 1223 | node | p1 node | p2 node | base node | link node |
1225 1224 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1226 1225 | | | | | |
1227 1226 +------------------------------------------------------------------+
1228 1227
1229 1228 Version 3 (headerlen=102):
1230 1229
1231 1230 +------------------------------------------------------------------------------+
1232 1231 | | | | | | |
1233 1232 | node | p1 node | p2 node | base node | link node | flags |
1234 1233 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1235 1234 | | | | | | |
1236 1235 +------------------------------------------------------------------------------+
1237 1236
1238 1237 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1239 1238 contain a series of *delta*s, densely packed (no separators). These deltas
1240 1239 describe a diff from an existing entry (either that the recipient already
1241 1240 has, or previously specified in the bundle/changegroup). The format is
1242 1241 described more fully in "hg help internals.bdiff", but briefly:
1243 1242
1244 1243 +---------------------------------------------------------------+
1245 1244 | | | | |
1246 1245 | start offset | end offset | new length | content |
1247 1246 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1248 1247 | | | | |
1249 1248 +---------------------------------------------------------------+
1250 1249
1251 1250 Please note that the length field in the delta data does *not* include
1252 1251 itself.
1253 1252
1254 1253 In version 1, the delta is always applied against the previous node from
1255 1254 the changegroup or the first parent if this is the first entry in the
1256 1255 changegroup.
1257 1256
1258 1257 In version 2 and up, the delta base node is encoded in the entry in the
1259 1258 changegroup. This allows the delta to be expressed against any parent,
1260 1259 which can result in smaller deltas and more efficient encoding of data.
1261 1260
1262 1261 The *flags* field holds bitwise flags affecting the processing of revision
1263 1262 data. The following flags are defined:
1264 1263
1265 1264 32768
1266 1265 Censored revision. The revision's fulltext has been replaced by censor
1267 1266 metadata. May only occur on file revisions.
1268 1267
1269 1268 16384
1270 1269 Ellipsis revision. Revision hash does not match data (likely due to
1271 1270 rewritten parents).
1272 1271
1273 1272 8192
1274 1273 Externally stored. The revision fulltext contains "key:value" "\n"
1275 1274 delimited metadata defining an object stored elsewhere. Used by the LFS
1276 1275 extension.
1277 1276
1278 1277 For historical reasons, the integer values are identical to revlog version
1279 1278 1 per-revision storage flags and correspond to bits being set in this
1280 1279 2-byte field. Bits were allocated starting from the most-significant bit,
1281 1280 hence the reverse ordering and allocation of these flags.
1282 1281
1283 1282 Changeset Segment
1284 1283 =================
1285 1284
1286 1285 The *changeset segment* consists of a single *delta group* holding
1287 1286 changelog data. The *empty chunk* at the end of the *delta group* denotes
1288 1287 the boundary to the *manifest segment*.
1289 1288
1290 1289 Manifest Segment
1291 1290 ================
1292 1291
1293 1292 The *manifest segment* consists of a single *delta group* holding manifest
1294 1293 data. If treemanifests are in use, it contains only the manifest for the
1295 1294 root directory of the repository. Otherwise, it contains the entire
1296 1295 manifest data. The *empty chunk* at the end of the *delta group* denotes
1297 1296 the boundary to the next segment (either the *treemanifests segment* or
1298 1297 the *filelogs segment*, depending on version and the request options).
1299 1298
1300 1299 Treemanifests Segment
1301 1300 ---------------------
1302 1301
1303 1302 The *treemanifests segment* only exists in changegroup version "3", and
1304 1303 only if the 'treemanifest' param is part of the bundle2 changegroup part
1305 1304 (it is not possible to use changegroup version 3 outside of bundle2).
1306 1305 Aside from the filenames in the *treemanifests segment* containing a
1307 1306 trailing "/" character, it behaves identically to the *filelogs segment*
1308 1307 (see below). The final sub-segment is followed by an *empty chunk*
1309 1308 (logically, a sub-segment with filename size 0). This denotes the boundary
1310 1309 to the *filelogs segment*.
1311 1310
1312 1311 Filelogs Segment
1313 1312 ================
1314 1313
1315 1314 The *filelogs segment* consists of multiple sub-segments, each
1316 1315 corresponding to an individual file whose data is being described:
1317 1316
1318 1317 +--------------------------------------------------+
1319 1318 | | | | | |
1320 1319 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1321 1320 | | | | | (4 bytes) |
1322 1321 | | | | | |
1323 1322 +--------------------------------------------------+
1324 1323
1325 1324 The final filelog sub-segment is followed by an *empty chunk* (logically,
1326 1325 a sub-segment with filename size 0). This denotes the end of the segment
1327 1326 and of the overall changegroup.
1328 1327
1329 1328 Each filelog sub-segment consists of the following:
1330 1329
1331 1330 +------------------------------------------------------+
1332 1331 | | | |
1333 1332 | filename length | filename | delta group |
1334 1333 | (4 bytes) | (<length - 4> bytes) | (various) |
1335 1334 | | | |
1336 1335 +------------------------------------------------------+
1337 1336
1338 1337 That is, a *chunk* consisting of the filename (not terminated or padded)
1339 1338 followed by N chunks constituting the *delta group* for this file. The
1340 1339 *empty chunk* at the end of each *delta group* denotes the boundary to the
1341 1340 next filelog sub-segment.
1342 1341
1343 1342 non-existent subtopics print an error
1344 1343
1345 1344 $ hg help internals.foo
1346 1345 abort: no such help topic: internals.foo
1347 1346 (try 'hg help --keyword foo')
1348 1347 [255]
1349 1348
1350 1349 test advanced, deprecated and experimental options are hidden in command help
1351 1350 $ hg help debugoptADV
1352 1351 hg debugoptADV
1353 1352
1354 1353 (no help text available)
1355 1354
1356 1355 options:
1357 1356
1358 1357 (some details hidden, use --verbose to show complete help)
1359 1358 $ hg help debugoptDEP
1360 1359 hg debugoptDEP
1361 1360
1362 1361 (no help text available)
1363 1362
1364 1363 options:
1365 1364
1366 1365 (some details hidden, use --verbose to show complete help)
1367 1366
1368 1367 $ hg help debugoptEXP
1369 1368 hg debugoptEXP
1370 1369
1371 1370 (no help text available)
1372 1371
1373 1372 options:
1374 1373
1375 1374 (some details hidden, use --verbose to show complete help)
1376 1375
1377 1376 test advanced, deprecated and experimental options are shown with -v
1378 1377 $ hg help -v debugoptADV | grep aopt
1379 1378 --aopt option is (ADVANCED)
1380 1379 $ hg help -v debugoptDEP | grep dopt
1381 1380 --dopt option is (DEPRECATED)
1382 1381 $ hg help -v debugoptEXP | grep eopt
1383 1382 --eopt option is (EXPERIMENTAL)
1384 1383
1385 1384 #if gettext
1386 1385 test deprecated option is hidden with translation with untranslated description
1387 1386 (use many globy for not failing on changed transaction)
1388 1387 $ LANGUAGE=sv hg help debugoptDEP
1389 1388 hg debugoptDEP
1390 1389
1391 1390 (*) (glob)
1392 1391
1393 1392 options:
1394 1393
1395 1394 (some details hidden, use --verbose to show complete help)
1396 1395 #endif
1397 1396
1398 1397 Test commands that collide with topics (issue4240)
1399 1398
1400 1399 $ hg config -hq
1401 1400 hg config [-u] [NAME]...
1402 1401
1403 1402 show combined config settings from all hgrc files
1404 1403 $ hg showconfig -hq
1405 1404 hg config [-u] [NAME]...
1406 1405
1407 1406 show combined config settings from all hgrc files
1408 1407
1409 1408 Test a help topic
1410 1409
1411 1410 $ hg help dates
1412 1411 Date Formats
1413 1412 """"""""""""
1414 1413
1415 1414 Some commands allow the user to specify a date, e.g.:
1416 1415
1417 1416 - backout, commit, import, tag: Specify the commit date.
1418 1417 - log, revert, update: Select revision(s) by date.
1419 1418
1420 1419 Many date formats are valid. Here are some examples:
1421 1420
1422 1421 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1423 1422 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1424 1423 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1425 1424 - "Dec 6" (midnight)
1426 1425 - "13:18" (today assumed)
1427 1426 - "3:39" (3:39AM assumed)
1428 1427 - "3:39pm" (15:39)
1429 1428 - "2006-12-06 13:18:29" (ISO 8601 format)
1430 1429 - "2006-12-6 13:18"
1431 1430 - "2006-12-6"
1432 1431 - "12-6"
1433 1432 - "12/6"
1434 1433 - "12/6/6" (Dec 6 2006)
1435 1434 - "today" (midnight)
1436 1435 - "yesterday" (midnight)
1437 1436 - "now" - right now
1438 1437
1439 1438 Lastly, there is Mercurial's internal format:
1440 1439
1441 1440 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1442 1441
1443 1442 This is the internal representation format for dates. The first number is
1444 1443 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1445 1444 is the offset of the local timezone, in seconds west of UTC (negative if
1446 1445 the timezone is east of UTC).
1447 1446
1448 1447 The log command also accepts date ranges:
1449 1448
1450 1449 - "<DATE" - at or before a given date/time
1451 1450 - ">DATE" - on or after a given date/time
1452 1451 - "DATE to DATE" - a date range, inclusive
1453 1452 - "-DAYS" - within a given number of days from today
1454 1453
1455 1454 Test repeated config section name
1456 1455
1457 1456 $ hg help config.host
1458 1457 "http_proxy.host"
1459 1458 Host name and (optional) port of the proxy server, for example
1460 1459 "myproxy:8000".
1461 1460
1462 1461 "smtp.host"
1463 1462 Host name of mail server, e.g. "mail.example.com".
1464 1463
1465 1464
1466 1465 Test section name with dot
1467 1466
1468 1467 $ hg help config.ui.username
1469 1468 "ui.username"
1470 1469 The committer of a changeset created when running "commit". Typically
1471 1470 a person's name and email address, e.g. "Fred Widget
1472 1471 <fred@example.com>". Environment variables in the username are
1473 1472 expanded.
1474 1473
1475 1474 (default: "$EMAIL" or "username@hostname". If the username in hgrc is
1476 1475 empty, e.g. if the system admin set "username =" in the system hgrc,
1477 1476 it has to be specified manually or in a different hgrc file)
1478 1477
1479 1478
1480 1479 $ hg help config.annotate.git
1481 1480 abort: help section not found: config.annotate.git
1482 1481 [255]
1483 1482
1484 1483 $ hg help config.update.check
1485 1484 "commands.update.check"
1486 1485 Determines what level of checking 'hg update' will perform before
1487 1486 moving to a destination revision. Valid values are "abort", "none",
1488 1487 "linear", and "noconflict". "abort" always fails if the working
1489 1488 directory has uncommitted changes. "none" performs no checking, and
1490 1489 may result in a merge with uncommitted changes. "linear" allows any
1491 1490 update as long as it follows a straight line in the revision history,
1492 1491 and may trigger a merge with uncommitted changes. "noconflict" will
1493 1492 allow any update which would not trigger a merge with uncommitted
1494 1493 changes, if any are present. (default: "linear")
1495 1494
1496 1495
1497 1496 $ hg help config.commands.update.check
1498 1497 "commands.update.check"
1499 1498 Determines what level of checking 'hg update' will perform before
1500 1499 moving to a destination revision. Valid values are "abort", "none",
1501 1500 "linear", and "noconflict". "abort" always fails if the working
1502 1501 directory has uncommitted changes. "none" performs no checking, and
1503 1502 may result in a merge with uncommitted changes. "linear" allows any
1504 1503 update as long as it follows a straight line in the revision history,
1505 1504 and may trigger a merge with uncommitted changes. "noconflict" will
1506 1505 allow any update which would not trigger a merge with uncommitted
1507 1506 changes, if any are present. (default: "linear")
1508 1507
1509 1508
1510 1509 $ hg help config.ommands.update.check
1511 1510 abort: help section not found: config.ommands.update.check
1512 1511 [255]
1513 1512
1514 1513 Unrelated trailing paragraphs shouldn't be included
1515 1514
1516 1515 $ hg help config.extramsg | grep '^$'
1517 1516
1518 1517
1519 1518 Test capitalized section name
1520 1519
1521 1520 $ hg help scripting.HGPLAIN > /dev/null
1522 1521
1523 1522 Help subsection:
1524 1523
1525 1524 $ hg help config.charsets |grep "Email example:" > /dev/null
1526 1525 [1]
1527 1526
1528 1527 Show nested definitions
1529 1528 ("profiling.type"[break]"ls"[break]"stat"[break])
1530 1529
1531 1530 $ hg help config.type | egrep '^$'|wc -l
1532 1531 \s*3 (re)
1533 1532
1534 1533 $ hg help config.profiling.type.ls
1535 1534 "profiling.type.ls"
1536 1535 Use Python's built-in instrumenting profiler. This profiler works on
1537 1536 all platforms, but each line number it reports is the first line of
1538 1537 a function. This restriction makes it difficult to identify the
1539 1538 expensive parts of a non-trivial function.
1540 1539
1541 1540
1542 1541 Separate sections from subsections
1543 1542
1544 1543 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1545 1544 "format"
1546 1545 --------
1547 1546
1548 1547 "usegeneraldelta"
1549 1548
1550 1549 "dotencode"
1551 1550
1552 1551 "usefncache"
1553 1552
1554 1553 "usestore"
1555 1554
1556 1555 "sparse-revlog"
1557 1556
1558 1557 "revlog-compression"
1559 1558
1560 1559 "bookmarks-in-store"
1561 1560
1562 1561 "profiling"
1563 1562 -----------
1564 1563
1565 1564 "format"
1566 1565
1567 1566 "progress"
1568 1567 ----------
1569 1568
1570 1569 "format"
1571 1570
1572 1571
1573 1572 Last item in help config.*:
1574 1573
1575 1574 $ hg help config.`hg help config|grep '^ "'| \
1576 1575 > tail -1|sed 's![ "]*!!g'`| \
1577 1576 > grep 'hg help -c config' > /dev/null
1578 1577 [1]
1579 1578
1580 1579 note to use help -c for general hg help config:
1581 1580
1582 1581 $ hg help config |grep 'hg help -c config' > /dev/null
1583 1582
1584 1583 Test templating help
1585 1584
1586 1585 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1587 1586 desc String. The text of the changeset description.
1588 1587 diffstat String. Statistics of changes with the following format:
1589 1588 firstline Any text. Returns the first line of text.
1590 1589 nonempty Any text. Returns '(none)' if the string is empty.
1591 1590
1592 1591 Test deprecated items
1593 1592
1594 1593 $ hg help -v templating | grep currentbookmark
1595 1594 currentbookmark
1596 1595 $ hg help templating | (grep currentbookmark || true)
1597 1596
1598 1597 Test help hooks
1599 1598
1600 1599 $ cat > helphook1.py <<EOF
1601 1600 > from mercurial import help
1602 1601 >
1603 1602 > def rewrite(ui, topic, doc):
1604 1603 > return doc + b'\nhelphook1\n'
1605 1604 >
1606 1605 > def extsetup(ui):
1607 1606 > help.addtopichook(b'revisions', rewrite)
1608 1607 > EOF
1609 1608 $ cat > helphook2.py <<EOF
1610 1609 > from mercurial import help
1611 1610 >
1612 1611 > def rewrite(ui, topic, doc):
1613 1612 > return doc + b'\nhelphook2\n'
1614 1613 >
1615 1614 > def extsetup(ui):
1616 1615 > help.addtopichook(b'revisions', rewrite)
1617 1616 > EOF
1618 1617 $ echo '[extensions]' >> $HGRCPATH
1619 1618 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1620 1619 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1621 1620 $ hg help revsets | grep helphook
1622 1621 helphook1
1623 1622 helphook2
1624 1623
1625 1624 help -c should only show debug --debug
1626 1625
1627 1626 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1628 1627 [1]
1629 1628
1630 1629 help -c should only show deprecated for -v
1631 1630
1632 1631 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1633 1632 [1]
1634 1633
1635 1634 Test -s / --system
1636 1635
1637 1636 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1638 1637 > wc -l | sed -e 's/ //g'
1639 1638 0
1640 1639 $ hg help config.files --system unix | grep 'USER' | \
1641 1640 > wc -l | sed -e 's/ //g'
1642 1641 0
1643 1642
1644 1643 Test -e / -c / -k combinations
1645 1644
1646 1645 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1647 1646 Commands:
1648 1647 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1649 1648 Extensions:
1650 1649 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1651 1650 Topics:
1652 1651 Commands:
1653 1652 Extensions:
1654 1653 Extension Commands:
1655 1654 $ hg help -c schemes
1656 1655 abort: no such help topic: schemes
1657 1656 (try 'hg help --keyword schemes')
1658 1657 [255]
1659 1658 $ hg help -e schemes |head -1
1660 1659 schemes extension - extend schemes with shortcuts to repository swarms
1661 1660 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1662 1661 Commands:
1663 1662 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1664 1663 Extensions:
1665 1664 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1666 1665 Extensions:
1667 1666 Commands:
1668 1667 $ hg help -c commit > /dev/null
1669 1668 $ hg help -e -c commit > /dev/null
1670 1669 $ hg help -e commit
1671 1670 abort: no such help topic: commit
1672 1671 (try 'hg help --keyword commit')
1673 1672 [255]
1674 1673
1675 1674 Test keyword search help
1676 1675
1677 1676 $ cat > prefixedname.py <<EOF
1678 1677 > '''matched against word "clone"
1679 1678 > '''
1680 1679 > EOF
1681 1680 $ echo '[extensions]' >> $HGRCPATH
1682 1681 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1683 1682 $ hg help -k clone
1684 1683 Topics:
1685 1684
1686 1685 config Configuration Files
1687 1686 extensions Using Additional Features
1688 1687 glossary Glossary
1689 1688 phases Working with Phases
1690 1689 subrepos Subrepositories
1691 1690 urls URL Paths
1692 1691
1693 1692 Commands:
1694 1693
1695 1694 bookmarks create a new bookmark or list existing bookmarks
1696 1695 clone make a copy of an existing repository
1697 1696 paths show aliases for remote repositories
1698 1697 pull pull changes from the specified source
1699 1698 update update working directory (or switch revisions)
1700 1699
1701 1700 Extensions:
1702 1701
1703 1702 clonebundles advertise pre-generated bundles to seed clones
1704 1703 narrow create clones which fetch history data for subset of files
1705 1704 (EXPERIMENTAL)
1706 1705 prefixedname matched against word "clone"
1707 1706 relink recreates hardlinks between repository clones
1708 1707
1709 1708 Extension Commands:
1710 1709
1711 1710 qclone clone main and patch repository at same time
1712 1711
1713 1712 Test unfound topic
1714 1713
1715 1714 $ hg help nonexistingtopicthatwillneverexisteverever
1716 1715 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1717 1716 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1718 1717 [255]
1719 1718
1720 1719 Test unfound keyword
1721 1720
1722 1721 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1723 1722 abort: no matches
1724 1723 (try 'hg help' for a list of topics)
1725 1724 [255]
1726 1725
1727 1726 Test omit indicating for help
1728 1727
1729 1728 $ cat > addverboseitems.py <<EOF
1730 1729 > r'''extension to test omit indicating.
1731 1730 >
1732 1731 > This paragraph is never omitted (for extension)
1733 1732 >
1734 1733 > .. container:: verbose
1735 1734 >
1736 1735 > This paragraph is omitted,
1737 1736 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1738 1737 >
1739 1738 > This paragraph is never omitted, too (for extension)
1740 1739 > '''
1741 1740 > from __future__ import absolute_import
1742 1741 > from mercurial import commands, help
1743 1742 > testtopic = br"""This paragraph is never omitted (for topic).
1744 1743 >
1745 1744 > .. container:: verbose
1746 1745 >
1747 1746 > This paragraph is omitted,
1748 1747 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1749 1748 >
1750 1749 > This paragraph is never omitted, too (for topic)
1751 1750 > """
1752 1751 > def extsetup(ui):
1753 1752 > help.helptable.append(([b"topic-containing-verbose"],
1754 1753 > b"This is the topic to test omit indicating.",
1755 1754 > lambda ui: testtopic))
1756 1755 > EOF
1757 1756 $ echo '[extensions]' >> $HGRCPATH
1758 1757 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1759 1758 $ hg help addverboseitems
1760 1759 addverboseitems extension - extension to test omit indicating.
1761 1760
1762 1761 This paragraph is never omitted (for extension)
1763 1762
1764 1763 This paragraph is never omitted, too (for extension)
1765 1764
1766 1765 (some details hidden, use --verbose to show complete help)
1767 1766
1768 1767 no commands defined
1769 1768 $ hg help -v addverboseitems
1770 1769 addverboseitems extension - extension to test omit indicating.
1771 1770
1772 1771 This paragraph is never omitted (for extension)
1773 1772
1774 1773 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1775 1774 extension)
1776 1775
1777 1776 This paragraph is never omitted, too (for extension)
1778 1777
1779 1778 no commands defined
1780 1779 $ hg help topic-containing-verbose
1781 1780 This is the topic to test omit indicating.
1782 1781 """"""""""""""""""""""""""""""""""""""""""
1783 1782
1784 1783 This paragraph is never omitted (for topic).
1785 1784
1786 1785 This paragraph is never omitted, too (for topic)
1787 1786
1788 1787 (some details hidden, use --verbose to show complete help)
1789 1788 $ hg help -v topic-containing-verbose
1790 1789 This is the topic to test omit indicating.
1791 1790 """"""""""""""""""""""""""""""""""""""""""
1792 1791
1793 1792 This paragraph is never omitted (for topic).
1794 1793
1795 1794 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1796 1795 topic)
1797 1796
1798 1797 This paragraph is never omitted, too (for topic)
1799 1798
1800 1799 Test section lookup
1801 1800
1802 1801 $ hg help revset.merge
1803 1802 "merge()"
1804 1803 Changeset is a merge changeset.
1805 1804
1806 1805 $ hg help glossary.dag
1807 1806 DAG
1808 1807 The repository of changesets of a distributed version control system
1809 1808 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1810 1809 of nodes and edges, where nodes correspond to changesets and edges
1811 1810 imply a parent -> child relation. This graph can be visualized by
1812 1811 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1813 1812 limited by the requirement for children to have at most two parents.
1814 1813
1815 1814
1816 1815 $ hg help hgrc.paths
1817 1816 "paths"
1818 1817 -------
1819 1818
1820 1819 Assigns symbolic names and behavior to repositories.
1821 1820
1822 1821 Options are symbolic names defining the URL or directory that is the
1823 1822 location of the repository. Example:
1824 1823
1825 1824 [paths]
1826 1825 my_server = https://example.com/my_repo
1827 1826 local_path = /home/me/repo
1828 1827
1829 1828 These symbolic names can be used from the command line. To pull from
1830 1829 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1831 1830 local_path'.
1832 1831
1833 1832 Options containing colons (":") denote sub-options that can influence
1834 1833 behavior for that specific path. Example:
1835 1834
1836 1835 [paths]
1837 1836 my_server = https://example.com/my_path
1838 1837 my_server:pushurl = ssh://example.com/my_path
1839 1838
1840 1839 The following sub-options can be defined:
1841 1840
1842 1841 "pushurl"
1843 1842 The URL to use for push operations. If not defined, the location
1844 1843 defined by the path's main entry is used.
1845 1844
1846 1845 "pushrev"
1847 1846 A revset defining which revisions to push by default.
1848 1847
1849 1848 When 'hg push' is executed without a "-r" argument, the revset defined
1850 1849 by this sub-option is evaluated to determine what to push.
1851 1850
1852 1851 For example, a value of "." will push the working directory's revision
1853 1852 by default.
1854 1853
1855 1854 Revsets specifying bookmarks will not result in the bookmark being
1856 1855 pushed.
1857 1856
1858 1857 The following special named paths exist:
1859 1858
1860 1859 "default"
1861 1860 The URL or directory to use when no source or remote is specified.
1862 1861
1863 1862 'hg clone' will automatically define this path to the location the
1864 1863 repository was cloned from.
1865 1864
1866 1865 "default-push"
1867 1866 (deprecated) The URL or directory for the default 'hg push' location.
1868 1867 "default:pushurl" should be used instead.
1869 1868
1870 1869 $ hg help glossary.mcguffin
1871 1870 abort: help section not found: glossary.mcguffin
1872 1871 [255]
1873 1872
1874 1873 $ hg help glossary.mc.guffin
1875 1874 abort: help section not found: glossary.mc.guffin
1876 1875 [255]
1877 1876
1878 1877 $ hg help template.files
1879 1878 files List of strings. All files modified, added, or removed by
1880 1879 this changeset.
1881 1880 files(pattern)
1882 1881 All files of the current changeset matching the pattern. See
1883 1882 'hg help patterns'.
1884 1883
1885 1884 Test section lookup by translated message
1886 1885
1887 1886 str.lower() instead of encoding.lower(str) on translated message might
1888 1887 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1889 1888 as the second or later byte of multi-byte character.
1890 1889
1891 1890 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1892 1891 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1893 1892 replacement makes message meaningless.
1894 1893
1895 1894 This tests that section lookup by translated string isn't broken by
1896 1895 such str.lower().
1897 1896
1898 1897 $ "$PYTHON" <<EOF
1899 1898 > def escape(s):
1900 1899 > return b''.join(b'\\u%x' % ord(uc) for uc in s.decode('cp932'))
1901 1900 > # translation of "record" in ja_JP.cp932
1902 1901 > upper = b"\x8bL\x98^"
1903 1902 > # str.lower()-ed section name should be treated as different one
1904 1903 > lower = b"\x8bl\x98^"
1905 1904 > with open('ambiguous.py', 'wb') as fp:
1906 1905 > fp.write(b"""# ambiguous section names in ja_JP.cp932
1907 1906 > u'''summary of extension
1908 1907 >
1909 1908 > %s
1910 1909 > ----
1911 1910 >
1912 1911 > Upper name should show only this message
1913 1912 >
1914 1913 > %s
1915 1914 > ----
1916 1915 >
1917 1916 > Lower name should show only this message
1918 1917 >
1919 1918 > subsequent section
1920 1919 > ------------------
1921 1920 >
1922 1921 > This should be hidden at 'hg help ambiguous' with section name.
1923 1922 > '''
1924 1923 > """ % (escape(upper), escape(lower)))
1925 1924 > EOF
1926 1925
1927 1926 $ cat >> $HGRCPATH <<EOF
1928 1927 > [extensions]
1929 1928 > ambiguous = ./ambiguous.py
1930 1929 > EOF
1931 1930
1932 1931 $ "$PYTHON" <<EOF | sh
1933 1932 > from mercurial.utils import procutil
1934 1933 > upper = b"\x8bL\x98^"
1935 1934 > procutil.stdout.write(b"hg --encoding cp932 help -e ambiguous.%s\n" % upper)
1936 1935 > EOF
1937 1936 \x8bL\x98^ (esc)
1938 1937 ----
1939 1938
1940 1939 Upper name should show only this message
1941 1940
1942 1941
1943 1942 $ "$PYTHON" <<EOF | sh
1944 1943 > from mercurial.utils import procutil
1945 1944 > lower = b"\x8bl\x98^"
1946 1945 > procutil.stdout.write(b"hg --encoding cp932 help -e ambiguous.%s\n" % lower)
1947 1946 > EOF
1948 1947 \x8bl\x98^ (esc)
1949 1948 ----
1950 1949
1951 1950 Lower name should show only this message
1952 1951
1953 1952
1954 1953 $ cat >> $HGRCPATH <<EOF
1955 1954 > [extensions]
1956 1955 > ambiguous = !
1957 1956 > EOF
1958 1957
1959 1958 Show help content of disabled extensions
1960 1959
1961 1960 $ cat >> $HGRCPATH <<EOF
1962 1961 > [extensions]
1963 1962 > ambiguous = !./ambiguous.py
1964 1963 > EOF
1965 1964 $ hg help -e ambiguous
1966 1965 ambiguous extension - (no help text available)
1967 1966
1968 1967 (use 'hg help extensions' for information on enabling extensions)
1969 1968
1970 1969 Test dynamic list of merge tools only shows up once
1971 1970 $ hg help merge-tools
1972 1971 Merge Tools
1973 1972 """""""""""
1974 1973
1975 1974 To merge files Mercurial uses merge tools.
1976 1975
1977 1976 A merge tool combines two different versions of a file into a merged file.
1978 1977 Merge tools are given the two files and the greatest common ancestor of
1979 1978 the two file versions, so they can determine the changes made on both
1980 1979 branches.
1981 1980
1982 1981 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1983 1982 backout' and in several extensions.
1984 1983
1985 1984 Usually, the merge tool tries to automatically reconcile the files by
1986 1985 combining all non-overlapping changes that occurred separately in the two
1987 1986 different evolutions of the same initial base file. Furthermore, some
1988 1987 interactive merge programs make it easier to manually resolve conflicting
1989 1988 merges, either in a graphical way, or by inserting some conflict markers.
1990 1989 Mercurial does not include any interactive merge programs but relies on
1991 1990 external tools for that.
1992 1991
1993 1992 Available merge tools
1994 1993 =====================
1995 1994
1996 1995 External merge tools and their properties are configured in the merge-
1997 1996 tools configuration section - see hgrc(5) - but they can often just be
1998 1997 named by their executable.
1999 1998
2000 1999 A merge tool is generally usable if its executable can be found on the
2001 2000 system and if it can handle the merge. The executable is found if it is an
2002 2001 absolute or relative executable path or the name of an application in the
2003 2002 executable search path. The tool is assumed to be able to handle the merge
2004 2003 if it can handle symlinks if the file is a symlink, if it can handle
2005 2004 binary files if the file is binary, and if a GUI is available if the tool
2006 2005 requires a GUI.
2007 2006
2008 2007 There are some internal merge tools which can be used. The internal merge
2009 2008 tools are:
2010 2009
2011 2010 ":dump"
2012 2011 Creates three versions of the files to merge, containing the contents of
2013 2012 local, other and base. These files can then be used to perform a merge
2014 2013 manually. If the file to be merged is named "a.txt", these files will
2015 2014 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
2016 2015 they will be placed in the same directory as "a.txt".
2017 2016
2018 2017 This implies premerge. Therefore, files aren't dumped, if premerge runs
2019 2018 successfully. Use :forcedump to forcibly write files out.
2020 2019
2021 2020 (actual capabilities: binary, symlink)
2022 2021
2023 2022 ":fail"
2024 2023 Rather than attempting to merge files that were modified on both
2025 2024 branches, it marks them as unresolved. The resolve command must be used
2026 2025 to resolve these conflicts.
2027 2026
2028 2027 (actual capabilities: binary, symlink)
2029 2028
2030 2029 ":forcedump"
2031 2030 Creates three versions of the files as same as :dump, but omits
2032 2031 premerge.
2033 2032
2034 2033 (actual capabilities: binary, symlink)
2035 2034
2036 2035 ":local"
2037 2036 Uses the local 'p1()' version of files as the merged version.
2038 2037
2039 2038 (actual capabilities: binary, symlink)
2040 2039
2041 2040 ":merge"
2042 2041 Uses the internal non-interactive simple merge algorithm for merging
2043 2042 files. It will fail if there are any conflicts and leave markers in the
2044 2043 partially merged file. Markers will have two sections, one for each side
2045 2044 of merge.
2046 2045
2047 2046 ":merge-local"
2048 2047 Like :merge, but resolve all conflicts non-interactively in favor of the
2049 2048 local 'p1()' changes.
2050 2049
2051 2050 ":merge-other"
2052 2051 Like :merge, but resolve all conflicts non-interactively in favor of the
2053 2052 other 'p2()' changes.
2054 2053
2055 2054 ":merge3"
2056 2055 Uses the internal non-interactive simple merge algorithm for merging
2057 2056 files. It will fail if there are any conflicts and leave markers in the
2058 2057 partially merged file. Marker will have three sections, one from each
2059 2058 side of the merge and one for the base content.
2060 2059
2061 2060 ":other"
2062 2061 Uses the other 'p2()' version of files as the merged version.
2063 2062
2064 2063 (actual capabilities: binary, symlink)
2065 2064
2066 2065 ":prompt"
2067 2066 Asks the user which of the local 'p1()' or the other 'p2()' version to
2068 2067 keep as the merged version.
2069 2068
2070 2069 (actual capabilities: binary, symlink)
2071 2070
2072 2071 ":tagmerge"
2073 2072 Uses the internal tag merge algorithm (experimental).
2074 2073
2075 2074 ":union"
2076 2075 Uses the internal non-interactive simple merge algorithm for merging
2077 2076 files. It will use both left and right sides for conflict regions. No
2078 2077 markers are inserted.
2079 2078
2080 2079 Internal tools are always available and do not require a GUI but will by
2081 2080 default not handle symlinks or binary files. See next section for detail
2082 2081 about "actual capabilities" described above.
2083 2082
2084 2083 Choosing a merge tool
2085 2084 =====================
2086 2085
2087 2086 Mercurial uses these rules when deciding which merge tool to use:
2088 2087
2089 2088 1. If a tool has been specified with the --tool option to merge or
2090 2089 resolve, it is used. If it is the name of a tool in the merge-tools
2091 2090 configuration, its configuration is used. Otherwise the specified tool
2092 2091 must be executable by the shell.
2093 2092 2. If the "HGMERGE" environment variable is present, its value is used and
2094 2093 must be executable by the shell.
2095 2094 3. If the filename of the file to be merged matches any of the patterns in
2096 2095 the merge-patterns configuration section, the first usable merge tool
2097 2096 corresponding to a matching pattern is used.
2098 2097 4. If ui.merge is set it will be considered next. If the value is not the
2099 2098 name of a configured tool, the specified value is used and must be
2100 2099 executable by the shell. Otherwise the named tool is used if it is
2101 2100 usable.
2102 2101 5. If any usable merge tools are present in the merge-tools configuration
2103 2102 section, the one with the highest priority is used.
2104 2103 6. If a program named "hgmerge" can be found on the system, it is used -
2105 2104 but it will by default not be used for symlinks and binary files.
2106 2105 7. If the file to be merged is not binary and is not a symlink, then
2107 2106 internal ":merge" is used.
2108 2107 8. Otherwise, ":prompt" is used.
2109 2108
2110 2109 For historical reason, Mercurial treats merge tools as below while
2111 2110 examining rules above.
2112 2111
2113 2112 step specified via binary symlink
2114 2113 ----------------------------------
2115 2114 1. --tool o/o o/o
2116 2115 2. HGMERGE o/o o/o
2117 2116 3. merge-patterns o/o(*) x/?(*)
2118 2117 4. ui.merge x/?(*) x/?(*)
2119 2118
2120 2119 Each capability column indicates Mercurial behavior for internal/external
2121 2120 merge tools at examining each rule.
2122 2121
2123 2122 - "o": "assume that a tool has capability"
2124 2123 - "x": "assume that a tool does not have capability"
2125 2124 - "?": "check actual capability of a tool"
2126 2125
2127 2126 If "merge.strict-capability-check" configuration is true, Mercurial checks
2128 2127 capabilities of merge tools strictly in (*) cases above (= each capability
2129 2128 column becomes "?/?"). It is false by default for backward compatibility.
2130 2129
2131 2130 Note:
2132 2131 After selecting a merge program, Mercurial will by default attempt to
2133 2132 merge the files using a simple merge algorithm first. Only if it
2134 2133 doesn't succeed because of conflicting changes will Mercurial actually
2135 2134 execute the merge program. Whether to use the simple merge algorithm
2136 2135 first can be controlled by the premerge setting of the merge tool.
2137 2136 Premerge is enabled by default unless the file is binary or a symlink.
2138 2137
2139 2138 See the merge-tools and ui sections of hgrc(5) for details on the
2140 2139 configuration of merge tools.
2141 2140
2142 2141 Compression engines listed in `hg help bundlespec`
2143 2142
2144 2143 $ hg help bundlespec | grep gzip
2145 2144 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
2146 2145 An algorithm that produces smaller bundles than "gzip".
2147 2146 This engine will likely produce smaller bundles than "gzip" but will be
2148 2147 "gzip"
2149 2148 better compression than "gzip". It also frequently yields better (?)
2150 2149
2151 2150 Test usage of section marks in help documents
2152 2151
2153 2152 $ cd "$TESTDIR"/../doc
2154 2153 $ "$PYTHON" check-seclevel.py
2155 2154 $ cd $TESTTMP
2156 2155
2157 2156 #if serve
2158 2157
2159 2158 Test the help pages in hgweb.
2160 2159
2161 2160 Dish up an empty repo; serve it cold.
2162 2161
2163 2162 $ hg init "$TESTTMP/test"
2164 2163 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
2165 2164 $ cat hg.pid >> $DAEMON_PIDS
2166 2165
2167 2166 $ get-with-headers.py $LOCALIP:$HGPORT "help"
2168 2167 200 Script output follows
2169 2168
2170 2169 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2171 2170 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2172 2171 <head>
2173 2172 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2174 2173 <meta name="robots" content="index, nofollow" />
2175 2174 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2176 2175 <script type="text/javascript" src="/static/mercurial.js"></script>
2177 2176
2178 2177 <title>Help: Index</title>
2179 2178 </head>
2180 2179 <body>
2181 2180
2182 2181 <div class="container">
2183 2182 <div class="menu">
2184 2183 <div class="logo">
2185 2184 <a href="https://mercurial-scm.org/">
2186 2185 <img src="/static/hglogo.png" alt="mercurial" /></a>
2187 2186 </div>
2188 2187 <ul>
2189 2188 <li><a href="/shortlog">log</a></li>
2190 2189 <li><a href="/graph">graph</a></li>
2191 2190 <li><a href="/tags">tags</a></li>
2192 2191 <li><a href="/bookmarks">bookmarks</a></li>
2193 2192 <li><a href="/branches">branches</a></li>
2194 2193 </ul>
2195 2194 <ul>
2196 2195 <li class="active">help</li>
2197 2196 </ul>
2198 2197 </div>
2199 2198
2200 2199 <div class="main">
2201 2200 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2202 2201
2203 2202 <form class="search" action="/log">
2204 2203
2205 2204 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
2206 2205 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2207 2206 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2208 2207 </form>
2209 2208 <table class="bigtable">
2210 2209 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
2211 2210
2212 2211 <tr><td>
2213 2212 <a href="/help/bundlespec">
2214 2213 bundlespec
2215 2214 </a>
2216 2215 </td><td>
2217 2216 Bundle File Formats
2218 2217 </td></tr>
2219 2218 <tr><td>
2220 2219 <a href="/help/color">
2221 2220 color
2222 2221 </a>
2223 2222 </td><td>
2224 2223 Colorizing Outputs
2225 2224 </td></tr>
2226 2225 <tr><td>
2227 2226 <a href="/help/config">
2228 2227 config
2229 2228 </a>
2230 2229 </td><td>
2231 2230 Configuration Files
2232 2231 </td></tr>
2233 2232 <tr><td>
2234 2233 <a href="/help/dates">
2235 2234 dates
2236 2235 </a>
2237 2236 </td><td>
2238 2237 Date Formats
2239 2238 </td></tr>
2240 2239 <tr><td>
2241 2240 <a href="/help/deprecated">
2242 2241 deprecated
2243 2242 </a>
2244 2243 </td><td>
2245 2244 Deprecated Features
2246 2245 </td></tr>
2247 2246 <tr><td>
2248 2247 <a href="/help/diffs">
2249 2248 diffs
2250 2249 </a>
2251 2250 </td><td>
2252 2251 Diff Formats
2253 2252 </td></tr>
2254 2253 <tr><td>
2255 2254 <a href="/help/environment">
2256 2255 environment
2257 2256 </a>
2258 2257 </td><td>
2259 2258 Environment Variables
2260 2259 </td></tr>
2261 2260 <tr><td>
2262 2261 <a href="/help/extensions">
2263 2262 extensions
2264 2263 </a>
2265 2264 </td><td>
2266 2265 Using Additional Features
2267 2266 </td></tr>
2268 2267 <tr><td>
2269 2268 <a href="/help/filesets">
2270 2269 filesets
2271 2270 </a>
2272 2271 </td><td>
2273 2272 Specifying File Sets
2274 2273 </td></tr>
2275 2274 <tr><td>
2276 2275 <a href="/help/flags">
2277 2276 flags
2278 2277 </a>
2279 2278 </td><td>
2280 2279 Command-line flags
2281 2280 </td></tr>
2282 2281 <tr><td>
2283 2282 <a href="/help/glossary">
2284 2283 glossary
2285 2284 </a>
2286 2285 </td><td>
2287 2286 Glossary
2288 2287 </td></tr>
2289 2288 <tr><td>
2290 2289 <a href="/help/hgignore">
2291 2290 hgignore
2292 2291 </a>
2293 2292 </td><td>
2294 2293 Syntax for Mercurial Ignore Files
2295 2294 </td></tr>
2296 2295 <tr><td>
2297 2296 <a href="/help/hgweb">
2298 2297 hgweb
2299 2298 </a>
2300 2299 </td><td>
2301 2300 Configuring hgweb
2302 2301 </td></tr>
2303 2302 <tr><td>
2304 2303 <a href="/help/internals">
2305 2304 internals
2306 2305 </a>
2307 2306 </td><td>
2308 2307 Technical implementation topics
2309 2308 </td></tr>
2310 2309 <tr><td>
2311 2310 <a href="/help/merge-tools">
2312 2311 merge-tools
2313 2312 </a>
2314 2313 </td><td>
2315 2314 Merge Tools
2316 2315 </td></tr>
2317 2316 <tr><td>
2318 2317 <a href="/help/pager">
2319 2318 pager
2320 2319 </a>
2321 2320 </td><td>
2322 2321 Pager Support
2323 2322 </td></tr>
2324 2323 <tr><td>
2325 2324 <a href="/help/patterns">
2326 2325 patterns
2327 2326 </a>
2328 2327 </td><td>
2329 2328 File Name Patterns
2330 2329 </td></tr>
2331 2330 <tr><td>
2332 2331 <a href="/help/phases">
2333 2332 phases
2334 2333 </a>
2335 2334 </td><td>
2336 2335 Working with Phases
2337 2336 </td></tr>
2338 2337 <tr><td>
2339 2338 <a href="/help/revisions">
2340 2339 revisions
2341 2340 </a>
2342 2341 </td><td>
2343 2342 Specifying Revisions
2344 2343 </td></tr>
2345 2344 <tr><td>
2346 2345 <a href="/help/scripting">
2347 2346 scripting
2348 2347 </a>
2349 2348 </td><td>
2350 2349 Using Mercurial from scripts and automation
2351 2350 </td></tr>
2352 2351 <tr><td>
2353 2352 <a href="/help/subrepos">
2354 2353 subrepos
2355 2354 </a>
2356 2355 </td><td>
2357 2356 Subrepositories
2358 2357 </td></tr>
2359 2358 <tr><td>
2360 2359 <a href="/help/templating">
2361 2360 templating
2362 2361 </a>
2363 2362 </td><td>
2364 2363 Template Usage
2365 2364 </td></tr>
2366 2365 <tr><td>
2367 2366 <a href="/help/urls">
2368 2367 urls
2369 2368 </a>
2370 2369 </td><td>
2371 2370 URL Paths
2372 2371 </td></tr>
2373 2372 <tr><td>
2374 2373 <a href="/help/topic-containing-verbose">
2375 2374 topic-containing-verbose
2376 2375 </a>
2377 2376 </td><td>
2378 2377 This is the topic to test omit indicating.
2379 2378 </td></tr>
2380 2379
2381 2380
2382 2381 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2383 2382
2384 2383 <tr><td>
2385 2384 <a href="/help/abort">
2386 2385 abort
2387 2386 </a>
2388 2387 </td><td>
2389 2388 abort an unfinished operation (EXPERIMENTAL)
2390 2389 </td></tr>
2391 2390 <tr><td>
2392 2391 <a href="/help/add">
2393 2392 add
2394 2393 </a>
2395 2394 </td><td>
2396 2395 add the specified files on the next commit
2397 2396 </td></tr>
2398 2397 <tr><td>
2399 2398 <a href="/help/annotate">
2400 2399 annotate
2401 2400 </a>
2402 2401 </td><td>
2403 2402 show changeset information by line for each file
2404 2403 </td></tr>
2405 2404 <tr><td>
2406 2405 <a href="/help/clone">
2407 2406 clone
2408 2407 </a>
2409 2408 </td><td>
2410 2409 make a copy of an existing repository
2411 2410 </td></tr>
2412 2411 <tr><td>
2413 2412 <a href="/help/commit">
2414 2413 commit
2415 2414 </a>
2416 2415 </td><td>
2417 2416 commit the specified files or all outstanding changes
2418 2417 </td></tr>
2419 2418 <tr><td>
2420 2419 <a href="/help/continue">
2421 2420 continue
2422 2421 </a>
2423 2422 </td><td>
2424 2423 resumes an interrupted operation (EXPERIMENTAL)
2425 2424 </td></tr>
2426 2425 <tr><td>
2427 2426 <a href="/help/diff">
2428 2427 diff
2429 2428 </a>
2430 2429 </td><td>
2431 2430 diff repository (or selected files)
2432 2431 </td></tr>
2433 2432 <tr><td>
2434 2433 <a href="/help/export">
2435 2434 export
2436 2435 </a>
2437 2436 </td><td>
2438 2437 dump the header and diffs for one or more changesets
2439 2438 </td></tr>
2440 2439 <tr><td>
2441 2440 <a href="/help/forget">
2442 2441 forget
2443 2442 </a>
2444 2443 </td><td>
2445 2444 forget the specified files on the next commit
2446 2445 </td></tr>
2447 2446 <tr><td>
2448 2447 <a href="/help/init">
2449 2448 init
2450 2449 </a>
2451 2450 </td><td>
2452 2451 create a new repository in the given directory
2453 2452 </td></tr>
2454 2453 <tr><td>
2455 2454 <a href="/help/log">
2456 2455 log
2457 2456 </a>
2458 2457 </td><td>
2459 2458 show revision history of entire repository or files
2460 2459 </td></tr>
2461 2460 <tr><td>
2462 2461 <a href="/help/merge">
2463 2462 merge
2464 2463 </a>
2465 2464 </td><td>
2466 2465 merge another revision into working directory
2467 2466 </td></tr>
2468 2467 <tr><td>
2469 2468 <a href="/help/pull">
2470 2469 pull
2471 2470 </a>
2472 2471 </td><td>
2473 2472 pull changes from the specified source
2474 2473 </td></tr>
2475 2474 <tr><td>
2476 2475 <a href="/help/push">
2477 2476 push
2478 2477 </a>
2479 2478 </td><td>
2480 2479 push changes to the specified destination
2481 2480 </td></tr>
2482 2481 <tr><td>
2483 2482 <a href="/help/remove">
2484 2483 remove
2485 2484 </a>
2486 2485 </td><td>
2487 2486 remove the specified files on the next commit
2488 2487 </td></tr>
2489 2488 <tr><td>
2490 2489 <a href="/help/serve">
2491 2490 serve
2492 2491 </a>
2493 2492 </td><td>
2494 2493 start stand-alone webserver
2495 2494 </td></tr>
2496 2495 <tr><td>
2497 2496 <a href="/help/status">
2498 2497 status
2499 2498 </a>
2500 2499 </td><td>
2501 2500 show changed files in the working directory
2502 2501 </td></tr>
2503 2502 <tr><td>
2504 2503 <a href="/help/summary">
2505 2504 summary
2506 2505 </a>
2507 2506 </td><td>
2508 2507 summarize working directory state
2509 2508 </td></tr>
2510 2509 <tr><td>
2511 2510 <a href="/help/update">
2512 2511 update
2513 2512 </a>
2514 2513 </td><td>
2515 2514 update working directory (or switch revisions)
2516 2515 </td></tr>
2517 2516
2518 2517
2519 2518
2520 2519 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2521 2520
2522 2521 <tr><td>
2523 2522 <a href="/help/addremove">
2524 2523 addremove
2525 2524 </a>
2526 2525 </td><td>
2527 2526 add all new files, delete all missing files
2528 2527 </td></tr>
2529 2528 <tr><td>
2530 2529 <a href="/help/archive">
2531 2530 archive
2532 2531 </a>
2533 2532 </td><td>
2534 2533 create an unversioned archive of a repository revision
2535 2534 </td></tr>
2536 2535 <tr><td>
2537 2536 <a href="/help/backout">
2538 2537 backout
2539 2538 </a>
2540 2539 </td><td>
2541 2540 reverse effect of earlier changeset
2542 2541 </td></tr>
2543 2542 <tr><td>
2544 2543 <a href="/help/bisect">
2545 2544 bisect
2546 2545 </a>
2547 2546 </td><td>
2548 2547 subdivision search of changesets
2549 2548 </td></tr>
2550 2549 <tr><td>
2551 2550 <a href="/help/bookmarks">
2552 2551 bookmarks
2553 2552 </a>
2554 2553 </td><td>
2555 2554 create a new bookmark or list existing bookmarks
2556 2555 </td></tr>
2557 2556 <tr><td>
2558 2557 <a href="/help/branch">
2559 2558 branch
2560 2559 </a>
2561 2560 </td><td>
2562 2561 set or show the current branch name
2563 2562 </td></tr>
2564 2563 <tr><td>
2565 2564 <a href="/help/branches">
2566 2565 branches
2567 2566 </a>
2568 2567 </td><td>
2569 2568 list repository named branches
2570 2569 </td></tr>
2571 2570 <tr><td>
2572 2571 <a href="/help/bundle">
2573 2572 bundle
2574 2573 </a>
2575 2574 </td><td>
2576 2575 create a bundle file
2577 2576 </td></tr>
2578 2577 <tr><td>
2579 2578 <a href="/help/cat">
2580 2579 cat
2581 2580 </a>
2582 2581 </td><td>
2583 2582 output the current or given revision of files
2584 2583 </td></tr>
2585 2584 <tr><td>
2586 2585 <a href="/help/config">
2587 2586 config
2588 2587 </a>
2589 2588 </td><td>
2590 2589 show combined config settings from all hgrc files
2591 2590 </td></tr>
2592 2591 <tr><td>
2593 2592 <a href="/help/copy">
2594 2593 copy
2595 2594 </a>
2596 2595 </td><td>
2597 2596 mark files as copied for the next commit
2598 2597 </td></tr>
2599 2598 <tr><td>
2600 2599 <a href="/help/files">
2601 2600 files
2602 2601 </a>
2603 2602 </td><td>
2604 2603 list tracked files
2605 2604 </td></tr>
2606 2605 <tr><td>
2607 2606 <a href="/help/graft">
2608 2607 graft
2609 2608 </a>
2610 2609 </td><td>
2611 2610 copy changes from other branches onto the current branch
2612 2611 </td></tr>
2613 2612 <tr><td>
2614 2613 <a href="/help/grep">
2615 2614 grep
2616 2615 </a>
2617 2616 </td><td>
2618 2617 search for a pattern in specified files
2619 2618 </td></tr>
2620 2619 <tr><td>
2621 2620 <a href="/help/hashelp">
2622 2621 hashelp
2623 2622 </a>
2624 2623 </td><td>
2625 2624 Extension command's help
2626 2625 </td></tr>
2627 2626 <tr><td>
2628 2627 <a href="/help/heads">
2629 2628 heads
2630 2629 </a>
2631 2630 </td><td>
2632 2631 show branch heads
2633 2632 </td></tr>
2634 2633 <tr><td>
2635 2634 <a href="/help/help">
2636 2635 help
2637 2636 </a>
2638 2637 </td><td>
2639 2638 show help for a given topic or a help overview
2640 2639 </td></tr>
2641 2640 <tr><td>
2642 2641 <a href="/help/hgalias">
2643 2642 hgalias
2644 2643 </a>
2645 2644 </td><td>
2646 2645 My doc
2647 2646 </td></tr>
2648 2647 <tr><td>
2649 2648 <a href="/help/hgaliasnodoc">
2650 2649 hgaliasnodoc
2651 2650 </a>
2652 2651 </td><td>
2653 2652 summarize working directory state
2654 2653 </td></tr>
2655 2654 <tr><td>
2656 2655 <a href="/help/identify">
2657 2656 identify
2658 2657 </a>
2659 2658 </td><td>
2660 2659 identify the working directory or specified revision
2661 2660 </td></tr>
2662 2661 <tr><td>
2663 2662 <a href="/help/import">
2664 2663 import
2665 2664 </a>
2666 2665 </td><td>
2667 2666 import an ordered set of patches
2668 2667 </td></tr>
2669 2668 <tr><td>
2670 2669 <a href="/help/incoming">
2671 2670 incoming
2672 2671 </a>
2673 2672 </td><td>
2674 2673 show new changesets found in source
2675 2674 </td></tr>
2676 2675 <tr><td>
2677 2676 <a href="/help/manifest">
2678 2677 manifest
2679 2678 </a>
2680 2679 </td><td>
2681 2680 output the current or given revision of the project manifest
2682 2681 </td></tr>
2683 2682 <tr><td>
2684 2683 <a href="/help/nohelp">
2685 2684 nohelp
2686 2685 </a>
2687 2686 </td><td>
2688 2687 (no help text available)
2689 2688 </td></tr>
2690 2689 <tr><td>
2691 2690 <a href="/help/outgoing">
2692 2691 outgoing
2693 2692 </a>
2694 2693 </td><td>
2695 2694 show changesets not found in the destination
2696 2695 </td></tr>
2697 2696 <tr><td>
2698 2697 <a href="/help/paths">
2699 2698 paths
2700 2699 </a>
2701 2700 </td><td>
2702 2701 show aliases for remote repositories
2703 2702 </td></tr>
2704 2703 <tr><td>
2705 2704 <a href="/help/phase">
2706 2705 phase
2707 2706 </a>
2708 2707 </td><td>
2709 2708 set or show the current phase name
2710 2709 </td></tr>
2711 2710 <tr><td>
2712 2711 <a href="/help/recover">
2713 2712 recover
2714 2713 </a>
2715 2714 </td><td>
2716 2715 roll back an interrupted transaction
2717 2716 </td></tr>
2718 2717 <tr><td>
2719 2718 <a href="/help/rename">
2720 2719 rename
2721 2720 </a>
2722 2721 </td><td>
2723 2722 rename files; equivalent of copy + remove
2724 2723 </td></tr>
2725 2724 <tr><td>
2726 2725 <a href="/help/resolve">
2727 2726 resolve
2728 2727 </a>
2729 2728 </td><td>
2730 2729 redo merges or set/view the merge status of files
2731 2730 </td></tr>
2732 2731 <tr><td>
2733 2732 <a href="/help/revert">
2734 2733 revert
2735 2734 </a>
2736 2735 </td><td>
2737 2736 restore files to their checkout state
2738 2737 </td></tr>
2739 2738 <tr><td>
2740 2739 <a href="/help/root">
2741 2740 root
2742 2741 </a>
2743 2742 </td><td>
2744 2743 print the root (top) of the current working directory
2745 2744 </td></tr>
2746 2745 <tr><td>
2747 2746 <a href="/help/shellalias">
2748 2747 shellalias
2749 2748 </a>
2750 2749 </td><td>
2751 2750 (no help text available)
2752 2751 </td></tr>
2753 2752 <tr><td>
2754 2753 <a href="/help/shelve">
2755 2754 shelve
2756 2755 </a>
2757 2756 </td><td>
2758 2757 save and set aside changes from the working directory
2759 2758 </td></tr>
2760 2759 <tr><td>
2761 2760 <a href="/help/tag">
2762 2761 tag
2763 2762 </a>
2764 2763 </td><td>
2765 2764 add one or more tags for the current or given revision
2766 2765 </td></tr>
2767 2766 <tr><td>
2768 2767 <a href="/help/tags">
2769 2768 tags
2770 2769 </a>
2771 2770 </td><td>
2772 2771 list repository tags
2773 2772 </td></tr>
2774 2773 <tr><td>
2775 2774 <a href="/help/unbundle">
2776 2775 unbundle
2777 2776 </a>
2778 2777 </td><td>
2779 2778 apply one or more bundle files
2780 2779 </td></tr>
2781 2780 <tr><td>
2782 2781 <a href="/help/unshelve">
2783 2782 unshelve
2784 2783 </a>
2785 2784 </td><td>
2786 2785 restore a shelved change to the working directory
2787 2786 </td></tr>
2788 2787 <tr><td>
2789 2788 <a href="/help/verify">
2790 2789 verify
2791 2790 </a>
2792 2791 </td><td>
2793 2792 verify the integrity of the repository
2794 2793 </td></tr>
2795 2794 <tr><td>
2796 2795 <a href="/help/version">
2797 2796 version
2798 2797 </a>
2799 2798 </td><td>
2800 2799 output version and copyright information
2801 2800 </td></tr>
2802 2801
2803 2802
2804 2803 </table>
2805 2804 </div>
2806 2805 </div>
2807 2806
2808 2807
2809 2808
2810 2809 </body>
2811 2810 </html>
2812 2811
2813 2812
2814 2813 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2815 2814 200 Script output follows
2816 2815
2817 2816 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2818 2817 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2819 2818 <head>
2820 2819 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2821 2820 <meta name="robots" content="index, nofollow" />
2822 2821 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2823 2822 <script type="text/javascript" src="/static/mercurial.js"></script>
2824 2823
2825 2824 <title>Help: add</title>
2826 2825 </head>
2827 2826 <body>
2828 2827
2829 2828 <div class="container">
2830 2829 <div class="menu">
2831 2830 <div class="logo">
2832 2831 <a href="https://mercurial-scm.org/">
2833 2832 <img src="/static/hglogo.png" alt="mercurial" /></a>
2834 2833 </div>
2835 2834 <ul>
2836 2835 <li><a href="/shortlog">log</a></li>
2837 2836 <li><a href="/graph">graph</a></li>
2838 2837 <li><a href="/tags">tags</a></li>
2839 2838 <li><a href="/bookmarks">bookmarks</a></li>
2840 2839 <li><a href="/branches">branches</a></li>
2841 2840 </ul>
2842 2841 <ul>
2843 2842 <li class="active"><a href="/help">help</a></li>
2844 2843 </ul>
2845 2844 </div>
2846 2845
2847 2846 <div class="main">
2848 2847 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2849 2848 <h3>Help: add</h3>
2850 2849
2851 2850 <form class="search" action="/log">
2852 2851
2853 2852 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
2854 2853 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2855 2854 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2856 2855 </form>
2857 2856 <div id="doc">
2858 2857 <p>
2859 2858 hg add [OPTION]... [FILE]...
2860 2859 </p>
2861 2860 <p>
2862 2861 add the specified files on the next commit
2863 2862 </p>
2864 2863 <p>
2865 2864 Schedule files to be version controlled and added to the
2866 2865 repository.
2867 2866 </p>
2868 2867 <p>
2869 2868 The files will be added to the repository at the next commit. To
2870 2869 undo an add before that, see 'hg forget'.
2871 2870 </p>
2872 2871 <p>
2873 2872 If no names are given, add all files to the repository (except
2874 2873 files matching &quot;.hgignore&quot;).
2875 2874 </p>
2876 2875 <p>
2877 2876 Examples:
2878 2877 </p>
2879 2878 <ul>
2880 2879 <li> New (unknown) files are added automatically by 'hg add':
2881 2880 <pre>
2882 2881 \$ ls (re)
2883 2882 foo.c
2884 2883 \$ hg status (re)
2885 2884 ? foo.c
2886 2885 \$ hg add (re)
2887 2886 adding foo.c
2888 2887 \$ hg status (re)
2889 2888 A foo.c
2890 2889 </pre>
2891 2890 <li> Specific files to be added can be specified:
2892 2891 <pre>
2893 2892 \$ ls (re)
2894 2893 bar.c foo.c
2895 2894 \$ hg status (re)
2896 2895 ? bar.c
2897 2896 ? foo.c
2898 2897 \$ hg add bar.c (re)
2899 2898 \$ hg status (re)
2900 2899 A bar.c
2901 2900 ? foo.c
2902 2901 </pre>
2903 2902 </ul>
2904 2903 <p>
2905 2904 Returns 0 if all files are successfully added.
2906 2905 </p>
2907 2906 <p>
2908 2907 options ([+] can be repeated):
2909 2908 </p>
2910 2909 <table>
2911 2910 <tr><td>-I</td>
2912 2911 <td>--include PATTERN [+]</td>
2913 2912 <td>include names matching the given patterns</td></tr>
2914 2913 <tr><td>-X</td>
2915 2914 <td>--exclude PATTERN [+]</td>
2916 2915 <td>exclude names matching the given patterns</td></tr>
2917 2916 <tr><td>-S</td>
2918 2917 <td>--subrepos</td>
2919 2918 <td>recurse into subrepositories</td></tr>
2920 2919 <tr><td>-n</td>
2921 2920 <td>--dry-run</td>
2922 2921 <td>do not perform actions, just print output</td></tr>
2923 2922 </table>
2924 2923 <p>
2925 2924 global options ([+] can be repeated):
2926 2925 </p>
2927 2926 <table>
2928 2927 <tr><td>-R</td>
2929 2928 <td>--repository REPO</td>
2930 2929 <td>repository root directory or name of overlay bundle file</td></tr>
2931 2930 <tr><td></td>
2932 2931 <td>--cwd DIR</td>
2933 2932 <td>change working directory</td></tr>
2934 2933 <tr><td>-y</td>
2935 2934 <td>--noninteractive</td>
2936 2935 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2937 2936 <tr><td>-q</td>
2938 2937 <td>--quiet</td>
2939 2938 <td>suppress output</td></tr>
2940 2939 <tr><td>-v</td>
2941 2940 <td>--verbose</td>
2942 2941 <td>enable additional output</td></tr>
2943 2942 <tr><td></td>
2944 2943 <td>--color TYPE</td>
2945 2944 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2946 2945 <tr><td></td>
2947 2946 <td>--config CONFIG [+]</td>
2948 2947 <td>set/override config option (use 'section.name=value')</td></tr>
2949 2948 <tr><td></td>
2950 2949 <td>--debug</td>
2951 2950 <td>enable debugging output</td></tr>
2952 2951 <tr><td></td>
2953 2952 <td>--debugger</td>
2954 2953 <td>start debugger</td></tr>
2955 2954 <tr><td></td>
2956 2955 <td>--encoding ENCODE</td>
2957 2956 <td>set the charset encoding (default: ascii)</td></tr>
2958 2957 <tr><td></td>
2959 2958 <td>--encodingmode MODE</td>
2960 2959 <td>set the charset encoding mode (default: strict)</td></tr>
2961 2960 <tr><td></td>
2962 2961 <td>--traceback</td>
2963 2962 <td>always print a traceback on exception</td></tr>
2964 2963 <tr><td></td>
2965 2964 <td>--time</td>
2966 2965 <td>time how long the command takes</td></tr>
2967 2966 <tr><td></td>
2968 2967 <td>--profile</td>
2969 2968 <td>print command execution profile</td></tr>
2970 2969 <tr><td></td>
2971 2970 <td>--version</td>
2972 2971 <td>output version information and exit</td></tr>
2973 2972 <tr><td>-h</td>
2974 2973 <td>--help</td>
2975 2974 <td>display help and exit</td></tr>
2976 2975 <tr><td></td>
2977 2976 <td>--hidden</td>
2978 2977 <td>consider hidden changesets</td></tr>
2979 2978 <tr><td></td>
2980 2979 <td>--pager TYPE</td>
2981 2980 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2982 2981 </table>
2983 2982
2984 2983 </div>
2985 2984 </div>
2986 2985 </div>
2987 2986
2988 2987
2989 2988
2990 2989 </body>
2991 2990 </html>
2992 2991
2993 2992
2994 2993 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2995 2994 200 Script output follows
2996 2995
2997 2996 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2998 2997 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2999 2998 <head>
3000 2999 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3001 3000 <meta name="robots" content="index, nofollow" />
3002 3001 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3003 3002 <script type="text/javascript" src="/static/mercurial.js"></script>
3004 3003
3005 3004 <title>Help: remove</title>
3006 3005 </head>
3007 3006 <body>
3008 3007
3009 3008 <div class="container">
3010 3009 <div class="menu">
3011 3010 <div class="logo">
3012 3011 <a href="https://mercurial-scm.org/">
3013 3012 <img src="/static/hglogo.png" alt="mercurial" /></a>
3014 3013 </div>
3015 3014 <ul>
3016 3015 <li><a href="/shortlog">log</a></li>
3017 3016 <li><a href="/graph">graph</a></li>
3018 3017 <li><a href="/tags">tags</a></li>
3019 3018 <li><a href="/bookmarks">bookmarks</a></li>
3020 3019 <li><a href="/branches">branches</a></li>
3021 3020 </ul>
3022 3021 <ul>
3023 3022 <li class="active"><a href="/help">help</a></li>
3024 3023 </ul>
3025 3024 </div>
3026 3025
3027 3026 <div class="main">
3028 3027 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3029 3028 <h3>Help: remove</h3>
3030 3029
3031 3030 <form class="search" action="/log">
3032 3031
3033 3032 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3034 3033 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3035 3034 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3036 3035 </form>
3037 3036 <div id="doc">
3038 3037 <p>
3039 3038 hg remove [OPTION]... FILE...
3040 3039 </p>
3041 3040 <p>
3042 3041 aliases: rm
3043 3042 </p>
3044 3043 <p>
3045 3044 remove the specified files on the next commit
3046 3045 </p>
3047 3046 <p>
3048 3047 Schedule the indicated files for removal from the current branch.
3049 3048 </p>
3050 3049 <p>
3051 3050 This command schedules the files to be removed at the next commit.
3052 3051 To undo a remove before that, see 'hg revert'. To undo added
3053 3052 files, see 'hg forget'.
3054 3053 </p>
3055 3054 <p>
3056 3055 -A/--after can be used to remove only files that have already
3057 3056 been deleted, -f/--force can be used to force deletion, and -Af
3058 3057 can be used to remove files from the next revision without
3059 3058 deleting them from the working directory.
3060 3059 </p>
3061 3060 <p>
3062 3061 The following table details the behavior of remove for different
3063 3062 file states (columns) and option combinations (rows). The file
3064 3063 states are Added [A], Clean [C], Modified [M] and Missing [!]
3065 3064 (as reported by 'hg status'). The actions are Warn, Remove
3066 3065 (from branch) and Delete (from disk):
3067 3066 </p>
3068 3067 <table>
3069 3068 <tr><td>opt/state</td>
3070 3069 <td>A</td>
3071 3070 <td>C</td>
3072 3071 <td>M</td>
3073 3072 <td>!</td></tr>
3074 3073 <tr><td>none</td>
3075 3074 <td>W</td>
3076 3075 <td>RD</td>
3077 3076 <td>W</td>
3078 3077 <td>R</td></tr>
3079 3078 <tr><td>-f</td>
3080 3079 <td>R</td>
3081 3080 <td>RD</td>
3082 3081 <td>RD</td>
3083 3082 <td>R</td></tr>
3084 3083 <tr><td>-A</td>
3085 3084 <td>W</td>
3086 3085 <td>W</td>
3087 3086 <td>W</td>
3088 3087 <td>R</td></tr>
3089 3088 <tr><td>-Af</td>
3090 3089 <td>R</td>
3091 3090 <td>R</td>
3092 3091 <td>R</td>
3093 3092 <td>R</td></tr>
3094 3093 </table>
3095 3094 <p>
3096 3095 <b>Note:</b>
3097 3096 </p>
3098 3097 <p>
3099 3098 'hg remove' never deletes files in Added [A] state from the
3100 3099 working directory, not even if &quot;--force&quot; is specified.
3101 3100 </p>
3102 3101 <p>
3103 3102 Returns 0 on success, 1 if any warnings encountered.
3104 3103 </p>
3105 3104 <p>
3106 3105 options ([+] can be repeated):
3107 3106 </p>
3108 3107 <table>
3109 3108 <tr><td>-A</td>
3110 3109 <td>--after</td>
3111 3110 <td>record delete for missing files</td></tr>
3112 3111 <tr><td>-f</td>
3113 3112 <td>--force</td>
3114 3113 <td>forget added files, delete modified files</td></tr>
3115 3114 <tr><td>-S</td>
3116 3115 <td>--subrepos</td>
3117 3116 <td>recurse into subrepositories</td></tr>
3118 3117 <tr><td>-I</td>
3119 3118 <td>--include PATTERN [+]</td>
3120 3119 <td>include names matching the given patterns</td></tr>
3121 3120 <tr><td>-X</td>
3122 3121 <td>--exclude PATTERN [+]</td>
3123 3122 <td>exclude names matching the given patterns</td></tr>
3124 3123 <tr><td>-n</td>
3125 3124 <td>--dry-run</td>
3126 3125 <td>do not perform actions, just print output</td></tr>
3127 3126 </table>
3128 3127 <p>
3129 3128 global options ([+] can be repeated):
3130 3129 </p>
3131 3130 <table>
3132 3131 <tr><td>-R</td>
3133 3132 <td>--repository REPO</td>
3134 3133 <td>repository root directory or name of overlay bundle file</td></tr>
3135 3134 <tr><td></td>
3136 3135 <td>--cwd DIR</td>
3137 3136 <td>change working directory</td></tr>
3138 3137 <tr><td>-y</td>
3139 3138 <td>--noninteractive</td>
3140 3139 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
3141 3140 <tr><td>-q</td>
3142 3141 <td>--quiet</td>
3143 3142 <td>suppress output</td></tr>
3144 3143 <tr><td>-v</td>
3145 3144 <td>--verbose</td>
3146 3145 <td>enable additional output</td></tr>
3147 3146 <tr><td></td>
3148 3147 <td>--color TYPE</td>
3149 3148 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
3150 3149 <tr><td></td>
3151 3150 <td>--config CONFIG [+]</td>
3152 3151 <td>set/override config option (use 'section.name=value')</td></tr>
3153 3152 <tr><td></td>
3154 3153 <td>--debug</td>
3155 3154 <td>enable debugging output</td></tr>
3156 3155 <tr><td></td>
3157 3156 <td>--debugger</td>
3158 3157 <td>start debugger</td></tr>
3159 3158 <tr><td></td>
3160 3159 <td>--encoding ENCODE</td>
3161 3160 <td>set the charset encoding (default: ascii)</td></tr>
3162 3161 <tr><td></td>
3163 3162 <td>--encodingmode MODE</td>
3164 3163 <td>set the charset encoding mode (default: strict)</td></tr>
3165 3164 <tr><td></td>
3166 3165 <td>--traceback</td>
3167 3166 <td>always print a traceback on exception</td></tr>
3168 3167 <tr><td></td>
3169 3168 <td>--time</td>
3170 3169 <td>time how long the command takes</td></tr>
3171 3170 <tr><td></td>
3172 3171 <td>--profile</td>
3173 3172 <td>print command execution profile</td></tr>
3174 3173 <tr><td></td>
3175 3174 <td>--version</td>
3176 3175 <td>output version information and exit</td></tr>
3177 3176 <tr><td>-h</td>
3178 3177 <td>--help</td>
3179 3178 <td>display help and exit</td></tr>
3180 3179 <tr><td></td>
3181 3180 <td>--hidden</td>
3182 3181 <td>consider hidden changesets</td></tr>
3183 3182 <tr><td></td>
3184 3183 <td>--pager TYPE</td>
3185 3184 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
3186 3185 </table>
3187 3186
3188 3187 </div>
3189 3188 </div>
3190 3189 </div>
3191 3190
3192 3191
3193 3192
3194 3193 </body>
3195 3194 </html>
3196 3195
3197 3196
3198 3197 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
3199 3198 200 Script output follows
3200 3199
3201 3200 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3202 3201 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3203 3202 <head>
3204 3203 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3205 3204 <meta name="robots" content="index, nofollow" />
3206 3205 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3207 3206 <script type="text/javascript" src="/static/mercurial.js"></script>
3208 3207
3209 3208 <title>Help: dates</title>
3210 3209 </head>
3211 3210 <body>
3212 3211
3213 3212 <div class="container">
3214 3213 <div class="menu">
3215 3214 <div class="logo">
3216 3215 <a href="https://mercurial-scm.org/">
3217 3216 <img src="/static/hglogo.png" alt="mercurial" /></a>
3218 3217 </div>
3219 3218 <ul>
3220 3219 <li><a href="/shortlog">log</a></li>
3221 3220 <li><a href="/graph">graph</a></li>
3222 3221 <li><a href="/tags">tags</a></li>
3223 3222 <li><a href="/bookmarks">bookmarks</a></li>
3224 3223 <li><a href="/branches">branches</a></li>
3225 3224 </ul>
3226 3225 <ul>
3227 3226 <li class="active"><a href="/help">help</a></li>
3228 3227 </ul>
3229 3228 </div>
3230 3229
3231 3230 <div class="main">
3232 3231 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3233 3232 <h3>Help: dates</h3>
3234 3233
3235 3234 <form class="search" action="/log">
3236 3235
3237 3236 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3238 3237 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3239 3238 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3240 3239 </form>
3241 3240 <div id="doc">
3242 3241 <h1>Date Formats</h1>
3243 3242 <p>
3244 3243 Some commands allow the user to specify a date, e.g.:
3245 3244 </p>
3246 3245 <ul>
3247 3246 <li> backout, commit, import, tag: Specify the commit date.
3248 3247 <li> log, revert, update: Select revision(s) by date.
3249 3248 </ul>
3250 3249 <p>
3251 3250 Many date formats are valid. Here are some examples:
3252 3251 </p>
3253 3252 <ul>
3254 3253 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
3255 3254 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
3256 3255 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
3257 3256 <li> &quot;Dec 6&quot; (midnight)
3258 3257 <li> &quot;13:18&quot; (today assumed)
3259 3258 <li> &quot;3:39&quot; (3:39AM assumed)
3260 3259 <li> &quot;3:39pm&quot; (15:39)
3261 3260 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
3262 3261 <li> &quot;2006-12-6 13:18&quot;
3263 3262 <li> &quot;2006-12-6&quot;
3264 3263 <li> &quot;12-6&quot;
3265 3264 <li> &quot;12/6&quot;
3266 3265 <li> &quot;12/6/6&quot; (Dec 6 2006)
3267 3266 <li> &quot;today&quot; (midnight)
3268 3267 <li> &quot;yesterday&quot; (midnight)
3269 3268 <li> &quot;now&quot; - right now
3270 3269 </ul>
3271 3270 <p>
3272 3271 Lastly, there is Mercurial's internal format:
3273 3272 </p>
3274 3273 <ul>
3275 3274 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
3276 3275 </ul>
3277 3276 <p>
3278 3277 This is the internal representation format for dates. The first number
3279 3278 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
3280 3279 second is the offset of the local timezone, in seconds west of UTC
3281 3280 (negative if the timezone is east of UTC).
3282 3281 </p>
3283 3282 <p>
3284 3283 The log command also accepts date ranges:
3285 3284 </p>
3286 3285 <ul>
3287 3286 <li> &quot;&lt;DATE&quot; - at or before a given date/time
3288 3287 <li> &quot;&gt;DATE&quot; - on or after a given date/time
3289 3288 <li> &quot;DATE to DATE&quot; - a date range, inclusive
3290 3289 <li> &quot;-DAYS&quot; - within a given number of days from today
3291 3290 </ul>
3292 3291
3293 3292 </div>
3294 3293 </div>
3295 3294 </div>
3296 3295
3297 3296
3298 3297
3299 3298 </body>
3300 3299 </html>
3301 3300
3302 3301
3303 3302 $ get-with-headers.py $LOCALIP:$HGPORT "help/pager"
3304 3303 200 Script output follows
3305 3304
3306 3305 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3307 3306 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3308 3307 <head>
3309 3308 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3310 3309 <meta name="robots" content="index, nofollow" />
3311 3310 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3312 3311 <script type="text/javascript" src="/static/mercurial.js"></script>
3313 3312
3314 3313 <title>Help: pager</title>
3315 3314 </head>
3316 3315 <body>
3317 3316
3318 3317 <div class="container">
3319 3318 <div class="menu">
3320 3319 <div class="logo">
3321 3320 <a href="https://mercurial-scm.org/">
3322 3321 <img src="/static/hglogo.png" alt="mercurial" /></a>
3323 3322 </div>
3324 3323 <ul>
3325 3324 <li><a href="/shortlog">log</a></li>
3326 3325 <li><a href="/graph">graph</a></li>
3327 3326 <li><a href="/tags">tags</a></li>
3328 3327 <li><a href="/bookmarks">bookmarks</a></li>
3329 3328 <li><a href="/branches">branches</a></li>
3330 3329 </ul>
3331 3330 <ul>
3332 3331 <li class="active"><a href="/help">help</a></li>
3333 3332 </ul>
3334 3333 </div>
3335 3334
3336 3335 <div class="main">
3337 3336 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3338 3337 <h3>Help: pager</h3>
3339 3338
3340 3339 <form class="search" action="/log">
3341 3340
3342 3341 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3343 3342 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3344 3343 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3345 3344 </form>
3346 3345 <div id="doc">
3347 3346 <h1>Pager Support</h1>
3348 3347 <p>
3349 3348 Some Mercurial commands can produce a lot of output, and Mercurial will
3350 3349 attempt to use a pager to make those commands more pleasant.
3351 3350 </p>
3352 3351 <p>
3353 3352 To set the pager that should be used, set the application variable:
3354 3353 </p>
3355 3354 <pre>
3356 3355 [pager]
3357 3356 pager = less -FRX
3358 3357 </pre>
3359 3358 <p>
3360 3359 If no pager is set in the user or repository configuration, Mercurial uses the
3361 3360 environment variable $PAGER. If $PAGER is not set, pager.pager from the default
3362 3361 or system configuration is used. If none of these are set, a default pager will
3363 3362 be used, typically 'less' on Unix and 'more' on Windows.
3364 3363 </p>
3365 3364 <p>
3366 3365 You can disable the pager for certain commands by adding them to the
3367 3366 pager.ignore list:
3368 3367 </p>
3369 3368 <pre>
3370 3369 [pager]
3371 3370 ignore = version, help, update
3372 3371 </pre>
3373 3372 <p>
3374 3373 To ignore global commands like 'hg version' or 'hg help', you have
3375 3374 to specify them in your user configuration file.
3376 3375 </p>
3377 3376 <p>
3378 3377 To control whether the pager is used at all for an individual command,
3379 3378 you can use --pager=&lt;value&gt;:
3380 3379 </p>
3381 3380 <ul>
3382 3381 <li> use as needed: 'auto'.
3383 3382 <li> require the pager: 'yes' or 'on'.
3384 3383 <li> suppress the pager: 'no' or 'off' (any unrecognized value will also work).
3385 3384 </ul>
3386 3385 <p>
3387 3386 To globally turn off all attempts to use a pager, set:
3388 3387 </p>
3389 3388 <pre>
3390 3389 [ui]
3391 3390 paginate = never
3392 3391 </pre>
3393 3392 <p>
3394 3393 which will prevent the pager from running.
3395 3394 </p>
3396 3395
3397 3396 </div>
3398 3397 </div>
3399 3398 </div>
3400 3399
3401 3400
3402 3401
3403 3402 </body>
3404 3403 </html>
3405 3404
3406 3405
3407 3406 Sub-topic indexes rendered properly
3408 3407
3409 3408 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
3410 3409 200 Script output follows
3411 3410
3412 3411 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3413 3412 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3414 3413 <head>
3415 3414 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3416 3415 <meta name="robots" content="index, nofollow" />
3417 3416 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3418 3417 <script type="text/javascript" src="/static/mercurial.js"></script>
3419 3418
3420 3419 <title>Help: internals</title>
3421 3420 </head>
3422 3421 <body>
3423 3422
3424 3423 <div class="container">
3425 3424 <div class="menu">
3426 3425 <div class="logo">
3427 3426 <a href="https://mercurial-scm.org/">
3428 3427 <img src="/static/hglogo.png" alt="mercurial" /></a>
3429 3428 </div>
3430 3429 <ul>
3431 3430 <li><a href="/shortlog">log</a></li>
3432 3431 <li><a href="/graph">graph</a></li>
3433 3432 <li><a href="/tags">tags</a></li>
3434 3433 <li><a href="/bookmarks">bookmarks</a></li>
3435 3434 <li><a href="/branches">branches</a></li>
3436 3435 </ul>
3437 3436 <ul>
3438 3437 <li><a href="/help">help</a></li>
3439 3438 </ul>
3440 3439 </div>
3441 3440
3442 3441 <div class="main">
3443 3442 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3444 3443
3445 3444 <form class="search" action="/log">
3446 3445
3447 3446 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3448 3447 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3449 3448 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3450 3449 </form>
3451 3450 <table class="bigtable">
3452 3451 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
3453 3452
3454 3453 <tr><td>
3455 3454 <a href="/help/internals.bid-merge">
3456 3455 bid-merge
3457 3456 </a>
3458 3457 </td><td>
3459 3458 Bid Merge Algorithm
3460 3459 </td></tr>
3461 3460 <tr><td>
3462 3461 <a href="/help/internals.bundle2">
3463 3462 bundle2
3464 3463 </a>
3465 3464 </td><td>
3466 3465 Bundle2
3467 3466 </td></tr>
3468 3467 <tr><td>
3469 3468 <a href="/help/internals.bundles">
3470 3469 bundles
3471 3470 </a>
3472 3471 </td><td>
3473 3472 Bundles
3474 3473 </td></tr>
3475 3474 <tr><td>
3476 3475 <a href="/help/internals.cbor">
3477 3476 cbor
3478 3477 </a>
3479 3478 </td><td>
3480 3479 CBOR
3481 3480 </td></tr>
3482 3481 <tr><td>
3483 3482 <a href="/help/internals.censor">
3484 3483 censor
3485 3484 </a>
3486 3485 </td><td>
3487 3486 Censor
3488 3487 </td></tr>
3489 3488 <tr><td>
3490 3489 <a href="/help/internals.changegroups">
3491 3490 changegroups
3492 3491 </a>
3493 3492 </td><td>
3494 3493 Changegroups
3495 3494 </td></tr>
3496 3495 <tr><td>
3497 3496 <a href="/help/internals.config">
3498 3497 config
3499 3498 </a>
3500 3499 </td><td>
3501 3500 Config Registrar
3502 3501 </td></tr>
3503 3502 <tr><td>
3504 3503 <a href="/help/internals.extensions">
3505 3504 extensions
3506 3505 </a>
3507 3506 </td><td>
3508 3507 Extension API
3509 3508 </td></tr>
3510 3509 <tr><td>
3511 3510 <a href="/help/internals.mergestate">
3512 3511 mergestate
3513 3512 </a>
3514 3513 </td><td>
3515 3514 Mergestate
3516 3515 </td></tr>
3517 3516 <tr><td>
3518 3517 <a href="/help/internals.requirements">
3519 3518 requirements
3520 3519 </a>
3521 3520 </td><td>
3522 3521 Repository Requirements
3523 3522 </td></tr>
3524 3523 <tr><td>
3525 3524 <a href="/help/internals.revlogs">
3526 3525 revlogs
3527 3526 </a>
3528 3527 </td><td>
3529 3528 Revision Logs
3530 3529 </td></tr>
3531 3530 <tr><td>
3532 3531 <a href="/help/internals.wireprotocol">
3533 3532 wireprotocol
3534 3533 </a>
3535 3534 </td><td>
3536 3535 Wire Protocol
3537 3536 </td></tr>
3538 3537 <tr><td>
3539 3538 <a href="/help/internals.wireprotocolrpc">
3540 3539 wireprotocolrpc
3541 3540 </a>
3542 3541 </td><td>
3543 3542 Wire Protocol RPC
3544 3543 </td></tr>
3545 3544 <tr><td>
3546 3545 <a href="/help/internals.wireprotocolv2">
3547 3546 wireprotocolv2
3548 3547 </a>
3549 3548 </td><td>
3550 3549 Wire Protocol Version 2
3551 3550 </td></tr>
3552 3551
3553 3552
3554 3553
3555 3554
3556 3555
3557 3556 </table>
3558 3557 </div>
3559 3558 </div>
3560 3559
3561 3560
3562 3561
3563 3562 </body>
3564 3563 </html>
3565 3564
3566 3565
3567 3566 Sub-topic topics rendered properly
3568 3567
3569 3568 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3570 3569 200 Script output follows
3571 3570
3572 3571 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3573 3572 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3574 3573 <head>
3575 3574 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3576 3575 <meta name="robots" content="index, nofollow" />
3577 3576 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3578 3577 <script type="text/javascript" src="/static/mercurial.js"></script>
3579 3578
3580 3579 <title>Help: internals.changegroups</title>
3581 3580 </head>
3582 3581 <body>
3583 3582
3584 3583 <div class="container">
3585 3584 <div class="menu">
3586 3585 <div class="logo">
3587 3586 <a href="https://mercurial-scm.org/">
3588 3587 <img src="/static/hglogo.png" alt="mercurial" /></a>
3589 3588 </div>
3590 3589 <ul>
3591 3590 <li><a href="/shortlog">log</a></li>
3592 3591 <li><a href="/graph">graph</a></li>
3593 3592 <li><a href="/tags">tags</a></li>
3594 3593 <li><a href="/bookmarks">bookmarks</a></li>
3595 3594 <li><a href="/branches">branches</a></li>
3596 3595 </ul>
3597 3596 <ul>
3598 3597 <li class="active"><a href="/help">help</a></li>
3599 3598 </ul>
3600 3599 </div>
3601 3600
3602 3601 <div class="main">
3603 3602 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3604 3603 <h3>Help: internals.changegroups</h3>
3605 3604
3606 3605 <form class="search" action="/log">
3607 3606
3608 3607 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3609 3608 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3610 3609 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3611 3610 </form>
3612 3611 <div id="doc">
3613 3612 <h1>Changegroups</h1>
3614 3613 <p>
3615 3614 Changegroups are representations of repository revlog data, specifically
3616 3615 the changelog data, root/flat manifest data, treemanifest data, and
3617 3616 filelogs.
3618 3617 </p>
3619 3618 <p>
3620 3619 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3621 3620 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3622 3621 only difference being an additional item in the *delta header*. Version
3623 3622 &quot;3&quot; adds support for storage flags in the *delta header* and optionally
3624 3623 exchanging treemanifests (enabled by setting an option on the
3625 3624 &quot;changegroup&quot; part in the bundle2).
3626 3625 </p>
3627 3626 <p>
3628 3627 Changegroups when not exchanging treemanifests consist of 3 logical
3629 3628 segments:
3630 3629 </p>
3631 3630 <pre>
3632 3631 +---------------------------------+
3633 3632 | | | |
3634 3633 | changeset | manifest | filelogs |
3635 3634 | | | |
3636 3635 | | | |
3637 3636 +---------------------------------+
3638 3637 </pre>
3639 3638 <p>
3640 3639 When exchanging treemanifests, there are 4 logical segments:
3641 3640 </p>
3642 3641 <pre>
3643 3642 +-------------------------------------------------+
3644 3643 | | | | |
3645 3644 | changeset | root | treemanifests | filelogs |
3646 3645 | | manifest | | |
3647 3646 | | | | |
3648 3647 +-------------------------------------------------+
3649 3648 </pre>
3650 3649 <p>
3651 3650 The principle building block of each segment is a *chunk*. A *chunk*
3652 3651 is a framed piece of data:
3653 3652 </p>
3654 3653 <pre>
3655 3654 +---------------------------------------+
3656 3655 | | |
3657 3656 | length | data |
3658 3657 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3659 3658 | | |
3660 3659 +---------------------------------------+
3661 3660 </pre>
3662 3661 <p>
3663 3662 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3664 3663 integer indicating the length of the entire chunk (including the length field
3665 3664 itself).
3666 3665 </p>
3667 3666 <p>
3668 3667 There is a special case chunk that has a value of 0 for the length
3669 3668 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3670 3669 </p>
3671 3670 <h2>Delta Groups</h2>
3672 3671 <p>
3673 3672 A *delta group* expresses the content of a revlog as a series of deltas,
3674 3673 or patches against previous revisions.
3675 3674 </p>
3676 3675 <p>
3677 3676 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3678 3677 to signal the end of the delta group:
3679 3678 </p>
3680 3679 <pre>
3681 3680 +------------------------------------------------------------------------+
3682 3681 | | | | | |
3683 3682 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3684 3683 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3685 3684 | | | | | |
3686 3685 +------------------------------------------------------------------------+
3687 3686 </pre>
3688 3687 <p>
3689 3688 Each *chunk*'s data consists of the following:
3690 3689 </p>
3691 3690 <pre>
3692 3691 +---------------------------------------+
3693 3692 | | |
3694 3693 | delta header | delta data |
3695 3694 | (various by version) | (various) |
3696 3695 | | |
3697 3696 +---------------------------------------+
3698 3697 </pre>
3699 3698 <p>
3700 3699 The *delta data* is a series of *delta*s that describe a diff from an existing
3701 3700 entry (either that the recipient already has, or previously specified in the
3702 3701 bundle/changegroup).
3703 3702 </p>
3704 3703 <p>
3705 3704 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3706 3705 &quot;3&quot; of the changegroup format.
3707 3706 </p>
3708 3707 <p>
3709 3708 Version 1 (headerlen=80):
3710 3709 </p>
3711 3710 <pre>
3712 3711 +------------------------------------------------------+
3713 3712 | | | | |
3714 3713 | node | p1 node | p2 node | link node |
3715 3714 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3716 3715 | | | | |
3717 3716 +------------------------------------------------------+
3718 3717 </pre>
3719 3718 <p>
3720 3719 Version 2 (headerlen=100):
3721 3720 </p>
3722 3721 <pre>
3723 3722 +------------------------------------------------------------------+
3724 3723 | | | | | |
3725 3724 | node | p1 node | p2 node | base node | link node |
3726 3725 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3727 3726 | | | | | |
3728 3727 +------------------------------------------------------------------+
3729 3728 </pre>
3730 3729 <p>
3731 3730 Version 3 (headerlen=102):
3732 3731 </p>
3733 3732 <pre>
3734 3733 +------------------------------------------------------------------------------+
3735 3734 | | | | | | |
3736 3735 | node | p1 node | p2 node | base node | link node | flags |
3737 3736 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3738 3737 | | | | | | |
3739 3738 +------------------------------------------------------------------------------+
3740 3739 </pre>
3741 3740 <p>
3742 3741 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3743 3742 series of *delta*s, densely packed (no separators). These deltas describe a diff
3744 3743 from an existing entry (either that the recipient already has, or previously
3745 3744 specified in the bundle/changegroup). The format is described more fully in
3746 3745 &quot;hg help internals.bdiff&quot;, but briefly:
3747 3746 </p>
3748 3747 <pre>
3749 3748 +---------------------------------------------------------------+
3750 3749 | | | | |
3751 3750 | start offset | end offset | new length | content |
3752 3751 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3753 3752 | | | | |
3754 3753 +---------------------------------------------------------------+
3755 3754 </pre>
3756 3755 <p>
3757 3756 Please note that the length field in the delta data does *not* include itself.
3758 3757 </p>
3759 3758 <p>
3760 3759 In version 1, the delta is always applied against the previous node from
3761 3760 the changegroup or the first parent if this is the first entry in the
3762 3761 changegroup.
3763 3762 </p>
3764 3763 <p>
3765 3764 In version 2 and up, the delta base node is encoded in the entry in the
3766 3765 changegroup. This allows the delta to be expressed against any parent,
3767 3766 which can result in smaller deltas and more efficient encoding of data.
3768 3767 </p>
3769 3768 <p>
3770 3769 The *flags* field holds bitwise flags affecting the processing of revision
3771 3770 data. The following flags are defined:
3772 3771 </p>
3773 3772 <dl>
3774 3773 <dt>32768
3775 3774 <dd>Censored revision. The revision's fulltext has been replaced by censor metadata. May only occur on file revisions.
3776 3775 <dt>16384
3777 3776 <dd>Ellipsis revision. Revision hash does not match data (likely due to rewritten parents).
3778 3777 <dt>8192
3779 3778 <dd>Externally stored. The revision fulltext contains &quot;key:value&quot; &quot;\n&quot; delimited metadata defining an object stored elsewhere. Used by the LFS extension.
3780 3779 </dl>
3781 3780 <p>
3782 3781 For historical reasons, the integer values are identical to revlog version 1
3783 3782 per-revision storage flags and correspond to bits being set in this 2-byte
3784 3783 field. Bits were allocated starting from the most-significant bit, hence the
3785 3784 reverse ordering and allocation of these flags.
3786 3785 </p>
3787 3786 <h2>Changeset Segment</h2>
3788 3787 <p>
3789 3788 The *changeset segment* consists of a single *delta group* holding
3790 3789 changelog data. The *empty chunk* at the end of the *delta group* denotes
3791 3790 the boundary to the *manifest segment*.
3792 3791 </p>
3793 3792 <h2>Manifest Segment</h2>
3794 3793 <p>
3795 3794 The *manifest segment* consists of a single *delta group* holding manifest
3796 3795 data. If treemanifests are in use, it contains only the manifest for the
3797 3796 root directory of the repository. Otherwise, it contains the entire
3798 3797 manifest data. The *empty chunk* at the end of the *delta group* denotes
3799 3798 the boundary to the next segment (either the *treemanifests segment* or the
3800 3799 *filelogs segment*, depending on version and the request options).
3801 3800 </p>
3802 3801 <h3>Treemanifests Segment</h3>
3803 3802 <p>
3804 3803 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3805 3804 only if the 'treemanifest' param is part of the bundle2 changegroup part
3806 3805 (it is not possible to use changegroup version 3 outside of bundle2).
3807 3806 Aside from the filenames in the *treemanifests segment* containing a
3808 3807 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3809 3808 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3810 3809 a sub-segment with filename size 0). This denotes the boundary to the
3811 3810 *filelogs segment*.
3812 3811 </p>
3813 3812 <h2>Filelogs Segment</h2>
3814 3813 <p>
3815 3814 The *filelogs segment* consists of multiple sub-segments, each
3816 3815 corresponding to an individual file whose data is being described:
3817 3816 </p>
3818 3817 <pre>
3819 3818 +--------------------------------------------------+
3820 3819 | | | | | |
3821 3820 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3822 3821 | | | | | (4 bytes) |
3823 3822 | | | | | |
3824 3823 +--------------------------------------------------+
3825 3824 </pre>
3826 3825 <p>
3827 3826 The final filelog sub-segment is followed by an *empty chunk* (logically,
3828 3827 a sub-segment with filename size 0). This denotes the end of the segment
3829 3828 and of the overall changegroup.
3830 3829 </p>
3831 3830 <p>
3832 3831 Each filelog sub-segment consists of the following:
3833 3832 </p>
3834 3833 <pre>
3835 3834 +------------------------------------------------------+
3836 3835 | | | |
3837 3836 | filename length | filename | delta group |
3838 3837 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3839 3838 | | | |
3840 3839 +------------------------------------------------------+
3841 3840 </pre>
3842 3841 <p>
3843 3842 That is, a *chunk* consisting of the filename (not terminated or padded)
3844 3843 followed by N chunks constituting the *delta group* for this file. The
3845 3844 *empty chunk* at the end of each *delta group* denotes the boundary to the
3846 3845 next filelog sub-segment.
3847 3846 </p>
3848 3847
3849 3848 </div>
3850 3849 </div>
3851 3850 </div>
3852 3851
3853 3852
3854 3853
3855 3854 </body>
3856 3855 </html>
3857 3856
3858 3857
3859 3858 $ get-with-headers.py 127.0.0.1:$HGPORT "help/unknowntopic"
3860 3859 404 Not Found
3861 3860
3862 3861 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3863 3862 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3864 3863 <head>
3865 3864 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3866 3865 <meta name="robots" content="index, nofollow" />
3867 3866 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3868 3867 <script type="text/javascript" src="/static/mercurial.js"></script>
3869 3868
3870 3869 <title>test: error</title>
3871 3870 </head>
3872 3871 <body>
3873 3872
3874 3873 <div class="container">
3875 3874 <div class="menu">
3876 3875 <div class="logo">
3877 3876 <a href="https://mercurial-scm.org/">
3878 3877 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
3879 3878 </div>
3880 3879 <ul>
3881 3880 <li><a href="/shortlog">log</a></li>
3882 3881 <li><a href="/graph">graph</a></li>
3883 3882 <li><a href="/tags">tags</a></li>
3884 3883 <li><a href="/bookmarks">bookmarks</a></li>
3885 3884 <li><a href="/branches">branches</a></li>
3886 3885 </ul>
3887 3886 <ul>
3888 3887 <li><a href="/help">help</a></li>
3889 3888 </ul>
3890 3889 </div>
3891 3890
3892 3891 <div class="main">
3893 3892
3894 3893 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3895 3894 <h3>error</h3>
3896 3895
3897 3896
3898 3897 <form class="search" action="/log">
3899 3898
3900 3899 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3901 3900 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3902 3901 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3903 3902 </form>
3904 3903
3905 3904 <div class="description">
3906 3905 <p>
3907 3906 An error occurred while processing your request:
3908 3907 </p>
3909 3908 <p>
3910 3909 Not Found
3911 3910 </p>
3912 3911 </div>
3913 3912 </div>
3914 3913 </div>
3915 3914
3916 3915
3917 3916
3918 3917 </body>
3919 3918 </html>
3920 3919
3921 3920 [1]
3922 3921
3923 3922 $ killdaemons.py
3924 3923
3925 3924 #endif
General Comments 0
You need to be logged in to leave comments. Login now