comparison mercurial/verify.py @ 28115:bd279da57e4b

verify: extract "manifest" constant into variable

The "manifest" label that's used in error messages will instead be the
directory path for subdirectory manifests (not the root manifest), so
let's extract the constant to a variable already to make future
patches simpler.

28114:2a03a365f645

        mf = self.repo.manifest

        ui.status(_("checking manifests\n"))
        filenodes = {}
        seen = {}
        if self.refersmf:
            # Do not check manifest if there are only changelog entries with
            # null manifests.
            self.checklog(mf, "manifest", 0)
        total = len(mf)
        for i in mf:
            ui.progress(_('checking'), i, total=total, unit=_('manifests'))
            n = mf.node(i)
            lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []),
                                 "manifest")
            if n in mflinkrevs:
                del mflinkrevs[n]
            else:
                self.err(lr, _("%s not in changesets") % short(n), "manifest")

            try:
                for f, fn in mf.readdelta(n).iteritems():
                    if not f:
                        self.err(lr, _("file without name in manifest"))
                    elif f != "/dev/null": # ignore this in very old repos
                        if _validpath(repo, f):
                            filenodes.setdefault(
                                _normpath(f), {}).setdefault(fn, lr)
            except Exception as inst:
                self.exc(lr, _("reading delta %s") % short(n), inst)
        ui.progress(_('checking'), None)

        if self.havemf:
            for c, m in sorted([(c, m) for m in mflinkrevs
                        for c in mflinkrevs[m]]):
                self.err(c, _("changeset refers to unknown revision %s") %
                         short(m), "manifest")

        return filenodes

    def _crosscheckfiles(self, filelinkrevs, filenodes):
        repo = self.repo

28115:bd279da57e4b

        mf = self.repo.manifest

        ui.status(_("checking manifests\n"))
        filenodes = {}
        seen = {}
        label = "manifest"
        if self.refersmf:
            # Do not check manifest if there are only changelog entries with
            # null manifests.
            self.checklog(mf, label, 0)
        total = len(mf)
        for i in mf:
            ui.progress(_('checking'), i, total=total, unit=_('manifests'))
            n = mf.node(i)
            lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []), label)
            if n in mflinkrevs:
                del mflinkrevs[n]
            else:
                self.err(lr, _("%s not in changesets") % short(n), label)

            try:
                for f, fn in mf.readdelta(n).iteritems():
                    if not f:
                        self.err(lr, _("file without name in manifest"))
                    elif f != "/dev/null": # ignore this in very old repos
                        if _validpath(repo, f):
                            filenodes.setdefault(
                                _normpath(f), {}).setdefault(fn, lr)
            except Exception as inst:
                self.exc(lr, _("reading delta %s") % short(n), inst, label)
        ui.progress(_('checking'), None)

        if self.havemf:
            for c, m in sorted([(c, m) for m in mflinkrevs
                        for c in mflinkrevs[m]]):
                self.err(c, _("changeset refers to unknown revision %s") %
                         short(m), label)

        return filenodes

    def _crosscheckfiles(self, filelinkrevs, filenodes):
        repo = self.repo