Show More
@@ -219,6 +219,7 b' def _verify(repo):' | |||||
219 | elif size > 0 or not revlogv1: |
|
219 | elif size > 0 or not revlogv1: | |
220 | storefiles.add(_normpath(f)) |
|
220 | storefiles.add(_normpath(f)) | |
221 |
|
221 | |||
|
222 | fncachewarned = False | |||
222 | files = sorted(set(filenodes) | set(filelinkrevs)) |
|
223 | files = sorted(set(filenodes) | set(filelinkrevs)) | |
223 | total = len(files) |
|
224 | total = len(files) | |
224 | for i, f in enumerate(files): |
|
225 | for i, f in enumerate(files): | |
@@ -245,6 +246,7 b' def _verify(repo):' | |||||
245 | storefiles.remove(ff) |
|
246 | storefiles.remove(ff) | |
246 | except KeyError: |
|
247 | except KeyError: | |
247 | warn(_(" warning: revlog '%s' not in fncache!") % ff) |
|
248 | warn(_(" warning: revlog '%s' not in fncache!") % ff) | |
|
249 | fncachewarned = True | |||
248 |
|
250 | |||
249 | checklog(fl, f, lr) |
|
251 | checklog(fl, f, lr) | |
250 | seen = {} |
|
252 | seen = {} | |
@@ -313,6 +315,9 b' def _verify(repo):' | |||||
313 | (len(files), len(cl), revisions)) |
|
315 | (len(files), len(cl), revisions)) | |
314 | if warnings[0]: |
|
316 | if warnings[0]: | |
315 | ui.warn(_("%d warnings encountered!\n") % warnings[0]) |
|
317 | ui.warn(_("%d warnings encountered!\n") % warnings[0]) | |
|
318 | if fncachewarned: | |||
|
319 | ui.warn(_('hint: run "hg debugrebuildfncache" to recover from ' | |||
|
320 | 'corrupt fncache\n')) | |||
316 | if errors[0]: |
|
321 | if errors[0]: | |
317 | ui.warn(_("%d integrity errors encountered!\n") % errors[0]) |
|
322 | ui.warn(_("%d integrity errors encountered!\n") % errors[0]) | |
318 | if badrevs: |
|
323 | if badrevs: |
@@ -53,6 +53,23 b' Testing verify:' | |||||
53 | warning: revlog 'data/a.i/b.i' not in fncache! |
|
53 | warning: revlog 'data/a.i/b.i' not in fncache! | |
54 | 3 files, 3 changesets, 3 total revisions |
|
54 | 3 files, 3 changesets, 3 total revisions | |
55 | 3 warnings encountered! |
|
55 | 3 warnings encountered! | |
|
56 | hint: run "hg debugrebuildfncache" to recover from corrupt fncache | |||
|
57 | ||||
|
58 | Follow the hint to make sure it works | |||
|
59 | ||||
|
60 | $ hg debugrebuildfncache | |||
|
61 | adding data/a.i | |||
|
62 | adding data/a.i.hg/c.i | |||
|
63 | adding data/a.i/b.i | |||
|
64 | 3 items added, 0 removed from fncache | |||
|
65 | ||||
|
66 | $ hg verify | |||
|
67 | checking changesets | |||
|
68 | checking manifests | |||
|
69 | crosschecking files in changesets and manifests | |||
|
70 | checking files | |||
|
71 | 3 files, 3 changesets, 3 total revisions | |||
|
72 | ||||
56 | $ cd .. |
|
73 | $ cd .. | |
57 |
|
74 | |||
58 | Non store repo: |
|
75 | Non store repo: |
@@ -55,6 +55,7 b' introduce some bugs in repo' | |||||
55 | bar.txt@0: 256559129457 in manifests not found |
|
55 | bar.txt@0: 256559129457 in manifests not found | |
56 | 3 files, 1 changesets, 0 total revisions |
|
56 | 3 files, 1 changesets, 0 total revisions | |
57 | 3 warnings encountered! |
|
57 | 3 warnings encountered! | |
|
58 | hint: run "hg debugrebuildfncache" to recover from corrupt fncache | |||
58 | 6 integrity errors encountered! |
|
59 | 6 integrity errors encountered! | |
59 | (first damaged changeset appears to be 0) |
|
60 | (first damaged changeset appears to be 0) | |
60 | [1] |
|
61 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now