~bzr-pqm/bzr/bzr.dev

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
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
46
from bzrlib.tests.http_server import HttpServer
4523.1.1 by Martin Pool
Rename tests.branch_implementations to per_branch
47
from bzrlib.tests.per_branch import TestCaseWithBranch
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):
4523.4.15 by John Arbash Meinel
First pass at marking tests that are known to fail.
309
        self.thisFailsStrictLockCheck()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
310
        wt = self.make_branch_and_tree('source')
311
        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).
312
        repo = wt.branch.repository
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
313
        repo.lock_write()
314
        repo.start_write_group()
2818.4.2 by Robert Collins
Review feedback.
315
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
316
        repo.commit_write_group()
317
        repo.unlock()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
318
        #FIXME: clone should work to urls,
319
        # wt.clone should work to disks.
320
        self.build_tree(['target/'])
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
321
        d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
322
        self.assertEqual(repo.get_signature_text('A'),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
323
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
324
3445.2.2 by John Arbash Meinel
Move the test to a branch_implementations test
325
    def test_missing_revisions(self):
326
        t1 = self.make_branch_and_tree('b1')
327
        rev1 = t1.commit('one')
328
        t2 = t1.bzrdir.sprout('b2').open_workingtree()
329
        rev2 = t1.commit('two')
330
        rev3 = t1.commit('three')
331
332
        self.assertEqual([rev2, rev3],
333
            self.applyDeprecated(deprecated_in((1, 6, 0)),
334
            t2.branch.missing_revisions, t1.branch))
335
336
        self.assertEqual([],
337
            self.applyDeprecated(deprecated_in((1, 6, 0)),
338
            t2.branch.missing_revisions, t1.branch, stop_revision=1))
339
        self.assertEqual([rev2],
340
            self.applyDeprecated(deprecated_in((1, 6, 0)),
341
            t2.branch.missing_revisions, t1.branch, stop_revision=2))
342
        self.assertEqual([rev2, rev3],
343
            self.applyDeprecated(deprecated_in((1, 6, 0)),
344
            t2.branch.missing_revisions, t1.branch, stop_revision=3))
345
346
        self.assertRaises(errors.NoSuchRevision,
347
            self.applyDeprecated, deprecated_in((1, 6, 0)),
348
            t2.branch.missing_revisions, t1.branch, stop_revision=4)
349
350
        rev4 = t2.commit('four')
351
        self.assertRaises(errors.DivergedBranches,
352
            self.applyDeprecated, deprecated_in((1, 6, 0)),
353
            t2.branch.missing_revisions, t1.branch)
354
1185.35.11 by Aaron Bentley
Added support for branch nicks
355
    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.
356
        """Test explicit and implicit branch nicknames.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
357
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.
358
        Nicknames are implicitly the name of the branch's directory, unless an
359
        explicit nickname is set.  That is, an explicit nickname always
360
        overrides the implicit one.
361
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
362
        t = get_transport(self.get_url())
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
363
        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.
364
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
365
        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.
366
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
367
        # 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.
368
        t.move('bzr.dev', 'bzr.ab')
369
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
370
        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.
371
        # Set the branch nick explicitly.  This will ensure there's a branch
372
        # config file in the branch.
373
        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)
374
        if not isinstance(branch, remote.RemoteBranch):
3407.2.8 by Martin Pool
Deprecate LockableFiles.controlfilename
375
            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.
376
        # Because the nick has been set explicitly, the nick is now always
377
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
378
        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.
379
        t.move('bzr.ab', 'integration')
380
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
381
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
382
        branch.nick = u"\u1234"
383
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
384
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
385
    def test_commit_nicks(self):
386
        """Nicknames are committed to the revision"""
387
        wt = self.make_branch_and_tree('bzr.dev')
388
        branch = wt.branch
389
        branch.nick = "My happy branch"
390
        wt.commit('My commit respect da nick.')
391
        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.
392
        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.
393
                         "My happy branch")
394
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
395
    def test_create_open_branch_uses_repository(self):
396
        try:
397
            repo = self.make_repository('.', shared=True)
398
        except errors.IncompatibleFormat:
399
            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.
400
        child_transport = repo.bzrdir.root_transport.clone('child')
401
        child_transport.mkdir('.')
402
        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.
403
        try:
404
            child_branch = self.branch_format.initialize(child_dir)
405
        except errors.UninitializableFormat:
406
            # branch references are not default init'able.
407
            return
408
        self.assertEqual(repo.bzrdir.root_transport.base,
409
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
410
        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.
411
        self.assertEqual(repo.bzrdir.root_transport.base,
412
                         child_branch.repository.bzrdir.root_transport.base)
413
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
414
    def test_format_description(self):
415
        tree = self.make_branch_and_tree('tree')
416
        text = tree.branch._format.get_format_description()
417
        self.failUnless(len(text))
418
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
419
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
420
        branch = self.make_branch(".")
421
        branch.lock_write()
422
        builder = branch.get_commit_builder([])
423
        self.assertIsInstance(builder, repository.CommitBuilder)
424
        branch.repository.commit_write_group()
425
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
426
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
427
    def test_generate_revision_history(self):
428
        """Create a fake revision history easily."""
429
        tree = self.make_branch_and_tree('.')
430
        rev1 = tree.commit('foo')
431
        orig_history = tree.branch.revision_history()
432
        rev2 = tree.commit('bar', allow_pointless=True)
433
        tree.branch.generate_revision_history(rev1)
434
        self.assertEqual(orig_history, tree.branch.revision_history())
435
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
436
    def test_generate_revision_history_NULL_REVISION(self):
437
        tree = self.make_branch_and_tree('.')
438
        rev1 = tree.commit('foo')
439
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
440
        self.assertEqual([], tree.branch.revision_history())
441
1551.8.6 by Aaron Bentley
Rename test
442
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
443
        tree_a = self.make_branch_and_tree('a')
444
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
445
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
446
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
447
        checkout_b.commit('rev1', rev_id='rev1')
448
        self.assertEqual('rev1', branch_a.last_revision())
449
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
450
1551.8.5 by Aaron Bentley
Change name to create_checkout
451
        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
452
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
453
        checkout_c.commit('rev2', rev_id='rev2')
454
        self.assertEqual('rev2', branch_a.last_revision())
455
        self.assertEqual(checkout_c.branch.base, branch_a.base)
456
457
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
458
        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
459
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
460
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
461
        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
462
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
463
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
464
    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
465
        """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
466
        tree_a = self.make_branch_and_tree('a')
467
        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.
468
        # open the branch via a readonly transport
469
        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
470
        # sanity check that the test will be valid
471
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
472
            source_branch.lock_write)
