This is an archive of the discontinued Mercurial Phabricator instance.

Differential D896

annotate: move annotatepair unit tests to a separate file
ClosedPublic

Authored by sid0 on Oct 2 2017, 5:35 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG80215865d154: annotate: move annotatepair unit tests to a separate file
Summary

In upcoming patches the output is going to be significantly longer than it is
today, and doctests don't allow wrapping the output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sid0 created this revision.Oct 2 2017, 5:35 AM
indygreg accepted this revision.Oct 2 2017, 6:26 AM
This revision is now accepted and ready to land.Oct 2 2017, 6:26 AM
Closed by commit rHG80215865d154: annotate: move annotatepair unit tests to a separate file (authored by sid0). · Explain WhyOct 2 2017, 1:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2338

mercurial/context.py

r''' r'''
Given parent and child fctxes and annotate data for parents, for all lines Given parent and child fctxes and annotate data for parents, for all lines
in either parent that match the child, annotate the child with the parent's in either parent that match the child, annotate the child with the parent's
data. data.
Additionally, if `skipchild` is True, replace all other lines with parent Additionally, if `skipchild` is True, replace all other lines with parent
annotate data as well such that child is never blamed for any lines. annotate data as well such that child is never blamed for any lines.
>>> oldfctx = b'old' See test-annotate.py for unit tests.
>>> 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 ([(rev, 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)
>>> p1ann[0]
[('old', 1), ('old', 2), ('p1', 3)]
>>> p2ann = decorate(p2data, p2fctx)
>>> p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
>>> p2ann[0]
[('old', 1), ('p2', 2), ('p2', 3)]
Test with multiple parents (note the difference caused by ordering):
>>> childann = decorate(childdata, childfctx)
>>> childann = _annotatepair([p1ann, p2ann], childfctx, childann, False,
... diffopts)
>>> childann[0]
[('old', 1), ('c', 2), ('p2', 2), ('c', 4), ('p2', 3)]
>>> childann = decorate(childdata, childfctx)
>>> childann = _annotatepair([p2ann, p1ann], childfctx, childann, False,
... diffopts)
>>> childann[0]
[('old', 1), ('c', 2), ('p1', 3), ('c', 4), ('p2', 3)]
Test with skipchild (note the difference caused by ordering):
>>> childann = decorate(childdata, childfctx)
>>> childann = _annotatepair([p1ann, p2ann], childfctx, childann, True,
... diffopts)
>>> childann[0]
[('old', 1), ('old', 2), ('p2', 2), ('p2', 2), ('p2', 3)]
>>> childann = decorate(childdata, childfctx)
>>> childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
... diffopts)
>>> childann[0]
[('old', 1), ('old', 2), ('p1', 3), ('p1', 3), ('p2', 3)]
''' '''
pblocks = [(parent, mdiff.allblocks(parent[1], child[1], opts=diffopts)) pblocks = [(parent, mdiff.allblocks(parent[1], child[1], opts=diffopts))
for parent in parents] for parent in parents]
if skipchild: if skipchild:
# Need to iterate over the blocks twice -- make it a list # Need to iterate over the blocks twice -- make it a list
pblocks = [(p, list(blocks)) for (p, blocks) in pblocks] pblocks = [(p, list(blocks)) for (p, blocks) in pblocks]
# Mercurial currently prefers p2 over p1 for annotate. # Mercurial currently prefers p2 over p1 for annotate.

tests/test-annotate.py

  • This file was added.
from __future__ import absolute_import
from __future__ import print_function
import unittest
from mercurial import (
mdiff,
)
from mercurial.context import (
_annotatepair,
)
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 ([(rev, 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)])
p2ann = decorate(p2data, p2fctx)
p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
self.assertEqual(p2ann[0], [('old', 1), ('p2', 2), ('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)]
)
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)]
)
# 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)]
)
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)]
)
if __name__ == '__main__':
import silenttestrunner
silenttestrunner.main(__name__)