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