1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
# Copyright (C) 2008, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests that get_record_stream() behaves itself properly when stacked."""
from bzrlib import (
errors,
knit,
)
from bzrlib.tests.per_repository_reference import (
TestCaseWithExternalReferenceRepository,
)
class TestGetRecordStream(TestCaseWithExternalReferenceRepository):
def setUp(self):
super(TestGetRecordStream, self).setUp()
builder = self.make_branch_builder('all')
builder.start_series()
# Graph of revisions:
#
# A
# |\
# B C
# |/|
# D E
# |\|
# F G
# These can be split up among the different repos as desired
#
builder.build_snapshot('A', None, [
('add', ('', 'root-id', 'directory', None)),
('add', ('file', 'f-id', 'file', 'initial content\n')),
])
builder.build_snapshot('B', ['A'], [
('modify', ('f-id', 'initial content\n'
'and B content\n')),
])
builder.build_snapshot('C', ['A'], [
('modify', ('f-id', 'initial content\n'
'and C content\n')),
])
builder.build_snapshot('D', ['B', 'C'], [
('modify', ('f-id', 'initial content\n'
'and B content\n'
'and C content\n')),
])
builder.build_snapshot('E', ['C'], [
('modify', ('f-id', 'initial content\n'
'and C content\n'
'and E content\n')),
])
builder.build_snapshot('F', ['D'], [
('modify', ('f-id', 'initial content\n'
'and B content\n'
'and C content\n'
'and F content\n')),
])
builder.build_snapshot('G', ['E', 'D'], [
('modify', ('f-id', 'initial content\n'
'and B content\n'
'and C content\n'
'and E content\n')),
])
builder.finish_series()
self.all_repo = builder.get_branch().repository
self.all_repo.lock_read()
self.addCleanup(self.all_repo.unlock)
self.base_repo = self.make_repository('base')
self.stacked_repo = self.make_referring('referring', self.base_repo)
def make_simple_split(self):
"""Set up the repositories so that everything is in base except F"""
self.base_repo.fetch(self.all_repo, revision_id='G')
self.stacked_repo.fetch(self.all_repo, revision_id='F')
def make_complex_split(self):
"""intermix the revisions so that base holds left stacked holds right.
base will hold
A B D F (and C because it is a parent of D)
referring will hold
C E G (only)
"""
self.base_repo.fetch(self.all_repo, revision_id='B')
self.stacked_repo.fetch(self.all_repo, revision_id='C')
self.base_repo.fetch(self.all_repo, revision_id='F')
self.stacked_repo.fetch(self.all_repo, revision_id='G')
def test_unordered_fetch_simple_split(self):
self.make_simple_split()
keys = [('f-id', r) for r in 'ABCDF']
self.stacked_repo.lock_read()
self.addCleanup(self.stacked_repo.unlock)
stream = self.stacked_repo.texts.get_record_stream(
keys, 'unordered', False)
record_keys = set()
for record in stream:
if record.storage_kind == 'absent':
raise ValueError('absent record: %s' % (record.key,))
record_keys.add(record.key)
# everything should be present, we don't care about the order
self.assertEqual(keys, sorted(record_keys))
def test_unordered_fetch_complex_split(self):
self.make_complex_split()
keys = [('f-id', r) for r in 'ABCDEG']
self.stacked_repo.lock_read()
self.addCleanup(self.stacked_repo.unlock)
stream = self.stacked_repo.texts.get_record_stream(
keys, 'unordered', False)
record_keys = set()
for record in stream:
if record.storage_kind == 'absent':
raise ValueError('absent record: %s' % (record.key,))
record_keys.add(record.key)
# everything should be present, we don't care about the order
self.assertEqual(keys, sorted(record_keys))
def test_ordered_no_closure(self):
self.make_complex_split()
# Topological ordering allows B & C and D & E to be returned with
# either one first, so the required ordering is:
# [A (B C) (D E) G]
keys = [('f-id', r) for r in 'ABCDEG']
alt_1 = [('f-id', r) for r in 'ACBDEG']
alt_2 = [('f-id', r) for r in 'ABCEDG']
alt_3 = [('f-id', r) for r in 'ACBEDG']
self.stacked_repo.lock_read()
self.addCleanup(self.stacked_repo.unlock)
stream = self.stacked_repo.texts.get_record_stream(
keys, 'topological', False)
record_keys = []
for record in stream:
if record.storage_kind == 'absent':
raise ValueError('absent record: %s' % (record.key,))
record_keys.append(record.key)
self.assertTrue(record_keys in (keys, alt_1, alt_2, alt_3))
def test_ordered_fulltext_simple(self):
self.make_simple_split()
# This is a common case in asking to annotate a file that exists on a
# stacked branch.
# See https://bugs.launchpad.net/bzr/+bug/393366
# Topological ordering allows B & C and D & E to be returned with
# either one first, so the required ordering is:
# [A (B C) D F]
keys = [('f-id', r) for r in 'ABCDF']
alt_1 = [('f-id', r) for r in 'ACBDF']
self.stacked_repo.lock_read()
self.addCleanup(self.stacked_repo.unlock)
stream = self.stacked_repo.texts.get_record_stream(
keys, 'topological', True)
record_keys = []
for record in stream:
if record.storage_kind == 'absent':
raise ValueError('absent record: %s' % (record.key,))
record_keys.append(record.key)
self.assertTrue(record_keys in (keys, alt_1))
def test_ordered_fulltext_complex(self):
self.make_complex_split()
# Topological ordering allows B & C and D & E to be returned with
# either one first, so the required ordering is:
# [A (B C) (D E) G]
keys = [('f-id', r) for r in 'ABCDEG']
alt_1 = [('f-id', r) for r in 'ACBDEG']
alt_2 = [('f-id', r) for r in 'ABCEDG']
alt_3 = [('f-id', r) for r in 'ACBEDG']
self.stacked_repo.lock_read()
self.addCleanup(self.stacked_repo.unlock)
stream = self.stacked_repo.texts.get_record_stream(
keys, 'topological', True)
record_keys = []
for record in stream:
if record.storage_kind == 'absent':
raise ValueError('absent record: %s' % (record.key,))
record_keys.append(record.key)
# Note that currently --2a format repositories do this correctly, but
# KnitPack format repositories do not.
if isinstance(self.stacked_repo.texts, knit.KnitVersionedFiles):
# See https://bugs.launchpad.net/bzr/+bug/399884
self.expectFailure('KVF does not weave fulltexts from fallback'
' repositories to preserve perfect order',
self.assertTrue, record_keys in (keys, alt_1, alt_2, alt_3))
self.assertTrue(record_keys in (keys, alt_1, alt_2, alt_3))
|