revset: disable subset optimization for parents() and children() (issue2437) For the boolean operators, the subset optimization works by calculating the cheaper argument first, and passing the subset to the second argument to restrict the revision domain. This works well for filtering predicates. But parents() don't work like a filter: it may return revisions outside the specified set. So, combining it with boolean operators may easily yield incorrect results. For instance, for the following revision graph: 0 -- 1 the expression '0 and parents(1)' should evaluate as follows: 0 and parents(1) -> 0 and 0 -> 0 But since [0] is passed to parents() as a subset, we get instead: 0 and parents(1 and 0) -> 0 and parents([]) -> 0 and [] -> [] This also affects children(), p1() and p2(), for the same reasons. Predicates that call these (like heads()) are also affected. We work around this issue by ignoring the subset when propagating the call inside those predicates.

check-code: warning and fixes for whitespace in unified tests

hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later pyOpenSSL apparently doesn't work for Python 2.7 and isn't very actively maintained. The built-in ssl module seems like a long-term winner, so we now use that with Python 2.6 and higher.

hgweb: refactor all pyOpenSSL references into one class

gendoc: added styling for extension TOC Uses CSS3 columns for the list of extensions, so it is not just a long list of extension names.

gendoc: automatically create help for default extensions. Adds a section in the hg.1 manpage and corresponding hg.1.html file. Each extension is listed with its module docstring, followed by the commands defined by that extendsion. Creates help for extensions by extracting doc strings from the extension modules and its commands.

gendoc: dedent documentation from docstrings When getting docstrings from the source they are indented to look good in the code. This indentation interferes with how the text is parsed by rst. Therefore this indentation is removed.

extensions.load: return module Makes extensions.load return the module that it has loaded. This is done so that callers can get information on this module, which e.g. can be used for generating docs.

help: different section separators Changes the characters used as section separators, so different ones are used for module docstring and command docstring. This is done because the section from the docstring will be at different levels in the restructured text output, therefore different symbols have to be used.

gendoc: add subsection for each command

gendoc: move section commands to module scope

mq: mark string for i18n

cmdutil: mark string for i18n

test-ssh: handle very slow ssh transfer rate

bookmarks: add paragraph on pushing and pulling to help Text adapted from http://mercurial.selenic.com/wiki/BookmarksExtension

help: help topic for merge tools I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.

check-code: find trailing whitespace

convert: kill trailing whitespace

convert: fix typo in comment

strip: support revision sets

interhg: use uisetup() instead of module-load side effects This fixes an infinite recursion bug caused by visiting a bad subpage of the help handler repeatedly, which caused the wrapper for the templater's escape filter to get installed twice and resulted in infinite recursion.

merge: when --tool is specified, disable HGMERGE by setting to empty string HGMERGE has different semantics than ui.merge. HGMERGE should hold the name on an executable in your path, or an absolute tool path. As such, it's not safe to simply copy the user's specified --tool value into HGMERGE. Instead, we disable HGMERGE by setting it to an empty string.

ui: only fix config if the relevant section has changed In particular, when extensions add hooks, or add non-ui and non-paths configuration items during their setups, we really have no reason to re-"fix" the config dictionaries.

test-tags: use printf instead of echo '...\n'