/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/bzr/dirstate.py

  • Committer: Breezy landing bot
  • Author(s): Gustav Hartvigsson
  • Date: 2021-01-10 18:46:30 UTC
  • mfrom: (7526.1.1 brz-removed-api-doc)
  • mto: This revision was merged to the branch mainline in revision 7532.
  • Revision ID: breezy.the.bot@gmail.com-20210110184630-dxu0g9dqq020uiw6
Drop documentation for removed API API.

Merged from https://code.launchpad.net/~gustav-hartvigsson/brz/removed-api-doc/+merge/396033

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/dirstate.py
243
243
    trace,
244
244
    urlutils,
245
245
    )
246
 
from ..tree import TreeChange
 
246
from .inventorytree import InventoryTreeChange
247
247
 
248
248
 
249
249
# This is the Windows equivalent of ENOTDIR
523
523
                    file_id_entry[0][0], file_id_entry[0][1])
524
524
                kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
525
525
                info = '%s:%s' % (kind, path)
526
 
                raise errors.DuplicateFileId(file_id, info)
 
526
                raise inventory.DuplicateFileId(file_id, info)
527
527
        first_key = (dirname, basename, b'')
528
528
        block_index, present = self._find_block_index_from_key(first_key)
529
529
        if present:
3759
3759
                    else:
3760
3760
                        path_u = self.utf8_decode(path)[0]
3761
3761
                source_kind = DirState._minikind_to_kind[source_minikind]
3762
 
                return TreeChange(
 
3762
                return InventoryTreeChange(
3763
3763
                    entry[0][2],
3764
3764
                    (old_path_u, path_u),
3765
3765
                    content_change,
3788
3788
                        and stat.S_IEXEC & path_info[3].st_mode)
3789
3789
                else:
3790
3790
                    target_exec = target_details[3]
3791
 
                return TreeChange(
 
3791
                return InventoryTreeChange(
3792
3792
                    entry[0][2],
3793
3793
                    (None, self.utf8_decode(path)[0]),
3794
3794
                    True,
3799
3799
                    (None, target_exec)), True
3800
3800
            else:
3801
3801
                # Its a missing file, report it as such.
3802
 
                return TreeChange(
 
3802
                return InventoryTreeChange(
3803
3803
                    entry[0][2],
3804
3804
                    (None, self.utf8_decode(path)[0]),
3805
3805
                    False,
3819
3819
                self.source_index, path_utf8=entry[0][0])[0][2]
3820
3820
            if parent_id == entry[0][2]:
3821
3821
                parent_id = None
3822
 
            return TreeChange(
 
3822
            return InventoryTreeChange(
3823
3823
                entry[0][2],
3824
3824
                (self.utf8_decode(old_path)[0], None),
3825
3825
                True,
3961
3961
                new_executable = bool(
3962
3962
                    stat.S_ISREG(root_dir_info[3].st_mode)
3963
3963
                    and stat.S_IEXEC & root_dir_info[3].st_mode)
3964
 
                yield TreeChange(
 
3964
                yield InventoryTreeChange(
3965
3965
                    None,
3966
3966
                    (None, current_root_unicode),
3967
3967
                    True,
4044
4044
                                new_executable = bool(
4045
4045
                                    stat.S_ISREG(current_path_info[3].st_mode)
4046
4046
                                    and stat.S_IEXEC & current_path_info[3].st_mode)
4047
 
                                yield TreeChange(
 
4047
                                yield InventoryTreeChange(
4048
4048
                                    None,
4049
4049
                                    (None, utf8_decode(current_path_info[0])[0]),
4050
4050
                                    True,
4180
4180
                                except UnicodeDecodeError:
4181
4181
                                    raise errors.BadFilenameEncoding(
4182
4182
                                        current_path_info[0], osutils._fs_enc)
4183
 
                                yield TreeChange(
 
4183
                                yield InventoryTreeChange(
4184
4184
                                    None,
4185
4185
                                    (None, relpath_unicode),
4186
4186
                                    True,