Mercurial > hg
view tests/test-narrow-update.t @ 46097:1b5e0d0bdb05
hghave: update the check for virtualenv
This started as `hghave --test-features` failing on Windows in `test-hghave.t`.
IDK how this worked, as neither my Linux nor Windows machines have the old
attribute with virtualenv 20.2.2, even on py2. I think this was noticed
recently because 357d8415aa27 mentioned an AttributeError, and mitigated by
making this py2 only. But as mentioned, this is also a problem on py2 (where
the failure was observed).
When I got this working by removing the attribute reference, the command in the
test failed because the `--no-site-package` argument was removed some time ago.
Therefore, this backs out 357d8415aa27 and references a known good attribute
(which was done to suppress the warning about an unused import) that also
ensures the command does not need the argument. Since there appears to be
(minor) broken stuff on py3, manually apply the `no-py3` guard that was backed
out of the check itself.
Differential Revision: https://phab.mercurial-scm.org/D9547
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 08 Dec 2020 12:43:18 -0500 |
parents | 351cbda889db |
children | ccd76e292be5 |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" create full repo $ hg init master $ cd master $ echo init > init $ hg ci -Aqm 'initial' $ mkdir inside $ echo inside > inside/f1 $ mkdir outside $ echo outside > outside/f1 $ hg ci -Aqm 'add inside and outside' $ echo modified > inside/f1 $ hg ci -qm 'modify inside' $ echo modified > outside/f1 $ hg ci -qm 'modify outside' $ cd .. $ hg clone --narrow ssh://user@dummy/master narrow --include inside requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 2 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow $ hg debugindex -c rev linkrev nodeid p1 p2 0 0 9958b1af2add 000000000000 000000000000 1 1 2db4ce2a3bfe 9958b1af2add 000000000000 2 2 0980ee31a742 2db4ce2a3bfe 000000000000 3 3 4410145019b7 0980ee31a742 000000000000 $ hg update -q 0 Can update to revision with changes inside $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update to revision with changes outside $ hg update -q 'desc("modify outside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update with a deleted file inside $ hg rm inside/f1 $ hg update -q 'desc("modify inside")' $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("initial")' $ hg update -q 'desc("modify inside")' Can update with a moved file inside $ hg mv inside/f1 inside/f2 $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")'