mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
584656dff3
Summary: Turned on the auto formatter. Ran `arc lint --apply-patches --take BLACK **/*.py`. Then run `arc lint` again so some other autofixers like spellchecker etc. looked at the code base. Manually accept the changes whenever they make sense, or use a workaround (ex. changing "dict()" to "dict constructor") where autofix is false positive. Disabled linters on files that are hard (i18n/polib.py) to fix, or less interesting to fix (hgsubversion tests), or cannot be fixed without breaking OSS build (FBPYTHON4). Conflicted linters (test-check-module-imports.t, part of test-check-code.t, test-check-pyflakes.t) are removed or disabled. Duplicated linters (test-check-pyflakes.t, test-check-pylint.t) are removed. An issue of the auto-formatter is lines are no longer guarnateed to be <= 80 chars. But that seems less important comparing with the benefit auto-formatter provides. As we're here, also remove test-check-py3-compat.t, as it is currently broken if `PYTHON3=/bin/python3` is set. Reviewed By: wez, phillco, simpkins, pkaush, singhsrb Differential Revision: D8173629 fbshipit-source-id: 90e248ae0c5e6eaadbe25520a6ee42d32005621b
118 lines
3.4 KiB
Python
118 lines
3.4 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
import unittest
|
|
|
|
from mercurial import mdiff
|
|
from 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__)
|