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