/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: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/repository.py
17
17
 
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
from .. import (
23
21
    check,
24
22
    errors,
34
32
from ..foreign import (
35
33
    ForeignRepository,
36
34
    )
37
 
from ..sixish import (
38
 
    viewitems,
39
 
    viewvalues,
40
 
    )
41
35
 
42
36
from .commit import (
43
37
    GitCommitBuilder,
298
292
        for (file_id, revision_id, identifier) in desired_files:
299
293
            per_revision.setdefault(revision_id, []).append(
300
294
                (file_id, identifier))
301
 
        for revid, files in viewitems(per_revision):
 
295
        for revid, files in per_revision.items():
302
296
            try:
303
297
                (commit_id, mapping) = self.lookup_bzr_revision_id(revid)
304
298
            except errors.NoSuchRevision:
410
404
                    this_parent_map[revid] = parents
411
405
            parent_map.update(this_parent_map)
412
406
            pending = set()
413
 
            for values in viewvalues(this_parent_map):
 
407
            for values in this_parent_map.values():
414
408
                pending.update(values)
415
409
            pending = pending.difference(parent_map)
416
410
        return _mod_graph.KnownGraph(parent_map)