← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
91
91
from bzrlib.xml5 import serializer_v5
92
92
from bzrlib.inventory import Inventory, ROOT_ID
93
93
from bzrlib.symbol_versioning import *
94
 
from bzrlib.weave import Weave
95
 
from bzrlib.weavefile import read_weave, write_weave_v5
96
94
from bzrlib.workingtree import WorkingTree
97
95
 
98
96
 
495
493
        for path, ie in self.new_inv.iter_entries():
496
494
            previous_entries = ie.find_previous_heads(
497
495
                self.parent_invs, 
498
 
                self.weave_store.get_weave_prelude_or_empty(ie.file_id,
 
496
                self.weave_store.get_weave_or_empty(ie.file_id,
499
497
                    self.branch.get_transaction()))
500
498
            if ie.revision is None:
501
499
                change = ie.snapshot(self.rev_id, path, previous_entries,