← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2005-10-17 11:56:54 UTC
  • mfrom: (1185.16.59)
  • Revision ID: robertc@robertcollins.net-20051017115654-662239e1587524a8
merge from martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
179
179
        path = inv.id2path(file_id)
180
180
        return bzrlib.osutils.lexists(self.abspath(path))
181
181
 
 
182
    def has_or_had_id(self, file_id):
 
183
        if file_id == self.inventory.root.file_id:
 
184
            return True
 
185
        return self.inventory.has_id(file_id)
182
186
 
183
187
    __contains__ = has_id
184
188
    
391
395
        else:
392
396
            return None
393
397
 
 
398
    def kind(self, file_id):
 
399
        return file_kind(self.id2abspath(file_id))
 
400
 
394
401
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
395
402
def get_conflicted_stem(path):
396
403
    for suffix in CONFLICT_SUFFIXES: