Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:01:09 +0200] rev 12812
gendoc: re-add indentation to global option table
The indentation was lost in
bdc1cf692447.
Patrick Mezard <pmezard@gmail.com> [Fri, 22 Oct 2010 22:58:17 +0200] rev 12811
test-transplant: test transplanted() revset
Steve Borho <steve@borho.org> [Fri, 22 Oct 2010 11:58:43 -0500] rev 12810
backout: add --tool argument for specifying merge tool
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:08:15 +0200] rev 12809
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.
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:05:51 +0200] rev 12808
help: use Windows cmd compatible quoting in revset help
Martin Geisler <mg@lazybytes.net> [Fri, 22 Oct 2010 16:34:38 +0200] rev 12807
color: give hint to translators about untranslated keywords
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 21 Oct 2010 11:45:02 -0200] rev 12806
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 ""
L. David Baron <dbaron@dbaron.org> [Thu, 21 Oct 2010 09:58:22 -0700] rev 12805
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.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:34:30 +0200] rev 12804
merge-tools: fixed typos
Spotted by Patrick Mézard.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:26:32 +0200] rev 12803
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.
Georg Brandl <georg@python.org> [Thu, 21 Oct 2010 17:02:08 +0200] rev 12802
eol: add missing word in module docstring
Steve Borho <steve@borho.org> [Thu, 21 Oct 2010 10:13:03 -0500] rev 12801
demandimport: backout
fe31f834a9ff
Using a keyword argument here breaks zipimporter for at least some
versions of Python2.6 on Windows.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 11:23:26 +0200] rev 12800
dispatch: backout
0c605364373c
The parenthesis may need translation too: Laurens Holst pointed out
that Japanese uses full-width parentheses: （） (U+FF08 U+FF09).
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 10:54:37 +0200] rev 12799
subrepo: svnsubrepo._wcrev should return str after
3d6ba8c2b1b8
Matt Mackall <mpm@selenic.com> [Thu, 21 Oct 2010 03:28:51 -0500] rev 12798
subrepo: fix status check on SVN subrepos (
issue2445)
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Oct 2010 03:18:52 +0200] rev 12797
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.