comparison mercurial/commands.py @ 26368:0224d22ef5d8

merge with stable

26366:a672cc61ab1d

            if isinstance(gen, bundle2.unbundle20):
                tr = repo.transaction('unbundle')
                try:
                    op = bundle2.processbundle(repo, gen, lambda: tr)
                    tr.close()
                finally:
                    if tr:
                        tr.release()
                changes = [r.get('result', 0)
                           for r in op.records['changegroup']]

26368:0224d22ef5d8

            if isinstance(gen, bundle2.unbundle20):
                tr = repo.transaction('unbundle')
                try:
                    op = bundle2.processbundle(repo, gen, lambda: tr)
                    tr.close()
                except error.UnsupportedPartError as exc:
                    raise util.Abort(_('%s: unknown bundle feature, %s')
                                     % (fname, exc),
                                     hint=_("see https://mercurial.selenic.com/"
                                            "wiki/BundleFeature for more "
                                            "information"))
                finally:
                    if tr:
                        tr.release()
                changes = [r.get('result', 0)
                           for r in op.records['changegroup']]