~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
1185.35.11 by Aaron Bentley
Added support for branch nicks
311
    def test_nicks(self):
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.
312
        """Test explicit and implicit branch nicknames.
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.
317
        """
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
318
        t = self.get_transport()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
319
        branch = self.make_branch('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.
320
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
321
        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.
322
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
323
        # 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.
324
        t.move('bzr.dev', 'bzr.ab')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
325
        branch = _mod_branch.Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
326
        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.
327
        # Set the branch nick explicitly.  This will ensure there's a branch
328
        # config file in the branch.
329
        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)
330
        if not isinstance(branch, remote.RemoteBranch):
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
331
            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.
332
        # Because the nick has been set explicitly, the nick is now always
333
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
334
        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.
335
        t.move('bzr.ab', 'integration')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
336
        branch = _mod_branch.Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
337
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
338
        branch.nick = u"\u1234"
339
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
340
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
341
    def test_commit_nicks(self):
342
        """Nicknames are committed to the revision"""
343
        wt = self.make_branch_and_tree('bzr.dev')
344
        branch = wt.branch
345
        branch.nick = "My happy branch"
346
        wt.commit('My commit respect da nick.')
347
        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.
348
        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.
349
                         "My happy branch")
350
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
351
    def test_create_colocated(self):
352
        try:
353
            repo = self.make_repository('.', shared=True)
354
        except errors.IncompatibleFormat:
355
            return
356
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
357
        try:
358
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
359
                name='branch1')
360
        except (errors.UninitializableFormat, errors.NoColocatedBranchSupport):
361
            # branch references are not default init'able and
362
            # not all bzrdirs support colocated branches.
363
            return
364
        self.assertEquals(1, len(repo.bzrdir.list_branches()))
365
        self.branch_format.initialize(repo.bzrdir, name='branch2')
366
        self.assertEquals(2, len(repo.bzrdir.list_branches()))
367
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
368
    def test_create_open_branch_uses_repository(self):
369
        try:
370
            repo = self.make_repository('.', shared=True)
371
        except errors.IncompatibleFormat:
372
            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.
373
        child_transport = repo.bzrdir.root_transport.clone('child')
374
        child_transport.mkdir('.')
375
        child_dir = self.bzrdir_format.initialize_on_transport(child_transport)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
376
        try:
377
            child_branch = self.branch_format.initialize(child_dir)
378
        except errors.UninitializableFormat:
379
            # branch references are not default init'able.
380
            return
381
        self.assertEqual(repo.bzrdir.root_transport.base,
382
                         child_branch.repository.bzrdir.root_transport.base)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
383
        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.
384
        self.assertEqual(repo.bzrdir.root_transport.base,
385
                         child_branch.repository.bzrdir.root_transport.base)
386
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
387
    def test_format_description(self):
388
        tree = self.make_branch_and_tree('tree')
389
        text = tree.branch._format.get_format_description()
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
390
        self.assertTrue(len(text))
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
391
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
392
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
393
        branch = self.make_branch(".")
394
        branch.lock_write()
395
        builder = branch.get_commit_builder([])
396
        self.assertIsInstance(builder, repository.CommitBuilder)
397
        branch.repository.commit_write_group()
398
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
399
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
400
    def test_generate_revision_history(self):
401
        """Create a fake revision history easily."""
402
        tree = self.make_branch_and_tree('.')
403
        rev1 = tree.commit('foo')
404
        orig_history = tree.branch.revision_history()
405
        rev2 = tree.commit('bar', allow_pointless=True)
406
        tree.branch.generate_revision_history(rev1)
407
        self.assertEqual(orig_history, tree.branch.revision_history())
408
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
409
    def test_generate_revision_history_NULL_REVISION(self):
410
        tree = self.make_branch_and_tree('.')
411
        rev1 = tree.commit('foo')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
412
        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.
413
        self.assertEqual([], tree.branch.revision_history())
414
1551.8.6 by Aaron Bentley
Rename test
415
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
416
        tree_a = self.make_branch_and_tree('a')
417
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
418
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
419
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
420
        checkout_b.commit('rev1', rev_id='rev1')
421
        self.assertEqual('rev1', branch_a.last_revision())
422
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
423
1551.8.5 by Aaron Bentley
Change name to create_checkout
424
        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
