← 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: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib import (
 
21
    check,
 
22
    osutils,
 
23
    )
 
24
from bzrlib.errors import PointlessCommit
 
25
from bzrlib.tests import (
 
26
    TestCaseWithTransport,
 
27
    )
 
28
from bzrlib.tests.features import (
 
29
    SymlinkFeature,
 
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
 
32
 
 
33
 
 
34
class TestCommitMerge(TestCaseWithTransport):
 
35
    """Tests for committing the results of a merge.
 
36
 
 
37
    These don't currently test the merge code, which is intentional to
 
38
    reduce the scope of testing.  We just mark the revision as merged
 
39
    without bothering about the contents much."""
 
40
 
 
41
    def test_merge_commit_empty(self):
 
42
        """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.bzrdir.sprout('y').open_workingtree()
 
47
        by = wty.branch
 
48
 
 
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
51
 
 
52
        by.fetch(bx)
 
53
        # just having the history there does nothing
 
54
        self.assertRaises(PointlessCommit,
 
55
                          wty.commit,
 
56
                          'no changes yet', rev_id='y@u-0-2',
 
57
                          allow_pointless=False)
 
58
        wty.merge_from_branch(bx)
 
59
        wty.commit('merge from x', rev_id='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([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
 
67
        rev = by.repository.get_revision('y@u-0-2')
 
68
        self.assertEqual(rev.parent_ids,
 
69
                          ['y@u-0-1', 'x@u-0-1'])
 
70
 
 
71
    def test_merge_new_file(self):
 
72
        """Commit merge of two trees with no overlapping files."""
 
73
        wtx = self.make_branch_and_tree('x')
 
74
        base_rev = wtx.commit('common parent')
 
75
        bx = wtx.branch
 
76
        wtx.commit('establish root id')
 
77
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
78
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
 
79
        by = wty.branch
 
80
 
 
81
        self.build_tree(['x/ecks', 'y/why'])
 
82
 
 
83
        wtx.add(['ecks'], ['ecks-id'])
 
84
        wty.add(['why'], ['why-id'])
 
85
 
 
86
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
87
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
88
 
 
89
        wty.merge_from_branch(bx)
 
90
 
 
91
        # partial commit of merges is currently not allowed, because
 
92
        # it would give different merge graphs for each file which
 
93
        # might be complex.  it can be allowed in the future.
 
94
        self.assertRaises(Exception,
 
95
                          wty.commit,
 
96
                          'partial commit', allow_pointless=False,
 
97
                          specific_files=['ecks'])
 
98
 
 
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
100
        tree = by.repository.revision_tree('y@u-0-2')
 
101
        self.assertEqual(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why-id'), 'y@u-0-1')
 
103
 
 
104
        check.check_dwim(bx.base, False, True, True)
 
105
        check.check_dwim(by.base, False, True, True)
 
106
 
 
107
    def test_merge_with_symlink(self):
 
108
        self.requireFeature(SymlinkFeature)
 
109
        tree_a = self.make_branch_and_tree('tree_a')
 
110
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
111
        tree_a.add('link')
 
112
        tree_a.commit('added link')
 
113
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
114
        self.build_tree(['tree_a/file'])
 
115
        tree_a.add('file')
 
116
        tree_a.commit('added file')
 
117
        self.build_tree(['tree_b/another_file'])
 
118
        tree_b.add('another_file')
 
119
        tree_b.commit('add another file')
 
120
        tree_b.merge_from_branch(tree_a.branch)
 
121
        tree_b.commit('merge')