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