--- a/tests/test-annotate.py Mon Oct 02 02:34:47 2017 -0700
+++ b/tests/test-annotate.py Mon Oct 02 02:34:47 2017 -0700
@@ -7,6 +7,7 @@
mdiff,
)
from mercurial.context import (
+ annotateline,
_annotatepair,
)
@@ -25,50 +26,76 @@
diffopts = mdiff.diffopts()
def decorate(text, rev):
- return ([(rev, i) for i in xrange(1, text.count(b'\n') + 1)], text)
+ 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], [('old', 1), ('old', 2), ('p1', 3)])
+ 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], [('old', 1), ('p2', 2), ('p2', 3)])
+ 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],
- [('old', 1), ('c', 2), ('p2', 2), ('c', 4), ('p2', 3)]
- )
+ 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],
- [('old', 1), ('c', 2), ('p1', 3), ('c', 4), ('p2', 3)]
- )
+ 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],
- [('old', 1), ('old', 2), ('p2', 2), ('p2', 2), ('p2', 3)]
- )
+ self.assertEqual(childann[0], [
+ annotateline('old', 1),
+ annotateline('old', 2),
+ annotateline('p2', 2),
+ annotateline('p2', 2),
+ annotateline('p2', 3),
+ ])
childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
diffopts)
- self.assertEqual(childann[0],
- [('old', 1), ('old', 2), ('p1', 3), ('p1', 3), ('p2', 3)]
- )
+ self.assertEqual(childann[0], [
+ annotateline('old', 1),
+ annotateline('old', 2),
+ annotateline('p1', 3),
+ annotateline('p1', 3),
+ annotateline('p2', 3),
+ ])
if __name__ == '__main__':
import silenttestrunner