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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
136
136
            sorted stream has compression parents strictly before their
137
137
            children.
138
138
        :param include_delta_closure: If True then the closure across any
139
 
            compression parents will be included (in the opaque data).
 
139
            compression parents will be included (in the data content of the
 
140
            stream, not in the emitted records). This guarantees that
 
141
            'fulltext' can be used successfully on every record.
140
142
        :return: An iterator of ContentFactory objects, each of which is only
141
143
            valid until the iterator is advanced.
142
144
        """
695
697
                ch_b = ch_a = True
696
698
                lines_b.append(line)
697
699
            else:
698
 
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
699
 
                                 'killed-base', 'killed-both'), state
 
700
                if state not in ('irrelevant', 'ghost-a', 'ghost-b',
 
701
                        'killed-base', 'killed-both'):
 
702
                    raise AssertionError(state)
700
703
        for struct in outstanding_struct():
701
704
            yield struct
702
705