Rev 5597: (jelmer) Remove some hardcoded dependencies on weave-era formats in bzrlib in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jan 12 00:43:18 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5597 [merge]
revision-id: pqm at pqm.ubuntu.com-20110112004317-81kxafod33p5lqal
parent: pqm at pqm.ubuntu.com-20110112000841-bsgwos6fnhv9nlc7
parent: jelmer at samba.org-20110111212702-tr36snusedppgpkk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-01-12 00:43:17 +0000
message:
(jelmer) Remove some hardcoded dependencies on weave-era formats in bzrlib
and clean up more imports. (Jelmer Vernooij)
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/per_interrepository/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_workingtree/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2011-01-10 21:31:59 +0000
+++ b/bzrlib/branch.py 2011-01-12 00:43:17 +0000
@@ -1380,13 +1380,8 @@
"""Return the most suitable metadir for a checkout of this branch.
Weaves are used if this branch's repository uses weaves.
"""
- if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
- from bzrlib.repofmt import weaverepo
- format = bzrdir.BzrDirMetaFormat1()
- format.repository_format = weaverepo.RepositoryFormat7()
- else:
- format = self.repository.bzrdir.checkout_metadir()
- format.set_branch_format(self._format)
+ format = self.repository.bzrdir.checkout_metadir()
+ format.set_branch_format(self._format)
return format
def create_clone_on_transport(self, to_transport, revision_id=None,
@@ -2057,7 +2052,7 @@
raise NotImplementedError
if found_repository is None:
found_repository = a_bzrdir.open_repository()
- return BzrBranch(_format=self,
+ return BzrBranchPreSplitOut(_format=self,
_control_files=a_bzrdir._control_files,
a_bzrdir=a_bzrdir,
name=name,
@@ -2698,6 +2693,19 @@
mode=self.bzrdir._get_file_mode())
+class BzrBranchPreSplitOut(BzrBranch):
+
+ def _get_checkout_format(self):
+ """Return the most suitable metadir for a checkout of this branch.
+ Weaves are used if this branch's repository uses weaves.
+ """
+ from bzrlib.repofmt.weaverepo import RepositoryFormat7
+ from bzrlib.bzrdir import BzrDirMetaFormat1
+ format = BzrDirMetaFormat1()
+ format.repository_format = RepositoryFormat7()
+ return format
+
+
class BzrBranch5(BzrBranch):
"""A format 5 branch. This supports new features over plain branches.
=== modified file 'bzrlib/repofmt/weaverepo.py'
--- a/bzrlib/repofmt/weaverepo.py 2011-01-11 20:45:44 +0000
+++ b/bzrlib/repofmt/weaverepo.py 2011-01-12 00:43:17 +0000
@@ -744,9 +744,6 @@
class InterWeaveRepo(InterSameDataRepository):
"""Optimised code paths between Weave based repositories.
-
- This should be in bzrlib/repofmt/weaverepo.py but we have not yet
- implemented lazy inter-object optimisation.
"""
@classmethod
=== modified file 'bzrlib/tests/blackbox/test_exceptions.py'
--- a/bzrlib/tests/blackbox/test_exceptions.py 2010-11-06 15:32:00 +0000
+++ b/bzrlib/tests/blackbox/test_exceptions.py 2011-01-11 21:27:02 +0000
@@ -16,8 +16,6 @@
"""Tests for display of exceptions."""
-from cStringIO import StringIO
-import os
import sys
from bzrlib import (
@@ -27,11 +25,9 @@
osutils,
repository,
tests,
- trace,
)
-from bzrlib.tests import TestCaseInTempDir, TestCase
-from bzrlib.errors import NotBranchError
+from bzrlib.tests import TestCase
class TestExceptionReporting(TestCase):
=== modified file 'bzrlib/tests/per_interrepository/test_interrepository.py'
--- a/bzrlib/tests/per_interrepository/test_interrepository.py 2009-07-10 06:46:10 +0000
+++ b/bzrlib/tests/per_interrepository/test_interrepository.py 2011-01-11 21:27:02 +0000
@@ -19,17 +19,12 @@
import sys
import bzrlib
-import bzrlib.bzrdir as bzrdir
-from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
import bzrlib.errors as errors
import bzrlib.gpg
from bzrlib.inventory import Inventory
import bzrlib.repofmt.weaverepo as weaverepo
-import bzrlib.repository as repository
-from bzrlib.revision import NULL_REVISION, Revision
+from bzrlib.revision import NULL_REVISION
from bzrlib.tests import (
- TestCase,
- TestCaseWithTransport,
TestNotApplicable,
TestSkipped,
)
@@ -67,7 +62,7 @@
if (isinstance(repo, (weaverepo.AllInOneRepository,
weaverepo.WeaveMetaDirRepository))
and sys.platform == 'win32'):
- raise TestSkipped("funky chars does not permitted"
+ raise TestSkipped("funky chars not allowed"
" on this platform in repository"
" %s" % repo.__class__.__name__)
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2010-05-06 23:41:35 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2011-01-11 21:27:02 +0000
@@ -25,10 +25,8 @@
delta as _mod_delta,
errors,
gpg,
- graph,
info,
inventory,
- osutils,
remote,
repository,
revision as _mod_revision,
@@ -37,7 +35,6 @@
upgrade,
versionedfile,
workingtree,
- xml_serializer,
)
from bzrlib.repofmt import (
pack_repo,
@@ -854,9 +851,6 @@
def test_sprout_from_hpss_preserves_format(self):
"""repo.sprout from a smart server preserves the repository format."""
- if self.repository_format == weaverepo.RepositoryFormat7():
- raise tests.TestNotApplicable(
- "Cannot fetch weaves over smart protocol.")
remote_repo = self.make_remote_repository('remote')
local_bzrdir = self.make_bzrdir('local')
try:
=== modified file 'bzrlib/tests/per_workingtree/test_add_reference.py'
--- a/bzrlib/tests/per_workingtree/test_add_reference.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_add_reference.py 2011-01-11 21:27:02 +0000
@@ -16,13 +16,9 @@
import os
-from bzrlib import errors, tests, workingtree, workingtree_4
+from bzrlib import errors, tests, workingtree
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
-TREES_NOT_SUPPORTING_REFERENCES = (workingtree.WorkingTree2,
- workingtree.WorkingTree3,
- workingtree_4.WorkingTree4)
-
class TestBasisInventory(TestCaseWithWorkingTree):
@@ -37,7 +33,7 @@
return tree, sub_tree
def _references_unsupported(self, tree):
- if tree.__class__ in TREES_NOT_SUPPORTING_REFERENCES:
+ if not tree.supports_tree_reference():
raise tests.TestSkipped('Tree format does not support references')
else:
self.fail('%r does not support references but should'
=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py 2010-11-26 17:59:08 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py 2011-01-11 21:27:02 +0000
@@ -19,7 +19,6 @@
from cStringIO import StringIO
import errno
import os
-import sys
from bzrlib import (
branch,
@@ -29,17 +28,22 @@
osutils,
tests,
urlutils,
- workingtree,
- )
-from bzrlib.errors import (NotBranchError, NotVersionedError,
- UnsupportedOperation, PathsNotVersionedError)
+ )
+from bzrlib.errors import (
+ UnsupportedOperation,
+ PathsNotVersionedError,
+ )
from bzrlib.inventory import Inventory
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
from bzrlib.tests import TestSkipped, TestNotApplicable
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
-from bzrlib.trace import mutter
-from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
- WorkingTree, WorkingTree2)
+from bzrlib.workingtree import (
+ TreeDirectory,
+ TreeFile,
+ TreeLink,
+ WorkingTree,
+ WorkingTree2,
+ )
from bzrlib.conflicts import ConflictList, TextConflict, ContentsConflict
=== modified file 'bzrlib/upgrade.py'
--- a/bzrlib/upgrade.py 2010-12-18 18:32:00 +0000
+++ b/bzrlib/upgrade.py 2011-01-11 21:27:02 +0000
@@ -19,12 +19,13 @@
from bzrlib import (
errors,
- osutils,
- repository,
trace,
ui,
)
-from bzrlib.bzrdir import BzrDir, format_registry
+from bzrlib.bzrdir import (
+ BzrDir,
+ format_registry,
+ )
from bzrlib.remote import RemoteBzrDir
More information about the bazaar-commits
mailing list