/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: 2017-11-13 18:40:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171113184041-l4063gzvsh3l7xpy
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_branchbuilder.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for the BranchBuilder class."""
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    branch as _mod_branch,
21
 
    errors,
22
21
    revision as _mod_revision,
23
22
    tests,
24
23
    )
25
 
from bzrlib.branchbuilder import BranchBuilder
 
24
from ..bzr import (
 
25
    branch as _mod_bzrbranch,
 
26
    )
 
27
from ..branchbuilder import BranchBuilder
26
28
 
27
29
 
28
30
class TestBranchBuilder(tests.TestCaseWithMemoryTransport):
47
49
        """Making a BranchBuilder with a format option sets the branch type."""
48
50
        builder = BranchBuilder(self.get_transport(), format='dirstate-tags')
49
51
        branch = builder.get_branch()
50
 
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
 
52
        self.assertIsInstance(branch, _mod_bzrbranch.BzrBranch6)
51
53
 
52
54
    def test_build_one_commit(self):
53
55
        """doing build_commit causes a commit to happen."""
87
89
            [rev_id1],
88
90
            branch.repository.get_revision(branch.last_revision()).parent_ids)
89
91
 
 
92
    def test_build_commit_parent_ids(self):
 
93
        """build_commit() takes a parent_ids argument."""
 
94
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
95
        rev_id1 = builder.build_commit(
 
96
            parent_ids=["ghost"], allow_leftmost_as_ghost=True)
 
97
        rev_id2 = builder.build_commit(parent_ids=[])
 
98
        branch = builder.get_branch()
 
99
        self.assertEqual((1, rev_id2), branch.last_revision_info())
 
100
        self.assertEqual(
 
101
            ["ghost"],
 
102
            branch.repository.get_revision(rev_id1).parent_ids)
 
103
 
90
104
 
91
105
class TestBranchBuilderBuildSnapshot(tests.TestCaseWithMemoryTransport):
92
106
 
117
131
        self.addCleanup(rev_tree.unlock)
118
132
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
119
133
                              (u'a', 'a-id', 'file')], rev_tree)
120
 
        self.assertEqual('contents', rev_tree.get_file_text('a-id'))
 
134
        self.assertEqual('contents', rev_tree.get_file_text('a'))
121
135
 
122
136
    def test_add_second_file(self):
123
137
        builder = self.build_a_rev()
132
146
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
133
147
                              (u'a', 'a-id', 'file'),
134
148
                              (u'b', 'b-id', 'file')], rev_tree)
135
 
        self.assertEqual('content_b', rev_tree.get_file_text('b-id'))
 
149
        self.assertEqual('content_b', rev_tree.get_file_text('b'))
136
150
 
137
151
    def test_add_empty_dir(self):
138
152
        builder = self.build_a_rev()
189
203
        rev_tree = branch.repository.revision_tree(rev_id2)
190
204
        rev_tree.lock_read()
191
205
        self.addCleanup(rev_tree.unlock)
192
 
        self.assertEqual('new\ncontent\n', rev_tree.get_file_text('a-id'))
 
206
        self.assertEqual('new\ncontent\n',
 
207
                         rev_tree.get_file_text(rev_tree.id2path('a-id')))
193
208
 
194
209
    def test_delete_file(self):
195
210
        builder = self.build_a_rev()
248
263
                              (u'dir', 'dir-id', 'directory'),
249
264
                              (u'dir/a', 'a-id', 'file')], rev_tree)
250
265
 
 
266
    def test_rename_out_of_unversioned_subdir(self):
 
267
        builder = self.build_a_rev()
 
268
        builder.build_snapshot('B-id', None,
 
269
            [('add', ('dir', 'dir-id', 'directory', None)),
 
270
             ('rename', ('a', 'dir/a'))])
 
271
        builder.build_snapshot('C-id', None,
 
272
            [('rename', ('dir/a', 'a')),
 
273
             ('unversion', 'dir-id')])
 
274
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
 
275
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
 
276
                              (u'a', 'a-id', 'file')], rev_tree)
 
277
 
251
278
    def test_set_parent(self):
252
279
        builder = self.build_a_rev()
253
280
        builder.start_series()
268
295
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
269
296
                              (u'a', 'a-id', 'file'),
270
297
                             ], b_tree)
271
 
        self.assertEqual('new\ncontent\n', b_tree.get_file_text('a-id'))
 
298
        self.assertEqual('new\ncontent\n', b_tree.get_file_text('a'))
272
299
 
273
300
        # We should still be using the content from A in C, not from B
274
301
        c_tree = repo.revision_tree('C-id')
276
303
                              (u'a', 'a-id', 'file'),
277
304
                              (u'c', 'c-id', 'file'),
278
305
                             ], c_tree)
279
 
        self.assertEqual('contents', c_tree.get_file_text('a-id'))
280
 
        self.assertEqual('alt\ncontent\n', c_tree.get_file_text('c-id'))
 
306
        self.assertEqual('contents', c_tree.get_file_text('a'))
 
307
        self.assertEqual('alt\ncontent\n', c_tree.get_file_text('c'))
281
308
 
282
309
    def test_set_merge_parent(self):
283
310
        builder = self.build_a_rev()
322
349
                             ], d_tree)
323
350
        # Because we copied the exact text into *this* tree, the 'c' file
324
351
        # should look like it was not modified in the merge
325
 
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
326
 
 
 
352
        self.assertEqual('C-id', d_tree.get_file_revision('c'))
 
353
 
 
354
    def test_set_parent_to_null(self):
 
355
        builder = self.build_a_rev()
 
356
        builder.start_series()
 
357
        self.addCleanup(builder.finish_series)
 
358
        builder.build_snapshot('B-id', [],
 
359
            [('add', ('', None, 'directory', None))])
 
360
        # We should now have a graph:
 
361
        #   A B
 
362
        # And not A => B
 
363
        repo = builder.get_branch().repository
 
364
        self.assertEqual({'A-id': (_mod_revision.NULL_REVISION,),
 
365
                          'B-id': (_mod_revision.NULL_REVISION,),},
 
366
                         repo.get_parent_map(['A-id', 'B-id']))
 
367
 
 
368
    
327
369
    def test_start_finish_series(self):
328
370
        builder = BranchBuilder(self.get_transport().clone('foo'))
329
371
        builder.start_series()
350
392
        self.addCleanup(b.unlock)
351
393
        self.assertEqual(('ghost',),
352
394
            b.repository.get_graph().get_parent_map(['tip'])['tip'])
 
395
 
 
396
    def test_unversion_root_add_new_root(self):
 
397
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
398
        builder.start_series()
 
399
        builder.build_snapshot('rev-1', None,
 
400
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
 
401
        builder.build_snapshot('rev-2', None,
 
402
            [('unversion', 'TREE_ROOT'),
 
403
             ('add', ('', 'my-root', 'directory', ''))])
 
404
        builder.finish_series()
 
405
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
 
406
        self.assertTreeShape([(u'', 'my-root', 'directory')], rev_tree)
 
407
 
 
408
    def test_empty_flush(self):
 
409
        """A flush with no actions before it is a no-op."""
 
410
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
411
        builder.start_series()
 
412
        builder.build_snapshot('rev-1', None,
 
413
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
 
414
        builder.build_snapshot('rev-2', None, [('flush', None)])
 
415
        builder.finish_series()
 
416
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
 
417
        self.assertTreeShape([(u'', 'TREE_ROOT', 'directory')], rev_tree)
 
418
 
 
419
    def test_kind_change(self):
 
420
        """It's possible to change the kind of an entry in a single snapshot
 
