~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,
28
    transactions,
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
29
    transport,
2018.5.129 by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
30
    remote,
1878.1.3 by John Arbash Meinel
some test cleanups
31
    repository,
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
32
    revision,
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
    )
3445.2.2 by John Arbash Meinel
Move the test to a branch_implementations test
35
from bzrlib.symbol_versioning import deprecated_in
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
36
from bzrlib.tests import (
37
    http_server,
38
    per_branch,
39
    )
4523.1.5 by Vincent Ladeuil
Fixed as asked in review.
40
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.
41
from bzrlib.transport import memory
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
42
43
44
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.
45
46
    def test_branch_format_matches_bzrdir_branch_format(self):
47
        bzrdir_branch_format = self.bzrdir_format.get_branch_format()
48
        self.assertIs(self.branch_format.__class__,
49
                      bzrdir_branch_format.__class__)
50
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.
51
    def test_make_branch_gets_expected_format(self):
52
        branch = self.make_branch('.')
53
        self.assertIs(self.branch_format.__class__,
54
            branch._format.__class__)
55
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.
56
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
57
class TestBranch(per_branch.TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
58
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
59
    def test_create_tree_with_merge(self):
60
        tree = self.create_tree_with_merge()
3287.6.9 by Robert Collins
One last use of deprecated methods.
61
        tree.lock_read()
62
        self.addCleanup(tree.unlock)
63
        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.
64
        ancestry_graph = graph.get_parent_map(
65
            tree.branch.repository.all_revision_ids())
3287.6.9 by Robert Collins
One last use of deprecated methods.
66
        self.assertEqual({'rev-1':('null:',),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
67
                          'rev-2':('rev-1', ),
68
                          'rev-1.1.1':('rev-1', ),
69
                          '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.
70
                         }, ancestry_graph)
71
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
72
    def test_revision_ids_are_utf8(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
73
        wt = self.make_branch_and_tree('tree')
74
        wt.commit('f', rev_id='rev1')
75
        wt.commit('f', rev_id='rev2')
76
        wt.commit('f', rev_id='rev3')
77
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
78
        br = self.get_branch()
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
79
        br.fetch(wt.branch)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
80
        br.set_revision_history(['rev1', 'rev2', 'rev3'])
81
        rh = br.revision_history()
82
        self.assertEqual(['rev1', 'rev2', 'rev3'], rh)
83
        for revision_id in rh:
84
            self.assertIsInstance(revision_id, str)
85
        last = br.last_revision()
86
        self.assertEqual('rev3', last)
87
        self.assertIsInstance(last, str)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
88
        revno, last = br.last_revision_info()
89
        self.assertEqual(3, revno)
90
        self.assertEqual('rev3', last)
91
        self.assertIsInstance(last, str)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
92
1260 by Martin Pool
- some updates for fetch/update function
93
    def test_fetch_revisions(self):
94
        """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.
95
        wt = self.make_branch_and_tree('b1')
96
        b1 = wt.branch
2381.1.3 by Robert Collins
Review feedback.
97
        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.
98
        wt.add(['foo'], ['foo-id'])
99
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
100
2381.1.3 by Robert Collins
Review feedback.
101
        b2 = self.make_branch('b2')
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
102
        b2.fetch(b1)
1260 by Martin Pool
- some updates for fetch/update function
103
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
104
        rev = b2.repository.get_revision('revision-1')
105
        tree = b2.repository.revision_tree('revision-1')
3015.2.1 by Robert Collins
Lock correctness in branch implementation tests.
106
        tree.lock_read()
107
        self.addCleanup(tree.unlock)
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
108
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
109
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
110
    def test_get_revision_delta(self):
111
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
112
        self.build_tree(['a/foo'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
113
        tree_a.add('foo', 'file1')
114
        tree_a.commit('rev1', rev_id='rev1')
2381.1.3 by Robert Collins
Review feedback.
115
        self.build_tree(['a/vla'])
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
116
        tree_a.add('vla', 'file2')
117
        tree_a.commit('rev2', rev_id='rev2')
118
119
        delta = tree_a.branch.get_revision_delta(1)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
120
        self.assertIsInstance(delta, _mod_delta.TreeDelta)
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
121
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
122
        delta = tree_a.branch.get_revision_delta(2)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
123
        self.assertIsInstance(delta, _mod_delta.TreeDelta)
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
124
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
125
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
126
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
127
        """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.
128
        tree_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
129
        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.
130
        tree_a.add('b')
131
        tree_a.commit("silly commit", rev_id='A')
132
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
133
        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.
134
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
135
136
    def get_balanced_branch_pair(self):
137
        """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.
138
        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.
139
        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.
140
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
141
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
142
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
143
        """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.
144
        # TODO: RBC 20060208 test with a revision not on revision-history.
145
        #       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).
146
        # 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.
147
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
148
        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.
149
        wt_a.add(['one'])
150
        wt_a.commit('commit one', rev_id='1')
2381.1.3 by Robert Collins
Review feedback.
151
        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.
152
        wt_a.add(['two'])
153
        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).
154
        # 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.
155
        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).
