mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +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
68 lines
2.2 KiB
Perl
68 lines
2.2 KiB
Perl
$ . "$TESTDIR/hgsql/library.sh"
|
|
|
|
# Populate the db with an initial commit
|
|
|
|
$ initclient client
|
|
$ cd client
|
|
$ echo x > x
|
|
$ hg commit -qAm x
|
|
$ echo y > y
|
|
$ hg commit -qAm y
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo z > z
|
|
$ hg commit -qAm z
|
|
$ cd ..
|
|
|
|
$ initserver master masterrepo
|
|
$ cd master
|
|
$ hg log
|
|
$ hg pull -q ../client
|
|
|
|
# Strip middle commit, verify sync fails
|
|
|
|
$ hg strip -r 1 --config hgsql.bypass=True
|
|
saved backup bundle to $TESTTMP/master/.hg/strip-backup/d34c38483be9-3839604f-backup.hg (glob)
|
|
- The huge number in the output below is because we're trying to apply rev 0
|
|
(which contains the generaldelta bit in the offset int) to a non-rev 0
|
|
location (so the generaldelta bit isn't stripped before the comparison)
|
|
$ hg log -l 1 2>&1 | egrep 'Corruption'
|
|
edenscm.hgext.hgsql.CorruptionException: revision offset doesn't match prior length (12884967424 offset vs 3 length): data/z.i
|
|
|
|
# Recover middle commit, but on top, then try syncing (succeeds)
|
|
|
|
$ hg unbundle -q $TESTTMP/master/.hg/strip-backup/d34c38483be9-3839604f-backup.hg --config hgsql.bypass=True
|
|
$ hg log -l 1
|
|
changeset: 2:d34c38483be9
|
|
tag: tip
|
|
parent: 0:b292c1e3311f
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: y
|
|
|
|
$ cd ..
|
|
|
|
# Attempt to pull new commit should fail because base rev is wrong due to reordering
|
|
|
|
$ cd client
|
|
$ echo a > a
|
|
$ hg commit -qAm a
|
|
$ cd ../master
|
|
$ hg pull ../client 2>&1 | egrep 'Corruption'
|
|
edenscm.hgext.hgsql.CorruptionException: expected node d34c38483be9d08f205eaae60c380a29b48e0189 at rev 1 of 00changelog.i but found bc3a71defa4a8fb6e8e5c192c02a26d94853d281
|
|
|
|
# Fix ordering, can pull now
|
|
|
|
$ hg strip -r 1 --config hgsql.bypass=True
|
|
saved backup bundle to $TESTTMP/master/.hg/strip-backup/bc3a71defa4a-48128f20-backup.hg (glob)
|
|
$ hg unbundle -q $TESTTMP/master/.hg/strip-backup/bc3a71defa4a-48128f20-backup.hg --config hgsql.bypass=True
|
|
$ hg pull ../client
|
|
pulling from ../client
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets ef1c83e819f1
|
|
(run 'hg update' to get a working copy)
|