- 10 Nov, 2019 2 commits
-
-
Sushil Khanchi authored
Changes in tests reflect the added behaviour.
-
Sushil Khanchi authored
After resolution of phase-divergence, user can locally create phase-divergence by rewriting the old bumped (obsolete now) changeset. Next patch will be adding the pre-check logic for creation of this phase-divergence.
-
- 03 Nov, 2019 2 commits
-
-
Sushil Khanchi authored
We have tests to check if fold is being performed on public cset. There is no changes in test files because testing that never touched the part this patch removes, and already caught in rewriteutil.precheck()
-
Sushil Khanchi authored
For now, pre-check will abort if rewriting a rev create divergence (and config experimental.evolution.allowdivergence is not set to True). But this behaviour can be improved where instead of abort maybe we can confirm the user to either proceed with divergence or some other options depends on what command user is running. Changes in test file are used to overrides the pre-check for testing purpose (using experimental.evolution.allowdivergence=yes).
-
- 20 Dec, 2019 2 commits
-
-
Anton Shestakov authored
On Python 3.
-
Anton Shestakov authored
-
- 19 Dec, 2019 3 commits
-
-
Anton Shestakov authored
-
Anton Shestakov authored
-
Anton Shestakov authored
-
- 09 Dec, 2019 4 commits
-
-
Anton Shestakov authored
-
Anton Shestakov authored
-
Anton Shestakov authored
-
Anton Shestakov authored
It's expected to have a bunch of import and attribute errors in this module because it's for compatibility with different versions of hg and Python. Although it doesn't explain why a function wouldn't have __code__ attribute? So far I think it's a quirk of pytype.
-
- 06 Nov, 2019 1 commit
-
-
Sushil Khanchi authored
Extracting the logic (which is used to check if rewriting an obsolete revision will create divergence) to a function. This function will be used in upcoming patches of pre-checking. This is how we check if rewriting an obsolete revision will create divergence. We need to check two cases: If there is any 1) non-obsolete successor. -> easily done by `obsutil.successorssets()` 2) precursor with non-obsolete successor. -> using `evolvecmd.divergentsets()`
-
- 26 Dec, 2019 1 commit
-
-
Pierre-Yves David authored
-
- 01 Dec, 2019 1 commit
-
-
Sushil Khanchi authored
-
- 26 Dec, 2019 3 commits
-
-
Pierre-Yves David authored
The case is simple enough to be handled on its own.
-
Pierre-Yves David authored
extracted from a changeset of Sushil khanchi <sushilkhanchi97@gmail.com>
-
Pierre-Yves David authored
A refactoring of the content divergence resolution in on its way. use a distinctive name for some variable early to make the change easier to read later.
-
- 28 Nov, 2019 2 commits
-
-
Sushil Khanchi authored
Changes in test file reflect the added behaviour. The intermediate changeset has been properly cleaned up by the `hg evolve --stop` call.
-
Sushil Khanchi authored
Right now, --stop leave the intermediate changeset (relocating the divergent changeset to its new location behind). This this is an incomplete step it should be removed by `hg --stop`.
-
- 27 Nov, 2019 1 commit
-
-
Sushil Khanchi authored
When resolving content-divergence where relocation of "divergent" changeset is also required, this test file make sure that --abort option is working fine.
-
- 26 Dec, 2019 1 commit
-
-
Anton Shestakov authored
Caught by pytype.
-
- 20 Dec, 2019 6 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
Added test shows that the logic to find the destination for `hg up` in the case when "working directory parent has a topic but wdir has no active topic" is buggy. This will be fixed in next patch.
-
Sushil Khanchi authored
-
Sushil Khanchi authored
Added test shows that when current active topic is empty and we try to run `hg up`, it fails with an error. It's because this case is not correctly handled when we find a destination to update (when topics are in play) Next patch will fix this.
-
Martin von Zweigbergk authored
-
Martin von Zweigbergk authored
-
- 19 Dec, 2019 1 commit
-
-
Martin von Zweigbergk authored
-
- 20 Dec, 2019 1 commit
-
-
Martin von Zweigbergk authored
-
- 27 Nov, 2019 3 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
-
Sushil Khanchi authored
Changes in test file demonstrate the added behaviour.
-
- 25 Nov, 2019 2 commits
-
-
Sushil Khanchi authored
This test shows that for now we don't handle the continue case when relocating "divergent" cset hit merge conflict while resolving content-divergence. Next patch will be adding the support for --continue case.
-
Sushil Khanchi authored
Now, as we also relocate divergent cset if required, so let's use more specific key to track the relocation of "divergent" and "other".
-
- 12 Dec, 2019 2 commits
-
-
Sushil Khanchi authored
-
Sushil Khanchi authored
I annotated the history of this "newer == [()]" condition and found that it was added in the initial stages of evolution project (more than 8 years ago) and there is no test where we get [()] as a successor set. So looks like "if not newer" is enough to check if it is empty. I also looked into obsutil.successorssets() implementation and I don't think it would give us [()] in any case.
-
- 19 Nov, 2019 2 commits
-
-
Martin von Zweigbergk authored
In relocate() when we notice conflicts, we will try to fix up the dirstate by calling copies.duplicatecopies() and dirstatedance(). However, we had called _evolvemerge() just before that point and that has already fixed up the dirstate, so there's no need to do it again. Also, we did it incorrectly as the test case shows.
-
Martin von Zweigbergk authored
Let's say `b` has been renamed to `c` in commit A and then renamed to `d` in commit B. We now modify A in a way that will cause a conflict when we evolve B. `hg evolve` will now stop and let the user resolve the conflicts, but it will have lost the copy information in the working copy (should still be c->d).
-