~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2006, 2007 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

#

# Author: Aaron Bentley <aaron.bentley@utoronto.ca>

"""Black-box tests for bzr merge.

"""

import os

from bzrlib.branch import Branch

from bzrlib.bzrdir import BzrDir

from bzrlib.conflicts import ConflictList, ContentsConflict

from bzrlib.osutils import abspath, file_kind

from bzrlib.tests.blackbox import ExternalBase

import bzrlib.urlutils as urlutils

from bzrlib.workingtree import WorkingTree

class TestMerge(ExternalBase):

    def example_branch(test):

        test.runbzr('init')

        file('hello', 'wt').write('foo')

        test.runbzr('add hello')

        test.runbzr('commit -m setup hello')

        file('goodbye', 'wt').write('baz')

        test.runbzr('add goodbye')

        test.runbzr('commit -m setup goodbye')

    def test_merge_reprocess(self):

        d = BzrDir.create_standalone_workingtree('.')

        d.commit('h')

        self.run_bzr('merge', '.', '--reprocess', '--merge-type', 'weave')

    def test_merge(self):

        from bzrlib.branch import Branch

        os.mkdir('a')

        os.chdir('a')

        self.example_branch()

        ancestor = Branch.open('.').revno()

        os.chdir('..')

        self.runbzr('branch a b')

        os.chdir('b')

        file('goodbye', 'wt').write('quux')

        self.runbzr(['commit',  '-m',  "more u's are always good"])

        os.chdir('../a')

        file('hello', 'wt').write('quuux')

        # We can't merge when there are in-tree changes

        self.runbzr('merge ../b', retcode=3)

        a = WorkingTree.open('.')

        a_tip = a.commit("Like an epidemic of u's")

        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',

                    retcode=3)

        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')

        self.runbzr('revert --no-backup')

        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')

        self.runbzr('revert --no-backup')

        self.runbzr('merge ../b -r last:1..last:1 --reprocess')

        self.runbzr('revert --no-backup')

        self.runbzr('merge ../b -r last:1')

        self.check_file_contents('goodbye', 'quux')

        # Merging a branch pulls its revision into the tree

        b = Branch.open('../b')

        b_tip = b.last_revision()

        self.failUnless(a.branch.repository.has_revision(b_tip))

        self.assertEqual([a_tip, b_tip], a.get_parent_ids())

        self.runbzr('revert --no-backup')

        out, err = self.runbzr('merge -r revno:1:./hello', retcode=3)

        self.assertTrue("Not a branch" in err)

        self.runbzr('merge -r revno:%d:./..revno:%d:../b'

                    %(ancestor,b.revno()))

        self.assertEquals(a.get_parent_ids(), 

                          [a.branch.last_revision(), b.last_revision()])

        self.check_file_contents('goodbye', 'quux')

        self.runbzr('revert --no-backup')

        self.runbzr('merge -r revno:%d:../b'%b.revno())

        self.assertEquals(a.get_parent_ids(),

                          [a.branch.last_revision(), b.last_revision()])

        a_tip = a.commit('merged')

        self.runbzr('merge ../b -r last:1')

        self.assertEqual([a_tip], a.get_parent_ids())

    def test_merge_with_missing_file(self):

        """Merge handles missing file conflicts"""

        os.mkdir('a')

        os.chdir('a')

        os.mkdir('sub')

        print >> file('sub/a.txt', 'wb'), "hello"

        print >> file('b.txt', 'wb'), "hello"

        print >> file('sub/c.txt', 'wb'), "hello"

        self.runbzr('init')

        self.runbzr('add')

        self.runbzr(('commit', '-m', 'added a'))

        self.runbzr('branch . ../b')

        print >> file('sub/a.txt', 'ab'), "there"

        print >> file('b.txt', 'ab'), "there"

        print >> file('sub/c.txt', 'ab'), "there"

        self.runbzr(('commit', '-m', 'Added there'))

        os.unlink('sub/a.txt')

        os.unlink('sub/c.txt')

        os.rmdir('sub')

        os.unlink('b.txt')

        self.runbzr(('commit', '-m', 'Removed a.txt'))

        os.chdir('../b')

        print >> file('sub/a.txt', 'ab'), "something"

        print >> file('b.txt', 'ab'), "something"

        print >> file('sub/c.txt', 'ab'), "something"

        self.runbzr(('commit', '-m', 'Modified a.txt'))

        self.runbzr('merge ../a/', retcode=1)

        self.assert_(os.path.exists('sub/a.txt.THIS'))

        self.assert_(os.path.exists('sub/a.txt.BASE'))

        os.chdir('../a')

        self.runbzr('merge ../b/', retcode=1)

        self.assert_(os.path.exists('sub/a.txt.OTHER'))

        self.assert_(os.path.exists('sub/a.txt.BASE'))

    def test_merge_remember(self):

        """Merge changes from one branch to another and test parent location."""

        tree_a = self.make_branch_and_tree('branch_a')

        branch_a = tree_a.branch

        self.build_tree(['branch_a/a'])

        tree_a.add('a')

        tree_a.commit('commit a')

        branch_b = branch_a.bzrdir.sprout('branch_b').open_branch()

        tree_b = branch_b.bzrdir.open_workingtree()

        branch_c = branch_a.bzrdir.sprout('branch_c').open_branch()

        tree_c = branch_c.bzrdir.open_workingtree()

        self.build_tree(['branch_a/b'])

        tree_a.add('b')

        tree_a.commit('commit b')

        self.build_tree(['branch_c/c'])

        tree_c.add('c')

        tree_c.commit('commit c')

        # reset parent

        parent = branch_b.get_parent()

        branch_b.set_parent(None)

        self.assertEqual(None, branch_b.get_parent())

        # test merge for failure without parent set

        os.chdir('branch_b')

        out = self.runbzr('merge', retcode=3)

        self.assertEquals(out,

                ('','bzr: ERROR: No location specified or remembered\n'))

        # test implicit --remember when no parent set, this merge conflicts

        self.build_tree(['d'])

        tree_b.add('d')

        out = self.runbzr('merge ../branch_a', retcode=3)

        self.assertEquals(out,

                ('','bzr: ERROR: Working tree has uncommitted changes.\n'))

        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))

        # test implicit --remember after resolving conflict

        tree_b.commit('commit d')

        out, err = self.runbzr('merge')

        base = urlutils.local_path_from_url(branch_a.base)

        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))

        self.assertEquals(err, '+N  b\nAll changes applied successfully.\n')

        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))

        # re-open tree as external runbzr modified it

        tree_b = branch_b.bzrdir.open_workingtree()

        tree_b.commit('merge branch_a')

        # test explicit --remember

        out, err = self.runbzr('merge ../branch_c --remember')

        self.assertEquals(out, '')

        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')

        self.assertEquals(abspath(branch_b.get_parent()),

                          abspath(branch_c.bzrdir.root_transport.base))

        # re-open tree as external runbzr modified it

        tree_b = branch_b.bzrdir.open_workingtree()

        tree_b.commit('merge branch_c')

    def test_merge_bundle(self):

        from bzrlib.testament import Testament

        tree_a = self.make_branch_and_tree('branch_a')

        f = file('branch_a/a', 'wb')

        f.write('hello')

        f.close()

        tree_a.add('a')

        tree_a.commit('message')

        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()

        f = file('branch_a/a', 'wb')

        f.write('hey there')

        f.close()

        tree_a.commit('message')

        f = file('branch_b/a', 'wb')

        f.write('goodbye')

        f.close()

        tree_b.commit('message')

        os.chdir('branch_b')

        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])

        os.chdir('../branch_a')

        self.runbzr('merge ../bundle', retcode=1)

        testament_a = Testament.from_revision(tree_a.branch.repository,

                                              tree_b.get_parent_ids()[0])

        testament_b = Testament.from_revision(tree_b.branch.repository,

                                              tree_b.get_parent_ids()[0])

        self.assertEqualDiff(testament_a.as_text(),

                         testament_b.as_text())

        tree_a.set_conflicts(ConflictList())

        tree_a.commit('message')

        # it is legal to attempt to merge an already-merged bundle

        output = self.runbzr('merge ../bundle')[1]

        # but it does nothing

        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())

        self.assertEqual('Nothing to do.\n', output)

    def test_merge_uncommitted(self):

        """Check that merge --uncommitted behaves properly"""

        tree_a = self.make_branch_and_tree('a')

        self.build_tree(['a/file_1', 'a/file_2'])

        tree_a.add(['file_1', 'file_2'])

        tree_a.commit('commit 1')

        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()

        self.failUnlessExists('b/file_1')

        tree_a.rename_one('file_1', 'file_i')

        tree_a.commit('commit 2')

        tree_a.rename_one('file_2', 'file_ii')

        ## os.chdir('b')

        self.run_bzr('merge', 'a', '--uncommitted', '-d', 'b')

        self.failUnlessExists('b/file_1')

        self.failUnlessExists('b/file_ii')

        tree_b.revert([])

        self.run_bzr_error(('Cannot use --uncommitted and --revision',),

                           'merge', '/a', '--uncommitted', '-r1',

                           '-d', 'b')

    def pullable_branch(self):

        os.mkdir('a')

        os.chdir('a')

        self.example_branch()

        os.chdir('..')

        self.runbzr('branch a b')

        os.chdir('b')

        file('goodbye', 'wt').write('quux')

        self.runbzr(['commit', '-m', "mode u's are always good"])

        os.chdir('../a')

    def pullable_branch(self):

        tree_a = self.make_branch_and_tree('a')

        self.build_tree(['a/file'])

        tree_a.add(['file'])

        self.id1 = tree_a.commit('commit 1')

        tree_b = self.make_branch_and_tree('b')

        tree_b.pull(tree_a.branch)

        file('b/file', 'wb').write('foo')

        self.id2 = tree_b.commit('commit 2')

    def test_merge_pull(self):

        self.pullable_branch()

        os.chdir('a')

        (out, err) = self.run_bzr('merge', '--pull', '../b')

        self.assertContainsRe(err, '1 revision\\(s\\) pulled')

        tree_a = WorkingTree.open('.')

        self.assertEqual([self.id2], tree_a.get_parent_ids())

    def test_merge_kind_change(self):

        tree_a = self.make_branch_and_tree('tree_a')

        self.build_tree_contents([('tree_a/file', 'content_1')])

        tree_a.add('file', 'file-id')

        tree_a.commit('added file')

        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()

        os.unlink('tree_a/file')

        self.build_tree(['tree_a/file/'])

        tree_a.commit('changed file to directory')

        os.chdir('tree_b')

        self.run_bzr('merge', '../tree_a')

        self.assertEqual('directory', file_kind('file'))

        tree_b.revert([])

        self.assertEqual('file', file_kind('file'))

        self.build_tree_contents([('file', 'content_2')])

        tree_b.commit('content change')

        self.run_bzr('merge', '../tree_a', retcode=1)

        self.assertEqual(tree_b.conflicts(),

                         [ContentsConflict('file', file_id='file-id')])