/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/changeset/read_changeset.py

  • Committer: Aaron Bentley
  • Date: 2006-05-25 16:40:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060525164018-bcd2286b694eb8a1
Ensure that StrictTestament handles execute bit differences

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset/read_changeset.py
9
9
import pprint
10
10
from sha import sha
11
11
 
12
 
from bzrlib.errors import BzrError
 
12
from bzrlib.errors import TestamentMismatch
13
13
from bzrlib.changeset.common import (decode, get_header, header_str,
14
14
                                     testament_sha1)
15
15
from bzrlib.inventory import (Inventory, InventoryEntry,
227
227
        assert rev.revision_id == revision_id
228
228
        sha1 = sha(StrictTestament(rev, inventory).as_short_text()).hexdigest()
229
229
        if sha1 != rev_info.sha1:
230
 
            raise BzrError('Revision checksum mismatch.'
231
 
                ' For revision_id {%s} supplied sha1 (%s) != measured (%s)'
232
 
                % (rev.revision_id, rev_info.sha1, sha1))
 
230
            raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
233
231
        if rev_to_sha1.has_key(rev.revision_id):
234
232
            raise BzrError('Revision {%s} given twice in the list'
235
233
                    % (rev.revision_id))