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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/weave.py
392
392
    def _add_lines(self, version_id, parents, lines, parent_texts,
393
393
       left_matching_blocks, nostore_sha, random_id, check_content):
394
394
        """See VersionedFile.add_lines."""
395
 
        idx = self._add(version_id, lines, map(self._lookup, parents),
 
395
        idx = self._add(version_id, lines, list(map(self._lookup, parents)),
396
396
            nostore_sha=nostore_sha)
397
397
        return sha_strings(lines), sum(map(len, lines)), idx
398
398