- Apr 28, 2014
-
-
Pierre-Yves David authored
The argument is `x` but the variable tested for filtering is `rev`. `rev` happens to be a revset methods, ... never part of the filtered revs. This method is now using `rev` for everything.
-
- Apr 29, 2014
-
-
Pierre-Yves David authored
Revset calls use to return a list. Graft use to mutate that list. We cannot do this anymore leading to a crash when grafting multiple changeset with a revset. File ".../mercurial/commands.py", line 3117, in graft revs.remove(rev) AttributeError: '_addset' object has no attribute 'remove' We are late in code-freeze so we make the shortest possible fix by turning it back to a list.
-
- Apr 28, 2014
-
-
Greg Hurrell authored
For a Mercurial new-comer, the distinction between `contains(x)`, `file(x)`, and `filelog(x)` in the "revsets" help page may not be obvious. This commit tries to make things more obvious (text based on an explanation from Matt in an FB group thread).
-
- Apr 24, 2014
-
-
Mads Kiilerich authored
8a9e0b523d2d made discovery more helpful - too helpful for some extreme use cases. Instead, we arbitrarily limit the list it at 4 and add 'or more'.
-
- Apr 23, 2014
-
-
Julien Cristau authored
The documentation says we exit 1 if we have nothing to do, so avoid breaking that contract when we're passed an empty revset. This was changed in http://www.selenic.com/hg/rev/a259f7b488ab to improve the error message; keep the improved message, just not the abort.
-
- Apr 26, 2014
-
-
Matt Harbison authored
-
Yuya Nishihara authored
Command server is designed to use the channel protocol even if the server process is accessible to tty, whereas vanilla hg should be able to read password from tty in that case. So it isn't enough to swap sys.stdin: # works only if the server process is detached from the console sys.stdin = self.fin getpass.getpass('') sys.stdin = oldin or test isatty: # vanilla hg can't talk to tty if stdin is redirected if self._isatty(self.fin): return getpass.getpass('') else: ... Since ui.nontty flag is undocumented and command-server channels don't provide isatty(), this change won't affect the other uses of ui._isatty(). issue3161 also suggests to provide some context of messages. I think it can be implemented by using the generic templating function.
-
- Apr 29, 2014
-
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
'pat' was renamed to 'regex' in 9d28fd795215.
-
- Apr 27, 2014
-
-
Yuya Nishihara authored
It wouldn't raise exception without this change, but _bufferstates was wrong because of missing _bufferstates.pop() in colorui.popbuffer().
-
- Apr 23, 2014
-
-
Javi Merino authored
The current version of excanvas is unknown. Substitute it with the latest version from the excanvas website: http://code.google.com/p/explorercanvas/ Instead of using the "compiled" version, just use the readable one.
-
Mads Kiilerich authored
Including the missing test coverage that would have caught it.
-
- Apr 21, 2014
-
-
Pierre-Yves David authored
We make sure any exceptions raised during the whole span of handling bundle2 processing are decorated. This let us catch exceptions raised by hooks prior to transaction commit.
-
- Apr 22, 2014
-
-
Pierre-Yves David authored
Same drill again. We catch the PushRaced error, check if it cames from a bundle2 processing, if so we turn it into a bundle2 with a part transporting error information to be reraised client side.
-
Pierre-Yves David authored
Errors with no explanations makes my uncle Bob sad.
-
Pierre-Yves David authored
If the heads on the server differ from the ones reported seen by the client at bundle time, we raise a PushRaced exception. However, the part raising the exception was broken. To fix it, we move the PushRaced class in the error module so it can be accessible everywhere without an import cycle. A test is also added to prevent regression.
-
- Apr 21, 2014
-
-
Pierre-Yves David authored
Same as for Abort error, we catch the error, encode it into a bundle2 reply (expected by the client) and stream this reply. The client processing of the error will raise the exception again.
-
- Apr 22, 2014
-
-
Pierre-Yves David authored
When doing local push, UnknownPartError from the server will be raised directly to the client. We need to catch them too.
-
Pierre-Yves David authored
We narrow the exception catching while pulling.
-
Pierre-Yves David authored
We narrow the exception catching while unbundling the push reply.
-
Pierre-Yves David authored
KeyError is very generic, we need something more specific for proper error handling.
-
- Apr 21, 2014
-
-
Pierre-Yves David authored
We have more than Abort to test.
-
Pierre-Yves David authored
Clients expect a bundle2 reply to their bundle2 submission. So we catch the Abort error and turn it into a bundle2 containing a part transporting the exception data. The unbundling of this reply will raise the error again.
-
- Apr 22, 2014
-
-
Pierre-Yves David authored
This is a small hack to help us do some graceful error handling in bundle2 without major refactoring. See embedded comment for details.
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Wagner Bruna authored
-
- Apr 21, 2014
-
-
Mads Kiilerich authored
-
- Apr 18, 2014
-
-
Mads Kiilerich authored
Bid merge is a new rarely used feature that the user explicitly enabled - we should tell/warn when the user actually is using it, just like we tell when we not are using it. Give a message like note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
-
- Apr 21, 2014
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
Martin Geisler's test case revealed the previous message argument error.
-
Mads Kiilerich authored
-
Matt Mackall authored
The case collision checker was missing a op entry for 'k'eep.
-
- Apr 19, 2014
-
-
Martin Geisler authored
-
Martin Geisler authored
The number of obsoleted changesets is referred to as N later in the docstring.
-
Martin Geisler authored
-
Isaac Jurado authored
Most UTF-8 aware terminals convert multibyte sequences into a single displayed characters. Because the first column is padded by counting bytes, the second column is not perfectly aligned in the presence of non ASCII characters.
-
- Apr 17, 2014
-
-
Matt Mackall authored
-