156
        wt_a.branch.repository.copy_content_into(repo_b)
157
        # wt_a might be a lightweight checkout, so get a hold of the actual
158
        # branch (because you can't do a partial clone of a lightweight
159
        # checkout).
160
        branch = wt_a.branch.bzrdir.open_branch()
161
        # Then make a branch where the new repository is, but specify a revision
162
        # ID.  The new branch's history will stop at the specified revision.
163
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
164
        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.
165
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
166
    def get_parented_branch(self):
167
        wt_a = self.make_branch_and_tree('a')
2381.1.3 by Robert Collins
Review feedback.
168
        self.build_tree(['a/one'])
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
169
        wt_a.add(['one'])
170
        wt_a.commit('commit one', rev_id='1')
171
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
172
        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)
173
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
174
        return branch_b
175
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.
176
    def test_clone_branch_nickname(self):
177
        # test the nick name is preserved always
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
178
        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.
179
180
    def test_clone_branch_parent(self):
181
        # 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)
182
        branch_b = self.get_parented_branch()
183
        repo_c = self.make_repository('c')
184
        branch_b.repository.copy_content_into(repo_c)
185
        branch_c = branch_b.clone(repo_c.bzrdir)
186
        self.assertNotEqual(None, branch_c.get_parent())
187
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
188
189
        # 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).
190
        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)
191
        branch_b.set_parent(random_parent)
192
        repo_d = self.make_repository('d')
193
        branch_b.repository.copy_content_into(repo_d)
194
        branch_d = branch_b.clone(repo_d.bzrdir)
195
        self.assertEqual(random_parent, branch_d.get_parent())
196
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
197
    def test_submit_branch(self):
198
        """Submit location can be queried and set"""
199
        branch = self.make_branch('branch')
200
        self.assertEqual(branch.get_submit_branch(), None)
201
        branch.set_submit_branch('sftp://example.com')
202
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
203
        branch.set_submit_branch('sftp://example.net')
204
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
206
    def test_public_branch(self):
207
        """public location can be queried and set"""
208
        branch = self.make_branch('branch')
209
        self.assertEqual(branch.get_public_branch(), None)
210
        branch.set_public_branch('sftp://example.com')
211
        self.assertEqual(branch.get_public_branch(), 'sftp://example.com')
212
        branch.set_public_branch('sftp://example.net')
213
        self.assertEqual(branch.get_public_branch(), 'sftp://example.net')
214
        branch.set_public_branch(None)
215
        self.assertEqual(branch.get_public_branch(), None)
216
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.
217
    def test_record_initial_ghost(self):
