/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 breezy/clean_tree.py

  • Committer: Jelmer Vernooij
  • Author(s): Richard Wilbur
  • Date: 2017-05-30 23:37:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6645.
  • Revision ID: jelmer@jelmer.uk-20170530233711-r0m0qp8hpkqzpopw
https://launchpad.net/bugs/1537319
Fix order in which files are processed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/clean_tree.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 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
17
18
 
 
19
import errno
18
20
import os
19
21
import shutil
20
22
 
21
 
from bzrlib.osutils import isdir
22
 
from bzrlib.trace import note
23
 
from bzrlib.workingtree import WorkingTree
24
 
 
 
23
from . import (
 
24
    controldir,
 
25
    errors,
 
26
    ui,
 
27
    )
 
28
from .osutils import isdir
 
29
from .trace import note
 
30
from .workingtree import WorkingTree
 
31
from .i18n import gettext
25
32
 
26
33
def is_detritus(subp):
27
34
    """Return True if the supplied path is detritus, False otherwise"""
51
58
    try:
52
59
        deletables = list(iter_deletables(tree, unknown=unknown,
53
60
            ignored=ignored, detritus=detritus))
 
61
        deletables = _filter_out_nested_bzrdirs(deletables)
54
62
        if len(deletables) == 0:
55
 
            note('Nothing to delete.')
 
63
            note(gettext('Nothing to delete.'))
56
64
            return 0
57
65
        if not no_prompt:
58
66
            for path, subp in deletables:
59
 
                print subp
60
 
            val = raw_input('Are you sure you wish to delete these [y/N]?')
61
 
            if val.lower() not in ('y', 'yes'):
62
 
                print 'Canceled'
 
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'))
63
71
                return 0
64
72
        delete_items(deletables, dry_run=dry_run)
65
73
    finally:
66
74
        tree.unlock()
67
75
 
68
76
 
 
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
 
69
98
def delete_items(deletables, dry_run=False):
70
99
    """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)
71
108
    has_deleted = False
72
109
    for path, subp in deletables:
73
110
        if not has_deleted:
74
 
            note("deleting paths:")
 
111
            note(gettext("deleting paths:"))
75
112
            has_deleted = True
76
 
        note('  ' + subp)
77
113
        if not dry_run:
78
114
            if isdir(path):
79
 
                shutil.rmtree(path)
 
115
                shutil.rmtree(path, onerror=onerror)
80
116
            else:
81
 
                os.unlink(path)
 
117
                try:
 
118
                    os.unlink(path)
 
119
                    note('  ' + subp)
 
120
                except OSError as 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)
82
129
    if not has_deleted:
83
 
        note("No files deleted.")
 
130
        note(gettext("No files deleted."))