mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
53 lines
1.3 KiB
Perl
53 lines
1.3 KiB
Perl
#require no-icasefs
|
|
|
|
Test sparse profiles in combination with case-collisions outside of the
|
|
profile.
|
|
|
|
$ cat > force_case_insensitivity.py <<EOF
|
|
> # We force the issue at update time, by monkey-patching util.fscasesensitive
|
|
> # and util.normcase to act like a case-insensitive filesystem
|
|
> from edenscm.mercurial import encoding, util
|
|
> util.fscasesensitive = lambda *args: False
|
|
> util.normcase = lambda p: encoding.upper(p)
|
|
> EOF
|
|
|
|
$ hg init myrepo
|
|
$ cd myrepo
|
|
$ cat > .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> sparse=
|
|
> EOF
|
|
|
|
$ mkdir profiles
|
|
$ cat > profiles/sparse_profile <<EOF
|
|
> [exclude]
|
|
> colliding_dir
|
|
> EOF
|
|
$ hg add profiles -q
|
|
$ hg commit -m 'profiles'
|
|
|
|
$ mkdir colliding_dir
|
|
$ cd colliding_dir
|
|
|
|
$ echo a > a
|
|
$ echo A > A
|
|
$ hg add A a
|
|
warning: possible case-folding collision for colliding_dir/a
|
|
$ hg commit -m '#1'
|
|
$ cd ..
|
|
$ hg up -r 0
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
The case collision is ignored when the sparse profile is enabled:
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> force_case_insensitivity=../force_case_insensitivity.py
|
|
> EOF
|
|
$ hg up -r 1
|
|
abort: case-folding collision between colliding_dir/[Aa] and colliding_dir/[aA] (re)
|
|
[255]
|
|
$ hg sparse --enable-profile profiles/sparse_profile
|
|
$ hg up -r 1
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|