~bzr-pqm/bzr/bzr.dev

6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
1
# Copyright (C) 2005-2012, 2016 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
6538.1.31 by Aaron Bentley
Support foreign branches.
19
import contextlib
6538.1.2 by Aaron Bentley
Migrate tests to per_branch, support RemoteBranch.
20
1878.1.3 by John Arbash Meinel
some test cleanups
21
from bzrlib import (
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
22
    branch as _mod_branch,
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
23
    controldir,
5345.1.19 by Vincent Ladeuil
Cleanup bt.per_branch.test_branch.
24
    config,
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
25
    delta as _mod_delta,
1878.1.3 by John Arbash Meinel
some test cleanups
26
    errors,
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
27
    merge,
6182.1.2 by Jelmer Vernooij
Fix branch test.
28
    osutils,
1878.1.3 by John Arbash Meinel
some test cleanups
29
    urlutils,
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
30
    transform,
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
31
    transport,
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)
32
    remote,
1878.1.3 by John Arbash Meinel
some test cleanups
33
    repository,
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
34
    revision,
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
35
    shelf,
5718.7.6 by Jelmer Vernooij
Fix import.
36
    symbol_versioning,
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
37
    tests,
1878.1.3 by John Arbash Meinel
some test cleanups
38
    )
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
39
from bzrlib.tests import (
40
    per_branch,
41
    )
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
42
from bzrlib.tests.http_server import HttpServer
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
43
from bzrlib.transport import memory
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
44
45
46
class TestTestCaseWithBranch(per_branch.TestCaseWithBranch):
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.
47
48
    def test_branch_format_matches_bzrdir_branch_format(self):
49
        bzrdir_branch_format = self.bzrdir_format.get_branch_format()
50
        self.assertIs(self.branch_format.__class__,
51
                      bzrdir_branch_format.__class__)
52
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.
53
    def test_make_branch_gets_expected_format(self):
54
        branch = self.make_branch('.')
55
        self.assertIs(self.branch_format.__class__,
56
            branch._format.__class__)
57
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.
58
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
59
class TestBranch(per_branch.TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
60
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
61
    def test_create_tree_with_merge(self):
62
        tree = self.create_tree_with_merge()
3287.6.9 by Robert Collins
One last use of deprecated methods.
63
        tree.lock_read()
64
        self.addCleanup(tree.unlock)
65
        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.
66
        ancestry_graph = graph.get_parent_map(
67
            tree.branch.repository.all_revision_ids())
3287.6.9 by Robert Collins
One last use of deprecated methods.
68
        self.assertEqual({'rev-1':('null:',),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
69
                          'rev-2':('rev-1', ),
70
                          'rev-1.1.1':('rev-1', ),
71
                          '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.
72
                         }, ancestry_graph)
73
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
74
    def test_revision_ids_are_utf8(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
75
        wt = self.make_branch_and_tree('tree')
76
        wt.commit('f', rev_id='rev1')
77
        wt.commit('f', rev_id='rev2')
78
        wt.commit('f', rev_id='rev3')
79
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
80
        br = self.get_branch()
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
81
        br.fetch(wt.branch)
5718.7.4 by Jelmer Vernooij
Branch.set_revision_history.
82
        br.generate_revision_history('rev3')
6165.4.18 by Jelmer Vernooij
Use graph.
83
        for revision_id in ['rev3', 'rev2', 'rev1']:
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
84
            self.assertIsInstance(revision_id, str)
85
        last = br.last_revision()
86
        self.assertEqual('rev3', last)
87
        self.assertIsInstance(last, str)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
88
        revno, last = br.last_revision_info()
89
        self.assertEqual(3, revno)
90
        self.assertEqual('rev3', last)
91
        self.assertIsInstance(last, str)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
92
1260 by Martin Pool
- some updates for fetch/update function
93
    def test_fetch_revisions(self):
94
        """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.
95
        wt = self.make_branch_and_tree('b1')
96
        b1 = wt.branch
2381.1.3 by Robert Collins
Review feedback.
97
        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.
98
        wt.add(['foo'], ['foo-id'])
99
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
100
2381.1.3 by Robert Collins
Review feedback.
101
        b2 = self.make_branch('b2')
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
102
        b2.fetch(b1)
1260 by Martin Pool
- some updates for fetch/update function
103
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
104
        rev = b2.repository.get_revision('revision-1')
105
        tree = b2.repository.revision_tree('revision-1')
3015.2.1 by Robert Collins
Lock correctness in branch implementation tests.
106
        tree.lock_read()
107
        self.addCleanup(tree.unlock)
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
108
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
109
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
110
    def test_get_revision_delta(self):
111
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
112
        self.build_tree(['a/foo'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
113
        tree_a.add('foo', 'file1')
114
        tree_a.commit('rev1', rev_id='rev1')
2381.1.3 by Robert Collins
Review feedback.
115
        self.build_tree(['a/vla'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
116
        tree_a.add('vla', 'file2')
117
        tree_a.commit('rev2', rev_id='rev2')
118
6171.1.2 by Jelmer Vernooij
Use applyDeprecated for Branch.get_revision_delta tests.
119
        delta = self.applyDeprecated(symbol_versioning.deprecated_in(
120
            (2, 5, 0)), tree_a.branch.get_revision_delta, 1)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
121
        self.assertIsInstance(delta, _mod_delta.TreeDelta)
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
122
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
6171.1.2 by Jelmer Vernooij
Use applyDeprecated for Branch.get_revision_delta tests.
123
        delta = self.applyDeprecated(symbol_versioning.deprecated_in(
124
            (2, 5, 0)), tree_a.branch.get_revision_delta, 2)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
125
        self.assertIsInstance(delta, _mod_delta.TreeDelta)
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
126
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
127
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
128
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
129
        """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.
130
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
131
        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.
132
        tree_a.add('b')
133
        tree_a.commit("silly commit", rev_id='A')
134
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
135
        tree_b = 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.
136
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
137
138
    def get_balanced_branch_pair(self):
139
        """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.
140
        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.
141
        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.
142
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
143
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
144
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
145
        """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.
146
        # TODO: RBC 20060208 test with a revision not on revision-history.
147
        #       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).
148
        # 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.
149
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
150
        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.
151
        wt_a.add(['one'])
152
        wt_a.commit('commit one', rev_id='1')
2381.1.3 by Robert Collins
Review feedback.
153
        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.
154
        wt_a.add(['two'])
155
        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).
156
        # 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.
157
        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).
