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
44 lines
1.1 KiB
Python
44 lines
1.1 KiB
Python
import test_hgsubversion_util
|
|
from edenscm.hgext.hgsubversion import wrappers
|
|
|
|
|
|
expected_diff_output = """Index: alpha
|
|
===================================================================
|
|
--- alpha\t(revision 3)
|
|
+++ alpha\t(working copy)
|
|
@@ -1,1 +1,3 @@
|
|
-file: alpha
|
|
+alpha
|
|
+
|
|
+added line
|
|
Index: foo
|
|
===================================================================
|
|
new file mode 100644
|
|
--- foo\t(revision 0)
|
|
+++ foo\t(working copy)
|
|
@@ -0,0 +1,1 @@
|
|
+This is missing a newline.
|
|
\ No newline at end of file
|
|
"""
|
|
|
|
|
|
class DiffTests(test_hgsubversion_util.TestBase):
|
|
def test_diff_output(self):
|
|
self._load_fixture_and_fetch("two_revs.svndump")
|
|
self.commitchanges(
|
|
[
|
|
("foo", "foo", "This is missing a newline."),
|
|
("alpha", "alpha", "alpha\n\nadded line\n"),
|
|
]
|
|
)
|
|
u = test_hgsubversion_util.testui()
|
|
u.pushbuffer()
|
|
wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True)
|
|
self.assertEqual(u.popbuffer(), expected_diff_output)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import silenttestrunner
|
|
|
|
silenttestrunner.main(__name__)
|