/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
 
20
22
from .. import (
21
23
    check,
22
24
    errors,
32
34
from ..foreign import (
33
35
    ForeignRepository,
34
36
    )
 
37
from ..sixish import (
 
38
    viewitems,
 
39
    viewvalues,
 
40
    )
35
41
 
36
42
from .commit import (
37
43
    GitCommitBuilder,
292
298
        for (file_id, revision_id, identifier) in desired_files:
293
299
            per_revision.setdefault(revision_id, []).append(
294
300
                (file_id, identifier))
295
 
        for revid, files in per_revision.items():
 
301
        for revid, files in viewitems(per_revision):
296
302
            try:
297
303
                (commit_id, mapping) = self.lookup_bzr_revision_id(revid)
298
304
            except errors.NoSuchRevision:
404
410
                    this_parent_map[revid] = parents
405
411
            parent_map.update(this_parent_map)
406
412
            pending = set()
407
 
            for values in this_parent_map.values():
 
413
            for values in viewvalues(this_parent_map):
408
414
                pending.update(values)
409
415
            pending = pending.difference(parent_map)
410
416
        return _mod_graph.KnownGraph(parent_map)