~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2006, 2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

import os

from bzrlib import (

    bzrdir,

    osutils,

    repository,

    tests,

    workingtree,

    )

class TestJoin(tests.TestCaseWithTransport):

    def make_trees(self):

        base_tree = self.make_branch_and_tree('tree',

            format='dirstate-with-subtree')

        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')

        osutils.rename('tree/subtree', 'tree/subtree2/subtree')

        self.run_bzr_error(

            ('Cannot join .*subtree.  Parent directory is not versioned',),

             'join tree/subtree2/subtree')

        # disabled because this gives an ugly error at present -- mbp 20070306

        ## self.run_bzr_error(

        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),

        ##      'join', '--reference', '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')

        sub_tree.lock_read()

        self.addCleanup(sub_tree.unlock)

        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'))

        base_tree.lock_read()

        self.addCleanup(base_tree.unlock)

        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'))

    def test_references_check_repository_support(self):

        """Users are stopped from adding a reference that can't be committed."""

        # in 0.15 the default format has a dirstate workingtree, that can

        # support tree references, but the default repository format

        # cannot.

        tree = self.make_branch_and_tree('tree', format='dirstate')

        tree2 = self.make_branch_and_tree('tree/subtree')

        out, err = self.run_bzr('join --reference tree/subtree',

                                retcode=3)

        self.assertContainsRe(err, r"Can't join trees")

        self.assertContainsRe(err, r"use bzr upgrade")