← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge dirstate and some small cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
268
268
        # results of each bisect in further still
269
269
        paths = sorted(paths)
270
270
        result = set()
271
 
        STate = self.current_dirstate()
 
271
        state = self.current_dirstate()
272
272
        # TODO we want a paths_to_dirblocks helper I think
273
273
        for path in paths:
274
274
            dirname, basename = os.path.split(path.encode('utf8'))
991
991
        state.set_path_id('', file_id)
992
992
        if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
993
993
            self._make_dirty(reset_inventory=True)
 
994
        state.save()
994
995
 
995
996
    def unlock(self):
996
997
        """Unlock in format 4 trees needs to write the entire dirstate."""