equal
deleted
inserted
replaced
796 if pushback: |
796 if pushback: |
797 trgetter = pushop.trmanager.transaction |
797 trgetter = pushop.trmanager.transaction |
798 op = bundle2.processbundle(pushop.repo, reply, trgetter) |
798 op = bundle2.processbundle(pushop.repo, reply, trgetter) |
799 except error.BundleValueError as exc: |
799 except error.BundleValueError as exc: |
800 raise error.Abort('missing support for %s' % exc) |
800 raise error.Abort('missing support for %s' % exc) |
|
801 except bundle2.AbortFromPart as exc: |
|
802 pushop.ui.status(_('remote: %s\n') % exc) |
|
803 raise error.Abort(_('push failed on remote'), hint=exc.hint) |
801 except error.PushkeyFailed as exc: |
804 except error.PushkeyFailed as exc: |
802 partid = int(exc.partid) |
805 partid = int(exc.partid) |
803 if partid not in pushop.pkfailcb: |
806 if partid not in pushop.pkfailcb: |
804 raise |
807 raise |
805 pushop.pkfailcb[partid](pushop, exc) |
808 pushop.pkfailcb[partid](pushop, exc) |