Rev 882: Don't provide find_repository() implementation. in file:///data/jelmer/bzr-svn/0.4.8/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 11 17:07:32 GMT 2008
At file:///data/jelmer/bzr-svn/0.4.8/
------------------------------------------------------------
revno: 882
revision-id:jelmer at samba.org-20080311170730-cv11bp53lsoxzlk9
parent: jelmer at samba.org-20080311170536-rs1n7ekg4tc3il2u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Tue 2008-03-11 18:07:30 +0100
message:
Don't provide find_repository() implementation.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS 2008-03-11 17:05:36 +0000
+++ b/NEWS 2008-03-11 17:07:30 +0000
@@ -4,6 +4,8 @@
* Fix compatibility with Bazaar 1.2.
+ * Don't provide find_repository() implementation. (#193814)
+
FEATURES
* Add progress bar to fetch initialization code.
=== modified file 'tests/test_checkout.py'
--- a/tests/test_checkout.py 2007-11-13 17:37:02 +0000
+++ b/tests/test_checkout.py 2008-03-11 17:07:30 +0000
@@ -68,7 +68,12 @@
def test_find_repository(self):
self.make_client("d", "dc")
x = self.open_checkout_bzrdir("dc")
- self.assertTrue(hasattr(x.find_repository(), "uuid"))
+ self.assertRaises(NoRepositoryPresent, x.find_repository)
+
+ def test__find_repository(self):
+ self.make_client("d", "dc")
+ x = self.open_checkout_bzrdir("dc")
+ self.assertTrue(hasattr(x._find_repository(), "uuid"))
def test_needs_format_conversion_default(self):
self.make_client("d", "dc")
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-01-28 22:52:09 +0000
+++ b/tests/test_commit.py 2008-03-11 17:07:30 +0000
@@ -309,7 +309,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
inv = repos.get_inventory(repos.generate_revision_id(2, "", "none"))
self.assertEqual(repos.generate_revision_id(2, "", "none"),
inv[inv.path2id('foo/bla')].revision)
@@ -328,7 +328,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
inv = repos.get_inventory(repos.generate_revision_id(2, "", "none"))
self.assertTrue(inv.has_filename('file'))
self.assertEqual(wt.branch.last_revision(),
@@ -344,7 +344,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
inv = repos.get_inventory(repos.generate_revision_id(2, "", "none"))
self.assertTrue(inv.has_filename('file'))
self.assertEquals(wt.branch.last_revision(),
@@ -366,7 +366,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
self.assertEqual("Commit from Bzr",
repos.get_revision(
repos.generate_revision_id(2, "", "none")).message)
@@ -379,7 +379,7 @@
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
self.assertEqual(u"\xe6\xf8\xe5", repos.get_revision(
repos.generate_revision_id(2, "", "none")).message)
@@ -478,7 +478,7 @@
wt.add('file')
wt.commit(message="Commit from Bzr")
self.olddir.open_branch().pull(self.newdir.open_branch())
- repos = self.olddir.find_repository()
+ repos = self.olddir._find_repository()
self.client_update("sc")
self.assertTrue(os.path.exists("sc/foo/trunk/file"))
self.assertFalse(os.path.exists("sc/foo/trunk/filel"))
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-02-01 00:28:08 +0000
+++ b/workingtree.py 2008-03-11 17:07:30 +0000
@@ -748,7 +748,7 @@
# FIXME: honor force_new_repo
# FIXME: Use recurse
result = get_rich_root_format().initialize(url)
- repo = self.find_repository()
+ repo = self._find_repository()
repo.clone(result, revision_id)
branch = self.open_branch()
branch.sprout(result, revision_id)
@@ -759,6 +759,9 @@
raise NoRepositoryPresent(self)
def find_repository(self):
+ raise NoRepositoryPresent(self)
+
+ def _find_repository(self):
return SvnRepository(self, self.svn_root_transport,
self.remote_bzrdir.branch_path)
@@ -781,7 +784,7 @@
def open_branch(self, unsupported=True):
"""See BzrDir.open_branch()."""
- repos = self.find_repository()
+ repos = self._find_repository()
try:
branch = SvnBranch(self.svn_root_transport.base, repos,
More information about the bazaar-commits
mailing list