~bzr-pqm/bzr/bzr.dev

1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
19
import os
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
20
import sys
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
21
1878.1.3 by John Arbash Meinel
some test cleanups
22
from bzrlib import (
23
    branch,
24
    bzrdir,
25
    errors,
26
    gpg,
27
    urlutils,
28
    transactions,
29
    repository,
30
    )
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
31
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
32
from bzrlib.delta import TreeDelta
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
33
from bzrlib.errors import (FileExists,
34
                           NoSuchRevision,
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
35
                           NoSuchFile,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
36
                           UninitializableFormat,
37
                           NotBranchError,
38
                           )
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
39
from bzrlib.osutils import getcwd
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
40
import bzrlib.revision
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
41
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
42
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
43
from bzrlib.tests.HttpServer import HttpServer
1260 by Martin Pool
- some updates for fetch/update function
44
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
45
from bzrlib.transport import get_transport
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
46
from bzrlib.transport.memory import MemoryServer
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
47
from bzrlib.upgrade import upgrade
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.
48
from bzrlib.workingtree import WorkingTree
1092.2.25 by Robert Collins
support ghosts in commits
49
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
50
1185.16.56 by Martin Pool
doc
51
# TODO: Make a branch using basis branch, and check that it 
52
# doesn't request any files that could have been avoided, by 
53
# hooking into the Transport.
54
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
55
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
56
class TestCaseWithBranch(TestCaseWithBzrDir):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
57
58
    def setUp(self):
59
        super(TestCaseWithBranch, self).setUp()
60
        self.branch = None
61
62
    def get_branch(self):
63
        if self.branch is None:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
64
            self.branch = self.make_branch('')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
65
        return self.branch
66
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
67
    def make_branch(self, relpath, format=None):
68
        repo = self.make_repository(relpath, format=format)
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.
69
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
70
        # Skipped is the wrong exception to raise.
71
        try:
72
            return self.branch_format.initialize(repo.bzrdir)
73
        except errors.UninitializableFormat:
74
            raise TestSkipped('Uninitializable branch format')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
75
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
76
    def make_repository(self, relpath, shared=False, format=None):
77
        made_control = self.make_bzrdir(relpath, format=format)
78
        return made_control.create_repository(shared=shared)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
