equal
deleted
inserted
replaced
23 p1data = b'a\nb\nc\n' |
23 p1data = b'a\nb\nc\n' |
24 p2data = b'a\nc\nd\n' |
24 p2data = b'a\nc\nd\n' |
25 childdata = b'a\nb2\nc\nc2\nd\n' |
25 childdata = b'a\nb2\nc\nc2\nd\n' |
26 diffopts = mdiff.diffopts() |
26 diffopts = mdiff.diffopts() |
27 |
27 |
28 def decorate(text, rev): |
28 def decorate(text, fctx): |
29 return ([annotateline(fctx=rev, lineno=i) |
29 return ([annotateline(fctx=fctx, lineno=i) |
30 for i in range(1, text.count(b'\n') + 1)], |
30 for i in range(1, text.count(b'\n') + 1)], |
31 text) |
31 text) |
32 |
32 |
33 # Basic usage |
33 # Basic usage |
34 |
34 |