/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-11 22:02:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2455.
  • Revision ID: amanic@gmail.com-20070411220247-plcjs3dvidvjx2vj
* workingtree.remove
  - Add and test a new force option in order to force the deletion of changed files
    and non-empty directories.
  - Some doc fixups.
  - Remove some implemented todo's
  - Remove ## TODO: Remove nested loops; better scalability
    as I can't see any nested loop.s
  - small whitespace cleanups in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
87
87
        self.failIfExists(files)
88
88
 
89
89
    def test_remove_changed_files(self):
90
 
        """check that unchanged files are removed but not deleted."""
 
90
        """check that changed files are removed but not deleted."""
91
91
        tree = self.getTree()
92
92
        tree.add(files)
93
93
        self.assertInWorkingTree(files)
97
97
        self.assertNotInWorkingTree(files)
98
98
        self.failUnlessExists(files)
99
99
 
 
100
    def test_force_remove_changed_files(self):
 
101
        """check that changed files are removed and deleted when forced."""
 
102
        tree = self.getTree()
 
103
        tree.add(files)
 
104
        self.assertInWorkingTree(files)
 
105
 
 
106
        tree.remove(files, keep_files=False, force=True)
 
107
 
 
108
        self.assertNotInWorkingTree(files)
 
109
        self.failIfExists(files)
 
110
 
100
111
    def test_remove_nonexisting_files(self):
101
112
        """delete files which does not exist."""
102
113
        tree = self.getTree()
103
114
        tree.remove(files, keep_files=False)
104
115
        tree.remove([''], keep_files=False)
105
116
        tree.remove(['b'], keep_files=False)
106
 
        
 
117
 
107
118
    def test_remove_nonempty_directory(self):
108
119
        tree = self.getTree()
109
 
        tree.add(files)        
 
120
        tree.add(files)
110
121
        tree.commit("make sure b is versioned")
111
122
        self.assertInWorkingTree(files)
112
123
        self.failUnlessExists(files)
115
126
        self.assertNotInWorkingTree(b)
116
127
        self.failUnlessExists(b)
117
128
 
 
129
    def test_force_remove_nonempty_directory(self):
 
130
        tree = self.getTree()
 
131
        tree.add(files)
 
132
        tree.commit("make sure b is versioned")
 
133
        self.assertInWorkingTree(files)
 
134
        self.failUnlessExists(files)
 
135
        tree.remove(['b'], keep_files=False, force=True)
 
136
        b_c = ['b','b/c']
 
137
        self.assertNotInWorkingTree(b_c)
 
138
        self.failIfExists(b_c)
 
139
 
118
140
    def test_remove_keep(self):
119
141
        """check that files are unversioned but not delete."""
120
142
        tree = self.getTree()