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

Converted test cases to Tree Transform

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
228
228
        os.symlink(target, self._limbo_name(trans_id))
229
229
        unique_add(self._new_contents, trans_id, 'symlink')
230
230
 
 
231
    @staticmethod
 
232
    def delete_any(full_path):
 
233
        try:
 
234
            os.unlink(full_path)
 
235
        except OSError, e:
 
236
        # We may be renaming a dangling inventory id
 
237
            if e.errno != errno.EISDIR and e.errno != errno.EACCES:
 
238
                raise
 
239
            os.rmdir(full_path)
 
240
 
 
241
    def cancel_creation(self, trans_id):
 
242
        del self._new_contents[trans_id]
 
243
        self.delete_any(self._limbo_name(trans_id))
 
244
 
231
245
    def delete_contents(self, trans_id):
232
246
        """Schedule the contents of a path entry for deletion"""
233
247
        self._removed_contents.add(trans_id)
588
602
        for path, trans_id in tree_paths:
589
603
            full_path = self._tree.abspath(path)
590
604
            if trans_id in self._removed_contents:
591
 
                try:
592
 
                    os.unlink(full_path)
593
 
                except OSError, e:
594
 
                # We may be renaming a dangling inventory id
595
 
                    if e.errno != errno.EISDIR and e.errno != errno.EACCES:
596
 
                        raise
597
 
                    os.rmdir(full_path)
 
605
                self.delete_any(full_path)
598
606
            elif trans_id in self._new_name or trans_id in self._new_parent:
599
607
                try:
600
608
                    os.rename(full_path, self._limbo_name(trans_id))