mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
119 lines
3.5 KiB
Python
119 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
|
|
from hghave import require
|
|
|
|
|
|
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 = "old"
|
|
p1fctx, p2fctx, childfctx = "p1", "p2", "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__)
|