Skip to content
Snippets Groups Projects
  1. Sep 18, 2020
  2. Sep 24, 2020
  3. Sep 01, 2020
  4. Sep 03, 2020
    • Valentin Gatien-Baron's avatar
      chg: make is possible to call by default an hg binary located next to chg · 4c8d9b53b1c7
      Valentin Gatien-Baron authored
      When a single version of hg is in use and it's in the PATH, using chg
      is just a matter of calling chg.
      
      But when there are multiple installations of hg+chg around, and hg is
      referred to with an absolute path, using chg is more annoying because
      it requires both changing the invocation to hg to use chg, but also
      setting CHGHG.
      
      Currently, we set HGPATH when we build chg to remove the need to set
      CHGHG in the previous paragraph. But that means chg now hardcodes its
      installation path, which makes the installation not relocatable. Hence
      this proposal to make chg find ./hg relative to itself (as opposed to
      CHGHG=./hg which find hg relative to cwd).
      
      This only works on linux as written, but since it's opt-in, it sounds
      fine.
      
      Tested by hand, as I'm not sure how else to test this.
      
      Differential Revision: https://phab.mercurial-scm.org/D9006
      4c8d9b53b1c7
  5. Sep 23, 2020
  6. Sep 18, 2020
  7. Sep 23, 2020
  8. Sep 18, 2020
  9. Sep 23, 2020
    • Martin von Zweigbergk's avatar
      largefiles: prevent in-memory merge instead of switching to on-disk · e5e1285b6f6f
      Martin von Zweigbergk authored
      I enabled in-memory merge by default while testing some changes. I
      spent quite some time troubleshooting why largefiles was still
      creating an on-disk mergestate. Then I found out that it ignores the
      callers `wc` argument to `mergemod._update()` and always uses on-disk
      merge. This patch changes that so we raise an error if largefiles is
      used with in-memory merge. That way we'll notice if in-memory merge is
      used with largefiles instead of silently replacing ignoring the
      `overlayworkingctx` instance and updating the working copy instead.
      
      I felt a little bad that this would break things more for users with
      both largefiles and in-memory rebase enabled. So I also added a
      higher-level override to make sure that largefiles disables in-memory
      rebase. It turns out that that fixes `run-tests.py -k largefiles
      --extra-config-opt rebase.experimental.inmemory=1`.
      
      Differential Revision: https://phab.mercurial-scm.org/D9069
      e5e1285b6f6f
  10. Sep 21, 2020
  11. Sep 18, 2020
  12. Sep 15, 2020
  13. Sep 11, 2020
  14. Sep 15, 2020
  15. Sep 09, 2020
    • Antoine Cezar's avatar
      rhg: add `--revision` argument to `rhg files` · 2f8227a12592
      Antoine Cezar authored
      Add the option to list the tracked files of a revision given its number
      or full node id.
      
      Benched on a clone of moz-central
      where tip is 1671467:81deaa1a68ebb28db0490954034ab38ab269409d
      
      files -r 81deaa1a68ebb28db0490954034ab38ab269409d > out.txt
      hg  0m1.633s
      rhg 0m0.157s
      
      files -r 81deaa1a68ebb28db0490954034ab38ab269409d > /dev/null
      hg  0m0.415s
      rhg 0m0.143s
      
      Differential Revision: https://phab.mercurial-scm.org/D9015
      2f8227a12592
  16. Sep 18, 2020
  17. Sep 09, 2020
  18. Sep 18, 2020
  19. Sep 09, 2020
  20. Sep 02, 2020
  21. Sep 23, 2020
  22. Aug 17, 2020
  23. Sep 09, 2020
  24. Aug 13, 2020
  25. Sep 04, 2020
  26. Sep 16, 2020
  27. Sep 09, 2020
    • Pulkit Goyal's avatar
      mergestate: introduce a new ACTION_KEEP_NEW · 6877b0ee5f9d
      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
      6877b0ee5f9d
  28. Sep 21, 2020
  29. Sep 18, 2020
  30. Sep 06, 2020
  31. Sep 22, 2020
  32. Sep 16, 2020
    • Kyle Lippincott's avatar
      branchmap: add a cache validation cache, avoid expensive re-hash on every use · 89f0d9f87701
      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
      89f0d9f87701
  33. Sep 21, 2020
Loading