53
53
merger_tree.commit('d', rev_id='d')
54
54
self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
56
def test_iter_log_data(self):
57
base_tree = self.make_branch_and_tree('base')
58
self.build_tree(['base/a'])
59
base_tree.add(['a'], ['a-id'])
60
base_tree.commit('add a', rev_id='b-1')
62
child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
64
self.build_tree(['child/b'])
65
child_tree.add(['b'], ['b-id'])
66
child_tree.commit('adding b', rev_id='c-2')
68
child_tree.remove(['a'])
69
child_tree.commit('removing a', rev_id='c-3')
71
self.build_tree_contents([('child/b', 'new contents for b\n')])
72
child_tree.commit('modifying b', rev_id='c-4')
74
child_tree.rename_one('b', 'c')
75
child_tree.commit('rename b=>c', rev_id='c-5')
77
base_extra, child_extra = find_unmerged(base_tree.branch,
79
results = list(iter_log_data(base_extra, base_tree.branch.repository,
81
self.assertEqual([], results)
83
results = list(iter_log_data(child_extra, child_tree.branch.repository,
85
self.assertEqual(4, len(results))
89
self.assertEqual((2, 'c-2'), (r0[0], r0[1].revision_id))
90
self.assertEqual((3, 'c-3'), (r1[0], r1[1].revision_id))
91
self.assertEqual((4, 'c-4'), (r2[0], r2[1].revision_id))
92
self.assertEqual((5, 'c-5'), (r3[0], r3[1].revision_id))
95
self.assertNotEqual(None, delta0)
96
self.assertEqual([('b', 'b-id', 'file')], delta0.added)
97
self.assertEqual([], delta0.removed)
98
self.assertEqual([], delta0.renamed)
99
self.assertEqual([], delta0.modified)
102
self.assertNotEqual(None, delta1)
103
self.assertEqual([], delta1.added)
104
self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
105
self.assertEqual([], delta1.renamed)
106
self.assertEqual([], delta1.modified)
109
self.assertNotEqual(None, delta2)
110
self.assertEqual([], delta2.added)
111
self.assertEqual([], delta2.removed)
112
self.assertEqual([], delta2.renamed)
113
self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
116
self.assertNotEqual(None, delta3)
117
self.assertEqual([], delta3.added)
118
self.assertEqual([], delta3.removed)
119
self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
121
self.assertEqual([], delta3.modified)