Skip to content
Snippets Groups Projects
  1. Mar 16, 2018
  2. Mar 17, 2018
    • Pulkit Goyal's avatar
      evolve: make sure we consider all cases in if-else · 6aff754c
      Pulkit Goyal authored
      The part of code which is touched decides on evolution of merge changeset. We
      need proper handling of each case there, so before adding logic, let's add
      conditional for each case so that upcoming patches are easy to understand.
      6aff754c
  3. Mar 19, 2018
  4. Mar 14, 2018
  5. Mar 16, 2018
  6. Mar 14, 2018
    • Pulkit Goyal's avatar
      utility: add a function to prompt user to choose a revision · b314c64f
      Pulkit Goyal authored
      This patch adds a utility function to interactively prompt user to choose a
      revision to proceed in cases when there are multiple revisions which are
      candidates.
      
      The function will be used in `hg evolve`, `hg next`, `hg prev` etc. If user
      feedback will be good, I plan to move it to core and use it at more possible
      places.
      b314c64f
    • Pulkit Goyal's avatar
      tests: add a test about evolve stabilizing orphan caused by splits · 8b5093f3
      Pulkit Goyal authored
      There are some similar tests lying around in the test suite but they are not
      well arranged. I wanted the test suite to be a goto reference for all the
      behaviors till the time we get all of them documented.
      8b5093f3
  7. Mar 19, 2018
  8. Mar 16, 2018
  9. Mar 13, 2018
    • Pulkit Goyal's avatar
      tests: add more tests related to stabilization of orphaned merge commit · 3f056d3a
      Pulkit Goyal authored
      This patch more tests related to stabilization of orphaned merge commit.
      Stabilization of a merge changeset with both the parents is not supported right
      now and prints a message on how to do that. Maybe we should do that internally
      as a part of `hg evolve` but I need to think about this.
      3f056d3a
    • Pulkit Goyal's avatar
      evolve: fix stabilization of orphan merge changesets in case of conflicts · d90e0faa
      Pulkit Goyal authored
      As demonstrated by tests added in previous patch, if one of the parent of a
      merge changeset has a new version and merge changeset gets, running `hg evolve`
      to stabilize that if results in conflicts will lead to lose of other parent of
      that merge changeset when we resolve conflicts and do `hg evolve --continue`.
      
      This patch fixes the behavior, by checking whether we are continuing evolving a
      merge changeset and if yes, setting the dirstate parents according to that.
      d90e0faa
    • Pulkit Goyal's avatar
      tests: add a test file of resolving orphaness of merge changesets · 92f1e240
      Pulkit Goyal authored
      This patch adds a new test file named test-evolve-orphan-merge.t which contains
      test cases when `hg evolve` try to stabilize a merge changeset which was orphan.
      
      This file contains 20-30% of all the cases as we have got something to fix
      before we add tests for rest of the cases. Going by this approach will make sure
      we don't live unfixed cases in the test file and the test files does not become
      a pile of hacks which are used to get in state when we fix the bugs.
      92f1e240
    • Pulkit Goyal's avatar
      grab: gracefully handle the case when we try to grab parent of wdir · 7b4d1bfb
      Pulkit Goyal authored
      Before this patch, we go all the way down to obsmarker creation logic and gets
      an error saying that changeset cannot obsolete itself. We should be more smart
      here and error out early saying we cannot grab that changeset.
      7b4d1bfb
  10. Mar 03, 2018
  11. Mar 14, 2018
  12. Mar 07, 2018
  13. Feb 23, 2018
  14. Mar 05, 2018
  15. Mar 04, 2018
    • Boris Feld's avatar
      obslog: add the operation to the Obslog output · 2823c82a
      Boris Feld authored
      The operation is helpful when debugging a case where we don't know how we
      ended up in this case while effect-flag are useful to understand what semantic
      changes happens to a changeset.
      
      Add the operation when displaying an obs-marker in the following form:
      
          `rewritten as X using amend`
      
      The other proposal is interesting but seems harder to internationalize and
      might requires update each time we introduce new operation:
      
          `Amended as X`
      
      Let's use the first proposal right now.
      2823c82a
  16. Dec 19, 2017
  17. Mar 04, 2018
  18. Dec 06, 2017
  19. Mar 03, 2018
Loading