/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/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
48
48
    hooks,
49
49
    registry,
50
50
    )
 
51
from .sixish import (
 
52
    viewitems,
 
53
    )
51
54
# TODO: Report back as changes are merged in
52
55
 
53
56
 
2289
2292
        filtered_parent_map = {}
2290
2293
        child_map = {}
2291
2294
        tails = []
2292
 
        for key, parent_keys in parent_map.iteritems():
 
2295
        for key, parent_keys in viewitems(parent_map):
2293
2296
            culled_parent_keys = [p for p in parent_keys if p in parent_map]
2294
2297
            if not culled_parent_keys:
2295
2298
                tails.append(key)