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
57 lines
1.5 KiB
Perl
57 lines
1.5 KiB
Perl
https://bz.mercurial-scm.org/2137
|
|
|
|
Setup:
|
|
|
|
create a little extension that has 3 side-effects:
|
|
1) ensure changelog data is not inlined
|
|
2) make revlog to use lazyparser
|
|
3) test that repo.lookup() works
|
|
1 and 2 are preconditions for the bug; 3 is the bug.
|
|
|
|
$ cat > commitwrapper.py <<EOF
|
|
> from edenscm.mercurial import extensions, node, revlog
|
|
>
|
|
> def reposetup(ui, repo):
|
|
> class wraprepo(repo.__class__):
|
|
> def commit(self, *args, **kwargs):
|
|
> result = super(wraprepo, self).commit(*args, **kwargs)
|
|
> tip1 = node.short(repo.changelog.tip())
|
|
> tip2 = node.short(repo.lookup(tip1))
|
|
> assert tip1 == tip2
|
|
> ui.write('new tip: %s\n' % tip1)
|
|
> return result
|
|
> repo.__class__ = wraprepo
|
|
>
|
|
> def extsetup(ui):
|
|
> revlog._maxinline = 8 # split out 00changelog.d early
|
|
> revlog._prereadsize = 8 # use revlog.lazyparser
|
|
> EOF
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> commitwrapper = `pwd`/commitwrapper.py
|
|
> EOF
|
|
|
|
$ hg init repo1
|
|
$ cd repo1
|
|
$ echo a > a
|
|
$ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'
|
|
adding a
|
|
new tip: 553596fad57b
|
|
|
|
Test that new changesets are visible to repo.lookup():
|
|
|
|
$ echo a >> a
|
|
$ hg commit -m'one more commit to demonstrate the bug'
|
|
new tip: 799ae3599e0e
|
|
|
|
$ hg tip
|
|
changeset: 1:799ae3599e0e
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: one more commit to demonstrate the bug
|
|
|
|
|
|
$ cd ..
|