← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 18:18:18 UTC
  • mfrom: (4618.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817181818-6ks7pxgiwpqvsd3l
(vila) Make selftest --parallel=fork work again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
33
33
    repofmt,
34
34
    )
35
35
from bzrlib.trace import mutter, note
36
 
from bzrlib.tsort import topo_sort
 
36
from bzrlib.tsort import TopoSorter
37
37
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
38
38
 
39
39
 
247
247
 
248
248
        # we have topological order of revisions and non ghost parents ready.
249
249
        self._setup_steps(len(self._rev_graph))
250
 
        revision_keys = [(rev_id,) for rev_id in topo_sort(self._rev_graph)]
 
250
        revision_keys = [(rev_id,) for rev_id in
 
251
            TopoSorter(self._rev_graph.items()).iter_topo_order()]
251
252
        stream = self._change_inv_parents(
252
253
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
253
254
            self._new_inv_parents,
377
378
        new_inventories = self.repo._temp_inventories()
378
379
        # we have topological order of revisions and non ghost parents ready.
379
380
        graph = self.revisions.get_parent_map(self.revisions.keys())
380
 
        revision_keys = topo_sort(graph)
 
381
        revision_keys = list(TopoSorter(graph).iter_topo_order())
381
382
        revision_ids = [key[-1] for key in revision_keys]
382
383
        self._setup_steps(len(revision_keys))
383
384
        stream = self._change_inv_parents(