##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

windows: degrade to py2 behavior when reading a non-symlink as a symlink...
windows: degrade to py2 behavior when reading a non-symlink as a symlink 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
marmoute - - Load All Authors

File last commit:

r48309:5decb7a4 default
r48680:4162f6b4 stable
Show More
Cargo.toml
32 lines | 778 B | application/toml | TOMLLexer
/ rust / hg-cpython / Cargo.toml
History | Source | Raw |Copy content |Copy permalink
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001 [package]
name = "hg-cpython"
version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"]
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
 r42828 edition = "2018"
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001
[lib]
name='rusthg'
crate-type = ["cdylib"]
[features]
Georges Racinet
rust-cpython: build and support for Python3...
 r41021 default = ["python27"]
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
 r43583 # Features to build an extension module:
Yuya Nishihara
rust-cpython: drop direct dependency on python(27|3)_sys...
 r43485 python27 = ["cpython/python27-sys", "cpython/extension-module-2-7"]
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
 r43583 python3 = ["cpython/python3-sys", "cpython/extension-module"]
Georges Racinet
rust-cpython: build and support for Python3...
 r41021
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
 r43583 # Enable one of these features to build a test executable linked to libpython:
# e.g. cargo test --no-default-features --features python27-bin
python27-bin = ["cpython/python27-sys"]
python3-bin = ["cpython/python3-sys"]
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001
[dependencies]
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
 r47330 crossbeam-channel = "0.4"
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
 r44786 hg-core = { path = "../hg-core"}
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001 libc = '*'
Raphaël Gomès
rust-status: add trace-level logging for Rust status fallback for debugging...
 r45062 log = "0.4.8"
Raphaël Gomès
rust-cpython: switch logging facade from `simple_logger` to `env_logger`...
 r46090 env_logger = "0.7.1"
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001
[dependencies.cpython]
marmoute
rust: bump rust-cpython version for 0.6.0...
 r48309 version = "0.6.0"
Georges Racinet
rust-cpython: start cpython crate bindings...
 r41001 default-features = false