158
        wt_a.branch.repository.copy_content_into(repo_b)
159
        # wt_a might be a lightweight checkout, so get a hold of the actual
160
        # branch (because you can't do a partial clone of a lightweight
161
        # checkout).
162
        branch = wt_a.branch.bzrdir.open_branch()
163
        # Then make a branch where the new repository is, but specify a revision
164
        # ID.  The new branch's history will stop at the specified revision.
165
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
166
        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.
167
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
168
    def get_parented_branch(self):
169
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
170
        self.build_tree(['a/one'])
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
171
        wt_a.add(['one'])
172
        wt_a.commit('commit one', rev_id='1')
173
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
174
        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)
175
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
176
        return branch_b
177
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.
178
    def test_clone_branch_nickname(self):
179
        # test the nick name is preserved always
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
180
        raise tests.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.
181
182
    def test_clone_branch_parent(self):
183
        # 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)
184
        branch_b = self.get_parented_branch()
185
        repo_c = self.make_repository('c')
186
        branch_b.repository.copy_content_into(repo_c)
187
        branch_c = branch_b.clone(repo_c.bzrdir)
188
        self.assertNotEqual(None, branch_c.get_parent())
189
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
190
191
        # We can also set a specific parent, and it should be honored
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
192
        random_parent = 'http://example.com/path/to/branch'
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
193
        branch_b.set_parent(random_parent)
194
        repo_d = self.make_repository('d')
195
        branch_b.repository.copy_content_into(repo_d)
196
        branch_d = branch_b.clone(repo_d.bzrdir)
197
        self.assertEqual(random_parent, branch_d.get_parent())
198
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
199
    def test_submit_branch(self):
200
        """Submit location can be queried and set"""
201
        branch = self.make_branch('branch')
202
        self.assertEqual(branch.get_submit_branch(), None)
203
        branch.set_submit_branch('sftp://example.com')
204
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
205
        branch.set_submit_branch('sftp://example.net')
206
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
207
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
208
    def test_public_branch(self):
209
        """public location can be queried and set"""
210
        branch = self.make_branch('branch')
211
        self.assertEqual(branch.get_public_branch(), None)
212
        branch.set_public_branch('sftp://example.com')
213
        self.assertEqual(branch.get_public_branch(), 'sftp://example.com')
214
        branch.set_public_branch('sftp://example.net')
215
        self.assertEqual(branch.get_public_branch(), 'sftp://example.net')
216
        branch.set_public_branch(None)
217
        self.assertEqual(branch.get_public_branch(), None)
218
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.
219
    def test_record_initial_ghost(self):
220
        """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.
221
        wt = self.make_branch_and_tree('.')
6164.2.1 by Jelmer Vernooij
Skip tests if the repository doesn't support ghosts.
222
        if not wt.branch.repository._format.supports_ghosts:
223
            raise tests.TestNotApplicable("repository format does not "
224
                "support ghosts")
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
225
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
226
            allow_leftmost_as_ghost=True)
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
227
        self.assertEqual(['non:existent@rev--ision--0--2'],
228
            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.
229
        rev_id = wt.commit('commit against a ghost first parent.')
230
        rev = wt.branch.repository.get_revision(rev_id)
231
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
232
        # parent_sha1s is not populated now, WTF. rbc 20051003
233
        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.
234
235
    def test_record_two_ghosts(self):
236
        """Recording with all ghosts works."""
237
        wt = self.make_branch_and_tree('.')
6164.2.1 by Jelmer Vernooij
Skip tests if the repository doesn't support ghosts.
238
        if not wt.branch.repository._format.supports_ghosts:
239
            raise tests.TestNotApplicable("repository format does not "
240
                "support ghosts")
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
241
        wt.set_parent_ids([
242
                'foo@azkhazan-123123-abcabc',
243
                'wibble@fofof--20050401--1928390812',
244
            ],
245
            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.
246
        rev_id = wt.commit("commit from ghost base with one merge")
247
        # the revision should have been committed with two parents
248
        rev = wt.branch.repository.get_revision(rev_id)
249
        self.assertEqual(['foo@azkhazan-123123-abcabc',
250
            'wibble@fofof--20050401--1928390812'],
251
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
252
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
253
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
254
        self.assertRaises(errors.InvalidRevisionId,
255
                          self.get_branch().repository.get_revision,
256
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
257
6162.2.3 by Jelmer Vernooij
Fix nick tests against foreign formats.
258
    def test_nicks_bzr(self):
259
        """Test the behaviour of branch nicks specific to bzr branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
260
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.
261
        Nicknames are implicitly the name of the branch's directory, unless an
262
        explicit nickname is set.  That is, an explicit nickname always
263
        overrides the implicit one.
6162.2.3 by Jelmer Vernooij
Fix nick tests against foreign formats.
264
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.
265
        """
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
266
        t = self.get_transport()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
267
        branch = self.make_branch('bzr.dev')
6162.2.3 by Jelmer Vernooij
Fix nick tests against foreign formats.
268
        if not isinstance(branch, _mod_branch.BzrBranch):
269
            raise tests.TestNotApplicable("not a bzr branch format")
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.
270
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
271
        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.
272
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
273
        # 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.
274
        t.move('bzr.dev', 'bzr.ab')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
275
        branch = _mod_branch.Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
276
        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.
277
        # Set the branch nick explicitly.  This will ensure there's a branch
278
        # config file in the branch.
279
        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)
280
        if not isinstance(branch, remote.RemoteBranch):
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
281
            self.assertTrue(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.
282
        # Because the nick has been set explicitly, the nick is now always
283
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
284
        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.
285
        t.move('bzr.ab', 'integration')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
286
        branch = _mod_branch.Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
287
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
288
        branch.nick = u"\u1234"
289
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
290
6162.2.3 by Jelmer Vernooij
Fix nick tests against foreign formats.
291
    def test_nicks(self):
292
        """Test explicit and implicit branch nicknames.
293
294
        A nickname is always available, whether set explicitly or not.
295
        """
296
        t = self.get_transport()
297
        branch = self.make_branch('bzr.dev')
298
        # An implicit nick name is set; what it is exactly depends on the
299
        # format.
300
        self.assertIsInstance(branch.nick, basestring)
301
        # Set the branch nick explicitly.
302
        branch.nick = "Aaron's branch"
303
        # Because the nick has been set explicitly, the nick is now always
304
        # "Aaron's branch".
305
        self.assertEqual(branch.nick, "Aaron's branch")
306
        branch.nick = u"\u1234"
307
        self.assertEqual(branch.nick, u"\u1234")
308
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
309
    def test_commit_nicks(self):
310
        """Nicknames are committed to the revision"""
311
        wt = self.make_branch_and_tree('bzr.dev')
312
        branch = wt.branch
313
        branch.nick = "My happy branch"
314
        wt.commit('My commit respect da nick.')
315
        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.
316
        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.
317
                         "My happy branch")
318
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
319
    def test_create_colocated(self):
320
        try:
321
            repo = self.make_repository('.', shared=True)
322
        except errors.IncompatibleFormat:
323
            return
6437.21.9 by Jelmer Vernooij
Some fixes.
324
        if repo.bzrdir._format.colocated_branches:
325
            raise tests.TestNotApplicable(
326
                "control dir does not support colocated branches")
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
327
        self.assertEqual(0, len(repo.bzrdir.list_branches()))
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
328
        if not self.bzrdir_format.colocated_branches:
329
            raise tests.TestNotApplicable("control dir format does not support "
330
                "colocated branches")
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
331
        try:
332
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
333
                name='branch1')
6437.21.9 by Jelmer Vernooij
Some fixes.
334
        except errors.UninitializableFormat:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
335
            # branch references are not default init'able and
336
            # not all bzrdirs support colocated branches.
337
            return
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
338
        self.assertEqual(1, len(repo.bzrdir.list_branches()))
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
339
        self.branch_format.initialize(repo.bzrdir, name='branch2')
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
340
        self.assertEqual(2, len(repo.bzrdir.list_branches()))
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
341
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
342
    def test_create_append_revisions_only(self):
343
        try:
344
            repo = self.make_repository('.', shared=True)
345
        except errors.IncompatibleFormat:
346
            return
347
        for val in (True, False):
348
            try:
349
                branch = self.branch_format.initialize(repo.bzrdir,
350
                    append_revisions_only=True)
351
            except (errors.UninitializableFormat, errors.UpgradeRequired):
352
                # branch references are not default init'able and
353
                # not all branches support append_revisions_only
354
                return
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
355
            self.assertEqual(True, branch.get_append_revisions_only())
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
356
            repo.bzrdir.destroy_branch()
357
6123.9.14 by Jelmer Vernooij
Fix RemoteBranch.get_append_revisions_only().
358
    def test_get_set_append_revisions_only(self):
359
        branch = self.make_branch('.')
360
        if branch._format.supports_set_append_revisions_only():
361
            branch.set_append_revisions_only(True)
362
            self.assertTrue(branch.get_append_revisions_only())
363
            branch.set_append_revisions_only(False)
364
            self.assertFalse(branch.get_append_revisions_only())
365
        else:
366
            self.assertRaises(errors.UpgradeRequired,
367
                branch.set_append_revisions_only, True)
368
            self.assertFalse(branch.get_append_revisions_only())
369
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
370
    def test_create_open_branch_uses_repository(self):
371
        try:
372
            repo = self.make_repository('.', shared=True)
373
        except errors.IncompatibleFormat:
6162.5.1 by Jelmer Vernooij
Skip test if control dir format is not initializable.
374
            raise tests.TestNotApplicable("requires shared repository support")
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
        child_transport = repo.bzrdir.root_transport.clone('child')
376
        child_transport.mkdir('.')
6162.3.1 by Jelmer Vernooij
Skip a few tests for uninitializable formats.
377
        try:
378
            child_dir = self.bzrdir_format.initialize_on_transport(child_transport)
379
        except errors.UninitializableFormat:
6162.5.1 by Jelmer Vernooij
Skip test if control dir format is not initializable.
380
            raise tests.TestNotApplicable("control dir format not initializable")
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
381
        try:
382
            child_branch = self.branch_format.initialize(child_dir)
383
        except errors.UninitializableFormat:
384
            # branch references are not default init'able.
385
            return
386
        self.assertEqual(repo.bzrdir.root_transport.base,
387
                         child_branch.repository.bzrdir.root_transport.base)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
388
        child_branch = _mod_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.
389
        self.assertEqual(repo.bzrdir.root_transport.base,
390
                         child_branch.repository.bzrdir.root_transport.base)
391
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
392
    def test_format_description(self):
393
        tree = self.make_branch_and_tree('tree')
394
        text = tree.branch._format.get_format_description()
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
395
        self.assertTrue(len(text))
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
396
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
397
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
398
        branch = self.make_branch(".")
399
        branch.lock_write()
400
        builder = branch.get_commit_builder([])
401
        self.assertIsInstance(builder, repository.CommitBuilder)
402
        branch.repository.commit_write_group()
403
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
404
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
405
    def test_generate_revision_history(self):
406
        """Create a fake revision history easily."""
407
        tree = self.make_branch_and_tree('.')
408
        rev1 = tree.commit('foo')
6165.4.6 by Jelmer Vernooij
Avoid more uses of revision_history.
409
        tree.lock_write()
410
        self.addCleanup(tree.unlock)
6165.4.19 by Jelmer Vernooij
Avoid all iter_reverse_revision_history calls.
411
        graph = tree.branch.repository.get_graph()
6165.4.16 by Jelmer Vernooij
Don't provide Branch.iter_reverse_revision_history.
412
        orig_history = list(
6165.4.19 by Jelmer Vernooij
Avoid all iter_reverse_revision_history calls.
413
            graph.iter_lefthand_ancestry(
414
                tree.branch.last_revision(), [revision.NULL_REVISION]))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
415
        rev2 = tree.commit('bar', allow_pointless=True)
416
        tree.branch.generate_revision_history(rev1)
6165.4.16 by Jelmer Vernooij
Don't provide Branch.iter_reverse_revision_history.
417
        self.assertEqual(orig_history, list(
6165.4.19 by Jelmer Vernooij
Avoid all iter_reverse_revision_history calls.
418
            graph.iter_lefthand_ancestry(
419
                tree.branch.last_revision(), [revision.NULL_REVISION])))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
420
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
421
    def test_generate_revision_history_NULL_REVISION(self):
422
        tree = self.make_branch_and_tree('.')
423
        rev1 = tree.commit('foo')
6165.4.6 by Jelmer Vernooij
Avoid more uses of revision_history.
424
        tree.lock_write()
425
        self.addCleanup(tree.unlock)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
426
        tree.branch.generate_revision_history(revision.NULL_REVISION)
6165.4.4 by Jelmer Vernooij
Avoid .revision_history().
427
        self.assertEqual(revision.NULL_REVISION, tree.branch.last_revision())
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
428
1551.8.6 by Aaron Bentley
Rename test
429
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
430
        tree_a = self.make_branch_and_tree('a')
431
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
432
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
433
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
434
        checkout_b.commit('rev1', rev_id='rev1')
435
        self.assertEqual('rev1', branch_a.last_revision())
436
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
437
1551.8.5 by Aaron Bentley
Change name to create_checkout
438
        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
439
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
440
        checkout_c.commit('rev2', rev_id='rev2')
441
        self.assertEqual('rev2', branch_a.last_revision())
442
        self.assertEqual(checkout_c.branch.base, branch_a.base)
443
1551.8.5 by Aaron Bentley
Change name to create_checkout
444
        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
445
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.5 by Aaron Bentley
Change name to create_checkout
446
        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
447
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
448
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
449
    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
450
        """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
451
        tree_a = self.make_branch_and_tree('a')
452
        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.
453
        # open the branch via a readonly transport
6217.3.1 by Jelmer Vernooij
Skip tests against formats that don't support readonly modifier.
454
        url = self.get_readonly_url(urlutils.basename(tree_a.branch.base))
455
        t = transport.get_transport_from_url(url)
456
        if not tree_a.branch.bzrdir._format.supports_transport(t):
457
            raise tests.TestNotApplicable("format does not support transport")
458
        source_branch = _mod_branch.Branch.open(url)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
459
        # sanity check that the test will be valid
460
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
461
            source_branch.lock_write)
462
        checkout = source_branch.create_checkout('c', lightweight=True)
463
        self.assertEqual(rev_id, checkout.last_revision())
464
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
465
    def test_create_anonymous_heavyweight_checkout(self):
466
        """A regular checkout from a readonly branch should succeed."""
467
        tree_a = self.make_branch_and_tree('a')
468
        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.
469
        # open the branch via a readonly transport
6182.1.16 by Jelmer Vernooij
Merge lp:bzr
470
        url = self.get_readonly_url(
471
            osutils.basename(tree_a.branch.base.rstrip('/')))
6205.3.1 by Jelmer Vernooij
Add ControlDirFormat.supports_transport.
472
        t = transport.get_transport_from_url(url)
473
        if not tree_a.branch.bzrdir._format.supports_transport(t):
474
            raise tests.TestNotApplicable("format does not support transport")
475
        source_branch = _mod_branch.Branch.open(url)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
476
        # sanity check that the test will be valid
477
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
478
            source_branch.lock_write)
479
        checkout = source_branch.create_checkout('c')
480
        self.assertEqual(rev_id, checkout.last_revision())
481
5672.1.1 by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it.
482
    def test_heads_to_fetch(self):
483
        # heads_to_fetch is a method that returns a collection of revids that
484
        # need to be fetched to copy this branch into another repo.  At a
485
        # minimum this will include the tip.
486
        # (In native formats, this is the tip + tags, but other formats may
487
        # have other revs needed)
488
        tree = self.make_branch_and_tree('a')
489
        tree.commit('first commit', rev_id='rev1')
490
        tree.commit('second commit', rev_id='rev2')
491
        must_fetch, should_fetch = tree.branch.heads_to_fetch()
492
        self.assertTrue('rev2' in must_fetch)
493
494
    def test_heads_to_fetch_not_null_revision(self):
495
        # NULL_REVISION does not appear in the result of heads_to_fetch, even
496
        # for an empty branch.
497
        tree = self.make_branch_and_tree('a')
498
        must_fetch, should_fetch = tree.branch.heads_to_fetch()
499
        self.assertFalse(revision.NULL_REVISION in must_fetch)
500
        self.assertFalse(revision.NULL_REVISION in should_fetch)
501
1551.8.4 by Aaron Bentley
Tweak import style
502
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
503
class TestBranchFormat(per_branch.TestCaseWithBranch):
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
504
505
    def test_branch_format_network_name(self):
506
        br = self.make_branch('.')
507
        format = br._format
508
        network_name = format.network_name()
509
        self.assertIsInstance(network_name, str)
510
        # We want to test that the network_name matches the actual format on
511
        # disk. For local branches that means that using network_name as a key
512
        # in the registry gives back the same format. For remote branches we
513
        # check that the network_name of the RemoteBranchFormat we have locally
514
        # matches the actual format present on disk.
515
        if isinstance(format, remote.RemoteBranchFormat):
516
            br._ensure_real()
517
            real_branch = br._real_branch
518
            self.assertEqual(real_branch._format.network_name(), network_name)
519
        else:
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
520
            registry = _mod_branch.network_format_registry
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
521
            looked_up_format = registry.get(network_name)
522
            self.assertEqual(format.__class__, looked_up_format.__class__)
523
6449.4.2 by Jelmer Vernooij
Fix test name.
524
    def test_get_config_calls(self):
6155.2.2 by Vincent Ladeuil
Add a smoke test as suggested in review.
525
        # Smoke test that all branch succeed getting a config
526
        br = self.make_branch('.')
527
        br.get_config()
528
        br.get_config_stack()
529
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
530
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
531
class ChrootedTests(per_branch.TestCaseWithBranch):
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
532
    """A support class that provides readonly urls outside the local namespace.
533
534
    This is done by checking if self.transport_server is a MemoryServer. if it
535
    is then we are chrooted already, if it is not then an HttpServer is used
536
    for readonly urls.
537
    """
538
539
    def setUp(self):
540
        super(ChrootedTests, self).setUp()
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
541
        if not self.vfs_transport_factory == memory.MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
