/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())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
191
        
1092.2.25 by Robert Collins
support ghosts in commits
192
    def test_record_initial_ghost_merge(self):
193
        """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.
194
        wt = self.make_branch_and_tree('.')
195
        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.
196
        wt.add_pending_merge('non:existent@rev--ision--0--2')
197
        wt.commit('pretend to merge nonexistent-revision', rev_id='first')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
198
        rev = branch.repository.get_revision(branch.last_revision())
1092.2.25 by Robert Collins
support ghosts in commits
199
        self.assertEqual(len(rev.parent_ids), 1)
200
        # parent_sha1s is not populated now, WTF. rbc 20051003
201
        self.assertEqual(len(rev.parent_sha1s), 0)
202
        self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
203
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
204
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
205
        self.assertRaises(errors.InvalidRevisionId,
206
                          self.get_branch().repository.get_revision,
207
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
208
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
209
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
210
# compare the gpg-to-sign info for a commit with a ghost and 
211
#     an identical tree without a ghost
212
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
213
        
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
214
    def test_pending_merges(self):
215
        """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.
216
        wt = self.make_branch_and_tree('.')
217
        b = wt.branch
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
218
        self.assertEquals(wt.pending_merges(), [])
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
219
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
220
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
221
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
222
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
223
        wt.add_pending_merge('wibble@fofof--20050401--1928390812')
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
224
        self.assertEquals(wt.pending_merges(),
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
225
                          ['foo@azkhazan-123123-abcabc',
226
                           '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.
227
        wt.commit("commit from base with two merges")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
228
        rev = b.repository.get_revision(b.revision_history()[0])
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
229
        self.assertEquals(len(rev.parent_ids), 2)
230
        self.assertEquals(rev.parent_ids[0],
231
                          'foo@azkhazan-123123-abcabc')
232
        self.assertEquals(rev.parent_ids[1],
233
                           'wibble@fofof--20050401--1928390812')
234
        # list should be cleared when we do a commit
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
235
        self.assertEquals(wt.pending_merges(), [])
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
236
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
237
    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.
238
        wt = self.make_branch_and_tree('.')
239
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
240
        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
241
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
242
        strategy = gpg.LoopbackGPGStrategy(None)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
243
        branch.repository.sign_revision('A', strategy)
244
        self.assertEqual(Testament.from_revision(branch.repository, 
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
245
                         'A').as_short_text(),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
246
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
247
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
248
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
249
        wt = self.make_branch_and_tree('.')
250
        branch = wt.branch
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
251
        branch.repository.store_revision_signature(
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
252
            gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
253
        self.assertRaises(errors.NoSuchRevision,
254
                          branch.repository.has_signature_for_revision_id,
255
                          'A')
256
        wt.commit("base", allow_pointless=True, rev_id='A')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
257
        self.assertEqual('FOO', 
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
258
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
259
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
260
    def test_branch_keeps_signatures(self):
261
        wt = self.make_branch_and_tree('source')
262
        wt.commit('A', allow_pointless=True, rev_id='A')
263
        wt.branch.repository.sign_revision('A',
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
264
            gpg.LoopbackGPGStrategy(None))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
265
        #FIXME: clone should work to urls,
266
        # wt.clone should work to disks.
267
        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.
268
        d2 = wt.bzrdir.clone('target')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
269
        self.assertEqual(wt.branch.repository.get_signature_text('A'),
270
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
271
1185.35.11 by Aaron Bentley
Added support for branch nicks
272
    def test_nicks(self):
273
        """Branch nicknames"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
274
        t = get_transport(self.get_url())
275
        t.mkdir('bzr.dev')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
276
        branch = self.make_branch('bzr.dev')
1185.35.11 by Aaron Bentley
Added support for branch nicks
277
        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.
278
        t.move('bzr.dev', 'bzr.ab')
279
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
280
        self.assertEqual(branch.nick, 'bzr.ab')
281
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
282
        branch.nick = "Aaron's branch"
1534.4.28 by Robert Collins
first cut at merge from integration.
283
        self.failUnless(
284
            t.has(
285
                t.relpath(
286
                    branch.control_files.controlfilename("branch.conf")
287
                    )
288
                )
289
            )
1185.35.11 by Aaron Bentley
Added support for branch nicks
290
        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.
291
        t.move('bzr.ab', 'integration')
292
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
293
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
294
        branch.nick = u"\u1234"
295
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
296
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
297
    def test_commit_nicks(self):
298
        """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.
299
        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.
300
        wt = self.make_branch_and_tree('bzr.dev')
301
        branch = wt.branch
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
302
        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.
303
        wt.commit('My commit respect da nick.')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
304
        committed = branch.repository.get_revision(branch.last_revision())
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
305
        self.assertEqual(committed.properties["branch-nick"], 
306
                         "My happy branch")
307
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
308
    def test_create_open_branch_uses_repository(self):
309
        try:
310
            repo = self.make_repository('.', shared=True)
311
        except errors.IncompatibleFormat:
312
            return
313
        repo.bzrdir.root_transport.mkdir('child')
314
        child_dir = self.bzrdir_format.initialize('child')
315
        try:
316
            child_branch = self.branch_format.initialize(child_dir)
317
        except errors.UninitializableFormat:
318
            # branch references are not default init'able.
319
            return
320
        self.assertEqual(repo.bzrdir.root_transport.base,
321
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
322
        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.
323
        self.assertEqual(repo.bzrdir.root_transport.base,
324
                         child_branch.repository.bzrdir.root_transport.base)
325
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
326
    def test_format_description(self):
327
        tree = self.make_branch_and_tree('tree')
328
        text = tree.branch._format.get_format_description()
329
        self.failUnless(len(text))
330
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
331
    def test_check_branch_report_results(self):
332
        """Checking a branch produces results which can be printed"""
333
        branch = self.make_branch('.')
334
        result = branch.check()
335
        # reports results through logging
336
        result.report_results(verbose=True)
337
        result.report_results(verbose=False)
338
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
339
    def test_get_commit_builder(self):
340
        self.assertIsInstance(self.make_branch(".").get_commit_builder([]), 
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
341
            repository.CommitBuilder)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
342
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
343
    def test_generate_revision_history(self):
344
        """Create a fake revision history easily."""
345
        tree = self.make_branch_and_tree('.')
346
        rev1 = tree.commit('foo')
347
        orig_history = tree.branch.revision_history()
348
        rev2 = tree.commit('bar', allow_pointless=True)
349
        tree.branch.generate_revision_history(rev1)
350
        self.assertEqual(orig_history, tree.branch.revision_history())
351
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
352
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
353
class ChrootedTests(TestCaseWithBranch):
354
    """A support class that provides readonly urls outside the local namespace.
355
356
    This is done by checking if self.transport_server is a MemoryServer. if it
357
    is then we are chrooted already, if it is not then an HttpServer is used
358
    for readonly urls.
359
    """
360
361
    def setUp(self):
362
        super(ChrootedTests, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
363
        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.
364
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
365
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
366
    def test_open_containing(self):
367
        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.
368
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
369
        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.
370
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
371
        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.
372
        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).
373
        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.
374
        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).
375
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
376
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
377
378
class InstrumentedTransaction(object):
379
380
    def finish(self):
381
        self.calls.append('finish')
382
383
    def __init__(self):
384
        self.calls = []
385
386
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
387
class TestDecorator(object):
388
389
    def __init__(self):
390
        self._calls = []
391
392
    def lock_read(self):
393
        self._calls.append('lr')
394
395
    def lock_write(self):
396
        self._calls.append('lw')
397
398
    def unlock(self):
399
        self._calls.append('ul')
400
401
    @needs_read_lock
402
    def do_with_read(self):
403
        return 1
404
405
    @needs_read_lock
406
    def except_with_read(self):
407
        raise RuntimeError
408
409
    @needs_write_lock
410
    def do_with_write(self):
411
        return 2
412
413
    @needs_write_lock
414
    def except_with_write(self):
415
        raise RuntimeError
416
417
418
class TestDecorators(TestCase):
419
420
    def test_needs_read_lock(self):
421
        branch = TestDecorator()
422
        self.assertEqual(1, branch.do_with_read())
423
        self.assertEqual(['lr', 'ul'], branch._calls)
424
425
    def test_excepts_in_read_lock(self):
426
        branch = TestDecorator()
427
        self.assertRaises(RuntimeError, branch.except_with_read)
428
        self.assertEqual(['lr', 'ul'], branch._calls)
429
430
    def test_needs_write_lock(self):
431
        branch = TestDecorator()
432
        self.assertEqual(2, branch.do_with_write())
433
        self.assertEqual(['lw', 'ul'], branch._calls)
434
435
    def test_excepts_in_write_lock(self):
436
        branch = TestDecorator()
437
        self.assertRaises(RuntimeError, branch.except_with_write)
438
        self.assertEqual(['lw', 'ul'], branch._calls)
439
440
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
441
class TestBranchTransaction(TestCaseWithBranch):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
442
443
    def setUp(self):
444
        super(TestBranchTransaction, self).setUp()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
445
        self.branch = None
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
446
        
447
    def test_default_get_transaction(self):
448
        """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.
449
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
450
                                   transactions.PassThroughTransaction))
451
452
    def test__set_new_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
453
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
454
455
    def test__set_over_existing_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
456
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
457
        self.assertRaises(errors.LockError,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
458
                          self.get_branch()._set_transaction,
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
459
                          transactions.ReadOnlyTransaction())
460
461
    def test_finish_no_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
462
        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
463
464
    def test_finish_readonly_transaction_works(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())
466
        self.get_branch()._finish_transaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
467
        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
468
469
    def test_unlock_calls_finish(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
470
        self.get_branch().lock_read()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
471
        transaction = InstrumentedTransaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
472
        self.get_branch().control_files._transaction = transaction
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
473
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
474
        self.assertEqual(['finish'], transaction.calls)
475
476
    def test_lock_read_acquires_ro_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
477
        self.get_branch().lock_read()
478
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
479
                                   transactions.ReadOnlyTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
480
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
481
        
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
482
    def test_lock_write_acquires_write_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
483
        self.get_branch().lock_write()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
484
        # cannot use get_transaction as its magic
1534.4.28 by Robert Collins
first cut at merge from integration.
485
        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.
486
                                   transactions.WriteTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
487
        self.get_branch().unlock()
488
489
490
class TestBranchPushLocations(TestCaseWithBranch):
491
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
492
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
493
        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.
494
495
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
496
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
497
                                   ensure_config_dir_exists)
498
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
499
        fn = locations_config_filename()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
500
        print >> open(fn, 'wt'), ("[%s]\n"
501
                                  "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.
502
                                  self.get_branch().base[:-1])
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
503
        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.
504
505
    def test_set_push_location(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
506
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
507
                                   ensure_config_dir_exists)
508
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
509
        fn = locations_config_filename()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
510
        self.get_branch().set_push_location('foo')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
511
        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.
512
                             "push_location = foo" % self.get_branch().base[:-1],
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
513
                             fn)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
514
515
    # TODO RBC 20051029 test getting a push location from a branch in a 
516
    # recursive section - that is, it appends the branch name.
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
517
518
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
519
class TestFormat(TestCaseWithBranch):
520
    """Tests for the format itself."""
521
522
    def test_format_initialize_find_open(self):
523
        # 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.
524
        if not self.branch_format.is_supported():
525
            # unsupported formats are not loopback testable
526
            # because the default open will not open them and
527
            # they may not be initializable.
528
            return
529
        # 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.
530
        t = get_transport(self.get_url())
531
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
532
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
533
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
534
535
        # find it via bzrdir opening:
536
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
537
        direct_opened_branch = opened_control.open_branch()
538
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
539
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
540
        self.failUnless(isinstance(direct_opened_branch._format,
541
                        self.branch_format.__class__))
542
543
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
544
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
545
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
546
        self.assertEqual(made_branch._format.__class__,
547
                         opened_branch._format.__class__)
548
        # if it has a unique id string, can we probe for it ?
549
        try:
550
            self.branch_format.get_format_string()
551
        except NotImplementedError:
552
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
553
        self.assertEqual(self.branch_format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
554
                         branch.BranchFormat.find_format(opened_control))