/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
17
"""Tests for branch implementations - tests a branch format."""
18
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
19
import os
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
20
import sys
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
21
1878.1.3 by John Arbash Meinel
some test cleanups
22
from bzrlib import (
23
    branch,
24
    bzrdir,
25
    errors,
26
    gpg,
27
    urlutils,
28
    transactions,
29
    repository,
30
    )
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
31
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
32
from bzrlib.delta import TreeDelta
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
33
from bzrlib.errors import (FileExists,
34
                           NoSuchRevision,
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
35
                           NoSuchFile,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
36
                           UninitializableFormat,
37
                           NotBranchError,
38
                           )
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
39
from bzrlib.osutils import getcwd
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
40
import bzrlib.revision
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
41
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
42
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
43
from bzrlib.tests.HttpServer import HttpServer
1260 by Martin Pool
- some updates for fetch/update function
44
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
45
from bzrlib.transport import get_transport
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
46
from bzrlib.transport.memory import MemoryServer
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
47
from bzrlib.upgrade import upgrade
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
48
from bzrlib.workingtree import WorkingTree
1092.2.25 by Robert Collins
support ghosts in commits
49
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
50
1185.16.56 by Martin Pool
doc
51
# TODO: Make a branch using basis branch, and check that it 
52
# doesn't request any files that could have been avoided, by 
53
# hooking into the Transport.
54
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
55
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
56
class TestCaseWithBranch(TestCaseWithBzrDir):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
57
58
    def setUp(self):
59
        super(TestCaseWithBranch, self).setUp()
60
        self.branch = None
61
62
    def get_branch(self):
63
        if self.branch is None:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
64
            self.branch = self.make_branch('')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
65
        return self.branch
66
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
67
    def make_branch(self, relpath, format=None):
