← 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: John Arbash Meinel
  • Date: 2005-09-15 21:35:53 UTC
  • mfrom: (907.1.57)
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050915213552-a6c83a5ef1e20897
(broken) Transport work is merged in. Tests do not pass yet.

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 check, osutils
21
 
from bzrlib.errors import PointlessCommit
22
 
from bzrlib.tests import (
23
 
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
 
    )
26
 
 
27
 
 
28
 
class TestCommitMerge(TestCaseWithTransport):
29
 
    """Tests for committing the results of a merge.
30
 
 
31
 
    These don't currently test the merge code, which is intentional to
32
 
    reduce the scope of testing.  We just mark the revision as merged
33
 
    without bothering about the contents much."""
34
 
 
35
 
    def test_merge_commit_empty(self):
36
 
        """Simple commit of two-way merge of empty trees."""
37
 
        wtx = self.make_branch_and_tree('x')
38
 
        base_rev = wtx.commit('common parent')
39
 
        bx = wtx.branch
40
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
41
 
        by = wty.branch
42
 
 
43
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
44
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
 
 
46
 
        by.fetch(bx)
47
 
        # just having the history there does nothing
48
 
        self.assertRaises(PointlessCommit,
49
 
                          wty.commit,
50
 
                          'no changes yet', rev_id='y@u-0-2',
51
 
                          allow_pointless=False)
52
 
        wty.merge_from_branch(bx)
53
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
 
 
55
 
        self.assertEquals(by.revno(), 3)
56
 
        self.assertEquals(list(by.revision_history()),
57
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
58
 
        rev = by.repository.get_revision('y@u-0-2')
59
 
        self.assertEquals(rev.parent_ids,
60
 
                          ['y@u-0-1', 'x@u-0-1'])
61
 
 
62
 
    def test_merge_new_file(self):
63
 
        """Commit merge of two trees with no overlapping files."""
64
 
        wtx = self.make_branch_and_tree('x')
65
 
        base_rev = wtx.commit('common parent')
66
 
        bx = wtx.branch
67
 
        wtx.commit('establish root id')
68
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
69
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
70
 
        by = wty.branch
71
 
 
72
 
        self.build_tree(['x/ecks', 'y/why'])
73
 
 
74
 
        wtx.add(['ecks'], ['ecks-id'])
75
 
        wty.add(['why'], ['why-id'])
76
 
 
77
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
78
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
79
 
 
80
 
        wty.merge_from_branch(bx)
81
 
 
82
 
        # partial commit of merges is currently not allowed, because
83
 
        # it would give different merge graphs for each file which
84
 
        # might be complex.  it can be allowed in the future.
85
 
        self.assertRaises(Exception,
86
 
                          wty.commit,
87
 
                          'partial commit', allow_pointless=False,
88
 
                          specific_files=['ecks'])
89
 
 
90
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
 
        tree = by.repository.revision_tree('y@u-0-2')
92
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
93
 
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
94
 
 
95
 
        check.check_dwim(bx.base, False, True, True)
96
 
        check.check_dwim(by.base, False, True, True)
97
 
 
98
 
    def test_merge_with_symlink(self):
99
 
        self.requireFeature(SymlinkFeature)
100
 
        tree_a = self.make_branch_and_tree('tree_a')
101
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
102
 
        tree_a.add('link')
103
 
        tree_a.commit('added link')
104
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
105
 
        self.build_tree(['tree_a/file'])
106
 
        tree_a.add('file')
107
 
        tree_a.commit('added file')
108
 
        self.build_tree(['tree_b/another_file'])
109
 
        tree_b.add('another_file')
110
 
        tree_b.commit('add another file')
111
 
        tree_b.merge_from_branch(tree_a.branch)
112
 
        tree_b.commit('merge')