Rev 644: Fix more tests. in file:///data/jelmer/bzr-svn/noschemes/

Jelmer Vernooij jelmer at samba.org
Sun Feb 3 19:42:08 GMT 2008


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

------------------------------------------------------------
revno: 644
revision-id:jelmer at samba.org-20080203194138-b7m7i48nrdt2jvj4
parent: jelmer at samba.org-20080203180333-z9ghw22ls8gh9jf9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: noschemes
timestamp: Sun 2008-02-03 20:41:38 +0100
message:
  Fix more tests.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  pre-revprop-change.example     prerevpropchange.exa-20071214160928-9g7oevg3tlky780a-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  scheme.py                      scheme.py-20060516195850-95181aae6b272f9e
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
  tests/test_upgrade.py          test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-02-03 18:03:33 +0000
+++ b/mapping.py	2008-02-03 19:41:38 +0000
@@ -424,13 +424,15 @@
         self.scheme = scheme
         assert not isinstance(scheme, str)
 
+    def __repr__(self):
+        return "%s(%r)" % (self.__class__.__name__, self.scheme)
+
     @staticmethod
     def supports_roundtripping():
         return True
 
     @classmethod
-    def parse_revision_id(cls, revid):
-        assert revid is not None
+    def _parse_revision_id(cls, revid):
         assert isinstance(revid, str)
 
         if not revid.startswith(cls.revid_prefix):
@@ -445,6 +447,11 @@
 
         branch_path = unescape_svn_path(branch_path)
 
+        return (uuid, branch_path, int(srevnum), scheme)
+
+    @classmethod
+    def parse_revision_id(cls, revid):
+        (uuid, branch_path, srevnum, scheme) = cls._parse_revision_id(revid)
         # Some older versions of bzr-svn 0.4 did not always set a branching
         # scheme but set "undefined" instead.
         if scheme == "undefined":
@@ -452,7 +459,7 @@
         else:
             scheme = BranchingScheme.find_scheme(scheme)
 
-        return (uuid, branch_path, int(srevnum), cls(scheme))
+        return (uuid, branch_path, srevnum, cls(scheme))
 
     def is_branch(self, branch_path):
         return (self.scheme.is_branch(branch_path) or 
@@ -461,15 +468,19 @@
     def is_tag(self, tag_path):
         return self.scheme.is_tag(tag_path)
 
-    def generate_revision_id(self, uuid, revnum, path):
+    @classmethod
+    def _generate_revision_id(cls, uuid, revnum, path, scheme):
         assert isinstance(revnum, int)
         assert isinstance(path, str)
         assert revnum >= 0
         assert revnum > 0 or path == "", \
                 "Trying to generate revid for (%r,%r)" % (path, revnum)
-        return "%s%s:%s:%s:%d" % (self.revid_prefix, self.scheme, uuid, \
+        return "%s%s:%s:%s:%d" % (cls.revid_prefix, scheme, uuid, \
                        escape_svn_path(path.strip("/")), revnum)
 
+    def generate_revision_id(self, uuid, revnum, path):
+        return self._generate_revision_id(uuid, revnum, path, self.scheme)
+
     def generate_file_id(self, uuid, revnum, branch, inv_path):
         assert isinstance(uuid, str)
         assert isinstance(revnum, int)

=== modified file 'pre-revprop-change.example'
--- a/pre-revprop-change.example	2008-02-01 15:42:04 +0000
+++ b/pre-revprop-change.example	2008-02-03 19:41:38 +0000
@@ -17,6 +17,7 @@
 
 if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
 
+# Allow adding bzr-svm revision properties:
 if [ "$ACTION" = "A" -a "`echo "$PROPNAME" | cut -d : -f 1`" = "bzr" ]; then exit 0; fi
 
 echo "Changing revision properties other than svn:log or bzr:* is prohibited" >&2

=== modified file 'repository.py'
--- a/repository.py	2008-02-03 18:03:33 +0000
+++ b/repository.py	2008-02-03 19:41:38 +0000
@@ -693,8 +693,9 @@
         :return: iterator that returns tuples with branch path, 
             changed paths and revision number.
         """
-        assert branch_path is not None
-        assert mapping.is_branch(branch_path) or mapping.is_tag(branch_path)
+        assert isinstance(branch_path, str)
+        assert mapping.is_branch(branch_path) or mapping.is_tag(branch_path), \
+                "Mapping %r doesn't accept %s as branch or tag" % (mapping, branch_path)
 
         for (bp, paths, revnum) in self._log.follow_path(branch_path, revnum):
             assert revnum > 0 or bp == ""

=== modified file 'scheme.py'
--- a/scheme.py	2008-01-28 22:52:09 +0000
+++ b/scheme.py	2008-02-03 19:41:38 +0000
@@ -213,6 +213,9 @@
     def __str__(self):
         return "none"
 
+    def __repr__(self):
+        return "%s()" % self.__class__.__name__
+
     def is_branch_parent(self, path):
         return False
 
@@ -272,6 +275,9 @@
     def __str__(self):
         return "trunk%d" % self.level
 
+    def __repr__(self):
+        return "%s(%d)" % (self.__class__.__name__, self.level)
+
     def is_branch_parent(self, path):
         parts = path.strip("/").split("/")
         if len(parts) <= self.level:
@@ -321,6 +327,9 @@
     def __str__(self):
         return "single-%s" % self.path
 
+    def __repr__(self):
+        return "%s(%r)" % (self.__class__.__name__, self.path)
+
     def is_branch_parent(self, path):
         if not "/" in self.path:
             return False

=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py	2008-02-03 18:03:33 +0000
+++ b/tests/test_convert.py	2008-02-03 19:41:38 +0000
@@ -92,6 +92,7 @@
                            TrunkBranchingScheme(), 
                            all=False, create_shared_repo=True)
         newrepos = Repository.open("e")
+        oldrepos.set_branching_scheme(TrunkBranchingScheme())
         self.assertFalse(newrepos.has_revision(oldrepos.generate_revision_id(2, "branches/somebranch", oldrepos.get_mapping())))
 
     def test_fetch_filebranch(self):
@@ -101,6 +102,7 @@
         oldrepos = Repository.open(self.repos_url)
         convert_repository(oldrepos, "e", TrunkBranchingScheme())
         newrepos = Repository.open("e")
+        oldrepos.set_branching_scheme(TrunkBranchingScheme())
         self.assertFalse(newrepos.has_revision(oldrepos.generate_revision_id(2, "branches/somebranch", oldrepos.get_mapping())))
 
     def test_fetch_dead(self):

=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py	2008-02-03 18:03:33 +0000
+++ b/tests/test_fetch.py	2008-02-03 19:41:38 +0000
@@ -1358,6 +1358,7 @@
         self.client_commit("dc", "added branch foobranch") #3
 
         repos = remote.SvnRemoteAccess(SvnRaTransport("svn+"+repos_url), format.SvnRemoteFormat()).find_repository()
+        repos.set_branching_scheme(TrunkBranchingScheme())
 
         mapping = repos.get_mapping()
 

=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py	2008-02-03 18:03:33 +0000
+++ b/tests/test_fileids.py	2008-02-03 19:41:38 +0000
@@ -22,7 +22,7 @@
 from bzrlib.tests import TestCase
 
 from fileids import SimpleFileIdMap
-from scheme import TrunkBranchingScheme
+from scheme import TrunkBranchingScheme, NoBranchingScheme
 from tests import TestCaseWithSubversionRepository
 
 class MockRepo:
@@ -247,30 +247,34 @@
         self.repos = Repository.open(self.repos_url)
 
     def test_empty(self):
-        scheme = TrunkBranchingScheme()
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 0, "", u""), self.repos.generate_revision_id(0, "", "trunk0"))}, 
-                         self.repos.get_fileid_map(0, "", scheme))
+        self.repos.set_branching_scheme(NoBranchingScheme())
+        self.mapping = self.repos.get_mapping()
+        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 0, "", u""), self.repos.generate_revision_id(0, "", self.mapping))}, 
+                         self.repos.get_fileid_map(0, "", self.mapping))
 
     def test_empty_trunk(self):
-        scheme = TrunkBranchingScheme()
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(1, "trunk", "trunk0"))}, 
-                self.repos.get_fileid_map(1, "trunk", scheme))
+        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(1, "trunk", self.mapping))}, 
+                self.repos.get_fileid_map(1, "trunk", self.mapping))
 
     def test_change_parent(self):
-        scheme = TrunkBranchingScheme()
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
         self.build_tree({"dc/trunk/file": 'data'})
         self.client_add("dc/trunk/file")
         self.client_commit("dc", "Msg")
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(2, "trunk", "trunk0")), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", "trunk0"))}, self.repos.get_fileid_map(2, "trunk", scheme))
+        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(2, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", self.mapping))}, self.repos.get_fileid_map(2, "trunk", self.mapping))
 
     def test_change_updates(self):
-        scheme = TrunkBranchingScheme()
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
@@ -279,10 +283,11 @@
         self.client_commit("dc", "Msg")
         self.build_tree({"dc/trunk/file": 'otherdata'})
         self.client_commit("dc", "Msg")
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", "trunk0")), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", "trunk0"))}, self.repos.get_fileid_map(3, "trunk", scheme))
+        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_sibling_unrelated(self):
-        scheme = TrunkBranchingScheme()
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
@@ -295,10 +300,11 @@
         self.build_tree({"dc/trunk/file": 'otherdata'})
         self.client_commit("dc", "Msg")
         self.client_update("dc")
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), "bar": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"bar"), self.repos.generate_revision_id(2, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", scheme))
+        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), "bar": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"bar"), self.repos.generate_revision_id(2, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_copy(self):
-        scheme = TrunkBranchingScheme()
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
@@ -308,12 +314,12 @@
         self.client_copy("dc/trunk/file", "dc/trunk/bar")
         self.client_commit("dc", "Msg")
         self.assertEqual({
-            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", mapping)), 
-            "bar": (self.mapping.generate_file_id(self.repos.uuid, 3, "trunk", u"bar"), self.repos.generate_revision_id(3, "trunk", mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", mapping))}, self.repos.get_fileid_map(3, "trunk", scheme))
+            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), 
+            "bar": (self.mapping.generate_file_id(self.repos.uuid, 3, "trunk", u"bar"), self.repos.generate_revision_id(3, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_copy_nested_modified(self):
-        scheme = TrunkBranchingScheme()
-        self.repos.set_branching_scheme(scheme)
+        self.repos.set_branching_scheme(TrunkBranchingScheme())
+        self.mapping = self.repos.get_mapping()
         self.build_tree({"dc/trunk": None})
         self.client_add("dc/trunk")
         self.client_commit("dc", "Msg")
@@ -334,4 +340,4 @@
               self.repos.generate_revision_id(3, "trunk", self.mapping)),
           "bar/file": (self.mapping.generate_file_id(self.repos.uuid, 3, "trunk", u"bar/file"), 
               self.repos.generate_revision_id(3, "trunk", self.mapping))},
-            self.repos.get_fileid_map(3, "trunk", scheme))
+            self.repos.get_fileid_map(3, "trunk", self.mapping))

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-02-03 18:03:33 +0000
+++ b/tests/test_mapping.py	2008-02-03 19:41:38 +0000
@@ -124,13 +124,12 @@
 
 class MappingTestAdapter:
     def test_roundtrip_revision(self):
-        revid = self.mapping.generate_revision_id("myuuid", 42, "path", "somescheme")
-        (uuid, path, revnum, scheme) = self.mapping.parse_revision_id(revid)
+        revid = self.mapping.generate_revision_id("myuuid", 42, "path")
+        (uuid, path, revnum, mapping) = self.mapping.parse_revision_id(revid)
         self.assertEquals(uuid, "myuuid")
         self.assertEquals(revnum, 42)
         self.assertEquals(path, "path")
-        if scheme is not None:
-            self.assertEquals(scheme, "somescheme")
+        self.assertEquals(mapping, self.mapping)
 
     def test_fileid_map(self):
         if not self.mapping.supports_roundtripping():
@@ -174,9 +173,9 @@
                 lambda: self.mapping.parse_revision_id("bla"))
 
     def test_parse_revision_id(self):
-        self.assertEquals(("myuuid", "bla", 5, "foobar"), 
+        self.assertEquals(("myuuid", "bla", 5, self.mapping), 
             self.mapping.parse_revision_id(
-                self.mapping.generate_revision_id("myuuid", 5, "bla", "foobar")))
+                self.mapping.generate_revision_id("myuuid", 5, "bla")))
 
 
 class Mappingv1Tests(MappingTestAdapter,TestCase):
@@ -195,7 +194,7 @@
 
 class Mappingv3Tests(MappingTestAdapter,TestCase):
     def setUp(self):
-        self.mapping = BzrSvnMappingv3
+        self.mapping = BzrSvnMappingv3(NoBranchingScheme())
 
     def test_revid_svk_map(self):
         self.assertEqual("auuid:/:6", 
@@ -203,28 +202,28 @@
 
     def test_generate_revid(self):
         self.assertEqual("svn-v3-undefined:myuuid:branch:5", 
-                         self.mapping.generate_revision_id("myuuid", 5, "branch", "undefined"))
+                         BzrSvnMappingv3._generate_revision_id("myuuid", 5, "branch", "undefined"))
 
     def test_generate_revid_nested(self):
         self.assertEqual("svn-v3-undefined:myuuid:branch%2Fpath:5", 
-                  default_mapping.generate_revision_id("myuuid", 5, "branch/path", "undefined"))
+                  BzrSvnMappingv3._generate_revision_id("myuuid", 5, "branch/path", "undefined"))
 
     def test_generate_revid_special_char(self):
         self.assertEqual("svn-v3-undefined:myuuid:branch%2C:5", 
-             default_mapping.generate_revision_id("myuuid", 5, "branch\x2c", "undefined"))
+             BzrSvnMappingv3._generate_revision_id("myuuid", 5, "branch\x2c", "undefined"))
 
     def test_generate_revid_nordic(self):
         self.assertEqual("svn-v3-undefined:myuuid:branch%C3%A6:5", 
-             default_mapping.generate_revision_id("myuuid", 5, u"branch\xe6".encode("utf-8"), "undefined"))
+             BzrSvnMappingv3._generate_revision_id("myuuid", 5, u"branch\xe6".encode("utf-8"), "undefined"))
 
     def test_parse_revid_simple(self):
-        self.assertEqual(("uuid", "", 4, None),
-                         default_mapping.parse_revision_id(
+        self.assertEqual(("uuid", "", 4, "undefined"),
+                         BzrSvnMappingv3._parse_revision_id(
                              "svn-v3-undefined:uuid::4"))
 
     def test_parse_revid_nested(self):
-        self.assertEqual(("uuid", "bp/data", 4, None),
-                         default_mapping.parse_revision_id(
+        self.assertEqual(("uuid", "bp/data", 4, "undefined"),
+                         BzrSvnMappingv3._parse_revision_id(
                      "svn-v3-undefined:uuid:bp%2Fdata:4"))
 
     def test_generate_file_id_root(self):

=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2008-02-03 18:03:33 +0000
+++ b/tests/test_repos.py	2008-02-03 19:41:38 +0000
@@ -123,10 +123,10 @@
                              "corrupt-id\n")
         self.client_commit("dc", "set id")
         repos = Repository.open(repos_url)
-        revid = repos.generate_revision_id(1, "", "undefined")
+        revid = repos.generate_revision_id(1, "", repos.get_mapping())
         self.assertEquals(
-               u"svn-v%d-undefined:%s::1" % (MAPPING_VERSION, repos.uuid),
-               revid)
+                repos.get_mapping().generate_revision_id(repos.uuid, 1, ""),
+                revid)
 
     def test_add_revision(self):
         repos_url = self.make_client("a", "dc")
@@ -225,6 +225,7 @@
         self.client_add("dc/branches")
         self.client_commit("dc", "My Message")
         repos = Repository.open(repos_url)
+        repos.set_branching_scheme(TrunkBranchingScheme())
         self.assertEqual([('trunk', 1)], 
                 list(repos.follow_history(1, repos.get_mapping())))
 
@@ -239,6 +240,7 @@
         self.client_commit("dc", "Create branch")
 
         repos = Repository.open(repos_url)
+        repos.set_branching_scheme(TrunkBranchingScheme())
 
         items = list(repos.follow_history(2, repos.get_mapping()))
         self.assertEqual([('branches/abranch', 2), 
@@ -543,6 +545,7 @@
         self.client_update("dc")
         self.build_tree({'dc/trunk/foo': "data2"})
         repository = Repository.open("svn+%s" % repos_url)
+        repository.set_branching_scheme(TrunkBranchingScheme())
         self.client_set_prop("dc/trunk", "svk:merge", 
             "%s:/branches/foo:1\n" % repository.uuid)
         self.client_commit("dc", "Second Message")
@@ -551,7 +554,6 @@
             repository.generate_revision_id(1, "branches/foo", mapping)], 
                 repository.revision_parents(
                     repository.generate_revision_id(2, "trunk", mapping)))
- 
     
     def test_get_revision(self):
         repos_url = self.make_client('d', 'dc')
@@ -1155,7 +1157,7 @@
         self.client_add("dc/py")
         self.client_commit("dc", "Initial commit")
         self.assertRaises(NoSuchRevision, 
-                lambda: repos._mainline_revision_parent("trunk", 2, NoBranchingScheme()))
+                lambda: repos._mainline_revision_parent("trunk", 2, repos.get_mapping()))
 
 
 class TestSvnRevisionTree(TestCaseWithSubversionRepository):

=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py	2008-02-03 16:43:47 +0000
+++ b/tests/test_upgrade.py	2008-02-03 19:41:38 +0000
@@ -67,7 +67,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         oldrepos.copy_content_into(newrepos)
         dir.create_branch()
@@ -90,7 +90,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         oldrepos.copy_content_into(newrepos)
         dir.create_branch()
@@ -147,7 +147,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         oldrepos.copy_content_into(newrepos)
         dir.create_branch()
@@ -190,7 +190,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         dir.create_branch()
         wt = dir.create_workingtree()
@@ -227,7 +227,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         b = dir.create_branch()
         wt = dir.create_workingtree()
@@ -254,7 +254,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         newrepos = dir.create_repository()
         b = dir.create_branch()
         wt = dir.create_workingtree()
@@ -282,7 +282,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         dir.create_repository()
         b = dir.create_branch()
         wt = dir.create_workingtree()
@@ -306,7 +306,7 @@
         self.client_commit("dc", "data")
 
         oldrepos = Repository.open(repos_url)
-        dir = BzrDir.create("f",format=get_rich_root_format())
+        dir = BzrDir.create("f", format=get_rich_root_format())
         dir.create_repository()
         b = dir.create_branch()
         wt = dir.create_workingtree()




More information about the bazaar-commits mailing list