218
        """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.
219
        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.
220
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
221
            allow_leftmost_as_ghost=True)
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
222
        self.assertEqual(['non:existent@rev--ision--0--2'],
223
            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.
224
        rev_id = wt.commit('commit against a ghost first parent.')
225
        rev = wt.branch.repository.get_revision(rev_id)
226
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
227
        # parent_sha1s is not populated now, WTF. rbc 20051003
228
        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.
229
230
    def test_record_two_ghosts(self):
231
        """Recording with all ghosts works."""
232
        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.
233
        wt.set_parent_ids([
234
                'foo@azkhazan-123123-abcabc',
235
                'wibble@fofof--20050401--1928390812',
236
            ],
237
            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.
238
        rev_id = wt.commit("commit from ghost base with one merge")
239
        # the revision should have been committed with two parents
240
        rev = wt.branch.repository.get_revision(rev_id)
241
        self.assertEqual(['foo@azkhazan-123123-abcabc',
242
            'wibble@fofof--20050401--1928390812'],
243
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
244
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
245
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
246
        self.assertRaises(errors.InvalidRevisionId,
247
                          self.get_branch().repository.get_revision,
248
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
249
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
250
# TODO 20051003 RBC:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
251
# compare the gpg-to-sign info for a commit with a ghost and
1092.2.25 by Robert Collins
support ghosts in commits
252
#     an identical tree without a ghost
253
# 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
254
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
255
    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.
256
        wt = self.make_branch_and_tree('.')
257
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
258
        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
259
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
260
        strategy = gpg.LoopbackGPGStrategy(None)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
261
        branch.repository.lock_write()
262
        branch.repository.start_write_group()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
263
        branch.repository.sign_revision('A', strategy)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
264
        branch.repository.commit_write_group()
265
        branch.repository.unlock()
1551.12.36 by Aaron Bentley
Fix failing tests
266
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
267
                         Testament.from_revision(branch.repository,
268
                         'A').as_short_text() +
1551.12.52 by Aaron Bentley
speling fix
269
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
270
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
271
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
272
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
273
        wt = self.make_branch_and_tree('.')
274
        branch = wt.branch
3015.2.3 by Robert Collins
Use write groups around revision signature tests for branch.
275
        branch.lock_write()
276
        try:
277
            branch.repository.start_write_group()
278
            try:
279
                branch.repository.store_revision_signature(
280
                    gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
281
            except:
282
                branch.repository.abort_write_group()
283
                raise
284
            else:
285
                branch.repository.commit_write_group()
286
        finally:
287
            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.
288
        # A signature without a revision should not be accessible.
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
289
        self.assertRaises(errors.NoSuchRevision,
290
                          branch.repository.has_signature_for_revision_id,
291
                          'A')
292
        wt.commit("base", allow_pointless=True, rev_id='A')
1551.12.36 by Aaron Bentley
Fix failing tests
293
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
1551.12.52 by Aaron Bentley
speling fix
294
                         'FOO-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
295
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
296
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
297
    def test_branch_keeps_signatures(self):
298
        wt = self.make_branch_and_tree('source')
299
        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).
300
        repo = wt.branch.repository
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
301
        repo.lock_write()
302
        repo.start_write_group()
2818.4.2 by Robert Collins
Review feedback.
303
        repo.sign_revision('A', gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
304
        repo.commit_write_group()
305
        repo.unlock()
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
306
        #FIXME: clone should work to urls,
307
        # wt.clone should work to disks.
308
        self.build_tree(['target/'])
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
309
        d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
310
        self.assertEqual(repo.get_signature_text('A'),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
311
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
312
1185.35.11 by Aaron Bentley
Added support for branch nicks
313
    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.
314
        """Test explicit and implicit branch nicknames.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
315
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.
316
        Nicknames are implicitly the name of the branch's directory, unless an
317
        explicit nickname is set.  That is, an explicit nickname always
318
        overrides the implicit one.
