/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: Canonical.com Patch Queue Manager
  • Date: 2011-06-30 16:06:19 UTC
  • mfrom: (5971.1.80 bzr-gpgme)
  • Revision ID: pqm@pqm.ubuntu.com-20110630160619-3022zmfchft893nt
(jr) A new command ``bzr verify-signatures`` has been added to check that
 commits
 are correctly signed with trusted keys by GPG. This requires python-gpgme to
 be installed. ``bzr log`` has gained a ``--signatures`` option to list the
 validity of signatures for each commit. New config options
 ``acceptable_keys``
 and ``validate_signatures_in_log`` can be set to control options to these
 commands. (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
 
import shutil
20
19
 
21
 
from bzrlib.tests import TestCaseWithTransport
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
24
 
from bzrlib.tests.test_revision import make_branches
25
 
from bzrlib.check import check
 
20
from bzrlib import check, osutils
 
21
from bzrlib.errors import PointlessCommit
 
22
from bzrlib.tests import (
 
23
    SymlinkFeature,
 
24
    TestCaseWithTransport,
 
25
    )
26
26
 
27
27
 
28
28
class TestCommitMerge(TestCaseWithTransport):
35
35
    def test_merge_commit_empty(self):
36
36
        """Simple commit of two-way merge of empty trees."""
37
37
        wtx = self.make_branch_and_tree('x')
 
38
        base_rev = wtx.commit('common parent')
38
39
        bx = wtx.branch
39
 
        wty = self.make_branch_and_tree('y')
 
40
        wty = wtx.bzrdir.sprout('y').open_workingtree()
40
41
        by = wty.branch
41
42
 
42
43
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
44
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
44
45
 
45
 
        self.assertEqual((1, []), by.fetch(bx))
 
46
        by.fetch(bx)
46
47
        # just having the history there does nothing
47
48
        self.assertRaises(PointlessCommit,
48
49
                          wty.commit,
49
50
                          'no changes yet', rev_id='y@u-0-2',
50
51
                          allow_pointless=False)
51
 
        wty.add_pending_merge('x@u-0-1')
 
52
        wty.merge_from_branch(bx)
52
53
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
54
 
54
 
        self.assertEquals(by.revno(), 2)
 
55
        self.assertEquals(by.revno(), 3)
55
56
        self.assertEquals(list(by.revision_history()),
56
 
                          ['y@u-0-1', 'y@u-0-2'])
 
57
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
57
58
        rev = by.repository.get_revision('y@u-0-2')
58
59
        self.assertEquals(rev.parent_ids,
59
60
                          ['y@u-0-1', 'x@u-0-1'])
61
62
    def test_merge_new_file(self):
62
63
        """Commit merge of two trees with no overlapping files."""
63
64
        wtx = self.make_branch_and_tree('x')
 
65
        base_rev = wtx.commit('common parent')
64
66
        bx = wtx.branch
65
 
        wty = self.make_branch_and_tree('y')
 
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())
66
70
        by = wty.branch
67
71
 
68
72
        self.build_tree(['x/ecks', 'y/why'])
73
77
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
74
78
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
75
79
 
76
 
        by.fetch(bx)
77
 
        # we haven't merged the texts, but let's fake it
78
 
        shutil.copyfile('x/ecks', 'y/ecks')
79
 
        wty.add(['ecks'], ['ecks-id'])
80
 
        wty.add_pending_merge('x@u-0-1')
 
80
        wty.merge_from_branch(bx)
81
81
 
82
82
        # partial commit of merges is currently not allowed, because
83
83
        # it would give different merge graphs for each file which
86
86
                          wty.commit,
87
87
                          'partial commit', allow_pointless=False,
88
88
                          specific_files=['ecks'])
89
 
        
 
89
 
90
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
91
        tree = by.repository.revision_tree('y@u-0-2')
92
 
        inv = tree.inventory
93
 
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
94
 
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
 
 
96
 
        check(bx, False)
97
 
        check(by, False)
 
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')