1. 10 Nov, 2019 2 commits
  2. 03 Nov, 2019 2 commits
    • Sushil Khanchi's avatar
      evolve: remove a check which is already done by rewriteutil.precheck() · 9d05eb69cd05
      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()
      9d05eb69cd05
    • Sushil Khanchi's avatar
      evolve: add pre-check logic for content-divergence in rewriteutil.precheck() · 39d282fd04e0
      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).
      39d282fd04e0
  3. 20 Dec, 2019 2 commits
  4. 19 Dec, 2019 3 commits
  5. 09 Dec, 2019 4 commits
  6. 06 Nov, 2019 1 commit
    • Sushil Khanchi's avatar
      evolve: extract logic of pre-checking divergence risk to its own function · f583d9eedbce
      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()`
      f583d9eedbce
  7. 26 Dec, 2019 1 commit
  8. 01 Dec, 2019 1 commit
  9. 26 Dec, 2019 3 commits
  10. 28 Nov, 2019 2 commits
  11. 27 Nov, 2019 1 commit
  12. 26 Dec, 2019 1 commit
  13. 20 Dec, 2019 6 commits
  14. 19 Dec, 2019 1 commit
  15. 20 Dec, 2019 1 commit
  16. 27 Nov, 2019 3 commits
  17. 25 Nov, 2019 2 commits
  18. 12 Dec, 2019 2 commits
  19. 19 Nov, 2019 2 commits
    • Martin von Zweigbergk's avatar
      evolve: delete redundant and incorrect code for updating dirstate · 04104042c6ad
      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.
      04104042c6ad
    • Martin von Zweigbergk's avatar
      tests: demonstrate how evolve loses transitive copies when interrupted · effce0a1f5bd
      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).
      effce0a1f5bd