Skip to content
Snippets Groups Projects
  1. Jan 15, 2021
    • Jörg Sonnenberger's avatar
      branchmap: update rev-branch-cache incrementally · 3e91d9978bec
      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
      3e91d9978bec
  2. Jan 18, 2021
  3. Jan 15, 2021
  4. Jan 22, 2021
  5. Jan 18, 2021
  6. May 11, 2020
  7. May 28, 2020
  8. May 18, 2020
  9. Jan 15, 2021
  10. Jan 17, 2021
  11. Jan 18, 2021
  12. Jan 19, 2021
    • Martin von Zweigbergk's avatar
      resolve: also detect new :mergediff conflict markers · 0c95b59a89f1
      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
      0c95b59a89f1
    • Martin von Zweigbergk's avatar
      simplemerge: delete unused find_unconflicted() · 98e3a693061a
      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
      98e3a693061a
  13. Dec 04, 2020
  14. Jan 19, 2021
  15. Jan 18, 2021
  16. Jan 15, 2021
  17. Jan 18, 2021
    • Pulkit Goyal's avatar
      share: rework config options to be much clearer and easier · 25be21ec6c65
      Pulkit Goyal authored
      Recently I implemented various boolean configs which control how to behave when
      there is a share-safe mismatch between source and share repository. Mismatch
      means that source supports share-safe where as share does not or vice versa.
      
      However, while discussion and documentation we realized that it's too
      complicated and there are some combinations of values which makes no sense.
      
      We decided to introduce a config option with 4 possible values which
      makes controlling and understanding things easier.
      
      The config option `share.safe-mismatch.source-{not-}safe` can have
      following 4 values:
      
      * abort (default): error out if there is mismatch
      * allow: allow to work with respecting share source configuration
      * {up|down}grade-abort: try to {up|down}grade, if it fails, abort
      * {up|down}grade-allow: try to {up|down}grade, if it fails, continue in allow
      mode
      
      
      I am not sure if I can explain 3 config options which I deleted right now in
      just 5 lines which is a sign of how complex they became.
      
      No test changes demonstrate that functionality is same, only names have changed.
      
      Differential Revision: https://phab.mercurial-scm.org/D9785
      25be21ec6c65
    • Pulkit Goyal's avatar
      share: move share safe functionality out of experimental · 4b0192f592cf
      Pulkit Goyal authored
      The share-safe functionality is complete and all configuration options are
      implemented. The behavior is well discussed on mailing list and in reviews.
      
      Let's unmark this as experimental to solve a chichen and egg issue.
      
      Differential Revision: https://phab.mercurial-scm.org/D9823
      4b0192f592cf
  18. Jan 15, 2021
  19. Jan 18, 2021
    • Pulkit Goyal's avatar
      share: rework config options to be much clearer and easier · cc3452d2dfa4
      Pulkit Goyal authored
      Recently I implemented various boolean configs which control how to behave when
      there is a share-safe mismatch between source and share repository. Mismatch
      means that source supports share-safe where as share does not or vice versa.
      
      However, while discussion and documentation we realized that it's too
      complicated and there are some combinations of values which makes no sense.
      
      We decided to introduce a config option with 4 possible values which
      makes controlling and understanding things easier.
      
      The config option `share.safe-mismatch.source-{not-}safe` can have
      following 4 values:
      
      * abort (default): error out if there is mismatch
      * allow: allow to work with respecting share source configuration
      * {up|down}grade-abort: try to {up|down}grade, if it fails, abort
      * {up|down}grade-allow: try to {up|down}grade, if it fails, continue in allow
      mode
      
      
      I am not sure if I can explain 3 config options which I deleted right now in
      just 5 lines which is a sign of how complex they became.
      
      No test changes demonstrate that functionality is same, only names have changed.
      
      Differential Revision: https://phab.mercurial-scm.org/D9785
      cc3452d2dfa4
  20. Jan 14, 2021
  21. Jan 18, 2021
  22. Jan 14, 2021
  23. Jan 18, 2021
  24. Jan 15, 2021
  25. Jan 17, 2021
  26. Dec 09, 2020
    • Matt Harbison's avatar
      windows: wrap `os.getcwd()` in `os.path.realpath()` on py3 · 3dfebba99ef6
      Matt Harbison authored
      I noticed various `test-check-*` failures that were printing absolute paths
      when repo relative paths were expected.  This was due to the drive letter in
      `repo.root` being uppercased as it is run through `os.path.realpath()`, and then
      the simple string comparison against the (lowercased) `_cwd` member of dirstate
      in `dirstate.getcwd()` causing an absolute path to be returned, instead of the
      expected `b''`.  That in turn causes `scmutil.getuipathfn()` to wrongly use
      `repo.pathto()` with an absolute cwd path.
      .
      
      Differential Revision: https://phab.mercurial-scm.org/D9806
      3dfebba99ef6
Loading