wireprotov2: unify file revision collection and linknode derivation

The old mechanism for choosing which file revisions to send in the
haveparents=True case was buggy in multiple ways - the most severe
of which being that file revisions were excluded when they shouldn't
have been.

This commit unifies the logic for deriving the filenodes that will
be sent by the "filesdata" command. We now consistently read files
data from manifests. The "haveparents" argument now controls whether
we iterate ctx.files() or use the full manifest to derive relevant
files.

The logic here is still woefully lacking to fully support shallow
clones. It will require an API break to fully address. This commit
should at least make the server APIs emit proper data, which is
strictly better than before.

Differential Revision: https://phab.mercurial-scm.org/D5406

mercurial/help/internals/wireprotocolv2.txt

@@ -1,722 +1,724
 **Experimental and under active development**
 
 This section documents the wire protocol commands exposed to transports
 using the frame-based protocol. The set of commands exposed through
 these transports is distinct from the set of commands exposed to legacy
 transports.
 
 The frame-based protocol uses CBOR to encode command execution requests.
 All command arguments must be mapped to a specific or set of CBOR data
 types.
 
 The response to many commands is also CBOR. There is no common response
 format: each command defines its own response format.
 
 TODOs
 =====
 
 * Add "node namespace" support to each command. In order to support
   SHA-1 hash transition, we want servers to be able to expose different
   "node namespaces" for the same data. Every command operating on nodes
   should specify which "node namespace" it is operating on and responses
   should encode the "node namespace" accordingly.
 
 Commands
 ========
 
 The sections below detail all commands available to wire protocol version
 2.
 
 branchmap
 ---------
 
 Obtain heads in named branches.
 
 Receives no arguments.
 
 The response is a map with bytestring keys defining the branch name.
 Values are arrays of bytestring defining raw changeset nodes.
 
 capabilities
 ------------
 
 Obtain the server's capabilities.
 
 Receives no arguments.
 
 This command is typically called only as part of the handshake during
 initial connection establishment.
 
 The response is a map with bytestring keys defining server information.
 
 The defined keys are:
 
 commands
    A map defining available wire protocol commands on this server.
 
    Keys in the map are the names of commands that can be invoked. Values
    are maps defining information about that command. The bytestring keys
    are:
 
       args
          (map) Describes arguments accepted by the command.
 
          Keys are bytestrings denoting the argument name.
 
          Values are maps describing the argument. The map has the following
          bytestring keys:
 
          default
             (varied) The default value for this argument if not specified. Only
             present if ``required`` is not true.
 
          required
             (boolean) Whether the argument must be specified. Failure to send
             required arguments will result in an error executing the command.
 
          type
             (bytestring) The type of the argument. e.g. ``bytes`` or ``bool``.
 
          validvalues
             (set) Values that are recognized for this argument. Some arguments
             only allow a fixed set of values to be specified. These arguments
             may advertise that set in this key. If this set is advertised and
             a value not in this set is specified, the command should result
             in error.
 
       permissions
          An array of permissions required to execute this command.
 
       *
          (various) Individual commands may define extra keys that supplement
          generic command metadata. See the command definition for more.
 
 framingmediatypes
    An array of bytestrings defining the supported framing protocol
    media types. Servers will not accept media types not in this list.
 
 pathfilterprefixes
    (set of bytestring) Matcher prefixes that are recognized when performing
    path filtering. Specifying a path filter whose type/prefix does not
    match one in this set will likely be rejected by the server.
 
 rawrepoformats
    An array of storage formats the repository is using. This set of
    requirements can be used to determine whether a client can read a
    *raw* copy of file data available.
 
 redirect
    A map declaring potential *content redirects* that may be used by this
    server. Contains the following bytestring keys:
 
    targets
       (array of maps) Potential redirect targets. Values are maps describing
       this target in more detail. Each map has the following bytestring keys:
 
       name
          (bytestring) Identifier for this target. The identifier will be used
          by clients to uniquely identify this target.
 
       protocol
          (bytestring) High-level network protocol. Values can be
          ``http``, ```https``, ``ssh``, etc.
 
       uris
           (array of bytestrings) Representative URIs for this target.
 
       snirequired (optional)
           (boolean) Indicates whether Server Name Indication is required
           to use this target. Defaults to False.
 
       tlsversions (optional)
           (array of bytestring) Indicates which TLS versions are supported by
           this target. Values are ``1.1``, ``1.2``, ``1.3``, etc.
 
    hashes
       (array of bytestring) Indicates support for hashing algorithms that are
       used to ensure content integrity. Values include ``sha1``, ``sha256``,
       etc.
 
 changesetdata
 -------------
 
 Obtain various data related to changesets.
 
 The command accepts the following arguments:
 
 revisions
    (array of maps) Specifies revisions whose data is being requested. Each
    value in the array is a map describing revisions. See the
    *Revisions Specifiers* section below for the format of this map.
 
    Data will be sent for the union of all revisions resolved by all
    revision specifiers.
 
    Only revision specifiers operating on changeset revisions are allowed.
 
 fields
    (set of bytestring) Which data associated with changelog revisions to
    fetch. The following values are recognized:
 
    bookmarks
       Bookmarks associated with a revision.
 
    parents
       Parent revisions.
 
    phase
       The phase state of a revision.
 
    revision
       The raw, revision data for the changelog entry. The hash of this data
       will match the revision's node value.
 
 The response bytestream starts with a CBOR map describing the data that follows.
 This map has the following bytestring keys:
 
 totalitems
    (unsigned integer) Total number of changelog revisions whose data is being
    transferred. This maps to the set of revisions in the requested node
    range, not the total number of records that follow (see below for why).
 
 Following the map header is a series of 0 or more CBOR values. If values
 are present, the first value will always be a map describing a single changeset
 revision.
 
 If the ``fieldsfollowing`` key is present, the map will immediately be followed
 by N CBOR bytestring values, where N is the number of elements in
 ``fieldsfollowing``. Each bytestring value corresponds to a field denoted
 by ``fieldsfollowing``.
 
 Following the optional bytestring field values is the next revision descriptor
 map, or end of stream.
 
 Each revision descriptor map has the following bytestring keys:
 
 node
    (bytestring) The node value for this revision. This is the SHA-1 hash of
    the raw revision data.
 
 bookmarks (optional)
    (array of bytestrings) Bookmarks attached to this revision. Only present
    if ``bookmarks`` data is being requested and the revision has bookmarks
    attached.
 
 fieldsfollowing (optional)
    (array of 2-array) Denotes what fields immediately follow this map. Each
    value is an array with 2 elements: the bytestring field name and an unsigned
    integer describing the length of the data, in bytes.
 
    If this key isn't present, no special fields will follow this map.
 
    The following fields may be present:
 
    revision
       Raw, revision data for the changelog entry. Contains a serialized form
       of the changeset data, including the author, date, commit message, set
       of changed files, manifest node, and other metadata.
 
       Only present if the ``revision`` field was requested.
 
 parents (optional)
    (array of bytestrings) The nodes representing the parent revisions of this
    revision. Only present if ``parents`` data is being requested.
 
 phase (optional)
    (bytestring) The phase that a revision is in. Recognized values are
    ``secret``, ``draft``, and ``public``. Only present if ``phase`` data
    is being requested.
 
 The set of changeset revisions emitted may not match the exact set of
 changesets requested. Furthermore, the set of keys present on each
 map may vary. This is to facilitate emitting changeset updates as well
 as new revisions.
 
 For example, if the request wants ``phase`` and ``revision`` data,
 the response may contain entries for each changeset in the common nodes
 set with the ``phase`` key and without the ``revision`` key in order
 to reflect a phase-only update.
 
 TODO support different revision selection mechanisms (e.g. non-public, specific
 revisions)
 TODO support different hash "namespaces" for revisions (e.g. sha-1 versus other)
 TODO support emitting obsolescence data
 TODO support filtering based on relevant paths (narrow clone)
 TODO support hgtagsfnodes cache / tags data
 TODO support branch heads cache
 TODO consider unify query mechanism. e.g. as an array of "query descriptors"
 rather than a set of top-level arguments that have semantics when combined.
 
 filedata
 --------
 
 Obtain various data related to an individual tracked file.
 
 The command accepts the following arguments:
 
 fields
    (set of bytestring) Which data associated with a file to fetch.
    The following values are recognized:
 
    linknode
       The changeset node introducing this revision.
 
    parents
       Parent nodes for the revision.
 
    revision
       The raw revision data for a file.
 
 haveparents
    (bool) Whether the client has the parent revisions of all requested
    nodes. If set, the server may emit revision data as deltas against
    any parent revision. If not set, the server MUST only emit deltas for
    revisions previously emitted by this command.
 
    False is assumed in the absence of any value.
 
 nodes
    (array of bytestrings) File nodes whose data to retrieve.
 
 path
    (bytestring) Path of the tracked file whose data to retrieve.
 
 TODO allow specifying revisions via alternate means (such as from
 changeset revisions or ranges)
 
 The response bytestream starts with a CBOR map describing the data that
 follows. It has the following bytestream keys:
 
 totalitems
    (unsigned integer) Total number of file revisions whose data is
    being returned.
 
 Following the map header is a series of 0 or more CBOR values. If values
 are present, the first value will always be a map describing a single changeset
 revision.
 
 If the ``fieldsfollowing`` key is present, the map will immediately be followed
 by N CBOR bytestring values, where N is the number of elements in
 ``fieldsfollowing``. Each bytestring value corresponds to a field denoted
 by ``fieldsfollowing``.
 
 Following the optional bytestring field values is the next revision descriptor
 map, or end of stream.
 
 Each revision descriptor map has the following bytestring keys:
 
 Each map has the following bytestring keys:
 
 node
    (bytestring) The node of the file revision whose data is represented.
 
 deltabasenode
    (bytestring) Node of the file revision the following delta is against.
 
    Only present if the ``revision`` field is requested and delta data
    follows this map.
 
 fieldsfollowing
    (array of 2-array) Denotes extra bytestring fields that following this map.
    See the documentation for ``changesetdata`` for semantics.
 
    The following named fields may be present:
 
    ``delta``
       The delta data to use to construct the fulltext revision.
 
       Only present if the ``revision`` field is requested and a delta is
       being emitted. The ``deltabasenode`` top-level key will also be
       present if this field is being emitted.
 
    ``revision``
       The fulltext revision data for this manifest. Only present if the
       ``revision`` field is requested and a fulltext revision is being emitted.
 
 parents
    (array of bytestring) The nodes of the parents of this file revision.
 
    Only present if the ``parents`` field is requested.
 
 When ``revision`` data is requested, the server chooses to emit either fulltext
 revision data or a delta. What the server decides can be inferred by looking
 for the presence of the ``delta`` or ``revision`` keys in the
 ``fieldsfollowing`` array.
 
 filesdata
 ---------
 
 Obtain various data related to multiple tracked files for specific changesets.
 
 This command is similar to ``filedata`` with the main difference being that
 individual requests operate on multiple file paths. This allows clients to
 request data for multiple paths by issuing a single command.
 
 The command accepts the following arguments:
 
 fields
    (set of bytestring) Which data associated with a file to fetch.
    The following values are recognized:
 
    linknode
       The changeset node introducing this revision.
 
    parents
       Parent nodes for the revision.
 
    revision
       The raw revision data for a file.
 
 haveparents
    (bool) Whether the client has the parent revisions of all requested
    nodes.
 
 pathfilter
    (map) Defines a filter that determines what file paths are relevant.
 
    See the *Path Filters* section for more.
 
    If the argument is omitted, it is assumed that all paths are relevant.
 
 revisions
    (array of maps) Specifies revisions whose data is being requested. Each value
    in the array is a map describing revisions. See the *Revisions Specifiers*
    section below for the format of this map.
 
    Data will be sent for the union of all revisions resolved by all revision
    specifiers.
 
    Only revision specifiers operating on changeset revisions are allowed.
 
 The response bytestream starts with a CBOR map describing the data that
 follows. This map has the following bytestring keys:
 
 totalpaths
    (unsigned integer) Total number of paths whose data is being transferred.
 
 totalitems
    (unsigned integer) Total number of file revisions whose data is being
    transferred.
 
 Following the map header are 0 or more sequences of CBOR values. Each sequence
 represents data for a specific tracked path. Each sequence begins with a CBOR
 map describing the file data that follows. Following that map is N CBOR values
 describing file revision data. The format of this data is identical to that
 returned by the ``filedata`` command.
 
 Each sequence's map header has the following bytestring keys:
 
 path
    (bytestring) The tracked file path whose data follows.
 
 totalitems
    (unsigned integer) Total number of file revisions whose data is being
    transferred.
 
 The ``haveparents`` argument has significant implications on the data
 transferred.
 
 When ``haveparents`` is true, the command MAY only emit data for file
 revisions introduced by the set of changeset revisions whose data is being
 requested. In other words, the command may assume that all file revisions
 for all relevant paths for ancestors of the requested changeset revisions
 are present on the receiver.
 
 When ``haveparents`` is false, the command MUST assume that the receiver
 has no file revisions data. This means that all referenced file revisions
 in the queried set of changeset revisions will be sent.
 
-TODO we'll probably want a more complicated mechanism for the client to
-specify which ancestor revisions are known.
+TODO we want a more complicated mechanism for the client to specify which
+ancestor revisions are known. This is needed so intelligent deltas can be
+emitted and so updated linknodes can be sent if the client needs to adjust
+its linknodes for existing file nodes to older changeset revisions.
 TODO we may want to make linknodes an array so multiple changesets can be
 marked as introducing a file revision, since this can occur with e.g. hidden
 changesets.
 
 heads
 -----
 
 Obtain DAG heads in the repository.
 
 The command accepts the following arguments:
 
 publiconly (optional)
    (boolean) If set, operate on the DAG for public phase changesets only.
    Non-public (i.e. draft) phase DAG heads will not be returned.
 
 The response is a CBOR array of bytestrings defining changeset nodes
 of DAG heads. The array can be empty if the repository is empty or no
 changesets satisfied the request.
 
 TODO consider exposing phase of heads in response
 
 known
 -----
 
 Determine whether a series of changeset nodes is known to the server.
 
 The command accepts the following arguments:
 
 nodes
    (array of bytestrings) List of changeset nodes whose presence to
    query.
 
 The response is a bytestring where each byte contains a 0 or 1 for the
 corresponding requested node at the same index.
 
 TODO use a bit array for even more compact response
 
 listkeys
 --------
 
 List values in a specified ``pushkey`` namespace.
 
 The command receives the following arguments:
 
 namespace
    (bytestring) Pushkey namespace to query.
 
 The response is a map with bytestring keys and values.
 
 TODO consider using binary to represent nodes in certain pushkey namespaces.
 
 lookup
 ------
 
 Try to resolve a value to a changeset revision.
 
 Unlike ``known`` which operates on changeset nodes, lookup operates on
 node fragments and other names that a user may use.
 
 The command receives the following arguments:
 
 key
    (bytestring) Value to try to resolve.
 
 On success, returns a bytestring containing the resolved node.
 
 manifestdata
 ------------
 
 Obtain various data related to manifests (which are lists of files in
 a revision).
 
 The command accepts the following arguments:
 
 fields
    (set of bytestring) Which data associated with manifests to fetch.
    The following values are recognized:
 
    parents
       Parent nodes for the manifest.
 
    revision
       The raw revision data for the manifest.
 
 haveparents
    (bool) Whether the client has the parent revisions of all requested
    nodes. If set, the server may emit revision data as deltas against
    any parent revision. If not set, the server MUST only emit deltas for
    revisions previously emitted by this command.
 
    False is assumed in the absence of any value.
 
 nodes
    (array of bytestring) Manifest nodes whose data to retrieve.
 
 tree
    (bytestring) Path to manifest to retrieve. The empty bytestring represents
    the root manifest. All other values represent directories/trees within
    the repository.
 
 TODO allow specifying revisions via alternate means (such as from changeset
 revisions or ranges)
 TODO consider recursive expansion of manifests (with path filtering for
 narrow use cases)
 
 The response bytestream starts with a CBOR map describing the data that
 follows. It has the following bytestring keys:
 
 totalitems
    (unsigned integer) Total number of manifest revisions whose data is
    being returned.
 
 Following the map header is a series of 0 or more CBOR values. If values
 are present, the first value will always be a map describing a single manifest
 revision.
 
 If the ``fieldsfollowing`` key is present, the map will immediately be followed
 by N CBOR bytestring values, where N is the number of elements in
 ``fieldsfollowing``. Each bytestring value corresponds to a field denoted
 by ``fieldsfollowing``.
 
 Following the optional bytestring field values is the next revision descriptor
 map, or end of stream.
 
 Each revision descriptor map has the following bytestring keys:
 
 node
    (bytestring) The node of the manifest revision whose data is represented.
 
 deltabasenode
    (bytestring) The node that the delta representation of this revision is
    computed against. Only present if the ``revision`` field is requested and
    a delta is being emitted.
 
 fieldsfollowing
    (array of 2-array) Denotes extra bytestring fields that following this map.
    See the documentation for ``changesetdata`` for semantics.
 
    The following named fields may be present:
 
    ``delta``
       The delta data to use to construct the fulltext revision.
 
       Only present if the ``revision`` field is requested and a delta is
       being emitted. The ``deltabasenode`` top-level key will also be
       present if this field is being emitted.
 
    ``revision``
       The fulltext revision data for this manifest. Only present if the
       ``revision`` field is requested and a fulltext revision is being emitted.
 
 parents
    (array of bytestring) The nodes of the parents of this manifest revision.
    Only present if the ``parents`` field is requested.
 
 When ``revision`` data is requested, the server chooses to emit either fulltext
 revision data or a delta. What the server decides can be inferred by looking
 for the presence of ``delta`` or ``revision`` in the ``fieldsfollowing`` array.
 
 Servers MAY advertise the following extra fields in the capabilities
 descriptor for this command:
 
 recommendedbatchsize
    (unsigned integer) Number of revisions the server recommends as a batch
    query size. If defined, clients needing to issue multiple ``manifestdata``
    commands to obtain needed data SHOULD construct their commands to have
    this many revisions per request.
 
 pushkey
 -------
 
 Set a value using the ``pushkey`` protocol.
 
 The command receives the following arguments:
 
 namespace
    (bytestring) Pushkey namespace to operate on.
 key
    (bytestring) The pushkey key to set.
 old
    (bytestring) Old value for this key.
 new
    (bytestring) New value for this key.
 
 TODO consider using binary to represent nodes is certain pushkey namespaces.
 TODO better define response type and meaning.
 
 rawstorefiledata
 ----------------
 
 Allows retrieving raw files used to store repository data.
 
 The command accepts the following arguments:
 
 files
    (array of bytestring) Describes the files that should be retrieved.
 
    The meaning of values in this array is dependent on the storage backend used
    by the server.
 
 The response bytestream starts with a CBOR map describing the data that follows.
 This map has the following bytestring keys:
 
 filecount
    (unsigned integer) Total number of files whose data is being transferred.
 
 totalsize
    (unsigned integer) Total size in bytes of files data that will be
    transferred. This is file on-disk size and not wire size.
 
 Following the map header are N file segments. Each file segment consists of a
 CBOR map followed by an indefinite length bytestring. Each map has the following
 bytestring keys:
 
 location
    (bytestring) Denotes the location in the repository where the file should be
    written. Values map to vfs instances to use for the writing.
 
 path
    (bytestring) Path of file being transferred. Path is the raw store
    path and can be any sequence of bytes that can be tracked in a Mercurial
    manifest.
 
 size
    (unsigned integer) Size of file data. This will be the final written
    file size. The total size of the data that follows the CBOR map
    will be greater due to encoding overhead of CBOR.
 
 TODO this command is woefully incomplete. If we are to move forward with a
 stream clone analog, it needs a lot more metadata around how to describe what
 files are available to retrieve, other semantics.
 
 Revision Specifiers
 ===================
 
 A *revision specifier* is a map that evaluates to a set of revisions.
 
 A *revision specifier* has a ``type`` key that defines the revision
 selection type to perform. Other keys in the map are used in a
 type-specific manner.
 
 The following types are defined:
 
 changesetexplicit
    An explicit set of enumerated changeset revisions.
 
    The ``nodes`` key MUST contain an array of full binary nodes, expressed
    as bytestrings.
 
 changesetexplicitdepth
    Like ``changesetexplicit``, but contains a ``depth`` key defining the
    unsigned integer number of ancestor revisions to also resolve. For each
    value in ``nodes``, DAG ancestors will be walked until up to N total
    revisions from that ancestry walk are present in the final resolved set.
 
 changesetdagrange
    Defines revisions via a DAG range of changesets on the changelog.
 
    The ``roots`` key MUST contain an array of full, binary node values
    representing the *root* revisions.
 
    The ``heads`` key MUST contain an array of full, binary nodes values
    representing the *head* revisions.
 
    The DAG range between ``roots`` and ``heads`` will be resolved and all
    revisions between will be used. Nodes in ``roots`` are not part of the
    resolved set. Nodes in ``heads`` are. The ``roots`` array may be empty.
    The ``heads`` array MUST be defined.
 
 Path Filters
 ============
 
 Various commands accept a *path filter* argument that defines the set of file
 paths relevant to the request.
 
 A *path filter* is defined as a map with the bytestring keys ``include`` and
 ``exclude``. Each is an array of bytestring values. Each value defines a pattern
 rule (see :hg:`help patterns`) that is used to match file paths.
 
 A path matches the path filter if it is matched by a rule in the ``include``
 set but doesn't match a rule in the ``exclude`` set. In other words, a path
 matcher takes the union of all ``include`` patterns and then substracts the
 union of all ``exclude`` patterns.
 
 Patterns MUST be prefixed with their pattern type. Only the following pattern
 types are allowed: ``path:``, ``rootfilesin:``.
 
 If the ``include`` key is omitted, it is assumed that all paths are
 relevant. The patterns from ``exclude`` will still be used, if defined.
 
 An example value is ``path:tests/foo``, which would match a file named
 ``tests/foo`` or a directory ``tests/foo`` and all files under it.

mercurial/wireprotov2server.py

@@ -1,1465 +1,1455
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 import collections
 import contextlib
 import hashlib
 
 from .i18n import _
 from .node import (
     hex,
     nullid,
 )
 from . import (
     discovery,
     encoding,
     error,
     match as matchmod,
     narrowspec,
     pycompat,
     streamclone,
     util,
     wireprotoframing,
     wireprototypes,
 )
 from .utils import (
     cborutil,
     interfaceutil,
     stringutil,
 )
 
 FRAMINGTYPE = b'application/mercurial-exp-framing-0006'
 
 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
 
 COMMANDS = wireprototypes.commanddict()
 
 # Value inserted into cache key computation function. Change the value to
 # force new cache keys for every command request. This should be done when
 # there is a change to how caching works, etc.
 GLOBAL_CACHE_VERSION = 1
 
 def handlehttpv2request(rctx, req, res, checkperm, urlparts):
     from .hgweb import common as hgwebcommon
 
     # URL space looks like: <permissions>/<command>, where <permission> can
     # be ``ro`` or ``rw`` to signal read-only or read-write, respectively.
 
     # Root URL does nothing meaningful... yet.
     if not urlparts:
         res.status = b'200 OK'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('HTTP version 2 API handler'))
         return
 
     if len(urlparts) == 1:
         res.status = b'404 Not Found'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('do not know how to process %s\n') %
                          req.dispatchpath)
         return
 
     permission, command = urlparts[0:2]
 
     if permission not in (b'ro', b'rw'):
         res.status = b'404 Not Found'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('unknown permission: %s') % permission)
         return
 
     if req.method != 'POST':
         res.status = b'405 Method Not Allowed'
         res.headers[b'Allow'] = b'POST'
         res.setbodybytes(_('commands require POST requests'))
         return
 
     # At some point we'll want to use our own API instead of recycling the
     # behavior of version 1 of the wire protocol...
     # TODO return reasonable responses - not responses that overload the
     # HTTP status line message for error reporting.
     try:
         checkperm(rctx, req, 'pull' if permission == b'ro' else 'push')
     except hgwebcommon.ErrorResponse as e:
         res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e))
         for k, v in e.headers:
             res.headers[k] = v
         res.setbodybytes('permission denied')
         return
 
     # We have a special endpoint to reflect the request back at the client.
     if command == b'debugreflect':
         _processhttpv2reflectrequest(rctx.repo.ui, rctx.repo, req, res)
         return
 
     # Extra commands that we handle that aren't really wire protocol
     # commands. Think extra hard before making this hackery available to
     # extension.
     extracommands = {'multirequest'}
 
     if command not in COMMANDS and command not in extracommands:
         res.status = b'404 Not Found'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('unknown wire protocol command: %s\n') % command)
         return
 
     repo = rctx.repo
     ui = repo.ui
 
     proto = httpv2protocolhandler(req, ui)
 
     if (not COMMANDS.commandavailable(command, proto)
         and command not in extracommands):
         res.status = b'404 Not Found'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('invalid wire protocol command: %s') % command)
         return
 
     # TODO consider cases where proxies may add additional Accept headers.
     if req.headers.get(b'Accept') != FRAMINGTYPE:
         res.status = b'406 Not Acceptable'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('client MUST specify Accept header with value: %s\n')
                            % FRAMINGTYPE)
         return
 
     if req.headers.get(b'Content-Type') != FRAMINGTYPE:
         res.status = b'415 Unsupported Media Type'
         # TODO we should send a response with appropriate media type,
         # since client does Accept it.
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('client MUST send Content-Type header with '
                            'value: %s\n') % FRAMINGTYPE)
         return
 
     _processhttpv2request(ui, repo, req, res, permission, command, proto)
 
 def _processhttpv2reflectrequest(ui, repo, req, res):
     """Reads unified frame protocol request and dumps out state to client.
 
     This special endpoint can be used to help debug the wire protocol.
 
     Instead of routing the request through the normal dispatch mechanism,
     we instead read all frames, decode them, and feed them into our state
     tracker. We then dump the log of all that activity back out to the
     client.
     """
     import json
 
     # Reflection APIs have a history of being abused, accidentally disclosing
     # sensitive data, etc. So we have a config knob.
     if not ui.configbool('experimental', 'web.api.debugreflect'):
         res.status = b'404 Not Found'
         res.headers[b'Content-Type'] = b'text/plain'
         res.setbodybytes(_('debugreflect service not available'))
         return
 
     # We assume we have a unified framing protocol request body.
 
     reactor = wireprotoframing.serverreactor(ui)
     states = []
 
     while True:
         frame = wireprotoframing.readframe(req.bodyfh)
 
         if not frame:
             states.append(b'received: <no frame>')
             break
 
         states.append(b'received: %d %d %d %s' % (frame.typeid, frame.flags,
                                                   frame.requestid,
                                                   frame.payload))
 
         action, meta = reactor.onframerecv(frame)
         states.append(json.dumps((action, meta), sort_keys=True,
                                  separators=(', ', ': ')))
 
     action, meta = reactor.oninputeof()
     meta['action'] = action
     states.append(json.dumps(meta, sort_keys=True, separators=(', ',': ')))
 
     res.status = b'200 OK'
     res.headers[b'Content-Type'] = b'text/plain'
     res.setbodybytes(b'\n'.join(states))
 
 def _processhttpv2request(ui, repo, req, res, authedperm, reqcommand, proto):
     """Post-validation handler for HTTPv2 requests.
 
     Called when the HTTP request contains unified frame-based protocol
     frames for evaluation.
     """
     # TODO Some HTTP clients are full duplex and can receive data before
     # the entire request is transmitted. Figure out a way to indicate support
     # for that so we can opt into full duplex mode.
     reactor = wireprotoframing.serverreactor(ui, deferoutput=True)
     seencommand = False
 
     outstream = None
 
     while True:
         frame = wireprotoframing.readframe(req.bodyfh)
         if not frame:
             break
 
         action, meta = reactor.onframerecv(frame)
 
         if action == 'wantframe':
             # Need more data before we can do anything.
             continue
         elif action == 'runcommand':
             # Defer creating output stream because we need to wait for
             # protocol settings frames so proper encoding can be applied.
             if not outstream:
                 outstream = reactor.makeoutputstream()
 
             sentoutput = _httpv2runcommand(ui, repo, req, res, authedperm,
                                            reqcommand, reactor, outstream,
                                            meta, issubsequent=seencommand)
 
             if sentoutput:
                 return
 
             seencommand = True
 
         elif action == 'error':
             # TODO define proper error mechanism.
             res.status = b'200 OK'
             res.headers[b'Content-Type'] = b'text/plain'
             res.setbodybytes(meta['message'] + b'\n')
             return
         else:
             raise error.ProgrammingError(
                 'unhandled action from frame processor: %s' % action)
 
     action, meta = reactor.oninputeof()
     if action == 'sendframes':
         # We assume we haven't started sending the response yet. If we're
         # wrong, the response type will raise an exception.
         res.status = b'200 OK'
         res.headers[b'Content-Type'] = FRAMINGTYPE
         res.setbodygen(meta['framegen'])
     elif action == 'noop':
         pass
     else:
         raise error.ProgrammingError('unhandled action from frame processor: %s'
                                      % action)
 
 def _httpv2runcommand(ui, repo, req, res, authedperm, reqcommand, reactor,
                       outstream, command, issubsequent):
     """Dispatch a wire protocol command made from HTTPv2 requests.
 
     The authenticated permission (``authedperm``) along with the original
     command from the URL (``reqcommand``) are passed in.
     """
     # We already validated that the session has permissions to perform the
     # actions in ``authedperm``. In the unified frame protocol, the canonical
     # command to run is expressed in a frame. However, the URL also requested
     # to run a specific command. We need to be careful that the command we
     # run doesn't have permissions requirements greater than what was granted
     # by ``authedperm``.
     #
     # Our rule for this is we only allow one command per HTTP request and
     # that command must match the command in the URL. However, we make
     # an exception for the ``multirequest`` URL. This URL is allowed to
     # execute multiple commands. We double check permissions of each command
     # as it is invoked to ensure there is no privilege escalation.
     # TODO consider allowing multiple commands to regular command URLs
     # iff each command is the same.
 
     proto = httpv2protocolhandler(req, ui, args=command['args'])
 
     if reqcommand == b'multirequest':
         if not COMMANDS.commandavailable(command['command'], proto):
             # TODO proper error mechanism
             res.status = b'200 OK'
             res.headers[b'Content-Type'] = b'text/plain'
             res.setbodybytes(_('wire protocol command not available: %s') %
                              command['command'])
             return True
 
         # TODO don't use assert here, since it may be elided by -O.
         assert authedperm in (b'ro', b'rw')
         wirecommand = COMMANDS[command['command']]
         assert wirecommand.permission in ('push', 'pull')
 
         if authedperm == b'ro' and wirecommand.permission != 'pull':
             # TODO proper error mechanism
             res.status = b'403 Forbidden'
             res.headers[b'Content-Type'] = b'text/plain'
             res.setbodybytes(_('insufficient permissions to execute '
                                'command: %s') % command['command'])
             return True
 
         # TODO should we also call checkperm() here? Maybe not if we're going
         # to overhaul that API. The granted scope from the URL check should
         # be good enough.
 
     else:
         # Don't allow multiple commands outside of ``multirequest`` URL.
         if issubsequent:
             # TODO proper error mechanism
             res.status = b'200 OK'
             res.headers[b'Content-Type'] = b'text/plain'
             res.setbodybytes(_('multiple commands cannot be issued to this '
                                'URL'))
             return True
 
         if reqcommand != command['command']:
             # TODO define proper error mechanism
             res.status = b'200 OK'
             res.headers[b'Content-Type'] = b'text/plain'
             res.setbodybytes(_('command in frame must match command in URL'))
             return True
 
     res.status = b'200 OK'
     res.headers[b'Content-Type'] = FRAMINGTYPE
 
     try:
         objs = dispatch(repo, proto, command['command'], command['redirect'])
 
         action, meta = reactor.oncommandresponsereadyobjects(
             outstream, command['requestid'], objs)
 
     except error.WireprotoCommandError as e:
         action, meta = reactor.oncommanderror(
             outstream, command['requestid'], e.message, e.messageargs)
 
     except Exception as e:
         action, meta = reactor.onservererror(
             outstream, command['requestid'],
             _('exception when invoking command: %s') %
             stringutil.forcebytestr(e))
 
     if action == 'sendframes':
         res.setbodygen(meta['framegen'])
         return True
     elif action == 'noop':
         return False
     else:
         raise error.ProgrammingError('unhandled event from reactor: %s' %
                                      action)
 
 def getdispatchrepo(repo, proto, command):
     return repo.filtered('served')
 
 def dispatch(repo, proto, command, redirect):
     """Run a wire protocol command.
 
     Returns an iterable of objects that will be sent to the client.
     """
     repo = getdispatchrepo(repo, proto, command)
 
     entry = COMMANDS[command]
     func = entry.func
     spec = entry.args
 
     args = proto.getargs(spec)
 
     # There is some duplicate boilerplate code here for calling the command and
     # emitting objects. It is either that or a lot of indented code that looks
     # like a pyramid (since there are a lot of code paths that result in not
     # using the cacher).
     callcommand = lambda: func(repo, proto, **pycompat.strkwargs(args))
 
     # Request is not cacheable. Don't bother instantiating a cacher.
     if not entry.cachekeyfn:
         for o in callcommand():
             yield o
         return
 
     if redirect:
         redirecttargets = redirect[b'targets']
         redirecthashes = redirect[b'hashes']
     else:
         redirecttargets = []
         redirecthashes = []
 
     cacher = makeresponsecacher(repo, proto, command, args,
                                 cborutil.streamencode,
                                 redirecttargets=redirecttargets,
                                 redirecthashes=redirecthashes)
 
     # But we have no cacher. Do default handling.
     if not cacher:
         for o in callcommand():
             yield o
         return
 
     with cacher:
         cachekey = entry.cachekeyfn(repo, proto, cacher, **args)
 
         # No cache key or the cacher doesn't like it. Do default handling.
         if cachekey is None or not cacher.setcachekey(cachekey):
             for o in callcommand():
                 yield o
             return
 
         # Serve it from the cache, if possible.
         cached = cacher.lookup()
 
         if cached:
             for o in cached['objs']:
                 yield o
             return
 
         # Else call the command and feed its output into the cacher, allowing
         # the cacher to buffer/mutate objects as it desires.
         for o in callcommand():
             for o in cacher.onobject(o):
                 yield o
 
         for o in cacher.onfinished():
             yield o
 
 @interfaceutil.implementer(wireprototypes.baseprotocolhandler)
 class httpv2protocolhandler(object):
     def __init__(self, req, ui, args=None):
         self._req = req
         self._ui = ui
         self._args = args
 
     @property
     def name(self):
         return HTTP_WIREPROTO_V2
 
     def getargs(self, args):
         # First look for args that were passed but aren't registered on this
         # command.
         extra = set(self._args) - set(args)
         if extra:
             raise error.WireprotoCommandError(
                 'unsupported argument to command: %s' %
                 ', '.join(sorted(extra)))
 
         # And look for required arguments that are missing.
         missing = {a for a in args if args[a]['required']} - set(self._args)
 
         if missing:
             raise error.WireprotoCommandError(
                 'missing required arguments: %s' % ', '.join(sorted(missing)))
 
         # Now derive the arguments to pass to the command, taking into
         # account the arguments specified by the client.
         data = {}
         for k, meta in sorted(args.items()):
             # This argument wasn't passed by the client.
             if k not in self._args:
                 data[k] = meta['default']()
                 continue
 
             v = self._args[k]
 
             # Sets may be expressed as lists. Silently normalize.
             if meta['type'] == 'set' and isinstance(v, list):
                 v = set(v)
 
             # TODO consider more/stronger type validation.
 
             data[k] = v
 
         return data
 
     def getprotocaps(self):
         # Protocol capabilities are currently not implemented for HTTP V2.
         return set()
 
     def getpayload(self):
         raise NotImplementedError
 
     @contextlib.contextmanager
     def mayberedirectstdio(self):
         raise NotImplementedError
 
     def client(self):
         raise NotImplementedError
 
     def addcapabilities(self, repo, caps):
         return caps
 
     def checkperm(self, perm):
         raise NotImplementedError
 
 def httpv2apidescriptor(req, repo):
     proto = httpv2protocolhandler(req, repo.ui)
 
     return _capabilitiesv2(repo, proto)
 
 def _capabilitiesv2(repo, proto):
     """Obtain the set of capabilities for version 2 transports.
 
     These capabilities are distinct from the capabilities for version 1
     transports.
     """
     caps = {
         'commands': {},
         'framingmediatypes': [FRAMINGTYPE],
         'pathfilterprefixes': set(narrowspec.VALID_PREFIXES),
     }
 
     for command, entry in COMMANDS.items():
         args = {}
 
         for arg, meta in entry.args.items():
             args[arg] = {
                 # TODO should this be a normalized type using CBOR's
                 # terminology?
                 b'type': meta['type'],
                 b'required': meta['required'],
             }
 
             if not meta['required']:
                 args[arg][b'default'] = meta['default']()
 
             if meta['validvalues']:
                 args[arg][b'validvalues'] = meta['validvalues']
 
         # TODO this type of check should be defined in a per-command callback.
         if (command == b'rawstorefiledata'
             and not streamclone.allowservergeneration(repo)):
             continue
 
         caps['commands'][command] = {
             'args': args,
             'permissions': [entry.permission],
         }
 
         if entry.extracapabilitiesfn:
             extracaps = entry.extracapabilitiesfn(repo, proto)
             caps['commands'][command].update(extracaps)
 
     caps['rawrepoformats'] = sorted(repo.requirements &
                                     repo.supportedformats)
 
     targets = getadvertisedredirecttargets(repo, proto)
     if targets:
         caps[b'redirect'] = {
             b'targets': [],
             b'hashes': [b'sha256', b'sha1'],
         }
 
         for target in targets:
             entry = {
                 b'name': target['name'],
                 b'protocol': target['protocol'],
                 b'uris': target['uris'],
             }
 
             for key in ('snirequired', 'tlsversions'):
                 if key in target:
                     entry[key] = target[key]
 
             caps[b'redirect'][b'targets'].append(entry)
 
     return proto.addcapabilities(repo, caps)
 
 def getadvertisedredirecttargets(repo, proto):
     """Obtain a list of content redirect targets.
 
     Returns a list containing potential redirect targets that will be
     advertised in capabilities data. Each dict MUST have the following
     keys:
 
     name
        The name of this redirect target. This is the identifier clients use
        to refer to a target. It is transferred as part of every command
        request.
 
     protocol
        Network protocol used by this target. Typically this is the string
        in front of the ``://`` in a URL. e.g. ``https``.
 
     uris
        List of representative URIs for this target. Clients can use the
        URIs to test parsing for compatibility or for ordering preference
        for which target to use.
 
     The following optional keys are recognized:
 
     snirequired
        Bool indicating if Server Name Indication (SNI) is required to
        connect to this target.
 
     tlsversions
        List of bytes indicating which TLS versions are supported by this
        target.
 
     By default, clients reflect the target order advertised by servers
     and servers will use the first client-advertised target when picking
     a redirect target. So targets should be advertised in the order the
     server prefers they be used.
     """
     return []
 
 def wireprotocommand(name, args=None, permission='push', cachekeyfn=None,
                      extracapabilitiesfn=None):
     """Decorator to declare a wire protocol command.
 
     ``name`` is the name of the wire protocol command being provided.
 
     ``args`` is a dict defining arguments accepted by the command. Keys are
     the argument name. Values are dicts with the following keys:
 
        ``type``
           The argument data type. Must be one of the following string
           literals: ``bytes``, ``int``, ``list``, ``dict``, ``set``,
           or ``bool``.
 
        ``default``
           A callable returning the default value for this argument. If not
           specified, ``None`` will be the default value.
 
        ``example``
           An example value for this argument.
 
        ``validvalues``
           Set of recognized values for this argument.
 
     ``permission`` defines the permission type needed to run this command.
     Can be ``push`` or ``pull``. These roughly map to read-write and read-only,
     respectively. Default is to assume command requires ``push`` permissions
     because otherwise commands not declaring their permissions could modify
     a repository that is supposed to be read-only.
 
     ``cachekeyfn`` defines an optional callable that can derive the
     cache key for this request.
 
     ``extracapabilitiesfn`` defines an optional callable that defines extra
     command capabilities/parameters that are advertised next to the command
     in the capabilities data structure describing the server. The callable
     receives as arguments the repository and protocol objects. It returns
     a dict of extra fields to add to the command descriptor.
 
     Wire protocol commands are generators of objects to be serialized and
     sent to the client.
 
     If a command raises an uncaught exception, this will be translated into
     a command error.
 
     All commands can opt in to being cacheable by defining a function
     (``cachekeyfn``) that is called to derive a cache key. This function
     receives the same arguments as the command itself plus a ``cacher``
     argument containing the active cacher for the request and returns a bytes
     containing the key in a cache the response to this command may be cached
     under.
     """
     transports = {k for k, v in wireprototypes.TRANSPORTS.items()
                   if v['version'] == 2}
 
     if permission not in ('push', 'pull'):
         raise error.ProgrammingError('invalid wire protocol permission; '
                                      'got %s; expected "push" or "pull"' %
                                      permission)
 
     if args is None:
         args = {}
 
     if not isinstance(args, dict):
         raise error.ProgrammingError('arguments for version 2 commands '
                                      'must be declared as dicts')
 
     for arg, meta in args.items():
         if arg == '*':
             raise error.ProgrammingError('* argument name not allowed on '
                                          'version 2 commands')
 
         if not isinstance(meta, dict):
             raise error.ProgrammingError('arguments for version 2 commands '
                                          'must declare metadata as a dict')
 
         if 'type' not in meta:
             raise error.ProgrammingError('%s argument for command %s does not '
                                          'declare type field' % (arg, name))
 
         if meta['type'] not in ('bytes', 'int', 'list', 'dict', 'set', 'bool'):
             raise error.ProgrammingError('%s argument for command %s has '
                                          'illegal type: %s' % (arg, name,
                                                                meta['type']))
 
         if 'example' not in meta:
             raise error.ProgrammingError('%s argument for command %s does not '
                                          'declare example field' % (arg, name))
 
         meta['required'] = 'default' not in meta
 
         meta.setdefault('default', lambda: None)
         meta.setdefault('validvalues', None)
 
     def register(func):
         if name in COMMANDS:
             raise error.ProgrammingError('%s command already registered '
                                          'for version 2' % name)
 
         COMMANDS[name] = wireprototypes.commandentry(
             func, args=args, transports=transports, permission=permission,
             cachekeyfn=cachekeyfn, extracapabilitiesfn=extracapabilitiesfn)
 
         return func
 
     return register
 
 def makecommandcachekeyfn(command, localversion=None, allargs=False):
     """Construct a cache key derivation function with common features.
 
     By default, the cache key is a hash of:
 
     * The command name.
     * A global cache version number.
     * A local cache version number (passed via ``localversion``).
     * All the arguments passed to the command.
     * The media type used.
     * Wire protocol version string.
     * The repository path.
     """
     if not allargs:
         raise error.ProgrammingError('only allargs=True is currently supported')
 
     if localversion is None:
         raise error.ProgrammingError('must set localversion argument value')
 
     def cachekeyfn(repo, proto, cacher, **args):
         spec = COMMANDS[command]
 
         # Commands that mutate the repo can not be cached.
         if spec.permission == 'push':
             return None
 
         # TODO config option to disable caching.
 
         # Our key derivation strategy is to construct a data structure
         # holding everything that could influence cacheability and to hash
         # the CBOR representation of that. Using CBOR seems like it might
         # be overkill. However, simpler hashing mechanisms are prone to
         # duplicate input issues. e.g. if you just concatenate two values,
         # "foo"+"bar" is identical to "fo"+"obar". Using CBOR provides
         # "padding" between values and prevents these problems.
 
         # Seed the hash with various data.
         state = {
             # To invalidate all cache keys.
             b'globalversion': GLOBAL_CACHE_VERSION,
             # More granular cache key invalidation.
             b'localversion': localversion,
             # Cache keys are segmented by command.
             b'command': pycompat.sysbytes(command),
             # Throw in the media type and API version strings so changes
             # to exchange semantics invalid cache.
             b'mediatype': FRAMINGTYPE,
             b'version': HTTP_WIREPROTO_V2,
             # So same requests for different repos don't share cache keys.
             b'repo': repo.root,
         }
 
         # The arguments passed to us will have already been normalized.
         # Default values will be set, etc. This is important because it
         # means that it doesn't matter if clients send an explicit argument
         # or rely on the default value: it will all normalize to the same
         # set of arguments on the server and therefore the same cache key.
         #
         # Arguments by their very nature must support being encoded to CBOR.
         # And the CBOR encoder is deterministic. So we hash the arguments
         # by feeding the CBOR of their representation into the hasher.
         if allargs:
             state[b'args'] = pycompat.byteskwargs(args)
 
         cacher.adjustcachekeystate(state)
 
         hasher = hashlib.sha1()
         for chunk in cborutil.streamencode(state):
             hasher.update(chunk)
 
         return pycompat.sysbytes(hasher.hexdigest())
 
     return cachekeyfn
 
 def makeresponsecacher(repo, proto, command, args, objencoderfn,
                        redirecttargets, redirecthashes):
     """Construct a cacher for a cacheable command.
 
     Returns an ``iwireprotocolcommandcacher`` instance.
 
     Extensions can monkeypatch this function to provide custom caching
     backends.
     """
     return None
 
 def resolvenodes(repo, revisions):
     """Resolve nodes from a revisions specifier data structure."""
     cl = repo.changelog
     clhasnode = cl.hasnode
 
     seen = set()
     nodes = []
 
     if not isinstance(revisions, list):
         raise error.WireprotoCommandError('revisions must be defined as an '
                                           'array')
 
     for spec in revisions:
         if b'type' not in spec:
             raise error.WireprotoCommandError(
                 'type key not present in revision specifier')
 
         typ = spec[b'type']
 
         if typ == b'changesetexplicit':
             if b'nodes' not in spec:
                 raise error.WireprotoCommandError(
                     'nodes key not present in changesetexplicit revision '
                     'specifier')
 
             for node in spec[b'nodes']:
                 if node not in seen:
                     nodes.append(node)
                     seen.add(node)
 
         elif typ == b'changesetexplicitdepth':
             for key in (b'nodes', b'depth'):
                 if key not in spec:
                     raise error.WireprotoCommandError(
                         '%s key not present in changesetexplicitdepth revision '
                         'specifier', (key,))
 
             for rev in repo.revs(b'ancestors(%ln, %d)', spec[b'nodes'],
                                  spec[b'depth'] - 1):
                 node = cl.node(rev)
 
                 if node not in seen:
                     nodes.append(node)
                     seen.add(node)
 
         elif typ == b'changesetdagrange':
             for key in (b'roots', b'heads'):
                 if key not in spec:
                     raise error.WireprotoCommandError(
                         '%s key not present in changesetdagrange revision '
                         'specifier', (key,))
 
             if not spec[b'heads']:
                 raise error.WireprotoCommandError(
                     'heads key in changesetdagrange cannot be empty')
 
             if spec[b'roots']:
                 common = [n for n in spec[b'roots'] if clhasnode(n)]
             else:
                 common = [nullid]
 
             for n in discovery.outgoing(repo, common, spec[b'heads']).missing:
                 if n not in seen:
                     nodes.append(n)
                     seen.add(n)
 
         else:
             raise error.WireprotoCommandError(
                 'unknown revision specifier type: %s', (typ,))
 
     return nodes
 
 @wireprotocommand('branchmap', permission='pull')
 def branchmapv2(repo, proto):
     yield {encoding.fromlocal(k): v
            for k, v in repo.branchmap().iteritems()}
 
 @wireprotocommand('capabilities', permission='pull')
 def capabilitiesv2(repo, proto):
     yield _capabilitiesv2(repo, proto)
 
 @wireprotocommand(
     'changesetdata',
     args={
         'revisions': {
             'type': 'list',
             'example': [{
                 b'type': b'changesetexplicit',
                 b'nodes': [b'abcdef...'],
             }],
         },
         'fields': {
             'type': 'set',
             'default': set,
             'example': {b'parents', b'revision'},
             'validvalues': {b'bookmarks', b'parents', b'phase', b'revision'},
         },
     },
     permission='pull')
 def changesetdata(repo, proto, revisions, fields):
     # TODO look for unknown fields and abort when they can't be serviced.
     # This could probably be validated by dispatcher using validvalues.
 
     cl = repo.changelog
     outgoing = resolvenodes(repo, revisions)
     publishing = repo.publishing()
 
     if outgoing:
         repo.hook('preoutgoing', throw=True, source='serve')
 
     yield {
         b'totalitems': len(outgoing),
     }
 
     # The phases of nodes already transferred to the client may have changed
     # since the client last requested data. We send phase-only records
     # for these revisions, if requested.
     # TODO actually do this. We'll probably want to emit phase heads
     # in the ancestry set of the outgoing revisions. This will ensure
     # that phase updates within that set are seen.
     if b'phase' in fields:
         pass
 
     nodebookmarks = {}
     for mark, node in repo._bookmarks.items():
         nodebookmarks.setdefault(node, set()).add(mark)
 
     # It is already topologically sorted by revision number.
     for node in outgoing:
         d = {
             b'node': node,
         }
 
         if b'parents' in fields:
             d[b'parents'] = cl.parents(node)
 
         if b'phase' in fields:
             if publishing:
                 d[b'phase'] = b'public'
             else:
                 ctx = repo[node]
                 d[b'phase'] = ctx.phasestr()
 
         if b'bookmarks' in fields and node in nodebookmarks:
             d[b'bookmarks'] = sorted(nodebookmarks[node])
             del nodebookmarks[node]
 
         followingmeta = []
         followingdata = []
 
         if b'revision' in fields:
             revisiondata = cl.revision(node, raw=True)
             followingmeta.append((b'revision', len(revisiondata)))
             followingdata.append(revisiondata)
 
         # TODO make it possible for extensions to wrap a function or register
         # a handler to service custom fields.
 
         if followingmeta:
             d[b'fieldsfollowing'] = followingmeta
 
         yield d
 
         for extra in followingdata:
             yield extra
 
     # If requested, send bookmarks from nodes that didn't have revision
     # data sent so receiver is aware of any bookmark updates.
     if b'bookmarks' in fields:
         for node, marks in sorted(nodebookmarks.iteritems()):
             yield {
                 b'node': node,
                 b'bookmarks': sorted(marks),
             }
 
 class FileAccessError(Exception):
     """Represents an error accessing a specific file."""
 
     def __init__(self, path, msg, args):
         self.path = path
         self.msg = msg
         self.args = args
 
 def getfilestore(repo, proto, path):
     """Obtain a file storage object for use with wire protocol.
 
     Exists as a standalone function so extensions can monkeypatch to add
     access control.
     """
     # This seems to work even if the file doesn't exist. So catch
     # "empty" files and return an error.
     fl = repo.file(path)
 
     if not len(fl):
         raise FileAccessError(path, 'unknown file: %s', (path,))
 
     return fl
 
 def emitfilerevisions(repo, path, revisions, linknodes, fields):
     for revision in revisions:
         d = {
             b'node': revision.node,
         }
 
         if b'parents' in fields:
             d[b'parents'] = [revision.p1node, revision.p2node]
 
         if b'linknode' in fields:
             d[b'linknode'] = linknodes[revision.node]
 
         followingmeta = []
         followingdata = []
 
         if b'revision' in fields:
             if revision.revision is not None:
                 followingmeta.append((b'revision', len(revision.revision)))
                 followingdata.append(revision.revision)
             else:
                 d[b'deltabasenode'] = revision.basenode
                 followingmeta.append((b'delta', len(revision.delta)))
                 followingdata.append(revision.delta)
 
         if followingmeta:
             d[b'fieldsfollowing'] = followingmeta
 
         yield d
 
         for extra in followingdata:
             yield extra
 
 def makefilematcher(repo, pathfilter):
     """Construct a matcher from a path filter dict."""
 
     # Validate values.
     if pathfilter:
         for key in (b'include', b'exclude'):
             for pattern in pathfilter.get(key, []):
                 if not pattern.startswith((b'path:', b'rootfilesin:')):
                     raise error.WireprotoCommandError(
                         '%s pattern must begin with `path:` or `rootfilesin:`; '
                         'got %s', (key, pattern))
 
     if pathfilter:
         matcher = matchmod.match(repo.root, b'',
                                  include=pathfilter.get(b'include', []),
                                  exclude=pathfilter.get(b'exclude', []))
     else:
         matcher = matchmod.match(repo.root, b'')
 
     # Requested patterns could include files not in the local store. So
     # filter those out.
     return repo.narrowmatch(matcher)
 
 @wireprotocommand(
     'filedata',
     args={
         'haveparents': {
             'type': 'bool',
             'default': lambda: False,
             'example': True,
         },
         'nodes': {
             'type': 'list',
             'example': [b'0123456...'],
         },
         'fields': {
             'type': 'set',
             'default': set,
             'example': {b'parents', b'revision'},
             'validvalues': {b'parents', b'revision', b'linknode'},
         },
         'path': {
             'type': 'bytes',
             'example': b'foo.txt',
         }
     },
     permission='pull',
     # TODO censoring a file revision won't invalidate the cache.
     # Figure out a way to take censoring into account when deriving
     # the cache key.
     cachekeyfn=makecommandcachekeyfn('filedata', 1, allargs=True))
 def filedata(repo, proto, haveparents, nodes, fields, path):
     # TODO this API allows access to file revisions that are attached to
     # secret changesets. filesdata does not have this problem. Maybe this
     # API should be deleted?
 
     try:
         # Extensions may wish to access the protocol handler.
         store = getfilestore(repo, proto, path)
     except FileAccessError as e:
         raise error.WireprotoCommandError(e.msg, e.args)
 
     clnode = repo.changelog.node
     linknodes = {}
 
     # Validate requested nodes.
     for node in nodes:
         try:
             store.rev(node)
         except error.LookupError:
             raise error.WireprotoCommandError('unknown file node: %s',
                                               (hex(node),))
 
         # TODO by creating the filectx against a specific file revision
         # instead of changeset, linkrev() is always used. This is wrong for
         # cases where linkrev() may refer to a hidden changeset. But since this
         # API doesn't know anything about changesets, we're not sure how to
         # disambiguate the linknode. Perhaps we should delete this API?
         fctx = repo.filectx(path, fileid=node)
         linknodes[node] = clnode(fctx.introrev())
 
     revisions = store.emitrevisions(nodes,
                                     revisiondata=b'revision' in fields,
                                     assumehaveparentrevisions=haveparents)
 
     yield {
         b'totalitems': len(nodes),
     }
 
     for o in emitfilerevisions(repo, path, revisions, linknodes, fields):
         yield o
 
 def filesdatacapabilities(repo, proto):
     batchsize = repo.ui.configint(
         b'experimental', b'server.filesdata.recommended-batch-size')
     return {
         b'recommendedbatchsize': batchsize,
     }
 
 @wireprotocommand(
     'filesdata',
     args={
         'haveparents': {
             'type': 'bool',
             'default': lambda: False,
             'example': True,
         },
         'fields': {
             'type': 'set',
             'default': set,
             'example': {b'parents', b'revision'},
             'validvalues': {b'firstchangeset', b'linknode', b'parents',
                             b'revision'},
         },
         'pathfilter': {
             'type': 'dict',
             'default': lambda: None,
             'example': {b'include': [b'path:tests']},
         },
         'revisions': {
             'type': 'list',
             'example': [{
                 b'type': b'changesetexplicit',
                 b'nodes': [b'abcdef...'],
             }],
         },
     },
     permission='pull',
     # TODO censoring a file revision won't invalidate the cache.
     # Figure out a way to take censoring into account when deriving
     # the cache key.
     cachekeyfn=makecommandcachekeyfn('filesdata', 1, allargs=True),
     extracapabilitiesfn=filesdatacapabilities)
 def filesdata(repo, proto, haveparents, fields, pathfilter, revisions):
     # TODO This should operate on a repo that exposes obsolete changesets. There
     # is a race between a client making a push that obsoletes a changeset and
     # another client fetching files data for that changeset. If a client has a
     # changeset, it should probably be allowed to access files data for that
     # changeset.
 
-    cl = repo.changelog
-    clnode = cl.node
     outgoing = resolvenodes(repo, revisions)
     filematcher = makefilematcher(repo, pathfilter)
 
-    # Figure out what needs to be emitted.
-    changedpaths = set()
     # path -> {fnode: linknode}
     fnodes = collections.defaultdict(dict)
 
+    # We collect the set of relevant file revisions by iterating the changeset
+    # revisions and either walking the set of files recorded in the changeset
+    # or by walking the manifest at that revision. There is probably room for a
+    # storage-level API to request this data, as it can be expensive to compute
+    # and would benefit from caching or alternate storage from what revlogs
+    # provide.
     for node in outgoing:
         ctx = repo[node]
-        changedpaths.update(ctx.files())
+        mctx = ctx.manifestctx()
+        md = mctx.read()
 
-    changedpaths = sorted(p for p in changedpaths if filematcher(p))
-
-    # If ancestors are known, we send file revisions having a linkrev in the
-    # outgoing set of changeset revisions.
     if haveparents:
-        outgoingclrevs = set(cl.rev(n) for n in outgoing)
-
-        for path in changedpaths:
-            try:
-                store = getfilestore(repo, proto, path)
-            except FileAccessError as e:
-                raise error.WireprotoCommandError(e.msg, e.args)
+            checkpaths = ctx.files()
+        else:
+            checkpaths = md.keys()
 
-            for rev in store:
-                linkrev = store.linkrev(rev)
-
-                if linkrev in outgoingclrevs:
-                    fnodes[path].setdefault(store.node(rev), clnode(linkrev))
+        for path in checkpaths:
+            fnode = md[path]
 
-    # If ancestors aren't known, we walk the manifests and send all
-    # encountered file revisions.
-    else:
-        for node in outgoing:
-            mctx = repo[node].manifestctx()
+            if path in fnodes and fnode in fnodes[path]:
+                continue
 
-            for path, fnode in mctx.read().items():
-                if filematcher(path):
+            if not filematcher(path):
+                continue
+
                     fnodes[path].setdefault(fnode, node)
 
     yield {
         b'totalpaths': len(fnodes),
         b'totalitems': sum(len(v) for v in fnodes.values())
     }
 
     for path, filenodes in sorted(fnodes.items()):
         try:
             store = getfilestore(repo, proto, path)
         except FileAccessError as e:
             raise error.WireprotoCommandError(e.msg, e.args)
 
         yield {
             b'path': path,
             b'totalitems': len(filenodes),
         }
 
         revisions = store.emitrevisions(filenodes.keys(),
                                         revisiondata=b'revision' in fields,
                                         assumehaveparentrevisions=haveparents)
 
         for o in emitfilerevisions(repo, path, revisions, filenodes, fields):
             yield o
 
 @wireprotocommand(
     'heads',
     args={
         'publiconly': {
             'type': 'bool',
             'default': lambda: False,
             'example': False,
         },
     },
     permission='pull')
 def headsv2(repo, proto, publiconly):
     if publiconly:
         repo = repo.filtered('immutable')
 
     yield repo.heads()
 
 @wireprotocommand(
     'known',
     args={
         'nodes': {
             'type': 'list',
             'default': list,
             'example': [b'deadbeef'],
         },
     },
     permission='pull')
 def knownv2(repo, proto, nodes):
     result = b''.join(b'1' if n else b'0' for n in repo.known(nodes))
     yield result
 
 @wireprotocommand(
     'listkeys',
     args={
         'namespace': {
             'type': 'bytes',
             'example': b'ns',
         },
     },
     permission='pull')
 def listkeysv2(repo, proto, namespace):
     keys = repo.listkeys(encoding.tolocal(namespace))
     keys = {encoding.fromlocal(k): encoding.fromlocal(v)
             for k, v in keys.iteritems()}
 
     yield keys
 
 @wireprotocommand(
     'lookup',
     args={
         'key': {
             'type': 'bytes',
             'example': b'foo',
         },
     },
     permission='pull')
 def lookupv2(repo, proto, key):
     key = encoding.tolocal(key)
 
     # TODO handle exception.
     node = repo.lookup(key)
 
     yield node
 
 def manifestdatacapabilities(repo, proto):
     batchsize = repo.ui.configint(
         b'experimental', b'server.manifestdata.recommended-batch-size')
 
     return {
         b'recommendedbatchsize': batchsize,
     }
 
 @wireprotocommand(
     'manifestdata',
     args={
         'nodes': {
             'type': 'list',
             'example': [b'0123456...'],
         },
         'haveparents': {
             'type': 'bool',
             'default': lambda: False,
             'example': True,
         },
         'fields': {
             'type': 'set',
             'default': set,
             'example': {b'parents', b'revision'},
             'validvalues': {b'parents', b'revision'},
         },
         'tree': {
             'type': 'bytes',
             'example': b'',
         },
     },
     permission='pull',
     cachekeyfn=makecommandcachekeyfn('manifestdata', 1, allargs=True),
     extracapabilitiesfn=manifestdatacapabilities)
 def manifestdata(repo, proto, haveparents, nodes, fields, tree):
     store = repo.manifestlog.getstorage(tree)
 
     # Validate the node is known and abort on unknown revisions.
     for node in nodes:
         try:
             store.rev(node)
         except error.LookupError:
             raise error.WireprotoCommandError(
                 'unknown node: %s', (node,))
 
     revisions = store.emitrevisions(nodes,
                                     revisiondata=b'revision' in fields,
                                     assumehaveparentrevisions=haveparents)
 
     yield {
         b'totalitems': len(nodes),
     }
 
     for revision in revisions:
         d = {
             b'node': revision.node,
         }
 
         if b'parents' in fields:
             d[b'parents'] = [revision.p1node, revision.p2node]
 
         followingmeta = []
         followingdata = []
 
         if b'revision' in fields:
             if revision.revision is not None:
                 followingmeta.append((b'revision', len(revision.revision)))
                 followingdata.append(revision.revision)
             else:
                 d[b'deltabasenode'] = revision.basenode
                 followingmeta.append((b'delta', len(revision.delta)))
                 followingdata.append(revision.delta)
 
         if followingmeta:
             d[b'fieldsfollowing'] = followingmeta
 
         yield d
 
         for extra in followingdata:
             yield extra
 
 @wireprotocommand(
     'pushkey',
     args={
         'namespace': {
             'type': 'bytes',
             'example': b'ns',
         },
         'key': {
             'type': 'bytes',
             'example': b'key',
         },
         'old': {
             'type': 'bytes',
             'example': b'old',
         },
         'new': {
             'type': 'bytes',
             'example': 'new',
         },
     },
     permission='push')
 def pushkeyv2(repo, proto, namespace, key, old, new):
     # TODO handle ui output redirection
     yield repo.pushkey(encoding.tolocal(namespace),
                        encoding.tolocal(key),
                        encoding.tolocal(old),
                        encoding.tolocal(new))
 
 
 @wireprotocommand(
     'rawstorefiledata',
     args={
         'files': {
             'type': 'list',
             'example': [b'changelog', b'manifestlog'],
         },
         'pathfilter': {
             'type': 'list',
             'default': lambda: None,
             'example': {b'include': [b'path:tests']},
         },
     },
     permission='pull')
 def rawstorefiledata(repo, proto, files, pathfilter):
     if not streamclone.allowservergeneration(repo):
         raise error.WireprotoCommandError(b'stream clone is disabled')
 
     # TODO support dynamically advertising what store files "sets" are
     # available. For now, we support changelog, manifestlog, and files.
     files = set(files)
     allowedfiles = {b'changelog', b'manifestlog'}
 
     unsupported = files - allowedfiles
     if unsupported:
         raise error.WireprotoCommandError(b'unknown file type: %s',
                                           (b', '.join(sorted(unsupported)),))
 
     with repo.lock():
         topfiles = list(repo.store.topfiles())
 
     sendfiles = []
     totalsize = 0
 
     # TODO this is a bunch of storage layer interface abstractions because
     # it assumes revlogs.
     for name, encodedname, size in topfiles:
         if b'changelog' in files and name.startswith(b'00changelog'):
             pass
         elif b'manifestlog' in files and name.startswith(b'00manifest'):
             pass
         else:
             continue
 
         sendfiles.append((b'store', name, size))
         totalsize += size
 
     yield {
         b'filecount': len(sendfiles),
         b'totalsize': totalsize,
     }
 
     for location, name, size in sendfiles:
         yield {
             b'location': location,
             b'path': name,
             b'size': size,
         }
 
         # We have to use a closure for this to ensure the context manager is
         # closed only after sending the final chunk.
         def getfiledata():
             with repo.svfs(name, 'rb', auditpath=False) as fh:
                 for chunk in util.filechunkiter(fh, limit=size):
                     yield chunk
 
         yield wireprototypes.indefinitebytestringresponse(
             getfiledata())

tests/test-wireproto-command-filesdata.t

@@ -1,1292 +1,1298
   $ . $TESTDIR/wireprotohelpers.sh
 
   $ hg init server
   $ enablehttpv2 server
   $ cd server
   $ cat > a << EOF
   > a0
   > 00000000000000000000000000000000000000
   > 11111111111111111111111111111111111111
   > EOF
   $ cat > b << EOF
   > b0
   > aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   > bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   > EOF
   $ mkdir -p dir0/child0 dir0/child1 dir1
   $ echo c0 > dir0/c
   $ echo d0 > dir0/d
   $ echo e0 > dir0/child0/e
   $ echo f0 > dir0/child1/f
   $ hg -q commit -A -m 'commit 0'
 
   $ echo a1 >> a
   $ echo d1 > dir0/d
   $ echo g0 > g
   $ echo h0 > h
   $ hg -q commit -A -m 'commit 1'
   $ echo f1 > dir0/child1/f
   $ echo i0 > dir0/i
   $ hg -q commit -A -m 'commit 2'
 
   $ hg -q up -r 0
   $ echo a2 >> a
   $ hg commit -m 'commit 3'
   created new head
 
 Create multiple heads introducing the same file nodefile node
 
   $ hg -q up -r 0
   $ echo foo > dupe-file
   $ hg commit -Am 'dupe 1'
   adding dupe-file
   created new head
   $ hg -q up -r 0
   $ echo foo > dupe-file
   $ hg commit -Am 'dupe 2'
   adding dupe-file
   created new head
 
   $ hg log -G -T '{rev}:{node} {desc}\n'
   @  5:47fc30580911232cb264675b402819deddf6c6f0 dupe 2
   |
   | o  4:b16cce2967c1749ef4f4e3086a806cfbad8a3af7 dupe 1
   |/
   | o  3:476fbf122cd82f6726f0191ff146f67140946abc commit 3
   |/
   | o  2:b91c03cbba3519ab149b6cd0a0afbdb5cf1b5c8a commit 2
   | |
   | o  1:5b0b1a23577e205ea240e39c9704e28d7697cbd8 commit 1
   |/
   o  0:6e875ff18c227659ad6143bb3580c65700734884 commit 0
   
 
   $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
 
 Missing arguments is an error
 
   $ sendhttpv2peer << EOF
   > command filesdata
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   abort: missing required arguments: revisions!
   [255]
 
 Bad pattern to pathfilter is rejected
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >          b'type': b'changesetexplicit',
   >          b'nodes': [
   >              b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >          ]}]
   >     pathfilter eval:{b'include': [b'bad:foo']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   abort: include pattern must begin with `path:` or `rootfilesin:`; got bad:foo!
   [255]
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     pathfilter eval:{b'exclude': [b'glob:foo']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   abort: exclude pattern must begin with `path:` or `rootfilesin:`; got glob:foo!
   [255]
 
 Fetching a single changeset without parents fetches all files
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 8,
       b'totalpaths': 8
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 1
     },
     {
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 Fetching a single changeset saying parents data is available fetches just new files
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     haveparents eval:True
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 4,
       b'totalpaths': 4
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 A path filter for a sub-directory is honored
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     haveparents eval:True
   >     pathfilter eval:{b'include': [b'path:dir0']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 1,
       b'totalpaths': 1
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     }
   ]
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     haveparents eval:True
   >     pathfilter eval:{b'exclude': [b'path:a', b'path:g']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 2,
       b'totalpaths': 2
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 Requesting multiple changeset nodes without haveparents sends all data for both
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >             b'\xb9\x1c\x03\xcb\xba\x35\x19\xab\x14\x9b\x6c\xd0\xa0\xaf\xbd\xb5\xcf\x1b\x5c\x8a',
   >         ]}]
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 10,
       b'totalpaths': 9
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 2
     },
     {
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     {
       b'node': b'(\xc7v\xae\x08\xd0\xd5^\xb4\x06H\xb4\x01\xb9\x0f\xf5DH4\x8e'
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'dir0/i',
       b'totalitems': 1
     },
     {
       b'node': b'\xd7t\xb5\x80Jq\xfd1\xe1\xae\x05\xea\x8e2\xdd\x9b\xa3\xd8S\xd7'
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 Requesting multiple changeset nodes with haveparents sends incremental data for both
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >             b'\xb9\x1c\x03\xcb\xba\x35\x19\xab\x14\x9b\x6c\xd0\xa0\xaf\xbd\xb5\xcf\x1b\x5c\x8a',
   >         ]}]
   >     haveparents eval:True
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 6,
       b'totalpaths': 6
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 1
     },
     {
       b'node': b'(\xc7v\xae\x08\xd0\xd5^\xb4\x06H\xb4\x01\xb9\x0f\xf5DH4\x8e'
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'dir0/i',
       b'totalitems': 1
     },
     {
       b'node': b'\xd7t\xb5\x80Jq\xfd1\xe1\xae\x05\xea\x8e2\xdd\x9b\xa3\xd8S\xd7'
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 Requesting parents works
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     fields eval:[b'parents']
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 8,
       b'totalpaths': 8
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11',
       b'parents': [
         b'd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 1
     },
     {
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G',
       b'parents': [
         b'S\x82\x06\xdc\x97\x1eR\x15@\xd6\x84:\xbf\xe6\xd1`2\xf6\xd4&',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K',
       b'parents': [
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
         b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
       ]
     }
   ]
 
 Requesting revision data works
 (haveparents defaults to False, so fulltext is emitted)
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     fields eval:[b'revision']
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 8,
       b'totalpaths': 8
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           84
         ]
       ],
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\na1\n',
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           81
         ]
       ],
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     b'b0\naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n',
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     b'c0\n',
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     b'e0\n',
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     b'f0\n',
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     b'd1\n',
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     b'g0\n',
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     },
     b'h0\n'
   ]
 
 haveparents=False should be same as above
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     fields eval:[b'revision']
   >     haveparents eval:False
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 8,
       b'totalpaths': 8
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           84
         ]
       ],
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\na1\n',
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           81
         ]
       ],
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     b'b0\naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n',
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     b'c0\n',
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     b'e0\n',
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     b'f0\n',
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     b'd1\n',
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     b'g0\n',
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     },
     b'h0\n'
   ]
 
 haveparents=True should emit a delta
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >         ]}]
   >     fields eval:[b'revision']
   >     haveparents eval:True
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 4,
       b'totalpaths': 4
     },
     {
       b'path': b'a',
       b'totalitems': 1
     },
     {
       b'deltabasenode': b'd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9',
       b'fieldsfollowing': [
         [
           b'delta',
           15
         ]
       ],
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     b'\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n',
     {
       b'path': b'dir0/d',
       b'totalitems': 1
     },
     {
       b'deltabasenode': b'S\x82\x06\xdc\x97\x1eR\x15@\xd6\x84:\xbf\xe6\xd1`2\xf6\xd4&',
       b'fieldsfollowing': [
         [
           b'delta',
           15
         ]
       ],
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     b'\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x03d1\n',
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     b'g0\n',
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     },
     b'h0\n'
   ]
 
 Requesting multiple revisions works
 (first revision is a fulltext since haveparents=False by default)
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x6e\x87\x5f\xf1\x8c\x22\x76\x59\xad\x61\x43\xbb\x35\x80\xc6\x57\x00\x73\x48\x84',
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >             b'\xb9\x1c\x03\xcb\xba\x35\x19\xab\x14\x9b\x6c\xd0\xa0\xaf\xbd\xb5\xcf\x1b\x5c\x8a',
   >         ]}]
   >     fields eval:[b'revision']
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 12,
       b'totalpaths': 9
     },
     {
       b'path': b'a',
       b'totalitems': 2
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           81
         ]
       ],
       b'node': b'd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9'
     },
     b'a0\n00000000000000000000000000000000000000\n11111111111111111111111111111111111111\n',
     {
       b'deltabasenode': b'd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9',
       b'fieldsfollowing': [
         [
           b'delta',
           15
         ]
       ],
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     b'\x00\x00\x00Q\x00\x00\x00Q\x00\x00\x00\x03a1\n',
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           81
         ]
       ],
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     b'b0\naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n',
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     b'c0\n',
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     b'e0\n',
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 2
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     b'f0\n',
     {
       b'deltabasenode': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4',
       b'fieldsfollowing': [
         [
           b'delta',
           15
         ]
       ],
       b'node': b'(\xc7v\xae\x08\xd0\xd5^\xb4\x06H\xb4\x01\xb9\x0f\xf5DH4\x8e'
     },
     b'\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x03f1\n',
     {
       b'path': b'dir0/d',
       b'totalitems': 2
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'S\x82\x06\xdc\x97\x1eR\x15@\xd6\x84:\xbf\xe6\xd1`2\xf6\xd4&'
     },
     b'd0\n',
     {
       b'deltabasenode': b'S\x82\x06\xdc\x97\x1eR\x15@\xd6\x84:\xbf\xe6\xd1`2\xf6\xd4&',
       b'fieldsfollowing': [
         [
           b'delta',
           15
         ]
       ],
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     b'\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x03d1\n',
     {
       b'path': b'dir0/i',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xd7t\xb5\x80Jq\xfd1\xe1\xae\x05\xea\x8e2\xdd\x9b\xa3\xd8S\xd7'
     },
     b'i0\n',
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     b'g0\n',
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'fieldsfollowing': [
         [
           b'revision',
           3
         ]
       ],
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     },
     b'h0\n'
   ]
 
 Requesting linknode field works
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x6e\x87\x5f\xf1\x8c\x22\x76\x59\xad\x61\x43\xbb\x35\x80\xc6\x57\x00\x73\x48\x84',
   >             b'\x5b\x0b\x1a\x23\x57\x7e\x20\x5e\xa2\x40\xe3\x9c\x97\x04\xe2\x8d\x76\x97\xcb\xd8',
   >             b'\xb9\x1c\x03\xcb\xba\x35\x19\xab\x14\x9b\x6c\xd0\xa0\xaf\xbd\xb5\xcf\x1b\x5c\x8a',
   >         ]}]
   >     fields eval:[b'linknode']
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 12,
       b'totalpaths': 9
     },
     {
       b'path': b'a',
       b'totalitems': 2
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'd\x9d\x14\x9d\xf4=\x83\x88%#\xb7\xfb\x1ej:\xf6\xf1\x90{9'
     },
     {
       b'linknode': b'[\x0b\x1a#W~ ^\xa2@\xe3\x9c\x97\x04\xe2\x8dv\x97\xcb\xd8',
       b'node': b'\n\x862\x1f\x13y\xd1\xa9\xec\xd0W\x9a"\x97z\xf7\xa5\xac\xaf\x11'
     },
     {
       b'path': b'b',
       b'totalitems': 1
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'\x88\xbac\xb8\xd8\xc6 :\xc6z\xc9\x98\xac\xd9\x17K\xf7\x05!\xb2'
     },
     {
       b'path': b'dir0/c',
       b'totalitems': 1
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'\x91DE4j\x0c\xa0b\x9b\xd4|\xeb]\xfe\x07\xe4\xd4\xcf%\x01'
     },
     {
       b'path': b'dir0/child0/e',
       b'totalitems': 1
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'\xbb\xbal\x06\xb3\x0fD=4\xff\x84\x1b\xc9\x85\xc4\xd0\x82|k\xe4'
     },
     {
       b'path': b'dir0/child1/f',
       b'totalitems': 2
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'\x12\xfc}\xcdw;Z\n\x92\x9c\xe1\x95"\x80\x83\xc6\xdd\xc9\xce\xc4'
     },
     {
       b'linknode': b'\xb9\x1c\x03\xcb\xba5\x19\xab\x14\x9bl\xd0\xa0\xaf\xbd\xb5\xcf\x1b\\\x8a',
       b'node': b'(\xc7v\xae\x08\xd0\xd5^\xb4\x06H\xb4\x01\xb9\x0f\xf5DH4\x8e'
     },
     {
       b'path': b'dir0/d',
       b'totalitems': 2
     },
     {
       b'linknode': b'n\x87_\xf1\x8c"vY\xadaC\xbb5\x80\xc6W\x00sH\x84',
       b'node': b'S\x82\x06\xdc\x97\x1eR\x15@\xd6\x84:\xbf\xe6\xd1`2\xf6\xd4&'
     },
     {
       b'linknode': b'[\x0b\x1a#W~ ^\xa2@\xe3\x9c\x97\x04\xe2\x8dv\x97\xcb\xd8',
       b'node': b'\x93\x88)\xad\x01R}2\xba\x06_\x81#6\xfe\xc7\x9d\xdd9G'
     },
     {
       b'path': b'dir0/i',
       b'totalitems': 1
     },
     {
       b'linknode': b'\xb9\x1c\x03\xcb\xba5\x19\xab\x14\x9bl\xd0\xa0\xaf\xbd\xb5\xcf\x1b\\\x8a',
       b'node': b'\xd7t\xb5\x80Jq\xfd1\xe1\xae\x05\xea\x8e2\xdd\x9b\xa3\xd8S\xd7'
     },
     {
       b'path': b'g',
       b'totalitems': 1
     },
     {
       b'linknode': b'[\x0b\x1a#W~ ^\xa2@\xe3\x9c\x97\x04\xe2\x8dv\x97\xcb\xd8',
       b'node': b'\xde\xca\xba5DFjI\x95r\xe9\x0f\xac\xe6\xfa\x0c!k\xba\x8c'
     },
     {
       b'path': b'h',
       b'totalitems': 1
     },
     {
       b'linknode': b'[\x0b\x1a#W~ ^\xa2@\xe3\x9c\x97\x04\xe2\x8dv\x97\xcb\xd8',
       b'node': b'\x03A\xfc\x84\x1b\xb5\xb4\xba\x93\xb2mM\xdaa\xf7y6]\xb3K'
     }
   ]
 
 Test behavior where a file node is introduced in 2 DAG heads
 
 Request for changeset introducing filenode returns linknode as self
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\xb1\x6c\xce\x29\x67\xc1\x74\x9e\xf4\xf4\xe3\x08\x6a\x80\x6c\xfb\xad\x8a\x3a\xf7',
   >         ]}]
   >     fields eval:[b'linknode']
   >     pathfilter eval:{b'include': [b'path:dupe-file']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 1,
       b'totalpaths': 1
     },
     {
       b'path': b'dupe-file',
       b'totalitems': 1
     },
     {
       b'linknode': b'\xb1l\xce)g\xc1t\x9e\xf4\xf4\xe3\x08j\x80l\xfb\xad\x8a:\xf7',
       b'node': b'.\xd2\xa3\x91*\x0b$P C\xea\xe8N\xe4\xb2y\xc1\x8b\x90\xdd'
     }
   ]
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\xb1\x6c\xce\x29\x67\xc1\x74\x9e\xf4\xf4\xe3\x08\x6a\x80\x6c\xfb\xad\x8a\x3a\xf7',
   >         ]}]
   >     fields eval:[b'linknode']
   >     haveparents eval:True
   >     pathfilter eval:{b'include': [b'path:dupe-file']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 1,
       b'totalpaths': 1
     },
     {
       b'path': b'dupe-file',
       b'totalitems': 1
     },
     {
       b'linknode': b'\xb1l\xce)g\xc1t\x9e\xf4\xf4\xe3\x08j\x80l\xfb\xad\x8a:\xf7',
       b'node': b'.\xd2\xa3\x91*\x0b$P C\xea\xe8N\xe4\xb2y\xc1\x8b\x90\xdd'
     }
   ]
 
 Request for changeset where recorded linknode isn't in DAG ancestry will get
 rewritten accordingly
 
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x47\xfc\x30\x58\x09\x11\x23\x2c\xb2\x64\x67\x5b\x40\x28\x19\xde\xdd\xf6\xc6\xf0',
   >         ]}]
   >     fields eval:[b'linknode']
   >     pathfilter eval:{b'include': [b'path:dupe-file']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
       b'totalitems': 1,
       b'totalpaths': 1
     },
     {
       b'path': b'dupe-file',
       b'totalitems': 1
     },
     {
       b'linknode': b'G\xfc0X\t\x11#,\xb2dg[@(\x19\xde\xdd\xf6\xc6\xf0',
       b'node': b'.\xd2\xa3\x91*\x0b$P C\xea\xe8N\xe4\xb2y\xc1\x8b\x90\xdd'
     }
   ]
 
