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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree_4.py
28
28
import os
29
29
import sys
30
30
 
31
 
from brzlib.lazy_import import lazy_import
 
31
from breezy.lazy_import import lazy_import
32
32
lazy_import(globals(), """
33
33
import errno
34
34
import stat
35
35
 
36
 
from brzlib import (
 
36
from breezy import (
37
37
    bzrdir,
38
38
    cache_utf8,
39
39
    config,
53
53
    )
54
54
""")
55
55
 
56
 
from brzlib.decorators import needs_read_lock, needs_write_lock
57
 
from brzlib.inventory import Inventory, ROOT_ID, entry_factory
58
 
from brzlib.lock import LogicalLockResult
59
 
from brzlib.lockable_files import LockableFiles
60
 
from brzlib.lockdir import LockDir
61
 
from brzlib.mutabletree import (
 
56
from breezy.decorators import needs_read_lock, needs_write_lock
 
57
from breezy.inventory import Inventory, ROOT_ID, entry_factory
 
58
from breezy.lock import LogicalLockResult
 
59
from breezy.lockable_files import LockableFiles
 
60
from breezy.lockdir import LockDir
 
61
from breezy.mutabletree import (
62
62
    MutableTree,
63
63
    needs_tree_write_lock,
64
64
    )
65
 
from brzlib.osutils import (
 
65
from breezy.osutils import (
66
66
    file_kind,
67
67
    isdir,
68
68
    pathjoin,
69
69
    realpath,
70
70
    safe_unicode,
71
71
    )
72
 
from brzlib.symbol_versioning import (
 
72
from breezy.symbol_versioning import (
73
73
    deprecated_in,
74
74
    deprecated_method,
75
75
    )
76
 
from brzlib.transport.local import LocalTransport
77
 
from brzlib.tree import (
 
76
from breezy.transport.local import LocalTransport
 
77
from breezy.tree import (
78
78
    InterTree,
79
79
    InventoryTree,
80
80
    )
81
 
from brzlib.workingtree import (
 
81
from breezy.workingtree import (
82
82
    InventoryWorkingTree,
83
83
    WorkingTree,
84
84
    WorkingTreeFormatMetaDir,
598
598
    def lock_read(self):
599
599
        """See Branch.lock_read, and WorkingTree.unlock.
600
600
 
601
 
        :return: A brzlib.lock.LogicalLockResult.
 
601
        :return: A breezy.lock.LogicalLockResult.
602
602
        """
603
603
        self.branch.lock_read()
604
604
        try:
644
644
    def lock_tree_write(self):
645
645
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
646
646
 
647
 
        :return: A brzlib.lock.LogicalLockResult.
 
647
        :return: A breezy.lock.LogicalLockResult.
648
648
        """
649
649
        self.branch.lock_read()
650
650
        return self._lock_self_write()
652
652
    def lock_write(self):
653
653
        """See MutableTree.lock_write, and WorkingTree.unlock.
654
654
 
655
 
        :return: A brzlib.lock.LogicalLockResult.
 
655
        :return: A breezy.lock.LogicalLockResult.
656
656
        """
657
657
        self.branch.lock_write()
658
658
        return self._lock_self_write()
2032
2032
    def lock_read(self):
2033
2033
        """Lock the tree for a set of operations.
2034
2034
 
2035
 
        :return: A brzlib.lock.LogicalLockResult.
 
2035
        :return: A breezy.lock.LogicalLockResult.
2036
2036
        """
2037
2037
        if not self._locked:
2038
2038
            self._repository.lock_read()
2142
2142
    @classmethod
2143
2143
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
2144
2144
                                                  target):
2145
 
        from brzlib.tests.test__dirstate_helpers import \
 
2145
        from breezy.tests.test__dirstate_helpers import \
2146
2146
            compiled_dirstate_helpers_feature
2147
2147
        test_case.requireFeature(compiled_dirstate_helpers_feature)
2148
 
        from brzlib._dirstate_helpers_pyx import ProcessEntryC
 
2148
        from breezy._dirstate_helpers_pyx import ProcessEntryC
2149
2149
        result = klass.make_source_parent_tree(source, target)
2150
2150
        result[1]._iter_changes = ProcessEntryC
2151
2151
        return result