/brz/remove-bazaar

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