mercurial/commands.py

32881:f65786a02922

    with repo.lock():
        for fname in fnames:
            f = hg.openpath(ui, fname)
            gen = exchange.readbundle(ui, f, fname)
            if isinstance(gen, bundle2.unbundle20):
                with repo.transaction('unbundle') as tr:
                    try:
                        op = bundle2.applybundle(repo, gen, tr,
                                                 source='unbundle',

                                   "wiki/BundleFeature for more "
                                   "information"))
                changes = [r.get('return', 0)
                           for r in op.records['changegroup']]
                modheads = changegroup.combineresults(changes)
            elif isinstance(gen, streamclone.streamcloneapplier):
                raise error.Abort(
                        _('packed bundles cannot be applied with '
                          '"hg unbundle"'),
                        hint=_('use "hg debugapplystreamclonebundle"'))
            else:
                modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)

    return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)

32882:0d98b11b8467

    with repo.lock():
        for fname in fnames:
            f = hg.openpath(ui, fname)
            gen = exchange.readbundle(ui, f, fname)
            if isinstance(gen, streamclone.streamcloneapplier):
                raise error.Abort(
                        _('packed bundles cannot be applied with '
                          '"hg unbundle"'),
                        hint=_('use "hg debugapplystreamclonebundle"'))
            if isinstance(gen, bundle2.unbundle20):
                with repo.transaction('unbundle') as tr:
                    try:
                        op = bundle2.applybundle(repo, gen, tr,
                                                 source='unbundle',

                                   "wiki/BundleFeature for more "
                                   "information"))
                changes = [r.get('return', 0)
                           for r in op.records['changegroup']]
                modheads = changegroup.combineresults(changes)
            else:
                modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)

    return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)