← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

- refactor handling of short option names

Show diffs side-by-side

added added

removed removed

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