/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/tests/test_commit_merge.py

(jelmer) Print the number of colocated branches in 'bzr info'. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
 
import shutil
20
19
 
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
 
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
    )
26
32
 
27
33
 
28
34
class TestCommitMerge(TestCaseWithTransport):
35
41
    def test_merge_commit_empty(self):
36
42
        """Simple commit of two-way merge of empty trees."""
37
43
        wtx = self.make_branch_and_tree('x')
 
44
        base_rev = wtx.commit('common parent')
38
45
        bx = wtx.branch
39
 
        wty = self.make_branch_and_tree('y')
 
46
        wty = wtx.bzrdir.sprout('y').open_workingtree()
40
47
        by = wty.branch
41
48
 
42
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
44
51
 
45
 
        self.assertEqual((1, []), by.fetch(bx))
 
52
        by.fetch(bx)
46
53
        # just having the history there does nothing
47
54
        self.assertRaises(PointlessCommit,
48
55
                          wty.commit,
49
56
                          'no changes yet', rev_id='y@u-0-2',
50
57
                          allow_pointless=False)
51
 
        wty.add_pending_merge('x@u-0-1')
 
58
        wty.merge_from_branch(bx)
52
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
60
 
54
 
        self.assertEquals(by.revno(), 2)
55
 
        self.assertEquals(list(by.revision_history()),
56
 
                          ['y@u-0-1', 'y@u-0-2'])
 
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])
57
68
        rev = by.repository.get_revision('y@u-0-2')
58
69
        self.assertEquals(rev.parent_ids,
59
70
                          ['y@u-0-1', 'x@u-0-1'])
61
72
    def test_merge_new_file(self):
62
73
        """Commit merge of two trees with no overlapping files."""
63
74
        wtx = self.make_branch_and_tree('x')
 
75
        base_rev = wtx.commit('common parent')
64
76
        bx = wtx.branch
65
 
        wty = self.make_branch_and_tree('y')
 
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())
66
80
        by = wty.branch
67
81
 
68
82
        self.build_tree(['x/ecks', 'y/why'])
73
87
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
74
88
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
75
89
 
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')
 
90
        wty.merge_from_branch(bx)
81
91
 
82
92
        # partial commit of merges is currently not allowed, because
83
93
        # it would give different merge graphs for each file which
86
96
                          wty.commit,
87
97
                          'partial commit', allow_pointless=False,
88
98
                          specific_files=['ecks'])
89
 
        
 
99
 
90
100
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
101
        tree = by.repository.revision_tree('y@u-0-2')
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)
 
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')