mercurial/changegroup.py
changeset 43106 d783f945a701
parent 43085 eef9a2d67051
child 43117 8ff1ecfadcd1
equal deleted inserted replaced
43105:649d3ac37a12 43106:d783f945a701
   351                 # validate incoming csets have their manifests
   351                 # validate incoming csets have their manifests
   352                 for cset in pycompat.xrange(clstart, clend):
   352                 for cset in pycompat.xrange(clstart, clend):
   353                     mfnode = cl.changelogrevision(cset).manifest
   353                     mfnode = cl.changelogrevision(cset).manifest
   354                     mfest = ml[mfnode].readdelta()
   354                     mfest = ml[mfnode].readdelta()
   355                     # store file cgnodes we must see
   355                     # store file cgnodes we must see
   356                     for f, n in mfest.iteritems():
   356                     for f, n in pycompat.iteritems(mfest):
   357                         needfiles.setdefault(f, set()).add(n)
   357                         needfiles.setdefault(f, set()).add(n)
   358 
   358 
   359             # process the files
   359             # process the files
   360             repo.ui.status(_(b"adding file changes\n"))
   360             repo.ui.status(_(b"adding file changes\n"))
   361             newrevs, newfiles = _addchangegroupfiles(
   361             newrevs, newfiles = _addchangegroupfiles(
   989 
   989 
   990         mfdicts = None
   990         mfdicts = None
   991         if self._ellipses and self._isshallow:
   991         if self._ellipses and self._isshallow:
   992             mfdicts = [
   992             mfdicts = [
   993                 (self._repo.manifestlog[n].read(), lr)
   993                 (self._repo.manifestlog[n].read(), lr)
   994                 for (n, lr) in manifests.iteritems()
   994                 for (n, lr) in pycompat.iteritems(manifests)
   995             ]
   995             ]
   996 
   996 
   997         manifests.clear()
   997         manifests.clear()
   998         clrevs = set(cl.rev(x) for x in clnodes)
   998         clrevs = set(cl.rev(x) for x in clnodes)
   999 
   999 
  1670                     raise error.Abort(_(b"received spurious file revlog entry"))
  1670                     raise error.Abort(_(b"received spurious file revlog entry"))
  1671             if not needs:
  1671             if not needs:
  1672                 del needfiles[f]
  1672                 del needfiles[f]
  1673     progress.complete()
  1673     progress.complete()
  1674 
  1674 
  1675     for f, needs in needfiles.iteritems():
  1675     for f, needs in pycompat.iteritems(needfiles):
  1676         fl = repo.file(f)
  1676         fl = repo.file(f)
  1677         for n in needs:
  1677         for n in needs:
  1678             try:
  1678             try:
  1679                 fl.rev(n)
  1679                 fl.rev(n)
  1680             except error.LookupError:
  1680             except error.LookupError: