Skip to content
Snippets Groups Projects
  1. Sep 09, 2021
    • 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
      58fe6d127a01
  2. Sep 17, 2021
  3. Sep 10, 2021
    • 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
      5b9de38a0356
    • Valentin Gatien-Baron's avatar
      cc33deae66a1
  4. Sep 07, 2021
    • 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
      053dd53a0b59
  5. Aug 30, 2021
  6. Aug 27, 2021
  7. Aug 26, 2021
  8. Aug 25, 2021
  9. Aug 22, 2021
    • Matt Harbison's avatar
      windows: degrade to py2 behavior when reading a non-symlink as a symlink · 4162f6b40f2c
      Matt Harbison authored
      While waiting for the push to hg-committed in WSL to complete, I ran a
      `phabimport` from Windows and got this traceback:
      
          $ hg phabimport 11313
          ** Unknown exception encountered with possibly-broken third-party extension "mercurial_keyring" (version N/A)
          ** which supports versions unknown of Mercurial.
          ** Please disable "mercurial_keyring" and try your action again.
          ** If that fixes the bug please report it to https://foss.heptapod.net/mercurial/mercurial_keyring/issues
          ** Python 3.9.5 (default, May  6 2021, 17:29:31) [MSC v.1928 64 bit (AMD64)]
          ** Mercurial Distributed SCM (version 5.9rc1+hg32.0e2f5733563d)
          ** Extensions loaded: absorb, blackbox, evolve 10.3.3, extdiff, fastannotate, fix, mercurial_keyring, mq, phabblocker 20210126, phabricator, rebase, show, strip, topic 0.22.3
          Traceback (most recent call last):
            File "mercurial.lock", line 279, in _trylock
            File "mercurial.vfs", line 202, in makelock
            File "mercurial.util", line 2147, in makelock
          FileExistsError: [WinError 183] Cannot create a file when that file already exists: b'hp-omen:78348' -> b'C:\\Users\\Matt\\hg/.hg/store/lock'
      
          During handling of the above exception, another exception occurred:
      
          Traceback (most recent call last):
            File "<string>", line 24, in <module>
            File "mercurial.dispatch", line 144, in run
            File "mercurial.dispatch", line 250, in dispatch
            File "mercurial.dispatch", line 294, in _rundispatch
            File "mercurial.dispatch", line 470, in _runcatch
            File "mercurial.dispatch", line 480, in _callcatch
            File "mercurial.scmutil", line 153, in callcatch
            File "mercurial.dispatch", line 460, in _runcatchfunc
            File "mercurial.dispatch", line 1273, in _dispatch
            File "mercurial.dispatch", line 918, in runcommand
            File "mercurial.dispatch", line 1285, in _runcommand
            File "mercurial.dispatch", line 1271, in <lambda>
            File "mercurial.util", line 1886, in check
            File "mercurial.util", line 1886, in check
            File "hgext.mq", line 4239, in mqcommand
            File "mercurial.util", line 1886, in check
            File "mercurial.util", line 1886, in check
            File "hgext.phabricator", line 314, in inner
            File "hgext.phabricator", line 2222, in phabimport
            File "hgext.phabricator", line 2123, in readpatch
            File "hgext.phabricator", line 2199, in _write
            File "mercurial.localrepo", line 2956, in lock
            File "mercurial.localrepo", line 2918, in _lock
            File "mercurial.lock", line 152, in trylock
            File "mercurial.lock", line 283, in _trylock
            File "mercurial.lock", line 314, in _readlock
            File "mercurial.vfs", line 221, in readlock
            File "mercurial.util", line 2163, in readlock
            File "mercurial.windows", line 619, in readlink
          ValueError: not a symbolic link
      
      Both exceptions look accurate (the file exists, and the Windows side can't read
      WSL side symlinks).  I didn't try to reproduce this entirely within the Windows
      side, but we can do better than a cryptic stacktrace.  With this change, the
      same scenario results in this abort:
      
          abort: C:\Users\Matt\hg/.hg/store/lock: The file cannot be accessed by the system
      
      When both the `push` and `phabimport` are done on the Windows side, it prints a
      message about waiting for the lock, and successfully applies the patch after the
      push completes.
      
      I'm not sure if there's enough info to be able to convert the abort into the
      wait scenario.  As it stands now, we don't support symlinks on Windows, which
      requires either a UAC Administrator level process or an opt-in in developer
      mode, and there are several places where the new symlink on Windows support in
      py3 was explicitly disabled in order to get tests to pass quicker.
      
      Differential Revision: https://phab.mercurial-scm.org/D11333
      4162f6b40f2c
  10. Aug 19, 2021
  11. Aug 18, 2021
    • Matt Harbison's avatar
      zeroconf: fix an issue concatenating bytes and str · ad2c37075f46
      Matt Harbison authored
      `bytes(length)` doesn't do what we want, so use `str`.
      
      There appear to be a ton more issues in this extension, including:
      
          - globals()[b'_GLOBAL_DONE'] using bytes as the key
          - `__author__` and similar using bytes
          - `BadDomainName` is feeding bytes to the Exception constructor
          - DNSRecord.toString() has the wrong signature (should be str, not bytes)
      
      Differential Revision: https://phab.mercurial-scm.org/D11303
      ad2c37075f46
  12. Aug 24, 2021
  13. Aug 19, 2021
  14. Aug 16, 2021
  15. Aug 18, 2021
Loading