473
        checkout = source_branch.create_checkout('c', lightweight=True)
474
        self.assertEqual(rev_id, checkout.last_revision())
475
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
476
    def test_create_anonymous_heavyweight_checkout(self):
477
        """A regular checkout from a readonly branch should succeed."""
478
        tree_a = self.make_branch_and_tree('a')
479
        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.
480
        # open the branch via a readonly transport
481
        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
482
        # sanity check that the test will be valid
483
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
484
            source_branch.lock_write)
485
        checkout = source_branch.create_checkout('c')
486
        self.assertEqual(rev_id, checkout.last_revision())
487
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
488
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
489
        tree = self.make_branch_and_tree('a')
490
        tree.commit('a commit', rev_id='rev1')
491
        br = tree.branch
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
492
        br.set_revision_history(["rev1"])
493
        self.assertEquals(br.revision_history(), ["rev1"])
494
        br.set_revision_history([])
495
        self.assertEquals(br.revision_history(), [])
496
1551.8.4 by Aaron Bentley
Tweak import style
497
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
498
class TestBranchFormat(TestCaseWithBranch):
499
500
    def test_branch_format_network_name(self):
501
        br = self.make_branch('.')
502
        format = br._format
503
        network_name = format.network_name()
504
        self.assertIsInstance(network_name, str)
505
        # We want to test that the network_name matches the actual format on
506
        # disk. For local branches that means that using network_name as a key
507
        # in the registry gives back the same format. For remote branches we
508
        # check that the network_name of the RemoteBranchFormat we have locally
509
        # matches the actual format present on disk.
510
        if isinstance(format, remote.RemoteBranchFormat):
511
            br._ensure_real()
512
            real_branch = br._real_branch
513
            self.assertEqual(real_branch._format.network_name(), network_name)
514
        else:
515
            registry = branch.network_format_registry
516
            looked_up_format = registry.get(network_name)
517
            self.assertEqual(format.__class__, looked_up_format.__class__)
