/brz/remove-bazaar

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