← 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: Canonical.com Patch Queue Manager
  • Date: 2008-04-07 07:52:50 UTC
  • mfrom: (3340.1.1 208418-1.4)
  • Revision ID: pqm@pqm.ubuntu.com-20080407075250-phs53xnslo8boaeo
Return the correct knit serialisation method in _StreamAccess.
        (Andrew Bennetts, Martin Pool, Robert Collins)

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
2
 
 
 
1
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.selftest import TestCaseInTempDir
 
21
from bzrlib.tests import (
 
22
    SymlinkFeature,
 
23
    TestCaseWithTransport,
 
24
    )
22
25
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):
 
26
from bzrlib.errors import PointlessCommit, BzrError
 
27
from bzrlib.tests.test_revision import make_branches
 
28
from bzrlib import osutils
 
29
 
 
30
 
 
31
class TestCommitMerge(TestCaseWithTransport):
31
32
    """Tests for committing the results of a merge.
32
33
 
33
34
    These don't currently test the merge code, which is intentional to
36
37
 
37
38
    def test_merge_commit_empty(self):
38
39
        """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)
 
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
        self.assertEqual((1, []), by.fetch(bx))
48
50
        # just having the history there does nothing
49
51
        self.assertRaises(PointlessCommit,
50
 
                          commit,
51
 
                          by, 'no changes yet', rev_id='y@u-0-2',
 
52
                          wty.commit,
 
53
                          'no changes yet', rev_id='y@u-0-2',
52
54
                          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)
 
55
        wty.merge_from_branch(bx)
 
56
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
55
57
 
56
 
        self.assertEquals(by.revno(), 2)
 
58
        self.assertEquals(by.revno(), 3)
57
59
        self.assertEquals(list(by.revision_history()),
58
 
                          ['y@u-0-1', 'y@u-0-2'])
59
 
        rev = by.get_revision('y@u-0-2')
 
60
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.repository.get_revision('y@u-0-2')
60
62
        self.assertEquals(rev.parent_ids,
61
63
                          ['y@u-0-1', 'x@u-0-1'])
62
64
 
63
 
 
64
 
 
65
65
    def test_merge_new_file(self):
66
66
        """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)
78
 
        # we haven't merged the texts, but let's fake it
79
 
        shutil.copyfile('x/ecks', 'y/ecks')
80
 
        by.add(['ecks'], ['ecks-id'])
81
 
        by.add_pending_merge('x@u-0-1')
 
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)
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
        bx.check()
 
100
        by.check()
 
101
        bx.repository.check([bx.last_revision()])
 
102
        by.repository.check([by.last_revision()])
 
103
 
 
104
    def test_merge_with_symlink(self):
 
105
        self.requireFeature(SymlinkFeature)
 
106
        tree_a = self.make_branch_and_tree('tree_a')
 
107
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
108
        tree_a.add('link')
 
109
        tree_a.commit('added link')
 
110
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
111
        self.build_tree(['tree_a/file'])
 
112
        tree_a.add('file')
 
113
        tree_a.commit('added file')
 
114
        self.build_tree(['tree_b/another_file'])
 
115
        tree_b.add('another_file')
 
116
        tree_b.commit('add another file')
 
117
        tree_b.merge_from_branch(tree_a.branch)
 
118
        tree_b.commit('merge')