/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

  • Committer: John Arbash Meinel
  • Date: 2006-10-06 05:53:44 UTC
  • mfrom: (2063 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
[merge] bzr.dev 2063

Show diffs side-by-side

added added

removed removed

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