← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

Merge from jam-integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by Canonical Ltd
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib import check, osutils
 
21
from bzrlib.tests import TestCaseInTempDir
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
24
 
from bzrlib.tests import (
25
 
    SymlinkFeature,
26
 
    TestCaseWithTransport,
27
 
    )
 
23
from bzrlib.commit import commit
 
24
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
28
25
from bzrlib.tests.test_revision import make_branches
29
 
 
30
 
 
31
 
class TestCommitMerge(TestCaseWithTransport):
 
26
from bzrlib.fetch import fetch
 
27
from bzrlib.check import check
 
28
 
 
29
 
 
30
class TestCommitMerge(TestCaseInTempDir):
32
31
    """Tests for committing the results of a merge.
33
32
 
34
33
    These don't currently test the merge code, which is intentional to
37
36
 
38
37
    def test_merge_commit_empty(self):
39
38
        """Simple commit of two-way merge of empty trees."""
40
 
        wtx = self.make_branch_and_tree('x')
41
 
        base_rev = wtx.commit('common parent')
42
 
        bx = wtx.branch
43
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
44
 
        by = wty.branch
45
 
 
46
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
 
 
49
 
        by.fetch(bx)
 
39
        os.mkdir('x')
 
40
        os.mkdir('y')
 
41
        bx = Branch.initialize('x')
 
42
        by = Branch.initialize('y')
 
43
 
 
44
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
 
45
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
 
46
 
 
47
        fetcher = fetch(from_branch=bx, to_branch=by)
 
48
        self.assertEqual(1, fetcher.count_copied)
 
49
        self.assertEqual([], fetcher.failed_revisions)
50
50
        # just having the history there does nothing
51
51
        self.assertRaises(PointlessCommit,
52
 
                          wty.commit,
53
 
                          'no changes yet', rev_id='y@u-0-2',
 
52
                          commit,
 
53
                          by, 'no changes yet', rev_id='y@u-0-2',
54
54
                          allow_pointless=False)
55
 
        wty.merge_from_branch(bx)
56
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
55
        by.working_tree().add_pending_merge('x@u-0-1')
 
56
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
57
 
58
 
        self.assertEquals(by.revno(), 3)
 
58
        self.assertEquals(by.revno(), 2)
59
59
        self.assertEquals(list(by.revision_history()),
60
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
61
 
        rev = by.repository.get_revision('y@u-0-2')
 
60
                          ['y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.get_revision('y@u-0-2')
62
62
        self.assertEquals(rev.parent_ids,
63
63
                          ['y@u-0-1', 'x@u-0-1'])
64
64
 
65
65
    def test_merge_new_file(self):
66
66
        """Commit merge of two trees with no overlapping files."""
67
 
        wtx = self.make_branch_and_tree('x')
68
 
        base_rev = wtx.commit('common parent')
69
 
        bx = wtx.branch
70
 
        wtx.commit('establish root id')
71
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
72
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
73
 
        by = wty.branch
74
 
 
75
 
        self.build_tree(['x/ecks', 'y/why'])
76
 
 
77
 
        wtx.add(['ecks'], ['ecks-id'])
78
 
        wty.add(['why'], ['why-id'])
79
 
 
80
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
82
 
 
83
 
        wty.merge_from_branch(bx)
 
67
        self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
 
68
 
 
69
        bx = Branch.initialize('x')
 
70
        by = Branch.initialize('y')
 
71
        bx.working_tree().add(['ecks'], ['ecks-id'])
 
72
        by.working_tree().add(['why'], ['why-id'])
 
73
 
 
74
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
 
75
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
 
76
 
 
77
        fetch(from_branch=bx, to_branch=by)
 
78
        # we haven't merged the texts, but let's fake it
 
79
        shutil.copyfile('x/ecks', 'y/ecks')
 
80
        by.working_tree().add(['ecks'], ['ecks-id'])
 
81
        by.working_tree().add_pending_merge('x@u-0-1')
84
82
 
85
83
        # partial commit of merges is currently not allowed, because
86
84
        # it would give different merge graphs for each file which
87
85
        # might be complex.  it can be allowed in the future.
88
86
        self.assertRaises(Exception,
89
 
                          wty.commit,
90
 
                          'partial commit', allow_pointless=False,
 
87
                          commit,
 
88
                          by, 'partial commit', allow_pointless=False,
91
89
                          specific_files=['ecks'])
92
 
 
93
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
 
        tree = by.repository.revision_tree('y@u-0-2')
 
90
        
 
91
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
92
        tree = by.revision_tree('y@u-0-2')
95
93
        inv = tree.inventory
96
94
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
95
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
96
 
99
 
        check.check_dwim(bx.base, False, True, True)
100
 
        check.check_dwim(by.base, False, True, True)
101
 
 
102
 
    def test_merge_with_symlink(self):
103
 
        self.requireFeature(SymlinkFeature)
104
 
        tree_a = self.make_branch_and_tree('tree_a')
105
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
106
 
        tree_a.add('link')
107
 
        tree_a.commit('added link')
108
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
109
 
        self.build_tree(['tree_a/file'])
110
 
        tree_a.add('file')
111
 
        tree_a.commit('added file')
112
 
        self.build_tree(['tree_b/another_file'])
113
 
        tree_b.add('another_file')
114
 
        tree_b.commit('add another file')
115
 
        tree_b.merge_from_branch(tree_a.branch)
116
 
        tree_b.commit('merge')
 
97
        check(bx, False)
 
98
        check(by, False)