mercurial/verify.py
changeset 30295 f65faa4422c8
parent 28467 bd37f0d53a49
child 30375 11b8b740d54a
equal deleted inserted replaced
30294:bce79dfcf5e4 30295:f65faa4422c8
   199 
   199 
   200     def _verifymanifest(self, mflinkrevs, dir="", storefiles=None,
   200     def _verifymanifest(self, mflinkrevs, dir="", storefiles=None,
   201                         progress=None):
   201                         progress=None):
   202         repo = self.repo
   202         repo = self.repo
   203         ui = self.ui
   203         ui = self.ui
   204         mf = self.repo.manifest.dirlog(dir)
   204         mfl = self.repo.manifestlog
       
   205         mf = mfl._revlog.dirlog(dir)
   205 
   206 
   206         if not dir:
   207         if not dir:
   207             self.ui.status(_("checking manifests\n"))
   208             self.ui.status(_("checking manifests\n"))
   208 
   209 
   209         filenodes = {}
   210         filenodes = {}
   233                          short(n), label)
   234                          short(n), label)
   234             else:
   235             else:
   235                 self.err(lr, _("%s not in changesets") % short(n), label)
   236                 self.err(lr, _("%s not in changesets") % short(n), label)
   236 
   237 
   237             try:
   238             try:
   238                 for f, fn, fl in mf.readshallowdelta(n).iterentries():
   239                 mfdelta = mfl.get(dir, n).readdelta(shallow=True)
       
   240                 for f, fn, fl in mfdelta.iterentries():
   239                     if not f:
   241                     if not f:
   240                         self.err(lr, _("entry without name in manifest"))
   242                         self.err(lr, _("entry without name in manifest"))
   241                     elif f == "/dev/null":  # ignore this in very old repos
   243                     elif f == "/dev/null":  # ignore this in very old repos
   242                         continue
   244                         continue
   243                     fullpath = dir + _normpath(f)
   245                     fullpath = dir + _normpath(f)