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

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-05-24 23:39:17 UTC
  • mfrom: (6631.2.3 i_unzipping)
  • Revision ID: breezy.the.bot@gmail.com-20170524233917-mueb4wxk2hr0n0fg
Make use of zip Python 3 compatible

Merged from https://code.launchpad.net/~gz/brz/i_unzipping/+merge/324552

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/versionedfile.py
19
19
from __future__ import absolute_import
20
20
 
21
21
from copy import copy
 
22
from future_builtins import zip
22
23
import os
23
24
import struct
24
25
from zlib import adler32
535
536
                                  if not mpvf.has_version(p))
536
537
        present_parents = set(self.get_parent_map(needed_parents).keys())
537
538
        for parent_id, lines in zip(present_parents,
538
 
                                 self._get_lf_split_line_list(present_parents)):
 
539
                self._get_lf_split_line_list(present_parents)):
539
540
            mpvf.add_version(lines, parent_id, [])
540
 
        for (version, parent_ids, expected_sha1, mpdiff), lines in\
541
 
            zip(records, mpvf.get_line_list(versions)):
 
541
        for (version, parent_ids, expected_sha1, mpdiff), lines in zip(
 
542
                records, mpvf.get_line_list(versions)):
542
543
            if len(parent_ids) == 1:
543
544
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
544
545
                    mpvf.get_diff(parent_ids[0]).num_lines()))
1027
1028
                continue
1028
1029
            mpvf.add_version(chunks_to_lines(record.get_bytes_as('chunked')),
1029
1030
                record.key, [])
1030
 
        for (key, parent_keys, expected_sha1, mpdiff), lines in\
1031
 
            zip(records, mpvf.get_line_list(versions)):
 
1031
        for (key, parent_keys, expected_sha1, mpdiff), lines in zip(
 
1032
                records, mpvf.get_line_list(versions)):
1032
1033
            if len(parent_keys) == 1:
1033
1034
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
1034
1035
                    mpvf.get_diff(parent_keys[0]).num_lines()))
1318
1319
            prefix_keys.append(key[-1])
1319
1320
        return result
1320
1321
 
1321
 
    def _get_all_prefixes(self):
 
1322
    def _iter_all_prefixes(self):
1322
1323
        # Identify all key prefixes.
1323
1324
        # XXX: A bit hacky, needs polish.
1324
1325
        if isinstance(self._mapper, ConstantMapper):
1413
1414
                yield line, prefix + (version,)
1414
1415
 
1415
1416
    def _iter_all_components(self):
1416
 
        for path, prefix in self._get_all_prefixes():
 
1417
        for path, prefix in self._iter_all_prefixes():
1417
1418
            yield prefix, self._get_vf(path)
1418
1419
 
1419
1420
    def keys(self):