equal
deleted
inserted
replaced
3 # Copyright 2006 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2006 Matt Mackall <mpm@selenic.com> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
|
8 from i18n import _ |
|
9 |
8 helptable = ( |
10 helptable = ( |
9 (["dates"], "Date Formats", |
11 (["dates"], _("Date Formats"), |
10 r''' |
12 _(r''' |
11 Some commands allow the user to specify a date: |
13 Some commands allow the user to specify a date: |
12 backout, commit, import, tag: Specify the commit date. |
14 backout, commit, import, tag: Specify the commit date. |
13 log, revert, update: Select revision(s) by date. |
15 log, revert, update: Select revision(s) by date. |
14 |
16 |
15 Many date formats are valid. Here are some examples: |
17 Many date formats are valid. Here are some examples: |
41 |
43 |
42 "<{date}" - on or before a given date |
44 "<{date}" - on or before a given date |
43 ">{date}" - on or after a given date |
45 ">{date}" - on or after a given date |
44 "{date} to {date}" - a date range, inclusive |
46 "{date} to {date}" - a date range, inclusive |
45 "-{days}" - within a given number of days of today |
47 "-{days}" - within a given number of days of today |
46 '''), |
48 ''')), |
47 |
49 |
48 (["patterns"], "File Name Patterns", |
50 (["patterns"], _("File Name Patterns"), |
49 r''' |
51 _(r''' |
50 Mercurial accepts several notations for identifying one or more |
52 Mercurial accepts several notations for identifying one or more |
51 files at a time. |
53 files at a time. |
52 |
54 |
53 By default, Mercurial treats filenames as shell-style extended |
55 By default, Mercurial treats filenames as shell-style extended |
54 glob patterns. |
56 glob patterns. |
87 |
89 |
88 Regexp examples: |
90 Regexp examples: |
89 |
91 |
90 re:.*\.c$ any name ending in ".c", anywhere in the repository |
92 re:.*\.c$ any name ending in ".c", anywhere in the repository |
91 |
93 |
92 '''), |
94 ''')), |
93 |
95 |
94 (['environment', 'env'], 'Environment Variables', |
96 (['environment', 'env'], _('Environment Variables'), |
95 r''' |
97 _(r''' |
96 HG:: |
98 HG:: |
97 Path to the 'hg' executable, automatically passed when running hooks, |
99 Path to the 'hg' executable, automatically passed when running hooks, |
98 extensions or external tools. If unset or empty, an executable named |
100 extensions or external tools. If unset or empty, an executable named |
99 'hg' (with com/exe/bat/cmd extension on Windows) is searched. |
101 'hg' (with com/exe/bat/cmd extension on Windows) is searched. |
100 |
102 |
158 defaults to 'vi'. |
160 defaults to 'vi'. |
159 |
161 |
160 PYTHONPATH:: |
162 PYTHONPATH:: |
161 This is used by Python to find imported modules and may need to be set |
163 This is used by Python to find imported modules and may need to be set |
162 appropriately if Mercurial is not installed system-wide. |
164 appropriately if Mercurial is not installed system-wide. |
163 '''), |
165 ''')), |
164 |
166 |
165 (['revs', 'revisions'], 'Specifying Single Revisions', |
167 (['revs', 'revisions'], _('Specifying Single Revisions'), |
166 r''' |
168 _(r''' |
167 Mercurial accepts several notations for identifying individual |
169 Mercurial accepts several notations for identifying individual |
168 revisions. |
170 revisions. |
169 |
171 |
170 A plain integer is treated as a revision number. Negative |
172 A plain integer is treated as a revision number. Negative |
171 integers are treated as offsets from the tip, with -1 denoting the |
173 integers are treated as offsets from the tip, with -1 denoting the |
191 |
193 |
192 The reserved name "." indicates the working directory parent. If |
194 The reserved name "." indicates the working directory parent. If |
193 no working directory is checked out, it is equivalent to null. |
195 no working directory is checked out, it is equivalent to null. |
194 If an uncommitted merge is in progress, "." is the revision of |
196 If an uncommitted merge is in progress, "." is the revision of |
195 the first parent. |
197 the first parent. |
196 '''), |
198 ''')), |
197 |
199 |
198 (['mrevs', 'multirevs'], 'Specifying Multiple Revisions', |
200 (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), |
199 r''' |
201 _(r''' |
200 When Mercurial accepts more than one revision, they may be |
202 When Mercurial accepts more than one revision, they may be |
201 specified individually, or provided as a continuous range, |
203 specified individually, or provided as a continuous range, |
202 separated by the ":" character. |
204 separated by the ":" character. |
203 |
205 |
204 The syntax of range notation is [BEGIN]:[END], where BEGIN and END |
206 The syntax of range notation is [BEGIN]:[END], where BEGIN and END |
210 If BEGIN is greater than END, revisions are treated in reverse |
212 If BEGIN is greater than END, revisions are treated in reverse |
211 order. |
213 order. |
212 |
214 |
213 A range acts as a closed interval. This means that a range of 3:5 |
215 A range acts as a closed interval. This means that a range of 3:5 |
214 gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. |
216 gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. |
215 '''), |
217 ''')), |
216 ) |
218 ) |