On Sun, Nov 20, 2016 at 4:13 AM, Stanislau Hlebik <st...@fb.com> wrote:
> # HG changeset patch
> # User Stanislau Hlebik <st...@fb.com>
> # Date 1479373181 28800
> # Thu Nov 17 00:59:41 2016 -0800
> # Node ID bd590f83eb640f4464ba5465f4e10677e348e83c
> # Parent 4e782ccf84f8fee96963f09439f7da7202c37775
> bookmarks: introduce binary encoding
>
> Bookmarks binary encoding will be used for `bookmarks` bundle2 part.
> The format is: <4 bytes - bookmark size, big-endian><bookmark>
> <1 byte - 0 if node is empty 1 otherwise><20 bytes node>
> BookmarksEncodeError and BookmarksDecodeError maybe thrown if input is
> incorrect.
>
> diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
> --- a/mercurial/bookmarks.py
> +++ b/mercurial/bookmarks.py
> @@ -8,7 +8,9 @@
> from __future__ import absolute_import
>
> import errno
> +import io
> import os
> +import struct
>
> from .i18n import _
> from .node import (
> @@ -23,6 +25,71 @@
> util,
> )
>
> +_NONEMPTYNODE = struct.pack('?', False)
> +_EMPTYNODE = struct.pack('?', True)
> +
> +def _unpackbookmarksize(stream):
> + """Returns 0 if stream is empty.
> + """
> +
> + intstruct = struct.Struct('>i')
> + expectedsize = intstruct.size
> + encodedbookmarksize = stream.read(expectedsize)
> + if not encodedbookmarksize:
> + return 0
> + if len(encodedbookmarksize) != expectedsize:
> + raise ValueError(
> + _('cannot decode bookmark size: '
> + 'expected size: %d, actual size: %d') %
> + (expectedsize, len(encodedbookmarksize)))
> + return intstruct.unpack(encodedbookmarksize)[0]
> +
> +def encodebookmarks(bookmarks):
> + """Encodes bookmark to node mapping to the byte string.
> +
> + Format: <4 bytes - bookmark size><bookmark>
> + <1 byte - 0 if node is empty 1 otherwise><20 bytes node>
> + Node may be 20 byte binary string or empty
> + """
> +
> + intstruct = struct.Struct('>i')
> + for bookmark, node in sorted(bookmarks.iteritems()):
> + yield intstruct.pack(len(bookmark))
> + yield encoding.fromlocal(bookmark)
>
I just spotted this: I /think/ it is possible for len(bookmark) !=
len(encoding.fromlocal(bookmark)). Even if it isn't true, it looks weird to
be taking the length of X but then writing Y. So please use the len() of
what you send over the wire.
> + if node:
> + if len(node) != 20:
> + raise ValueError(_('node must be 20 or bytes long'))
> + yield _NONEMPTYNODE
> + yield node
> + else:
> + yield _EMPTYNODE
> +
> +def decodebookmarks(buf):
> + """Decodes buffer into bookmark to node mapping.
> +
> + Node is either 20 bytes or empty.
> + """
> +
> + stream = io.BytesIO(buf)
> + bookmarks = {}
> + bookmarksize = _unpackbookmarksize(stream)
> + boolstruct = struct.Struct('?')
> + while bookmarksize:
> + bookmark = stream.read(bookmarksize)
> + if len(bookmark) != bookmarksize:
> + raise ValueError(
> + _('cannot decode bookmark: expected size: %d, '
> + 'actual size: %d') % (bookmarksize, len(bookmark)))
> + bookmark = encoding.tolocal(bookmark)
> + packedemptynodeflag = stream.read(boolstruct.size)
> + emptynode = boolstruct.unpack(packedemptynodeflag)[0]
> + node = ''
> + if not emptynode:
> + node = stream.read(20)
> + bookmarks[bookmark] = node
> + bookmarksize = _unpackbookmarksize(stream)
> + return bookmarks
> +
> def _getbkfile(repo):
> """Hook so that extensions that mess with the store can hook bm
> storage.
>
>
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
