Rev 343: Don't use SvnRepository for regular Bazaar branches. (#77023) in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Sun Dec 31 20:59:17 GMT 2006
------------------------------------------------------------
revno: 343
revision-id: jelmer at samba.org-20061231205748-2molb5x3pspz17cx
parent: jelmer at samba.org-20061231200311-yesyt819xp8bbs03
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2006-12-31 21:57:48 +0100
message:
Don't use SvnRepository for regular Bazaar branches. (#77023)
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'NEWS'
--- a/NEWS 2006-12-31 03:39:10 +0000
+++ b/NEWS 2006-12-31 20:57:48 +0000
@@ -27,6 +27,9 @@
* Remove requirement for svn+ prefix. (#75751)
+ * Don't consider SvnRepositories for writing for regular Bazaar
+ branches. (#77023)
+
IMPROVEMENTS
* Implemented SvnRepository.all_revision_ids().
=== modified file 'checkout.py'
--- a/checkout.py 2006-12-31 20:03:11 +0000
+++ b/checkout.py 2006-12-31 20:57:48 +0000
@@ -16,7 +16,8 @@
from binascii import hexlify
from bzrlib.bzrdir import BzrDirFormat, BzrDir
-from bzrlib.errors import NotBranchError, NoSuchFile, InvalidRevisionId
+from bzrlib.errors import (InvalidRevisionId, NotBranchError, NoSuchFile,
+ NoRepositoryPresent)
from bzrlib.inventory import (Inventory, InventoryDirectory, InventoryFile,
ROOT_ID)
from bzrlib.lockable_files import TransportLock, LockableFiles
@@ -500,7 +501,7 @@
def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
# FIXME: honor force_new_repo
result = BzrDirFormat.get_default_format().initialize(url)
- repo = self.open_repository()
+ repo = self.find_repository()
result_repo = repo.clone(result, revision_id, basis)
branch = self.open_branch()
branch.sprout(result, revision_id)
@@ -508,11 +509,10 @@
return result
def open_repository(self):
- repos = SvnRepository(self, self.svn_root_transport)
- return repos
+ raise NoRepositoryPresent(self)
- # Subversion has all-in-one, so a repository is always present
- find_repository = open_repository
+ def find_repository(self):
+ return SvnRepository(self, self.svn_root_transport)
def create_workingtree(self, revision_id=None):
"""See BzrDir.create_workingtree().
@@ -528,7 +528,7 @@
def open_branch(self, unsupported=True):
"""See BzrDir.open_branch()."""
- repos = self.open_repository()
+ repos = self.find_repository()
try:
branch = SvnBranch(self.root_transport.base, repos, self.branch_path)
=== modified file 'format.py'
--- a/format.py 2006-12-31 20:03:11 +0000
+++ b/format.py 2006-12-31 20:57:48 +0000
@@ -88,7 +88,7 @@
:return: instance of SvnRepository.
"""
if self.branch_path == "":
- return SvnRepository(self, SvnRaTransport(self.svn_root_url))
+ return SvnRepository(self, self.root_transport)
raise NoRepositoryPresent(self)
def find_repository(self):
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2006-12-31 20:03:11 +0000
+++ b/tests/__init__.py 2006-12-31 20:57:48 +0000
@@ -231,6 +231,7 @@
testmod_names = [
'test_branch',
'test_branchprops',
+ 'test_checkout',
'test_commit',
'test_convert',
'test_fileids',
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2006-12-22 19:14:38 +0000
+++ b/tests/test_commit.py 2006-12-31 20:57:48 +0000
@@ -210,7 +210,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.open_repository()
+ repos = self.olddir.find_repository()
inv = repos.get_inventory("svn-v%d:2@%s-" % (MAPPING_VERSION, repos.uuid))
self.assertEqual("svn-v%d:2@%s-" % (MAPPING_VERSION, repos.uuid),
inv[inv.path2id('foo/bla')].revision)
@@ -229,7 +229,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.open_repository()
+ repos = self.olddir.find_repository()
inv = repos.get_inventory("svn-v%d:2@%s-" % (MAPPING_VERSION, repos.uuid))
self.assertTrue(inv.has_filename('file'))
self.assertTrue(wt.branch.last_revision() in
@@ -246,7 +246,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.open_repository()
+ repos = self.olddir.find_repository()
inv = repos.get_inventory("svn-v%d:2@%s-" % (MAPPING_VERSION, repos.uuid))
self.assertTrue(inv.has_filename('file'))
self.assertTrue(wt.branch.last_revision() in
@@ -267,7 +267,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.open_repository()
+ repos = self.olddir.find_repository()
self.assertEqual("Commit from Bzr",
repos.get_revision("svn-v%d:2@%s-" % (MAPPING_VERSION, repos.uuid)).message)
@@ -283,7 +283,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.open_repository()
+ repos = self.olddir.find_repository()
self.assertEqual("svn-v%d:3@%s-" % (MAPPING_VERSION, repos.uuid),
self.olddir.open_branch().last_revision())
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2006-12-31 20:03:11 +0000
+++ b/tests/test_repos.py 2006-12-31 20:57:48 +0000
@@ -482,7 +482,7 @@
self.build_tree({'dc/proj1/trunk/file': "data"})
self.client_add("dc/proj1")
self.client_commit("dc", "My Message")
- oldrepos = Repository.open("dc")
+ oldrepos = Repository.open(repos_url)
oldrepos.set_branching_scheme(TrunkBranchingScheme(1))
dir = BzrDir.create("f")
newrepos = dir.create_repository()
@@ -493,7 +493,7 @@
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
self.client_commit("dc", "My Message")
- oldrepos = Repository.open("dc")
+ oldrepos = Repository.open(repos_url)
dir = BzrDir.create("f")
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -512,7 +512,7 @@
self.client_add("dc/foo/blo")
self.client_add("dc/bar")
self.client_commit("dc", "Second Message")
- oldrepos = Repository.open("dc")
+ oldrepos = Repository.open(repos_url)
dir = BzrDir.create("f")
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
@@ -1720,7 +1720,7 @@
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
self.client_commit("dc", "My Message")
- self.repos = Repository.open("dc")
+ self.repos = Repository.open(repos_url)
self.inventory = self.repos.get_inventory(
"svn-v%d:1@%s-" % (MAPPING_VERSION, self.repos.uuid))
self.tree = self.repos.revision_tree(
More information about the bazaar-commits
mailing list