518
519
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
520
class ChrootedTests(TestCaseWithBranch):
521
    """A support class that provides readonly urls outside the local namespace.
522
523
    This is done by checking if self.transport_server is a MemoryServer. if it
524
    is then we are chrooted already, if it is not then an HttpServer is used
525
    for readonly urls.
526
    """
527
528
    def setUp(self):
529
        super(ChrootedTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
530
        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.
531
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
532
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
533
    def test_open_containing(self):
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(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
536
        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.
537
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
538
        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.
539
        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).
540
        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.
541
        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).
542
        self.assertEqual('g/p/q', relpath)
2929.3.21 by Vincent Ladeuil
Merge bzr.dev, resolve conflicts.
543
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
544
545
class InstrumentedTransaction(object):
546
547
    def finish(self):
548
        self.calls.append('finish')
549
550
    def __init__(self):
551
        self.calls = []
552
553
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
554
class TestDecorator(object):
555
556
    def __init__(self):
557
        self._calls = []
558
559
    def lock_read(self):
560
        self._calls.append('lr')
561
562
    def lock_write(self):
563
        self._calls.append('lw')
564
565
    def unlock(self):
566
        self._calls.append('ul')
567
568
    @needs_read_lock
569
    def do_with_read(self):
570
        return 1
571
572
    @needs_read_lock
573
    def except_with_read(self):
574
        raise RuntimeError
575
576
    @needs_write_lock
577
    def do_with_write(self):
578
        return 2
579
580
    @needs_write_lock
581
    def except_with_write(self):
582
        raise RuntimeError
583
584
585
class TestDecorators(TestCase):
586
587
    def test_needs_read_lock(self):
588
        branch = TestDecorator()
589
        self.assertEqual(1, branch.do_with_read())
590
        self.assertEqual(['lr', 'ul'], branch._calls)
591
592
    def test_excepts_in_read_lock(self):
593
        branch = TestDecorator()
594
        self.assertRaises(RuntimeError, branch.except_with_read)
595
        self.assertEqual(['lr', 'ul'], branch._calls)
596
597
    def test_needs_write_lock(self):
598
        branch = TestDecorator()
599
        self.assertEqual(2, branch.do_with_write())
600
        self.assertEqual(['lw', 'ul'], branch._calls)
601
602
    def test_excepts_in_write_lock(self):
603
        branch = TestDecorator()
604
        self.assertRaises(RuntimeError, branch.except_with_write)
605
        self.assertEqual(['lw', 'ul'], branch._calls)
606
607
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
608
class TestBranchPushLocations(TestCaseWithBranch):
609
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
610
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
611
        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.
612
613
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
614
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
615
                                   ensure_config_dir_exists)
616
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
617
        fn = locations_config_filename()
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
618
        open(fn, 'wt').write(("[%s]\n"
619
                                  "push_location=foo\n" %
620
                                  self.get_branch().base[:-1]))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
621
        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.
622
623
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
624
        branch = self.get_branch()
625
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
626
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
627
628
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
629
class TestChildSubmitFormats(TestCaseWithBranch):
630
631
    def test_get_child_submit_format_default(self):
632
        self.assertEqual(None, self.get_branch().get_child_submit_format())
633
634
    def test_get_child_submit_format(self):
635
        branch = self.get_branch()
636
        branch.get_config().set_user_option('child_submit_format', '10')
637
        branch = self.get_branch()
638
        self.assertEqual('10', branch.get_child_submit_format())
639
640
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
641
class TestFormat(TestCaseWithBranch):
642
    """Tests for the format itself."""
643
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
644
    def test_get_reference(self):
645
        """get_reference on all regular branches should return None."""
646
        if not self.branch_format.is_supported():
647
            # unsupported formats are not loopback testable
648
            # because the default open will not open them and
649
            # they may not be initializable.
650
            return
651
        made_branch = self.make_branch('.')
652
        self.assertEqual(None,
653
            made_branch._format.get_reference(made_branch.bzrdir))
654
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
655
    def test_set_reference(self):
656
        """set_reference on all regular branches should be callable."""
657
        if not self.branch_format.is_supported():
658
            # unsupported formats are not loopback testable
659
            # because the default open will not open them and
660
            # they may not be initializable.
661
            return
662
        this_branch = self.make_branch('this')
663
        other_branch = self.make_branch('other')
664
        try:
665
            this_branch._format.set_reference(this_branch.bzrdir, other_branch)
