← 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: 2011-09-22 14:12:18 UTC
  • mfrom: (6155.3.1 jam)
  • Revision ID: pqm@pqm.ubuntu.com-20110922141218-86s4uu6nqvourw4f
(jameinel) Cleanup comments bzrlib/smart/__init__.py (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
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 Canonical Ltd
2
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
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 check, osutils
 
21
from bzrlib.errors import PointlessCommit
 
22
from bzrlib.tests import (
 
23
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
 
26
    SymlinkFeature,
 
27
    )
25
28
 
26
29
 
27
30
class TestCommitMerge(TestCaseWithTransport):
34
37
    def test_merge_commit_empty(self):
35
38
        """Simple commit of two-way merge of empty trees."""
36
39
        wtx = self.make_branch_and_tree('x')
 
40
        base_rev = wtx.commit('common parent')
37
41
        bx = wtx.branch
38
 
        wty = self.make_branch_and_tree('y')
 
42
        wty = wtx.bzrdir.sprout('y').open_workingtree()
39
43
        by = wty.branch
40
44
 
41
45
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
42
46
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
43
47
 
44
 
        self.assertEqual((1, []), by.fetch(bx))
 
48
        by.fetch(bx)
45
49
        # just having the history there does nothing
46
50
        self.assertRaises(PointlessCommit,
47
51
                          wty.commit,
48
52
                          'no changes yet', rev_id='y@u-0-2',
49
53
                          allow_pointless=False)
50
 
        wty.add_pending_merge('x@u-0-1')
 
54
        wty.merge_from_branch(bx)
51
55
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
52
56
 
53
 
        self.assertEquals(by.revno(), 2)
 
57
        self.assertEquals(by.revno(), 3)
54
58
        self.assertEquals(list(by.revision_history()),
55
 
                          ['y@u-0-1', 'y@u-0-2'])
 
59
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
56
60
        rev = by.repository.get_revision('y@u-0-2')
57
61
        self.assertEquals(rev.parent_ids,
58
62
                          ['y@u-0-1', 'x@u-0-1'])
60
64
    def test_merge_new_file(self):
61
65
        """Commit merge of two trees with no overlapping files."""
62
66
        wtx = self.make_branch_and_tree('x')
 
67
        base_rev = wtx.commit('common parent')
63
68
        bx = wtx.branch
64
 
        wty = self.make_branch_and_tree('y')
 
69
        wtx.commit('establish root id')
 
70
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
71
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
65
72
        by = wty.branch
66
73
 
67
74
        self.build_tree(['x/ecks', 'y/why'])
72
79
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
73
80
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
74
81
 
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')
 
82
        wty.merge_from_branch(bx)
80
83
 
81
84
        # partial commit of merges is currently not allowed, because
82
85
        # it would give different merge graphs for each file which
85
88
                          wty.commit,
86
89
                          'partial commit', allow_pointless=False,
87
90
                          specific_files=['ecks'])
88
 
        
 
91
 
89
92
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
90
93
        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()])
 
94
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
95
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
96
 
 
97
        check.check_dwim(bx.base, False, True, True)
 
98
        check.check_dwim(by.base, False, True, True)
 
99
 
 
100
    def test_merge_with_symlink(self):
 
101
        self.requireFeature(SymlinkFeature)
 
102
        tree_a = self.make_branch_and_tree('tree_a')
 
103
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
104
        tree_a.add('link')
 
105
        tree_a.commit('added link')
 
106
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
107
        self.build_tree(['tree_a/file'])
 
108
        tree_a.add('file')
 
109
        tree_a.commit('added file')
 
110
        self.build_tree(['tree_b/another_file'])
 
111
        tree_b.add('another_file')
 
112
        tree_b.commit('add another file')
 
113
        tree_b.merge_from_branch(tree_a.branch)
 
114
        tree_b.commit('merge')