← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-31 16:12:57 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060731161257-91a231523255332c
new official bzr.ico

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
403
403
            version_ids,
404
404
            ignore_missing)
405
405
 
406
 
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
407
 
                                                pb=None):
 
406
    def iter_lines_added_or_present_in_versions(self, version_ids=None):
408
407
        """Iterate over the lines in the versioned file from version_ids.
409
408
 
410
409
        This may return lines from other versions, and does not return the
413
412
        thinks is relevant, but given that such hints are just guesses,
414
413
        its better not to have it if we don't need it.
415
414
 
416
 
        If a progress bar is supplied, it may be used to indicate progress.
417
 
        The caller is responsible for cleaning up progress bars (because this
418
 
        is an iterator).
419
 
 
420
415
        NOTES: Lines are normalised: they will all have \n terminators.
421
416
               Lines are returned in arbitrary order.
422
417
        """
563
558
    InterVersionedFile.get(other).method_name(parameters).
564
559
    """
565
560
 
566
 
    _optimisers = []
 
561
    _optimisers = set()
567
562
    """The available optimised InterVersionedFile types."""
568
563
 
569
564
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):