← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
997
997
        new_paths = self.new_paths()
998
998
        modified_paths = []
999
999
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1000
        completed_new = []
1000
1001
        try:
1001
1002
            for num, (path, trans_id) in enumerate(new_paths):
1002
1003
                new_entry = None
1019
1020
                            self.rename_count += 1
1020
1021
                    if trans_id in self._new_contents:
1021
1022
                        modified_paths.append(full_path)
1022
 
                        del self._new_contents[trans_id]
 
1023
                        completed_new.append(trans_id)
1023
1024
 
1024
1025
                if trans_id in self._new_id:
1025
1026
                    if kind is None:
1064
1065
                                            new_entry))
1065
1066
        finally:
1066
1067
            child_pb.finished()
 
1068
        for trans_id in completed_new:
 
1069
            del self._new_contents[trans_id]
1067
1070
        return modified_paths
1068
1071
 
1069
1072
    def _set_executability(self, path, entry, trans_id):