421 subdirs.add(os.path.dirname(f)) |
421 subdirs.add(os.path.dirname(f)) |
422 subdirprogress = ui.makeprogress( |
422 subdirprogress = ui.makeprogress( |
423 _(b'checking'), unit=_(b'manifests'), total=len(subdirs) |
423 _(b'checking'), unit=_(b'manifests'), total=len(subdirs) |
424 ) |
424 ) |
425 |
425 |
426 for subdir, linkrevs in subdirnodes.iteritems(): |
426 for subdir, linkrevs in pycompat.iteritems(subdirnodes): |
427 subdirfilenodes = self._verifymanifest( |
427 subdirfilenodes = self._verifymanifest( |
428 linkrevs, subdir, storefiles, subdirprogress |
428 linkrevs, subdir, storefiles, subdirprogress |
429 ) |
429 ) |
430 for f, onefilenodes in subdirfilenodes.iteritems(): |
430 for f, onefilenodes in pycompat.iteritems(subdirfilenodes): |
431 filenodes.setdefault(f, {}).update(onefilenodes) |
431 filenodes.setdefault(f, {}).update(onefilenodes) |
432 |
432 |
433 if not dir and subdirnodes: |
433 if not dir and subdirnodes: |
434 subdirprogress.complete() |
434 subdirprogress.complete() |
435 if self.warnorphanstorefiles: |
435 if self.warnorphanstorefiles: |
606 lr, _(b"checking rename of %s") % short(n), inst, f |
606 lr, _(b"checking rename of %s") % short(n), inst, f |
607 ) |
607 ) |
608 |
608 |
609 # cross-check |
609 # cross-check |
610 if f in filenodes: |
610 if f in filenodes: |
611 fns = [(v, k) for k, v in filenodes[f].iteritems()] |
611 fns = [(v, k) for k, v in pycompat.iteritems(filenodes[f])] |
612 for lr, node in sorted(fns): |
612 for lr, node in sorted(fns): |
613 self._err( |
613 self._err( |
614 lr, |
614 lr, |
615 _(b"manifest refers to unknown revision %s") |
615 _(b"manifest refers to unknown revision %s") |
616 % short(node), |
616 % short(node), |