##// END OF EJS Templates
wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

File last commit:

r37082:434e520a default
r39595:07b58266 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__)