← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

[merge] much integrated work from robert and john

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
269
269
            self._record_inventory()
270
270
            self._make_revision()
271
271
            self.branch.append_revision(self.rev_id)
272
 
            self.branch.set_pending_merges([])
 
272
            self.work_tree.set_pending_merges([])
273
273
            self.reporter.completed(self.branch.revno()+1, self.rev_id)
274
274
            if self.config.post_commit() is not None:
275
275
                hooks = self.config.post_commit().split(' ')
312
312
 
313
313
    def _gather_parents(self):
314
314
        """Record the parents of a merge for merge detection."""
315
 
        pending_merges = self.branch.pending_merges()
 
315
        pending_merges = self.work_tree.pending_merges()
316
316
        self.parents = []
317
317
        self.parent_invs = []
318
318
        self.present_parents = []
378
378
            deleted_ids.sort(reverse=True)
379
379
            for path, file_id in deleted_ids:
380
380
                del self.work_inv[file_id]
381
 
            self.branch._write_inventory(self.work_inv)
 
381
            self.work_tree._write_inventory(self.work_inv)
382
382
 
383
383
    def _store_snapshot(self):
384
384
        """Pass over inventory and record a snapshot.