/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

merge with bzr.dev and put the NEWS entry in the IN DEVELOPMENT section

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
121
121
        self._non_present_ids = {}
122
122
        # Mapping of new file_id -> trans_id
123
123
        self._r_new_id = {}
124
 
        # Set of file_ids that will be removed
 
124
        # Set of trans_ids that will be removed
125
125
        self._removed_id = set()
126
126
        # Mapping of path in old tree -> trans_id
127
127
        self._tree_path_ids = {}
1649
1649
    def has_id(self, file_id):
1650
1650
        if file_id in self._transform._r_new_id:
1651
1651
            return True
1652
 
        elif file_id in self._transform._removed_id:
 
1652
        elif file_id in set([self._transform.tree_file_id(trans_id) for
 
1653
            trans_id in self._transform._removed_id]):
1653
1654
            return False
1654
1655
        else:
1655
1656
            return self._transform._tree.has_id(file_id)