← 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: John Arbash Meinel
  • Date: 2005-11-30 15:43:57 UTC
  • mto: (1185.50.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1518.
  • Revision ID: john@arbash-meinel.com-20051130154357-614206b3a7b83cd0
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.

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