/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/bzr/bundle/serializer/v4.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-07 14:46:08 UTC
  • mfrom: (7490.3.7 work)
  • mto: This revision was merged to the branch mainline in revision 7497.
  • Revision ID: jelmer@jelmer.uk-20200307144608-3yx04ocg1lb5mqk4
Merge brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/bundle/serializer/v4.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
import bz2
 
18
from io import (
 
19
    BytesIO,
 
20
    )
20
21
import re
21
22
 
22
23
from .... import (
38
39
    )
39
40
from .. import bundle_data, serializer as bundle_serializer
40
41
from ....i18n import ngettext
41
 
from ....sixish import (
42
 
    BytesIO,
43
 
    viewitems,
44
 
    )
45
42
 
46
43
 
47
44
class _MPDiffInventoryGenerator(_mod_versionedfile._MPDiffGenerator):
335
332
        text_keys = []
336
333
        altered_fileids = self.repository.fileids_altered_by_revision_ids(
337
334
            self.revision_ids)
338
 
        for file_id, revision_ids in viewitems(altered_fileids):
 
335
        for file_id, revision_ids in altered_fileids.items():
339
336
            for revision_id in revision_ids:
340
337
                text_keys.append((file_id, revision_id))
341
338
        self._add_mp_records_keys('file', self.repository.texts, text_keys)