~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: 2007-09-06 03:41:24 UTC
  • mfrom: (2794.1.3 knits)
  • Revision ID: pqm@pqm.ubuntu.com-20070906034124-gf4re7orinpud4to
(robertc) Nuke VersionedFile add/get delta support which was never used, and reduce memory copies during commits of unannotated file such as inventory. (Robert Collins).

Show diffs side-by-side

added added

removed removed

Lines of Context:
170
170
                # This is done to avoid a revision_count * time-to-write additional overhead on 
171
171
                # reconcile.
172
172
                new_inventory_vf._check_write_ok()
173
 
                Weave._add_lines(new_inventory_vf, rev_id, parents, self.inventory.get_lines(rev_id),
174
 
                                 None)
 
173
                Weave._add_lines(new_inventory_vf, rev_id, parents,
 
174
                    self.inventory.get_lines(rev_id), None, None, None)
175
175
            else:
176
176
                new_inventory_vf.add_lines(rev_id, parents, self.inventory.get_lines(rev_id))
177
177