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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-22 22:46:24 UTC
  • mfrom: (7490.40.105 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200822224624-om4a4idsr7cn8jew
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/inventorytree.py
104
104
    def is_reparented(self):
105
105
        return self.parent_id[0] != self.parent_id[1]
106
106
 
 
107
    @property
 
108
    def renamed(self):
 
109
        return (
 
110
            not self.copied and
 
111
            None not in self.name and
 
112
            None not in self.parent_id and
 
113
            (self.name[0] != self.name[1] or self.parent_id[0] != self.parent_id[1]))
 
114
 
107
115
    def discard_new(self):
108
116
        return self.__class__(
109
117
            self.file_id, (self.path[0], None), self.changed_content,
1010
1018
            subdirs = []
1011
1019
            for name, child in entry.sorted_children():
1012
1020
                toppath = relroot + name
1013
 
                dirblock.append((toppath, name, child.kind, None,
1014
 
                                 child.kind))
 
1021
                dirblock.append((toppath, name, child.kind, None, child.kind))
1015
1022
                if child.kind == _directory:
1016
1023
                    subdirs.append((toppath, child.file_id))
1017
1024
            yield root, dirblock