← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Martin Pool
  • Date: 2005-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
72
72
    :param inv_id:  The inventory id for this inventory
73
73
    :param branch:  The Branch where this entry will be stored.
74
74
    """
75
 
    raise NotImplementedError("can't update existing inventory entry")
 
75
    _update_store_entry(inv, inv_id, branch,
 
76
            'inventory-store', branch.inventory_store)
76
77
 
77
78
 
78
79
def check(branch):
154
155
                                    "by {%s}"
155
156
                                    % (rev_id, last_rev_id))
156
157
 
157
 
            if hasattr(rev, 'inventory_id') and rev.inventory_id != rev_id:
 
158
            if rev.inventory_id != rev_id:
158
159
                mismatch_inv_id.append(rev_id)
159
160
 
160
161
            ## TODO: Check all the required fields are present on the revision.
161
162
 
162
163
            if rev.inventory_sha1:
163
 
                inv_sha1 = branch.get_inventory_sha1(rev_id)
 
164
                inv_sha1 = branch.get_inventory_sha1(rev.inventory_id)
164
165
                if inv_sha1 != rev.inventory_sha1:
165
166
                    raise BzrCheckError('Inventory sha1 hash doesn\'t match'
166
167
                        ' value in revision {%s}' % rev_id)
168
169
                missing_inventory_sha_cnt += 1
169
170
                mutter("no inventory_sha1 on revision {%s}" % rev_id)
170
171
 
171
 
            inv = branch.get_inventory(rev_id)
 
172
            inv = branch.get_inventory(rev.inventory_id)
172
173
            seen_ids = {}
173
174
            seen_names = {}
174
175
 
238
239
    if missing_revision_cnt:
239
240
        note('%d revisions are mentioned but not present' % missing_revision_cnt)
240
241
 
241
 
    if missing_revision_cnt:
242
 
        print '%d revisions are mentioned but not present' % missing_revision_cnt
243
 
 
244
242
    # stub this out for now because the main bzr branch has references
245
243
    # to revisions that aren't present in the store -- mbp 20050804
246
244
#    if (missing_inventory_sha_cnt