1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
# Copyright (C) 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for Branch.get_stacked_on and set_stacked_on."""
from bzrlib import errors
from bzrlib.tests import TestNotApplicable
from bzrlib.tests.branch_implementations import TestCaseWithBranch
class TestStacking(TestCaseWithBranch):
def test_get_set_stacked_on(self):
# branches must either:
# raise UnstackableBranchFormat or
# raise UnstackableRepositoryFormat or
# permit stacking to be done and then return the stacked location.
branch = self.make_branch('branch')
target = self.make_branch('target')
old_format_errors = (
errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat,
)
try:
branch.set_stacked_on(target.base)
except old_format_errors:
# if the set failed, so must the get
self.assertRaises(old_format_errors, branch.get_stacked_on)
return
# now we have a stacked branch:
self.assertEqual(target.base, branch.get_stacked_on())
branch.set_stacked_on(None)
self.assertRaises(errors.NotStacked, branch.get_stacked_on)
def test_set_stacked_on_fetches(self):
# We have a mainline
trunk_tree = self.make_branch_and_tree('mainline')
trunk_revid = trunk_tree.commit('mainline')
# and make branch from it which is stacked
try:
new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
# not a testable combination.
return
new_tree = new_dir.open_workingtree()
new_tree.commit('something local')
def test_clone_from_stacked_branch(self):
# We can clone from the bzrdir of a stacked branch. If
# preserve_stacking is True, the cloned branch is stacked on the
# same branch as the original.
tree = self.make_branch_and_tree('stacked-on')
tree.commit('Added foo')
try:
stacked_bzrdir = tree.branch.bzrdir.sprout(
'stacked', tree.branch.last_revision(), stacked=True)
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
# not a testable combination.
return
cloned_bzrdir = stacked_bzrdir.clone('cloned', preserve_stacking=True)
try:
self.assertEqual(
stacked_bzrdir.open_branch().get_stacked_on(),
cloned_bzrdir.open_branch().get_stacked_on())
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
pass
cloned_unstacked_bzrdir = stacked_bzrdir.clone('cloned-unstacked',
preserve_stacking=False)
unstacked_branch = cloned_unstacked_bzrdir.open_branch()
self.assertRaises(errors.NotStacked, unstacked_branch.get_stacked_on)
|