gendoc: re-add indentation to global option table The indentation was lost in bdc1cf692447.

test-transplant: test transplanted() revset

backout: add --tool argument for specifying merge tool

help: improve merge-tools topic, describe --tool and clarify details This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.

help: use Windows cmd compatible quoting in revset help

color: give hint to translators about untranslated keywords

i18n: extract comments marked for translator hints Comments marked with "i18n:", like: # i18n: do not translate the field names msg = _("Valid entries for the format field are topic, bar, number.") will become available for translators in the .po files: #. i18n: do not translate the field names msgid "Valid entries for the format field are topic, bar, number." msgstr ""

setup/hg: handle hg being a symlink when appending relative libdir to sys.path Resolve symbolic links in the path to hg so that an hg that works when invoked directly will also work when invoked via a symlink to it.

merge-tools: fixed typos Spotted by Patrick Mézard.

commands: mark tip:0 as literal text If left unquoted, this is seen as a link to '0' using protocol 'tip' because of some over-eager link-finding magic in Docutils.

eol: add missing word in module docstring

demandimport: backout fe31f834a9ff Using a keyword argument here breaks zipimporter for at least some versions of Python2.6 on Windows.

dispatch: backout 0c605364373c The parenthesis may need translation too: Laurens Holst pointed out that Japanese uses full-width parentheses: （） (U+FF08 U+FF09).

subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8

subrepo: fix status check on SVN subrepos (issue2445)

hgweb: let HTTPS serve use more compatible and less secure encryption PROTOCOL_SSLv3 on the server side doesn't work everywhere. Sometimes the client reports "EOF occurred in violation of protocol" (for example on Mac and Solaris). The more compatible PROTOCOL_SSLv23 is now used instead. It works but is less "secure" for some OpenSSL versions as it can fall back to weak encryption.

mercurial.el: fix hg-outgoing path when 'default-push' is not defined hg-outgoing path is set as 'default-push' which prevents it from working in repos which only have 'default' defined. Fix provided by Kyujin Shim at http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html

merge default into stable for 1.7 freeze

merge with stable

patchbomb: hide passwords potentially embedded in urls

wix: add vim syntax file for Mercurial unit tests

wix: add new help page templates

wix: add new merge-tools.txt help text

Merge with mpm

merge: implement --tool arguments using new ui.forcemerge configurable ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool

tests: fix up changed output

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