- Oct 21, 2010
-
-
Matt Mackall authored
-
kiilerix authored
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.
-
- Oct 20, 2010
-
-
Azhagu Selvan SP authored
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
-
Matt Mackall authored
-
Benoit Boissinot authored
-
Benoit Boissinot authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
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
-
Matt Mackall authored
-
- Oct 15, 2010
-
-
Wagner Bruna authored
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.
-
- Oct 20, 2010
-
-
Matt Mackall authored
-
kiilerix authored
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.
-
kiilerix authored
-
Erik Zielke authored
Uses CSS3 columns for the list of extensions, so it is not just a long list of extension names.
-
Erik Zielke authored
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.
-
- Oct 19, 2010
-
-
Erik Zielke authored
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.
-
Erik Zielke authored
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.
-
Erik Zielke authored
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.
-
- Oct 20, 2010
-
-
Martin Geisler authored
-
Martin Geisler authored
-
Wagner Bruna authored
-
Wagner Bruna authored
-
- Oct 14, 2010
-
-
timeless developer authored
-
- Oct 19, 2010
-
-
Kevin Bullock authored
Text adapted from http://mercurial.selenic.com/wiki/BookmarksExtension
-
- Oct 20, 2010
-
-
Erik Zielke authored
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.
-
Martin Geisler authored
-
timeless developer authored
-
timeless developer authored
-
- Oct 18, 2010
-
-
Wagner Bruna authored
-
- Oct 16, 2010
-
-
Augie Fackler authored
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.
-
- Oct 19, 2010
-
-
Steve Borho authored
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.
-
- Oct 18, 2010
-
-
Nicolas Dumazet authored
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.
-
- Oct 19, 2010
-
-
Nicolas Dumazet authored
-
- Oct 17, 2010
-
-
Benoit Boissinot authored
-
Benoit Boissinot authored
-
Benoit Boissinot authored
-
- Oct 09, 2010
-
-
Benoit Boissinot authored
-