/brz/remove-bazaar

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