542
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
543
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
544
    def test_open_containing(self):
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
545
        self.assertRaises(errors.NotBranchError,
546
                          _mod_branch.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.
547
                          self.get_readonly_url(''))
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
548
        self.assertRaises(errors.NotBranchError,
549
                          _mod_branch.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.
550
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
551
        branch = self.make_branch('.')
6205.3.1 by Jelmer Vernooij
Add ControlDirFormat.supports_transport.
552
        if not branch.bzrdir._format.supports_transport(
553
            transport.get_transport_from_url(self.get_readonly_url('.'))):
554
            raise tests.TestNotApplicable("format does not support transport")
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
555
        branch, relpath = _mod_branch.Branch.open_containing(
556
            self.get_readonly_url(''))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
557
        self.assertEqual('', relpath)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
558
        branch, relpath = _mod_branch.Branch.open_containing(
559
            self.get_readonly_url('g/p/q'))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
560
        self.assertEqual('g/p/q', relpath)
2929.3.21 by Vincent Ladeuil
Merge bzr.dev, resolve conflicts.
561
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
562
563
class InstrumentedTransaction(object):
564
565
    def finish(self):
566
        self.calls.append('finish')
567
568
    def __init__(self):
569
        self.calls = []
570
571
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
572
class TestDecorator(object):
573
574
    def __init__(self):
575
        self._calls = []
576
577
    def lock_read(self):
578
        self._calls.append('lr')
579
580
    def lock_write(self):
581
        self._calls.append('lw')
582
583
    def unlock(self):
584
        self._calls.append('ul')
585
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
586
    @_mod_branch.needs_read_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
587
    def do_with_read(self):
588
        return 1
589
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
590
    @_mod_branch.needs_read_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
591
    def except_with_read(self):
592
        raise RuntimeError
593
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
594
    @_mod_branch.needs_write_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
595
    def do_with_write(self):
596
        return 2
597
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
598
    @_mod_branch.needs_write_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
599
    def except_with_write(self):
600
        raise RuntimeError
601
602
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
603
class TestDecorators(tests.TestCase):
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
604
605
    def test_needs_read_lock(self):
606
        branch = TestDecorator()
607
        self.assertEqual(1, branch.do_with_read())
608
        self.assertEqual(['lr', 'ul'], branch._calls)
609
610
    def test_excepts_in_read_lock(self):
611
        branch = TestDecorator()
612
        self.assertRaises(RuntimeError, branch.except_with_read)
613
        self.assertEqual(['lr', 'ul'], branch._calls)
614
615
    def test_needs_write_lock(self):
616
        branch = TestDecorator()
617
        self.assertEqual(2, branch.do_with_write())
618
        self.assertEqual(['lw', 'ul'], branch._calls)
619
620
    def test_excepts_in_write_lock(self):
621
        branch = TestDecorator()
622
        self.assertRaises(RuntimeError, branch.except_with_write)
623
        self.assertEqual(['lw', 'ul'], branch._calls)
624
625
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
626
class TestBranchPushLocations(per_branch.TestCaseWithBranch):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
627
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
628
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
629
        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.
630
631
    def test_get_push_location_exact(self):
5345.1.19 by Vincent Ladeuil
Cleanup bt.per_branch.test_branch.
632
        b = self.get_branch()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
633
        config.LocationConfig.from_string(
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
634
            '[%s]\npush_location=foo\n' % (b.base,), b.base, save=True)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
635
        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.
636
637
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
638
        branch = self.get_branch()
639
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
640
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
641
642
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
643
class TestChildSubmitFormats(per_branch.TestCaseWithBranch):
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
644
645
    def test_get_child_submit_format_default(self):
6104.2.4 by Jelmer Vernooij
Allow get_child_submit_format to return a string.
646
        submit_format = self.get_branch().get_child_submit_format()
647
        self.assertTrue(submit_format is None or
648
                        isinstance(submit_format, str))
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
649
650
    def test_get_child_submit_format(self):
651
        branch = self.get_branch()
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
652
        branch.get_config_stack().set('child_submit_format', '10')
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
653
        branch = self.get_branch()
654
        self.assertEqual('10', branch.get_child_submit_format())
655
656
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
657
class TestFormat(per_branch.TestCaseWithBranch):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
658
    """Tests for the format itself."""
659
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
660
    def test_get_reference(self):
661
        """get_reference on all regular branches should return None."""
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
        made_branch = self.make_branch('.')
668
        self.assertEqual(None,
669
            made_branch._format.get_reference(made_branch.bzrdir))
670
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
671
    def test_set_reference(self):
672
        """set_reference on all regular branches should be callable."""
673
        if not self.branch_format.is_supported():
674
            # unsupported formats are not loopback testable
675
            # because the default open will not open them and
676
            # they may not be initializable.
677
            return
678
        this_branch = self.make_branch('this')
679
        other_branch = self.make_branch('other')
680
        try:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
681
            this_branch._format.set_reference(this_branch.bzrdir, None,
682
                other_branch)
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
683
        except NotImplementedError:
684
            # that's ok
685
            pass
686
        else:
687
            ref = this_branch._format.get_reference(this_branch.bzrdir)
688
            self.assertEqual(ref, other_branch.base)
689
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
690
    def test_format_initialize_find_open(self):
691
        # 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.
692
        if not self.branch_format.is_supported():
693
            # unsupported formats are not loopback testable
694
            # because the default open will not open them and
695
            # they may not be initializable.
696
            return
697
        # supported formats must be able to init and open
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
698
        t = self.get_transport()
6039.1.5 by Jelmer Vernooij
Add get_transport_from_url and get_transport_from_path functions.
699
        readonly_t = transport.get_transport_from_url(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
700
        made_branch = self.make_branch('.')
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
701
        self.assertIsInstance(made_branch, _mod_branch.Branch)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
702
703
        # find it via bzrdir opening:
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
704
        opened_control = controldir.ControlDir.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
705
        direct_opened_branch = opened_control.open_branch()
706
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
707
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
708
        self.assertIsInstance(direct_opened_branch._format,
709
            self.branch_format.__class__)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
710
711
        # find it via Branch.open
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
712
        opened_branch = _mod_branch.Branch.open(readonly_t.base)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
713
        self.assertIsInstance(opened_branch, made_branch.__class__)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
714
        self.assertEqual(made_branch._format.__class__,
715
                         opened_branch._format.__class__)
716
        # if it has a unique id string, can we probe for it ?
717
        try:
718
            self.branch_format.get_format_string()
719
        except NotImplementedError:
720
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
721
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
722
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
723
2230.3.7 by Aaron Bentley
Fix binding return values
724
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
725
class TestBound(per_branch.TestCaseWithBranch):
2230.3.6 by Aaron Bentley
work in progress bind stuff
726
727
    def test_bind_unbind(self):
728
        branch = self.make_branch('1')
729
        branch2 = self.make_branch('2')
730
        try:
731
            branch.bind(branch2)
732
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
733
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
734
        self.assertTrue(branch.unbind())
735
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
736
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
737
738
    def test_old_bound_location(self):
739
        branch = self.make_branch('branch1')
740
        try:
741
            self.assertIs(None, branch.get_old_bound_location())
742
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
743
            raise tests.TestNotApplicable(
744
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
745
        branch2 = self.make_branch('branch2')
746
        branch.bind(branch2)
747
        self.assertIs(None, branch.get_old_bound_location())
748
        branch.unbind()
749
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
750
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
751
    def test_bind_diverged(self):
752
        tree_a = self.make_branch_and_tree('tree_a')
753
        tree_a.commit('rev1a')
754
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
755
        tree_a.commit('rev2a')
756
        tree_b.commit('rev2b')
757
        try:
758
            tree_b.branch.bind(tree_a.branch)
759
        except errors.UpgradeRequired:
760
            raise tests.TestNotApplicable('Format does not support binding')
761
5609.25.5 by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals.
762
    def test_unbind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
763
        """b.unbind clears any cached value of b.get_master_branch."""
5609.25.5 by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals.
764
        master = self.make_branch('master')
765
        branch = self.make_branch('branch')
766
        try:
767
            branch.bind(master)
768
        except errors.UpgradeRequired:
769
            raise tests.TestNotApplicable('Format does not support binding')
770
        self.addCleanup(branch.lock_write().unlock)
771
        self.assertNotEqual(None, branch.get_master_branch())
772
        branch.unbind()
773
        self.assertEqual(None, branch.get_master_branch())
774
775
    def test_bind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
776
        """b.bind clears any cached value of b.get_master_branch."""
5609.25.5 by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals.
777
        master1 = self.make_branch('master1')
778
        master2 = self.make_branch('master2')
779
        branch = self.make_branch('branch')
780
        try:
781
            branch.bind(master1)
782
        except errors.UpgradeRequired:
783
            raise tests.TestNotApplicable('Format does not support binding')
784
        self.addCleanup(branch.lock_write().unlock)
785
        self.assertNotEqual(None, branch.get_master_branch())
786
        branch.bind(master2)
787
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
788
                branch.get_master_branch().base))
789
790
    def test_set_bound_location_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
791
        """b.set_bound_location clears any cached value of b.get_master_branch.
5609.25.5 by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals.
792
        """
793
        master1 = self.make_branch('master1')
794
        master2 = self.make_branch('master2')
795
        branch = self.make_branch('branch')
796
        try:
797
            branch.bind(master1)
798
        except errors.UpgradeRequired:
799
            raise tests.TestNotApplicable('Format does not support binding')
800
        self.addCleanup(branch.lock_write().unlock)
801
        self.assertNotEqual(None, branch.get_master_branch())
802
        branch.set_bound_location(self.get_url('master2'))
803
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
804
                branch.get_master_branch().base))
