/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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
905 by Martin Pool
- merge aaron's append_multiple.patch
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,
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
27
    merge,
1878.1.3 by John Arbash Meinel
some test cleanups
28
    urlutils,
29
    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)
30
    remote,
1878.1.3 by John Arbash Meinel
some test cleanups
31
    repository,
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
32
    tests,
1878.1.3 by John Arbash Meinel
some test cleanups
33
    )
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
34
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().
35
from bzrlib.delta import TreeDelta
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
36
from bzrlib.errors import (FileExists,
37
                           NoSuchRevision,
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
38
                           NoSuchFile,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
39
                           UninitializableFormat,
40
                           NotBranchError,
41
                           )
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
42
from bzrlib.osutils import getcwd
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
43
import bzrlib.revision
3445.2.2 by John Arbash Meinel
Move the test to a branch_implementations test
44
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.
45
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
46
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.
47
from bzrlib.tests.http_server import HttpServer
1260 by Martin Pool
- some updates for fetch/update function
48
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
49
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.
50
from bzrlib.transport.memory import MemoryServer
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
51
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.
52
from bzrlib.workingtree import WorkingTree
1092.2.25 by Robert Collins
support ghosts in commits
53
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
54
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.
55
class TestTestCaseWithBranch(TestCaseWithBranch):
56
57
    def test_branch_format_matches_bzrdir_branch_format(self):
58
        bzrdir_branch_format = self.bzrdir_format.get_branch_format()
59
        self.assertIs(self.branch_format.__class__,
60
                      bzrdir_branch_format.__class__)
61
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.
62
    def test_make_branch_gets_expected_format(self):
63
        branch = self.make_branch('.')
64
        self.assertIs(self.branch_format.__class__,
65
            branch._format.__class__)
66
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.
67
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
68
class TestBranch(TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
69
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
70
    def test_create_tree_with_merge(self):
71
        tree = self.create_tree_with_merge()
3287.6.9 by Robert Collins
One last use of deprecated methods.
72
        tree.lock_read()
73
        self.addCleanup(tree.unlock)
74
        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.
75
        ancestry_graph = graph.get_parent_map(
76
            tree.branch.repository.all_revision_ids())
3287.6.9 by Robert Collins
One last use of deprecated methods.
77
        self.assertEqual({'rev-1':('null:',),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
78
                          'rev-2':('rev-1', ),
79
                          'rev-1.1.1':('rev-1', ),
80
                          '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.
81
                         }, ancestry_graph)
82
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
83
    def test_revision_ids_are_utf8(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
84
        wt = self.make_branch_and_tree('tree')
85
        wt.commit('f', rev_id='rev1')
86
        wt.commit('f', rev_id='rev2')
87
        wt.commit('f', rev_id='rev3')
88
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
89
        br = self.get_branch()
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
90
        br.fetch(wt.branch)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
91
        br.set_revision_history(['rev1', 'rev2', 'rev3'])
92
        rh = br.revision_history()
93
        self.assertEqual(['rev1', 'rev2', 'rev3'], rh)
94
        for revision_id in rh:
95
            self.assertIsInstance(revision_id, str)
96
        last = br.last_revision()
97
        self.assertEqual('rev3', last)
98
        self.assertIsInstance(last, str)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
99
        revno, last = br.last_revision_info()
100
        self.assertEqual(3, revno)
101
        self.assertEqual('rev3', last)
102
        self.assertIsInstance(last, str)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
103
1260 by Martin Pool
- some updates for fetch/update function
104
    def test_fetch_revisions(self):
105
        """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.
106
        wt = self.make_branch_and_tree('b1')
107
        b1 = wt.branch
2381.1.3 by Robert Collins
Review feedback.
108
        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.
109
        wt.add(['foo'], ['foo-id'])
110
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
111
2381.1.3 by Robert Collins
Review feedback.
112
        b2 = self.make_branch('b2')
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
113
        b2.fetch(b1)
1260 by Martin Pool
- some updates for fetch/update function
114
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
115
        rev = b2.repository.get_revision('revision-1')
116
        tree = b2.repository.revision_tree('revision-1')
3015.2.1 by Robert Collins
Lock correctness in branch implementation tests.
117
        tree.lock_read()
118
        self.addCleanup(tree.unlock)
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
119
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
120
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
121
    def test_get_revision_delta(self):
122
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
123
        self.build_tree(['a/foo'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
124
        tree_a.add('foo', 'file1')
125
        tree_a.commit('rev1', rev_id='rev1')
2381.1.3 by Robert Collins
Review feedback.
126
        self.build_tree(['a/vla'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
127
        tree_a.add('vla', 'file2')
128
        tree_a.commit('rev2', rev_id='rev2')
129
130
        delta = tree_a.branch.get_revision_delta(1)
131
        self.assertIsInstance(delta, TreeDelta)
132
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
133
        delta = tree_a.branch.get_revision_delta(2)
134
        self.assertIsInstance(delta, TreeDelta)
135
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
136
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
137
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
138
        """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.
139
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
140
        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.
141
        tree_a.add('b')
142
        tree_a.commit("silly commit", rev_id='A')
143
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
144
        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.
145
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
146
147
    def get_balanced_branch_pair(self):
148
        """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.
149
        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.
150
        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.
151
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
152
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
153
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
154
        """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.
155
        # TODO: RBC 20060208 test with a revision not on revision-history.
156
        #       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).
157
        # 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.
158
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
159
        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.
160
        wt_a.add(['one'])
161
        wt_a.commit('commit one', rev_id='1')
2381.1.3 by Robert Collins
Review feedback.
162
        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.
163
        wt_a.add(['two'])
164
        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).
165
        # 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.
166
        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).
