← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to clean_tree.py

  • Committer: Aaron Bentley
  • Date: 2006-03-18 23:29:32 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060318232932-4981a8efa6e028c9
Fixed patch on checkouts

Show diffs side-by-side

added added

removed removed

Lines of Context:
clean_tree.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
import errno
17
17
import os
18
 
from bzrlib.osutils import has_symlinks, isdir
19
18
import shutil
20
 
from bzrlib.branch import Branch
21
19
import sys
22
20
 
23
 
def is_detrius(subp):
 
21
from bzrlib.bzrdir import BzrDir
 
22
from bzrlib.osutils import has_symlinks, isdir
 
23
from bzrlib.workingtree import WorkingTree
 
24
 
 
25
def is_detritus(subp):
24
26
    return subp.endswith('.THIS') or subp.endswith('.BASE') or\
25
27
        subp.endswith('.OTHER') or subp.endswith('~') or subp.endswith('.tmp')
26
28
 
27
 
def iter_deletables(tree, unknown=True, ignored=False, detrius=False):
 
29
def iter_deletables(tree, unknown=True, ignored=False, detritus=False):
28
30
    """Iterate through files that may be deleted"""
29
31
    for subp in tree.extras():
30
 
        if detrius and is_detrius(subp):
 
32
        if detritus and is_detritus(subp):
31
33
            yield tree.abspath(subp), subp
32
34
            continue
33
35
        if tree.is_ignored(subp):
37
39
            if unknown:
38
40
                yield tree.abspath(subp), subp
39
41
 
40
 
def clean_tree(directory, ignored=False, detrius=False, dry_run=False,
 
42
def clean_tree(directory, ignored=False, detritus=False, dry_run=False,
41
43
               to_file=sys.stdout):
42
 
    br = Branch.open_containing(directory)[0]
43
 
    tree = br.working_tree()
44
 
    deletables = iter_deletables(tree, ignored=ignored, detrius=detrius)
 
44
    tree = WorkingTree.open_containing(directory)[0]
 
45
    deletables = iter_deletables(tree, ignored=ignored, detritus=detritus)
45
46
    delete_items(deletables, dry_run=dry_run, to_file=to_file)
46
47
 
47
48
def delete_items(deletables, dry_run=False, to_file=sys.stdout):
60
61
    if not has_deleted:
61
62
        print >> to_file, "No files deleted."
62
63
def test_suite():
63
 
    from bzrlib.selftest import TestCaseInTempDir
 
64
    from bzrlib.tests import TestCaseInTempDir
64
65
    from unittest import makeSuite
65
66
    import os.path
66
67
    from StringIO import StringIO
69
70
            if has_symlinks() is False:
70
71
                return
71
72
            os.mkdir('branch')
72
 
            b = Branch.initialize('branch')
 
73
            BzrDir.create_standalone_workingtree('branch')
73
74
            os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
74
75
            os.mkdir('no-die-please')
75
76
            assert os.path.exists('branch/die-please')
82
83
        def test_iter_deletable(self):
83
84
            """Files are selected for deletion appropriately"""
84
85
            os.mkdir('branch')
85
 
            b = Branch.initialize('branch')
86
 
            tree = b.working_tree()
 
86
            tree = BzrDir.create_standalone_workingtree('branch')
87
87
            file('branch/file.BASE', 'wb').write('contents')
88
88
            self.assertEqual(len(list(iter_deletables(tree))), 1)
89
89
            file('branch/file~', 'wb').write('contents')
91
91
            dels = [r for a,r in iter_deletables(tree)]
92
92
            assert 'file~' not in dels
93
93
            assert 'file.pyc' not in dels
94
 
            dels = [r for a,r in iter_deletables(tree, detrius=True)]
 
94
            dels = [r for a,r in iter_deletables(tree, detritus=True)]
95
95
            assert 'file~' in dels
96
96
            assert 'file.pyc' not in dels
97
97
            dels = [r for a,r in iter_deletables(tree, ignored=True)]