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
54 lines
1.7 KiB
Python
54 lines
1.7 KiB
Python
import test_hgsubversion_util
|
|
from edenscm.mercurial import commands, hg
|
|
|
|
|
|
class TestHooks(test_hgsubversion_util.TestBase):
|
|
def setUp(self):
|
|
super(TestHooks, self).setUp()
|
|
|
|
def _loadupdate(self, fixture_name, *args, **kwargs):
|
|
kwargs = kwargs.copy()
|
|
kwargs.update(noupdate=False)
|
|
repo, repo_path = self.load_and_fetch(fixture_name, *args, **kwargs)
|
|
return repo, repo_path
|
|
|
|
def test_updatemetahook(self):
|
|
repo, repo_path = self._loadupdate("single_rev.svndump")
|
|
self.add_svn_rev(repo_path, {"trunk/alpha": "Changed"})
|
|
commands.pull(self.repo.ui, self.repo)
|
|
|
|
# Clone to a new repository and add a hook
|
|
new_wc_path = "%s-2" % self.wc_path
|
|
commands.clone(self.repo.ui, self.wc_path, new_wc_path)
|
|
newrepo = hg.repository(test_hgsubversion_util.testui(), new_wc_path)
|
|
newrepo.ui.setconfig(
|
|
"hooks",
|
|
"changegroup.meta",
|
|
"python:hgext.hgsubversion.hooks.updatemeta.hook",
|
|
)
|
|
|
|
# Commit a rev that should trigger svn meta update
|
|
self.add_svn_rev(repo_path, {"trunk/alpha": "Changed Again"})
|
|
commands.pull(self.repo.ui, self.repo)
|
|
|
|
self.called = False
|
|
from edenscm.hgext.hgsubversion import svncommands
|
|
|
|
oldupdatemeta = svncommands.updatemeta
|
|
|
|
def _updatemeta(ui, repo, args=[]):
|
|
self.called = True
|
|
|
|
svncommands.updatemeta = _updatemeta
|
|
|
|
# Pull and make sure our updatemeta function gets called
|
|
commands.pull(newrepo.ui, newrepo)
|
|
svncommands.updatemeta = oldupdatemeta
|
|
self.assertTrue(self.called)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import silenttestrunner
|
|
|
|
silenttestrunner.main(__name__)
|