167
        wt_a.branch.repository.copy_content_into(repo_b)
168
        # wt_a might be a lightweight checkout, so get a hold of the actual
169
        # branch (because you can't do a partial clone of a lightweight
170
        # checkout).
171
        branch = wt_a.branch.bzrdir.open_branch()
172
        # Then make a branch where the new repository is, but specify a revision
173
        # ID.  The new branch's history will stop at the specified revision.
174
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
175
        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.
176
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
177
    def get_parented_branch(self):
178
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
179
        self.build_tree(['a/one'])
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
180
        wt_a.add(['one'])
181
        wt_a.commit('commit one', rev_id='1')
182
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
183
        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)
184
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
185
        return branch_b
186
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.
187
    def test_clone_branch_nickname(self):
188
        # test the nick name is preserved always
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
189
        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.
190
191
    def test_clone_branch_parent(self):
192
        # 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)
193
        branch_b = self.get_parented_branch()
194
        repo_c = self.make_repository('c')
195
        branch_b.repository.copy_content_into(repo_c)
196
        branch_c = branch_b.clone(repo_c.bzrdir)
197
        self.assertNotEqual(None, branch_c.get_parent())
198
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
199
200
        # We can also set a specific parent, and it should be honored
201
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
202
        branch_b.set_parent(random_parent)
203
        repo_d = self.make_repository('d')
204
        branch_b.repository.copy_content_into(repo_d)
205
        branch_d = branch_b.clone(repo_d.bzrdir)
206
        self.assertEqual(random_parent, branch_d.get_parent())
207
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
208
    def test_submit_branch(self):
209
        """Submit location can be queried and set"""
210
        branch = self.make_branch('branch')
211
        self.assertEqual(branch.get_submit_branch(), None)
212
        branch.set_submit_branch('sftp://example.com')
213
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
214
        branch.set_submit_branch('sftp://example.net')
215
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
216
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
217
    def test_public_branch(self):
218
        """public location can be queried and set"""
219
        branch = self.make_branch('branch')
220
        self.assertEqual(branch.get_public_branch(), None)
221
        branch.set_public_branch('sftp://example.com')
222
        self.assertEqual(branch.get_public_branch(), 'sftp://example.com')
223
        branch.set_public_branch('sftp://example.net')
224
        self.assertEqual(branch.get_public_branch(), 'sftp://example.net')
225
        branch.set_public_branch(None)
226
        self.assertEqual(branch.get_public_branch(), None)
227
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.
228
    def test_record_initial_ghost(self):
