##// END OF EJS Templates
verify: use similar language for missing manifest and file revisions...
Martin von Zweigbergk -
r28114:2a03a365 default
parent child Browse files
Show More
@@ -371,8 +371,8 b' class verifier(object):'
371 if f in filenodes:
371 if f in filenodes:
372 fns = [(lr, n) for n, lr in filenodes[f].iteritems()]
372 fns = [(lr, n) for n, lr in filenodes[f].iteritems()]
373 for lr, node in sorted(fns):
373 for lr, node in sorted(fns):
374 self.err(lr, _("%s in manifests not found") % short(node),
374 self.err(lr, _("manifest refers to unknown revision %s") %
375 f)
375 short(node), f)
376 ui.progress(_('checking'), None)
376 ui.progress(_('checking'), None)
377
377
378 for f in storefiles:
378 for f in storefiles:
@@ -72,7 +72,7 b' Expected to fail:'
72 checking manifests
72 checking manifests
73 crosschecking files in changesets and manifests
73 crosschecking files in changesets and manifests
74 checking files
74 checking files
75 beta@1: dddc47b3ba30 in manifests not found
75 beta@1: manifest refers to unknown revision dddc47b3ba30
76 2 files, 2 changesets, 2 total revisions
76 2 files, 2 changesets, 2 total revisions
77 1 integrity errors encountered!
77 1 integrity errors encountered!
78 (first damaged changeset appears to be 1)
78 (first damaged changeset appears to be 1)
@@ -46,13 +46,13 b' introduce some bugs in repo'
46 checking files
46 checking files
47 warning: revlog 'data/FOO.txt.i' not in fncache!
47 warning: revlog 'data/FOO.txt.i' not in fncache!
48 0: empty or missing FOO.txt
48 0: empty or missing FOO.txt
49 FOO.txt@0: f62022d3d590 in manifests not found
49 FOO.txt@0: manifest refers to unknown revision f62022d3d590
50 warning: revlog 'data/QUICK.txt.i' not in fncache!
50 warning: revlog 'data/QUICK.txt.i' not in fncache!
51 0: empty or missing QUICK.txt
51 0: empty or missing QUICK.txt
52 QUICK.txt@0: 88b857db8eba in manifests not found
52 QUICK.txt@0: manifest refers to unknown revision 88b857db8eba
53 warning: revlog 'data/bar.txt.i' not in fncache!
53 warning: revlog 'data/bar.txt.i' not in fncache!
54 0: empty or missing bar.txt
54 0: empty or missing bar.txt
55 bar.txt@0: 256559129457 in manifests not found
55 bar.txt@0: manifest refers to unknown revision 256559129457
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 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
@@ -102,8 +102,8 b' Entire filelog missing'
102 $ hg verify -q
102 $ hg verify -q
103 warning: revlog 'data/file.i' not in fncache!
103 warning: revlog 'data/file.i' not in fncache!
104 0: empty or missing file
104 0: empty or missing file
105 file@0: 362fef284ce2 in manifests not found
105 file@0: manifest refers to unknown revision 362fef284ce2
106 file@1: c10f2164107d in manifests not found
106 file@1: manifest refers to unknown revision c10f2164107d
107 1 warnings encountered!
107 1 warnings encountered!
108 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
108 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
109 3 integrity errors encountered!
109 3 integrity errors encountered!
@@ -130,8 +130,8 b' Entire changelog and filelog missing'
130 manifest@1: 941fc4534185 not in changesets
130 manifest@1: 941fc4534185 not in changesets
131 warning: revlog 'data/file.i' not in fncache!
131 warning: revlog 'data/file.i' not in fncache!
132 ?: empty or missing file
132 ?: empty or missing file
133 file@0: 362fef284ce2 in manifests not found
133 file@0: manifest refers to unknown revision 362fef284ce2
134 file@1: c10f2164107d in manifests not found
134 file@1: manifest refers to unknown revision c10f2164107d
135 1 warnings encountered!
135 1 warnings encountered!
136 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
136 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
137 6 integrity errors encountered!
137 6 integrity errors encountered!
@@ -182,7 +182,7 b' Filelog missing entry'
182
182
183 $ cp -f .hg/store-partial/data/file.* .hg/store/data
183 $ cp -f .hg/store-partial/data/file.* .hg/store/data
184 $ hg verify -q
184 $ hg verify -q
185 file@1: c10f2164107d in manifests not found
185 file@1: manifest refers to unknown revision c10f2164107d
186 1 integrity errors encountered!
186 1 integrity errors encountered!
187 (first damaged changeset appears to be 1)
187 (first damaged changeset appears to be 1)
188 [1]
188 [1]
@@ -208,7 +208,7 b' Changelog and filelog missing entry'
208 $ hg verify -q
208 $ hg verify -q
209 manifest@?: rev 1 points to nonexistent changeset 1
209 manifest@?: rev 1 points to nonexistent changeset 1
210 manifest@?: 941fc4534185 not in changesets
210 manifest@?: 941fc4534185 not in changesets
211 file@?: c10f2164107d in manifests not found
211 file@?: manifest refers to unknown revision c10f2164107d
212 3 integrity errors encountered!
212 3 integrity errors encountered!
213 [1]
213 [1]
214 $ cp -r .hg/store-full/* .hg/store
214 $ cp -r .hg/store-full/* .hg/store
General Comments 0
You need to be logged in to leave comments. Login now