/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 breezy/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/bzrdir.py
26
26
from ...controldir import (
27
27
    ControlDir,
28
28
    Converter,
 
29
    MustHaveWorkingTree,
29
30
    format_registry,
30
31
    )
 
32
from ... import (
 
33
    errors,
 
34
    )
31
35
from ...lazy_import import lazy_import
32
36
lazy_import(globals(), """
33
37
import os
34
38
import warnings
35
39
 
36
40
from breezy import (
37
 
    errors,
 
41
    branch as _mod_branch,,
38
42
    graph,
39
43
    lockable_files,
40
44
    lockdir,
903
907
                    "source branch %r is not within %r with branch %r" %
904
908
                    (source_branch, self, my_branch))
905
909
        if stacked:
906
 
            raise errors.UnstackableBranchFormat(
 
910
            raise _mod_branch.UnstackableBranchFormat(
907
911
                self._format, self.root_transport.base)
908
912
        if not create_tree_if_local:
909
 
            raise errors.MustHaveWorkingTree(
 
913
            raise MustHaveWorkingTree(
910
914
                self._format, self.root_transport.base)
911
915
        from .workingtree import WorkingTreeFormat2
912
916
        self._make_tail(url)