Mercurial > public > mercurial-scm > hg

comparison mercurial/utils/cborutil.py @ 43117:8ff1ecfadcd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: join string literals that are already on one line Thanks to Kyle for noticing this and for providing the regular expression to run on the codebase. This patch has been reviewed by the test suite and they approved of it. # skip-blame: fallout from mass reformatting Differential Revision: https://phab.mercurial-scm.org/D7028
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 08 Oct 2019 15:06:18 -0700
parents d783f945a701
children 9f70512ae2cf
comparison
equal deleted inserted replaced
43116:defabf63e969 43117:8ff1ecfadcd1
402 if not complete: 402 if not complete:
403 return False, None, readcount2, SPECIAL_NONE 403 return False, None, readcount2, SPECIAL_NONE
404 404
405 if special != SPECIAL_START_ARRAY: 405 if special != SPECIAL_START_ARRAY:
406 raise CBORDecodeError( 406 raise CBORDecodeError(
407 b'expected array after finite set ' b'semantic tag' 407 b'expected array after finite set semantic tag'
408 ) 408 )
409 409
410 return True, size, readcount + readcount2 + 1, SPECIAL_START_SET 410 return True, size, readcount + readcount2 + 1, SPECIAL_START_SET
411 411
412 else: 412 else:
744 SPECIAL_START_ARRAY, 744 SPECIAL_START_ARRAY,
745 SPECIAL_START_MAP, 745 SPECIAL_START_MAP,
746 SPECIAL_START_SET, 746 SPECIAL_START_SET,
747 ): 747 ):
748 raise CBORDecodeError( 748 raise CBORDecodeError(
749 b'collections not supported as map ' b'keys' 749 b'collections not supported as map keys'
750 ) 750 )
751 751
752 # We do not allow special values to be used as map keys. 752 # We do not allow special values to be used as map keys.
753 else: 753 else:
754 raise CBORDecodeError( 754 raise CBORDecodeError(
839 SPECIAL_START_ARRAY, 839 SPECIAL_START_ARRAY,
840 SPECIAL_START_MAP, 840 SPECIAL_START_MAP,
841 SPECIAL_START_SET, 841 SPECIAL_START_SET,
842 ): 842 ):
843 raise CBORDecodeError( 843 raise CBORDecodeError(
844 b'collections not allowed as set ' b'values' 844 b'collections not allowed as set values'
845 ) 845 )
846 846
847 # We don't allow non-trivial types to exist as set values. 847 # We don't allow non-trivial types to exist as set values.
848 else: 848 else:
849 raise CBORDecodeError( 849 raise CBORDecodeError(