15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from bzrlib.trace import note, warning
21
def _update_store_entry(obj, obj_id, branch, store_name, store):
22
"""This is just a meta-function, which handles both revision entries
23
and inventory entries.
25
from bzrlib.trace import mutter
26
import tempfile, os, errno
27
from osutils import rename
28
obj_tmp = tempfile.TemporaryFile()
29
obj.write_xml(obj_tmp)
32
tmpfd, tmp_path = tempfile.mkstemp(prefix=obj_id, suffix='.gz',
33
dir=branch.controlfilename(store_name))
36
orig_obj_path = branch.controlfilename([store_name, obj_id+'.gz'])
37
# Remove the old entry out of the way
38
rename(orig_obj_path, tmp_path)
40
# TODO: We may need to handle the case where the old
41
# entry was not compressed (and thus did not end with .gz)
43
store.add(obj_tmp, obj_id) # Add the new one
44
os.remove(tmp_path) # Remove the old name
45
mutter(' Updated %s entry {%s}' % (store_name, obj_id))
47
# On any exception, restore the old entry
48
rename(tmp_path, orig_obj_path)
51
if os.path.exists(tmp_path):
52
# Unfortunately, the next command might throw
53
# an exception, which will mask a previous exception.
57
def _update_revision_entry(rev, branch):
58
"""After updating the values in a revision, make sure to
59
write out the data, but try to do it in an atomic manner.
61
:param rev: The Revision object to store
62
:param branch: The Branch object where this Revision is to be stored.
64
_update_store_entry(rev, rev.revision_id, branch,
65
'revision-store', branch.revision_store)
67
def _update_inventory_entry(inv, inv_id, branch):
68
"""When an inventory has been modified (such as by adding a unique tree root)
69
this atomically re-generates the file.
71
:param inv: The Inventory
72
:param inv_id: The inventory id for this inventory
73
:param branch: The Branch where this entry will be stored.
75
_update_store_entry(inv, inv_id, branch,
76
'inventory-store', branch.inventory_store)
21
def check(branch, update=False):
80
22
"""Run consistency checks on a branch.
82
TODO: Also check non-mainline revisions mentioned as parents.
84
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.
86
30
from bzrlib.trace import mutter
87
from bzrlib.errors import BzrCheckError, NoSuchRevision
31
from bzrlib.errors import BzrCheckError
88
32
from bzrlib.osutils import fingerprint_file
89
from bzrlib.inventory import ROOT_ID
90
from bzrlib.branch import gen_root_id
33
from bzrlib.progress import ProgressBar
44
pb = ProgressBar(show_spinner=True)
97
48
missing_inventory_sha_cnt = 0
98
missing_revision_sha_cnt = 0
99
missing_revision_cnt = 0
101
50
history = branch.revision_history()
103
52
revcount = len(history)
106
# for all texts checked, text_id -> sha1
107
54
checked_texts = {}
109
progress = bzrlib.ui.ui_factory.progress_bar()
111
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
113
progress.update('checking revision', revno, revcount)
114
# mutter(' revision {%s}' % rev_id)
115
rev = branch.get_revision(rev_id)
116
if rev.revision_id != rev_id:
117
raise BzrCheckError('wrong internal revision id in revision {%s}'
120
# check the previous history entry is a parent of this entry
122
if last_rev_id is None:
123
raise BzrCheckError("revision {%s} has %d parents, but is the "
124
"start of the branch"
125
% (rev_id, len(rev.parents)))
126
for prr in rev.parents:
127
if prr.revision_id == last_rev_id:
130
raise BzrCheckError("previous revision {%s} not listed among "
132
% (last_rev_id, rev_id))
134
for prr in rev.parents:
135
if prr.revision_sha1 is None:
136
missing_revision_sha_cnt += 1
138
prid = prr.revision_id
141
actual_sha = branch.get_revision_sha1(prid)
142
except NoSuchRevision:
143
missing_revision_cnt += 1
144
mutter("parent {%s} of {%s} not present in store",
148
if prr.revision_sha1 != actual_sha:
149
raise BzrCheckError("mismatched revision sha1 for "
150
"parent {%s} of {%s}: %s vs %s"
152
prr.revision_sha1, actual_sha))
154
raise BzrCheckError("revision {%s} has no parents listed but preceded "
156
% (rev_id, last_rev_id))
158
if rev.inventory_id != rev_id:
159
mismatch_inv_id.append(rev_id)
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
161
76
## TODO: Check all the required fields are present on the revision.
163
79
if rev.inventory_sha1:
80
#mutter(' checking inventory hash {%s}' % rev.inventory_sha1)
164
81
inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
165
82
if inv_sha1 != rev.inventory_sha1:
166
83
raise BzrCheckError('Inventory sha1 hash doesn\'t match'
167
' 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
169
90
missing_inventory_sha_cnt += 1
170
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
172
155
inv = branch.get_inventory(rev.inventory_id)
added
removed
bzrlib/check.py
