/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2697.2.2 by Martin Pool
deprecate Branch.append_revision
1
# Copyright (C) 2005, 2006, 2007 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,
2018.5.129 by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
29
    remote,
1878.1.3 by John Arbash Meinel
some test cleanups
30
    repository,
31
    )
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
32
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().
33
from bzrlib.delta import TreeDelta
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
34
from bzrlib.errors import (FileExists,
35
                           NoSuchRevision,
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
36
                           NoSuchFile,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
37
                           UninitializableFormat,
38
                           NotBranchError,
39
                           )
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
40
from bzrlib.osutils import getcwd
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
41
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.
42
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
43
from bzrlib.tests.branch_implementations import TestCaseWithBranch
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
44
from bzrlib.tests.HttpServer import HttpServer
1260 by Martin Pool
- some updates for fetch/update function
45
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
46
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.
47
from bzrlib.transport.memory import MemoryServer
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
48
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.
49
from bzrlib.workingtree import WorkingTree
2697.2.2 by Martin Pool
deprecate Branch.append_revision
50
from bzrlib.symbol_versioning import (
51
    zero_ninetyone,
52
    )
1092.2.25 by Robert Collins
support ghosts in commits
53
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
54
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
55
class TestBranch(TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
56
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
57
    def test_create_tree_with_merge(self):
58
        tree = self.create_tree_with_merge()
59
        ancestry_graph = tree.branch.repository.get_revision_graph('rev-3')
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
60
        self.assertEqual({'rev-1':(),
61
                          'rev-2':('rev-1', ),
62
                          'rev-1.1.1':('rev-1', ),
63
                          'rev-3':('rev-2', 'rev-1.1.1', ),
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
64
                         }, ancestry_graph)
65
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
66
    def test_revision_ids_are_utf8(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
67
        wt = self.make_branch_and_tree('tree')
68
        wt.commit('f', rev_id='rev1')
69
        wt.commit('f', rev_id='rev2')
70
        wt.commit('f', rev_id='rev3')
71
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
72
        br = self.get_branch()
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
73
        br.fetch(wt.branch)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
74
        br.set_revision_history(['rev1', 'rev2', 'rev3'])
75
        rh = br.revision_history()
76
        self.assertEqual(['rev1', 'rev2', 'rev3'], rh)
77
        for revision_id in rh:
78
            self.assertIsInstance(revision_id, str)
79
        last = br.last_revision()
80
        self.assertEqual('rev3', last)
81
        self.assertIsInstance(last, str)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
82
        revno, last = br.last_revision_info()
83
        self.assertEqual(3, revno)
84
        self.assertEqual('rev3', last)
85
        self.assertIsInstance(last, str)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
86
1260 by Martin Pool
- some updates for fetch/update function
87
    def test_fetch_revisions(self):
88
        """Test fetch-revision operation."""
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.
89
        wt = self.make_branch_and_tree('b1')
90
        b1 = wt.branch
2381.1.3 by Robert Collins
Review feedback.
91
        self.build_tree_contents([('b1/foo', '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.
92
        wt.add(['foo'], ['foo-id'])
93
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
94
2381.1.3 by Robert Collins
Review feedback.
95
        b2 = self.make_branch('b2')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
96
        self.assertEqual((1, []), b2.fetch(b1))
1260 by Martin Pool
- some updates for fetch/update function
97
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
98
        rev = b2.repository.get_revision('revision-1')
99
        tree = b2.repository.revision_tree('revision-1')
3015.2.1 by Robert Collins
Lock correctness in branch implementation tests.
100
        tree.lock_read()
101
        self.addCleanup(tree.unlock)
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
102
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
103
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
104
    def test_get_revision_delta(self):
105
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
106
        self.build_tree(['a/foo'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
107
        tree_a.add('foo', 'file1')
108
        tree_a.commit('rev1', rev_id='rev1')
2381.1.3 by Robert Collins
Review feedback.
109
        self.build_tree(['a/vla'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
110
        tree_a.add('vla', 'file2')
111
        tree_a.commit('rev2', rev_id='rev2')
112
113
        delta = tree_a.branch.get_revision_delta(1)
114
        self.assertIsInstance(delta, TreeDelta)
115
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
116
        delta = tree_a.branch.get_revision_delta(2)
117
        self.assertIsInstance(delta, TreeDelta)
118
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
119
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
120
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
121
        """Return two branches, a and b, with one file in 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.
122
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
123
        self.build_tree_contents([('a/b', 'b')])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
124
        tree_a.add('b')
125
        tree_a.commit("silly commit", rev_id='A')
126
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.
127
        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.
128
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
129
130
    def get_balanced_branch_pair(self):
131
        """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.
132
        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.
133
        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.
134
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
135
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
136
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
137
        """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.
138
        # TODO: RBC 20060208 test with a revision not on revision-history.
139
        #       what should that behaviour be ? Emailed the list.
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
140
        # First, make a branch with two commits.
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
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
142
        self.build_tree(['a/one'])
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.
143
        wt_a.add(['one'])
144
        wt_a.commit('commit one', rev_id='1')
2381.1.3 by Robert Collins
Review feedback.
145
        self.build_tree(['a/two'])
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.
146
        wt_a.add(['two'])
147
        wt_a.commit('commit two', rev_id='2')
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
148
        # Now make a copy of the repository.
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.
149
        repo_b = self.make_repository('b')
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
150
        wt_a.branch.repository.copy_content_into(repo_b)
151
        # wt_a might be a lightweight checkout, so get a hold of the actual
152
        # branch (because you can't do a partial clone of a lightweight
153
        # checkout).
154
        branch = wt_a.branch.bzrdir.open_branch()
155
        # Then make a branch where the new repository is, but specify a revision
156
        # ID.  The new branch's history will stop at the specified revision.
157
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
158
        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.
159
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
160
    def get_parented_branch(self):
161
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
162
        self.build_tree(['a/one'])
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
163
        wt_a.add(['one'])
164
        wt_a.commit('commit one', rev_id='1')
165
166
        branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch()
167
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
168
        return branch_b
169
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.
170
    def test_clone_branch_nickname(self):
171
        # test the nick name is preserved always
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
172
        raise TestSkipped('XXX branch cloning is not yet tested.')
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.
173
174
    def test_clone_branch_parent(self):
175
        # 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)
176
        branch_b = self.get_parented_branch()
177
        repo_c = self.make_repository('c')
178
        branch_b.repository.copy_content_into(repo_c)
179
        branch_c = branch_b.clone(repo_c.bzrdir)
180
        self.assertNotEqual(None, branch_c.get_parent())
181
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
182
183
        # We can also set a specific parent, and it should be honored
184
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
185
        branch_b.set_parent(random_parent)
186
        repo_d = self.make_repository('d')
187
        branch_b.repository.copy_content_into(repo_d)
188
        branch_d = branch_b.clone(repo_d.bzrdir)
189
        self.assertEqual(random_parent, branch_d.get_parent())
190
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
191
    def test_submit_branch(self):
192
        """Submit location can be queried and set"""
193
        branch = self.make_branch('branch')
194
        self.assertEqual(branch.get_submit_branch(), None)
195
        branch.set_submit_branch('sftp://example.com')
196
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
197
        branch.set_submit_branch('sftp://example.net')
198
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
199
        
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
200
    def test_public_branch(self):
201
        """public location can be queried and set"""
202
        branch = self.make_branch('branch')
203
        self.assertEqual(branch.get_public_branch(), None)
204
        branch.set_public_branch('sftp://example.com')
205
        self.assertEqual(branch.get_public_branch(), 'sftp://example.com')
206
        branch.set_public_branch('sftp://example.net')
207
        self.assertEqual(branch.get_public_branch(), 'sftp://example.net')
208
        branch.set_public_branch(None)
209
        self.assertEqual(branch.get_public_branch(), None)
210
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.
211
    def test_record_initial_ghost(self):
212
        """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.
213
        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.
214
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
215
            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.
216
        rev_id = wt.commit('commit against a ghost first parent.')
217
        rev = wt.branch.repository.get_revision(rev_id)
218
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
219
        # parent_sha1s is not populated now, WTF. rbc 20051003
220
        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.
221
222
    def test_record_two_ghosts(self):
223
        """Recording with all ghosts works."""
224
        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.
225
        wt.set_parent_ids([
226
                'foo@azkhazan-123123-abcabc',
227
                'wibble@fofof--20050401--1928390812',
228
            ],
229
            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.
230
        rev_id = wt.commit("commit from ghost base with one merge")
231
        # the revision should have been committed with two parents
232
        rev = wt.branch.repository.get_revision(rev_id)
233
        self.assertEqual(['foo@azkhazan-123123-abcabc',
234
            'wibble@fofof--20050401--1928390812'],
235
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
236
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
237
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
238
        self.assertRaises(errors.InvalidRevisionId,
239
                          self.get_branch().repository.get_revision,
240
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
241
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
242
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
243
# compare the gpg-to-sign info for a commit with a ghost and 
244
#     an identical tree without a ghost
245
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
246
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
247
    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.
248
        wt = self.make_branch_and_tree('.')
249
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
250
        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
251
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
252
        strategy = gpg.LoopbackGPGStrategy(None)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
253
        branch.repository.lock_write()
254
        branch.repository.start_write_group()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
255
        branch.repository.sign_revision('A', strategy)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
256
        branch.repository.commit_write_group()
257
        branch.repository.unlock()
1551.12.36 by Aaron Bentley
Fix failing tests
258
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
259
                         Testament.from_revision(branch.repository,
260
                         'A').as_short_text() +
1551.12.52 by Aaron Bentley
speling fix
261
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
262
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
263
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
264
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
265
        wt = self.make_branch_and_tree('.')
266
        branch = wt.branch
3015.2.3 by Robert Collins
Use write groups around revision signature tests for branch.
267
        branch.lock_write()
268
        try:
269
            branch.repository.start_write_group()
270
            try:
271
                branch.repository.store_revision_signature(
272
                    gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
273
            except:
274
                branch.repository.abort_write_group()
275
                raise
276
            else:
277
                branch.repository.commit_write_group()
278
        finally:
279
            branch.unlock()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
280
        self.assertRaises(errors.NoSuchRevision,
281
                          branch.repository.has_signature_for_revision_id,
282
                          'A')
283
        wt.commit("base", allow_pointless=True, rev_id='A')
1551.12.36 by Aaron Bentley
Fix failing tests
284
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
1551.12.52 by Aaron Bentley
speling fix
285
                         'FOO-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
286
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
287
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
288
    def test_branch_keeps_signatures(self):
289
        wt = self.make_branch_and_tree('source')
290
        wt.commit('A', allow_pointless=True, rev_id='A')
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
291
        repo = wt.branch.repository
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
292
        repo.lock_write()
293
        repo.start_write_group()
2818.4.2 by Robert Collins
Review feedback.
294
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
295
        repo.commit_write_group()
296
        repo.unlock()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
297
        #FIXME: clone should work to urls,
298
        # wt.clone should work to disks.
299
        self.build_tree(['target/'])
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
300
        d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
301
        self.assertEqual(repo.get_signature_text('A'),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
302
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
303
1185.35.11 by Aaron Bentley
Added support for branch nicks
304
    def test_nicks(self):
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
305
        """Test explicit and implicit branch nicknames.
306
        
307
        Nicknames are implicitly the name of the branch's directory, unless an
308
        explicit nickname is set.  That is, an explicit nickname always
309
        overrides the implicit one.
310
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
311
        t = get_transport(self.get_url())
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
312
        branch = self.make_branch('bzr.dev')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
313
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
314
        self.assertEqual(branch.nick, 'bzr.dev')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
315
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
316
        # will report its nick as 'bzr.ab'.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
317
        t.move('bzr.dev', 'bzr.ab')
318
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
319
        self.assertEqual(branch.nick, 'bzr.ab')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
320
        # Set the branch nick explicitly.  This will ensure there's a branch
321
        # config file in the branch.
322
        branch.nick = "Aaron's branch"
323
        branch.nick = "Aaron's branch"
2018.5.129 by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
324
        if not isinstance(branch, remote.RemoteBranch):
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
325
            controlfilename = branch.control_files.controlfilename
2018.5.129 by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
326
            self.failUnless(t.has(t.relpath(controlfilename("branch.conf"))))
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
327
        # Because the nick has been set explicitly, the nick is now always
328
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
329
        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.
330
        t.move('bzr.ab', 'integration')
331
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
332
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
333
        branch.nick = u"\u1234"
334
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
335
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
336
    def test_commit_nicks(self):
337
        """Nicknames are committed to the revision"""
338
        wt = self.make_branch_and_tree('bzr.dev')
339
        branch = wt.branch
340
        branch.nick = "My happy branch"
341
        wt.commit('My commit respect da nick.')
342
        committed = branch.repository.get_revision(branch.last_revision())
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
343
        self.assertEqual(committed.properties["branch-nick"],
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
344
                         "My happy branch")
345
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
346
    def test_create_open_branch_uses_repository(self):
347
        try:
348
            repo = self.make_repository('.', shared=True)
349
        except errors.IncompatibleFormat:
350
            return
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
351
        child_transport = repo.bzrdir.root_transport.clone('child')
352
        child_transport.mkdir('.')
353
        child_dir = self.bzrdir_format.initialize_on_transport(child_transport)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
354
        try:
355
            child_branch = self.branch_format.initialize(child_dir)
356
        except errors.UninitializableFormat:
357
            # branch references are not default init'able.
358
            return
359
        self.assertEqual(repo.bzrdir.root_transport.base,
360
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
361
        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.
362
        self.assertEqual(repo.bzrdir.root_transport.base,
363
                         child_branch.repository.bzrdir.root_transport.base)
364
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
365
    def test_format_description(self):
366
        tree = self.make_branch_and_tree('tree')
367
        text = tree.branch._format.get_format_description()
368
        self.failUnless(len(text))
369
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
370
    def test_check_branch_report_results(self):
371
        """Checking a branch produces results which can be printed"""
372
        branch = self.make_branch('.')
373
        result = branch.check()
374
        # reports results through logging
375
        result.report_results(verbose=True)
376
        result.report_results(verbose=False)
377
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
378
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
379
        branch = self.make_branch(".")
380
        branch.lock_write()
381
        builder = branch.get_commit_builder([])
382
        self.assertIsInstance(builder, repository.CommitBuilder)
383
        branch.repository.commit_write_group()
384
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
385
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
386
    def test_generate_revision_history(self):
387
        """Create a fake revision history easily."""
388
        tree = self.make_branch_and_tree('.')
389
        rev1 = tree.commit('foo')
390
        orig_history = tree.branch.revision_history()
391
        rev2 = tree.commit('bar', allow_pointless=True)
392
        tree.branch.generate_revision_history(rev1)
393
        self.assertEqual(orig_history, tree.branch.revision_history())
394
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
395
    def test_generate_revision_history_NULL_REVISION(self):
396
        tree = self.make_branch_and_tree('.')
397
        rev1 = tree.commit('foo')
398
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
399
        self.assertEqual([], tree.branch.revision_history())
400
1551.8.6 by Aaron Bentley
Rename test
401
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
402
        tree_a = self.make_branch_and_tree('a')
403
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
404
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
405
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
406
        checkout_b.commit('rev1', rev_id='rev1')
407
        self.assertEqual('rev1', branch_a.last_revision())
408
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
409
1551.8.5 by Aaron Bentley
Change name to create_checkout
410
        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
411
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
412
        checkout_c.commit('rev2', rev_id='rev2')
413
        self.assertEqual('rev2', branch_a.last_revision())
414
        self.assertEqual(checkout_c.branch.base, branch_a.base)
415
416
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
417
        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
418
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
419
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
420
        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
421
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
422
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
423
    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
424
        """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
425
        tree_a = self.make_branch_and_tree('a')
426
        rev_id = tree_a.commit('put some content in the branch')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
427
        # open the branch via a readonly transport
428
        source_branch = bzrlib.branch.Branch.open(self.get_readonly_url('a'))
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
429
        # sanity check that the test will be valid
430
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
431
            source_branch.lock_write)
432
        checkout = source_branch.create_checkout('c', lightweight=True)
433
        self.assertEqual(rev_id, checkout.last_revision())
434
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
435
    def test_create_anonymous_heavyweight_checkout(self):
436
        """A regular checkout from a readonly branch should succeed."""
437
        tree_a = self.make_branch_and_tree('a')
438
        rev_id = tree_a.commit('put some content in the branch')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
439
        # open the branch via a readonly transport
440
        source_branch = bzrlib.branch.Branch.open(self.get_readonly_url('a'))
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
441
        # sanity check that the test will be valid
442
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
443
            source_branch.lock_write)
444
        checkout = source_branch.create_checkout('c')
445
        self.assertEqual(rev_id, checkout.last_revision())
446
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
447
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
448
        tree = self.make_branch_and_tree('a')
449
        tree.commit('a commit', rev_id='rev1')
450
        br = tree.branch
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
451
        br.set_revision_history(["rev1"])
452
        self.assertEquals(br.revision_history(), ["rev1"])
453
        br.set_revision_history([])
454
        self.assertEquals(br.revision_history(), [])
455
1551.8.4 by Aaron Bentley
Tweak import style
456
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
457
class ChrootedTests(TestCaseWithBranch):
458
    """A support class that provides readonly urls outside the local namespace.
459
460
    This is done by checking if self.transport_server is a MemoryServer. if it
461
    is then we are chrooted already, if it is not then an HttpServer is used
462
    for readonly urls.
463
    """
464
465
    def setUp(self):
466
        super(ChrootedTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
467
        if not self.vfs_transport_factory == MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
468
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
469
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
470
    def test_open_containing(self):
471
        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.
472
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
473
        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.
474
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
475
        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.
476
        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).
477
        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.
478
        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).
479
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
480
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
481
482
class InstrumentedTransaction(object):
483
484
    def finish(self):
485
        self.calls.append('finish')
486
487
    def __init__(self):
488
        self.calls = []
489
490
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
491
class TestDecorator(object):
492
493
    def __init__(self):
494
        self._calls = []
495
496
    def lock_read(self):
497
        self._calls.append('lr')
498
499
    def lock_write(self):
500
        self._calls.append('lw')
501
502
    def unlock(self):
503
        self._calls.append('ul')
504
505
    @needs_read_lock
506
    def do_with_read(self):
507
        return 1
508
509
    @needs_read_lock
510
    def except_with_read(self):
511
        raise RuntimeError
512
513
    @needs_write_lock
514
    def do_with_write(self):
515
        return 2
516
517
    @needs_write_lock
518
    def except_with_write(self):
519
        raise RuntimeError
520
521
522
class TestDecorators(TestCase):
523
524
    def test_needs_read_lock(self):
525
        branch = TestDecorator()
526
        self.assertEqual(1, branch.do_with_read())
527
        self.assertEqual(['lr', 'ul'], branch._calls)
528
529
    def test_excepts_in_read_lock(self):
530
        branch = TestDecorator()
531
        self.assertRaises(RuntimeError, branch.except_with_read)
532
        self.assertEqual(['lr', 'ul'], branch._calls)
533
534
    def test_needs_write_lock(self):
535
        branch = TestDecorator()
536
        self.assertEqual(2, branch.do_with_write())
537
        self.assertEqual(['lw', 'ul'], branch._calls)
538
539
    def test_excepts_in_write_lock(self):
540
        branch = TestDecorator()
541
        self.assertRaises(RuntimeError, branch.except_with_write)
542
        self.assertEqual(['lw', 'ul'], branch._calls)
543
544
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
545
class TestBranchPushLocations(TestCaseWithBranch):
546
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
547
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
548
        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.
549
550
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
551
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
552
                                   ensure_config_dir_exists)
553
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
554
        fn = locations_config_filename()
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
555
        open(fn, 'wt').write(("[%s]\n"
556
                                  "push_location=foo\n" %
557
                                  self.get_branch().base[:-1]))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
558
        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.
559
560
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
561
        branch = self.get_branch()
562
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
563
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
564
565
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
566
class TestFormat(TestCaseWithBranch):
567
    """Tests for the format itself."""
568
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
569
    def test_get_reference(self):
570
        """get_reference on all regular branches should return None."""
571
        if not self.branch_format.is_supported():
572
            # unsupported formats are not loopback testable
573
            # because the default open will not open them and
574
            # they may not be initializable.
575
            return
576
        made_branch = self.make_branch('.')
577
        self.assertEqual(None,
578
            made_branch._format.get_reference(made_branch.bzrdir))
579
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
580
    def test_set_reference(self):
581
        """set_reference on all regular branches should be callable."""
582
        if not self.branch_format.is_supported():
583
            # unsupported formats are not loopback testable
584
            # because the default open will not open them and
585
            # they may not be initializable.
586
            return
587
        this_branch = self.make_branch('this')
588
        other_branch = self.make_branch('other')
589
        try:
590
            this_branch._format.set_reference(this_branch.bzrdir, other_branch)
591
        except NotImplementedError:
592
            # that's ok
593
            pass
594
        else:
595
            ref = this_branch._format.get_reference(this_branch.bzrdir)
596
            self.assertEqual(ref, other_branch.base)
597
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
598
    def test_format_initialize_find_open(self):
599
        # 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.
600
        if not self.branch_format.is_supported():
601
            # unsupported formats are not loopback testable
602
            # because the default open will not open them and
603
            # they may not be initializable.
604
            return
605
        # 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.
606
        t = get_transport(self.get_url())
607
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
608
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
609
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
610
611
        # find it via bzrdir opening:
612
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
613
        direct_opened_branch = opened_control.open_branch()
614
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
615
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
616
        self.failUnless(isinstance(direct_opened_branch._format,
617
                        self.branch_format.__class__))
618
619
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
620
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
621
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
622
        self.assertEqual(made_branch._format.__class__,
623
                         opened_branch._format.__class__)
624
        # if it has a unique id string, can we probe for it ?
625
        try:
626
            self.branch_format.get_format_string()
627
        except NotImplementedError:
628
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
629
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
630
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
631
2230.3.7 by Aaron Bentley
Fix binding return values
632
2230.3.6 by Aaron Bentley
work in progress bind stuff
633
class TestBound(TestCaseWithBranch):
634
635
    def test_bind_unbind(self):
636
        branch = self.make_branch('1')
637
        branch2 = self.make_branch('2')
638
        try:
639
            branch.bind(branch2)
640
        except errors.UpgradeRequired:
641
            raise TestSkipped('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
642
        self.assertTrue(branch.unbind())
643
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
644
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
645
646
    def test_old_bound_location(self):
647
        branch = self.make_branch('branch1')
648
        try:
649
            self.assertIs(None, branch.get_old_bound_location())
650
        except errors.UpgradeRequired:
651
            raise TestSkipped('Format does not store old bound locations')
652
        branch2 = self.make_branch('branch2')
653
        branch.bind(branch2)
654
        self.assertIs(None, branch.get_old_bound_location())
655
        branch.unbind()
656
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
657
658
659
class TestStrict(TestCaseWithBranch):
660
661
    def test_strict_history(self):
662
        tree1 = self.make_branch_and_tree('tree1')
663
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
664
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
665
        except errors.UpgradeRequired:
666
            raise TestSkipped('Format does not support strict history')
667
        tree1.commit('empty commit')
668
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
669
        tree2.commit('empty commit 2')
670
        tree1.pull(tree2.branch)
671
        tree1.commit('empty commit 3')
672
        tree2.commit('empty commit 4')
673
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
674
        tree2.merge_from_branch(tree1.branch)
675
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
676
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
677
                          tree2.branch)
678
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
679
        tree3.merge_from_branch(tree2.branch)
680
        tree3.commit('empty commit 6')
681
        tree2.pull(tree3.branch)