/brz/remove-bazaar

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