/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

  • Committer: Alexander Belchenko
  • Date: 2006-07-30 16:43:12 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060730164312-b025fd3ff0cee59e
rename  gpl.txt => COPYING.txt

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, 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by 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., 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 .. import (
21
 
    check,
22
 
    osutils,
23
 
    )
24
 
from ..commit import PointlessCommit
25
 
from . import (
26
 
    TestCaseWithTransport,
27
 
    )
28
 
from .features import (
29
 
    SymlinkFeature,
30
 
    )
31
 
from .matchers import RevisionHistoryMatches
 
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
32
25
 
33
26
 
34
27
class TestCommitMerge(TestCaseWithTransport):
41
34
    def test_merge_commit_empty(self):
42
35
        """Simple commit of two-way merge of empty trees."""
43
36
        wtx = self.make_branch_and_tree('x')
44
 
        base_rev = wtx.commit('common parent')
45
37
        bx = wtx.branch
46
 
        wty = wtx.controldir.sprout('y').open_workingtree()
 
38
        wty = self.make_branch_and_tree('y')
47
39
        by = wty.branch
48
40
 
49
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
50
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
41
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
42
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
51
43
 
52
 
        by.fetch(bx)
 
44
        self.assertEqual((1, []), by.fetch(bx))
53
45
        # just having the history there does nothing
54
46
        self.assertRaises(PointlessCommit,
55
47
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
48
                          'no changes yet', rev_id='y@u-0-2',
57
49
                          allow_pointless=False)
58
 
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
50
        wty.add_pending_merge('x@u-0-1')
 
51
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
52
 
61
 
        self.assertEqual(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
63
 
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertThat(by,
65
 
                        RevisionHistoryMatches(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
69
 
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
53
        self.assertEquals(by.revno(), 2)
 
54
        self.assertEquals(list(by.revision_history()),
 
55
                          ['y@u-0-1', 'y@u-0-2'])
 
56
        rev = by.repository.get_revision('y@u-0-2')
 
57
        self.assertEquals(rev.parent_ids,
 
58
                          ['y@u-0-1', 'x@u-0-1'])
71
59
 
72
60
    def test_merge_new_file(self):
73
61
        """Commit merge of two trees with no overlapping files."""
74
62
        wtx = self.make_branch_and_tree('x')
75
 
        base_rev = wtx.commit('common parent')
76
63
        bx = wtx.branch
77
 
        wtx.commit('establish root id')
78
 
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
 
64
        wty = self.make_branch_and_tree('y')
80
65
        by = wty.branch
81
66
 
82
67
        self.build_tree(['x/ecks', 'y/why'])
83
68
 
84
 
        wtx.add(['ecks'], [b'ecks-id'])
85
 
        wty.add(['why'], [b'why-id'])
86
 
 
87
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
89
 
 
90
 
        wty.merge_from_branch(bx)
 
69
        wtx.add(['ecks'], ['ecks-id'])
 
70
        wty.add(['why'], ['why-id'])
 
71
 
 
72
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
73
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
74
 
 
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')
91
80
 
92
81
        # partial commit of merges is currently not allowed, because
93
82
        # it would give different merge graphs for each file which
96
85
                          wty.commit,
97
86
                          'partial commit', allow_pointless=False,
98
87
                          specific_files=['ecks'])
99
 
 
100
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree(b'y@u-0-2')
102
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
103
 
        self.assertEqual(tree.get_file_revision('why'), b'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.controldir.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')
 
88
        
 
89
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
90
        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()])