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.

resolve: port to generic templater Test output changes because color labels are applied separately.

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".

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".

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().

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

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

test-merge-tools: fix flaky test by avoiding debugsetparents debugsetparents is a debug command and does not provide the same guarantees as non-debug commands do. In particular, when the user sets a different parent, any clean files will remain clean in the dirstate even though the new parent might have a different version of the file (so it should appear modified compared to the new parent). Let's instead achieve the same effect by updating to the new parent and reverting the contents back to what they were. This fix can be tested by passing '--config debug.dirstate.delaywrite=2' to the 'hg update' command in the beforemerge().

revlog: in addgroup, reject ill-formed deltas based on censored nodes To ensure interoperability when clones disagree about which file nodes are censored, a restriction is made on deltas based on censored nodes. Any such delta must replace the full text of the base in a single patch. If the recipient of a delta considers the base to be censored and the delta is not in the expected form, the recipient must reject it, as it can't know if the source has also censored the base. For background and broader design of the censorship feature, see: http://mercurial.selenic.com/wiki/CensorPlan

mdiff: add helper for making deltas which replace the full text of a revision This helper will be used initially for censor-aware delta generation. Deltas which replace the full contents of the base revision are guaranteed to apply correctly regardless of whether the delta recipient has censored the base. For background and broader design of the censorship feature, see: http://mercurial.selenic.com/wiki/CensorPlan

revlog: add "iscensored()" to revlog public API The iscensored method will be used by the exchange layer to reject nonconforming deltas involving censored revisions (and to produce conforming deltas). For background and broader design of the censorship feature, see: http://mercurial.selenic.com/wiki/CensorPlan

filelog: allow censored files to contain padding data To ensure delta compatibility, when a revision is censored, it is padded to match the original data in size. The previous check does not allow for padding because it was added before padding was found to be a requirement. For more background and design of the censorship feature, see: mercurial.selenic.com/wiki/CensorPlan

revset: drop factory that promotes spanset to fullreposet All callers use fullreposet where appropriate. Backed out changeset fbae659543cf

revset: specify fullreposet without using spanset factory The factory function will be removed because the subsequent patches will make fullreposet(repo) not fully compatible with spanset(repo).

revset: make match function initiate query from full set by default This change is intended to avoid exposing the implementation detail to callers. I'm going to extend fullreposet to support "null" revision, so these mfunc calls will have to use fullreposet() instead of spanset().

localrepo: don't reintroduce pruned tag entries when tagging If a commit and a followup tag commit are pruned, there are no references to it in any non obsolete version of .hgtags. Without this change however, the next time a tag is added to another branch, the obsolete references are appended in .hgtags before the new entries for the current tag command. The annotation to unfilter localrepo._tag() has been around since b3af182a1944. The log message for it mentions computing the tag cache though, so I'm not sure if this was misplaced? It looks like branchmap was aware of filtering then, and now tracks a cache per view.