- Oct 20, 2015
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 19, 2015
-
-
Mads Kiilerich authored
Instead of reporting spliced in ['82544090e14fe18091e04f1fb0f0d7991cbe6e7e'] as parents of 369fd983d9e13330e9f12d9fce820deae84ea223 report spliced in 82544090e14fe18091e04f1fb0f0d7991cbe6e7e as parents of 369fd983d9e13330e9f12d9fce820deae84ea223
-
Mads Kiilerich authored
--collapse will do that rebase doesn't commit until the final commit. The lack of a new commit would make it look like the rebase didn't contribute any changes. Instead, only warn about no commits when not using --collapse.
-
Sean Farley authored
Wihtout this patch, commands.pull silently drops opargs defeating the whole purpose of the argument.
-
Sean Farley authored
Wihtout this patch, commands.push silently drops opargs defeating the whole purpose of the argument.
-
- Oct 15, 2015
-
-
timeless authored
this backs out 131f7fe06e9e, because Python2.5 support was dropped
-
timeless authored
-
timeless authored
-
timeless authored
-
- Oct 20, 2015
-
-
Ryan McElroy authored
We want to support editors with parameters, eg EDITOR="vim -O" or whatever. So remove the quotes from around $ED and assume that the editor variable is properly escaped already.
-
- Oct 19, 2015
-
-
Pierre-Yves David authored
Before this bundle repository were unable to work with compressed bundle2. We use the same approach as with bundle1, we extract the changegroup in uncompressed form into a temporary file.
-
- Oct 03, 2015
-
-
Pierre-Yves David authored
We were returning 'False' in all cases, even when the bundle2 was actually compressed.
-
- Oct 19, 2015
-
-
Pierre-Yves David authored
Uncompressing bundle2 needs to be handled differently.
-
Pierre-Yves David authored
We will reuse this logic for bundle2
-
Pierre-Yves David authored
-
- Oct 20, 2015
-
-
Pierre-Yves David authored
If the histedit fails, we restore a backup. We make sure this backup bundle can be in bundle2 format as general delta will require.
-
Pierre-Yves David authored
Restoring from a 'bundle2' was missing this data.
-
Pierre-Yves David authored
This will let the hook get access to the 'url' value.
-
Pierre-Yves David authored
We allow specifying the url to carry it to hooks. This gets us closer to 'bundle1.apply(...)' and will allow us to remove regressions in multiple place where we forget to pass the url to hooks.
-
Pierre-Yves David authored
This will let the hook get access to the 'source' value.
-
Pierre-Yves David authored
We allow specifying the source to carry it to hooks. This gets us closer to 'bundle1.apply(...)' and will allow us to remove regressions in multiple places where we forget to pass the source to hooks.
-
Pierre-Yves David authored
This should be set for all bundle2 application, we enforce that at a low level. This is for courtesy with hooks.
-
Pierre-Yves David authored
This is one such place.
-
Pierre-Yves David authored
There is a case where the intent is clear and the transaction is not optional. We want to be able to alter that transaction in a wide and easy way. We cannot get a unified '.apply(repo)' method for bundle1 and bundle2 yet because the api are still a bit too far apart. But this is a good step forward to get the rc out.
-
- Oct 15, 2015
-
-
Siddharth Agarwal authored
This can happen when either 'hg resolve --all' is called or a driver-resolved file is explicitly requested. This is done as part of 'hg resolve --all' so that users still have a chance to test their changes before committing them. The exact semantics here are still to be decided. This does not impact any non-experimental features. Thanks to Pierre-Yves David for some advice about this behavior in particular, and merge drivers in general.
-
Siddharth Agarwal authored
We need to be careful about allowing --mark and --unmark to keep working -- we don't want the user to be stuck in a weird state. The exact behavior here is still to be decided, though.
-
Siddharth Agarwal authored
This will be a chance for the merge driver to finish resolving or generating any driver-resolved files. As before, having a separate error state from 'unresolved' is too big a refactoring for now, so we hack around it by setting unresolved to a positive value when necessary.
-
Siddharth Agarwal authored
We also need to update our internal state to whatever state driverpreprocess leaves it in. Adding an error state separate from the unresolved count is too big a refactoring for now, so we hack around it by setting it to a positive value to indicate an error state.
-
Siddharth Agarwal authored
The exact semantics for what should happen (particularly with respect to error handling) are still a bit hard to pin down, so I think it's better to experiment with it as an extension for now. For now this stub will act as a convenient point for extensions to hook on.
-
Siddharth Agarwal authored
Users will often be in the habit of running 'hg resolve --mark --all' after resolving merge conflicts in source files. We need to make sure this doesn't cause driver-resolved files to be marked. 'hg resolve --all' will resolve driver-resolved files, though. The weird conditional structure is to accommodate an upcoming patch.
-
Siddharth Agarwal authored
This allows for status and other results on the wctx to be cached between iterations.
-
- Oct 19, 2015
-
-
James Mills authored
-
- Oct 16, 2015
-
-
Mads Kiilerich authored
-
- Oct 14, 2015
- Oct 15, 2015
-
-
timeless authored
-
- Oct 16, 2015
- Oct 18, 2015
-
-
Yuya Nishihara authored
Spotted by CC=clang CFLAGS='-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wshorten-64-to-32': mercurial/parsers.c:1580:24: warning: comparison of integers of different signs: 'Py_ssize_t' (aka 'long') and 'unsigned long' [-Wsign-compare] if (self->raw_length > INT_MAX / sizeof(nodetree)) {
-