← 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: Canonical.com Patch Queue Manager
  • Date: 2006-06-06 22:59:58 UTC
  • mfrom: (1740.2.6 bzr.checkout)
  • Revision ID: pqm@pqm.ubuntu.com-20060606225958-17ab4431da6b44f6
Speed up checkout by using existing revision text when possible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import (
22
 
    SymlinkFeature,
23
 
    TestCaseWithTransport,
24
 
    )
 
21
from bzrlib.tests import TestCaseWithTransport
25
22
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
 
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
27
24
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
 
25
from bzrlib.check import check
29
26
 
30
27
 
31
28
class TestCommitMerge(TestCaseWithTransport):
38
35
    def test_merge_commit_empty(self):
39
36
        """Simple commit of two-way merge of empty trees."""
40
37
        wtx = self.make_branch_and_tree('x')
41
 
        base_rev = wtx.commit('common parent')
42
38
        bx = wtx.branch
43
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
39
        wty = self.make_branch_and_tree('y')
44
40
        by = wty.branch
45
 
        
 
41
 
46
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
44
 
52
48
                          wty.commit,
53
49
                          'no changes yet', rev_id='y@u-0-2',
54
50
                          allow_pointless=False)
55
 
        wty.merge_from_branch(bx)
 
51
        wty.add_pending_merge('x@u-0-1')
56
52
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
53
 
58
 
        self.assertEquals(by.revno(), 3)
 
54
        self.assertEquals(by.revno(), 2)
59
55
        self.assertEquals(list(by.revision_history()),
60
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
56
                          ['y@u-0-1', 'y@u-0-2'])
61
57
        rev = by.repository.get_revision('y@u-0-2')
62
58
        self.assertEquals(rev.parent_ids,
63
59
                          ['y@u-0-1', 'x@u-0-1'])
65
61
    def test_merge_new_file(self):
66
62
        """Commit merge of two trees with no overlapping files."""
67
63
        wtx = self.make_branch_and_tree('x')
68
 
        base_rev = wtx.commit('common parent')
69
64
        bx = wtx.branch
70
 
        wtx.commit('establish root id')
71
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
72
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
 
65
        wty = self.make_branch_and_tree('y')
73
66
        by = wty.branch
74
67
 
75
68
        self.build_tree(['x/ecks', 'y/why'])
80
73
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
74
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
82
75
 
83
 
        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')
84
81
 
85
82
        # partial commit of merges is currently not allowed, because
86
83
        # it would give different merge graphs for each file which
96
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
95
 
99
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
103
 
 
104
 
    def test_merge_with_symlink(self):
105
 
        self.requireFeature(SymlinkFeature)
106
 
        tree_a = self.make_branch_and_tree('tree_a')
107
 
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
108
 
        tree_a.add('link')
109
 
        tree_a.commit('added link')
110
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
111
 
        self.build_tree(['tree_a/file'])
112
 
        tree_a.add('file')
113
 
        tree_a.commit('added file')
114
 
        self.build_tree(['tree_b/another_file'])
115
 
        tree_b.add('another_file')
116
 
        tree_b.commit('add another file')
117
 
        tree_b.merge_from_branch(tree_a.branch)
118
 
        tree_b.commit('merge')
 
96
        check(bx, False)
 
97
        check(by, False)