Show More
@@ -1135,9 +1135,9 b' def _pushbundle2(pushop):' | |||
|
1135 | 1135 | except error.BundleValueError as exc: |
|
1136 | 1136 | raise error.Abort(_(b'missing support for %s') % exc) |
|
1137 | 1137 | except bundle2.AbortFromPart as exc: |
|
1138 |
pushop.ui. |
|
|
1138 | pushop.ui.error(_(b'remote: %s\n') % exc) | |
|
1139 | 1139 | if exc.hint is not None: |
|
1140 |
pushop.ui. |
|
|
1140 | pushop.ui.error(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) | |
|
1141 | 1141 | raise error.Abort(_(b'push failed on remote')) |
|
1142 | 1142 | except error.PushkeyFailed as exc: |
|
1143 | 1143 | partid = int(exc.partid) |
@@ -1832,7 +1832,7 b' def _pullbundle2(pullop):' | |||
|
1832 | 1832 | op.modes[b'bookmarks'] = b'records' |
|
1833 | 1833 | bundle2.processbundle(pullop.repo, bundle, op=op) |
|
1834 | 1834 | except bundle2.AbortFromPart as exc: |
|
1835 |
pullop.repo.ui. |
|
|
1835 | pullop.repo.ui.error(_(b'remote: abort: %s\n') % exc) | |
|
1836 | 1836 | raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) |
|
1837 | 1837 | except error.BundleValueError as exc: |
|
1838 | 1838 | raise error.Abort(_(b'missing support for %s') % exc) |
@@ -147,6 +147,7 b' Can pull into repo with a single commit' | |||
|
147 | 147 | $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0 |
|
148 | 148 | $ cd narrow2 |
|
149 | 149 | $ hg pull -q -r 1 |
|
150 | remote: abort: unexpected error: unable to resolve parent while packing b'00manifest.i' 1 for changeset 0 | |
|
150 | 151 | transaction abort! |
|
151 | 152 | rollback completed |
|
152 | 153 | abort: pull failed on remote |
@@ -91,7 +91,6 b'' | |||
|
91 | 91 | # flakiness here |
|
92 | 92 | $ hg clone --noupdate ssh://user@dummy/shallow full 2>/dev/null |
|
93 | 93 | streaming all changes |
|
94 | remote: abort: Cannot clone from a shallow repo to a full repo. | |
|
95 | 94 | [255] |
|
96 | 95 | |
|
97 | 96 | # getbundle full clone |
@@ -85,9 +85,9 b' check its contents separately.' | |||
|
85 | 85 | $ TEMP_STDERR=full-clone-from-shallow.stderr.tmp |
|
86 | 86 | $ hg clone --noupdate ssh://user@dummy/shallow full 2>$TEMP_STDERR |
|
87 | 87 | streaming all changes |
|
88 | remote: abort: Cannot clone from a shallow repo to a full repo. | |
|
89 | 88 | [255] |
|
90 | 89 | $ cat $TEMP_STDERR |
|
90 | remote: abort: Cannot clone from a shallow repo to a full repo. | |
|
91 | 91 | abort: pull failed on remote |
|
92 | 92 | $ rm $TEMP_STDERR |
|
93 | 93 |
General Comments 0
You need to be logged in to leave comments.
Login now