##// END OF EJS Templates
tests: use `hg help dates` instead of `hg help revs` in test...
Martin von Zweigbergk -
r30768:43839a24 default
parent child Browse files
Show More
@@ -1154,37 +1154,49 b' Test commands that collide with topics ('
1154 1154
1155 1155 Test a help topic
1156 1156
1157 $ hg help revs
1158 Specifying Single Revisions
1159 """""""""""""""""""""""""""
1160
1161 Mercurial supports several ways to specify individual revisions.
1162
1163 A plain integer is treated as a revision number. Negative integers are
1164 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1165 denoting the revision prior to the tip, and so forth.
1166
1167 A 40-digit hexadecimal string is treated as a unique revision identifier.
1168 A hexadecimal string less than 40 characters long is treated as a unique
1169 revision identifier and is referred to as a short-form identifier. A
1170 short-form identifier is only valid if it is the prefix of exactly one
1171 full-length identifier.
1172
1173 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1174 is a movable pointer to a revision. A tag is a permanent name associated
1175 with a revision. A branch name denotes the tipmost open branch head of
1176 that branch - or if they are all closed, the tipmost closed head of the
1177 branch. Bookmark, tag, and branch names must not contain the ":"
1178 character.
1179
1180 The reserved name "tip" always identifies the most recent revision.
1181
1182 The reserved name "null" indicates the null revision. This is the revision
1183 of an empty repository, and the parent of revision 0.
1184
1185 The reserved name "." indicates the working directory parent. If no
1186 working directory is checked out, it is equivalent to null. If an
1187 uncommitted merge is in progress, "." is the revision of the first parent.
1157 $ hg help dates
1158 Date Formats
1159 """"""""""""
1160
1161 Some commands allow the user to specify a date, e.g.:
1162
1163 - backout, commit, import, tag: Specify the commit date.
1164 - log, revert, update: Select revision(s) by date.
1165
1166 Many date formats are valid. Here are some examples:
1167
1168 - "Wed Dec 6 13:18:29 2006" (local timezone assumed)
1169 - "Dec 6 13:18 -0600" (year assumed, time offset provided)
1170 - "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
1171 - "Dec 6" (midnight)
1172 - "13:18" (today assumed)
1173 - "3:39" (3:39AM assumed)
1174 - "3:39pm" (15:39)
1175 - "2006-12-06 13:18:29" (ISO 8601 format)
1176 - "2006-12-6 13:18"
1177 - "2006-12-6"
1178 - "12-6"
1179 - "12/6"
1180 - "12/6/6" (Dec 6 2006)
1181 - "today" (midnight)
1182 - "yesterday" (midnight)
1183 - "now" - right now
1184
1185 Lastly, there is Mercurial's internal format:
1186
1187 - "1165411109 0" (Wed Dec 6 13:18:29 2006 UTC)
1188
1189 This is the internal representation format for dates. The first number is
1190 the number of seconds since the epoch (1970-01-01 00:00 UTC). The second
1191 is the offset of the local timezone, in seconds west of UTC (negative if
1192 the timezone is east of UTC).
1193
1194 The log command also accepts date ranges:
1195
1196 - "<DATE" - at or before a given date/time
1197 - ">DATE" - on or after a given date/time
1198 - "DATE to DATE" - a date range, inclusive
1199 - "-DAYS" - within a given number of days of today
1188 1200
1189 1201 Test repeated config section name
1190 1202
@@ -2726,7 +2738,7 b' Dish up an empty repo; serve it cold.'
2726 2738 </html>
2727 2739
2728 2740
2729 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2741 $ get-with-headers.py 127.0.0.1:$HGPORT "help/dates"
2730 2742 200 Script output follows
2731 2743
2732 2744 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -2737,7 +2749,7 b' Dish up an empty repo; serve it cold.'
2737 2749 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2738 2750 <script type="text/javascript" src="/static/mercurial.js"></script>
2739 2751
2740 <title>Help: revisions</title>
2752 <title>Help: dates</title>
2741 2753 </head>
2742 2754 <body>
2743 2755
@@ -2761,7 +2773,7 b' Dish up an empty repo; serve it cold.'
2761 2773
2762 2774 <div class="main">
2763 2775 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2764 <h3>Help: revisions</h3>
2776 <h3>Help: dates</h3>
2765 2777
2766 2778 <form class="search" action="/log">
2767 2779
@@ -2770,42 +2782,56 b' Dish up an empty repo; serve it cold.'
2770 2782 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2771 2783 </form>
2772 2784 <div id="doc">
2773 <h1>Specifying Single Revisions</h1>
2785 <h1>Date Formats</h1>
2774 2786 <p>
2775 Mercurial supports several ways to specify individual revisions.
2787 Some commands allow the user to specify a date, e.g.:
2776 2788 </p>
2789 <ul>
2790 <li> backout, commit, import, tag: Specify the commit date.
2791 <li> log, revert, update: Select revision(s) by date.
2792 </ul>
2777 2793 <p>
2778 A plain integer is treated as a revision number. Negative integers are
2779 treated as sequential offsets from the tip, with -1 denoting the tip,
2780 -2 denoting the revision prior to the tip, and so forth.
2794 Many date formats are valid. Here are some examples:
2781 2795 </p>
2796 <ul>
2797 <li> &quot;Wed Dec 6 13:18:29 2006&quot; (local timezone assumed)
2798 <li> &quot;Dec 6 13:18 -0600&quot; (year assumed, time offset provided)
2799 <li> &quot;Dec 6 13:18 UTC&quot; (UTC and GMT are aliases for +0000)
2800 <li> &quot;Dec 6&quot; (midnight)
2801 <li> &quot;13:18&quot; (today assumed)
2802 <li> &quot;3:39&quot; (3:39AM assumed)
2803 <li> &quot;3:39pm&quot; (15:39)
2804 <li> &quot;2006-12-06 13:18:29&quot; (ISO 8601 format)
2805 <li> &quot;2006-12-6 13:18&quot;
2806 <li> &quot;2006-12-6&quot;
2807 <li> &quot;12-6&quot;
2808 <li> &quot;12/6&quot;
2809 <li> &quot;12/6/6&quot; (Dec 6 2006)
2810 <li> &quot;today&quot; (midnight)
2811 <li> &quot;yesterday&quot; (midnight)
2812 <li> &quot;now&quot; - right now
2813 </ul>
2782 2814 <p>
2783 A 40-digit hexadecimal string is treated as a unique revision identifier.
2784 A hexadecimal string less than 40 characters long is treated as a
2785 unique revision identifier and is referred to as a short-form
2786 identifier. A short-form identifier is only valid if it is the prefix
2787 of exactly one full-length identifier.
2815 Lastly, there is Mercurial's internal format:
2816 </p>
2817 <ul>
2818 <li> &quot;1165411109 0&quot; (Wed Dec 6 13:18:29 2006 UTC)
2819 </ul>
2820 <p>
2821 This is the internal representation format for dates. The first number
2822 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
2823 second is the offset of the local timezone, in seconds west of UTC
2824 (negative if the timezone is east of UTC).
2788 2825 </p>
2789 2826 <p>
2790 Any other string is treated as a bookmark, tag, or branch name. A
2791 bookmark is a movable pointer to a revision. A tag is a permanent name
2792 associated with a revision. A branch name denotes the tipmost open branch head
2793 of that branch - or if they are all closed, the tipmost closed head of the
2794 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2795 </p>
2796 <p>
2797 The reserved name &quot;tip&quot; always identifies the most recent revision.
2827 The log command also accepts date ranges:
2798 2828 </p>
2799 <p>
2800 The reserved name &quot;null&quot; indicates the null revision. This is the
2801 revision of an empty repository, and the parent of revision 0.
2802 </p>
2803 <p>
2804 The reserved name &quot;.&quot; indicates the working directory parent. If no
2805 working directory is checked out, it is equivalent to null. If an
2806 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2807 parent.
2808 </p>
2829 <ul>
2830 <li> &quot;&lt;DATE&quot; - at or before a given date/time
2831 <li> &quot;&gt;DATE&quot; - on or after a given date/time
2832 <li> &quot;DATE to DATE&quot; - a date range, inclusive
2833 <li> &quot;-DAYS&quot; - within a given number of days of today
2834 </ul>
2809 2835
2810 2836 </div>
2811 2837 </div>
General Comments 0
You need to be logged in to leave comments. Login now