319
        """
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
320
        t = self.get_transport()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
321
        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.
322
        # The nick will be 'bzr.dev', because there is no explicit nick set.
1185.35.11 by Aaron Bentley
Added support for branch nicks
323
        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.
324
        # Move the branch to a different directory, 'bzr.ab'.  Now that branch
325
        # 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.
326
        t.move('bzr.dev', 'bzr.ab')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
327
        branch = _mod_branch.Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
328
        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.
329
        # Set the branch nick explicitly.  This will ensure there's a branch
330
        # config file in the branch.
331
        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)
332
        if not isinstance(branch, remote.RemoteBranch):
3407.2.8 by Martin Pool
Deprecate LockableFiles.controlfilename
333
            self.failUnless(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.
334
        # Because the nick has been set explicitly, the nick is now always
335
        # "Aaron's branch", regardless of directory name.
1185.35.11 by Aaron Bentley
Added support for branch nicks
336
        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.
337
        t.move('bzr.ab', 'integration')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
338
        branch = _mod_branch.Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
339
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
340
        branch.nick = u"\u1234"
341
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
342
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
343
    def test_commit_nicks(self):
344
        """Nicknames are committed to the revision"""
345
        wt = self.make_branch_and_tree('bzr.dev')
346
        branch = wt.branch
347
        branch.nick = "My happy branch"
348
        wt.commit('My commit respect da nick.')
349
        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.
350
        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.
351
                         "My happy branch")
352
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
353
    def test_create_colocated(self):
354
        try:
355
            repo = self.make_repository('.', shared=True)
356
        except errors.IncompatibleFormat:
357
            return
358
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
359
        try:
360
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
361
                name='branch1')
362
        except (errors.UninitializableFormat, errors.NoColocatedBranchSupport):
363
            # branch references are not default init'able and
364
            # not all bzrdirs support colocated branches.
365
            return
366
        self.assertEquals(1, len(repo.bzrdir.list_branches()))
367
        self.branch_format.initialize(repo.bzrdir, name='branch2')
368
        self.assertEquals(2, len(repo.bzrdir.list_branches()))
369
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
370
    def test_create_open_branch_uses_repository(self):
371
        try:
372
            repo = self.make_repository('.', shared=True)
373
        except errors.IncompatibleFormat:
374
            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.
375
        child_transport = repo.bzrdir.root_transport.clone('child')
376
        child_transport.mkdir('.')
377
        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.
378
        try:
379
            child_branch = self.branch_format.initialize(child_dir)
380
        except errors.UninitializableFormat:
381
            # branch references are not default init'able.
382
            return
383
        self.assertEqual(repo.bzrdir.root_transport.base,
384
                         child_branch.repository.bzrdir.root_transport.base)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
385
        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.
386
        self.assertEqual(repo.bzrdir.root_transport.base,
387
                         child_branch.repository.bzrdir.root_transport.base)
388
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
389
    def test_format_description(self):
390
        tree = self.make_branch_and_tree('tree')
391
        text = tree.branch._format.get_format_description()
392
        self.failUnless(len(text))
393
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
394
    def test_get_commit_builder(self):
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
395
        branch = self.make_branch(".")
396
        branch.lock_write()
397
        builder = branch.get_commit_builder([])
398
        self.assertIsInstance(builder, repository.CommitBuilder)
399
        branch.repository.commit_write_group()
400
        branch.unlock()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
401
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
402
    def test_generate_revision_history(self):
403
        """Create a fake revision history easily."""
404
        tree = self.make_branch_and_tree('.')
405
        rev1 = tree.commit('foo')
406
        orig_history = tree.branch.revision_history()
407
        rev2 = tree.commit('bar', allow_pointless=True)
408
        tree.branch.generate_revision_history(rev1)
409
        self.assertEqual(orig_history, tree.branch.revision_history())
410
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
411
    def test_generate_revision_history_NULL_REVISION(self):
412
        tree = self.make_branch_and_tree('.')
413
        rev1 = tree.commit('foo')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
414
        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.
415
        self.assertEqual([], tree.branch.revision_history())
416
1551.8.6 by Aaron Bentley
Rename test
417
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
418
        tree_a = self.make_branch_and_tree('a')
419
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
420
        checkout_b = branch_a.create_checkout('b')
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
421
        self.assertEqual('null:', checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
422
        checkout_b.commit('rev1', rev_id='rev1')
423
        self.assertEqual('rev1', branch_a.last_revision())
424
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
425
1551.8.5 by Aaron Bentley
Change name to create_checkout
426
        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
427
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
428
        checkout_c.commit('rev2', rev_id='rev2')
429
        self.assertEqual('rev2', branch_a.last_revision())
430
        self.assertEqual(checkout_c.branch.base, branch_a.base)
431
1551.8.5 by Aaron Bentley
Change name to create_checkout
432
        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
433
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.5 by Aaron Bentley
Change name to create_checkout
434
        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
435
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
436
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
437
    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
438
        """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
439
        tree_a = self.make_branch_and_tree('a')
440
        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.
441
        # open the branch via a readonly transport
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
442
        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
443
        # sanity check that the test will be valid
444
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
445
            source_branch.lock_write)
446
        checkout = source_branch.create_checkout('c', lightweight=True)
447
        self.assertEqual(rev_id, checkout.last_revision())
448
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
449
    def test_create_anonymous_heavyweight_checkout(self):
450
        """A regular checkout from a readonly branch should succeed."""
451
        tree_a = self.make_branch_and_tree('a')
452
        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.
453
        # open the branch via a readonly transport
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
454
        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
455
        # sanity check that the test will be valid
456
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
457
            source_branch.lock_write)
458
        checkout = source_branch.create_checkout('c')
459
        self.assertEqual(rev_id, checkout.last_revision())
460
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
461
    def test_set_revision_history(self):
2018.5.97 by Andrew Bennetts
Fix more tests.
462
        tree = self.make_branch_and_tree('a')
463
        tree.commit('a commit', rev_id='rev1')
464
        br = tree.branch
2018.12.1 by Andrew Bennetts
Add TestBranch.test_set_revision_history
465
        br.set_revision_history(["rev1"])
466
        self.assertEquals(br.revision_history(), ["rev1"])
467
        br.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):
625
        self.assertEqual(None, self.get_branch().get_child_submit_format())
626
627
    def test_get_child_submit_format(self):
628
        branch = self.get_branch()
629
        branch.get_config().set_user_option('child_submit_format', '10')
630
        branch = self.get_branch()
631
        self.assertEqual('10', branch.get_child_submit_format())
632
633
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
634
class TestFormat(per_branch.TestCaseWithBranch):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
635
    """Tests for the format itself."""
