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
|
# Copyright (C) 2006 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
import os
from bzrlib import bzrdir, repository, tests, workingtree
class TestJoin(tests.TestCaseWithTransport):
def make_trees(self):
base_tree = self.make_branch_and_tree('tree',
format='experimental-reference-dirstate')
base_tree.commit('empty commit')
self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
sub_tree = self.make_branch_and_tree('tree/subtree')
sub_tree.set_root_id('subtree-root-id')
sub_tree.add('file1', 'file1-id')
sub_tree.commit('added file1')
return base_tree, sub_tree
def check_success(self, path):
base_tree = workingtree.WorkingTree.open(path)
self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
def test_join(self):
base_tree, sub_tree = self.make_trees()
self.run_bzr('join', 'tree/subtree')
self.check_success('tree')
def test_join_dot(self):
base_tree, sub_tree = self.make_trees()
self.run_bzr('join', '.', working_dir='tree/subtree')
self.check_success('tree')
def test_join_error(self):
base_tree, sub_tree = self.make_trees()
os.mkdir('tree/subtree2')
os.rename('tree/subtree', 'tree/subtree2/subtree')
self.run_bzr_error(('Cannot join .*subtree. Parent directory is not'
' versioned',), 'join', 'tree/subtree2/subtree')
self.run_bzr_error(('Not a branch:.*subtree2',), 'join',
'tree/subtree2')
def test_join_reference(self):
"""Join can add a reference if --reference is supplied"""
base_tree, sub_tree = self.make_trees()
self.run_bzr('join', '.', '--reference', working_dir='tree/subtree')
# Restore trees, because run_bzr is out-of-band
base_tree = workingtree.WorkingTree.open('tree')
sub_tree = workingtree.WorkingTree.open('tree/subtree')
self.assertEqual('file1-id', sub_tree.path2id('file1'))
self.assertTrue('file1-id' in sub_tree)
self.assertEqual('subtree-root-id', sub_tree.path2id(''))
self.assertEqual('', sub_tree.id2path('subtree-root-id'))
self.assertIs(None, base_tree.path2id('subtree/file1'))
self.assertTrue('file1-id' not in base_tree)
self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
|