##// END OF EJS Templates
bundle2: keep hint close to the primary message when remote abort...
Pierre-Yves David -
r30908:4c8dcb49 stable
parent child Browse files
Show More
@@ -904,7 +904,9 def _pushbundle2(pushop):
904 904 raise error.Abort(_('missing support for %s') % exc)
905 905 except bundle2.AbortFromPart as exc:
906 906 pushop.ui.status(_('remote: %s\n') % exc)
907 raise error.Abort(_('push failed on remote'), hint=exc.hint)
907 if exc.hint is not None:
908 pushop.ui.status(_('remote: %s\n') % ('(%s)' % exc.hint))
909 raise error.Abort(_('push failed on remote'))
908 910 except error.PushkeyFailed as exc:
909 911 partid = int(exc.partid)
910 912 if partid not in pushop.pkfailcb:
@@ -518,16 +518,16 Doing the actual push: Abort error
518 518 pushing to ssh://user@dummy/other
519 519 searching for changes
520 520 remote: Abandon ship!
521 remote: (don't panic)
521 522 abort: push failed on remote
522 (don't panic)
523 523 [255]
524 524
525 525 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
526 526 pushing to http://localhost:$HGPORT2/
527 527 searching for changes
528 528 remote: Abandon ship!
529 remote: (don't panic)
529 530 abort: push failed on remote
530 (don't panic)
531 531 [255]
532 532
533 533
General Comments 0
You need to be logged in to leave comments. Login now