~bzr-pqm/bzr/bzr.dev

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