/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/bzr/vf_repository.py

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
from breezy import (
27
27
    config as _mod_config,
28
28
    debug,
29
 
    fetch as _mod_fetch,
30
29
    fifo_cache,
31
30
    gpg,
32
31
    graph,
38
37
    ui,
39
38
    )
40
39
from breezy.bzr import (
 
40
    fetch as _mod_fetch,
41
41
    check,
42
42
    inventory_delta,
43
43
    inventorytree,
2285
2285
        :return: None.
2286
2286
        """
2287
2287
        if self.target._format.experimental:
2288
 
            ui.ui_factory.show_user_warning('experimental_format_fetch',
2289
 
                                            from_format=self.source._format,
2290
 
                                            to_format=self.target._format)
2291
 
        from breezy.fetch import RepoFetcher
 
2288
            ui.ui_factory.show_user_warning(
 
2289
                'experimental_format_fetch',
 
2290
                from_format=self.source._format,
 
2291
                to_format=self.target._format)
 
2292
        from breezy.bzr.fetch import RepoFetcher
2292
2293
        # See <https://launchpad.net/bugs/456077> asking for a warning here
2293
2294
        if self.source._format.network_name() != self.target._format.network_name():
2294
 
            ui.ui_factory.show_user_warning('cross_format_fetch',
2295
 
                                            from_format=self.source._format,
2296
 
                                            to_format=self.target._format)
 
2295
            ui.ui_factory.show_user_warning(
 
2296
                'cross_format_fetch', from_format=self.source._format,
 
2297
                to_format=self.target._format)
2297
2298
        with self.lock_write():
2298
2299
            f = RepoFetcher(to_repository=self.target,
2299
2300
                            from_repository=self.source,