636
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
637
    def test_get_reference(self):
638
        """get_reference on all regular branches should return None."""
639
        if not self.branch_format.is_supported():
640
            # unsupported formats are not loopback testable
641
            # because the default open will not open them and
642
            # they may not be initializable.
643
            return
644
        made_branch = self.make_branch('.')
645
        self.assertEqual(None,
646
            made_branch._format.get_reference(made_branch.bzrdir))
647
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
648
    def test_set_reference(self):
649
        """set_reference on all regular branches should be callable."""
650
        if not self.branch_format.is_supported():
651
            # unsupported formats are not loopback testable
652
            # because the default open will not open them and
653
            # they may not be initializable.
654
            return
655
        this_branch = self.make_branch('this')
656
        other_branch = self.make_branch('other')
657
        try:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
658
            this_branch._format.set_reference(this_branch.bzrdir, None,
659
                other_branch)
3078.2.7 by Ian Clatworthy
added smoke test for set_reference
660
        except NotImplementedError:
661
            # that's ok
662
            pass
663
        else:
664
            ref = this_branch._format.get_reference(this_branch.bzrdir)
665
            self.assertEqual(ref, other_branch.base)
666
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
667
    def test_format_initialize_find_open(self):
668
        # 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.
669
        if not self.branch_format.is_supported():
670
            # unsupported formats are not loopback testable
671
            # because the default open will not open them and
672
            # they may not be initializable.
673
            return
674
        # 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.
675
        t = self.get_transport()
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
676
        readonly_t = transport.get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
677
        made_branch = self.make_branch('.')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
678
        self.failUnless(isinstance(made_branch, _mod_branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
679
680
        # find it via bzrdir opening:
681
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
682
        direct_opened_branch = opened_control.open_branch()
683
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
684
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
685
        self.failUnless(isinstance(direct_opened_branch._format,
686
                        self.branch_format.__class__))
687
688
        # find it via Branch.open
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
689
        opened_branch = _mod_branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
690
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
691
        self.assertEqual(made_branch._format.__class__,
692
                         opened_branch._format.__class__)
693
        # if it has a unique id string, can we probe for it ?
694
        try:
695
            self.branch_format.get_format_string()
696
        except NotImplementedError:
697
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
698
        self.assertEqual(self.branch_format,
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
699
                         opened_control.find_branch_format())
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
700
2230.3.7 by Aaron Bentley
Fix binding return values
701
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
702
class TestBound(per_branch.TestCaseWithBranch):
2230.3.6 by Aaron Bentley
work in progress bind stuff
703
704
    def test_bind_unbind(self):
705
        branch = self.make_branch('1')
706
        branch2 = self.make_branch('2')
707
        try:
708
            branch.bind(branch2)
709
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
710
            raise tests.TestNotApplicable('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
711
        self.assertTrue(branch.unbind())
712
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
713
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
714
715
    def test_old_bound_location(self):
716
        branch = self.make_branch('branch1')
717
        try:
718
            self.assertIs(None, branch.get_old_bound_location())
719
        except errors.UpgradeRequired:
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
720
            raise tests.TestNotApplicable(
721
                    'Format does not store old bound locations')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
722
        branch2 = self.make_branch('branch2')
723
        branch.bind(branch2)
724
        self.assertIs(None, branch.get_old_bound_location())
725
        branch.unbind()
726
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
727
3099.1.1 by John Arbash Meinel
Fix bug #175337, bzr bind shouldn't check the ancestry
728
    def test_bind_diverged(self):
729
        tree_a = self.make_branch_and_tree('tree_a')
730
        tree_a.commit('rev1a')
731
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
732
        tree_a.commit('rev2a')
733
        tree_b.commit('rev2b')
734
        try:
735
            tree_b.branch.bind(tree_a.branch)
736
        except errors.UpgradeRequired:
737
            raise tests.TestNotApplicable('Format does not support binding')
738
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.
739
    def test_unbind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
740
        """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.
741
        master = self.make_branch('master')
742
        branch = self.make_branch('branch')
743
        try:
744
            branch.bind(master)
745
        except errors.UpgradeRequired:
746
            raise tests.TestNotApplicable('Format does not support binding')
747
        self.addCleanup(branch.lock_write().unlock)
748
        self.assertNotEqual(None, branch.get_master_branch())
749
        branch.unbind()
750
        self.assertEqual(None, branch.get_master_branch())
751
752
    def test_unlocked_does_not_cache_master_branch(self):
753
        """Unlocked branches do not cache the result of get_master_branch."""
754
        master = self.make_branch('master')
755
        branch1 = self.make_branch('branch')
756
        try:
757
            branch1.bind(master)
758
        except errors.UpgradeRequired:
759
            raise tests.TestNotApplicable('Format does not support binding')
760
        # Open branch1 again
761
        branch2 = branch1.bzrdir.open_branch()
762
        self.assertNotEqual(None, branch1.get_master_branch())
763
        # Unbind the branch via branch2.  branch1 isn't locked so will
764
        # immediately return the new value for get_master_branch.
765
        branch2.unbind()
766
        self.assertEqual(None, branch1.get_master_branch())
767
768
    def test_bind_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
769
        """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.
770
        master1 = self.make_branch('master1')
771
        master2 = self.make_branch('master2')
772
        branch = self.make_branch('branch')
773
        try:
774
            branch.bind(master1)
775
        except errors.UpgradeRequired:
776
            raise tests.TestNotApplicable('Format does not support binding')
777
        self.addCleanup(branch.lock_write().unlock)
778
        self.assertNotEqual(None, branch.get_master_branch())
779
        branch.bind(master2)
780
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
781
                branch.get_master_branch().base))
782
783
    def test_set_bound_location_clears_cached_master_branch(self):
5609.25.6 by Andrew Bennetts
Docstring tweaks.
784
        """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.
785
        """
786
        master1 = self.make_branch('master1')
787
        master2 = self.make_branch('master2')
788
        branch = self.make_branch('branch')
789
        try:
790
            branch.bind(master1)
791
        except errors.UpgradeRequired:
792
            raise tests.TestNotApplicable('Format does not support binding')
793
        self.addCleanup(branch.lock_write().unlock)
794
        self.assertNotEqual(None, branch.get_master_branch())
795
        branch.set_bound_location(self.get_url('master2'))
796
        self.assertEqual('.', urlutils.relative_url(self.get_url('master2'),
797
                branch.get_master_branch().base))
798
2230.3.32 by Aaron Bentley
Implement strict history policy
799
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
800
class TestStrict(per_branch.TestCaseWithBranch):
2230.3.32 by Aaron Bentley
Implement strict history policy
801
802
    def test_strict_history(self):
803
        tree1 = self.make_branch_and_tree('tree1')
804
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
805
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
806
        except errors.UpgradeRequired:
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
807
            raise tests.TestSkipped('Format does not support strict history')
2230.3.32 by Aaron Bentley
Implement strict history policy
808
        tree1.commit('empty commit')
809
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
810
        tree2.commit('empty commit 2')
811
        tree1.pull(tree2.branch)
812
        tree1.commit('empty commit 3')
813
        tree2.commit('empty commit 4')
814
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
815
        tree2.merge_from_branch(tree1.branch)
816
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
817
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
818
                          tree2.branch)
