/brz/remove-bazaar

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