/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/inventory.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:
29
29
# created, but it's not for now.
30
30
ROOT_ID = "TREE_ROOT"
31
31
 
32
 
from brzlib.lazy_import import lazy_import
 
32
from breezy.lazy_import import lazy_import
33
33
lazy_import(globals(), """
34
34
import collections
35
35
import copy
36
36
import re
37
37
import tarfile
38
38
 
39
 
from brzlib import (
 
39
from breezy import (
40
40
    chk_map,
41
41
    errors,
42
42
    generate_ids,
44
44
    )
45
45
""")
46
46
 
47
 
from brzlib import (
 
47
from breezy import (
48
48
    lazy_regex,
49
49
    trace,
50
50
    )
51
51
 
52
 
from brzlib.static_tuple import StaticTuple
53
 
from brzlib.symbol_versioning import (
 
52
from breezy.static_tuple import StaticTuple
 
53
from breezy.symbol_versioning import (
54
54
    deprecated_in,
55
55
    deprecated_method,
56
56
    )
454
454
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
455
455
             output_to, reverse=False):
456
456
        """See InventoryEntry._diff."""
457
 
        from brzlib.diff import DiffText
 
457
        from breezy.diff import DiffText
458
458
        from_file_id = self.file_id
459
459
        if to_entry:
460
460
            to_file_id = to_entry.file_id
550
550
    def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
551
551
             output_to, reverse=False):
552
552
        """See InventoryEntry._diff."""
553
 
        from brzlib.diff import DiffSymlink
 
553
        from breezy.diff import DiffSymlink
554
554
        old_target = self.symlink_target
555
555
        if to_entry is not None:
556
556
            new_target = to_entry.symlink_target
810
810
        return delta
811
811
 
812
812
    def make_entry(self, kind, name, parent_id, file_id=None):
813
 
        """Simple thunk to brzlib.inventory.make_entry."""
 
813
        """Simple thunk to breezy.inventory.make_entry."""
814
814
        return make_entry(kind, name, parent_id, file_id)
815
815
 
816
816
    def entries(self):
2241
2241
        accessed on this platform by the normalized path.
2242
2242
    :return: The NFC normalised version of name.
2243
2243
    """
2244
 
    #------- This has been copied to brzlib.dirstate.DirState.add, please
 
2244
    #------- This has been copied to breezy.dirstate.DirState.add, please
2245
2245
    # keep them synchronised.
2246
2246
    # we dont import normalized_filename directly because we want to be
2247
2247
    # able to change the implementation at runtime for tests.