Rev 1894: Set layout explicitly. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Tue Sep 9 19:09:42 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1894
revision-id: jelmer at samba.org-20080909180935-r7512zi3wtabcvxi
parent: jelmer at samba.org-20080909164141-o9mbxtrh5k88dff7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-09 20:09:35 +0200
message:
Set layout explicitly.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/mapping3/__init__.py __init__.py-20080831152358-oy04n53cpnh64aj6-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
=== modified file 'mapping.py'
--- a/mapping.py 2008-09-09 16:41:41 +0000
+++ b/mapping.py 2008-09-09 18:09:35 +0000
@@ -723,7 +723,7 @@
mapping_registry.register_lazy('v4', 'bzrlib.plugins.svn.mapping4',
'BzrSvnMappingv4',
'Fourth format (bzr-svn 0.5.x)')
-mapping_registry.set_default('v3')
+mapping_registry.set_default('v4')
def find_mapping(revprops, fileprops):
=== modified file 'tests/mapping3/__init__.py'
--- a/tests/mapping3/__init__.py 2008-09-09 13:36:52 +0000
+++ b/tests/mapping3/__init__.py 2008-09-09 18:09:35 +0000
@@ -19,8 +19,9 @@
from bzrlib.repository import Repository
from bzrlib.tests import TestCase
from bzrlib.trace import mutter
+from bzrlib.workingtree import WorkingTree
-from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import format, ra
from bzrlib.plugins.svn.layout import TrunkLayout, RootLayout
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
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-09-09 12:25:50 +0000
+++ b/tests/test_fetch.py 2008-09-09 18:09:35 +0000
@@ -29,7 +29,7 @@
from bzrlib.plugins.svn import format, remote
from bzrlib.plugins.svn.convert import load_dumpfile
from bzrlib.plugins.svn.errors import InvalidFileName
-from bzrlib.plugins.svn.layout import TrunkLayout
+from bzrlib.plugins.svn.layout import TrunkLayout, RootLayout
from bzrlib.plugins.svn.tests import SubversionTestCase
from bzrlib.plugins.svn.transport import SvnRaTransport
@@ -272,6 +272,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -298,6 +299,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -329,6 +331,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -450,6 +453,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -591,6 +595,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -737,6 +742,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -917,6 +923,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1058,6 +1065,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1221,6 +1229,7 @@
load_dumpfile("dumpfile", "old")
oldrepos = Repository.open("old")
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1477,6 +1486,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1502,6 +1512,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1526,6 +1537,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1572,6 +1584,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1596,6 +1609,7 @@
oldrepos = Repository.open(repos_url)
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
+ oldrepos.set_layout(RootLayout())
oldrepos.copy_content_into(newrepos)
mapping = oldrepos.get_mapping()
self.assertTrue(newrepos.has_revision(
@@ -1620,6 +1634,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1686,6 +1701,7 @@
dc.close()
oldrepos = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-09-04 11:47:09 +0000
+++ b/tests/test_fileids.py 2008-09-09 18:09:35 +0000
@@ -61,6 +61,7 @@
dc.close()
repository = Repository.open(repos_url)
+ oldrepos.set_layout(RootLayout())
mapping = repository.get_mapping()
inv1 = repository.get_inventory(
More information about the bazaar-commits
mailing list