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

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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
 
import errno
20
18
import os
21
19
import shutil
22
20
 
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
 
21
from bzrlib.osutils import isdir
 
22
from bzrlib.trace import note
 
23
from bzrlib.workingtree import WorkingTree
32
24
 
33
25
 
34
26
def is_detritus(subp):
55
47
               dry_run=False, no_prompt=False):
56
48
    """Remove files in the specified classes from the tree"""
57
49
    tree = WorkingTree.open_containing(directory)[0]
58
 
    with tree.lock_read():
 
50
    tree.lock_read()
 
51
    try:
59
52
        deletables = list(iter_deletables(tree, unknown=unknown,
60
 
                                          ignored=ignored, detritus=detritus))
61
 
        deletables = _filter_out_nested_controldirs(deletables)
 
53
            ignored=ignored, detritus=detritus))
62
54
        if len(deletables) == 0:
63
 
            note(gettext('Nothing to delete.'))
 
55
            note('Nothing to delete.')
64
56
            return 0
65
57
        if not no_prompt:
66
58
            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'))
 
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'
71
63
                return 0
72
64
        delete_items(deletables, dry_run=dry_run)
73
 
 
74
 
 
75
 
def _filter_out_nested_controldirs(deletables):
76
 
    result = []
77
 
    for path, subp in deletables:
78
 
        # bzr won't recurse into unknowns/ignored directories by default
79
 
        # so we don't pay a penalty for checking subdirs of path for nested
80
 
        # control dir.
81
 
        # That said we won't detect the branch in the subdir of non-branch
82
 
        # directory and therefore delete it. (worth to FIXME?)
83
 
        if isdir(path):
84
 
            try:
85
 
                controldir.ControlDir.open(path)
86
 
            except errors.NotBranchError:
87
 
                result.append((path, subp))
88
 
            else:
89
 
                # TODO may be we need to notify user about skipped directories?
90
 
                pass
91
 
        else:
92
 
            result.append((path, subp))
93
 
    return result
 
65
    finally:
 
66
        tree.unlock()
94
67
 
95
68
 
96
69
def delete_items(deletables, dry_run=False):
97
70
    """Delete files in the deletables iterable"""
98
 
    def onerror(function, path, excinfo):
99
 
        """Show warning for errors seen by rmtree.
100
 
        """
101
 
        # Handle only permission error while removing files.
102
 
        # Other errors are re-raised.
103
 
        if function is not os.remove or excinfo[1].errno != errno.EACCES:
104
 
            raise
105
 
        ui.ui_factory.show_warning(gettext('unable to remove %s') % path)
106
71
    has_deleted = False
107
72
    for path, subp in deletables:
108
73
        if not has_deleted:
109
 
            note(gettext("deleting paths:"))
 
74
            note("deleting paths:")
110
75
            has_deleted = True
 
76
        note('  ' + subp)
111
77
        if not dry_run:
112
78
            if isdir(path):
113
 
                shutil.rmtree(path, onerror=onerror)
 
79
                shutil.rmtree(path)
114
80
            else:
115
 
                try:
116
 
                    os.unlink(path)
117
 
                    note('  ' + subp)
118
 
                except OSError as e:
119
 
                    # We handle only permission error here
120
 
                    if e.errno != errno.EACCES:
121
 
                        raise e
122
 
                    ui.ui_factory.show_warning(gettext(
123
 
                        'unable to remove "{0}": {1}.').format(
124
 
                        path, e.strerror))
125
 
        else:
126
 
            note('  ' + subp)
 
81
                os.unlink(path)
127
82
    if not has_deleted:
128
 
        note(gettext("No files deleted."))
 
83
        note("No files deleted.")