← 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

  • Committer: Aaron Bentley
  • Date: 2008-03-11 14:29:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3264.
  • Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference

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='dirstate-with-subtree')
 
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(
 
55
            ('Cannot join .*subtree.  Parent directory is not versioned',),
 
56
             'join tree/subtree2/subtree')
 
57
        # disabled because this gives an ugly error at present -- mbp 20070306
 
58
        ## self.run_bzr_error(
 
59
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
 
60
        ##      'join', '--reference', 'tree/subtree2/subtree')
 
61
        self.run_bzr_error(('Not a branch:.*subtree2',),
 
62
                           'join tree/subtree2')
 
63
 
 
64
    def test_join_reference(self):
 
65
        """Join can add a reference if --reference is supplied"""
 
66
        base_tree, sub_tree = self.make_trees()
 
67
        self.run_bzr('join . --reference', working_dir='tree/subtree')
 
68
        sub_tree.lock_read()
 
69
        self.addCleanup(sub_tree.unlock)
 
70
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
 
71
        self.assertTrue('file1-id' in sub_tree)
 
72
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
 
73
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
74
        self.assertIs(None, base_tree.path2id('subtree/file1'))
 
75
        base_tree.lock_read()
 
76
        self.addCleanup(base_tree.unlock)
 
77
        self.assertTrue('file1-id' not in base_tree)
 
78
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
 
79
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
 
80
 
 
81
    def test_references_check_repository_support(self):
 
82
        """Users are stopped from adding a reference that can't be committed."""
 
83
        # in 0.15 the default format has a dirstate workingtree, that can
 
84
        # support tree references, but the default repository format 
 
85
        # cannot.
 
86
        tree = self.make_branch_and_tree('tree', format='dirstate')
 
87
        tree2 = self.make_branch_and_tree('tree/subtree')
 
88
        out, err = self.run_bzr('join --reference tree/subtree',
 
89
                                retcode=3)
 
90
        self.assertContainsRe(err, r"Can't join trees")
 
91
        self.assertContainsRe(err, r"use bzr upgrade")
 
92
 
 
93