229
        """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.
230
        wt = self.make_branch_and_tree('.')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
231
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
232
            allow_leftmost_as_ghost=True)
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
233
        self.assertEqual(['non:existent@rev--ision--0--2'],
234
            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.
235
        rev_id = wt.commit('commit against a ghost first parent.')
236
        rev = wt.branch.repository.get_revision(rev_id)
237
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
238
        # parent_sha1s is not populated now, WTF. rbc 20051003
239
        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.
240
241
    def test_record_two_ghosts(self):
242
        """Recording with all ghosts works."""
243
        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.
244
        wt.set_parent_ids([
245
                'foo@azkhazan-123123-abcabc',
246
                'wibble@fofof--20050401--1928390812',
247
            ],
248
            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.
249
        rev_id = wt.commit("commit from ghost base with one merge")
250
        # the revision should have been committed with two parents
251
        rev = wt.branch.repository.get_revision(rev_id)
252
        self.assertEqual(['foo@azkhazan-123123-abcabc',
253
            'wibble@fofof--20050401--1928390812'],
254
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
255
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
256
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
257
        self.assertRaises(errors.InvalidRevisionId,
258
                          self.get_branch().repository.get_revision,
259
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
260
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
261
# TODO 20051003 RBC:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
262
# compare the gpg-to-sign info for a commit with a ghost and
1092.2.25 by Robert Collins
support ghosts in commits
263
#     an identical tree without a ghost
264
# 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
265
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
266
    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.
267
        wt = self.make_branch_and_tree('.')
268
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
269
        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
270
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
271
        strategy = gpg.LoopbackGPGStrategy(None)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
272
        branch.repository.lock_write()
273
        branch.repository.start_write_group()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
274
        branch.repository.sign_revision('A', strategy)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
275
        branch.repository.commit_write_group()
276
        branch.repository.unlock()
1551.12.36 by Aaron Bentley
Fix failing tests
277
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
278
                         Testament.from_revision(branch.repository,
279
                         'A').as_short_text() +
1551.12.52 by Aaron Bentley
speling fix
280
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
281
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
282
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
283
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
284
        wt = self.make_branch_and_tree('.')
285
        branch = wt.branch
3015.2.3 by Robert Collins
Use write groups around revision signature tests for branch.
286
        branch.lock_write()
287
        try:
288
            branch.repository.start_write_group()
289
            try:
290
                branch.repository.store_revision_signature(
291
                    gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
292
            except:
293
                branch.repository.abort_write_group()
294
                raise
295
            else:
296
                branch.repository.commit_write_group()
297
        finally:
298
            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.
299
        # A signature without a revision should not be accessible.
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
300
        self.assertRaises(errors.NoSuchRevision,
301
                          branch.repository.has_signature_for_revision_id,
302
                          'A')
303
        wt.commit("base", allow_pointless=True, rev_id='A')
1551.12.36 by Aaron Bentley
Fix failing tests
304
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
1551.12.52 by Aaron Bentley
speling fix
305
                         'FOO-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
306
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
307
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
308
    def test_branch_keeps_signatures(self):
309
        wt = self.make_branch_and_tree('source')
310
        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).
311
        repo = wt.branch.repository
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
312
        repo.lock_write()
313
        repo.start_write_group()
2818.4.2 by Robert Collins
Review feedback.
314
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
315
        repo.commit_write_group()
316
        repo.unlock()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
317
        #FIXME: clone should work to urls,
318
        # wt.clone should work to disks.
319
        self.build_tree(['target/'])
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
320
        d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
321
        self.assertEqual(repo.get_signature_text('A'),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
322
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
323
3445.2.2 by John Arbash Meinel
Move the test to a branch_implementations test
324
    def test_missing_revisions(self):
325
        t1 = self.make_branch_and_tree('b1')
326
        rev1 = t1.commit('one')
327
        t2 = t1.bzrdir.sprout('b2').open_workingtree()
328
        rev2 = t1.commit('two')
329
        rev3 = t1.commit('three')
330
331
        self.assertEqual([rev2, rev3],
332
            self.applyDeprecated(deprecated_in((1, 6, 0)),
333
            t2.branch.missing_revisions, t1.branch))
334
335
        self.assertEqual([],
336
            self.applyDeprecated(deprecated_in((1, 6, 0)),
337
            t2.branch.missing_revisions, t1.branch, stop_revision=1))
338
        self.assertEqual([rev2],
339
            self.applyDeprecated(deprecated_in((1, 6, 0)),
340
            t2.branch.missing_revisions, t1.branch, stop_revision=2))
341
        self.assertEqual([rev2, rev3],
342
            self.applyDeprecated(deprecated_in((1, 6, 0)),
343
            t2.branch.missing_revisions, t1.branch, stop_revision=3))
344
345
        self.assertRaises(errors.NoSuchRevision,
346
            self.applyDeprecated, deprecated_in((1, 6, 0)),
347
            t2.branch.missing_revisions, t1.branch, stop_revision=4)
348
349
        rev4 = t2.commit('four')
350
        self.assertRaises(errors.DivergedBranches,
351
            self.applyDeprecated, deprecated_in((1, 6, 0)),
352
            t2.branch.missing_revisions, t1.branch)
353
1185.35.11 by Aaron Bentley
Added support for branch nicks
354
    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.
355
        """Test explicit and implicit branch nicknames.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
356
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
357
        Nicknames are implicitly the name of the branch's directory, unless an
358
        explicit nickname is set.  That is, an explicit nickname always
