← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

merge dirstate and trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
 
1
# Copyright (C) 2006 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib import bzrdir, repository, tests, workingtree
 
21
 
 
22
 
 
23
class TestJoin(tests.TestCaseWithTransport):
 
24
 
 
25
    def make_trees(self):
 
26
        base_tree = self.make_branch_and_tree('tree',
 
27
                                              format='experimental-reference-dirstate')
 
28
        base_tree.commit('empty commit')
 
29
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
 
30
        sub_tree = self.make_branch_and_tree('tree/subtree')
 
31
        sub_tree.set_root_id('subtree-root-id')
 
32
        sub_tree.add('file1', 'file1-id')
 
33
        sub_tree.commit('added file1')
 
34
        return base_tree, sub_tree
 
35
 
 
36
    def check_success(self, path):
 
37
        base_tree = workingtree.WorkingTree.open(path)
 
38
        self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
 
39
 
 
40
    def test_join(self):
 
41
        base_tree, sub_tree = self.make_trees()
 
42
        self.run_bzr('join', 'tree/subtree')
 
43
        self.check_success('tree')
 
44
 
 
45
    def test_join_dot(self):
 
46
        base_tree, sub_tree = self.make_trees()
 
47
        self.run_bzr('join', '.', working_dir='tree/subtree')
 
48
        self.check_success('tree')
 
49
 
 
50
    def test_join_error(self):
 
51
        base_tree, sub_tree = self.make_trees()
 
52
        os.mkdir('tree/subtree2')
 
53
        os.rename('tree/subtree', 'tree/subtree2/subtree')
 
54
        self.run_bzr_error(('Cannot join .*subtree.  Parent directory is not'
 
55
                            ' versioned',), 'join', 'tree/subtree2/subtree')
 
56
        self.run_bzr_error(('Not a branch:.*subtree2',), 'join', 
 
57
                            'tree/subtree2')
 
58
 
 
59
    def test_join_reference(self):
 
60
        """Join can add a reference if --reference is supplied"""
 
61
        base_tree, sub_tree = self.make_trees()
 
62
        self.run_bzr('join', '.', '--reference', working_dir='tree/subtree')
 
63
        # Restore trees, because run_bzr is out-of-band
 
64
        base_tree = workingtree.WorkingTree.open('tree')
 
65
        sub_tree = workingtree.WorkingTree.open('tree/subtree')
 
66
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
 
67
        self.assertTrue('file1-id' in sub_tree)
 
68
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
 
69
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
70
        self.assertIs(None, base_tree.path2id('subtree/file1'))
 
71
        self.assertTrue('file1-id' not in base_tree)
 
72
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
 
73
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))