/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)
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.
217
        rev_id = wt.commit('commit against a ghost first parent.')
218
        rev = wt.branch.repository.get_revision(rev_id)
219
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
220
        # parent_sha1s is not populated now, WTF. rbc 20051003
221
        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.
222
223
    def test_record_two_ghosts(self):
224
        """Recording with all ghosts works."""
225
        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.
226
        wt.set_parent_ids([
227
                'foo@azkhazan-123123-abcabc',
228
                'wibble@fofof--20050401--1928390812',
229
            ],
230
            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.
231
        rev_id = wt.commit("commit from ghost base with one merge")
232
        # the revision should have been committed with two parents
233
        rev = wt.branch.repository.get_revision(rev_id)
234
        self.assertEqual(['foo@azkhazan-123123-abcabc',
235
            'wibble@fofof--20050401--1928390812'],
236
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
237
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
238
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
239
        self.assertRaises(errors.InvalidRevisionId,
240
                          self.get_branch().repository.get_revision,
241
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
242
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
243
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
244
# compare the gpg-to-sign info for a commit with a ghost and 
245
#     an identical tree without a ghost
246
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
247
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
248
    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.
249
        wt = self.make_branch_and_tree('.')
250
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
251
        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
252
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
253
        strategy = gpg.LoopbackGPGStrategy(None)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
254
        branch.repository.lock_write()
255
        branch.repository.start_write_group()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
256
        branch.repository.sign_revision('A', strategy)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
257
        branch.repository.commit_write_group()
258
        branch.repository.unlock()
1551.12.36 by Aaron Bentley
Fix failing tests
259
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
260
                         Testament.from_revision(branch.repository,
261
                         'A').as_short_text() +
1551.12.52 by Aaron Bentley
speling fix
262
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
263
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
264
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
265
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
266
        wt = self.make_branch_and_tree('.')
267
        branch = wt.branch
3015.2.3 by Robert Collins
Use write groups around revision signature tests for branch.
268
        branch.lock_write()
269
        try:
270
            branch.repository.start_write_group()
271
            try:
272
                branch.repository.store_revision_signature(
273
                    gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
274
            except:
275
                branch.repository.abort_write_group()
276
                raise
277
            else:
278
                branch.repository.commit_write_group()
279
        finally:
280
            branch.unlock()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
281
        self.assertRaises(errors.NoSuchRevision,
282
                          branch.repository.has_signature_for_revision_id,
283
                          'A')
284
        wt.commit("base", allow_pointless=True, rev_id='A')
1551.12.36 by Aaron Bentley
Fix failing tests
285
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
1551.12.52 by Aaron Bentley
speling fix
286
                         'FOO-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
287
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
288
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
289
    def test_branch_keeps_signatures(self):
290
        wt = self.make_branch_and_tree('source')
291
        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).
292
        repo = wt.branch.repository
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
293
        repo.lock_write()
294
        repo.start_write_group()
2818.4.2 by Robert Collins
Review feedback.
295
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
296
        repo.commit_write_group()
297
        repo.unlock()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
298
        #FIXME: clone should work to urls,
299
        # wt.clone should work to disks.
300
        self.build_tree(['target/'])
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
301
        d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
302
        self.assertEqual(repo.get_signature_text('A'),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
303
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
304
1185.35.11 by Aaron Bentley
Added support for branch nicks
305
    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.
306
        """Test explicit and implicit branch nicknames.
307
        
308
        Nicknames are implicitly the name of the branch's directory, unless an
309
        explicit nickname is set.  That is, an explicit nickname always
310
        overrides the implicit one.
311
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
312
        t = get_transport(self.get_url())
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
313
        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.
314
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
315
        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.
316
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
317
        # 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.
318
        t.move('bzr.dev', 'bzr.ab')
319
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
320
        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.
321
        # Set the branch nick explicitly.  This will ensure there's a branch
322
        # config file in the branch.
323
        branch.nick = "Aaron's branch"
324
        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)
325
        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.
326
            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)
327
            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.
328
        # Because the nick has been set explicitly, the nick is now always
329
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
330
        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.
331
        t.move('bzr.ab', 'integration')
332
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
333
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
334
        branch.nick = u"\u1234"
335
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
336
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
337
    def test_commit_nicks(self):
338
        """Nicknames are committed to the revision"""
339
        wt = self.make_branch_and_tree('bzr.dev')
340
        branch = wt.branch
341
        branch.nick = "My happy branch"
342
        wt.commit('My commit respect da nick.')
343
        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.
344
        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.
345
                         "My happy branch")
346
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
347
    def test_create_open_branch_uses_repository(self):
348
        try:
349
            repo = self.make_repository('.', shared=True)
350
        except errors.IncompatibleFormat:
351
            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.
352
        child_transport = repo.bzrdir.root_transport.clone('child')
353
        child_transport.mkdir('.')
354
        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.
355
        try:
356
            child_branch = self.branch_format.initialize(child_dir)
357
        except errors.UninitializableFormat:
358
            # branch references are not default init'able.
359
            return
360
        self.assertEqual(repo.bzrdir.root_transport.base,
361
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
362
        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.
363
        self.assertEqual(repo.bzrdir.root_transport.base,
364
                         child_branch.repository.bzrdir.root_transport.base)
365
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
366
    def test_format_description(self):
367
        tree = self.make_branch_and_tree('tree')
368
        text = tree.branch._format.get_format_description()
369
        self.failUnless(len(text))
370
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
371
    def test_check_branch_report_results(self):
372
        """Checking a branch produces results which can be printed"""
373
        branch = self.make_branch('.')
374
        result = branch.check()
375
        # reports results through logging
376
        result.report_results(verbose=True)
377
        result.report_results(verbose=False)
378
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
379
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
380
        branch = self.make_branch(".")
381
        branch.lock_write()
382
        builder = branch.get_commit_builder([])
383
        self.assertIsInstance(builder, repository.CommitBuilder)
384
        branch.repository.commit_write_group()
385
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
386
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
387
    def test_generate_revision_history(self):
388
        """Create a fake revision history easily."""
389
        tree = self.make_branch_and_tree('.')
390
        rev1 = tree.commit('foo')
391
        orig_history = tree.branch.revision_history()
392
        rev2 = tree.commit('bar', allow_pointless=True)
393
        tree.branch.generate_revision_history(rev1)
394
        self.assertEqual(orig_history, tree.branch.revision_history())
395
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
396
    def test_generate_revision_history_NULL_REVISION(self):
397
        tree = self.make_branch_and_tree('.')
398
        rev1 = tree.commit('foo')
399
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
400
        self.assertEqual([], tree.branch.revision_history())
401
1551.8.6 by Aaron Bentley
Rename test
402
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
403
        tree_a = self.make_branch_and_tree('a')
404
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
405
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
406
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
407
        checkout_b.commit('rev1', rev_id='rev1')
408
        self.assertEqual('rev1', branch_a.last_revision())
409
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
410
1551.8.5 by Aaron Bentley
Change name to create_checkout
411
        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
412
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
413
        checkout_c.commit('rev2', rev_id='rev2')
414
        self.assertEqual('rev2', branch_a.last_revision())
415
        self.assertEqual(checkout_c.branch.base, branch_a.base)
416
417
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
418
        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
419
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
420
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
421
        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
422
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
423
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
424
    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
425
        """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
426
        tree_a = self.make_branch_and_tree('a')
427
        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.
428
        # open the branch via a readonly transport
429
        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
430
        # sanity check that the test will be valid
431
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
432
            source_branch.lock_write)
433
        checkout = source_branch.create_checkout('c', lightweight=True)
434
        self.assertEqual(rev_id, checkout.last_revision())
435
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
436
    def test_create_anonymous_heavyweight_checkout(self):
437
        """A regular checkout from a readonly branch should succeed."""
438
        tree_a = self.make_branch_and_tree('a')
439
        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.
440
        # open the branch via a readonly transport
441
        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
442
        # sanity check that the test will be valid
443
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
444
            source_branch.lock_write)
445
        checkout = source_branch.create_checkout('c')
446
        self.assertEqual(rev_id, checkout.last_revision())
447
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
448
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
449
        tree = self.make_branch_and_tree('a')
450
        tree.commit('a commit', rev_id='rev1')
451
        br = tree.branch
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
452
        br.set_revision_history(["rev1"])
453
        self.assertEquals(br.revision_history(), ["rev1"])
454
        br.set_revision_history([])
455
        self.assertEquals(br.revision_history(), [])
456
1551.8.4 by Aaron Bentley
Tweak import style
457
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
458
class ChrootedTests(TestCaseWithBranch):
459
    """A support class that provides readonly urls outside the local namespace.
460
461
    This is done by checking if self.transport_server is a MemoryServer. if it
462
    is then we are chrooted already, if it is not then an HttpServer is used
463
    for readonly urls.
464
    """
465
466
    def setUp(self):
467
        super(ChrootedTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
468
        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.
469
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
470
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
471
    def test_open_containing(self):
472
        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.
473
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
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('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
476
        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.
477
        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).
478
        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.
479
        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).
480
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
481
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
482
483
class InstrumentedTransaction(object):
484
485
    def finish(self):
486
        self.calls.append('finish')
487
488
    def __init__(self):
489
        self.calls = []
490
491
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
492
class TestDecorator(object):
493
494
    def __init__(self):
495
        self._calls = []
496
497
    def lock_read(self):
498
        self._calls.append('lr')
499
500
    def lock_write(self):
501
        self._calls.append('lw')
502
503
    def unlock(self):
504
        self._calls.append('ul')
505
506
    @needs_read_lock
507
    def do_with_read(self):
508
        return 1
509
510
    @needs_read_lock
511
    def except_with_read(self):
512
        raise RuntimeError
513
514
    @needs_write_lock
515
    def do_with_write(self):
516
        return 2
517
518
    @needs_write_lock
519
    def except_with_write(self):
520
        raise RuntimeError
521
522
523
class TestDecorators(TestCase):
524
525
    def test_needs_read_lock(self):
526
        branch = TestDecorator()
527
        self.assertEqual(1, branch.do_with_read())
528
        self.assertEqual(['lr', 'ul'], branch._calls)
529
530
    def test_excepts_in_read_lock(self):
531
        branch = TestDecorator()
532
        self.assertRaises(RuntimeError, branch.except_with_read)
533
        self.assertEqual(['lr', 'ul'], branch._calls)
534
535
    def test_needs_write_lock(self):
536
        branch = TestDecorator()
537
        self.assertEqual(2, branch.do_with_write())
538
        self.assertEqual(['lw', 'ul'], branch._calls)
539
540
    def test_excepts_in_write_lock(self):
541
        branch = TestDecorator()
542
        self.assertRaises(RuntimeError, branch.except_with_write)
543
        self.assertEqual(['lw', 'ul'], branch._calls)
544
545
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
546
class TestBranchPushLocations(TestCaseWithBranch):
547
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
548
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
549
        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.
550
551
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
552
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
553
                                   ensure_config_dir_exists)
554
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
555
        fn = locations_config_filename()
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
556
        open(fn, 'wt').write(("[%s]\n"
557
                                  "push_location=foo\n" %
558
                                  self.get_branch().base[:-1]))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
559
        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.
560
561
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
562
        branch = self.get_branch()
563
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
564
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
565
566
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
567
class TestFormat(TestCaseWithBranch):
568
    """Tests for the format itself."""
569
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
570
    def test_get_reference(self):
571
        """get_reference on all regular branches should return None."""
572
        if not self.branch_format.is_supported():
573
            # unsupported formats are not loopback testable
574
            # because the default open will not open them and
575
            # they may not be initializable.
576
            return
577
        made_branch = self.make_branch('.')
578
        self.assertEqual(None,
579
            made_branch._format.get_reference(made_branch.bzrdir))
580
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
581
    def test_set_reference(self):
582
        """set_reference on all regular branches should be callable."""
583
        if not self.branch_format.is_supported():
584
            # unsupported formats are not loopback testable
585
            # because the default open will not open them and
586
            # they may not be initializable.
587
            return
588
        this_branch = self.make_branch('this')
589
        other_branch = self.make_branch('other')
590
        try:
591
            this_branch._format.set_reference(this_branch.bzrdir, other_branch)
592
        except NotImplementedError:
593
            # that's ok
594
            pass
595
        else:
596
            ref = this_branch._format.get_reference(this_branch.bzrdir)
597
            self.assertEqual(ref, other_branch.base)
598
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
599
    def test_format_initialize_find_open(self):
600
        # 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.
601
        if not self.branch_format.is_supported():
602
            # unsupported formats are not loopback testable
603
            # because the default open will not open them and
604
            # they may not be initializable.
605
            return
606
        # 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.
607
        t = get_transport(self.get_url())
608
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
609
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
610
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
611
612
        # find it via bzrdir opening:
613
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
614
        direct_opened_branch = opened_control.open_branch()
615
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
616
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
617
        self.failUnless(isinstance(direct_opened_branch._format,
618
                        self.branch_format.__class__))
619
620
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
621
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
622
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
623
        self.assertEqual(made_branch._format.__class__,
624
                         opened_branch._format.__class__)
625
        # if it has a unique id string, can we probe for it ?
626
        try:
627
            self.branch_format.get_format_string()
628
        except NotImplementedError:
629
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
630
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
631
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
632
2230.3.7 by Aaron Bentley
Fix binding return values
633
2230.3.6 by Aaron Bentley
work in progress bind stuff
634
class TestBound(TestCaseWithBranch):
635
636
    def test_bind_unbind(self):
637
        branch = self.make_branch('1')
638
        branch2 = self.make_branch('2')
639
        try:
640
            branch.bind(branch2)
641
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
642
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
643
        self.assertTrue(branch.unbind())
644
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
645
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
646
647
    def test_old_bound_location(self):
648
        branch = self.make_branch('branch1')
649
        try:
650
            self.assertIs(None, branch.get_old_bound_location())
651
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
652
            raise tests.TestNotApplicable(
653
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
654
        branch2 = self.make_branch('branch2')
655
        branch.bind(branch2)
656
        self.assertIs(None, branch.get_old_bound_location())
657
        branch.unbind()
658
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
659
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
660
    def test_bind_diverged(self):
661
        tree_a = self.make_branch_and_tree('tree_a')
662
        tree_a.commit('rev1a')
663
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
664
        tree_a.commit('rev2a')
665
        tree_b.commit('rev2b')
666
        try:
667
            tree_b.branch.bind(tree_a.branch)
668
        except errors.UpgradeRequired:
669
            raise tests.TestNotApplicable('Format does not support binding')
670
2230.3.32 by Aaron Bentley
Implement strict history policy
671
672
class TestStrict(TestCaseWithBranch):
673
674
    def test_strict_history(self):
675
        tree1 = self.make_branch_and_tree('tree1')
676
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
677
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
678
        except errors.UpgradeRequired:
679
            raise TestSkipped('Format does not support strict history')
680
        tree1.commit('empty commit')
681
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
682
        tree2.commit('empty commit 2')
683
        tree1.pull(tree2.branch)
684
        tree1.commit('empty commit 3')
685
        tree2.commit('empty commit 4')
686
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
687
        tree2.merge_from_branch(tree1.branch)
688
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
689
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
690
                          tree2.branch)
691
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
692
        tree3.merge_from_branch(tree2.branch)
693
        tree3.commit('empty commit 6')
694
        tree2.pull(tree3.branch)