← 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

(mbp) merge bzr.dev to 0.8, prepare for release

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