/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
1260 by Martin Pool
- some updates for fetch/update function
43
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
44
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.
45
from bzrlib.transport.http import HttpServer
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"""
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
85
        br = self.get_branch()
905 by Martin Pool
- merge aaron's append_multiple.patch
86
        br.append_revision("rev1")
87
        self.assertEquals(br.revision_history(), ["rev1",])
88
        br.append_revision("rev2", "rev3")
89
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
90
1260 by Martin Pool
- some updates for fetch/update function
91
    def test_fetch_revisions(self):
92
        """Test fetch-revision operation."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
93
        get_transport(self.get_url()).mkdir('b1')
94
        get_transport(self.get_url()).mkdir('b2')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
95
        wt = self.make_branch_and_tree('b1')
96
        b1 = wt.branch
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
97
        b2 = self.make_branch('b2')
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
98
        file('b1/foo', 'w').write('hello')
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
99
        wt.add(['foo'], ['foo-id'])
100
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
101
102
        mutter('start fetch')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
103
        self.assertEqual((1, []), b2.fetch(b1))
1260 by Martin Pool
- some updates for fetch/update function
104
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
105
        rev = b2.repository.get_revision('revision-1')
106
        tree = b2.repository.revision_tree('revision-1')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
107
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
108
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
109
    def test_get_revision_delta(self):
110
        tree_a = self.make_branch_and_tree('a')
111
        self.build_tree(['a/foo'])
112
        tree_a.add('foo', 'file1')
113
        tree_a.commit('rev1', rev_id='rev1')
114
        self.build_tree(['a/vla'])
115
        tree_a.add('vla', 'file2')
116
        tree_a.commit('rev2', rev_id='rev2')
117
118
        delta = tree_a.branch.get_revision_delta(1)
119
        self.assertIsInstance(delta, TreeDelta)
120
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
121
        delta = tree_a.branch.get_revision_delta(2)
122
        self.assertIsInstance(delta, TreeDelta)
123
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
124
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
125
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
126
        """Return two branches, a and b, with one file in a."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
127
        get_transport(self.get_url()).mkdir('a')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
128
        tree_a = self.make_branch_and_tree('a')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
129
        file('a/b', 'wb').write('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
130
        tree_a.add('b')
131
        tree_a.commit("silly commit", rev_id='A')
132
133
        get_transport(self.get_url()).mkdir('b')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
134
        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.
135
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
136
137
    def get_balanced_branch_pair(self):
138
        """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.
139
        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.
140
        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.
