[Pkg-bazaar-commits] ./bzr/unstable r11: - change revision XML to <revision>

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 11
committer: mbp at sourcefrog.net
timestamp: Wed 2005-03-09 17:51:20 +1100
message:
  - change revision XML to <revision>
  - more assertions when reading back in
modified:
  bzrlib/revision.py
-------------- next part --------------
=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py	2005-03-09 06:44:53 +0000
+++ b/bzrlib/revision.py	2005-03-09 06:51:20 +0000
@@ -50,7 +50,7 @@
 
         
     def to_element(self):
-        root = Element('changeset',
+        root = Element('revision',
                        committer = self.committer,
                        timestamp = '%.9f' % self.timestamp,
                        revision_id = self.revision_id,
@@ -66,17 +66,22 @@
 
         return root
 
-    def from_element(cls, root):
-        cs = cls(committer = root.get('committer'),
-                 timestamp = float(root.get('timestamp')),
-                 precursor = root.get('precursor'),
-                 revision_id = root.get('revision_id'),
-                 inventory_id = root.get('inventory_id'))
-
-        v = root.get('timezone')
+
+    def from_element(cls, elt):
+        # <changeset> is deprecated...
+        if elt.tag not in ('revision', 'changeset'):
+            bailout("unexpected tag in revision file: %r" % elt)
+
+        cs = cls(committer = elt.get('committer'),
+                 timestamp = float(elt.get('timestamp')),
+                 precursor = elt.get('precursor'),
+                 revision_id = elt.get('revision_id'),
+                 inventory_id = elt.get('inventory_id'))
+
+        v = elt.get('timezone')
         cs.timezone = v and int(v)
 
-        cs.message = root.findtext('message') # text of <message>
+        cs.message = elt.findtext('message') # text of <message>
         return cs
 
     from_element = classmethod(from_element)