1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr branch."""
import os
from bzrlib import branch, bzrdir
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.tests import HardlinkFeature
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
from bzrlib.workingtree import WorkingTree
class TestBranch(ExternalBase):
def example_branch(self, path='.'):
tree = self.make_branch_and_tree(path)
self.build_tree_contents([(path + '/hello', 'foo')])
tree.add('hello')
tree.commit(message='setup')
self.build_tree_contents([(path + '/goodbye', 'baz')])
tree.add('goodbye')
tree.commit(message='setup')
def test_branch(self):
"""Branch from one branch to another."""
self.example_branch('a')
self.run_bzr('branch a b')
b = branch.Branch.open('b')
self.run_bzr('branch a c -r 1')
# previously was erroneously created by branching
self.assertFalse(b._transport.has('branch-name'))
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
def test_branch_only_copies_history(self):
# Knit branches should only push the history for the current revision.
format = bzrdir.BzrDirMetaFormat1()
format.repository_format = RepositoryFormatKnit1()
shared_repo = self.make_repository('repo', format=format, shared=True)
shared_repo.set_make_working_trees(True)
def make_shared_tree(path):
shared_repo.bzrdir.root_transport.mkdir(path)
shared_repo.bzrdir.create_branch_convenience('repo/' + path)
return WorkingTree.open('repo/' + path)
tree_a = make_shared_tree('a')
self.build_tree(['repo/a/file'])
tree_a.add('file')
tree_a.commit('commit a-1', rev_id='a-1')
f = open('repo/a/file', 'ab')
f.write('more stuff\n')
f.close()
tree_a.commit('commit a-2', rev_id='a-2')
tree_b = make_shared_tree('b')
self.build_tree(['repo/b/file'])
tree_b.add('file')
tree_b.commit('commit b-1', rev_id='b-1')
self.assertTrue(shared_repo.has_revision('a-1'))
self.assertTrue(shared_repo.has_revision('a-2'))
self.assertTrue(shared_repo.has_revision('b-1'))
# Now that we have a repository with shared files, make sure
# that things aren't copied out by a 'branch'
self.run_bzr('branch repo/b branch-b')
pushed_tree = WorkingTree.open('branch-b')
pushed_repo = pushed_tree.branch.repository
self.assertFalse(pushed_repo.has_revision('a-1'))
self.assertFalse(pushed_repo.has_revision('a-2'))
self.assertTrue(pushed_repo.has_revision('b-1'))
def test_branch_hardlink(self):
self.requireFeature(HardlinkFeature)
source = self.make_branch_and_tree('source')
self.build_tree(['source/file1'])
source.add('file1')
source.commit('added file')
self.run_bzr(['branch', 'source', 'target', '--hardlink'])
source_stat = os.stat('source/file1')
target_stat = os.stat('target/file1')
self.assertEqual(source_stat, target_stat)
def assertShallow(self, branch_revid, stacked_on):
"""Assert that the branch 'newbranch' has been published correctly."""
new_branch = branch.Branch.open('newbranch')
# The branch refers to the mainline
self.assertEqual(stacked_on, new_branch.get_stacked_on())
# and the branch's work was pushed
self.assertTrue(new_branch.repository.has_revision(branch_revid))
# but the mainline's was not included
repo = new_branch.bzrdir.open_repository()
self.assertEqual(1, len(repo.all_revision_ids()))
def test_branch_stacked_branch_also_stacked_same_reference(self):
# We have a mainline
trunk_tree = self.make_branch_and_tree('target',
format='development')
trunk_tree.commit('mainline')
# and a branch from it which is stacked
branch_tree = self.make_branch_and_tree('branch',
format='development')
branch_tree.branch.set_stacked_on(trunk_tree.branch.base)
# with some work on it
branch_tree.commit('moar work plz')
# branching our local branch gives us a new stacked branch pointing at
# mainline.
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
self.assertEqual('', out)
self.assertEqual('Created new stacked branch referring to %s.\n' %
trunk_tree.branch.base, err)
self.assertShallow(branch_tree.last_revision(),
trunk_tree.branch.base)
def test_branch_stacked(self):
# We have a mainline
trunk_tree = self.make_branch_and_tree('mainline',
format='development')
trunk_tree.commit('mainline')
# and a branch from it which is stacked
out, err = self.run_bzr(['branch', '--stacked', 'mainline',
'newbranch'])
self.assertEqual('', out)
self.assertEqual('Created new stacked branch referring to %s.\n' %
trunk_tree.branch.base, err)
new_tree = WorkingTree.open('newbranch')
new_revid = new_tree.commit('new work')
self.assertShallow(new_revid, trunk_tree.branch.base)
class TestRemoteBranch(TestCaseWithSFTPServer):
def setUp(self):
super(TestRemoteBranch, self).setUp()
tree = self.make_branch_and_tree('branch')
self.build_tree_contents([('branch/file', 'file content\n')])
tree.add('file')
tree.commit('file created')
def test_branch_local_remote(self):
self.run_bzr(['branch', 'branch', self.get_url('remote')])
t = self.get_transport()
# Ensure that no working tree what created remotely
self.assertFalse(t.has('remote/file'))
def test_branch_remote_remote(self):
# Light cheat: we access the branch remotely
self.run_bzr(['branch', self.get_url('branch'),
self.get_url('remote')])
t = self.get_transport()
# Ensure that no working tree what created remotely
self.assertFalse(t.has('remote/file'))
|