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