/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/bundle/bundle_data.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
from ..revision import Revision, NULL_REVISION
43
43
from ..sixish import (
44
44
    BytesIO,
 
45
    viewitems,
45
46
    )
46
47
from ..testament import StrictTestament
47
48
from ..trace import mutter, warning
106
107
        revision_info.timestamp = revision.timestamp
107
108
        revision_info.message = revision.message.split('\n')
108
109
        revision_info.properties = [': '.join(p) for p in
109
 
                                    revision.properties.iteritems()]
 
110
                                    viewitems(revision.properties)]
110
111
        return revision_info
111
112
 
112
113
 
252
253
 
253
254
        count = 0
254
255
        missing = {}
255
 
        for revision_id, sha1 in rev_to_sha.iteritems():
 
256
        for revision_id, sha1 in viewitems(rev_to_sha):
256
257
            if repository.has_revision(revision_id):
257
258
                testament = StrictTestament.from_revision(repository,
258
259
                                                          revision_id)
772
773
 
773
774
    def sorted_path_id(self):
774
775
        paths = []
775
 
        for result in self._new_id.iteritems():
 
776
        for result in viewitems(self._new_id):
776
777
            paths.append(result)
777
778
        for id in self.base_tree.all_file_ids():
778
779
            path = self.id2path(id)