← Back to branch summary

~bzr-pqm/bzr/bzr.dev

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