/brz/remove-bazaar

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