-TODO this is buggy
-
   $ sendhttpv2peer << EOF
   > command filesdata
   >     revisions eval:[{
   >         b'type': b'changesetexplicit',
   >         b'nodes': [
   >             b'\x47\xfc\x30\x58\x09\x11\x23\x2c\xb2\x64\x67\x5b\x40\x28\x19\xde\xdd\xf6\xc6\xf0',
   >         ]}]
   >     fields eval:[b'linknode']
   >     haveparents eval:True
   >     pathfilter eval:{b'include': [b'path:dupe-file']}
   > EOF
   creating http peer for wire protocol version 2
   sending filesdata command
   response: gen[
     {
-      b'totalitems': 0,
-      b'totalpaths': 0
+      b'totalitems': 1,
+      b'totalpaths': 1
+    },
+    {
+      b'path': b'dupe-file',
+      b'totalitems': 1
+    },
+    {
+      b'linknode': b'G\xfc0X\t\x11#,\xb2dg[@(\x19\xde\xdd\xf6\xc6\xf0',
+      b'node': b'.\xd2\xa3\x91*\x0b$P C\xea\xe8N\xe4\xb2y\xc1\x8b\x90\xdd'
     }
   ]
 
   $ cat error.log

tests/test-wireproto-exchangev2.t

@@ -1,1320 +1,1305
 Tests for wire protocol version 2 exchange.
 Tests in this file should be folded into existing tests once protocol
 v2 has enough features that it can be enabled via #testcase in existing
 tests.
 
   $ . $TESTDIR/wireprotohelpers.sh
   $ enablehttpv2client
 
   $ hg init server-simple
   $ enablehttpv2 server-simple
   $ cd server-simple
   $ cat >> .hg/hgrc << EOF
   > [phases]
   > publish = false
   > EOF
   $ echo a0 > a
   $ echo b0 > b
   $ hg -q commit -A -m 'commit 0'
 
   $ echo a1 > a
   $ hg commit -m 'commit 1'
   $ hg phase --public -r .
   $ echo a2 > a
   $ hg commit -m 'commit 2'
 
   $ hg -q up -r 0
   $ echo b1 > b
   $ hg -q commit -m 'head 2 commit 1'
   $ echo b2 > b
   $ hg -q commit -m 'head 2 commit 2'
 
   $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
 
   $ cd ..
 
 Test basic clone
 
   $ hg --debug clone -U http://localhost:$HGPORT client-simple
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=941; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset 4432d83626e8
   add changeset cd2534766bec
   add changeset e96ae20f4188
   add changeset caa2a465451d
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8',
       '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5',
       '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f',
       '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
           '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5',
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=901; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:caa2a465451d (3 drafts)
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 All changesets should have been transferred
 
   $ hg -R client-simple debugindex -c
      rev linkrev nodeid       p1           p2
        0       0 3390ef850073 000000000000 000000000000
        1       1 4432d83626e8 3390ef850073 000000000000
        2       2 cd2534766bec 4432d83626e8 000000000000
        3       3 e96ae20f4188 3390ef850073 000000000000
        4       4 caa2a465451d e96ae20f4188 000000000000
 
   $ hg -R client-simple log -G -T '{rev} {node} {phase}\n'
   o  4 caa2a465451dd1facda0f5b12312c355584188a1 draft
   |
   o  3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
   |
   | o  2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
   | |
   | o  1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
   |/
   o  0 3390ef850073fbc2f0dfff2244342c8e9229013a public
   
 
 All manifests should have been transferred
 
   $ hg -R client-simple debugindex -m
      rev linkrev nodeid       p1           p2
        0       0 992f4779029a 000000000000 000000000000
        1       1 a988fb43583e 992f4779029a 000000000000
        2       2 ec804e488c20 a988fb43583e 000000000000
        3       3 045c7f3927da 992f4779029a 000000000000
        4       4 379cb0c2e664 045c7f3927da 000000000000
 
 Cloning only a specific revision works
 
   $ hg --debug clone -U -r 4432d83626e8 http://localhost:$HGPORT client-singlehead
   using http://localhost:$HGPORT/
   sending capabilities command
   sending 1 commands
   sending command lookup: {
     'key': '4432d83626e8'
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=21; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=381; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset 4432d83626e8
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=404; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=439; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:4432d83626e8
   (sent 6 HTTP requests and * bytes; received * bytes in responses) (glob)
 
   $ cd client-singlehead
 
   $ hg log -G -T '{rev} {node} {phase}\n'
   o  1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
   |
   o  0 3390ef850073fbc2f0dfff2244342c8e9229013a public
   
 
   $ hg debugindex -m
      rev linkrev nodeid       p1           p2
        0       0 992f4779029a 000000000000 000000000000
        1       1 a988fb43583e 992f4779029a 000000000000
 
 Incremental pull works
 
   $ hg --debug pull
   pulling from http://localhost:$HGPORT/
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': [
       'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   searching for changes
   all local heads known remotely
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'roots': [
           'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
         ],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=573; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset cd2534766bec
   add changeset e96ae20f4188
   add changeset caa2a465451d
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5',
       '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f',
       '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=601; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'revisions': [
       {
         'nodes': [
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
           '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5',
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=527; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets cd2534766bec:caa2a465451d (3 drafts)
   (run 'hg update' to get a working copy)
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
   $ hg log -G -T '{rev} {node} {phase}\n'
   o  4 caa2a465451dd1facda0f5b12312c355584188a1 draft
   |
   o  3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
   |
   | o  2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
   | |
   | o  1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
   |/
   o  0 3390ef850073fbc2f0dfff2244342c8e9229013a public
   
 
   $ hg debugindex -m
      rev linkrev nodeid       p1           p2
        0       0 992f4779029a 000000000000 000000000000
        1       1 a988fb43583e 992f4779029a 000000000000
        2       2 ec804e488c20 a988fb43583e 000000000000
        3       3 045c7f3927da 992f4779029a 000000000000
        4       4 379cb0c2e664 045c7f3927da 000000000000
 
 Phase-only update works
 TODO this doesn't work
 
   $ hg -R ../server-simple phase --public -r caa2a465451dd
   $ hg --debug pull
   pulling from http://localhost:$HGPORT/
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': [
       '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
       '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=3; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   searching for changes
   all remote heads known locally
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'roots': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   checking for updated bookmarks
   (run 'hg update' to get a working copy)
   (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
 
   $ hg log -G -T '{rev} {node} {phase}\n'
   o  4 caa2a465451dd1facda0f5b12312c355584188a1 draft
   |
   o  3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
   |
   | o  2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
   | |
   | o  1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
   |/
   o  0 3390ef850073fbc2f0dfff2244342c8e9229013a public
   
 
   $ cd ..
 
 Bookmarks are transferred on clone
 
   $ hg -R server-simple bookmark -r 3390ef850073fbc2f0dfff2244342c8e9229013a book-1
   $ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-2
 
   $ hg --debug clone -U http://localhost:$HGPORT/ client-bookmarks
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=979; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset 4432d83626e8
   add changeset cd2534766bec
   add changeset e96ae20f4188
   add changeset caa2a465451d
   checking for updated bookmarks
   adding remote bookmark book-1
   adding remote bookmark book-2
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8',
       '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5',
       '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f',
       '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
           '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5',
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=901; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:caa2a465451d (1 drafts)
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
   $ hg -R client-bookmarks bookmarks
      book-1                    0:3390ef850073
      book-2                    2:cd2534766bec
 
 Server-side bookmark moves are reflected during `hg pull`
 
   $ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-1
   moving bookmark 'book-1' forward from 3390ef850073
 
   $ hg -R client-bookmarks --debug pull
   pulling from http://localhost:$HGPORT/
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': [
       '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
       '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=3; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   searching for changes
   all remote heads known locally
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'roots': [
           '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
           '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
         ],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=65; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   checking for updated bookmarks
   updating bookmark book-1
   (run 'hg update' to get a working copy)
   (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
 
   $ hg -R client-bookmarks bookmarks
      book-1                    2:cd2534766bec
      book-2                    2:cd2534766bec
 
   $ killdaemons.py
 
 Let's set up a slightly more complicated server
 
   $ hg init server-2
   $ enablehttpv2 server-2
   $ cd server-2
   $ mkdir dir0 dir1
   $ echo a0 > a
   $ echo b0 > b
   $ hg -q commit -A -m 'commit 0'
   $ echo c0 > dir0/c
   $ echo d0 > dir0/d
   $ hg -q commit -A -m 'commit 1'
   $ echo e0 > dir1/e
   $ echo f0 > dir1/f
   $ hg -q commit -A -m 'commit 2'
   $ echo c1 > dir0/c
   $ echo e1 > dir1/e
   $ hg commit -m 'commit 3'
   $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
 
   $ cd ..
 
 Narrow clone only fetches some files
 
   $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ http://localhost:$HGPORT/ client-narrow-0
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset b709380892b1
   add changeset 47fe012ab237
   add changeset 97765fc3cd62
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8',
       '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb',
       '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'pathfilter': {
       'include': [
         'path:dir0'
       ]
     },
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b',
           'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%',
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=449; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:97765fc3cd62
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 #if reporevlogstore
   $ find client-narrow-0/.hg/store -type f -name '*.i' | sort
   client-narrow-0/.hg/store/00changelog.i
   client-narrow-0/.hg/store/00manifest.i
   client-narrow-0/.hg/store/data/dir0/c.i
   client-narrow-0/.hg/store/data/dir0/d.i
 #endif
 
 --exclude by itself works
 
   $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --exclude dir0/ http://localhost:$HGPORT/ client-narrow-1
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset b709380892b1
   add changeset 47fe012ab237
   add changeset 97765fc3cd62
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8',
       '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb',
       '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'pathfilter': {
       'exclude': [
         'path:dir0'
       ],
       'include': [
         'path:.'
       ]
     },
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b',
           'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%',
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=709; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:97765fc3cd62
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 #if reporevlogstore
   $ find client-narrow-1/.hg/store -type f -name '*.i' | sort
   client-narrow-1/.hg/store/00changelog.i
   client-narrow-1/.hg/store/00manifest.i
   client-narrow-1/.hg/store/data/a.i
   client-narrow-1/.hg/store/data/b.i
   client-narrow-1/.hg/store/data/dir1/e.i
   client-narrow-1/.hg/store/data/dir1/f.i
 #endif
 
 Mixing --include and --exclude works
 
   $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ --exclude dir0/c http://localhost:$HGPORT/ client-narrow-2
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset b709380892b1
   add changeset 47fe012ab237
   add changeset 97765fc3cd62
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8',
       '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb',
       '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'pathfilter': {
       'exclude': [
         'path:dir0/c'
       ],
       'include': [
         'path:dir0'
       ]
     },
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b',
           'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%',
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=160; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   new changesets 3390ef850073:97765fc3cd62
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 #if reporevlogstore
   $ find client-narrow-2/.hg/store -type f -name '*.i' | sort
   client-narrow-2/.hg/store/00changelog.i
   client-narrow-2/.hg/store/00manifest.i
   client-narrow-2/.hg/store/data/dir0/d.i
 #endif
 
 --stream will use rawfiledata to transfer changelog and manifestlog, then
 fall through to get files data
 
   $ hg --debug clone --stream -U http://localhost:$HGPORT client-stream-0
   using http://localhost:$HGPORT/
   sending capabilities command
   sending 1 commands
   sending command rawstorefiledata: {
     'files': [
       'changelog',
       'manifestlog'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': [
       '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   searching for changes
   all remote heads known locally
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   checking for updated bookmarks
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b',
           'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%',
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1133; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 --stream + --include/--exclude will only obtain some files
 
   $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --stream --include dir0/ -U http://localhost:$HGPORT client-stream-2
   using http://localhost:$HGPORT/
   sending capabilities command
   sending 1 commands
   sending command rawstorefiledata: {
     'files': [
       'changelog',
       'manifestlog'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   updating the branch cache
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': [
       '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   searching for changes
   all remote heads known locally
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   checking for updated bookmarks
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'pathfilter': {
       'include': [
         'path:dir0'
       ]
     },
     'revisions': [
       {
         'nodes': [
           '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
           '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b',
           'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%',
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=449; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 
 #if reporevlogstore
   $ find client-stream-2/.hg/store -type f -name '*.i' | sort
   client-stream-2/.hg/store/00changelog.i
   client-stream-2/.hg/store/00manifest.i
   client-stream-2/.hg/store/data/dir0/c.i
   client-stream-2/.hg/store/data/dir0/d.i
 #endif
 
 Shallow clone doesn't work with revlogs
 
   $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --depth 1 -U http://localhost:$HGPORT client-shallow-revlogs
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending 2 commands
   sending command heads: {}
   sending command known: {
     'nodes': []
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command changesetdata: {
     'fields': set([
       'bookmarks',
       'parents',
       'phase',
       'revision'
     ]),
     'revisions': [
       {
         'heads': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'roots': [],
         'type': 'changesetdagrange'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   add changeset 3390ef850073
   add changeset b709380892b1
   add changeset 47fe012ab237
   add changeset 97765fc3cd62
   checking for updated bookmarks
   sending 1 commands
   sending command manifestdata: {
     'fields': set([
       'parents',
       'revision'
     ]),
     'haveparents': True,
     'nodes': [
       '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A',
       '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8',
       '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb',
       '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3'
     ],
     'tree': ''
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   sending 1 commands
   sending command filesdata: {
     'fields': set([
       'linknode',
       'parents',
       'revision'
     ]),
     'haveparents': False,
     'revisions': [
       {
         'nodes': [
           '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.'
         ],
         'type': 'changesetexplicit'
       }
     ]
   }
   received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
   received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=1005; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
   received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
   transaction abort!
   rollback completed
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
   abort: revlog storage does not support missing parents write mode
   [255]
 
   $ killdaemons.py
 
 Repo with 2 DAG branches introducing same filenode, to test linknode adjustment
 
   $ hg init server-linknode
   $ enablehttpv2 server-linknode
   $ cd server-linknode
   $ touch foo
   $ hg -q commit -Am initial
   $ echo foo > dupe-file
   $ hg commit -Am 'dupe 1'
   adding dupe-file
   $ hg -q up -r 0
   $ echo foo > dupe-file
   $ hg commit -Am 'dupe 2'
   adding dupe-file
   created new head
   $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
 Perform an incremental pull of both heads and ensure linkrev is written out properly
 
   $ hg clone -r 96ee1d7354c4 http://localhost:$HGPORT client-linknode-1
   new changesets 96ee1d7354c4
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client-linknode-1
   $ touch extra
   $ hg commit -Am extra
   adding extra
   $ cd ..
 
   $ hg clone -r 96ee1d7354c4 http://localhost:$HGPORT client-linknode-2
   new changesets 96ee1d7354c4
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client-linknode-2
   $ touch extra
   $ hg commit -Am extra
   adding extra
   $ cd ..
 
   $ hg -R client-linknode-1 pull -r 1681c33f9f80
   pulling from http://localhost:$HGPORT/
   searching for changes
   new changesets 1681c33f9f80
   (run 'hg update' to get a working copy)
 
 #if reporevlogstore
   $ hg -R client-linknode-1 debugrevlogindex dupe-file
      rev linkrev nodeid       p1           p2
        0       2 2ed2a3912a0b 000000000000 000000000000
 #endif
 
   $ hg -R client-linknode-2 pull -r 639c8990d6a5
   pulling from http://localhost:$HGPORT/
   searching for changes
   new changesets 639c8990d6a5
   (run 'hg update' to get a working copy)
 
 #if reporevlogstore
   $ hg -R client-linknode-2 debugrevlogindex dupe-file
-  abort: revlog 'dupe-file' not found
-  [255]
+     rev linkrev nodeid       p1           p2
+       0       2 2ed2a3912a0b 000000000000 000000000000
 #endif
-
-  $ hg -R client-linknode-2 verify
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-   warning: revlog 'data/dupe-file.i' not in fncache!
-   2: empty or missing dupe-file
-   dupe-file@2: manifest refers to unknown revision 2ed2a3912a0b
-  checked 3 changesets with 2 changes to 3 files
-  1 warnings encountered!
-  hint: run "hg debugrebuildfncache" to recover from corrupt fncache
-  2 integrity errors encountered!
-  (first damaged changeset appears to be 2)
-  [1]