Rev 1715: Fix tests. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1715
revision-id: jelmer at samba.org-20080830023127-fp1v5w9u5a0e9pb3
parent: jelmer at samba.org-20080830011615-7amrja70kx32uxcs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-08-30 04:31:27 +0200
message:
  Fix tests.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'logwalker.py'
--- a/logwalker.py	2008-08-30 00:40:33 +0000
+++ b/logwalker.py	2008-08-30 02:31:27 +0000
@@ -100,6 +100,10 @@
         self._ensure_init()
         return self.dict.__eq__(other)
 
+    def update(self, other):
+        self._ensure_init()
+        return self.dict.update(other)
+
 
 class LogCache(CacheTable):
     """Log browser cache table manager. The methods of this class

=== modified file 'mapping.py'
--- a/mapping.py	2008-08-30 01:11:46 +0000
+++ b/mapping.py	2008-08-30 02:31:27 +0000
@@ -689,7 +689,7 @@
 mapping_registry.register_lazy('v4', 'bzrlib.plugins.svn.mapping4', 
                                'BzrSvnMappingv4',
                                'Fourth format (bzr-svn 0.5.x)')
-mapping_registry.set_default('v4')
+mapping_registry.set_default('v3')
 
 def parse_mapping_name(name):
     assert isinstance(name, str)

=== modified file 'repository.py'
--- a/repository.py	2008-08-30 01:11:46 +0000
+++ b/repository.py	2008-08-30 02:31:27 +0000
@@ -612,6 +612,8 @@
 
     def _revmeta(self, path, changes, revnum, revprops=None, fileprops=None):
         if (path, revnum) in self._revmeta_cache:
+            if changes is not None:
+                self._revmeta_cache[path,revnum].paths = changes
             return self._revmeta_cache[path,revnum]
 
         if revprops is None:

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-08-29 20:03:11 +0000
+++ b/tests/test_mapping.py	2008-08-30 02:31:27 +0000
@@ -153,7 +153,9 @@
         if not self.mapping.supports_roundtripping():
             raise TestNotApplicable
         fileids = {"": "some-id", "bla/blie": "other-id"}
-        (revprops, fileprops) = self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], dict())
+        revprops = {}
+        fileprops = {}
+        self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], revprops, fileprops)
         self.mapping.export_fileid_map(fileids, revprops, fileprops)
         revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
         self.assertEquals(fileids, 
@@ -172,8 +174,10 @@
     def test_message(self):
         if not self.mapping.supports_roundtripping():
             raise TestNotApplicable
-        (revprops, fileprops) = self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", 
-                                     {"arevprop": "val"}, "arevid", 4, ["merge1"], dict())
+        revprops = {}
+        fileprops = {}
+        self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", 
+                                     {"arevprop": "val"}, "arevid", 4, ["merge1"], revprops, fileprops)
         revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
         try:
             self.mapping.export_message("My Commit message", revprops, fileprops)
@@ -186,8 +190,10 @@
     def test_revision(self):
         if not self.mapping.supports_roundtripping():
             raise TestNotApplicable
-        (revprops, fileprops) = self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", 
-                                     {"arevprop": "val" }, "arevid", 4, ["merge1"], dict())
+        revprops = {}
+        fileprops = {}
+        self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", 
+                                     {"arevprop": "val" }, "arevid", 4, ["parent", "merge1"], revprops, fileprops)
         targetrev = Revision(None)
         revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
         self.mapping.import_revision(revprops, fileprops, "someuuid", "somebp", 4, targetrev)
@@ -199,7 +205,9 @@
     def test_revision_id(self):
         if not self.mapping.supports_roundtripping():
             raise TestNotApplicable
-        (revprops, fileprops) = self.mapping.export_revision(True, "branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], dict())
+        revprops = {}
+        fileprops = {}
+        self.mapping.export_revision("branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["parent", "merge1"], revprops, fileprops)
         self.assertEquals((4, "arevid"), self.mapping.get_revision_id("branchp", revprops, fileprops))
     
     def test_revision_id_none(self):

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-29 20:03:11 +0000
+++ b/workingtree.py	2008-08-30 02:31:27 +0000
@@ -459,12 +459,15 @@
         else:
             extra = ""
         original_props = self._get_base_branch_props()
+        svn_fileprops = dict(original_props.items())
         wc = self._get_wc(write_lock=True)
-        (svn_revprops, svn_fileprops) = self.branch.mapping.export_revision(False, self.branch.get_branch_path(), 
+        svn_revprops = {}
+        self.branch.mapping.export_revision(self.branch.get_branch_path(), 
                                             timestamp, timezone, committer, revprops, 
                                             rev_id, self.branch.revno()+1, 
-                                            self.pending_merges(),
-                                            original_props)
+                                            self.get_parent_ids(),
+                                            svn_revprops,
+                                            svn_fileprops)
         try:
             self._set_branch_props(wc, svn_fileprops)
         finally: