/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 18:15:53 UTC
  • mfrom: (7045.4.7 python3-s)
  • Revision ID: breezy.the.bot@gmail.com-20180725181553-mz6zhncntlovb8ii
Fix another couple of hundred tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-s/+merge/350749

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/repository.py
338
338
                    raise errors.RevisionNotPresent((fileid, revid), self)
339
339
                try:
340
340
                    obj = tree_lookup_path(
341
 
                        self._git.object_store.__getitem__, root_tree, path)
 
341
                        self._git.object_store.__getitem__, root_tree,
 
342
                        path.encode('utf-8'))
342
343
                    if isinstance(obj, tuple):
343
344
                        (mode, item_id) = obj
344
345
                        obj = self._git.object_store[item_id]
434
435
                    this_parent_map[revid] = parents
435
436
            parent_map.update(this_parent_map)
436
437
            pending = set()
437
 
            map(pending.update, viewvalues(this_parent_map))
 
438
            for values in viewvalues(this_parent_map):
 
439
                pending.update(values)
438
440
            pending = pending.difference(parent_map)
439
441
        return _mod_graph.KnownGraph(parent_map)
440
442