--- a/help/dates.txt Wed Nov 18 22:23:11 2009 -0500
+++ b/help/dates.txt Thu Nov 19 23:39:30 2009 +0100
@@ -3,34 +3,34 @@
- backout, commit, import, tag: Specify the commit date.
- log, revert, update: Select revision(s) by date.
-Many date formats are valid. Here are some examples::
+Many date formats are valid. Here are some examples:
- "Wed Dec 6 13:18:29 2006" (local timezone assumed)
- "Dec 6 13:18 -0600" (year assumed, time offset provided)
- "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
- "Dec 6" (midnight)
- "13:18" (today assumed)
- "3:39" (3:39AM assumed)
- "3:39pm" (15:39)
- "2006-12-06 13:18:29" (ISO 8601 format)
- "2006-12-6 13:18"
- "2006-12-6"
- "12-6"
- "12/6"
- "12/6/6" (Dec 6 2006)
+- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)
+- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)
+- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)
+- ``Dec 6`` (midnight)
+- ``13:18`` (today assumed)
+- ``3:39`` (3:39AM assumed)
+- ``3:39pm`` (15:39)
+- ``2006-12-06 13:18:29`` (ISO 8601 format)
+- ``2006-12-6 13:18``
+- ``2006-12-6``
+- ``12-6``
+- ``12/6``
+- ``12/6/6`` (Dec 6 2006)
-Lastly, there is Mercurial's internal format::
+Lastly, there is Mercurial's internal format:
- "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
+- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)
This is the internal representation format for dates. unixtime is the
number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
the offset of the local timezone, in seconds west of UTC (negative if
the timezone is east of UTC).
-The log command also accepts date ranges::
+The log command also accepts date ranges:
- "<{datetime}" - at or before a given date/time
- ">{datetime}" - on or after a given date/time
- "{datetime} to {datetime}" - a date range, inclusive
- "-{days}" - within a given number of days of today
+- ``<{datetime}`` - at or before a given date/time
+- ``>{datetime}`` - on or after a given date/time
+- ``{datetime} to {datetime}`` - a date range, inclusive
+- ``-{days}`` - within a given number of days of today
--- a/mercurial/commands.py Wed Nov 18 22:23:11 2009 -0500
+++ b/mercurial/commands.py Thu Nov 19 23:39:30 2009 +0100
@@ -141,14 +141,14 @@
directory; use -r/--rev to specify a different revision.
To specify the type of archive to create, use -t/--type. Valid
- types are::
-
- "files" (default): a directory full of files
- "tar": tar archive, uncompressed
- "tbz2": tar archive, compressed using bzip2
- "tgz": tar archive, compressed using gzip
- "uzip": zip archive, uncompressed
- "zip": zip archive, compressed using deflate
+ types are:
+
+ :``files``: a directory full of files (default)
+ :``tar``: tar archive, uncompressed
+ :``tbz2``: tar archive, compressed using bzip2
+ :``tgz``: tar archive, compressed using gzip
+ :``uzip``: zip archive, uncompressed
+ :``zip``: zip archive, compressed using deflate
The exact name of the destination archive or directory is given
using a format string; see 'hg help export' for details.
@@ -561,11 +561,11 @@
Output may be to a file, in which case the name of the file is
given using a format string. The formatting rules are the same as
- for the export command, with the following additions::
-
- %s basename of file being printed
- %d dirname of file being printed, or '.' if in repository root
- %p root-relative path name of file being printed
+ for the export command, with the following additions:
+
+ :``%s``: basename of file being printed
+ :``%d``: dirname of file being printed, or '.' if in repository root
+ :``%p``: root-relative path name of file being printed
"""
ctx = repo[opts.get('rev')]
err = 1
@@ -601,9 +601,9 @@
will be the null changeset). Otherwise, clone will initially check
out (in order of precedence):
- a) the changeset, tag or branch specified with -u/--updaterev
- b) the changeset, tag or branch given with the first -r/--rev
- c) the head of the default branch
+ a) the changeset, tag or branch specified with -u/--updaterev
+ b) the changeset, tag or branch given with the first -r/--rev
+ c) the head of the default branch
Use 'hg clone -u . src dst' to checkout the source repository's
parent changeset (applicable for local source repositories only).
@@ -1140,16 +1140,16 @@
first parent only.
Output may be to a file, in which case the name of the file is
- given using a format string. The formatting rules are as follows::
-
- %% literal "%" character
- %H changeset hash (40 bytes of hexadecimal)
- %N number of patches being generated
- %R changeset revision number
- %b basename of the exporting repository
- %h short-form changeset hash (12 bytes of hexadecimal)
- %n zero-padded sequence number, starting at 1
- %r zero-padded changeset revision number
+ given using a format string. The formatting rules are as follows:
+
+ :``%%``: literal "%" character
+ :``%H``: changeset hash (40 bytes of hexadecimal)
+ :``%N``: number of patches being generated
+ :``%R``: changeset revision number
+ :``%b``: basename of the exporting repository
+ :``%h``: short-form changeset hash (12 bytes of hexadecimal)
+ :``%n``: zero-padded sequence number, starting at 1
+ :``%r``: zero-padded changeset revision number
Without the -a/--text option, export will avoid generating diffs
of files it detects as binary. With -a, export will generate a
@@ -2740,13 +2740,13 @@
Transactions are used to encapsulate the effects of all commands
that create new changesets or propagate existing changesets into a
repository. For example, the following commands are transactional,
- and their effects can be rolled back::
-
- commit
- import
- pull
- push (with this repository as destination)
- unbundle
+ and their effects can be rolled back:
+
+ - commit
+ - import
+ - pull
+ - push (with this repository as destination)
+ - unbundle
This command is not intended for use on public repositories. Once
changes are visible for pull by other users, rolling a transaction
@@ -3386,7 +3386,7 @@
('u', 'updaterev', '',
_('revision, tag or branch to check out')),
('r', 'rev', [],
- _('a changeset you would like to have after cloning')),
+ _('clone only the specified revisions and ancestors')),
('', 'pull', None, _('use pull protocol to copy metadata')),
('', 'uncompressed', None,
_('use uncompressed transfer (fast over LAN)')),
--- a/tests/test-dispatch.out Wed Nov 18 22:23:11 2009 -0500
+++ b/tests/test-dispatch.out Thu Nov 19 23:39:30 2009 +0100
@@ -13,9 +13,9 @@
a format string. The formatting rules are the same as for the export
command, with the following additions:
- %s basename of file being printed
- %d dirname of file being printed, or '.' if in repository root
- %p root-relative path name of file being printed
+ "%s" basename of file being printed
+ "%d" dirname of file being printed, or '.' if in repository root
+ "%p" root-relative path name of file being printed
options: