/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2524.1.1 by Aaron Bentley
Revert broken changes
1
# Copyright (C) 2007 Canonical Ltd
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2524.1.1 by Aaron Bentley
Revert broken changes
16
17
"""Tests for Branch.sprout()"""
18
3763.9.4 by Daniel Clemente
New test for utf-8 symlinks in BzrDir.sprout
19
import os
2524.1.1 by Aaron Bentley
Revert broken changes
20
from bzrlib import (
3834.5.1 by Andrew Bennetts
Improve test_sprout.
21
    branch as _mod_branch,
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
22
    errors,
2524.1.1 by Aaron Bentley
Revert broken changes
23
    remote,
2487.2.4 by Aaron Bentley
Add test to ensure we can branch from repository revisions
24
    revision as _mod_revision,
2524.1.1 by Aaron Bentley
Revert broken changes
25
    tests,
26
    )
27
from bzrlib.tests.branch_implementations import TestCaseWithBranch
28
29
30
class TestSprout(TestCaseWithBranch):
31
32
    def test_sprout_branch_nickname(self):
33
        # test the nick name is reset always
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
34
        raise tests.TestSkipped('XXX branch sprouting is not yet tested.')
2524.1.1 by Aaron Bentley
Revert broken changes
35
36
    def test_sprout_branch_parent(self):
37
        source = self.make_branch('source')
