Skip to content
Snippets Groups Projects
  1. Feb 20, 2022
  2. Mar 02, 2022
    • Gregory Szorc's avatar
      py3: use pickle directly · df56e6bd
      Gregory Szorc authored
      pycompat.pickle abstracted over the different pickle modules in
      Python 2 and 3. Now that we're Python 3 only, it is safe to use the
      `pickle` module directly. So this commit does that.
      
      As part of this we remove the rules from check-code.py that were
      forbidden direct pickle module use.
      
      We retain the `util.pickle` symbol for backwards compatibility, just
      in case some extensions were using it.
      
      Differential Revision: https://phab.mercurial-scm.org/D12249
      df56e6bd
  3. Feb 20, 2022
  4. Feb 18, 2022
  5. Feb 22, 2022
  6. Feb 17, 2022
  7. Feb 15, 2022
  8. Feb 16, 2022
  9. Feb 12, 2022
    • Martin von Zweigbergk's avatar
      filemerge: put temporary files in single temp dir by default · b70c9697
      Martin von Zweigbergk authored
      The feature introduced in D2888 seems like a pure improvement to
      me. It makes the names' of temporary file easier to read. Let's have
      it always enabled.
      
      I also removed the config option for the path prefix because it
      doesn't seem useful. I asked Kyle (the author of the feature) about it
      and he couldn't think of a reason to keep it. I suspect it was just
      that we to have a config to turn it on/off while it was experimental,
      so it might as well be a configurable prefix then.
      
      Differential Revision: https://phab.mercurial-scm.org/D12171
      b70c9697
  10. Feb 15, 2022
  11. Feb 07, 2022
  12. Feb 14, 2022
  13. Feb 11, 2022
  14. Jan 28, 2022
  15. Feb 08, 2022
    • Martin von Zweigbergk's avatar
      filemerge: move check for identical sides out of filemerge() · 93d6f0e7
      Martin von Zweigbergk authored
      `filemerge.filemerge()` returns `None` if no merge was necessary
      because the two sides were identical. I don't think it should be that
      function's responsibility to handle that case; we should ideally not
      even call `filemerge.filemerge()` if the two inputs identical. This
      patch therefore moves the check out to the caller (`mergestate.py`).
      
      The largefiles test changed because we now notice that the two sides
      made the same change, so we don't consider it a merge. Also note that
      the new message better matches the line above it in the test output.
      
      Differential Revision: https://phab.mercurial-scm.org/D12154
      93d6f0e7
  16. Feb 03, 2022
  17. Feb 07, 2022
    • sliquister's avatar
      sparse: rework debugsparse's interface · a6efb918
      sliquister authored
      hg debugsparse supports arguments like --include, similar to `hg
      tracked --addinclude` or `hg log --include`. But in `hg debugsparse`,
      the pattern is not an argument of the flag, instead the patterns are
      the anonymous command line arguments.
      
      Not only is this surprising, it makes it impossible to use --include
      and --exclude in the same invocation, or --reset --exclude.
      
      So I propose making debugsparse making --include, --exclude take an
      argument, and rejecting anonymous command line arguments, as well as
      allowing mixing several of these flags in one invocations.
      
      Differential Revision: https://phab.mercurial-scm.org/D12155
      a6efb918
  18. Feb 10, 2022
  19. Feb 08, 2022
  20. Feb 10, 2022
  21. Feb 03, 2022
    • Pierre-Yves David's avatar
      narrow: allow merging non-conflicting change outside of the narrow spec · f1eb77dc
      Pierre-Yves David authored
      We use the mergestate to carry information about these merge action and
      reprocess them at commit time to apply the necessary update.
      
      The dirstate itself is never affected and remains "pure", with content only in
      the narrow-spec. This file involved in such merge are therefor not listed in `hg
      status`.
      
      The current testing is based on a modification of the previous testing, that
      refused to do such merges. As a result it is a bit simple and more extensive
      code and testing testing will have to be introduced later. I am planning to do
      this extra testing, soon.
      
      In addition, this only works for flat manifest. Support for tree manifest will
      need more work. I am not currently planning to do this work.
      
      Differential Revision: https://phab.mercurial-scm.org/D12119
      f1eb77dc
Loading