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

Use relative imports where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
30
30
    BaseObjectStore,
31
31
    )
32
32
 
33
 
from bzrlib import (
 
33
from ... import (
34
34
    errors,
35
35
    lru_cache,
36
36
    trace,
37
37
    ui,
38
38
    urlutils,
39
39
    )
40
 
from bzrlib.lock import LogicalLockResult
41
 
from bzrlib.revision import (
 
40
from ...lock import LogicalLockResult
 
41
from ...revision import (
42
42
    NULL_REVISION,
43
43
    )
44
 
from bzrlib.testament import(
 
44
from ...testament import(
45
45
    StrictTestament3,
46
46
    )
47
47
 
48
 
from bzrlib.plugins.git.cache import (
 
48
from .cache import (
49
49
    from_repository as cache_from_repository,
50
50
    )
51
 
from bzrlib.plugins.git.mapping import (
 
51
from .mapping import (
52
52
    default_mapping,
53
53
    directory_to_tree,
54
54
    extract_unusual_modes,
55
55
    mapping_registry,
56
56
    symlink_to_blob,
57
57
    )
58
 
from bzrlib.plugins.git.unpeel_map import (
 
58
from .unpeel_map import (
59
59
    UnpeelMap,
60
60
    )
61
61
 
755
755
        f = os.fdopen(fd, 'wb')
756
756
        def commit():
757
757
            from dulwich.pack import PackData, Pack
758
 
            from bzrlib.plugins.git.fetch import import_git_objects
 
758
            from .fetch import import_git_objects
759
759
            os.fsync(fd)
760
760
            f.close()
761
761
            if os.path.getsize(path) == 0: