/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_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6928 work)
  • mto: (6940.2.6 base)
  • mto: This revision was merged to the branch mainline in revision 6941.
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_missing.py
40
40
        merger_tree = self.make_branch_and_tree('merger')
41
41
        merger = merger_tree.branch
42
42
        self.assertUnmerged(([], []), original, puller)
43
 
        original_tree.commit('a', rev_id='a')
 
43
        original_tree.commit('a', rev_id=b'a')
44
44
        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
45
45
        puller_tree.pull(original)
46
46
        self.assertUnmerged(([], []), original, puller)
47
47
        merger_tree.pull(original)
48
 
        original_tree.commit('b', rev_id='b')
49
 
        original_tree.commit('c', rev_id='c')
 
48
        original_tree.commit('b', rev_id=b'b')
 
49
        original_tree.commit('c', rev_id=b'c')
50
50
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
51
51
                            original, puller)
52
52
        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
59
59
        merger_tree.merge_from_branch(original)
60
60
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
61
61
                            original, merger)
62
 
        merger_tree.commit('d', rev_id='d')
 
62
        merger_tree.commit('d', rev_id=b'd')
63
63
        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
64
64
 
65
65
    def test_iter_log_revisions(self):
66
66
        base_tree = self.make_branch_and_tree('base')
67
67
        self.build_tree(['base/a'])
68
 
        base_tree.add(['a'], ['a-id'])
69
 
        base_tree.commit('add a', rev_id='b-1')
 
68
        base_tree.add(['a'], [b'a-id'])
 
69
        base_tree.commit('add a', rev_id=b'b-1')
70
70
 
71
71
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
72
72
 
73
73
        self.build_tree(['child/b'])
74
 
        child_tree.add(['b'], ['b-id'])
75
 
        child_tree.commit('adding b', rev_id='c-2')
 
74
        child_tree.add(['b'], [b'b-id'])
 
75
        child_tree.commit('adding b', rev_id=b'c-2')
76
76
 
77
77
        child_tree.remove(['a'])
78
 
        child_tree.commit('removing a', rev_id='c-3')
 
78
        child_tree.commit('removing a', rev_id=b'c-3')
79
79
 
80
 
        self.build_tree_contents([('child/b', 'new contents for b\n')])
81
 
        child_tree.commit('modifying b', rev_id='c-4')
 
80
        self.build_tree_contents([('child/b', b'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id=b'c-4')
82
82
 
83
83
        child_tree.rename_one('b', 'c')
84
 
        child_tree.commit('rename b=>c', rev_id='c-5')
 
84
        child_tree.commit('rename b=>c', rev_id=b'c-5')
85
85
 
86
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
87
87
                                                        child_tree.branch)
189
189
 
190
190
    def test_include_merged(self):
191
191
        tree = self.make_branch_and_tree('tree')
192
 
        rev1 = tree.commit('one', rev_id='rev1')
 
192
        rev1 = tree.commit('one', rev_id=b'rev1')
193
193
 
194
194
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
195
 
        rev2 = tree2.commit('two', rev_id='rev2')
196
 
        rev3 = tree2.commit('three', rev_id='rev3')
 
195
        rev2 = tree2.commit('two', rev_id=b'rev2')
 
196
        rev3 = tree2.commit('three', rev_id=b'rev3')
197
197
 
198
198
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
199
 
        rev4 = tree3.commit('four', rev_id='rev4')
200
 
        rev5 = tree3.commit('five', rev_id='rev5')
 
199
        rev4 = tree3.commit('four', rev_id=b'rev4')
 
200
        rev5 = tree3.commit('five', rev_id=b'rev5')
201
201
 
202
202
        tree2.merge_from_branch(tree3.branch)
203
 
        rev6 = tree2.commit('six', rev_id='rev6')
 
203
        rev6 = tree2.commit('six', rev_id=b'rev6')
204
204
 
205
205
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
206
206
                                 ('4', 'rev6', 0),