1. 21 Oct, 2021 1 commit
  2. 20 Oct, 2021 1 commit
  3. 19 Oct, 2021 1 commit
  4. 20 Oct, 2021 1 commit
  5. 19 Oct, 2021 3 commits
  6. 18 Oct, 2021 1 commit
  7. 05 Oct, 2021 2 commits
  8. 28 Sep, 2021 1 commit
    • Raphaël Gomès's avatar
      windows-ci: temporarily allow Windows jobs to fail · 750920b18aaa
      Raphaël Gomès authored
      We have unfortunately ran out of free credit on the runners we were using from
      OVH for the Windows CI. We will be disabling the two remaining ones on the 30th
      of September, hence we need the CI to pass even if Windows jobs cannot start as
      a temporary measure. Hopefully we can find another way of getting Windows
      runners soon.
      
      Differential Revision: https://phab.mercurial-scm.org/D11499
      
      --HG--
      branch : stable
      750920b18aaa
  9. 21 Sep, 2021 5 commits
  10. 20 Sep, 2021 3 commits
    • Pierre-Yves David's avatar
      persistent-nodemap: use quiet upgrade in tests · ce01b97a93da
      Pierre-Yves David authored
      This make them less verbose while keeping the important information in the
      checked output.
      
      Differential Revision: https://phab.mercurial-scm.org/D11478
      
      --HG--
      branch : stable
      ce01b97a93da
    • Pierre-Yves David's avatar
      persistent-nodemap: fix a typo in a test comment · b833f8cbe199
      Pierre-Yves David authored
      oops.
      
      Differential Revision: https://phab.mercurial-scm.org/D11477
      
      --HG--
      branch : stable
      b833f8cbe199
    • Raphaël Gomès's avatar
      patchbomb: fix traceback on outgoing when not specifying revisions · ff2304dd3ba9
      Raphaël Gomès authored
      A user reported that `hg email -n -o` raised with the following traceback:
      
      ```
      ** unknown exception encountered, please report by visiting
      ** https://mercurial-scm.org/wiki/BugTracker
      ** Python 3.8.12 (default, Sep 13 2021, 22:12:54) [GCC 7.5.0]
      ** Mercurial Distributed SCM (version 5.9.1)
      ** Extensions loaded: patchbomb
      Traceback (most recent call last):
        File "/usr/pkg/bin/hg", line 61, in <module>
          dispatch.run()
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 144, in run
          status = dispatch(req)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 250, in dispatch
          status = _rundispatch(req)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 294, in _rundispatch
          ret = _runcatch(req) or 0
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 470, in _runcatch
          return _callcatch(ui, _runcatchfunc)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 480, in _callcatch
          return scmutil.callcatch(ui, func)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/scmutil.py", line 153, in callcatch
          return func()
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 460, in _runcatchfunc
          return _dispatch(req)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 1273, in _dispatch
          return runcommand(
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 918, in runcommand
          ret = _runcommand(ui, options, cmd, d)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 1285, in _runcommand
          return cmdfunc()
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/dispatch.py", line 1271, in <lambda>
          d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/util.py", line 1886, in check
          return func(*args, **kwargs)
        File "/usr/pkg/lib/python3.8/site-packages/hgext/patchbomb.py", line 817, in email
          revs = _getoutgoing(repo, dest, revs)
        File "/usr/pkg/lib/python3.8/site-packages/hgext/patchbomb.py", line 537, in _getoutgoing
          safe_paths = [urlutil.hidepassword(p.rawloc) for p in paths]
        File "/usr/pkg/lib/python3.8/site-packages/hgext/patchbomb.py", line 537, in <listcomp>
          safe_paths = [urlutil.hidepassword(p.rawloc) for p in paths]
        File "/usr/pkg/lib/python3.8/site-packages/mercurial/utils/urlutil.py", line 501, in get_push_paths
          msg %= dest
      TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'NoneType'
      ```
      
      This is due to patchbomb passing `[None]` in the `dests` parameter of the
      multi-paths outgoing function, we fix this in this change and add a
      non-regression test.
      
      Differential Revision: https://phab.mercurial-scm.org/D11456
      
      --HG--
      branch : stable
      ff2304dd3ba9
  11. 09 Sep, 2021 1 commit
    • Raphaël Gomès's avatar
      pep-517: remove the `build-backend` key to allow for users to build extensions · 58fe6d127a01
      Raphaël Gomès authored
      PEP 517 changed how projects should define their build dependencies.
      The presence of a `pyproject.toml` file changes the behavior of `pip` to
      conform to PEP 517.
      Since we haven't updated the `setup.py` file yet (I'm not even sure we're not
      an edge case which would make it harder/impossible, I have not tried yet), this
      is a workaround to issue6589: it allows users to pass `--no-use-pep517` to pip
      to revert to the legacy installer. The build backend is simply assumed to be
      the `build_meta:__legacy__` one.
      
      Differential Revision: https://phab.mercurial-scm.org/D11393
      
      --HG--
      branch : stable
      58fe6d127a01
  12. 17 Sep, 2021 4 commits
  13. 10 Sep, 2021 2 commits
    • Valentin Gatien-Baron's avatar
      narrow: fix commits of empty files · 5b9de38a0356
      Valentin Gatien-Baron authored
      The problem is that when committing a new file with empty contents (or
      in general empty file with filelog p1 = -1), hg commit with narrow
      doesn't create a filelog revision at all, which causes failures in
      further commands.
      
      The problem seems to be that:
      - hg thinks that instead of creating a new filelog revision, it can
        use the filelog's p1 (the nullrev)
      - because it thinks the file contents is the same in that revision and
        in p1
      - because `narrowfilelog.cmp(nullrev, b'')` is True (unlike with
        `filelog.cmp`)
      
      It's not clear to me which `cmp` behaves better. But I think it makes
      sense to change the commit code to not to "reuse" the null rev when
      adding an empty file with filelog p1 == filelog p2 == -1. This is
      consistent with never writing the null rev in the manifest, which `hg
      verify` claims is an invariant:
      
      ```
      inside/c@4: manifest refers to unknown revision 000000000000
      ```
      
      Differential Revision: https://phab.mercurial-scm.org/D11400
      
      --HG--
      branch : stable
      5b9de38a0356
    • Valentin Gatien-Baron's avatar
      narrow: show repo corruption when commiting empty files · cc33deae66a1
      Valentin Gatien-Baron authored
      Differential Revision: https://phab.mercurial-scm.org/D11399
      
      --HG--
      branch : stable
      cc33deae66a1
  14. 07 Sep, 2021 1 commit
    • Kyle Lippincott's avatar
      filemerge: be more strict when detecting conflict markers, add `|` markers · 053dd53a0b59
      Kyle Lippincott authored
      I received a user complaint about detecting a line that contained 78 `=`
      followed by `*/` as a conflict marker. We'll never generate that, we generate 7
      identical characters and either the end of the line, or a space. Let's be
      explicit about detecting exactly what we produce to reduce the chances of a
      false positive.
      
      While we're here, add `|||||||` as a detected conflict marker (generated with
      the `keep-merge3` style conflicts).
      
      Differential Revision: https://phab.mercurial-scm.org/D11391
      
      --HG--
      branch : stable
      053dd53a0b59
  15. 30 Aug, 2021 2 commits
  16. 27 Aug, 2021 5 commits
  17. 26 Aug, 2021 3 commits
  18. 25 Aug, 2021 3 commits