/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_branchbuilder.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_branchbuilder.py
200
200
    def test_modify_file(self):
201
201
        builder = self.build_a_rev()
202
202
        rev_id2 = builder.build_snapshot(None,
203
 
            [('modify', ('a', 'new\ncontent\n'))],
 
203
            [('modify', ('a-id', 'new\ncontent\n'))],
204
204
            revision_id='B-id')
205
205
        self.assertEqual('B-id', rev_id2)
206
206
        branch = builder.get_branch()
208
208
        rev_tree.lock_read()
209
209
        self.addCleanup(rev_tree.unlock)
210
210
        self.assertEqual('new\ncontent\n',
211
 
                         rev_tree.get_file_text(rev_tree.id2path(b'a-id')))
 
211
                         rev_tree.get_file_text(rev_tree.id2path('a-id')))
212
212
 
213
213
    def test_delete_file(self):
214
214
        builder = self.build_a_rev()
215
215
        rev_id2 = builder.build_snapshot(None,
216
 
            [('unversion', 'a')], revision_id='B-id')
 
216
            [('unversion', 'a-id')], revision_id='B-id')
217
217
        self.assertEqual('B-id', rev_id2)
218
218
        branch = builder.get_branch()
219
219
        rev_tree = branch.repository.revision_tree(rev_id2)
238
238
                              (u'b/d/e', 'e-id', 'file')], rev_tree)
239
239
        # Removing a directory removes all child dirs
240
240
        builder.build_snapshot(
241
 
                None, [('unversion', 'b')],
 
241
                None, [('unversion', 'b-id')],
242
242
                revision_id='C-id')
243
243
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
244
244
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
278
278
            revision_id='B-id')
279
279
        builder.build_snapshot(None,
280
280
            [('rename', ('dir/a', 'a')),
281
 
             ('unversion', 'dir')], revision_id='C-id')
 
281
             ('unversion', 'dir-id')], revision_id='C-id')
282
282
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
283
283
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
284
284
                              (u'a', 'a-id', 'file')], rev_tree)
288
288
        builder.start_series()
289
289
        self.addCleanup(builder.finish_series)
290
290
        builder.build_snapshot(['A-id'],
291
 
            [('modify', ('a', 'new\ncontent\n'))],
 
291
            [('modify', ('a-id', 'new\ncontent\n'))],
292
292
            revision_id='B-id')
293
293
        builder.build_snapshot(['A-id'],
294
294
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))],
416
416
            [('add', ('', 'TREE_ROOT', 'directory', ''))],
417
417
            revision_id='rev-1')
418
418
        builder.build_snapshot(None,
419
 
            [('unversion', ''),
 
419
            [('unversion', 'TREE_ROOT'),
420
420
             ('add', ('', 'my-root', 'directory', ''))],
421
421
            revision_id='rev-2')
422
422
        builder.finish_series()
446
446
             ('add', (u'a', 'a-id', 'file', 'content\n'))],
447
447
            revision_id='A-id')
448
448
        builder.build_snapshot(None,
449
 
            [('unversion', 'a'),
 
449
            [('unversion', 'a-id'),
450
450
             ('flush', None),
451
451
             ('add', (u'a', 'a-id', 'directory', None))],
452
452
            revision_id='B-id')
467
467
             ('add', (u'dir', 'dir-id', 'directory', None))],
468
468
            revision_id='A-id')
469
469
        builder.build_snapshot(None,
470
 
            [('unversion', ''),  # implicitly unversions all children
 
470
            [('unversion', 'orig-root'),  # implicitly unversions all children
471
471
             ('flush', None),
472
472
             ('add', (u'', 'dir-id', 'directory', None))],
473
473
            revision_id='B-id')