← 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: Martin Pool
  • Date: 2005-07-04 13:08:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve

- test cases for this

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
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
 
18
 
"""Black-box tests for bzr branch."""
19
 
 
20
 
import os
21
 
 
22
 
from bzrlib import branch, bzrdir
23
 
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
26
 
from bzrlib.workingtree import WorkingTree
27
 
 
28
 
 
29
 
class TestBranch(ExternalBase):
30
 
 
31
 
    def example_branch(test):
32
 
        test.run_bzr('init')
33
 
        file('hello', 'wt').write('foo')
34
 
        test.run_bzr('add hello')
35
 
        test.run_bzr('commit -m setup hello')
36
 
        file('goodbye', 'wt').write('baz')
37
 
        test.run_bzr('add goodbye')
38
 
        test.run_bzr('commit -m setup goodbye')
39
 
 
40
 
    def test_branch(self):
41
 
        """Branch from one branch to another."""
42
 
        os.mkdir('a')
43
 
        os.chdir('a')
44
 
        self.example_branch()
45
 
        os.chdir('..')
46
 
        self.run_bzr('branch a b')
47
 
        b = branch.Branch.open('b')
48
 
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
49
 
        self.run_bzr('branch a c -r 1')
50
 
        os.chdir('b')
51
 
        self.run_bzr('commit -m foo --unchanged')
52
 
        os.chdir('..')
53
 
 
54
 
    def test_branch_only_copies_history(self):
55
 
        # Knit branches should only push the history for the current revision.
56
 
        format = bzrdir.BzrDirMetaFormat1()
57
 
        format.repository_format = RepositoryFormatKnit1()
58
 
        shared_repo = self.make_repository('repo', format=format, shared=True)
59
 
        shared_repo.set_make_working_trees(True)
60
 
 
61
 
        def make_shared_tree(path):
62
 
            shared_repo.bzrdir.root_transport.mkdir(path)
63
 
            shared_repo.bzrdir.create_branch_convenience('repo/' + path)
64
 
            return WorkingTree.open('repo/' + path)
65
 
        tree_a = make_shared_tree('a')
66
 
        self.build_tree(['repo/a/file'])
67
 
        tree_a.add('file')
68
 
        tree_a.commit('commit a-1', rev_id='a-1')
69
 
        f = open('repo/a/file', 'ab')
70
 
        f.write('more stuff\n')
71
 
        f.close()
72
 
        tree_a.commit('commit a-2', rev_id='a-2')
73
 
 
74
 
        tree_b = make_shared_tree('b')
75
 
        self.build_tree(['repo/b/file'])
76
 
        tree_b.add('file')
77
 
        tree_b.commit('commit b-1', rev_id='b-1')
78
 
 
79
 
        self.assertTrue(shared_repo.has_revision('a-1'))
80
 
        self.assertTrue(shared_repo.has_revision('a-2'))
81
 
        self.assertTrue(shared_repo.has_revision('b-1'))
82
 
 
83
 
        # Now that we have a repository with shared files, make sure
84
 
        # that things aren't copied out by a 'branch'
85
 
        self.run_bzr('branch repo/b branch-b')
86
 
        pushed_tree = WorkingTree.open('branch-b')
87
 
        pushed_repo = pushed_tree.branch.repository
88
 
        self.assertFalse(pushed_repo.has_revision('a-1'))
89
 
        self.assertFalse(pushed_repo.has_revision('a-2'))
90
 
        self.assertTrue(pushed_repo.has_revision('b-1'))
91
 
 
92
 
 
93
 
class TestRemoteBranch(TestCaseWithSFTPServer):
94
 
 
95
 
    def setUp(self):
96
 
        super(TestRemoteBranch, self).setUp()
97
 
        tree = self.make_branch_and_tree('branch')
98
 
        self.build_tree_contents([('branch/file', 'file content\n')])
99
 
        tree.add('file')
100
 
        tree.commit('file created')
101
 
 
102
 
    def test_branch_local_remote(self):
103
 
        self.run_bzr(['branch', 'branch', self.get_url('remote')])
104
 
        t = self.get_transport()
105
 
        # Ensure that no working tree what created remotely
106
 
        self.assertFalse(t.has('remote/file'))
107
 
 
108
 
    def test_branch_remote_remote(self):
109
 
        # Light cheat: we access the branch remotely
110
 
        self.run_bzr(['branch', self.get_url('branch'),
111
 
                      self.get_url('remote')])
112
 
        t = self.get_transport()
113
 
        # Ensure that no working tree what created remotely
114
 
        self.assertFalse(t.has('remote/file'))
115