666
        except NotImplementedError:
667
            # that's ok
668
            pass
669
        else:
670
            ref = this_branch._format.get_reference(this_branch.bzrdir)
671
            self.assertEqual(ref, other_branch.base)
672
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
673
    def test_format_initialize_find_open(self):
674
        # 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.
675
        if not self.branch_format.is_supported():
676
            # unsupported formats are not loopback testable
677
            # because the default open will not open them and
678
            # they may not be initializable.
679
            return
680
        # 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.
681
        t = get_transport(self.get_url())
682
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
683
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
684
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
685
686
        # find it via bzrdir opening:
687
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
688
        direct_opened_branch = opened_control.open_branch()
689
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
690
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
691
        self.failUnless(isinstance(direct_opened_branch._format,
692
                        self.branch_format.__class__))
693
694
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
695
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
696
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
697
        self.assertEqual(made_branch._format.__class__,
698
                         opened_branch._format.__class__)
699
        # if it has a unique id string, can we probe for it ?
700
        try:
701
            self.branch_format.get_format_string()
702
        except NotImplementedError:
703
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
704
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
705
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
706
2230.3.7 by Aaron Bentley
Fix binding return values
707
2230.3.6 by Aaron Bentley
work in progress bind stuff
708
class TestBound(TestCaseWithBranch):
709
710
    def test_bind_unbind(self):
711
        branch = self.make_branch('1')
712
        branch2 = self.make_branch('2')
713
        try:
714
            branch.bind(branch2)
715
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
716
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
717
        self.assertTrue(branch.unbind())
718
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
719
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
720
721
    def test_old_bound_location(self):
722
        branch = self.make_branch('branch1')
723
        try:
724
            self.assertIs(None, branch.get_old_bound_location())
725
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
726
            raise tests.TestNotApplicable(
727
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
728
        branch2 = self.make_branch('branch2')
729
        branch.bind(branch2)
730
        self.assertIs(None, branch.get_old_bound_location())
731
        branch.unbind()
732
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
733
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
734
    def test_bind_diverged(self):
735
        tree_a = self.make_branch_and_tree('tree_a')
736
        tree_a.commit('rev1a')
737
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
738
        tree_a.commit('rev2a')
739
        tree_b.commit('rev2b')
740
        try:
741
            tree_b.branch.bind(tree_a.branch)
742
        except errors.UpgradeRequired:
743
            raise tests.TestNotApplicable('Format does not support binding')
744
2230.3.32 by Aaron Bentley
Implement strict history policy
745
746
class TestStrict(TestCaseWithBranch):
747
748
    def test_strict_history(self):
749
        tree1 = self.make_branch_and_tree('tree1')
750
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
751
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
752
        except errors.UpgradeRequired:
753
            raise TestSkipped('Format does not support strict history')
754
        tree1.commit('empty commit')
755
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
756
        tree2.commit('empty commit 2')
757
        tree1.pull(tree2.branch)
758
        tree1.commit('empty commit 3')
759
        tree2.commit('empty commit 4')
760
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
761
        tree2.merge_from_branch(tree1.branch)
762
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
763
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
764
                          tree2.branch)
765
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
766
        tree3.merge_from_branch(tree2.branch)
767
        tree3.commit('empty commit 6')
768
        tree2.pull(tree3.branch)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
769
770
771
class TestIgnoreFallbacksParameter(TestCaseWithBranch):
772
773
    def make_branch_with_fallback(self):
774
        fallback = self.make_branch('fallback')
775
        if not fallback._format.supports_stacking():
776
            raise tests.TestNotApplicable("format does not support stacking")
777
        stacked = self.make_branch('stacked')
778
        stacked.set_stacked_on_url(fallback.base)
779
        return stacked
780
781
    def test_fallbacks_not_opened(self):
782
        stacked = self.make_branch_with_fallback()
783
        self.get_transport('').rename('fallback', 'moved')
