/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 bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2011-06-07 20:59:59 UTC
  • mto: (5954.6.3 795456-eager-test)
  • mto: This revision was merged to the branch mainline in revision 5967.
  • Revision ID: aaron@aaronbentley.com-20110607205959-jrepah8xabua71mj
Include parent id changes for changed inventory entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
394
394
    def _inventory_altered(self):
395
395
        """Get the trans_ids and paths of files needing new inv entries."""
396
396
        new_ids = set()
397
 
        for id_set in [self._new_name, self._new_parent, self._new_id,
 
397
        changed_id = set(t for t in self._new_id
 
398
                         if self._new_id[t] != self.tree_file_id(t))
 
399
        for id_set in [self._new_name, self._new_parent, changed_id,
398
400
                       self._new_executability]:
399
401
            new_ids.update(id_set)
400
402
        changed_kind = set(self._removed_contents)
403
405
        changed_kind = (t for t in changed_kind
404
406
                        if self.tree_kind(t) != self.final_kind(t))
405
407
        new_ids.update(changed_kind)
 
408
        file_id_changed = set(t for t in changed_id if t in self._removed_id)
 
409
        for parent_trans_id in file_id_changed:
 
410
            new_ids.update(self.iter_tree_children(parent_trans_id))
406
411
        return sorted(FinalPaths(self).get_paths(new_ids))
407
412
 
408
413
    def final_kind(self, trans_id):