Rev 1810: Fix yet more tests. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Fri Sep 5 13:38:24 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1810
revision-id: jelmer at samba.org-20080905123820-6hvfkbgdc2nw9z2g
parent: jelmer at samba.org-20080904211418-23kh9smmy7nc7cxs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-09-05 14:38:20 +0200
message:
Fix yet more tests.
modified:
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
mapping2.py mapping.py-20080904055555-lw057kjuadn0r2ma-2
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
tests/mapping3/__init__.py __init__.py-20080831152358-oy04n53cpnh64aj6-1
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
=== modified file 'errors.py'
--- a/errors.py 2008-09-01 01:30:13 +0000
+++ b/errors.py 2008-09-05 12:38:20 +0000
@@ -208,3 +208,11 @@
NotBranchError.__init__(self, urllib.quote(path))
self.layout = layout
+
+class LayoutUnusable(BzrError):
+ _fmt = """Unable to use layout %(layout)r with mapping %(mapping)r."""
+
+ def __init__(self, layout, mapping):
+ BzrError.__init__(self)
+ self.layout = layout
+ self.mapping = mapping
=== modified file 'mapping2.py'
--- a/mapping2.py 2008-09-04 21:14:18 +0000
+++ b/mapping2.py 2008-09-05 12:38:20 +0000
@@ -15,7 +15,8 @@
from bzrlib.errors import InvalidRevisionId, NotBranchError
from bzrlib.inventory import ROOT_ID
-from bzrlib.plugins.svn.layout import RepositoryLayout, get_root_paths
+from bzrlib.plugins.svn.errors import LayoutUnusable
+from bzrlib.plugins.svn.layout import RepositoryLayout, get_root_paths, RootLayout, TrunkLayout
from bzrlib.plugins.svn.mapping import BzrSvnMapping, escape_svn_path, unescape_svn_path, parse_svn_revprops
SVN_PROP_BZR_MERGE = 'bzr:merge'
@@ -95,6 +96,13 @@
def get_guessed_layout(self, repository):
return self._layout
+ def check_layout(self, repository, layout):
+ if isinstance(layout, RootLayout):
+ return RootLegacyLayout()
+ elif isinstance(layout, TrunkLayout):
+ return TrunkLegacyLayout(layout.level or 0)
+ raise LayoutUnusable(layout, self)
+
class BzrSvnMappingv2(BzrSvnMappingv1):
"""The second version of the mappings as used in the 0.3.x series.
@@ -193,3 +201,9 @@
def is_branch(self, path, project=None):
return path == ""
+
+ def get_branches(self, repository, revnum, project="", pb=None):
+ return [""]
+
+ def get_tags(self, repository, revnum, project="", pb=None):
+ return []
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-09-04 11:47:09 +0000
+++ b/mapping3/__init__.py 2008-09-05 12:38:20 +0000
@@ -176,9 +176,8 @@
return SchemeDerivedLayout(repository, self.guessed_scheme or self.scheme)
def check_layout(self, repository, layout):
- scheme = scheme_from_layout(layout)
- repository.get_mapping().scheme = scheme
- config_set_scheme(repository, scheme, scheme)
+ self.scheme = scheme_from_layout(layout)
+ config_set_scheme(repository, self.scheme, self.scheme)
@classmethod
def from_repository(cls, repository, _hinted_branch_path=None):
=== modified file 'tests/mapping3/__init__.py'
--- a/tests/mapping3/__init__.py 2008-09-04 21:14:18 +0000
+++ b/tests/mapping3/__init__.py 2008-09-05 12:38:20 +0000
@@ -14,9 +14,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from bzrlib.bzrdir import BzrDir
+from bzrlib.errors import NoSuchRevision
from bzrlib.repository import Repository
from bzrlib.tests import TestCase
+from bzrlib.plugins.svn import format
from bzrlib.plugins.svn.layout import TrunkLayout
from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID, mapping_registry
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps, SVN_PROP_BZR_BRANCHING_SCHEME, set_property_scheme
@@ -273,13 +275,13 @@
def test_set_property_scheme(self):
self.make_checkout(self.repos_url, 'dc')
- repos = Repository.open(repos_url)
+ repos = Repository.open(self.repos_url)
set_property_scheme(repos, ListBranchingScheme(["bla/*"]))
self.client_update("dc")
self.assertEquals("bla/*\n",
self.client_get_prop("dc", SVN_PROP_BZR_BRANCHING_SCHEME))
self.assertEquals("Updating branching scheme for Bazaar.",
- self.client_log(repos_url, 1, 1)[1][3])
+ self.client_log(self.repos_url, 1, 1)[1][3])
def test_fetch_fileid_renames(self):
dc = self.get_commit_editor(self.repos_url)
@@ -381,10 +383,10 @@
self.assertEquals("bla", tree.path2id("bdir"))
def test_store_branching_scheme(self):
- repos_url = self.make_client('d', 'dc')
- repository = Repository.open(repos_url)
+ self.make_checkout(self.repos_url, 'dc')
+ repository = Repository.open(self.repos_url)
repository.set_layout(TrunkLayout(42))
- repository = Repository.open(repos_url)
+ repository = Repository.open(self.repos_url)
self.assertEquals("trunk42", str(repository.get_mapping().scheme))
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-09-04 15:23:13 +0000
+++ b/tests/test_blackbox.py 2008-09-05 12:38:20 +0000
@@ -20,6 +20,7 @@
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.tests import KnownFailure
+from bzrlib.plugins.svn.convert import load_dumpfile
from bzrlib.plugins.svn.layout import RootLayout
from bzrlib.plugins.svn.tests import SubversionTestCase
@@ -293,6 +294,11 @@
""")
self.check_output("", 'svn-import --layout=none %s dc' % filename)
+ load_dumpfile(filename, "realrepo")
+ svnrepo = Repository.open("realrepo")
+ self.assertEquals(uuid, svnrepo.uuid)
+ svnrepo.set_layout(RootLayout())
+ mapping = svnrepo.get_mapping()
newrepos = Repository.open("dc")
self.assertTrue(newrepos.has_revision(
mapping.revision_id_foreign_to_bzr((uuid, 5, ""))))
More information about the bazaar-commits
mailing list