← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

Merge cleanup into first-try resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clean_tree.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
 
18
import errno
18
19
import os
19
20
import shutil
20
21
 
21
 
from bzrlib import bzrdir, errors
 
22
from bzrlib import (
 
23
    bzrdir,
 
24
    errors,
 
25
    ui,
 
26
    )
22
27
from bzrlib.osutils import isdir
23
28
from bzrlib.trace import note
24
29
from bzrlib.workingtree import WorkingTree
93
98
 
94
99
def delete_items(deletables, dry_run=False):
95
100
    """Delete files in the deletables iterable"""
 
101
    def onerror(function, path, excinfo):
 
102
        """Show warning for errors seen by rmtree.
 
103
        """
 
104
        # Handle only permission error while removing files.
 
105
        # Other errors are re-raised.
 
106
        if function is not os.remove or excinfo[1].errno != errno.EACCES:
 
107
            raise
 
108
        ui.ui_factory.show_warning('unable to remove %s' % path)
96
109
    has_deleted = False
97
110
    for path, subp in deletables:
98
111
        if not has_deleted:
99
112
            note("deleting paths:")
100
113
            has_deleted = True
101
 
        note('  ' + subp)
102
114
        if not dry_run:
103
115
            if isdir(path):
104
 
                shutil.rmtree(path)
 
116
                shutil.rmtree(path, onerror=onerror)
105
117
            else:
106
 
                os.unlink(path)
 
118
                try:
 
119
                    os.unlink(path)
 
120
                    note('  ' + subp)
 
121
                except OSError, e:
 
122
                    # We handle only permission error here
 
123
                    if e.errno != errno.EACCES:
 
124
                        raise e
 
125
                    ui.ui_factory.show_warning(
 
126
                        'unable to remove "%s": %s.' % (path, e.strerror))
 
127
        else:
 
128
            note('  ' + subp)
107
129
    if not has_deleted:
108
130
        note("No files deleted.")