421
        with a bit of help from the 'flush' action.
 
422
        """
 
423
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
424
        builder.start_series()
 
425
        builder.build_snapshot('A-id', None,
 
426
            [('add', (u'', 'a-root-id', 'directory', None)),
 
427
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
 
428
        builder.build_snapshot('B-id', None,
 
429
            [('unversion', 'a-id'),
 
430
             ('flush', None),
 
431
             ('add', (u'a', 'a-id', 'directory', None))])
 
432
        builder.finish_series()
 
433
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
 
434
        self.assertTreeShape(
 
435
            [(u'', 'a-root-id', 'directory'), (u'a', 'a-id', 'directory')],
 
436
            rev_tree)
 
437
 
 
438
    def test_pivot_root(self):
 
439
        """It's possible (albeit awkward) to move an existing dir to the root
 
440
        in a single snapshot by using unversion then flush then add.
 
441
        """
 
442
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
443
        builder.start_series()
 
444
        builder.build_snapshot('A-id', None,
 
445
            [('add', (u'', 'orig-root', 'directory', None)),
 
446
             ('add', (u'dir', 'dir-id', 'directory', None))])
 
447
        builder.build_snapshot('B-id', None,
 
448
            [('unversion', 'orig-root'),  # implicitly unversions all children
 
449
             ('flush', None),
 
450
             ('add', (u'', 'dir-id', 'directory', None))])
 
451
        builder.finish_series()
 
452
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
 
453
        self.assertTreeShape([(u'', 'dir-id', 'directory')], rev_tree)
 
454