16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
def _update_store_entry(obj, obj_id, branch, store_name, store):
20
"""This is just a meta-function, which handles both revision entries
21
and inventory entries.
23
from bzrlib.trace import mutter
24
import tempfile, os, errno
25
from osutils import rename
26
obj_tmp = tempfile.TemporaryFile()
27
obj.write_xml(obj_tmp)
30
tmpfd, tmp_path = tempfile.mkstemp(prefix=obj_id, suffix='.gz',
31
dir=branch.controlfilename(store_name))
34
orig_obj_path = branch.controlfilename([store_name, obj_id+'.gz'])
35
# Remove the old entry out of the way
36
rename(orig_obj_path, tmp_path)
38
# TODO: We may need to handle the case where the old
39
# entry was not compressed (and thus did not end with .gz)
41
store.add(obj_tmp, obj_id) # Add the new one
42
os.remove(tmp_path) # Remove the old name
43
mutter(' Updated %s entry {%s}' % (store_name, obj_id))
45
# On any exception, restore the old entry
46
rename(tmp_path, orig_obj_path)
49
if os.path.exists(tmp_path):
50
# Unfortunately, the next command might throw
51
# an exception, which will mask a previous exception.
55
def _update_revision_entry(rev, branch):
56
"""After updating the values in a revision, make sure to
57
write out the data, but try to do it in an atomic manner.
59
:param rev: The Revision object to store
60
:param branch: The Branch object where this Revision is to be stored.
62
_update_store_entry(rev, rev.revision_id, branch,
63
'revision-store', branch.revision_store)
65
def _update_inventory_entry(inv, inv_id, branch):
66
"""When an inventory has been modified (such as by adding a unique tree root)
67
this atomically re-generates the file.
69
:param inv: The Inventory
70
:param inv_id: The inventory id for this inventory
71
:param branch: The Branch where this entry will be stored.
73
_update_store_entry(inv, inv_id, branch,
74
'inventory-store', branch.inventory_store)
21
def check(branch, update=False):
77
22
"""Run consistency checks on a branch.
79
TODO: Also check non-mainline revisions mentioned as parents.
81
TODO: Check for extra files in the control directory.
24
If update is True, for revisions missing certain information
25
(right now this is inventory_sha1 and revision_sha1),
26
update them to include the appropriate values.
83
30
from bzrlib.trace import mutter
84
31
from bzrlib.errors import BzrCheckError
85
32
from bzrlib.osutils import fingerprint_file
86
33
from bzrlib.progress import ProgressBar
87
from bzrlib.inventory import ROOT_ID
88
from bzrlib.branch import gen_root_id
93
44
pb = ProgressBar(show_spinner=True)
96
48
missing_inventory_sha_cnt = 0
97
missing_revision_sha_cnt = 0
99
50
history = branch.revision_history()
101
52
revcount = len(history)
104
# for all texts checked, text_id -> sha1
105
54
checked_texts = {}
107
for rev_id in 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
109
64
pb.update('checking revision', revno, revcount)
110
mutter(' revision {%s}' % rev_id)
111
rev = branch.get_revision(rev_id)
112
if rev.revision_id != rev_id:
113
raise BzrCheckError('wrong internal revision id in revision {%s}'
116
# check the previous history entry is a parent of this entry
118
if last_rev_id is None:
119
raise BzrCheckError("revision {%s} has %d parents, but is the "
120
"start of the branch"
121
% (rev_id, len(rev.parents)))
122
for prr in rev.parents:
123
if prr.revision_id == last_rev_id:
126
raise BzrCheckError("previous revision {%s} not listed among "
128
% (last_rev_id, rev_id))
130
for prr in rev.parents:
131
if prr.revision_sha1 is None:
132
missing_revision_sha_cnt += 1
134
prid = prr.revision_id
135
actual_sha = branch.get_revision_sha1(prid)
136
if prr.revision_sha1 != actual_sha:
137
raise BzrCheckError("mismatched revision sha1 for "
138
"parent {%s} of {%s}: %s vs %s"
140
prr.revision_sha1, actual_sha))
142
raise BzrCheckError("revision {%s} has no parents listed but preceded "
144
% (rev_id, last_rev_id))
146
if rev.inventory_id != rev_id:
147
mismatch_inv_id.append(rev_id)
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
149
76
## TODO: Check all the required fields are present on the revision.
151
79
if rev.inventory_sha1:
80
#mutter(' checking inventory hash {%s}' % rev.inventory_sha1)
152
81
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
153
82
if inv_sha1 != rev.inventory_sha1:
154
83
raise BzrCheckError('Inventory sha1 hash doesn\'t match'
155
' value in revision {%s}' % rev_id)
84
' value in revision {%s}' % rid)
86
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
87
rev.inventory_sha1 = inv_sha1
157
90
missing_inventory_sha_cnt += 1
158
mutter("no inventory_sha1 on revision {%s}" % rev_id)
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)
108
rev.precursor_sha1 = precursor_sha1
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
160
155
inv = branch.get_inventory(rev.inventory_id)
added
removed
bzrlib/check.py