359
        overrides the implicit one.
360
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
361
        t = get_transport(self.get_url())
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
362
        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.
363
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
364
        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.
365
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
366
        # 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.
367
        t.move('bzr.dev', 'bzr.ab')
368
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
369
        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.
370
        # Set the branch nick explicitly.  This will ensure there's a branch
371
        # config file in the branch.
372
        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)
373
        if not isinstance(branch, remote.RemoteBranch):
3407.2.8 by Martin Pool
Deprecate LockableFiles.controlfilename
374
            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.
375
        # Because the nick has been set explicitly, the nick is now always
376
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
377
        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.
378
        t.move('bzr.ab', 'integration')
379
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
380
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
381
        branch.nick = u"\u1234"
382
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
383
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
384
    def test_commit_nicks(self):
385
        """Nicknames are committed to the revision"""
386
        wt = self.make_branch_and_tree('bzr.dev')
387
        branch = wt.branch
388
        branch.nick = "My happy branch"
389
        wt.commit('My commit respect da nick.')
390
        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.
391
        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.
392
                         "My happy branch")
393
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
394
    def test_create_open_branch_uses_repository(self):
395
        try:
396
            repo = self.make_repository('.', shared=True)
397
        except errors.IncompatibleFormat:
398
            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.
399
        child_transport = repo.bzrdir.root_transport.clone('child')
400
        child_transport.mkdir('.')
401
        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.
402
        try:
403
            child_branch = self.branch_format.initialize(child_dir)
404
        except errors.UninitializableFormat:
405
            # branch references are not default init'able.
406
            return
