Skip to content
Snippets Groups Projects
  1. Jan 26, 2021
  2. Jan 25, 2021
  3. Dec 01, 2020
  4. Jan 14, 2021
  5. Dec 14, 2020
  6. Jan 14, 2021
  7. Dec 14, 2020
  8. Jan 20, 2021
  9. Jan 15, 2021
    • Jörg Sonnenberger's avatar
      branchmap: update rev-branch-cache incrementally · 3e91d997
      Jörg Sonnenberger authored
      Historically, the revision to branch mapping cache was updated on demand
      and shared via bundle2 to avoid the cost of rebuilding on first use.
      
      Use the new `register_changeset` callback and update rbc directly on
      every change. Make the transfer of the bundle part redundant, but keep
      it for the moment to avoid the test churn.
      
      Over all, "hg unbundle" for large bundles is less than 1.8% slower for
      different larger repositories and that seems to a reasonable trade off.
      
      Differential Revision: https://phab.mercurial-scm.org/D9781
      3e91d997
  10. Jan 18, 2021
  11. Jan 15, 2021
  12. Jan 22, 2021
  13. Jan 18, 2021
  14. May 11, 2020
  15. May 28, 2020
  16. May 18, 2020
  17. Jan 15, 2021
  18. Jan 17, 2021
  19. Jan 18, 2021
  20. Jan 19, 2021
    • Martin von Zweigbergk's avatar
      resolve: also detect new :mergediff conflict markers · 0c95b59a
      Martin von Zweigbergk authored
      The conflict markers created by `:mergediff` were not detected as
      conflicts, which affects both `commands.resolve.mark-check` and
      `mergetools.<tool>.check`. This patch fixes that.
      
      The new regex it uses for finding conflict markers is less restrictive
      because it `:mergediff` doesn't follow the `<<<<<<<` and `>>>>>>>`
      lines by a space (and a description). Hopefully lines like that don't
      give too many false positives. We can add back the space and make
      `:mergediff` add trailing spaces if it turns out to be a
      problem. OTOH, there will always be some false positives and we have
      ways of overriding the checks already.
      
      This patch can go onto the default or stable branch, depending on how
      much we care about an experimental feature.
      
      Differential Revision: https://phab.mercurial-scm.org/D9835
      0c95b59a
    • Martin von Zweigbergk's avatar
      simplemerge: delete unused find_unconflicted() · 98e3a693
      Martin von Zweigbergk authored
      The function has been unused ever since it was introduced in
      465b9ea02868 (Import 3-way merge code from bzr, 2007-04-16).
      
      Differential Revision: https://phab.mercurial-scm.org/D9832
      98e3a693
  21. Dec 04, 2020
  22. Jan 19, 2021
  23. Jan 18, 2021
  24. Jan 15, 2021
Loading