← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-04 15:29:17 UTC
  • mfrom: (2961 +trunk)
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071104152917-nrsumxpk3dikso2c
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
78
78
            for property in self.properties:
79
79
                key_end = property.find(': ')
80
80
                if key_end == -1:
81
 
                    if not property.endswith(':'):
82
 
                        raise ValueError(property)
 
81
                    assert property.endswith(':')
83
82
                    key = str(property[:-1])
84
83
                    value = ''
85
84
                else:
197
196
    def revision_tree(self, repository, revision_id, base=None):
198
197
        revision = self.get_revision(revision_id)
199
198
        base = self.get_base(revision)
200
 
        if base == revision_id:
201
 
            raise AssertionError()
 
199
        assert base != revision_id
202
200
        if not self._validated_revisions_against_repo:
203
201
            self._validate_references_from_repository(repository)
204
202
        revision_info = self.get_revision_info(revision_id)
262
260
            elif revision_id not in checked:
263
261
                missing[revision_id] = sha1
264
262
 
 
263
        for inv_id, sha1 in inv_to_sha.iteritems():
 
264
            if repository.has_revision(inv_id):
 
265
                # Note: branch.get_inventory_sha1() just returns the value that
 
266
                # is stored in the revision text, and that value may be out
 
267
                # of date. This is bogus, because that means we aren't
 
268
                # validating the actual text, just that we wrote and read the
 
269
                # string. But for now, what the hell.
 
270
                local_sha1 = repository.get_inventory_sha1(inv_id)
 
271
                if sha1 != local_sha1:
 
272
                    raise BzrError('sha1 mismatch. For inventory id {%s}' 
 
273
                                   'local: %s, bundle: %s' % 
 
274
                                   (inv_id, local_sha1, sha1))
 
275
                else:
 
276
                    count += 1
 
277
 
265
278
        if len(missing) > 0:
266
279
            # I don't know if this is an error yet
267
280
            warning('Not all revision hashes could be validated.'
273
286
        """At this point we should have generated the BundleTree,
274
287
        so build up an inventory, and make sure the hashes match.
275
288
        """
 
289
 
 
290
        assert inv is not None
 
291
 
276
292
        # Now we should have a complete inventory entry.
277
293
        s = serializer_v5.write_inventory_to_string(inv)
278
294
        sha1 = sha_string(s)
279
295
        # Target revision is the last entry in the real_revisions list
280
296
        rev = self.get_revision(revision_id)
281
 
        if rev.revision_id != revision_id:
282
 
            raise AssertionError()
 
297
        assert rev.revision_id == revision_id
283
298
        if sha1 != rev.inventory_sha1:
284
299
            open(',,bogus-inv', 'wb').write(s)
285
300
            warning('Inventory sha hash mismatch for revision %s. %s'
293
308
        
294
309
        rev = self.get_revision(revision_id)
295
310
        rev_info = self.get_revision_info(revision_id)
296
 
        if not (rev.revision_id == rev_info.revision_id):
297
 
            raise AssertionError()
298
 
        if not (rev.revision_id == revision_id):
299
 
            raise AssertionError()
 
311
        assert rev.revision_id == rev_info.revision_id
 
312
        assert rev.revision_id == revision_id
300
313
        sha1 = self._testament_sha1(rev, inventory)
301
314
        if sha1 != rev_info.sha1:
302
315
            raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
334
347
                if name == 'last-changed':
335
348
                    last_changed = value
336
349
                elif name == 'executable':
 
350
                    assert value in ('yes', 'no'), value
337
351
                    val = (value == 'yes')
338
352
                    bundle_tree.note_executable(new_path, val)
339
353
                elif name == 'target':
343
357
            return last_changed, encoding
344
358
 
345
359
        def do_patch(path, lines, encoding):
346
 
            if encoding == 'base64':
 
360
            if encoding is not None:
 
361
                assert encoding == 'base64'
347
362
                patch = base64.decodestring(''.join(lines))
348
 
            elif encoding is None:
 
363
            else:
349
364
                patch =  ''.join(lines)
350
 
            else:
351
 
                raise ValueError(encoding)
352
365
            bundle_tree.note_patch(path, patch)
353
366
 
354
367
        def renamed(kind, extra, lines):
482
495
 
483
496
    def note_rename(self, old_path, new_path):
484
497
        """A file/directory has been renamed from old_path => new_path"""
485
 
        if new_path in self._renamed:
486
 
            raise AssertionError(new_path)
487
 
        if old_path in self._renamed_r:
488
 
            raise AssertionError(old_path)
 
498
        assert new_path not in self._renamed
 
499
        assert old_path not in self._renamed_r
489
500
        self._renamed[new_path] = old_path
490
501
        self._renamed_r[old_path] = new_path
491
502
 
521
532
 
522
533
    def old_path(self, new_path):
523
534
        """Get the old_path (path in the base_tree) for the file at new_path"""
524
 
        if new_path[:1] in ('\\', '/'):
525
 
            raise ValueError(new_path)
 
535
        assert new_path[:1] not in ('\\', '/')
526
536
        old_path = self._renamed.get(new_path)
527
537
        if old_path is not None:
528
538
            return old_path
548
558
        """Get the new_path (path in the target_tree) for the file at old_path
549
559
        in the base tree.
550
560
        """
551
 
        if old_path[:1] in ('\\', '/'):
552
 
            raise ValueError(old_path)
 
561
        assert old_path[:1] not in ('\\', '/')
553
562
        new_path = self._renamed_r.get(old_path)
554
563
        if new_path is not None:
555
564
            return new_path
628
637
            if (patch_original is None and 
629
638
                self.get_kind(file_id) == 'directory'):
630
639
                return StringIO()
631
 
            if patch_original is None:
632
 
                raise AssertionError("None: %s" % file_id)
 
640
            assert patch_original is not None, "None: %s" % file_id
633
641
            return patch_original
634
642
 
635
 
        if file_patch.startswith('\\'):
636
 
            raise ValueError(
637
 
                'Malformed patch for %s, %r' % (file_id, file_patch))
 
643
        assert not file_patch.startswith('\\'), \
 
644
            'Malformed patch for %s, %r' % (file_id, file_patch)
638
645
        return patched_file(file_patch, patch_original)
639
646
 
640
647
    def get_symlink_target(self, file_id):
687
694
        This need to be called before ever accessing self.inventory
688
695
        """
689
696
        from os.path import dirname, basename
 
697
 
 
698
        assert self.base_tree is not None
690
699
        base_inv = self.base_tree.inventory
691
700
        inv = Inventory(None, self.revision_id)
692
701