Show More
@@ -41,9 +41,9 b' helptable = (' | |||||
41 |
|
41 | |||
42 | The log command also accepts date ranges: |
|
42 | The log command also accepts date ranges: | |
43 |
|
43 | |||
44 |
"<{date}" - |
|
44 | "<{datetime}" - at or before a given date/time | |
45 | ">{date}" - on or after a given date |
|
45 | ">{datetime}" - on or after a given date/time | |
46 | "{date} to {date}" - a date range, inclusive |
|
46 | "{datetime} to {datetime}" - a date range, inclusive | |
47 | "-{days}" - within a given number of days of today |
|
47 | "-{days}" - within a given number of days of today | |
48 | ''')), |
|
48 | ''')), | |
49 |
|
49 | |||
@@ -57,16 +57,16 b' helptable = (' | |||||
57 |
|
57 | |||
58 | Alternate pattern notations must be specified explicitly. |
|
58 | Alternate pattern notations must be specified explicitly. | |
59 |
|
59 | |||
60 |
To use a plain path name without any pattern matching, start |
|
60 | To use a plain path name without any pattern matching, start it | |
61 |
|
|
61 | with "path:". These path names must completely match starting at | |
62 |
the |
|
62 | the current repository root. | |
63 |
|
63 | |||
64 | To use an extended glob, start a name with "glob:". Globs are |
|
64 | To use an extended glob, start a name with "glob:". Globs are | |
65 |
rooted at the current directory; a glob such as "*.c" will |
|
65 | rooted at the current directory; a glob such as "*.c" will only | |
66 |
files ending |
|
66 | match files in the current directory ending with ".c". | |
67 |
|
67 | |||
68 | The supported glob syntax extensions are "**" to match any string |
|
68 | The supported glob syntax extensions are "**" to match any string | |
69 |
across path separators |
|
69 | across path separators and "{a,b}" to mean "a or b". | |
70 |
|
70 | |||
71 | To use a Perl/Python regular expression, start a name with "re:". |
|
71 | To use a Perl/Python regular expression, start a name with "re:". | |
72 | Regexp pattern matching is anchored at the root of the repository. |
|
72 | Regexp pattern matching is anchored at the root of the repository. | |
@@ -81,11 +81,11 b' helptable = (' | |||||
81 |
|
81 | |||
82 | glob:*.c any name ending in ".c" in the current directory |
|
82 | glob:*.c any name ending in ".c" in the current directory | |
83 | *.c any name ending in ".c" in the current directory |
|
83 | *.c any name ending in ".c" in the current directory | |
84 |
**.c any name ending in ".c" in |
|
84 | **.c any name ending in ".c" in any subdirectory of the | |
85 |
|
|
85 | current directory including itself. | |
86 | foo/*.c any name ending in ".c" in the directory foo |
|
86 | foo/*.c any name ending in ".c" in the directory foo | |
87 |
foo/**.c any name ending in ".c" in |
|
87 | foo/**.c any name ending in ".c" in any subdirectory of foo | |
88 |
|
|
88 | including itself. | |
89 |
|
89 | |||
90 | Regexp examples: |
|
90 | Regexp examples: | |
91 |
|
91 | |||
@@ -97,11 +97,13 b' helptable = (' | |||||
97 | _(r''' |
|
97 | _(r''' | |
98 | HG:: |
|
98 | HG:: | |
99 | Path to the 'hg' executable, automatically passed when running hooks, |
|
99 | Path to the 'hg' executable, automatically passed when running hooks, | |
100 |
extensions or external tools. If unset or empty, |
|
100 | extensions or external tools. If unset or empty, this is the hg | |
101 | 'hg' (with com/exe/bat/cmd extension on Windows) is searched. |
|
101 | exutable's name if it's frozen, or an executable named 'hg' | |
|
102 | (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on | |||
|
103 | Windows) is searched. | |||
102 |
|
104 | |||
103 | HGEDITOR:: |
|
105 | HGEDITOR:: | |
104 |
This is the name of the editor to |
|
106 | This is the name of the editor to run when committing. See EDITOR. | |
105 |
|
107 | |||
106 | (deprecated, use .hgrc) |
|
108 | (deprecated, use .hgrc) | |
107 |
|
109 | |||
@@ -113,8 +115,8 b' HGENCODING::' | |||||
113 |
|
115 | |||
114 | HGENCODINGMODE:: |
|
116 | HGENCODINGMODE:: | |
115 | This sets Mercurial's behavior for handling unknown characters |
|
117 | This sets Mercurial's behavior for handling unknown characters | |
116 |
while transcoding user input |
|
118 | while transcoding user input. The default is "strict", which | |
117 |
causes Mercurial to abort if it can't |
|
119 | causes Mercurial to abort if it can't map a character. Other | |
118 | settings include "replace", which replaces unknown characters, and |
|
120 | settings include "replace", which replaces unknown characters, and | |
119 | "ignore", which drops them. This setting can be overridden with |
|
121 | "ignore", which drops them. This setting can be overridden with | |
120 | the --encodingmode command-line option. |
|
122 | the --encodingmode command-line option. | |
@@ -129,15 +131,15 b' HGMERGE::' | |||||
129 | HGRCPATH:: |
|
131 | HGRCPATH:: | |
130 | A list of files or directories to search for hgrc files. Item |
|
132 | A list of files or directories to search for hgrc files. Item | |
131 | separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, |
|
133 | separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, | |
132 |
platform default search path is used. If empty, only .hg/hgrc |
|
134 | platform default search path is used. If empty, only the .hg/hgrc | |
133 | current repository is read. |
|
135 | from the current repository is read. | |
134 |
|
136 | |||
135 | For each element in path, if a directory, all entries in directory |
|
137 | For each element in path, if a directory, all entries in directory | |
136 | ending with ".rc" are added to path. Else, element itself is |
|
138 | ending with ".rc" are added to path. Else, element itself is | |
137 | added to path. |
|
139 | added to path. | |
138 |
|
140 | |||
139 | HGUSER:: |
|
141 | HGUSER:: | |
140 |
This is the string used |
|
142 | This is the string used as the author of a commit. | |
141 |
|
143 | |||
142 | (deprecated, use .hgrc) |
|
144 | (deprecated, use .hgrc) | |
143 |
|
145 | |||
@@ -146,7 +148,7 b' EMAIL::' | |||||
146 |
|
148 | |||
147 | LOGNAME:: |
|
149 | LOGNAME:: | |
148 | If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
|
150 | If neither HGUSER nor EMAIL is set, LOGNAME will be used (with | |
149 |
'@hostname' appended) as the author value |
|
151 | '@hostname' appended) as the author value of a commit. | |
150 |
|
152 | |||
151 | VISUAL:: |
|
153 | VISUAL:: | |
152 | This is the name of the editor to use when committing. See EDITOR. |
|
154 | This is the name of the editor to use when committing. See EDITOR. | |
@@ -161,17 +163,19 b' EDITOR::' | |||||
161 |
|
163 | |||
162 | PYTHONPATH:: |
|
164 | PYTHONPATH:: | |
163 | This is used by Python to find imported modules and may need to be set |
|
165 | This is used by Python to find imported modules and may need to be set | |
164 | appropriately if Mercurial is not installed system-wide. |
|
166 | appropriately if this Mercurial is not installed system-wide. | |
165 | ''')), |
|
167 | ''')), | |
166 |
|
168 | |||
167 | (['revs', 'revisions'], _('Specifying Single Revisions'), |
|
169 | (['revs', 'revisions'], _('Specifying Single Revisions'), | |
168 | _(r''' |
|
170 | _(r''' | |
169 |
Mercurial |
|
171 | Mercurial supports several ways to specify individual | |
170 | revisions. |
|
172 | revisions. | |
171 |
|
173 | |||
172 | A plain integer is treated as a revision number. Negative |
|
174 | A plain integer is treated as a revision number. Negative | |
173 |
integers are treated as offsets from the tip, with |
|
175 | integers are treated as toplogical offsets from the tip, with | |
174 | tip. |
|
176 | -1 denoting the tip. As such, negative numbers are only useful | |
|
177 | if you've memorized your local tree numbers and want to save | |||
|
178 | typing a single digit. This editor suggests copy and paste. | |||
175 |
|
179 | |||
176 | A 40-digit hexadecimal string is treated as a unique revision |
|
180 | A 40-digit hexadecimal string is treated as a unique revision | |
177 | identifier. |
|
181 | identifier. | |
@@ -179,7 +183,7 b' PYTHONPATH::' | |||||
179 | A hexadecimal string less than 40 characters long is treated as a |
|
183 | A hexadecimal string less than 40 characters long is treated as a | |
180 | unique revision identifier, and referred to as a short-form |
|
184 | unique revision identifier, and referred to as a short-form | |
181 | identifier. A short-form identifier is only valid if it is the |
|
185 | identifier. A short-form identifier is only valid if it is the | |
182 | prefix of one full-length identifier. |
|
186 | prefix of exactly one full-length identifier. | |
183 |
|
187 | |||
184 | Any other string is treated as a tag name, which is a symbolic |
|
188 | Any other string is treated as a tag name, which is a symbolic | |
185 | name associated with a revision identifier. Tag names may not |
|
189 | name associated with a revision identifier. Tag names may not | |
@@ -200,8 +204,8 b' PYTHONPATH::' | |||||
200 | (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), |
|
204 | (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), | |
201 | _(r''' |
|
205 | _(r''' | |
202 | When Mercurial accepts more than one revision, they may be |
|
206 | When Mercurial accepts more than one revision, they may be | |
203 |
specified individually, or provided as a continuous |
|
207 | specified individually, or provided as a topologically continuous | |
204 | separated by the ":" character. |
|
208 | range, separated by the ":" character. | |
205 |
|
209 | |||
206 | The syntax of range notation is [BEGIN]:[END], where BEGIN and END |
|
210 | The syntax of range notation is [BEGIN]:[END], where BEGIN and END | |
207 | are revision identifiers. Both BEGIN and END are optional. If |
|
211 | are revision identifiers. Both BEGIN and END are optional. If | |
@@ -213,7 +217,7 b' PYTHONPATH::' | |||||
213 | order. |
|
217 | order. | |
214 |
|
218 | |||
215 | A range acts as a closed interval. This means that a range of 3:5 |
|
219 | A range acts as a closed interval. This means that a range of 3:5 | |
216 |
gives 3, 4 and 5. Similarly, a range of |
|
220 | gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6. | |
217 | ''')), |
|
221 | ''')), | |
218 |
|
222 | |||
219 | (['diffs'], _('Diff Formats'), |
|
223 | (['diffs'], _('Diff Formats'), | |
@@ -225,14 +229,14 b' PYTHONPATH::' | |||||
225 | While this standard format is often enough, it does not encode the |
|
229 | While this standard format is often enough, it does not encode the | |
226 | following information: |
|
230 | following information: | |
227 |
|
231 | |||
228 | - executable status |
|
232 | - executable status and other permission bits | |
229 | - copy or rename information |
|
233 | - copy or rename information | |
230 | - changes in binary files |
|
234 | - changes in binary files | |
231 | - creation or deletion of empty files |
|
235 | - creation or deletion of empty files | |
232 |
|
236 | |||
233 | Mercurial also supports the extended diff format from the git VCS |
|
237 | Mercurial also supports the extended diff format from the git VCS | |
234 | which addresses these limitations. The git diff format is not |
|
238 | which addresses these limitations. The git diff format is not | |
235 |
produced by default because |
|
239 | produced by default because a few widespread tools still do not | |
236 | understand this format. |
|
240 | understand this format. | |
237 |
|
241 | |||
238 | This means that when generating diffs from a Mercurial repository |
|
242 | This means that when generating diffs from a Mercurial repository | |
@@ -255,7 +259,7 b' PYTHONPATH::' | |||||
255 | via the --template option, or select an existing template-style (--style). |
|
259 | via the --template option, or select an existing template-style (--style). | |
256 |
|
260 | |||
257 | You can customize output for any "log-like" command: log, outgoing, |
|
261 | You can customize output for any "log-like" command: log, outgoing, | |
258 |
incoming, tip, parents, heads and glog |
|
262 | incoming, tip, parents, heads and glog. | |
259 |
|
263 | |||
260 | Three styles are packaged with Mercurial: default (the style used |
|
264 | Three styles are packaged with Mercurial: default (the style used | |
261 | when no explicit preference is passed), compact and changelog. Usage: |
|
265 | when no explicit preference is passed), compact and changelog. Usage: | |
@@ -290,7 +294,7 b' PYTHONPATH::' | |||||
290 | The "date" keyword does not produce human-readable output. If you |
|
294 | The "date" keyword does not produce human-readable output. If you | |
291 | want to use a date in your output, you can use a filter to process it. |
|
295 | want to use a date in your output, you can use a filter to process it. | |
292 | Filters are functions which return a string based on the input variable. |
|
296 | Filters are functions which return a string based on the input variable. | |
293 |
You can also use a chain of filters to get the |
|
297 | You can also use a chain of filters to get the desired output: | |
294 |
|
298 | |||
295 | $ hg tip --template "{date|isodate}\n" |
|
299 | $ hg tip --template "{date|isodate}\n" | |
296 | 2008-08-21 18:22 +0000 |
|
300 | 2008-08-21 18:22 +0000 | |
@@ -346,7 +350,7 b' PYTHONPATH::' | |||||
346 | 'hg incoming --bundle'). |
|
350 | 'hg incoming --bundle'). | |
347 |
|
351 | |||
348 | An optional identifier after # indicates a particular branch, tag, |
|
352 | An optional identifier after # indicates a particular branch, tag, | |
349 |
or changeset to |
|
353 | or changeset to use from the remote repository. | |
350 |
|
354 | |||
351 | Some features, such as pushing to http:// and https:// URLs are |
|
355 | Some features, such as pushing to http:// and https:// URLs are | |
352 | only possible if the feature is explicitly enabled on the |
|
356 | only possible if the feature is explicitly enabled on the | |
@@ -377,13 +381,14 b' PYTHONPATH::' | |||||
377 | You can then use the alias for any command that uses a url (for example |
|
381 | You can then use the alias for any command that uses a url (for example | |
378 | 'hg pull alias1' would pull from the 'alias1' path). |
|
382 | 'hg pull alias1' would pull from the 'alias1' path). | |
379 |
|
383 | |||
380 |
Two path aliases are |
|
384 | Two path aliases are special because they are used as defaults | |
381 | when you do not provide the url to a command: |
|
385 | when you do not provide the url to a command: | |
382 |
|
386 | |||
383 | default: |
|
387 | default: | |
384 | When you create a repository with hg clone, the clone command saves |
|
388 | When you create a repository with hg clone, the clone command saves | |
385 |
the location of the source repository as the ' |
|
389 | the location of the source repository as the new repository's | |
386 |
then used when you omit |
|
390 | 'default' path. This is then used when you omit path from push- | |
|
391 | and pull-like commands (including in and out). | |||
387 |
|
392 | |||
388 | default-push: |
|
393 | default-push: | |
389 | The push command will look for a path named 'default-push', and |
|
394 | The push command will look for a path named 'default-push', and |
General Comments 0
You need to be logged in to leave comments.
Login now