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