← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2006-03-09 07:14:10 UTC
  • mfrom: (1600 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1602.
  • Revision ID: mbp@sourcefrog.net-20060309071410-4ab7d54905541c75
[merge] from bzr.dev

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
 
232
230
        self.rev_id = rev_id
233
231
        self.specific_files = specific_files
234
232
        self.allow_pointless = allow_pointless
235
 
        self.revprops = {'branch-nick': self.branch.nick}
236
 
        if revprops:
 
233
        self.revprops = {}
 
234
        if revprops is not None:
237
235
            self.revprops.update(revprops)
238
236
 
239
237
        self.work_tree.lock_write()
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,