← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: Wouter van Heyst
  • Date: 2006-06-07 16:05:27 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060607160527-2b3649154d0e2e84
more code cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005,2006 by 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import branch, bzrdir
23
 
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
 
22
import bzrlib.branch
 
23
import bzrlib.bzrdir
 
24
from bzrlib.repository import RepositoryFormatKnit1
24
25
from bzrlib.tests.blackbox import ExternalBase
25
26
from bzrlib.workingtree import WorkingTree
26
27
 
28
29
class TestBranch(ExternalBase):
29
30
 
30
31
    def example_branch(test):
31
 
        test.run_bzr('init')
 
32
        test.runbzr('init')
32
33
        file('hello', 'wt').write('foo')
33
 
        test.run_bzr('add hello')
34
 
        test.run_bzr('commit -m setup hello')
 
34
        test.runbzr('add hello')
 
35
        test.runbzr('commit -m setup hello')
35
36
        file('goodbye', 'wt').write('baz')
36
 
        test.run_bzr('add goodbye')
37
 
        test.run_bzr('commit -m setup goodbye')
 
37
        test.runbzr('add goodbye')
 
38
        test.runbzr('commit -m setup goodbye')
38
39
 
39
40
    def test_branch(self):
40
41
        """Branch from one branch to another."""
42
43
        os.chdir('a')
43
44
        self.example_branch()
44
45
        os.chdir('..')
45
 
        self.run_bzr('branch a b')
46
 
        b = branch.Branch.open('b')
 
46
        self.runbzr('branch a b')
 
47
        b = bzrlib.branch.Branch.open('b')
47
48
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
48
 
        self.run_bzr('branch a c -r 1')
 
49
        self.runbzr('branch a c -r 1')
49
50
        os.chdir('b')
50
 
        self.run_bzr('commit -m foo --unchanged')
 
51
        self.runbzr('commit -m foo --unchanged')
51
52
        os.chdir('..')
52
53
 
 
54
    def test_branch_basis(self):
 
55
        # ensure that basis really does grab from the basis by having incomplete source
 
56
        tree = self.make_branch_and_tree('commit_tree')
 
57
        self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
 
58
        tree.add('foo')
 
59
        tree.commit('revision 1', rev_id='1')
 
60
        source = self.make_branch_and_tree('source')
 
61
        # this gives us an incomplete repository
 
62
        tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
 
63
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
 
64
        tree.bzrdir.open_branch().copy_content_into(source.branch)
 
65
        tree.copy_content_into(source)
 
66
        self.assertFalse(source.branch.repository.has_revision('2'))
 
67
        dir = source.bzrdir
 
68
        self.runbzr('branch source target --basis commit_tree')
 
69
        target = bzrlib.bzrdir.BzrDir.open('target')
 
70
        self.assertEqual('2', target.open_branch().last_revision())
 
71
        self.assertEqual('2', target.open_workingtree().last_revision())
 
72
        self.assertTrue(target.open_branch().repository.has_revision('2'))
 
73
 
53
74
    def test_branch_only_copies_history(self):
54
75
        # Knit branches should only push the history for the current revision.
55
 
        format = bzrdir.BzrDirMetaFormat1()
 
76
        format = bzrlib.bzrdir.BzrDirMetaFormat1()
56
77
        format.repository_format = RepositoryFormatKnit1()
57
78
        shared_repo = self.make_repository('repo', format=format, shared=True)
58
79
        shared_repo.set_make_working_trees(True)