/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Martin Pool
  • Date: 2008-05-08 04:33:38 UTC
  • mfrom: (3414 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508043338-ru3vflx8z641a76k
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
262
262
            elif revision_id not in checked:
263
263
                missing[revision_id] = sha1
264
264
 
265
 
        for inv_id, sha1 in inv_to_sha.iteritems():
266
 
            if repository.has_revision(inv_id):
267
 
                # Note: branch.get_inventory_sha1() just returns the value that
268
 
                # is stored in the revision text, and that value may be out
269
 
                # of date. This is bogus, because that means we aren't
270
 
                # validating the actual text, just that we wrote and read the
271
 
                # string. But for now, what the hell.
272
 
                local_sha1 = repository.get_inventory_sha1(inv_id)
273
 
                if sha1 != local_sha1:
274
 
                    raise BzrError('sha1 mismatch. For inventory id {%s}' 
275
 
                                   'local: %s, bundle: %s' % 
276
 
                                   (inv_id, local_sha1, sha1))
277
 
                else:
278
 
                    count += 1
279
 
 
280
265
        if len(missing) > 0:
281
266
            # I don't know if this is an error yet
282
267
            warning('Not all revision hashes could be validated.'