exchange: refactor APIs to obtain bundle data (API) Currently, exchange.getbundle() returns either a cg1unpacker or a util.chunkbuffer (in the case of bundle2). This is kinda OK, as both expose a .read() to consumers. However, localpeer.getbundle() has code inferring what the response type is based on arguments and converts the util.chunkbuffer returned in the bundle2 case to a bundle2.unbundle20 instance. This is a sign that the API for exchange.getbundle() is not ideal because it doesn't consistently return an "unbundler" instance. In addition, unbundlers mask the fact that there is an underlying generator of changegroup data. In both cg1 and bundle2, this generator is being fed into a util.chunkbuffer so it can be re-exposed as a file object. util.chunkbuffer is a nice abstraction. However, it should only be used "at the edges." This is because keeping data as a generator is more efficient than converting it to a chunkbuffer, especially if we convert that chunkbuffer back to a generator (as is the case in some code paths currently). This patch refactors exchange.getbundle() into exchange.getbundlechunks(). The new API returns an iterator of chunks instead of a file-like object. Callers of exchange.getbundle() have been updated to use the new API. There is a minor change of behavior in test-getbundle.t. This is because `hg debuggetbundle` isn't defining bundlecaps. As a result, a cg1 data stream and unpacker is being produced. This is getting fed into a new bundle20 instance via bundle2.writebundle(), which uses a backchannel mechanism between changegroup generation to add the "nbchanges" part parameter. I never liked this backchannel mechanism and I plan to remove it someday. `hg bundle` still produces the "nbchanges" part parameter, so there should be no user-visible change of behavior. I consider this "regression" a bug in `hg debuggetbundle`. And that bug is captured by an existing "TODO" in the code to use bundle2 capabilities.

     1

from __future__ import absolute_import, print_function

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

)

     6

     7

def testdispatch(cmd):

     8

    """Simple wrapper around dispatch.dispatch()

     9

    10

    Prints command and result value, but does not handle quoting.

    11

    """

    12

    print("running: %s" % (cmd,))

    13

    req = dispatch.request(cmd.split())

    14

    result = dispatch.dispatch(req)

    15

    print("result: %r" % (result,))

    16

    17

# create file 'foo', add and commit

    18

f = open('foo', 'wb')

    19

f.write('foo\n')

    20

f.close()

    21

testdispatch("add foo")

    22

testdispatch("commit -m commit1 -d 2000-01-01 foo")

    23

    24

# append to file 'foo' and commit

    25

f = open('foo', 'ab')

    26

f.write('bar\n')

    27

f.close()

    28

# remove blackbox.log directory (proxy for readonly log file)

    29

os.rmdir(".hg/blackbox.log")

    30

# replace it with the real blackbox.log file

    31

os.rename(".hg/blackbox.log-", ".hg/blackbox.log")

    32

testdispatch("commit -m commit2 -d 2000-01-02 foo")

    33

    34

# check 88803a69b24 (fancyopts modified command table)

    35

testdispatch("log -r 0")

    36

testdispatch("log -r tip")