← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Robert Collins
  • Date: 2007-09-03 23:19:00 UTC
  • mfrom: (2791 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2792.
  • Revision ID: robertc@robertcollins.net-20070903231900-j3or8vkiixxpskzm
Fix some inconsistent NEWS indents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
130
130
        :param left_matching_blocks: a hint about which areas are common
131
131
            between the text and its left-hand-parent.  The format is
132
132
            the SequenceMatcher.get_matching_blocks format.
133
 
        :return: An opaque representation of the inserted version which can be
134
 
                 provided back to future add_lines calls in the parent_texts
135
 
                 dictionary.
 
133
        :return: The text sha1, the number of bytes in the text, and an opaque
 
134
                 representation of the inserted version which can be provided
 
135
                 back to future add_lines calls in the parent_texts dictionary.
136
136
        """
137
137
        version_id = osutils.safe_revision_id(version_id)
138
138
        parents = [osutils.safe_revision_id(v) for v in parents]
318
318
                    mpvf.get_diff(parent_ids[0]).num_lines()))
319
319
            else:
320
320
                left_matching_blocks = None
321
 
            version_text = self.add_lines(version, parent_ids, lines,
 
321
            _, _, version_text = self.add_lines(version, parent_ids, lines,
322
322
                vf_parents, left_matching_blocks=left_matching_blocks)
323
323
            vf_parents[version] = version_text
324
324
        for (version, parent_ids, expected_sha1, mpdiff), sha1 in\
687
687
            # deltas = self.source.get_deltas(order)
688
688
            for index, version in enumerate(order):
689
689
                pb.update('Converting versioned data', index, len(order))
690
 
                parent_text = target.add_lines(version,
 
690
                _, _, parent_text = target.add_lines(version,
691
691
                                               self.source.get_parents(version),
692
692
                                               self.source.get_lines(version),
693
693
                                               parent_texts=parent_texts)