38
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
39
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
40
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
41
    def test_sprout_uses_bzrdir_branch_format(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
42
        # branch.sprout(bzrdir) is defined as using the branch format selected
43
        # by bzrdir; format preservation is achieved by parameterising the
44
        # bzrdir during bzrdir.sprout, which is where stacking compatibility
45
        # checks are done. So this test tests that each implementation of
46
        # Branch.sprout delegates appropriately to the bzrdir which the
47
        # branch is being created in, rather than testing that the result is
48
        # in the format that we are testing (which is what would happen if
49
        # the branch did not delegate appropriately).
3834.5.1 by Andrew Bennetts
Improve test_sprout.
50
        if isinstance(self.branch_format, _mod_branch.BranchReferenceFormat):
51
            raise tests.TestNotApplicable('cannot sprout to a reference')
52
        # Start with a format that is unlikely to be the target format
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
53
        # We call the super class to allow overriding the format of creation)
3834.5.1 by Andrew Bennetts
Improve test_sprout.
54
        source = tests.TestCaseWithTransport.make_branch(self, 'old-branch',
55
                                                         format='metaweave')
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
56
        target_bzrdir = self.make_bzrdir('target')
57
        target_bzrdir.create_repository()
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
58
        result_format = self.branch_format
59
        if isinstance(target_bzrdir, remote.RemoteBzrDir):
60
            # for a remote bzrdir, we need to parameterise it with a branch
61
            # format, as, after creation, the newly opened remote objects
62
            # do not have one unless a branch was created at the time.
63
            # We use branch format 6 because its not the default, and its not
64
            # metaweave either.
65
            target_bzrdir._format.set_branch_format(_mod_branch.BzrBranchFormat6())
66
            result_format = target_bzrdir._format.get_branch_format()
3834.5.1 by Andrew Bennetts
Improve test_sprout.
67
        target = source.sprout(target_bzrdir)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
68
        if isinstance(target, remote.RemoteBranch):
69
            # we have to look at the real branch to see whether RemoteBranch
70
            # did the right thing.
71
            target._ensure_real()
72
            target = target._real_branch
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
73
        if isinstance(result_format, remote.RemoteBranchFormat):
74
            # Unwrap a parameterised RemoteBranchFormat for comparison.
75
            result_format = result_format._custom_format
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
76
        self.assertIs(result_format.__class__, target._format.__class__)
2524.1.1 by Aaron Bentley
Revert broken changes
77
78
    def test_sprout_partial(self):
79
        # test sprouting with a prefix of the revision-history.
80
        # also needs not-on-revision-history behaviour defined.
81
        wt_a = self.make_branch_and_tree('a')
82
        self.build_tree(['a/one'])
83
        wt_a.add(['one'])
84
        wt_a.commit('commit one', rev_id='1')
85
        self.build_tree(['a/two'])
86
        wt_a.add(['two'])
87
        wt_a.commit('commit two', rev_id='2')
88
        repo_b = self.make_repository('b')
89
        repo_a = wt_a.branch.repository
90
        repo_a.copy_content_into(repo_b)
91
        br_b = wt_a.branch.sprout(repo_b.bzrdir, revision_id='1')
92
        self.assertEqual('1', br_b.last_revision())
93
94
    def test_sprout_partial_not_in_revision_history(self):
95
        """We should be able to sprout from any revision in ancestry."""
96
        wt = self.make_branch_and_tree('source')
97
        self.build_tree(['source/a'])
98
        wt.add('a')
99
        wt.commit('rev1', rev_id='rev1')
100
        wt.commit('rev2-alt', rev_id='rev2-alt')
101
        wt.set_parent_ids(['rev1'])
102
        wt.branch.set_last_revision_info(1, 'rev1')
103
        wt.commit('rev2', rev_id='rev2')
104
        wt.set_parent_ids(['rev2', 'rev2-alt'])
105
        wt.commit('rev3', rev_id='rev3')
106
107
        repo = self.make_repository('target')
108
        repo.fetch(wt.branch.repository)
109
        branch2 = wt.branch.sprout(repo.bzrdir, revision_id='rev2-alt')
110
        self.assertEqual((2, 'rev2-alt'), branch2.last_revision_info())
111
        self.assertEqual(['rev1', 'rev2-alt'], branch2.revision_history())
2487.2.4 by Aaron Bentley
Add test to ensure we can branch from repository revisions
112
113
    def test_sprout_from_any_repo_revision(self):
114
        """We should be able to sprout from any revision."""
115
        wt = self.make_branch_and_tree('source')
116
        self.build_tree(['source/a'])
117
        wt.add('a')
118
        wt.commit('rev1a', rev_id='rev1a')
119
        # simulated uncommit
120
        wt.branch.set_last_revision_info(0, _mod_revision.NULL_REVISION)
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
121
        wt.set_last_revision(_mod_revision.NULL_REVISION)
2796.1.4 by Aaron Bentley
Fix up various test cases
122
        wt.revert()
2487.2.4 by Aaron Bentley
Add test to ensure we can branch from repository revisions
123
        wt.commit('rev1b', rev_id='rev1b')
124
        wt2 = wt.bzrdir.sprout('target',
125
            revision_id='rev1a').open_workingtree()
126
        self.assertEqual('rev1a', wt2.last_revision())
127
        self.failUnlessExists('target/a')
3763.9.4 by Daniel Clemente
New test for utf-8 symlinks in BzrDir.sprout
128
3763.9.7 by Daniel Clemente
Tested Unicode target rather than always trying to create it in UTF-8. Test renamed
129
    def test_sprout_with_unicode_symlink(self):
3763.9.8 by Daniel Clemente
Broken lines, and prepended # before bug numbers
130
        # this tests bug #272444
3763.9.11 by Daniel Clemente
More detailed comment and in broken line
131
        # Since the trigger function seems to be set_parent_trees, there exists
132
        # also a similar test, with name test_unicode_symlink, in class
133
        # TestSetParents at file workingtree_implementations/test_parents.py
4095.3.4 by Vincent Ladeuil
Some trivial cleanups, related to fix for bug #272444.
134
        self.requireFeature(tests.SymlinkFeature)
135
        self.requireFeature(tests.UnicodeFilenameFeature)
3763.9.4 by Daniel Clemente
New test for utf-8 symlinks in BzrDir.sprout
136
137
        tree = self.make_branch_and_tree('tree1')
138
3763.9.9 by Daniel Clemente
Used a greek omega instead of an accented 'o' to avoid combining characters
139
        # The link points to a file whose name is an omega
140
        # U+03A9 GREEK CAPITAL LETTER OMEGA
141
        # UTF-8: ce a9  UTF-16BE: 03a9  Decimal: Ω
142
        os.symlink(u'\u03a9','tree1/link_name')
3763.9.4 by Daniel Clemente
New test for utf-8 symlinks in BzrDir.sprout
143
        tree.add(['link_name'],['link-id'])
144
4095.3.1 by Vincent Ladeuil
Fix #339055 and #277444 by handling non ascii symlink targets.
145
        revision = tree.commit('added a link to a Unicode target')
146
        tree.bzrdir.sprout('target')
3763.9.4 by Daniel Clemente
New test for utf-8 symlinks in BzrDir.sprout
147
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
148
    def assertBranchHookBranchIsStacked(self, pre_change_params):
149
        # Just calling will either succeed or fail.
150
        pre_change_params.branch.get_stacked_on_url()
151
        self.hook_calls.append(pre_change_params)
152
153
    def test_sprout_stacked_hooks_get_stacked_branch(self):
154
        tree = self.make_branch_and_tree('source')
155
        tree.commit('a commit')
156
        revid = tree.commit('a second commit')
157
        source = tree.branch
158
        target_transport = self.get_transport('target')
159
        self.hook_calls = []
160
        _mod_branch.Branch.hooks.install_named_hook("pre_change_branch_tip",
161
            self.assertBranchHookBranchIsStacked, None)
162
        try:
163
            dir = source.bzrdir.sprout(target_transport.base,
164
                source.last_revision(), possible_transports=[target_transport],
165
                source_branch=source, stacked=True)
166
        except errors.UnstackableBranchFormat:
167
            if isinstance(self.branch_format, _mod_branch.BzrBranchFormat4):
4095.3.4 by Vincent Ladeuil
Some trivial cleanups, related to fix for bug #272444.
168
                raise tests.KnownFailure(
169
                    "Format 4 doesn't auto stack successfully.")
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
170
            else:
171
                raise
172
        result = dir.open_branch()
173
        self.assertEqual(revid, result.last_revision())
174
        self.assertEqual(source.base, result.get_stacked_on_url())
175
        # Smart servers invoke hooks on both sides
176
        if isinstance(result, remote.RemoteBranch):
177
            expected_calls = 2
178
        else:
179
            expected_calls = 1
180
        self.assertEqual(expected_calls, len(self.hook_calls))
181