← 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: Aaron Bentley
  • Date: 2005-07-26 14:06:11 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 982.
  • Revision ID: abentley@panoramicfeedback.com-20050726140611-403e366f3c79c1f1
Fixed python invocation

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, 2011 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
 
    revision as _mod_revision,
24
 
    )
25
 
from bzrlib.errors import PointlessCommit
26
 
from bzrlib.tests import (
27
 
    TestCaseWithTransport,
28
 
    )
29
 
from bzrlib.tests.features import (
30
 
    SymlinkFeature,
31
 
    )
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.assertEquals(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
63
 
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertEquals(list(
65
 
            graph.iter_lefthand_ancestry(by.last_revision(),
66
 
                [_mod_revision.NULL_REVISION])),
67
 
            ['y@u-0-2', 'y@u-0-1', base_rev])
68
 
        rev = by.repository.get_revision('y@u-0-2')
69
 
        self.assertEquals(rev.parent_ids,
70
 
                          ['y@u-0-1', 'x@u-0-1'])
71
 
 
72
 
    def test_merge_new_file(self):
73
 
        """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.bzrdir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
80
 
        by = wty.branch
81
 
 
82
 
        self.build_tree(['x/ecks', 'y/why'])
83
 
 
84
 
        wtx.add(['ecks'], ['ecks-id'])
85
 
        wty.add(['why'], ['why-id'])
86
 
 
87
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
89
 
 
90
 
        wty.merge_from_branch(bx)
91
 
 
92
 
        # partial commit of merges is currently not allowed, because
93
 
        # it would give different merge graphs for each file which
94
 
        # might be complex.  it can be allowed in the future.
95
 
        self.assertRaises(Exception,
96
 
                          wty.commit,
97
 
                          'partial commit', allow_pointless=False,
98
 
                          specific_files=['ecks'])
99
 
 
100
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree('y@u-0-2')
102
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
103
 
        self.assertEquals(tree.get_file_revision('why-id'), '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.bzrdir.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')