784
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=True)
785
        self.assertEqual([], reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
786
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
787
    def test_fallbacks_are_opened(self):
788
        stacked = self.make_branch_with_fallback()
789
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=False)
790
        self.assertLength(1, reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
791
792
793
class TestReferenceLocation(TestCaseWithBranch):
794
795
    def test_reference_parent(self):
796
        tree = self.make_branch_and_tree('tree')
797
        subtree = self.make_branch_and_tree('tree/subtree')
798
        subtree.set_root_id('subtree-id')
799
        try:
800
            tree.add_reference(subtree)
801
        except bzrlib.errors.UnsupportedOperation:
802
            raise tests.TestNotApplicable('Tree cannot hold references.')
803
        reference_parent = tree.branch.reference_parent('subtree-id',
804
                                                        'subtree')
805
        self.assertEqual(subtree.branch.base, reference_parent.base)
806
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
807
    def test_reference_parent_accepts_possible_transports(self):
808
        tree = self.make_branch_and_tree('tree')
809
        subtree = self.make_branch_and_tree('tree/subtree')
810
        subtree.set_root_id('subtree-id')
811
        try:
812
            tree.add_reference(subtree)
813
        except bzrlib.errors.UnsupportedOperation:
814
            raise tests.TestNotApplicable('Tree cannot hold references.')
815
        reference_parent = tree.branch.reference_parent('subtree-id',
816
            'subtree', possible_transports=[subtree.bzrdir.root_transport])
817
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
818
    def test_get_reference_info(self):
819
        branch = self.make_branch('branch')
820
        try:
821
            path, loc = branch.get_reference_info('file-id')
822
        except bzrlib.errors.UnsupportedOperation:
823
            raise tests.TestNotApplicable('Branch cannot hold references.')
824
        self.assertIs(None, path)
825
        self.assertIs(None, loc)
826
827
    def test_set_reference_info(self):
828
        branch = self.make_branch('branch')
829
        try:
830
            branch.set_reference_info('file-id', 'path/to/location',
831
                                      'path/to/file')
832
        except bzrlib.errors.UnsupportedOperation:
833
            raise tests.TestNotApplicable('Branch cannot hold references.')
834
835
    def test_set_get_reference_info(self):
836
        branch = self.make_branch('branch')
837
        try:
838
            branch.set_reference_info('file-id', 'path/to/file',
839
                                      'path/to/location')
840
        except bzrlib.errors.UnsupportedOperation:
841
            raise tests.TestNotApplicable('Branch cannot hold references.')
842
        # Create a new instance to ensure storage is permanent
843
        branch = Branch.open('branch')
844
        tree_path, branch_location = branch.get_reference_info('file-id')
845
        self.assertEqual('path/to/location', branch_location)
846
847
    def test_set_null_reference_info(self):
848
        branch = self.make_branch('branch')
849
        try:
850
            branch.set_reference_info('file-id', 'path/to/file',
851
                                      'path/to/location')
852
        except bzrlib.errors.UnsupportedOperation:
853
            raise tests.TestNotApplicable('Branch cannot hold references.')
854
        branch.set_reference_info('file-id', None, None)
855
        tree_path, branch_location = branch.get_reference_info('file-id')
856
        self.assertIs(None, tree_path)
857
        self.assertIs(None, branch_location)
858
859
    def test_set_null_reference_info_when_null(self):
860
        branch = self.make_branch('branch')
861
        try:
862
            tree_path, branch_location = branch.get_reference_info('file-id')
863
        except bzrlib.errors.UnsupportedOperation:
864
            raise tests.TestNotApplicable('Branch cannot hold references.')
865
        self.assertIs(None, tree_path)
866
        self.assertIs(None, branch_location)
867
        branch.set_reference_info('file-id', None, None)
868
869
    def test_set_null_requires_two_nones(self):
870
        branch = self.make_branch('branch')
871
        try:
872
            e = self.assertRaises(ValueError, branch.set_reference_info,
873
                                  'file-id', 'path', None)
874
        except bzrlib.errors.UnsupportedOperation:
875
            raise tests.TestNotApplicable('Branch cannot hold references.')
876
        self.assertEqual('tree_path must be None when branch_location is'
877
                         ' None.', str(e))
878
        e = self.assertRaises(ValueError, branch.set_reference_info,
879
                              'file-id', None, 'location')
880
        self.assertEqual('branch_location must be None when tree_path is'
881
                         ' None.', str(e))
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
882
4273.1.7 by Aaron Bentley
Make update_references do a merge.
883
    def make_branch_with_reference(self, location, reference_location,
884
                                   file_id='file-id'):
885
        branch = self.make_branch(location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
886
        try:
4273.1.7 by Aaron Bentley
Make update_references do a merge.
887
            branch.set_reference_info(file_id, 'path/to/file',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
888
                                      reference_location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
889
        except bzrlib.errors.UnsupportedOperation:
890
            raise tests.TestNotApplicable('Branch cannot hold references.')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
891
        return branch
892
893
    def test_reference_parent_from_reference_info_(self):
894
        referenced_branch = self.make_branch('reference_branch')
895
        branch = self.make_branch_with_reference('branch',
896
                                                 referenced_branch.base)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
897
        parent = branch.reference_parent('file-id', 'path/to/file')
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
898
        self.assertEqual(parent.base, referenced_branch.base)
899
900
    def test_branch_relative_reference_location(self):
901
        branch = self.make_branch('branch')
902
        try:
903
            branch.set_reference_info('file-id', 'path/to/file',
904
            '../reference_branch')
905
        except bzrlib.errors.UnsupportedOperation:
906
            raise tests.TestNotApplicable('Branch cannot hold references.')
907
        referenced_branch = self.make_branch('reference_branch')
908
        parent = branch.reference_parent('file-id', 'path/to/file')
909
        self.assertEqual(parent.base, referenced_branch.base)
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
910
911
    def test_sprout_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
912
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
913
        new_branch = branch.bzrdir.sprout('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
914
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
915
                         new_branch.get_reference_info('file-id')[1])
916
917
    def test_clone_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
918
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
919
        new_branch = branch.bzrdir.clone('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
920
        self.assertEqual('../reference',
921
                         new_branch.get_reference_info('file-id')[1])
922
923
    def test_copied_locations_are_rebased(self):
924
        branch = self.make_branch_with_reference('branch', 'reference')
925
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
926
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
927
                         new_branch.get_reference_info('file-id')[1])
4273.1.7 by Aaron Bentley
Make update_references do a merge.
928
929
    def test_update_references_retains_old_references(self):
930
        branch = self.make_branch_with_reference('branch', 'reference')
931
        new_branch = self.make_branch_with_reference(
932
            'new_branch', 'reference', 'file-id2')
933
        new_branch.update_references(branch)
934
        self.assertEqual('reference',
935
                         branch.get_reference_info('file-id')[1])
936
937
    def test_update_references_retains_known_references(self):
938
        branch = self.make_branch_with_reference('branch', 'reference')
939
        new_branch = self.make_branch_with_reference(
940
            'new_branch', 'reference2')
941
        new_branch.update_references(branch)
942
        self.assertEqual('reference',
943
                         branch.get_reference_info('file-id')[1])
944
4273.1.14 by Aaron Bentley
Restore disabled test
945
    def test_update_references_skips_known_references(self):
4273.1.7 by Aaron Bentley
Make update_references do a merge.
946
        branch = self.make_branch_with_reference('branch', 'reference')
947
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
948
        new_branch.set_reference_info('file-id', '../foo', '../foo')
949
        new_branch.update_references(branch)
4273.1.14 by Aaron Bentley
Restore disabled test
950
        self.assertEqual('reference',
4273.1.7 by Aaron Bentley
Make update_references do a merge.
951
                         branch.get_reference_info('file-id')[1])
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
952
953
    def test_pull_updates_references(self):
954
        branch = self.make_branch_with_reference('branch', 'reference')
955
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
956
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
957
        branch.pull(new_branch)
958
        self.assertEqual('foo',
959
                         branch.get_reference_info('file-id2')[1])
960
961
    def test_push_updates_references(self):
962
        branch = self.make_branch_with_reference('branch', 'reference')
963
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
964
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
965
        new_branch.push(branch)
966
        self.assertEqual('foo',
967
                         branch.get_reference_info('file-id2')[1])
968
969
    def test_merge_updates_references(self):
970
        branch = self.make_branch_with_reference('branch', 'reference')
971
        tree = self.make_branch_and_tree('tree')
972
        tree.commit('foo')
973
        branch.pull(tree.branch)
974
        checkout = branch.create_checkout('checkout', lightweight=True)
975
        checkout.commit('bar')
976
        tree.lock_write()
977
        self.addCleanup(tree.unlock)
978
        merger = merge.Merger.from_revision_ids(None, tree,
979
                                                branch.last_revision(),
980
                                                other_branch=branch)
981
        merger.merge_type = merge.Merge3Merger
982
        merger.do_merge()
983
        self.assertEqual('../branch/reference',
984
                         tree.branch.get_reference_info('file-id')[1])