← 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: Robert Collins
  • Date: 2006-06-09 07:45:35 UTC
  • mto: (1755.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1756.
  • Revision ID: robertc@robertcollins.net-20060609074535-3002a0209179b35c
Fixup '== None' usage in inventory.py.

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
 
#
 
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
import shutil
19
20
 
20
 
from bzrlib import check, osutils
21
 
from bzrlib.errors import PointlessCommit
22
 
from bzrlib.tests import (
23
 
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
 
    )
 
21
from bzrlib.tests import TestCaseWithTransport
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
 
24
from bzrlib.tests.test_revision import make_branches
 
25
from bzrlib.check import check
26
26
 
27
27
 
28
28
class TestCommitMerge(TestCaseWithTransport):
35
35
    def test_merge_commit_empty(self):
36
36
        """Simple commit of two-way merge of empty trees."""
37
37
        wtx = self.make_branch_and_tree('x')
38
 
        base_rev = wtx.commit('common parent')
39
38
        bx = wtx.branch
40
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
39
        wty = self.make_branch_and_tree('y')
41
40
        by = wty.branch
42
41
 
43
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
44
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
44
 
46
 
        by.fetch(bx)
 
45
        self.assertEqual((1, []), by.fetch(bx))
47
46
        # just having the history there does nothing
48
47
        self.assertRaises(PointlessCommit,
49
48
                          wty.commit,
50
49
                          'no changes yet', rev_id='y@u-0-2',
51
50
                          allow_pointless=False)
52
 
        wty.merge_from_branch(bx)
 
51
        wty.add_pending_merge('x@u-0-1')
53
52
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
53
 
55
 
        self.assertEquals(by.revno(), 3)
 
54
        self.assertEquals(by.revno(), 2)
56
55
        self.assertEquals(list(by.revision_history()),
57
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
56
                          ['y@u-0-1', 'y@u-0-2'])
58
57
        rev = by.repository.get_revision('y@u-0-2')
59
58
        self.assertEquals(rev.parent_ids,
60
59
                          ['y@u-0-1', 'x@u-0-1'])
62
61
    def test_merge_new_file(self):
63
62
        """Commit merge of two trees with no overlapping files."""
64
63
        wtx = self.make_branch_and_tree('x')
65
 
        base_rev = wtx.commit('common parent')
66
64
        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())
 
65
        wty = self.make_branch_and_tree('y')
70
66
        by = wty.branch
71
67
 
72
68
        self.build_tree(['x/ecks', 'y/why'])
77
73
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
78
74
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
79
75
 
80
 
        wty.merge_from_branch(bx)
 
76
        by.fetch(bx)
 
77
        # we haven't merged the texts, but let's fake it
 
78
        shutil.copyfile('x/ecks', 'y/ecks')
 
79
        wty.add(['ecks'], ['ecks-id'])
 
80
        wty.add_pending_merge('x@u-0-1')
81
81
 
82
82
        # partial commit of merges is currently not allowed, because
83
83
        # it would give different merge graphs for each file which
86
86
                          wty.commit,
87
87
                          'partial commit', allow_pointless=False,
88
88
                          specific_files=['ecks'])
89
 
 
 
89
        
90
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
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')
 
92
        inv = tree.inventory
 
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
95
 
 
96
        check(bx, False)
 
97
        check(by, False)