##// END OF EJS Templates
merge: flush any deferred writes before, and after, running any workers...
merge: flush any deferred writes before, and after, running any workers Since we fork to create workers, any changes they queue up will be lost after the worker terminates, so the easiest solution is to have each worker flush the writes they accumulate--we are close to the end of the merge in any case. To prevent duplicated writes, we also have the master processs flush before forking. In an in-memory merge (M2), we'll instead disable the use of workers. Differential Revision: https://phab.mercurial-scm.org/D628

File last commit:

r19968:7bec3f69 stable
r34126:b90e5b2a default
Show More
dates.txt
39 lines | 1.2 KiB | text/plain | TextLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 Some commands allow the user to specify a date, e.g.:
- 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:
- ``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)
Paul Cavallaro
dates: support 'today' and 'yesterday' in parsedate (issue3764)...
r18537 - ``today`` (midnight)
- ``yesterday`` (midnight)
Augie Fackler
parsedate: understand "now" as a shortcut for the current time
r18614 - ``now`` - right now
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Lastly, there is Mercurial's internal format:
Pavlos Touboulidis
doc: fix internal date sample (issue4072)
r19968 - ``1165411109 0`` (Wed Dec 6 13:18:29 2006 UTC)
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Martin Geisler
help/dates: rephrase explanation of internal format...
r13882 This is the internal representation format for dates. The first number
is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
second is the offset of the local timezone, in seconds west of UTC
(negative if the timezone is east of UTC).
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
The log command also accepts date ranges:
Martin Geisler
help/dates: use DATE as place-holder in help and abort texts...
r13886 - ``<DATE`` - at or before a given date/time
- ``>DATE`` - on or after a given date/time
- ``DATE to DATE`` - a date range, inclusive
- ``-DAYS`` - within a given number of days of today