425
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
426
        checkout_c.commit('rev2', rev_id='rev2')
427
        self.assertEqual('rev2', branch_a.last_revision())
428
        self.assertEqual(checkout_c.branch.base, branch_a.base)
429
1551.8.5 by Aaron Bentley
Change name to create_checkout
430
        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
431
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.5 by Aaron Bentley
Change name to create_checkout
432
        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
433
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
434
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
435
    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
436
        """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
437
        tree_a = self.make_branch_and_tree('a')
438
        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.
439
        # open the branch via a readonly transport
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
440
        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
441
        # sanity check that the test will be valid
442
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
443
            source_branch.lock_write)
444
        checkout = source_branch.create_checkout('c', lightweight=True)
445
        self.assertEqual(rev_id, checkout.last_revision())
446
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
447
    def test_create_anonymous_heavyweight_checkout(self):
448
        """A regular checkout from a readonly branch should succeed."""
449
        tree_a = self.make_branch_and_tree('a')
450
        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.
451
        # open the branch via a readonly transport
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
452
        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
453
        # sanity check that the test will be valid
454
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
455
            source_branch.lock_write)
456
        checkout = source_branch.create_checkout('c')
457
        self.assertEqual(rev_id, checkout.last_revision())
458
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
459
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
460
        tree = self.make_branch_and_tree('a')
461
        tree.commit('a commit', rev_id='rev1')
462
        br = tree.branch
5718.7.6 by Jelmer Vernooij
Fix import.
463
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
5718.7.4 by Jelmer Vernooij
Branch.set_revision_history.
464
            br.set_revision_history, ["rev1"])
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
465
        self.assertEquals(br.revision_history(), ["rev1"])
5718.7.6 by Jelmer Vernooij
Fix import.
466
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
5718.7.4 by Jelmer Vernooij
Branch.set_revision_history.
467
            br.set_revision_history, [])
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
468
        self.assertEquals(br.revision_history(), [])
469
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.
470
    def test_heads_to_fetch(self):
471
        # heads_to_fetch is a method that returns a collection of revids that
472
        # need to be fetched to copy this branch into another repo.  At a
473
        # minimum this will include the tip.
474
        # (In native formats, this is the tip + tags, but other formats may
475
        # have other revs needed)
476
        tree = self.make_branch_and_tree('a')
477
        tree.commit('first commit', rev_id='rev1')
478
        tree.commit('second commit', rev_id='rev2')
479
        must_fetch, should_fetch = tree.branch.heads_to_fetch()
480
        self.assertTrue('rev2' in must_fetch)
481
482
    def test_heads_to_fetch_not_null_revision(self):
483
        # NULL_REVISION does not appear in the result of heads_to_fetch, even
484
        # for an empty branch.
485
        tree = self.make_branch_and_tree('a')
486
        must_fetch, should_fetch = tree.branch.heads_to_fetch()
487
        self.assertFalse(revision.NULL_REVISION in must_fetch)
488
        self.assertFalse(revision.NULL_REVISION in should_fetch)
489
1551.8.4 by Aaron Bentley
Tweak import style
490
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
491
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.
492
493
    def test_branch_format_network_name(self):
494
        br = self.make_branch('.')
495
        format = br._format
496
        network_name = format.network_name()
497
        self.assertIsInstance(network_name, str)
498
        # We want to test that the network_name matches the actual format on
499
        # disk. For local branches that means that using network_name as a key
500
        # in the registry gives back the same format. For remote branches we
501
        # check that the network_name of the RemoteBranchFormat we have locally
502
        # matches the actual format present on disk.
503
        if isinstance(format, remote.RemoteBranchFormat):
504
            br._ensure_real()
505
            real_branch = br._real_branch
506
            self.assertEqual(real_branch._format.network_name(), network_name)
507
        else:
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
508
            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.
509
            looked_up_format = registry.get(network_name)
510
            self.assertEqual(format.__class__, looked_up_format.__class__)
511
512
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
513
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.
514
    """A support class that provides readonly urls outside the local namespace.
515
516
    This is done by checking if self.transport_server is a MemoryServer. if it
517
    is then we are chrooted already, if it is not then an HttpServer is used
518
    for readonly urls.
