##// END OF EJS Templates
sshpeer: initial definition and implementation of new SSH protocol...
sshpeer: initial definition and implementation of new SSH protocol The existing SSH protocol has several design flaws. Future commits will elaborate on these flaws as new features are introduced to combat these flaws. For now, hopefully you can take me for my word that a ground up rewrite of the SSH protocol is needed. This commit lays the foundation for a new SSH protocol by defining a mechanism to upgrade the SSH transport channel away from the default (version 1) protocol to something modern (which we'll call "version 2" for now). This upgrade process is detailed in the internals documentation for the wire protocol. The gist of it is the client sends a request line preceding the "hello" command/line which basically says "I'm requesting an upgrade: here's what I support." If the server recognizes that line, it processes the upgrade request and the transport channel is switched to use the new version of the protocol. If not, it sends an empty response, which is how all Mercurial SSH servers from the beginning of time reacted to unknown commands. The upgrade request is effectively ignored and the client continues to use the existing version of the protocol as if nothing happened. The new version of the SSH protocol is completely identical to version 1 aside from the upgrade dance and the bytes that follow. The immediate bytes that follow the protocol switch are defined to be a length framed "capabilities: " line containing the remote's advertised capabilities. In reality, this looks very similar to what the "hello" response would look like. But it will evolve quickly. The methodology by which the protocol will evolve is important. I'm not going to introduce the new protocol all at once. That would likely lead to endless bike shedding and forward progress would stall. Instead, I intend to tricle out new features and diversions from the existing protocol in small, incremental changes. To support the gradual evolution of the protocol, the on-the-wire advertised protocol name contains an "exp" to denote "experimental" and a 4 digit field to capture the sub-version of the protocol. Whenever we make a BC change to the wire protocol, we can increment this version and lock out all older clients because it will appear as a completely different protocol version. This means we can incur as many breaking changes as we want. We don't have to commit to supporting any one feature or idea for a long period of time. We can even evolve the handshake mechanism, because that is defined as being an implementation detail of the negotiated protocol version! Hopefully this lowers the barrier to accepting changes to the protocol and for experimenting with "radical" ideas during its development. In core, sshpeer received most of the attention. We haven't even implemented the server bits for the new protocol in core yet. Instead, we add very primitive support to our test server, mainly just to exercise the added code paths in sshpeer. Differential Revision: https://phab.mercurial-scm.org/D2061 # no-check-commit because of required foo_bar naming

File last commit:

r34662:eb586ed5 default
r35994:48a3a928 default
Show More
test-bundle2-remote-changegroup.t
604 lines | 20.8 KiB | text/troff | Tads3Lexer
/ tests / test-bundle2-remote-changegroup.t
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 #require killdaemons
Create an extension to test bundle2 remote-changegroup parts
$ cat > bundle2.py << EOF
> """A small extension to test bundle2 remote-changegroup parts.
>
> Current bundle2 implementation doesn't provide a way to generate those
> parts, so they must be created by extensions.
> """
Pierre-Yves David
getchangegroup: take an 'outgoing' object as argument (API)...
r29807 > from mercurial import bundle2, changegroup, discovery, exchange, util
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 >
> def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
> b2caps=None, heads=None, common=None,
> **kwargs):
> """this function replaces the changegroup part handler for getbundle.
> It allows to create a set of arbitrary parts containing changegroups
> and remote-changegroups, as described in a bundle2maker file in the
> repository .hg/ directory.
>
> Each line of that bundle2maker file contain a description of the
> part to add:
> - changegroup common_revset heads_revset
> Creates a changegroup part based, using common_revset and
Pierre-Yves David
getchangegroup: take an 'outgoing' object as argument (API)...
r29807 > heads_revset for outgoing
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > - remote-changegroup url file
> Creates a remote-changegroup part for a bundle at the given
> url. Size and digest, as required by the client, are computed
> from the given file.
> - raw-remote-changegroup <python expression>
> Creates a remote-changegroup part with the data given in the
Augie Fackler
tests: capitalize Python when it's not used as a command name...
r33261 > Python expression as parameters. The Python expression is
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > evaluated with eval, and is expected to be a dict.
> """
> def newpart(name, data=''):
> """wrapper around bundler.newpart adding an extra part making the
> client output information about each processed part"""
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 > bundler.newpart('output', data=name)
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > part = bundler.newpart(name, data=data)
> return part
>
Pierre-Yves David
test-bundle2-remote-changegroup: directly use repo.vfs.join...
r31326 > for line in open(repo.vfs.join('bundle2maker'), 'r'):
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > line = line.strip()
> try:
> verb, args = line.split(None, 1)
> except ValueError:
> verb, args = line, ''
> if verb == 'remote-changegroup':
> url, file = args.split()
> bundledata = open(file, 'rb').read()
> digest = util.digester.preferred(b2caps['digests'])
> d = util.digester([digest], bundledata)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 > part = newpart('remote-changegroup')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > 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':
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 > part = newpart('remote-changegroup')
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > for k, v in eval(args).items():
> part.addparam(k, str(v))
> elif verb == 'changegroup':
> _common, heads = args.split()
> common.extend(repo.lookup(r) for r in repo.revs(_common))
> heads = [repo.lookup(r) for r in repo.revs(heads)]
Pierre-Yves David
getchangegroup: take an 'outgoing' object as argument (API)...
r29807 > outgoing = discovery.outgoing(repo, common, heads)
Durham Goode
changegroup: replace getchangegroup with makechangegroup...
r34103 > cg = changegroup.makechangegroup(repo, outgoing, '01',
> 'changegroup')
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 > newpart('changegroup', cg.getchunks())
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > else:
> raise Exception('unknown verb')
>
> exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart
> EOF
Start a simple HTTP server to serve bundles
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
r32940 $ $PYTHON "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 $ cat dumb.pid >> $DAEMON_PIDS
$ cat >> $HGRCPATH << EOF
> [ui]
Augie Fackler
tests: clean up even more direct `python` calls with $PYTHON...
r33286 > ssh=$PYTHON "$TESTDIR/dummyssh"
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> EOF
$ hg init repo
$ hg -R repo unbundle $TESTDIR/bundles/rebase.hg
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo log -G
o 7:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H
|
| o 6:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G
|/|
o | 5:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| o 4:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/
| o 3:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D
| |
| o 2:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C
| |
| o 1:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/
o 0:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg clone repo orig
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat > repo/.hg/hgrc << EOF
> [extensions]
> bundle2=$TESTTMP/bundle2.py
> EOF
Test a pull with an remote-changegroup
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 3 changesets found
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/bundle.hg bundle.hg
> EOF
$ hg clone orig clone -r 3 -r 4
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:9520eea781bc
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 24b6387c8c8c:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
|
| o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
|/|
o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/
| @ 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
| |
| o 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
| |
| o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ rm -rf clone
Test a pull with an remote-changegroup and a following changegroup
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle2.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 2 changesets found
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/bundle2.hg bundle2.hg
> changegroup 0:4 5:7
> EOF
$ hg clone orig clone -r 2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:5fddd98957c8
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 32af7686d403:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
|
| o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
|/|
o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/
| o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
| |
| @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
| |
| o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ rm -rf clone
Test a pull with a changegroup followed by an remote-changegroup
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 --base '0:4' -r '5:7' bundle3.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 3 changesets found
$ cat > repo/.hg/bundle2maker << EOF
> changegroup 000000000000 :4
> remote-changegroup http://localhost:$HGPORT/bundle3.hg bundle3.hg
> EOF
$ hg clone orig clone -r 2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:5fddd98957c8
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 32af7686d403:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
|
| o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
|/|
o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/
| o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
| |
| @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
| |
| o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ rm -rf clone
Test a pull with two remote-changegroups and a changegroup
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 --base 2 -r '3:4' bundle4.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 2 changesets found
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 --base '3:4' -r '5:6' bundle5.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 2 changesets found
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg
> remote-changegroup http://localhost:$HGPORT/bundle5.hg bundle5.hg
> changegroup 0:6 7
> EOF
$ hg clone orig clone -r 2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:5fddd98957c8
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 32af7686d403:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
|
| o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
|/|
o | 5:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| o 4:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/
| o 3:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
| |
| @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
| |
| o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ rm -rf clone
Hash digest tests
Pierre-Yves David
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'...
r26773 $ hg bundle -R repo --type v1 -a bundle6.hg
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 8 changesets found
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394'}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
Hash digest mismatch throws an error
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '0' * 40}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted:
sha1 mismatch: expected 0000000000000000000000000000000000000000, got 2c880cfec23cff7d8f80c2f12958d1563cbdaba6
[255]
Multiple hash digests can be given
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:02de42196ebe
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
If either of the multiple hash digests mismatches, an error is thrown
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': '0' * 32, 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted:
md5 mismatch: expected 00000000000000000000000000000000, got e22172c2907ef88794b7bea6642c2394
[255]
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '0' * 40}
> EOF
$ hg clone ssh://user@dummy/repo clone
requesting all changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted:
sha1 mismatch: expected 0000000000000000000000000000000000000000, got 2c880cfec23cff7d8f80c2f12958d1563cbdaba6
[255]
Corruption tests
$ hg clone orig clone -r 2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets cd010b8cd998:5fddd98957c8
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle5.hg', 'size': 578, 'digests': 'sha1', 'digest:sha1': '0' * 40}
> changegroup 0:6 7
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle5.hg is corrupted:
sha1 mismatch: expected 0000000000000000000000000000000000000000, got f29485d6bfd37db99983cfc95ecb52f8ca396106
[255]
The entire transaction has been rolled back in the pull above
$ hg -R clone log -G
@ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
|
o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
No params
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: remote-changegroup: missing "url" param
[255]
Missing size
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg'}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: remote-changegroup: missing "size" param
[255]
Invalid size
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 'foo'}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: remote-changegroup: invalid value for param "size"
[255]
Size mismatch
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 42}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle4.hg is corrupted:
size mismatch: expected 42, got 581
[255]
Unknown digest
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'foo', 'digest:foo': 'bar'}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
abort: missing support for remote-changegroup - digest:foo
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 [255]
Missing digest
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'sha1'}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: remote-changegroup: missing "digest:sha1" param
[255]
Not an HTTP url
$ cat > repo/.hg/bundle2maker << EOF
> raw-remote-changegroup {'url': 'ssh://localhost:$HGPORT/bundle4.hg', 'size': 581}
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: remote-changegroup does not support ssh urls
[255]
Not a bundle
$ cat > notbundle.hg << EOF
> foo
> EOF
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/notbundle.hg notbundle.hg
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: http://localhost:$HGPORT/notbundle.hg: not a Mercurial bundle
[255]
Not a bundle 1.0
$ cat > notbundle10.hg << EOF
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 > HG20
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 > EOF
$ cat > repo/.hg/bundle2maker << EOF
> remote-changegroup http://localhost:$HGPORT/notbundle10.hg notbundle10.hg
> EOF
$ hg pull -R clone ssh://user@dummy/repo
pulling from ssh://user@dummy/repo
searching for changes
Pierre-Yves David
bundle2: rename format, parts and config to final names...
r24686 remote: remote-changegroup
Mike Hommey
bundle2: client side support for a part to import external bundles...
r23029 abort: http://localhost:$HGPORT/notbundle10.hg: not a bundle version 1.0
[255]
$ hg -R clone log -G
@ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
|
o 1:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
|
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ rm -rf clone
Matt Mackall
tests: drop DAEMON_PIDS from killdaemons calls
r25474 $ killdaemons.py