/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/git/repository.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/repository.py
34
34
from ..foreign import (
35
35
    ForeignRepository,
36
36
    )
37
 
from ..sixish import (
38
 
    viewitems,
39
 
    viewvalues,
40
 
    )
41
37
 
42
38
from .commit import (
43
39
    GitCommitBuilder,
298
294
        for (file_id, revision_id, identifier) in desired_files:
299
295
            per_revision.setdefault(revision_id, []).append(
300
296
                (file_id, identifier))
301
 
        for revid, files in viewitems(per_revision):
 
297
        for revid, files in per_revision.items():
302
298
            try:
303
299
                (commit_id, mapping) = self.lookup_bzr_revision_id(revid)
304
300
            except errors.NoSuchRevision:
410
406
                    this_parent_map[revid] = parents
411
407
            parent_map.update(this_parent_map)
412
408
            pending = set()
413
 
            for values in viewvalues(this_parent_map):
 
409
            for values in this_parent_map.values():
414
410
                pending.update(values)
415
411
            pending = pending.difference(parent_map)
416
412
        return _mod_graph.KnownGraph(parent_map)