mercurial/commands.py
changeset 33048 52c7060b707a
parent 33043 e8c8d81eb864
child 33049 d765ad56081f
equal deleted inserted replaced
33047:6e3a6774d998 33048:52c7060b707a
  5214                             hint=_("see https://mercurial-scm.org/"
  5214                             hint=_("see https://mercurial-scm.org/"
  5215                                    "wiki/BundleFeature for more "
  5215                                    "wiki/BundleFeature for more "
  5216                                    "information"))
  5216                                    "information"))
  5217                 changes = [r.get('return', 0)
  5217                 changes = [r.get('return', 0)
  5218                            for r in op.records['changegroup']]
  5218                            for r in op.records['changegroup']]
  5219                 modheads = changegroup.combineresults(changes)
  5219                 modheads = bundle2.combinechangegroupresults(changes)
  5220             else:
  5220             else:
  5221                 txnname = 'unbundle\n%s' % util.hidepassword(url)
  5221                 txnname = 'unbundle\n%s' % util.hidepassword(url)
  5222                 with repo.transaction(txnname) as tr:
  5222                 with repo.transaction(txnname) as tr:
  5223                     modheads, addednodes = gen.apply(repo, tr, 'unbundle', url)
  5223                     modheads, addednodes = gen.apply(repo, tr, 'unbundle', url)
  5224 
  5224