← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
133
133
        return self.has_id(file_id)
134
134
 
135
135
    def has_or_had_id(self, file_id):
136
 
        if file_id == self.inventory.root.file_id:
137
 
            return True
138
136
        return self.inventory.has_id(file_id)
139
137
 
140
138
    def is_ignored(self, filename):
825
823
        new_pending = set()
826
824
        for file_id in pending:
827
825
            for tree in trees:
828
 
                if not tree.has_id(file_id):
 
826
                if not tree.has_or_had_id(file_id):
829
827
                    continue
830
828
                for child_id in tree.iter_children(file_id):
831
829
                    if child_id not in interesting_ids: