Mercurial > hg

annotate mercurial/thirdparty/cbor/__init__.py @ 45284:31c454a5f1a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult in checkpassconflicts() instead of actions (API) This is a part of series which aims to use mergeresult obj instead of an action dictionary. Differential Revision: https://phab.mercurial-scm.org/D8822
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:31:26 +0530
parents 3bc609bcfe77
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37214
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
1 from .cbor2 import (
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
2 CBORDecodeError,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
3 CBORDecoder,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
4 CBOREncodeError,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
5 CBOREncoder,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
6 dump,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
7 dumps,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
8 load,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
9 loads,
3bc609bcfe77 cbor: import CBORDecoder and CBOREncoder
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37128
diff changeset
10 )