← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
333
333
 
334
334
        # we have topological order of revisions and non ghost parents ready.
335
335
        self._setup_steps(len(self.revisions))
336
 
        graph = self.revisions.get_graph()
337
 
        parent_map = self.revisions.get_parent_map(graph.keys())
 
336
        revision_ids = self.revisions.versions()
 
337
        graph = self.revisions.get_parent_map(revision_ids)
338
338
        for rev_id in TopoSorter(graph.items()).iter_topo_order():
339
 
            parents = parent_map[rev_id]
 
339
            parents = graph[rev_id]
340
340
            # double check this really is in topological order, ignoring existing ghosts.
341
341
            unavailable = [p for p in parents if p not in new_inventory_vf and
342
342
                p in self.revisions]