← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

  • Committer: Robert Collins
  • Date: 2005-10-18 13:11:57 UTC
  • mfrom: (1185.16.72) (0.2.1)
  • Revision ID: robertc@robertcollins.net-20051018131157-76a9970aa78e927e
Merged Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/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 TestCaseWithTransport
 
21
from bzrlib.selftest import TestCaseInTempDir
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
24
 
from bzrlib.tests.test_revision import make_branches
25
 
 
26
 
 
27
 
class TestCommitMerge(TestCaseWithTransport):
 
23
from bzrlib.commit import commit
 
24
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
 
25
from bzrlib.selftest.testrevision import make_branches
 
26
from bzrlib.fetch import fetch
 
27
from bzrlib.check import check
 
28
 
 
29
 
 
30
class TestCommitMerge(TestCaseInTempDir):
28
31
    """Tests for committing the results of a merge.
29
32
 
30
33
    These don't currently test the merge code, which is intentional to
33
36
 
34
37
    def test_merge_commit_empty(self):
35
38
        """Simple commit of two-way merge of empty trees."""
36
 
        wtx = self.make_branch_and_tree('x')
37
 
        base_rev = wtx.commit('common parent')
38
 
        bx = wtx.branch
39
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
40
 
        by = wty.branch
41
 
        
42
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
44
 
 
45
 
        self.assertEqual((1, []), by.fetch(bx))
 
39
        os.mkdir('x')
 
40
        os.mkdir('y')
 
41
        bx = Branch.initialize('x')
 
42
        by = Branch.initialize('y')
 
43
 
 
44
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
 
45
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
 
46
 
 
47
        fetcher = fetch(from_branch=bx, to_branch=by)
 
48
        self.assertEqual(1, fetcher.count_copied)
 
49
        self.assertEqual([], fetcher.failed_revisions)
46
50
        # just having the history there does nothing
47
51
        self.assertRaises(PointlessCommit,
48
 
                          wty.commit,
49
 
                          'no changes yet', rev_id='y@u-0-2',
 
52
                          commit,
 
53
                          by, 'no changes yet', rev_id='y@u-0-2',
50
54
                          allow_pointless=False)
51
 
        wty.merge_from_branch(bx)
52
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
55
        by.add_pending_merge('x@u-0-1')
 
56
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
57
 
54
 
        self.assertEquals(by.revno(), 3)
 
58
        self.assertEquals(by.revno(), 2)
55
59
        self.assertEquals(list(by.revision_history()),
56
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
57
 
        rev = by.repository.get_revision('y@u-0-2')
 
60
                          ['y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.get_revision('y@u-0-2')
58
62
        self.assertEquals(rev.parent_ids,
59
63
                          ['y@u-0-1', 'x@u-0-1'])
60
64
 
 
65
 
 
66
 
61
67
    def test_merge_new_file(self):
62
68
        """Commit merge of two trees with no overlapping files."""
63
 
        wtx = self.make_branch_and_tree('x')
64
 
        base_rev = wtx.commit('common parent')
65
 
        bx = wtx.branch
66
 
        wtx.commit('establish root id')
67
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
68
 
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
69
 
        by = wty.branch
70
 
 
71
 
        self.build_tree(['x/ecks', 'y/why'])
72
 
 
73
 
        wtx.add(['ecks'], ['ecks-id'])
74
 
        wty.add(['why'], ['why-id'])
75
 
 
76
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
77
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
78
 
 
79
 
        wty.merge_from_branch(bx)
 
69
        self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
 
70
 
 
71
        bx = Branch.initialize('x')
 
72
        by = Branch.initialize('y')
 
73
        bx.add(['ecks'], ['ecks-id'])
 
74
        by.add(['why'], ['why-id'])
 
75
 
 
76
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
 
77
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
 
78
 
 
79
        fetch(from_branch=bx, to_branch=by)
 
80
        # we haven't merged the texts, but let's fake it
 
81
        shutil.copyfile('x/ecks', 'y/ecks')
 
82
        by.add(['ecks'], ['ecks-id'])
 
83
        by.add_pending_merge('x@u-0-1')
80
84
 
81
85
        # partial commit of merges is currently not allowed, because
82
86
        # it would give different merge graphs for each file which
83
87
        # might be complex.  it can be allowed in the future.
84
88
        self.assertRaises(Exception,
85
 
                          wty.commit,
86
 
                          'partial commit', allow_pointless=False,
 
89
                          commit,
 
90
                          by, 'partial commit', allow_pointless=False,
87
91
                          specific_files=['ecks'])
88
92
        
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')
 
93
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
94
        tree = by.revision_tree('y@u-0-2')
91
95
        inv = tree.inventory
92
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
93
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
94
98
 
95
 
        bx.check()
96
 
        by.check()
97
 
        bx.repository.check([bx.last_revision()])
98
 
        by.repository.check([by.last_revision()])
 
99
        check(bx, False)
 
100
        check(by, False)