79
80
81
class TestBranch(TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
82
1102 by Martin Pool
- merge test refactoring from robertc
83
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
84
        """Test appending more than one revision"""
2230.3.2 by Aaron Bentley
Get all branch tests passing
85
        wt = self.make_branch_and_tree('tree')
86
        wt.commit('f', rev_id='rev1')
87
        wt.commit('f', rev_id='rev2')
88
        wt.commit('f', rev_id='rev3')
89
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
90
        br = self.get_branch()
2230.3.2 by Aaron Bentley
Get all branch tests passing
91
        br.fetch(wt.branch)
905 by Martin Pool
- merge aaron's append_multiple.patch
92
        br.append_revision("rev1")
93
        self.assertEquals(br.revision_history(), ["rev1",])
94
        br.append_revision("rev2", "rev3")
95
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
96
        self.assertRaises(errors.ReservedId, br.append_revision, 'current:')
1110 by Martin Pool
- merge aaron's merge improvements:
97
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
98
    def test_revision_ids_are_utf8(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
99
        wt = self.make_branch_and_tree('tree')
100
        wt.commit('f', rev_id='rev1')
101
        wt.commit('f', rev_id='rev2')
102
        wt.commit('f', rev_id='rev3')
103
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
104
        br = self.get_branch()
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
105
        br.fetch(wt.branch)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
106
        br.set_revision_history(['rev1', 'rev2', 'rev3'])
107
        rh = br.revision_history()
108
        self.assertEqual(['rev1', 'rev2', 'rev3'], rh)
109
        for revision_id in rh:
110
            self.assertIsInstance(revision_id, str)
111
        last = br.last_revision()
112
        self.assertEqual('rev3', last)
113
        self.assertIsInstance(last, str)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
114
        revno, last = br.last_revision_info()
115
        self.assertEqual(3, revno)
116
        self.assertEqual('rev3', last)
117
        self.assertIsInstance(last, str)
2249.5.6 by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids.
118
1260 by Martin Pool
- some updates for fetch/update function
119
    def test_fetch_revisions(self):
120
        """Test fetch-revision operation."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
121
        get_transport(self.get_url()).mkdir('b1')
122
        get_transport(self.get_url()).mkdir('b2')
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.
123
        wt = self.make_branch_and_tree('b1')
124
        b1 = wt.branch
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
125
        b2 = self.make_branch('b2')
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
126
        file('b1/foo', 'w').write('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.
127
        wt.add(['foo'], ['foo-id'])
128
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
129
130
        mutter('start fetch')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
131
        self.assertEqual((1, []), b2.fetch(b1))
1260 by Martin Pool
- some updates for fetch/update function
132
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
133
        rev = b2.repository.get_revision('revision-1')
134
        tree = b2.repository.revision_tree('revision-1')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
135
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
136
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
137
    def test_get_revision_delta(self):
138
        tree_a = self.make_branch_and_tree('a')
139
        self.build_tree(['a/foo'])
140
        tree_a.add('foo', 'file1')
141
        tree_a.commit('rev1', rev_id='rev1')
142
        self.build_tree(['a/vla'])
143
        tree_a.add('vla', 'file2')
144
        tree_a.commit('rev2', rev_id='rev2')
145
146
        delta = tree_a.branch.get_revision_delta(1)
147
        self.assertIsInstance(delta, TreeDelta)
148
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
149
        delta = tree_a.branch.get_revision_delta(2)
150
        self.assertIsInstance(delta, TreeDelta)
151
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
152
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
153
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
154
        """Return two branches, a and b, with one file in a."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
155
        get_transport(self.get_url()).mkdir('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.
156
        tree_a = self.make_branch_and_tree('a')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
157
        file('a/b', 'wb').write('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
158
        tree_a.add('b')
159
        tree_a.commit("silly commit", rev_id='A')
160
161
        get_transport(self.get_url()).mkdir('b')
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.
162
        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.
163
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
164
165
    def get_balanced_branch_pair(self):
166
        """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.
167
        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.
168
        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.
169
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
170
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
171
    def test_clone_branch(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
172
        """Copy the stores from one branch to another"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
173
        tree_a, tree_b = self.get_balanced_branch_pair()
174
        tree_b.commit("silly commit")
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
175
        os.mkdir('c')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
176
        # this fails to test that the history from a was not used.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
177
        dir_c = tree_a.bzrdir.clone('c', basis=tree_b.bzrdir)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
178
        self.assertEqual(tree_a.branch.revision_history(),
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
179
                         dir_c.open_branch().revision_history())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
180
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
181
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
182
        """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.
183
        # TODO: RBC 20060208 test with a revision not on revision-history.
184
        #       what should that behaviour be ? Emailed the list.
185
        wt_a = self.make_branch_and_tree('a')
186
        self.build_tree(['a/one'])
187
        wt_a.add(['one'])
188
        wt_a.commit('commit one', rev_id='1')
189
        self.build_tree(['a/two'])
190
        wt_a.add(['two'])
191
        wt_a.commit('commit two', rev_id='2')
192
        repo_b = self.make_repository('b')
193
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
194
        br_b = wt_a.bzrdir.open_branch().clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
195
        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.
196
197
    def test_sprout_partial(self):
198
        # test sprouting with a prefix of the revision-history.
199
        # also needs not-on-revision-history behaviour defined.
200
        wt_a = self.make_branch_and_tree('a')
201
        self.build_tree(['a/one'])
202
        wt_a.add(['one'])
203
        wt_a.commit('commit one', rev_id='1')
204
        self.build_tree(['a/two'])
205
        wt_a.add(['two'])
206
        wt_a.commit('commit two', rev_id='2')
207
        repo_b = self.make_repository('b')
208
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
209
        br_b = wt_a.bzrdir.open_branch().sprout(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
210
        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.
211
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
212
    def get_parented_branch(self):
213
        wt_a = self.make_branch_and_tree('a')
214
        self.build_tree(['a/one'])
215
        wt_a.add(['one'])
216
        wt_a.commit('commit one', rev_id='1')
217
218
        branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch()
219
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
220
        return branch_b
221
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.
222
    def test_clone_branch_nickname(self):
223
        # test the nick name is preserved always
224
        raise TestSkipped('XXX branch cloning is not yet tested..')
225
226
    def test_clone_branch_parent(self):
227
        # 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)
228
        branch_b = self.get_parented_branch()
229
        repo_c = self.make_repository('c')
230
        branch_b.repository.copy_content_into(repo_c)
231
        branch_c = branch_b.clone(repo_c.bzrdir)
232
        self.assertNotEqual(None, branch_c.get_parent())
233
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
234
235
        # We can also set a specific parent, and it should be honored
236
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
237
        branch_b.set_parent(random_parent)
238
        repo_d = self.make_repository('d')
239
        branch_b.repository.copy_content_into(repo_d)
240
        branch_d = branch_b.clone(repo_d.bzrdir)
241
        self.assertEqual(random_parent, branch_d.get_parent())
242
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
243
    def test_copy_content_incomplete(self):
244
        tree = self.make_branch_and_tree('commit_tree')
245
        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
246
        tree.add('foo')
247
        tree.commit('revision 1', rev_id='1')
248
        source = self.make_branch_and_tree('source')
249
        # this gives us an incomplete repository
250
        tree.bzrdir.open_repository().copy_content_into(
251
            source.branch.repository)
252
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
253
        tree.bzrdir.open_branch().copy_content_into(source.branch)
254
255
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
256
    def test_sprout_branch_nickname(self):
257
        # test the nick name is reset always
258
        raise TestSkipped('XXX branch sprouting is not yet tested..')
259
260
    def test_sprout_branch_parent(self):
261
        source = self.make_branch('source')
262
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
263
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
264
265
    def test_submit_branch(self):
266
        """Submit location can be queried and set"""
267
        branch = self.make_branch('branch')
268
        self.assertEqual(branch.get_submit_branch(), None)
269
        branch.set_submit_branch('sftp://example.com')
270
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
271
        branch.set_submit_branch('sftp://example.net')
272
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
273
        
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
274
    def test_public_branch(self):
275
        """public location can be queried and set"""
276
        branch = self.make_branch('branch')
277
        self.assertEqual(branch.get_public_branch(), None)
278
        branch.set_public_branch('sftp://example.com')
279
        self.assertEqual(branch.get_public_branch(), 'sftp://example.com')
280
        branch.set_public_branch('sftp://example.net')
281
        self.assertEqual(branch.get_public_branch(), 'sftp://example.net')
282
        branch.set_public_branch(None)
283
        self.assertEqual(branch.get_public_branch(), None)
284
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.
285
    def test_record_initial_ghost(self):
286
        """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.
287
        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.
288
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
289
            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.
290
        rev_id = wt.commit('commit against a ghost first parent.')
291
        rev = wt.branch.repository.get_revision(rev_id)
292
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
293
        # parent_sha1s is not populated now, WTF. rbc 20051003
294
        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.
295
296
    def test_record_two_ghosts(self):
297
        """Recording with all ghosts works."""
298
        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.
299
        wt.set_parent_ids([
300
                'foo@azkhazan-123123-abcabc',
301
                'wibble@fofof--20050401--1928390812',
302
            ],
303
            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.
304
        rev_id = wt.commit("commit from ghost base with one merge")
305
        # the revision should have been committed with two parents
306
        rev = wt.branch.repository.get_revision(rev_id)
307
        self.assertEqual(['foo@azkhazan-123123-abcabc',
308
            'wibble@fofof--20050401--1928390812'],
309
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
310
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
311
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
312
        self.assertRaises(errors.InvalidRevisionId,
313
                          self.get_branch().repository.get_revision,
314
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
315
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
316
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
317
# compare the gpg-to-sign info for a commit with a ghost and 
318
#     an identical tree without a ghost
319
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
320
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
321
    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.
322
        wt = self.make_branch_and_tree('.')
323
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
324
        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
325
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
326
        strategy = gpg.LoopbackGPGStrategy(None)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
327
        branch.repository.sign_revision('A', strategy)
1551.12.36 by Aaron Bentley
Fix failing tests
328
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
329
                         Testament.from_revision(branch.repository,
330
                         'A').as_short_text() +
1551.12.52 by Aaron Bentley
speling fix
331
                         '-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
332
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
333
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
334
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
335
        wt = self.make_branch_and_tree('.')
336
        branch = wt.branch
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
337
        branch.repository.store_revision_signature(
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
338
            gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
339
        self.assertRaises(errors.NoSuchRevision,
340
                          branch.repository.has_signature_for_revision_id,
341
                          'A')
342
        wt.commit("base", allow_pointless=True, rev_id='A')
1551.12.36 by Aaron Bentley
Fix failing tests
343
        self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n'
1551.12.52 by Aaron Bentley
speling fix
344
                         'FOO-----END PSEUDO-SIGNED CONTENT-----\n',
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
345
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
346
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
347
    def test_branch_keeps_signatures(self):
348
        wt = self.make_branch_and_tree('source')
349
        wt.commit('A', allow_pointless=True, rev_id='A')
350
        wt.branch.repository.sign_revision('A',
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
351
            gpg.LoopbackGPGStrategy(None))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
352
        #FIXME: clone should work to urls,
353
        # wt.clone should work to disks.
354
        self.build_tree(['target/'])
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.
355
        d2 = wt.bzrdir.clone('target')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
356
        self.assertEqual(wt.branch.repository.get_signature_text('A'),
357
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
358
1185.35.11 by Aaron Bentley
Added support for branch nicks
359
    def test_nicks(self):
360
        """Branch nicknames"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
361
        t = get_transport(self.get_url())
362
        t.mkdir('bzr.dev')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
363
        branch = self.make_branch('bzr.dev')
1185.35.11 by Aaron Bentley
Added support for branch nicks
364
        self.assertEqual(branch.nick, 'bzr.dev')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
365
        t.move('bzr.dev', 'bzr.ab')
366
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
367
        self.assertEqual(branch.nick, 'bzr.ab')
368
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
369
        branch.nick = "Aaron's branch"
1534.4.28 by Robert Collins
first cut at merge from integration.
370
        self.failUnless(
371
            t.has(
372
                t.relpath(
373
                    branch.control_files.controlfilename("branch.conf")
374
                    )
375
                )
376
            )
1185.35.11 by Aaron Bentley
Added support for branch nicks
377
        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.
378
        t.move('bzr.ab', 'integration')
379
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
380
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
381
        branch.nick = u"\u1234"
382
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
383
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
384
    def test_create_open_branch_uses_repository(self):
385
        try:
386
            repo = self.make_repository('.', shared=True)
387
        except errors.IncompatibleFormat:
388
            return
389
        repo.bzrdir.root_transport.mkdir('child')
390
        child_dir = self.bzrdir_format.initialize('child')
391
        try:
392
            child_branch = self.branch_format.initialize(child_dir)
393
        except errors.UninitializableFormat:
394
            # branch references are not default init'able.
395
            return
396
        self.assertEqual(repo.bzrdir.root_transport.base,
397
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
398
        child_branch = 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.
399
        self.assertEqual(repo.bzrdir.root_transport.base,
400
                         child_branch.repository.bzrdir.root_transport.base)
401
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
402
    def test_format_description(self):
403
        tree = self.make_branch_and_tree('tree')
404
        text = tree.branch._format.get_format_description()
405
        self.failUnless(len(text))
406
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
407
    def test_check_branch_report_results(self):
408
        """Checking a branch produces results which can be printed"""
409
        branch = self.make_branch('.')
410
        result = branch.check()
411
        # reports results through logging
412
        result.report_results(verbose=True)
413
        result.report_results(verbose=False)
414
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
415
    def test_get_commit_builder(self):
416
        self.assertIsInstance(self.make_branch(".").get_commit_builder([]), 
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
417
            repository.CommitBuilder)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
418
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
419
    def test_generate_revision_history(self):
420
        """Create a fake revision history easily."""
421
        tree = self.make_branch_and_tree('.')
422
        rev1 = tree.commit('foo')
423
        orig_history = tree.branch.revision_history()
424
        rev2 = tree.commit('bar', allow_pointless=True)
425
        tree.branch.generate_revision_history(rev1)
426
        self.assertEqual(orig_history, tree.branch.revision_history())
427
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
428
    def test_generate_revision_history_NULL_REVISION(self):
429
        tree = self.make_branch_and_tree('.')
430
        rev1 = tree.commit('foo')
431
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
432
        self.assertEqual([], tree.branch.revision_history())
433
1551.8.6 by Aaron Bentley
Rename test
434
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
435
        tree_a = self.make_branch_and_tree('a')
436
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
437
        checkout_b = branch_a.create_checkout('b')
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
438
        self.assertEqual(None, checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
439
        checkout_b.commit('rev1', rev_id='rev1')
440
        self.assertEqual('rev1', branch_a.last_revision())
441
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
442
1551.8.5 by Aaron Bentley
Change name to create_checkout
443
        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
444
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
445
        checkout_c.commit('rev2', rev_id='rev2')
446
        self.assertEqual('rev2', branch_a.last_revision())
447
        self.assertEqual(checkout_c.branch.base, branch_a.base)
448
449
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
450
        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
451
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
452
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
453
        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
454
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
455
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
456
    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
457
        """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
458
        tree_a = self.make_branch_and_tree('a')
459
        rev_id = tree_a.commit('put some content in the branch')
460
        source_branch = bzrlib.branch.Branch.open(
461
            'readonly+' + tree_a.bzrdir.root_transport.base)
462
        # sanity check that the test will be valid
463
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
464
            source_branch.lock_write)
465
        checkout = source_branch.create_checkout('c', lightweight=True)
466
        self.assertEqual(rev_id, checkout.last_revision())
467
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
468
    def test_create_anonymous_heavyweight_checkout(self):
469
        """A regular checkout from a readonly branch should succeed."""
470
        tree_a = self.make_branch_and_tree('a')
471
        rev_id = tree_a.commit('put some content in the branch')
472
        source_branch = bzrlib.branch.Branch.open(
473
            'readonly+' + tree_a.bzrdir.root_transport.base)
474
        # sanity check that the test will be valid
475
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
476
            source_branch.lock_write)
477
        checkout = source_branch.create_checkout('c')
478
        self.assertEqual(rev_id, checkout.last_revision())
479
1551.8.4 by Aaron Bentley
Tweak import style
480
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
481
class ChrootedTests(TestCaseWithBranch):
482
    """A support class that provides readonly urls outside the local namespace.
483
484
    This is done by checking if self.transport_server is a MemoryServer. if it
485
    is then we are chrooted already, if it is not then an HttpServer is used
486
    for readonly urls.
487
    """
488
489
    def setUp(self):
490
        super(ChrootedTests, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
491
        if not self.transport_server == MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
492
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
493
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
494
    def test_open_containing(self):
495
        self.assertRaises(NotBranchError, 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.
496
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
497
        self.assertRaises(NotBranchError, 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.
498
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
499
        branch = self.make_branch('.')
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
500
        branch, relpath = Branch.open_containing(self.get_readonly_url(''))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
501
        self.assertEqual('', relpath)
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
502
        branch, relpath = Branch.open_containing(self.get_readonly_url('g/p/q'))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
503
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
504
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
505
506
class InstrumentedTransaction(object):
507
508
    def finish(self):
509
        self.calls.append('finish')
510
511
    def __init__(self):
512
        self.calls = []
513
514
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
515
class TestDecorator(object):
516
517
    def __init__(self):
518
        self._calls = []
519
520
    def lock_read(self):
521
        self._calls.append('lr')
522
523
    def lock_write(self):
524
        self._calls.append('lw')
525
526
    def unlock(self):
527
        self._calls.append('ul')
528
529
    @needs_read_lock
530
    def do_with_read(self):
531
        return 1
532
533
    @needs_read_lock
534
    def except_with_read(self):
535
        raise RuntimeError
536
537
    @needs_write_lock
538
    def do_with_write(self):
539
        return 2
540
541
    @needs_write_lock
542
    def except_with_write(self):
543
        raise RuntimeError
544
545
546
class TestDecorators(TestCase):
547
548
    def test_needs_read_lock(self):
549
        branch = TestDecorator()
550
        self.assertEqual(1, branch.do_with_read())
551
        self.assertEqual(['lr', 'ul'], branch._calls)
552
553
    def test_excepts_in_read_lock(self):
554
        branch = TestDecorator()
555
        self.assertRaises(RuntimeError, branch.except_with_read)
556
        self.assertEqual(['lr', 'ul'], branch._calls)
557
558
    def test_needs_write_lock(self):
559
        branch = TestDecorator()
560
        self.assertEqual(2, branch.do_with_write())
561
        self.assertEqual(['lw', 'ul'], branch._calls)
562
563
    def test_excepts_in_write_lock(self):
564
        branch = TestDecorator()
565
        self.assertRaises(RuntimeError, branch.except_with_write)
566
        self.assertEqual(['lw', 'ul'], branch._calls)
567
568
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
569
class TestBranchPushLocations(TestCaseWithBranch):
570
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
571
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
572
        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.
573
574
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
575
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
576
                                   ensure_config_dir_exists)
577
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
578
        fn = locations_config_filename()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
579
        print >> open(fn, 'wt'), ("[%s]\n"
580
                                  "push_location=foo" %
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.
581
                                  self.get_branch().base[:-1])
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
582
        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.
583
584
    def test_set_push_location(self):
1878.1.3 by John Arbash Meinel
some test cleanups
585
        branch = self.get_branch()
586
        branch.set_push_location('foo')
2230.3.3 by Aaron Bentley
Add more config testing
587
        self.assertEqual('foo', branch.get_push_location())
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
588
589
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
590
class TestFormat(TestCaseWithBranch):
591
    """Tests for the format itself."""
592
593
    def test_format_initialize_find_open(self):
594
        # 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.
595
        if not self.branch_format.is_supported():
596
            # unsupported formats are not loopback testable
597
            # because the default open will not open them and
598
            # they may not be initializable.
599
            return
600
        # supported formats must be able to init and open
1534.4.12 by Robert Collins
Tweak formats implementation test to exercise readonly and readwrite transports.
601
        t = get_transport(self.get_url())
602
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
603
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
604
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
605
606
        # find it via bzrdir opening:
607
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
608
        direct_opened_branch = opened_control.open_branch()
609
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
610
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
611
        self.failUnless(isinstance(direct_opened_branch._format,
612
                        self.branch_format.__class__))
613
614
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
615
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
616
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
617
        self.assertEqual(made_branch._format.__class__,
618
                         opened_branch._format.__class__)
619
        # if it has a unique id string, can we probe for it ?
620
        try:
621
            self.branch_format.get_format_string()
622
        except NotImplementedError:
623
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
624
        self.assertEqual(self.branch_format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
625
                         branch.BranchFormat.find_format(opened_control))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
626
2230.3.7 by Aaron Bentley
Fix binding return values
627
2230.3.6 by Aaron Bentley
work in progress bind stuff
628
class TestBound(TestCaseWithBranch):
629
630
    def test_bind_unbind(self):
631
        branch = self.make_branch('1')
632
        branch2 = self.make_branch('2')
633
        try:
634
            branch.bind(branch2)
635
        except errors.UpgradeRequired:
636
            raise TestSkipped('Format does not support binding')
2230.3.7 by Aaron Bentley
Fix binding return values
637
        self.assertTrue(branch.unbind())
638
        self.assertFalse(branch.unbind())
2230.3.6 by Aaron Bentley
work in progress bind stuff
639
        self.assertIs(None, branch.get_bound_location())
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
640
641
    def test_old_bound_location(self):
642
        branch = self.make_branch('branch1')
643
        try:
644
            self.assertIs(None, branch.get_old_bound_location())
645
        except errors.UpgradeRequired:
646
            raise TestSkipped('Format does not store old bound locations')
647
        branch2 = self.make_branch('branch2')
648
        branch.bind(branch2)
649
        self.assertIs(None, branch.get_old_bound_location())
650
        branch.unbind()
651
        self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$')
2230.3.32 by Aaron Bentley
Implement strict history policy
652
653
654
class TestStrict(TestCaseWithBranch):
655
656
    def test_strict_history(self):
657
        tree1 = self.make_branch_and_tree('tree1')
658
        try:
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
659
            tree1.branch.set_append_revisions_only(True)
2230.3.32 by Aaron Bentley
Implement strict history policy
660
        except errors.UpgradeRequired:
661
            raise TestSkipped('Format does not support strict history')
662
        tree1.commit('empty commit')
663
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
664
        tree2.commit('empty commit 2')
665
        tree1.pull(tree2.branch)
666
        tree1.commit('empty commit 3')
667
        tree2.commit('empty commit 4')
668
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
669
        tree2.merge_from_branch(tree1.branch)
670
        tree2.commit('empty commit 5')
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
671
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
2230.3.32 by Aaron Bentley
Implement strict history policy
672
                          tree2.branch)
673
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
674
        tree3.merge_from_branch(tree2.branch)
675
        tree3.commit('empty commit 6')
676
        tree2.pull(tree3.branch)