mercurial: comparison mercurial/verify.py

equal deleted inserted replaced

-:7297e9e13a8a
+:962921c330b0
 self.refersmf = True
 self.exc(i, _("unpacking changeset %s") % short(n), inst)
 ui.progress(_('checking'), None)
 return mflinkrevs, filelinkrevs
-def _verifymanifest(self, mflinkrevs, dir=""):
+def _verifymanifest(self, mflinkrevs, dir="", storefiles=None):
 repo = self.repo
 ui = self.ui
 mf = self.repo.manifest.dirlog(dir)
 if not dir:
 subdirnodes = {}
 seen = {}
 label = "manifest"
 if dir:
 label = dir
+revlogfiles = mf.files()
+storefiles.difference_update(revlogfiles)
 if self.refersmf:
 # Do not check manifest if there are only changelog entries with
 # null manifests.
 self.checklog(mf, label, 0)
 total = len(mf)
 self.err(c, _("changeset refers to unknown revision %s") %
 short(m), label)
 if not dir and subdirnodes:
 self.ui.status(_("checking directory manifests\n"))
+storefiles = set()
+revlogv1 = self.revlogv1
+for f, f2, size in repo.store.datafiles():
+if not f:
+self.err(None, _("cannot decode filename '%s'") % f2)
+elif (size > 0 or not revlogv1) and f.startswith('meta/'):
+storefiles.add(_normpath(f))
 for subdir, linkrevs in subdirnodes.iteritems():
-subdirfilenodes = self._verifymanifest(linkrevs, subdir)
+subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles)
 for f, onefilenodes in subdirfilenodes.iteritems():
 filenodes.setdefault(f, {}).update(onefilenodes)
+if not dir and subdirnodes:
+for f in sorted(storefiles):
+self.warn(_("warning: orphan revlog '%s'") % f)
 return filenodes
 def _crosscheckfiles(self, filelinkrevs, filenodes):
 repo = self.repo
 for lr, node in sorted(fns):
 self.err(lr, _("manifest refers to unknown revision %s") %
 short(node), f)
 ui.progress(_('checking'), None)
-for f in storefiles:
+for f in sorted(storefiles):
 self.warn(_("warning: orphan revlog '%s'") % f)
 return len(files), revisions

changeset 28204	962921c330b0
parent 28203	7297e9e13a8a
child 28205	53f42c8d5f71