1. 14 Oct, 2020 1 commit
    • Pierre-Yves David's avatar
      topic: add a `exp….topic.linear-merge` option to allow some oedipus · 3946ee4ee3ae
      Pierre-Yves David authored
      If this option is set to `from-branch`, a user can call `hg merge some-topic`
      from a bare branch even if `some-topic` is a direct descendant of the current
      working copy parents. This was previously denied if the changesets was on the
      same branch, since the result would be an "oedipus merge".
      
      Some user have been requesting this, and this type of merge is one of Gitlab
      standard way of merging a "Merge Request". That new option will unlock issue
      `heptapod#200` and make this mode available for those who wants it.
      3946ee4ee3ae
  2. 15 Oct, 2020 1 commit
  3. 12 Oct, 2020 1 commit
  4. 11 Oct, 2020 1 commit
  5. 26 Sep, 2020 1 commit
  6. 25 Sep, 2020 3 commits
  7. 24 Sep, 2020 4 commits
  8. 14 Oct, 2020 1 commit
  9. 10 Oct, 2020 1 commit
  10. 22 Sep, 2020 3 commits
  11. 10 Oct, 2020 2 commits
  12. 09 Oct, 2020 1 commit
  13. 18 Sep, 2020 1 commit
  14. 17 Sep, 2020 1 commit
  15. 26 Aug, 2020 4 commits
  16. 17 Sep, 2020 3 commits
  17. 10 Sep, 2020 1 commit
  18. 05 Sep, 2020 2 commits
    • Matt Harbison's avatar
      config: specify the extension when forcing a config option · 1ee535d769db
      Matt Harbison authored
      I noticed that `hg config server --debug` said 'none: server.bundle1=False'.
      
      --HG--
      branch : stable
      1ee535d769db
    • Matt Harbison's avatar
      tests: use the modern config setting to enable evolution in topic tests · 044ce00dfa88
      Matt Harbison authored
      When adding `hg pick --config extensions.evolve=` to test-topic-dest.t to
      investigate issue6406, it failed with `abort: unknown command 'pick'`.  This is
      a manifestation of issue6039.  I made several attempts at determining the root
      cause, and while I'm still worried about *why* a config setting can cause the
      extension to fail to fully initialize, there are some topic bugs to cleanup and
      I don't feel like spending more time on this.
      
      --HG--
      branch : stable
      044ce00dfa88
  19. 08 Sep, 2020 3 commits
  20. 05 Sep, 2020 1 commit
  21. 26 Aug, 2020 1 commit
    • Martin von Zweigbergk's avatar
      dirstate: replace _uncommitdirstate() by core's movedirstate() · 2df762b9c0c5
      Martin von Zweigbergk authored
      IIRC, when _uncommitdirstate() was upstreamed, it got cleaned up a
      lot. Let's switch to the simpler upstream version.
      
      This fixes the brokeness in `hg uncommit` demonstrated by the previous
      patch. The problem was that _uncommitdirstate() had not been properly
      updated to support uncommitting to another commit. If you replace
      `oldctx.p1()` by `ctx` there, you would get this same diff as from
      this patch (the `interactive` code path had been fixed this way
      already).
      
      --HG--
      branch : stable
      2df762b9c0c5
  22. 03 Sep, 2020 1 commit
    • Martin von Zweigbergk's avatar
      tests: add test showing that `hg uncommit --rev` can fail to mark file added · 80b5d4b85a52
      Martin von Zweigbergk authored
      The test case modified in this commit uses `hg uncommit --rev 0 b` to
      revert the parent commit's state to revision 0 where file `b` doesn't
      exist. The file is still tracked in the dirstate (correctly, since `hg
      uncommit` should not affected the tracked-ness), so `hg status` should
      report it as added. However, as the calls added in this patch shows,
      it gets reported as modified instead.
      
      --HG--
      branch : stable
      80b5d4b85a52
  23. 02 Sep, 2020 1 commit
    • Matt Harbison's avatar
      topic: fix the `topic(...)` revset to not select commits without a topic · 95478db35f88
      Matt Harbison authored
      The problem seems to be that the now removed __contains__ check would select any
      revision indicated by a non-string argument.  This led to `topic(head())`
      returning a bunch of non-topic heads, though not as many as simply `head()`.
      
      I'm likely misunderstanding something, because there appears to be a similar
      __contains__ check for `branch()` in core.  But maybe that's just harder to see
      the issue, because branch names doesn't disappear like topics.
      
      --HG--
      branch : stable
      95478db35f88
  24. 21 Aug, 2020 1 commit