/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/tests/test_workingtree.py

  • Committer: Marius Kruger
  • Date: 2007-04-09 21:50:50 UTC
  • mto: This revision was merged to the branch mainline in revision 2455.
  • Revision ID: amanic@gmail.com-20070409215050-9k4jxh76grq7jxz8
First pass at only deleting files on 'bzr remove' when
they haven't changed.

Needed to modify _find_children_across_trees (tree.py) because
tree.has_id did not work as excpeted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
class TestRemove(TestCaseWithTransport):
68
68
    """Tests WorkingTree.remove"""
69
69
 
70
 
    def test_remove(self):
 
70
    def getTree(self):
 
71
        self.makeAndChdirToTestDir()
71
72
        tree = self.make_branch_and_tree('.')
72
73
        self.build_tree(files)
 
74
        return tree
 
75
 
 
76
    def test_remove_unchanged_files(self):
 
77
        """check that unchanged files are removed and deleted."""
 
78
        tree = self.getTree()
73
79
        tree.add(files)
 
80
        tree.commit("files must not have changes")
 
81
 
74
82
        self.assertInWorkingTree(files)
75
83
 
76
 
        tree.remove(files,delete_files=True)
 
84
        tree.remove(files, keep_files=False)
77
85
 
78
86
        self.assertNotInWorkingTree(files)
79
87
        self.failIfExists(files)
80
88
 
81
 
        tree.remove([''],delete_files=True)
82
 
        tree.remove(['b'],delete_files=True)
83
 
 
84
 
    def test_unversion(self):
85
 
        tree = self.make_branch_and_tree('.')
86
 
        self.build_tree(files)
 
89
    def test_remove_changed_files(self):
 
90
        """check that unchanged files are removed but not deleted."""
 
91
        tree = self.getTree()
 
92
        tree.add(files)
 
93
        self.assertInWorkingTree(files)
 
94
 
 
95
        tree.remove(files, keep_files=False)
 
96
 
 
97
        self.assertNotInWorkingTree(files)
 
98
        self.failUnlessExists(files)
 
99
 
 
100
    def test_remove_nonexisting_files(self):
 
101
        """delete files which does not exist."""
 
102
        tree = self.getTree()
 
103
        tree.remove(files, keep_files=False)
 
104
        tree.remove([''], keep_files=False)
 
105
        tree.remove(['b'], keep_files=False)
 
106
 
 
107
    def test_remove_keep(self):
 
108
        """check that files are unversioned but not delete."""
 
109
        tree = self.getTree()
87
110
        tree.add(files)
88
111
        self.assertInWorkingTree(files)
89
112
 
90
113
        tree.remove(files)
91
 
 
92
114
        self.assertNotInWorkingTree(files)
93
115
        self.failUnlessExists(files)
94
116
 
95
 
 
96
117
class TestDefaultFormat(TestCaseWithTransport):
97
118
 
98
119
    def test_get_set_default_format(self):