← 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] update from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.selftest import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.commit import commit
24
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
25
 
from bzrlib.selftest.testrevision import make_branches
 
24
from bzrlib.tests.test_revision import make_branches
26
25
from bzrlib.fetch import fetch
27
26
from bzrlib.check import check
28
27
 
29
28
 
30
 
class TestCommitMerge(TestCaseInTempDir):
 
29
class TestCommitMerge(TestCaseWithTransport):
31
30
    """Tests for committing the results of a merge.
32
31
 
33
32
    These don't currently test the merge code, which is intentional to
36
35
 
37
36
    def test_merge_commit_empty(self):
38
37
        """Simple commit of two-way merge of empty trees."""
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
 
        fetch(from_branch=bx, to_branch=by)
 
38
        wtx = self.make_branch_and_tree('x')
 
39
        bx = wtx.branch
 
40
        wty = self.make_branch_and_tree('y')
 
41
        by = wty.branch
 
42
 
 
43
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
44
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
45
 
 
46
        fetcher = fetch(from_branch=bx, to_branch=by)
 
47
        self.assertEqual(1, fetcher.count_copied)
 
48
        self.assertEqual([], fetcher.failed_revisions)
48
49
        # just having the history there does nothing
49
50
        self.assertRaises(PointlessCommit,
50
 
                          commit,
51
 
                          by, 'no changes yet', rev_id='y@u-0-2',
 
51
                          wty.commit,
 
52
                          'no changes yet', rev_id='y@u-0-2',
52
53
                          allow_pointless=False)
53
 
        by.add_pending_merge('x@u-0-1')
54
 
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
54
        wty.add_pending_merge('x@u-0-1')
 
55
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
55
56
 
56
57
        self.assertEquals(by.revno(), 2)
57
58
        self.assertEquals(list(by.revision_history()),
58
59
                          ['y@u-0-1', 'y@u-0-2'])
59
 
        rev = by.get_revision('y@u-0-2')
 
60
        rev = by.repository.get_revision('y@u-0-2')
60
61
        self.assertEquals(rev.parent_ids,
61
62
                          ['y@u-0-1', 'x@u-0-1'])
62
63
 
63
 
 
64
 
 
65
64
    def test_merge_new_file(self):
66
65
        """Commit merge of two trees with no overlapping files."""
67
 
        self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
68
 
 
69
 
        bx = Branch.initialize('x')
70
 
        by = Branch.initialize('y')
71
 
        bx.add(['ecks'], ['ecks-id'])
72
 
        by.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)
 
66
        wtx = self.make_branch_and_tree('x')
 
67
        bx = wtx.branch
 
68
        wty = self.make_branch_and_tree('y')
 
69
        by = wty.branch
 
70
 
 
71
        self.build_tree(['x/ecks', 'y/why'])
 
72
 
 
73
        wtx.add(['ecks'], ['ecks-id'])
 
74
        wty.add(['why'], ['why-id'])
 
75
 
 
76
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
77
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
76
78
 
77
79
        fetch(from_branch=bx, to_branch=by)
78
80
        # we haven't merged the texts, but let's fake it
79
81
        shutil.copyfile('x/ecks', 'y/ecks')
80
 
        by.add(['ecks'], ['ecks-id'])
81
 
        by.add_pending_merge('x@u-0-1')
 
82
        wty.add(['ecks'], ['ecks-id'])
 
83
        wty.add_pending_merge('x@u-0-1')
82
84
 
83
85
        # partial commit of merges is currently not allowed, because
84
86
        # it would give different merge graphs for each file which
85
87
        # might be complex.  it can be allowed in the future.
86
88
        self.assertRaises(Exception,
87
 
                          commit,
88
 
                          by, 'partial commit', allow_pointless=False,
 
89
                          wty.commit,
 
90
                          'partial commit', allow_pointless=False,
89
91
                          specific_files=['ecks'])
90
92
        
91
 
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
92
 
        tree = by.revision_tree('y@u-0-2')
 
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')
93
95
        inv = tree.inventory
94
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
95
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
96
98
 
97
 
        check(bx)
98
 
        check(by)
 
99
        check(bx, False)
 
100
        check(by, False)