← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Aaron Bentley
  • Date: 2008-01-03 22:14:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3241.
  • Revision ID: abentley@panoramicfeedback.com-20080103221440-0y6atamnscjnoh9s
Updates from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1211
1211
                                               fingerprint, new_child_path)
1212
1212
        self._apply_removals(removals.values())
1213
1213
        self._apply_insertions(insertions.values())
1214
 
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1215
1214
 
1216
1215
    def _apply_removals(self, removals):
1217
1216
        for path in sorted(removals, reverse=True):
1219
1218
            block_i, entry_i, d_present, f_present = \
1220
1219
                self._get_block_entry_index(dirname, basename, 0)
1221
1220
            entry = self._dirblocks[block_i][1][entry_i]
1222
 
            entry[1][0] = ('a', '', 0, False, '')
 
1221
            self._make_absent(entry)
1223
1222
 
1224
1223
    def _apply_insertions(self, adds):
1225
1224
        for key, minikind, executable, fingerprint, path_utf8 in sorted(adds):