← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-18 22:34:21 UTC
  • mto: (3606.5.6 1.6)
  • mto: This revision was merged to the branch mainline in revision 3641.
  • Revision ID: john@arbash-meinel.com-20080818223421-todjny24vj4faj4t
Add tests for the fetching behavior.

The proper parameter passed is 'unordered' add an assert for it, and
fix callers that were passing 'unsorted' instead.
Add tests that we make the right get_record_stream call based
on the value of _fetch_uses_deltas.
Fix the fetch request for signatures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
245
245
        revision_keys = [(rev_id,) for rev_id in
246
246
            TopoSorter(self._rev_graph.items()).iter_topo_order()]
247
247
        stream = self._change_inv_parents(
248
 
            self.inventory.get_record_stream(revision_keys, 'unsorted', True),
 
248
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
249
249
            self._new_inv_parents,
250
250
            set(revision_keys))
251
251
        new_inventories.insert_record_stream(stream)
377
377
        revision_ids = [key[-1] for key in revision_keys]
378
378
        self._setup_steps(len(revision_keys))
379
379
        stream = self._change_inv_parents(
380
 
            self.inventory.get_record_stream(revision_keys, 'unsorted', True),
 
380
            self.inventory.get_record_stream(revision_keys, 'unordered', True),
381
381
            graph.__getitem__,
382
382
            set(revision_keys))
383
383
        new_inventories.insert_record_stream(stream)