/brz/remove-bazaar

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