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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-20 22:24:54 UTC
  • mfrom: (7199.3.2 empty-dir-changed)
  • Revision ID: breezy.the.bot@gmail.com-20181120222454-rm8rzhuksrgixbmh
Don't report empty directories in git repositories as pending changes.

Merged from https://code.launchpad.net/~jelmer/brz/empty-dir-changed/+merge/359025

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_remove.py
26
26
    files = ['a', 'b/', 'b/c', 'd/']
27
27
    rfiles = ['b/c', 'b', 'a', 'd']
28
28
    backup_files = ['a.~1~', 'b.~1~/', 'b.~1~/c.~1~', 'd.~1~/']
 
29
    backup_files_no_version_dirs = ['a.~1~', 'b.~1~/', 'b.~1~/c.~1~']
29
30
 
30
31
    def get_tree(self, files):
31
32
        tree = self.make_branch_and_tree('.')
84
85
        tree.add(TestRemove.files)
85
86
        tree.remove(TestRemove.files, keep_files=False)
86
87
        self.assertNotInWorkingTree(TestRemove.files)
87
 
        self.assertPathExists(TestRemove.backup_files)
 
88
        if tree.has_versioned_directories():
 
89
            self.assertPathExists(TestRemove.backup_files)
 
90
        else:
 
91
            self.assertPathExists(TestRemove.backup_files_no_version_dirs)
88
92
        tree._validate()
89
93
 
90
94
    def test_remove_changed_file(self):
134
138
        tree.remove(rfilesx, keep_files=False)
135
139
        self.assertNotInWorkingTree(rfilesx)
136
140
        self.assertPathExists(['bx.~1~/cx.~1~', 'bx.~1~', 'ax.~1~'])
137
 
        if tree.supports_rename_tracking():
 
141
        if (tree.supports_rename_tracking() or
 
142
                not tree.has_versioned_directories()):
138
143
            self.assertPathDoesNotExist('dx.~1~')  # unchanged file
139
144
        else:
140
145
            self.assertPathExists('dx.~1~')  # renamed, so appears changed
155
160
        tree = self.get_tree(TestRemove.files)
156
161
        tree.remove(TestRemove.files, keep_files=False)
157
162
        self.assertRemovedAndDeleted(TestRemove.files)
158
 
        self.assertPathExists(TestRemove.backup_files)
 
163
        if tree.has_versioned_directories():
 
164
            self.assertPathExists(TestRemove.backup_files)
 
165
        else:
 
166
            self.assertPathExists(TestRemove.backup_files_no_version_dirs)
159
167
        tree._validate()
160
168
 
161
169
    def test_remove_nonexisting_files(self):