Pascal Quantin <pascal.quantin@wavecom.com> [Sat, 17 Jan 2009 15:23:13 +0100] rev 7662
Update mercurial.ini file packaged in win32 installer
Update contrib/win32/mercurial.ini file with contrib/sample.hgrc
content and append contrib/mergetools.hgrc content during installation
Patrick Mezard <pmezard@gmail.com> [Sat, 17 Jan 2009 15:19:41 +0100] rev 7661
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 17 Jan 2009 15:15:26 +0100] rev 7660
Document how HTML documentation is built under Windows
Pascal Quantin <pascal.quantin@wavecom.com> [Thu, 15 Jan 2009 14:19:29 +0100] rev 7659
Add Lee Cantey's installer icon to win32 installer
Add Lee Cantey's installer icon to contrib/win32 and update
mercurial.iss accordingly
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jan 2009 01:38:52 +0100] rev 7658
notify: fix neglect of custom headers set via template
e981725da3fe introduced a bug that discarded all custom headers.
Add custom header to test template.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7657
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7656
branch closing: referencing open and closed branches/heads
Treat fully closed branches similarly to "inactive" in the output of
'hg branches'. They will be suffixed with "(closed)" where inactive branches
are marked with "(inactive)". If the -a/--active option is given both
inactive and closed branches will not be shown.
Partially closed branches (multiple heads, at least one not closed)
will display the next (tipmost) open head.
Add -a/--active option to "hg heads" which will hide closed heads iff the
option is specified.
In other hg commands, when multiple branch heads exist the branch name will
refer to the tipmost open head, and if none exist, then the tipmost closed
head.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7655
branch closing: mark closed branches with a 'close' extra
Adds a --close-branch option to commit.
When --close-branch is present the commit will mark the changeset
with close=1 in the changeset extras field.
If a regular changeset is added on top of a closed head the branch
is no longer considered closed, and thus re-opened.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7654
store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.
The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.
The localrepo.branchheads function is reworked to use the data from the cache.
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 20:23:18 +0100] rev 7653
i18n: make local now builds .mo files