Rev 1533: Move more code out of DeltaBuildEditor. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1533
revision-id: jelmer at samba.org-20080802195744-rr21qmnp2h0zev1k
parent: jelmer at samba.org-20080802195243-d1khyb28f5csk636
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-02 21:57:44 +0200
message:
  Move more code out of DeltaBuildEditor.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'fetch.py'
--- a/fetch.py	2008-08-02 19:52:43 +0000
+++ b/fetch.py	2008-08-02 19:57:44 +0000
@@ -117,22 +117,13 @@
     def abort(self):
         pass
 
-    def _get_existing_id(self, old_parent_id, new_parent_id, path):
-        assert isinstance(path, unicode)
-        assert isinstance(old_parent_id, str)
-        assert isinstance(new_parent_id, str)
-        ret = self._get_id_map().get(path)
-        if ret is not None:
-            return ret
-        return self.old_inventory[old_parent_id].children[urlutils.basename(path)].file_id
-
     def _get_new_id(self, parent_id, new_path):
         assert isinstance(new_path, unicode)
         assert isinstance(parent_id, str)
         ret = self._get_id_map().get(new_path)
         if ret is not None:
             return ret
-        return self.mapping.generate_file_id(self.source.uuid, self.revmeta.revnum, 
+        return self.mapping.generate_file_id(self.revmeta.uuid, self.revmeta.revnum, 
                                              self.revmeta.branch_path, new_path)
 
     def _rename(self, file_id, parent_id, old_path, new_path, kind):
@@ -430,7 +421,7 @@
                        parent_ids=parent_ids)
 
         self.mapping.import_revision(self.revmeta.revprops, self.revmeta.fileprops, 
-                                     self.revmeta.repository.uuid, self.revmeta.branch_path,
+                                     self.revmeta.revmeta.uuid, self.revmeta.branch_path,
                                      self.revmeta.revnum, rev)
 
         signature = self.revmeta.revprops.get(SVN_REVPROP_BZR_SIGNATURE)
@@ -460,7 +451,7 @@
         if self.old_inventory.root is None:
             # First time the root is set
             old_file_id = None
-            file_id = self.mapping.generate_file_id(self.source.uuid, self.revmeta.revnum, self.revmeta.branch_path, u"")
+            file_id = self.mapping.generate_file_id(self.revmeta.uuid, self.revmeta.revnum, self.revmeta.branch_path, u"")
             file_parents = []
         else:
             assert self.old_inventory.root.revision is not None
@@ -481,8 +472,18 @@
         assert isinstance(parent_id, str)
         return self.old_inventory[parent_id].children[urlutils.basename(old_path)].file_id
 
-
-class TreeDeltaBuildeditor(DeltaBuildEditor):
+    def _get_existing_id(self, old_parent_id, new_parent_id, path):
+        assert isinstance(path, unicode)
+        assert isinstance(old_parent_id, str)
+        assert isinstance(new_parent_id, str)
+        ret = self._get_id_map().get(path)
+        if ret is not None:
+            return ret
+        return self.old_inventory[old_parent_id].children[urlutils.basename(path)].file_id
+
+
+
+class TreeDeltaBuildEditor(DeltaBuildEditor):
     """Implementation of the Subversion commit editor interface that builds a 
     Bazaar TreeDelta.
     """

=== modified file 'repository.py'
--- a/repository.py	2008-08-02 02:39:06 +0000
+++ b/repository.py	2008-08-02 19:57:44 +0000
@@ -549,7 +549,6 @@
 
         rev.svn_meta = revmeta
         rev.svn_mapping = mapping
-        rev.svn_uuid = self.uuid
 
         mapping.import_revision(svn_revprops, svn_fileprops, self.uuid, path, 
                                 revnum, rev)