← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clean_tree.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
17
 
19
18
import errno
20
19
import os
21
20
import shutil
 
21
import sys
22
22
 
23
 
from bzrlib import (
24
 
    controldir,
25
 
    errors,
26
 
    ui,
27
 
    )
28
 
from bzrlib.osutils import isdir
 
23
from bzrlib.osutils import has_symlinks, isdir
29
24
from bzrlib.trace import note
30
25
from bzrlib.workingtree import WorkingTree
31
 
from bzrlib.i18n import gettext
 
26
 
32
27
 
33
28
def is_detritus(subp):
34
29
    """Return True if the supplied path is detritus, False otherwise"""
58
53
    try:
59
54
        deletables = list(iter_deletables(tree, unknown=unknown,
60
55
            ignored=ignored, detritus=detritus))
61
 
        deletables = _filter_out_nested_bzrdirs(deletables)
62
56
        if len(deletables) == 0:
63
 
            note(gettext('Nothing to delete.'))
 
57
            note('Nothing to delete.')
64
58
            return 0
65
59
        if not no_prompt:
66
60
            for path, subp in deletables:
67
 
                ui.ui_factory.note(subp)
68
 
            prompt = gettext('Are you sure you wish to delete these')
69
 
            if not ui.ui_factory.get_boolean(prompt):
70
 
                ui.ui_factory.note(gettext('Canceled'))
 
61
                print subp
 
62
            val = raw_input('Are you sure you wish to delete these [y/N]?')
 
63
            if val.lower() not in ('y', 'yes'):
 
64
                print 'Canceled'
71
65
                return 0
72
66
        delete_items(deletables, dry_run=dry_run)
73
67
    finally:
74
68
        tree.unlock()
75
69
 
76
70
 
77
 
def _filter_out_nested_bzrdirs(deletables):
78
 
    result = []
79
 
    for path, subp in deletables:
80
 
        # bzr won't recurse into unknowns/ignored directories by default
81
 
        # so we don't pay a penalty for checking subdirs of path for nested
82
 
        # bzrdir.
83
 
        # That said we won't detect the branch in the subdir of non-branch
84
 
        # directory and therefore delete it. (worth to FIXME?)
85
 
        if isdir(path):
86
 
            try:
87
 
                controldir.ControlDir.open(path)
88
 
            except errors.NotBranchError:
89
 
                result.append((path,subp))
90
 
            else:
91
 
                # TODO may be we need to notify user about skipped directories?
92
 
                pass
93
 
        else:
94
 
            result.append((path,subp))
95
 
    return result
96
 
 
97
 
 
98
71
def delete_items(deletables, dry_run=False):
99
72
    """Delete files in the deletables iterable"""
100
 
    def onerror(function, path, excinfo):
101
 
        """Show warning for errors seen by rmtree.
102
 
        """
103
 
        # Handle only permission error while removing files.
104
 
        # Other errors are re-raised.
105
 
        if function is not os.remove or excinfo[1].errno != errno.EACCES:
106
 
            raise
107
 
        ui.ui_factory.show_warning(gettext('unable to remove %s') % path)
108
73
    has_deleted = False
109
74
    for path, subp in deletables:
110
75
        if not has_deleted:
111
 
            note(gettext("deleting paths:"))
 
76
            note("deleting paths:")
112
77
            has_deleted = True
 
78
        note('  ' + subp)
113
79
        if not dry_run:
114
80
            if isdir(path):
115
 
                shutil.rmtree(path, onerror=onerror)
 
81
                shutil.rmtree(path)
116
82
            else:
117
 
                try:
118
 
                    os.unlink(path)
119
 
                    note('  ' + subp)
120
 
                except OSError, e:
121
 
                    # We handle only permission error here
122
 
                    if e.errno != errno.EACCES:
123
 
                        raise e
124
 
                    ui.ui_factory.show_warning(gettext(
125
 
                        'unable to remove "{0}": {1}.').format(
126
 
                                                    path, e.strerror))
127
 
        else:
128
 
            note('  ' + subp)
 
83
                os.unlink(path)
129
84
    if not has_deleted:
130
 
        note(gettext("No files deleted."))
 
85
        note("No files deleted.")