Show More
@@ -12,8 +12,8 b' points to a changeset identified by its ' | |||||
12 | changeset that is based on a changeset that has a bookmark on it, the |
|
12 | changeset that is based on a changeset that has a bookmark on it, the | |
13 | bookmark shifts to the new changeset. |
|
13 | bookmark shifts to the new changeset. | |
14 |
|
14 | |||
15 |
It is possible to use bookmark names in every revision lookup (e.g. |
|
15 | It is possible to use bookmark names in every revision lookup (e.g. | |
16 |
|
|
16 | :hg:`merge`, :hg:`update`). | |
17 |
|
17 | |||
18 | By default, when several bookmarks point to the same changeset, they |
|
18 | By default, when several bookmarks point to the same changeset, they | |
19 | will all move forward together. It is possible to obtain a more |
|
19 | will all move forward together. It is possible to obtain a more |
@@ -197,7 +197,7 b' def sign(ui, repo, *revs, **opts):' | |||||
197 | If no revision is given, the parent of the working directory is used, |
|
197 | If no revision is given, the parent of the working directory is used, | |
198 | or tip if no revision is checked out. |
|
198 | or tip if no revision is checked out. | |
199 |
|
199 | |||
200 |
See |
|
200 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
201 | """ |
|
201 | """ | |
202 |
|
202 | |||
203 | mygpg = newgpg(ui, **opts) |
|
203 | mygpg = newgpg(ui, **opts) |
@@ -17,7 +17,7 b' which provides hooks for hgk to get info' | |||||
17 | the contrib directory, and the extension is shipped in the hgext |
|
17 | the contrib directory, and the extension is shipped in the hgext | |
18 | repository, and needs to be enabled. |
|
18 | repository, and needs to be enabled. | |
19 |
|
19 | |||
20 |
The |
|
20 | The :hg:`view` command will launch the hgk Tcl script. For this command | |
21 | to work, hgk must be in your search path. Alternately, you can specify |
|
21 | to work, hgk must be in your search path. Alternately, you can specify | |
22 | the path to hgk in your .hgrc file:: |
|
22 | the path to hgk in your .hgrc file:: | |
23 |
|
23 |
@@ -281,7 +281,7 b' def demo(ui, repo, *args, **opts):' | |||||
281 |
|
281 | |||
282 | Use -d/--default to disable current configuration. |
|
282 | Use -d/--default to disable current configuration. | |
283 |
|
283 | |||
284 |
See |
|
284 | See :hg:`help templates` for information on templates and filters. | |
285 | ''' |
|
285 | ''' | |
286 | def demoitems(section, items): |
|
286 | def demoitems(section, items): | |
287 | ui.write('[%s]\n' % section) |
|
287 | ui.write('[%s]\n' % section) |
@@ -1836,7 +1836,7 b' def init(ui, repo, **opts):' | |||||
1836 | qcommit to commit changes to this queue repository. |
|
1836 | qcommit to commit changes to this queue repository. | |
1837 |
|
1837 | |||
1838 | This command is deprecated. Without -c, it's implied by other relevant |
|
1838 | This command is deprecated. Without -c, it's implied by other relevant | |
1839 |
commands. With -c, use |
|
1839 | commands. With -c, use :hg:`init --mq` instead.""" | |
1840 | return qinit(ui, repo, create=opts['create_repo']) |
|
1840 | return qinit(ui, repo, create=opts['create_repo']) | |
1841 |
|
1841 | |||
1842 | def clone(ui, source, dest=None, **opts): |
|
1842 | def clone(ui, source, dest=None, **opts): | |
@@ -1852,7 +1852,7 b' def clone(ui, source, dest=None, **opts)' | |||||
1852 | default. Use -p <url> to change. |
|
1852 | default. Use -p <url> to change. | |
1853 |
|
1853 | |||
1854 | The patch directory must be a nested Mercurial repository, as |
|
1854 | The patch directory must be a nested Mercurial repository, as | |
1855 | would be created by init --mq. |
|
1855 | would be created by :hg:`init --mq`. | |
1856 | ''' |
|
1856 | ''' | |
1857 | def patchdir(repo): |
|
1857 | def patchdir(repo): | |
1858 | url = repo.url() |
|
1858 | url = repo.url() | |
@@ -1906,7 +1906,7 b' def clone(ui, source, dest=None, **opts)' | |||||
1906 | def commit(ui, repo, *pats, **opts): |
|
1906 | def commit(ui, repo, *pats, **opts): | |
1907 | """commit changes in the queue repository (DEPRECATED) |
|
1907 | """commit changes in the queue repository (DEPRECATED) | |
1908 |
|
1908 | |||
1909 |
This command is deprecated; use |
|
1909 | This command is deprecated; use :hg:`commit --mq` instead.""" | |
1910 | q = repo.mq |
|
1910 | q = repo.mq | |
1911 | r = q.qrepo() |
|
1911 | r = q.qrepo() | |
1912 | if not r: |
|
1912 | if not r: | |
@@ -2371,8 +2371,8 b' def strip(ui, repo, rev, **opts):' | |||||
2371 | completes. |
|
2371 | completes. | |
2372 |
|
2372 | |||
2373 | Any stripped changesets are stored in ``.hg/strip-backup`` as a |
|
2373 | Any stripped changesets are stored in ``.hg/strip-backup`` as a | |
2374 |
bundle (see |
|
2374 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can | |
2375 |
be restored by running |
|
2375 | be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, | |
2376 | where BUNDLE is the bundle file created by the strip. Note that |
|
2376 | where BUNDLE is the bundle file created by the strip. Note that | |
2377 | the local revision numbers will in general be different after the |
|
2377 | the local revision numbers will in general be different after the | |
2378 | restore. |
|
2378 | restore. |
@@ -187,9 +187,9 b' def makepatch(ui, repo, patch, opts, _ch' | |||||
187 | def patchbomb(ui, repo, *revs, **opts): |
|
187 | def patchbomb(ui, repo, *revs, **opts): | |
188 | '''send changesets by email |
|
188 | '''send changesets by email | |
189 |
|
189 | |||
190 |
By default, diffs are sent in the format generated by |
|
190 | By default, diffs are sent in the format generated by | |
191 |
one per message. The series starts with a "[PATCH 0 |
|
191 | :hg:`export`, one per message. The series starts with a "[PATCH 0 | |
192 | introduction, which describes the series as a whole. |
|
192 | of N]" introduction, which describes the series as a whole. | |
193 |
|
193 | |||
194 | Each patch email has a Subject line of "[PATCH M of N] ...", using |
|
194 | Each patch email has a Subject line of "[PATCH M of N] ...", using | |
195 | the first line of the changeset description as the subject text. |
|
195 | the first line of the changeset description as the subject text. |
@@ -453,7 +453,7 b' def transplant(ui, repo, *revs, **opts):' | |||||
453 | transplanted, otherwise you will be prompted to select the |
|
453 | transplanted, otherwise you will be prompted to select the | |
454 | changesets you want. |
|
454 | changesets you want. | |
455 |
|
455 | |||
456 |
|
|
456 | :hg:`transplant --branch REVISION --all` will rebase the selected | |
457 | branch (up to the named revision) onto your current working |
|
457 | branch (up to the named revision) onto your current working | |
458 | directory. |
|
458 | directory. | |
459 |
|
459 | |||
@@ -462,12 +462,12 b' def transplant(ui, repo, *revs, **opts):' | |||||
462 | of a merged transplant, and you can merge descendants of them |
|
462 | of a merged transplant, and you can merge descendants of them | |
463 | normally instead of transplanting them. |
|
463 | normally instead of transplanting them. | |
464 |
|
464 | |||
465 |
If no merges or revisions are provided, |
|
465 | If no merges or revisions are provided, :hg:`transplant` will | |
466 | an interactive changeset browser. |
|
466 | start an interactive changeset browser. | |
467 |
|
467 | |||
468 | If a changeset application fails, you can fix the merge by hand |
|
468 | If a changeset application fails, you can fix the merge by hand | |
469 |
and then resume where you left off by calling |
|
469 | and then resume where you left off by calling :hg:`transplant | |
470 | --continue/-c. |
|
470 | --continue/-c`. | |
471 | ''' |
|
471 | ''' | |
472 | def getremotechanges(repo, url): |
|
472 | def getremotechanges(repo, url): | |
473 | sourcerepo = ui.expandpath(url) |
|
473 | sourcerepo = ui.expandpath(url) |
@@ -24,7 +24,7 b' def add(ui, repo, *pats, **opts):' | |||||
24 | repository. |
|
24 | repository. | |
25 |
|
25 | |||
26 | The files will be added to the repository at the next commit. To |
|
26 | The files will be added to the repository at the next commit. To | |
27 |
undo an add before that, see |
|
27 | undo an add before that, see :hg:`forget`. | |
28 |
|
28 | |||
29 | If no names are given, add all files to the repository. |
|
29 | If no names are given, add all files to the repository. | |
30 |
|
30 | |||
@@ -492,7 +492,7 b' def branches(ui, repo, active=False, clo' | |||||
492 |
|
492 | |||
493 | List the repository's named branches, indicating which ones are |
|
493 | List the repository's named branches, indicating which ones are | |
494 | inactive. If -c/--closed is specified, also list branches which have |
|
494 | inactive. If -c/--closed is specified, also list branches which have | |
495 |
been marked closed (see |
|
495 | been marked closed (see :hg:`commit --close-branch`). | |
496 |
|
496 | |||
497 | If -a/--active is specified, only show active branches. A branch |
|
497 | If -a/--active is specified, only show active branches. A branch | |
498 | is considered active if it contains repository heads. |
|
498 | is considered active if it contains repository heads. | |
@@ -724,8 +724,8 b' def commit(ui, repo, *pats, **opts):' | |||||
724 | """commit the specified files or all outstanding changes |
|
724 | """commit the specified files or all outstanding changes | |
725 |
|
725 | |||
726 | Commit changes to the given files into the repository. Unlike a |
|
726 | Commit changes to the given files into the repository. Unlike a | |
727 |
centralized RCS, this operation is a local operation. See |
|
727 | centralized RCS, this operation is a local operation. See | |
728 | for a way to actively distribute your changes. |
|
728 | :hg:`push` for a way to actively distribute your changes. | |
729 |
|
729 | |||
730 | If a list of files is omitted, all changes reported by :hg:`status` |
|
730 | If a list of files is omitted, all changes reported by :hg:`status` | |
731 | will be committed. |
|
731 | will be committed. | |
@@ -792,7 +792,7 b' def copy(ui, repo, *pats, **opts):' | |||||
792 | operation is recorded, but no copying is performed. |
|
792 | operation is recorded, but no copying is performed. | |
793 |
|
793 | |||
794 | This command takes effect with the next commit. To undo a copy |
|
794 | This command takes effect with the next commit. To undo a copy | |
795 |
before that, see |
|
795 | before that, see :hg:`revert`. | |
796 |
|
796 | |||
797 | Returns 0 on success, 1 if errors are encountered. |
|
797 | Returns 0 on success, 1 if errors are encountered. | |
798 | """ |
|
798 | """ | |
@@ -1282,7 +1282,7 b' def forget(ui, repo, *pats, **opts):' | |||||
1282 | entire project history, and it does not delete them from the |
|
1282 | entire project history, and it does not delete them from the | |
1283 | working directory. |
|
1283 | working directory. | |
1284 |
|
1284 | |||
1285 |
To undo a forget before the next commit, see |
|
1285 | To undo a forget before the next commit, see :hg:`add`. | |
1286 |
|
1286 | |||
1287 | Returns 0 on success. |
|
1287 | Returns 0 on success. | |
1288 | """ |
|
1288 | """ | |
@@ -1507,7 +1507,7 b' def heads(ui, repo, *branchrevs, **opts)' | |||||
1507 | associated with the specified changesets are shown. |
|
1507 | associated with the specified changesets are shown. | |
1508 |
|
1508 | |||
1509 | If -c/--closed is specified, also show branch heads marked closed |
|
1509 | If -c/--closed is specified, also show branch heads marked closed | |
1510 |
(see |
|
1510 | (see :hg:`commit --close-branch`). | |
1511 |
|
1511 | |||
1512 | If STARTREV is specified, only those heads that are descendants of |
|
1512 | If STARTREV is specified, only those heads that are descendants of | |
1513 | STARTREV will be displayed. |
|
1513 | STARTREV will be displayed. | |
@@ -1914,7 +1914,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1914 | text/plain body parts before first diff are added to commit |
|
1914 | text/plain body parts before first diff are added to commit | |
1915 | message. |
|
1915 | message. | |
1916 |
|
1916 | |||
1917 |
If the imported patch was generated by |
|
1917 | If the imported patch was generated by :hg:`export`, user and | |
1918 | description from patch override values from message headers and |
|
1918 | description from patch override values from message headers and | |
1919 | body. Values given on command line with -m/--message and -u/--user |
|
1919 | body. Values given on command line with -m/--message and -u/--user | |
1920 | override these. |
|
1920 | override these. | |
@@ -2500,10 +2500,10 b' def pull(ui, repo, source="default", **o' | |||||
2500 | -R is specified). By default, this does not update the copy of the |
|
2500 | -R is specified). By default, this does not update the copy of the | |
2501 | project in the working directory. |
|
2501 | project in the working directory. | |
2502 |
|
2502 | |||
2503 |
Use |
|
2503 | Use :hg:`incoming` if you want to see what would have been added | |
2504 |
pull at the time you issued this command. If you then decide |
|
2504 | by a pull at the time you issued this command. If you then decide | |
2505 |
add those changes to the repository, you should use pull |
|
2505 | to add those changes to the repository, you should use :hg:`pull | |
2506 |
where X is the last changeset listed by |
|
2506 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
2507 |
|
2507 | |||
2508 | If SOURCE is omitted, the 'default' path will be used. |
|
2508 | If SOURCE is omitted, the 'default' path will be used. | |
2509 | See :hg:`help urls` for more information. |
|
2509 | See :hg:`help urls` for more information. | |
@@ -2596,8 +2596,8 b' def remove(ui, repo, *pats, **opts):' | |||||
2596 | The following table details the behavior of remove for different |
|
2596 | The following table details the behavior of remove for different | |
2597 | file states (columns) and option combinations (rows). The file |
|
2597 | file states (columns) and option combinations (rows). The file | |
2598 | states are Added [A], Clean [C], Modified [M] and Missing [!] (as |
|
2598 | states are Added [A], Clean [C], Modified [M] and Missing [!] (as | |
2599 |
reported by |
|
2599 | reported by :hg:`status`). The actions are Warn, Remove (from | |
2600 | and Delete (from disk):: |
|
2600 | branch) and Delete (from disk):: | |
2601 |
|
2601 | |||
2602 | A C M ! |
|
2602 | A C M ! | |
2603 | none W RD W R |
|
2603 | none W RD W R | |
@@ -2606,7 +2606,7 b' def remove(ui, repo, *pats, **opts):' | |||||
2606 | -Af R R R R |
|
2606 | -Af R R R R | |
2607 |
|
2607 | |||
2608 | This command schedules the files to be removed at the next commit. |
|
2608 | This command schedules the files to be removed at the next commit. | |
2609 |
To undo a remove before that, see |
|
2609 | To undo a remove before that, see :hg:`revert`. | |
2610 |
|
2610 | |||
2611 | Returns 0 on success, 1 if any warnings encountered. |
|
2611 | Returns 0 on success, 1 if any warnings encountered. | |
2612 | """ |
|
2612 | """ | |
@@ -2661,7 +2661,7 b' def rename(ui, repo, *pats, **opts):' | |||||
2661 | operation is recorded, but no copying is performed. |
|
2661 | operation is recorded, but no copying is performed. | |
2662 |
|
2662 | |||
2663 | This command takes effect at the next commit. To undo a rename |
|
2663 | This command takes effect at the next commit. To undo a rename | |
2664 |
before that, see |
|
2664 | before that, see :hg:`revert`. | |
2665 |
|
2665 | |||
2666 | Returns 0 on success, 1 if errors are encountered. |
|
2666 | Returns 0 on success, 1 if errors are encountered. | |
2667 | """ |
|
2667 | """ |
@@ -241,7 +241,7 b' add the specified files on the next comm' | |||||
241 | Schedule files to be version controlled and added to the repository. |
|
241 | Schedule files to be version controlled and added to the repository. | |
242 |
|
242 | |||
243 | The files will be added to the repository at the next commit. To undo an |
|
243 | The files will be added to the repository at the next commit. To undo an | |
244 | add before that, see hg forget. |
|
244 | add before that, see "hg forget". | |
245 |
|
245 | |||
246 | If no names are given, add all files to the repository. |
|
246 | If no names are given, add all files to the repository. | |
247 |
|
247 | |||
@@ -262,7 +262,7 b' add the specified files on the next comm' | |||||
262 | Schedule files to be version controlled and added to the repository. |
|
262 | Schedule files to be version controlled and added to the repository. | |
263 |
|
263 | |||
264 | The files will be added to the repository at the next commit. To undo an |
|
264 | The files will be added to the repository at the next commit. To undo an | |
265 | add before that, see hg forget. |
|
265 | add before that, see "hg forget". | |
266 |
|
266 | |||
267 | If no names are given, add all files to the repository. |
|
267 | If no names are given, add all files to the repository. | |
268 |
|
268 | |||
@@ -314,7 +314,7 b' add the specified files on the next comm' | |||||
314 | Schedule files to be version controlled and added to the repository. |
|
314 | Schedule files to be version controlled and added to the repository. | |
315 |
|
315 | |||
316 | The files will be added to the repository at the next commit. To undo an |
|
316 | The files will be added to the repository at the next commit. To undo an | |
317 | add before that, see hg forget. |
|
317 | add before that, see "hg forget". | |
318 |
|
318 | |||
319 | If no names are given, add all files to the repository. |
|
319 | If no names are given, add all files to the repository. | |
320 |
|
320 | |||
@@ -335,7 +335,7 b' add the specified files on the next comm' | |||||
335 | Schedule files to be version controlled and added to the repository. |
|
335 | Schedule files to be version controlled and added to the repository. | |
336 |
|
336 | |||
337 | The files will be added to the repository at the next commit. To undo an |
|
337 | The files will be added to the repository at the next commit. To undo an | |
338 | add before that, see hg forget. |
|
338 | add before that, see "hg forget". | |
339 |
|
339 | |||
340 | If no names are given, add all files to the repository. |
|
340 | If no names are given, add all files to the repository. | |
341 |
|
341 |
General Comments 0
You need to be logged in to leave comments.
Login now