← 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

  • Committer: Robey Pointer
  • Date: 2006-07-01 19:03:33 UTC
  • mfrom: (1829 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: robey@lag.net-20060701190333-f58465aec4bd3412
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

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