/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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
163
163
        fp = fingerprint_file(f)
164
164
        f.seek(0)
165
165
        
166
 
        if ie.text_size != None:
 
166
        if ie.text_size is not None:
167
167
            if ie.text_size != fp['size']:
168
168
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
169
169
                        ["inventory expects %d bytes" % ie.text_size,
394
394
    will pass through to InterTree as appropriate.
395
395
    """
396
396
 
397
 
    _optimisers = set()
 
397
    _optimisers = []
398
398
 
399
399
    @needs_read_lock
400
400
    def compare(self, want_unchanged=False, specific_files=None,