519
    """
520
521
    def setUp(self):
522
        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.
523
        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.
524
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
525
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
526
    def test_open_containing(self):
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
527
        self.assertRaises(errors.NotBranchError,
528
                          _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.
529
                          self.get_readonly_url(''))
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
530
        self.assertRaises(errors.NotBranchError,
531
                          _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.
532
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
533
        branch = self.make_branch('.')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
534
        branch, relpath = _mod_branch.Branch.open_containing(
535
            self.get_readonly_url(''))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
536
        self.assertEqual('', relpath)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
537
        branch, relpath = _mod_branch.Branch.open_containing(
538
            self.get_readonly_url('g/p/q'))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
539
        self.assertEqual('g/p/q', relpath)
2929.3.21 by Vincent Ladeuil
Merge bzr.dev, resolve conflicts.
540
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
541
542
class InstrumentedTransaction(object):
543
544
    def finish(self):
545
        self.calls.append('finish')
546
547
    def __init__(self):
548
        self.calls = []
549
550
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
551
class TestDecorator(object):
552
553
    def __init__(self):
554
        self._calls = []
555
556
    def lock_read(self):
557
        self._calls.append('lr')
558
559
    def lock_write(self):
560
        self._calls.append('lw')
561
562
    def unlock(self):
563
        self._calls.append('ul')
564
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
565
    @_mod_branch.needs_read_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
566
    def do_with_read(self):
567
        return 1
568
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
569
    @_mod_branch.needs_read_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
570
    def except_with_read(self):
571
        raise RuntimeError
572
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
573
    @_mod_branch.needs_write_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
574
    def do_with_write(self):
575
        return 2
576
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
577
    @_mod_branch.needs_write_lock
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
578
    def except_with_write(self):
579
        raise RuntimeError
580
581
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
582
class TestDecorators(tests.TestCase):
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
583
584
    def test_needs_read_lock(self):
585
        branch = TestDecorator()
586
        self.assertEqual(1, branch.do_with_read())
587
        self.assertEqual(['lr', 'ul'], branch._calls)
588
589
    def test_excepts_in_read_lock(self):
590
        branch = TestDecorator()
591
        self.assertRaises(RuntimeError, branch.except_with_read)
592
        self.assertEqual(['lr', 'ul'], branch._calls)
593
594
    def test_needs_write_lock(self):
595
        branch = TestDecorator()
596
        self.assertEqual(2, branch.do_with_write())
597
        self.assertEqual(['lw', 'ul'], branch._calls)
598
599
    def test_excepts_in_write_lock(self):
600
        branch = TestDecorator()
601
        self.assertRaises(RuntimeError, branch.except_with_write)
602
        self.assertEqual(['lw', 'ul'], branch._calls)
603
604
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
605
class TestBranchPushLocations(per_branch.TestCaseWithBranch):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
606
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
607
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
608
        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.
609
610
    def test_get_push_location_exact(self):
5345.1.19 by Vincent Ladeuil
Cleanup bt.per_branch.test_branch.
611
        b = self.get_branch()
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
612
        config.LocationConfig.from_string(
5345.1.25 by Vincent Ladeuil
Move the '_save' parameter from '__init__' to 'from_bytes', fix fallouts.
613
            '[%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.
614
        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.
615
616
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
617
        branch = self.get_branch()
618
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
619
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
620
621
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
622
class TestChildSubmitFormats(per_branch.TestCaseWithBranch):
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
623
624
    def test_get_child_submit_format_default(self):
6104.2.4 by Jelmer Vernooij
Allow get_child_submit_format to return a string.
625
        submit_format = self.get_branch().get_child_submit_format()
626
        self.assertTrue(submit_format is None or
627
                        isinstance(submit_format, str))
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
628
629
    def test_get_child_submit_format(self):
630
        branch = self.get_branch()
631
        branch.get_config().set_user_option('child_submit_format', '10')
632
        branch = self.get_branch()
633
        self.assertEqual('10', branch.get_child_submit_format())
634
635
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
636
class TestFormat(per_branch.TestCaseWithBranch):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
637
    """Tests for the format itself."""
638
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
639
    def test_get_reference(self):
640
        """get_reference on all regular branches should return None."""
641
        if not self.branch_format.is_supported():
642
            # unsupported formats are not loopback testable
643
            # because the default open will not open them and
644
            # they may not be initializable.
645
            return
646
        made_branch = self.make_branch('.')
647
        self.assertEqual(None,
648
            made_branch._format.get_reference(made_branch.bzrdir))
649
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
650
    def test_set_reference(self):
651
        """set_reference on all regular branches should be callable."""
652
        if not self.branch_format.is_supported():
653
            # unsupported formats are not loopback testable
654
            # because the default open will not open them and
655
            # they may not be initializable.
656
            return
657
        this_branch = self.make_branch('this')
658
        other_branch = self.make_branch('other')
659
        try:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
660
            this_branch._format.set_reference(this_branch.bzrdir, None,
661
                other_branch)
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
662
        except NotImplementedError:
663
            # that's ok
664
            pass
665
        else:
666
            ref = this_branch._format.get_reference(this_branch.bzrdir)
667
            self.assertEqual(ref, other_branch.base)
668
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
669
    def test_format_initialize_find_open(self):
670
        # 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.
671
        if not self.branch_format.is_supported():
672
            # unsupported formats are not loopback testable
673
            # because the default open will not open them and
674
            # they may not be initializable.
675
            return
676
        # 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.
677
        t = self.get_transport()
6039.1.5 by Jelmer Vernooij
Add get_transport_from_url and get_transport_from_path functions.
678
        readonly_t = transport.get_transport_from_url(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
679
        made_branch = self.make_branch('.')
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
680
        self.assertIsInstance(made_branch, _mod_branch.Branch)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
681
682
        # find it via bzrdir opening:
683
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
684
        direct_opened_branch = opened_control.open_branch()
685
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
686
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
687
        self.assertIsInstance(direct_opened_branch._format,
688
            self.branch_format.__class__)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
689
690
        # find it via Branch.open
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
691
        opened_branch = _mod_branch.Branch.open(readonly_t.base)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
692
        self.assertIsInstance(opened_branch, made_branch.__class__)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
693
        self.assertEqual(made_branch._format.__class__,
694
                         opened_branch._format.__class__)
695
        # if it has a unique id string, can we probe for it ?
696
        try:
697
            self.branch_format.get_format_string()
698
        except NotImplementedError:
699
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
700
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
701
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
702
2230.3.7 by Aaron Bentley
Fix binding return values
703
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
704
class TestBound(per_branch.TestCaseWithBranch):
2230.3.6 by Aaron Bentley
work in progress bind stuff
705
706
    def test_bind_unbind(self):
707
        branch = self.make_branch('1')
708
        branch2 = self.make_branch('2')
709
        try:
710
            branch.bind(branch2)
711
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
712
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
713
        self.assertTrue(branch.unbind())
714
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
715
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
716
717
    def test_old_bound_location(self):
718
        branch = self.make_branch('branch1')
719
        try:
720
            self.assertIs(None, branch.get_old_bound_location())
721
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
722
            raise tests.TestNotApplicable(
723
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
724
        branch2 = self.make_branch('branch2')
725
        branch.bind(branch2)
726
        self.assertIs(None, branch.get_old_bound_location())
727
        branch.unbind()
728
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
729
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
730
    def test_bind_diverged(self):
731
        tree_a = self.make_branch_and_tree('tree_a')
732
        tree_a.commit('rev1a')
733
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
734
        tree_a.commit('rev2a')
735
        tree_b.commit('rev2b')
736
        try:
737
            tree_b.branch.bind(tree_a.branch)
738
        except errors.UpgradeRequired:
739
            raise tests.TestNotApplicable('Format does not support binding')
740
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.
741
    def test_unbind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
742
        """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.
