← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 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
18
18
 
19
19
from bzrlib import (
20
20
    branch as _mod_branch,
 
21
    errors,
21
22
    revision as _mod_revision,
22
23
    tests,
23
24
    )
86
87
            [rev_id1],
87
88
            branch.repository.get_revision(branch.last_revision()).parent_ids)
88
89
 
89
 
    def test_build_commit_parent_ids(self):
90
 
        """build_commit() takes a parent_ids argument."""
91
 
        builder = BranchBuilder(self.get_transport().clone('foo'))
92
 
        rev_id1 = builder.build_commit(
93
 
            parent_ids=["ghost"], allow_leftmost_as_ghost=True)
94
 
        rev_id2 = builder.build_commit(parent_ids=[])
95
 
        branch = builder.get_branch()
96
 
        self.assertEqual((1, rev_id2), branch.last_revision_info())
97
 
        self.assertEqual(
98
 
            ["ghost"],
99
 
            branch.repository.get_revision(rev_id1).parent_ids)
100
 
 
101
90
 
102
91
class TestBranchBuilderBuildSnapshot(tests.TestCaseWithMemoryTransport):
103
92
 
259
248
                              (u'dir', 'dir-id', 'directory'),
260
249
                              (u'dir/a', 'a-id', 'file')], rev_tree)
261
250
 
262
 
    def test_rename_out_of_unversioned_subdir(self):
263
 
        builder = self.build_a_rev()
264
 
        builder.build_snapshot('B-id', None,
265
 
            [('add', ('dir', 'dir-id', 'directory', None)),
266
 
             ('rename', ('a', 'dir/a'))])
267
 
        builder.build_snapshot('C-id', None,
268
 
            [('rename', ('dir/a', 'a')),
269
 
             ('unversion', 'dir-id')])
270
 
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
271
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
272
 
                              (u'a', 'a-id', 'file')], rev_tree)
273
 
 
274
251
    def test_set_parent(self):
275
252
        builder = self.build_a_rev()
276
253
        builder.start_series()
345
322
                             ], d_tree)
346
323
        # Because we copied the exact text into *this* tree, the 'c' file
347
324
        # should look like it was not modified in the merge
348
 
        self.assertEqual('C-id', d_tree.get_file_revision('c-id'))
349
 
 
350
 
    def test_set_parent_to_null(self):
351
 
        builder = self.build_a_rev()
352
 
        builder.start_series()
353
 
        self.addCleanup(builder.finish_series)
354
 
        builder.build_snapshot('B-id', [],
355
 
            [('add', ('', None, 'directory', None))])
356
 
        # We should now have a graph:
357
 
        #   A B
358
 
        # And not A => B
359
 
        repo = builder.get_branch().repository
360
 
        self.assertEqual({'A-id': (_mod_revision.NULL_REVISION,),
361
 
                          'B-id': (_mod_revision.NULL_REVISION,),},
362
 
                         repo.get_parent_map(['A-id', 'B-id']))
363
 
 
364
 
    
 
325
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
 
326
 
365
327
    def test_start_finish_series(self):
366
328
        builder = BranchBuilder(self.get_transport().clone('foo'))
367
329
        builder.start_series()
388
350
        self.addCleanup(b.unlock)
389
351
        self.assertEqual(('ghost',),
390
352
            b.repository.get_graph().get_parent_map(['tip'])['tip'])
391
 
 
392
 
    def test_unversion_root_add_new_root(self):
393
 
        builder = BranchBuilder(self.get_transport().clone('foo'))
394
 
        builder.start_series()
395
 
        builder.build_snapshot('rev-1', None,
396
 
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
397
 
        builder.build_snapshot('rev-2', None,
398
 
            [('unversion', 'TREE_ROOT'),
399
 
             ('add', ('', 'my-root', 'directory', ''))])
400
 
        builder.finish_series()
401
 
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
402
 
        self.assertTreeShape([(u'', 'my-root', 'directory')], rev_tree)
403
 
 
404
 
    def test_empty_flush(self):
405
 
        """A flush with no actions before it is a no-op."""
406
 
        builder = BranchBuilder(self.get_transport().clone('foo'))
407
 
        builder.start_series()
408
 
        builder.build_snapshot('rev-1', None,
409
 
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
410
 
        builder.build_snapshot('rev-2', None, [('flush', None)])
411
 
        builder.finish_series()
412
 
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
413
 
        self.assertTreeShape([(u'', 'TREE_ROOT', 'directory')], rev_tree)
414
 
 
415
 
    def test_kind_change(self):
416
 
        """It's possible to change the kind of an entry in a single snapshot
417
 
        with a bit of help from the 'flush' action.
418
 
        """
419
 
        builder = BranchBuilder(self.get_transport().clone('foo'))
420
 
        builder.start_series()
421
 
        builder.build_snapshot('A-id', None,
422
 
            [('add', (u'', 'a-root-id', 'directory', None)),
423
 
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
424
 
        builder.build_snapshot('B-id', None,
425
 
            [('unversion', 'a-id'),
426
 
             ('flush', None),
427
 
             ('add', (u'a', 'a-id', 'directory', None))])
428
 
        builder.finish_series()
429
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
430
 
        self.assertTreeShape(
431
 
            [(u'', 'a-root-id', 'directory'), (u'a', 'a-id', 'directory')],
432
 
            rev_tree)
433
 
 
434
 
    def test_pivot_root(self):
435
 
        """It's possible (albeit awkward) to move an existing dir to the root
436
 
        in a single snapshot by using unversion then flush then add.
437
 
        """
438
 
        builder = BranchBuilder(self.get_transport().clone('foo'))
439
 
        builder.start_series()
440
 
        builder.build_snapshot('A-id', None,
441
 
            [('add', (u'', 'orig-root', 'directory', None)),
442
 
             ('add', (u'dir', 'dir-id', 'directory', None))])
443
 
        builder.build_snapshot('B-id', None,
444
 
            [('unversion', 'orig-root'),  # implicitly unversions all children
445
 
             ('flush', None),
446
 
             ('add', (u'', 'dir-id', 'directory', None))])
447
 
        builder.finish_series()
448
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
449
 
        self.assertTreeShape([(u'', 'dir-id', 'directory')], rev_tree)
450