/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: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
21
21
    check,
22
22
    osutils,
23
23
    )
24
 
from ..commit import PointlessCommit
 
24
from ..errors import PointlessCommit
25
25
from . import (
26
26
    TestCaseWithTransport,
27
27
    )
46
46
        wty = wtx.controldir.sprout('y').open_workingtree()
47
47
        by = wty.branch
48
48
 
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)
 
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
51
51
 
52
52
        by.fetch(bx)
53
53
        # just having the history there does nothing
54
54
        self.assertRaises(PointlessCommit,
55
55
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
56
                          'no changes yet', rev_id='y@u-0-2',
57
57
                          allow_pointless=False)
58
58
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
60
 
61
61
        self.assertEqual(by.revno(), 3)
62
62
        graph = wty.branch.repository.get_graph()
63
63
        self.addCleanup(wty.lock_read().unlock)
64
64
        self.assertThat(by,
65
 
                        RevisionHistoryMatches(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
 
67
        rev = by.repository.get_revision('y@u-0-2')
69
68
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
69
                          ['y@u-0-1', 'x@u-0-1'])
71
70
 
72
71
    def test_merge_new_file(self):
73
72
        """Commit merge of two trees with no overlapping files."""
76
75
        bx = wtx.branch
77
76
        wtx.commit('establish root id')
78
77
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
 
78
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
80
79
        by = wty.branch
81
80
 
82
81
        self.build_tree(['x/ecks', 'y/why'])
83
82
 
84
 
        wtx.add(['ecks'], [b'ecks-id'])
85
 
        wty.add(['why'], [b'why-id'])
 
83
        wtx.add(['ecks'], ['ecks-id'])
 
84
        wty.add(['why'], ['why-id'])
86
85
 
87
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
86
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
87
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
89
88
 
90
89
        wty.merge_from_branch(bx)
91
90
 
97
96
                          'partial commit', allow_pointless=False,
98
97
                          specific_files=['ecks'])
99
98
 
100
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree(b'y@u-0-2')
102
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
103
 
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
 
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
100
        tree = by.repository.revision_tree('y@u-0-2')
 
101
        self.assertEqual(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why-id'), 'y@u-0-1')
104
103
 
105
104
        check.check_dwim(bx.base, False, True, True)
106
105
        check.check_dwim(by.base, False, True, True)