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

Use relative imports where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
45
45
import stat
46
46
import sys
47
47
 
48
 
from bzrlib import (
 
48
from ... import (
49
49
    errors,
50
50
    conflicts as _mod_conflicts,
51
51
    ignores,
56
56
    tree,
57
57
    workingtree,
58
58
    )
59
 
from bzrlib.decorators import (
 
59
from ...decorators import (
60
60
    needs_read_lock,
61
61
    )
62
 
from bzrlib.mutabletree import needs_tree_write_lock
63
 
 
64
 
 
65
 
from bzrlib.plugins.git.dir import (
 
62
from ...mutabletree import needs_tree_write_lock
 
63
 
 
64
 
 
65
from .dir import (
66
66
    LocalGitDir,
67
67
    )
68
 
from bzrlib.plugins.git.tree import (
 
68
from .tree import (
69
69
    changes_from_git_changes,
70
70
    tree_delta_from_git_changes,
71
71
    )
72
 
from bzrlib.plugins.git.mapping import (
 
72
from .mapping import (
73
73
    GitFileIdMap,
74
74
    mode_kind,
75
75
    )
832
832
 
833
833
    @property
834
834
    def _matchingbzrdir(self):
835
 
        from bzrlib.plugins.git.dir import LocalGitControlDirFormat
 
835
        from .dir import LocalGitControlDirFormat
836
836
        return LocalGitControlDirFormat()
837
837
 
838
838
    def get_format_description(self):
858
858
 
859
859
    @classmethod
860
860
    def is_compatible(cls, source, target):
861
 
        from bzrlib.plugins.git.repository import GitRevisionTree
 
861
        from .repository import GitRevisionTree
862
862
        return (isinstance(source, GitRevisionTree) and
863
863
                isinstance(target, GitWorkingTree))
864
864