mercurial/manifest.py
changeset 42347 6310180662f5
parent 42341 27d6956d386b
child 42380 12bd4e2d4d06
equal deleted inserted replaced
42346:38d85ec06552 42347:6310180662f5
  1484             # manifest up-front, which may save time later for the
  1484             # manifest up-front, which may save time later for the
  1485             # revlog layer.
  1485             # revlog layer.
  1486 
  1486 
  1487             _checkforbidden(added)
  1487             _checkforbidden(added)
  1488             # combine the changed lists into one sorted iterator
  1488             # combine the changed lists into one sorted iterator
  1489             work = heapq.merge([(x, False) for x in added],
  1489             work = heapq.merge([(x, False) for x in sorted(added)],
  1490                                [(x, True) for x in removed])
  1490                                [(x, True) for x in sorted(removed)])
  1491 
  1491 
  1492             arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
  1492             arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
  1493             cachedelta = self._revlog.rev(p1), deltatext
  1493             cachedelta = self._revlog.rev(p1), deltatext
  1494             text = util.buffer(arraytext)
  1494             text = util.buffer(arraytext)
  1495             n = self._revlog.addrevision(text, transaction, link, p1, p2,
  1495             n = self._revlog.addrevision(text, transaction, link, p1, p2,