/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: Vincent Ladeuil
  • Date: 2007-11-14 08:20:26 UTC
  • mfrom: (2974 +trunk)
  • mto: (2990.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2991.
  • Revision ID: v.ladeuil+lp@free.fr-20071114082026-4d27f52n5r0t82rw
merge bzr.dev

Show diffs side-by-side

added added

removed removed

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