help: adding a new help topic about extensions Currently listing non-enabled extensions and a short introductory text. Thanks to Dan Villiom Podlaski Christiansen for the preliminary proof-of-concept code for listing available extensions.

bookmarks: add appropriate locking (issue1691) - make updates of bookmark state locked and atomic - wrap commit so that commit and bookmarks happen under the same lock

filemerge: fix internal:dump

hgweb: deny cloning a subpath of a repo

hgweb: web.encoding should override encoding.encoding (issue1183)

bdiff: fix compile with GCC -ansi (issue1690)

tags: silence warning about unknown tags This is mostly a nuisance and can happen legitimately with pull -r, etc.

rollback: minor clarification (issue828)

update: add --check option

tags: drop nested function

tags: generate contexts directly

tags: reverse and simplify head-walking

tags: simplify rev handling

tags: fold in _hgtagsnodes

compare grep result between target and its parent I found that typical case is that grep target is added at (*) revision in the tree shown below. +--- 1(*) --- 3 0 +--- 2 ------ 4 Now, I expect 'hg grep --all' to show only rev:1 which is first appearance of target line. But 'hg grep --all' will tell: target line dis-appeared at 3 => 4 target line appeared at 2 => 3 target line dis-appeared at 1 => 2 target line appeared at 0 => 1 because current 'hg grep' implementation compares not between target revision and its parent, but between neighbor revisions in walkthrough order. I checked performance of this patch by "hg grep --follow --all walkchangerevs" on whole Mercurial repo, and patched version could complete as fast as un-patched one.

url: let host port take precedence when connecting to HTTPS Fixes use of HTTPS connections on non-standard ports.

url: support client certificate files over HTTPS (issue643) This extends the httpshandler with the means to utilise the auth section to provide it with a PEM encoded certificate key file and certificate chain file. This works also with sites that both require client certificate authentication and basic or digest password authentication, although the latter situation may require the user to enter the PEM password multiple times.

acl: support for getting authenticated user from web server (issue298) Previously, the acl extension just read the current system user, which is fine for direct file system access and SSH, but will not work for HTTP(S) as that would return the web server process user identity rather than the authenticated user. An empty user is returned if the user is not authenticated.

hgweb: escape REMOTE_HOST when passing url for addchangegroup If DNS lookups are turned off on the web server, REMOTE_HOST may be populated with REMOTE_ADDR, which, if the remote is an IPv6 hosts will contain colons, thus interfering with the separator character. This is solved by URL quoting the REMOTE_HOST string.

tests: fix test for convert detection of p4 repos

kill trailing whitespace

graphmod/webcommands: use generic DAG walks Changes graph() to colorededges(), which operates on the new generic DAG walks and adds color and edge information needed by the web graph. This is in preparation of adding DAG walk filters, like the linear run collapser in the next patch. The idea is to have a bunch of changelog walkers that return basic data. Then we can filter this data. Finally we add edge and formatting info suitable for the output media we want to target (glog, hgweb).

graphmod: rename a bunch of vars in graph()

graphmod/graphlog: make dag walks carry data as type, payload

graphlog: rename grapher to asciiedges

graphlog: move and rename graphabledag to asciiformat

graphmod/graphlog: extract nodelistwalk

graphmod/graphlog: move log walks to graphmod

graphmod: code cleanup and doc fix

merge: rename -S/--show option to -P/--preview