--- a/tests/test-bundle2-remote-changegroup.t Wed Apr 08 09:38:09 2015 -0700
+++ b/tests/test-bundle2-remote-changegroup.t Thu Apr 09 16:25:48 2015 -0400
@@ -35,7 +35,7 @@
> def newpart(name, data=''):
> """wrapper around bundler.newpart adding an extra part making the
> client output information about each processed part"""
- > bundler.newpart('b2x:output', data=name)
+ > bundler.newpart('output', data=name)
> part = bundler.newpart(name, data=data)
> return part
>
@@ -50,13 +50,13 @@
> bundledata = open(file, 'rb').read()
> digest = util.digester.preferred(b2caps['digests'])
> d = util.digester([digest], bundledata)
- > part = newpart('b2x:remote-changegroup')
+ > part = newpart('remote-changegroup')
> part.addparam('url', url)
> part.addparam('size', str(len(bundledata)))
> part.addparam('digests', digest)
> part.addparam('digest:%s' % digest, d[digest])
> elif verb == 'raw-remote-changegroup':
- > part = newpart('b2x:remote-changegroup')
+ > part = newpart('remote-changegroup')
> for k, v in eval(args).items():
> part.addparam(k, str(v))
> elif verb == 'changegroup':
@@ -65,7 +65,7 @@
> heads = [repo.lookup(r) for r in repo.revs(heads)]
> cg = changegroup.getchangegroup(repo, 'changegroup',
> heads=heads, common=common)
- > newpart('b2x:changegroup', cg.getchunks())
+ > newpart('changegroup', cg.getchunks())
> else:
> raise Exception('unknown verb')
>
@@ -137,7 +137,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -180,12 +180,12 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- remote: b2x:changegroup
+ remote: changegroup
adding changesets
adding manifests
adding file changes
@@ -228,12 +228,12 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:changegroup
+ remote: changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -279,17 +279,17 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
- remote: b2x:changegroup
+ remote: changegroup
adding changesets
adding manifests
adding file changes
@@ -324,7 +324,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -338,7 +338,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -354,7 +354,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -372,7 +372,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -388,7 +388,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -404,7 +404,7 @@
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -433,12 +433,12 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -467,7 +467,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: remote-changegroup: missing "url" param
[255]
@@ -479,7 +479,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: remote-changegroup: missing "size" param
[255]
@@ -491,7 +491,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: remote-changegroup: invalid value for param "size"
[255]
@@ -503,7 +503,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
adding changesets
adding manifests
adding file changes
@@ -522,8 +522,8 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
- abort: missing support for b2x:remote-changegroup - digest:foo
+ remote: remote-changegroup
+ abort: missing support for remote-changegroup - digest:foo
[255]
Missing digest
@@ -534,7 +534,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: remote-changegroup: missing "digest:sha1" param
[255]
@@ -546,7 +546,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: remote-changegroup does not support ssh urls
[255]
@@ -561,14 +561,14 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: http://localhost:$HGPORT/notbundle.hg: not a Mercurial bundle
[255]
Not a bundle 1.0
$ cat > notbundle10.hg << EOF
- > HG2Y
+ > HG20
> EOF
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/notbundle10.hg notbundle10.hg
@@ -576,7 +576,7 @@
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
- remote: b2x:remote-changegroup
+ remote: remote-changegroup
abort: http://localhost:$HGPORT/notbundle10.hg: not a bundle version 1.0
[255]