mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +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
76 lines
2.1 KiB
Perl
76 lines
2.1 KiB
Perl
|
|
$ . "$TESTDIR/library.sh"
|
|
|
|
Set up an extension to make sure remotefilelog clientsetup() runs
|
|
unconditionally even if we have never used a local shallow repo.
|
|
This mimics behavior when using remotefilelog with chg. clientsetup() can be
|
|
triggered due to a shallow repo, and then the code can later interact with
|
|
non-shallow repositories.
|
|
|
|
$ cat > setupremotefilelog.py << EOF
|
|
> from edenscm.mercurial import extensions
|
|
> def extsetup(ui):
|
|
> remotefilelog = extensions.find('remotefilelog')
|
|
> remotefilelog.onetimeclientsetup(ui)
|
|
> EOF
|
|
|
|
Set up the master repository to pull from.
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [remotefilelog]
|
|
> server=True
|
|
> EOF
|
|
$ echo x > x
|
|
$ hg commit -qAm x
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone ssh://user@dummy/master child -q
|
|
|
|
We should see the remotefilelog capability here, which advertises that
|
|
the server supports our custom getfiles method.
|
|
|
|
$ cd master
|
|
$ echo 'hello' | hg -R . serve --stdio
|
|
* (glob)
|
|
capabilities: lookup * remotefilelog getflogheads getfile (glob)
|
|
$ echo 'capabilities' | hg -R . serve --stdio ; echo
|
|
* (glob)
|
|
* remotefilelog getflogheads getfile (glob)
|
|
|
|
Pull to the child repository. Use our custom setupremotefilelog extension
|
|
to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without
|
|
using chg it normally would not be run in this case since the local repository
|
|
is not shallow.)
|
|
|
|
$ echo y > y
|
|
$ hg commit -qAm y
|
|
|
|
$ cd ../child
|
|
$ hg pull --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py
|
|
pulling from ssh://user@dummy/master
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets d34c38483be9
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg up
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cat y
|
|
y
|
|
|
|
Test that bundle works in a non-remotefilelog repo w/ remotefilelog loaded
|
|
|
|
$ echo y >> y
|
|
$ hg commit -qAm "modify y"
|
|
$ hg bundle --base ".^" --rev . mybundle.hg --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py
|
|
1 changesets found
|
|
|
|
$ cd ..
|