/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: John Arbash Meinel
  • Date: 2009-08-04 14:10:09 UTC
  • mfrom: (4585 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4588.
  • Revision ID: john@arbash-meinel.com-20090804141009-uety2n17v1atk5ok
Merge bzr.dev 4585, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1718
1718
    def __iter__(self):
1719
1719
        return iter(self.all_file_ids())
1720
1720
 
1721
 
    def has_id(self, file_id):
 
1721
    def _has_id(self, file_id, fallback_check):
1722
1722
        if file_id in self._transform._r_new_id:
1723
1723
            return True
1724
1724
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1725
1725
            trans_id in self._transform._removed_id]):
1726
1726
            return False
1727
1727
        else:
1728
 
            return self._transform._tree.has_id(file_id)
 
1728
            return fallback_check(file_id)
 
1729
 
 
1730
    def has_id(self, file_id):
 
1731
        return self._has_id(file_id, self._transform._tree.has_id)
 
1732
 
 
1733
    def has_or_had_id(self, file_id):
 
1734
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
1729
1735
 
1730
1736
    def _path2trans_id(self, path):
1731
1737
        # We must not use None here, because that is a valid value to store.
2079
2085
        self.transform = transform
2080
2086
 
2081
2087
    def _determine_path(self, trans_id):
2082
 
        if trans_id == self.transform.root:
 
2088
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
2083
2089
            return ""
2084
2090
        name = self.transform.final_name(trans_id)
2085
2091
        parent_id = self.transform.final_parent(trans_id)