Show More
@@ -88,10 +88,10 b' def bookmark(ui, repo, mark=None, rev=No' | |||||
88 |
|
88 | |||
89 | Bookmarks are pointers to certain commits that move when |
|
89 | Bookmarks are pointers to certain commits that move when | |
90 | committing. Bookmarks are local. They can be renamed, copied and |
|
90 | committing. Bookmarks are local. They can be renamed, copied and | |
91 |
deleted. It is possible to use bookmark names in |
|
91 | deleted. It is possible to use bookmark names in :hg:`merge` and | |
92 |
|
|
92 | :hg:`update` to merge and update respectively to a given bookmark. | |
93 |
|
93 | |||
94 |
You can use |
|
94 | You can use :hg:`bookmark NAME` to set a bookmark on the working | |
95 | directory's parent revision with the given name. If you specify |
|
95 | directory's parent revision with the given name. If you specify | |
96 | a revision using -r REV (where REV may be an existing bookmark), |
|
96 | a revision using -r REV (where REV may be an existing bookmark), | |
97 | the bookmark is assigned to that revision. |
|
97 | the bookmark is assigned to that revision. |
@@ -28,7 +28,7 b" def fetch(ui, repo, source='default', **" | |||||
28 | parent, with local changes as the second. To switch the merge |
|
28 | parent, with local changes as the second. To switch the merge | |
29 | order, use --switch-parent. |
|
29 | order, use --switch-parent. | |
30 |
|
30 | |||
31 |
See |
|
31 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
32 | ''' |
|
32 | ''' | |
33 |
|
33 | |||
34 | date = opts.get('date') |
|
34 | date = opts.get('date') |
@@ -49,25 +49,25 b' NOTE: the more specific you are in your ' | |||||
49 | lose speed in huge repositories. |
|
49 | lose speed in huge repositories. | |
50 |
|
50 | |||
51 | For [keywordmaps] template mapping and expansion demonstration and |
|
51 | For [keywordmaps] template mapping and expansion demonstration and | |
52 |
control run |
|
52 | control run :hg:`kwdemo`. See :hg:`help templates` for a list of | |
53 | available templates and filters. |
|
53 | available templates and filters. | |
54 |
|
54 | |||
55 | An additional date template filter {date|utcdate} is provided. It |
|
55 | An additional date template filter {date|utcdate} is provided. It | |
56 | returns a date like "2006/09/18 15:13:13". |
|
56 | returns a date like "2006/09/18 15:13:13". | |
57 |
|
57 | |||
58 |
The default template mappings (view with |
|
58 | The default template mappings (view with :hg:`kwdemo -d`) can be | |
59 |
replaced with customized keywords and templates. Again, run |
|
59 | replaced with customized keywords and templates. Again, run | |
60 |
kwdemo |
|
60 | :hg:`kwdemo` to control the results of your config changes. | |
61 |
|
61 | |||
62 |
Before changing/disabling active keywords, run |
|
62 | Before changing/disabling active keywords, run :hg:`kwshrink` to avoid | |
63 | the risk of inadvertently storing expanded keywords in the change |
|
63 | the risk of inadvertently storing expanded keywords in the change | |
64 | history. |
|
64 | history. | |
65 |
|
65 | |||
66 | To force expansion after enabling it, or a configuration change, run |
|
66 | To force expansion after enabling it, or a configuration change, run | |
67 |
|
|
67 | :hg:`kwexpand`. | |
68 |
|
68 | |||
69 | Also, when committing with the record extension or using mq's qrecord, |
|
69 | Also, when committing with the record extension or using mq's qrecord, | |
70 |
be aware that keywords cannot be updated. Again, run |
|
70 | be aware that keywords cannot be updated. Again, run :hg:`kwexpand` on | |
71 | the files in question to update keyword expansions after all changes |
|
71 | the files in question to update keyword expansions after all changes | |
72 | have been checked in. |
|
72 | have been checked in. | |
73 |
|
73 | |||
@@ -361,7 +361,7 b' def files(ui, repo, *pats, **opts):' | |||||
361 | execution by including only files that are actual candidates for |
|
361 | execution by including only files that are actual candidates for | |
362 | expansion. |
|
362 | expansion. | |
363 |
|
363 | |||
364 |
See |
|
364 | See :hg:`help keyword` on how to construct patterns both for | |
365 | inclusion and exclusion of files. |
|
365 | inclusion and exclusion of files. | |
366 |
|
366 | |||
367 | With -A/--all and -v/--verbose the codes used to show the status |
|
367 | With -A/--all and -v/--verbose the codes used to show the status | |
@@ -398,7 +398,7 b' def shrink(ui, repo, *pats, **opts):' | |||||
398 | '''revert expanded keywords in the working directory |
|
398 | '''revert expanded keywords in the working directory | |
399 |
|
399 | |||
400 | Run before changing/disabling active keywords or if you experience |
|
400 | Run before changing/disabling active keywords or if you experience | |
401 |
problems with |
|
401 | problems with :hg:`import` or :hg:`merge`. | |
402 |
|
402 | |||
403 | kwshrink refuses to run if given files contain local changes. |
|
403 | kwshrink refuses to run if given files contain local changes. | |
404 | ''' |
|
404 | ''' |
@@ -14,7 +14,7 b' applied patches (subset of known patches' | |||||
14 | Known patches are represented as patch files in the .hg/patches |
|
14 | Known patches are represented as patch files in the .hg/patches | |
15 | directory. Applied patches are both patch files and changesets. |
|
15 | directory. Applied patches are both patch files and changesets. | |
16 |
|
16 | |||
17 |
Common tasks (use |
|
17 | Common tasks (use :hg:`help command` for more details):: | |
18 |
|
18 | |||
19 | create new patch qnew |
|
19 | create new patch qnew | |
20 | import existing patch qimport |
|
20 | import existing patch qimport | |
@@ -2041,9 +2041,9 b' def diff(ui, repo, *pats, **opts):' | |||||
2041 | last refresh (thus showing what the current patch would become |
|
2041 | last refresh (thus showing what the current patch would become | |
2042 | after a qrefresh). |
|
2042 | after a qrefresh). | |
2043 |
|
2043 | |||
2044 |
Use |
|
2044 | Use :hg:`diff` if you only want to see the changes made since the | |
2045 |
last qrefresh, or |
|
2045 | last qrefresh, or :hg:`export qtip` if you want to see changes | |
2046 | by the current patch without including changes made since the |
|
2046 | made by the current patch without including changes made since the | |
2047 | qrefresh. |
|
2047 | qrefresh. | |
2048 | """ |
|
2048 | """ | |
2049 | repo.mq.diff(repo, pats, opts) |
|
2049 | repo.mq.diff(repo, pats, opts) |
@@ -45,8 +45,8 b' paged.' | |||||
45 |
|
45 | |||
46 | If pager.attend is present, pager.ignore will be ignored. |
|
46 | If pager.attend is present, pager.ignore will be ignored. | |
47 |
|
47 | |||
48 |
To ignore global commands like |
|
48 | To ignore global commands like :hg:`version` or :hg:`help`, you have | |
49 | specify them in the global .hgrc |
|
49 | to specify them in the global .hgrc | |
50 | ''' |
|
50 | ''' | |
51 |
|
51 | |||
52 | import sys, os, signal |
|
52 | import sys, os, signal |
@@ -16,7 +16,7 b' message contains two or three body parts' | |||||
16 |
|
16 | |||
17 | - The changeset description. |
|
17 | - The changeset description. | |
18 | - [Optional] The result of running diffstat on the patch. |
|
18 | - [Optional] The result of running diffstat on the patch. | |
19 |
- The patch itself, as generated by |
|
19 | - The patch itself, as generated by :hg:`export`. | |
20 |
|
20 | |||
21 | Each message refers to the first in the series using the In-Reply-To |
|
21 | Each message refers to the first in the series using the In-Reply-To | |
22 | and References headers, so they will show up as a sequence in threaded |
|
22 | and References headers, so they will show up as a sequence in threaded | |
@@ -38,11 +38,11 b' file::' | |||||
38 | Use ``[patchbomb]`` as configuration section name if you need to |
|
38 | Use ``[patchbomb]`` as configuration section name if you need to | |
39 | override global ``[email]`` address settings. |
|
39 | override global ``[email]`` address settings. | |
40 |
|
40 | |||
41 |
Then you can use the |
|
41 | Then you can use the :hg:`email` command to mail a series of | |
42 | as a patchbomb. |
|
42 | changesets as a patchbomb. | |
43 |
|
43 | |||
44 | To avoid sending patches prematurely, it is a good idea to first run |
|
44 | To avoid sending patches prematurely, it is a good idea to first run | |
45 |
the |
|
45 | the :hg:`email` command with the "-n" option (test only). You will be | |
46 | prompted for an email recipient address, a subject and an introductory |
|
46 | prompted for an email recipient address, a subject and an introductory | |
47 | message describing the patches of your patchbomb. Then when all is |
|
47 | message describing the patches of your patchbomb. Then when all is | |
48 | done, patchbomb messages are displayed. If the PAGER environment |
|
48 | done, patchbomb messages are displayed. If the PAGER environment | |
@@ -196,7 +196,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
196 | description. Next, (optionally) if the diffstat program is |
|
196 | description. Next, (optionally) if the diffstat program is | |
197 | installed and -d/--diffstat is used, the result of running |
|
197 | installed and -d/--diffstat is used, the result of running | |
198 | diffstat on the patch. Finally, the patch itself, as generated by |
|
198 | diffstat on the patch. Finally, the patch itself, as generated by | |
199 |
|
|
199 | :hg:`export`. | |
200 |
|
200 | |||
201 | By default the patch is included as text in the email body for |
|
201 | By default the patch is included as text in the email body for | |
202 | easy reviewing. Using the -a/--attach option will instead create |
|
202 | easy reviewing. Using the -a/--attach option will instead create |
@@ -37,7 +37,7 b' def purge(ui, repo, *dirs, **opts):' | |||||
37 |
|
37 | |||
38 | This means that purge will delete: |
|
38 | This means that purge will delete: | |
39 |
|
39 | |||
40 |
- Unknown files: files marked with "?" by |
|
40 | - Unknown files: files marked with "?" by :hg:`status` | |
41 | - Empty directories: in fact Mercurial ignores directories unless |
|
41 | - Empty directories: in fact Mercurial ignores directories unless | |
42 | they contain files under source control management |
|
42 | they contain files under source control management | |
43 |
|
43 | |||
@@ -45,7 +45,7 b' def purge(ui, repo, *dirs, **opts):' | |||||
45 |
|
45 | |||
46 | - Modified and unmodified tracked files |
|
46 | - Modified and unmodified tracked files | |
47 | - Ignored files (unless --all is specified) |
|
47 | - Ignored files (unless --all is specified) | |
48 |
- New files added to the repository (with |
|
48 | - New files added to the repository (with :hg:`add`) | |
49 |
|
49 | |||
50 | If directories are given on the command line, only files in these |
|
50 | If directories are given on the command line, only files in these | |
51 | directories are considered. |
|
51 | directories are considered. |
@@ -360,10 +360,10 b' def filterpatch(ui, chunks):' | |||||
360 | def record(ui, repo, *pats, **opts): |
|
360 | def record(ui, repo, *pats, **opts): | |
361 | '''interactively select changes to commit |
|
361 | '''interactively select changes to commit | |
362 |
|
362 | |||
363 |
If a list of files is omitted, all changes reported by |
|
363 | If a list of files is omitted, all changes reported by :hg:`status` | |
364 | will be candidates for recording. |
|
364 | will be candidates for recording. | |
365 |
|
365 | |||
366 |
See |
|
366 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
367 |
|
367 | |||
368 | You will be prompted for whether to record changes to each |
|
368 | You will be prompted for whether to record changes to each | |
369 | modified file, and for files with multiple changes, for each |
|
369 | modified file, and for files with multiple changes, for each | |
@@ -388,7 +388,7 b' def record(ui, repo, *pats, **opts):' | |||||
388 | def qrecord(ui, repo, patch, *pats, **opts): |
|
388 | def qrecord(ui, repo, patch, *pats, **opts): | |
389 | '''interactively record a new patch |
|
389 | '''interactively record a new patch | |
390 |
|
390 | |||
391 |
See |
|
391 | See :hg:`help qnew` & :hg:`help record` for more information and | |
392 | usage. |
|
392 | usage. | |
393 | ''' |
|
393 | ''' | |
394 |
|
394 |
@@ -32,7 +32,7 b' def add(ui, repo, *pats, **opts):' | |||||
32 | .. container:: verbose |
|
32 | .. container:: verbose | |
33 |
|
33 | |||
34 | An example showing how new (unknown) files are added |
|
34 | An example showing how new (unknown) files are added | |
35 |
automatically by |
|
35 | automatically by :hg:`add`:: | |
36 |
|
36 | |||
37 | $ ls |
|
37 | $ ls | |
38 | foo.c |
|
38 | foo.c | |
@@ -171,7 +171,7 b' def archive(ui, repo, dest, **opts):' | |||||
171 | :``zip``: zip archive, compressed using deflate |
|
171 | :``zip``: zip archive, compressed using deflate | |
172 |
|
172 | |||
173 | The exact name of the destination archive or directory is given |
|
173 | The exact name of the destination archive or directory is given | |
174 |
using a format string; see |
|
174 | using a format string; see :hg:`help export` for details. | |
175 |
|
175 | |||
176 | Each member added to an archive file has a directory prefix |
|
176 | Each member added to an archive file has a directory prefix | |
177 | prepended. Use -p/--prefix to specify a format string for the |
|
177 | prepended. Use -p/--prefix to specify a format string for the | |
@@ -230,7 +230,7 b' def backout(ui, repo, node=None, rev=Non' | |||||
230 | changeset afterwards. This saves you from doing the merge by hand. |
|
230 | changeset afterwards. This saves you from doing the merge by hand. | |
231 | The result of this merge is not committed, as with a normal merge. |
|
231 | The result of this merge is not committed, as with a normal merge. | |
232 |
|
232 | |||
233 |
See |
|
233 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
234 | ''' |
|
234 | ''' | |
235 | if rev and node: |
|
235 | if rev and node: | |
236 | raise util.Abort(_("please specify just one revision")) |
|
236 | raise util.Abort(_("please specify just one revision")) | |
@@ -456,8 +456,8 b' def branch(ui, repo, label=None, **opts)' | |||||
456 | the parent of the working directory, negating a previous branch |
|
456 | the parent of the working directory, negating a previous branch | |
457 | change. |
|
457 | change. | |
458 |
|
458 | |||
459 |
Use the command |
|
459 | Use the command :hg:`update` to switch to an existing branch. Use | |
460 |
|
|
460 | :hg:`commit --close-branch` to mark this branch as closed. | |
461 | """ |
|
461 | """ | |
462 |
|
462 | |||
463 | if opts.get('clean'): |
|
463 | if opts.get('clean'): | |
@@ -485,7 +485,7 b' def branches(ui, repo, active=False, clo' | |||||
485 | If -a/--active is specified, only show active branches. A branch |
|
485 | If -a/--active is specified, only show active branches. A branch | |
486 | is considered active if it contains repository heads. |
|
486 | is considered active if it contains repository heads. | |
487 |
|
487 | |||
488 |
Use the command |
|
488 | Use the command :hg:`update` to switch to an existing branch. | |
489 | """ |
|
489 | """ | |
490 |
|
490 | |||
491 | hexfunc = ui.debugflag and hex or short |
|
491 | hexfunc = ui.debugflag and hex or short | |
@@ -637,11 +637,11 b' def clone(ui, source, dest=None, **opts)' | |||||
637 | The location of the source is added to the new repository's |
|
637 | The location of the source is added to the new repository's | |
638 | .hg/hgrc file, as the default to be used for future pulls. |
|
638 | .hg/hgrc file, as the default to be used for future pulls. | |
639 |
|
639 | |||
640 |
See |
|
640 | See :hg:`help urls` for valid source format details. | |
641 |
|
641 | |||
642 | It is possible to specify an ``ssh://`` URL as the destination, but no |
|
642 | It is possible to specify an ``ssh://`` URL as the destination, but no | |
643 | .hg/hgrc and working directory will be created on the remote side. |
|
643 | .hg/hgrc and working directory will be created on the remote side. | |
644 |
Please see |
|
644 | Please see :hg:`help urls` for important details about ``ssh://`` URLs. | |
645 |
|
645 | |||
646 | A set of changesets (tags, or branch names) to pull may be specified |
|
646 | A set of changesets (tags, or branch names) to pull may be specified | |
647 | by listing each changeset (tag, or branch name) with -r/--rev. |
|
647 | by listing each changeset (tag, or branch name) with -r/--rev. | |
@@ -705,7 +705,7 b' def commit(ui, repo, *pats, **opts):' | |||||
705 | centralized RCS, this operation is a local operation. See hg push |
|
705 | centralized RCS, this operation is a local operation. See hg push | |
706 | for a way to actively distribute your changes. |
|
706 | for a way to actively distribute your changes. | |
707 |
|
707 | |||
708 |
If a list of files is omitted, all changes reported by |
|
708 | If a list of files is omitted, all changes reported by :hg:`status` | |
709 | will be committed. |
|
709 | will be committed. | |
710 |
|
710 | |||
711 | If you are committing the result of a merge, do not provide any |
|
711 | If you are committing the result of a merge, do not provide any | |
@@ -714,7 +714,7 b' def commit(ui, repo, *pats, **opts):' | |||||
714 | If no commit message is specified, the configured editor is |
|
714 | If no commit message is specified, the configured editor is | |
715 | started to prompt you for a message. |
|
715 | started to prompt you for a message. | |
716 |
|
716 | |||
717 |
See |
|
717 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
718 | """ |
|
718 | """ | |
719 | extra = {} |
|
719 | extra = {} | |
720 | if opts.get('close_branch'): |
|
720 | if opts.get('close_branch'): | |
@@ -1151,7 +1151,7 b' def diff(ui, repo, *pats, **opts):' | |||||
1151 | anyway, probably with undesirable results. |
|
1151 | anyway, probably with undesirable results. | |
1152 |
|
1152 | |||
1153 | Use the -g/--git option to generate diffs in the git extended diff |
|
1153 | Use the -g/--git option to generate diffs in the git extended diff | |
1154 |
format. For more information, read |
|
1154 | format. For more information, read :hg:`help diffs`. | |
1155 | """ |
|
1155 | """ | |
1156 |
|
1156 | |||
1157 | revs = opts.get('rev') |
|
1157 | revs = opts.get('rev') | |
@@ -1219,7 +1219,7 b' def export(ui, repo, *changesets, **opts' | |||||
1219 | diff anyway, probably with undesirable results. |
|
1219 | diff anyway, probably with undesirable results. | |
1220 |
|
1220 | |||
1221 | Use the -g/--git option to generate diffs in the git extended diff |
|
1221 | Use the -g/--git option to generate diffs in the git extended diff | |
1222 |
format. See |
|
1222 | format. See :hg:`help diffs` for more information. | |
1223 |
|
1223 | |||
1224 | With the --switch-parent option, the diff will be against the |
|
1224 | With the --switch-parent option, the diff will be against the | |
1225 | second parent. It can be useful to review a merge. |
|
1225 | second parent. It can be useful to review a merge. | |
@@ -1878,7 +1878,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1878 |
|
1878 | |||
1879 | To read a patch from standard input, use "-" as the patch name. If |
|
1879 | To read a patch from standard input, use "-" as the patch name. If | |
1880 | a URL is specified, the patch will be downloaded from it. |
|
1880 | a URL is specified, the patch will be downloaded from it. | |
1881 |
See |
|
1881 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1882 | """ |
|
1882 | """ | |
1883 | patches = (patch1,) + patches |
|
1883 | patches = (patch1,) + patches | |
1884 |
|
1884 | |||
@@ -2081,7 +2081,7 b' def init(ui, dest=".", **opts):' | |||||
2081 | If no directory is given, the current directory is used. |
|
2081 | If no directory is given, the current directory is used. | |
2082 |
|
2082 | |||
2083 | It is possible to specify an ``ssh://`` URL as the destination. |
|
2083 | It is possible to specify an ``ssh://`` URL as the destination. | |
2084 |
See |
|
2084 | See :hg:`help urls` for more information. | |
2085 | """ |
|
2085 | """ | |
2086 | hg.repository(cmdutil.remoteui(ui, opts), dest, create=1) |
|
2086 | hg.repository(cmdutil.remoteui(ui, opts), dest, create=1) | |
2087 |
|
2087 | |||
@@ -2136,7 +2136,7 b' def log(ui, repo, *pats, **opts):' | |||||
2136 | --follow is set, in which case the working directory parent is |
|
2136 | --follow is set, in which case the working directory parent is | |
2137 | used as the starting revision. |
|
2137 | used as the starting revision. | |
2138 |
|
2138 | |||
2139 |
See |
|
2139 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
2140 |
|
2140 | |||
2141 | By default this command prints revision number and changeset id, |
|
2141 | By default this command prints revision number and changeset id, | |
2142 | tags, non-trivial parents, user, date and time, and a summary for |
|
2142 | tags, non-trivial parents, user, date and time, and a summary for | |
@@ -2387,7 +2387,7 b' def paths(ui, repo, search=None):' | |||||
2387 | unless a location is specified. When cloning a repository, the |
|
2387 | unless a location is specified. When cloning a repository, the | |
2388 | clone source is written as 'default' in .hg/hgrc. |
|
2388 | clone source is written as 'default' in .hg/hgrc. | |
2389 |
|
2389 | |||
2390 |
See |
|
2390 | See :hg:`help urls` for more information. | |
2391 | """ |
|
2391 | """ | |
2392 | if search: |
|
2392 | if search: | |
2393 | for name, path in ui.configitems("paths"): |
|
2393 | for name, path in ui.configitems("paths"): | |
@@ -2429,7 +2429,7 b' def pull(ui, repo, source="default", **o' | |||||
2429 | where X is the last changeset listed by hg incoming. |
|
2429 | where X is the last changeset listed by hg incoming. | |
2430 |
|
2430 | |||
2431 | If SOURCE is omitted, the 'default' path will be used. |
|
2431 | If SOURCE is omitted, the 'default' path will be used. | |
2432 |
See |
|
2432 | See :hg:`help urls` for more information. | |
2433 | """ |
|
2433 | """ | |
2434 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
2434 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
2435 | other = hg.repository(cmdutil.remoteui(repo, opts), source) |
|
2435 | other = hg.repository(cmdutil.remoteui(repo, opts), source) | |
@@ -2465,7 +2465,7 b' def push(ui, repo, dest=None, **opts):' | |||||
2465 | If -r/--rev is used, the named revision and all its ancestors will |
|
2465 | If -r/--rev is used, the named revision and all its ancestors will | |
2466 | be pushed to the remote repository. |
|
2466 | be pushed to the remote repository. | |
2467 |
|
2467 | |||
2468 |
Please see |
|
2468 | Please see :hg:`help urls` for important details about ``ssh://`` | |
2469 | URLs. If DESTINATION is omitted, a default path will be used. |
|
2469 | URLs. If DESTINATION is omitted, a default path will be used. | |
2470 | """ |
|
2470 | """ | |
2471 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2471 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
@@ -2663,8 +2663,8 b' def revert(ui, repo, *pats, **opts):' | |||||
2663 |
|
2663 | |||
2664 | Using the -r/--rev option, revert the given files or directories |
|
2664 | Using the -r/--rev option, revert the given files or directories | |
2665 | to their contents as of a specific revision. This can be helpful |
|
2665 | to their contents as of a specific revision. This can be helpful | |
2666 |
to "roll back" some or all of an earlier change. See |
|
2666 | to "roll back" some or all of an earlier change. See :hg:`help | |
2667 |
dates |
|
2667 | dates` for a list of formats valid for -d/--date. | |
2668 |
|
2668 | |||
2669 | Revert modifies the working directory. It does not commit any |
|
2669 | Revert modifies the working directory. It does not commit any | |
2670 | changes, or change the parent of the working directory. If you |
|
2670 | changes, or change the parent of the working directory. If you | |
@@ -3213,7 +3213,7 b' def tag(ui, repo, name1, *names, **opts)' | |||||
3213 | necessary. The file '.hg/localtags' is used for local tags (not |
|
3213 | necessary. The file '.hg/localtags' is used for local tags (not | |
3214 | shared among repositories). |
|
3214 | shared among repositories). | |
3215 |
|
3215 | |||
3216 |
See |
|
3216 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3217 | """ |
|
3217 | """ | |
3218 |
|
3218 | |||
3219 | rev_ = "." |
|
3219 | rev_ = "." | |
@@ -3355,12 +3355,12 b' def update(ui, repo, node=None, rev=None' | |||||
3355 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
3355 | 3. With the -C/--clean option, uncommitted changes are discarded and | |
3356 | the working directory is updated to the requested changeset. |
|
3356 | the working directory is updated to the requested changeset. | |
3357 |
|
3357 | |||
3358 |
Use null as the changeset to remove the working directory (like |
|
3358 | Use null as the changeset to remove the working directory (like | |
3359 |
clone -U |
|
3359 | :hg:`clone -U`). | |
3360 |
|
3360 | |||
3361 |
If you want to update just one file to an older changeset, use |
|
3361 | If you want to update just one file to an older changeset, use :hg:`revert`. | |
3362 |
|
3362 | |||
3363 |
See |
|
3363 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3364 | """ |
|
3364 | """ | |
3365 | if rev and node: |
|
3365 | if rev and node: | |
3366 | raise util.Abort(_("please specify just one revision")) |
|
3366 | raise util.Abort(_("please specify just one revision")) |
@@ -16,7 +16,7 b' by default because a few widespread tool' | |||||
16 | format. |
|
16 | format. | |
17 |
|
17 | |||
18 | This means that when generating diffs from a Mercurial repository |
|
18 | This means that when generating diffs from a Mercurial repository | |
19 |
(e.g. with |
|
19 | (e.g. with :hg:`export`), you should be careful about things like file | |
20 | copies and renames or other things mentioned above, because when |
|
20 | copies and renames or other things mentioned above, because when | |
21 | applying a standard diff to a different repository, this extra |
|
21 | applying a standard diff to a different repository, this extra | |
22 | information is lost. Mercurial's internal operations (like push and |
|
22 | information is lost. Mercurial's internal operations (like push and |
@@ -7,12 +7,12 b' Valid URLs are of the form::' | |||||
7 | ssh://[user[:pass]@]host[:port]/[path][#revision] |
|
7 | ssh://[user[:pass]@]host[:port]/[path][#revision] | |
8 |
|
8 | |||
9 | Paths in the local filesystem can either point to Mercurial |
|
9 | Paths in the local filesystem can either point to Mercurial | |
10 |
repositories or to bundle files (as created by |
|
10 | repositories or to bundle files (as created by :hg:`bundle` or :hg:` | |
11 |
incoming --bundle |
|
11 | incoming --bundle`). | |
12 |
|
12 | |||
13 | An optional identifier after # indicates a particular branch, tag, or |
|
13 | An optional identifier after # indicates a particular branch, tag, or | |
14 |
changeset to use from the remote repository. See also |
|
14 | changeset to use from the remote repository. See also :hg:`help | |
15 |
revisions |
|
15 | revisions`. | |
16 |
|
16 | |||
17 | Some features, such as pushing to http:// and https:// URLs are only |
|
17 | Some features, such as pushing to http:// and https:// URLs are only | |
18 | possible if the feature is explicitly enabled on the remote Mercurial |
|
18 | possible if the feature is explicitly enabled on the remote Mercurial | |
@@ -47,7 +47,7 b' These URLs can all be stored in your hgr' | |||||
47 | ... |
|
47 | ... | |
48 |
|
48 | |||
49 | You can then use the alias for any command that uses a URL (for |
|
49 | You can then use the alias for any command that uses a URL (for | |
50 |
example |
|
50 | example :hg:`pull alias1` will be treated as :hg:`pull URL1`). | |
51 |
|
51 | |||
52 | Two path aliases are special because they are used as defaults when |
|
52 | Two path aliases are special because they are used as defaults when | |
53 | you do not provide the URL to a command: |
|
53 | you do not provide the URL to a command: |
@@ -391,7 +391,7 b' diff repository (or selected files)' | |||||
391 | with undesirable results. |
|
391 | with undesirable results. | |
392 |
|
392 | |||
393 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
393 | Use the -g/--git option to generate diffs in the git extended diff format. | |
394 |
For more information, read |
|
394 | For more information, read "hg help diffs". | |
395 |
|
395 | |||
396 | options: |
|
396 | options: | |
397 |
|
397 |
@@ -28,7 +28,7 b' hg qrecord [OPTION]... PATCH [FILE]...' | |||||
28 |
|
28 | |||
29 | interactively record a new patch |
|
29 | interactively record a new patch | |
30 |
|
30 | |||
31 |
See |
|
31 | See "hg help qnew" & "hg help record" for more information and usage. | |
32 |
|
32 | |||
33 | options: |
|
33 | options: | |
34 |
|
34 |
@@ -6,7 +6,7 b' interactively select changes to commit' | |||||
6 | If a list of files is omitted, all changes reported by "hg status" will be |
|
6 | If a list of files is omitted, all changes reported by "hg status" will be | |
7 | candidates for recording. |
|
7 | candidates for recording. | |
8 |
|
8 | |||
9 |
See |
|
9 | See "hg help dates" for a list of formats valid for -d/--date. | |
10 |
|
10 | |||
11 | You will be prompted for whether to record changes to each modified file, |
|
11 | You will be prompted for whether to record changes to each modified file, | |
12 | and for files with multiple changes, for each change to use. For each |
|
12 | 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