/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: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6928 work)
  • mto: (6940.2.6 base)
  • mto: This revision was merged to the branch mainline in revision 6941.
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_remove.py
88
88
    def test_remove_changed_file(self):
89
89
        """Removal of changed files must back it up."""
90
90
        tree = self.get_committed_tree(['a'])
91
 
        self.build_tree_contents([('a', "some other new content!")])
 
91
        self.build_tree_contents([('a', b"some other new content!")])
92
92
        self.assertInWorkingTree('a')
93
93
        tree.remove('a', keep_files=False)
94
94
        self.assertNotInWorkingTree(TestRemove.files)
125
125
        for f in TestRemove.rfiles:
126
126
            tree.rename_one(f, f+'x')
127
127
        rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
128
 
        self.build_tree_contents([('ax', 'changed and renamed!'),
129
 
                                  ('bx/cx', 'changed and renamed!')])
 
128
        self.build_tree_contents([('ax', b'changed and renamed!'),
 
129
                                  ('bx/cx', b'changed and renamed!')])
130
130
        self.assertPathExists(rfilesx)
131
131
 
132
132
        tree.remove(rfilesx, keep_files=False)
255
255
        """Backup directories with changed files."""
256
256
        files = ['b/', 'b/c']
257
257
        tree = self.get_committed_tree(files)
258
 
        self.build_tree_contents([('b/c', "some other new content!")])
 
258
        self.build_tree_contents([('b/c', b"some other new content!")])
259
259
 
260
260
        tree.remove('b', keep_files=False)
261
261
        self.assertPathExists('b.~1~/c.~1~')
265
265
        """Delete directories with changed files when forced."""
266
266
        files = ['b/', 'b/c']
267
267
        tree = self.get_committed_tree(files)
268
 
        self.build_tree_contents([('b/c', "some other new content!")])
 
268
        self.build_tree_contents([('b/c', b"some other new content!")])
269
269
 
270
270
        # see if we can force it now..
271
271
        tree.remove('b', keep_files=False, force=True)
275
275
    def test_remove_directory_with_changed_emigrated_file(self):
276
276
        # As per bug #129880
277
277
        tree = self.make_branch_and_tree('.')
278
 
        self.build_tree_contents([('somedir/',), ('somedir/file', 'contents')])
 
278
        self.build_tree_contents([('somedir/',), (b'somedir/file', b'contents')])
279
279
        tree.add(['somedir', 'somedir/file'])
280
280
        tree.commit(message="first")
281
 
        self.build_tree_contents([('somedir/file', 'changed')])
 
281
        self.build_tree_contents([('somedir/file', b'changed')])
282
282
        tree.rename_one('somedir/file', 'moved-file')
283
283
        tree.remove('somedir', keep_files=False)
284
284
        self.assertNotInWorkingTree('somedir')