819
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
820
        tree3.merge_from_branch(tree2.branch)
821
        tree3.commit('empty commit 6')
822
        tree2.pull(tree3.branch)
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
823
824
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
825
class TestIgnoreFallbacksParameter(per_branch.TestCaseWithBranch):
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
826
827
    def make_branch_with_fallback(self):
828
        fallback = self.make_branch('fallback')
829
        if not fallback._format.supports_stacking():
830
            raise tests.TestNotApplicable("format does not support stacking")
831
        stacked = self.make_branch('stacked')
832
        stacked.set_stacked_on_url(fallback.base)
833
        return stacked
834
835
    def test_fallbacks_not_opened(self):
836
        stacked = self.make_branch_with_fallback()
837
        self.get_transport('').rename('fallback', 'moved')
838
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=True)
839
        self.assertEqual([], reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
840
4160.2.13 by Andrew Bennetts
Add some tests for ignore_fallbacks.
841
    def test_fallbacks_are_opened(self):
842
        stacked = self.make_branch_with_fallback()
843
        reopened = stacked.bzrdir.open_branch(ignore_fallbacks=False)
844
        self.assertLength(1, reopened.repository._fallback_repositories)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
845
846
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
847
class TestReferenceLocation(per_branch.TestCaseWithBranch):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
848
849
    def test_reference_parent(self):
850
        tree = self.make_branch_and_tree('tree')
851
        subtree = self.make_branch_and_tree('tree/subtree')
852
        subtree.set_root_id('subtree-id')
853
        try:
854
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
855
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
856
            raise tests.TestNotApplicable('Tree cannot hold references.')
857
        reference_parent = tree.branch.reference_parent('subtree-id',
858
                                                        'subtree')
859
        self.assertEqual(subtree.branch.base, reference_parent.base)
860
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
861
    def test_reference_parent_accepts_possible_transports(self):
862
        tree = self.make_branch_and_tree('tree')
863
        subtree = self.make_branch_and_tree('tree/subtree')
864
        subtree.set_root_id('subtree-id')
865
        try:
866
            tree.add_reference(subtree)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
867
        except errors.UnsupportedOperation:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
868
            raise tests.TestNotApplicable('Tree cannot hold references.')
869
        reference_parent = tree.branch.reference_parent('subtree-id',
870
            'subtree', possible_transports=[subtree.bzrdir.root_transport])
871
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
872
    def test_get_reference_info(self):
873
        branch = self.make_branch('branch')
874
        try:
875
            path, loc = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
876
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
877
            raise tests.TestNotApplicable('Branch cannot hold references.')
878
        self.assertIs(None, path)
879
        self.assertIs(None, loc)
880
881
    def test_set_reference_info(self):
882
        branch = self.make_branch('branch')
883
        try:
884
            branch.set_reference_info('file-id', 'path/to/location',
885
                                      'path/to/file')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
886
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
887
            raise tests.TestNotApplicable('Branch cannot hold references.')
888
889
    def test_set_get_reference_info(self):
890
        branch = self.make_branch('branch')
891
        try:
892
            branch.set_reference_info('file-id', 'path/to/file',
893
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
894
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
895
            raise tests.TestNotApplicable('Branch cannot hold references.')
896
        # Create a new instance to ensure storage is permanent
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
897
        branch = _mod_branch.Branch.open('branch')
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
898
        tree_path, branch_location = branch.get_reference_info('file-id')
899
        self.assertEqual('path/to/location', branch_location)
900
901
    def test_set_null_reference_info(self):
902
        branch = self.make_branch('branch')
903
        try:
904
            branch.set_reference_info('file-id', 'path/to/file',
905
                                      'path/to/location')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
906
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
907
            raise tests.TestNotApplicable('Branch cannot hold references.')
908
        branch.set_reference_info('file-id', None, None)
909
        tree_path, branch_location = branch.get_reference_info('file-id')
910
        self.assertIs(None, tree_path)
911
        self.assertIs(None, branch_location)
912
913
    def test_set_null_reference_info_when_null(self):
914
        branch = self.make_branch('branch')
915
        try:
916
            tree_path, branch_location = branch.get_reference_info('file-id')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
917
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
918
            raise tests.TestNotApplicable('Branch cannot hold references.')
919
        self.assertIs(None, tree_path)
920
        self.assertIs(None, branch_location)
921
        branch.set_reference_info('file-id', None, None)
922
923
    def test_set_null_requires_two_nones(self):
924
        branch = self.make_branch('branch')
925
        try:
926
            e = self.assertRaises(ValueError, branch.set_reference_info,
927
                                  'file-id', 'path', None)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
928
        except errors.UnsupportedOperation:
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
929
            raise tests.TestNotApplicable('Branch cannot hold references.')
930
        self.assertEqual('tree_path must be None when branch_location is'
931
                         ' None.', str(e))
932
        e = self.assertRaises(ValueError, branch.set_reference_info,
933
                              'file-id', None, 'location')
934
        self.assertEqual('branch_location must be None when tree_path is'
935
                         ' None.', str(e))
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
936
4273.1.7 by Aaron Bentley
Make update_references do a merge.
937
    def make_branch_with_reference(self, location, reference_location,
938
                                   file_id='file-id'):
939
        branch = self.make_branch(location)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
940
        try:
4273.1.7 by Aaron Bentley
Make update_references do a merge.
941
            branch.set_reference_info(file_id, 'path/to/file',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
942
                                      reference_location)
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
943
        except errors.UnsupportedOperation:
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
944
            raise tests.TestNotApplicable('Branch cannot hold references.')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
945
        return branch
946
947
    def test_reference_parent_from_reference_info_(self):
948
        referenced_branch = self.make_branch('reference_branch')
949
        branch = self.make_branch_with_reference('branch',
950
                                                 referenced_branch.base)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
951
        parent = branch.reference_parent('file-id', 'path/to/file')
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
952
        self.assertEqual(parent.base, referenced_branch.base)
953
954
    def test_branch_relative_reference_location(self):
955
        branch = self.make_branch('branch')
956
        try:
957
            branch.set_reference_info('file-id', 'path/to/file',
958
            '../reference_branch')
5010.2.4 by Vincent Ladeuil
Fix per_branch/test_branch.py imports.
959
        except errors.UnsupportedOperation:
4273.1.3 by Aaron Bentley
Use branch-relative paths to references.
960
            raise tests.TestNotApplicable('Branch cannot hold references.')
961
        referenced_branch = self.make_branch('reference_branch')
962
        parent = branch.reference_parent('file-id', 'path/to/file')
963
        self.assertEqual(parent.base, referenced_branch.base)
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
964
965
    def test_sprout_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
966
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
967
        new_branch = branch.bzrdir.sprout('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
968
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
969
                         new_branch.get_reference_info('file-id')[1])
970
971
    def test_clone_copies_reference_location(self):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
972
        branch = self.make_branch_with_reference('branch', '../reference')
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
973
        new_branch = branch.bzrdir.clone('new-branch').open_branch()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
974
        self.assertEqual('../reference',
975
                         new_branch.get_reference_info('file-id')[1])
976
977
    def test_copied_locations_are_rebased(self):
978
        branch = self.make_branch_with_reference('branch', 'reference')
979
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
980
        self.assertEqual('../reference',
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
981
                         new_branch.get_reference_info('file-id')[1])
4273.1.7 by Aaron Bentley
Make update_references do a merge.
982
983
    def test_update_references_retains_old_references(self):
984
        branch = self.make_branch_with_reference('branch', 'reference')
985
        new_branch = self.make_branch_with_reference(
986
            'new_branch', 'reference', 'file-id2')
987
        new_branch.update_references(branch)
988
        self.assertEqual('reference',
989
                         branch.get_reference_info('file-id')[1])
990
991
    def test_update_references_retains_known_references(self):
992
        branch = self.make_branch_with_reference('branch', 'reference')
993
        new_branch = self.make_branch_with_reference(
994
            'new_branch', 'reference2')
995
        new_branch.update_references(branch)
996
        self.assertEqual('reference',
997
                         branch.get_reference_info('file-id')[1])
998
4273.1.14 by Aaron Bentley
Restore disabled test
999
    def test_update_references_skips_known_references(self):
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1000
        branch = self.make_branch_with_reference('branch', 'reference')
1001
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1002
        new_branch.set_reference_info('file-id', '../foo', '../foo')
1003
        new_branch.update_references(branch)
4273.1.14 by Aaron Bentley
Restore disabled test
1004
        self.assertEqual('reference',
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1005
                         branch.get_reference_info('file-id')[1])
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1006
1007
    def test_pull_updates_references(self):
1008
        branch = self.make_branch_with_reference('branch', 'reference')
1009
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1010
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1011
        branch.pull(new_branch)
1012
        self.assertEqual('foo',
1013
                         branch.get_reference_info('file-id2')[1])
1014
1015
    def test_push_updates_references(self):
1016
        branch = self.make_branch_with_reference('branch', 'reference')
1017
        new_branch = branch.bzrdir.sprout('branch/new-branch').open_branch()
1018
        new_branch.set_reference_info('file-id2', '../foo', '../foo')
1019
        new_branch.push(branch)
1020
        self.assertEqual('foo',
1021
                         branch.get_reference_info('file-id2')[1])
1022
1023
    def test_merge_updates_references(self):
1024
        branch = self.make_branch_with_reference('branch', 'reference')
1025
        tree = self.make_branch_and_tree('tree')
1026
        tree.commit('foo')
1027
        branch.pull(tree.branch)
1028
        checkout = branch.create_checkout('checkout', lightweight=True)
1029
        checkout.commit('bar')
1030
        tree.lock_write()
1031
        self.addCleanup(tree.unlock)
1032
        merger = merge.Merger.from_revision_ids(None, tree,
1033
                                                branch.last_revision(),
1034
                                                other_branch=branch)
1035
        merger.merge_type = merge.Merge3Merger
1036
        merger.do_merge()
1037
        self.assertEqual('../branch/reference',
1038
                         tree.branch.get_reference_info('file-id')[1])
5158.6.2 by Martin Pool
Branch provides user_url etc
1039
1040
1041
class TestBranchControlComponent(per_branch.TestCaseWithBranch):
1042
    """Branch implementations adequately implement ControlComponent."""
1043
    
1044
    def test_urls(self):
1045
        br = self.make_branch('branch')
1046
        self.assertIsInstance(br.user_url, str)
1047
        self.assertEqual(br.user_url, br.user_transport.base)
1048
        # for all current bzrdir implementations the user dir must be 
1049
        # above the control dir but we might need to relax that?
1050
        self.assertEqual(br.control_url.find(br.user_url), 0)
1051
        self.assertEqual(br.control_url, br.control_transport.base)