/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/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2007-10-23 22:14:32 UTC
  • mto: (2592.6.3 repository)
  • mto: This revision was merged to the branch mainline in revision 2967.
  • Revision ID: robertc@robertcollins.net-20071023221432-j8zndh1oiegql3cu
* Commit updates the state of the working tree via a delta rather than
  supplying entirely new basis trees. For commit of a single specified file
  this reduces the wall clock time for commit by roughly a 30%.
  (Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1220
1220
            for file_id in file_ids:
1221
1221
                self._inventory.remove_recursive_id(file_id)
1222
1222
 
 
1223
    def update_basis_by_delta(self, new_revid, delta):
 
1224
        """See MutableTree.update_basis_by_delta."""
 
1225
        assert self.last_revision() != new_revid
 
1226
        self.current_dirstate().update_basis_by_delta(delta, new_revid)
 
1227
 
1223
1228
    @needs_read_lock
1224
1229
    def _validate(self):
1225
1230
        self._dirstate._validate()
1227
1232
    @needs_tree_write_lock
1228
1233
    def _write_inventory(self, inv):
1229
1234
        """Write inventory as the current inventory."""
1230
 
        assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
 
1235
        assert not self._dirty, ("attempting to write an inventory when the "
 
1236
            "dirstate is dirty will cause data loss")
1231
1237
        self.current_dirstate().set_state_from_inventory(inv)
1232
1238
        self._make_dirty(reset_inventory=False)
1233
1239
        if self._inventory is not None: