← 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-17 11:41:07 UTC
  • mfrom: (1442.1.60)
  • Revision ID: robertc@robertcollins.net-20051017114107-f5586285d825c105
Merge in first part of GPG support.

This adds check_signatures config support, triams back the transport api
to be leaner and easier to hook in suffixes - non primary streams in the store
associated with the fileid that primary data is stored in, a gpg module which
will encapsulate all signing and checking operations.

Show diffs side-by-side

added added

removed removed

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