~bzr-pqm/bzr/bzr.dev

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