| durin42 | |
| Alphare | |
| pulkit |
| hg-reviewers |
It seems like the server's message is something you'd like to see even
with --quiet. It's clearly part of the error.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/exchange.py (6 lines) | |||
| M | tests/test-narrow-pull.t (1 line) | |||
| M | tests/test-remotefilelog-clone-tree.t (1 line) | |||
| M | tests/test-remotefilelog-clone.t (2 lines) |
| try: | try: | ||||
| trgetter = None | trgetter = None | ||||
| if pushback: | if pushback: | ||||
| trgetter = pushop.trmanager.transaction | trgetter = pushop.trmanager.transaction | ||||
| op = bundle2.processbundle(pushop.repo, reply, trgetter) | op = bundle2.processbundle(pushop.repo, reply, trgetter) | ||||
| except error.BundleValueError as exc: | except error.BundleValueError as exc: | ||||
| raise error.Abort(_(b'missing support for %s') % exc) | raise error.Abort(_(b'missing support for %s') % exc) | ||||
| except bundle2.AbortFromPart as exc: | except bundle2.AbortFromPart as exc: | ||||
| pushop.ui.status(_(b'remote: %s\n') % exc) | pushop.ui.error(_(b'remote: %s\n') % exc) | ||||
| if exc.hint is not None: | if exc.hint is not None: | ||||
| pushop.ui.status(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) | pushop.ui.error(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) | ||||
| raise error.Abort(_(b'push failed on remote')) | raise error.Abort(_(b'push failed on remote')) | ||||
| except error.PushkeyFailed as exc: | except error.PushkeyFailed as exc: | ||||
| partid = int(exc.partid) | partid = int(exc.partid) | ||||
| if partid not in pushop.pkfailcb: | if partid not in pushop.pkfailcb: | ||||
| raise | raise | ||||
| pushop.pkfailcb[partid](pushop, exc) | pushop.pkfailcb[partid](pushop, exc) | ||||
| for rephand in replyhandlers: | for rephand in replyhandlers: | ||||
| rephand(op) | rephand(op) | ||||
| try: | try: | ||||
| op = bundle2.bundleoperation( | op = bundle2.bundleoperation( | ||||
| pullop.repo, pullop.gettransaction, source=b'pull' | pullop.repo, pullop.gettransaction, source=b'pull' | ||||
| ) | ) | ||||
| op.modes[b'bookmarks'] = b'records' | op.modes[b'bookmarks'] = b'records' | ||||
| bundle2.processbundle(pullop.repo, bundle, op=op) | bundle2.processbundle(pullop.repo, bundle, op=op) | ||||
| except bundle2.AbortFromPart as exc: | except bundle2.AbortFromPart as exc: | ||||
| pullop.repo.ui.status(_(b'remote: abort: %s\n') % exc) | pullop.repo.ui.error(_(b'remote: abort: %s\n') % exc) | ||||
| raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) | raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) | ||||
| except error.BundleValueError as exc: | except error.BundleValueError as exc: | ||||
| raise error.Abort(_(b'missing support for %s') % exc) | raise error.Abort(_(b'missing support for %s') % exc) | ||||
| if pullop.fetch: | if pullop.fetch: | ||||
| pullop.cgresult = bundle2.combinechangegroupresults(op) | pullop.cgresult = bundle2.combinechangegroupresults(op) | ||||
| # processing phases change | # processing phases change | ||||
| 28: Update#2 to f9 | 28: Update#2 to f9 | ||||
| Can pull into repo with a single commit | Can pull into repo with a single commit | ||||
| $ cd .. | $ cd .. | ||||
| $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0 | $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0 | ||||
| $ cd narrow2 | $ cd narrow2 | ||||
| $ hg pull -q -r 1 | $ hg pull -q -r 1 | ||||
| remote: abort: unexpected error: unable to resolve parent while packing b'00manifest.i' 1 for changeset 0 | |||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: pull failed on remote | abort: pull failed on remote | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| # full clone from shallow | # full clone from shallow | ||||
| # - send stderr to /dev/null because the order of stdout/err causes | # - send stderr to /dev/null because the order of stdout/err causes | ||||
| # flakiness here | # flakiness here | ||||
| $ hg clone --noupdate ssh://user@dummy/shallow full 2>/dev/null | $ hg clone --noupdate ssh://user@dummy/shallow full 2>/dev/null | ||||
| streaming all changes | streaming all changes | ||||
| remote: abort: Cannot clone from a shallow repo to a full repo. | |||||
| [255] | [255] | ||||
| # getbundle full clone | # getbundle full clone | ||||
| $ printf '[server]\npreferuncompressed=False\n' >> master/.hg/hgrc | $ printf '[server]\npreferuncompressed=False\n' >> master/.hg/hgrc | ||||
| $ hgcloneshallow ssh://user@dummy/master shallow3 | $ hgcloneshallow ssh://user@dummy/master shallow3 | ||||
| requesting all changes | requesting all changes | ||||
| adding changesets | adding changesets | ||||
| Note: the output to STDERR comes from a different process to the output on | Note: the output to STDERR comes from a different process to the output on | ||||
| STDOUT and their relative ordering is not deterministic. As a result, the test | STDOUT and their relative ordering is not deterministic. As a result, the test | ||||
| was failing sporadically. To avoid this, we capture STDERR to a file and | was failing sporadically. To avoid this, we capture STDERR to a file and | ||||
| check its contents separately. | check its contents separately. | ||||
| $ TEMP_STDERR=full-clone-from-shallow.stderr.tmp | $ TEMP_STDERR=full-clone-from-shallow.stderr.tmp | ||||
| $ hg clone --noupdate ssh://user@dummy/shallow full 2>$TEMP_STDERR | $ hg clone --noupdate ssh://user@dummy/shallow full 2>$TEMP_STDERR | ||||
| streaming all changes | streaming all changes | ||||
| remote: abort: Cannot clone from a shallow repo to a full repo. | |||||
| [255] | [255] | ||||
| $ cat $TEMP_STDERR | $ cat $TEMP_STDERR | ||||
| remote: abort: Cannot clone from a shallow repo to a full repo. | |||||
| abort: pull failed on remote | abort: pull failed on remote | ||||
| $ rm $TEMP_STDERR | $ rm $TEMP_STDERR | ||||
| # getbundle full clone | # getbundle full clone | ||||
| $ printf '[server]\npreferuncompressed=False\n' >> master/.hg/hgrc | $ printf '[server]\npreferuncompressed=False\n' >> master/.hg/hgrc | ||||
| $ hgcloneshallow ssh://user@dummy/master shallow3 | $ hgcloneshallow ssh://user@dummy/master shallow3 | ||||
| requesting all changes | requesting all changes | ||||