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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-01 21:13:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180701211321-dazu15ry3tcvny2l
Fix some git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/repository.py
35
35
from ...foreign import (
36
36
    ForeignRepository,
37
37
    )
 
38
from ...sixish import viewvalues
38
39
 
39
40
from .commit import (
40
41
    GitCommitBuilder,
430
431
                    this_parent_map[revid] = parents
431
432
            parent_map.update(this_parent_map)
432
433
            pending = set()
433
 
            map(pending.update, this_parent_map.itervalues())
 
434
            map(pending.update, viewvalues(this_parent_map))
434
435
            pending = pending.difference(parent_map)
435
436
        return _mod_graph.KnownGraph(parent_map)
436
437
 
460
461
        :raise KeyError: If foreign revision was not found
461
462
        :return: bzr revision id
462
463
        """
463
 
        if type(foreign_revid) is not str:
 
464
        if not isinstance(foreign_revid, bytes):
464
465
            raise TypeError(foreign_revid)
465
466
        if mapping is None:
466
467
            mapping = self.get_mapping()