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