Show More
@@ -834,7 +834,10 b' def getbundle(repo, proto, others):' | |||||
834 |
|
834 | |||
835 | if not bundle1allowed(repo, 'pull'): |
|
835 | if not bundle1allowed(repo, 'pull'): | |
836 | if not exchange.bundle2requested(opts.get('bundlecaps')): |
|
836 | if not exchange.bundle2requested(opts.get('bundlecaps')): | |
837 | return ooberror(bundle2required) |
|
837 | if proto.name == 'http': | |
|
838 | return ooberror(bundle2required) | |||
|
839 | raise error.Abort(bundle2requiredmain, | |||
|
840 | hint=bundle2requiredhint) | |||
838 |
|
841 | |||
839 | chunks = exchange.getbundlechunks(repo, 'serve', **opts) |
|
842 | chunks = exchange.getbundlechunks(repo, 'serve', **opts) | |
840 | return streamres(gen=chunks, v1compressible=True) |
|
843 | return streamres(gen=chunks, v1compressible=True) |
@@ -1039,6 +1039,16 b' Verify the global server.bundle1 option ' | |||||
1039 | [255] |
|
1039 | [255] | |
1040 | $ killdaemons.py |
|
1040 | $ killdaemons.py | |
1041 |
|
1041 | |||
|
1042 | $ hg --config devel.legacy.exchange=bundle1 clone ssh://user@dummy/bundle2onlyserver not-bundle2-ssh | |||
|
1043 | requesting all changes | |||
|
1044 | adding changesets | |||
|
1045 | remote: abort: incompatible Mercurial client; bundle2 required | |||
|
1046 | remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |||
|
1047 | transaction abort! | |||
|
1048 | rollback completed | |||
|
1049 | abort: stream ended unexpectedly (got 0 bytes, expected 4) | |||
|
1050 | [255] | |||
|
1051 | ||||
1042 | $ cat > bundle2onlyserver/.hg/hgrc << EOF |
|
1052 | $ cat > bundle2onlyserver/.hg/hgrc << EOF | |
1043 | > [server] |
|
1053 | > [server] | |
1044 | > bundle1gd = false |
|
1054 | > bundle1gd = false |
General Comments 0
You need to be logged in to leave comments.
Login now