##// END OF EJS Templates
verify: reference the correct linkrev when a filelog is missing...
Benoit Boissinot -
r8292:29540554 default
parent child Browse files
Show More
@@ -52,9 +52,9 b' def _verify(repo):'
52 ui.warn(msg + "\n")
52 ui.warn(msg + "\n")
53 warnings[0] += 1
53 warnings[0] += 1
54
54
55 def checklog(obj, name):
55 def checklog(obj, name, linkrev):
56 if not len(obj) and (havecl or havemf):
56 if not len(obj) and (havecl or havemf):
57 err(0, _("empty or missing %s") % name)
57 err(linkrev, _("empty or missing %s") % name)
58 return
58 return
59
59
60 d = obj.checksize()
60 d = obj.checksize()
@@ -107,7 +107,7 b' def _verify(repo):'
107
107
108 ui.status(_("checking changesets\n"))
108 ui.status(_("checking changesets\n"))
109 seen = {}
109 seen = {}
110 checklog(cl, "changelog")
110 checklog(cl, "changelog", 0)
111 for i in repo:
111 for i in repo:
112 n = cl.node(i)
112 n = cl.node(i)
113 checkentry(cl, i, n, seen, [i], "changelog")
113 checkentry(cl, i, n, seen, [i], "changelog")
@@ -122,7 +122,7 b' def _verify(repo):'
122
122
123 ui.status(_("checking manifests\n"))
123 ui.status(_("checking manifests\n"))
124 seen = {}
124 seen = {}
125 checklog(mf, "manifest")
125 checklog(mf, "manifest", 0)
126 for i in mf:
126 for i in mf:
127 n = mf.node(i)
127 n = mf.node(i)
128 lr = checkentry(mf, i, n, seen, mflinkrevs.get(n, []), "manifest")
128 lr = checkentry(mf, i, n, seen, mflinkrevs.get(n, []), "manifest")
@@ -196,7 +196,7 b' def _verify(repo):'
196 except KeyError:
196 except KeyError:
197 err(lr, _("missing revlog!"), ff)
197 err(lr, _("missing revlog!"), ff)
198
198
199 checklog(fl, f)
199 checklog(fl, f, lr)
200 seen = {}
200 seen = {}
201 for i in fl:
201 for i in fl:
202 revisions += 1
202 revisions += 1
@@ -64,12 +64,12 b' crosschecking files in changesets and ma'
64 c@2: in changeset but not in manifest
64 c@2: in changeset but not in manifest
65 checking files
65 checking files
66 data/b.i@1: missing revlog!
66 data/b.i@1: missing revlog!
67 0: empty or missing b
67 1: empty or missing b
68 data/c.i@2: missing revlog!
68 data/c.i@2: missing revlog!
69 0: empty or missing c
69 2: empty or missing c
70 3 files, 3 changesets, 1 total revisions
70 3 files, 3 changesets, 1 total revisions
71 8 integrity errors encountered!
71 8 integrity errors encountered!
72 (first damaged changeset appears to be 0)
72 (first damaged changeset appears to be 1)
73 % journal contents
73 % journal contents
74 00changelog.i
74 00changelog.i
75 00manifest.i
75 00manifest.i
General Comments 0
You need to be logged in to leave comments. Login now