Thu, 21 Oct 2010 11:23:26 +0200 dispatch: backout 0c605364373c stable
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).
Thu, 21 Oct 2010 10:54:37 +0200 subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8 stable
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 10:54:37 +0200] rev 12799
subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8
Thu, 21 Oct 2010 03:28:51 -0500 subrepo: fix status check on SVN subrepos (issue2445) stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Oct 2010 03:28:51 -0500] rev 12798
subrepo: fix status check on SVN subrepos (issue2445)
Thu, 21 Oct 2010 03:18:52 +0200 hgweb: let HTTPS serve use more compatible and less secure encryption stable
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.
Wed, 20 Oct 2010 18:15:47 +0530 mercurial.el: fix hg-outgoing path when 'default-push' is not defined stable
Azhagu Selvan SP <tamizhgeek@gmail.com> [Wed, 20 Oct 2010 18:15:47 +0530] rev 12796
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
Wed, 20 Oct 2010 17:06:42 -0500 merge default into stable for 1.7 freeze stable
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 17:06:42 -0500] rev 12795
merge default into stable for 1.7 freeze
Wed, 20 Oct 2010 23:48:33 +0200 merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:48:33 +0200] rev 12794
merge with stable
Wed, 20 Oct 2010 23:39:48 +0200 patchbomb: hide passwords potentially embedded in urls stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:39:48 +0200] rev 12793
patchbomb: hide passwords potentially embedded in urls
Wed, 20 Oct 2010 16:45:08 -0500 wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:45:08 -0500] rev 12792
wix: add vim syntax file for Mercurial unit tests
Wed, 20 Oct 2010 16:41:17 -0500 wix: add new help page templates
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:41:17 -0500] rev 12791
wix: add new help page templates
Wed, 20 Oct 2010 16:27:24 -0500 wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:27:24 -0500] rev 12790
wix: add new merge-tools.txt help text
Wed, 20 Oct 2010 15:36:42 -0500 Merge with mpm
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 15:36:42 -0500] rev 12789
Merge with mpm
Tue, 19 Oct 2010 22:33:52 -0500 merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org> [Tue, 19 Oct 2010 22:33:52 -0500] rev 12788
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
Wed, 20 Oct 2010 15:09:38 -0500 tests: fix up changed output
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 15:09:38 -0500] rev 12787
tests: fix up changed output
Fri, 15 Oct 2010 03:30:38 -0300 revset: disable subset optimization for parents() and children() (issue2437)
Wagner Bruna <wbruna@yahoo.com> [Fri, 15 Oct 2010 03:30:38 -0300] rev 12786
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.
Wed, 20 Oct 2010 14:57:36 -0500 check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 14:57:36 -0500] rev 12785
check-code: warning and fixes for whitespace in unified tests
Wed, 20 Oct 2010 20:19:34 +0200 hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Oct 2010 20:19:34 +0200] rev 12784
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.
Wed, 20 Oct 2010 20:19:32 +0200 hgweb: refactor all pyOpenSSL references into one class
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Oct 2010 20:19:32 +0200] rev 12783
hgweb: refactor all pyOpenSSL references into one class
Wed, 20 Oct 2010 17:47:46 +0200 gendoc: added styling for extension TOC
Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 17:47:46 +0200] rev 12782
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.
Wed, 20 Oct 2010 17:45:09 +0200 gendoc: automatically create help for default extensions.
Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 17:45:09 +0200] rev 12781
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.
Tue, 19 Oct 2010 13:50:03 +0200 gendoc: dedent documentation from docstrings
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:50:03 +0200] rev 12780
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.
Tue, 19 Oct 2010 13:43:40 +0200 extensions.load: return module
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:43:40 +0200] rev 12779
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.
Tue, 19 Oct 2010 13:39:34 +0200 help: different section separators
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:39:34 +0200] rev 12778
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.
Wed, 20 Oct 2010 18:08:37 +0200 gendoc: add subsection for each command
Martin Geisler <mg@lazybytes.net> [Wed, 20 Oct 2010 18:08:37 +0200] rev 12777
gendoc: add subsection for each command
(0) -10000 -3000 -1000 -300 -100 -50 -24 +24 +50 +100 +300 +1000 +3000 +10000 +30000 tip