/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 breezy/tests/test_commit_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
2
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
16
16
 
17
17
 
18
18
import os
19
 
import shutil
20
19
 
21
 
from bzrlib import check, osutils
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
24
 
from bzrlib.tests import (
 
20
from .. import (
 
21
    check,
 
22
    osutils,
 
23
    )
 
24
from ..commit import PointlessCommit
 
25
from . import (
 
26
    TestCaseWithTransport,
 
27
    )
 
28
from .features import (
25
29
    SymlinkFeature,
26
 
    TestCaseWithTransport,
27
30
    )
28
 
from bzrlib.tests.test_revision import make_branches
 
31
from .matchers import RevisionHistoryMatches
29
32
 
30
33
 
31
34
class TestCommitMerge(TestCaseWithTransport):
40
43
        wtx = self.make_branch_and_tree('x')
41
44
        base_rev = wtx.commit('common parent')
42
45
        bx = wtx.branch
43
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
46
        wty = wtx.controldir.sprout('y').open_workingtree()
44
47
        by = wty.branch
45
48
 
46
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
49
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
 
50
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
48
51
 
49
52
        by.fetch(bx)
50
53
        # just having the history there does nothing
51
54
        self.assertRaises(PointlessCommit,
52
55
                          wty.commit,
53
 
                          'no changes yet', rev_id='y@u-0-2',
 
56
                          'no changes yet', rev_id=b'y@u-0-2',
54
57
                          allow_pointless=False)
55
58
        wty.merge_from_branch(bx)
56
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
59
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
57
60
 
58
 
        self.assertEquals(by.revno(), 3)
59
 
        self.assertEquals(list(by.revision_history()),
60
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
61
 
        rev = by.repository.get_revision('y@u-0-2')
62
 
        self.assertEquals(rev.parent_ids,
63
 
                          ['y@u-0-1', 'x@u-0-1'])
 
61
        self.assertEqual(by.revno(), 3)
 
62
        graph = wty.branch.repository.get_graph()
 
63
        self.addCleanup(wty.lock_read().unlock)
 
64
        self.assertThat(by,
 
65
            RevisionHistoryMatches([base_rev, b'y@u-0-1', b'y@u-0-2'])
 
66
            )
 
67
        rev = by.repository.get_revision(b'y@u-0-2')
 
68
        self.assertEqual(rev.parent_ids,
 
69
                          [b'y@u-0-1', b'x@u-0-1'])
64
70
 
65
71
    def test_merge_new_file(self):
66
72
        """Commit merge of two trees with no overlapping files."""
68
74
        base_rev = wtx.commit('common parent')
69
75
        bx = wtx.branch
70
76
        wtx.commit('establish root id')
71
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
77
        wty = wtx.controldir.sprout('y').open_workingtree()
72
78
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
73
79
        by = wty.branch
74
80
 
75
81
        self.build_tree(['x/ecks', 'y/why'])
76
82
 
77
 
        wtx.add(['ecks'], ['ecks-id'])
78
 
        wty.add(['why'], ['why-id'])
 
83
        wtx.add(['ecks'], [b'ecks-id'])
 
84
        wty.add(['why'], [b'why-id'])
79
85
 
80
 
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
 
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
86
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
 
87
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
82
88
 
83
89
        wty.merge_from_branch(bx)
84
90
 
90
96
                          'partial commit', allow_pointless=False,
91
97
                          specific_files=['ecks'])
92
98
 
93
 
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
 
        tree = by.repository.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')
 
99
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
100
        tree = by.repository.revision_tree(b'y@u-0-2')
 
101
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
98
103
 
99
104
        check.check_dwim(bx.base, False, True, True)
100
105
        check.check_dwim(by.base, False, True, True)
105
110
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
106
111
        tree_a.add('link')
107
112
        tree_a.commit('added link')
108
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
113
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
109
114
        self.build_tree(['tree_a/file'])
110
115
        tree_a.add('file')
111
116
        tree_a.commit('added file')