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
92 lines
2.5 KiB
Perl
92 lines
2.5 KiB
Perl
|
|
$ . "$TESTDIR/library.sh"
|
|
|
|
generaldelta to generaldelta interactions with bundle2 but legacy clients
|
|
without changegroup2 support
|
|
$ cat > testcg2.py << EOF
|
|
> from edenscm.mercurial import changegroup, registrar, util
|
|
> import sys
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
> @command('testcg2', norepo=True)
|
|
> def testcg2(ui):
|
|
> if not util.safehasattr(changegroup, 'cg2packer'):
|
|
> sys.exit(80)
|
|
> EOF
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> testcg2 = $TESTTMP/testcg2.py
|
|
> EOF
|
|
$ hg testcg2 || exit 80
|
|
|
|
$ cat > disablecg2.py << EOF
|
|
> from edenscm.mercurial import changegroup, util, error
|
|
> deleted = False
|
|
> def reposetup(ui, repo):
|
|
> global deleted
|
|
> if deleted:
|
|
> return
|
|
> packermap = changegroup._packermap
|
|
> # protect against future changes
|
|
> if len(packermap) != 3:
|
|
> raise error.Abort('packermap has %d versions, expected 3!' % len(packermap))
|
|
> for k in ['01', '02', '03']:
|
|
> if not packermap.get(k):
|
|
> raise error.Abort("packermap doesn't have key '%s'!" % k)
|
|
>
|
|
> del packermap['02']
|
|
> deleted = True
|
|
> EOF
|
|
|
|
$ hginit master
|
|
$ grep generaldelta master/.hg/requires
|
|
generaldelta
|
|
$ cd master
|
|
preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [remotefilelog]
|
|
> server=True
|
|
> [experimental]
|
|
> bundle2-exp = True
|
|
> [server]
|
|
> preferuncompressed = False
|
|
> EOF
|
|
$ echo x > x
|
|
$ hg commit -qAm x
|
|
|
|
$ cd ..
|
|
|
|
$ hgcloneshallow ssh://user@dummy/master shallow -q --pull --config experimental.bundle2-exp=True
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
|
|
$ cd shallow
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [extensions]
|
|
> disablecg2 = $TESTTMP/disablecg2.py
|
|
> EOF
|
|
|
|
$ cd ../master
|
|
$ echo y > y
|
|
$ hg commit -qAm y
|
|
|
|
$ cd ../shallow
|
|
$ hg pull -u
|
|
pulling from ssh://user@dummy/master
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
new changesets d34c38483be9
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
|
|
|
|
$ echo a > a
|
|
$ hg commit -qAm a
|
|
$ hg push
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: adding changesets
|
|
remote: adding manifests
|
|
remote: adding file changes
|
|
remote: added 1 changesets with 1 changes to 1 files
|