141
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
142
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
143
    def test_clone_branch(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
144
        """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.
145
        tree_a, tree_b = self.get_balanced_branch_pair()
146
        tree_b.commit("silly commit")
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
147
        os.mkdir('c')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
148
        # 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.
149
        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.
150
        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.
151
                         dir_c.open_branch().revision_history())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
152
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
153
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
154
        """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.
155
        # TODO: RBC 20060208 test with a revision not on revision-history.
156
        #       what should that behaviour be ? Emailed the list.
157
        wt_a = self.make_branch_and_tree('a')
158
        self.build_tree(['a/one'])
159
        wt_a.add(['one'])
160
        wt_a.commit('commit one', rev_id='1')
161
        self.build_tree(['a/two'])
162
        wt_a.add(['two'])
163
        wt_a.commit('commit two', rev_id='2')
164
        repo_b = self.make_repository('b')
165
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
166
        br_b = wt_a.bzrdir.open_branch().clone(repo_b.bzrdir, revision_id='1')
167
        self.assertEqual(br_b.last_revision(), '1')
168
169
    def test_sprout_partial(self):
170
        # test sprouting with a prefix of the revision-history.
171
        # also needs not-on-revision-history behaviour defined.
172
        wt_a = self.make_branch_and_tree('a')
173
        self.build_tree(['a/one'])
174
        wt_a.add(['one'])
175
        wt_a.commit('commit one', rev_id='1')
176
        self.build_tree(['a/two'])
177
        wt_a.add(['two'])
178
        wt_a.commit('commit two', rev_id='2')
179
        repo_b = self.make_repository('b')
180
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
181
        br_b = wt_a.bzrdir.open_branch().sprout(repo_b.bzrdir, revision_id='1')
182
        self.assertEqual(br_b.last_revision(), '1')
183
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
184
    def get_parented_branch(self):
185
        wt_a = self.make_branch_and_tree('a')
186
        self.build_tree(['a/one'])
187
        wt_a.add(['one'])
188
        wt_a.commit('commit one', rev_id='1')
189
190
        branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch()
191
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
192
        return branch_b
193
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.
194
    def test_clone_branch_nickname(self):
195
        # test the nick name is preserved always
196
        raise TestSkipped('XXX branch cloning is not yet tested..')
197
198
    def test_clone_branch_parent(self):
199
        # 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)
200
        branch_b = self.get_parented_branch()
201
        repo_c = self.make_repository('c')
202
        branch_b.repository.copy_content_into(repo_c)
203
        branch_c = branch_b.clone(repo_c.bzrdir)
204
        self.assertNotEqual(None, branch_c.get_parent())
205
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
206
207
        # We can also set a specific parent, and it should be honored
208
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
209
        branch_b.set_parent(random_parent)
210
        repo_d = self.make_repository('d')
211
        branch_b.repository.copy_content_into(repo_d)
212
        branch_d = branch_b.clone(repo_d.bzrdir)
213
        self.assertEqual(random_parent, branch_d.get_parent())
214
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
    def test_sprout_branch_nickname(self):
216
        # test the nick name is reset always
217
        raise TestSkipped('XXX branch sprouting is not yet tested..')
218
219
    def test_sprout_branch_parent(self):
220
        source = self.make_branch('source')
221
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
222
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
223
224
    def test_submit_branch(self):
225
        """Submit location can be queried and set"""
226
        branch = self.make_branch('branch')
227
        self.assertEqual(branch.get_submit_branch(), None)
228
        branch.set_submit_branch('sftp://example.com')
229
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
230
        branch.set_submit_branch('sftp://example.net')
231
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
232
        
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.
233
    def test_record_initial_ghost(self):
234
        """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.
235
        wt = self.make_branch_and_tree('.')
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.
236
        wt.add_pending_merge('non:existent@rev--ision--0--2')
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
237
        rev_id = wt.commit('commit against a ghost first parent.')
238
        rev = wt.branch.repository.get_revision(rev_id)
239
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
240
        # parent_sha1s is not populated now, WTF. rbc 20051003
241
        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.
242
243
    def test_record_two_ghosts(self):
244
        """Recording with all ghosts works."""
245
        wt = self.make_branch_and_tree('.')
246
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
247
        wt.add_pending_merge('wibble@fofof--20050401--1928390812')
248
        rev_id = wt.commit("commit from ghost base with one merge")
249
        # the revision should have been committed with two parents
250
        rev = wt.branch.repository.get_revision(rev_id)
251
        self.assertEqual(['foo@azkhazan-123123-abcabc',
252
            'wibble@fofof--20050401--1928390812'],
253
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
254
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
255
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
256
        self.assertRaises(errors.InvalidRevisionId,
257
                          self.get_branch().repository.get_revision,
258
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
259
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
260
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
261
# compare the gpg-to-sign info for a commit with a ghost and 
262
#     an identical tree without a ghost
263
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
264
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
265
    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.
266
        wt = self.make_branch_and_tree('.')
267
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
268
        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
269
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
270
        strategy = gpg.LoopbackGPGStrategy(None)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
271
        branch.repository.sign_revision('A', strategy)
272
        self.assertEqual(Testament.from_revision(branch.repository, 
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
273
                         'A').as_short_text(),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
274
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
275
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
276
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
277
        wt = self.make_branch_and_tree('.')
278
        branch = wt.branch
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
279
        branch.repository.store_revision_signature(
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
280
            gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
281
        self.assertRaises(errors.NoSuchRevision,
282
                          branch.repository.has_signature_for_revision_id,
283
                          'A')
284
        wt.commit("base", allow_pointless=True, rev_id='A')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
285
        self.assertEqual('FOO', 
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
286
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
287
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
288
    def test_branch_keeps_signatures(self):
289
        wt = self.make_branch_and_tree('source')
290
        wt.commit('A', allow_pointless=True, rev_id='A')
291
        wt.branch.repository.sign_revision('A',
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
292
            gpg.LoopbackGPGStrategy(None))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
293
        #FIXME: clone should work to urls,
294
        # wt.clone should work to disks.
295
        self.build_tree(['target/'])
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
296
        d2 = wt.bzrdir.clone('target')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
297
        self.assertEqual(wt.branch.repository.get_signature_text('A'),
298
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
299
1185.35.11 by Aaron Bentley
Added support for branch nicks
300
    def test_nicks(self):
301
        """Branch nicknames"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
302
        t = get_transport(self.get_url())
303
        t.mkdir('bzr.dev')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
304
        branch = self.make_branch('bzr.dev')
1185.35.11 by Aaron Bentley
Added support for branch nicks
305
        self.assertEqual(branch.nick, 'bzr.dev')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
306
        t.move('bzr.dev', 'bzr.ab')
307
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
308
        self.assertEqual(branch.nick, 'bzr.ab')
309
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
310
        branch.nick = "Aaron's branch"
1534.4.28 by Robert Collins
first cut at merge from integration.
311
        self.failUnless(
312
            t.has(
313
                t.relpath(
314
                    branch.control_files.controlfilename("branch.conf")
315
                    )
316
                )
317
            )
1185.35.11 by Aaron Bentley
Added support for branch nicks
318
        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.
319
        t.move('bzr.ab', 'integration')
320
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
321
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
322
        branch.nick = u"\u1234"
323
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
324
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
325
    def test_commit_nicks(self):
326
        """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.
327
        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.
328
        wt = self.make_branch_and_tree('bzr.dev')
329
        branch = wt.branch
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
330
        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.
331
        wt.commit('My commit respect da nick.')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
332
        committed = branch.repository.get_revision(branch.last_revision())
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
333
        self.assertEqual(committed.properties["branch-nick"], 
334
                         "My happy branch")
335
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
336
    def test_create_open_branch_uses_repository(self):
337
        try:
338
            repo = self.make_repository('.', shared=True)
339
        except errors.IncompatibleFormat:
340
            return
341
        repo.bzrdir.root_transport.mkdir('child')
342
        child_dir = self.bzrdir_format.initialize('child')
343
        try:
344
            child_branch = self.branch_format.initialize(child_dir)
345
        except errors.UninitializableFormat:
346
            # branch references are not default init'able.
347
            return
348
        self.assertEqual(repo.bzrdir.root_transport.base,
349
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
350
        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.
351
        self.assertEqual(repo.bzrdir.root_transport.base,
352
                         child_branch.repository.bzrdir.root_transport.base)
353
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
354
    def test_format_description(self):
355
        tree = self.make_branch_and_tree('tree')
356
        text = tree.branch._format.get_format_description()
357
        self.failUnless(len(text))
358
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
359
    def test_check_branch_report_results(self):
360
        """Checking a branch produces results which can be printed"""
361
        branch = self.make_branch('.')
362
        result = branch.check()
363
        # reports results through logging
364
        result.report_results(verbose=True)
365
        result.report_results(verbose=False)
366
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
367
    def test_get_commit_builder(self):
368
        self.assertIsInstance(self.make_branch(".").get_commit_builder([]), 
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
369
            repository.CommitBuilder)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
370
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
371
    def test_generate_revision_history(self):
372
        """Create a fake revision history easily."""
373
        tree = self.make_branch_and_tree('.')
374
        rev1 = tree.commit('foo')
375
        orig_history = tree.branch.revision_history()
376
        rev2 = tree.commit('bar', allow_pointless=True)
377
        tree.branch.generate_revision_history(rev1)
378
        self.assertEqual(orig_history, tree.branch.revision_history())
379
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
380
    def test_generate_revision_history_NULL_REVISION(self):
381
        tree = self.make_branch_and_tree('.')
382
        rev1 = tree.commit('foo')
383
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
384
        self.assertEqual([], tree.branch.revision_history())
385
1551.8.6 by Aaron Bentley
Rename test
386
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
387
        tree_a = self.make_branch_and_tree('a')
388
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
389
        checkout_b = branch_a.create_checkout('b')
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
390
        checkout_b.commit('rev1', rev_id='rev1')
391
        self.assertEqual('rev1', branch_a.last_revision())
392
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
393
1551.8.5 by Aaron Bentley
Change name to create_checkout
394
        checkout_c = branch_a.create_checkout('c', lightweight=True)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
395
        checkout_c.commit('rev2', rev_id='rev2')
396
        self.assertEqual('rev2', branch_a.last_revision())
397
        self.assertEqual(checkout_c.branch.base, branch_a.base)
398
399
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
400
        checkout_d = branch_a.create_checkout('d', lightweight=True)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
401
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
402
        checkout_e = branch_a.create_checkout('e')
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
403
1551.8.4 by Aaron Bentley
Tweak import style
404
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
405
class ChrootedTests(TestCaseWithBranch):
406
    """A support class that provides readonly urls outside the local namespace.
407
408
    This is done by checking if self.transport_server is a MemoryServer. if it
409
    is then we are chrooted already, if it is not then an HttpServer is used
410
    for readonly urls.
411
    """
412
413
    def setUp(self):
414
        super(ChrootedTests, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
415
        if not self.transport_server == MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
416
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
417
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
418
    def test_open_containing(self):
419
        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.
420
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
421
        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.
422
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
423
        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.
424
        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).
425
        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.
426
        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).
427
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
428
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
429
430
class InstrumentedTransaction(object):
431
432
    def finish(self):
433
        self.calls.append('finish')
434
435
    def __init__(self):
436
        self.calls = []
437
438
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
439
class TestDecorator(object):
440
441
    def __init__(self):
442
        self._calls = []
443
444
    def lock_read(self):
445
        self._calls.append('lr')
446
447
    def lock_write(self):
448
        self._calls.append('lw')
449
450
    def unlock(self):
451
        self._calls.append('ul')
452
453
    @needs_read_lock
454
    def do_with_read(self):
455
        return 1
456
457
    @needs_read_lock
458
    def except_with_read(self):
459
        raise RuntimeError
460
461
    @needs_write_lock
462
    def do_with_write(self):
463
        return 2
464
465
    @needs_write_lock
466
    def except_with_write(self):
467
        raise RuntimeError
468
469
470
class TestDecorators(TestCase):
471
472
    def test_needs_read_lock(self):
473
        branch = TestDecorator()
474
        self.assertEqual(1, branch.do_with_read())
475
        self.assertEqual(['lr', 'ul'], branch._calls)
476
477
    def test_excepts_in_read_lock(self):
478
        branch = TestDecorator()
479
        self.assertRaises(RuntimeError, branch.except_with_read)
480
        self.assertEqual(['lr', 'ul'], branch._calls)
481
482
    def test_needs_write_lock(self):
483
        branch = TestDecorator()
484
        self.assertEqual(2, branch.do_with_write())
485
        self.assertEqual(['lw', 'ul'], branch._calls)
486
487
    def test_excepts_in_write_lock(self):
488
        branch = TestDecorator()
489
        self.assertRaises(RuntimeError, branch.except_with_write)
490
        self.assertEqual(['lw', 'ul'], branch._calls)
491
492
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
493
class TestBranchTransaction(TestCaseWithBranch):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
494
495
    def setUp(self):
496
        super(TestBranchTransaction, self).setUp()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
497
        self.branch = None
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
498
        
499
    def test_default_get_transaction(self):
500
        """branch.get_transaction on a new branch should give a PassThrough."""
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
501
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
502
                                   transactions.PassThroughTransaction))
503
504
    def test__set_new_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
505
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
506
507
    def test__set_over_existing_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
508
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
509
        self.assertRaises(errors.LockError,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
510
                          self.get_branch()._set_transaction,
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
511
                          transactions.ReadOnlyTransaction())
512
513
    def test_finish_no_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
514
        self.assertRaises(errors.LockError, self.get_branch()._finish_transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
515
516
    def test_finish_readonly_transaction_works(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
517
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
518
        self.get_branch()._finish_transaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
519
        self.assertEqual(None, self.get_branch().control_files._transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
520
521
    def test_unlock_calls_finish(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
522
        self.get_branch().lock_read()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
523
        transaction = InstrumentedTransaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
524
        self.get_branch().control_files._transaction = transaction
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
525
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
526
        self.assertEqual(['finish'], transaction.calls)
527
528
    def test_lock_read_acquires_ro_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
529
        self.get_branch().lock_read()
530
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
531
                                   transactions.ReadOnlyTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
532
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
533
        
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
534
    def test_lock_write_acquires_write_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
535
        self.get_branch().lock_write()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
536
        # cannot use get_transaction as its magic
1534.4.28 by Robert Collins
first cut at merge from integration.
537
        self.failUnless(isinstance(self.get_branch().control_files._transaction,
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
538
                                   transactions.WriteTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
539
        self.get_branch().unlock()
540
541
542
class TestBranchPushLocations(TestCaseWithBranch):
543
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
544
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
545
        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.
546
547
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
548
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
549
                                   ensure_config_dir_exists)
550
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
551
        fn = locations_config_filename()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
552
        print >> open(fn, 'wt'), ("[%s]\n"
553
                                  "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.
554
                                  self.get_branch().base[:-1])
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
555
        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.
556
557
    def test_set_push_location(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
558
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
559
                                   ensure_config_dir_exists)
560
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
561
        fn = locations_config_filename()
1878.1.3 by John Arbash Meinel
some test cleanups
562
        branch = self.get_branch()
563
        branch.set_push_location('foo')
564
        local_path = urlutils.local_path_from_url(branch.base[:-1])
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
565
        self.assertFileEqual("[%s]\n"
1878.1.3 by John Arbash Meinel
some test cleanups
566
                             "push_location = foo" % local_path,
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
567
                             fn)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
568
569
    # TODO RBC 20051029 test getting a push location from a branch in a 
570
    # recursive section - that is, it appends the branch name.
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
571
572
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
573
class TestFormat(TestCaseWithBranch):
574
    """Tests for the format itself."""
575
576
    def test_format_initialize_find_open(self):
577
        # 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.
578
        if not self.branch_format.is_supported():
579
            # unsupported formats are not loopback testable
580
            # because the default open will not open them and
581
            # they may not be initializable.
582
            return
583
        # 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.
584
        t = get_transport(self.get_url())
585
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
586
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
587
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
588
589
        # find it via bzrdir opening:
590
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
591
        direct_opened_branch = opened_control.open_branch()
592
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
593
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
594
        self.failUnless(isinstance(direct_opened_branch._format,
595
                        self.branch_format.__class__))
596
597
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
598
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
599
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
600
        self.assertEqual(made_branch._format.__class__,
601
                         opened_branch._format.__class__)
602
        # if it has a unique id string, can we probe for it ?
603
        try:
604
            self.branch_format.get_format_string()
605
        except NotImplementedError:
606
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
607
        self.assertEqual(self.branch_format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
608
                         branch.BranchFormat.find_format(opened_control))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
609
610