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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/rename_map.py
177
177
        with ui_factory.nested_progress_bar() as task:
178
178
            iterator = self.tree.iter_changes(basis, want_unversioned=True,
179
179
                                              pb=task)
180
 
            for change in iterator:
181
 
                if change.kind[1] is None and change.versioned[1]:
182
 
                    if not self.tree.has_filename(
183
 
                            self.tree.id2path(change.parent_id[0])):
 
180
            for (file_id, paths, changed_content, versioned, parent, name,
 
181
                 kind, executable) in iterator:
 
182
                if kind[1] is None and versioned[1]:
 
183
                    if not self.tree.has_filename(self.tree.id2path(parent[0])):
184
184
                        missing_parents.setdefault(
185
 
                            change.parent_id[0], set()).add(change.file_id)
186
 
                    if change.kind[0] == 'file':
187
 
                        missing_files.add(change.file_id)
 
185
                            parent[0], set()).add(file_id)
 
186
                    if kind[0] == 'file':
 
187
                        missing_files.add(file_id)
188
188
                    else:
189
189
                        # other kinds are not handled
190
190
                        pass
191
 
                if change.versioned == (False, False):
192
 
                    if self.tree.is_ignored(change.path[1]):
 
191
                if versioned == (False, False):
 
192
                    if self.tree.is_ignored(paths[1]):
193
193
                        continue
194
 
                    if change.kind[1] == 'file':
195
 
                        candidate_files.add(change.path[1])
196
 
                    if change.kind[1] == 'directory':
197
 
                        for _dir, children in self.tree.walkdirs(change.path[1]):
 
194
                    if kind[1] == 'file':
 
195
                        candidate_files.add(paths[1])
 
196
                    if kind[1] == 'directory':
 
197
                        for _dir, children in self.tree.walkdirs(paths[1]):
198
198
                            for child in children:
199
199
                                if child[2] == 'file':
200
200
                                    candidate_files.add(child[0])