~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-09-30 02:54:51 UTC
  • mfrom: (1395)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050930025451-47b9e412202be44b
symlink and weaves, whaddya know

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2005 by Canonical Ltd
 
2
 
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
 
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
 
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
 
 
18
import os
 
19
import shutil
 
20
 
 
21
from bzrlib.selftest import TestCaseInTempDir
 
22
from bzrlib.branch import Branch
 
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):
 
31
    """Tests for committing the results of a merge.
 
32
 
 
33
    These don't currently test the merge code, which is intentional to
 
34
    reduce the scope of testing.  We just mark the revision as merged
 
35
    without bothering about the contents much."""
 
36
 
 
37
    def test_merge_commit_empty(self):
 
38
        """Simple commit of two-way merge of empty trees."""
 
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
        fetch(from_branch=bx, to_branch=by)
 
48
        # just having the history there does nothing
 
49
        self.assertRaises(PointlessCommit,
 
50
                          commit,
 
51
                          by, 'no changes yet', rev_id='y@u-0-2',
 
52
                          allow_pointless=False)
 
53
        by.add_pending_merge('x@u-0-1')
 
54
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
55
 
 
56
        self.assertEquals(by.revno(), 2)
 
57
        self.assertEquals(list(by.revision_history()),
 
58
                          ['y@u-0-1', 'y@u-0-2'])
 
59
        rev = by.get_revision('y@u-0-2')
 
60
        self.assertEquals(rev.parent_ids,
 
61
                          ['y@u-0-1', 'x@u-0-1'])
 
62
 
 
63
 
 
64
 
 
65
    def test_merge_new_file(self):
 
66
        """Commit merge of two trees with no overlapping files."""
 
67
        self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
 
68
 
 
69
        bx = Branch.initialize('x')
 
70
        by = Branch.initialize('y')
 
71
        bx.add(['ecks'], ['ecks-id'])
 
72
        by.add(['why'], ['why-id'])
 
73
 
 
74
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
 
75
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
 
76
 
 
77
        fetch(from_branch=bx, to_branch=by)
 
78
        # we haven't merged the texts, but let's fake it
 
79
        shutil.copyfile('x/ecks', 'y/ecks')
 
80
        by.add(['ecks'], ['ecks-id'])
 
81
        by.add_pending_merge('x@u-0-1')
 
82
 
 
83
        # partial commit of merges is currently not allowed, because
 
84
        # it would give different merge graphs for each file which
 
85
        # might be complex.  it can be allowed in the future.
 
86
        self.assertRaises(Exception,
 
87
                          commit,
 
88
                          by, 'partial commit', allow_pointless=False,
 
89
                          specific_files=['ecks'])
 
90
        
 
91
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
92
        tree = by.revision_tree('y@u-0-2')
 
93
        inv = tree.inventory
 
94
        self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
 
95
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
 
96
 
 
97
        check(bx)
 
98
        check(by)