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