annotate mercurial/help/dates.txt @ 17202:1ae119269ddc

hgweb: side-by-side comparison functionality Adds new web command to the core, ``comparison``, which enables colorful side-by-side change display, which for some might be much easier to work with than the standard line diff output. The idea how to implement comes from the SonicHq extension. The web interface gets a new link to call the comparison functionality. It lets users configure the amount of context lines around change blocks, or to show full files - check help (also in this changeset) for details and defaults. The setting in hgrc can be overridden by adding ``context=<value>`` to the request query string. The comparison creates addressable lines, so as to enable sharing links to specific lines, just as standard diff does. Incorporates updates to all web related styles. Known limitations: * the column diff is done against the first parent, just as the standard diff * this change allows examining diffs for single files only (as I am not sure if examining the whole changeset in this way would be helpful) * syntax highlighting of the output changes is not performed (enabling the highlight extension has no influence on it)
author wujek srujek
date Sun, 08 Jul 2012 17:17:02 +0200
parents 06803dc5fc19
children ae60735e37d2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9540
cad36e496640 help: un-indent help topics
Martin Geisler <mg@lazybytes.net>
parents: 9539
diff changeset
1 Some commands allow the user to specify a date, e.g.:
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
2
9540
cad36e496640 help: un-indent help topics
Martin Geisler <mg@lazybytes.net>
parents: 9539
diff changeset
3 - backout, commit, import, tag: Specify the commit date.
cad36e496640 help: un-indent help topics
Martin Geisler <mg@lazybytes.net>
parents: 9539
diff changeset
4 - log, revert, update: Select revision(s) by date.
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
5
9893
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
6 Many date formats are valid. Here are some examples:
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
7
9893
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
8 - ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
9 - ``Dec 6 13:18 -0600`` (year assumed, time offset provided)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
10 - ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
11 - ``Dec 6`` (midnight)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
12 - ``13:18`` (today assumed)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
13 - ``3:39`` (3:39AM assumed)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
14 - ``3:39pm`` (15:39)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
15 - ``2006-12-06 13:18:29`` (ISO 8601 format)
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
16 - ``2006-12-6 13:18``
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
17 - ``2006-12-6``
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
18 - ``12-6``
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
19 - ``12/6``
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
20 - ``12/6/6`` (Dec 6 2006)
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
21
9893
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
22 Lastly, there is Mercurial's internal format:
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
23
9893
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
24 - ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
25
13882
0a0988bd4818 help/dates: rephrase explanation of internal format
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
26 This is the internal representation format for dates. The first number
0a0988bd4818 help/dates: rephrase explanation of internal format
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
27 is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
0a0988bd4818 help/dates: rephrase explanation of internal format
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
28 second is the offset of the local timezone, in seconds west of UTC
0a0988bd4818 help/dates: rephrase explanation of internal format
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
29 (negative if the timezone is east of UTC).
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
30
9893
af873901b575 commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net>
parents: 9540
diff changeset
31 The log command also accepts date ranges:
9539
c904e76e3834 help: move help topics from mercurial/help.py to help/*.txt
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
32
13886
fe48c57390f2 help/dates: use DATE as place-holder in help and abort texts
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
33 - ``<DATE`` - at or before a given date/time
fe48c57390f2 help/dates: use DATE as place-holder in help and abort texts
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
34 - ``>DATE`` - on or after a given date/time
fe48c57390f2 help/dates: use DATE as place-holder in help and abort texts
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
35 - ``DATE to DATE`` - a date range, inclusive
fe48c57390f2 help/dates: use DATE as place-holder in help and abort texts
Martin Geisler <mg@aragost.com>
parents: 9999
diff changeset
36 - ``-DAYS`` - within a given number of days of today