Rev 1439: Pass revnum, branch and uuid to import_revision function. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1439
revision-id: jelmer at samba.org-20080704103405-hkvyv91indtm4ulh
parent: jelmer at samba.org-20080704091500-ppp4t9fk1whaux6r
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-07-04 12:34:05 +0200
message:
  Pass revnum, branch and uuid to import_revision function.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-07-03 22:10:49 +0000
+++ b/fetch.py	2008-07-04 10:34:05 +0000
@@ -127,7 +127,9 @@
         # Commit SVN revision properties to a Revision object
         rev = Revision(revision_id=revid, parent_ids=self.revmeta.get_parent_ids(self.mapping))
 
-        self.mapping.import_revision(self.revmeta.revprops, self.revmeta.fileprops, rev)
+        self.mapping.import_revision(self.revmeta.revprops, self.revmeta.fileprops, 
+                                     self.revmeta.repository.uuid, self.revmeta.branch_path,
+                                     self.revmeta.revnum, rev)
 
         signature = self.revmeta.revprops.get(SVN_REVPROP_BZR_SIGNATURE)
 

=== modified file 'mapping.py'
--- a/mapping.py	2008-06-26 16:27:42 +0000
+++ b/mapping.py	2008-07-04 10:34:05 +0000
@@ -15,7 +15,7 @@
 
 """Maps between Subversion and Bazaar semantics."""
 
-from bzrlib import osutils, registry
+from bzrlib import log, osutils, registry
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
 
@@ -324,13 +324,14 @@
         """
         raise NotImplementedError(self.generate_file_id)
 
-    def import_revision(self, revprops, fileprops, rev):
+    def import_revision(self, revprops, fileprops, uuid, branch, revnum, rev):
         """Update a Revision object from Subversion revision and branch 
         properties.
 
         :param revprops: Dictionary with Subversion revision properties.
         :param fileprops: Dictionary with Subversion file properties on the 
                           branch root.
+        :param revnum: Revision number in Subversion.
         :param rev: Revision object to import data into.
         """
         raise NotImplementedError(self.import_revision)
@@ -449,7 +450,7 @@
         """Whether this mapping can be used with custom file properties."""
         return True
 
-    def import_revision(self, svn_revprops, fileprops, rev):
+    def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
         parse_svn_revprops(svn_revprops, rev)
         metadata = fileprops.get(SVN_PROP_BZR_REVISION_INFO)
         if metadata is not None:
@@ -535,7 +536,7 @@
         """Whether this mapping can be used with custom revision properties."""
         return True
 
-    def import_revision(self, svn_revprops, fileprops, rev):
+    def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
         parse_svn_revprops(svn_revprops, rev)
         parse_bzr_svn_revprops(svn_revprops, rev)
 
@@ -606,6 +607,9 @@
     def supports_roundtripping():
         return True
 
+    def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
+        super(BzrSvnMappingv4, self).import_revision(svn_revprops, fileprops, uuid, branch, revnum, rev)
+
     @classmethod
     def parse_revision_id(cls, revid):
         assert isinstance(revid, str)
@@ -693,3 +697,5 @@
 
 def get_default_mapping():
     return mapping_registry.get_default()
+
+

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-07-03 20:33:27 +0000
+++ b/mapping3/__init__.py	2008-07-04 10:34:05 +0000
@@ -339,7 +339,7 @@
         self.fileprops.export_fileid_map(fileids, revprops, fileprops)
         self.revprops.export_fileid_map(fileids, revprops, fileprops)
 
-    def import_revision(self, svn_revprops, fileprops, rev):
+    def import_revision(self, svn_revprops, fileprops, revnum, rev):
         self.fileprops.import_revision(svn_revprops, fileprops, rev)
         self.revprops.import_revision(svn_revprops, fileprops, rev)
 

=== modified file 'repository.py'
--- a/repository.py	2008-07-04 02:49:15 +0000
+++ b/repository.py	2008-07-04 10:34:05 +0000
@@ -527,7 +527,7 @@
         rev = Revision(revision_id=revision_id, parent_ids=revmeta.get_parent_ids(mapping),
                        inventory_sha1="")
 
-        mapping.import_revision(svn_revprops, svn_fileprops, rev)
+        mapping.import_revision(svn_revprops, svn_fileprops, self.uuid, path, revnum, rev)
 
         return rev
 

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-06-22 23:57:14 +0000
+++ b/tests/test_mapping.py	2008-07-04 10:34:05 +0000
@@ -156,7 +156,7 @@
         except NotImplementedError:
             raise TestNotApplicable
         targetrev = Revision(None)
-        self.mapping.import_revision(revprops, fileprops, targetrev)
+        self.mapping.import_revision(revprops, fileprops, "someuuid", "somebp", 4, targetrev)
         self.assertEquals("My Commit message", targetrev.message)
 
     def test_revision(self):
@@ -166,7 +166,7 @@
                                      {"arevprop": "val" }, "arevid", 4, ["merge1"], dict())
         targetrev = Revision(None)
         revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
-        self.mapping.import_revision(revprops, fileprops, targetrev)
+        self.mapping.import_revision(revprops, fileprops, "someuuid", "somebp", 4, targetrev)
         self.assertEquals(targetrev.committer, "somebody")
         self.assertEquals(targetrev.properties, {"arevprop": "val"})
         self.assertEquals(targetrev.timestamp, 432432432.0)