31
31
from bzrlib.errors import BzrCheckError
32
32
from bzrlib.osutils import fingerprint_file
33
33
from bzrlib.progress import ProgressBar
37
pb = ProgressBar(show_spinner=True)
41
missing_inventory_sha_cnt = 0
43
history = branch.revision_history()
45
revcount = len(history)
49
updated_revisions = []
51
# Set to True in the case that the previous revision entry
52
# was updated, since this will affect future revision entries
53
updated_previous_revision = False
57
pb.update('checking revision', revno, revcount)
58
mutter(' revision {%s}' % rid)
59
rev = branch.get_revision(rid)
60
if rev.revision_id != rid:
61
raise BzrCheckError('wrong internal revision id in revision {%s}' % rid)
62
if rev.precursor != last_ptr:
63
raise BzrCheckError('mismatched precursor in revision {%s}' % rid)
65
if rid in checked_revs:
66
raise BzrCheckError('repeated revision {%s}' % rid)
67
checked_revs[rid] = True
69
## TODO: Check all the required fields are present on the revision.
72
if rev.inventory_sha1:
73
#mutter(' checking inventory hash {%s}' % rev.inventory_sha1)
74
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
75
if inv_sha1 != rev.inventory_sha1:
76
raise BzrCheckError('Inventory sha1 hash doesn\'t match'
77
' value in revision {%s}' % rid)
79
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
80
rev.inventory_sha1 = inv_sha1
83
missing_inventory_sha_cnt += 1
84
mutter("no inventory_sha1 on revision {%s}" % rid)
87
if rev.precursor_sha1:
88
precursor_sha1 = branch.get_revision_sha1(rev.precursor)
89
if updated_previous_revision:
90
# we don't expect the hashes to match, because
91
# we had to modify the previous revision_history entry.
44
pb = ProgressBar(show_spinner=True)
48
missing_inventory_sha_cnt = 0
50
history = branch.revision_history()
52
revcount = len(history)
56
updated_revisions = []
58
# Set to True in the case that the previous revision entry
59
# was updated, since this will affect future revision entries
60
updated_previous_revision = False
64
pb.update('checking revision', revno, revcount)
65
mutter(' revision {%s}' % rid)
66
rev = branch.get_revision(rid)
67
if rev.revision_id != rid:
68
raise BzrCheckError('wrong internal revision id in revision {%s}' % rid)
69
if rev.precursor != last_ptr:
70
raise BzrCheckError('mismatched precursor in revision {%s}' % rid)
72
if rid in checked_revs:
73
raise BzrCheckError('repeated revision {%s}' % rid)
74
checked_revs[rid] = True
76
## TODO: Check all the required fields are present on the revision.
79
if rev.inventory_sha1:
80
#mutter(' checking inventory hash {%s}' % rev.inventory_sha1)
81
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
82
if inv_sha1 != rev.inventory_sha1:
83
raise BzrCheckError('Inventory sha1 hash doesn\'t match'
84
' value in revision {%s}' % rid)
86
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
87
rev.inventory_sha1 = inv_sha1
90
missing_inventory_sha_cnt += 1
91
mutter("no inventory_sha1 on revision {%s}" % rid)
94
if rev.precursor_sha1:
95
precursor_sha1 = branch.get_revision_sha1(rev.precursor)
96
if updated_previous_revision:
97
# we don't expect the hashes to match, because
98
# we had to modify the previous revision_history entry.
99
rev.precursor_sha1 = precursor_sha1
102
#mutter(' checking precursor hash {%s}' % rev.precursor_sha1)
103
if rev.precursor_sha1 != precursor_sha1:
104
raise BzrCheckError('Precursor sha1 hash doesn\'t match'
105
' value in revision {%s}' % rid)
107
precursor_sha1 = branch.get_revision_sha1(rev.precursor)
92
108
rev.precursor_sha1 = precursor_sha1
95
#mutter(' checking precursor hash {%s}' % rev.precursor_sha1)
96
if rev.precursor_sha1 != precursor_sha1:
97
raise BzrCheckError('Precursor sha1 hash doesn\'t match'
98
' value in revision {%s}' % rid)
100
precursor_sha1 = branch.get_revision_sha1(rev.precursor)
101
rev.precursor_sha1 = precursor_sha1
105
updated_previous_revision = True
106
# We had to update this revision entries hashes
107
# Now we need to write out a new value
108
# This is a little bit invasive, since we are *rewriting* a
109
# revision entry. I'm not supremely happy about it, but
110
# there should be *some* way of making old entries have
111
# the full meta information.
112
import tempfile, os, errno
113
rev_tmp = tempfile.TemporaryFile()
114
rev.write_xml(rev_tmp)
117
tmpfd, tmp_path = tempfile.mkstemp(prefix=rid, suffix='.gz',
118
dir=branch.controlfilename('revision-store'))
120
def special_rename(p1, p2):
121
if sys.platform == 'win32':
125
if e.errno != e.ENOENT:
130
# TODO: We may need to handle the case where the old revision
131
# entry was not compressed (and thus did not end with .gz)
133
# Remove the old revision entry out of the way
134
rev_path = branch.controlfilename(['revision-store', rid+'.gz'])
135
special_rename(rev_path, tmp_path)
136
branch.revision_store.add(rev_tmp, rid) # Add the new one
137
os.remove(tmp_path) # Remove the old name
138
mutter(' Updated revision entry {%s}' % rid)
140
# On any exception, restore the old entry
141
special_rename(tmp_path, rev_path)
144
updated_revisions.append(rid)
146
updated_previous_revision = False
148
inv = branch.get_inventory(rev.inventory_id)
152
## p('revision %d/%d file ids' % (revno, revcount))
154
if file_id in seen_ids:
155
raise BzrCheckError('duplicated file_id {%s} '
156
'in inventory for revision {%s}'
158
seen_ids[file_id] = True
169
if ie.parent_id != None:
170
if ie.parent_id not in seen_ids:
171
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
172
% (ie.parent_id, rid))
174
if ie.kind == 'file':
175
if ie.text_id in checked_texts:
176
fp = checked_texts[ie.text_id]
178
if not ie.text_id in branch.text_store:
179
raise BzrCheckError('text {%s} not in text_store' % ie.text_id)
181
tf = branch.text_store[ie.text_id]
182
fp = fingerprint_file(tf)
183
checked_texts[ie.text_id] = fp
185
if ie.text_size != fp['size']:
186
raise BzrCheckError('text {%s} wrong size' % ie.text_id)
187
if ie.text_sha1 != fp['sha1']:
188
raise BzrCheckError('text {%s} wrong sha1' % ie.text_id)
189
elif ie.kind == 'directory':
190
if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
191
raise BzrCheckError('directory {%s} has text in revision {%s}'
195
for path, ie in inv.iter_entries():
196
if path in seen_names:
197
raise BzrCheckError('duplicated path %r '
198
'in inventory for revision {%s}'
112
updated_previous_revision = True
113
# We had to update this revision entries hashes
114
# Now we need to write out a new value
115
# This is a little bit invasive, since we are *rewriting* a
116
# revision entry. I'm not supremely happy about it, but
117
# there should be *some* way of making old entries have
118
# the full meta information.
119
import tempfile, os, errno
120
rev_tmp = tempfile.TemporaryFile()
121
rev.write_xml(rev_tmp)
124
tmpfd, tmp_path = tempfile.mkstemp(prefix=rid, suffix='.gz',
125
dir=branch.controlfilename('revision-store'))
127
def special_rename(p1, p2):
128
if sys.platform == 'win32':
132
if e.errno != e.ENOENT:
137
# TODO: We may need to handle the case where the old revision
138
# entry was not compressed (and thus did not end with .gz)
140
# Remove the old revision entry out of the way
141
rev_path = branch.controlfilename(['revision-store', rid+'.gz'])
142
special_rename(rev_path, tmp_path)
143
branch.revision_store.add(rev_tmp, rid) # Add the new one
144
os.remove(tmp_path) # Remove the old name
145
mutter(' Updated revision entry {%s}' % rid)
147
# On any exception, restore the old entry
148
special_rename(tmp_path, rev_path)
151
updated_revisions.append(rid)
153
updated_previous_revision = False
155
inv = branch.get_inventory(rev.inventory_id)
159
## p('revision %d/%d file ids' % (revno, revcount))
161
if file_id in seen_ids:
162
raise BzrCheckError('duplicated file_id {%s} '
163
'in inventory for revision {%s}'
165
seen_ids[file_id] = True
176
if ie.parent_id != None:
177
if ie.parent_id not in seen_ids:
178
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
179
% (ie.parent_id, rid))
181
if ie.kind == 'file':
182
if ie.text_id in checked_texts:
183
fp = checked_texts[ie.text_id]
185
if not ie.text_id in branch.text_store:
186
raise BzrCheckError('text {%s} not in text_store' % ie.text_id)
188
tf = branch.text_store[ie.text_id]
189
fp = fingerprint_file(tf)
190
checked_texts[ie.text_id] = fp
192
if ie.text_size != fp['size']:
193
raise BzrCheckError('text {%s} wrong size' % ie.text_id)
194
if ie.text_sha1 != fp['sha1']:
195
raise BzrCheckError('text {%s} wrong sha1' % ie.text_id)
196
elif ie.kind == 'directory':
197
if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
198
raise BzrCheckError('directory {%s} has text in revision {%s}'
202
for path, ie in inv.iter_entries():
203
if path in seen_names:
204
raise BzrCheckError('duplicated path %r '
205
'in inventory for revision {%s}'
200
207
seen_names[path] = True