← 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: 2013-05-23 10:35:23 UTC
  • mfrom: (6574.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20130523103523-2wt6jmauja1n1vdt
(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

Show diffs side-by-side

added added

removed removed

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