##// END OF EJS Templates
py3: do I/O in bytes in test-help.t
Yuya Nishihara -
r40286:7759c26a default
parent child Browse files
Show More
@@ -1,3762 +1,3764 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 add add the specified files on the next commit
57 57 addremove add all new files, delete all missing files
58 58 annotate show changeset information by line for each file
59 59 archive create an unversioned archive of a repository revision
60 60 backout reverse effect of earlier changeset
61 61 bisect subdivision search of changesets
62 62 bookmarks create a new bookmark or list existing bookmarks
63 63 branch set or show the current branch name
64 64 branches list repository named branches
65 65 bundle create a bundle file
66 66 cat output the current or given revision of files
67 67 clone make a copy of an existing repository
68 68 commit commit the specified files or all outstanding changes
69 69 config show combined config settings from all hgrc files
70 70 copy mark files as copied for the next commit
71 71 diff diff repository (or selected files)
72 72 export dump the header and diffs for one or more changesets
73 73 files list tracked files
74 74 forget forget the specified files on the next commit
75 75 graft copy changes from other branches onto the current branch
76 76 grep search revision history for a pattern in specified files
77 77 heads show branch heads
78 78 help show help for a given topic or a help overview
79 79 identify identify the working directory or specified revision
80 80 import import an ordered set of patches
81 81 incoming show new changesets found in source
82 82 init create a new repository in the given directory
83 83 log show revision history of entire repository or files
84 84 manifest output the current or given revision of the project manifest
85 85 merge merge another revision into working directory
86 86 outgoing show changesets not found in the destination
87 87 paths show aliases for remote repositories
88 88 phase set or show the current phase name
89 89 pull pull changes from the specified source
90 90 push push changes to the specified destination
91 91 recover roll back an interrupted transaction
92 92 remove remove the specified files on the next commit
93 93 rename rename files; equivalent of copy + remove
94 94 resolve redo merges or set/view the merge status of files
95 95 revert restore files to their checkout state
96 96 root print the root (top) of the current working directory
97 97 serve start stand-alone webserver
98 98 status show changed files in the working directory
99 99 summary summarize working directory state
100 100 tag add one or more tags for the current or given revision
101 101 tags list repository tags
102 102 unbundle apply one or more bundle files
103 103 update update working directory (or switch revisions)
104 104 verify verify the integrity of the repository
105 105 version output version and copyright information
106 106
107 107 additional help topics:
108 108
109 109 bundlespec Bundle File Formats
110 110 color Colorizing Outputs
111 111 config Configuration Files
112 112 dates Date Formats
113 113 deprecated Deprecated Features
114 114 diffs Diff Formats
115 115 environment Environment Variables
116 116 extensions Using Additional Features
117 117 filesets Specifying File Sets
118 118 flags Command-line flags
119 119 glossary Glossary
120 120 hgignore Syntax for Mercurial Ignore Files
121 121 hgweb Configuring hgweb
122 122 internals Technical implementation topics
123 123 merge-tools Merge Tools
124 124 pager Pager Support
125 125 patterns File Name Patterns
126 126 phases Working with Phases
127 127 revisions Specifying Revisions
128 128 scripting Using Mercurial from scripts and automation
129 129 subrepos Subrepositories
130 130 templating Template Usage
131 131 urls URL Paths
132 132
133 133 (use 'hg help -v' to show built-in aliases and global options)
134 134
135 135 $ hg -q help
136 136 add add the specified files on the next commit
137 137 addremove add all new files, delete all missing files
138 138 annotate show changeset information by line for each file
139 139 archive create an unversioned archive of a repository revision
140 140 backout reverse effect of earlier changeset
141 141 bisect subdivision search of changesets
142 142 bookmarks create a new bookmark or list existing bookmarks
143 143 branch set or show the current branch name
144 144 branches list repository named branches
145 145 bundle create a bundle file
146 146 cat output the current or given revision of files
147 147 clone make a copy of an existing repository
148 148 commit commit the specified files or all outstanding changes
149 149 config show combined config settings from all hgrc files
150 150 copy mark files as copied for the next commit
151 151 diff diff repository (or selected files)
152 152 export dump the header and diffs for one or more changesets
153 153 files list tracked files
154 154 forget forget the specified files on the next commit
155 155 graft copy changes from other branches onto the current branch
156 156 grep search revision history for a pattern in specified files
157 157 heads show branch heads
158 158 help show help for a given topic or a help overview
159 159 identify identify the working directory or specified revision
160 160 import import an ordered set of patches
161 161 incoming show new changesets found in source
162 162 init create a new repository in the given directory
163 163 log show revision history of entire repository or files
164 164 manifest output the current or given revision of the project manifest
165 165 merge merge another revision into working directory
166 166 outgoing show changesets not found in the destination
167 167 paths show aliases for remote repositories
168 168 phase set or show the current phase name
169 169 pull pull changes from the specified source
170 170 push push changes to the specified destination
171 171 recover roll back an interrupted transaction
172 172 remove remove the specified files on the next commit
173 173 rename rename files; equivalent of copy + remove
174 174 resolve redo merges or set/view the merge status of files
175 175 revert restore files to their checkout state
176 176 root print the root (top) of the current working directory
177 177 serve start stand-alone webserver
178 178 status show changed files in the working directory
179 179 summary summarize working directory state
180 180 tag add one or more tags for the current or given revision
181 181 tags list repository tags
182 182 unbundle apply one or more bundle files
183 183 update update working directory (or switch revisions)
184 184 verify verify the integrity of the repository
185 185 version output version and copyright information
186 186
187 187 additional help topics:
188 188
189 189 bundlespec Bundle File Formats
190 190 color Colorizing Outputs
191 191 config Configuration Files
192 192 dates Date Formats
193 193 deprecated Deprecated Features
194 194 diffs Diff Formats
195 195 environment Environment Variables
196 196 extensions Using Additional Features
197 197 filesets Specifying File Sets
198 198 flags Command-line flags
199 199 glossary Glossary
200 200 hgignore Syntax for Mercurial Ignore Files
201 201 hgweb Configuring hgweb
202 202 internals Technical implementation topics
203 203 merge-tools Merge Tools
204 204 pager Pager Support
205 205 patterns File Name Patterns
206 206 phases Working with Phases
207 207 revisions Specifying Revisions
208 208 scripting Using Mercurial from scripts and automation
209 209 subrepos Subrepositories
210 210 templating Template Usage
211 211 urls URL Paths
212 212
213 213 Test extension help:
214 214 $ hg help extensions --config extensions.rebase= --config extensions.children=
215 215 Using Additional Features
216 216 """""""""""""""""""""""""
217 217
218 218 Mercurial has the ability to add new features through the use of
219 219 extensions. Extensions may add new commands, add options to existing
220 220 commands, change the default behavior of commands, or implement hooks.
221 221
222 222 To enable the "foo" extension, either shipped with Mercurial or in the
223 223 Python search path, create an entry for it in your configuration file,
224 224 like this:
225 225
226 226 [extensions]
227 227 foo =
228 228
229 229 You may also specify the full path to an extension:
230 230
231 231 [extensions]
232 232 myfeature = ~/.hgext/myfeature.py
233 233
234 234 See 'hg help config' for more information on configuration files.
235 235
236 236 Extensions are not loaded by default for a variety of reasons: they can
237 237 increase startup overhead; they may be meant for advanced usage only; they
238 238 may provide potentially dangerous abilities (such as letting you destroy
239 239 or modify history); they might not be ready for prime time; or they may
240 240 alter some usual behaviors of stock Mercurial. It is thus up to the user
241 241 to activate extensions as needed.
242 242
243 243 To explicitly disable an extension enabled in a configuration file of
244 244 broader scope, prepend its path with !:
245 245
246 246 [extensions]
247 247 # disabling extension bar residing in /path/to/extension/bar.py
248 248 bar = !/path/to/extension/bar.py
249 249 # ditto, but no path was supplied for extension baz
250 250 baz = !
251 251
252 252 enabled extensions:
253 253
254 254 children command to display child changesets (DEPRECATED)
255 255 rebase command to move sets of revisions to a different ancestor
256 256
257 257 disabled extensions:
258 258
259 259 acl hooks for controlling repository access
260 260 blackbox log repository events to a blackbox for debugging
261 261 bugzilla hooks for integrating with the Bugzilla bug tracker
262 262 censor erase file content at a given revision
263 263 churn command to display statistics about repository history
264 264 clonebundles advertise pre-generated bundles to seed clones
265 265 closehead close arbitrary heads without checking them out first
266 266 convert import revisions from foreign VCS repositories into
267 267 Mercurial
268 268 eol automatically manage newlines in repository files
269 269 extdiff command to allow external programs to compare revisions
270 270 factotum http authentication with factotum
271 271 githelp try mapping git commands to Mercurial commands
272 272 gpg commands to sign and verify changesets
273 273 hgk browse the repository in a graphical way
274 274 highlight syntax highlighting for hgweb (requires Pygments)
275 275 histedit interactive history editing
276 276 keyword expand keywords in tracked files
277 277 largefiles track large binary files
278 278 mq manage a stack of patches
279 279 notify hooks for sending email push notifications
280 280 patchbomb command to send changesets as (a series of) patch emails
281 281 purge command to delete untracked files from the working
282 282 directory
283 283 relink recreates hardlinks between repository clones
284 284 schemes extend schemes with shortcuts to repository swarms
285 285 share share a common history between several working directories
286 286 shelve save and restore changes to the working directory
287 287 strip strip changesets and their descendants from history
288 288 transplant command to transplant changesets from another branch
289 289 win32mbcs allow the use of MBCS paths with problematic encodings
290 290 zeroconf discover and advertise repositories on the local network
291 291
292 292 #endif
293 293
294 294 Verify that deprecated extensions are included if --verbose:
295 295
296 296 $ hg -v help extensions | grep children
297 297 children command to display child changesets (DEPRECATED)
298 298
299 299 Verify that extension keywords appear in help templates
300 300
301 301 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
302 302
303 303 Test short command list with verbose option
304 304
305 305 $ hg -v help shortlist
306 306 Mercurial Distributed SCM
307 307
308 308 basic commands:
309 309
310 310 add add the specified files on the next commit
311 311 annotate, blame
312 312 show changeset information by line for each file
313 313 clone make a copy of an existing repository
314 314 commit, ci commit the specified files or all outstanding changes
315 315 diff diff repository (or selected files)
316 316 export dump the header and diffs for one or more changesets
317 317 forget forget the specified files on the next commit
318 318 init create a new repository in the given directory
319 319 log, history show revision history of entire repository or files
320 320 merge merge another revision into working directory
321 321 pull pull changes from the specified source
322 322 push push changes to the specified destination
323 323 remove, rm remove the specified files on the next commit
324 324 serve start stand-alone webserver
325 325 status, st show changed files in the working directory
326 326 summary, sum summarize working directory state
327 327 update, up, checkout, co
328 328 update working directory (or switch revisions)
329 329
330 330 global options ([+] can be repeated):
331 331
332 332 -R --repository REPO repository root directory or name of overlay bundle
333 333 file
334 334 --cwd DIR change working directory
335 335 -y --noninteractive do not prompt, automatically pick the first choice for
336 336 all prompts
337 337 -q --quiet suppress output
338 338 -v --verbose enable additional output
339 339 --color TYPE when to colorize (boolean, always, auto, never, or
340 340 debug)
341 341 --config CONFIG [+] set/override config option (use 'section.name=value')
342 342 --debug enable debugging output
343 343 --debugger start debugger
344 344 --encoding ENCODE set the charset encoding (default: ascii)
345 345 --encodingmode MODE set the charset encoding mode (default: strict)
346 346 --traceback always print a traceback on exception
347 347 --time time how long the command takes
348 348 --profile print command execution profile
349 349 --version output version information and exit
350 350 -h --help display help and exit
351 351 --hidden consider hidden changesets
352 352 --pager TYPE when to paginate (boolean, always, auto, or never)
353 353 (default: auto)
354 354
355 355 (use 'hg help' for the full list of commands)
356 356
357 357 $ hg add -h
358 358 hg add [OPTION]... [FILE]...
359 359
360 360 add the specified files on the next commit
361 361
362 362 Schedule files to be version controlled and added to the repository.
363 363
364 364 The files will be added to the repository at the next commit. To undo an
365 365 add before that, see 'hg forget'.
366 366
367 367 If no names are given, add all files to the repository (except files
368 368 matching ".hgignore").
369 369
370 370 Returns 0 if all files are successfully added.
371 371
372 372 options ([+] can be repeated):
373 373
374 374 -I --include PATTERN [+] include names matching the given patterns
375 375 -X --exclude PATTERN [+] exclude names matching the given patterns
376 376 -S --subrepos recurse into subrepositories
377 377 -n --dry-run do not perform actions, just print output
378 378
379 379 (some details hidden, use --verbose to show complete help)
380 380
381 381 Verbose help for add
382 382
383 383 $ hg add -hv
384 384 hg add [OPTION]... [FILE]...
385 385
386 386 add the specified files on the next commit
387 387
388 388 Schedule files to be version controlled and added to the repository.
389 389
390 390 The files will be added to the repository at the next commit. To undo an
391 391 add before that, see 'hg forget'.
392 392
393 393 If no names are given, add all files to the repository (except files
394 394 matching ".hgignore").
395 395
396 396 Examples:
397 397
398 398 - New (unknown) files are added automatically by 'hg add':
399 399
400 400 $ ls
401 401 foo.c
402 402 $ hg status
403 403 ? foo.c
404 404 $ hg add
405 405 adding foo.c
406 406 $ hg status
407 407 A foo.c
408 408
409 409 - Specific files to be added can be specified:
410 410
411 411 $ ls
412 412 bar.c foo.c
413 413 $ hg status
414 414 ? bar.c
415 415 ? foo.c
416 416 $ hg add bar.c
417 417 $ hg status
418 418 A bar.c
419 419 ? foo.c
420 420
421 421 Returns 0 if all files are successfully added.
422 422
423 423 options ([+] can be repeated):
424 424
425 425 -I --include PATTERN [+] include names matching the given patterns
426 426 -X --exclude PATTERN [+] exclude names matching the given patterns
427 427 -S --subrepos recurse into subrepositories
428 428 -n --dry-run do not perform actions, just print output
429 429
430 430 global options ([+] can be repeated):
431 431
432 432 -R --repository REPO repository root directory or name of overlay bundle
433 433 file
434 434 --cwd DIR change working directory
435 435 -y --noninteractive do not prompt, automatically pick the first choice for
436 436 all prompts
437 437 -q --quiet suppress output
438 438 -v --verbose enable additional output
439 439 --color TYPE when to colorize (boolean, always, auto, never, or
440 440 debug)
441 441 --config CONFIG [+] set/override config option (use 'section.name=value')
442 442 --debug enable debugging output
443 443 --debugger start debugger
444 444 --encoding ENCODE set the charset encoding (default: ascii)
445 445 --encodingmode MODE set the charset encoding mode (default: strict)
446 446 --traceback always print a traceback on exception
447 447 --time time how long the command takes
448 448 --profile print command execution profile
449 449 --version output version information and exit
450 450 -h --help display help and exit
451 451 --hidden consider hidden changesets
452 452 --pager TYPE when to paginate (boolean, always, auto, or never)
453 453 (default: auto)
454 454
455 455 Test the textwidth config option
456 456
457 457 $ hg root -h --config ui.textwidth=50
458 458 hg root
459 459
460 460 print the root (top) of the current working
461 461 directory
462 462
463 463 Print the root directory of the current
464 464 repository.
465 465
466 466 Returns 0 on success.
467 467
468 468 (some details hidden, use --verbose to show
469 469 complete help)
470 470
471 471 Test help option with version option
472 472
473 473 $ hg add -h --version
474 474 Mercurial Distributed SCM (version *) (glob)
475 475 (see https://mercurial-scm.org for more information)
476 476
477 477 Copyright (C) 2005-* Matt Mackall and others (glob)
478 478 This is free software; see the source for copying conditions. There is NO
479 479 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
480 480
481 481 $ hg add --skjdfks
482 482 hg add: option --skjdfks not recognized
483 483 hg add [OPTION]... [FILE]...
484 484
485 485 add the specified files on the next commit
486 486
487 487 options ([+] can be repeated):
488 488
489 489 -I --include PATTERN [+] include names matching the given patterns
490 490 -X --exclude PATTERN [+] exclude names matching the given patterns
491 491 -S --subrepos recurse into subrepositories
492 492 -n --dry-run do not perform actions, just print output
493 493
494 494 (use 'hg add -h' to show more help)
495 495 [255]
496 496
497 497 Test ambiguous command help
498 498
499 499 $ hg help ad
500 500 list of commands:
501 501
502 502 add add the specified files on the next commit
503 503 addremove add all new files, delete all missing files
504 504
505 505 (use 'hg help -v ad' to show built-in aliases and global options)
506 506
507 507 Test command without options
508 508
509 509 $ hg help verify
510 510 hg verify
511 511
512 512 verify the integrity of the repository
513 513
514 514 Verify the integrity of the current repository.
515 515
516 516 This will perform an extensive check of the repository's integrity,
517 517 validating the hashes and checksums of each entry in the changelog,
518 518 manifest, and tracked files, as well as the integrity of their crosslinks
519 519 and indices.
520 520
521 521 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
522 522 information about recovery from corruption of the repository.
523 523
524 524 Returns 0 on success, 1 if errors are encountered.
525 525
526 526 (some details hidden, use --verbose to show complete help)
527 527
528 528 $ hg help diff
529 529 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
530 530
531 531 diff repository (or selected files)
532 532
533 533 Show differences between revisions for the specified files.
534 534
535 535 Differences between files are shown using the unified diff format.
536 536
537 537 Note:
538 538 'hg diff' may generate unexpected results for merges, as it will
539 539 default to comparing against the working directory's first parent
540 540 changeset if no revisions are specified.
541 541
542 542 When two revision arguments are given, then changes are shown between
543 543 those revisions. If only one revision is specified then that revision is
544 544 compared to the working directory, and, when no revisions are specified,
545 545 the working directory files are compared to its first parent.
546 546
547 547 Alternatively you can specify -c/--change with a revision to see the
548 548 changes in that changeset relative to its first parent.
549 549
550 550 Without the -a/--text option, diff will avoid generating diffs of files it
551 551 detects as binary. With -a, diff will generate a diff anyway, probably
552 552 with undesirable results.
553 553
554 554 Use the -g/--git option to generate diffs in the git extended diff format.
555 555 For more information, read 'hg help diffs'.
556 556
557 557 Returns 0 on success.
558 558
559 559 options ([+] can be repeated):
560 560
561 561 -r --rev REV [+] revision
562 562 -c --change REV change made by revision
563 563 -a --text treat all files as text
564 564 -g --git use git extended diff format
565 565 --binary generate binary diffs in git mode (default)
566 566 --nodates omit dates from diff headers
567 567 --noprefix omit a/ and b/ prefixes from filenames
568 568 -p --show-function show which function each change is in
569 569 --reverse produce a diff that undoes the changes
570 570 -w --ignore-all-space ignore white space when comparing lines
571 571 -b --ignore-space-change ignore changes in the amount of white space
572 572 -B --ignore-blank-lines ignore changes whose lines are all blank
573 573 -Z --ignore-space-at-eol ignore changes in whitespace at EOL
574 574 -U --unified NUM number of lines of context to show
575 575 --stat output diffstat-style summary of changes
576 576 --root DIR produce diffs relative to subdirectory
577 577 -I --include PATTERN [+] include names matching the given patterns
578 578 -X --exclude PATTERN [+] exclude names matching the given patterns
579 579 -S --subrepos recurse into subrepositories
580 580
581 581 (some details hidden, use --verbose to show complete help)
582 582
583 583 $ hg help status
584 584 hg status [OPTION]... [FILE]...
585 585
586 586 aliases: st
587 587
588 588 show changed files in the working directory
589 589
590 590 Show status of files in the repository. If names are given, only files
591 591 that match are shown. Files that are clean or ignored or the source of a
592 592 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
593 593 -C/--copies or -A/--all are given. Unless options described with "show
594 594 only ..." are given, the options -mardu are used.
595 595
596 596 Option -q/--quiet hides untracked (unknown and ignored) files unless
597 597 explicitly requested with -u/--unknown or -i/--ignored.
598 598
599 599 Note:
600 600 'hg status' may appear to disagree with diff if permissions have
601 601 changed or a merge has occurred. The standard diff format does not
602 602 report permission changes and diff only reports changes relative to one
603 603 merge parent.
604 604
605 605 If one revision is given, it is used as the base revision. If two
606 606 revisions are given, the differences between them are shown. The --change
607 607 option can also be used as a shortcut to list the changed files of a
608 608 revision from its first parent.
609 609
610 610 The codes used to show the status of files are:
611 611
612 612 M = modified
613 613 A = added
614 614 R = removed
615 615 C = clean
616 616 ! = missing (deleted by non-hg command, but still tracked)
617 617 ? = not tracked
618 618 I = ignored
619 619 = origin of the previous file (with --copies)
620 620
621 621 Returns 0 on success.
622 622
623 623 options ([+] can be repeated):
624 624
625 625 -A --all show status of all files
626 626 -m --modified show only modified files
627 627 -a --added show only added files
628 628 -r --removed show only removed files
629 629 -d --deleted show only deleted (but tracked) files
630 630 -c --clean show only files without changes
631 631 -u --unknown show only unknown (not tracked) files
632 632 -i --ignored show only ignored files
633 633 -n --no-status hide status prefix
634 634 -C --copies show source of copied files
635 635 -0 --print0 end filenames with NUL, for use with xargs
636 636 --rev REV [+] show difference from revision
637 637 --change REV list the changed files of a revision
638 638 -I --include PATTERN [+] include names matching the given patterns
639 639 -X --exclude PATTERN [+] exclude names matching the given patterns
640 640 -S --subrepos recurse into subrepositories
641 641 -T --template TEMPLATE display with template
642 642
643 643 (some details hidden, use --verbose to show complete help)
644 644
645 645 $ hg -q help status
646 646 hg status [OPTION]... [FILE]...
647 647
648 648 show changed files in the working directory
649 649
650 650 $ hg help foo
651 651 abort: no such help topic: foo
652 652 (try 'hg help --keyword foo')
653 653 [255]
654 654
655 655 $ hg skjdfks
656 656 hg: unknown command 'skjdfks'
657 657 (use 'hg help' for a list of commands)
658 658 [255]
659 659
660 660 Typoed command gives suggestion
661 661 $ hg puls
662 662 hg: unknown command 'puls'
663 663 (did you mean one of pull, push?)
664 664 [255]
665 665
666 666 Not enabled extension gets suggested
667 667
668 668 $ hg rebase
669 669 hg: unknown command 'rebase'
670 670 'rebase' is provided by the following extension:
671 671
672 672 rebase command to move sets of revisions to a different ancestor
673 673
674 674 (use 'hg help extensions' for information on enabling extensions)
675 675 [255]
676 676
677 677 Disabled extension gets suggested
678 678 $ hg --config extensions.rebase=! rebase
679 679 hg: unknown command 'rebase'
680 680 'rebase' is provided by the following extension:
681 681
682 682 rebase command to move sets of revisions to a different ancestor
683 683
684 684 (use 'hg help extensions' for information on enabling extensions)
685 685 [255]
686 686
687 687 Make sure that we don't run afoul of the help system thinking that
688 688 this is a section and erroring out weirdly.
689 689
690 690 $ hg .log
691 691 hg: unknown command '.log'
692 692 (did you mean log?)
693 693 [255]
694 694
695 695 $ hg log.
696 696 hg: unknown command 'log.'
697 697 (did you mean log?)
698 698 [255]
699 699 $ hg pu.lh
700 700 hg: unknown command 'pu.lh'
701 701 (did you mean one of pull, push?)
702 702 [255]
703 703
704 704 $ cat > helpext.py <<EOF
705 705 > import os
706 706 > from mercurial import commands, fancyopts, registrar
707 707 >
708 708 > def func(arg):
709 709 > return '%sfoo' % arg
710 710 > class customopt(fancyopts.customopt):
711 711 > def newstate(self, oldstate, newparam, abort):
712 712 > return '%sbar' % oldstate
713 713 > cmdtable = {}
714 714 > command = registrar.command(cmdtable)
715 715 >
716 716 > @command(b'nohelp',
717 717 > [(b'', b'longdesc', 3, b'x'*67),
718 718 > (b'n', b'', None, b'normal desc'),
719 719 > (b'', b'newline', b'', b'line1\nline2'),
720 720 > (b'', b'callableopt', func, b'adds foo'),
721 721 > (b'', b'customopt', customopt(''), b'adds bar'),
722 722 > (b'', b'customopt-withdefault', customopt('foo'), b'adds bar')],
723 723 > b'hg nohelp',
724 724 > norepo=True)
725 725 > @command(b'debugoptADV', [(b'', b'aopt', None, b'option is (ADVANCED)')])
726 726 > @command(b'debugoptDEP', [(b'', b'dopt', None, b'option is (DEPRECATED)')])
727 727 > @command(b'debugoptEXP', [(b'', b'eopt', None, b'option is (EXPERIMENTAL)')])
728 728 > def nohelp(ui, *args, **kwargs):
729 729 > pass
730 730 >
731 731 > def uisetup(ui):
732 732 > ui.setconfig(b'alias', b'shellalias', b'!echo hi', b'helpext')
733 733 > ui.setconfig(b'alias', b'hgalias', b'summary', b'helpext')
734 734 >
735 735 > EOF
736 736 $ echo '[extensions]' >> $HGRCPATH
737 737 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
738 738
739 739 Test for aliases
740 740
741 741 $ hg help hgalias
742 742 hg hgalias [--remote]
743 743
744 744 alias for: hg summary
745 745
746 746 summarize working directory state
747 747
748 748 This generates a brief summary of the working directory state, including
749 749 parents, branch, commit status, phase and available updates.
750 750
751 751 With the --remote option, this will check the default paths for incoming
752 752 and outgoing changes. This can be time-consuming.
753 753
754 754 Returns 0 on success.
755 755
756 756 defined by: helpext
757 757
758 758 options:
759 759
760 760 --remote check for push and pull
761 761
762 762 (some details hidden, use --verbose to show complete help)
763 763
764 764 $ hg help shellalias
765 765 hg shellalias
766 766
767 767 shell alias for: echo hi
768 768
769 769 (no help text available)
770 770
771 771 defined by: helpext
772 772
773 773 (some details hidden, use --verbose to show complete help)
774 774
775 775 Test command with no help text
776 776
777 777 $ hg help nohelp
778 778 hg nohelp
779 779
780 780 (no help text available)
781 781
782 782 options:
783 783
784 784 --longdesc VALUE
785 785 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
786 786 xxxxxxxxxxxxxxxxxxxxxxx (default: 3)
787 787 -n -- normal desc
788 788 --newline VALUE line1 line2
789 789 --callableopt VALUE adds foo
790 790 --customopt VALUE adds bar
791 791 --customopt-withdefault VALUE adds bar (default: foo)
792 792
793 793 (some details hidden, use --verbose to show complete help)
794 794
795 795 $ hg help -k nohelp
796 796 Commands:
797 797
798 798 nohelp hg nohelp
799 799
800 800 Extension Commands:
801 801
802 802 nohelp (no help text available)
803 803
804 804 Test that default list of commands omits extension commands
805 805
806 806 #if no-extraextensions
807 807
808 808 $ hg help
809 809 Mercurial Distributed SCM
810 810
811 811 list of commands:
812 812
813 813 add add the specified files on the next commit
814 814 addremove add all new files, delete all missing files
815 815 annotate show changeset information by line for each file
816 816 archive create an unversioned archive of a repository revision
817 817 backout reverse effect of earlier changeset
818 818 bisect subdivision search of changesets
819 819 bookmarks create a new bookmark or list existing bookmarks
820 820 branch set or show the current branch name
821 821 branches list repository named branches
822 822 bundle create a bundle file
823 823 cat output the current or given revision of files
824 824 clone make a copy of an existing repository
825 825 commit commit the specified files or all outstanding changes
826 826 config show combined config settings from all hgrc files
827 827 copy mark files as copied for the next commit
828 828 diff diff repository (or selected files)
829 829 export dump the header and diffs for one or more changesets
830 830 files list tracked files
831 831 forget forget the specified files on the next commit
832 832 graft copy changes from other branches onto the current branch
833 833 grep search revision history for a pattern in specified files
834 834 heads show branch heads
835 835 help show help for a given topic or a help overview
836 836 identify identify the working directory or specified revision
837 837 import import an ordered set of patches
838 838 incoming show new changesets found in source
839 839 init create a new repository in the given directory
840 840 log show revision history of entire repository or files
841 841 manifest output the current or given revision of the project manifest
842 842 merge merge another revision into working directory
843 843 outgoing show changesets not found in the destination
844 844 paths show aliases for remote repositories
845 845 phase set or show the current phase name
846 846 pull pull changes from the specified source
847 847 push push changes to the specified destination
848 848 recover roll back an interrupted transaction
849 849 remove remove the specified files on the next commit
850 850 rename rename files; equivalent of copy + remove
851 851 resolve redo merges or set/view the merge status of files
852 852 revert restore files to their checkout state
853 853 root print the root (top) of the current working directory
854 854 serve start stand-alone webserver
855 855 status show changed files in the working directory
856 856 summary summarize working directory state
857 857 tag add one or more tags for the current or given revision
858 858 tags list repository tags
859 859 unbundle apply one or more bundle files
860 860 update update working directory (or switch revisions)
861 861 verify verify the integrity of the repository
862 862 version output version and copyright information
863 863
864 864 enabled extensions:
865 865
866 866 helpext (no help text available)
867 867
868 868 additional help topics:
869 869
870 870 bundlespec Bundle File Formats
871 871 color Colorizing Outputs
872 872 config Configuration Files
873 873 dates Date Formats
874 874 deprecated Deprecated Features
875 875 diffs Diff Formats
876 876 environment Environment Variables
877 877 extensions Using Additional Features
878 878 filesets Specifying File Sets
879 879 flags Command-line flags
880 880 glossary Glossary
881 881 hgignore Syntax for Mercurial Ignore Files
882 882 hgweb Configuring hgweb
883 883 internals Technical implementation topics
884 884 merge-tools Merge Tools
885 885 pager Pager Support
886 886 patterns File Name Patterns
887 887 phases Working with Phases
888 888 revisions Specifying Revisions
889 889 scripting Using Mercurial from scripts and automation
890 890 subrepos Subrepositories
891 891 templating Template Usage
892 892 urls URL Paths
893 893
894 894 (use 'hg help -v' to show built-in aliases and global options)
895 895
896 896 #endif
897 897
898 898 Test list of internal help commands
899 899
900 900 $ hg help debug
901 901 debug commands (internal and unsupported):
902 902
903 903 debugancestor
904 904 find the ancestor revision of two revisions in a given index
905 905 debugapplystreamclonebundle
906 906 apply a stream clone bundle file
907 907 debugbuilddag
908 908 builds a repo with a given DAG from scratch in the current
909 909 empty repo
910 910 debugbundle lists the contents of a bundle
911 911 debugcapabilities
912 912 lists the capabilities of a remote peer
913 913 debugcheckstate
914 914 validate the correctness of the current dirstate
915 915 debugcolor show available color, effects or style
916 916 debugcommands
917 917 list all available commands and options
918 918 debugcomplete
919 919 returns the completion list associated with the given command
920 920 debugcreatestreamclonebundle
921 921 create a stream clone bundle file
922 922 debugdag format the changelog or an index DAG as a concise textual
923 923 description
924 924 debugdata dump the contents of a data file revision
925 925 debugdate parse and display a date
926 926 debugdeltachain
927 927 dump information about delta chains in a revlog
928 928 debugdirstate
929 929 show the contents of the current dirstate
930 930 debugdiscovery
931 931 runs the changeset discovery protocol in isolation
932 932 debugdownload
933 933 download a resource using Mercurial logic and config
934 934 debugextensions
935 935 show information about active extensions
936 936 debugfileset parse and apply a fileset specification
937 937 debugformat display format information about the current repository
938 938 debugfsinfo show information detected about current filesystem
939 939 debuggetbundle
940 940 retrieves a bundle from a repo
941 941 debugignore display the combined ignore pattern and information about
942 942 ignored files
943 943 debugindex dump index data for a storage primitive
944 944 debugindexdot
945 945 dump an index DAG as a graphviz dot file
946 946 debugindexstats
947 947 show stats related to the changelog index
948 948 debuginstall test Mercurial installation
949 949 debugknown test whether node ids are known to a repo
950 950 debuglocks show or modify state of locks
951 951 debugmanifestfulltextcache
952 952 show, clear or amend the contents of the manifest fulltext
953 953 cache
954 954 debugmergestate
955 955 print merge state
956 956 debugnamecomplete
957 957 complete "names" - tags, open branch names, bookmark names
958 958 debugobsolete
959 959 create arbitrary obsolete marker
960 960 debugoptADV (no help text available)
961 961 debugoptDEP (no help text available)
962 962 debugoptEXP (no help text available)
963 963 debugpathcomplete
964 964 complete part or all of a tracked path
965 965 debugpeer establish a connection to a peer repository
966 966 debugpickmergetool
967 967 examine which merge tool is chosen for specified file
968 968 debugpushkey access the pushkey key/value protocol
969 969 debugpvec (no help text available)
970 970 debugrebuilddirstate
971 971 rebuild the dirstate as it would look like for the given
972 972 revision
973 973 debugrebuildfncache
974 974 rebuild the fncache file
975 975 debugrename dump rename information
976 976 debugrevlog show data and statistics about a revlog
977 977 debugrevlogindex
978 978 dump the contents of a revlog index
979 979 debugrevspec parse and apply a revision specification
980 980 debugserve run a server with advanced settings
981 981 debugsetparents
982 982 manually set the parents of the current working directory
983 983 debugssl test a secure connection to a server
984 984 debugsub (no help text available)
985 985 debugsuccessorssets
986 986 show set of successors for revision
987 987 debugtemplate
988 988 parse and apply a template
989 989 debuguigetpass
990 990 show prompt to type password
991 991 debuguiprompt
992 992 show plain prompt
993 993 debugupdatecaches
994 994 warm all known caches in the repository
995 995 debugupgraderepo
996 996 upgrade a repository to use different features
997 997 debugwalk show how files match on given patterns
998 998 debugwhyunstable
999 999 explain instabilities of a changeset
1000 1000 debugwireargs
1001 1001 (no help text available)
1002 1002 debugwireproto
1003 1003 send wire protocol commands to a server
1004 1004
1005 1005 (use 'hg help -v debug' to show built-in aliases and global options)
1006 1006
1007 1007 internals topic renders index of available sub-topics
1008 1008
1009 1009 $ hg help internals
1010 1010 Technical implementation topics
1011 1011 """""""""""""""""""""""""""""""
1012 1012
1013 1013 To access a subtopic, use "hg help internals.{subtopic-name}"
1014 1014
1015 1015 bundle2 Bundle2
1016 1016 bundles Bundles
1017 1017 cbor CBOR
1018 1018 censor Censor
1019 1019 changegroups Changegroups
1020 1020 config Config Registrar
1021 1021 requirements Repository Requirements
1022 1022 revlogs Revision Logs
1023 1023 wireprotocol Wire Protocol
1024 1024 wireprotocolrpc
1025 1025 Wire Protocol RPC
1026 1026 wireprotocolv2
1027 1027 Wire Protocol Version 2
1028 1028
1029 1029 sub-topics can be accessed
1030 1030
1031 1031 $ hg help internals.changegroups
1032 1032 Changegroups
1033 1033 """"""""""""
1034 1034
1035 1035 Changegroups are representations of repository revlog data, specifically
1036 1036 the changelog data, root/flat manifest data, treemanifest data, and
1037 1037 filelogs.
1038 1038
1039 1039 There are 3 versions of changegroups: "1", "2", and "3". From a high-
1040 1040 level, versions "1" and "2" are almost exactly the same, with the only
1041 1041 difference being an additional item in the *delta header*. Version "3"
1042 1042 adds support for storage flags in the *delta header* and optionally
1043 1043 exchanging treemanifests (enabled by setting an option on the
1044 1044 "changegroup" part in the bundle2).
1045 1045
1046 1046 Changegroups when not exchanging treemanifests consist of 3 logical
1047 1047 segments:
1048 1048
1049 1049 +---------------------------------+
1050 1050 | | | |
1051 1051 | changeset | manifest | filelogs |
1052 1052 | | | |
1053 1053 | | | |
1054 1054 +---------------------------------+
1055 1055
1056 1056 When exchanging treemanifests, there are 4 logical segments:
1057 1057
1058 1058 +-------------------------------------------------+
1059 1059 | | | | |
1060 1060 | changeset | root | treemanifests | filelogs |
1061 1061 | | manifest | | |
1062 1062 | | | | |
1063 1063 +-------------------------------------------------+
1064 1064
1065 1065 The principle building block of each segment is a *chunk*. A *chunk* is a
1066 1066 framed piece of data:
1067 1067
1068 1068 +---------------------------------------+
1069 1069 | | |
1070 1070 | length | data |
1071 1071 | (4 bytes) | (<length - 4> bytes) |
1072 1072 | | |
1073 1073 +---------------------------------------+
1074 1074
1075 1075 All integers are big-endian signed integers. Each chunk starts with a
1076 1076 32-bit integer indicating the length of the entire chunk (including the
1077 1077 length field itself).
1078 1078
1079 1079 There is a special case chunk that has a value of 0 for the length
1080 1080 ("0x00000000"). We call this an *empty chunk*.
1081 1081
1082 1082 Delta Groups
1083 1083 ============
1084 1084
1085 1085 A *delta group* expresses the content of a revlog as a series of deltas,
1086 1086 or patches against previous revisions.
1087 1087
1088 1088 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
1089 1089 to signal the end of the delta group:
1090 1090
1091 1091 +------------------------------------------------------------------------+
1092 1092 | | | | | |
1093 1093 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
1094 1094 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
1095 1095 | | | | | |
1096 1096 +------------------------------------------------------------------------+
1097 1097
1098 1098 Each *chunk*'s data consists of the following:
1099 1099
1100 1100 +---------------------------------------+
1101 1101 | | |
1102 1102 | delta header | delta data |
1103 1103 | (various by version) | (various) |
1104 1104 | | |
1105 1105 +---------------------------------------+
1106 1106
1107 1107 The *delta data* is a series of *delta*s that describe a diff from an
1108 1108 existing entry (either that the recipient already has, or previously
1109 1109 specified in the bundle/changegroup).
1110 1110
1111 1111 The *delta header* is different between versions "1", "2", and "3" of the
1112 1112 changegroup format.
1113 1113
1114 1114 Version 1 (headerlen=80):
1115 1115
1116 1116 +------------------------------------------------------+
1117 1117 | | | | |
1118 1118 | node | p1 node | p2 node | link node |
1119 1119 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1120 1120 | | | | |
1121 1121 +------------------------------------------------------+
1122 1122
1123 1123 Version 2 (headerlen=100):
1124 1124
1125 1125 +------------------------------------------------------------------+
1126 1126 | | | | | |
1127 1127 | node | p1 node | p2 node | base node | link node |
1128 1128 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
1129 1129 | | | | | |
1130 1130 +------------------------------------------------------------------+
1131 1131
1132 1132 Version 3 (headerlen=102):
1133 1133
1134 1134 +------------------------------------------------------------------------------+
1135 1135 | | | | | | |
1136 1136 | node | p1 node | p2 node | base node | link node | flags |
1137 1137 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
1138 1138 | | | | | | |
1139 1139 +------------------------------------------------------------------------------+
1140 1140
1141 1141 The *delta data* consists of "chunklen - 4 - headerlen" bytes, which
1142 1142 contain a series of *delta*s, densely packed (no separators). These deltas
1143 1143 describe a diff from an existing entry (either that the recipient already
1144 1144 has, or previously specified in the bundle/changegroup). The format is
1145 1145 described more fully in "hg help internals.bdiff", but briefly:
1146 1146
1147 1147 +---------------------------------------------------------------+
1148 1148 | | | | |
1149 1149 | start offset | end offset | new length | content |
1150 1150 | (4 bytes) | (4 bytes) | (4 bytes) | (<new length> bytes) |
1151 1151 | | | | |
1152 1152 +---------------------------------------------------------------+
1153 1153
1154 1154 Please note that the length field in the delta data does *not* include
1155 1155 itself.
1156 1156
1157 1157 In version 1, the delta is always applied against the previous node from
1158 1158 the changegroup or the first parent if this is the first entry in the
1159 1159 changegroup.
1160 1160
1161 1161 In version 2 and up, the delta base node is encoded in the entry in the
1162 1162 changegroup. This allows the delta to be expressed against any parent,
1163 1163 which can result in smaller deltas and more efficient encoding of data.
1164 1164
1165 1165 The *flags* field holds bitwise flags affecting the processing of revision
1166 1166 data. The following flags are defined:
1167 1167
1168 1168 32768
1169 1169 Censored revision. The revision's fulltext has been replaced by censor
1170 1170 metadata. May only occur on file revisions.
1171 1171
1172 1172 16384
1173 1173 Ellipsis revision. Revision hash does not match data (likely due to
1174 1174 rewritten parents).
1175 1175
1176 1176 8192
1177 1177 Externally stored. The revision fulltext contains "key:value" "\n"
1178 1178 delimited metadata defining an object stored elsewhere. Used by the LFS
1179 1179 extension.
1180 1180
1181 1181 For historical reasons, the integer values are identical to revlog version
1182 1182 1 per-revision storage flags and correspond to bits being set in this
1183 1183 2-byte field. Bits were allocated starting from the most-significant bit,
1184 1184 hence the reverse ordering and allocation of these flags.
1185 1185
1186 1186 Changeset Segment
1187 1187 =================
1188 1188
1189 1189 The *changeset segment* consists of a single *delta group* holding
1190 1190 changelog data. The *empty chunk* at the end of the *delta group* denotes
1191 1191 the boundary to the *manifest segment*.
1192 1192
1193 1193 Manifest Segment
1194 1194 ================
1195 1195
1196 1196 The *manifest segment* consists of a single *delta group* holding manifest
1197 1197 data. If treemanifests are in use, it contains only the manifest for the
1198 1198 root directory of the repository. Otherwise, it contains the entire
1199 1199 manifest data. The *empty chunk* at the end of the *delta group* denotes
1200 1200 the boundary to the next segment (either the *treemanifests segment* or
1201 1201 the *filelogs segment*, depending on version and the request options).
1202 1202
1203 1203 Treemanifests Segment
1204 1204 ---------------------
1205 1205
1206 1206 The *treemanifests segment* only exists in changegroup version "3", and
1207 1207 only if the 'treemanifest' param is part of the bundle2 changegroup part
1208 1208 (it is not possible to use changegroup version 3 outside of bundle2).
1209 1209 Aside from the filenames in the *treemanifests segment* containing a
1210 1210 trailing "/" character, it behaves identically to the *filelogs segment*
1211 1211 (see below). The final sub-segment is followed by an *empty chunk*
1212 1212 (logically, a sub-segment with filename size 0). This denotes the boundary
1213 1213 to the *filelogs segment*.
1214 1214
1215 1215 Filelogs Segment
1216 1216 ================
1217 1217
1218 1218 The *filelogs segment* consists of multiple sub-segments, each
1219 1219 corresponding to an individual file whose data is being described:
1220 1220
1221 1221 +--------------------------------------------------+
1222 1222 | | | | | |
1223 1223 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
1224 1224 | | | | | (4 bytes) |
1225 1225 | | | | | |
1226 1226 +--------------------------------------------------+
1227 1227
1228 1228 The final filelog sub-segment is followed by an *empty chunk* (logically,
1229 1229 a sub-segment with filename size 0). This denotes the end of the segment
1230 1230 and of the overall changegroup.
1231 1231
1232 1232 Each filelog sub-segment consists of the following:
1233 1233
1234 1234 +------------------------------------------------------+
1235 1235 | | | |
1236 1236 | filename length | filename | delta group |
1237 1237 | (4 bytes) | (<length - 4> bytes) | (various) |
1238 1238 | | | |
1239 1239 +------------------------------------------------------+
1240 1240
1241 1241 That is, a *chunk* consisting of the filename (not terminated or padded)
1242 1242 followed by N chunks constituting the *delta group* for this file. The
1243 1243 *empty chunk* at the end of each *delta group* denotes the boundary to the
1244 1244 next filelog sub-segment.
1245 1245
1246 1246 Test list of commands with command with no help text
1247 1247
1248 1248 $ hg help helpext
1249 1249 helpext extension - no help text available
1250 1250
1251 1251 list of commands:
1252 1252
1253 1253 nohelp (no help text available)
1254 1254
1255 1255 (use 'hg help -v helpext' to show built-in aliases and global options)
1256 1256
1257 1257
1258 1258 test advanced, deprecated and experimental options are hidden in command help
1259 1259 $ hg help debugoptADV
1260 1260 hg debugoptADV
1261 1261
1262 1262 (no help text available)
1263 1263
1264 1264 options:
1265 1265
1266 1266 (some details hidden, use --verbose to show complete help)
1267 1267 $ hg help debugoptDEP
1268 1268 hg debugoptDEP
1269 1269
1270 1270 (no help text available)
1271 1271
1272 1272 options:
1273 1273
1274 1274 (some details hidden, use --verbose to show complete help)
1275 1275
1276 1276 $ hg help debugoptEXP
1277 1277 hg debugoptEXP
1278 1278
1279 1279 (no help text available)
1280 1280
1281 1281 options:
1282 1282
1283 1283 (some details hidden, use --verbose to show complete help)
1284 1284
1285 1285 test advanced, deprecated and experimental options are shown with -v
1286 1286 $ hg help -v debugoptADV | grep aopt
1287 1287 --aopt option is (ADVANCED)
1288 1288 $ hg help -v debugoptDEP | grep dopt
1289 1289 --dopt option is (DEPRECATED)
1290 1290 $ hg help -v debugoptEXP | grep eopt
1291 1291 --eopt option is (EXPERIMENTAL)
1292 1292
1293 1293 #if gettext
1294 1294 test deprecated option is hidden with translation with untranslated description
1295 1295 (use many globy for not failing on changed transaction)
1296 1296 $ LANGUAGE=sv hg help debugoptDEP
1297 1297 hg debugoptDEP
1298 1298
1299 1299 (*) (glob)
1300 1300
1301 1301 options:
1302 1302
1303 1303 (some details hidden, use --verbose to show complete help)
1304 1304 #endif
1305 1305
1306 1306 Test commands that collide with topics (issue4240)
1307 1307
1308 1308 $ hg config -hq
1309 1309 hg config [-u] [NAME]...
1310 1310
1311 1311 show combined config settings from all hgrc files
1312 1312 $ hg showconfig -hq
1313 1313 hg config [-u] [NAME]...
1314 1314
1315 1315 show combined config settings from all hgrc files
1316 1316
1317 1317 Test a help topic
1318 1318
1319 1319 $ hg help dates
1320 1320 Date Formats
1321 1321 """"""""""""
1322 1322
1323 1323 Some commands allow the user to specify a date, e.g.:
1324 1324
1325 1325 - backout, commit, import, tag: Specify the commit date.
1326 1326 - log, revert, update: Select revision(s) by date.
1327 1327
1328 1328 Many date formats are valid. Here are some examples:
1329 1329
1330 1330 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1331 1331 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1332 1332 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1333 1333 - "Dec 6" (midnight)
1334 1334 - "13:18" (today assumed)
1335 1335 - "3:39" (3:39AM assumed)
1336 1336 - "3:39pm" (15:39)
1337 1337 - "2006-12-06 13:18:29" (ISO 8601 format)
1338 1338 - "2006-12-6 13:18"
1339 1339 - "2006-12-6"
1340 1340 - "12-6"
1341 1341 - "12/6"
1342 1342 - "12/6/6" (Dec 6 2006)
1343 1343 - "today" (midnight)
1344 1344 - "yesterday" (midnight)
1345 1345 - "now" - right now
1346 1346
1347 1347 Lastly, there is Mercurial's internal format:
1348 1348
1349 1349 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1350 1350
1351 1351 This is the internal representation format for dates. The first number is
1352 1352 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1353 1353 is the offset of the local timezone, in seconds west of UTC (negative if
1354 1354 the timezone is east of UTC).
1355 1355
1356 1356 The log command also accepts date ranges:
1357 1357
1358 1358 - "<DATE" - at or before a given date/time
1359 1359 - ">DATE" - on or after a given date/time
1360 1360 - "DATE to DATE" - a date range, inclusive
1361 1361 - "-DAYS" - within a given number of days of today
1362 1362
1363 1363 Test repeated config section name
1364 1364
1365 1365 $ hg help config.host
1366 1366 "http_proxy.host"
1367 1367 Host name and (optional) port of the proxy server, for example
1368 1368 "myproxy:8000".
1369 1369
1370 1370 "smtp.host"
1371 1371 Host name of mail server, e.g. "mail.example.com".
1372 1372
1373 1373
1374 1374 Test section name with dot
1375 1375
1376 1376 $ hg help config.ui.username
1377 1377 "ui.username"
1378 1378 The committer of a changeset created when running "commit". Typically
1379 1379 a person's name and email address, e.g. "Fred Widget
1380 1380 <fred@example.com>". Environment variables in the username are
1381 1381 expanded.
1382 1382
1383 1383 (default: "$EMAIL" or "username@hostname". If the username in hgrc is
1384 1384 empty, e.g. if the system admin set "username =" in the system hgrc,
1385 1385 it has to be specified manually or in a different hgrc file)
1386 1386
1387 1387
1388 1388 $ hg help config.annotate.git
1389 1389 abort: help section not found: config.annotate.git
1390 1390 [255]
1391 1391
1392 1392 $ hg help config.update.check
1393 1393 "commands.update.check"
1394 1394 Determines what level of checking 'hg update' will perform before
1395 1395 moving to a destination revision. Valid values are "abort", "none",
1396 1396 "linear", and "noconflict". "abort" always fails if the working
1397 1397 directory has uncommitted changes. "none" performs no checking, and
1398 1398 may result in a merge with uncommitted changes. "linear" allows any
1399 1399 update as long as it follows a straight line in the revision history,
1400 1400 and may trigger a merge with uncommitted changes. "noconflict" will
1401 1401 allow any update which would not trigger a merge with uncommitted
1402 1402 changes, if any are present. (default: "linear")
1403 1403
1404 1404
1405 1405 $ hg help config.commands.update.check
1406 1406 "commands.update.check"
1407 1407 Determines what level of checking 'hg update' will perform before
1408 1408 moving to a destination revision. Valid values are "abort", "none",
1409 1409 "linear", and "noconflict". "abort" always fails if the working
1410 1410 directory has uncommitted changes. "none" performs no checking, and
1411 1411 may result in a merge with uncommitted changes. "linear" allows any
1412 1412 update as long as it follows a straight line in the revision history,
1413 1413 and may trigger a merge with uncommitted changes. "noconflict" will
1414 1414 allow any update which would not trigger a merge with uncommitted
1415 1415 changes, if any are present. (default: "linear")
1416 1416
1417 1417
1418 1418 $ hg help config.ommands.update.check
1419 1419 abort: help section not found: config.ommands.update.check
1420 1420 [255]
1421 1421
1422 1422 Unrelated trailing paragraphs shouldn't be included
1423 1423
1424 1424 $ hg help config.extramsg | grep '^$'
1425 1425
1426 1426
1427 1427 Test capitalized section name
1428 1428
1429 1429 $ hg help scripting.HGPLAIN > /dev/null
1430 1430
1431 1431 Help subsection:
1432 1432
1433 1433 $ hg help config.charsets |grep "Email example:" > /dev/null
1434 1434 [1]
1435 1435
1436 1436 Show nested definitions
1437 1437 ("profiling.type"[break]"ls"[break]"stat"[break])
1438 1438
1439 1439 $ hg help config.type | egrep '^$'|wc -l
1440 1440 \s*3 (re)
1441 1441
1442 1442 $ hg help config.profiling.type.ls
1443 1443 "profiling.type.ls"
1444 1444 Use Python's built-in instrumenting profiler. This profiler works on
1445 1445 all platforms, but each line number it reports is the first line of
1446 1446 a function. This restriction makes it difficult to identify the
1447 1447 expensive parts of a non-trivial function.
1448 1448
1449 1449
1450 1450 Separate sections from subsections
1451 1451
1452 1452 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1453 1453 "format"
1454 1454 --------
1455 1455
1456 1456 "usegeneraldelta"
1457 1457
1458 1458 "dotencode"
1459 1459
1460 1460 "usefncache"
1461 1461
1462 1462 "usestore"
1463 1463
1464 1464 "profiling"
1465 1465 -----------
1466 1466
1467 1467 "format"
1468 1468
1469 1469 "progress"
1470 1470 ----------
1471 1471
1472 1472 "format"
1473 1473
1474 1474
1475 1475 Last item in help config.*:
1476 1476
1477 1477 $ hg help config.`hg help config|grep '^ "'| \
1478 1478 > tail -1|sed 's![ "]*!!g'`| \
1479 1479 > grep 'hg help -c config' > /dev/null
1480 1480 [1]
1481 1481
1482 1482 note to use help -c for general hg help config:
1483 1483
1484 1484 $ hg help config |grep 'hg help -c config' > /dev/null
1485 1485
1486 1486 Test templating help
1487 1487
1488 1488 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1489 1489 desc String. The text of the changeset description.
1490 1490 diffstat String. Statistics of changes with the following format:
1491 1491 firstline Any text. Returns the first line of text.
1492 1492 nonempty Any text. Returns '(none)' if the string is empty.
1493 1493
1494 1494 Test deprecated items
1495 1495
1496 1496 $ hg help -v templating | grep currentbookmark
1497 1497 currentbookmark
1498 1498 $ hg help templating | (grep currentbookmark || true)
1499 1499
1500 1500 Test help hooks
1501 1501
1502 1502 $ cat > helphook1.py <<EOF
1503 1503 > from mercurial import help
1504 1504 >
1505 1505 > def rewrite(ui, topic, doc):
1506 1506 > return doc + b'\nhelphook1\n'
1507 1507 >
1508 1508 > def extsetup(ui):
1509 1509 > help.addtopichook(b'revisions', rewrite)
1510 1510 > EOF
1511 1511 $ cat > helphook2.py <<EOF
1512 1512 > from mercurial import help
1513 1513 >
1514 1514 > def rewrite(ui, topic, doc):
1515 1515 > return doc + b'\nhelphook2\n'
1516 1516 >
1517 1517 > def extsetup(ui):
1518 1518 > help.addtopichook(b'revisions', rewrite)
1519 1519 > EOF
1520 1520 $ echo '[extensions]' >> $HGRCPATH
1521 1521 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1522 1522 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1523 1523 $ hg help revsets | grep helphook
1524 1524 helphook1
1525 1525 helphook2
1526 1526
1527 1527 help -c should only show debug --debug
1528 1528
1529 1529 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1530 1530 [1]
1531 1531
1532 1532 help -c should only show deprecated for -v
1533 1533
1534 1534 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1535 1535 [1]
1536 1536
1537 1537 Test -s / --system
1538 1538
1539 1539 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1540 1540 > wc -l | sed -e 's/ //g'
1541 1541 0
1542 1542 $ hg help config.files --system unix | grep 'USER' | \
1543 1543 > wc -l | sed -e 's/ //g'
1544 1544 0
1545 1545
1546 1546 Test -e / -c / -k combinations
1547 1547
1548 1548 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1549 1549 Commands:
1550 1550 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1551 1551 Extensions:
1552 1552 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1553 1553 Topics:
1554 1554 Commands:
1555 1555 Extensions:
1556 1556 Extension Commands:
1557 1557 $ hg help -c schemes
1558 1558 abort: no such help topic: schemes
1559 1559 (try 'hg help --keyword schemes')
1560 1560 [255]
1561 1561 $ hg help -e schemes |head -1
1562 1562 schemes extension - extend schemes with shortcuts to repository swarms
1563 1563 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1564 1564 Commands:
1565 1565 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1566 1566 Extensions:
1567 1567 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1568 1568 Extensions:
1569 1569 Commands:
1570 1570 $ hg help -c commit > /dev/null
1571 1571 $ hg help -e -c commit > /dev/null
1572 1572 $ hg help -e commit
1573 1573 abort: no such help topic: commit
1574 1574 (try 'hg help --keyword commit')
1575 1575 [255]
1576 1576
1577 1577 Test keyword search help
1578 1578
1579 1579 $ cat > prefixedname.py <<EOF
1580 1580 > '''matched against word "clone"
1581 1581 > '''
1582 1582 > EOF
1583 1583 $ echo '[extensions]' >> $HGRCPATH
1584 1584 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1585 1585 $ hg help -k clone
1586 1586 Topics:
1587 1587
1588 1588 config Configuration Files
1589 1589 extensions Using Additional Features
1590 1590 glossary Glossary
1591 1591 phases Working with Phases
1592 1592 subrepos Subrepositories
1593 1593 urls URL Paths
1594 1594
1595 1595 Commands:
1596 1596
1597 1597 bookmarks create a new bookmark or list existing bookmarks
1598 1598 clone make a copy of an existing repository
1599 1599 paths show aliases for remote repositories
1600 1600 pull pull changes from the specified source
1601 1601 update update working directory (or switch revisions)
1602 1602
1603 1603 Extensions:
1604 1604
1605 1605 clonebundles advertise pre-generated bundles to seed clones
1606 1606 narrow create clones which fetch history data for subset of files
1607 1607 (EXPERIMENTAL)
1608 1608 prefixedname matched against word "clone"
1609 1609 relink recreates hardlinks between repository clones
1610 1610
1611 1611 Extension Commands:
1612 1612
1613 1613 qclone clone main and patch repository at same time
1614 1614
1615 1615 Test unfound topic
1616 1616
1617 1617 $ hg help nonexistingtopicthatwillneverexisteverever
1618 1618 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1619 1619 (try 'hg help --keyword nonexistingtopicthatwillneverexisteverever')
1620 1620 [255]
1621 1621
1622 1622 Test unfound keyword
1623 1623
1624 1624 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1625 1625 abort: no matches
1626 1626 (try 'hg help' for a list of topics)
1627 1627 [255]
1628 1628
1629 1629 Test omit indicating for help
1630 1630
1631 1631 $ cat > addverboseitems.py <<EOF
1632 1632 > '''extension to test omit indicating.
1633 1633 >
1634 1634 > This paragraph is never omitted (for extension)
1635 1635 >
1636 1636 > .. container:: verbose
1637 1637 >
1638 1638 > This paragraph is omitted,
1639 1639 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1640 1640 >
1641 1641 > This paragraph is never omitted, too (for extension)
1642 1642 > '''
1643 1643 > from __future__ import absolute_import
1644 1644 > from mercurial import commands, help
1645 1645 > testtopic = b"""This paragraph is never omitted (for topic).
1646 1646 >
1647 1647 > .. container:: verbose
1648 1648 >
1649 1649 > This paragraph is omitted,
1650 1650 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1651 1651 >
1652 1652 > This paragraph is never omitted, too (for topic)
1653 1653 > """
1654 1654 > def extsetup(ui):
1655 1655 > help.helptable.append(([b"topic-containing-verbose"],
1656 1656 > b"This is the topic to test omit indicating.",
1657 1657 > lambda ui: testtopic))
1658 1658 > EOF
1659 1659 $ echo '[extensions]' >> $HGRCPATH
1660 1660 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1661 1661 $ hg help addverboseitems
1662 1662 addverboseitems extension - extension to test omit indicating.
1663 1663
1664 1664 This paragraph is never omitted (for extension)
1665 1665
1666 1666 This paragraph is never omitted, too (for extension)
1667 1667
1668 1668 (some details hidden, use --verbose to show complete help)
1669 1669
1670 1670 no commands defined
1671 1671 $ hg help -v addverboseitems
1672 1672 addverboseitems extension - extension to test omit indicating.
1673 1673
1674 1674 This paragraph is never omitted (for extension)
1675 1675
1676 1676 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1677 1677 extension)
1678 1678
1679 1679 This paragraph is never omitted, too (for extension)
1680 1680
1681 1681 no commands defined
1682 1682 $ hg help topic-containing-verbose
1683 1683 This is the topic to test omit indicating.
1684 1684 """"""""""""""""""""""""""""""""""""""""""
1685 1685
1686 1686 This paragraph is never omitted (for topic).
1687 1687
1688 1688 This paragraph is never omitted, too (for topic)
1689 1689
1690 1690 (some details hidden, use --verbose to show complete help)
1691 1691 $ hg help -v topic-containing-verbose
1692 1692 This is the topic to test omit indicating.
1693 1693 """"""""""""""""""""""""""""""""""""""""""
1694 1694
1695 1695 This paragraph is never omitted (for topic).
1696 1696
1697 1697 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1698 1698 topic)
1699 1699
1700 1700 This paragraph is never omitted, too (for topic)
1701 1701
1702 1702 Test section lookup
1703 1703
1704 1704 $ hg help revset.merge
1705 1705 "merge()"
1706 1706 Changeset is a merge changeset.
1707 1707
1708 1708 $ hg help glossary.dag
1709 1709 DAG
1710 1710 The repository of changesets of a distributed version control system
1711 1711 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1712 1712 of nodes and edges, where nodes correspond to changesets and edges
1713 1713 imply a parent -> child relation. This graph can be visualized by
1714 1714 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1715 1715 limited by the requirement for children to have at most two parents.
1716 1716
1717 1717
1718 1718 $ hg help hgrc.paths
1719 1719 "paths"
1720 1720 -------
1721 1721
1722 1722 Assigns symbolic names and behavior to repositories.
1723 1723
1724 1724 Options are symbolic names defining the URL or directory that is the
1725 1725 location of the repository. Example:
1726 1726
1727 1727 [paths]
1728 1728 my_server = https://example.com/my_repo
1729 1729 local_path = /home/me/repo
1730 1730
1731 1731 These symbolic names can be used from the command line. To pull from
1732 1732 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1733 1733 local_path'.
1734 1734
1735 1735 Options containing colons (":") denote sub-options that can influence
1736 1736 behavior for that specific path. Example:
1737 1737
1738 1738 [paths]
1739 1739 my_server = https://example.com/my_path
1740 1740 my_server:pushurl = ssh://example.com/my_path
1741 1741
1742 1742 The following sub-options can be defined:
1743 1743
1744 1744 "pushurl"
1745 1745 The URL to use for push operations. If not defined, the location
1746 1746 defined by the path's main entry is used.
1747 1747
1748 1748 "pushrev"
1749 1749 A revset defining which revisions to push by default.
1750 1750
1751 1751 When 'hg push' is executed without a "-r" argument, the revset defined
1752 1752 by this sub-option is evaluated to determine what to push.
1753 1753
1754 1754 For example, a value of "." will push the working directory's revision
1755 1755 by default.
1756 1756
1757 1757 Revsets specifying bookmarks will not result in the bookmark being
1758 1758 pushed.
1759 1759
1760 1760 The following special named paths exist:
1761 1761
1762 1762 "default"
1763 1763 The URL or directory to use when no source or remote is specified.
1764 1764
1765 1765 'hg clone' will automatically define this path to the location the
1766 1766 repository was cloned from.
1767 1767
1768 1768 "default-push"
1769 1769 (deprecated) The URL or directory for the default 'hg push' location.
1770 1770 "default:pushurl" should be used instead.
1771 1771
1772 1772 $ hg help glossary.mcguffin
1773 1773 abort: help section not found: glossary.mcguffin
1774 1774 [255]
1775 1775
1776 1776 $ hg help glossary.mc.guffin
1777 1777 abort: help section not found: glossary.mc.guffin
1778 1778 [255]
1779 1779
1780 1780 $ hg help template.files
1781 1781 files List of strings. All files modified, added, or removed by
1782 1782 this changeset.
1783 1783 files(pattern)
1784 1784 All files of the current changeset matching the pattern. See
1785 1785 'hg help patterns'.
1786 1786
1787 1787 Test section lookup by translated message
1788 1788
1789 1789 str.lower() instead of encoding.lower(str) on translated message might
1790 1790 make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z)
1791 1791 as the second or later byte of multi-byte character.
1792 1792
1793 1793 For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932)
1794 1794 contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this
1795 1795 replacement makes message meaningless.
1796 1796
1797 1797 This tests that section lookup by translated string isn't broken by
1798 1798 such str.lower().
1799 1799
1800 1800 $ "$PYTHON" <<EOF
1801 1801 > def escape(s):
1802 > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932'))
1802 > return b''.join(b'\\u%x' % ord(uc) for uc in s.decode('cp932'))
1803 1803 > # translation of "record" in ja_JP.cp932
1804 > upper = "\x8bL\x98^"
1804 > upper = b"\x8bL\x98^"
1805 1805 > # str.lower()-ed section name should be treated as different one
1806 > lower = "\x8bl\x98^"
1807 > with open('ambiguous.py', 'w') as fp:
1808 > fp.write("""# ambiguous section names in ja_JP.cp932
1806 > lower = b"\x8bl\x98^"
1807 > with open('ambiguous.py', 'wb') as fp:
1808 > fp.write(b"""# ambiguous section names in ja_JP.cp932
1809 1809 > u'''summary of extension
1810 1810 >
1811 1811 > %s
1812 1812 > ----
1813 1813 >
1814 1814 > Upper name should show only this message
1815 1815 >
1816 1816 > %s
1817 1817 > ----
1818 1818 >
1819 1819 > Lower name should show only this message
1820 1820 >
1821 1821 > subsequent section
1822 1822 > ------------------
1823 1823 >
1824 1824 > This should be hidden at 'hg help ambiguous' with section name.
1825 1825 > '''
1826 1826 > """ % (escape(upper), escape(lower)))
1827 1827 > EOF
1828 1828
1829 1829 $ cat >> $HGRCPATH <<EOF
1830 1830 > [extensions]
1831 1831 > ambiguous = ./ambiguous.py
1832 1832 > EOF
1833 1833
1834 1834 $ "$PYTHON" <<EOF | sh
1835 > upper = "\x8bL\x98^"
1836 > print("hg --encoding cp932 help -e ambiguous.%s" % upper)
1835 > from mercurial import pycompat
1836 > upper = b"\x8bL\x98^"
1837 > pycompat.stdout.write(b"hg --encoding cp932 help -e ambiguous.%s\n" % upper)
1837 1838 > EOF
1838 1839 \x8bL\x98^ (esc)
1839 1840 ----
1840 1841
1841 1842 Upper name should show only this message
1842 1843
1843 1844
1844 1845 $ "$PYTHON" <<EOF | sh
1845 > lower = "\x8bl\x98^"
1846 > print("hg --encoding cp932 help -e ambiguous.%s" % lower)
1846 > from mercurial import pycompat
1847 > lower = b"\x8bl\x98^"
1848 > pycompat.stdout.write(b"hg --encoding cp932 help -e ambiguous.%s\n" % lower)
1847 1849 > EOF
1848 1850 \x8bl\x98^ (esc)
1849 1851 ----
1850 1852
1851 1853 Lower name should show only this message
1852 1854
1853 1855
1854 1856 $ cat >> $HGRCPATH <<EOF
1855 1857 > [extensions]
1856 1858 > ambiguous = !
1857 1859 > EOF
1858 1860
1859 1861 Show help content of disabled extensions
1860 1862
1861 1863 $ cat >> $HGRCPATH <<EOF
1862 1864 > [extensions]
1863 1865 > ambiguous = !./ambiguous.py
1864 1866 > EOF
1865 1867 $ hg help -e ambiguous
1866 1868 ambiguous extension - (no help text available)
1867 1869
1868 1870 (use 'hg help extensions' for information on enabling extensions)
1869 1871
1870 1872 Test dynamic list of merge tools only shows up once
1871 1873 $ hg help merge-tools
1872 1874 Merge Tools
1873 1875 """""""""""
1874 1876
1875 1877 To merge files Mercurial uses merge tools.
1876 1878
1877 1879 A merge tool combines two different versions of a file into a merged file.
1878 1880 Merge tools are given the two files and the greatest common ancestor of
1879 1881 the two file versions, so they can determine the changes made on both
1880 1882 branches.
1881 1883
1882 1884 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1883 1885 backout' and in several extensions.
1884 1886
1885 1887 Usually, the merge tool tries to automatically reconcile the files by
1886 1888 combining all non-overlapping changes that occurred separately in the two
1887 1889 different evolutions of the same initial base file. Furthermore, some
1888 1890 interactive merge programs make it easier to manually resolve conflicting
1889 1891 merges, either in a graphical way, or by inserting some conflict markers.
1890 1892 Mercurial does not include any interactive merge programs but relies on
1891 1893 external tools for that.
1892 1894
1893 1895 Available merge tools
1894 1896 =====================
1895 1897
1896 1898 External merge tools and their properties are configured in the merge-
1897 1899 tools configuration section - see hgrc(5) - but they can often just be
1898 1900 named by their executable.
1899 1901
1900 1902 A merge tool is generally usable if its executable can be found on the
1901 1903 system and if it can handle the merge. The executable is found if it is an
1902 1904 absolute or relative executable path or the name of an application in the
1903 1905 executable search path. The tool is assumed to be able to handle the merge
1904 1906 if it can handle symlinks if the file is a symlink, if it can handle
1905 1907 binary files if the file is binary, and if a GUI is available if the tool
1906 1908 requires a GUI.
1907 1909
1908 1910 There are some internal merge tools which can be used. The internal merge
1909 1911 tools are:
1910 1912
1911 1913 ":dump"
1912 1914 Creates three versions of the files to merge, containing the contents of
1913 1915 local, other and base. These files can then be used to perform a merge
1914 1916 manually. If the file to be merged is named "a.txt", these files will
1915 1917 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1916 1918 they will be placed in the same directory as "a.txt".
1917 1919
1918 1920 This implies premerge. Therefore, files aren't dumped, if premerge runs
1919 1921 successfully. Use :forcedump to forcibly write files out.
1920 1922
1921 1923 (actual capabilities: binary, symlink)
1922 1924
1923 1925 ":fail"
1924 1926 Rather than attempting to merge files that were modified on both
1925 1927 branches, it marks them as unresolved. The resolve command must be used
1926 1928 to resolve these conflicts.
1927 1929
1928 1930 (actual capabilities: binary, symlink)
1929 1931
1930 1932 ":forcedump"
1931 1933 Creates three versions of the files as same as :dump, but omits
1932 1934 premerge.
1933 1935
1934 1936 (actual capabilities: binary, symlink)
1935 1937
1936 1938 ":local"
1937 1939 Uses the local 'p1()' version of files as the merged version.
1938 1940
1939 1941 (actual capabilities: binary, symlink)
1940 1942
1941 1943 ":merge"
1942 1944 Uses the internal non-interactive simple merge algorithm for merging
1943 1945 files. It will fail if there are any conflicts and leave markers in the
1944 1946 partially merged file. Markers will have two sections, one for each side
1945 1947 of merge.
1946 1948
1947 1949 ":merge-local"
1948 1950 Like :merge, but resolve all conflicts non-interactively in favor of the
1949 1951 local 'p1()' changes.
1950 1952
1951 1953 ":merge-other"
1952 1954 Like :merge, but resolve all conflicts non-interactively in favor of the
1953 1955 other 'p2()' changes.
1954 1956
1955 1957 ":merge3"
1956 1958 Uses the internal non-interactive simple merge algorithm for merging
1957 1959 files. It will fail if there are any conflicts and leave markers in the
1958 1960 partially merged file. Marker will have three sections, one from each
1959 1961 side of the merge and one for the base content.
1960 1962
1961 1963 ":other"
1962 1964 Uses the other 'p2()' version of files as the merged version.
1963 1965
1964 1966 (actual capabilities: binary, symlink)
1965 1967
1966 1968 ":prompt"
1967 1969 Asks the user which of the local 'p1()' or the other 'p2()' version to
1968 1970 keep as the merged version.
1969 1971
1970 1972 (actual capabilities: binary, symlink)
1971 1973
1972 1974 ":tagmerge"
1973 1975 Uses the internal tag merge algorithm (experimental).
1974 1976
1975 1977 ":union"
1976 1978 Uses the internal non-interactive simple merge algorithm for merging
1977 1979 files. It will use both left and right sides for conflict regions. No
1978 1980 markers are inserted.
1979 1981
1980 1982 Internal tools are always available and do not require a GUI but will by
1981 1983 default not handle symlinks or binary files. See next section for detail
1982 1984 about "actual capabilities" described above.
1983 1985
1984 1986 Choosing a merge tool
1985 1987 =====================
1986 1988
1987 1989 Mercurial uses these rules when deciding which merge tool to use:
1988 1990
1989 1991 1. If a tool has been specified with the --tool option to merge or
1990 1992 resolve, it is used. If it is the name of a tool in the merge-tools
1991 1993 configuration, its configuration is used. Otherwise the specified tool
1992 1994 must be executable by the shell.
1993 1995 2. If the "HGMERGE" environment variable is present, its value is used and
1994 1996 must be executable by the shell.
1995 1997 3. If the filename of the file to be merged matches any of the patterns in
1996 1998 the merge-patterns configuration section, the first usable merge tool
1997 1999 corresponding to a matching pattern is used.
1998 2000 4. If ui.merge is set it will be considered next. If the value is not the
1999 2001 name of a configured tool, the specified value is used and must be
2000 2002 executable by the shell. Otherwise the named tool is used if it is
2001 2003 usable.
2002 2004 5. If any usable merge tools are present in the merge-tools configuration
2003 2005 section, the one with the highest priority is used.
2004 2006 6. If a program named "hgmerge" can be found on the system, it is used -
2005 2007 but it will by default not be used for symlinks and binary files.
2006 2008 7. If the file to be merged is not binary and is not a symlink, then
2007 2009 internal ":merge" is used.
2008 2010 8. Otherwise, ":prompt" is used.
2009 2011
2010 2012 For historical reason, Mercurial treats merge tools as below while
2011 2013 examining rules above.
2012 2014
2013 2015 step specified via binary symlink
2014 2016 ----------------------------------
2015 2017 1. --tool o/o o/o
2016 2018 2. HGMERGE o/o o/o
2017 2019 3. merge-patterns o/o(*) x/?(*)
2018 2020 4. ui.merge x/?(*) x/?(*)
2019 2021
2020 2022 Each capability column indicates Mercurial behavior for internal/external
2021 2023 merge tools at examining each rule.
2022 2024
2023 2025 - "o": "assume that a tool has capability"
2024 2026 - "x": "assume that a tool does not have capability"
2025 2027 - "?": "check actual capability of a tool"
2026 2028
2027 2029 If "merge.strict-capability-check" configuration is true, Mercurial checks
2028 2030 capabilities of merge tools strictly in (*) cases above (= each capability
2029 2031 column becomes "?/?"). It is false by default for backward compatibility.
2030 2032
2031 2033 Note:
2032 2034 After selecting a merge program, Mercurial will by default attempt to
2033 2035 merge the files using a simple merge algorithm first. Only if it
2034 2036 doesn't succeed because of conflicting changes will Mercurial actually
2035 2037 execute the merge program. Whether to use the simple merge algorithm
2036 2038 first can be controlled by the premerge setting of the merge tool.
2037 2039 Premerge is enabled by default unless the file is binary or a symlink.
2038 2040
2039 2041 See the merge-tools and ui sections of hgrc(5) for details on the
2040 2042 configuration of merge tools.
2041 2043
2042 2044 Compression engines listed in `hg help bundlespec`
2043 2045
2044 2046 $ hg help bundlespec | grep gzip
2045 2047 "v1" bundles can only use the "gzip", "bzip2", and "none" compression
2046 2048 An algorithm that produces smaller bundles than "gzip".
2047 2049 This engine will likely produce smaller bundles than "gzip" but will be
2048 2050 "gzip"
2049 2051 better compression than "gzip". It also frequently yields better (?)
2050 2052
2051 2053 Test usage of section marks in help documents
2052 2054
2053 2055 $ cd "$TESTDIR"/../doc
2054 2056 $ "$PYTHON" check-seclevel.py
2055 2057 $ cd $TESTTMP
2056 2058
2057 2059 #if serve
2058 2060
2059 2061 Test the help pages in hgweb.
2060 2062
2061 2063 Dish up an empty repo; serve it cold.
2062 2064
2063 2065 $ hg init "$TESTTMP/test"
2064 2066 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
2065 2067 $ cat hg.pid >> $DAEMON_PIDS
2066 2068
2067 2069 $ get-with-headers.py $LOCALIP:$HGPORT "help"
2068 2070 200 Script output follows
2069 2071
2070 2072 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2071 2073 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2072 2074 <head>
2073 2075 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2074 2076 <meta name="robots" content="index, nofollow" />
2075 2077 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2076 2078 <script type="text/javascript" src="/static/mercurial.js"></script>
2077 2079
2078 2080 <title>Help: Index</title>
2079 2081 </head>
2080 2082 <body>
2081 2083
2082 2084 <div class="container">
2083 2085 <div class="menu">
2084 2086 <div class="logo">
2085 2087 <a href="https://mercurial-scm.org/">
2086 2088 <img src="/static/hglogo.png" alt="mercurial" /></a>
2087 2089 </div>
2088 2090 <ul>
2089 2091 <li><a href="/shortlog">log</a></li>
2090 2092 <li><a href="/graph">graph</a></li>
2091 2093 <li><a href="/tags">tags</a></li>
2092 2094 <li><a href="/bookmarks">bookmarks</a></li>
2093 2095 <li><a href="/branches">branches</a></li>
2094 2096 </ul>
2095 2097 <ul>
2096 2098 <li class="active">help</li>
2097 2099 </ul>
2098 2100 </div>
2099 2101
2100 2102 <div class="main">
2101 2103 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2102 2104
2103 2105 <form class="search" action="/log">
2104 2106
2105 2107 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
2106 2108 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2107 2109 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2108 2110 </form>
2109 2111 <table class="bigtable">
2110 2112 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
2111 2113
2112 2114 <tr><td>
2113 2115 <a href="/help/bundlespec">
2114 2116 bundlespec
2115 2117 </a>
2116 2118 </td><td>
2117 2119 Bundle File Formats
2118 2120 </td></tr>
2119 2121 <tr><td>
2120 2122 <a href="/help/color">
2121 2123 color
2122 2124 </a>
2123 2125 </td><td>
2124 2126 Colorizing Outputs
2125 2127 </td></tr>
2126 2128 <tr><td>
2127 2129 <a href="/help/config">
2128 2130 config
2129 2131 </a>
2130 2132 </td><td>
2131 2133 Configuration Files
2132 2134 </td></tr>
2133 2135 <tr><td>
2134 2136 <a href="/help/dates">
2135 2137 dates
2136 2138 </a>
2137 2139 </td><td>
2138 2140 Date Formats
2139 2141 </td></tr>
2140 2142 <tr><td>
2141 2143 <a href="/help/deprecated">
2142 2144 deprecated
2143 2145 </a>
2144 2146 </td><td>
2145 2147 Deprecated Features
2146 2148 </td></tr>
2147 2149 <tr><td>
2148 2150 <a href="/help/diffs">
2149 2151 diffs
2150 2152 </a>
2151 2153 </td><td>
2152 2154 Diff Formats
2153 2155 </td></tr>
2154 2156 <tr><td>
2155 2157 <a href="/help/environment">
2156 2158 environment
2157 2159 </a>
2158 2160 </td><td>
2159 2161 Environment Variables
2160 2162 </td></tr>
2161 2163 <tr><td>
2162 2164 <a href="/help/extensions">
2163 2165 extensions
2164 2166 </a>
2165 2167 </td><td>
2166 2168 Using Additional Features
2167 2169 </td></tr>
2168 2170 <tr><td>
2169 2171 <a href="/help/filesets">
2170 2172 filesets
2171 2173 </a>
2172 2174 </td><td>
2173 2175 Specifying File Sets
2174 2176 </td></tr>
2175 2177 <tr><td>
2176 2178 <a href="/help/flags">
2177 2179 flags
2178 2180 </a>
2179 2181 </td><td>
2180 2182 Command-line flags
2181 2183 </td></tr>
2182 2184 <tr><td>
2183 2185 <a href="/help/glossary">
2184 2186 glossary
2185 2187 </a>
2186 2188 </td><td>
2187 2189 Glossary
2188 2190 </td></tr>
2189 2191 <tr><td>
2190 2192 <a href="/help/hgignore">
2191 2193 hgignore
2192 2194 </a>
2193 2195 </td><td>
2194 2196 Syntax for Mercurial Ignore Files
2195 2197 </td></tr>
2196 2198 <tr><td>
2197 2199 <a href="/help/hgweb">
2198 2200 hgweb
2199 2201 </a>
2200 2202 </td><td>
2201 2203 Configuring hgweb
2202 2204 </td></tr>
2203 2205 <tr><td>
2204 2206 <a href="/help/internals">
2205 2207 internals
2206 2208 </a>
2207 2209 </td><td>
2208 2210 Technical implementation topics
2209 2211 </td></tr>
2210 2212 <tr><td>
2211 2213 <a href="/help/merge-tools">
2212 2214 merge-tools
2213 2215 </a>
2214 2216 </td><td>
2215 2217 Merge Tools
2216 2218 </td></tr>
2217 2219 <tr><td>
2218 2220 <a href="/help/pager">
2219 2221 pager
2220 2222 </a>
2221 2223 </td><td>
2222 2224 Pager Support
2223 2225 </td></tr>
2224 2226 <tr><td>
2225 2227 <a href="/help/patterns">
2226 2228 patterns
2227 2229 </a>
2228 2230 </td><td>
2229 2231 File Name Patterns
2230 2232 </td></tr>
2231 2233 <tr><td>
2232 2234 <a href="/help/phases">
2233 2235 phases
2234 2236 </a>
2235 2237 </td><td>
2236 2238 Working with Phases
2237 2239 </td></tr>
2238 2240 <tr><td>
2239 2241 <a href="/help/revisions">
2240 2242 revisions
2241 2243 </a>
2242 2244 </td><td>
2243 2245 Specifying Revisions
2244 2246 </td></tr>
2245 2247 <tr><td>
2246 2248 <a href="/help/scripting">
2247 2249 scripting
2248 2250 </a>
2249 2251 </td><td>
2250 2252 Using Mercurial from scripts and automation
2251 2253 </td></tr>
2252 2254 <tr><td>
2253 2255 <a href="/help/subrepos">
2254 2256 subrepos
2255 2257 </a>
2256 2258 </td><td>
2257 2259 Subrepositories
2258 2260 </td></tr>
2259 2261 <tr><td>
2260 2262 <a href="/help/templating">
2261 2263 templating
2262 2264 </a>
2263 2265 </td><td>
2264 2266 Template Usage
2265 2267 </td></tr>
2266 2268 <tr><td>
2267 2269 <a href="/help/urls">
2268 2270 urls
2269 2271 </a>
2270 2272 </td><td>
2271 2273 URL Paths
2272 2274 </td></tr>
2273 2275 <tr><td>
2274 2276 <a href="/help/topic-containing-verbose">
2275 2277 topic-containing-verbose
2276 2278 </a>
2277 2279 </td><td>
2278 2280 This is the topic to test omit indicating.
2279 2281 </td></tr>
2280 2282
2281 2283
2282 2284 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
2283 2285
2284 2286 <tr><td>
2285 2287 <a href="/help/add">
2286 2288 add
2287 2289 </a>
2288 2290 </td><td>
2289 2291 add the specified files on the next commit
2290 2292 </td></tr>
2291 2293 <tr><td>
2292 2294 <a href="/help/annotate">
2293 2295 annotate
2294 2296 </a>
2295 2297 </td><td>
2296 2298 show changeset information by line for each file
2297 2299 </td></tr>
2298 2300 <tr><td>
2299 2301 <a href="/help/clone">
2300 2302 clone
2301 2303 </a>
2302 2304 </td><td>
2303 2305 make a copy of an existing repository
2304 2306 </td></tr>
2305 2307 <tr><td>
2306 2308 <a href="/help/commit">
2307 2309 commit
2308 2310 </a>
2309 2311 </td><td>
2310 2312 commit the specified files or all outstanding changes
2311 2313 </td></tr>
2312 2314 <tr><td>
2313 2315 <a href="/help/diff">
2314 2316 diff
2315 2317 </a>
2316 2318 </td><td>
2317 2319 diff repository (or selected files)
2318 2320 </td></tr>
2319 2321 <tr><td>
2320 2322 <a href="/help/export">
2321 2323 export
2322 2324 </a>
2323 2325 </td><td>
2324 2326 dump the header and diffs for one or more changesets
2325 2327 </td></tr>
2326 2328 <tr><td>
2327 2329 <a href="/help/forget">
2328 2330 forget
2329 2331 </a>
2330 2332 </td><td>
2331 2333 forget the specified files on the next commit
2332 2334 </td></tr>
2333 2335 <tr><td>
2334 2336 <a href="/help/init">
2335 2337 init
2336 2338 </a>
2337 2339 </td><td>
2338 2340 create a new repository in the given directory
2339 2341 </td></tr>
2340 2342 <tr><td>
2341 2343 <a href="/help/log">
2342 2344 log
2343 2345 </a>
2344 2346 </td><td>
2345 2347 show revision history of entire repository or files
2346 2348 </td></tr>
2347 2349 <tr><td>
2348 2350 <a href="/help/merge">
2349 2351 merge
2350 2352 </a>
2351 2353 </td><td>
2352 2354 merge another revision into working directory
2353 2355 </td></tr>
2354 2356 <tr><td>
2355 2357 <a href="/help/pull">
2356 2358 pull
2357 2359 </a>
2358 2360 </td><td>
2359 2361 pull changes from the specified source
2360 2362 </td></tr>
2361 2363 <tr><td>
2362 2364 <a href="/help/push">
2363 2365 push
2364 2366 </a>
2365 2367 </td><td>
2366 2368 push changes to the specified destination
2367 2369 </td></tr>
2368 2370 <tr><td>
2369 2371 <a href="/help/remove">
2370 2372 remove
2371 2373 </a>
2372 2374 </td><td>
2373 2375 remove the specified files on the next commit
2374 2376 </td></tr>
2375 2377 <tr><td>
2376 2378 <a href="/help/serve">
2377 2379 serve
2378 2380 </a>
2379 2381 </td><td>
2380 2382 start stand-alone webserver
2381 2383 </td></tr>
2382 2384 <tr><td>
2383 2385 <a href="/help/status">
2384 2386 status
2385 2387 </a>
2386 2388 </td><td>
2387 2389 show changed files in the working directory
2388 2390 </td></tr>
2389 2391 <tr><td>
2390 2392 <a href="/help/summary">
2391 2393 summary
2392 2394 </a>
2393 2395 </td><td>
2394 2396 summarize working directory state
2395 2397 </td></tr>
2396 2398 <tr><td>
2397 2399 <a href="/help/update">
2398 2400 update
2399 2401 </a>
2400 2402 </td><td>
2401 2403 update working directory (or switch revisions)
2402 2404 </td></tr>
2403 2405
2404 2406
2405 2407
2406 2408 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
2407 2409
2408 2410 <tr><td>
2409 2411 <a href="/help/addremove">
2410 2412 addremove
2411 2413 </a>
2412 2414 </td><td>
2413 2415 add all new files, delete all missing files
2414 2416 </td></tr>
2415 2417 <tr><td>
2416 2418 <a href="/help/archive">
2417 2419 archive
2418 2420 </a>
2419 2421 </td><td>
2420 2422 create an unversioned archive of a repository revision
2421 2423 </td></tr>
2422 2424 <tr><td>
2423 2425 <a href="/help/backout">
2424 2426 backout
2425 2427 </a>
2426 2428 </td><td>
2427 2429 reverse effect of earlier changeset
2428 2430 </td></tr>
2429 2431 <tr><td>
2430 2432 <a href="/help/bisect">
2431 2433 bisect
2432 2434 </a>
2433 2435 </td><td>
2434 2436 subdivision search of changesets
2435 2437 </td></tr>
2436 2438 <tr><td>
2437 2439 <a href="/help/bookmarks">
2438 2440 bookmarks
2439 2441 </a>
2440 2442 </td><td>
2441 2443 create a new bookmark or list existing bookmarks
2442 2444 </td></tr>
2443 2445 <tr><td>
2444 2446 <a href="/help/branch">
2445 2447 branch
2446 2448 </a>
2447 2449 </td><td>
2448 2450 set or show the current branch name
2449 2451 </td></tr>
2450 2452 <tr><td>
2451 2453 <a href="/help/branches">
2452 2454 branches
2453 2455 </a>
2454 2456 </td><td>
2455 2457 list repository named branches
2456 2458 </td></tr>
2457 2459 <tr><td>
2458 2460 <a href="/help/bundle">
2459 2461 bundle
2460 2462 </a>
2461 2463 </td><td>
2462 2464 create a bundle file
2463 2465 </td></tr>
2464 2466 <tr><td>
2465 2467 <a href="/help/cat">
2466 2468 cat
2467 2469 </a>
2468 2470 </td><td>
2469 2471 output the current or given revision of files
2470 2472 </td></tr>
2471 2473 <tr><td>
2472 2474 <a href="/help/config">
2473 2475 config
2474 2476 </a>
2475 2477 </td><td>
2476 2478 show combined config settings from all hgrc files
2477 2479 </td></tr>
2478 2480 <tr><td>
2479 2481 <a href="/help/copy">
2480 2482 copy
2481 2483 </a>
2482 2484 </td><td>
2483 2485 mark files as copied for the next commit
2484 2486 </td></tr>
2485 2487 <tr><td>
2486 2488 <a href="/help/files">
2487 2489 files
2488 2490 </a>
2489 2491 </td><td>
2490 2492 list tracked files
2491 2493 </td></tr>
2492 2494 <tr><td>
2493 2495 <a href="/help/graft">
2494 2496 graft
2495 2497 </a>
2496 2498 </td><td>
2497 2499 copy changes from other branches onto the current branch
2498 2500 </td></tr>
2499 2501 <tr><td>
2500 2502 <a href="/help/grep">
2501 2503 grep
2502 2504 </a>
2503 2505 </td><td>
2504 2506 search revision history for a pattern in specified files
2505 2507 </td></tr>
2506 2508 <tr><td>
2507 2509 <a href="/help/heads">
2508 2510 heads
2509 2511 </a>
2510 2512 </td><td>
2511 2513 show branch heads
2512 2514 </td></tr>
2513 2515 <tr><td>
2514 2516 <a href="/help/help">
2515 2517 help
2516 2518 </a>
2517 2519 </td><td>
2518 2520 show help for a given topic or a help overview
2519 2521 </td></tr>
2520 2522 <tr><td>
2521 2523 <a href="/help/hgalias">
2522 2524 hgalias
2523 2525 </a>
2524 2526 </td><td>
2525 2527 summarize working directory state
2526 2528 </td></tr>
2527 2529 <tr><td>
2528 2530 <a href="/help/identify">
2529 2531 identify
2530 2532 </a>
2531 2533 </td><td>
2532 2534 identify the working directory or specified revision
2533 2535 </td></tr>
2534 2536 <tr><td>
2535 2537 <a href="/help/import">
2536 2538 import
2537 2539 </a>
2538 2540 </td><td>
2539 2541 import an ordered set of patches
2540 2542 </td></tr>
2541 2543 <tr><td>
2542 2544 <a href="/help/incoming">
2543 2545 incoming
2544 2546 </a>
2545 2547 </td><td>
2546 2548 show new changesets found in source
2547 2549 </td></tr>
2548 2550 <tr><td>
2549 2551 <a href="/help/manifest">
2550 2552 manifest
2551 2553 </a>
2552 2554 </td><td>
2553 2555 output the current or given revision of the project manifest
2554 2556 </td></tr>
2555 2557 <tr><td>
2556 2558 <a href="/help/nohelp">
2557 2559 nohelp
2558 2560 </a>
2559 2561 </td><td>
2560 2562 (no help text available)
2561 2563 </td></tr>
2562 2564 <tr><td>
2563 2565 <a href="/help/outgoing">
2564 2566 outgoing
2565 2567 </a>
2566 2568 </td><td>
2567 2569 show changesets not found in the destination
2568 2570 </td></tr>
2569 2571 <tr><td>
2570 2572 <a href="/help/paths">
2571 2573 paths
2572 2574 </a>
2573 2575 </td><td>
2574 2576 show aliases for remote repositories
2575 2577 </td></tr>
2576 2578 <tr><td>
2577 2579 <a href="/help/phase">
2578 2580 phase
2579 2581 </a>
2580 2582 </td><td>
2581 2583 set or show the current phase name
2582 2584 </td></tr>
2583 2585 <tr><td>
2584 2586 <a href="/help/recover">
2585 2587 recover
2586 2588 </a>
2587 2589 </td><td>
2588 2590 roll back an interrupted transaction
2589 2591 </td></tr>
2590 2592 <tr><td>
2591 2593 <a href="/help/rename">
2592 2594 rename
2593 2595 </a>
2594 2596 </td><td>
2595 2597 rename files; equivalent of copy + remove
2596 2598 </td></tr>
2597 2599 <tr><td>
2598 2600 <a href="/help/resolve">
2599 2601 resolve
2600 2602 </a>
2601 2603 </td><td>
2602 2604 redo merges or set/view the merge status of files
2603 2605 </td></tr>
2604 2606 <tr><td>
2605 2607 <a href="/help/revert">
2606 2608 revert
2607 2609 </a>
2608 2610 </td><td>
2609 2611 restore files to their checkout state
2610 2612 </td></tr>
2611 2613 <tr><td>
2612 2614 <a href="/help/root">
2613 2615 root
2614 2616 </a>
2615 2617 </td><td>
2616 2618 print the root (top) of the current working directory
2617 2619 </td></tr>
2618 2620 <tr><td>
2619 2621 <a href="/help/shellalias">
2620 2622 shellalias
2621 2623 </a>
2622 2624 </td><td>
2623 2625 (no help text available)
2624 2626 </td></tr>
2625 2627 <tr><td>
2626 2628 <a href="/help/tag">
2627 2629 tag
2628 2630 </a>
2629 2631 </td><td>
2630 2632 add one or more tags for the current or given revision
2631 2633 </td></tr>
2632 2634 <tr><td>
2633 2635 <a href="/help/tags">
2634 2636 tags
2635 2637 </a>
2636 2638 </td><td>
2637 2639 list repository tags
2638 2640 </td></tr>
2639 2641 <tr><td>
2640 2642 <a href="/help/unbundle">
2641 2643 unbundle
2642 2644 </a>
2643 2645 </td><td>
2644 2646 apply one or more bundle files
2645 2647 </td></tr>
2646 2648 <tr><td>
2647 2649 <a href="/help/verify">
2648 2650 verify
2649 2651 </a>
2650 2652 </td><td>
2651 2653 verify the integrity of the repository
2652 2654 </td></tr>
2653 2655 <tr><td>
2654 2656 <a href="/help/version">
2655 2657 version
2656 2658 </a>
2657 2659 </td><td>
2658 2660 output version and copyright information
2659 2661 </td></tr>
2660 2662
2661 2663
2662 2664 </table>
2663 2665 </div>
2664 2666 </div>
2665 2667
2666 2668
2667 2669
2668 2670 </body>
2669 2671 </html>
2670 2672
2671 2673
2672 2674 $ get-with-headers.py $LOCALIP:$HGPORT "help/add"
2673 2675 200 Script output follows
2674 2676
2675 2677 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2676 2678 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2677 2679 <head>
2678 2680 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2679 2681 <meta name="robots" content="index, nofollow" />
2680 2682 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2681 2683 <script type="text/javascript" src="/static/mercurial.js"></script>
2682 2684
2683 2685 <title>Help: add</title>
2684 2686 </head>
2685 2687 <body>
2686 2688
2687 2689 <div class="container">
2688 2690 <div class="menu">
2689 2691 <div class="logo">
2690 2692 <a href="https://mercurial-scm.org/">
2691 2693 <img src="/static/hglogo.png" alt="mercurial" /></a>
2692 2694 </div>
2693 2695 <ul>
2694 2696 <li><a href="/shortlog">log</a></li>
2695 2697 <li><a href="/graph">graph</a></li>
2696 2698 <li><a href="/tags">tags</a></li>
2697 2699 <li><a href="/bookmarks">bookmarks</a></li>
2698 2700 <li><a href="/branches">branches</a></li>
2699 2701 </ul>
2700 2702 <ul>
2701 2703 <li class="active"><a href="/help">help</a></li>
2702 2704 </ul>
2703 2705 </div>
2704 2706
2705 2707 <div class="main">
2706 2708 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2707 2709 <h3>Help: add</h3>
2708 2710
2709 2711 <form class="search" action="/log">
2710 2712
2711 2713 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
2712 2714 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2713 2715 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2714 2716 </form>
2715 2717 <div id="doc">
2716 2718 <p>
2717 2719 hg add [OPTION]... [FILE]...
2718 2720 </p>
2719 2721 <p>
2720 2722 add the specified files on the next commit
2721 2723 </p>
2722 2724 <p>
2723 2725 Schedule files to be version controlled and added to the
2724 2726 repository.
2725 2727 </p>
2726 2728 <p>
2727 2729 The files will be added to the repository at the next commit. To
2728 2730 undo an add before that, see 'hg forget'.
2729 2731 </p>
2730 2732 <p>
2731 2733 If no names are given, add all files to the repository (except
2732 2734 files matching &quot;.hgignore&quot;).
2733 2735 </p>
2734 2736 <p>
2735 2737 Examples:
2736 2738 </p>
2737 2739 <ul>
2738 2740 <li> New (unknown) files are added automatically by 'hg add':
2739 2741 <pre>
2740 2742 \$ ls (re)
2741 2743 foo.c
2742 2744 \$ hg status (re)
2743 2745 ? foo.c
2744 2746 \$ hg add (re)
2745 2747 adding foo.c
2746 2748 \$ hg status (re)
2747 2749 A foo.c
2748 2750 </pre>
2749 2751 <li> Specific files to be added can be specified:
2750 2752 <pre>
2751 2753 \$ ls (re)
2752 2754 bar.c foo.c
2753 2755 \$ hg status (re)
2754 2756 ? bar.c
2755 2757 ? foo.c
2756 2758 \$ hg add bar.c (re)
2757 2759 \$ hg status (re)
2758 2760 A bar.c
2759 2761 ? foo.c
2760 2762 </pre>
2761 2763 </ul>
2762 2764 <p>
2763 2765 Returns 0 if all files are successfully added.
2764 2766 </p>
2765 2767 <p>
2766 2768 options ([+] can be repeated):
2767 2769 </p>
2768 2770 <table>
2769 2771 <tr><td>-I</td>
2770 2772 <td>--include PATTERN [+]</td>
2771 2773 <td>include names matching the given patterns</td></tr>
2772 2774 <tr><td>-X</td>
2773 2775 <td>--exclude PATTERN [+]</td>
2774 2776 <td>exclude names matching the given patterns</td></tr>
2775 2777 <tr><td>-S</td>
2776 2778 <td>--subrepos</td>
2777 2779 <td>recurse into subrepositories</td></tr>
2778 2780 <tr><td>-n</td>
2779 2781 <td>--dry-run</td>
2780 2782 <td>do not perform actions, just print output</td></tr>
2781 2783 </table>
2782 2784 <p>
2783 2785 global options ([+] can be repeated):
2784 2786 </p>
2785 2787 <table>
2786 2788 <tr><td>-R</td>
2787 2789 <td>--repository REPO</td>
2788 2790 <td>repository root directory or name of overlay bundle file</td></tr>
2789 2791 <tr><td></td>
2790 2792 <td>--cwd DIR</td>
2791 2793 <td>change working directory</td></tr>
2792 2794 <tr><td>-y</td>
2793 2795 <td>--noninteractive</td>
2794 2796 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2795 2797 <tr><td>-q</td>
2796 2798 <td>--quiet</td>
2797 2799 <td>suppress output</td></tr>
2798 2800 <tr><td>-v</td>
2799 2801 <td>--verbose</td>
2800 2802 <td>enable additional output</td></tr>
2801 2803 <tr><td></td>
2802 2804 <td>--color TYPE</td>
2803 2805 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
2804 2806 <tr><td></td>
2805 2807 <td>--config CONFIG [+]</td>
2806 2808 <td>set/override config option (use 'section.name=value')</td></tr>
2807 2809 <tr><td></td>
2808 2810 <td>--debug</td>
2809 2811 <td>enable debugging output</td></tr>
2810 2812 <tr><td></td>
2811 2813 <td>--debugger</td>
2812 2814 <td>start debugger</td></tr>
2813 2815 <tr><td></td>
2814 2816 <td>--encoding ENCODE</td>
2815 2817 <td>set the charset encoding (default: ascii)</td></tr>
2816 2818 <tr><td></td>
2817 2819 <td>--encodingmode MODE</td>
2818 2820 <td>set the charset encoding mode (default: strict)</td></tr>
2819 2821 <tr><td></td>
2820 2822 <td>--traceback</td>
2821 2823 <td>always print a traceback on exception</td></tr>
2822 2824 <tr><td></td>
2823 2825 <td>--time</td>
2824 2826 <td>time how long the command takes</td></tr>
2825 2827 <tr><td></td>
2826 2828 <td>--profile</td>
2827 2829 <td>print command execution profile</td></tr>
2828 2830 <tr><td></td>
2829 2831 <td>--version</td>
2830 2832 <td>output version information and exit</td></tr>
2831 2833 <tr><td>-h</td>
2832 2834 <td>--help</td>
2833 2835 <td>display help and exit</td></tr>
2834 2836 <tr><td></td>
2835 2837 <td>--hidden</td>
2836 2838 <td>consider hidden changesets</td></tr>
2837 2839 <tr><td></td>
2838 2840 <td>--pager TYPE</td>
2839 2841 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
2840 2842 </table>
2841 2843
2842 2844 </div>
2843 2845 </div>
2844 2846 </div>
2845 2847
2846 2848
2847 2849
2848 2850 </body>
2849 2851 </html>
2850 2852
2851 2853
2852 2854 $ get-with-headers.py $LOCALIP:$HGPORT "help/remove"
2853 2855 200 Script output follows
2854 2856
2855 2857 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2856 2858 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2857 2859 <head>
2858 2860 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2859 2861 <meta name="robots" content="index, nofollow" />
2860 2862 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2861 2863 <script type="text/javascript" src="/static/mercurial.js"></script>
2862 2864
2863 2865 <title>Help: remove</title>
2864 2866 </head>
2865 2867 <body>
2866 2868
2867 2869 <div class="container">
2868 2870 <div class="menu">
2869 2871 <div class="logo">
2870 2872 <a href="https://mercurial-scm.org/">
2871 2873 <img src="/static/hglogo.png" alt="mercurial" /></a>
2872 2874 </div>
2873 2875 <ul>
2874 2876 <li><a href="/shortlog">log</a></li>
2875 2877 <li><a href="/graph">graph</a></li>
2876 2878 <li><a href="/tags">tags</a></li>
2877 2879 <li><a href="/bookmarks">bookmarks</a></li>
2878 2880 <li><a href="/branches">branches</a></li>
2879 2881 </ul>
2880 2882 <ul>
2881 2883 <li class="active"><a href="/help">help</a></li>
2882 2884 </ul>
2883 2885 </div>
2884 2886
2885 2887 <div class="main">
2886 2888 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2887 2889 <h3>Help: remove</h3>
2888 2890
2889 2891 <form class="search" action="/log">
2890 2892
2891 2893 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
2892 2894 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2893 2895 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2894 2896 </form>
2895 2897 <div id="doc">
2896 2898 <p>
2897 2899 hg remove [OPTION]... FILE...
2898 2900 </p>
2899 2901 <p>
2900 2902 aliases: rm
2901 2903 </p>
2902 2904 <p>
2903 2905 remove the specified files on the next commit
2904 2906 </p>
2905 2907 <p>
2906 2908 Schedule the indicated files for removal from the current branch.
2907 2909 </p>
2908 2910 <p>
2909 2911 This command schedules the files to be removed at the next commit.
2910 2912 To undo a remove before that, see 'hg revert'. To undo added
2911 2913 files, see 'hg forget'.
2912 2914 </p>
2913 2915 <p>
2914 2916 -A/--after can be used to remove only files that have already
2915 2917 been deleted, -f/--force can be used to force deletion, and -Af
2916 2918 can be used to remove files from the next revision without
2917 2919 deleting them from the working directory.
2918 2920 </p>
2919 2921 <p>
2920 2922 The following table details the behavior of remove for different
2921 2923 file states (columns) and option combinations (rows). The file
2922 2924 states are Added [A], Clean [C], Modified [M] and Missing [!]
2923 2925 (as reported by 'hg status'). The actions are Warn, Remove
2924 2926 (from branch) and Delete (from disk):
2925 2927 </p>
2926 2928 <table>
2927 2929 <tr><td>opt/state</td>
2928 2930 <td>A</td>
2929 2931 <td>C</td>
2930 2932 <td>M</td>
2931 2933 <td>!</td></tr>
2932 2934 <tr><td>none</td>
2933 2935 <td>W</td>
2934 2936 <td>RD</td>
2935 2937 <td>W</td>
2936 2938 <td>R</td></tr>
2937 2939 <tr><td>-f</td>
2938 2940 <td>R</td>
2939 2941 <td>RD</td>
2940 2942 <td>RD</td>
2941 2943 <td>R</td></tr>
2942 2944 <tr><td>-A</td>
2943 2945 <td>W</td>
2944 2946 <td>W</td>
2945 2947 <td>W</td>
2946 2948 <td>R</td></tr>
2947 2949 <tr><td>-Af</td>
2948 2950 <td>R</td>
2949 2951 <td>R</td>
2950 2952 <td>R</td>
2951 2953 <td>R</td></tr>
2952 2954 </table>
2953 2955 <p>
2954 2956 <b>Note:</b>
2955 2957 </p>
2956 2958 <p>
2957 2959 'hg remove' never deletes files in Added [A] state from the
2958 2960 working directory, not even if &quot;--force&quot; is specified.
2959 2961 </p>
2960 2962 <p>
2961 2963 Returns 0 on success, 1 if any warnings encountered.
2962 2964 </p>
2963 2965 <p>
2964 2966 options ([+] can be repeated):
2965 2967 </p>
2966 2968 <table>
2967 2969 <tr><td>-A</td>
2968 2970 <td>--after</td>
2969 2971 <td>record delete for missing files</td></tr>
2970 2972 <tr><td>-f</td>
2971 2973 <td>--force</td>
2972 2974 <td>forget added files, delete modified files</td></tr>
2973 2975 <tr><td>-S</td>
2974 2976 <td>--subrepos</td>
2975 2977 <td>recurse into subrepositories</td></tr>
2976 2978 <tr><td>-I</td>
2977 2979 <td>--include PATTERN [+]</td>
2978 2980 <td>include names matching the given patterns</td></tr>
2979 2981 <tr><td>-X</td>
2980 2982 <td>--exclude PATTERN [+]</td>
2981 2983 <td>exclude names matching the given patterns</td></tr>
2982 2984 <tr><td>-n</td>
2983 2985 <td>--dry-run</td>
2984 2986 <td>do not perform actions, just print output</td></tr>
2985 2987 </table>
2986 2988 <p>
2987 2989 global options ([+] can be repeated):
2988 2990 </p>
2989 2991 <table>
2990 2992 <tr><td>-R</td>
2991 2993 <td>--repository REPO</td>
2992 2994 <td>repository root directory or name of overlay bundle file</td></tr>
2993 2995 <tr><td></td>
2994 2996 <td>--cwd DIR</td>
2995 2997 <td>change working directory</td></tr>
2996 2998 <tr><td>-y</td>
2997 2999 <td>--noninteractive</td>
2998 3000 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2999 3001 <tr><td>-q</td>
3000 3002 <td>--quiet</td>
3001 3003 <td>suppress output</td></tr>
3002 3004 <tr><td>-v</td>
3003 3005 <td>--verbose</td>
3004 3006 <td>enable additional output</td></tr>
3005 3007 <tr><td></td>
3006 3008 <td>--color TYPE</td>
3007 3009 <td>when to colorize (boolean, always, auto, never, or debug)</td></tr>
3008 3010 <tr><td></td>
3009 3011 <td>--config CONFIG [+]</td>
3010 3012 <td>set/override config option (use 'section.name=value')</td></tr>
3011 3013 <tr><td></td>
3012 3014 <td>--debug</td>
3013 3015 <td>enable debugging output</td></tr>
3014 3016 <tr><td></td>
3015 3017 <td>--debugger</td>
3016 3018 <td>start debugger</td></tr>
3017 3019 <tr><td></td>
3018 3020 <td>--encoding ENCODE</td>
3019 3021 <td>set the charset encoding (default: ascii)</td></tr>
3020 3022 <tr><td></td>
3021 3023 <td>--encodingmode MODE</td>
3022 3024 <td>set the charset encoding mode (default: strict)</td></tr>
3023 3025 <tr><td></td>
3024 3026 <td>--traceback</td>
3025 3027 <td>always print a traceback on exception</td></tr>
3026 3028 <tr><td></td>
3027 3029 <td>--time</td>
3028 3030 <td>time how long the command takes</td></tr>
3029 3031 <tr><td></td>
3030 3032 <td>--profile</td>
3031 3033 <td>print command execution profile</td></tr>
3032 3034 <tr><td></td>
3033 3035 <td>--version</td>
3034 3036 <td>output version information and exit</td></tr>
3035 3037 <tr><td>-h</td>
3036 3038 <td>--help</td>
3037 3039 <td>display help and exit</td></tr>
3038 3040 <tr><td></td>
3039 3041 <td>--hidden</td>
3040 3042 <td>consider hidden changesets</td></tr>
3041 3043 <tr><td></td>
3042 3044 <td>--pager TYPE</td>
3043 3045 <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
3044 3046 </table>
3045 3047
3046 3048 </div>
3047 3049 </div>
3048 3050 </div>
3049 3051
3050 3052
3051 3053
3052 3054 </body>
3053 3055 </html>
3054 3056
3055 3057
3056 3058 $ get-with-headers.py $LOCALIP:$HGPORT "help/dates"
3057 3059 200 Script output follows
3058 3060
3059 3061 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3060 3062 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3061 3063 <head>
3062 3064 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3063 3065 <meta name="robots" content="index, nofollow" />
3064 3066 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3065 3067 <script type="text/javascript" src="/static/mercurial.js"></script>
3066 3068
3067 3069 <title>Help: dates</title>
3068 3070 </head>
3069 3071 <body>
3070 3072
3071 3073 <div class="container">
3072 3074 <div class="menu">
3073 3075 <div class="logo">
3074 3076 <a href="https://mercurial-scm.org/">
3075 3077 <img src="/static/hglogo.png" alt="mercurial" /></a>
3076 3078 </div>
3077 3079 <ul>
3078 3080 <li><a href="/shortlog">log</a></li>
3079 3081 <li><a href="/graph">graph</a></li>
3080 3082 <li><a href="/tags">tags</a></li>
3081 3083 <li><a href="/bookmarks">bookmarks</a></li>
3082 3084 <li><a href="/branches">branches</a></li>
3083 3085 </ul>
3084 3086 <ul>
3085 3087 <li class="active"><a href="/help">help</a></li>
3086 3088 </ul>
3087 3089 </div>
3088 3090
3089 3091 <div class="main">
3090 3092 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3091 3093 <h3>Help: dates</h3>
3092 3094
3093 3095 <form class="search" action="/log">
3094 3096
3095 3097 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3096 3098 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3097 3099 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3098 3100 </form>
3099 3101 <div id="doc">
3100 3102 <h1>Date Formats</h1>
3101 3103 <p>
3102 3104 Some commands allow the user to specify a date, e.g.:
3103 3105 </p>
3104 3106 <ul>
3105 3107 <li> backout, commit, import, tag: Specify the commit date.
3106 3108 <li> log, revert, update: Select revision(s) by date.
3107 3109 </ul>
3108 3110 <p>
3109 3111 Many date formats are valid. Here are some examples:
3110 3112 </p>
3111 3113 <ul>
3112 3114 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
3113 3115 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
3114 3116 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
3115 3117 <li> &quot;Dec 6&quot; (midnight)
3116 3118 <li> &quot;13:18&quot; (today assumed)
3117 3119 <li> &quot;3:39&quot; (3:39AM assumed)
3118 3120 <li> &quot;3:39pm&quot; (15:39)
3119 3121 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
3120 3122 <li> &quot;2006-12-6 13:18&quot;
3121 3123 <li> &quot;2006-12-6&quot;
3122 3124 <li> &quot;12-6&quot;
3123 3125 <li> &quot;12/6&quot;
3124 3126 <li> &quot;12/6/6&quot; (Dec 6 2006)
3125 3127 <li> &quot;today&quot; (midnight)
3126 3128 <li> &quot;yesterday&quot; (midnight)
3127 3129 <li> &quot;now&quot; - right now
3128 3130 </ul>
3129 3131 <p>
3130 3132 Lastly, there is Mercurial's internal format:
3131 3133 </p>
3132 3134 <ul>
3133 3135 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
3134 3136 </ul>
3135 3137 <p>
3136 3138 This is the internal representation format for dates. The first number
3137 3139 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
3138 3140 second is the offset of the local timezone, in seconds west of UTC
3139 3141 (negative if the timezone is east of UTC).
3140 3142 </p>
3141 3143 <p>
3142 3144 The log command also accepts date ranges:
3143 3145 </p>
3144 3146 <ul>
3145 3147 <li> &quot;&lt;DATE&quot; - at or before a given date/time
3146 3148 <li> &quot;&gt;DATE&quot; - on or after a given date/time
3147 3149 <li> &quot;DATE to DATE&quot; - a date range, inclusive
3148 3150 <li> &quot;-DAYS&quot; - within a given number of days of today
3149 3151 </ul>
3150 3152
3151 3153 </div>
3152 3154 </div>
3153 3155 </div>
3154 3156
3155 3157
3156 3158
3157 3159 </body>
3158 3160 </html>
3159 3161
3160 3162
3161 3163 $ get-with-headers.py $LOCALIP:$HGPORT "help/pager"
3162 3164 200 Script output follows
3163 3165
3164 3166 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3165 3167 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3166 3168 <head>
3167 3169 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3168 3170 <meta name="robots" content="index, nofollow" />
3169 3171 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3170 3172 <script type="text/javascript" src="/static/mercurial.js"></script>
3171 3173
3172 3174 <title>Help: pager</title>
3173 3175 </head>
3174 3176 <body>
3175 3177
3176 3178 <div class="container">
3177 3179 <div class="menu">
3178 3180 <div class="logo">
3179 3181 <a href="https://mercurial-scm.org/">
3180 3182 <img src="/static/hglogo.png" alt="mercurial" /></a>
3181 3183 </div>
3182 3184 <ul>
3183 3185 <li><a href="/shortlog">log</a></li>
3184 3186 <li><a href="/graph">graph</a></li>
3185 3187 <li><a href="/tags">tags</a></li>
3186 3188 <li><a href="/bookmarks">bookmarks</a></li>
3187 3189 <li><a href="/branches">branches</a></li>
3188 3190 </ul>
3189 3191 <ul>
3190 3192 <li class="active"><a href="/help">help</a></li>
3191 3193 </ul>
3192 3194 </div>
3193 3195
3194 3196 <div class="main">
3195 3197 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3196 3198 <h3>Help: pager</h3>
3197 3199
3198 3200 <form class="search" action="/log">
3199 3201
3200 3202 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3201 3203 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3202 3204 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3203 3205 </form>
3204 3206 <div id="doc">
3205 3207 <h1>Pager Support</h1>
3206 3208 <p>
3207 3209 Some Mercurial commands can produce a lot of output, and Mercurial will
3208 3210 attempt to use a pager to make those commands more pleasant.
3209 3211 </p>
3210 3212 <p>
3211 3213 To set the pager that should be used, set the application variable:
3212 3214 </p>
3213 3215 <pre>
3214 3216 [pager]
3215 3217 pager = less -FRX
3216 3218 </pre>
3217 3219 <p>
3218 3220 If no pager is set in the user or repository configuration, Mercurial uses the
3219 3221 environment variable $PAGER. If $PAGER is not set, pager.pager from the default
3220 3222 or system configuration is used. If none of these are set, a default pager will
3221 3223 be used, typically 'less' on Unix and 'more' on Windows.
3222 3224 </p>
3223 3225 <p>
3224 3226 You can disable the pager for certain commands by adding them to the
3225 3227 pager.ignore list:
3226 3228 </p>
3227 3229 <pre>
3228 3230 [pager]
3229 3231 ignore = version, help, update
3230 3232 </pre>
3231 3233 <p>
3232 3234 To ignore global commands like 'hg version' or 'hg help', you have
3233 3235 to specify them in your user configuration file.
3234 3236 </p>
3235 3237 <p>
3236 3238 To control whether the pager is used at all for an individual command,
3237 3239 you can use --pager=&lt;value&gt;:
3238 3240 </p>
3239 3241 <ul>
3240 3242 <li> use as needed: 'auto'.
3241 3243 <li> require the pager: 'yes' or 'on'.
3242 3244 <li> suppress the pager: 'no' or 'off' (any unrecognized value will also work).
3243 3245 </ul>
3244 3246 <p>
3245 3247 To globally turn off all attempts to use a pager, set:
3246 3248 </p>
3247 3249 <pre>
3248 3250 [ui]
3249 3251 paginate = never
3250 3252 </pre>
3251 3253 <p>
3252 3254 which will prevent the pager from running.
3253 3255 </p>
3254 3256
3255 3257 </div>
3256 3258 </div>
3257 3259 </div>
3258 3260
3259 3261
3260 3262
3261 3263 </body>
3262 3264 </html>
3263 3265
3264 3266
3265 3267 Sub-topic indexes rendered properly
3266 3268
3267 3269 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals"
3268 3270 200 Script output follows
3269 3271
3270 3272 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3271 3273 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3272 3274 <head>
3273 3275 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3274 3276 <meta name="robots" content="index, nofollow" />
3275 3277 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3276 3278 <script type="text/javascript" src="/static/mercurial.js"></script>
3277 3279
3278 3280 <title>Help: internals</title>
3279 3281 </head>
3280 3282 <body>
3281 3283
3282 3284 <div class="container">
3283 3285 <div class="menu">
3284 3286 <div class="logo">
3285 3287 <a href="https://mercurial-scm.org/">
3286 3288 <img src="/static/hglogo.png" alt="mercurial" /></a>
3287 3289 </div>
3288 3290 <ul>
3289 3291 <li><a href="/shortlog">log</a></li>
3290 3292 <li><a href="/graph">graph</a></li>
3291 3293 <li><a href="/tags">tags</a></li>
3292 3294 <li><a href="/bookmarks">bookmarks</a></li>
3293 3295 <li><a href="/branches">branches</a></li>
3294 3296 </ul>
3295 3297 <ul>
3296 3298 <li><a href="/help">help</a></li>
3297 3299 </ul>
3298 3300 </div>
3299 3301
3300 3302 <div class="main">
3301 3303 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3302 3304
3303 3305 <form class="search" action="/log">
3304 3306
3305 3307 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3306 3308 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3307 3309 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3308 3310 </form>
3309 3311 <table class="bigtable">
3310 3312 <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
3311 3313
3312 3314 <tr><td>
3313 3315 <a href="/help/internals.bundle2">
3314 3316 bundle2
3315 3317 </a>
3316 3318 </td><td>
3317 3319 Bundle2
3318 3320 </td></tr>
3319 3321 <tr><td>
3320 3322 <a href="/help/internals.bundles">
3321 3323 bundles
3322 3324 </a>
3323 3325 </td><td>
3324 3326 Bundles
3325 3327 </td></tr>
3326 3328 <tr><td>
3327 3329 <a href="/help/internals.cbor">
3328 3330 cbor
3329 3331 </a>
3330 3332 </td><td>
3331 3333 CBOR
3332 3334 </td></tr>
3333 3335 <tr><td>
3334 3336 <a href="/help/internals.censor">
3335 3337 censor
3336 3338 </a>
3337 3339 </td><td>
3338 3340 Censor
3339 3341 </td></tr>
3340 3342 <tr><td>
3341 3343 <a href="/help/internals.changegroups">
3342 3344 changegroups
3343 3345 </a>
3344 3346 </td><td>
3345 3347 Changegroups
3346 3348 </td></tr>
3347 3349 <tr><td>
3348 3350 <a href="/help/internals.config">
3349 3351 config
3350 3352 </a>
3351 3353 </td><td>
3352 3354 Config Registrar
3353 3355 </td></tr>
3354 3356 <tr><td>
3355 3357 <a href="/help/internals.requirements">
3356 3358 requirements
3357 3359 </a>
3358 3360 </td><td>
3359 3361 Repository Requirements
3360 3362 </td></tr>
3361 3363 <tr><td>
3362 3364 <a href="/help/internals.revlogs">
3363 3365 revlogs
3364 3366 </a>
3365 3367 </td><td>
3366 3368 Revision Logs
3367 3369 </td></tr>
3368 3370 <tr><td>
3369 3371 <a href="/help/internals.wireprotocol">
3370 3372 wireprotocol
3371 3373 </a>
3372 3374 </td><td>
3373 3375 Wire Protocol
3374 3376 </td></tr>
3375 3377 <tr><td>
3376 3378 <a href="/help/internals.wireprotocolrpc">
3377 3379 wireprotocolrpc
3378 3380 </a>
3379 3381 </td><td>
3380 3382 Wire Protocol RPC
3381 3383 </td></tr>
3382 3384 <tr><td>
3383 3385 <a href="/help/internals.wireprotocolv2">
3384 3386 wireprotocolv2
3385 3387 </a>
3386 3388 </td><td>
3387 3389 Wire Protocol Version 2
3388 3390 </td></tr>
3389 3391
3390 3392
3391 3393
3392 3394
3393 3395
3394 3396 </table>
3395 3397 </div>
3396 3398 </div>
3397 3399
3398 3400
3399 3401
3400 3402 </body>
3401 3403 </html>
3402 3404
3403 3405
3404 3406 Sub-topic topics rendered properly
3405 3407
3406 3408 $ get-with-headers.py $LOCALIP:$HGPORT "help/internals.changegroups"
3407 3409 200 Script output follows
3408 3410
3409 3411 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3410 3412 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3411 3413 <head>
3412 3414 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3413 3415 <meta name="robots" content="index, nofollow" />
3414 3416 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3415 3417 <script type="text/javascript" src="/static/mercurial.js"></script>
3416 3418
3417 3419 <title>Help: internals.changegroups</title>
3418 3420 </head>
3419 3421 <body>
3420 3422
3421 3423 <div class="container">
3422 3424 <div class="menu">
3423 3425 <div class="logo">
3424 3426 <a href="https://mercurial-scm.org/">
3425 3427 <img src="/static/hglogo.png" alt="mercurial" /></a>
3426 3428 </div>
3427 3429 <ul>
3428 3430 <li><a href="/shortlog">log</a></li>
3429 3431 <li><a href="/graph">graph</a></li>
3430 3432 <li><a href="/tags">tags</a></li>
3431 3433 <li><a href="/bookmarks">bookmarks</a></li>
3432 3434 <li><a href="/branches">branches</a></li>
3433 3435 </ul>
3434 3436 <ul>
3435 3437 <li class="active"><a href="/help">help</a></li>
3436 3438 </ul>
3437 3439 </div>
3438 3440
3439 3441 <div class="main">
3440 3442 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3441 3443 <h3>Help: internals.changegroups</h3>
3442 3444
3443 3445 <form class="search" action="/log">
3444 3446
3445 3447 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3446 3448 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3447 3449 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3448 3450 </form>
3449 3451 <div id="doc">
3450 3452 <h1>Changegroups</h1>
3451 3453 <p>
3452 3454 Changegroups are representations of repository revlog data, specifically
3453 3455 the changelog data, root/flat manifest data, treemanifest data, and
3454 3456 filelogs.
3455 3457 </p>
3456 3458 <p>
3457 3459 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
3458 3460 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with the
3459 3461 only difference being an additional item in the *delta header*. Version
3460 3462 &quot;3&quot; adds support for storage flags in the *delta header* and optionally
3461 3463 exchanging treemanifests (enabled by setting an option on the
3462 3464 &quot;changegroup&quot; part in the bundle2).
3463 3465 </p>
3464 3466 <p>
3465 3467 Changegroups when not exchanging treemanifests consist of 3 logical
3466 3468 segments:
3467 3469 </p>
3468 3470 <pre>
3469 3471 +---------------------------------+
3470 3472 | | | |
3471 3473 | changeset | manifest | filelogs |
3472 3474 | | | |
3473 3475 | | | |
3474 3476 +---------------------------------+
3475 3477 </pre>
3476 3478 <p>
3477 3479 When exchanging treemanifests, there are 4 logical segments:
3478 3480 </p>
3479 3481 <pre>
3480 3482 +-------------------------------------------------+
3481 3483 | | | | |
3482 3484 | changeset | root | treemanifests | filelogs |
3483 3485 | | manifest | | |
3484 3486 | | | | |
3485 3487 +-------------------------------------------------+
3486 3488 </pre>
3487 3489 <p>
3488 3490 The principle building block of each segment is a *chunk*. A *chunk*
3489 3491 is a framed piece of data:
3490 3492 </p>
3491 3493 <pre>
3492 3494 +---------------------------------------+
3493 3495 | | |
3494 3496 | length | data |
3495 3497 | (4 bytes) | (&lt;length - 4&gt; bytes) |
3496 3498 | | |
3497 3499 +---------------------------------------+
3498 3500 </pre>
3499 3501 <p>
3500 3502 All integers are big-endian signed integers. Each chunk starts with a 32-bit
3501 3503 integer indicating the length of the entire chunk (including the length field
3502 3504 itself).
3503 3505 </p>
3504 3506 <p>
3505 3507 There is a special case chunk that has a value of 0 for the length
3506 3508 (&quot;0x00000000&quot;). We call this an *empty chunk*.
3507 3509 </p>
3508 3510 <h2>Delta Groups</h2>
3509 3511 <p>
3510 3512 A *delta group* expresses the content of a revlog as a series of deltas,
3511 3513 or patches against previous revisions.
3512 3514 </p>
3513 3515 <p>
3514 3516 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
3515 3517 to signal the end of the delta group:
3516 3518 </p>
3517 3519 <pre>
3518 3520 +------------------------------------------------------------------------+
3519 3521 | | | | | |
3520 3522 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
3521 3523 | (4 bytes) | (various) | (4 bytes) | (various) | (4 bytes) |
3522 3524 | | | | | |
3523 3525 +------------------------------------------------------------------------+
3524 3526 </pre>
3525 3527 <p>
3526 3528 Each *chunk*'s data consists of the following:
3527 3529 </p>
3528 3530 <pre>
3529 3531 +---------------------------------------+
3530 3532 | | |
3531 3533 | delta header | delta data |
3532 3534 | (various by version) | (various) |
3533 3535 | | |
3534 3536 +---------------------------------------+
3535 3537 </pre>
3536 3538 <p>
3537 3539 The *delta data* is a series of *delta*s that describe a diff from an existing
3538 3540 entry (either that the recipient already has, or previously specified in the
3539 3541 bundle/changegroup).
3540 3542 </p>
3541 3543 <p>
3542 3544 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
3543 3545 &quot;3&quot; of the changegroup format.
3544 3546 </p>
3545 3547 <p>
3546 3548 Version 1 (headerlen=80):
3547 3549 </p>
3548 3550 <pre>
3549 3551 +------------------------------------------------------+
3550 3552 | | | | |
3551 3553 | node | p1 node | p2 node | link node |
3552 3554 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3553 3555 | | | | |
3554 3556 +------------------------------------------------------+
3555 3557 </pre>
3556 3558 <p>
3557 3559 Version 2 (headerlen=100):
3558 3560 </p>
3559 3561 <pre>
3560 3562 +------------------------------------------------------------------+
3561 3563 | | | | | |
3562 3564 | node | p1 node | p2 node | base node | link node |
3563 3565 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
3564 3566 | | | | | |
3565 3567 +------------------------------------------------------------------+
3566 3568 </pre>
3567 3569 <p>
3568 3570 Version 3 (headerlen=102):
3569 3571 </p>
3570 3572 <pre>
3571 3573 +------------------------------------------------------------------------------+
3572 3574 | | | | | | |
3573 3575 | node | p1 node | p2 node | base node | link node | flags |
3574 3576 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
3575 3577 | | | | | | |
3576 3578 +------------------------------------------------------------------------------+
3577 3579 </pre>
3578 3580 <p>
3579 3581 The *delta data* consists of &quot;chunklen - 4 - headerlen&quot; bytes, which contain a
3580 3582 series of *delta*s, densely packed (no separators). These deltas describe a diff
3581 3583 from an existing entry (either that the recipient already has, or previously
3582 3584 specified in the bundle/changegroup). The format is described more fully in
3583 3585 &quot;hg help internals.bdiff&quot;, but briefly:
3584 3586 </p>
3585 3587 <pre>
3586 3588 +---------------------------------------------------------------+
3587 3589 | | | | |
3588 3590 | start offset | end offset | new length | content |
3589 3591 | (4 bytes) | (4 bytes) | (4 bytes) | (&lt;new length&gt; bytes) |
3590 3592 | | | | |
3591 3593 +---------------------------------------------------------------+
3592 3594 </pre>
3593 3595 <p>
3594 3596 Please note that the length field in the delta data does *not* include itself.
3595 3597 </p>
3596 3598 <p>
3597 3599 In version 1, the delta is always applied against the previous node from
3598 3600 the changegroup or the first parent if this is the first entry in the
3599 3601 changegroup.
3600 3602 </p>
3601 3603 <p>
3602 3604 In version 2 and up, the delta base node is encoded in the entry in the
3603 3605 changegroup. This allows the delta to be expressed against any parent,
3604 3606 which can result in smaller deltas and more efficient encoding of data.
3605 3607 </p>
3606 3608 <p>
3607 3609 The *flags* field holds bitwise flags affecting the processing of revision
3608 3610 data. The following flags are defined:
3609 3611 </p>
3610 3612 <dl>
3611 3613 <dt>32768
3612 3614 <dd>Censored revision. The revision's fulltext has been replaced by censor metadata. May only occur on file revisions.
3613 3615 <dt>16384
3614 3616 <dd>Ellipsis revision. Revision hash does not match data (likely due to rewritten parents).
3615 3617 <dt>8192
3616 3618 <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.
3617 3619 </dl>
3618 3620 <p>
3619 3621 For historical reasons, the integer values are identical to revlog version 1
3620 3622 per-revision storage flags and correspond to bits being set in this 2-byte
3621 3623 field. Bits were allocated starting from the most-significant bit, hence the
3622 3624 reverse ordering and allocation of these flags.
3623 3625 </p>
3624 3626 <h2>Changeset Segment</h2>
3625 3627 <p>
3626 3628 The *changeset segment* consists of a single *delta group* holding
3627 3629 changelog data. The *empty chunk* at the end of the *delta group* denotes
3628 3630 the boundary to the *manifest segment*.
3629 3631 </p>
3630 3632 <h2>Manifest Segment</h2>
3631 3633 <p>
3632 3634 The *manifest segment* consists of a single *delta group* holding manifest
3633 3635 data. If treemanifests are in use, it contains only the manifest for the
3634 3636 root directory of the repository. Otherwise, it contains the entire
3635 3637 manifest data. The *empty chunk* at the end of the *delta group* denotes
3636 3638 the boundary to the next segment (either the *treemanifests segment* or the
3637 3639 *filelogs segment*, depending on version and the request options).
3638 3640 </p>
3639 3641 <h3>Treemanifests Segment</h3>
3640 3642 <p>
3641 3643 The *treemanifests segment* only exists in changegroup version &quot;3&quot;, and
3642 3644 only if the 'treemanifest' param is part of the bundle2 changegroup part
3643 3645 (it is not possible to use changegroup version 3 outside of bundle2).
3644 3646 Aside from the filenames in the *treemanifests segment* containing a
3645 3647 trailing &quot;/&quot; character, it behaves identically to the *filelogs segment*
3646 3648 (see below). The final sub-segment is followed by an *empty chunk* (logically,
3647 3649 a sub-segment with filename size 0). This denotes the boundary to the
3648 3650 *filelogs segment*.
3649 3651 </p>
3650 3652 <h2>Filelogs Segment</h2>
3651 3653 <p>
3652 3654 The *filelogs segment* consists of multiple sub-segments, each
3653 3655 corresponding to an individual file whose data is being described:
3654 3656 </p>
3655 3657 <pre>
3656 3658 +--------------------------------------------------+
3657 3659 | | | | | |
3658 3660 | filelog0 | filelog1 | filelog2 | ... | 0x0 |
3659 3661 | | | | | (4 bytes) |
3660 3662 | | | | | |
3661 3663 +--------------------------------------------------+
3662 3664 </pre>
3663 3665 <p>
3664 3666 The final filelog sub-segment is followed by an *empty chunk* (logically,
3665 3667 a sub-segment with filename size 0). This denotes the end of the segment
3666 3668 and of the overall changegroup.
3667 3669 </p>
3668 3670 <p>
3669 3671 Each filelog sub-segment consists of the following:
3670 3672 </p>
3671 3673 <pre>
3672 3674 +------------------------------------------------------+
3673 3675 | | | |
3674 3676 | filename length | filename | delta group |
3675 3677 | (4 bytes) | (&lt;length - 4&gt; bytes) | (various) |
3676 3678 | | | |
3677 3679 +------------------------------------------------------+
3678 3680 </pre>
3679 3681 <p>
3680 3682 That is, a *chunk* consisting of the filename (not terminated or padded)
3681 3683 followed by N chunks constituting the *delta group* for this file. The
3682 3684 *empty chunk* at the end of each *delta group* denotes the boundary to the
3683 3685 next filelog sub-segment.
3684 3686 </p>
3685 3687
3686 3688 </div>
3687 3689 </div>
3688 3690 </div>
3689 3691
3690 3692
3691 3693
3692 3694 </body>
3693 3695 </html>
3694 3696
3695 3697
3696 3698 $ get-with-headers.py 127.0.0.1:$HGPORT "help/unknowntopic"
3697 3699 404 Not Found
3698 3700
3699 3701 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3700 3702 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
3701 3703 <head>
3702 3704 <link rel="icon" href="/static/hgicon.png" type="image/png" />
3703 3705 <meta name="robots" content="index, nofollow" />
3704 3706 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
3705 3707 <script type="text/javascript" src="/static/mercurial.js"></script>
3706 3708
3707 3709 <title>test: error</title>
3708 3710 </head>
3709 3711 <body>
3710 3712
3711 3713 <div class="container">
3712 3714 <div class="menu">
3713 3715 <div class="logo">
3714 3716 <a href="https://mercurial-scm.org/">
3715 3717 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
3716 3718 </div>
3717 3719 <ul>
3718 3720 <li><a href="/shortlog">log</a></li>
3719 3721 <li><a href="/graph">graph</a></li>
3720 3722 <li><a href="/tags">tags</a></li>
3721 3723 <li><a href="/bookmarks">bookmarks</a></li>
3722 3724 <li><a href="/branches">branches</a></li>
3723 3725 </ul>
3724 3726 <ul>
3725 3727 <li><a href="/help">help</a></li>
3726 3728 </ul>
3727 3729 </div>
3728 3730
3729 3731 <div class="main">
3730 3732
3731 3733 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
3732 3734 <h3>error</h3>
3733 3735
3734 3736
3735 3737 <form class="search" action="/log">
3736 3738
3737 3739 <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
3738 3740 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
3739 3741 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
3740 3742 </form>
3741 3743
3742 3744 <div class="description">
3743 3745 <p>
3744 3746 An error occurred while processing your request:
3745 3747 </p>
3746 3748 <p>
3747 3749 Not Found
3748 3750 </p>
3749 3751 </div>
3750 3752 </div>
3751 3753 </div>
3752 3754
3753 3755
3754 3756
3755 3757 </body>
3756 3758 </html>
3757 3759
3758 3760 [1]
3759 3761
3760 3762 $ killdaemons.py
3761 3763
3762 3764 #endif
General Comments 0
You need to be logged in to leave comments. Login now