Merge 0.4.

[jelmer/subvertpy.git] / tests / test_convert.py

diff --git a/tests/test_convert.py b/tests/test_convert.py
index 1e0299b811bb32c73053de812345f0615a381730..ec06e81d45b98ddb8d3e90b1a7d35a99c896c9fc 100644 (file)
--- a/tests/test_convert.py
+++ b/tests/test_convert.py
@@ -27,7 +27,8 @@ from bzrlib.trace import mutter
 import os, sys
 from convert import convert_repository, NotDumpFile, load_dumpfile
 from format import get_rich_root_format
-from scheme import TrunkBranchingScheme, NoBranchingScheme
+from mapping3 import set_branching_scheme
+from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
 from tests import TestCaseWithSubversionRepository
 
 import repos
@@ -93,7 +94,7 @@ class TestConversion(TestCaseWithSubversionRepository):
                            TrunkBranchingScheme(), 
                            all=False, create_shared_repo=True)
         newrepos = Repository.open("e")
-        oldrepos.set_branching_scheme(TrunkBranchingScheme())
+        set_branching_scheme(oldrepos, TrunkBranchingScheme())
         self.assertFalse(newrepos.has_revision(oldrepos.generate_revision_id(2, "branches/somebranch", oldrepos.get_mapping())))
 
     def test_fetch_filebranch(self):
@@ -103,7 +104,7 @@ class TestConversion(TestCaseWithSubversionRepository):
         oldrepos = Repository.open(self.repos_url)
         convert_repository(oldrepos, "e", TrunkBranchingScheme())
         newrepos = Repository.open("e")
-        oldrepos.set_branching_scheme(TrunkBranchingScheme())
+        set_branching_scheme(oldrepos, TrunkBranchingScheme())
         self.assertFalse(newrepos.has_revision(oldrepos.generate_revision_id(2, "branches/somebranch", oldrepos.get_mapping())))
 
     def test_fetch_dead(self):
@@ -139,7 +140,7 @@ class TestConversion(TestCaseWithSubversionRepository):
         dir.create_repository(shared=True)
 
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                TrunkBranchingScheme(), True)
+                TrunkBranchingScheme(), create_shared_repo=True)
 
         self.assertTrue(Repository.open("e").is_shared())
 
@@ -166,14 +167,15 @@ class TestConversion(TestCaseWithSubversionRepository):
         dir.create_repository(shared=True)
 
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                NoBranchingScheme(), True)
+                NoBranchingScheme(), create_shared_repo=True)
 
     def test_shared_import_with_wt(self):
         dir = BzrDir.create("e", format=get_rich_root_format())
         dir.create_repository(shared=True)
 
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                TrunkBranchingScheme(), True, True)
+                TrunkBranchingScheme(), create_shared_repo=True, 
+                working_trees=True)
 
         self.assertTrue(os.path.isfile(os.path.join(
                         self.test_dir, "e", "trunk", "file")))
@@ -183,7 +185,8 @@ class TestConversion(TestCaseWithSubversionRepository):
         dir.create_repository(shared=True)
 
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                TrunkBranchingScheme(), True, False)
+                TrunkBranchingScheme(), create_shared_repo=True, 
+                working_trees=False)
 
         self.assertFalse(os.path.isfile(os.path.join(
                         self.test_dir, "e", "trunk", "file")))
@@ -194,12 +197,13 @@ class TestConversion(TestCaseWithSubversionRepository):
 
         self.assertRaises(IncompatibleRepositories, 
             lambda: convert_repository(Repository.open(self.repos_url), "e", 
-                TrunkBranchingScheme(), True, False))
+                TrunkBranchingScheme(), create_shared_repo=True, 
+                working_trees=False))
 
     def test_shared_import_continue_branch(self):
         oldrepos = Repository.open("svn+"+self.repos_url)
         convert_repository(oldrepos, "e", 
-                TrunkBranchingScheme(), True)
+                TrunkBranchingScheme(), create_shared_repo=True)
 
         mapping = oldrepos.get_mapping()
 
@@ -211,7 +215,7 @@ class TestConversion(TestCaseWithSubversionRepository):
                 Branch.open("e/trunk").last_revision())
 
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                TrunkBranchingScheme(), True)
+                TrunkBranchingScheme(), create_shared_repo=True)
 
         self.assertEqual(Repository.open(self.repos_url).generate_revision_id(3, "trunk", mapping), 
                         Branch.open("e/trunk").last_revision())
@@ -219,7 +223,7 @@ class TestConversion(TestCaseWithSubversionRepository):
  
     def test_shared_import(self):
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                TrunkBranchingScheme(), True)
+                TrunkBranchingScheme(), create_shared_repo=True)
 
         self.assertTrue(Repository.open("e").is_shared())
     
@@ -233,7 +237,7 @@ class TestConversion(TestCaseWithSubversionRepository):
 
     def test_notshared_import(self):
         convert_repository(Repository.open("svn+"+self.repos_url), "e", 
-                           TrunkBranchingScheme(), False)
+                           TrunkBranchingScheme(), create_shared_repo=False)
 
         self.assertRaises(NotBranchError, Repository.open, "e")