38
38
def make_three_vf(self):
39
39
vf = self.make_vf()
40
vf.add_lines((b'one',), (), [b'first\n'])
41
vf.add_lines((b'two',), [(b'one',)], [b'first\n', b'second\n'])
42
vf.add_lines((b'three',), [(b'one',), (b'two',)],
43
[b'first\n', b'second\n', b'third\n'])
40
vf.add_lines(('one',), (), ['first\n'])
41
vf.add_lines(('two',), [('one',)], ['first\n', 'second\n'])
42
vf.add_lines(('three',), [('one',), ('two',)],
43
['first\n', 'second\n', 'third\n'])
46
46
def test_finds_parents(self):
47
47
vf = self.make_three_vf()
48
gen = versionedfile._MPDiffGenerator(vf, [(b'three',)])
48
gen = versionedfile._MPDiffGenerator(vf, [('three',)])
49
49
needed_keys, refcount = gen._find_needed_keys()
50
self.assertEqual(sorted([(b'one',), (b'two',), (b'three',)]),
50
self.assertEqual(sorted([('one',), ('two',), ('three',)]),
51
51
sorted(needed_keys))
52
self.assertEqual({(b'one',): 1, (b'two',): 1}, refcount)
52
self.assertEqual({('one',): 1, ('two',): 1}, refcount)
54
54
def test_ignores_ghost_parents(self):
55
55
# If a parent is a ghost, it is just ignored
56
56
vf = self.make_vf()
57
vf.add_lines((b'two',), [(b'one',)], [b'first\n', b'second\n'])
58
gen = versionedfile._MPDiffGenerator(vf, [(b'two',)])
57
vf.add_lines(('two',), [('one',)], ['first\n', 'second\n'])
58
gen = versionedfile._MPDiffGenerator(vf, [('two',)])
59
59
needed_keys, refcount = gen._find_needed_keys()
60
self.assertEqual(sorted([(b'two',)]), sorted(needed_keys))
60
self.assertEqual(sorted([('two',)]), sorted(needed_keys))
61
61
# It is returned, but we don't really care as we won't extract it
62
self.assertEqual({(b'one',): 1}, refcount)
63
self.assertEqual([(b'one',)], sorted(gen.ghost_parents))
62
self.assertEqual({('one',): 1}, refcount)
63
self.assertEqual([('one',)], sorted(gen.ghost_parents))
64
64
self.assertEqual([], sorted(gen.present_parents))
66
66
def test_raises_on_ghost_keys(self):
67
67
# If the requested key is a ghost, then we have a problem
68
68
vf = self.make_vf()
69
gen = versionedfile._MPDiffGenerator(vf, [(b'one',)])
69
gen = versionedfile._MPDiffGenerator(vf, [('one',)])
70
70
self.assertRaises(errors.RevisionNotPresent,
71
71
gen._find_needed_keys)
73
73
def test_refcount_multiple_children(self):
74
74
vf = self.make_three_vf()
75
gen = versionedfile._MPDiffGenerator(vf, [(b'two',), (b'three',)])
75
gen = versionedfile._MPDiffGenerator(vf, [('two',), ('three',)])
76
76
needed_keys, refcount = gen._find_needed_keys()
77
self.assertEqual(sorted([(b'one',), (b'two',), (b'three',)]),
77
self.assertEqual(sorted([('one',), ('two',), ('three',)]),
78
78
sorted(needed_keys))
79
self.assertEqual({(b'one',): 2, (b'two',): 1}, refcount)
80
self.assertEqual([(b'one',)], sorted(gen.present_parents))
79
self.assertEqual({('one',): 2, ('two',): 1}, refcount)
80
self.assertEqual([('one',)], sorted(gen.present_parents))
82
82
def test_process_contents(self):
83
83
vf = self.make_three_vf()
84
gen = versionedfile._MPDiffGenerator(vf, [(b'two',), (b'three',)])
84
gen = versionedfile._MPDiffGenerator(vf, [('two',), ('three',)])
85
85
gen._find_needed_keys()
86
self.assertEqual({(b'two',): ((b'one',),),
87
(b'three',): ((b'one',), (b'two',))},
86
self.assertEqual({('two',): (('one',),),
87
('three',): (('one',), ('two',))},
89
self.assertEqual({(b'one',): 2, (b'two',): 1}, gen.refcounts)
90
self.assertEqual(sorted([(b'one',), (b'two',), (b'three',)]),
89
self.assertEqual({('one',): 2, ('two',): 1}, gen.refcounts)
90
self.assertEqual(sorted([('one',), ('two',), ('three',)]),
91
91
sorted(gen.needed_keys))
92
92
stream = vf.get_record_stream(gen.needed_keys, 'topological', True)
93
93
record = next(stream)
94
self.assertEqual((b'one',), record.key)
94
self.assertEqual(('one',), record.key)
95
95
# one is not needed in the output, but it is needed by children. As
96
96
# such, it should end up in the various caches
97
97
gen._process_one_record(record.key, record.get_bytes_as('chunked'))
98
98
# The chunks should be cached, the refcount untouched
99
self.assertEqual({(b'one',)}, set(gen.chunks))
100
self.assertEqual({(b'one',): 2, (b'two',): 1}, gen.refcounts)
99
self.assertEqual({('one',)}, set(gen.chunks))
100
self.assertEqual({('one',): 2, ('two',): 1}, gen.refcounts)
101
101
self.assertEqual(set(), set(gen.diffs))
102
102
# Next we get 'two', which is something we output, but also needed for
104
104
record = next(stream)
105
self.assertEqual((b'two',), record.key)
105
self.assertEqual(('two',), record.key)
106
106
gen._process_one_record(record.key, record.get_bytes_as('chunked'))
107
107
# Both are now cached, and the diff for two has been extracted, and
108
108
# one's refcount has been updated. two has been removed from the
110
self.assertEqual({(b'one',), (b'two',)}, set(gen.chunks))
111
self.assertEqual({(b'one',): 1, (b'two',): 1}, gen.refcounts)
112
self.assertEqual({(b'two',)}, set(gen.diffs))
113
self.assertEqual({(b'three',): ((b'one',), (b'two',))},
110
self.assertEqual({('one',), ('two',)}, set(gen.chunks))
111
self.assertEqual({('one',): 1, ('two',): 1}, gen.refcounts)
112
self.assertEqual({('two',)}, set(gen.diffs))
113
self.assertEqual({('three',): (('one',), ('two',))},
115
115
# Finally 'three', which allows us to remove all parents from the
117
117
record = next(stream)
118
self.assertEqual((b'three',), record.key)
118
self.assertEqual(('three',), record.key)
119
119
gen._process_one_record(record.key, record.get_bytes_as('chunked'))
120
120
# Both are now cached, and the diff for two has been extracted, and
121
121
# one's refcount has been updated
122
122
self.assertEqual(set(), set(gen.chunks))
123
123
self.assertEqual({}, gen.refcounts)
124
self.assertEqual({(b'two',), (b'three',)}, set(gen.diffs))
124
self.assertEqual({('two',), ('three',)}, set(gen.diffs))
126
126
def test_compute_diffs(self):
127
127
vf = self.make_three_vf()
128
128
# The content is in the order requested, even if it isn't topological
129
gen = versionedfile._MPDiffGenerator(vf, [(b'two',), (b'three',),
129
gen = versionedfile._MPDiffGenerator(vf, [('two',), ('three',),
131
131
diffs = gen.compute_diffs()
132
132
expected_diffs = [
133
133
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
134
multiparent.NewText([b'second\n'])]),
134
multiparent.NewText(['second\n'])]),
135
135
multiparent.MultiParent([multiparent.ParentText(1, 0, 0, 2),
136
multiparent.NewText([b'third\n'])]),
137
multiparent.MultiParent([multiparent.NewText([b'first\n'])]),
136
multiparent.NewText(['third\n'])]),
137
multiparent.MultiParent([multiparent.NewText(['first\n'])]),
139
139
self.assertEqual(expected_diffs, diffs)