Show More
@@ -368,7 +368,7 b' def inlineliterals(blocks):' | |||||
368 | return blocks |
|
368 | return blocks | |
369 |
|
369 | |||
370 | def hgrole(blocks): |
|
370 | def hgrole(blocks): | |
371 |
substs = [(':hg:`', '" |
|
371 | substs = [(':hg:`', "'hg "), ('`', "'")] | |
372 | for b in blocks: |
|
372 | for b in blocks: | |
373 | if b['type'] in ('paragraph', 'section'): |
|
373 | if b['type'] in ('paragraph', 'section'): | |
374 | # Turn :hg:`command` into "hg command". This also works |
|
374 | # Turn :hg:`command` into "hg command". This also works |
@@ -57,7 +57,7 b'' | |||||
57 | <source ID> <destination ID> |
|
57 | <source ID> <destination ID> | |
58 |
|
58 | |||
59 | If the file doesn't exist, it's automatically created. It's updated on |
|
59 | If the file doesn't exist, it's automatically created. It's updated on | |
60 |
each commit copied, so |
|
60 | each commit copied, so 'hg convert' can be interrupted and can be run | |
61 | repeatedly to copy new commits. |
|
61 | repeatedly to copy new commits. | |
62 |
|
62 | |||
63 | The authormap is a simple text file that maps each source commit author to |
|
63 | The authormap is a simple text file that maps each source commit author to |
@@ -431,7 +431,7 b' Extension module help vs command help:' | |||||
431 | to directories containing snapshots of files to compare. |
|
431 | to directories containing snapshots of files to compare. | |
432 |
|
432 | |||
433 | The extdiff extension also allows you to configure new diff commands, so you |
|
433 | The extdiff extension also allows you to configure new diff commands, so you | |
434 |
do not need to type |
|
434 | do not need to type 'hg extdiff -p kdiff3' always. | |
435 |
|
435 | |||
436 | [extdiff] |
|
436 | [extdiff] | |
437 | # add new command that runs GNU diff(1) in 'context diff' mode |
|
437 | # add new command that runs GNU diff(1) in 'context diff' mode | |
@@ -469,7 +469,7 b' Extension module help vs command help:' | |||||
469 | [diff-tools] |
|
469 | [diff-tools] | |
470 | kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child |
|
470 | kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child | |
471 |
|
471 | |||
472 |
You can use -I/-X and list of file or directory names like normal |
|
472 | You can use -I/-X and list of file or directory names like normal 'hg diff' | |
473 | command. The extdiff extension makes snapshots of only needed files, so |
|
473 | command. The extdiff extension makes snapshots of only needed files, so | |
474 | running the external diff program will actually be pretty fast (at least |
|
474 | running the external diff program will actually be pretty fast (at least | |
475 | faster than having to compare the entire tree). |
|
475 | faster than having to compare the entire tree). |
@@ -221,7 +221,7 b' Test extension help:' | |||||
221 | [extensions] |
|
221 | [extensions] | |
222 | myfeature = ~/.hgext/myfeature.py |
|
222 | myfeature = ~/.hgext/myfeature.py | |
223 |
|
223 | |||
224 |
See |
|
224 | See 'hg help config' for more information on configuration files. | |
225 |
|
225 | |||
226 | Extensions are not loaded by default for a variety of reasons: they can |
|
226 | Extensions are not loaded by default for a variety of reasons: they can | |
227 | increase startup overhead; they may be meant for advanced usage only; they |
|
227 | increase startup overhead; they may be meant for advanced usage only; they | |
@@ -345,7 +345,7 b' Test short command list with verbose opt' | |||||
345 | Schedule files to be version controlled and added to the repository. |
|
345 | Schedule files to be version controlled and added to the repository. | |
346 |
|
346 | |||
347 | The files will be added to the repository at the next commit. To undo an |
|
347 | The files will be added to the repository at the next commit. To undo an | |
348 |
add before that, see |
|
348 | add before that, see 'hg forget'. | |
349 |
|
349 | |||
350 | If no names are given, add all files to the repository (except files |
|
350 | If no names are given, add all files to the repository (except files | |
351 | matching ".hgignore"). |
|
351 | matching ".hgignore"). | |
@@ -371,14 +371,14 b' Verbose help for add' | |||||
371 | Schedule files to be version controlled and added to the repository. |
|
371 | Schedule files to be version controlled and added to the repository. | |
372 |
|
372 | |||
373 | The files will be added to the repository at the next commit. To undo an |
|
373 | The files will be added to the repository at the next commit. To undo an | |
374 |
add before that, see |
|
374 | add before that, see 'hg forget'. | |
375 |
|
375 | |||
376 | If no names are given, add all files to the repository (except files |
|
376 | If no names are given, add all files to the repository (except files | |
377 | matching ".hgignore"). |
|
377 | matching ".hgignore"). | |
378 |
|
378 | |||
379 | Examples: |
|
379 | Examples: | |
380 |
|
380 | |||
381 |
- New (unknown) files are added automatically by |
|
381 | - New (unknown) files are added automatically by 'hg add': | |
382 |
|
382 | |||
383 | $ ls |
|
383 | $ ls | |
384 | foo.c |
|
384 | foo.c | |
@@ -498,7 +498,7 b' Test command without options' | |||||
498 | Differences between files are shown using the unified diff format. |
|
498 | Differences between files are shown using the unified diff format. | |
499 |
|
499 | |||
500 | Note: |
|
500 | Note: | |
501 |
|
|
501 | 'hg diff' may generate unexpected results for merges, as it will | |
502 | default to comparing against the working directory's first parent |
|
502 | default to comparing against the working directory's first parent | |
503 | changeset if no revisions are specified. |
|
503 | changeset if no revisions are specified. | |
504 |
|
504 | |||
@@ -515,7 +515,7 b' Test command without options' | |||||
515 | with undesirable results. |
|
515 | with undesirable results. | |
516 |
|
516 | |||
517 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
517 | Use the -g/--git option to generate diffs in the git extended diff format. | |
518 |
For more information, read |
|
518 | For more information, read 'hg help diffs'. | |
519 |
|
519 | |||
520 | Returns 0 on success. |
|
520 | Returns 0 on success. | |
521 |
|
521 | |||
@@ -558,7 +558,7 b' Test command without options' | |||||
558 | explicitly requested with -u/--unknown or -i/--ignored. |
|
558 | explicitly requested with -u/--unknown or -i/--ignored. | |
559 |
|
559 | |||
560 | Note: |
|
560 | Note: | |
561 |
|
|
561 | 'hg status' may appear to disagree with diff if permissions have | |
562 | changed or a merge has occurred. The standard diff format does not |
|
562 | changed or a merge has occurred. The standard diff format does not | |
563 | report permission changes and diff only reports changes relative to one |
|
563 | report permission changes and diff only reports changes relative to one | |
564 | merge parent. |
|
564 | merge parent. | |
@@ -1378,7 +1378,7 b' Test omit indicating for help' | |||||
1378 |
|
1378 | |||
1379 | This paragraph is never omitted (for extension) |
|
1379 | This paragraph is never omitted (for extension) | |
1380 |
|
1380 | |||
1381 |
This paragraph is omitted, if |
|
1381 | This paragraph is omitted, if 'hg help' is invoked without "-v" (for | |
1382 | extension) |
|
1382 | extension) | |
1383 |
|
1383 | |||
1384 | This paragraph is never omitted, too (for extension) |
|
1384 | This paragraph is never omitted, too (for extension) | |
@@ -1399,7 +1399,7 b' Test omit indicating for help' | |||||
1399 |
|
1399 | |||
1400 | This paragraph is never omitted (for topic). |
|
1400 | This paragraph is never omitted (for topic). | |
1401 |
|
1401 | |||
1402 |
This paragraph is omitted, if |
|
1402 | This paragraph is omitted, if 'hg help' is invoked without "-v" (for | |
1403 | topic) |
|
1403 | topic) | |
1404 |
|
1404 | |||
1405 | This paragraph is never omitted, too (for topic) |
|
1405 | This paragraph is never omitted, too (for topic) | |
@@ -1416,7 +1416,7 b' Test section lookup' | |||||
1416 | (DVCS) can be described as a directed acyclic graph (DAG), consisting |
|
1416 | (DVCS) can be described as a directed acyclic graph (DAG), consisting | |
1417 | of nodes and edges, where nodes correspond to changesets and edges |
|
1417 | of nodes and edges, where nodes correspond to changesets and edges | |
1418 | imply a parent -> child relation. This graph can be visualized by |
|
1418 | imply a parent -> child relation. This graph can be visualized by | |
1419 |
graphical tools such as |
|
1419 | graphical tools such as 'hg log --graph'. In Mercurial, the DAG is | |
1420 | limited by the requirement for children to have at most two parents. |
|
1420 | limited by the requirement for children to have at most two parents. | |
1421 |
|
1421 | |||
1422 |
|
1422 | |||
@@ -1434,8 +1434,8 b' Test section lookup' | |||||
1434 | local_path = /home/me/repo |
|
1434 | local_path = /home/me/repo | |
1435 |
|
1435 | |||
1436 | These symbolic names can be used from the command line. To pull from |
|
1436 | These symbolic names can be used from the command line. To pull from | |
1437 |
"my_server": |
|
1437 | "my_server": 'hg pull my_server'. To push to "local_path": 'hg push | |
1438 |
local_path |
|
1438 | local_path'. | |
1439 |
|
1439 | |||
1440 | Options containing colons (":") denote sub-options that can influence |
|
1440 | Options containing colons (":") denote sub-options that can influence | |
1441 | behavior for that specific path. Example: |
|
1441 | behavior for that specific path. Example: | |
@@ -1455,11 +1455,11 b' Test section lookup' | |||||
1455 | "default" |
|
1455 | "default" | |
1456 | The URL or directory to use when no source or remote is specified. |
|
1456 | The URL or directory to use when no source or remote is specified. | |
1457 |
|
1457 | |||
1458 |
|
|
1458 | 'hg clone' will automatically define this path to the location the | |
1459 | repository was cloned from. |
|
1459 | repository was cloned from. | |
1460 |
|
1460 | |||
1461 | "default-push" |
|
1461 | "default-push" | |
1462 |
(deprecated) The URL or directory for the default |
|
1462 | (deprecated) The URL or directory for the default 'hg push' location. | |
1463 | "default:pushurl" should be used instead. |
|
1463 | "default:pushurl" should be used instead. | |
1464 |
|
1464 | |||
1465 | $ hg help glossary.mcguffin |
|
1465 | $ hg help glossary.mcguffin | |
@@ -1486,8 +1486,8 b' Test dynamic list of merge tools only sh' | |||||
1486 | the two file versions, so they can determine the changes made on both |
|
1486 | the two file versions, so they can determine the changes made on both | |
1487 | branches. |
|
1487 | branches. | |
1488 |
|
1488 | |||
1489 |
Merge tools are used both for |
|
1489 | Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg | |
1490 |
backout |
|
1490 | backout' and in several extensions. | |
1491 |
|
1491 | |||
1492 | Usually, the merge tool tries to automatically reconcile the files by |
|
1492 | Usually, the merge tool tries to automatically reconcile the files by | |
1493 | combining all non-overlapping changes that occurred separately in the two |
|
1493 | combining all non-overlapping changes that occurred separately in the two | |
@@ -2248,7 +2248,7 b' Dish up an empty repo; serve it cold.' | |||||
2248 | </p> |
|
2248 | </p> | |
2249 | <p> |
|
2249 | <p> | |
2250 | The files will be added to the repository at the next commit. To |
|
2250 | The files will be added to the repository at the next commit. To | |
2251 |
undo an add before that, see |
|
2251 | undo an add before that, see 'hg forget'. | |
2252 | </p> |
|
2252 | </p> | |
2253 | <p> |
|
2253 | <p> | |
2254 | If no names are given, add all files to the repository (except |
|
2254 | If no names are given, add all files to the repository (except | |
@@ -2258,7 +2258,7 b' Dish up an empty repo; serve it cold.' | |||||
2258 | Examples: |
|
2258 | Examples: | |
2259 | </p> |
|
2259 | </p> | |
2260 | <ul> |
|
2260 | <ul> | |
2261 |
<li> New (unknown) files are added automatically by |
|
2261 | <li> New (unknown) files are added automatically by 'hg add': | |
2262 | <pre> |
|
2262 | <pre> | |
2263 | \$ ls (re) |
|
2263 | \$ ls (re) | |
2264 | foo.c |
|
2264 | foo.c | |
@@ -2425,8 +2425,8 b' Dish up an empty repo; serve it cold.' | |||||
2425 | </p> |
|
2425 | </p> | |
2426 | <p> |
|
2426 | <p> | |
2427 | This command schedules the files to be removed at the next commit. |
|
2427 | This command schedules the files to be removed at the next commit. | |
2428 |
To undo a remove before that, see |
|
2428 | To undo a remove before that, see 'hg revert'. To undo added | |
2429 |
files, see |
|
2429 | files, see 'hg forget'. | |
2430 | </p> |
|
2430 | </p> | |
2431 | <p> |
|
2431 | <p> | |
2432 | -A/--after can be used to remove only files that have already |
|
2432 | -A/--after can be used to remove only files that have already | |
@@ -2438,7 +2438,7 b' Dish up an empty repo; serve it cold.' | |||||
2438 | The following table details the behavior of remove for different |
|
2438 | The following table details the behavior of remove for different | |
2439 | file states (columns) and option combinations (rows). The file |
|
2439 | file states (columns) and option combinations (rows). The file | |
2440 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
2440 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
2441 |
(as reported by |
|
2441 | (as reported by 'hg status'). The actions are Warn, Remove | |
2442 | (from branch) and Delete (from disk): |
|
2442 | (from branch) and Delete (from disk): | |
2443 | </p> |
|
2443 | </p> | |
2444 | <table> |
|
2444 | <table> | |
@@ -2472,7 +2472,7 b' Dish up an empty repo; serve it cold.' | |||||
2472 | <b>Note:</b> |
|
2472 | <b>Note:</b> | |
2473 | </p> |
|
2473 | </p> | |
2474 | <p> |
|
2474 | <p> | |
2475 |
|
|
2475 | 'hg remove' never deletes files in Added [A] state from the | |
2476 | working directory, not even if "--force" is specified. |
|
2476 | working directory, not even if "--force" is specified. | |
2477 | </p> |
|
2477 | </p> | |
2478 | <p> |
|
2478 | <p> |
@@ -594,18 +594,18 b' Debug output.' | |||||
594 | == roles == |
|
594 | == roles == | |
595 | 60 column format: |
|
595 | 60 column format: | |
596 | ---------------------------------------------------------------------- |
|
596 | ---------------------------------------------------------------------- | |
597 |
Please see |
|
597 | Please see 'hg add'. | |
598 | ---------------------------------------------------------------------- |
|
598 | ---------------------------------------------------------------------- | |
599 |
|
599 | |||
600 | 30 column format: |
|
600 | 30 column format: | |
601 | ---------------------------------------------------------------------- |
|
601 | ---------------------------------------------------------------------- | |
602 |
Please see |
|
602 | Please see 'hg add'. | |
603 | ---------------------------------------------------------------------- |
|
603 | ---------------------------------------------------------------------- | |
604 |
|
604 | |||
605 | html format: |
|
605 | html format: | |
606 | ---------------------------------------------------------------------- |
|
606 | ---------------------------------------------------------------------- | |
607 | <p> |
|
607 | <p> | |
608 |
Please see |
|
608 | Please see 'hg add'. | |
609 | </p> |
|
609 | </p> | |
610 | ---------------------------------------------------------------------- |
|
610 | ---------------------------------------------------------------------- | |
611 |
|
611 | |||
@@ -621,7 +621,7 b' Section' | |||||
621 | Subsection |
|
621 | Subsection | |
622 | '''''''''' |
|
622 | '''''''''' | |
623 |
|
623 | |||
624 |
Markup: "foo" and |
|
624 | Markup: "foo" and 'hg help' | |
625 | --------------------------- |
|
625 | --------------------------- | |
626 | ---------------------------------------------------------------------- |
|
626 | ---------------------------------------------------------------------- | |
627 |
|
627 | |||
@@ -636,7 +636,7 b' Section' | |||||
636 | Subsection |
|
636 | Subsection | |
637 | '''''''''' |
|
637 | '''''''''' | |
638 |
|
638 | |||
639 |
Markup: "foo" and |
|
639 | Markup: "foo" and 'hg help' | |
640 | --------------------------- |
|
640 | --------------------------- | |
641 | ---------------------------------------------------------------------- |
|
641 | ---------------------------------------------------------------------- | |
642 |
|
642 | |||
@@ -645,7 +645,7 b' html format:' | |||||
645 | <h1>Title</h1> |
|
645 | <h1>Title</h1> | |
646 | <h2>Section</h2> |
|
646 | <h2>Section</h2> | |
647 | <h3>Subsection</h3> |
|
647 | <h3>Subsection</h3> | |
648 |
<h2>Markup: "foo" and |
|
648 | <h2>Markup: "foo" and 'hg help'</h2> | |
649 | ---------------------------------------------------------------------- |
|
649 | ---------------------------------------------------------------------- | |
650 |
|
650 | |||
651 | == admonitions == |
|
651 | == admonitions == |
@@ -25,7 +25,7 b' help' | |||||
25 | Known patches are represented as patch files in the .hg/patches directory. |
|
25 | Known patches are represented as patch files in the .hg/patches directory. | |
26 | Applied patches are both patch files and changesets. |
|
26 | Applied patches are both patch files and changesets. | |
27 |
|
27 | |||
28 |
Common tasks (use |
|
28 | Common tasks (use 'hg help command' for more details): | |
29 |
|
29 | |||
30 | create new patch qnew |
|
30 | create new patch qnew | |
31 | import existing patch qimport |
|
31 | import existing patch qimport | |
@@ -49,14 +49,14 b' help' | |||||
49 | will override the [diff] section and always generate git or regular patches, |
|
49 | will override the [diff] section and always generate git or regular patches, | |
50 | possibly losing data in the second case. |
|
50 | possibly losing data in the second case. | |
51 |
|
51 | |||
52 |
It may be desirable for mq changesets to be kept in the secret phase (see |
|
52 | It may be desirable for mq changesets to be kept in the secret phase (see 'hg | |
53 |
help phases |
|
53 | help phases'), which can be enabled with the following setting: | |
54 |
|
54 | |||
55 | [mq] |
|
55 | [mq] | |
56 | secret = True |
|
56 | secret = True | |
57 |
|
57 | |||
58 | You will by default be managing a patch queue named "patches". You can create |
|
58 | You will by default be managing a patch queue named "patches". You can create | |
59 |
other, independent patch queues with the |
|
59 | other, independent patch queues with the 'hg qqueue' command. | |
60 |
|
60 | |||
61 | If the working directory contains uncommitted files, qpush, qpop and qgoto |
|
61 | If the working directory contains uncommitted files, qpush, qpop and qgoto | |
62 | abort immediately. If -f/--force is used, the changes are discarded. Setting: |
|
62 | abort immediately. If -f/--force is used, the changes are discarded. Setting: |
@@ -22,7 +22,7 b'' | |||||
22 | This extension implements hooks to send email notifications when changesets |
|
22 | This extension implements hooks to send email notifications when changesets | |
23 | are sent from or received by the local repository. |
|
23 | are sent from or received by the local repository. | |
24 |
|
24 | |||
25 |
First, enable the extension as explained in |
|
25 | First, enable the extension as explained in 'hg help extensions', and register | |
26 | the hook you want to run. "incoming" and "changegroup" hooks are run when |
|
26 | the hook you want to run. "incoming" and "changegroup" hooks are run when | |
27 | changesets are received, while "outgoing" hooks are for changesets sent to |
|
27 | changesets are received, while "outgoing" hooks are for changesets sent to | |
28 | another repository: |
|
28 | another repository: |
@@ -30,10 +30,10 b' help record (record)' | |||||
30 |
|
30 | |||
31 | interactively select changes to commit |
|
31 | interactively select changes to commit | |
32 |
|
32 | |||
33 |
If a list of files is omitted, all changes reported by |
|
33 | If a list of files is omitted, all changes reported by 'hg status' will be | |
34 | candidates for recording. |
|
34 | candidates for recording. | |
35 |
|
35 | |||
36 |
See |
|
36 | See 'hg help dates' for a list of formats valid for -d/--date. | |
37 |
|
37 | |||
38 | You will be prompted for whether to record changes to each modified file, |
|
38 | You will be prompted for whether to record changes to each modified file, | |
39 | and for files with multiple changes, for each change to use. For each |
|
39 | and for files with multiple changes, for each change to use. For each | |
@@ -82,7 +82,7 b' help (no mq, so no qrecord)' | |||||
82 |
|
82 | |||
83 | interactively record a new patch |
|
83 | interactively record a new patch | |
84 |
|
84 | |||
85 |
See |
|
85 | See 'hg help qnew' & 'hg help record' for more information and usage. | |
86 |
|
86 | |||
87 | (some details hidden, use --verbose to show complete help) |
|
87 | (some details hidden, use --verbose to show complete help) | |
88 |
|
88 | |||
@@ -114,7 +114,7 b' help (bad mq)' | |||||
114 |
|
114 | |||
115 | interactively record a new patch |
|
115 | interactively record a new patch | |
116 |
|
116 | |||
117 |
See |
|
117 | See 'hg help qnew' & 'hg help record' for more information and usage. | |
118 |
|
118 | |||
119 | (some details hidden, use --verbose to show complete help) |
|
119 | (some details hidden, use --verbose to show complete help) | |
120 |
|
120 | |||
@@ -128,7 +128,7 b' help (mq present)' | |||||
128 |
|
128 | |||
129 | interactively record a new patch |
|
129 | interactively record a new patch | |
130 |
|
130 | |||
131 |
See |
|
131 | See 'hg help qnew' & 'hg help record' for more information and usage. | |
132 |
|
132 | |||
133 | options ([+] can be repeated): |
|
133 | options ([+] can be repeated): | |
134 |
|
134 |
@@ -17,10 +17,10 b' Record help' | |||||
17 |
|
17 | |||
18 | interactively select changes to commit |
|
18 | interactively select changes to commit | |
19 |
|
19 | |||
20 |
If a list of files is omitted, all changes reported by |
|
20 | If a list of files is omitted, all changes reported by 'hg status' will be | |
21 | candidates for recording. |
|
21 | candidates for recording. | |
22 |
|
22 | |||
23 |
See |
|
23 | See 'hg help dates' for a list of formats valid for -d/--date. | |
24 |
|
24 | |||
25 | You will be prompted for whether to record changes to each modified file, |
|
25 | You will be prompted for whether to record changes to each modified file, | |
26 | and for files with multiple changes, for each change to use. For each |
|
26 | and for files with multiple changes, for each change to use. For each |
General Comments 0
You need to be logged in to leave comments.
Login now