← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset/read_changeset.py

  • Committer: Aaron Bentley
  • Date: 2006-05-14 00:38:58 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060514003858-0698218f821eaa02
Fixed most revision attribute handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset/read_changeset.py
55
55
        self.timezone = None
56
56
        self.inventory_sha1 = None
57
57
 
58
 
        self.parents = None
59
 
        self.parent_sha1s = {}
 
58
        self.parent_ids = None
60
59
        self.message = None
 
60
        self.properties = None
61
61
 
62
62
    def __str__(self):
63
63
        return pprint.pformat(self.__dict__)
411
411
        if key is None:
412
412
            return
413
413
 
414
 
        if key == 'revision':
 
414
        if key == 'revision_id':
415
415
            self._read_revision(value)
416
 
        elif hasattr(self.info, key):
417
 
            if getattr(self.info, key) is None:
418
 
                setattr(self.info, key, value)
 
416
        else:
 
417
            revision_info = self.info.revisions[-1]
 
418
            if hasattr(revision_info, key):
 
419
                if getattr(revision_info, key) is None:
 
420
                    setattr(revision_info, key, value)
 
421
                else:
 
422
                    raise MalformedHeader('Duplicated Key: %s' % key)
419
423
            else:
420
 
                raise MalformedHeader('Duplicated Key: %s' % key)
421
 
        else:
422
 
            # What do we do with a key we don't recognize
423
 
            raise MalformedHeader('Unknown Key: %s' % key)
 
424
                # What do we do with a key we don't recognize
 
425
                raise MalformedHeader('Unknown Key: "%s"' % key)
424
426
        
425
427
    def _read_many(self, indent):
426
428
        """If a line ends with no entry, that means that it should be
486
488
        rev_info = RevisionInfo(revision_id)
487
489
        start = '#    '
488
490
        for line in self._next():
489
 
            key,value = self._read_next_entry(line, indent=4)
 
491
            key,value = self._read_next_entry(line, indent=1)
490
492
            #if key is None:
491
493
            #    continue
492
494
            if hasattr(rev_info, key):