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
118 lines
3.5 KiB
Python
118 lines
3.5 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
import unittest
|
|
|
|
from edenscm.mercurial import mdiff
|
|
from edenscm.mercurial.context import _annotatepair, annotateline
|
|
|
|
|
|
try:
|
|
xrange(0)
|
|
except NameError:
|
|
xrange = range
|
|
|
|
|
|
class AnnotateTests(unittest.TestCase):
|
|
"""Unit tests for annotate code."""
|
|
|
|
def testannotatepair(self):
|
|
self.maxDiff = None # camelcase-required
|
|
|
|
oldfctx = b"old"
|
|
p1fctx, p2fctx, childfctx = b"p1", b"p2", b"c"
|
|
olddata = b"a\nb\n"
|
|
p1data = b"a\nb\nc\n"
|
|
p2data = b"a\nc\nd\n"
|
|
childdata = b"a\nb2\nc\nc2\nd\n"
|
|
diffopts = mdiff.diffopts()
|
|
|
|
def decorate(text, rev):
|
|
return (
|
|
[
|
|
annotateline(fctx=rev, lineno=i)
|
|
for i in xrange(1, text.count(b"\n") + 1)
|
|
],
|
|
text,
|
|
)
|
|
|
|
# Basic usage
|
|
|
|
oldann = decorate(olddata, oldfctx)
|
|
p1ann = decorate(p1data, p1fctx)
|
|
p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
|
|
self.assertEqual(
|
|
p1ann[0],
|
|
[annotateline("old", 1), annotateline("old", 2), annotateline("p1", 3)],
|
|
)
|
|
|
|
p2ann = decorate(p2data, p2fctx)
|
|
p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
|
|
self.assertEqual(
|
|
p2ann[0],
|
|
[annotateline("old", 1), annotateline("p2", 2), annotateline("p2", 3)],
|
|
)
|
|
|
|
# Test with multiple parents (note the difference caused by ordering)
|
|
|
|
childann = decorate(childdata, childfctx)
|
|
childann = _annotatepair([p1ann, p2ann], childfctx, childann, False, diffopts)
|
|
self.assertEqual(
|
|
childann[0],
|
|
[
|
|
annotateline("old", 1),
|
|
annotateline("c", 2),
|
|
annotateline("p2", 2),
|
|
annotateline("c", 4),
|
|
annotateline("p2", 3),
|
|
],
|
|
)
|
|
|
|
childann = decorate(childdata, childfctx)
|
|
childann = _annotatepair([p2ann, p1ann], childfctx, childann, False, diffopts)
|
|
self.assertEqual(
|
|
childann[0],
|
|
[
|
|
annotateline("old", 1),
|
|
annotateline("c", 2),
|
|
annotateline("p1", 3),
|
|
annotateline("c", 4),
|
|
annotateline("p2", 3),
|
|
],
|
|
)
|
|
|
|
# Test with skipchild (note the difference caused by ordering)
|
|
|
|
childann = decorate(childdata, childfctx)
|
|
childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, diffopts)
|
|
self.assertEqual(
|
|
childann[0],
|
|
[
|
|
annotateline("old", 1),
|
|
annotateline("old", 2, True),
|
|
# note that this line was carried over from earlier so it is *not*
|
|
# marked skipped
|
|
annotateline("p2", 2),
|
|
annotateline("p2", 2, True),
|
|
annotateline("p2", 3),
|
|
],
|
|
)
|
|
|
|
childann = decorate(childdata, childfctx)
|
|
childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, diffopts)
|
|
self.assertEqual(
|
|
childann[0],
|
|
[
|
|
annotateline("old", 1),
|
|
annotateline("old", 2, True),
|
|
annotateline("p1", 3),
|
|
annotateline("p1", 3, True),
|
|
annotateline("p2", 3),
|
|
],
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import silenttestrunner
|
|
|
|
silenttestrunner.main(__name__)
|