805
2230.3.32 by Aaron Bentley
Implement strict history policy
806
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
807
class TestStrict(per_branch.TestCaseWithBranch):
2230.3.32 by Aaron Bentley
Implement strict history policy
808
809
    def test_strict_history(self):
810
        tree1 = self.make_branch_and_tree('tree1')
811
        try:
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
812
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
813
        except errors.UpgradeRequired:
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
814
            raise tests.TestSkipped('Format does not support strict history')
2230.3.32 by Aaron Bentley
Implement strict history policy
815
        tree1.commit('empty commit')
816
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
817
        tree2.commit('empty commit 2')
818
        tree1.pull(tree2.branch)
819
        tree1.commit('empty commit 3')
820
        tree2.commit('empty commit 4')
821
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
822
        tree2.merge_from_branch(tree1.branch)
823
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
824
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
825
                          tree2.branch)
826
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
827
        tree3.merge_from_branch(tree2.branch)
828
        tree3.commit('empty commit 6')
829
        tree2.pull(tree3.branch)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
830
831
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
832
class TestIgnoreFallbacksParameter(per_branch.TestCaseWithBranch):
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
833
834
    def make_branch_with_fallback(self):
835
        fallback = self.make_branch('fallback')
836
        if not fallback._format.supports_stacking():
837
            raise tests.TestNotApplicable("format does not support stacking")
838
        stacked = self.make_branch('stacked')
839
        stacked.set_stacked_on_url(fallback.base)
840
        return stacked
841
842
    def test_fallbacks_not_opened(self):
843
        stacked = self.make_branch_with_fallback()
844
        self.get_transport('').rename('fallback', 'moved')
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
845
        reopened_dir = controldir.ControlDir.open(stacked.base)
6155.6.14 by Jelmer Vernooij
Fix reopening of remote dirs.
846
        reopened = reopened_dir.open_branch(ignore_fallbacks=True)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
