/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/test_delta.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_delta.py
235
235
        """Doing a status when a file has changed kind should work"""
236
236
        tree = self.make_branch_and_tree('.')
237
237
        self.build_tree(['filename'])
238
 
        tree.add('filename', b'file-id')
 
238
        tree.add('filename', 'file-id')
239
239
        tree.commit('added filename')
240
240
        os.unlink('filename')
241
241
        self.build_tree(['filename/'])
242
242
        delta = tree.changes_from(tree.basis_tree())
243
 
        self.assertEqual([('filename', b'file-id', 'file', 'directory')],
 
243
        self.assertEqual([('filename', 'file-id', 'file', 'directory')],
244
244
                         delta.kind_changed)
245
245
        self.assertEqual([], delta.added)
246
246
        self.assertEqual([], delta.removed)
248
248
        self.assertEqual([], delta.modified)
249
249
        self.assertEqual([], delta.unchanged)
250
250
        self.assertTrue(delta.has_changed())
251
 
        self.assertTrue(delta.touches_file_id(b'file-id'))
 
251
        self.assertTrue(delta.touches_file_id('file-id'))
252
252
        self.assertEqual('kind changed:\n  filename (file => directory)\n',
253
253
                         self.show_string(delta))
254
254
        other_delta = _mod_delta.TreeDelta()
255
255
        self.assertNotEqual(other_delta, delta)
256
 
        other_delta.kind_changed = [('filename', b'file-id', 'file',
 
256
        other_delta.kind_changed = [('filename', 'file-id', 'file',
257
257
                                     'symlink')]
258
258
        self.assertNotEqual(other_delta, delta)
259
 
        other_delta.kind_changed = [('filename', b'file-id', 'file',
 
259
        other_delta.kind_changed = [('filename', 'file-id', 'file',
260
260
                                     'directory')]
261
261
        self.assertEqual(other_delta, delta)
262
262
        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
271
271
        self.assertEqual([], delta.kind_changed)
272
272
        # This loses the fact that kind changed, remembering it as a
273
273
        # modification
274
 
        self.assertEqual([('filename', 'dirname', b'file-id', 'directory',
 
274
        self.assertEqual([('filename', 'dirname', 'file-id', 'directory',
275
275
                           True, False)], delta.renamed)
276
276
        self.assertTrue(delta.has_changed())
277
 
        self.assertTrue(delta.touches_file_id(b'file-id'))
 
277
        self.assertTrue(delta.touches_file_id('file-id'))
278
278
 
279
279
 
280
280
class TestDeltaShow(tests.TestCaseWithTransport):
283
283
        # We build the delta from a real tree to avoid depending on internal
284
284
        # implementation details.
285
285
        wt = self.make_branch_and_tree('branch')
286
 
        self.build_tree_contents([('branch/f1', b'1\n'),
287
 
                                  ('branch/f2', b'2\n'),
288
 
                                  ('branch/f3', b'3\n'),
289
 
                                  ('branch/f4', b'4\n'),
290
 
                                  ('branch/f5', b'5\n'),
 
286
        self.build_tree_contents([('branch/f1', '1\n'),
 
287
                                  ('branch/f2', '2\n'),
 
288
                                  ('branch/f3', '3\n'),
 
289
                                  ('branch/f4', '4\n'),
 
290
                                  ('branch/f5', '5\n'),
291
291
                                  ('branch/dir/',),
292
292
                                 ])
293
293
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
294
 
               [b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
295
 
        wt.commit('commit one', rev_id=b'1')
 
294
               ['f1-id', 'f2-id', 'f3-id', 'f4-id', 'dir-id'])
 
295
        wt.commit('commit one', rev_id='1')
296
296
 
297
297
        # TODO add rename,removed,etc. here?
298
298
        wt.add('f5')