Show More
@@ -17,7 +17,10 b" def fetch(ui, repo, source='default', **" | |||||
17 |
|
17 | |||
18 | If the pulled changes add a new head, the head is automatically |
|
18 | If the pulled changes add a new head, the head is automatically | |
19 | merged, and the result of the merge is committed. Otherwise, the |
|
19 | merged, and the result of the merge is committed. Otherwise, the | |
20 |
working directory is updated. |
|
20 | working directory is updated. | |
|
21 | ||||
|
22 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
|
23 | ''' | |||
21 |
|
24 | |||
22 | def postincoming(other, modheads): |
|
25 | def postincoming(other, modheads): | |
23 | if modheads == 0: |
|
26 | if modheads == 0: |
@@ -198,6 +198,8 b' def sign(ui, repo, *revs, **opts):' | |||||
198 |
|
198 | |||
199 | If no revision is given, the parent of the working directory is used, |
|
199 | If no revision is given, the parent of the working directory is used, | |
200 | or tip if no revision is checked out. |
|
200 | or tip if no revision is checked out. | |
|
201 | ||||
|
202 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
201 | """ |
|
203 | """ | |
202 |
|
204 | |||
203 | mygpg = newgpg(ui, **opts) |
|
205 | mygpg = newgpg(ui, **opts) |
@@ -341,6 +341,8 b' def record(ui, repo, *pats, **opts):' | |||||
341 | If a list of files is omitted, all changes reported by "hg status" |
|
341 | If a list of files is omitted, all changes reported by "hg status" | |
342 | will be candidates for recording. |
|
342 | will be candidates for recording. | |
343 |
|
343 | |||
|
344 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
|
345 | ||||
344 | You will be prompted for whether to record changes to each |
|
346 | You will be prompted for whether to record changes to each | |
345 | modified file, and for files with multiple changes, for each |
|
347 | modified file, and for files with multiple changes, for each | |
346 | change to use. For each query, the following responses are |
|
348 | change to use. For each query, the following responses are |
@@ -184,7 +184,10 b' def backout(ui, repo, node=None, rev=Non' | |||||
184 | before starting the backout, then merges the new head with that |
|
184 | before starting the backout, then merges the new head with that | |
185 | changeset afterwards. This saves you from doing the merge by |
|
185 | changeset afterwards. This saves you from doing the merge by | |
186 | hand. The result of this merge is not committed, as for a normal |
|
186 | hand. The result of this merge is not committed, as for a normal | |
187 |
merge. |
|
187 | merge. | |
|
188 | ||||
|
189 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
|
190 | ''' | |||
188 | if rev and node: |
|
191 | if rev and node: | |
189 | raise util.Abort(_("please specify just one revision")) |
|
192 | raise util.Abort(_("please specify just one revision")) | |
190 |
|
193 | |||
@@ -533,6 +536,8 b' def commit(ui, repo, *pats, **opts):' | |||||
533 |
|
536 | |||
534 | If no commit message is specified, the configured editor is started to |
|
537 | If no commit message is specified, the configured editor is started to | |
535 | enter a message. |
|
538 | enter a message. | |
|
539 | ||||
|
540 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
536 | """ |
|
541 | """ | |
537 | def commitfunc(ui, repo, files, message, match, opts): |
|
542 | def commitfunc(ui, repo, files, message, match, opts): | |
538 | return repo.commit(files, message, opts['user'], opts['date'], match, |
|
543 | return repo.commit(files, message, opts['user'], opts['date'], match, | |
@@ -1440,6 +1445,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1440 | problems or other deficiencies in the text patch format. |
|
1445 | problems or other deficiencies in the text patch format. | |
1441 |
|
1446 | |||
1442 | To read a patch from standard input, use patch name "-". |
|
1447 | To read a patch from standard input, use patch name "-". | |
|
1448 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
1443 | """ |
|
1449 | """ | |
1444 | patches = (patch1,) + patches |
|
1450 | patches = (patch1,) + patches | |
1445 |
|
1451 | |||
@@ -1662,6 +1668,8 b' def log(ui, repo, *pats, **opts):' | |||||
1662 | --follow is set, in which case the working directory parent is |
|
1668 | --follow is set, in which case the working directory parent is | |
1663 | used as the starting revision. |
|
1669 | used as the starting revision. | |
1664 |
|
1670 | |||
|
1671 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
|
1672 | ||||
1665 | By default this command outputs: changeset id and hash, tags, |
|
1673 | By default this command outputs: changeset id and hash, tags, | |
1666 | non-trivial parents, user, date and time, and a summary for each |
|
1674 | non-trivial parents, user, date and time, and a summary for each | |
1667 | commit. When the -v/--verbose switch is used, the list of changed |
|
1675 | commit. When the -v/--verbose switch is used, the list of changed | |
@@ -2173,7 +2181,8 b' def revert(ui, repo, *pats, **opts):' | |||||
2173 |
|
2181 | |||
2174 | Using the -r option, revert the given files or directories to their |
|
2182 | Using the -r option, revert the given files or directories to their | |
2175 | contents as of a specific revision. This can be helpful to "roll |
|
2183 | contents as of a specific revision. This can be helpful to "roll | |
2176 |
back" some or all of an earlier |
|
2184 | back" some or all of an earlier change. | |
|
2185 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
2177 |
|
2186 | |||
2178 | Revert modifies the working directory. It does not commit any |
|
2187 | Revert modifies the working directory. It does not commit any | |
2179 | changes, or change the parent of the working directory. If you |
|
2188 | changes, or change the parent of the working directory. If you | |
@@ -2185,7 +2194,6 b' def revert(ui, repo, *pats, **opts):' | |||||
2185 | mode of a file was changed, it is reset. |
|
2194 | mode of a file was changed, it is reset. | |
2186 |
|
2195 | |||
2187 | If names are given, all files matching the names are reverted. |
|
2196 | If names are given, all files matching the names are reverted. | |
2188 |
|
||||
2189 | If no arguments are given, no files are reverted. |
|
2197 | If no arguments are given, no files are reverted. | |
2190 |
|
2198 | |||
2191 | Modified files are saved with a .orig suffix before reverting. |
|
2199 | Modified files are saved with a .orig suffix before reverting. | |
@@ -2541,6 +2549,8 b' def tag(ui, repo, name, rev_=None, **opt' | |||||
2541 | similarly to other project files and can be hand-edited if |
|
2549 | similarly to other project files and can be hand-edited if | |
2542 | necessary. The file '.hg/localtags' is used for local tags (not |
|
2550 | necessary. The file '.hg/localtags' is used for local tags (not | |
2543 | shared among repositories). |
|
2551 | shared among repositories). | |
|
2552 | ||||
|
2553 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
2544 | """ |
|
2554 | """ | |
2545 | if name in ['tip', '.', 'null']: |
|
2555 | if name in ['tip', '.', 'null']: | |
2546 | raise util.Abort(_("the name '%s' is reserved") % name) |
|
2556 | raise util.Abort(_("the name '%s' is reserved") % name) | |
@@ -2642,6 +2652,7 b' def update(ui, repo, node=None, rev=None' | |||||
2642 |
|
2652 | |||
2643 | Update the working directory to the specified revision, or the |
|
2653 | Update the working directory to the specified revision, or the | |
2644 | tip of the current branch if none is specified. |
|
2654 | tip of the current branch if none is specified. | |
|
2655 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
2645 |
|
2656 | |||
2646 | If there are no outstanding changes in the working directory and |
|
2657 | If there are no outstanding changes in the working directory and | |
2647 | there is a linear relationship between the current version and the |
|
2658 | there is a linear relationship between the current version and the |
@@ -8,8 +8,11 b'' | |||||
8 | helptable = { |
|
8 | helptable = { | |
9 | "dates|Date Formats": |
|
9 | "dates|Date Formats": | |
10 | r''' |
|
10 | r''' | |
11 |
Some commands |
|
11 | Some commands allow the user to specify a date: | |
12 | Many date formats are acceptible. Here are some examples: |
|
12 | backout, commit, import, tag: Specify the commit date. | |
|
13 | log, revert, update: Select revision(s) by date. | |||
|
14 | ||||
|
15 | Many date formats are valid. Here are some examples: | |||
13 |
|
16 | |||
14 | "Wed Dec 6 13:18:29 2006" (local timezone assumed) |
|
17 | "Wed Dec 6 13:18:29 2006" (local timezone assumed) | |
15 | "Dec 6 13:18 -0600" (year assumed, time offset provided) |
|
18 | "Dec 6 13:18 -0600" (year assumed, time offset provided) | |
@@ -33,6 +36,13 b' helptable = {' | |||||
33 | the number of seconds since the epoch (1970-01-01 00:00 UTC). offset |
|
36 | the number of seconds since the epoch (1970-01-01 00:00 UTC). offset | |
34 | is the offset of the local timezone, in seconds west of UTC (negative |
|
37 | is the offset of the local timezone, in seconds west of UTC (negative | |
35 | if the timezone is east of UTC). |
|
38 | if the timezone is east of UTC). | |
|
39 | ||||
|
40 | The log command also accepts date ranges: | |||
|
41 | ||||
|
42 | "<{date}" - on or before a given date | |||
|
43 | ">{date}" - on or after a given date | |||
|
44 | "{date} to {date}" - a date range, inclusive | |||
|
45 | "-{days}" - within a given number of days of today | |||
36 | ''', |
|
46 | ''', | |
37 |
|
47 | |||
38 | 'environment|env|Environment Variables': |
|
48 | 'environment|env|Environment Variables': |
@@ -6,6 +6,8 b' interactively select changes to commit' | |||||
6 | If a list of files is omitted, all changes reported by "hg status" |
|
6 | If a list of files is omitted, all changes reported by "hg status" | |
7 | will be candidates for recording. |
|
7 | will be candidates for recording. | |
8 |
|
8 | |||
|
9 | See 'hg help dates' for a list of formats valid for -d/--date. | |||
|
10 | ||||
9 | You will be prompted for whether to record changes to each |
|
11 | You will be prompted for whether to record changes to each | |
10 | modified file, and for files with multiple changes, for each |
|
12 | modified file, and for files with multiple changes, for each | |
11 | change to use. For each query, the following responses are |
|
13 | change to use. For each query, the following responses are |
General Comments 0
You need to be logged in to leave comments.
Login now