/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-15 10:44:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070715104412-ghj18yhkvjwpd54b
Fix bug #112173 and bzr branch multiple connections.

* bzrlib/tests/bzrdir_implementations/test_bzrdir.py:
(TestBzrDir.sproutOrSkip): Rework the method now that sprout do
not raises NotLocalUrl anymore.

* bzrlib/bzrdir.py:
(BzrDir.sprout): Add a possible_transports parameter for reuse.
Don't create a working tree on non local transports (bug #112173).
(BzrDirPreSplitOut.sprout): Add a possible_transports
parameter (not used) to comply with the new sprout signature.

* bzrlib/builtins.py:
(cmd_branch.run): Fix the multiple connections bug by reusing the
transport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
from bzrlib.tests.bzrdir_implementations import TestCaseWithBzrDir
52
52
from bzrlib.trace import mutter
53
53
from bzrlib.transport import get_transport
 
54
from bzrlib.transport.local import LocalTransport
54
55
from bzrlib.upgrade import upgrade
55
56
from bzrlib.remote import RemoteBzrDir
56
57
from bzrlib.repofmt import weaverepo
128
129
        A simple wrapper for from_bzrdir.sprout that translates NotLocalUrl into
129
130
        TestSkipped.  Returns the newly sprouted bzrdir.
130
131
        """
131
 
        try:
132
 
            target = from_bzrdir.sprout(to_url, revision_id=revision_id,
133
 
                                        force_new_repo=force_new_repo)
134
 
        except errors.NotLocalUrl:
 
132
        to_transport = get_transport(to_url)
 
133
        if not isinstance(to_transport, LocalTransport):
135
134
            raise TestSkipped('Cannot sprout to remote bzrdirs.')
 
135
        target = from_bzrdir.sprout(to_url, revision_id=revision_id,
 
136
                                    force_new_repo=force_new_repo,
 
137
                                    possible_transports=[to_transport])
136
138
        return target
137
139
 
138
140
    def test_create_null_workingtree(self):