comparison mercurial/exchange.py @ 33039:b82615afde65

bundle: add a applybundle1() method

This is one step towards removing a bunch of "if isinstance(gen,
unbundle20)" by treating bundle1 and bundle2 more similarly.

The name may sounds ironic for a method in the bundle2 module, but I
didn't think it was worth it yet to create a new 'bundle' module that
depends on the 'bundle2' module. Besides, we'll inline the method
again later.

33038:f0efd2bffe1e

        raise error.Abort(_("partial pull cannot be done because "
                           "other repository doesn't support "
                           "changegroupsubset."))
    else:
        cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
    pullop.cgresult, addednodes = cg.apply(pullop.repo, tr, 'pull',
                                           pullop.remote.url())

def _pullphase(pullop):
    # Get remote phases data from remote
    if 'phases' in pullop.stepsdone:

        # push can proceed
        if not isinstance(cg, bundle2.unbundle20):
            # legacy case: bundle1 (changegroup 01)
            txnname = "\n".join([source, util.hidepassword(url)])
            with repo.lock(), repo.transaction(txnname) as tr:
                r, addednodes = cg.apply(repo, tr, source, url)
        else:
            r = None
            try:
                def gettransaction():
                    if not lockandtr[2]:

            if isinstance(cg, bundle2.unbundle20):
                bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
            elif isinstance(cg, streamclone.streamcloneapplier):
                cg.apply(repo)
            else:
                cg.apply(repo, tr, 'clonebundles', url)
            return True
        except urlerr.httperror as e:
            ui.warn(_('HTTP error fetching bundle: %s\n') % str(e))
        except urlerr.urlerror as e:
            ui.warn(_('error fetching bundle: %s\n') % e.reason)

33039:b82615afde65

        raise error.Abort(_("partial pull cannot be done because "
                           "other repository doesn't support "
                           "changegroupsubset."))
    else:
        cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
    pullop.cgresult = bundle2.applybundle1(pullop.repo, cg, tr, 'pull',
                                           pullop.remote.url())

def _pullphase(pullop):
    # Get remote phases data from remote
    if 'phases' in pullop.stepsdone:

        # push can proceed
        if not isinstance(cg, bundle2.unbundle20):
            # legacy case: bundle1 (changegroup 01)
            txnname = "\n".join([source, util.hidepassword(url)])
            with repo.lock(), repo.transaction(txnname) as tr:
                r = bundle2.applybundle1(repo, cg, tr, source, url)
        else:
            r = None
            try:
                def gettransaction():
                    if not lockandtr[2]:

            if isinstance(cg, bundle2.unbundle20):
                bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
            elif isinstance(cg, streamclone.streamcloneapplier):
                cg.apply(repo)
            else:
                bundle2.applybundle1(repo, cg, tr, 'clonebundles', url)
            return True
        except urlerr.httperror as e:
            ui.warn(_('HTTP error fetching bundle: %s\n') % str(e))
        except urlerr.urlerror as e:
            ui.warn(_('error fetching bundle: %s\n') % e.reason)