743
        master = self.make_branch('master')
744
        branch = self.make_branch('branch')
745
        try:
746
            branch.bind(master)
747
        except errors.UpgradeRequired:
748
            raise tests.TestNotApplicable('Format does not support binding')
749
        self.addCleanup(branch.lock_write().unlock)
750
        self.assertNotEqual(None, branch.get_master_branch())
751
        branch.unbind()
752
        self.assertEqual(None, branch.get_master_branch())
753
754
    def test_unlocked_does_not_cache_master_branch(self):
755
        """Unlocked branches do not cache the result of get_master_branch."""
756
        master = self.make_branch('master')
757
        branch1 = self.make_branch('branch')
758
        try:
759
            branch1.bind(master)
760
        except errors.UpgradeRequired:
761
            raise tests.TestNotApplicable('Format does not support binding')
762
        # Open branch1 again
763
        branch2 = branch1.bzrdir.open_branch()
764
        self.assertNotEqual(None, branch1.get_master_branch())
765
        # Unbind the branch via branch2.  branch1 isn't locked so will
766
        # immediately return the new value for get_master_branch.
767
        branch2.unbind()
768
        self.assertEqual(None, branch1.get_master_branch())
769
770
    def test_bind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
771
        """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.
772
        master1 = self.make_branch('master1')
773
        master2 = self.make_branch('master2')
774
        branch = self.make_branch('branch')
775
        try:
776
            branch.bind(master1)
777
        except errors.UpgradeRequired:
778
            raise tests.TestNotApplicable('Format does not support binding')
779
        self.addCleanup(branch.lock_write().unlock)
780
        self.assertNotEqual(None, branch.get_master_branch())
781
        branch.bind(master2)
782
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
783
                branch.get_master_branch().base))
784
785
    def test_set_bound_location_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
786
        """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.
