test-bundle2.t
1085 lines
| 34.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bundle2.t
|
r20801 | |||
Create an extension to test bundle2 API | ||||
$ cat > bundle2.py << EOF | ||||
> """A small extension to test bundle2 implementation | ||||
> | ||||
> Current bundle2 implementation is far too limited to be used in any core | ||||
> code. We still need to be able to test it while it grow up. | ||||
> """ | ||||
> | ||||
|
r21547 | > try: | ||
> import msvcrt | ||||
> msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) | ||||
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) | ||||
> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) | ||||
> except ImportError: | ||||
> pass | ||||
> | ||||
|
r20802 | > import sys | ||
|
r20801 | > from mercurial import cmdutil | ||
|
r20813 | > from mercurial import util | ||
|
r20801 | > from mercurial import bundle2 | ||
|
r20950 | > from mercurial import scmutil | ||
> from mercurial import discovery | ||||
> from mercurial import changegroup | ||||
|
r21184 | > from mercurial import error | ||
|
r20801 | > cmdtable = {} | ||
> command = cmdutil.command(cmdtable) | ||||
> | ||||
|
r20876 | > ELEPHANTSSONG = """Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko | ||
> Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||||
> Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.""" | ||||
> assert len(ELEPHANTSSONG) == 178 # future test say 178 bytes, trust it. | ||||
> | ||||
|
r20890 | > @bundle2.parthandler('test:song') | ||
|
r20948 | > def songhandler(op, part): | ||
|
r20889 | > """handle a "test:song" bundle2 part, printing the lyrics on stdin""" | ||
|
r20948 | > op.ui.write('The choir starts singing:\n') | ||
|
r20949 | > verses = 0 | ||
|
r21019 | > for line in part.read().split('\n'): | ||
|
r20948 | > op.ui.write(' %s\n' % line) | ||
|
r20949 | > verses += 1 | ||
> op.records.add('song', {'verses': verses}) | ||||
|
r20889 | > | ||
|
r20997 | > @bundle2.parthandler('test:ping') | ||
> def pinghandler(op, part): | ||||
> op.ui.write('received ping request (id %i)\n' % part.id) | ||||
|
r21135 | > if op.reply is not None and 'ping-pong' in op.reply.capabilities: | ||
|
r21133 | > op.ui.write_err('replying to ping request (id %i)\n' % part.id) | ||
|
r21600 | > op.reply.newpart('test:pong', [('in-reply-to', str(part.id))]) | ||
|
r20997 | > | ||
|
r21135 | > @bundle2.parthandler('test:debugreply') | ||
> def debugreply(op, part): | ||||
> """print data about the capacity of the bundle reply""" | ||||
> if op.reply is None: | ||||
> op.ui.write('debugreply: no reply\n') | ||||
> else: | ||||
> op.ui.write('debugreply: capabilities:\n') | ||||
> for cap in sorted(op.reply.capabilities): | ||||
> op.ui.write('debugreply: %r\n' % cap) | ||||
|
r21136 | > for val in op.reply.capabilities[cap]: | ||
> op.ui.write('debugreply: %r\n' % val) | ||||
> | ||||
|
r20804 | > @command('bundle2', | ||
|
r20856 | > [('', 'param', [], 'stream level parameter'), | ||
|
r20891 | > ('', 'unknown', False, 'include an unknown mandatory part in the bundle'), | ||
|
r20950 | > ('', 'parts', False, 'include some arbitrary parts to the bundle'), | ||
|
r21130 | > ('', 'reply', False, 'produce a reply bundle'), | ||
|
r21184 | > ('', 'pushrace', False, 'includes a check:head part with unknown nodes'), | ||
|
r20950 | > ('r', 'rev', [], 'includes those changeset in the bundle'),], | ||
|
r20841 | > '[OUTPUTFILE]') | ||
> def cmdbundle2(ui, repo, path=None, **opts): | ||||
|
r20801 | > """write a bundle2 container on standard ouput""" | ||
|
r20842 | > bundler = bundle2.bundle20(ui) | ||
|
r20804 | > for p in opts['param']: | ||
|
r20809 | > p = p.split('=', 1) | ||
|
r20813 | > try: | ||
> bundler.addparam(*p) | ||||
> except ValueError, exc: | ||||
> raise util.Abort('%s' % exc) | ||||
|
r20809 | > | ||
|
r21130 | > if opts['reply']: | ||
|
r21137 | > capsstring = 'ping-pong\nelephants=babar,celeste\ncity%3D%21=celeste%2Cville' | ||
|
r21600 | > bundler.newpart('b2x:replycaps', data=capsstring) | ||
|
r21130 | > | ||
|
r21184 | > if opts['pushrace']: | ||
|
r21604 | > # also serve to test the assignement of data outside of init | ||
> part = bundler.newpart('b2x:check:heads') | ||||
> part.data = '01234567890123456789' | ||||
|
r21184 | > | ||
|
r20950 | > revs = opts['rev'] | ||
> if 'rev' in opts: | ||||
> revs = scmutil.revrange(repo, opts['rev']) | ||||
> if revs: | ||||
> # very crude version of a changegroup part creation | ||||
> bundled = repo.revs('%ld::%ld', revs, revs) | ||||
> headmissing = [c.node() for c in repo.set('heads(%ld)', revs)] | ||||
> headcommon = [c.node() for c in repo.set('parents(%ld) - %ld', revs, revs)] | ||||
> outgoing = discovery.outgoing(repo.changelog, headcommon, headmissing) | ||||
> cg = changegroup.getlocalbundle(repo, 'test:bundle2', outgoing, None) | ||||
|
r21600 | > bundler.newpart('b2x:changegroup', data=cg.getchunks()) | ||
|
r20950 | > | ||
|
r20856 | > if opts['parts']: | ||
|
r21600 | > bundler.newpart('test:empty') | ||
|
r20856 | > # add a second one to make sure we handle multiple parts | ||
|
r21600 | > bundler.newpart('test:empty') | ||
> bundler.newpart('test:song', data=ELEPHANTSSONG) | ||||
> bundler.newpart('test:debugreply') | ||||
|
r21605 | > mathpart = bundler.newpart('test:math') | ||
> mathpart.addparam('pi', '3.14') | ||||
> mathpart.addparam('e', '2.72') | ||||
> mathpart.addparam('cooking', 'raw', mandatory=False) | ||||
> mathpart.data = '42' | ||||
|
r20891 | > if opts['unknown']: | ||
|
r21600 | > bundler.newpart('test:UNKNOWN', data='some random content') | ||
|
r20997 | > if opts['parts']: | ||
|
r21600 | > bundler.newpart('test:ping') | ||
|
r20856 | > | ||
|
r20841 | > if path is None: | ||
> file = sys.stdout | ||||
> else: | ||||
> file = open(path, 'w') | ||||
> | ||||
|
r20804 | > for chunk in bundler.getchunks(): | ||
|
r20841 | > file.write(chunk) | ||
|
r20802 | > | ||
|
r20889 | > @command('unbundle2', [], '') | ||
|
r20997 | > def cmdunbundle2(ui, repo, replypath=None): | ||
|
r20889 | > """process a bundle2 stream from stdin on the current repo""" | ||
|
r20891 | > try: | ||
|
r20952 | > tr = None | ||
|
r20946 | > lock = repo.lock() | ||
|
r20952 | > tr = repo.transaction('processbundle') | ||
|
r20892 | > try: | ||
|
r20947 | > unbundler = bundle2.unbundle20(ui, sys.stdin) | ||
|
r20952 | > op = bundle2.processbundle(repo, unbundler, lambda: tr) | ||
> tr.close() | ||||
|
r20892 | > except KeyError, exc: | ||
> raise util.Abort('missing support for %s' % exc) | ||||
|
r21184 | > except error.PushRaced, exc: | ||
|
r21185 | > raise util.Abort('push race: %s' % exc) | ||
|
r20892 | > finally: | ||
|
r20952 | > if tr is not None: | ||
> tr.release() | ||||
|
r20946 | > lock.release() | ||
|
r20892 | > remains = sys.stdin.read() | ||
> ui.write('%i unread bytes\n' % len(remains)) | ||||
|
r20949 | > if op.records['song']: | ||
> totalverses = sum(r['verses'] for r in op.records['song']) | ||||
> ui.write('%i total verses sung\n' % totalverses) | ||||
|
r20950 | > for rec in op.records['changegroup']: | ||
> ui.write('addchangegroup return: %i\n' % rec['return']) | ||||
|
r20997 | > if op.reply is not None and replypath is not None: | ||
> file = open(replypath, 'w') | ||||
> for chunk in op.reply.getchunks(): | ||||
> file.write(chunk) | ||||
|
r20889 | > | ||
|
r20888 | > @command('statbundle2', [], '') | ||
> def cmdstatbundle2(ui, repo): | ||||
> """print statistic on the bundle2 container read from stdin""" | ||||
|
r20843 | > unbundler = bundle2.unbundle20(ui, sys.stdin) | ||
|
r20844 | > try: | ||
> params = unbundler.params | ||||
> except KeyError, exc: | ||||
> raise util.Abort('unknown parameters: %s' % exc) | ||||
> ui.write('options count: %i\n' % len(params)) | ||||
> for key in sorted(params): | ||||
|
r20805 | > ui.write('- %s\n' % key) | ||
|
r20844 | > value = params[key] | ||
|
r20810 | > if value is not None: | ||
> ui.write(' %s\n' % value) | ||||
|
r21017 | > count = 0 | ||
|
r21129 | > for p in unbundler.iterparts(): | ||
|
r21017 | > count += 1 | ||
|
r20864 | > ui.write(' :%s:\n' % p.type) | ||
|
r20877 | > ui.write(' mandatory: %i\n' % len(p.mandatoryparams)) | ||
> ui.write(' advisory: %i\n' % len(p.advisoryparams)) | ||||
|
r21019 | > ui.write(' payload: %i bytes\n' % len(p.read())) | ||
|
r21017 | > ui.write('parts count: %i\n' % count) | ||
|
r20801 | > EOF | ||
$ cat >> $HGRCPATH << EOF | ||||
> [extensions] | ||||
> bundle2=$TESTTMP/bundle2.py | ||||
|
r21147 | > [experimental] | ||
> bundle2-exp=True | ||||
|
r21069 | > [ui] | ||
> ssh=python "$TESTDIR/dummyssh" | ||||
|
r21075 | > [web] | ||
> push_ssl = false | ||||
> allow_push = * | ||||
|
r20801 | > EOF | ||
The extension requires a repo (currently unused) | ||||
$ hg init main | ||||
$ cd main | ||||
|
r20803 | $ touch a | ||
$ hg add a | ||||
$ hg commit -m 'a' | ||||
|
r20801 | |||
|
r20804 | |||
Empty bundle | ||||
================= | ||||
- no option | ||||
- no parts | ||||
Test bundling | ||||
|
r20801 | |||
$ hg bundle2 | ||||
|
r21144 | HG2X\x00\x00\x00\x00 (no-eol) (esc) | ||
|
r20802 | |||
|
r20804 | Test unbundling | ||
|
r20802 | |||
|
r20888 | $ hg bundle2 | hg statbundle2 | ||
|
r20802 | options count: 0 | ||
parts count: 0 | ||||
|
r20803 | |||
Test old style bundle are detected and refused | ||||
$ hg bundle --all ../bundle.hg | ||||
1 changesets found | ||||
|
r20888 | $ hg statbundle2 < ../bundle.hg | ||
|
r20803 | abort: unknown bundle version 10 | ||
[255] | ||||
|
r20804 | |||
Test parameters | ||||
================= | ||||
- some options | ||||
- no parts | ||||
advisory parameters, no value | ||||
------------------------------- | ||||
Simplest possible parameters form | ||||
|
r20805 | Test generation simple option | ||
|
r20804 | |||
$ hg bundle2 --param 'caution' | ||||
|
r21144 | HG2X\x00\x07caution\x00\x00 (no-eol) (esc) | ||
|
r20804 | |||
|
r20805 | Test unbundling | ||
|
r20888 | $ hg bundle2 --param 'caution' | hg statbundle2 | ||
|
r20805 | options count: 1 | ||
- caution | ||||
parts count: 0 | ||||
|
r20804 | Test generation multiple option | ||
$ hg bundle2 --param 'caution' --param 'meal' | ||||
|
r21144 | HG2X\x00\x0ccaution meal\x00\x00 (no-eol) (esc) | ||
|
r20805 | |||
Test unbundling | ||||
|
r20888 | $ hg bundle2 --param 'caution' --param 'meal' | hg statbundle2 | ||
|
r20805 | options count: 2 | ||
- caution | ||||
- meal | ||||
parts count: 0 | ||||
|
r20809 | advisory parameters, with value | ||
------------------------------- | ||||
Test generation | ||||
$ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | ||||
|
r21144 | HG2X\x00\x1ccaution meal=vegan elephants\x00\x00 (no-eol) (esc) | ||
|
r20809 | |||
|
r20810 | Test unbundling | ||
|
r20888 | $ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | hg statbundle2 | ||
|
r20810 | options count: 3 | ||
- caution | ||||
- elephants | ||||
- meal | ||||
vegan | ||||
parts count: 0 | ||||
|
r20811 | |||
parameter with special char in value | ||||
--------------------------------------------------- | ||||
Test generation | ||||
$ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | ||||
|
r21144 | HG2X\x00)e%7C%21%207/=babar%25%23%3D%3Dtutu simple\x00\x00 (no-eol) (esc) | ||
|
r20812 | |||
Test unbundling | ||||
|
r20888 | $ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | hg statbundle2 | ||
|
r20812 | options count: 2 | ||
- e|! 7/ | ||||
babar%#==tutu | ||||
- simple | ||||
parts count: 0 | ||||
|
r20813 | |||
|
r20844 | Test unknown mandatory option | ||
--------------------------------------------------- | ||||
|
r20888 | $ hg bundle2 --param 'Gravity' | hg statbundle2 | ||
|
r20844 | abort: unknown parameters: 'Gravity' | ||
[255] | ||||
|
r20841 | Test debug output | ||
--------------------------------------------------- | ||||
|
r20843 | bundling debug | ||
|
r20841 | $ hg bundle2 --debug --param 'e|! 7/=babar%#==tutu' --param simple ../out.hg2 | ||
|
r21144 | start emission of HG2X stream | ||
|
r20842 | bundle parameter: e%7C%21%207/=babar%25%23%3D%3Dtutu simple | ||
|
r20856 | start of parts | ||
|
r20842 | end of bundle | ||
|
r20841 | |||
file content is ok | ||||
$ cat ../out.hg2 | ||||
|
r21144 | HG2X\x00)e%7C%21%207/=babar%25%23%3D%3Dtutu simple\x00\x00 (no-eol) (esc) | ||
|
r20841 | |||
|
r20843 | unbundling debug | ||
|
r20888 | $ hg statbundle2 --debug < ../out.hg2 | ||
|
r21144 | start processing of HG2X stream | ||
|
r20843 | reading bundle2 stream parameters | ||
|
r20844 | ignoring unknown parameter 'e|! 7/' | ||
ignoring unknown parameter 'simple' | ||||
|
r20843 | options count: 2 | ||
- e|! 7/ | ||||
babar%#==tutu | ||||
- simple | ||||
start extraction of bundle2 parts | ||||
|
r20864 | part header size: 0 | ||
|
r20843 | end of bundle2 stream | ||
parts count: 0 | ||||
|
r20813 | Test buggy input | ||
--------------------------------------------------- | ||||
empty parameter name | ||||
$ hg bundle2 --param '' --quiet | ||||
abort: empty parameter name | ||||
[255] | ||||
|
r20814 | |||
bad parameter name | ||||
$ hg bundle2 --param 42babar | ||||
abort: non letter first character: '42babar' | ||||
[255] | ||||
|
r20856 | |||
Test part | ||||
================= | ||||
$ hg bundle2 --parts ../parts.hg2 --debug | ||||
|
r21144 | start emission of HG2X stream | ||
|
r20856 | bundle parameter: | ||
start of parts | ||||
bundle part: "test:empty" | ||||
bundle part: "test:empty" | ||||
|
r20876 | bundle part: "test:song" | ||
|
r21135 | bundle part: "test:debugreply" | ||
|
r20877 | bundle part: "test:math" | ||
|
r20997 | bundle part: "test:ping" | ||
|
r20856 | end of bundle | ||
$ cat ../parts.hg2 | ||||
|
r21144 | HG2X\x00\x00\x00\x11 (esc) | ||
|
r20995 | test:empty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11 (esc) | ||
test:empty\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x10 test:song\x00\x00\x00\x02\x00\x00\x00\x00\x00\xb2Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko (esc) | ||||
|
r20876 | Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||
|
r21135 | Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.\x00\x00\x00\x00\x00\x16\x0ftest:debugreply\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00+ test:math\x00\x00\x00\x04\x02\x01\x02\x04\x01\x04\x07\x03pi3.14e2.72cookingraw\x00\x00\x00\x0242\x00\x00\x00\x00\x00\x10 test:ping\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00 (no-eol) (esc) | ||
|
r20856 | |||
|
r20888 | $ hg statbundle2 < ../parts.hg2 | ||
|
r20864 | options count: 0 | ||
|
r20876 | :test:empty: | ||
|
r20877 | mandatory: 0 | ||
advisory: 0 | ||||
|
r20876 | payload: 0 bytes | ||
|
r20864 | :test:empty: | ||
|
r20877 | mandatory: 0 | ||
advisory: 0 | ||||
|
r20876 | payload: 0 bytes | ||
:test:song: | ||||
|
r20877 | mandatory: 0 | ||
advisory: 0 | ||||
|
r20876 | payload: 178 bytes | ||
|
r21135 | :test:debugreply: | ||
mandatory: 0 | ||||
advisory: 0 | ||||
payload: 0 bytes | ||||
|
r20877 | :test:math: | ||
mandatory: 2 | ||||
advisory: 1 | ||||
payload: 2 bytes | ||||
|
r20997 | :test:ping: | ||
mandatory: 0 | ||||
advisory: 0 | ||||
payload: 0 bytes | ||||
|
r21135 | parts count: 6 | ||
|
r20864 | |||
|
r20888 | $ hg statbundle2 --debug < ../parts.hg2 | ||
|
r21144 | start processing of HG2X stream | ||
|
r20864 | reading bundle2 stream parameters | ||
options count: 0 | ||||
start extraction of bundle2 parts | ||||
|
r20995 | part header size: 17 | ||
|
r20864 | part type: "test:empty" | ||
|
r20995 | part id: "0" | ||
|
r20864 | part parameters: 0 | ||
|
r21017 | :test:empty: | ||
mandatory: 0 | ||||
advisory: 0 | ||||
|
r21019 | payload chunk size: 0 | ||
|
r21017 | payload: 0 bytes | ||
|
r20995 | part header size: 17 | ||
|
r20864 | part type: "test:empty" | ||
|
r20995 | part id: "1" | ||
|
r20864 | part parameters: 0 | ||
|
r21017 | :test:empty: | ||
mandatory: 0 | ||||
advisory: 0 | ||||
|
r21019 | payload chunk size: 0 | ||
|
r21017 | payload: 0 bytes | ||
|
r20995 | part header size: 16 | ||
|
r20876 | part type: "test:song" | ||
|
r20995 | part id: "2" | ||
|
r20876 | part parameters: 0 | ||
|
r21017 | :test:song: | ||
mandatory: 0 | ||||
advisory: 0 | ||||
|
r21019 | payload chunk size: 178 | ||
payload chunk size: 0 | ||||
|
r21017 | payload: 178 bytes | ||
|
r21135 | part header size: 22 | ||
part type: "test:debugreply" | ||||
part id: "3" | ||||
part parameters: 0 | ||||
:test:debugreply: | ||||
mandatory: 0 | ||||
advisory: 0 | ||||
payload chunk size: 0 | ||||
payload: 0 bytes | ||||
|
r20995 | part header size: 43 | ||
|
r20877 | part type: "test:math" | ||
|
r21135 | part id: "4" | ||
|
r20877 | part parameters: 3 | ||
|
r21017 | :test:math: | ||
mandatory: 2 | ||||
advisory: 1 | ||||
|
r21019 | payload chunk size: 2 | ||
payload chunk size: 0 | ||||
|
r21017 | payload: 2 bytes | ||
|
r20997 | part header size: 16 | ||
part type: "test:ping" | ||||
|
r21135 | part id: "5" | ||
|
r20997 | part parameters: 0 | ||
:test:ping: | ||||
mandatory: 0 | ||||
advisory: 0 | ||||
|
r21019 | payload chunk size: 0 | ||
|
r20997 | payload: 0 bytes | ||
|
r21017 | part header size: 0 | ||
end of bundle2 stream | ||||
|
r21135 | parts count: 6 | ||
|
r20889 | |||
|
r20950 | Test actual unbundling of test part | ||
======================================= | ||||
|
r20889 | |||
Process the bundle | ||||
$ hg unbundle2 --debug < ../parts.hg2 | ||||
|
r21144 | start processing of HG2X stream | ||
|
r20889 | reading bundle2 stream parameters | ||
start extraction of bundle2 parts | ||||
|
r20995 | part header size: 17 | ||
|
r20889 | part type: "test:empty" | ||
|
r20995 | part id: "0" | ||
|
r20889 | part parameters: 0 | ||
|
r21019 | ignoring unknown advisory part 'test:empty' | ||
|
r20889 | payload chunk size: 0 | ||
|
r20995 | part header size: 17 | ||
|
r20889 | part type: "test:empty" | ||
|
r20995 | part id: "1" | ||
|
r20889 | part parameters: 0 | ||
|
r21019 | ignoring unknown advisory part 'test:empty' | ||
|
r20889 | payload chunk size: 0 | ||
|
r20995 | part header size: 16 | ||
|
r20889 | part type: "test:song" | ||
|
r20995 | part id: "2" | ||
|
r20889 | part parameters: 0 | ||
|
r21019 | found a handler for part 'test:song' | ||
The choir starts singing: | ||||
|
r20889 | payload chunk size: 178 | ||
payload chunk size: 0 | ||||
Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko | ||||
Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||||
Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko. | ||||
|
r21135 | part header size: 22 | ||
part type: "test:debugreply" | ||||
part id: "3" | ||||
part parameters: 0 | ||||
found a handler for part 'test:debugreply' | ||||
debugreply: no reply | ||||
payload chunk size: 0 | ||||
|
r20995 | part header size: 43 | ||
|
r20889 | part type: "test:math" | ||
|
r21135 | part id: "4" | ||
|
r20889 | part parameters: 3 | ||
|
r21019 | ignoring unknown advisory part 'test:math' | ||
|
r20889 | payload chunk size: 2 | ||
payload chunk size: 0 | ||||
|
r20997 | part header size: 16 | ||
part type: "test:ping" | ||||
|
r21135 | part id: "5" | ||
|
r20997 | part parameters: 0 | ||
found a handler for part 'test:ping' | ||||
|
r21135 | received ping request (id 5) | ||
|
r21019 | payload chunk size: 0 | ||
|
r20889 | part header size: 0 | ||
end of bundle2 stream | ||||
|
r20892 | 0 unread bytes | ||
|
r20949 | 3 total verses sung | ||
|
r20891 | |||
|
r20997 | Unbundle with an unknown mandatory part | ||
(should abort) | ||||
|
r20891 | |||
$ hg bundle2 --parts --unknown ../unknown.hg2 | ||||
$ hg unbundle2 < ../unknown.hg2 | ||||
|
r20951 | The choir starts singing: | ||
|
r20891 | Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko | ||
Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||||
Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko. | ||||
|
r21135 | debugreply: no reply | ||
|
r20892 | 0 unread bytes | ||
|
r20891 | abort: missing support for 'test:unknown' | ||
[255] | ||||
|
r20950 | |||
|
r20997 | unbundle with a reply | ||
|
r21130 | $ hg bundle2 --parts --reply ../parts-reply.hg2 | ||
$ hg unbundle2 ../reply.hg2 < ../parts-reply.hg2 | ||||
|
r20997 | 0 unread bytes | ||
3 total verses sung | ||||
The reply is a bundle | ||||
$ cat ../reply.hg2 | ||||
|
r21146 | HG2X\x00\x00\x00\x1f (esc) | ||
b2x:output\x00\x00\x00\x00\x00\x01\x0b\x01in-reply-to3\x00\x00\x00\xd9The choir starts singing: (esc) | ||||
|
r21131 | Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko | ||
Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||||
Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko. | ||||
|
r21146 | \x00\x00\x00\x00\x00\x1f (esc) | ||
b2x:output\x00\x00\x00\x01\x00\x01\x0b\x01in-reply-to4\x00\x00\x00\xc9debugreply: capabilities: (esc) | ||||
|
r21137 | debugreply: 'city=!' | ||
debugreply: 'celeste,ville' | ||||
|
r21135 | debugreply: 'elephants' | ||
|
r21136 | debugreply: 'babar' | ||
debugreply: 'celeste' | ||||
|
r21135 | debugreply: 'ping-pong' | ||
|
r21146 | \x00\x00\x00\x00\x00\x1e test:pong\x00\x00\x00\x02\x01\x00\x0b\x01in-reply-to6\x00\x00\x00\x00\x00\x1f (esc) | ||
b2x:output\x00\x00\x00\x03\x00\x01\x0b\x01in-reply-to6\x00\x00\x00=received ping request (id 6) (esc) | ||||
|
r21135 | replying to ping request (id 6) | ||
|
r21131 | \x00\x00\x00\x00\x00\x00 (no-eol) (esc) | ||
|
r20997 | |||
The reply is valid | ||||
$ hg statbundle2 < ../reply.hg2 | ||||
options count: 0 | ||||
|
r21146 | :b2x:output: | ||
|
r21131 | mandatory: 0 | ||
advisory: 1 | ||||
payload: 217 bytes | ||||
|
r21146 | :b2x:output: | ||
|
r21135 | mandatory: 0 | ||
advisory: 1 | ||||
|
r21137 | payload: 201 bytes | ||
|
r20997 | :test:pong: | ||
mandatory: 1 | ||||
advisory: 0 | ||||
payload: 0 bytes | ||||
|
r21146 | :b2x:output: | ||
|
r21131 | mandatory: 0 | ||
advisory: 1 | ||||
|
r21133 | payload: 61 bytes | ||
|
r21135 | parts count: 4 | ||
|
r21131 | |||
Unbundle the reply to get the output: | ||||
$ hg unbundle2 < ../reply.hg2 | ||||
remote: The choir starts singing: | ||||
remote: Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko | ||||
remote: Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko | ||||
remote: Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko. | ||||
|
r21135 | remote: debugreply: capabilities: | ||
|
r21137 | remote: debugreply: 'city=!' | ||
remote: debugreply: 'celeste,ville' | ||||
|
r21135 | remote: debugreply: 'elephants' | ||
|
r21136 | remote: debugreply: 'babar' | ||
remote: debugreply: 'celeste' | ||||
|
r21135 | remote: debugreply: 'ping-pong' | ||
remote: received ping request (id 6) | ||||
remote: replying to ping request (id 6) | ||||
|
r21131 | 0 unread bytes | ||
|
r20997 | |||
|
r21184 | Test push race detection | ||
$ hg bundle2 --pushrace ../part-race.hg2 | ||||
$ hg unbundle2 < ../part-race.hg2 | ||||
0 unread bytes | ||||
|
r21185 | abort: push race: repository changed while pushing - please try again | ||
|
r21184 | [255] | ||
|
r20950 | Support for changegroup | ||
=================================== | ||||
$ hg unbundle $TESTDIR/bundles/rebase.hg | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 8 changesets with 7 changes to 7 files (+3 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg log -G | ||||
o changeset: 8:02de42196ebe | ||||
| tag: tip | ||||
| parent: 6:24b6387c8c8c | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: H | ||||
| | ||||
| o changeset: 7:eea13746799a | ||||
|/| parent: 6:24b6387c8c8c | ||||
| | parent: 5:9520eea781bc | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: G | ||||
| | | ||||
o | changeset: 6:24b6387c8c8c | ||||
| | parent: 1:cd010b8cd998 | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: F | ||||
| | | ||||
| o changeset: 5:9520eea781bc | ||||
|/ parent: 1:cd010b8cd998 | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: E | ||||
| | ||||
| o changeset: 4:32af7686d403 | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: D | ||||
| | | ||||
| o changeset: 3:5fddd98957c8 | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: C | ||||
| | | ||||
| o changeset: 2:42ccdea3bb16 | ||||
|/ user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: B | ||||
| | ||||
o changeset: 1:cd010b8cd998 | ||||
parent: -1:000000000000 | ||||
user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
date: Sat Apr 30 15:24:48 2011 +0200 | ||||
summary: A | ||||
@ changeset: 0:3903775176ed | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
$ hg bundle2 --debug --rev '8+7+5+4' ../rev.hg2 | ||||
4 changesets found | ||||
list of changesets: | ||||
32af7686d403cf45b5d95f2d70cebea587ac806a | ||||
9520eea781bcca16c1e15acc0ba14335a0e8e5ba | ||||
eea13746799a9e0bfd88f29d3c2e9dc9389f524f | ||||
02de42196ebee42ef284b6780a87cdc96e8eaab6 | ||||
|
r21144 | start emission of HG2X stream | ||
|
r21001 | bundle parameter: | ||
start of parts | ||||
|
r21146 | bundle part: "b2x:changegroup" | ||
|
r20950 | bundling: 1/4 changesets (25.00%) | ||
bundling: 2/4 changesets (50.00%) | ||||
bundling: 3/4 changesets (75.00%) | ||||
bundling: 4/4 changesets (100.00%) | ||||
bundling: 1/4 manifests (25.00%) | ||||
bundling: 2/4 manifests (50.00%) | ||||
bundling: 3/4 manifests (75.00%) | ||||
bundling: 4/4 manifests (100.00%) | ||||
bundling: D 1/3 files (33.33%) | ||||
bundling: E 2/3 files (66.67%) | ||||
bundling: H 3/3 files (100.00%) | ||||
end of bundle | ||||
$ cat ../rev.hg2 | ||||
|
r21146 | HG2X\x00\x00\x00\x16\x0fb2x:changegroup\x00\x00\x00\x00\x00\x00\x00\x00\x06\x13\x00\x00\x00\xa42\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j_\xdd\xd9\x89W\xc8\xa5JMCm\xfe\x1d\xa9\xd8\x7f!\xa1\xb9{\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x002\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c (esc) | ||
|
r20950 | \x00\x00\x00f\x00\x00\x00h\x00\x00\x00\x02D (esc) | ||
\x00\x00\x00i\x00\x00\x00j\x00\x00\x00\x01D\x00\x00\x00\xa4\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\xcd\x01\x0b\x8c\xd9\x98\xf3\x98\x1aZ\x81\x15\xf9O\x8d\xa4\xabP`\x89\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)4dece9c826f69490507b98c6383a3009b295837d (esc) | ||||
\x00\x00\x00f\x00\x00\x00h\x00\x00\x00\x02E (esc) | ||||
\x00\x00\x00i\x00\x00\x00j\x00\x00\x00\x01E\x00\x00\x00\xa2\xee\xa17Fy\x9a\x9e\x0b\xfd\x88\xf2\x9d<.\x9d\xc98\x9fRO$\xb68|\x8c\x8c\xae7\x17\x88\x80\xf3\xfa\x95\xde\xd3\xcb\x1c\xf7\x85\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\xee\xa17Fy\x9a\x9e\x0b\xfd\x88\xf2\x9d<.\x9d\xc98\x9fRO\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)365b93d57fdf4814e2b5911d6bacff2b12014441 (esc) | ||||
\x00\x00\x00f\x00\x00\x00h\x00\x00\x00\x00\x00\x00\x00i\x00\x00\x00j\x00\x00\x00\x01G\x00\x00\x00\xa4\x02\xdeB\x19n\xbe\xe4.\xf2\x84\xb6x (esc) | ||||
\x87\xcd\xc9n\x8e\xaa\xb6$\xb68|\x8c\x8c\xae7\x17\x88\x80\xf3\xfa\x95\xde\xd3\xcb\x1c\xf7\x85\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xdeB\x19n\xbe\xe4.\xf2\x84\xb6x (esc) | ||||
\x87\xcd\xc9n\x8e\xaa\xb6\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)8bee48edc7318541fc0013ee41b089276a8c24bf (esc) | ||||
\x00\x00\x00f\x00\x00\x00f\x00\x00\x00\x02H (esc) | ||||
\x00\x00\x00g\x00\x00\x00h\x00\x00\x00\x01H\x00\x00\x00\x00\x00\x00\x00\x8bn\x1fLG\xec\xb53\xff\xd0\xc8\xe5,\xdc\x88\xaf\xb6\xcd9\xe2\x0cf\xa5\xa0\x18\x17\xfd\xf5#\x9c'8\x02\xb5\xb7a\x8d\x05\x1c\x89\xe4\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x002\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j\x00\x00\x00\x81\x00\x00\x00\x81\x00\x00\x00+D\x00c3f1ca2924c16a19b0656a84900e504e5b0aec2d (esc) | ||||
\x00\x00\x00\x8bM\xec\xe9\xc8&\xf6\x94\x90P{\x98\xc68:0 \xb2\x95\x83}\x00}\x8c\x9d\x88\x84\x13%\xf5\xc6\xb0cq\xb3[N\x8a+\x1a\x83\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\x00\x00\x00+\x00\x00\x00\xac\x00\x00\x00+E\x009c6fd0350a6c0d0c49d4a9c5017cf07043f54e58 (esc) | ||||
\x00\x00\x00\x8b6[\x93\xd5\x7f\xdfH\x14\xe2\xb5\x91\x1dk\xac\xff+\x12\x01DA(\xa5\x84\xc6^\xf1!\xf8\x9e\xb6j\xb7\xd0\xbc\x15=\x80\x99\xe7\xceM\xec\xe9\xc8&\xf6\x94\x90P{\x98\xc68:0 \xb2\x95\x83}\xee\xa17Fy\x9a\x9e\x0b\xfd\x88\xf2\x9d<.\x9d\xc98\x9fRO\x00\x00\x00V\x00\x00\x00V\x00\x00\x00+F\x0022bfcfd62a21a3287edbd4d656218d0f525ed76a (esc) | ||||
\x00\x00\x00\x97\x8b\xeeH\xed\xc71\x85A\xfc\x00\x13\xeeA\xb0\x89'j\x8c$\xbf(\xa5\x84\xc6^\xf1!\xf8\x9e\xb6j\xb7\xd0\xbc\x15=\x80\x99\xe7\xce\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xdeB\x19n\xbe\xe4.\xf2\x84\xb6x (esc) | ||||
\x87\xcd\xc9n\x8e\xaa\xb6\x00\x00\x00+\x00\x00\x00V\x00\x00\x00\x00\x00\x00\x00\x81\x00\x00\x00\x81\x00\x00\x00+H\x008500189e74a9e0475e822093bc7db0d631aeb0b4 (esc) | ||||
\x00\x00\x00\x00\x00\x00\x00\x05D\x00\x00\x00b\xc3\xf1\xca)$\xc1j\x19\xb0ej\x84\x90\x0ePN[ (esc) | ||||
\xec-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x002\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02D (esc) | ||||
\x00\x00\x00\x00\x00\x00\x00\x05E\x00\x00\x00b\x9co\xd05 (esc) | ||||
l\r (no-eol) (esc) | ||||
\x0cI\xd4\xa9\xc5\x01|\xf0pC\xf5NX\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02E (esc) | ||||
\x00\x00\x00\x00\x00\x00\x00\x05H\x00\x00\x00b\x85\x00\x18\x9et\xa9\xe0G^\x82 \x93\xbc}\xb0\xd61\xae\xb0\xb4\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xdeB\x19n\xbe\xe4.\xf2\x84\xb6x (esc) | ||||
\x87\xcd\xc9n\x8e\xaa\xb6\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02H (esc) | ||||
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 (no-eol) (esc) | ||||
|
r21130 | $ hg unbundle2 < ../rev.hg2 | ||
|
r20950 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
added 0 changesets with 0 changes to 3 files | ||||
0 unread bytes | ||||
addchangegroup return: 1 | ||||
|
r20955 | |||
|
r21130 | with reply | ||
$ hg bundle2 --rev '8+7+5+4' --reply ../rev-rr.hg2 | ||||
$ hg unbundle2 ../rev-reply.hg2 < ../rev-rr.hg2 | ||||
0 unread bytes | ||||
addchangegroup return: 1 | ||||
$ cat ../rev-reply.hg2 | ||||
|
r21146 | HG2X\x00\x00\x003\x15b2x:reply:changegroup\x00\x00\x00\x00\x00\x02\x0b\x01\x06\x01in-reply-to1return1\x00\x00\x00\x00\x00\x1f (esc) | ||
b2x:output\x00\x00\x00\x01\x00\x01\x0b\x01in-reply-to1\x00\x00\x00dadding changesets (esc) | ||||
|
r21131 | adding manifests | ||
adding file changes | ||||
added 0 changesets with 0 changes to 3 files | ||||
\x00\x00\x00\x00\x00\x00 (no-eol) (esc) | ||||
|
r20998 | |||
|
r20955 | Real world exchange | ||
===================== | ||||
clone --pull | ||||
$ cd .. | ||||
$ hg clone main other --pull --rev 9520eea781bc | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R other log -G | ||||
@ changeset: 1:9520eea781bc | ||||
| tag: tip | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: E | ||||
| | ||||
o changeset: 0:cd010b8cd998 | ||||
user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
date: Sat Apr 30 15:24:48 2011 +0200 | ||||
summary: A | ||||
pull | ||||
|
r21061 | $ hg -R other pull -r 24b6387c8c8c | ||
|
r20955 | pulling from $TESTTMP/main (glob) | ||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r21061 | added 1 changesets with 1 changes to 1 files (+1 heads) | ||
|
r20955 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
r21061 | |||
|
r21584 | pull empty | ||
$ hg -R other pull -r 24b6387c8c8c | ||||
pulling from $TESTTMP/main (glob) | ||||
no changes found | ||||
|
r21061 | push | ||
$ hg -R main push other --rev eea13746799a | ||||
pushing to other | ||||
searching for changes | ||||
|
r21131 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 0 changes to 0 files (-1 heads) | ||||
|
r21069 | |||
pull over ssh | ||||
$ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --traceback | ||||
pulling from ssh://user@dummy/main | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
pull over http | ||||
$ hg -R main serve -p $HGPORT -d --pid-file=main.pid -E main-error.log | ||||
$ cat main.pid >> $DAEMON_PIDS | ||||
$ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 | ||||
pulling from http://localhost:$HGPORT/ | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
(run 'hg heads .' to see heads, 'hg merge' to merge) | ||||
$ cat main-error.log | ||||
|
r21075 | push over ssh | ||
|
r21069 | |||
|
r21075 | $ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 | ||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 1 changes to 1 files | ||||
push over http | ||||
$ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||||
$ cat other.pid >> $DAEMON_PIDS | ||||
$ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
|
r21131 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 1 changes to 1 files | ||||
|
r21075 | $ cat other-error.log | ||
Check final content. | ||||
$ hg -R other log -G | ||||
o changeset: 7:32af7686d403 | ||||
| tag: tip | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: D | ||||
| | ||||
o changeset: 6:5fddd98957c8 | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: C | ||||
| | ||||
o changeset: 5:42ccdea3bb16 | ||||
| parent: 0:cd010b8cd998 | ||||
| user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: B | ||||
| | ||||
| o changeset: 4:02de42196ebe | ||||
| | parent: 2:24b6387c8c8c | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: H | ||||
| | | ||||
| | o changeset: 3:eea13746799a | ||||
| |/| parent: 2:24b6387c8c8c | ||||
| | | parent: 1:9520eea781bc | ||||
| | | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | | summary: G | ||||
| | | | ||||
| o | changeset: 2:24b6387c8c8c | ||||
|/ / parent: 0:cd010b8cd998 | ||||
| | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| | date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| | summary: F | ||||
| | | ||||
| @ changeset: 1:9520eea781bc | ||||
|/ user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
| date: Sat Apr 30 15:24:48 2011 +0200 | ||||
| summary: E | ||||
| | ||||
o changeset: 0:cd010b8cd998 | ||||
user: Nicolas Dumazet <nicdumz.commits@gmail.com> | ||||
date: Sat Apr 30 15:24:48 2011 +0200 | ||||
summary: A | ||||
|
r21177 | |||
Error Handling | ||||
============== | ||||
Check that errors are properly returned to the client during push. | ||||
Setting up | ||||
$ cat > failpush.py << EOF | ||||
> """A small extension that makes push fails when using bundle2 | ||||
> | ||||
> used to test error handling in bundle2 | ||||
> """ | ||||
> | ||||
> from mercurial import util | ||||
> from mercurial import bundle2 | ||||
> from mercurial import exchange | ||||
> from mercurial import extensions | ||||
> | ||||
> def _pushbundle2failpart(orig, pushop, bundler): | ||||
> extradata = orig(pushop, bundler) | ||||
|
r21178 | > reason = pushop.ui.config('failpush', 'reason', None) | ||
> part = None | ||||
> if reason == 'abort': | ||||
|
r21600 | > bundler.newpart('test:abort') | ||
|
r21183 | > if reason == 'unknown': | ||
|
r21600 | > bundler.newpart('TEST:UNKNOWN') | ||
|
r21186 | > if reason == 'race': | ||
> # 20 Bytes of crap | ||||
|
r21600 | > bundler.newpart('b2x:check:heads', data='01234567890123456789') | ||
|
r21177 | > return extradata | ||
> | ||||
> @bundle2.parthandler("test:abort") | ||||
> def handleabort(op, part): | ||||
> raise util.Abort('Abandon ship!', hint="don't panic") | ||||
> | ||||
> def uisetup(ui): | ||||
> extensions.wrapfunction(exchange, '_pushbundle2extraparts', _pushbundle2failpart) | ||||
> | ||||
> EOF | ||||
$ cd main | ||||
$ hg up tip | ||||
3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'I' > I | ||||
$ hg add I | ||||
$ hg ci -m 'I' | ||||
$ hg id | ||||
e7ec4e813ba6 tip | ||||
$ cd .. | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [extensions] | ||||
> failpush=$TESTTMP/failpush.py | ||||
> EOF | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | ||||
$ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||||
$ cat other.pid >> $DAEMON_PIDS | ||||
Doing the actual push: Abort error | ||||
|
r21178 | $ cat << EOF >> $HGRCPATH | ||
> [failpush] | ||||
> reason = abort | ||||
> EOF | ||||
|
r21177 | $ hg -R main push other -r e7ec4e813ba6 | ||
pushing to other | ||||
searching for changes | ||||
abort: Abandon ship! | ||||
(don't panic) | ||||
[255] | ||||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: Abandon ship! | ||||
(don't panic) | ||||
[255] | ||||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: Abandon ship! | ||||
(don't panic) | ||||
[255] | ||||
|
r21183 | Doing the actual push: unknown mandatory parts | ||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = unknown | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
abort: missing support for 'test:unknown' | ||||
[255] | ||||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: missing support for "'test:unknown'" | ||||
[255] | ||||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: missing support for "'test:unknown'" | ||||
[255] | ||||
|
r21186 | |||
Doing the actual push: race | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = race | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
abort: push failed: | ||||
'repository changed while pushing - please try again' | ||||
[255] | ||||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: push failed: | ||||
'repository changed while pushing - please try again' | ||||
[255] | ||||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: push failed: | ||||
'repository changed while pushing - please try again' | ||||
[255] | ||||
|
r21187 | |||
Doing the actual push: hook abort | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = | ||||
> [hooks] | ||||
> b2x-pretransactionclose.failpush = false | ||||
> EOF | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | ||||
$ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||||
$ cat other.pid >> $DAEMON_PIDS | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
transaction abort! | ||||
rollback completed | ||||
abort: b2x-pretransactionclose.failpush hook exited with status 1 | ||||
[255] | ||||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: b2x-pretransactionclose.failpush hook exited with status 1 | ||||
remote: transaction abort! | ||||
remote: rollback completed | ||||
[255] | ||||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: b2x-pretransactionclose.failpush hook exited with status 1 | ||||
[255] | ||||