Skip to content
Snippets Groups Projects
Commit cfdf7bfb authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t

parent 72c086b1
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,14 @@
> Current bundle2 implementation doesn't provide a way to generate those
> parts, so they must be created by extensions.
> """
> from mercurial import bundle2, changegroup, discovery, exchange, util
> from mercurial import (
> bundle2,
> changegroup,
> discovery,
> exchange,
> pycompat,
> util,
> )
>
> def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
> b2caps=None, heads=None, common=None,
......@@ -60,9 +67,9 @@
> d = util.digester([digest], bundledata)
> part = newpart(b'remote-changegroup')
> part.addparam(b'url', url)
> part.addparam(b'size', str(len(bundledata)))
> part.addparam(b'size', b'%d' % len(bundledata))
> part.addparam(b'digests', digest)
> part.addparam(b'digest:%s' % digest, d[digest])
> elif verb == b'raw-remote-changegroup':
> part = newpart(b'remote-changegroup')
> for k, v in eval(args).items():
......@@ -64,9 +71,9 @@
> part.addparam(b'digests', digest)
> part.addparam(b'digest:%s' % digest, d[digest])
> elif verb == b'raw-remote-changegroup':
> part = newpart(b'remote-changegroup')
> for k, v in eval(args).items():
> part.addparam(k, str(v))
> part.addparam(pycompat.sysbytes(k), pycompat.bytestr(v))
> elif verb == b'changegroup':
> _common, heads = args.split()
> common.extend(repo[r].node() for r in repo.revs(_common))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment