Rev 998: Rather than just store branching scheme actually set it. in file:///data/jelmer/bzr-svn/layout/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 998
revision-id: jelmer at samba.org-20080504002734-36mv7up22ut2ea39
parent: jelmer at samba.org-20080503030128-acod7kobc71t253e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Sun 2008-05-04 02:27:34 +0200
message:
  Rather than just store branching scheme actually set it.
modified:
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-05-03 03:01:28 +0000
+++ b/mapping3/__init__.py	2008-05-04 00:27:34 +0000
@@ -102,7 +102,9 @@
     return scheme
 
 def set_branching_scheme(repository, scheme, mandatory=False):
-    repository.get_config().set_branching_scheme(str(scheme), mandatory=mandatory)
+    repository.get_mapping().scheme = scheme
+    repository.get_config().set_branching_scheme(str(scheme), 
+                                                 mandatory=mandatory)
 
 
 class BzrSvnMappingv3(mapping.BzrSvnMapping):

=== modified file 'repository.py'
--- a/repository.py	2008-05-02 23:54:57 +0000
+++ b/repository.py	2008-05-04 00:27:34 +0000
@@ -195,9 +195,9 @@
         return self._cached_revnum
 
     def get_mapping(self):
-        if self._default_mapping is not None:
-            return self._default_mapping
-        return get_default_mapping().from_repository(self, self._hinted_branch_path)
+        if self._default_mapping is None:
+            self._default_mapping = get_default_mapping().from_repository(self, self._hinted_branch_path)
+        return self._default_mapping
 
     def _make_parents_provider(self):
         return CachingParentsProvider(self)

=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2008-05-03 03:01:28 +0000
+++ b/tests/test_repos.py	2008-05-04 00:27:34 +0000
@@ -36,7 +36,8 @@
 import format
 from mapping import (escape_svn_path, unescape_svn_path, 
                      SVN_PROP_BZR_REVISION_ID)
-from mapping3 import SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme
+from mapping3 import (SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme,
+                      set_property_scheme)
 from mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme, 
                     ListBranchingScheme, SingleBranchingScheme)
 from transport import SvnRaTransport