/brz/remove-bazaar

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