/brz/remove-bazaar

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