##// END OF EJS Templates
httppeer: implement command executor for version 2 peer...
httppeer: implement command executor for version 2 peer Now that we have a new API for issuing commands which is compatible with wire protocol version 2, we can start using it with wire protocol version 2. This commit replaces our hacky implementation of _call() with something a bit more robust based on the new command executor interface. We now have proper support for issuing multiple commands per HTTP request. Each HTTP request maintains its own client reactor. The implementation is similar to the one in the legacy wire protocol. We use a ThreadPoolExecutor for spinning up a thread to read the HTTP response in the background. This allows responses to resolve in any order. While not implemented on the server yet, a client could use concurrent.futures.as_completed() with a collection of futures and handle responses as they arrive from the server. The return value from issued commands is still a simple list of raw or decoded CBOR data. This is still super hacky. We will want a rich data type for representing command responses. But at least this commit gets us one step closer to a proper peer implementation. Differential Revision: https://phab.mercurial-scm.org/D3297

File last commit:

r37082:434e520a default
r37669:950294e2 default
Show More
test-annotate.py
110 lines | 3.5 KiB | text/x-python | PythonLexer
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 from __future__ import absolute_import
from __future__ import print_function
import unittest
from mercurial import (
mdiff,
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 pycompat,
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 )
Yuya Nishihara
dagop: move annotateline and _annotatepair from context.py...
r36935 from mercurial.dagop import (
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 annotateline,
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 _annotatedfile,
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 _annotatepair,
)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 def tr(a):
return [annotateline(fctx, lineno, skip)
for fctx, lineno, skip in zip(a.fctxs, a.linenos, a.skips)]
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 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()
Yuya Nishihara
annotate: correct parameter name of decorate() function
r36953 def decorate(text, fctx):
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 n = text.count(b'\n')
linenos = pycompat.rangelist(1, n + 1)
return _annotatedfile([fctx] * n, linenos, [False] * n, text)
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Basic usage
oldann = decorate(olddata, oldfctx)
p1ann = decorate(p1data, p1fctx)
p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(p1ann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2),
annotateline(b'p1', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
p2ann = decorate(p2data, p2fctx)
p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(p2ann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'p2', 2),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Test with multiple parents (note the difference caused by ordering)
childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, False,
diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(childann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'c', 2),
annotateline(b'p2', 2),
annotateline(b'c', 4),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, False,
diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(childann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'c', 2),
annotateline(b'p1', 3),
annotateline(b'c', 4),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Test with skipchild (note the difference caused by ordering)
childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, True,
diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(childann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2, True),
Siddharth Agarwal
annotate: track whether a particular annotation was the result of a skip...
r34434 # note that this line was carried over from earlier so it is *not*
# marked skipped
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'p2', 2),
annotateline(b'p2', 2, True),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
diffopts)
Yuya Nishihara
annotate: do not construct attr.s object per line while computing history...
r37082 self.assertEqual(tr(childann), [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2, True),
annotateline(b'p1', 3),
annotateline(b'p1', 3, True),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
if __name__ == '__main__':
import silenttestrunner
silenttestrunner.main(__name__)