/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
  • Date: 2017-06-11 13:48:12 UTC
  • mfrom: (6686 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170611134812-02rfzb60kjyk32cl
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/clean_tree.py
58
58
    try:
59
59
        deletables = list(iter_deletables(tree, unknown=unknown,
60
60
            ignored=ignored, detritus=detritus))
61
 
        deletables = _filter_out_nested_bzrdirs(deletables)
 
61
        deletables = _filter_out_nested_controldirs(deletables)
62
62
        if len(deletables) == 0:
63
63
            note(gettext('Nothing to delete.'))
64
64
            return 0
74
74
        tree.unlock()
75
75
 
76
76
 
77
 
def _filter_out_nested_bzrdirs(deletables):
 
77
def _filter_out_nested_controldirs(deletables):
78
78
    result = []
79
79
    for path, subp in deletables:
80
80
        # bzr won't recurse into unknowns/ignored directories by default
81
81
        # so we don't pay a penalty for checking subdirs of path for nested
82
 
        # bzrdir.
 
82
        # control dir.
83
83
        # That said we won't detect the branch in the subdir of non-branch
84
84
        # directory and therefore delete it. (worth to FIXME?)
85
85
        if isdir(path):