/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/tree.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-15 00:44:57 UTC
  • mfrom: (2009 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2050.
  • Revision ID: john@arbash-meinel.com-20060915004457-902cec0526a39337
[merge] bzr.dev 2009

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
147
147
        fp = fingerprint_file(f)
148
148
        f.seek(0)
149
149
        
150
 
        if ie.text_size != None:
 
150
        if ie.text_size is not None:
151
151
            if ie.text_size != fp['size']:
152
152
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
153
153
                        ["inventory expects %d bytes" % ie.text_size,
220
220
        return iter([])
221
221
    
222
222
    def __contains__(self, file_id):
223
 
        return file_id in self._inventory
 
223
        return (file_id in self._inventory)
224
224
 
225
225
    def get_file_sha1(self, file_id, path=None):
226
226
        return None
375
375
    will pass through to InterTree as appropriate.
376
376
    """
377
377
 
378
 
    _optimisers = set()
 
378
    _optimisers = []
379
379
 
380
380
    @needs_read_lock
381
381
    def compare(self, want_unchanged=False, specific_files=None,