equal
deleted
inserted
replaced
1593 kwargs['obsmarkers'] = True |
1593 kwargs['obsmarkers'] = True |
1594 pullop.stepsdone.add('obsmarkers') |
1594 pullop.stepsdone.add('obsmarkers') |
1595 _pullbundle2extraprepare(pullop, kwargs) |
1595 _pullbundle2extraprepare(pullop, kwargs) |
1596 bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs)) |
1596 bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs)) |
1597 try: |
1597 try: |
1598 op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction) |
1598 op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction, |
|
1599 source='pull') |
1599 op.modes['bookmarks'] = 'records' |
1600 op.modes['bookmarks'] = 'records' |
1600 bundle2.processbundle(pullop.repo, bundle, op=op) |
1601 bundle2.processbundle(pullop.repo, bundle, op=op) |
1601 except bundle2.AbortFromPart as exc: |
1602 except bundle2.AbortFromPart as exc: |
1602 pullop.repo.ui.status(_('remote: abort: %s\n') % exc) |
1603 pullop.repo.ui.status(_('remote: abort: %s\n') % exc) |
1603 raise error.Abort(_('pull failed on remote'), hint=exc.hint) |
1604 raise error.Abort(_('pull failed on remote'), hint=exc.hint) |
2050 # locking. |
2051 # locking. |
2051 if not repo.ui.configbool('experimental', 'bundle2lazylocking'): |
2052 if not repo.ui.configbool('experimental', 'bundle2lazylocking'): |
2052 gettransaction() |
2053 gettransaction() |
2053 |
2054 |
2054 op = bundle2.bundleoperation(repo, gettransaction, |
2055 op = bundle2.bundleoperation(repo, gettransaction, |
2055 captureoutput=captureoutput) |
2056 captureoutput=captureoutput, |
|
2057 source='push') |
2056 try: |
2058 try: |
2057 op = bundle2.processbundle(repo, cg, op=op) |
2059 op = bundle2.processbundle(repo, cg, op=op) |
2058 finally: |
2060 finally: |
2059 r = op.reply |
2061 r = op.reply |
2060 if captureoutput and r is not None: |
2062 if captureoutput and r is not None: |