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