/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/fetch.py

Various small changes in aid of making tests pass (including deleting one invalid test).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
44
44
from bzrlib.trace import mutter
45
45
import bzrlib.ui
46
46
 
 
47
from bzrlib.lazy_import import lazy_import
 
48
lazy_import(globals(), '''
 
49
from bzrlib.remote import RemoteRepository
 
50
''')
47
51
 
48
52
# TODO: Avoid repeatedly opening weaves so many times.
49
53
 
88
92
        # result variables.
89
93
        self.failed_revisions = []
90
94
        self.count_copied = 0
 
95
        if isinstance(to_repository, RemoteRepository):
 
96
            to_repository._ensure_real()
 
97
            to_repository = to_repository._real_repository
 
98
        if isinstance(from_repository, RemoteRepository):
 
99
            from_repository._ensure_real()
 
100
            from_repository = from_repository._real_repository
91
101
        if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
92
102
            # check that last_revision is in 'from' and then return a no-operation.
93
103
            if last_revision not in (None, NULL_REVISION):