1. 12 Jul, 2019 1 commit
  2. 11 Jul, 2019 1 commit
  3. 17 Jul, 2019 1 commit
  4. 13 Jul, 2019 1 commit
  5. 17 Jul, 2019 1 commit
  6. 11 Jul, 2019 1 commit
  7. 12 Jul, 2019 2 commits
  8. 11 Jul, 2019 2 commits
  9. 09 Jul, 2019 1 commit
    • Martin von Zweigbergk's avatar
      py3: use array.array.{to,from}bytes() on py3 · 854637e3d2d0
      Martin von Zweigbergk authored
      array.array.{to,from}string() still exists on py3, but they're
      deprecated and generate warnings.
      
      I've put the compat function in compat.pt for now. We can move into a
      dedicated pycompat.py if we end up with a lot of py3 compat stuff.
      854637e3d2d0
  10. 11 Jul, 2019 1 commit
  11. 13 Jul, 2019 2 commits
  12. 15 Jul, 2019 1 commit
  13. 13 Jul, 2019 1 commit
  14. 11 Jul, 2019 5 commits
  15. 13 Jul, 2019 1 commit
  16. 12 Jul, 2019 2 commits
  17. 11 Jul, 2019 2 commits
  18. 17 Jul, 2019 2 commits
    • Pierre-Yves David's avatar
      branching: merge with stable · 076b6813a7ea
      Pierre-Yves David authored
      076b6813a7ea
    • Sushil Khanchi's avatar
      touch: fix the inconsistent behavior of divergence catching logic (issue6107) · ef8907df73fc
      Sushil Khanchi authored
      When touching a node, the way we check if it can lead to divergence
      is we look at the successors sets of the rev being touched. And if
      there is successor revs exists (excluding the case when that successor
      set is (A,) for rev A) that means there will be divergence and we warn
      the user.
      This works fine but there is still a case (which is not covered by looking
      at successor sets) which can lead to divergence.
      
      That case is: when there is already a revision exists which is divergent
      to the revision being touched. And performing the touch would revive
      that "dead" divergence. (Dead because one of the revision is obsolete which
      is the one we are touching)
      
      And to see if there is any rev which is divergent to a particular rev
      we already have a function which we can use here
      i.e. `evolvecmd.divergentsets(repo, ctx_being_touched)`
      
      Changes in test file demonstrate the fixed behaviour.
      ef8907df73fc
  19. 29 Jun, 2019 1 commit
  20. 17 Jul, 2019 1 commit
  21. 15 Jul, 2019 1 commit
  22. 13 Jul, 2019 1 commit
  23. 11 Jul, 2019 2 commits
    • Anton Shestakov's avatar
      fold: allow operations on merge commits with some conditions · 41885988921e
      Anton Shestakov authored
      It's possible to fold revision chains that include a single merge commit: just
      fold everything into the merge commit while saving its other parent (so it
      continues being a merge commit). It's also possible to fold revisions that
      include multiple merge commits, on the condition that they merge with not more
      than 2 external changesets (i.e. a changesets that aren't going to be folded).
      41885988921e
    • Anton Shestakov's avatar
      rewind: make sure merge commits include files from p1 and p2 · 7839720c7c75
      Anton Shestakov authored
      Otherwise rewinding a merge commit makes it lose all changes.
      
      This fix populates `updates` argument of rewriteutil.rewrite() with parent
      changesets. That argument is normally used for folding multiple changesets, but
      in this case it's simply used to include files from p1 and p2. Usually,
      rewrite() works fine using ctx.files(), but that function can return an empty
      list when ctx is a merge commit.
      7839720c7c75
  24. 10 Jul, 2019 1 commit
    • Anton Shestakov's avatar
      touch: make sure merge commits include files from p1 and p2 · b69497b23d31
      Anton Shestakov authored
      Otherwise touching a merge commit makes it lose all changes.
      
      This fix populates `updates` argument of rewriteutil.rewrite() with parent
      changesets. That argument is normally used for folding multiple changesets, but
      in this case it's simply used to include files from p1 and p2. Usually,
      rewrite() works fine using ctx.files(), but that function can return an empty
      list when ctx is a merge commit.
      b69497b23d31
  25. 09 Jul, 2019 5 commits