/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-09-16 07:26:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050916072603-98c9cd829758289f
- in commit, avoid reading basis inventory twice

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
195
195
            self.basis_inv = self.basis_tree.inventory
196
196
 
197
197
            self._gather_parents()
198
 
 
 
198
            self._check_parents_present()
 
199
            
199
200
            self._remove_deleted()
200
201
            self.new_inv = Inventory()
201
202
            self._store_files()
259
260
    def _gather_parents(self):
260
261
        pending_merges = self.branch.pending_merges()
261
262
        self.parents = []
 
263
        self.parent_trees = []
262
264
        precursor_id = self.branch.last_revision()
263
265
        if precursor_id:
264
266
            self.parents.append(precursor_id)
 
267
            self.parent_trees.append(self.basis_tree)
265
268
        self.parents += pending_merges
 
269
        self.parent_trees.extend(map(self.branch.revision_tree, pending_merges))
 
270
 
 
271
 
 
272
    def _check_parents_present(self):
266
273
        for parent_id in self.parents:
267
274
            mutter('commit parent revision {%s}', parent_id)
268
275
            if not self.branch.has_revision(parent_id):
269
276
                warning("can't commit a merge from an absent parent")
270
277
                raise HistoryMissing(self.branch, 'revision', parent_id)
271
 
        self.parent_trees = map(self.branch.revision_tree, self.parents)
272
 
 
273
 
 
 
278
 
 
279
            
274
280
    def _make_revision(self):
275
281
        """Record a new revision object for this commit."""
276
282
        self.rev = Revision(timestamp=self.timestamp,