68
        repo = self.make_repository(relpath, format=format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
69
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
70
        # Skipped is the wrong exception to raise.
71
        try:
72
            return self.branch_format.initialize(repo.bzrdir)
73
        except errors.UninitializableFormat:
74
            raise TestSkipped('Uninitializable branch format')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
75
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
76
    def make_repository(self, relpath, shared=False, format=None):
77
        made_control = self.make_bzrdir(relpath, format=format)
78
        return made_control.create_repository(shared=shared)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
79
80
81
class TestBranch(TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
82
1102 by Martin Pool
- merge test refactoring from robertc
83
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
84
        """Test appending more than one revision"""
2230.3.2 by Aaron Bentley
Get all branch tests passing
85
        wt = self.make_branch_and_tree('tree')
86
        wt.commit('f', rev_id='rev1')
87
        wt.commit('f', rev_id='rev2')
88
        wt.commit('f', rev_id='rev3')
89
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
90
        br = self.get_branch()
2230.3.2 by Aaron Bentley
Get all branch tests passing
91
        br.fetch(wt.branch)
905 by Martin Pool
- merge aaron's append_multiple.patch
92
        br.append_revision("rev1")
93
        self.assertEquals(br.revision_history(), ["rev1",])
94
        br.append_revision("rev2", "rev3")
95
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
96
        self.assertRaises(errors.ReservedId, br.append_revision, 'current:')
1110 by Martin Pool
- merge aaron's merge improvements:
97
1260 by Martin Pool
- some updates for fetch/update function
98
    def test_fetch_revisions(self):
99
        """Test fetch-revision operation."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
100
        get_transport(self.get_url()).mkdir('b1')
101
        get_transport(self.get_url()).mkdir('b2')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
102
        wt = self.make_branch_and_tree('b1')
103
        b1 = wt.branch
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
104
        b2 = self.make_branch('b2')
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
105
        file('b1/foo', 'w').write('hello')
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
106
        wt.add(['foo'], ['foo-id'])
107
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
108
109
        mutter('start fetch')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
110
        self.assertEqual((1, []), b2.fetch(b1))
1260 by Martin Pool
- some updates for fetch/update function
111
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
112
        rev = b2.repository.get_revision('revision-1')
113
        tree = b2.repository.revision_tree('revision-1')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
114
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
115
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
116
    def test_get_revision_delta(self):
117
        tree_a = self.make_branch_and_tree('a')
118
        self.build_tree(['a/foo'])
119
        tree_a.add('foo', 'file1')
120
        tree_a.commit('rev1', rev_id='rev1')
121
        self.build_tree(['a/vla'])
122
        tree_a.add('vla', 'file2')
123
        tree_a.commit('rev2', rev_id='rev2')
124
125
        delta = tree_a.branch.get_revision_delta(1)
126
        self.assertIsInstance(delta, TreeDelta)
127
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
128
        delta = tree_a.branch.get_revision_delta(2)
129
        self.assertIsInstance(delta, TreeDelta)
130
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
131
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
132
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
133
        """Return two branches, a and b, with one file in a."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
134
        get_transport(self.get_url()).mkdir('a')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
135
        tree_a = self.make_branch_and_tree('a')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
136
        file('a/b', 'wb').write('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
137
        tree_a.add('b')
138
        tree_a.commit("silly commit", rev_id='A')
139
140
        get_transport(self.get_url()).mkdir('b')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
141
        tree_b = self.make_branch_and_tree('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
142
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
143
144
    def get_balanced_branch_pair(self):
145
        """Returns br_a, br_b as with one commit in a, and b has a's stores."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
146
        tree_a, tree_b = self.get_unbalanced_tree_pair()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
147
        tree_b.branch.repository.fetch(tree_a.branch.repository)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
149
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
150
    def test_clone_branch(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
151
        """Copy the stores from one branch to another"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
152
        tree_a, tree_b = self.get_balanced_branch_pair()
153
        tree_b.commit("silly commit")
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
154
        os.mkdir('c')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
155
        # this fails to test that the history from a was not used.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
156
        dir_c = tree_a.bzrdir.clone('c', basis=tree_b.bzrdir)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
157
        self.assertEqual(tree_a.branch.revision_history(),
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
158
                         dir_c.open_branch().revision_history())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
159
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
160
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
161
        """Copy only part of the history of a branch."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
162
        # TODO: RBC 20060208 test with a revision not on revision-history.
163
        #       what should that behaviour be ? Emailed the list.
164
        wt_a = self.make_branch_and_tree('a')
165
        self.build_tree(['a/one'])
166
        wt_a.add(['one'])
167
        wt_a.commit('commit one', rev_id='1')
168
        self.build_tree(['a/two'])
169
        wt_a.add(['two'])
170
        wt_a.commit('commit two', rev_id='2')
171
        repo_b = self.make_repository('b')
172
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
173
        br_b = wt_a.bzrdir.open_branch().clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
174
        self.assertEqual('1', br_b.last_revision())
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
175
176
    def test_sprout_partial(self):
177
        # test sprouting with a prefix of the revision-history.
178
        # also needs not-on-revision-history behaviour defined.
179
        wt_a = self.make_branch_and_tree('a')
180
        self.build_tree(['a/one'])
181
        wt_a.add(['one'])
182
        wt_a.commit('commit one', rev_id='1')
183
        self.build_tree(['a/two'])
184
        wt_a.add(['two'])
185
        wt_a.commit('commit two', rev_id='2')
186
        repo_b = self.make_repository('b')
187
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
188
        br_b = wt_a.bzrdir.open_branch().sprout(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
189
        self.assertEqual('1', br_b.last_revision())
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
190
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
191
    def get_parented_branch(self):
192
        wt_a = self.make_branch_and_tree('a')
193
        self.build_tree(['a/one'])
194
        wt_a.add(['one'])
195
        wt_a.commit('commit one', rev_id='1')
196
197
        branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch()
198
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
199
        return branch_b
200
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
201
    def test_clone_branch_nickname(self):
202
        # test the nick name is preserved always
203
        raise TestSkipped('XXX branch cloning is not yet tested..')
204
205
    def test_clone_branch_parent(self):
206
        # test the parent is preserved always
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
207
        branch_b = self.get_parented_branch()
208
        repo_c = self.make_repository('c')
209
        branch_b.repository.copy_content_into(repo_c)
210
        branch_c = branch_b.clone(repo_c.bzrdir)
211
        self.assertNotEqual(None, branch_c.get_parent())
212
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
213
214
        # We can also set a specific parent, and it should be honored
215
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
216
        branch_b.set_parent(random_parent)
217
        repo_d = self.make_repository('d')
218
        branch_b.repository.copy_content_into(repo_d)
219
        branch_d = branch_b.clone(repo_d.bzrdir)
220
        self.assertEqual(random_parent, branch_d.get_parent())
221
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
222
    def test_copy_content_incomplete(self):
223
        tree = self.make_branch_and_tree('commit_tree')
224
        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
225
        tree.add('foo')
226
        tree.commit('revision 1', rev_id='1')
227
        source = self.make_branch_and_tree('source')
228
        # this gives us an incomplete repository
229
        tree.bzrdir.open_repository().copy_content_into(
230
            source.branch.repository)
231
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
232
        tree.bzrdir.open_branch().copy_content_into(source.branch)
233
234
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
235
    def test_sprout_branch_nickname(self):
236
        # test the nick name is reset always
237
        raise TestSkipped('XXX branch sprouting is not yet tested..')
238
239
    def test_sprout_branch_parent(self):
240
        source = self.make_branch('source')
241
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
242
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
243
244
    def test_submit_branch(self):
245
        """Submit location can be queried and set"""
246
        branch = self.make_branch('branch')
247
        self.assertEqual(branch.get_submit_branch(), None)
248
        branch.set_submit_branch('sftp://example.com')
249
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
250
        branch.set_submit_branch('sftp://example.net')
251
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
252
        
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
253
    def test_record_initial_ghost(self):
254
        """Branches should support having ghosts."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
255
        wt = self.make_branch_and_tree('.')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
256
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
257
            allow_leftmost_as_ghost=True)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
258
        rev_id = wt.commit('commit against a ghost first parent.')
259
        rev = wt.branch.repository.get_revision(rev_id)
260
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
261
        # parent_sha1s is not populated now, WTF. rbc 20051003
262
        self.assertEqual(len(rev.parent_sha1s), 0)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
263
264
    def test_record_two_ghosts(self):
265
        """Recording with all ghosts works."""
266
        wt = self.make_branch_and_tree('.')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
267
        wt.set_parent_ids([
268
                'foo@azkhazan-123123-abcabc',
269
                'wibble@fofof--20050401--1928390812',
270
            ],
271
            allow_leftmost_as_ghost=True)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
272
        rev_id = wt.commit("commit from ghost base with one merge")
273
        # the revision should have been committed with two parents
274
        rev = wt.branch.repository.get_revision(rev_id)
275
        self.assertEqual(['foo@azkhazan-123123-abcabc',
276
            'wibble@fofof--20050401--1928390812'],
277
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
278
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
279
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
280
        self.assertRaises(errors.InvalidRevisionId,
281
                          self.get_branch().repository.get_revision,
282
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
283
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
284
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
285
# compare the gpg-to-sign info for a commit with a ghost and 
286
#     an identical tree without a ghost
287
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
288
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
289
    def test_sign_existing_revision(self):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
290
        wt = self.make_branch_and_tree('.')
291
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
292
        wt.commit("base", allow_pointless=True, rev_id='A')
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
293
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
294
        strategy = gpg.LoopbackGPGStrategy(None)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
295
        branch.repository.sign_revision('A', strategy)
296
        self.assertEqual(Testament.from_revision(branch.repository, 
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
297
                         'A').as_short_text(),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
298
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
299
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
300
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
301
        wt = self.make_branch_and_tree('.')
302
        branch = wt.branch
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
303
        branch.repository.store_revision_signature(
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
304
            gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
305
        self.assertRaises(errors.NoSuchRevision,
306
                          branch.repository.has_signature_for_revision_id,
307
                          'A')
308
        wt.commit("base", allow_pointless=True, rev_id='A')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
309
        self.assertEqual('FOO', 
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
310
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
311
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
312
    def test_branch_keeps_signatures(self):
313
        wt = self.make_branch_and_tree('source')
314
        wt.commit('A', allow_pointless=True, rev_id='A')
315
        wt.branch.repository.sign_revision('A',
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
316
            gpg.LoopbackGPGStrategy(None))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
317
        #FIXME: clone should work to urls,
318
        # wt.clone should work to disks.
319
        self.build_tree(['target/'])
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
320
        d2 = wt.bzrdir.clone('target')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
321
        self.assertEqual(wt.branch.repository.get_signature_text('A'),
322
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
323
1185.35.11 by Aaron Bentley
Added support for branch nicks
324
    def test_nicks(self):
325
        """Branch nicknames"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
326
        t = get_transport(self.get_url())
327
        t.mkdir('bzr.dev')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
328
        branch = self.make_branch('bzr.dev')
1185.35.11 by Aaron Bentley
Added support for branch nicks
329
        self.assertEqual(branch.nick, 'bzr.dev')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
330
        t.move('bzr.dev', 'bzr.ab')
331
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
332
        self.assertEqual(branch.nick, 'bzr.ab')
333
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
334
        branch.nick = "Aaron's branch"
1534.4.28 by Robert Collins
first cut at merge from integration.
335
        self.failUnless(
336
            t.has(
337
                t.relpath(
338
                    branch.control_files.controlfilename("branch.conf")
339
                    )
340
                )
341
            )
1185.35.11 by Aaron Bentley
Added support for branch nicks
342
        self.assertEqual(branch.nick, "Aaron's branch")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
343
        t.move('bzr.ab', 'integration')
344
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
345
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
346
        branch.nick = u"\u1234"
347
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
348
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
349
    def test_create_open_branch_uses_repository(self):
350
        try:
351
            repo = self.make_repository('.', shared=True)
352
        except errors.IncompatibleFormat:
353
            return
354
        repo.bzrdir.root_transport.mkdir('child')
355
        child_dir = self.bzrdir_format.initialize('child')
356
        try:
357
            child_branch = self.branch_format.initialize(child_dir)
358
        except errors.UninitializableFormat:
359
            # branch references are not default init'able.
360
            return
361
        self.assertEqual(repo.bzrdir.root_transport.base,
362
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
363
        child_branch = branch.Branch.open(self.get_url('child'))
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
364
        self.assertEqual(repo.bzrdir.root_transport.base,
365
                         child_branch.repository.bzrdir.root_transport.base)
366
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
367
    def test_format_description(self):
368
        tree = self.make_branch_and_tree('tree')
369
        text = tree.branch._format.get_format_description()
370
        self.failUnless(len(text))
371
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
372
    def test_check_branch_report_results(self):
373
        """Checking a branch produces results which can be printed"""
374
        branch = self.make_branch('.')
375
        result = branch.check()
376
        # reports results through logging
377
        result.report_results(verbose=True)
378
        result.report_results(verbose=False)
379
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
380
    def test_get_commit_builder(self):
381
        self.assertIsInstance(self.make_branch(".").get_commit_builder([]), 
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
382
            repository.CommitBuilder)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
383
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
384
    def test_generate_revision_history(self):
385
        """Create a fake revision history easily."""
386
        tree = self.make_branch_and_tree('.')
387
        rev1 = tree.commit('foo')
388
        orig_history = tree.branch.revision_history()
389
        rev2 = tree.commit('bar', allow_pointless=True)
390
        tree.branch.generate_revision_history(rev1)
391
        self.assertEqual(orig_history, tree.branch.revision_history())
392
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
393
    def test_generate_revision_history_NULL_REVISION(self):
394
        tree = self.make_branch_and_tree('.')
395
        rev1 = tree.commit('foo')
396
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
397
        self.assertEqual([], tree.branch.revision_history())
398
1551.8.6 by Aaron Bentley
Rename test
399
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
400
        tree_a = self.make_branch_and_tree('a')
401
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
402
        checkout_b = branch_a.create_checkout('b')
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
403
        self.assertEqual(None, checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
404
        checkout_b.commit('rev1', rev_id='rev1')
405
        self.assertEqual('rev1', branch_a.last_revision())
406
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
407
1551.8.5 by Aaron Bentley
Change name to create_checkout
408
        checkout_c = branch_a.create_checkout('c', lightweight=True)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
409
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
410
        checkout_c.commit('rev2', rev_id='rev2')
411
        self.assertEqual('rev2', branch_a.last_revision())
412
        self.assertEqual(checkout_c.branch.base, branch_a.base)
413
414
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
415
        checkout_d = branch_a.create_checkout('d', lightweight=True)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
416
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
417
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
418
        checkout_e = branch_a.create_checkout('e')
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
419
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
420
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
421
    def test_create_anonymous_lightweight_checkout(self):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
422
        """A lightweight checkout from a readonly branch should succeed."""
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
423
        tree_a = self.make_branch_and_tree('a')
424
        rev_id = tree_a.commit('put some content in the branch')
425
        source_branch = bzrlib.branch.Branch.open(
426
            'readonly+' + tree_a.bzrdir.root_transport.base)
427
        # sanity check that the test will be valid
428
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
429
            source_branch.lock_write)
430
        checkout = source_branch.create_checkout('c', lightweight=True)
431
        self.assertEqual(rev_id, checkout.last_revision())
432
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
433
    def test_create_anonymous_heavyweight_checkout(self):
434
        """A regular checkout from a readonly branch should succeed."""
435
        tree_a = self.make_branch_and_tree('a')
436
        rev_id = tree_a.commit('put some content in the branch')
437
        source_branch = bzrlib.branch.Branch.open(
438
            'readonly+' + tree_a.bzrdir.root_transport.base)
439
        # sanity check that the test will be valid
440
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
441
            source_branch.lock_write)
442
        checkout = source_branch.create_checkout('c')
443
        self.assertEqual(rev_id, checkout.last_revision())
444
1551.8.4 by Aaron Bentley
Tweak import style
445
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
446
class ChrootedTests(TestCaseWithBranch):
447
    """A support class that provides readonly urls outside the local namespace.
448
449
    This is done by checking if self.transport_server is a MemoryServer. if it
450
    is then we are chrooted already, if it is not then an HttpServer is used
451
    for readonly urls.
452
    """
453
454
    def setUp(self):
455
        super(ChrootedTests, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
456
        if not self.transport_server == MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
457
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
458
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
459
    def test_open_containing(self):
460
        self.assertRaises(NotBranchError, Branch.open_containing,
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
461
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
462
        self.assertRaises(NotBranchError, Branch.open_containing,
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
463
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
464
        branch = self.make_branch('.')
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
465
        branch, relpath = Branch.open_containing(self.get_readonly_url(''))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
466
        self.assertEqual('', relpath)
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
467
        branch, relpath = Branch.open_containing(self.get_readonly_url('g/p/q'))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
468
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
469
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
470
471
class InstrumentedTransaction(object):
472
473
    def finish(self):
474
        self.calls.append('finish')
475
476
    def __init__(self):
477
        self.calls = []
478
479
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
480
class TestDecorator(object):
481
482
    def __init__(self):
483
        self._calls = []
484
485
    def lock_read(self):
486
        self._calls.append('lr')
487
488
    def lock_write(self):
489
        self._calls.append('lw')
490
491
    def unlock(self):
492
        self._calls.append('ul')
493
494
    @needs_read_lock
495
    def do_with_read(self):
496
        return 1
497
498
    @needs_read_lock
499
    def except_with_read(self):
500
        raise RuntimeError
501
502
    @needs_write_lock
503
    def do_with_write(self):
504
        return 2
505
506
    @needs_write_lock
507
    def except_with_write(self):
508
        raise RuntimeError
509
510
511
class TestDecorators(TestCase):
512
513
    def test_needs_read_lock(self):
514
        branch = TestDecorator()
515
        self.assertEqual(1, branch.do_with_read())
516
        self.assertEqual(['lr', 'ul'], branch._calls)
517
518
    def test_excepts_in_read_lock(self):
519
        branch = TestDecorator()
520
        self.assertRaises(RuntimeError, branch.except_with_read)
521
        self.assertEqual(['lr', 'ul'], branch._calls)
522
523
    def test_needs_write_lock(self):
524
        branch = TestDecorator()
525
        self.assertEqual(2, branch.do_with_write())
526
        self.assertEqual(['lw', 'ul'], branch._calls)
527
528
    def test_excepts_in_write_lock(self):
529
        branch = TestDecorator()
530
        self.assertRaises(RuntimeError, branch.except_with_write)
531
        self.assertEqual(['lw', 'ul'], branch._calls)
532
533
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
534
class TestBranchTransaction(TestCaseWithBranch):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
535
536
    def setUp(self):
537
        super(TestBranchTransaction, self).setUp()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
538
        self.branch = None
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
539
        
540
    def test_default_get_transaction(self):
541
        """branch.get_transaction on a new branch should give a PassThrough."""
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
542
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
543
                                   transactions.PassThroughTransaction))
544
545
    def test__set_new_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
546
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
547
548
    def test__set_over_existing_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
549
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
550
        self.assertRaises(errors.LockError,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
551
                          self.get_branch()._set_transaction,
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
552
                          transactions.ReadOnlyTransaction())
553
554
    def test_finish_no_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
555
        self.assertRaises(errors.LockError, self.get_branch()._finish_transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
556
557
    def test_finish_readonly_transaction_works(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
558
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
559
        self.get_branch()._finish_transaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
560
        self.assertEqual(None, self.get_branch().control_files._transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
561
562
    def test_unlock_calls_finish(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
563
        self.get_branch().lock_read()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
564
        transaction = InstrumentedTransaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
565
        self.get_branch().control_files._transaction = transaction
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
566
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
567
        self.assertEqual(['finish'], transaction.calls)
568
569
    def test_lock_read_acquires_ro_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
570
        self.get_branch().lock_read()
571
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
572
                                   transactions.ReadOnlyTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
573
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
574
        
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
575
    def test_lock_write_acquires_write_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
576
        self.get_branch().lock_write()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
577
        # cannot use get_transaction as its magic
1534.4.28 by Robert Collins
first cut at merge from integration.
578
        self.failUnless(isinstance(self.get_branch().control_files._transaction,
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
579
                                   transactions.WriteTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
580
        self.get_branch().unlock()
581
582
583
class TestBranchPushLocations(TestCaseWithBranch):
584
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
585
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
586
        self.assertEqual(None, self.get_branch().get_push_location())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
587
588
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
589
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
590
                                   ensure_config_dir_exists)
591
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
592
        fn = locations_config_filename()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
593
        print >> open(fn, 'wt'), ("[%s]\n"
594
                                  "push_location=foo" %
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
595
                                  self.get_branch().base[:-1])
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
596
        self.assertEqual("foo", self.get_branch().get_push_location())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
597
598
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
599
        branch = self.get_branch()
600
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
601
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
602
603
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
604
class TestFormat(TestCaseWithBranch):
605
    """Tests for the format itself."""
606
607
    def test_format_initialize_find_open(self):
608
        # loopback test to check the current format initializes to itself.
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
609
        if not self.branch_format.is_supported():
610
            # unsupported formats are not loopback testable
611
            # because the default open will not open them and
612
            # they may not be initializable.
613
            return
614
        # supported formats must be able to init and open
1534.4.12 by Robert Collins
Tweak formats implementation test to exercise readonly and readwrite transports.
615
        t = get_transport(self.get_url())
616
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
617
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
618
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
619
620
        # find it via bzrdir opening:
621
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
622
        direct_opened_branch = opened_control.open_branch()
623
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
624
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
625
        self.failUnless(isinstance(direct_opened_branch._format,
626
                        self.branch_format.__class__))
627
628
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
629
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
630
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
631
        self.assertEqual(made_branch._format.__class__,
632
                         opened_branch._format.__class__)
633
        # if it has a unique id string, can we probe for it ?
634
        try:
635
            self.branch_format.get_format_string()
636
        except NotImplementedError:
637
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
638
        self.assertEqual(self.branch_format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
639
                         branch.BranchFormat.find_format(opened_control))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
640
2230.3.7 by Aaron Bentley
Fix binding return values
641
2230.3.6 by Aaron Bentley
work in progress bind stuff
642
class TestBound(TestCaseWithBranch):
643
644
    def test_bind_unbind(self):
645
        branch = self.make_branch('1')
646
        branch2 = self.make_branch('2')
647
        try:
648
            branch.bind(branch2)
649
        except errors.UpgradeRequired:
650
            raise TestSkipped('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
651
        self.assertTrue(branch.unbind())
652
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
653
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
654
655
    def test_old_bound_location(self):
656
        branch = self.make_branch('branch1')
657
        try:
658
            self.assertIs(None, branch.get_old_bound_location())
659
        except errors.UpgradeRequired:
660
            raise TestSkipped('Format does not store old bound locations')
661
        branch2 = self.make_branch('branch2')
662
        branch.bind(branch2)
663
        self.assertIs(None, branch.get_old_bound_location())
664
        branch.unbind()
665
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
666
667
668
class TestStrict(TestCaseWithBranch):
669
670
    def test_strict_history(self):
671
        tree1 = self.make_branch_and_tree('tree1')
672
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
673
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
674
        except errors.UpgradeRequired:
675
            raise TestSkipped('Format does not support strict history')
676
        tree1.commit('empty commit')
677
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
678
        tree2.commit('empty commit 2')
679
        tree1.pull(tree2.branch)
680
        tree1.commit('empty commit 3')
681
        tree2.commit('empty commit 4')
682
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
683
        tree2.merge_from_branch(tree1.branch)
684
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
685
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
686
                          tree2.branch)
687
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
688
        tree3.merge_from_branch(tree2.branch)
689
        tree3.commit('empty commit 6')
690
        tree2.pull(tree3.branch)