Durham Goode <durham@fb.com> [Tue, 17 Feb 2015 19:59:26 -0800] rev 24131
histedit: don't recreate state object
Previously, the histedit state object was being recreated during continue/abort.
This meant that the locks that were held on the original state object were not
available to actions, which meant actions could not release the lock on the
repository (like an 'exec' action would need to do).
This affected our internal extension that added the 'exec' action.
Anton Shestakov <engored@ya.ru> [Sat, 10 Jan 2015 21:37:42 +0800] rev 24130
hgweb: clearly outline <tr> block in paper/changeset.tmpl
This particular <tr> block should use the style of its neighboring blocks,
otherwise it's easy to think that the closing '</tr>' is missing.
Anton Shestakov <engored@ya.ru> [Sat, 10 Jan 2015 19:58:28 +0800] rev 24129
hgweb: don't mix tabs and spaces in monoblue templates
Anton Shestakov <engored@ya.ru> [Sat, 10 Jan 2015 19:43:07 +0800] rev 24128
hgweb: remove unneeded escaping in gitweb/map and monoblue/map
Elements in map files work slightly different from regular python strings, so
escaping single quotes is not necessary. It is also demonstrated by the very
same lines: '(current diff)'.
I should've made this in
9e1f4c65f5f5, but here we go.
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Feb 2015 13:59:13 +0900] rev 24127
resolve: port to generic templater
Test output changes because color labels are applied separately.
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Feb 2015 13:55:15 +0900] rev 24126
resolve: extract -l/--list operation from big loop
This prepares for porting to generic templater. repo.wlock() and ms.commit()
should be unnecessary for "resolve -l".
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Feb 2015 13:47:43 +0900] rev 24125
resolve: silence warning of unknown pats for -l/--list (BC)
It was introduced at
232de244ab6f to warn that "hg resolve" did nothing
meaningful. The warning seems not good for "hg resolve -l" because it is
rather like "hg status" or "hg files".
Ryan McElroy <rm@fb.com> [Mon, 09 Feb 2015 11:02:45 -0800] rev 24124
extensions: allow extending command synopsis and docstring
Mercurial uses a synopsis string and the docstring of a command for the
command's help output. Today there is no way for an extension that adds
functionality to a command to extend either of these help strings.
This patch enables appending to both the doctring and the synopsis, and adds
a test for this functionality. Example usage is shown in the test and is also
described in the docstring of extensions.wrapcommand().
Mike Edgar <adgar@google.com> [Wed, 21 Jan 2015 17:11:37 -0500] rev 24123
revlog: _addrevision creates full-replace deltas based on censored revisions
A delta against a censored revision is either received through exchange and
written blindly to a revlog, or it is created by the revlog itself. This
change ensures the latter process creates deltas which fully replace all
data in a censored base using a single patch operation.
Recipients of a delta against a censored base will verify that the delta is in
this full-replace format. Other recipients will use the delta as normal.
For background and broader design of the censorship feature, see:
http://mercurial.selenic.com/wiki/CensorPlan
Mike Edgar <adgar@google.com> [Fri, 06 Feb 2015 01:38:16 +0000] rev 24122
revlog: special case expanding full-replacement deltas received by exchange
When a delta received through exchange is added to a revlog, it will very
often be expanded to a full text by applying the delta to its base. If
that delta is of a particular form, we can avoid decoding the base revision.
This avoids an exception if the base revision is censored.
For background and broader design of the censorship feature, see:
http://mercurial.selenic.com/wiki/CensorPlan