847
        self.assertEqual([], reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
848
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
849
    def test_fallbacks_are_opened(self):
850
        stacked = self.make_branch_with_fallback()
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
851
        reopened_dir = controldir.ControlDir.open(stacked.base)
6155.6.14 by Jelmer Vernooij
Fix reopening of remote dirs.
852
        reopened = reopened_dir.open_branch(ignore_fallbacks=False)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
853
        self.assertLength(1, reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
854
855
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
856
class TestReferenceLocation(per_branch.TestCaseWithBranch):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
857
858
    def test_reference_parent(self):
859
        tree = self.make_branch_and_tree('tree')
860
        subtree = self.make_branch_and_tree('tree/subtree')
861
        subtree.set_root_id('subtree-id')
862
        try:
863
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
864
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
865
            raise tests.TestNotApplicable('Tree cannot hold references.')
6182.1.6 by Jelmer Vernooij
use basename to find branch location.
866
        reference_parent = tree.branch.reference_parent(
6182.1.17 by Jelmer Vernooij
Fix two reference_parent tests.
867
            'subtree-id',
868
            urlutils.relative_url(tree.branch.user_url, subtree.branch.user_url))
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
869
        self.assertEqual(subtree.branch.base, reference_parent.base)
870
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
871
    def test_reference_parent_accepts_possible_transports(self):
872
        tree = self.make_branch_and_tree('tree')
873
        subtree = self.make_branch_and_tree('tree/subtree')
874
        subtree.set_root_id('subtree-id')
875
        try:
876
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
877
        except errors.UnsupportedOperation:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
878
            raise tests.TestNotApplicable('Tree cannot hold references.')
879
        reference_parent = tree.branch.reference_parent('subtree-id',
6182.1.17 by Jelmer Vernooij
Fix two reference_parent tests.
880
            urlutils.relative_url(
881
                tree.branch.user_url, subtree.branch.user_url),
6182.1.9 by Jelmer Vernooij
More test fixes.
882
            possible_transports=[subtree.bzrdir.root_transport])
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
883
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
884
    def test_get_reference_info(self):
885
        branch = self.make_branch('branch')
886
        try:
887
            path, loc = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
888
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
889
            raise tests.TestNotApplicable('Branch cannot hold references.')
890
        self.assertIs(None, path)
891
        self.assertIs(None, loc)
892
893
    def test_set_reference_info(self):
894
        branch = self.make_branch('branch')
895
        try:
896
            branch.set_reference_info('file-id', 'path/to/location',
897
                                      'path/to/file')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
898
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
899
            raise tests.TestNotApplicable('Branch cannot hold references.')
900
901
    def test_set_get_reference_info(self):
902
        branch = self.make_branch('branch')
903
        try:
904
            branch.set_reference_info('file-id', 'path/to/file',
905
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
906
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
907
            raise tests.TestNotApplicable('Branch cannot hold references.')
908
        # Create a new instance to ensure storage is permanent
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
909
        branch = _mod_branch.Branch.open('branch')
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
910
        tree_path, branch_location = branch.get_reference_info('file-id')
911
        self.assertEqual('path/to/location', branch_location)
912
913
    def test_set_null_reference_info(self):
914
        branch = self.make_branch('branch')
915
        try:
916
            branch.set_reference_info('file-id', 'path/to/file',
917
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
918
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
919
            raise tests.TestNotApplicable('Branch cannot hold references.')
920
        branch.set_reference_info('file-id', None, None)
921
        tree_path, branch_location = branch.get_reference_info('file-id')
922
        self.assertIs(None, tree_path)
923
        self.assertIs(None, branch_location)
924
925
    def test_set_null_reference_info_when_null(self):
926
        branch = self.make_branch('branch')
927
        try:
928
            tree_path, branch_location = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
929
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
930
            raise tests.TestNotApplicable('Branch cannot hold references.')
931
        self.assertIs(None, tree_path)
932
        self.assertIs(None, branch_location)
933
        branch.set_reference_info('file-id', None, None)
934
935
    def test_set_null_requires_two_nones(self):
936
        branch = self.make_branch('branch')
937
        try:
938
            e = self.assertRaises(ValueError, branch.set_reference_info,
939
                                  'file-id', 'path', None)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
940
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
941
            raise tests.TestNotApplicable('Branch cannot hold references.')
942
        self.assertEqual('tree_path must be None when branch_location is'
943
                         ' None.', str(e))
944
        e = self.assertRaises(ValueError, branch.set_reference_info,
945
                              'file-id', None, 'location')
946
        self.assertEqual('branch_location must be None when tree_path is'
947
                         ' None.', str(e))
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
948
4273.1.7 by Aaron Bentley
Make update_references do a merge.
949
    def make_branch_with_reference(self, location, reference_location,
950
                                   file_id='file-id'):
951
        branch = self.make_branch(location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
952
        try:
4273.1.7 by Aaron Bentley
Make update_references do a merge.
953
            branch.set_reference_info(file_id, 'path/to/file',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
954
                                      reference_location)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
955
        except errors.UnsupportedOperation:
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
956
            raise tests.TestNotApplicable('Branch cannot hold references.')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
957
        return branch
958
959
    def test_reference_parent_from_reference_info_(self):
960
        referenced_branch = self.make_branch('reference_branch')
961
        branch = self.make_branch_with_reference('branch',
962
                                                 referenced_branch.base)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
963
        parent = branch.reference_parent('file-id', 'path/to/file')
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
964
        self.assertEqual(parent.base, referenced_branch.base)
965
966
    def test_branch_relative_reference_location(self):
967
        branch = self.make_branch('branch')
968
        try:
969
            branch.set_reference_info('file-id', 'path/to/file',
970
            '../reference_branch')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
971
        except errors.UnsupportedOperation:
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
972
            raise tests.TestNotApplicable('Branch cannot hold references.')
973
        referenced_branch = self.make_branch('reference_branch')
974
        parent = branch.reference_parent('file-id', 'path/to/file')
975
        self.assertEqual(parent.base, referenced_branch.base)
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
976
977
    def test_sprout_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
978
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
979
        new_branch = branch.bzrdir.sprout('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
980
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
981
                         new_branch.get_reference_info('file-id')[1])
982
983
    def test_clone_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
984
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
985
        new_branch = branch.bzrdir.clone('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
986
        self.assertEqual('../reference',
987
                         new_branch.get_reference_info('file-id')[1])
988
989
    def test_copied_locations_are_rebased(self):
990
        branch = self.make_branch_with_reference('branch', 'reference')
991
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
992
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
993
                         new_branch.get_reference_info('file-id')[1])
4273.1.7 by Aaron Bentley
Make update_references do a merge.
994
995
    def test_update_references_retains_old_references(self):
996
        branch = self.make_branch_with_reference('branch', 'reference')
997
        new_branch = self.make_branch_with_reference(
998
            'new_branch', 'reference', 'file-id2')
999
        new_branch.update_references(branch)
1000
        self.assertEqual('reference',
1001
                         branch.get_reference_info('file-id')[1])
1002
1003
    def test_update_references_retains_known_references(self):
1004
        branch = self.make_branch_with_reference('branch', 'reference')
1005
        new_branch = self.make_branch_with_reference(
1006
            'new_branch', 'reference2')
1007
        new_branch.update_references(branch)
1008
        self.assertEqual('reference',
1009
                         branch.get_reference_info('file-id')[1])
1010
4273.1.14 by Aaron Bentley
Restore disabled test
1011
    def test_update_references_skips_known_references(self):
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1012
        branch = self.make_branch_with_reference('branch', 'reference')
1013
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1014
        new_branch.set_reference_info('file-id', '../foo', '../foo')
1015
        new_branch.update_references(branch)
4273.1.14 by Aaron Bentley
Restore disabled test
1016
        self.assertEqual('reference',
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1017
                         branch.get_reference_info('file-id')[1])
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1018
1019
    def test_pull_updates_references(self):
1020
        branch = self.make_branch_with_reference('branch', 'reference')
1021
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1022
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1023
        branch.pull(new_branch)
1024
        self.assertEqual('foo',
1025
                         branch.get_reference_info('file-id2')[1])
1026
1027
    def test_push_updates_references(self):
1028
        branch = self.make_branch_with_reference('branch', 'reference')
1029
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1030
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1031
        new_branch.push(branch)
1032
        self.assertEqual('foo',
1033
                         branch.get_reference_info('file-id2')[1])
1034
1035
    def test_merge_updates_references(self):
1036
        branch = self.make_branch_with_reference('branch', 'reference')
1037
        tree = self.make_branch_and_tree('tree')
1038
        tree.commit('foo')
1039
        branch.pull(tree.branch)
1040
        checkout = branch.create_checkout('checkout', lightweight=True)
1041
        checkout.commit('bar')
1042
        tree.lock_write()
1043
        self.addCleanup(tree.unlock)
1044
        merger = merge.Merger.from_revision_ids(None, tree,
1045
                                                branch.last_revision(),
1046
                                                other_branch=branch)
1047
        merger.merge_type = merge.Merge3Merger
1048
        merger.do_merge()
1049
        self.assertEqual('../branch/reference',
1050
                         tree.branch.get_reference_info('file-id')[1])
5158.6.2 by Martin Pool
Branch provides user_url etc
1051
1052
1053
class TestBranchControlComponent(per_branch.TestCaseWithBranch):
1054
    """Branch implementations adequately implement ControlComponent."""
6155.2.2 by Vincent Ladeuil
Add a smoke test as suggested in review.
1055
5158.6.2 by Martin Pool
Branch provides user_url etc
1056
    def test_urls(self):
1057
        br = self.make_branch('branch')
1058
        self.assertIsInstance(br.user_url, str)
1059
        self.assertEqual(br.user_url, br.user_transport.base)
1060
        # for all current bzrdir implementations the user dir must be 
1061
        # above the control dir but we might need to relax that?
1062
        self.assertEqual(br.control_url.find(br.user_url), 0)
1063
        self.assertEqual(br.control_url, br.control_transport.base)
6538.1.2 by Aaron Bentley
Migrate tests to per_branch, support RemoteBranch.
1064
1065
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1066
class FakeShelfCreator(object):
1067
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1068
    def __init__(self, branch):
1069
        self.branch = branch
1070
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1071
    def write_shelf(self, shelf_file, message=None):
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1072
        tree = self.branch.repository.revision_tree(revision.NULL_REVISION)
1073
        with transform.TransformPreview(tree) as tt:
1074
            shelf.ShelfCreator._write_shelf(
1075
                shelf_file, tt, revision.NULL_REVISION)
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1076
1077
6538.1.31 by Aaron Bentley
Support foreign branches.
1078
@contextlib.contextmanager
1079
def skip_if_storing_uncommitted_unsupported():
1080
    try:
1081
        yield
1082
    except errors.StoringUncommittedNotSupported:
1083
        raise tests.TestNotApplicable('Cannot store uncommitted changes.')
1084
1085
6538.1.2 by Aaron Bentley
Migrate tests to per_branch, support RemoteBranch.
1086
class TestUncommittedChanges(per_branch.TestCaseWithBranch):
1087
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1088
    def bind(self, branch, master):
1089
        try:
1090
            branch.bind(master)
1091
        except errors.UpgradeRequired:
1092
            raise tests.TestNotApplicable('Branch cannot be bound.')
1093
1094
    def test_store_uncommitted(self):
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1095
        tree = self.make_branch_and_tree('b')
1096
        branch = tree.branch
1097
        creator = FakeShelfCreator(branch)
6538.1.31 by Aaron Bentley
Support foreign branches.
1098
        with skip_if_storing_uncommitted_unsupported():
1099
            self.assertIs(None, branch.get_unshelver(tree))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1100
        branch.store_uncommitted(creator)
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1101
        self.assertIsNot(None, branch.get_unshelver(tree))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1102
1103
    def test_store_uncommitted_bound(self):
6538.1.31 by Aaron Bentley
Support foreign branches.
1104
        tree = self.make_branch_and_tree('b')
1105
        branch = tree.branch
1106
        master = self.make_branch('master')
1107
        self.bind(branch, master)
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1108
        creator = FakeShelfCreator(tree.branch)
1109
        self.assertIs(None, tree.branch.get_unshelver(tree))
1110
        self.assertIs(None, master.get_unshelver(tree))
1111
        tree.branch.store_uncommitted(creator)
1112
        self.assertIsNot(None, master.get_unshelver(tree))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1113
1114
    def test_store_uncommitted_already_stored(self):
1115
        branch = self.make_branch('b')
6538.1.31 by Aaron Bentley
Support foreign branches.
1116
        with skip_if_storing_uncommitted_unsupported():
1117
            branch.store_uncommitted(FakeShelfCreator(branch))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1118
        self.assertRaises(errors.ChangesAlreadyStored,
6538.1.26 by Aaron Bentley
Remove get_uncommitted.
1119
                          branch.store_uncommitted, FakeShelfCreator(branch))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1120
1121
    def test_store_uncommitted_none(self):
1122
        branch = self.make_branch('b')
6538.1.31 by Aaron Bentley
Support foreign branches.
1123
        with skip_if_storing_uncommitted_unsupported():
1124
            branch.store_uncommitted(FakeShelfCreator(branch))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1125
        branch.store_uncommitted(None)
6538.1.24 by Aaron Bentley
Eliminate get_stored_uncommitted from API.
1126
        self.assertIs(None, branch.get_unshelver(None))
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1127
1128
    def test_get_unshelver(self):
1129
        tree = self.make_branch_and_tree('tree')
1130
        tree.commit('')
1131
        self.build_tree_contents([('tree/file', 'contents1')])
1132
        tree.add('file')
6538.1.31 by Aaron Bentley
Support foreign branches.
1133
        with skip_if_storing_uncommitted_unsupported():
1134
            tree.store_uncommitted()
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1135
        unshelver = tree.branch.get_unshelver(tree)
1136
        self.assertIsNot(None, unshelver)
1137
1138
    def test_get_unshelver_bound(self):
1139
        tree = self.make_branch_and_tree('tree')
1140
        tree.commit('')
1141
        self.build_tree_contents([('tree/file', 'contents1')])
1142
        tree.add('file')
6538.1.31 by Aaron Bentley
Support foreign branches.
1143
        with skip_if_storing_uncommitted_unsupported():
1144
            tree.store_uncommitted()
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
1145
        branch = self.make_branch('branch')
1146
        self.bind(branch, tree.branch)
1147
        unshelver = branch.get_unshelver(tree)
1148
        self.assertIsNot(None, unshelver)