/brz/remove-bazaar

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