equal
deleted
inserted
replaced
925 > part = None |
925 > part = None |
926 > if reason == 'abort': |
926 > if reason == 'abort': |
927 > part = bundle2.bundlepart('test:abort') |
927 > part = bundle2.bundlepart('test:abort') |
928 > if reason == 'unknown': |
928 > if reason == 'unknown': |
929 > part = bundle2.bundlepart('TEST:UNKNOWN') |
929 > part = bundle2.bundlepart('TEST:UNKNOWN') |
|
930 > if reason == 'race': |
|
931 > # 20 Bytes of crap |
|
932 > part = bundle2.bundlepart('b2x:check:heads', data='01234567890123456789') |
930 > if part is not None: |
933 > if part is not None: |
931 > bundler.addpart(part) |
934 > bundler.addpart(part) |
932 > return extradata |
935 > return extradata |
933 > |
936 > |
934 > @bundle2.parthandler("test:abort") |
937 > @bundle2.parthandler("test:abort") |
1010 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
1013 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
1011 pushing to http://localhost:$HGPORT2/ |
1014 pushing to http://localhost:$HGPORT2/ |
1012 searching for changes |
1015 searching for changes |
1013 abort: missing support for "'test:unknown'" |
1016 abort: missing support for "'test:unknown'" |
1014 [255] |
1017 [255] |
|
1018 |
|
1019 Doing the actual push: race |
|
1020 |
|
1021 $ cat << EOF >> $HGRCPATH |
|
1022 > [failpush] |
|
1023 > reason = race |
|
1024 > EOF |
|
1025 |
|
1026 $ hg -R main push other -r e7ec4e813ba6 |
|
1027 pushing to other |
|
1028 searching for changes |
|
1029 abort: push failed: |
|
1030 'repository changed while pushing - please try again' |
|
1031 [255] |
|
1032 |
|
1033 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
1034 pushing to ssh://user@dummy/other |
|
1035 searching for changes |
|
1036 abort: push failed: |
|
1037 'repository changed while pushing - please try again' |
|
1038 [255] |
|
1039 |
|
1040 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
1041 pushing to http://localhost:$HGPORT2/ |
|
1042 searching for changes |
|
1043 abort: push failed: |
|
1044 'repository changed while pushing - please try again' |
|
1045 [255] |