← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2008-08-12 14:03:41 UTC
  • mto: This revision was merged to the branch mainline in revision 3623.
  • Revision ID: aaron@aaronbentley.com-20080812140341-nytxmmhztdg5zxfh
Compensate for stale entries in TT._needs_rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
470
470
        """
471
471
        new_ids = set()
472
472
        if filesystem_only:
473
 
            id_sets = (self._needs_rename, self._new_executability)
 
473
            active_ids = set(self._new_name)
 
474
            active_ids.update(self._new_parent)
 
475
            active_ids.update(self._new_contents)
 
476
            active_ids.update(self._new_id)
 
477
            needs_rename = set(self._needs_rename)
 
478
            bad_ids = needs_rename.symmetric_difference(active_ids)
 
479
            needs_rename.difference_update(bad_ids)
 
480
            id_sets = (needs_rename, self._new_executability)
474
481
        else:
475
482
            id_sets = (self._new_name, self._new_parent, self._new_contents,
476
483
                       self._new_id, self._new_executability)