/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by 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
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
 
 
20
 
from .. import (
21
 
    check,
22
 
    osutils,
23
 
    )
24
 
from ..commit import PointlessCommit
25
 
from . import (
26
 
    TestCaseWithTransport,
27
 
    )
28
 
from .features import (
29
 
    SymlinkFeature,
30
 
    )
31
 
from .matchers import RevisionHistoryMatches
32
 
 
33
 
 
34
 
class TestCommitMerge(TestCaseWithTransport):
 
19
import shutil
 
20
 
 
21
from bzrlib.selftest import TestCaseInTempDir
 
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):
35
31
    """Tests for committing the results of a merge.
36
32
 
37
33
    These don't currently test the merge code, which is intentional to
40
36
 
41
37
    def test_merge_commit_empty(self):
42
38
        """Simple commit of two-way merge of empty trees."""
43
 
        wtx = self.make_branch_and_tree('x')
44
 
        base_rev = wtx.commit('common parent')
45
 
        bx = wtx.branch
46
 
        wty = wtx.controldir.sprout('y').open_workingtree()
47
 
        by = wty.branch
48
 
 
49
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
50
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
51
 
 
52
 
        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
        fetcher = fetch(from_branch=bx, to_branch=by)
 
48
        self.assertEqual(1, fetcher.count_copied)
 
49
        self.assertEqual([], fetcher.failed_revisions)
53
50
        # just having the history there does nothing
54
51
        self.assertRaises(PointlessCommit,
55
 
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
52
                          commit,
 
53
                          by, 'no changes yet', rev_id='y@u-0-2',
57
54
                          allow_pointless=False)
58
 
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
60
 
 
61
 
        self.assertEqual(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
63
 
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertThat(by,
65
 
                        RevisionHistoryMatches(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
69
 
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
55
        by.working_tree().add_pending_merge('x@u-0-1')
 
56
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
57
 
 
58
        self.assertEquals(by.revno(), 2)
 
59
        self.assertEquals(list(by.revision_history()),
 
60
                          ['y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.get_revision('y@u-0-2')
 
62
        self.assertEquals(rev.parent_ids,
 
63
                          ['y@u-0-1', 'x@u-0-1'])
 
64
 
 
65
 
71
66
 
72
67
    def test_merge_new_file(self):
73
68
        """Commit merge of two trees with no overlapping files."""
74
 
        wtx = self.make_branch_and_tree('x')
75
 
        base_rev = wtx.commit('common parent')
76
 
        bx = wtx.branch
77
 
        wtx.commit('establish root id')
78
 
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
80
 
        by = wty.branch
81
 
 
82
 
        self.build_tree(['x/ecks', 'y/why'])
83
 
 
84
 
        wtx.add(['ecks'], [b'ecks-id'])
85
 
        wty.add(['why'], [b'why-id'])
86
 
 
87
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
89
 
 
90
 
        wty.merge_from_branch(bx)
 
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)
 
80
        # we haven't merged the texts, but let's fake it
 
81
        shutil.copyfile('x/ecks', 'y/ecks')
 
82
        by.add(['ecks'], ['ecks-id'])
 
83
        by.working_tree().add_pending_merge('x@u-0-1')
91
84
 
92
85
        # partial commit of merges is currently not allowed, because
93
86
        # it would give different merge graphs for each file which
94
87
        # might be complex.  it can be allowed in the future.
95
88
        self.assertRaises(Exception,
96
 
                          wty.commit,
97
 
                          'partial commit', allow_pointless=False,
 
89
                          commit,
 
90
                          by, 'partial commit', allow_pointless=False,
98
91
                          specific_files=['ecks'])
99
 
 
100
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree(b'y@u-0-2')
102
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
103
 
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
104
 
 
105
 
        check.check_dwim(bx.base, False, True, True)
106
 
        check.check_dwim(by.base, False, True, True)
107
 
 
108
 
    def test_merge_with_symlink(self):
109
 
        self.requireFeature(SymlinkFeature)
110
 
        tree_a = self.make_branch_and_tree('tree_a')
111
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
112
 
        tree_a.add('link')
113
 
        tree_a.commit('added link')
114
 
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
115
 
        self.build_tree(['tree_a/file'])
116
 
        tree_a.add('file')
117
 
        tree_a.commit('added file')
118
 
        self.build_tree(['tree_b/another_file'])
119
 
        tree_b.add('another_file')
120
 
        tree_b.commit('add another file')
121
 
        tree_b.merge_from_branch(tree_a.branch)
122
 
        tree_b.commit('merge')
 
92
        
 
93
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
94
        tree = by.revision_tree('y@u-0-2')
 
95
        inv = tree.inventory
 
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
98
 
 
99
        check(bx, False)
 
100
        check(by, False)