← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_sprout.py

  • Committer: Martin Pool
  • Date: 2010-07-02 07:29:40 UTC
  • mfrom: (129.1.7 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100702072940-hpzq5elg8wjve8rh
http://bugs.debian.org/452024
http://bugs.debian.org/464688
http://bugs.debian.org/523595
http://bugs.debian.org/526233
http://bugs.debian.org/537708
http://bugs.debian.org/555336
http://bugs.debian.org/555343
https://launchpad.net/bugs/249452
https://launchpad.net/bugs/385074
* PPA rebuild.
* PPA rebuild for Karmic.
* PPA rebuild for Jaunty.
* PPA rebuild for Hardy.
* From postinst, actually remove the example bash completion scripts.
  (LP: #249452)
* New upstream release.
* New upstream release.
* New upstream release.
* Revert change to Build-depends: Dapper does not have python-central.
  Should be python-support..
* Target ppa..
* Target ppa..
* Target ppa..
* Target ppa..
* New upstream release.
* Switch to dpkg-source 3.0 (quilt) format.
* Bump standards version to 3.8.4.
* Remove embedded copy of python-configobj. Closes: #555336
* Remove embedded copy of python-elementtree. Closes: #555343
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* debian/control: Fix obsolete-relation-form-in-source
  lintian warning. 
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split out docs into bzr-doc package.
* New upstream release.
* Added John Francesco Ferlito to Uploaders.
* Fix install path to quick-reference guide
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again, again.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to path changes.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Bump standards version to 3.8.3.
* Remove unused patch system.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix copy and paste tab error in .install file
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
 + Fixes compatibility with Python 2.4. Closes: #537708
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream version.
* Bump standards version to 3.8.2.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add python-pyrex to build-deps to ensure C extensions are always build.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix API compatibility version. (Closes: #526233)
* New upstream release.
  + Fixes default format for upgrade command. (Closes: #464688)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add missing dependency on zlib development library. (Closes:
  #523595)
* Add zlib build-depends.
* Add zlib build-depends.
* Add zlib build-depends.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Move to section vcs.
* Bump standards version to 3.8.1.
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Recommend ca-certificates. (Closes: #452024)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Update watch file. bazaar now uses launchpad to host its sources.
* Remove patch for inventory root revision copy, applied upstream.
* New upstream release.
* New upstream release.
* New upstream release
* Force removal of files installed in error to /etc/bash_completion.d/
  (LP: #249452)
* New upstream release.
* New upstream release
* New upstream release.
* Bump standards version.
* Include patch for inventory root revision copy, required for bzr-svn.
* New upstream release.
* Remove unused lintian overrides.
* Correct the package version not to be native.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Final 1.5 release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add myself as a co-maintainer.
* Add a Dm-Upload-Allowed: yes header.
* New upstream bugfix release.
* New upstream release.
* Final 1.3 release.
* New upstream release.
* First release candidate of the upcoming 1.3 release.
* Rebuild to fix the problem caused by a build with a broken python-central.
* New upstream release.
* Rebuild for dapper PPA.
* Apply Lamont's patches to fix build-dependencies on dapper.
  (See: https://bugs.launchpad.net/bzr/+bug/189915)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_sprout.py
 
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
"""Tests for Branch.sprout()"""
 
18
 
 
19
import os
 
20
from bzrlib import (
 
21
    branch as _mod_branch,
 
22
    errors,
 
23
    osutils,
 
24
    remote,
 
25
    revision as _mod_revision,
 
26
    tests,
 
27
    )
 
28
from bzrlib.tests.per_branch import TestCaseWithBranch
 
29
 
 
30
 
 
31
class TestSprout(TestCaseWithBranch):
 
32
 
 
33
    def test_sprout_branch_nickname(self):
 
34
        # test the nick name is reset always
 
35
        raise tests.TestSkipped('XXX branch sprouting is not yet tested.')
 
36
 
 
37
    def test_sprout_branch_parent(self):
 
38
        source = self.make_branch('source')
 
39
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
 
40
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
 
41
 
 
42
    def test_sprout_uses_bzrdir_branch_format(self):
 
43
        # branch.sprout(bzrdir) is defined as using the branch format selected
 
44
        # by bzrdir; format preservation is achieved by parameterising the
 
45
        # bzrdir during bzrdir.sprout, which is where stacking compatibility
 
46
        # checks are done. So this test tests that each implementation of
 
47
        # Branch.sprout delegates appropriately to the bzrdir which the
 
48
        # branch is being created in, rather than testing that the result is
 
49
        # in the format that we are testing (which is what would happen if
 
50
        # the branch did not delegate appropriately).
 
51
        if isinstance(self.branch_format, _mod_branch.BranchReferenceFormat):
 
52
            raise tests.TestNotApplicable('cannot sprout to a reference')
 
53
        # Start with a format that is unlikely to be the target format
 
54
        # We call the super class to allow overriding the format of creation)
 
55
        source = tests.TestCaseWithTransport.make_branch(self, 'old-branch',
 
56
                                                         format='metaweave')
 
57
        target_bzrdir = self.make_bzrdir('target')
 
58
        target_bzrdir.create_repository()
 
59
        result_format = self.branch_format
 
60
        if isinstance(target_bzrdir, remote.RemoteBzrDir):
 
61
            # for a remote bzrdir, we need to parameterise it with a branch
 
62
            # format, as, after creation, the newly opened remote objects
 
63
            # do not have one unless a branch was created at the time.
 
64
            # We use branch format 6 because its not the default, and its not
 
65
            # metaweave either.
 
66
            target_bzrdir._format.set_branch_format(_mod_branch.BzrBranchFormat6())
 
67
            result_format = target_bzrdir._format.get_branch_format()
 
68
        target = source.sprout(target_bzrdir)
 
69
        if isinstance(target, remote.RemoteBranch):
 
70
            # we have to look at the real branch to see whether RemoteBranch
 
71
            # did the right thing.
 
72
            target._ensure_real()
 
73
            target = target._real_branch
 
74
        if isinstance(result_format, remote.RemoteBranchFormat):
 
75
            # Unwrap a parameterised RemoteBranchFormat for comparison.
 
76
            result_format = result_format._custom_format
 
77
        self.assertIs(result_format.__class__, target._format.__class__)
 
78
 
 
79
    def test_sprout_partial(self):
 
80
        # test sprouting with a prefix of the revision-history.
 
81
        # also needs not-on-revision-history behaviour defined.
 
82
        wt_a = self.make_branch_and_tree('a')
 
83
        self.build_tree(['a/one'])
 
84
        wt_a.add(['one'])
 
85
        wt_a.commit('commit one', rev_id='1')
 
86
        self.build_tree(['a/two'])
 
87
        wt_a.add(['two'])
 
88
        wt_a.commit('commit two', rev_id='2')
 
89
        repo_b = self.make_repository('b')
 
90
        repo_a = wt_a.branch.repository
 
91
        repo_a.copy_content_into(repo_b)
 
92
        br_b = wt_a.branch.sprout(repo_b.bzrdir, revision_id='1')
 
93
        self.assertEqual('1', br_b.last_revision())
 
94
 
 
95
    def test_sprout_partial_not_in_revision_history(self):
 
96
        """We should be able to sprout from any revision in ancestry."""
 
97
        wt = self.make_branch_and_tree('source')
 
98
        self.build_tree(['source/a'])
 
99
        wt.add('a')
 
100
        wt.commit('rev1', rev_id='rev1')
 
101
        wt.commit('rev2-alt', rev_id='rev2-alt')
 
102
        wt.set_parent_ids(['rev1'])
 
103
        wt.branch.set_last_revision_info(1, 'rev1')
 
104
        wt.commit('rev2', rev_id='rev2')
 
105
        wt.set_parent_ids(['rev2', 'rev2-alt'])
 
106
        wt.commit('rev3', rev_id='rev3')
 
107
 
 
108
        repo = self.make_repository('target')
 
109
        repo.fetch(wt.branch.repository)
 
110
        branch2 = wt.branch.sprout(repo.bzrdir, revision_id='rev2-alt')
 
111
        self.assertEqual((2, 'rev2-alt'), branch2.last_revision_info())
 
112
        self.assertEqual(['rev1', 'rev2-alt'], branch2.revision_history())
 
113
 
 
114
    def test_sprout_from_any_repo_revision(self):
 
115
        """We should be able to sprout from any revision."""
 
116
        wt = self.make_branch_and_tree('source')
 
117
        self.build_tree(['source/a'])
 
118
        wt.add('a')
 
119
        wt.commit('rev1a', rev_id='rev1a')
 
120
        # simulated uncommit
 
121
        wt.branch.set_last_revision_info(0, _mod_revision.NULL_REVISION)
 
122
        wt.set_last_revision(_mod_revision.NULL_REVISION)
 
123
        wt.revert()
 
124
        wt.commit('rev1b', rev_id='rev1b')
 
125
        wt2 = wt.bzrdir.sprout('target',
 
126
            revision_id='rev1a').open_workingtree()
 
127
        self.assertEqual('rev1a', wt2.last_revision())
 
128
        self.failUnlessExists('target/a')
 
129
 
 
130
    def test_sprout_with_unicode_symlink(self):
 
131
        # this tests bug #272444
 
132
        # Since the trigger function seems to be set_parent_trees, there exists
 
133
        # also a similar test, with name test_unicode_symlink, in class
 
134
        # TestSetParents at file per_workingtree/test_parents.py
 
135
        self.requireFeature(tests.SymlinkFeature)
 
136
        self.requireFeature(tests.UnicodeFilenameFeature)
 
137
 
 
138
        tree = self.make_branch_and_tree('tree1')
 
139
 
 
140
        # The link points to a file whose name is an omega
 
141
        # U+03A9 GREEK CAPITAL LETTER OMEGA
 
142
        # UTF-8: ce a9  UTF-16BE: 03a9  Decimal: Ω
 
143
        target = u'\u03a9'
 
144
        link_name = u'\N{Euro Sign}link'
 
145
        os.symlink(target, 'tree1/' + link_name)
 
146
        tree.add([link_name],['link-id'])
 
147
 
 
148
        revision = tree.commit('added a link to a Unicode target')
 
149
        tree.bzrdir.sprout('dest')
 
150
        self.assertEqual(target, osutils.readlink('dest/' + link_name))
 
151
        tree.lock_read()
 
152
        self.addCleanup(tree.unlock)
 
153
        # Check that the symlink target is safely round-tripped in the trees.
 
154
        self.assertEqual(target, tree.get_symlink_target('link-id'))
 
155
        self.assertEqual(target,
 
156
                         tree.basis_tree().get_symlink_target('link-id'))
 
157
 
 
158
    def test_sprout_with_ghost_in_mainline(self):
 
159
        tree = self.make_branch_and_tree('tree1')
 
160
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
161
        tree.add('')
 
162
        tree.commit('msg1', rev_id='rev1')
 
163
        tree.commit('msg2', rev_id='rev2')
 
164
        tree.bzrdir.sprout('target', revision_id='rev1')
 
165
 
 
166
    def assertBranchHookBranchIsStacked(self, pre_change_params):
 
167
        # Just calling will either succeed or fail.
 
168
        pre_change_params.branch.get_stacked_on_url()
 
169
        self.hook_calls.append(pre_change_params)
 
170
 
 
171
    def test_sprout_stacked_hooks_get_stacked_branch(self):
 
172
        tree = self.make_branch_and_tree('source')
 
173
        tree.commit('a commit')
 
174
        revid = tree.commit('a second commit')
 
175
        source = tree.branch
 
176
        target_transport = self.get_transport('target')
 
177
        self.hook_calls = []
 
178
        _mod_branch.Branch.hooks.install_named_hook("pre_change_branch_tip",
 
179
            self.assertBranchHookBranchIsStacked, None)
 
180
        try:
 
181
            dir = source.bzrdir.sprout(target_transport.base,
 
182
                source.last_revision(), possible_transports=[target_transport],
 
183
                source_branch=source, stacked=True)
 
184
        except errors.UnstackableBranchFormat:
 
185
            if isinstance(self.branch_format, _mod_branch.BzrBranchFormat4):
 
186
                raise tests.KnownFailure(
 
187
                    "Format 4 doesn't auto stack successfully.")
 
188
            else:
 
189
                raise
 
190
        result = dir.open_branch()
 
191
        self.assertEqual(revid, result.last_revision())
 
192
        self.assertEqual(source.base, result.get_stacked_on_url())
 
193
        # Smart servers invoke hooks on both sides
 
194
        if isinstance(result, remote.RemoteBranch):
 
195
            expected_calls = 2
 
196
        else:
 
197
            expected_calls = 1
 
198
        self.assertEqual(expected_calls, len(self.hook_calls))
 
199