~bzr-pqm/bzr/bzr.dev

5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1342 by Martin Pool
- start some tests for commit of merge revisions
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1342 by Martin Pool
- start some tests for commit of merge revisions
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1342 by Martin Pool
- start some tests for commit of merge revisions
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1342 by Martin Pool
- start some tests for commit of merge revisions
16
17
18
import os
19
4332.3.35 by Robert Collins
Fix failing tests.
20
from bzrlib import check, osutils
5579.3.1 by Jelmer Vernooij
Remove unused imports.
21
from bzrlib.errors import PointlessCommit
2353.5.1 by Alexander Belchenko
forgotten import of TestSkipped
22
from bzrlib.tests import (
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
23
    SymlinkFeature,
2353.5.1 by Alexander Belchenko
forgotten import of TestSkipped
24
    TestCaseWithTransport,
25
    )
1342 by Martin Pool
- start some tests for commit of merge revisions
26
27
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
28
class TestCommitMerge(TestCaseWithTransport):
1342 by Martin Pool
- start some tests for commit of merge revisions
29
    """Tests for committing the results of a merge.
30
31
    These don't currently test the merge code, which is intentional to
32
    reduce the scope of testing.  We just mark the revision as merged
33
    without bothering about the contents much."""
34
35
    def test_merge_commit_empty(self):
36
        """Simple commit of two-way merge of empty trees."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
37
        wtx = self.make_branch_and_tree('x')
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
38
        base_rev = wtx.commit('common parent')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
39
        bx = wtx.branch
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
40
        wty = wtx.bzrdir.sprout('y').open_workingtree()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
41
        by = wty.branch
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
42
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
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)
1342 by Martin Pool
- start some tests for commit of merge revisions
45
4360.4.16 by John Arbash Meinel
It seems that fetch() no longer returns the number of revisions fetched.
46
        by.fetch(bx)
1342 by Martin Pool
- start some tests for commit of merge revisions
47
        # just having the history there does nothing
48
        self.assertRaises(PointlessCommit,
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
49
                          wty.commit,
50
                          'no changes yet', rev_id='y@u-0-2',
1342 by Martin Pool
- start some tests for commit of merge revisions
51
                          allow_pointless=False)
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
52
        wty.merge_from_branch(bx)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
53
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
1342 by Martin Pool
- start some tests for commit of merge revisions
54
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
55
        self.assertEquals(by.revno(), 3)
1342 by Martin Pool
- start some tests for commit of merge revisions
56
        self.assertEquals(list(by.revision_history()),
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
57
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
58
        rev = by.repository.get_revision('y@u-0-2')
1342 by Martin Pool
- start some tests for commit of merge revisions
59
        self.assertEquals(rev.parent_ids,
60
                          ['y@u-0-1', 'x@u-0-1'])
61
62
    def test_merge_new_file(self):
63
        """Commit merge of two trees with no overlapping files."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
64
        wtx = self.make_branch_and_tree('x')
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
65
        base_rev = wtx.commit('common parent')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
66
        bx = wtx.branch
1731.1.33 by Aaron Bentley
Revert no-special-root changes
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())
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
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)
1342 by Martin Pool
- start some tests for commit of merge revisions
79
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
80
        wty.merge_from_branch(bx)
1344 by Martin Pool
- disallow selected-file commit of merges
81
82
        # partial commit of merges is currently not allowed, because
83
        # it would give different merge graphs for each file which
84
        # might be complex.  it can be allowed in the future.
85
        self.assertRaises(Exception,
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
86
                          wty.commit,
87
                          'partial commit', allow_pointless=False,
1344 by Martin Pool
- disallow selected-file commit of merges
88
                          specific_files=['ecks'])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
89
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
91
        tree = by.repository.revision_tree('y@u-0-2')
1342 by Martin Pool
- start some tests for commit of merge revisions
92
        inv = tree.inventory
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
1345 by Martin Pool
- check branch after commit in merge tests
95
4332.3.35 by Robert Collins
Fix failing tests.
96
        check.check_dwim(bx.base, False, True, True)
97
        check.check_dwim(by.base, False, True, True)
2338.4.1 by Marien Zwart
Fix committing merges in a dirstate tree with a symlink.
98
99
    def test_merge_with_symlink(self):
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
100
        self.requireFeature(SymlinkFeature)
2338.4.1 by Marien Zwart
Fix committing merges in a dirstate tree with a symlink.
101
        tree_a = self.make_branch_and_tree('tree_a')
102
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
103
        tree_a.add('link')
104
        tree_a.commit('added link')
105
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
106
        self.build_tree(['tree_a/file'])
107
        tree_a.add('file')
108
        tree_a.commit('added file')
109
        self.build_tree(['tree_b/another_file'])
110
        tree_b.add('another_file')
111
        tree_b.commit('add another file')
112
        tree_b.merge_from_branch(tree_a.branch)
113
        tree_b.commit('merge')