Skip to content
Snippets Groups Projects
  1. Aug 13, 2020
  2. Sep 04, 2020
  3. Sep 16, 2020
  4. Sep 09, 2020
    • Pulkit Goyal's avatar
      mergestate: introduce a new ACTION_KEEP_NEW · 6877b0ee
      Pulkit Goyal authored
      `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this
      KEEP, what was the state of things.
      
      In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files
      which are kept absent in the working directory.
      
      There is another special case where we keep the file when it's not present on
      both ancestor and remote side. We introduce a dedicated action for that.
      
      The goal is to use these information to make bid merge smarter.
      
      Differential Revision: https://phab.mercurial-scm.org/D9002
      6877b0ee
  5. Sep 21, 2020
  6. Sep 18, 2020
  7. Sep 06, 2020
  8. Sep 22, 2020
  9. Sep 16, 2020
    • Kyle Lippincott's avatar
      branchmap: add a cache validation cache, avoid expensive re-hash on every use · 89f0d9f8
      Kyle Lippincott authored
      In a pathological `hg log` case, we end up executing the branchmap validity
      checking twice per commit displayed. Or maybe we always do, and I just noticed
      because it's really slow in this repo for some reason.
      
      Before:
      ```
        Time (mean ± σ):      9.816 s ±  0.071 s    [User: 9.435 s, System: 0.392 s]
      
        Range (min … max):    9.709 s …  9.920 s
      ```
      
      After:
      ```
        Time (mean ± σ):      8.671 s ±  0.078 s    [User: 8.309 s, System: 0.392 s]
      
        Range (min … max):    8.594 s …  8.816 s
      ```
      
      Differential Revision: https://phab.mercurial-scm.org/D9023
      89f0d9f8
  10. Sep 21, 2020
  11. Sep 16, 2020
    • Antoine cezar's avatar
      run-test: allow relative path in `--blacklist` and `--whitelist` (issue6351) · 22140fd7
      Antoine cezar authored
      When specifying a test with `--blacklist` or `--whitelist` with path relatives
      to the repository root (eg: `tests/test-check-commit.t`) the file is not taken
      into account. It only works when the name of the test is given.
      
      It would be better if `--blacklist` and `--whitelist` behaviors where compatible
      with `--test-list`.
      
      This patch allows to use relative path with `--blacklist` and `--whitelist`
      while staying compatible with the old behavior by checking the test relative
      path in addition to its name.
      
      Differential Revision: https://phab.mercurial-scm.org/D9024
      22140fd7
  12. Sep 18, 2020
  13. Sep 15, 2020
  14. Sep 17, 2020
  15. Sep 18, 2020
  16. Sep 13, 2020
  17. Sep 18, 2020
  18. Sep 15, 2020
  19. Sep 16, 2020
  20. Sep 18, 2020
  21. Sep 16, 2020
    • Martin von Zweigbergk's avatar
      mergestate: move most of of reset() into start() · 9ea4b52a
      Martin von Zweigbergk authored
      `ms.reset()` has somehow become a combination of two different things:
      
       1. A constructor-like function creating an empty instance
       2. A call to `shutil.rmtree()` to clear the mergestate.
      
      It seems that all callers now care only about the latter (since we
      changed one caller to use the new `ms.start()` method instead). Let's
      move the code for the former into `start()`, since that's the only
      place it's needed.
      
      Differential Revision: https://phab.mercurial-scm.org/D9035
      9ea4b52a
  22. Sep 17, 2020
  23. Sep 16, 2020
  24. Sep 17, 2020
  25. Sep 03, 2020
  26. Jun 25, 2020
  27. Sep 18, 2020
Loading