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

  • Committer: Robert Collins
  • Date: 2007-11-09 17:50:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2988.
  • Revision ID: robertc@robertcollins.net-20071109175031-agaiy6530rvbprmb
Change (without backwards compatibility) the
iter_lines_added_or_present_in_versions VersionedFile API to yield the
text version that each line is being returned from. This is useful for
reconcile in determining what inventories reference what texts.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
463
463
            # properly, we do not filter down to that
464
464
            # if inserted not in version_ids: continue
465
465
            if line[-1] != '\n':
466
 
                yield line + '\n'
 
466
                yield line + '\n', inserted
467
467
            else:
468
 
                yield line
 
468
                yield line, inserted
469
469
 
470
470
    def _walk_internal(self, version_ids=None):
471
471
        """Helper method for weave actions."""