787
        """
788
        master1 = self.make_branch('master1')
789
        master2 = self.make_branch('master2')
790
        branch = self.make_branch('branch')
791
        try:
792
            branch.bind(master1)
793
        except errors.UpgradeRequired:
794
            raise tests.TestNotApplicable('Format does not support binding')
795
        self.addCleanup(branch.lock_write().unlock)
796
        self.assertNotEqual(None, branch.get_master_branch())
797
        branch.set_bound_location(self.get_url('master2'))
798
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
799
                branch.get_master_branch().base))
800
2230.3.32 by Aaron Bentley
Implement strict history policy
801
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
802
class TestStrict(per_branch.TestCaseWithBranch):
2230.3.32 by Aaron Bentley
Implement strict history policy
803
804
    def test_strict_history(self):
805
        tree1 = self.make_branch_and_tree('tree1')
806
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
807
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
808
        except errors.UpgradeRequired:
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
809
            raise tests.TestSkipped('Format does not support strict history')
2230.3.32 by Aaron Bentley
Implement strict history policy
810
        tree1.commit('empty commit')
811
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
812
        tree2.commit('empty commit 2')
813
        tree1.pull(tree2.branch)
814
        tree1.commit('empty commit 3')
815
        tree2.commit('empty commit 4')
816
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
817
        tree2.merge_from_branch(tree1.branch)
818
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
819
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
820
                          tree2.branch)
821
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
822
        tree3.merge_from_branch(tree2.branch)
823
        tree3.commit('empty commit 6')
824
        tree2.pull(tree3.branch)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
825
826
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
827
class TestIgnoreFallbacksParameter(per_branch.TestCaseWithBranch):
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
828
829
    def make_branch_with_fallback(self):
830
        fallback = self.make_branch('fallback')
831
        if not fallback._format.supports_stacking():
832
            raise tests.TestNotApplicable("format does not support stacking")
833
        stacked = self.make_branch('stacked')
834
        stacked.set_stacked_on_url(fallback.base)
835
        return stacked
836
837
    def test_fallbacks_not_opened(self):
838
        stacked = self.make_branch_with_fallback()
839
        self.get_transport('').rename('fallback', 'moved')
840
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=True)
841
        self.assertEqual([], reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
842
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
843
    def test_fallbacks_are_opened(self):
844
        stacked = self.make_branch_with_fallback()
845
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=False)
846
        self.assertLength(1, reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
847
848
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
849
class TestReferenceLocation(per_branch.TestCaseWithBranch):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
850
851
    def test_reference_parent(self):
852
        tree = self.make_branch_and_tree('tree')
853
        subtree = self.make_branch_and_tree('tree/subtree')
854
        subtree.set_root_id('subtree-id')
855
        try:
856
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
857
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
858
            raise tests.TestNotApplicable('Tree cannot hold references.')
859
        reference_parent = tree.branch.reference_parent('subtree-id',
860
                                                        'subtree')
861
        self.assertEqual(subtree.branch.base, reference_parent.base)
862
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
863
    def test_reference_parent_accepts_possible_transports(self):
864
        tree = self.make_branch_and_tree('tree')
865
        subtree = self.make_branch_and_tree('tree/subtree')
866
        subtree.set_root_id('subtree-id')
867
        try:
868
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
869
        except errors.UnsupportedOperation:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
870
            raise tests.TestNotApplicable('Tree cannot hold references.')
871
        reference_parent = tree.branch.reference_parent('subtree-id',
872
            'subtree', possible_transports=[subtree.bzrdir.root_transport])
873
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
874
    def test_get_reference_info(self):
875
        branch = self.make_branch('branch')
876
        try:
877
            path, loc = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
878
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
879
            raise tests.TestNotApplicable('Branch cannot hold references.')
880
        self.assertIs(None, path)
881
        self.assertIs(None, loc)
882
883
    def test_set_reference_info(self):
884
        branch = self.make_branch('branch')
885
        try:
886
            branch.set_reference_info('file-id', 'path/to/location',
887
                                      'path/to/file')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
888
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
889
            raise tests.TestNotApplicable('Branch cannot hold references.')
890
891
    def test_set_get_reference_info(self):
892
        branch = self.make_branch('branch')
893
        try:
894
            branch.set_reference_info('file-id', 'path/to/file',
895
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
896
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
897
            raise tests.TestNotApplicable('Branch cannot hold references.')
898
        # Create a new instance to ensure storage is permanent
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
899
        branch = _mod_branch.Branch.open('branch')
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
900
        tree_path, branch_location = branch.get_reference_info('file-id')
901
        self.assertEqual('path/to/location', branch_location)
902
903
    def test_set_null_reference_info(self):
904
        branch = self.make_branch('branch')
905
        try:
906
            branch.set_reference_info('file-id', 'path/to/file',
907
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
908
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
909
            raise tests.TestNotApplicable('Branch cannot hold references.')
910
        branch.set_reference_info('file-id', None, None)
911
        tree_path, branch_location = branch.get_reference_info('file-id')
912
        self.assertIs(None, tree_path)
913
        self.assertIs(None, branch_location)
914
915
    def test_set_null_reference_info_when_null(self):
916
        branch = self.make_branch('branch')
917
        try:
918
            tree_path, branch_location = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
919
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
920
            raise tests.TestNotApplicable('Branch cannot hold references.')
921
        self.assertIs(None, tree_path)
922
        self.assertIs(None, branch_location)
923
        branch.set_reference_info('file-id', None, None)
924
925
    def test_set_null_requires_two_nones(self):
926
        branch = self.make_branch('branch')
927
        try:
928
            e = self.assertRaises(ValueError, branch.set_reference_info,
929
                                  'file-id', 'path', None)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
930
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
931
            raise tests.TestNotApplicable('Branch cannot hold references.')
932
        self.assertEqual('tree_path must be None when branch_location is'
933
                         ' None.', str(e))
934
        e = self.assertRaises(ValueError, branch.set_reference_info,
935
                              'file-id', None, 'location')
936
        self.assertEqual('branch_location must be None when tree_path is'
937
                         ' None.', str(e))
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
938
4273.1.7 by Aaron Bentley
Make update_references do a merge.
939
    def make_branch_with_reference(self, location, reference_location,
940
                                   file_id='file-id'):
941
        branch = self.make_branch(location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
942
        try:
4273.1.7 by Aaron Bentley
Make update_references do a merge.
943
            branch.set_reference_info(file_id, 'path/to/file',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
944
                                      reference_location)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
945
        except errors.UnsupportedOperation:
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
946
            raise tests.TestNotApplicable('Branch cannot hold references.')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
947
        return branch
948
949
    def test_reference_parent_from_reference_info_(self):
950
        referenced_branch = self.make_branch('reference_branch')
951
        branch = self.make_branch_with_reference('branch',
952
                                                 referenced_branch.base)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
953
        parent = branch.reference_parent('file-id', 'path/to/file')
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
954
        self.assertEqual(parent.base, referenced_branch.base)
955
956
    def test_branch_relative_reference_location(self):
957
        branch = self.make_branch('branch')
958
        try:
959
            branch.set_reference_info('file-id', 'path/to/file',
960
            '../reference_branch')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
961
        except errors.UnsupportedOperation:
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
962
            raise tests.TestNotApplicable('Branch cannot hold references.')
963
        referenced_branch = self.make_branch('reference_branch')
964
        parent = branch.reference_parent('file-id', 'path/to/file')
965
        self.assertEqual(parent.base, referenced_branch.base)
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
966
967
    def test_sprout_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
968
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
969
        new_branch = branch.bzrdir.sprout('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
970
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
971
                         new_branch.get_reference_info('file-id')[1])
972
973
    def test_clone_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
974
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
975
        new_branch = branch.bzrdir.clone('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
976
        self.assertEqual('../reference',
977
                         new_branch.get_reference_info('file-id')[1])
978
979
    def test_copied_locations_are_rebased(self):
980
        branch = self.make_branch_with_reference('branch', 'reference')
981
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
982
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
983
                         new_branch.get_reference_info('file-id')[1])
4273.1.7 by Aaron Bentley
Make update_references do a merge.
984
985
    def test_update_references_retains_old_references(self):
986
        branch = self.make_branch_with_reference('branch', 'reference')
987
        new_branch = self.make_branch_with_reference(
988
            'new_branch', 'reference', 'file-id2')
989
        new_branch.update_references(branch)
990
        self.assertEqual('reference',
991
                         branch.get_reference_info('file-id')[1])
992
993
    def test_update_references_retains_known_references(self):
994
        branch = self.make_branch_with_reference('branch', 'reference')
995
        new_branch = self.make_branch_with_reference(
996
            'new_branch', 'reference2')
997
        new_branch.update_references(branch)
998
        self.assertEqual('reference',
999
                         branch.get_reference_info('file-id')[1])
1000
4273.1.14 by Aaron Bentley
Restore disabled test
1001
    def test_update_references_skips_known_references(self):
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1002
        branch = self.make_branch_with_reference('branch', 'reference')
1003
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1004
        new_branch.set_reference_info('file-id', '../foo', '../foo')
1005
        new_branch.update_references(branch)
4273.1.14 by Aaron Bentley
Restore disabled test
1006
        self.assertEqual('reference',
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1007
                         branch.get_reference_info('file-id')[1])
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1008
1009
    def test_pull_updates_references(self):
1010
        branch = self.make_branch_with_reference('branch', 'reference')
1011
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1012
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1013
        branch.pull(new_branch)
1014
        self.assertEqual('foo',
1015
                         branch.get_reference_info('file-id2')[1])
1016
1017
    def test_push_updates_references(self):
1018
        branch = self.make_branch_with_reference('branch', 'reference')
1019
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1020
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1021
        new_branch.push(branch)
1022
        self.assertEqual('foo',
1023
                         branch.get_reference_info('file-id2')[1])
1024
1025
    def test_merge_updates_references(self):
1026
        branch = self.make_branch_with_reference('branch', 'reference')
1027
        tree = self.make_branch_and_tree('tree')
1028
        tree.commit('foo')
1029
        branch.pull(tree.branch)
1030
        checkout = branch.create_checkout('checkout', lightweight=True)
1031
        checkout.commit('bar')
1032
        tree.lock_write()
1033
        self.addCleanup(tree.unlock)
1034
        merger = merge.Merger.from_revision_ids(None, tree,
1035
                                                branch.last_revision(),
1036
                                                other_branch=branch)
1037
        merger.merge_type = merge.Merge3Merger
1038
        merger.do_merge()
1039
        self.assertEqual('../branch/reference',
1040
                         tree.branch.get_reference_info('file-id')[1])
5158.6.2 by Martin Pool
Branch provides user_url etc
1041
1042
1043
class TestBranchControlComponent(per_branch.TestCaseWithBranch):
1044
    """Branch implementations adequately implement ControlComponent."""
1045
    
1046
    def test_urls(self):
1047
        br = self.make_branch('branch')
1048
        self.assertIsInstance(br.user_url, str)
1049
        self.assertEqual(br.user_url, br.user_transport.base)
1050
        # for all current bzrdir implementations the user dir must be 
1051
        # above the control dir but we might need to relax that?
1052
        self.assertEqual(br.control_url.find(br.user_url), 0)
1053
        self.assertEqual(br.control_url, br.control_transport.base)