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