← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2005-10-07 06:17:49 UTC
  • mfrom: (1185.13.2) (1417.1.8)
  • Revision ID: robertc@robertcollins.net-20051007061749-191de10c005c1db3
merge in readonly and passthrough transaction - make log suck less

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
248
248
        self.inv_sha1 = sha_string(inv_text)
249
249
        s = self.branch.control_weaves
250
250
        s.add_text('inventory', self.rev_id,
251
 
                   split_lines(inv_text), self.present_parents)
 
251
                   split_lines(inv_text), self.present_parents,
 
252
                   self.branch.get_transaction())
252
253
 
253
254
    def _escape_commit_message(self):
254
255
        """Replace xml-incompatible control characters."""
347
348
        for path, ie in self.new_inv.iter_entries():
348
349
            previous_entries = ie.find_previous_heads(
349
350
                self.parent_invs, 
350
 
                self.weave_store.get_weave_or_empty(ie.file_id))
 
351
                self.weave_store.get_weave_or_empty(ie.file_id,
 
352
                    self.branch.get_transaction()))
351
353
            if ie.revision is None:
352
354
                change = ie.snapshot(self.rev_id, path, previous_entries,
353
 
                                     self.work_tree, self.weave_store)
 
355
                                     self.work_tree, self.weave_store,
 
356
                                     self.branch.get_transaction())
354
357
            else:
355
358
                change = "unchanged"
356
359
            self.reporter.snapshot_change(change, path)