cborutil: implement sans I/O decoder
The vendored CBOR package decodes by calling read(n) on an object.
There are a number of disadvantages to this:
* Uses blocking I/O. If sufficient data is not available, the decoder
will hang until it is.
* No support for partial reads. If the read(n) returns less data than
requested, the decoder raises an error.
* Requires the use of a file like object. If the original data is in
say a buffer, we need to "cast" it to e.g. a BytesIO to appease the
decoder.
In addition, the vendored CBOR decoder doesn't provide flexibility
that we desire. Specifically:
* It buffers indefinite length bytestrings instead of streaming them.
* It doesn't allow limiting the set of types that can be decoded. This
property is useful when implementing a "hardened" decoder that is
less susceptible to abusive input.
* It doesn't provide sufficient "hook points" and introspection to
institute checks around behavior. These are useful for implementing
a "hardened" decoder.
This all adds up to a reasonable set of justifications for writing our
own decoder.
So, this commit implements our own CBOR decoder.
At the heart of the decoder is a function that decodes a single "item"
from a buffer. This item can be a complete simple value or a special
value, such as "start of array." Using this function, we can build a
decoder that effectively iterates over the stream of decoded items and
builds up higher-level values, such as arrays, maps, sets, and indefinite
length bytestrings. And we can do this without performing I/O in the
decoder itself.
The core of the sans I/O decoder will probably not be used directly.
Instead, it is expected that we'll build utility functions for invoking
the decoder given specific input types. This will allow extreme
flexibility in how data is delivered to the decoder.
I'm pretty happy with the state of the decoder modulo the TODO items
to track wanted features to help with a "hardened" decoder. The one
thing I could be convinced to change is the handling of semantic tags.
Since we only support a single semantic tag (sets), I thought it would
be easier to handle them inline in decodeitem(). This is simpler now.
But if we add support for other semantic tags, it will likely be easier
to move semantic tag handling outside of decodeitem(). But, properly
supporting semantic tags opens up a whole can of worms, as many
semantic tags imply new types. I'm optimistic we won't need these in
Mercurial. But who knows.
I'm also pretty happy with the test coverage. Writing comprehensive
tests for partial decoding did flush out a handful of bugs. One
general improvement to testing would be fuzz testing for partial
decoding. I may implement that later. I also anticipate switching the
wire protocol code to this new decoder will flush out any lingering
bugs.
Differential Revision: https://phab.mercurial-scm.org/D4414
$ cat >> $HGRCPATH<<EOF
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> [experimental]
> evolution=true
> EOF
$ reinit () {
> rm -rf .hg && hg init
> }
$ hg init
Test what said in drawdag.py docstring
$ hg debugdrawdag <<'EOS'
> c d
> |/
> b
> |
> a
> EOS
$ hg log -G -T '{rev} {desc} ({tags})'
o 3 d (d tip)
|
| o 2 c (c)
|/
o 1 b (b)
|
o 0 a (a)
$ hg debugdrawdag <<'EOS'
> foo bar bar foo
> | / | |
> ancestor(c,d) a baz
> EOS
$ hg log -G -T '{desc}'
o foo
|\
+---o bar
| | |
| o | baz
| /
+---o d
| |
+---o c
| |
o | b
|/
o a
$ reinit
$ hg debugdrawdag <<'EOS'
> o foo
> |\
> +---o bar
> | | |
> | o | baz
> | /
> +---o d
> | |
> +---o c
> | |
> o | b
> |/
> o a
> EOS
$ hg log -G -T '{desc}'
o foo
|\
| | o d
| |/
| | o c
| |/
| | o bar
| |/|
| o | b
| |/
o / baz
/
o a
$ reinit
$ hg debugdrawdag <<'EOS'
> o foo
> |\
> | | o d
> | |/
> | | o c
> | |/
> | | o bar
> | |/|
> | o | b
> | |/
> o / baz
> /
> o a
> EOS
$ hg log -G -T '{desc}'
o foo
|\
| | o d
| |/
| | o c
| |/
| | o bar
| |/|
| o | b
| |/
o / baz
/
o a
$ hg manifest -r a
a
$ hg manifest -r b
a
b
$ hg manifest -r bar
a
b
$ hg manifest -r foo
a
b
baz
Edges existed in repo are no-ops
$ reinit
$ hg debugdrawdag <<'EOS'
> B C C
> | | |
> A A B
> EOS
$ hg log -G -T '{desc}'
o C
|\
| o B
|/
o A
$ hg debugdrawdag <<'EOS'
> C D C
> | | |
> B B A
> EOS
$ hg log -G -T '{desc}'
o D
|
| o C
|/|
o | B
|/
o A
Node with more than 2 parents are disallowed
$ hg debugdrawdag <<'EOS'
> A
> /|\
> D B C
> EOS
abort: A: too many parents: C D B
[255]
Cycles are disallowed
$ hg debugdrawdag <<'EOS'
> A
> |
> A
> EOS
abort: the graph has cycles
[255]
$ hg debugdrawdag <<'EOS'
> A
> |
> B
> |
> A
> EOS
abort: the graph has cycles
[255]
Create obsmarkers via comments
$ reinit
$ hg debugdrawdag <<'EOS'
> G
> |
> I D C F # split: B -> E, F, G
> \ \| | # replace: C -> D -> H
> H B E # prune: F, I
> \|/
> A
> EOS
1 new orphan changesets
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
* G 711f53bbef0bebd12eb6f0511d5e2e998b984846
|
x F 64a8289d249234b9886244d379f15e6b650b28e3
|
o E 7fb047a69f220c21711122dfd94305a9efb60cba
|
| x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282
| |
| | x C 26805aba1e600a82e93661149f2313866a221a7b
| |/
| x B 112478962961147124edd43549aedd1a335e44bf
|/
| x I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
| |
| o H 575c4b5ec114d64b681d33f8792853568bfb2b2c
|/
o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
$ hg debugobsolete
112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'split', 'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'}
be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
Change file contents via comments
$ reinit
$ hg debugdrawdag <<'EOS'
> C # A/dir1/a = 1\n2
> |\ # B/dir2/b = 34
> A B # C/dir1/c = 5
> # C/dir2/c = 6
> # C/A = a
> # C/B = b
> EOS
$ hg log -G -T '{desc} {files}'
o C A B dir1/c dir2/c
|\
| o B B dir2/b
|
o A A dir1/a
$ for f in `hg files -r C`; do
> echo FILE "$f"
> hg cat -r C "$f"
> echo
> done
FILE A
a
FILE B
b
FILE dir1/a
1
2
FILE dir1/c
5
FILE dir2/b
34
FILE dir2/c
6