407
        self.assertEqual(repo.bzrdir.root_transport.base,
408
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
409
        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.
410
        self.assertEqual(repo.bzrdir.root_transport.base,
411
                         child_branch.repository.bzrdir.root_transport.base)
412
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
413
    def test_format_description(self):
414
        tree = self.make_branch_and_tree('tree')
415
        text = tree.branch._format.get_format_description()
416
        self.failUnless(len(text))
417
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
418
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
419
        branch = self.make_branch(".")
420
        branch.lock_write()
421
        builder = branch.get_commit_builder([])
422
        self.assertIsInstance(builder, repository.CommitBuilder)
423
        branch.repository.commit_write_group()
424
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
425
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
426
    def test_generate_revision_history(self):
427
        """Create a fake revision history easily."""
428
        tree = self.make_branch_and_tree('.')
429
        rev1 = tree.commit('foo')
430
        orig_history = tree.branch.revision_history()
431
        rev2 = tree.commit('bar', allow_pointless=True)
432
        tree.branch.generate_revision_history(rev1)
433
        self.assertEqual(orig_history, tree.branch.revision_history())
434
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
435
    def test_generate_revision_history_NULL_REVISION(self):
436
        tree = self.make_branch_and_tree('.')
437
        rev1 = tree.commit('foo')
438
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
439
        self.assertEqual([], tree.branch.revision_history())
440
1551.8.6 by Aaron Bentley
Rename test
441
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
442
        tree_a = self.make_branch_and_tree('a')
443
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
444
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
445
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
446
        checkout_b.commit('rev1', rev_id='rev1')
447
        self.assertEqual('rev1', branch_a.last_revision())
448
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
449
1551.8.5 by Aaron Bentley
Change name to create_checkout
450
        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
451
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
452
        checkout_c.commit('rev2', rev_id='rev2')
453
        self.assertEqual('rev2', branch_a.last_revision())
454
        self.assertEqual(checkout_c.branch.base, branch_a.base)
455
456
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
457
        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
458
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
459
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
460
        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
461
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
462
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
463
    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
464
        """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
465
        tree_a = self.make_branch_and_tree('a')
466
        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.
467
        # open the branch via a readonly transport
468
        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
469
        # sanity check that the test will be valid
470
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
471
            source_branch.lock_write)
472
        checkout = source_branch.create_checkout('c', lightweight=True)
473
        self.assertEqual(rev_id, checkout.last_revision())
474
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
475
    def test_create_anonymous_heavyweight_checkout(self):
476
        """A regular checkout from a readonly branch should succeed."""
477
        tree_a = self.make_branch_and_tree('a')
478
        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.
479
        # open the branch via a readonly transport
480
        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
481
        # sanity check that the test will be valid
482
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
483
            source_branch.lock_write)
484
        checkout = source_branch.create_checkout('c')
485
        self.assertEqual(rev_id, checkout.last_revision())
486
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
487
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
488
        tree = self.make_branch_and_tree('a')
489
        tree.commit('a commit', rev_id='rev1')
490
        br = tree.branch
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
491
        br.set_revision_history(["rev1"])
492
        self.assertEquals(br.revision_history(), ["rev1"])
493
        br.set_revision_history([])
494
        self.assertEquals(br.revision_history(), [])
495
1551.8.4 by Aaron Bentley
Tweak import style
496
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
497
class TestBranchFormat(TestCaseWithBranch):
498
499
    def test_branch_format_network_name(self):
500
        br = self.make_branch('.')
501
        format = br._format
502
        network_name = format.network_name()
503
        self.assertIsInstance(network_name, str)
504
        # We want to test that the network_name matches the actual format on
505
        # disk. For local branches that means that using network_name as a key
506
        # in the registry gives back the same format. For remote branches we
507
        # check that the network_name of the RemoteBranchFormat we have locally
508
        # matches the actual format present on disk.
509
        if isinstance(format, remote.RemoteBranchFormat):
510
            br._ensure_real()
511
            real_branch = br._real_branch
512
            self.assertEqual(real_branch._format.network_name(), network_name)
513
        else:
514
            registry = branch.network_format_registry
515
            looked_up_format = registry.get(network_name)
516
            self.assertEqual(format.__class__, looked_up_format.__class__)
517
518
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
519
class ChrootedTests(TestCaseWithBranch):
520
    """A support class that provides readonly urls outside the local namespace.
521
522
    This is done by checking if self.transport_server is a MemoryServer. if it
523
    is then we are chrooted already, if it is not then an HttpServer is used
524
    for readonly urls.
525
    """
526
527
    def setUp(self):
528
        super(ChrootedTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
529
        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.
530
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
531
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
532
    def test_open_containing(self):
533
        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.
534
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
535
        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.
536
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
537
        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.
538
        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).
539
        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.
540
        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).
541
        self.assertEqual('g/p/q', relpath)
2929.3.21 by Vincent Ladeuil
Merge bzr.dev, resolve conflicts.
542
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
543
544
class InstrumentedTransaction(object):
545
546
    def finish(self):
547
        self.calls.append('finish')
548
549
    def __init__(self):
550
        self.calls = []
551
552
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
553
class TestDecorator(object):
554
555
    def __init__(self):
556
        self._calls = []
557
558
    def lock_read(self):
559
        self._calls.append('lr')
560
561
    def lock_write(self):
562
        self._calls.append('lw')
563
564
    def unlock(self):
565
        self._calls.append('ul')
566
567
    @needs_read_lock
568
    def do_with_read(self):
569
        return 1
570
571
    @needs_read_lock
572
    def except_with_read(self):
573
        raise RuntimeError
574
575
    @needs_write_lock
576
    def do_with_write(self):
577
        return 2
578
579
    @needs_write_lock
580
    def except_with_write(self):
581
        raise RuntimeError
582
583
584
class TestDecorators(TestCase):
585
586
    def test_needs_read_lock(self):
587
        branch = TestDecorator()
588
        self.assertEqual(1, branch.do_with_read())
589
        self.assertEqual(['lr', 'ul'], branch._calls)
590
591
    def test_excepts_in_read_lock(self):
592
        branch = TestDecorator()
593
        self.assertRaises(RuntimeError, branch.except_with_read)
594
        self.assertEqual(['lr', 'ul'], branch._calls)
595
596
    def test_needs_write_lock(self):
597
        branch = TestDecorator()
598
        self.assertEqual(2, branch.do_with_write())
599
        self.assertEqual(['lw', 'ul'], branch._calls)
600
601
    def test_excepts_in_write_lock(self):
602
        branch = TestDecorator()
603
        self.assertRaises(RuntimeError, branch.except_with_write)
604
        self.assertEqual(['lw', 'ul'], branch._calls)
605
606
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
607
class TestBranchPushLocations(TestCaseWithBranch):
608
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
609
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
610
        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.
611
612
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
613
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
614
                                   ensure_config_dir_exists)
615
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
616
        fn = locations_config_filename()
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
617
        open(fn, 'wt').write(("[%s]\n"
618
                                  "push_location=foo\n" %
619
                                  self.get_branch().base[:-1]))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
620
        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.
621
622
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
623
        branch = self.get_branch()
624
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
625
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
626
627
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
628
class TestFormat(TestCaseWithBranch):
629
    """Tests for the format itself."""
630
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
631
    def test_get_reference(self):
632
        """get_reference on all regular branches should return None."""
633
        if not self.branch_format.is_supported():
634
            # unsupported formats are not loopback testable
635
            # because the default open will not open them and
636
            # they may not be initializable.
637
            return
638
        made_branch = self.make_branch('.')
639
        self.assertEqual(None,
640
            made_branch._format.get_reference(made_branch.bzrdir))
641
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
642
    def test_set_reference(self):
643
        """set_reference on all regular branches should be callable."""
644
        if not self.branch_format.is_supported():
645
            # unsupported formats are not loopback testable
646
            # because the default open will not open them and
647
            # they may not be initializable.
648
            return
649
        this_branch = self.make_branch('this')
650
        other_branch = self.make_branch('other')
651
        try:
652
            this_branch._format.set_reference(this_branch.bzrdir, other_branch)
653
        except NotImplementedError:
654
            # that's ok
655
            pass
656
        else:
657
            ref = this_branch._format.get_reference(this_branch.bzrdir)
658
            self.assertEqual(ref, other_branch.base)
659
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
660
    def test_format_initialize_find_open(self):
661
        # 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.
662
        if not self.branch_format.is_supported():
663
            # unsupported formats are not loopback testable
664
            # because the default open will not open them and
665
            # they may not be initializable.
666
            return
667
        # 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.
668
        t = get_transport(self.get_url())
669
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
670
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
671
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
672
673
        # find it via bzrdir opening:
674
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
675
        direct_opened_branch = opened_control.open_branch()
676
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
677
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
678
        self.failUnless(isinstance(direct_opened_branch._format,
679
                        self.branch_format.__class__))
680
681
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
682
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
683
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
684
        self.assertEqual(made_branch._format.__class__,
685
                         opened_branch._format.__class__)
686
        # if it has a unique id string, can we probe for it ?
687
        try:
688
            self.branch_format.get_format_string()
689
        except NotImplementedError:
690
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
691
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
692
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
693
2230.3.7 by Aaron Bentley
Fix binding return values
694
2230.3.6 by Aaron Bentley
work in progress bind stuff
695
class TestBound(TestCaseWithBranch):
696
697
    def test_bind_unbind(self):
698
        branch = self.make_branch('1')
699
        branch2 = self.make_branch('2')
700
        try:
701
            branch.bind(branch2)
702
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
703
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
704
        self.assertTrue(branch.unbind())
705
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
706
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
707
708
    def test_old_bound_location(self):
709
        branch = self.make_branch('branch1')
710
        try:
711
            self.assertIs(None, branch.get_old_bound_location())
712
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
713
            raise tests.TestNotApplicable(
714
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
715
        branch2 = self.make_branch('branch2')
716
        branch.bind(branch2)
717
        self.assertIs(None, branch.get_old_bound_location())
718
        branch.unbind()
719
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
720
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
721
    def test_bind_diverged(self):
722
        tree_a = self.make_branch_and_tree('tree_a')
723
        tree_a.commit('rev1a')
724
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
725
        tree_a.commit('rev2a')
726
        tree_b.commit('rev2b')
727
        try:
728
            tree_b.branch.bind(tree_a.branch)
729
        except errors.UpgradeRequired:
730
            raise tests.TestNotApplicable('Format does not support binding')
731
2230.3.32 by Aaron Bentley
Implement strict history policy
732
733
class TestStrict(TestCaseWithBranch):
734
735
    def test_strict_history(self):
736
        tree1 = self.make_branch_and_tree('tree1')
737
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
738
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
739
        except errors.UpgradeRequired:
740
            raise TestSkipped('Format does not support strict history')
741
        tree1.commit('empty commit')
742
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
743
        tree2.commit('empty commit 2')
744
        tree1.pull(tree2.branch)
745
        tree1.commit('empty commit 3')
746
        tree2.commit('empty commit 4')
747
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
748
        tree2.merge_from_branch(tree1.branch)
749
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
750
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
751
                          tree2.branch)
752
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
753
        tree3.merge_from_branch(tree2.branch)
754
        tree3.commit('empty commit 6')
755
        tree2.pull(tree3.branch)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
756
757
758
class TestIgnoreFallbacksParameter(TestCaseWithBranch):
759
760
    def make_branch_with_fallback(self):
761
        fallback = self.make_branch('fallback')
762
        if not fallback._format.supports_stacking():
763
            raise tests.TestNotApplicable("format does not support stacking")
764
        stacked = self.make_branch('stacked')
765
        stacked.set_stacked_on_url(fallback.base)
766
        return stacked
767
768
    def test_fallbacks_not_opened(self):
769
        stacked = self.make_branch_with_fallback()
770
        self.get_transport('').rename('fallback', 'moved')
771
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=True)
772
        self.assertEqual([], reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
773
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
774
    def test_fallbacks_are_opened(self):
775
        stacked = self.make_branch_with_fallback()
776
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=False)
777
        self.assertLength(1, reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
778
779
780
class TestReferenceLocation(TestCaseWithBranch):
781
782
    def test_reference_parent(self):
783
        tree = self.make_branch_and_tree('tree')
784
        subtree = self.make_branch_and_tree('tree/subtree')
785
        subtree.set_root_id('subtree-id')
786
        try:
787
            tree.add_reference(subtree)
788
        except bzrlib.errors.UnsupportedOperation:
789
            raise tests.TestNotApplicable('Tree cannot hold references.')
790
        reference_parent = tree.branch.reference_parent('subtree-id',
791
                                                        'subtree')
792
        self.assertEqual(subtree.branch.base, reference_parent.base)
793
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
794
    def test_reference_parent_accepts_possible_transports(self):
795
        tree = self.make_branch_and_tree('tree')
796
        subtree = self.make_branch_and_tree('tree/subtree')
797
        subtree.set_root_id('subtree-id')
798
        try:
799
            tree.add_reference(subtree)
800
        except bzrlib.errors.UnsupportedOperation:
801
            raise tests.TestNotApplicable('Tree cannot hold references.')
802
        reference_parent = tree.branch.reference_parent('subtree-id',
803
            'subtree', possible_transports=[subtree.bzrdir.root_transport])
804
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
805
    def test_get_reference_info(self):
806
        branch = self.make_branch('branch')
807
        try:
808
            path, loc = branch.get_reference_info('file-id')
809
        except bzrlib.errors.UnsupportedOperation:
810
            raise tests.TestNotApplicable('Branch cannot hold references.')
811
        self.assertIs(None, path)
812
        self.assertIs(None, loc)
813
814
    def test_set_reference_info(self):
815
        branch = self.make_branch('branch')
816
        try:
817
            branch.set_reference_info('file-id', 'path/to/location',
818
                                      'path/to/file')
819
        except bzrlib.errors.UnsupportedOperation:
820
            raise tests.TestNotApplicable('Branch cannot hold references.')
821
822
    def test_set_get_reference_info(self):
823
        branch = self.make_branch('branch')
824
        try:
825
            branch.set_reference_info('file-id', 'path/to/file',
826
                                      'path/to/location')
827
        except bzrlib.errors.UnsupportedOperation:
828
            raise tests.TestNotApplicable('Branch cannot hold references.')
829
        # Create a new instance to ensure storage is permanent
830
        branch = Branch.open('branch')
831
        tree_path, branch_location = branch.get_reference_info('file-id')
832
        self.assertEqual('path/to/location', branch_location)
833
834
    def test_set_null_reference_info(self):
835
        branch = self.make_branch('branch')
836
        try:
837
            branch.set_reference_info('file-id', 'path/to/file',
838
                                      'path/to/location')
839
        except bzrlib.errors.UnsupportedOperation:
840
            raise tests.TestNotApplicable('Branch cannot hold references.')
841
        branch.set_reference_info('file-id', None, None)
842
        tree_path, branch_location = branch.get_reference_info('file-id')
843
        self.assertIs(None, tree_path)
844
        self.assertIs(None, branch_location)
845
846
    def test_set_null_reference_info_when_null(self):
847
        branch = self.make_branch('branch')
848
        try:
849
            tree_path, branch_location = branch.get_reference_info('file-id')
850
        except bzrlib.errors.UnsupportedOperation:
851
            raise tests.TestNotApplicable('Branch cannot hold references.')
852
        self.assertIs(None, tree_path)
853
        self.assertIs(None, branch_location)
854
        branch.set_reference_info('file-id', None, None)
855
856
    def test_set_null_requires_two_nones(self):
857
        branch = self.make_branch('branch')
858
        try:
859
            e = self.assertRaises(ValueError, branch.set_reference_info,
860
                                  'file-id', 'path', None)
861
        except bzrlib.errors.UnsupportedOperation:
862
            raise tests.TestNotApplicable('Branch cannot hold references.')
863
        self.assertEqual('tree_path must be None when branch_location is'
864
                         ' None.', str(e))
865
        e = self.assertRaises(ValueError, branch.set_reference_info,
866
                              'file-id', None, 'location')
867
        self.assertEqual('branch_location must be None when tree_path is'
868
                         ' None.', str(e))
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
869
4273.1.7 by Aaron Bentley
Make update_references do a merge.
870
    def make_branch_with_reference(self, location, reference_location,
871
                                   file_id='file-id'):
872
        branch = self.make_branch(location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
873
        try:
4273.1.7 by Aaron Bentley
Make update_references do a merge.
874
            branch.set_reference_info(file_id, 'path/to/file',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
875
                                      reference_location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
876
        except bzrlib.errors.UnsupportedOperation:
877
            raise tests.TestNotApplicable('Branch cannot hold references.')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
878
        return branch
879
880
    def test_reference_parent_from_reference_info_(self):
881
        referenced_branch = self.make_branch('reference_branch')
882
        branch = self.make_branch_with_reference('branch',
883
                                                 referenced_branch.base)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
884
        parent = branch.reference_parent('file-id', 'path/to/file')
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
885
        self.assertEqual(parent.base, referenced_branch.base)
886
887
    def test_branch_relative_reference_location(self):
888
        branch = self.make_branch('branch')
889
        try:
890
            branch.set_reference_info('file-id', 'path/to/file',
891
            '../reference_branch')
892
        except bzrlib.errors.UnsupportedOperation:
893
            raise tests.TestNotApplicable('Branch cannot hold references.')
894
        referenced_branch = self.make_branch('reference_branch')
895
        parent = branch.reference_parent('file-id', 'path/to/file')
896
        self.assertEqual(parent.base, referenced_branch.base)
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
897
898
    def test_sprout_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
899
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
900
        new_branch = branch.bzrdir.sprout('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
901
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
902
                         new_branch.get_reference_info('file-id')[1])
903
904
    def test_clone_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
905
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
906
        new_branch = branch.bzrdir.clone('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
907
        self.assertEqual('../reference',
908
                         new_branch.get_reference_info('file-id')[1])
909
910
    def test_copied_locations_are_rebased(self):
911
        branch = self.make_branch_with_reference('branch', 'reference')
912
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
913
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
914
                         new_branch.get_reference_info('file-id')[1])
4273.1.7 by Aaron Bentley
Make update_references do a merge.
915
916
    def test_update_references_retains_old_references(self):
917
        branch = self.make_branch_with_reference('branch', 'reference')
918
        new_branch = self.make_branch_with_reference(
919
            'new_branch', 'reference', 'file-id2')
920
        new_branch.update_references(branch)
921
        self.assertEqual('reference',
922
                         branch.get_reference_info('file-id')[1])
923
924
    def test_update_references_retains_known_references(self):
925
        branch = self.make_branch_with_reference('branch', 'reference')
926
        new_branch = self.make_branch_with_reference(
927
            'new_branch', 'reference2')
928
        new_branch.update_references(branch)
929
        self.assertEqual('reference',
930
                         branch.get_reference_info('file-id')[1])
931
4273.1.14 by Aaron Bentley
Restore disabled test
932
    def test_update_references_skips_known_references(self):
4273.1.7 by Aaron Bentley
Make update_references do a merge.
933
        branch = self.make_branch_with_reference('branch', 'reference')
934
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
935
        new_branch.set_reference_info('file-id', '../foo', '../foo')
936
        new_branch.update_references(branch)
4273.1.14 by Aaron Bentley
Restore disabled test
937
        self.assertEqual('reference',
4273.1.7 by Aaron Bentley
Make update_references do a merge.
938
                         branch.get_reference_info('file-id')[1])
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
939
940
    def test_pull_updates_references(self):
941
        branch = self.make_branch_with_reference('branch', 'reference')
942
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
943
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
944
        branch.pull(new_branch)
945
        self.assertEqual('foo',
946
                         branch.get_reference_info('file-id2')[1])
947
948
    def test_push_updates_references(self):
949
        branch = self.make_branch_with_reference('branch', 'reference')
950
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
951
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
952
        new_branch.push(branch)
953
        self.assertEqual('foo',
954
                         branch.get_reference_info('file-id2')[1])
955
956
    def test_merge_updates_references(self):
957
        branch = self.make_branch_with_reference('branch', 'reference')
958
        tree = self.make_branch_and_tree('tree')
959
        tree.commit('foo')
960
        branch.pull(tree.branch)
961
        checkout = branch.create_checkout('checkout', lightweight=True)
962
        checkout.commit('bar')
963
        tree.lock_write()
964
        self.addCleanup(tree.unlock)
965
        merger = merge.Merger.from_revision_ids(None, tree,
966
                                                branch.last_revision(),
967
                                                other_branch=branch)
968
        merger.merge_type = merge.Merge3Merger
969
        merger.do_merge()
970
        self.assertEqual('../branch/reference',
971
                         tree.branch.get_reference_info('file-id')[1])