Rev 997: Fix more tests. in file:///data/jelmer/bzr-svn/layout/
Jelmer Vernooij
jelmer at samba.org
Sat May 3 04:01:30 BST 2008
At file:///data/jelmer/bzr-svn/layout/
------------------------------------------------------------
revno: 997
revision-id: jelmer at samba.org-20080503030128-acod7kobc71t253e
parent: jelmer at samba.org-20080502235457-lh8ppdzxj8pot424
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Sat 2008-05-03 05:01:28 +0200
message:
Fix more tests.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
=== modified file '__init__.py'
--- a/__init__.py 2008-05-02 23:54:57 +0000
+++ b/__init__.py 2008-05-03 03:01:28 +0000
@@ -183,7 +183,6 @@
from bzrlib import urlutils
from convert import convert_repository
from repository import SvnRepository
- from mapping3 import SchemeDerivedLayout
import os
if to_location is None:
@@ -231,7 +230,7 @@
return False
return True
- convert_repository(from_repos, to_location, SchemeDerivedLayout(from_repos, scheme),
+ convert_repository(from_repos, to_location, scheme, None,
not standalone, trees, all, filter_branch=filter_branch)
if tmp_repos is not None:
=== modified file 'convert.py'
--- a/convert.py 2008-05-02 19:36:00 +0000
+++ b/convert.py 2008-05-03 03:01:28 +0000
@@ -80,7 +80,7 @@
return repos
-def convert_repository(source_repos, output_url, layout=None,
+def convert_repository(source_repos, output_url, scheme=None, layout=None,
create_shared_repo=True, working_trees=False, all=False,
format=None, filter_branch=None):
"""Convert a Subversion repository and its' branches to a
@@ -88,6 +88,7 @@
:param source_repos: Subversion repository
:param output_url: URL to write Bazaar repository to.
+ :param scheme: Branching scheme to use.
:param layout: Repository layout (object) to use
:param create_shared_repo: Whether to create a shared Bazaar repository
:param working_trees: Whether to create working trees
@@ -95,6 +96,7 @@
branches, should be imported
:param format: Format to use
"""
+ from mapping3 import SchemeDerivedLayout, set_branching_scheme
assert not all or create_shared_repo
if format is None:
format = get_rich_root_format()
@@ -113,6 +115,9 @@
if layout is not None:
source_repos.set_layout(layout)
+ elif scheme is not None:
+ set_branching_scheme(source_repos, scheme)
+ layout = SchemeDerivedLayout(source_repos, scheme)
else:
layout = source_repos.get_layout()
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-05-02 23:54:57 +0000
+++ b/mapping3/__init__.py 2008-05-03 03:01:28 +0000
@@ -105,7 +105,6 @@
repository.get_config().set_branching_scheme(str(scheme), mandatory=mandatory)
-
class BzrSvnMappingv3(mapping.BzrSvnMapping):
"""The third version of the mappings as used in the 0.4.x series.
=== modified file 'mapping3/scheme.py'
--- a/mapping3/scheme.py 2008-05-02 23:54:57 +0000
+++ b/mapping3/scheme.py 2008-05-03 03:01:28 +0000
@@ -332,7 +332,7 @@
assert isinstance(path, str)
path = path.strip("/")
if not path.startswith(self.path):
- raise InvalidSvnBranchPath(path=path, scheme=self)
+ raise InvalidSvnBranchPath(path, self)
return (path[0:len(self.path)].strip("/"),
path[len(self.path):].strip("/"))
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-05-02 18:37:05 +0000
+++ b/tests/test_convert.py 2008-05-03 03:01:28 +0000
@@ -27,6 +27,7 @@
import os, sys
from convert import convert_repository, NotDumpFile, load_dumpfile
from format import get_rich_root_format
+from mapping3 import set_branching_scheme
from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
@@ -94,7 +95,7 @@
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):
@@ -104,7 +105,7 @@
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):
@@ -140,7 +141,7 @@
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())
@@ -167,14 +168,15 @@
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")))
@@ -184,7 +186,8 @@
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")))
@@ -195,12 +198,13 @@
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()
@@ -212,7 +216,7 @@
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())
@@ -220,7 +224,7 @@
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())
@@ -234,7 +238,7 @@
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")
=== modified file 'tests/test_errors.py'
--- a/tests/test_errors.py 2008-05-02 23:54:57 +0000
+++ b/tests/test_errors.py 2008-05-03 03:01:28 +0000
@@ -20,7 +20,7 @@
from bzrlib.tests import TestCase
from errors import (convert_svn_error, convert_error, InvalidPropertyValue,
- NotSvnBranchPath,
+ NotSvnBranchPath, InvalidSvnBranchPath,
SVN_ERR_UNKNOWN_HOSTNAME)
import svn.core
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-05-02 18:37:05 +0000
+++ b/tests/test_fetch.py 2008-05-03 03:01:28 +0000
@@ -30,6 +30,7 @@
from bzrlib.plugins.svn.errors import InvalidFileName
import format
import remote
+from mapping3 import set_branching_scheme
from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
from transport import SvnRaTransport
@@ -59,7 +60,7 @@
self.client_add("dc/proj1")
self.client_commit("dc", "My Message")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(1))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -103,7 +104,7 @@
self.client_update("dc")
self.client_commit("dc", "strange revision")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -116,7 +117,7 @@
self.client_add("dc/trunk")
self.client_commit("dc", "My Message")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
self.assertRaises(InvalidFileName, oldrepos.copy_content_into, newrepos)
@@ -124,7 +125,7 @@
def test_fetch_null(self):
repos_url = self.make_client('d', 'dc')
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(1))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos, NULL_REVISION)
@@ -184,7 +185,7 @@
self.client_add("dc/trunk")
self.client_commit("dc", "My Message")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -196,7 +197,7 @@
self.client_commit("dc", "My Message")
self.client_set_revprop(repos_url, 1, "bzr:gpg-signature", "SIGNATURE")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -212,7 +213,7 @@
self.client_add(u"dc/trunk/IöC/bar".encode("utf-8"))
self.client_commit("dc", "My Message")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -223,7 +224,7 @@
self.client_add("dc/trunk")
self.client_commit("dc", "My Message")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -237,7 +238,7 @@
self.build_tree({u"dc/trunk/€\x2c": "bar"})
revno = self.client_commit("dc", "My Message2")[0]
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme(0))
+ set_branching_scheme(oldrepos, TrunkBranchingScheme(0))
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -339,7 +340,7 @@
self.client_copy("dc/trunk/mydir", "dc/branches/tmp/abranch")
self.client_commit("dc", "Third Message")
oldrepos = Repository.open("svn+"+repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1223,7 +1224,7 @@
self.client_commit("dc", "split out lib")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1246,7 +1247,7 @@
self.client_commit("dc", "revive old trunk")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1268,7 +1269,7 @@
self.client_commit("dc", "revive old trunk")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1288,7 +1289,7 @@
self.client_commit("dc", "revive old trunk")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1312,7 +1313,7 @@
self.client_commit("dc", "split out lib")
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1336,7 +1337,7 @@
self.client_commit("dc", "foohosts") #4
oldrepos = Repository.open(repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1372,7 +1373,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())
+ set_branching_scheme(repos, TrunkBranchingScheme())
mapping = repos.get_mapping()
@@ -1411,7 +1412,7 @@
self.client_commit("dc", "foohosts") #6
repos = remote.SvnRemoteAccess(SvnRaTransport("svn+"+repos_url), format.SvnRemoteFormat()).find_repository()
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
mapping = repos.get_mapping()
@@ -1627,7 +1628,7 @@
self.client_set_prop("dc/trunk", "some:property", "some data3\n")
self.client_commit("dc", "My 4")
oldrepos = Repository.open("svn+"+repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1664,7 +1665,7 @@
self.client_commit("dc", "Change dir")
oldrepos = Repository.open("svn+"+repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f", format.get_rich_root_format())
newrepos = dir.create_repository()
mapping = oldrepos.get_mapping()
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-05-02 18:37:05 +0000
+++ b/tests/test_fileids.py 2008-05-03 03:01:28 +0000
@@ -22,7 +22,7 @@
from bzrlib.tests import TestCase
from fileids import simple_apply_changes
-from mapping3 import BzrSvnMappingv3FileProps
+from mapping3 import BzrSvnMappingv3FileProps, set_branching_scheme
from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
@@ -254,13 +254,13 @@
self.repos = Repository.open(self.repos_url)
def test_empty(self):
- self.repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(self.repos, 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):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
@@ -269,7 +269,7 @@
self.repos.get_fileid_map(1, "trunk", self.mapping))
def test_change_parent(self):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
@@ -280,7 +280,7 @@
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):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
@@ -293,7 +293,7 @@
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):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
@@ -310,7 +310,7 @@
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):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
@@ -325,7 +325,7 @@
"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):
- self.repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(self.repos, TrunkBranchingScheme())
self.mapping = self.repos.get_mapping()
self.build_tree({"dc/trunk": None})
self.client_add("dc/trunk")
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-05-02 19:07:23 +0000
+++ b/tests/test_repos.py 2008-05-03 03:01:28 +0000
@@ -36,7 +36,7 @@
import format
from mapping import (escape_svn_path, unescape_svn_path,
SVN_PROP_BZR_REVISION_ID)
-from mapping3 import SVN_PROP_BZR_BRANCHING_SCHEME
+from mapping3 import SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme
from mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme,
ListBranchingScheme, SingleBranchingScheme)
from transport import SvnRaTransport
@@ -215,12 +215,12 @@
repos = Repository.open(repos_url)
self.assertEqual(2,
- len(list(repos.all_revision_ids(repos.get_mapping()))))
+ len(list(repos.all_revision_ids(repos.get_layout()))))
def test_all_revs_empty(self):
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual([], list(repos.all_revision_ids()))
def test_all_revs(self):
@@ -235,7 +235,7 @@
self.client_commit("dc", "remove branch")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
mapping = repos.get_mapping()
self.assertEqual([
repos.generate_revision_id(2, "branches/somebranch", mapping),
@@ -246,8 +246,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
self.assertEqual([repos.generate_revision_id(0, '', repos.get_mapping())],
- list(repos.all_revision_ids(
- repos.get_mapping())))
+ list(repos.all_revision_ids(repos.get_layout())))
def test_follow_history_empty_branch(self):
repos_url = self.make_client("a", "dc")
@@ -256,9 +255,9 @@
self.client_add("dc/branches")
self.client_commit("dc", "My Message")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual([repos.generate_revision_id(1, 'trunk', repos.get_mapping())],
- list(repos.all_revision_ids(repos.get_mapping())))
+ list(repos.all_revision_ids(repos.get_layout())))
def test_follow_history_follow(self):
repos_url = self.make_client("a", "dc")
@@ -271,9 +270,9 @@
self.client_commit("dc", "Create branch")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
- items = list(repos.all_revision_ids(repos.get_mapping()))
+ items = list(repos.all_revision_ids(repos.get_layout()))
self.assertEqual([repos.generate_revision_id(2, 'branches/abranch', repos.get_mapping()),
repos.generate_revision_id(1, 'trunk', repos.get_mapping())], items)
@@ -289,7 +288,7 @@
self.client_commit("dc", "My Message")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual(1, len(list(repos.iter_reverse_branch_changes("branches/brancha",
1, TrunkBranchingScheme()))))
@@ -310,7 +309,7 @@
self.client_commit("dc", "My Message2")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual(1, len(list(repos.iter_reverse_branch_changes("branches/brancha",
2, TrunkBranchingScheme()))))
@@ -325,7 +324,7 @@
self.client_add("dc/branches")
self.client_commit("dc", "My Message")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
branches = repos.find_branches()
self.assertEquals(2, len(branches))
self.assertEquals(urlutils.join(repos.base, "branches/brancha"),
@@ -346,7 +345,7 @@
self.client_commit("dc", "My Message 2")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual([("tags/branchab", 2, True),
("tags/brancha", 2, True)],
@@ -362,7 +361,7 @@
self.client_commit("dc", "My Message 2")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual([("branches/branchb", 2, True)],
list(repos.find_branchpaths(TrunkBranchingScheme(), from_revnum=2,
@@ -410,7 +409,7 @@
self.client_commit("dc", "My Message 2")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(repos, TrunkBranchingScheme(1))
self.assertEqual([("t2/branches/brancha", 2, True),
("t2/branches/branchab", 2, True)],
@@ -420,7 +419,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(repos, NoBranchingScheme())
self.assertEqual([("", 0, True)],
list(repos.find_branchpaths(NoBranchingScheme(), to_revnum=0)))
@@ -429,7 +428,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(repos, NoBranchingScheme())
self.assertEqual([("", 0, True)],
list(repos.find_branchpaths(NoBranchingScheme(), to_revnum=0)))
@@ -438,7 +437,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.assertEqual([],
list(repos.find_branchpaths(TrunkBranchingScheme(), to_revnum=0)))
@@ -447,7 +446,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.build_tree({'dc/trunk/foo': "data"})
self.client_add("dc/trunk")
@@ -460,7 +459,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
self.build_tree({'dc/trunk/foo': "data"})
self.client_add("dc/trunk")
@@ -576,7 +575,7 @@
self.client_update("dc")
self.build_tree({'dc/trunk/foo': "data2"})
repository = Repository.open("svn+%s" % repos_url)
- repository.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repository, TrunkBranchingScheme())
self.client_set_prop("dc/trunk", "svk:merge",
"%s:/branches/foo:1\n" % repository.uuid)
self.client_commit("dc", "Second Message")
@@ -646,9 +645,9 @@
def test_store_branching_scheme(self):
repos_url = self.make_client('d', 'dc')
repository = Repository.open(repos_url)
- repository.set_branching_scheme(TrunkBranchingScheme(42))
+ set_branching_scheme(repository, TrunkBranchingScheme(42))
repository = Repository.open(repos_url)
- self.assertEquals("trunk42", str(repository.get_scheme()))
+ self.assertEquals("trunk42", str(repository.get_mapping().scheme))
def test_get_ancestry(self):
repos_url = self.make_client('d', 'dc')
@@ -725,7 +724,7 @@
self.build_tree({'dc/trunk/a': "bloe"})
self.client_commit("dc", "second commit")
repository = Repository.open(repos_url)
- repository.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repository, TrunkBranchingScheme())
mapping = repository.get_mapping()
self.assertEqual({repository.generate_revision_id(1, "trunk", mapping): (),
repository.generate_revision_id(2, "trunk", mapping): (repository.generate_revision_id(1, "trunk", mapping),),
@@ -954,12 +953,12 @@
self.client_commit("dc", "set scheme")
repository = Repository.open("svn+%s" % repos_url)
self.assertEquals(ListBranchingScheme(["trunk", "branches/*", "branches/tmp/*"]).branch_list,
- repository.get_scheme().branch_list)
+ repository.get_mapping().scheme.branch_list)
def test_set_property_scheme(self):
repos_url = self.make_client('d', 'dc')
repos = Repository.open(repos_url)
- repos.set_property_scheme(ListBranchingScheme(["bla/*"]))
+ set_property_scheme(repos, ListBranchingScheme(["bla/*"]))
self.client_update("dc")
self.assertEquals("bla/*\n",
self.client_get_prop("dc", SVN_PROP_BZR_BRANCHING_SCHEME))
@@ -1052,7 +1051,7 @@
self.client_commit("dc", "foohosts") #4
oldrepos = Repository.open("svn+"+repos_url)
- oldrepos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(oldrepos, TrunkBranchingScheme())
dir = BzrDir.create("f",format=format.get_rich_root_format())
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1085,18 +1084,18 @@
def test_set_branching_scheme(self):
repos_url = self.make_client('d', 'dc')
repos = Repository.open(repos_url)
- repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(repos, NoBranchingScheme())
def testlhs_revision_parent_none(self):
repos_url = self.make_client('d', 'dc')
repos = Repository.open(repos_url)
- repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(repos, NoBranchingScheme())
self.assertEquals(None, repos.lhs_revision_parent("", 0, NoBranchingScheme()))
def testlhs_revision_parent_first(self):
repos_url = self.make_client('d', 'dc')
repos = Repository.open(repos_url)
- repos.set_branching_scheme(NoBranchingScheme())
+ set_branching_scheme(repos, NoBranchingScheme())
self.build_tree({'dc/adir/afile': "data"})
self.client_add("dc/adir")
self.client_commit("dc", "Initial commit")
@@ -1115,7 +1114,7 @@
self.build_tree({'dc/trunk/adir/afile': "bla"})
self.client_commit("dc", "Incremental commit")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme())
+ set_branching_scheme(repos, TrunkBranchingScheme())
mapping = repos.get_mapping()
self.assertEquals(repos.generate_revision_id(1, "trunk", mapping), \
repos.lhs_revision_parent("trunk", 2, mapping))
@@ -1131,7 +1130,7 @@
self.build_tree({'dc/de/trunk/adir/afile': "bla"})
self.client_commit("dc", "Change de")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(repos, TrunkBranchingScheme(1))
mapping = repos.get_mapping()
self.assertEquals(repos.generate_revision_id(1, "py/trunk", mapping), \
repos.lhs_revision_parent("de/trunk", 3, mapping))
@@ -1147,7 +1146,7 @@
self.client_copy("dc/py/trunk", "dc/de/trunk")
self.client_commit("dc", "Copy trunk")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(repos, TrunkBranchingScheme(1))
mapping = repos.get_mapping()
self.assertEquals(repos.generate_revision_id(1, "py/trunk", mapping), \
repos.lhs_revision_parent("de/trunk", 2, mapping))
@@ -1163,7 +1162,7 @@
self.client_delete("dc/de/trunk/adir")
self.client_commit("dc", "Another incremental commit")
repos = Repository.open(repos_url)
- repos.set_branching_scheme(TrunkBranchingScheme(1))
+ set_branching_scheme(repos, TrunkBranchingScheme(1))
mapping = repos.get_mapping()
self.assertEquals(repos.generate_revision_id(1, "py/trunk", mapping), \
repos.lhs_revision_parent("de/trunk", 3, mapping))
More information about the bazaar-commits
mailing list