| pulkit |
| hg-reviewers |
I also reworded a variable to make it clearer that it's only used for
subdirectories.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/verify.py (18 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| filelinkrevs.setdefault(_normpath(f), []).append(i) | filelinkrevs.setdefault(_normpath(f), []).append(i) | ||||
| except Exception as inst: | except Exception as inst: | ||||
| self.refersmf = True | self.refersmf = True | ||||
| self.exc(i, _("unpacking changeset %s") % short(n), inst) | self.exc(i, _("unpacking changeset %s") % short(n), inst) | ||||
| ui.progress(_('checking'), None) | ui.progress(_('checking'), None) | ||||
| return mflinkrevs, filelinkrevs | return mflinkrevs, filelinkrevs | ||||
| def _verifymanifest(self, mflinkrevs, dir="", storefiles=None, | def _verifymanifest(self, mflinkrevs, dir="", storefiles=None, | ||||
| progress=None): | subdirprogress=None): | ||||
| repo = self.repo | repo = self.repo | ||||
| ui = self.ui | ui = self.ui | ||||
| match = self.match | match = self.match | ||||
| mfl = self.repo.manifestlog | mfl = self.repo.manifestlog | ||||
| mf = mfl._revlog.dirlog(dir) | mf = mfl._revlog.dirlog(dir) | ||||
| if not dir: | if not dir: | ||||
| self.ui.status(_("checking manifests\n")) | self.ui.status(_("checking manifests\n")) | ||||
| filenodes = {} | filenodes = {} | ||||
| subdirnodes = {} | subdirnodes = {} | ||||
| seen = {} | seen = {} | ||||
| label = "manifest" | label = "manifest" | ||||
| if dir: | if dir: | ||||
| label = dir | label = dir | ||||
| revlogfiles = mf.files() | revlogfiles = mf.files() | ||||
| storefiles.difference_update(revlogfiles) | storefiles.difference_update(revlogfiles) | ||||
| if progress: # should be true since we're in a subdirectory | if subdirprogress: # should be true since we're in a subdirectory | ||||
| progress() | subdirprogress.increment() | ||||
| if self.refersmf: | if self.refersmf: | ||||
| # Do not check manifest if there are only changelog entries with | # Do not check manifest if there are only changelog entries with | ||||
| # null manifests. | # null manifests. | ||||
| self.checklog(mf, label, 0) | self.checklog(mf, label, 0) | ||||
| total = len(mf) | total = len(mf) | ||||
| for i in mf: | for i in mf: | ||||
| if not dir: | if not dir: | ||||
| ui.progress(_('checking'), i, total=total, unit=_('manifests')) | ui.progress(_('checking'), i, total=total, unit=_('manifests')) | ||||
| subdirs = set() | subdirs = set() | ||||
| revlogv1 = self.revlogv1 | revlogv1 = self.revlogv1 | ||||
| for f, f2, size in repo.store.datafiles(): | for f, f2, size in repo.store.datafiles(): | ||||
| if not f: | if not f: | ||||
| self.err(None, _("cannot decode filename '%s'") % f2) | self.err(None, _("cannot decode filename '%s'") % f2) | ||||
| elif (size > 0 or not revlogv1) and f.startswith('meta/'): | elif (size > 0 or not revlogv1) and f.startswith('meta/'): | ||||
| storefiles.add(_normpath(f)) | storefiles.add(_normpath(f)) | ||||
| subdirs.add(os.path.dirname(f)) | subdirs.add(os.path.dirname(f)) | ||||
| subdircount = len(subdirs) | subdirprogress = ui.makeprogress(_('checking'), unit=_('manifests'), | ||||
| currentsubdir = [0] | total=len(subdirs)) | ||||
| def progress(): | |||||
| currentsubdir[0] += 1 | |||||
| ui.progress(_('checking'), currentsubdir[0], total=subdircount, | |||||
| unit=_('manifests')) | |||||
| for subdir, linkrevs in subdirnodes.iteritems(): | for subdir, linkrevs in subdirnodes.iteritems(): | ||||
| subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles, | subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles, | ||||
| progress) | subdirprogress) | ||||
| for f, onefilenodes in subdirfilenodes.iteritems(): | for f, onefilenodes in subdirfilenodes.iteritems(): | ||||
| filenodes.setdefault(f, {}).update(onefilenodes) | filenodes.setdefault(f, {}).update(onefilenodes) | ||||
| if not dir and subdirnodes: | if not dir and subdirnodes: | ||||
| ui.progress(_('checking'), None) | subdirprogress.complete() | ||||
| if self.warnorphanstorefiles: | if self.warnorphanstorefiles: | ||||
| for f in sorted(storefiles): | for f in sorted(storefiles): | ||||
| self.warn(_("warning: orphan data file '%s'") % f) | self.warn(_("warning: orphan data file '%s'") % f) | ||||
| return filenodes | return filenodes | ||||
| def _crosscheckfiles(self, filelinkrevs, filenodes): | def _crosscheckfiles(self, filelinkrevs, filenodes): | ||||
| repo = self.repo | repo = self.repo | ||||