/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
1
# Copyright (C) 2005, 2009 Canonical Ltd
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
2
#
3
# Authors:
4
#   Johan Rydberg <jrydberg@gnu.org>
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
10
#
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
11
# This program is distributed in the hope that it will be useful,
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
15
#
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
19
20
1704.2.15 by Martin Pool
Remove TODO about knit testing printed from test suite
21
# TODO: might be nice to create a versionedfile with some type of corruption
22
# considered typical and check that it can be detected/corrected.
23
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
24
from itertools import chain, izip
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
25
from StringIO import StringIO
26
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
27
from bzrlib import (
28
    errors,
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
29
    graph as _mod_graph,
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
30
    groupcompress,
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
31
    knit as _mod_knit,
2309.4.7 by John Arbash Meinel
Update VersionedFile tests to ensure that they can take Unicode,
32
    osutils,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
33
    progress,
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
34
    ui,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
35
    )
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
36
from bzrlib.errors import (
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
37
                           RevisionNotPresent,
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
38
                           RevisionAlreadyPresent,
39
                           WeaveParentMismatch
40
                           )
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
41
from bzrlib.knit import (
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
42
    cleanup_pack_knit,
43
    make_file_factory,
44
    make_pack_factory,
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
45
    KnitAnnotateFactory,
2770.1.10 by Aaron Bentley
Merge bzr.dev
46
    KnitPlainFactory,
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
47
    )
3350.6.2 by Robert Collins
Prepare parameterised test environment.
48
from bzrlib.tests import (
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
49
    TestCase,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
50
    TestCaseWithMemoryTransport,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
51
    TestNotApplicable,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
52
    TestSkipped,
53
    condition_isinstance,
54
    split_suite_by_condition,
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
55
    multiply_tests,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
56
    )
2929.3.8 by Vincent Ladeuil
Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix uses.
57
from bzrlib.tests.http_utils import TestCaseWithWebserver
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
58
from bzrlib.trace import mutter
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
59
from bzrlib.transport import get_transport
1563.2.13 by Robert Collins
InterVersionedFile implemented.
60
from bzrlib.transport.memory import MemoryTransport
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
61
from bzrlib.tsort import topo_sort
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
62
from bzrlib.tuned_gzip import GzipFile
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
63
import bzrlib.versionedfile as versionedfile
3350.6.2 by Robert Collins
Prepare parameterised test environment.
64
from bzrlib.versionedfile import (
65
    ConstantMapper,
66
    HashEscapedPrefixMapper,
67
    PrefixMapper,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
68
    VirtualVersionedFiles,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
69
    make_versioned_files_factory,
70
    )
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
71
from bzrlib.weave import WeaveFile
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
72
from bzrlib.weavefile import read_weave, write_weave
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
73
74
3350.6.2 by Robert Collins
Prepare parameterised test environment.
75
def load_tests(standard_tests, module, loader):
76
    """Parameterize VersionedFiles tests for different implementations."""
77
    to_adapt, result = split_suite_by_condition(
78
        standard_tests, condition_isinstance(TestVersionedFiles))
79
    # We want to be sure of behaviour for:
80
    # weaves prefix layout (weave texts)
81
    # individually named weaves (weave inventories)
82
    # annotated knits - prefix|hash|hash-escape layout, we test the third only
83
    #                   as it is the most complex mapper.
84
    # individually named knits
85
    # individual no-graph knits in packs (signatures)
86
    # individual graph knits in packs (inventories)
87
    # individual graph nocompression knits in packs (revisions)
88
    # plain text knits in packs (texts)
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
89
    len_one_scenarios = [
3350.6.2 by Robert Collins
Prepare parameterised test environment.
90
        ('weave-named', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
91
            'cleanup':None,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
92
            'factory':make_versioned_files_factory(WeaveFile,
93
                ConstantMapper('inventory')),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
94
            'graph':True,
95
            'key_length':1,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
96
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
97
            }),
98
        ('named-knit', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
99
            'cleanup':None,
100
            'factory':make_file_factory(False, ConstantMapper('revisions')),
101
            'graph':True,
102
            'key_length':1,
4009.3.7 by Andrew Bennetts
Most tests passing.
103
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
104
            }),
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
105
        ('named-nograph-nodelta-knit-pack', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
106
            'cleanup':cleanup_pack_knit,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
107
            'factory':make_pack_factory(False, False, 1),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
108
            'graph':False,
109
            'key_length':1,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
110
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
111
            }),
112
        ('named-graph-knit-pack', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
113
            'cleanup':cleanup_pack_knit,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
114
            'factory':make_pack_factory(True, True, 1),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
115
            'graph':True,
116
            'key_length':1,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
117
            'support_partial_insertion': True,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
118
            }),
119
        ('named-graph-nodelta-knit-pack', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
120
            'cleanup':cleanup_pack_knit,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
121
            'factory':make_pack_factory(True, False, 1),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
122
            'graph':True,
123
            'key_length':1,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
124
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
125
            }),
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
126
        ('groupcompress-nograph', {
127
            'cleanup':groupcompress.cleanup_pack_group,
128
            'factory':groupcompress.make_pack_factory(False, False, 1),
129
            'graph': False,
130
            'key_length':1,
131
            'support_partial_insertion':False,
132
            }),
3350.6.2 by Robert Collins
Prepare parameterised test environment.
133
        ]
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
134
    len_two_scenarios = [
3350.6.2 by Robert Collins
Prepare parameterised test environment.
135
        ('weave-prefix', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
136
            'cleanup':None,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
137
            'factory':make_versioned_files_factory(WeaveFile,
138
                PrefixMapper()),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
139
            'graph':True,
140
            'key_length':2,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
141
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
142
            }),
143
        ('annotated-knit-escape', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
144
            'cleanup':None,
145
            'factory':make_file_factory(True, HashEscapedPrefixMapper()),
146
            'graph':True,
147
            'key_length':2,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
148
            'support_partial_insertion': False,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
149
            }),
150
        ('plain-knit-pack', {
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
151
            'cleanup':cleanup_pack_knit,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
152
            'factory':make_pack_factory(True, True, 2),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
153
            'graph':True,
154
            'key_length':2,
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
155
            'support_partial_insertion': True,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
156
            }),
3735.31.10 by John Arbash Meinel
Add groupcompress with multiple parents.
157
        ('groupcompress', {
158
            'cleanup':groupcompress.cleanup_pack_group,
159
            'factory':groupcompress.make_pack_factory(True, False, 1),
160
            'graph': True,
161
            'key_length':1,
162
            'support_partial_insertion':False,
163
            }),
3350.6.2 by Robert Collins
Prepare parameterised test environment.
164
        ]
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
165
    scenarios = len_one_scenarios + len_two_scenarios
166
    return multiply_tests(to_adapt, scenarios, result)
3350.6.2 by Robert Collins
Prepare parameterised test environment.
167
168
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
169
def get_diamond_vf(f, trailing_eol=True, left_only=False):
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
170
    """Get a diamond graph to exercise deltas and merges.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
171
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
172
    :param trailing_eol: If True end the last line with \n.
173
    """
174
    parents = {
175
        'origin': (),
176
        'base': (('origin',),),
177
        'left': (('base',),),
178
        'right': (('base',),),
179
        'merged': (('left',), ('right',)),
180
        }
181
    # insert a diamond graph to exercise deltas and merges.
182
    if trailing_eol:
183
        last_char = '\n'
184
    else:
185
        last_char = ''
186
    f.add_lines('origin', [], ['origin' + last_char])
187
    f.add_lines('base', ['origin'], ['base' + last_char])
188
    f.add_lines('left', ['base'], ['base\n', 'left' + last_char])
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
189
    if not left_only:
190
        f.add_lines('right', ['base'],
191
            ['base\n', 'right' + last_char])
192
        f.add_lines('merged', ['left', 'right'],
193
            ['base\n', 'left\n', 'right\n', 'merged' + last_char])
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
194
    return f, parents
195
196
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
197
def get_diamond_files(files, key_length, trailing_eol=True, left_only=False,
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
198
    nograph=False, nokeys=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
199
    """Get a diamond graph to exercise deltas and merges.
200
201
    This creates a 5-node graph in files. If files supports 2-length keys two
202
    graphs are made to exercise the support for multiple ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
203
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
204
    :param trailing_eol: If True end the last line with \n.
205
    :param key_length: The length of keys in files. Currently supports length 1
206
        and 2 keys.
207
    :param left_only: If True do not add the right and merged nodes.
208
    :param nograph: If True, do not provide parents to the add_lines calls;
209
        this is useful for tests that need inserted data but have graphless
210
        stores.
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
211
    :param nokeys: If True, pass None is as the key for all insertions.
212
        Currently implies nograph.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
213
    :return: The results of the add_lines calls.
214
    """
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
215
    if nokeys:
216
        nograph = True
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
217
    if key_length == 1:
218
        prefixes = [()]
219
    else:
220
        prefixes = [('FileA',), ('FileB',)]
221
    # insert a diamond graph to exercise deltas and merges.
222
    if trailing_eol:
223
        last_char = '\n'
224
    else:
225
        last_char = ''
226
    result = []
227
    def get_parents(suffix_list):
228
        if nograph:
229
            return ()
230
        else:
231
            result = [prefix + suffix for suffix in suffix_list]
232
            return result
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
233
    def get_key(suffix):
234
        if nokeys:
235
            return (None, )
236
        else:
237
            return (suffix,)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
238
    # we loop over each key because that spreads the inserts across prefixes,
239
    # which is how commit operates.
240
    for prefix in prefixes:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
241
        result.append(files.add_lines(prefix + get_key('origin'), (),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
242
            ['origin' + last_char]))
243
    for prefix in prefixes:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
244
        result.append(files.add_lines(prefix + get_key('base'),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
245
            get_parents([('origin',)]), ['base' + last_char]))
246
    for prefix in prefixes:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
247
        result.append(files.add_lines(prefix + get_key('left'),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
248
            get_parents([('base',)]),
249
            ['base\n', 'left' + last_char]))
250
    if not left_only:
251
        for prefix in prefixes:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
252
            result.append(files.add_lines(prefix + get_key('right'),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
253
                get_parents([('base',)]),
254
                ['base\n', 'right' + last_char]))
255
        for prefix in prefixes:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
256
            result.append(files.add_lines(prefix + get_key('merged'),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
257
                get_parents([('left',), ('right',)]),
258
                ['base\n', 'left\n', 'right\n', 'merged' + last_char]))
259
    return result
260
261
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
262
class VersionedFileTestMixIn(object):
263
    """A mixin test class for testing VersionedFiles.
264
265
    This is not an adaptor-style test at this point because
266
    theres no dynamic substitution of versioned file implementations,
267
    they are strictly controlled by their owning repositories.
268
    """
269
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
270
    def get_transaction(self):
271
        if not hasattr(self, '_transaction'):
272
            self._transaction = None
273
        return self._transaction
274
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
275
    def test_add(self):
276
        f = self.get_file()
277
        f.add_lines('r0', [], ['a\n', 'b\n'])
278
        f.add_lines('r1', ['r0'], ['b\n', 'c\n'])
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
279
        def verify_file(f):
280
            versions = f.versions()
281
            self.assertTrue('r0' in versions)
282
            self.assertTrue('r1' in versions)
283
            self.assertEquals(f.get_lines('r0'), ['a\n', 'b\n'])
284
            self.assertEquals(f.get_text('r0'), 'a\nb\n')
285
            self.assertEquals(f.get_lines('r1'), ['b\n', 'c\n'])
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
286
            self.assertEqual(2, len(f))
287
            self.assertEqual(2, f.num_versions())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
289
            self.assertRaises(RevisionNotPresent,
290
                f.add_lines, 'r2', ['foo'], [])
291
            self.assertRaises(RevisionAlreadyPresent,
292
                f.add_lines, 'r1', [], [])
293
        verify_file(f)
1666.1.6 by Robert Collins
Make knit the default format.
294
        # this checks that reopen with create=True does not break anything.
295
        f = self.reopen_file(create=True)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
296
        verify_file(f)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
297
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
298
    def test_adds_with_parent_texts(self):
299
        f = self.get_file()
300
        parent_texts = {}
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
301
        _, _, parent_texts['r0'] = f.add_lines('r0', [], ['a\n', 'b\n'])
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
302
        try:
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
303
            _, _, parent_texts['r1'] = f.add_lines_with_ghosts('r1',
304
                ['r0', 'ghost'], ['b\n', 'c\n'], parent_texts=parent_texts)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
305
        except NotImplementedError:
306
            # if the format doesn't support ghosts, just add normally.
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
307
            _, _, parent_texts['r1'] = f.add_lines('r1',
308
                ['r0'], ['b\n', 'c\n'], parent_texts=parent_texts)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
309
        f.add_lines('r2', ['r1'], ['c\n', 'd\n'], parent_texts=parent_texts)
310
        self.assertNotEqual(None, parent_texts['r0'])
311
        self.assertNotEqual(None, parent_texts['r1'])
312
        def verify_file(f):
313
            versions = f.versions()
314
            self.assertTrue('r0' in versions)
315
            self.assertTrue('r1' in versions)
316
            self.assertTrue('r2' in versions)
317
            self.assertEquals(f.get_lines('r0'), ['a\n', 'b\n'])
318
            self.assertEquals(f.get_lines('r1'), ['b\n', 'c\n'])
319
            self.assertEquals(f.get_lines('r2'), ['c\n', 'd\n'])
320
            self.assertEqual(3, f.num_versions())
321
            origins = f.annotate('r1')
322
            self.assertEquals(origins[0][0], 'r0')
323
            self.assertEquals(origins[1][0], 'r1')
324
            origins = f.annotate('r2')
325
            self.assertEquals(origins[0][0], 'r1')
326
            self.assertEquals(origins[1][0], 'r2')
327
328
        verify_file(f)
329
        f = self.reopen_file()
330
        verify_file(f)
331
2805.6.7 by Robert Collins
Review feedback.
332
    def test_add_unicode_content(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
333
        # unicode content is not permitted in versioned files.
2805.6.7 by Robert Collins
Review feedback.
334
        # versioned files version sequences of bytes only.
335
        vf = self.get_file()
336
        self.assertRaises(errors.BzrBadParameterUnicode,
337
            vf.add_lines, 'a', [], ['a\n', u'b\n', 'c\n'])
338
        self.assertRaises(
339
            (errors.BzrBadParameterUnicode, NotImplementedError),
340
            vf.add_lines_with_ghosts, 'a', [], ['a\n', u'b\n', 'c\n'])
341
2520.4.150 by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines
342
    def test_add_follows_left_matching_blocks(self):
343
        """If we change left_matching_blocks, delta changes
344
345
        Note: There are multiple correct deltas in this case, because
346
        we start with 1 "a" and we get 3.
347
        """
348
        vf = self.get_file()
349
        if isinstance(vf, WeaveFile):
350
            raise TestSkipped("WeaveFile ignores left_matching_blocks")
351
        vf.add_lines('1', [], ['a\n'])
352
        vf.add_lines('2', ['1'], ['a\n', 'a\n', 'a\n'],
353
                     left_matching_blocks=[(0, 0, 1), (1, 3, 0)])
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
354
        self.assertEqual(['a\n', 'a\n', 'a\n'], vf.get_lines('2'))
2520.4.150 by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines
355
        vf.add_lines('3', ['1'], ['a\n', 'a\n', 'a\n'],
356
                     left_matching_blocks=[(0, 2, 1), (1, 3, 0)])
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
357
        self.assertEqual(['a\n', 'a\n', 'a\n'], vf.get_lines('3'))
2520.4.150 by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines
358
2805.6.7 by Robert Collins
Review feedback.
359
    def test_inline_newline_throws(self):
360
        # \r characters are not permitted in lines being added
361
        vf = self.get_file()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
362
        self.assertRaises(errors.BzrBadParameterContainsNewline,
2805.6.7 by Robert Collins
Review feedback.
363
            vf.add_lines, 'a', [], ['a\n\n'])
364
        self.assertRaises(
365
            (errors.BzrBadParameterContainsNewline, NotImplementedError),
366
            vf.add_lines_with_ghosts, 'a', [], ['a\n\n'])
367
        # but inline CR's are allowed
368
        vf.add_lines('a', [], ['a\r\n'])
369
        try:
370
            vf.add_lines_with_ghosts('b', [], ['a\r\n'])
371
        except NotImplementedError:
372
            pass
373
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
374
    def test_add_reserved(self):
375
        vf = self.get_file()
376
        self.assertRaises(errors.ReservedId,
377
            vf.add_lines, 'a:', [], ['a\n', 'b\n', 'c\n'])
378
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
379
    def test_add_lines_nostoresha(self):
380
        """When nostore_sha is supplied using old content raises."""
381
        vf = self.get_file()
382
        empty_text = ('a', [])
383
        sample_text_nl = ('b', ["foo\n", "bar\n"])
384
        sample_text_no_nl = ('c', ["foo\n", "bar"])
385
        shas = []
386
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
387
            sha, _, _ = vf.add_lines(version, [], lines)
388
            shas.append(sha)
389
        # we now have a copy of all the lines in the vf.
390
        for sha, (version, lines) in zip(
391
            shas, (empty_text, sample_text_nl, sample_text_no_nl)):
392
            self.assertRaises(errors.ExistingContent,
393
                vf.add_lines, version + "2", [], lines,
394
                nostore_sha=sha)
395
            # and no new version should have been added.
396
            self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
397
                version + "2")
398
2803.1.1 by Robert Collins
Fix typo in ghosts version of test_add_lines_nostoresha.
399
    def test_add_lines_with_ghosts_nostoresha(self):
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
400
        """When nostore_sha is supplied using old content raises."""
401
        vf = self.get_file()
402
        empty_text = ('a', [])
403
        sample_text_nl = ('b', ["foo\n", "bar\n"])
404
        sample_text_no_nl = ('c', ["foo\n", "bar"])
405
        shas = []
406
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
407
            sha, _, _ = vf.add_lines(version, [], lines)
408
            shas.append(sha)
409
        # we now have a copy of all the lines in the vf.
410
        # is the test applicable to this vf implementation?
411
        try:
412
            vf.add_lines_with_ghosts('d', [], [])
413
        except NotImplementedError:
414
            raise TestSkipped("add_lines_with_ghosts is optional")
415
        for sha, (version, lines) in zip(
416
            shas, (empty_text, sample_text_nl, sample_text_no_nl)):
417
            self.assertRaises(errors.ExistingContent,
418
                vf.add_lines_with_ghosts, version + "2", [], lines,
419
                nostore_sha=sha)
420
            # and no new version should have been added.
421
            self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
422
                version + "2")
423
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
424
    def test_add_lines_return_value(self):
425
        # add_lines should return the sha1 and the text size.
426
        vf = self.get_file()
427
        empty_text = ('a', [])
428
        sample_text_nl = ('b', ["foo\n", "bar\n"])
429
        sample_text_no_nl = ('c', ["foo\n", "bar"])
430
        # check results for the three cases:
431
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
432
            # the first two elements are the same for all versioned files:
433
            # - the digest and the size of the text. For some versioned files
434
            #   additional data is returned in additional tuple elements.
435
            result = vf.add_lines(version, [], lines)
436
            self.assertEqual(3, len(result))
437
            self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
438
                result[0:2])
439
        # parents should not affect the result:
440
        lines = sample_text_nl[1]
441
        self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
442
            vf.add_lines('d', ['b', 'c'], lines)[0:2])
443
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
444
    def test_get_reserved(self):
445
        vf = self.get_file()
446
        self.assertRaises(errors.ReservedId, vf.get_texts, ['b:'])
447
        self.assertRaises(errors.ReservedId, vf.get_lines, 'b:')
448
        self.assertRaises(errors.ReservedId, vf.get_text, 'b:')
449
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
450
    def test_add_unchanged_last_line_noeol_snapshot(self):
451
        """Add a text with an unchanged last line with no eol should work."""
452
        # Test adding this in a number of chain lengths; because the interface
453
        # for VersionedFile does not allow forcing a specific chain length, we
454
        # just use a small base to get the first snapshot, then a much longer
455
        # first line for the next add (which will make the third add snapshot)
456
        # and so on. 20 has been chosen as an aribtrary figure - knits use 200
457
        # as a capped delta length, but ideally we would have some way of
458
        # tuning the test to the store (e.g. keep going until a snapshot
459
        # happens).
460
        for length in range(20):
461
            version_lines = {}
462
            vf = self.get_file('case-%d' % length)
463
            prefix = 'step-%d'
464
            parents = []
465
            for step in range(length):
466
                version = prefix % step
467
                lines = (['prelude \n'] * step) + ['line']
468
                vf.add_lines(version, parents, lines)
469
                version_lines[version] = lines
470
                parents = [version]
471
            vf.add_lines('no-eol', parents, ['line'])
472
            vf.get_texts(version_lines.keys())
473
            self.assertEqualDiff('line', vf.get_text('no-eol'))
474
475
    def test_get_texts_eol_variation(self):
476
        # similar to the failure in <http://bugs.launchpad.net/234748>
477
        vf = self.get_file()
478
        sample_text_nl = ["line\n"]
479
        sample_text_no_nl = ["line"]
480
        versions = []
481
        version_lines = {}
482
        parents = []
483
        for i in range(4):
484
            version = 'v%d' % i
485
            if i % 2:
486
                lines = sample_text_nl
487
            else:
488
                lines = sample_text_no_nl
489
            # left_matching blocks is an internal api; it operates on the
490
            # *internal* representation for a knit, which is with *all* lines
491
            # being normalised to end with \n - even the final line in a no_nl
492
            # file. Using it here ensures that a broken internal implementation
493
            # (which is what this test tests) will generate a correct line
494
            # delta (which is to say, an empty delta).
495
            vf.add_lines(version, parents, lines,
496
                left_matching_blocks=[(0, 0, 1)])
497
            parents = [version]
498
            versions.append(version)
499
            version_lines[version] = lines
500
        vf.check()
501
        vf.get_texts(versions)
502
        vf.get_texts(reversed(versions))
503
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
504
    def test_add_lines_with_matching_blocks_noeol_last_line(self):
505
        """Add a text with an unchanged last line with no eol should work."""
506
        from bzrlib import multiparent
507
        # Hand verified sha1 of the text we're adding.
508
        sha1 = '6a1d115ec7b60afb664dc14890b5af5ce3c827a4'
509
        # Create a mpdiff which adds a new line before the trailing line, and
510
        # reuse the last line unaltered (which can cause annotation reuse).
511
        # Test adding this in two situations:
512
        # On top of a new insertion
513
        vf = self.get_file('fulltext')
514
        vf.add_lines('noeol', [], ['line'])
515
        vf.add_lines('noeol2', ['noeol'], ['newline\n', 'line'],
516
            left_matching_blocks=[(0, 1, 1)])
517
        self.assertEqualDiff('newline\nline', vf.get_text('noeol2'))
518
        # On top of a delta
519
        vf = self.get_file('delta')
520
        vf.add_lines('base', [], ['line'])
521
        vf.add_lines('noeol', ['base'], ['prelude\n', 'line'])
522
        vf.add_lines('noeol2', ['noeol'], ['newline\n', 'line'],
523
            left_matching_blocks=[(1, 1, 1)])
524
        self.assertEqualDiff('newline\nline', vf.get_text('noeol2'))
525
2520.4.85 by Aaron Bentley
Get all test passing (which just proves there aren't enough tests!)
526
    def test_make_mpdiffs(self):
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
527
        from bzrlib import multiparent
528
        vf = self.get_file('foo')
529
        sha1s = self._setup_for_deltas(vf)
530
        new_vf = self.get_file('bar')
531
        for version in multiparent.topo_iter(vf):
2520.4.85 by Aaron Bentley
Get all test passing (which just proves there aren't enough tests!)
532
            mpdiff = vf.make_mpdiffs([version])[0]
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
533
            new_vf.add_mpdiffs([(version, vf.get_parent_map([version])[version],
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
534
                                 vf.get_sha1s([version])[version], mpdiff)])
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
535
            self.assertEqualDiff(vf.get_text(version),
536
                                 new_vf.get_text(version))
537
3453.3.2 by John Arbash Meinel
Add a test case for the first loop, unable to find a way to trigger the second loop
538
    def test_make_mpdiffs_with_ghosts(self):
539
        vf = self.get_file('foo')
3453.3.4 by John Arbash Meinel
Skip the new test for old weave formats that don't support ghosts
540
        try:
541
            vf.add_lines_with_ghosts('text', ['ghost'], ['line\n'])
542
        except NotImplementedError:
543
            # old Weave formats do not allow ghosts
544
            return
3453.3.2 by John Arbash Meinel
Add a test case for the first loop, unable to find a way to trigger the second loop
545
        self.assertRaises(errors.RevisionNotPresent, vf.make_mpdiffs, ['ghost'])
546
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
547
    def _setup_for_deltas(self, f):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
548
        self.assertFalse(f.has_version('base'))
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
549
        # add texts that should trip the knit maximum delta chain threshold
550
        # as well as doing parallel chains of data in knits.
551
        # this is done by two chains of 25 insertions
552
        f.add_lines('base', [], ['line\n'])
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
553
        f.add_lines('noeol', ['base'], ['line'])
554
        # detailed eol tests:
555
        # shared last line with parent no-eol
556
        f.add_lines('noeolsecond', ['noeol'], ['line\n', 'line'])
557
        # differing last line with parent, both no-eol
558
        f.add_lines('noeolnotshared', ['noeolsecond'], ['line\n', 'phone'])
559
        # add eol following a noneol parent, change content
560
        f.add_lines('eol', ['noeol'], ['phone\n'])
561
        # add eol following a noneol parent, no change content
562
        f.add_lines('eolline', ['noeol'], ['line\n'])
563
        # noeol with no parents:
564
        f.add_lines('noeolbase', [], ['line'])
565
        # noeol preceeding its leftmost parent in the output:
566
        # this is done by making it a merge of two parents with no common
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
567
        # anestry: noeolbase and noeol with the
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
568
        # later-inserted parent the leftmost.
569
        f.add_lines('eolbeforefirstparent', ['noeolbase', 'noeol'], ['line'])
570
        # two identical eol texts
571
        f.add_lines('noeoldup', ['noeol'], ['line'])
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
572
        next_parent = 'base'
573
        text_name = 'chain1-'
574
        text = ['line\n']
575
        sha1s = {0 :'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
576
                 1 :'45e21ea146a81ea44a821737acdb4f9791c8abe7',
577
                 2 :'e1f11570edf3e2a070052366c582837a4fe4e9fa',
578
                 3 :'26b4b8626da827088c514b8f9bbe4ebf181edda1',
579
                 4 :'e28a5510be25ba84d31121cff00956f9970ae6f6',
580
                 5 :'d63ec0ce22e11dcf65a931b69255d3ac747a318d',
581
                 6 :'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
582
                 7 :'95c14da9cafbf828e3e74a6f016d87926ba234ab',
583
                 8 :'779e9a0b28f9f832528d4b21e17e168c67697272',
584
                 9 :'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
585
                 10:'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
586
                 11:'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
587
                 12:'31a2286267f24d8bedaa43355f8ad7129509ea85',
588
                 13:'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
589
                 14:'2c4b1736566b8ca6051e668de68650686a3922f2',
590
                 15:'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
591
                 16:'b0d2e18d3559a00580f6b49804c23fea500feab3',
592
                 17:'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
593
                 18:'5cf64a3459ae28efa60239e44b20312d25b253f3',
594
                 19:'1ebed371807ba5935958ad0884595126e8c4e823',
595
                 20:'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
596
                 21:'01edc447978004f6e4e962b417a4ae1955b6fe5d',
597
                 22:'d8d8dc49c4bf0bab401e0298bb5ad827768618bb',
598
                 23:'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
599
                 24:'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
600
                 25:'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
601
                 }
602
        for depth in range(26):
603
            new_version = text_name + '%s' % depth
604
            text = text + ['line\n']
605
            f.add_lines(new_version, [next_parent], text)
606
            next_parent = new_version
607
        next_parent = 'base'
608
        text_name = 'chain2-'
609
        text = ['line\n']
610
        for depth in range(26):
611
            new_version = text_name + '%s' % depth
612
            text = text + ['line\n']
613
            f.add_lines(new_version, [next_parent], text)
614
            next_parent = new_version
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
615
        return sha1s
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
616
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
617
    def test_ancestry(self):
618
        f = self.get_file()
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
619
        self.assertEqual([], f.get_ancestry([]))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
620
        f.add_lines('r0', [], ['a\n', 'b\n'])
621
        f.add_lines('r1', ['r0'], ['b\n', 'c\n'])
622
        f.add_lines('r2', ['r0'], ['b\n', 'c\n'])
623
        f.add_lines('r3', ['r2'], ['b\n', 'c\n'])
624
        f.add_lines('rM', ['r1', 'r2'], ['b\n', 'c\n'])
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
625
        self.assertEqual([], f.get_ancestry([]))
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
626
        versions = f.get_ancestry(['rM'])
627
        # there are some possibilities:
628
        # r0 r1 r2 rM r3
629
        # r0 r1 r2 r3 rM
630
        # etc
631
        # so we check indexes
632
        r0 = versions.index('r0')
633
        r1 = versions.index('r1')
634
        r2 = versions.index('r2')
635
        self.assertFalse('r3' in versions)
636
        rM = versions.index('rM')
637
        self.assertTrue(r0 < r1)
638
        self.assertTrue(r0 < r2)
639
        self.assertTrue(r1 < rM)
640
        self.assertTrue(r2 < rM)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
641
642
        self.assertRaises(RevisionNotPresent,
643
            f.get_ancestry, ['rM', 'rX'])
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
644
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
645
        self.assertEqual(set(f.get_ancestry('rM')),
646
            set(f.get_ancestry('rM', topo_sorted=False)))
647
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
648
    def test_mutate_after_finish(self):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
649
        self._transaction = 'before'
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
650
        f = self.get_file()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
651
        self._transaction = 'after'
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
652
        self.assertRaises(errors.OutSideTransaction, f.add_lines, '', [], [])
653
        self.assertRaises(errors.OutSideTransaction, f.add_lines_with_ghosts, '', [], [])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
654
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
655
    def test_copy_to(self):
656
        f = self.get_file()
657
        f.add_lines('0', [], ['a\n'])
658
        t = MemoryTransport()
659
        f.copy_to('foo', t)
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
660
        for suffix in self.get_factory().get_suffixes():
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
661
            self.assertTrue(t.has('foo' + suffix))
662
663
    def test_get_suffixes(self):
664
        f = self.get_file()
665
        # and should be a list
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
666
        self.assertTrue(isinstance(self.get_factory().get_suffixes(), list))
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
667
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
668
    def test_get_parent_map(self):
669
        f = self.get_file()
670
        f.add_lines('r0', [], ['a\n', 'b\n'])
671
        self.assertEqual(
672
            {'r0':()}, f.get_parent_map(['r0']))
673
        f.add_lines('r1', ['r0'], ['a\n', 'b\n'])
674
        self.assertEqual(
675
            {'r1':('r0',)}, f.get_parent_map(['r1']))
676
        self.assertEqual(
677
            {'r0':(),
678
             'r1':('r0',)},
679
            f.get_parent_map(['r0', 'r1']))
680
        f.add_lines('r2', [], ['a\n', 'b\n'])
681
        f.add_lines('r3', [], ['a\n', 'b\n'])
682
        f.add_lines('m', ['r0', 'r1', 'r2', 'r3'], ['a\n', 'b\n'])
683
        self.assertEqual(
684
            {'m':('r0', 'r1', 'r2', 'r3')}, f.get_parent_map(['m']))
685
        self.assertEqual({}, f.get_parent_map('y'))
686
        self.assertEqual(
687
            {'r0':(),
688
             'r1':('r0',)},
689
            f.get_parent_map(['r0', 'y', 'r1']))
690
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
691
    def test_annotate(self):
692
        f = self.get_file()
693
        f.add_lines('r0', [], ['a\n', 'b\n'])
694
        f.add_lines('r1', ['r0'], ['c\n', 'b\n'])
695
        origins = f.annotate('r1')
696
        self.assertEquals(origins[0][0], 'r1')
697
        self.assertEquals(origins[1][0], 'r0')
698
699
        self.assertRaises(RevisionNotPresent,
700
            f.annotate, 'foo')
701
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
702
    def test_detection(self):
703
        # Test weaves detect corruption.
704
        #
705
        # Weaves contain a checksum of their texts.
706
        # When a text is extracted, this checksum should be
707
        # verified.
708
709
        w = self.get_file_corrupted_text()
710
711
        self.assertEqual('hello\n', w.get_text('v1'))
712
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
713
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
714
        self.assertRaises(errors.WeaveInvalidChecksum, w.check)
715
716
        w = self.get_file_corrupted_checksum()
717
718
        self.assertEqual('hello\n', w.get_text('v1'))
719
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
720
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
721
        self.assertRaises(errors.WeaveInvalidChecksum, w.check)
722
723
    def get_file_corrupted_text(self):
724
        """Return a versioned file with corrupt text but valid metadata."""
725
        raise NotImplementedError(self.get_file_corrupted_text)
726
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
727
    def reopen_file(self, name='foo'):
728
        """Open the versioned file from disk again."""
729
        raise NotImplementedError(self.reopen_file)
730
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
731
    def test_iter_lines_added_or_present_in_versions(self):
732
        # test that we get at least an equalset of the lines added by
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
733
        # versions in the weave
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
734
        # the ordering here is to make a tree so that dumb searches have
735
        # more changes to muck up.
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
736
737
        class InstrumentedProgress(progress.DummyProgress):
738
739
            def __init__(self):
740
741
                progress.DummyProgress.__init__(self)
742
                self.updates = []
743
744
            def update(self, msg=None, current=None, total=None):
745
                self.updates.append((msg, current, total))
746
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
747
        vf = self.get_file()
748
        # add a base to get included
749
        vf.add_lines('base', [], ['base\n'])
750
        # add a ancestor to be included on one side
751
        vf.add_lines('lancestor', [], ['lancestor\n'])
752
        # add a ancestor to be included on the other side
753
        vf.add_lines('rancestor', ['base'], ['rancestor\n'])
754
        # add a child of rancestor with no eofile-nl
755
        vf.add_lines('child', ['rancestor'], ['base\n', 'child\n'])
756
        # add a child of lancestor and base to join the two roots
757
        vf.add_lines('otherchild',
758
                     ['lancestor', 'base'],
759
                     ['base\n', 'lancestor\n', 'otherchild\n'])
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
760
        def iter_with_versions(versions, expected):
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
761
            # now we need to see what lines are returned, and how often.
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
762
            lines = {}
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
763
            progress = InstrumentedProgress()
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
764
            # iterate over the lines
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
765
            for line in vf.iter_lines_added_or_present_in_versions(versions,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
766
                pb=progress):
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
767
                lines.setdefault(line, 0)
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
768
                lines[line] += 1
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
769
            if []!= progress.updates:
2039.1.2 by Aaron Bentley
Tweak test to avoid catching assert
770
                self.assertEqual(expected, progress.updates)
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
771
            return lines
2147.1.3 by John Arbash Meinel
In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.
772
        lines = iter_with_versions(['child', 'otherchild'],
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
773
                                   [('Walking content', 0, 2),
774
                                    ('Walking content', 1, 2),
775
                                    ('Walking content', 2, 2)])
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
776
        # we must see child and otherchild
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
777
        self.assertTrue(lines[('child\n', 'child')] > 0)
778
        self.assertTrue(lines[('otherchild\n', 'otherchild')] > 0)
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
779
        # we dont care if we got more than that.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
780
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
781
        # test all lines
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
782
        lines = iter_with_versions(None, [('Walking content', 0, 5),
783
                                          ('Walking content', 1, 5),
784
                                          ('Walking content', 2, 5),
785
                                          ('Walking content', 3, 5),
786
                                          ('Walking content', 4, 5),
787
                                          ('Walking content', 5, 5)])
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
788
        # all lines must be seen at least once
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
789
        self.assertTrue(lines[('base\n', 'base')] > 0)
790
        self.assertTrue(lines[('lancestor\n', 'lancestor')] > 0)
791
        self.assertTrue(lines[('rancestor\n', 'rancestor')] > 0)
792
        self.assertTrue(lines[('child\n', 'child')] > 0)
793
        self.assertTrue(lines[('otherchild\n', 'otherchild')] > 0)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
794
1594.2.8 by Robert Collins
add ghost aware apis to knits.
795
    def test_add_lines_with_ghosts(self):
796
        # some versioned file formats allow lines to be added with parent
797
        # information that is > than that in the format. Formats that do
798
        # not support this need to raise NotImplementedError on the
799
        # add_lines_with_ghosts api.
800
        vf = self.get_file()
801
        # add a revision with ghost parents
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
802
        # The preferred form is utf8, but we should translate when needed
803
        parent_id_unicode = u'b\xbfse'
804
        parent_id_utf8 = parent_id_unicode.encode('utf8')
1594.2.8 by Robert Collins
add ghost aware apis to knits.
805
        try:
2309.4.7 by John Arbash Meinel
Update VersionedFile tests to ensure that they can take Unicode,
806
            vf.add_lines_with_ghosts('notbxbfse', [parent_id_utf8], [])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
807
        except NotImplementedError:
808
            # check the other ghost apis are also not implemented
809
            self.assertRaises(NotImplementedError, vf.get_ancestry_with_ghosts, ['foo'])
810
            self.assertRaises(NotImplementedError, vf.get_parents_with_ghosts, 'foo')
811
            return
2150.2.1 by Robert Collins
Correctly decode utf8 revision ids from knits when parsing, fixes a regression where a unicode revision id is stored correctly, but then indexed by the utf8 value on the next invocation of bzr, rather than the unicode value.
812
        vf = self.reopen_file()
1594.2.8 by Robert Collins
add ghost aware apis to knits.
813
        # test key graph related apis: getncestry, _graph, get_parents
814
        # has_version
815
        # - these are ghost unaware and must not be reflect ghosts
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
816
        self.assertEqual(['notbxbfse'], vf.get_ancestry('notbxbfse'))
817
        self.assertFalse(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
818
        # we have _with_ghost apis to give us ghost information.
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
819
        self.assertEqual([parent_id_utf8, 'notbxbfse'], vf.get_ancestry_with_ghosts(['notbxbfse']))
820
        self.assertEqual([parent_id_utf8], vf.get_parents_with_ghosts('notbxbfse'))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
821
        # if we add something that is a ghost of another, it should correct the
822
        # results of the prior apis
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
823
        vf.add_lines(parent_id_utf8, [], [])
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
824
        self.assertEqual([parent_id_utf8, 'notbxbfse'], vf.get_ancestry(['notbxbfse']))
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
825
        self.assertEqual({'notbxbfse':(parent_id_utf8,)},
826
            vf.get_parent_map(['notbxbfse']))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
827
        self.assertTrue(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
828
        # we have _with_ghost apis to give us ghost information.
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
829
        self.assertEqual([parent_id_utf8, 'notbxbfse'],
830
            vf.get_ancestry_with_ghosts(['notbxbfse']))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
831
        self.assertEqual([parent_id_utf8], vf.get_parents_with_ghosts('notbxbfse'))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
832
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
833
    def test_add_lines_with_ghosts_after_normal_revs(self):
834
        # some versioned file formats allow lines to be added with parent
835
        # information that is > than that in the format. Formats that do
836
        # not support this need to raise NotImplementedError on the
837
        # add_lines_with_ghosts api.
838
        vf = self.get_file()
839
        # probe for ghost support
840
        try:
3287.6.5 by Robert Collins
Deprecate VersionedFile.has_ghost.
841
            vf.add_lines_with_ghosts('base', [], ['line\n', 'line_b\n'])
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
842
        except NotImplementedError:
843
            return
844
        vf.add_lines_with_ghosts('references_ghost',
845
                                 ['base', 'a_ghost'],
846
                                 ['line\n', 'line_b\n', 'line_c\n'])
847
        origins = vf.annotate('references_ghost')
848
        self.assertEquals(('base', 'line\n'), origins[0])
849
        self.assertEquals(('base', 'line_b\n'), origins[1])
850
        self.assertEquals(('references_ghost', 'line_c\n'), origins[2])
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
851
852
    def test_readonly_mode(self):
853
        transport = get_transport(self.get_url('.'))
854
        factory = self.get_factory()
855
        vf = factory('id', transport, 0777, create=True, access_mode='w')
856
        vf = factory('id', transport, access_mode='r')
857
        self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], [])
858
        self.assertRaises(errors.ReadOnlyError,
859
                          vf.add_lines_with_ghosts,
860
                          'base',
861
                          [],
862
                          [])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
863
3316.2.9 by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use
864
    def test_get_sha1s(self):
1666.1.6 by Robert Collins
Make knit the default format.
865
        # check the sha1 data is available
866
        vf = self.get_file()
867
        # a simple file
868
        vf.add_lines('a', [], ['a\n'])
869
        # the same file, different metadata
870
        vf.add_lines('b', ['a'], ['a\n'])
871
        # a file differing only in last newline.
872
        vf.add_lines('c', [], ['a'])
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
873
        self.assertEqual({
874
            'a': '3f786850e387550fdab836ed7e6dc881de23001b',
875
            'c': '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8',
876
            'b': '3f786850e387550fdab836ed7e6dc881de23001b',
877
            },
878
            vf.get_sha1s(['a', 'c', 'b']))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
879
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
880
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
881
class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
882
883
    def get_file(self, name='foo'):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
884
        return WeaveFile(name, get_transport(self.get_url('.')), create=True,
885
            get_scope=self.get_transaction)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
886
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
887
    def get_file_corrupted_text(self):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
888
        w = WeaveFile('foo', get_transport(self.get_url('.')), create=True,
889
            get_scope=self.get_transaction)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
890
        w.add_lines('v1', [], ['hello\n'])
891
        w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
892
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
893
        # We are going to invasively corrupt the text
894
        # Make sure the internals of weave are the same
895
        self.assertEqual([('{', 0)
896
                        , 'hello\n'
897
                        , ('}', None)
898
                        , ('{', 1)
899
                        , 'there\n'
900
                        , ('}', None)
901
                        ], w._weave)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
902
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
903
        self.assertEqual(['f572d396fae9206628714fb2ce00f72e94f2258f'
904
                        , '90f265c6e75f1c8f9ab76dcf85528352c5f215ef'
905
                        ], w._sha1s)
906
        w.check()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
907
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
908
        # Corrupted
909
        w._weave[4] = 'There\n'
910
        return w
911
912
    def get_file_corrupted_checksum(self):
913
        w = self.get_file_corrupted_text()
914
        # Corrected
915
        w._weave[4] = 'there\n'
916
        self.assertEqual('hello\nthere\n', w.get_text('v2'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
917
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
918
        #Invalid checksum, first digit changed
919
        w._sha1s[1] =  'f0f265c6e75f1c8f9ab76dcf85528352c5f215ef'
920
        return w
921
1666.1.6 by Robert Collins
Make knit the default format.
922
    def reopen_file(self, name='foo', create=False):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
923
        return WeaveFile(name, get_transport(self.get_url('.')), create=create,
924
            get_scope=self.get_transaction)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
925
1563.2.25 by Robert Collins
Merge in upstream.
926
    def test_no_implicit_create(self):
927
        self.assertRaises(errors.NoSuchFile,
928
                          WeaveFile,
929
                          'foo',
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
930
                          get_transport(self.get_url('.')),
931
                          get_scope=self.get_transaction)
1563.2.25 by Robert Collins
Merge in upstream.
932
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
933
    def get_factory(self):
934
        return WeaveFile
935
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
936
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
937
class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
938
939
    def setUp(self):
940
        TestCaseWithMemoryTransport.setUp(self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
941
        mapper = PrefixMapper()
942
        factory = make_file_factory(True, mapper)
943
        self.vf1 = factory(self.get_transport('root-1'))
944
        self.vf2 = factory(self.get_transport('root-2'))
945
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root')
946
        self.plan_merge_vf.fallback_versionedfiles.extend([self.vf1, self.vf2])
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
947
948
    def test_add_lines(self):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
949
        self.plan_merge_vf.add_lines(('root', 'a:'), [], [])
950
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
951
            ('root', 'a'), [], [])
952
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
953
            ('root', 'a:'), None, [])
954
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
955
            ('root', 'a:'), [], None)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
956
957
    def setup_abcde(self):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
958
        self.vf1.add_lines(('root', 'A'), [], ['a'])
959
        self.vf1.add_lines(('root', 'B'), [('root', 'A')], ['b'])
960
        self.vf2.add_lines(('root', 'C'), [], ['c'])
961
        self.vf2.add_lines(('root', 'D'), [('root', 'C')], ['d'])
962
        self.plan_merge_vf.add_lines(('root', 'E:'),
963
            [('root', 'B'), ('root', 'D')], ['e'])
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
964
965
    def test_get_parents(self):
966
        self.setup_abcde()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
967
        self.assertEqual({('root', 'B'):(('root', 'A'),)},
968
            self.plan_merge_vf.get_parent_map([('root', 'B')]))
969
        self.assertEqual({('root', 'D'):(('root', 'C'),)},
970
            self.plan_merge_vf.get_parent_map([('root', 'D')]))
971
        self.assertEqual({('root', 'E:'):(('root', 'B'),('root', 'D'))},
972
            self.plan_merge_vf.get_parent_map([('root', 'E:')]))
973
        self.assertEqual({},
974
            self.plan_merge_vf.get_parent_map([('root', 'F')]))
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
975
        self.assertEqual({
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
976
                ('root', 'B'):(('root', 'A'),),
977
                ('root', 'D'):(('root', 'C'),),
978
                ('root', 'E:'):(('root', 'B'),('root', 'D')),
979
                },
980
            self.plan_merge_vf.get_parent_map(
981
                [('root', 'B'), ('root', 'D'), ('root', 'E:'), ('root', 'F')]))
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
982
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
983
    def test_get_record_stream(self):
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
984
        self.setup_abcde()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
985
        def get_record(suffix):
986
            return self.plan_merge_vf.get_record_stream(
987
                [('root', suffix)], 'unordered', True).next()
988
        self.assertEqual('a', get_record('A').get_bytes_as('fulltext'))
989
        self.assertEqual('c', get_record('C').get_bytes_as('fulltext'))
990
        self.assertEqual('e', get_record('E:').get_bytes_as('fulltext'))
991
        self.assertEqual('absent', get_record('F').storage_kind)
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
992
993
994
class TestReadonlyHttpMixin(object):
995
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
996
    def get_transaction(self):
997
        return 1
998
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
999
    def test_readonly_http_works(self):
1000
        # we should be able to read from http with a versioned file.
1001
        vf = self.get_file()
1666.1.6 by Robert Collins
Make knit the default format.
1002
        # try an empty file access
1003
        readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
1004
        self.assertEqual([], readonly_vf.versions())
1005
        # now with feeling.
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
1006
        vf.add_lines('1', [], ['a\n'])
1007
        vf.add_lines('2', ['1'], ['b\n', 'a\n'])
1008
        readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
1666.1.6 by Robert Collins
Make knit the default format.
1009
        self.assertEqual(['1', '2'], vf.versions())
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
1010
        for version in readonly_vf.versions():
1011
            readonly_vf.get_lines(version)
1012
1013
1014
class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
1015
1016
    def get_file(self):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1017
        return WeaveFile('foo', get_transport(self.get_url('.')), create=True,
1018
            get_scope=self.get_transaction)
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
1019
1020
    def get_factory(self):
1021
        return WeaveFile
1022
1023
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1024
class MergeCasesMixin(object):
1025
1026
    def doMerge(self, base, a, b, mp):
1027
        from cStringIO import StringIO
1028
        from textwrap import dedent
1029
1030
        def addcrlf(x):
1031
            return x + '\n'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1032
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1033
        w = self.get_file()
1034
        w.add_lines('text0', [], map(addcrlf, base))
1035
        w.add_lines('text1', ['text0'], map(addcrlf, a))
1036
        w.add_lines('text2', ['text0'], map(addcrlf, b))
1037
1038
        self.log_contents(w)
1039
1040
        self.log('merge plan:')
1041
        p = list(w.plan_merge('text1', 'text2'))
1042
        for state, line in p:
1043
            if line:
1044
                self.log('%12s | %s' % (state, line[:-1]))
1045
1046
        self.log('merge:')
1047
        mt = StringIO()
1048
        mt.writelines(w.weave_merge(p))
1049
        mt.seek(0)
1050
        self.log(mt.getvalue())
1051
1052
        mp = map(addcrlf, mp)
1053
        self.assertEqual(mt.readlines(), mp)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1054
1055
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1056
    def testOneInsert(self):
1057
        self.doMerge([],
1058
                     ['aa'],
1059
                     [],
1060
                     ['aa'])
1061
1062
    def testSeparateInserts(self):
1063
        self.doMerge(['aaa', 'bbb', 'ccc'],
1064
                     ['aaa', 'xxx', 'bbb', 'ccc'],
1065
                     ['aaa', 'bbb', 'yyy', 'ccc'],
1066
                     ['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
1067
1068
    def testSameInsert(self):
1069
        self.doMerge(['aaa', 'bbb', 'ccc'],
1070
                     ['aaa', 'xxx', 'bbb', 'ccc'],
1071
                     ['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
1072
                     ['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
1073
    overlappedInsertExpected = ['aaa', 'xxx', 'yyy', 'bbb']
1074
    def testOverlappedInsert(self):
1075
        self.doMerge(['aaa', 'bbb'],
1076
                     ['aaa', 'xxx', 'yyy', 'bbb'],
1077
                     ['aaa', 'xxx', 'bbb'], self.overlappedInsertExpected)
1078
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1079
        # really it ought to reduce this to
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1080
        # ['aaa', 'xxx', 'yyy', 'bbb']
1081
1082
1083
    def testClashReplace(self):
1084
        self.doMerge(['aaa'],
1085
                     ['xxx'],
1086
                     ['yyy', 'zzz'],
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1087
                     ['<<<<<<< ', 'xxx', '=======', 'yyy', 'zzz',
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1088
                      '>>>>>>> '])
1089
1090
    def testNonClashInsert1(self):
1091
        self.doMerge(['aaa'],
1092
                     ['xxx', 'aaa'],
1093
                     ['yyy', 'zzz'],
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1094
                     ['<<<<<<< ', 'xxx', 'aaa', '=======', 'yyy', 'zzz',
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1095
                      '>>>>>>> '])
1096
1097
    def testNonClashInsert2(self):
1098
        self.doMerge(['aaa'],
1099
                     ['aaa'],
1100
                     ['yyy', 'zzz'],
1101
                     ['yyy', 'zzz'])
1102
1103
1104
    def testDeleteAndModify(self):
1105
        """Clashing delete and modification.
1106
1107
        If one side modifies a region and the other deletes it then
1108
        there should be a conflict with one side blank.
1109
        """
1110
1111
        #######################################
1112
        # skippd, not working yet
1113
        return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1114
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1115
        self.doMerge(['aaa', 'bbb', 'ccc'],
1116
                     ['aaa', 'ddd', 'ccc'],
1117
                     ['aaa', 'ccc'],
1118
                     ['<<<<<<<< ', 'aaa', '=======', '>>>>>>> ', 'ccc'])
1119
1120
    def _test_merge_from_strings(self, base, a, b, expected):
1121
        w = self.get_file()
1122
        w.add_lines('text0', [], base.splitlines(True))
1123
        w.add_lines('text1', ['text0'], a.splitlines(True))
1124
        w.add_lines('text2', ['text0'], b.splitlines(True))
1125
        self.log('merge plan:')
1126
        p = list(w.plan_merge('text1', 'text2'))
1127
        for state, line in p:
1128
            if line:
1129
                self.log('%12s | %s' % (state, line[:-1]))
1130
        self.log('merge result:')
1131
        result_text = ''.join(w.weave_merge(p))
1132
        self.log(result_text)
1133
        self.assertEqualDiff(result_text, expected)
1134
1135
    def test_weave_merge_conflicts(self):
1136
        # does weave merge properly handle plans that end with unchanged?
1137
        result = ''.join(self.get_file().weave_merge([('new-a', 'hello\n')]))
1138
        self.assertEqual(result, 'hello\n')
1139
1140
    def test_deletion_extended(self):
1141
        """One side deletes, the other deletes more.
1142
        """
1143
        base = """\
1144
            line 1
1145
            line 2
1146
            line 3
1147
            """
1148
        a = """\
1149
            line 1
1150
            line 2
1151
            """
1152
        b = """\
1153
            line 1
1154
            """
1155
        result = """\
1156
            line 1
4312.1.3 by John Arbash Meinel
Different sides deleting different amounts is now a conflict.
1157
<<<<<<<\x20
1158
            line 2
1159
=======
1160
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1161
            """
1162
        self._test_merge_from_strings(base, a, b, result)
1163
1164
    def test_deletion_overlap(self):
1165
        """Delete overlapping regions with no other conflict.
1166
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1167
        Arguably it'd be better to treat these as agreement, rather than
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1168
        conflict, but for now conflict is safer.
1169
        """
1170
        base = """\
1171
            start context
1172
            int a() {}
1173
            int b() {}
1174
            int c() {}
1175
            end context
1176
            """
1177
        a = """\
1178
            start context
1179
            int a() {}
1180
            end context
1181
            """
1182
        b = """\
1183
            start context
1184
            int c() {}
1185
            end context
1186
            """
1187
        result = """\
1188
            start context
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1189
<<<<<<<\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1190
            int a() {}
1191
=======
1192
            int c() {}
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1193
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1194
            end context
1195
            """
1196
        self._test_merge_from_strings(base, a, b, result)
1197
1198
    def test_agreement_deletion(self):
1199
        """Agree to delete some lines, without conflicts."""
1200
        base = """\
1201
            start context
1202
            base line 1
1203
            base line 2
1204
            end context
1205
            """
1206
        a = """\
1207
            start context
1208
            base line 1
1209
            end context
1210
            """
1211
        b = """\
1212
            start context
1213
            base line 1
1214
            end context
1215
            """
1216
        result = """\
1217
            start context
1218
            base line 1
1219
            end context
1220
            """
1221
        self._test_merge_from_strings(base, a, b, result)
1222
1223
    def test_sync_on_deletion(self):
1224
        """Specific case of merge where we can synchronize incorrectly.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1225
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1226
        A previous version of the weave merge concluded that the two versions
1227
        agreed on deleting line 2, and this could be a synchronization point.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1228
        Line 1 was then considered in isolation, and thought to be deleted on
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1229
        both sides.
1230
1231
        It's better to consider the whole thing as a disagreement region.
1232
        """
1233
        base = """\
1234
            start context
1235
            base line 1
1236
            base line 2
1237
            end context
1238
            """
1239
        a = """\
1240
            start context
1241
            base line 1
1242
            a's replacement line 2
1243
            end context
1244
            """
1245
        b = """\
1246
            start context
1247
            b replaces
1248
            both lines
1249
            end context
1250
            """
1251
        result = """\
1252
            start context
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1253
<<<<<<<\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1254
            base line 1
1255
            a's replacement line 2
1256
=======
1257
            b replaces
1258
            both lines
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1259
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1260
            end context
1261
            """
1262
        self._test_merge_from_strings(base, a, b, result)
1263
1264
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
1265
class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1266
1267
    def get_file(self, name='foo'):
1268
        return WeaveFile(name, get_transport(self.get_url('.')), create=True)
1269
1270
    def log_contents(self, w):
1271
        self.log('weave is:')
1272
        tmpf = StringIO()
1273
        write_weave(w, tmpf)
1274
        self.log(tmpf.getvalue())
1275
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1276
    overlappedInsertExpected = ['aaa', '<<<<<<< ', 'xxx', 'yyy', '=======',
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1277
                                'xxx', '>>>>>>> ', 'bbb']
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1278
1279
1280
class TestContentFactoryAdaption(TestCaseWithMemoryTransport):
1281
1282
    def test_select_adaptor(self):
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1283
        """Test expected adapters exist."""
1284
        # One scenario for each lookup combination we expect to use.
1285
        # Each is source_kind, requested_kind, adapter class
1286
        scenarios = [
1287
            ('knit-delta-gz', 'fulltext', _mod_knit.DeltaPlainToFullText),
1288
            ('knit-ft-gz', 'fulltext', _mod_knit.FTPlainToFullText),
1289
            ('knit-annotated-delta-gz', 'knit-delta-gz',
1290
                _mod_knit.DeltaAnnotatedToUnannotated),
1291
            ('knit-annotated-delta-gz', 'fulltext',
1292
                _mod_knit.DeltaAnnotatedToFullText),
1293
            ('knit-annotated-ft-gz', 'knit-ft-gz',
1294
                _mod_knit.FTAnnotatedToUnannotated),
1295
            ('knit-annotated-ft-gz', 'fulltext',
1296
                _mod_knit.FTAnnotatedToFullText),
1297
            ]
1298
        for source, requested, klass in scenarios:
1299
            adapter_factory = versionedfile.adapter_registry.get(
1300
                (source, requested))
1301
            adapter = adapter_factory(None)
1302
            self.assertIsInstance(adapter, klass)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1303
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1304
    def get_knit(self, annotated=True):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1305
        mapper = ConstantMapper('knit')
1306
        transport = self.get_transport()
1307
        return make_file_factory(annotated, mapper)(transport)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1308
1309
    def helpGetBytes(self, f, ft_adapter, delta_adapter):
3350.3.22 by Robert Collins
Review feedback.
1310
        """Grab the interested adapted texts for tests."""
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1311
        # origin is a fulltext
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1312
        entries = f.get_record_stream([('origin',)], 'unordered', False)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1313
        base = entries.next()
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1314
        ft_data = ft_adapter.get_bytes(base)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1315
        # merged is both a delta and multiple parents.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1316
        entries = f.get_record_stream([('merged',)], 'unordered', False)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1317
        merged = entries.next()
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1318
        delta_data = delta_adapter.get_bytes(merged)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1319
        return ft_data, delta_data
1320
1321
    def test_deannotation_noeol(self):
1322
        """Test converting annotated knits to unannotated knits."""
1323
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1324
        f = self.get_knit()
1325
        get_diamond_files(f, 1, trailing_eol=False)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1326
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1327
            _mod_knit.FTAnnotatedToUnannotated(None),
1328
            _mod_knit.DeltaAnnotatedToUnannotated(None))
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1329
        self.assertEqual(
1330
            'version origin 1 b284f94827db1fa2970d9e2014f080413b547a7e\n'
1331
            'origin\n'
1332
            'end origin\n',
1333
            GzipFile(mode='rb', fileobj=StringIO(ft_data)).read())
1334
        self.assertEqual(
1335
            'version merged 4 32c2e79763b3f90e8ccde37f9710b6629c25a796\n'
1336
            '1,2,3\nleft\nright\nmerged\nend merged\n',
1337
            GzipFile(mode='rb', fileobj=StringIO(delta_data)).read())
1338
1339
    def test_deannotation(self):
1340
        """Test converting annotated knits to unannotated knits."""
1341
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1342
        f = self.get_knit()
1343
        get_diamond_files(f, 1)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1344
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1345
            _mod_knit.FTAnnotatedToUnannotated(None),
1346
            _mod_knit.DeltaAnnotatedToUnannotated(None))
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1347
        self.assertEqual(
1348
            'version origin 1 00e364d235126be43292ab09cb4686cf703ddc17\n'
1349
            'origin\n'
1350
            'end origin\n',
1351
            GzipFile(mode='rb', fileobj=StringIO(ft_data)).read())
1352
        self.assertEqual(
1353
            'version merged 3 ed8bce375198ea62444dc71952b22cfc2b09226d\n'
1354
            '2,2,2\nright\nmerged\nend merged\n',
1355
            GzipFile(mode='rb', fileobj=StringIO(delta_data)).read())
1356
1357
    def test_annotated_to_fulltext_no_eol(self):
1358
        """Test adapting annotated knits to full texts (for -> weaves)."""
1359
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1360
        f = self.get_knit()
1361
        get_diamond_files(f, 1, trailing_eol=False)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1362
        # Reconstructing a full text requires a backing versioned file, and it
1363
        # must have the base lines requested from it.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1364
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1365
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1366
            _mod_knit.FTAnnotatedToFullText(None),
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1367
            _mod_knit.DeltaAnnotatedToFullText(logged_vf))
1368
        self.assertEqual('origin', ft_data)
1369
        self.assertEqual('base\nleft\nright\nmerged', delta_data)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1370
        self.assertEqual([('get_record_stream', [('left',)], 'unordered',
1371
            True)], logged_vf.calls)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1372
1373
    def test_annotated_to_fulltext(self):
1374
        """Test adapting annotated knits to full texts (for -> weaves)."""
1375
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1376
        f = self.get_knit()
1377
        get_diamond_files(f, 1)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1378
        # Reconstructing a full text requires a backing versioned file, and it
1379
        # must have the base lines requested from it.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1380
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1381
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1382
            _mod_knit.FTAnnotatedToFullText(None),
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1383
            _mod_knit.DeltaAnnotatedToFullText(logged_vf))
1384
        self.assertEqual('origin\n', ft_data)
1385
        self.assertEqual('base\nleft\nright\nmerged\n', delta_data)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1386
        self.assertEqual([('get_record_stream', [('left',)], 'unordered',
1387
            True)], logged_vf.calls)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1388
1389
    def test_unannotated_to_fulltext(self):
1390
        """Test adapting unannotated knits to full texts.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1391
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1392
        This is used for -> weaves, and for -> annotated knits.
1393
        """
1394
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1395
        f = self.get_knit(annotated=False)
1396
        get_diamond_files(f, 1)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1397
        # Reconstructing a full text requires a backing versioned file, and it
1398
        # must have the base lines requested from it.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1399
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1400
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1401
            _mod_knit.FTPlainToFullText(None),
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1402
            _mod_knit.DeltaPlainToFullText(logged_vf))
1403
        self.assertEqual('origin\n', ft_data)
1404
        self.assertEqual('base\nleft\nright\nmerged\n', delta_data)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1405
        self.assertEqual([('get_record_stream', [('left',)], 'unordered',
1406
            True)], logged_vf.calls)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1407
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1408
    def test_unannotated_to_fulltext_no_eol(self):
1409
        """Test adapting unannotated knits to full texts.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1410
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1411
        This is used for -> weaves, and for -> annotated knits.
1412
        """
1413
        # we need a full text, and a delta
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1414
        f = self.get_knit(annotated=False)
1415
        get_diamond_files(f, 1, trailing_eol=False)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1416
        # Reconstructing a full text requires a backing versioned file, and it
1417
        # must have the base lines requested from it.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1418
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1419
        ft_data, delta_data = self.helpGetBytes(f,
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1420
            _mod_knit.FTPlainToFullText(None),
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1421
            _mod_knit.DeltaPlainToFullText(logged_vf))
1422
        self.assertEqual('origin', ft_data)
1423
        self.assertEqual('base\nleft\nright\nmerged', delta_data)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1424
        self.assertEqual([('get_record_stream', [('left',)], 'unordered',
1425
            True)], logged_vf.calls)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1426
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
1427
1428
class TestKeyMapper(TestCaseWithMemoryTransport):
1429
    """Tests for various key mapping logic."""
1430
1431
    def test_identity_mapper(self):
1432
        mapper = versionedfile.ConstantMapper("inventory")
1433
        self.assertEqual("inventory", mapper.map(('foo@ar',)))
1434
        self.assertEqual("inventory", mapper.map(('quux',)))
1435
1436
    def test_prefix_mapper(self):
1437
        #format5: plain
1438
        mapper = versionedfile.PrefixMapper()
1439
        self.assertEqual("file-id", mapper.map(("file-id", "revision-id")))
1440
        self.assertEqual("new-id", mapper.map(("new-id", "revision-id")))
1441
        self.assertEqual(('file-id',), mapper.unmap("file-id"))
1442
        self.assertEqual(('new-id',), mapper.unmap("new-id"))
1443
1444
    def test_hash_prefix_mapper(self):
1445
        #format6: hash + plain
1446
        mapper = versionedfile.HashPrefixMapper()
1447
        self.assertEqual("9b/file-id", mapper.map(("file-id", "revision-id")))
1448
        self.assertEqual("45/new-id", mapper.map(("new-id", "revision-id")))
1449
        self.assertEqual(('file-id',), mapper.unmap("9b/file-id"))
1450
        self.assertEqual(('new-id',), mapper.unmap("45/new-id"))
1451
1452
    def test_hash_escaped_mapper(self):
1453
        #knit1: hash + escaped
1454
        mapper = versionedfile.HashEscapedPrefixMapper()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1455
        self.assertEqual("88/%2520", mapper.map((" ", "revision-id")))
1456
        self.assertEqual("ed/fil%2545-%2549d", mapper.map(("filE-Id",
1457
            "revision-id")))
1458
        self.assertEqual("88/ne%2557-%2549d", mapper.map(("neW-Id",
1459
            "revision-id")))
1460
        self.assertEqual(('filE-Id',), mapper.unmap("ed/fil%2545-%2549d"))
1461
        self.assertEqual(('neW-Id',), mapper.unmap("88/ne%2557-%2549d"))
3350.6.2 by Robert Collins
Prepare parameterised test environment.
1462
1463
1464
class TestVersionedFiles(TestCaseWithMemoryTransport):
1465
    """Tests for the multiple-file variant of VersionedFile."""
1466
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1467
    def get_versionedfiles(self, relpath='files'):
1468
        transport = self.get_transport(relpath)
1469
        if relpath != '.':
1470
            transport.mkdir('.')
1471
        files = self.factory(transport)
1472
        if self.cleanup is not None:
1473
            self.addCleanup(lambda:self.cleanup(files))
1474
        return files
1475
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1476
    def get_simple_key(self, suffix):
1477
        """Return a key for the object under test."""
1478
        if self.key_length == 1:
1479
            return (suffix,)
1480
        else:
1481
            return ('FileA',) + (suffix,)
1482
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1483
    def test_add_lines(self):
1484
        f = self.get_versionedfiles()
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1485
        key0 = self.get_simple_key('r0')
1486
        key1 = self.get_simple_key('r1')
1487
        key2 = self.get_simple_key('r2')
1488
        keyf = self.get_simple_key('foo')
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1489
        f.add_lines(key0, [], ['a\n', 'b\n'])
1490
        if self.graph:
1491
            f.add_lines(key1, [key0], ['b\n', 'c\n'])
1492
        else:
1493
            f.add_lines(key1, [], ['b\n', 'c\n'])
1494
        keys = f.keys()
1495
        self.assertTrue(key0 in keys)
1496
        self.assertTrue(key1 in keys)
1497
        records = []
1498
        for record in f.get_record_stream([key0, key1], 'unordered', True):
1499
            records.append((record.key, record.get_bytes_as('fulltext')))
1500
        records.sort()
1501
        self.assertEqual([(key0, 'a\nb\n'), (key1, 'b\nc\n')], records)
1502
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1503
    def test__add_text(self):
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1504
        f = self.get_versionedfiles()
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1505
        key0 = self.get_simple_key('r0')
1506
        key1 = self.get_simple_key('r1')
1507
        key2 = self.get_simple_key('r2')
1508
        keyf = self.get_simple_key('foo')
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1509
        f._add_text(key0, [], 'a\nb\n')
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1510
        if self.graph:
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1511
            f._add_text(key1, [key0], 'b\nc\n')
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1512
        else:
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1513
            f._add_text(key1, [], 'b\nc\n')
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1514
        keys = f.keys()
1515
        self.assertTrue(key0 in keys)
1516
        self.assertTrue(key1 in keys)
1517
        records = []
1518
        for record in f.get_record_stream([key0, key1], 'unordered', True):
1519
            records.append((record.key, record.get_bytes_as('fulltext')))
1520
        records.sort()
1521
        self.assertEqual([(key0, 'a\nb\n'), (key1, 'b\nc\n')], records)
1522
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1523
    def test_annotate(self):
1524
        files = self.get_versionedfiles()
1525
        self.get_diamond_files(files)
1526
        if self.key_length == 1:
1527
            prefix = ()
1528
        else:
1529
            prefix = ('FileA',)
1530
        # introduced full text
1531
        origins = files.annotate(prefix + ('origin',))
1532
        self.assertEqual([
1533
            (prefix + ('origin',), 'origin\n')],
1534
            origins)
1535
        # a delta
1536
        origins = files.annotate(prefix + ('base',))
1537
        self.assertEqual([
1538
            (prefix + ('base',), 'base\n')],
1539
            origins)
1540
        # a merge
1541
        origins = files.annotate(prefix + ('merged',))
1542
        if self.graph:
1543
            self.assertEqual([
1544
                (prefix + ('base',), 'base\n'),
1545
                (prefix + ('left',), 'left\n'),
1546
                (prefix + ('right',), 'right\n'),
1547
                (prefix + ('merged',), 'merged\n')
1548
                ],
1549
                origins)
1550
        else:
1551
            # Without a graph everything is new.
1552
            self.assertEqual([
1553
                (prefix + ('merged',), 'base\n'),
1554
                (prefix + ('merged',), 'left\n'),
1555
                (prefix + ('merged',), 'right\n'),
1556
                (prefix + ('merged',), 'merged\n')
1557
                ],
1558
                origins)
1559
        self.assertRaises(RevisionNotPresent,
1560
            files.annotate, prefix + ('missing-key',))
1561
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1562
    def test_check_no_parameters(self):
1563
        files = self.get_versionedfiles()
1564
1565
    def test_check_progressbar_parameter(self):
1566
        """A progress bar can be supplied because check can be a generator."""
1567
        pb = ui.ui_factory.nested_progress_bar()
1568
        self.addCleanup(pb.finished)
1569
        files = self.get_versionedfiles()
1570
        files.check(progress_bar=pb)
1571
1572
    def test_check_with_keys_becomes_generator(self):
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1573
        files = self.get_versionedfiles()
1574
        self.get_diamond_files(files)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1575
        keys = files.keys()
1576
        entries = files.check(keys=keys)
1577
        seen = set()
1578
        # Texts output should be fulltexts.
1579
        self.capture_stream(files, entries, seen.add,
1580
            files.get_parent_map(keys), require_fulltext=True)
1581
        # All texts should be output.
1582
        self.assertEqual(set(keys), seen)
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1583
3350.6.2 by Robert Collins
Prepare parameterised test environment.
1584
    def test_construct(self):
1585
        """Each parameterised test can be constructed on a transport."""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1586
        files = self.get_versionedfiles()
1587
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1588
    def get_diamond_files(self, files, trailing_eol=True, left_only=False,
1589
        nokeys=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1590
        return get_diamond_files(files, self.key_length,
1591
            trailing_eol=trailing_eol, nograph=not self.graph,
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1592
            left_only=left_only, nokeys=nokeys)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1593
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1594
    def _add_content_nostoresha(self, add_lines):
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1595
        """When nostore_sha is supplied using old content raises."""
1596
        vf = self.get_versionedfiles()
1597
        empty_text = ('a', [])
1598
        sample_text_nl = ('b', ["foo\n", "bar\n"])
1599
        sample_text_no_nl = ('c', ["foo\n", "bar"])
1600
        shas = []
1601
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1602
            if add_lines:
1603
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
1604
                                         lines)
1605
            else:
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1606
                sha, _, _ = vf._add_text(self.get_simple_key(version), [],
1607
                                         ''.join(lines))
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1608
            shas.append(sha)
1609
        # we now have a copy of all the lines in the vf.
1610
        for sha, (version, lines) in zip(
1611
            shas, (empty_text, sample_text_nl, sample_text_no_nl)):
1612
            new_key = self.get_simple_key(version + "2")
1613
            self.assertRaises(errors.ExistingContent,
1614
                vf.add_lines, new_key, [], lines,
1615
                nostore_sha=sha)
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1616
            self.assertRaises(errors.ExistingContent,
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1617
                vf._add_text, new_key, [], ''.join(lines),
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1618
                nostore_sha=sha)
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1619
            # and no new version should have been added.
1620
            record = vf.get_record_stream([new_key], 'unordered', True).next()
1621
            self.assertEqual('absent', record.storage_kind)
1622
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1623
    def test_add_lines_nostoresha(self):
1624
        self._add_content_nostoresha(add_lines=True)
1625
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1626
    def test__add_text_nostoresha(self):
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1627
        self._add_content_nostoresha(add_lines=False)
1628
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1629
    def test_add_lines_return(self):
1630
        files = self.get_versionedfiles()
1631
        # save code by using the stock data insertion helper.
1632
        adds = self.get_diamond_files(files)
1633
        results = []
1634
        # We can only validate the first 2 elements returned from add_lines.
1635
        for add in adds:
1636
            self.assertEqual(3, len(add))
1637
            results.append(add[:2])
1638
        if self.key_length == 1:
1639
            self.assertEqual([
1640
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1641
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1642
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1643
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1644
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
1645
                results)
1646
        elif self.key_length == 2:
1647
            self.assertEqual([
1648
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1649
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1650
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1651
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1652
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1653
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1654
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1655
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1656
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1657
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
1658
                results)
1659
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1660
    def test_add_lines_no_key_generates_chk_key(self):
1661
        files = self.get_versionedfiles()
1662
        # save code by using the stock data insertion helper.
1663
        adds = self.get_diamond_files(files, nokeys=True)
1664
        results = []
1665
        # We can only validate the first 2 elements returned from add_lines.
1666
        for add in adds:
1667
            self.assertEqual(3, len(add))
1668
            results.append(add[:2])
1669
        if self.key_length == 1:
1670
            self.assertEqual([
1671
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1672
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1673
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1674
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1675
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
1676
                results)
1677
            # Check the added items got CHK keys.
1678
            self.assertEqual(set([
1679
                ('sha1:00e364d235126be43292ab09cb4686cf703ddc17',),
1680
                ('sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',),
1681
                ('sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',),
1682
                ('sha1:a8478686da38e370e32e42e8a0c220e33ee9132f',),
1683
                ('sha1:ed8bce375198ea62444dc71952b22cfc2b09226d',),
1684
                ]),
1685
                files.keys())
1686
        elif self.key_length == 2:
1687
            self.assertEqual([
1688
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1689
                ('00e364d235126be43292ab09cb4686cf703ddc17', 7),
1690
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1691
                ('51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1692
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1693
                ('a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1694
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1695
                ('9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1696
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1697
                ('ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
1698
                results)
1699
            # Check the added items got CHK keys.
1700
            self.assertEqual(set([
1701
                ('FileA', 'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1702
                ('FileA', 'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1703
                ('FileA', 'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1704
                ('FileA', 'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1705
                ('FileA', 'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
1706
                ('FileB', 'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1707
                ('FileB', 'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1708
                ('FileB', 'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1709
                ('FileB', 'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1710
                ('FileB', 'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
1711
                ]),
1712
                files.keys())
1713
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1714
    def test_empty_lines(self):
1715
        """Empty files can be stored."""
1716
        f = self.get_versionedfiles()
1717
        key_a = self.get_simple_key('a')
1718
        f.add_lines(key_a, [], [])
1719
        self.assertEqual('',
1720
            f.get_record_stream([key_a], 'unordered', True
1721
                ).next().get_bytes_as('fulltext'))
1722
        key_b = self.get_simple_key('b')
1723
        f.add_lines(key_b, self.get_parents([key_a]), [])
1724
        self.assertEqual('',
1725
            f.get_record_stream([key_b], 'unordered', True
1726
                ).next().get_bytes_as('fulltext'))
1727
1728
    def test_newline_only(self):
1729
        f = self.get_versionedfiles()
1730
        key_a = self.get_simple_key('a')
1731
        f.add_lines(key_a, [], ['\n'])
1732
        self.assertEqual('\n',
1733
            f.get_record_stream([key_a], 'unordered', True
1734
                ).next().get_bytes_as('fulltext'))
1735
        key_b = self.get_simple_key('b')
1736
        f.add_lines(key_b, self.get_parents([key_a]), ['\n'])
1737
        self.assertEqual('\n',
1738
            f.get_record_stream([key_b], 'unordered', True
1739
                ).next().get_bytes_as('fulltext'))
1740
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
1741
    def test_get_known_graph_ancestry(self):
1742
        f = self.get_versionedfiles()
4593.5.36 by John Arbash Meinel
a few more implementations of the interface.
1743
        if not self.graph:
1744
            raise TestNotApplicable('ancestry info only relevant with graph.')
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
1745
        key_a = self.get_simple_key('a')
1746
        key_b = self.get_simple_key('b')
1747
        key_c = self.get_simple_key('c')
1748
        # A
1749
        # |\
1750
        # | B
1751
        # |/
1752
        # C
1753
        f.add_lines(key_a, [], ['\n'])
1754
        f.add_lines(key_b, [key_a], ['\n'])
1755
        f.add_lines(key_c, [key_a, key_b], ['\n'])
1756
        kg = f.get_known_graph_ancestry([key_c])
1757
        self.assertIsInstance(kg, _mod_graph.KnownGraph)
1758
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1759
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1760
    def test_known_graph_with_fallbacks(self):
1761
        f = self.get_versionedfiles('files')
1762
        if not self.graph:
1763
            raise TestNotApplicable('ancestry info only relevant with graph.')
1764
        if getattr(f, 'add_fallback_versioned_files', None) is None:
1765
            raise TestNotApplicable("%s doesn't support fallbacks"
1766
                                    % (f.__class__.__name__,))
1767
        key_a = self.get_simple_key('a')
1768
        key_b = self.get_simple_key('b')
1769
        key_c = self.get_simple_key('c')
1770
        # A     only in fallback
1771
        # |\
1772
        # | B
1773
        # |/
1774
        # C
1775
        g = self.get_versionedfiles('fallback')
1776
        g.add_lines(key_a, [], ['\n'])
1777
        f.add_fallback_versioned_files(g)
1778
        f.add_lines(key_b, [key_a], ['\n'])
1779
        f.add_lines(key_c, [key_a, key_b], ['\n'])
1780
        kg = f.get_known_graph_ancestry([key_c])
1781
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1782
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1783
    def test_get_record_stream_empty(self):
1784
        """An empty stream can be requested without error."""
1785
        f = self.get_versionedfiles()
1786
        entries = f.get_record_stream([], 'unordered', False)
1787
        self.assertEqual([], list(entries))
1788
1789
    def assertValidStorageKind(self, storage_kind):
1790
        """Assert that storage_kind is a valid storage_kind."""
1791
        self.assertSubset([storage_kind],
1792
            ['mpdiff', 'knit-annotated-ft', 'knit-annotated-delta',
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1793
             'knit-ft', 'knit-delta', 'chunked', 'fulltext',
1794
             'knit-annotated-ft-gz', 'knit-annotated-delta-gz', 'knit-ft-gz',
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1795
             'knit-delta-gz',
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1796
             'knit-delta-closure', 'knit-delta-closure-ref',
1797
             'groupcompress-block', 'groupcompress-block-ref'])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1798
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1799
    def capture_stream(self, f, entries, on_seen, parents,
1800
        require_fulltext=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1801
        """Capture a stream for testing."""
1802
        for factory in entries:
1803
            on_seen(factory.key)
1804
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1805
            if factory.sha1 is not None:
1806
                self.assertEqual(f.get_sha1s([factory.key])[factory.key],
1807
                    factory.sha1)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1808
            self.assertEqual(parents[factory.key], factory.parents)
1809
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
1810
                str)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1811
            if require_fulltext:
1812
                factory.get_bytes_as('fulltext')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1813
1814
    def test_get_record_stream_interface(self):
1815
        """each item in a stream has to provide a regular interface."""
1816
        files = self.get_versionedfiles()
1817
        self.get_diamond_files(files)
1818
        keys, _ = self.get_keys_and_sort_order()
1819
        parent_map = files.get_parent_map(keys)
1820
        entries = files.get_record_stream(keys, 'unordered', False)
1821
        seen = set()
1822
        self.capture_stream(files, entries, seen.add, parent_map)
1823
        self.assertEqual(set(keys), seen)
1824
1825
    def get_keys_and_sort_order(self):
1826
        """Get diamond test keys list, and their sort ordering."""
1827
        if self.key_length == 1:
1828
            keys = [('merged',), ('left',), ('right',), ('base',)]
1829
            sort_order = {('merged',):2, ('left',):1, ('right',):1, ('base',):0}
1830
        else:
1831
            keys = [
1832
                ('FileA', 'merged'), ('FileA', 'left'), ('FileA', 'right'),
1833
                ('FileA', 'base'),
1834
                ('FileB', 'merged'), ('FileB', 'left'), ('FileB', 'right'),
1835
                ('FileB', 'base'),
1836
                ]
1837
            sort_order = {
1838
                ('FileA', 'merged'):2, ('FileA', 'left'):1, ('FileA', 'right'):1,
1839
                ('FileA', 'base'):0,
1840
                ('FileB', 'merged'):2, ('FileB', 'left'):1, ('FileB', 'right'):1,
1841
                ('FileB', 'base'):0,
1842
                }
1843
        return keys, sort_order
1844
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1845
    def get_keys_and_groupcompress_sort_order(self):
1846
        """Get diamond test keys list, and their groupcompress sort ordering."""
1847
        if self.key_length == 1:
1848
            keys = [('merged',), ('left',), ('right',), ('base',)]
1849
            sort_order = {('merged',):0, ('left',):1, ('right',):1, ('base',):2}
1850
        else:
1851
            keys = [
1852
                ('FileA', 'merged'), ('FileA', 'left'), ('FileA', 'right'),
1853
                ('FileA', 'base'),
1854
                ('FileB', 'merged'), ('FileB', 'left'), ('FileB', 'right'),
1855
                ('FileB', 'base'),
1856
                ]
1857
            sort_order = {
1858
                ('FileA', 'merged'):0, ('FileA', 'left'):1, ('FileA', 'right'):1,
1859
                ('FileA', 'base'):2,
1860
                ('FileB', 'merged'):3, ('FileB', 'left'):4, ('FileB', 'right'):4,
1861
                ('FileB', 'base'):5,
1862
                }
1863
        return keys, sort_order
1864
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1865
    def test_get_record_stream_interface_ordered(self):
1866
        """each item in a stream has to provide a regular interface."""
1867
        files = self.get_versionedfiles()
1868
        self.get_diamond_files(files)
1869
        keys, sort_order = self.get_keys_and_sort_order()
1870
        parent_map = files.get_parent_map(keys)
1871
        entries = files.get_record_stream(keys, 'topological', False)
1872
        seen = []
1873
        self.capture_stream(files, entries, seen.append, parent_map)
1874
        self.assertStreamOrder(sort_order, seen, keys)
1875
1876
    def test_get_record_stream_interface_ordered_with_delta_closure(self):
1877
        """each item must be accessible as a fulltext."""
1878
        files = self.get_versionedfiles()
1879
        self.get_diamond_files(files)
1880
        keys, sort_order = self.get_keys_and_sort_order()
1881
        parent_map = files.get_parent_map(keys)
1882
        entries = files.get_record_stream(keys, 'topological', True)
1883
        seen = []
1884
        for factory in entries:
1885
            seen.append(factory.key)
1886
            self.assertValidStorageKind(factory.storage_kind)
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1887
            self.assertSubset([factory.sha1],
1888
                [None, files.get_sha1s([factory.key])[factory.key]])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1889
            self.assertEqual(parent_map[factory.key], factory.parents)
1890
            # self.assertEqual(files.get_text(factory.key),
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1891
            ft_bytes = factory.get_bytes_as('fulltext')
1892
            self.assertIsInstance(ft_bytes, str)
1893
            chunked_bytes = factory.get_bytes_as('chunked')
1894
            self.assertEqualDiff(ft_bytes, ''.join(chunked_bytes))
1895
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1896
        self.assertStreamOrder(sort_order, seen, keys)
1897
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1898
    def test_get_record_stream_interface_groupcompress(self):
1899
        """each item in a stream has to provide a regular interface."""
1900
        files = self.get_versionedfiles()
1901
        self.get_diamond_files(files)
1902
        keys, sort_order = self.get_keys_and_groupcompress_sort_order()
1903
        parent_map = files.get_parent_map(keys)
1904
        entries = files.get_record_stream(keys, 'groupcompress', False)
1905
        seen = []
1906
        self.capture_stream(files, entries, seen.append, parent_map)
1907
        self.assertStreamOrder(sort_order, seen, keys)
1908
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1909
    def assertStreamOrder(self, sort_order, seen, keys):
1910
        self.assertEqual(len(set(seen)), len(keys))
1911
        if self.key_length == 1:
1912
            lows = {():0}
1913
        else:
1914
            lows = {('FileA',):0, ('FileB',):0}
1915
        if not self.graph:
1916
            self.assertEqual(set(keys), set(seen))
1917
        else:
1918
            for key in seen:
1919
                sort_pos = sort_order[key]
1920
                self.assertTrue(sort_pos >= lows[key[:-1]],
1921
                    "Out of order in sorted stream: %r, %r" % (key, seen))
1922
                lows[key[:-1]] = sort_pos
1923
1924
    def test_get_record_stream_unknown_storage_kind_raises(self):
1925
        """Asking for a storage kind that the stream cannot supply raises."""
1926
        files = self.get_versionedfiles()
1927
        self.get_diamond_files(files)
1928
        if self.key_length == 1:
1929
            keys = [('merged',), ('left',), ('right',), ('base',)]
1930
        else:
1931
            keys = [
1932
                ('FileA', 'merged'), ('FileA', 'left'), ('FileA', 'right'),
1933
                ('FileA', 'base'),
1934
                ('FileB', 'merged'), ('FileB', 'left'), ('FileB', 'right'),
1935
                ('FileB', 'base'),
1936
                ]
1937
        parent_map = files.get_parent_map(keys)
1938
        entries = files.get_record_stream(keys, 'unordered', False)
1939
        # We track the contents because we should be able to try, fail a
1940
        # particular kind and then ask for one that works and continue.
1941
        seen = set()
1942
        for factory in entries:
1943
            seen.add(factory.key)
1944
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1945
            if factory.sha1 is not None:
1946
                self.assertEqual(files.get_sha1s([factory.key])[factory.key],
1947
                                 factory.sha1)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1948
            self.assertEqual(parent_map[factory.key], factory.parents)
1949
            # currently no stream emits mpdiff
1950
            self.assertRaises(errors.UnavailableRepresentation,
1951
                factory.get_bytes_as, 'mpdiff')
1952
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
1953
                str)
1954
        self.assertEqual(set(keys), seen)
1955
1956
    def test_get_record_stream_missing_records_are_absent(self):
1957
        files = self.get_versionedfiles()
1958
        self.get_diamond_files(files)
1959
        if self.key_length == 1:
1960
            keys = [('merged',), ('left',), ('right',), ('absent',), ('base',)]
1961
        else:
1962
            keys = [
1963
                ('FileA', 'merged'), ('FileA', 'left'), ('FileA', 'right'),
1964
                ('FileA', 'absent'), ('FileA', 'base'),
1965
                ('FileB', 'merged'), ('FileB', 'left'), ('FileB', 'right'),
1966
                ('FileB', 'absent'), ('FileB', 'base'),
1967
                ('absent', 'absent'),
1968
                ]
1969
        parent_map = files.get_parent_map(keys)
1970
        entries = files.get_record_stream(keys, 'unordered', False)
1971
        self.assertAbsentRecord(files, keys, parent_map, entries)
1972
        entries = files.get_record_stream(keys, 'topological', False)
1973
        self.assertAbsentRecord(files, keys, parent_map, entries)
1974
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
1975
    def assertRecordHasContent(self, record, bytes):
1976
        """Assert that record has the bytes bytes."""
1977
        self.assertEqual(bytes, record.get_bytes_as('fulltext'))
4005.3.7 by Robert Collins
Review feedback.
1978
        self.assertEqual(bytes, ''.join(record.get_bytes_as('chunked')))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
1979
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
1980
    def test_get_record_stream_native_formats_are_wire_ready_one_ft(self):
1981
        files = self.get_versionedfiles()
1982
        key = self.get_simple_key('foo')
1983
        files.add_lines(key, (), ['my text\n', 'content'])
1984
        stream = files.get_record_stream([key], 'unordered', False)
1985
        record = stream.next()
1986
        if record.storage_kind in ('chunked', 'fulltext'):
1987
            # chunked and fulltext representations are for direct use not wire
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
1988
            # serialisation: check they are able to be used directly. To send
1989
            # such records over the wire translation will be needed.
1990
            self.assertRecordHasContent(record, "my text\ncontent")
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
1991
        else:
1992
            bytes = [record.get_bytes_as(record.storage_kind)]
1993
            network_stream = versionedfile.NetworkRecordStream(bytes).read()
1994
            source_record = record
1995
            records = []
1996
            for record in network_stream:
1997
                records.append(record)
1998
                self.assertEqual(source_record.storage_kind,
1999
                    record.storage_kind)
2000
                self.assertEqual(source_record.parents, record.parents)
2001
                self.assertEqual(
2002
                    source_record.get_bytes_as(source_record.storage_kind),
2003
                    record.get_bytes_as(record.storage_kind))
2004
            self.assertEqual(1, len(records))
2005
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2006
    def assertStreamMetaEqual(self, records, expected, stream):
2007
        """Assert that streams expected and stream have the same records.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2008
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2009
        :param records: A list to collect the seen records.
2010
        :return: A generator of the records in stream.
2011
        """
2012
        # We make assertions during copying to catch things early for
2013
        # easier debugging.
2014
        for record, ref_record in izip(stream, expected):
2015
            records.append(record)
2016
            self.assertEqual(ref_record.key, record.key)
2017
            self.assertEqual(ref_record.storage_kind, record.storage_kind)
2018
            self.assertEqual(ref_record.parents, record.parents)
2019
            yield record
2020
2021
    def stream_to_bytes_or_skip_counter(self, skipped_records, full_texts,
2022
        stream):
2023
        """Convert a stream to a bytes iterator.
2024
2025
        :param skipped_records: A list with one element to increment when a
2026
            record is skipped.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2027
        :param full_texts: A dict from key->fulltext representation, for
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2028
            checking chunked or fulltext stored records.
2029
        :param stream: A record_stream.
2030
        :return: An iterator over the bytes of each record.
2031
        """
2032
        for record in stream:
2033
            if record.storage_kind in ('chunked', 'fulltext'):
2034
                skipped_records[0] += 1
2035
                # check the content is correct for direct use.
2036
                self.assertRecordHasContent(record, full_texts[record.key])
2037
            else:
2038
                yield record.get_bytes_as(record.storage_kind)
2039
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2040
    def test_get_record_stream_native_formats_are_wire_ready_ft_delta(self):
2041
        files = self.get_versionedfiles()
2042
        target_files = self.get_versionedfiles('target')
2043
        key = self.get_simple_key('ft')
2044
        key_delta = self.get_simple_key('delta')
2045
        files.add_lines(key, (), ['my text\n', 'content'])
2046
        if self.graph:
2047
            delta_parents = (key,)
2048
        else:
2049
            delta_parents = ()
2050
        files.add_lines(key_delta, delta_parents, ['different\n', 'content\n'])
2051
        local = files.get_record_stream([key, key_delta], 'unordered', False)
2052
        ref = files.get_record_stream([key, key_delta], 'unordered', False)
2053
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2054
        full_texts = {
2055
            key: "my text\ncontent",
2056
            key_delta: "different\ncontent\n",
2057
            }
2058
        byte_stream = self.stream_to_bytes_or_skip_counter(
2059
            skipped_records, full_texts, local)
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2060
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2061
        records = []
2062
        # insert the stream from the network into a versioned files object so we can
2063
        # check the content was carried across correctly without doing delta
2064
        # inspection.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2065
        target_files.insert_record_stream(
2066
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2067
        # No duplicates on the wire thank you!
2068
        self.assertEqual(2, len(records) + skipped_records[0])
2069
        if len(records):
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2070
            # if any content was copied it all must have all been.
2071
            self.assertIdenticalVersionedFile(files, target_files)
2072
2073
    def test_get_record_stream_native_formats_are_wire_ready_delta(self):
2074
        # copy a delta over the wire
2075
        files = self.get_versionedfiles()
2076
        target_files = self.get_versionedfiles('target')
2077
        key = self.get_simple_key('ft')
2078
        key_delta = self.get_simple_key('delta')
2079
        files.add_lines(key, (), ['my text\n', 'content'])
2080
        if self.graph:
2081
            delta_parents = (key,)
2082
        else:
2083
            delta_parents = ()
2084
        files.add_lines(key_delta, delta_parents, ['different\n', 'content\n'])
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2085
        # Copy the basis text across so we can reconstruct the delta during
2086
        # insertion into target.
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2087
        target_files.insert_record_stream(files.get_record_stream([key],
2088
            'unordered', False))
2089
        local = files.get_record_stream([key_delta], 'unordered', False)
2090
        ref = files.get_record_stream([key_delta], 'unordered', False)
2091
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2092
        full_texts = {
2093
            key_delta: "different\ncontent\n",
2094
            }
2095
        byte_stream = self.stream_to_bytes_or_skip_counter(
2096
            skipped_records, full_texts, local)
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2097
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2098
        records = []
2099
        # insert the stream from the network into a versioned files object so we can
2100
        # check the content was carried across correctly without doing delta
2101
        # inspection during check_stream.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2102
        target_files.insert_record_stream(
2103
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2104
        # No duplicates on the wire thank you!
2105
        self.assertEqual(1, len(records) + skipped_records[0])
2106
        if len(records):
2107
            # if any content was copied it all must have all been
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2108
            self.assertIdenticalVersionedFile(files, target_files)
2109
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2110
    def test_get_record_stream_wire_ready_delta_closure_included(self):
2111
        # copy a delta over the wire with the ability to get its full text.
2112
        files = self.get_versionedfiles()
2113
        key = self.get_simple_key('ft')
2114
        key_delta = self.get_simple_key('delta')
2115
        files.add_lines(key, (), ['my text\n', 'content'])
2116
        if self.graph:
2117
            delta_parents = (key,)
2118
        else:
2119
            delta_parents = ()
2120
        files.add_lines(key_delta, delta_parents, ['different\n', 'content\n'])
2121
        local = files.get_record_stream([key_delta], 'unordered', True)
2122
        ref = files.get_record_stream([key_delta], 'unordered', True)
2123
        skipped_records = [0]
2124
        full_texts = {
2125
            key_delta: "different\ncontent\n",
2126
            }
2127
        byte_stream = self.stream_to_bytes_or_skip_counter(
2128
            skipped_records, full_texts, local)
2129
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2130
        records = []
2131
        # insert the stream from the network into a versioned files object so we can
2132
        # check the content was carried across correctly without doing delta
2133
        # inspection during check_stream.
2134
        for record in self.assertStreamMetaEqual(records, ref, network_stream):
2135
            # we have to be able to get the full text out:
2136
            self.assertRecordHasContent(record, full_texts[record.key])
2137
        # No duplicates on the wire thank you!
2138
        self.assertEqual(1, len(records) + skipped_records[0])
2139
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2140
    def assertAbsentRecord(self, files, keys, parents, entries):
2141
        """Helper for test_get_record_stream_missing_records_are_absent."""
2142
        seen = set()
2143
        for factory in entries:
2144
            seen.add(factory.key)
2145
            if factory.key[-1] == 'absent':
2146
                self.assertEqual('absent', factory.storage_kind)
2147
                self.assertEqual(None, factory.sha1)
2148
                self.assertEqual(None, factory.parents)
2149
            else:
2150
                self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
2151
                if factory.sha1 is not None:
2152
                    sha1 = files.get_sha1s([factory.key])[factory.key]
2153
                    self.assertEqual(sha1, factory.sha1)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2154
                self.assertEqual(parents[factory.key], factory.parents)
2155
                self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
2156
                    str)
2157
        self.assertEqual(set(keys), seen)
2158
2159
    def test_filter_absent_records(self):
2160
        """Requested missing records can be filter trivially."""
2161
        files = self.get_versionedfiles()
2162
        self.get_diamond_files(files)
2163
        keys, _ = self.get_keys_and_sort_order()
2164
        parent_map = files.get_parent_map(keys)
2165
        # Add an absent record in the middle of the present keys. (We don't ask
2166
        # for just absent keys to ensure that content before and after the
2167
        # absent keys is still delivered).
2168
        present_keys = list(keys)
2169
        if self.key_length == 1:
2170
            keys.insert(2, ('extra',))
2171
        else:
2172
            keys.insert(2, ('extra', 'extra'))
2173
        entries = files.get_record_stream(keys, 'unordered', False)
2174
        seen = set()
2175
        self.capture_stream(files, versionedfile.filter_absent(entries), seen.add,
2176
            parent_map)
2177
        self.assertEqual(set(present_keys), seen)
2178
2179
    def get_mapper(self):
2180
        """Get a mapper suitable for the key length of the test interface."""
2181
        if self.key_length == 1:
2182
            return ConstantMapper('source')
2183
        else:
2184
            return HashEscapedPrefixMapper()
2185
2186
    def get_parents(self, parents):
2187
        """Get parents, taking self.graph into consideration."""
2188
        if self.graph:
2189
            return parents
2190
        else:
2191
            return None
2192
4332.3.32 by Robert Collins
Merge bzr.dev.
2193
    def test_get_annotator(self):
2194
        files = self.get_versionedfiles()
2195
        self.get_diamond_files(files)
2196
        origin_key = self.get_simple_key('origin')
2197
        base_key = self.get_simple_key('base')
2198
        left_key = self.get_simple_key('left')
2199
        right_key = self.get_simple_key('right')
2200
        merged_key = self.get_simple_key('merged')
2201
        # annotator = files.get_annotator()
2202
        # introduced full text
2203
        origins, lines = files.get_annotator().annotate(origin_key)
2204
        self.assertEqual([(origin_key,)], origins)
2205
        self.assertEqual(['origin\n'], lines)
2206
        # a delta
2207
        origins, lines = files.get_annotator().annotate(base_key)
2208
        self.assertEqual([(base_key,)], origins)
2209
        # a merge
2210
        origins, lines = files.get_annotator().annotate(merged_key)
2211
        if self.graph:
2212
            self.assertEqual([
2213
                (base_key,),
2214
                (left_key,),
2215
                (right_key,),
2216
                (merged_key,),
2217
                ], origins)
2218
        else:
2219
            # Without a graph everything is new.
2220
            self.assertEqual([
2221
                (merged_key,),
2222
                (merged_key,),
2223
                (merged_key,),
2224
                (merged_key,),
2225
                ], origins)
2226
        self.assertRaises(RevisionNotPresent,
2227
            files.get_annotator().annotate, self.get_simple_key('missing-key'))
2228
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2229
    def test_get_parent_map(self):
2230
        files = self.get_versionedfiles()
2231
        if self.key_length == 1:
2232
            parent_details = [
2233
                (('r0',), self.get_parents(())),
2234
                (('r1',), self.get_parents((('r0',),))),
2235
                (('r2',), self.get_parents(())),
2236
                (('r3',), self.get_parents(())),
2237
                (('m',), self.get_parents((('r0',),('r1',),('r2',),('r3',)))),
2238
                ]
2239
        else:
2240
            parent_details = [
2241
                (('FileA', 'r0'), self.get_parents(())),
2242
                (('FileA', 'r1'), self.get_parents((('FileA', 'r0'),))),
2243
                (('FileA', 'r2'), self.get_parents(())),
2244
                (('FileA', 'r3'), self.get_parents(())),
2245
                (('FileA', 'm'), self.get_parents((('FileA', 'r0'),
2246
                    ('FileA', 'r1'), ('FileA', 'r2'), ('FileA', 'r3')))),
2247
                ]
2248
        for key, parents in parent_details:
2249
            files.add_lines(key, parents, [])
2250
            # immediately after adding it should be queryable.
2251
            self.assertEqual({key:parents}, files.get_parent_map([key]))
2252
        # We can ask for an empty set
2253
        self.assertEqual({}, files.get_parent_map([]))
2254
        # We can ask for many keys
2255
        all_parents = dict(parent_details)
2256
        self.assertEqual(all_parents, files.get_parent_map(all_parents.keys()))
2257
        # Absent keys are just not included in the result.
2258
        keys = all_parents.keys()
2259
        if self.key_length == 1:
2260
            keys.insert(1, ('missing',))
2261
        else:
2262
            keys.insert(1, ('missing', 'missing'))
2263
        # Absent keys are just ignored
2264
        self.assertEqual(all_parents, files.get_parent_map(keys))
2265
2266
    def test_get_sha1s(self):
2267
        files = self.get_versionedfiles()
2268
        self.get_diamond_files(files)
2269
        if self.key_length == 1:
2270
            keys = [('base',), ('origin',), ('left',), ('merged',), ('right',)]
2271
        else:
2272
            # ask for shas from different prefixes.
2273
            keys = [
2274
                ('FileA', 'base'), ('FileB', 'origin'), ('FileA', 'left'),
2275
                ('FileA', 'merged'), ('FileB', 'right'),
2276
                ]
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2277
        self.assertEqual({
2278
            keys[0]: '51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',
2279
            keys[1]: '00e364d235126be43292ab09cb4686cf703ddc17',
2280
            keys[2]: 'a8478686da38e370e32e42e8a0c220e33ee9132f',
2281
            keys[3]: 'ed8bce375198ea62444dc71952b22cfc2b09226d',
2282
            keys[4]: '9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',
2283
            },
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2284
            files.get_sha1s(keys))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2285
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2286
    def test_insert_record_stream_empty(self):
2287
        """Inserting an empty record stream should work."""
2288
        files = self.get_versionedfiles()
2289
        files.insert_record_stream([])
2290
2291
    def assertIdenticalVersionedFile(self, expected, actual):
2292
        """Assert that left and right have the same contents."""
2293
        self.assertEqual(set(actual.keys()), set(expected.keys()))
2294
        actual_parents = actual.get_parent_map(actual.keys())
2295
        if self.graph:
2296
            self.assertEqual(actual_parents, expected.get_parent_map(expected.keys()))
2297
        else:
2298
            for key, parents in actual_parents.items():
2299
                self.assertEqual(None, parents)
2300
        for key in actual.keys():
2301
            actual_text = actual.get_record_stream(
2302
                [key], 'unordered', True).next().get_bytes_as('fulltext')
2303
            expected_text = expected.get_record_stream(
2304
                [key], 'unordered', True).next().get_bytes_as('fulltext')
2305
            self.assertEqual(actual_text, expected_text)
2306
2307
    def test_insert_record_stream_fulltexts(self):
2308
        """Any file should accept a stream of fulltexts."""
2309
        files = self.get_versionedfiles()
2310
        mapper = self.get_mapper()
2311
        source_transport = self.get_transport('source')
2312
        source_transport.mkdir('.')
2313
        # weaves always output fulltexts.
2314
        source = make_versioned_files_factory(WeaveFile, mapper)(
2315
            source_transport)
2316
        self.get_diamond_files(source, trailing_eol=False)
2317
        stream = source.get_record_stream(source.keys(), 'topological',
2318
            False)
2319
        files.insert_record_stream(stream)
2320
        self.assertIdenticalVersionedFile(source, files)
2321
2322
    def test_insert_record_stream_fulltexts_noeol(self):
2323
        """Any file should accept a stream of fulltexts."""
2324
        files = self.get_versionedfiles()
2325
        mapper = self.get_mapper()
2326
        source_transport = self.get_transport('source')
2327
        source_transport.mkdir('.')
2328
        # weaves always output fulltexts.
2329
        source = make_versioned_files_factory(WeaveFile, mapper)(
2330
            source_transport)
2331
        self.get_diamond_files(source, trailing_eol=False)
2332
        stream = source.get_record_stream(source.keys(), 'topological',
2333
            False)
2334
        files.insert_record_stream(stream)
2335
        self.assertIdenticalVersionedFile(source, files)
2336
2337
    def test_insert_record_stream_annotated_knits(self):
2338
        """Any file should accept a stream from plain knits."""
2339
        files = self.get_versionedfiles()
2340
        mapper = self.get_mapper()
2341
        source_transport = self.get_transport('source')
2342
        source_transport.mkdir('.')
2343
        source = make_file_factory(True, mapper)(source_transport)
2344
        self.get_diamond_files(source)
2345
        stream = source.get_record_stream(source.keys(), 'topological',
2346
            False)
2347
        files.insert_record_stream(stream)
2348
        self.assertIdenticalVersionedFile(source, files)
2349
2350
    def test_insert_record_stream_annotated_knits_noeol(self):
2351
        """Any file should accept a stream from plain knits."""
2352
        files = self.get_versionedfiles()
2353
        mapper = self.get_mapper()
2354
        source_transport = self.get_transport('source')
2355
        source_transport.mkdir('.')
2356
        source = make_file_factory(True, mapper)(source_transport)
2357
        self.get_diamond_files(source, trailing_eol=False)
2358
        stream = source.get_record_stream(source.keys(), 'topological',
2359
            False)
2360
        files.insert_record_stream(stream)
2361
        self.assertIdenticalVersionedFile(source, files)
2362
2363
    def test_insert_record_stream_plain_knits(self):
2364
        """Any file should accept a stream from plain knits."""
2365
        files = self.get_versionedfiles()
2366
        mapper = self.get_mapper()
2367
        source_transport = self.get_transport('source')
2368
        source_transport.mkdir('.')
2369
        source = make_file_factory(False, mapper)(source_transport)
2370
        self.get_diamond_files(source)
2371
        stream = source.get_record_stream(source.keys(), 'topological',
2372
            False)
2373
        files.insert_record_stream(stream)
2374
        self.assertIdenticalVersionedFile(source, files)
2375
2376
    def test_insert_record_stream_plain_knits_noeol(self):
2377
        """Any file should accept a stream from plain knits."""
2378
        files = self.get_versionedfiles()
2379
        mapper = self.get_mapper()
2380
        source_transport = self.get_transport('source')
2381
        source_transport.mkdir('.')
2382
        source = make_file_factory(False, mapper)(source_transport)
2383
        self.get_diamond_files(source, trailing_eol=False)
2384
        stream = source.get_record_stream(source.keys(), 'topological',
2385
            False)
2386
        files.insert_record_stream(stream)
2387
        self.assertIdenticalVersionedFile(source, files)
2388
2389
    def test_insert_record_stream_existing_keys(self):
2390
        """Inserting keys already in a file should not error."""
2391
        files = self.get_versionedfiles()
2392
        source = self.get_versionedfiles('source')
2393
        self.get_diamond_files(source)
2394
        # insert some keys into f.
2395
        self.get_diamond_files(files, left_only=True)
2396
        stream = source.get_record_stream(source.keys(), 'topological',
2397
            False)
2398
        files.insert_record_stream(stream)
2399
        self.assertIdenticalVersionedFile(source, files)
2400
2401
    def test_insert_record_stream_missing_keys(self):
2402
        """Inserting a stream with absent keys should raise an error."""
2403
        files = self.get_versionedfiles()
2404
        source = self.get_versionedfiles('source')
2405
        stream = source.get_record_stream([('missing',) * self.key_length],
2406
            'topological', False)
2407
        self.assertRaises(errors.RevisionNotPresent, files.insert_record_stream,
2408
            stream)
2409
2410
    def test_insert_record_stream_out_of_order(self):
2411
        """An out of order stream can either error or work."""
2412
        files = self.get_versionedfiles()
2413
        source = self.get_versionedfiles('source')
2414
        self.get_diamond_files(source)
2415
        if self.key_length == 1:
2416
            origin_keys = [('origin',)]
2417
            end_keys = [('merged',), ('left',)]
2418
            start_keys = [('right',), ('base',)]
2419
        else:
2420
            origin_keys = [('FileA', 'origin'), ('FileB', 'origin')]
2421
            end_keys = [('FileA', 'merged',), ('FileA', 'left',),
2422
                ('FileB', 'merged',), ('FileB', 'left',)]
2423
            start_keys = [('FileA', 'right',), ('FileA', 'base',),
2424
                ('FileB', 'right',), ('FileB', 'base',)]
2425
        origin_entries = source.get_record_stream(origin_keys, 'unordered', False)
2426
        end_entries = source.get_record_stream(end_keys, 'topological', False)
2427
        start_entries = source.get_record_stream(start_keys, 'topological', False)
2428
        entries = chain(origin_entries, end_entries, start_entries)
2429
        try:
2430
            files.insert_record_stream(entries)
2431
        except RevisionNotPresent:
2432
            # Must not have corrupted the file.
2433
            files.check()
2434
        else:
2435
            self.assertIdenticalVersionedFile(source, files)
2436
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2437
    def get_knit_delta_source(self):
2438
        """Get a source that can produce a stream with knit delta records,
2439
        regardless of this test's scenario.
2440
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2441
        mapper = self.get_mapper()
2442
        source_transport = self.get_transport('source')
2443
        source_transport.mkdir('.')
2444
        source = make_file_factory(False, mapper)(source_transport)
4009.3.1 by Andrew Bennetts
Fix test_insert_record_stream_delta_missing_basis_no_corruption to test what it claims to, and fix KnitVersionedFiles.get_record_stream to match the expected exception.
2445
        get_diamond_files(source, self.key_length, trailing_eol=True,
2446
            nograph=False, left_only=False)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2447
        return source
2448
2449
    def test_insert_record_stream_delta_missing_basis_no_corruption(self):
2450
        """Insertion where a needed basis is not included notifies the caller
2451
        of the missing basis.  In the meantime a record missing its basis is
2452
        not added.
2453
        """
2454
        source = self.get_knit_delta_source()
4009.3.7 by Andrew Bennetts
Most tests passing.
2455
        keys = [self.get_simple_key('origin'), self.get_simple_key('merged')]
2456
        entries = source.get_record_stream(keys, 'unordered', False)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2457
        files = self.get_versionedfiles()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2458
        if self.support_partial_insertion:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2459
            self.assertEqual([],
2460
                list(files.get_missing_compression_parent_keys()))
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2461
            files.insert_record_stream(entries)
2462
            missing_bases = files.get_missing_compression_parent_keys()
2463
            self.assertEqual(set([self.get_simple_key('left')]),
2464
                set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2465
            self.assertEqual(set(keys), set(files.get_parent_map(keys)))
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2466
        else:
2467
            self.assertRaises(
2468
                errors.RevisionNotPresent, files.insert_record_stream, entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2469
            files.check()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2470
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2471
    def test_insert_record_stream_delta_missing_basis_can_be_added_later(self):
2472
        """Insertion where a needed basis is not included notifies the caller
2473
        of the missing basis.  That basis can be added in a second
2474
        insert_record_stream call that does not need to repeat records present
4009.3.3 by Andrew Bennetts
Add docstrings.
2475
        in the previous stream.  The record(s) that required that basis are
2476
        fully inserted once their basis is no longer missing.
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2477
        """
2478
        if not self.support_partial_insertion:
2479
            raise TestNotApplicable(
2480
                'versioned file scenario does not support partial insertion')
2481
        source = self.get_knit_delta_source()
2482
        entries = source.get_record_stream([self.get_simple_key('origin'),
2483
            self.get_simple_key('merged')], 'unordered', False)
2484
        files = self.get_versionedfiles()
2485
        files.insert_record_stream(entries)
2486
        missing_bases = files.get_missing_compression_parent_keys()
2487
        self.assertEqual(set([self.get_simple_key('left')]),
2488
            set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2489
        # 'merged' is inserted (although a commit of a write group involving
2490
        # this versionedfiles would fail).
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2491
        merged_key = self.get_simple_key('merged')
4009.3.7 by Andrew Bennetts
Most tests passing.
2492
        self.assertEqual(
2493
            [merged_key], files.get_parent_map([merged_key]).keys())
2494
        # Add the full delta closure of the missing records
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2495
        missing_entries = source.get_record_stream(
4009.3.7 by Andrew Bennetts
Most tests passing.
2496
            missing_bases, 'unordered', True)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2497
        files.insert_record_stream(missing_entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2498
        # Now 'merged' is fully inserted (and a commit would succeed).
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2499
        self.assertEqual([], list(files.get_missing_compression_parent_keys()))
2500
        self.assertEqual(
2501
            [merged_key], files.get_parent_map([merged_key]).keys())
4009.3.7 by Andrew Bennetts
Most tests passing.
2502
        files.check()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2503
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2504
    def test_iter_lines_added_or_present_in_keys(self):
2505
        # test that we get at least an equalset of the lines added by
2506
        # versions in the store.
2507
        # the ordering here is to make a tree so that dumb searches have
2508
        # more changes to muck up.
2509
2510
        class InstrumentedProgress(progress.DummyProgress):
2511
2512
            def __init__(self):
2513
2514
                progress.DummyProgress.__init__(self)
2515
                self.updates = []
2516
2517
            def update(self, msg=None, current=None, total=None):
2518
                self.updates.append((msg, current, total))
2519
2520
        files = self.get_versionedfiles()
2521
        # add a base to get included
2522
        files.add_lines(self.get_simple_key('base'), (), ['base\n'])
2523
        # add a ancestor to be included on one side
2524
        files.add_lines(self.get_simple_key('lancestor'), (), ['lancestor\n'])
2525
        # add a ancestor to be included on the other side
2526
        files.add_lines(self.get_simple_key('rancestor'),
2527
            self.get_parents([self.get_simple_key('base')]), ['rancestor\n'])
2528
        # add a child of rancestor with no eofile-nl
2529
        files.add_lines(self.get_simple_key('child'),
2530
            self.get_parents([self.get_simple_key('rancestor')]),
2531
            ['base\n', 'child\n'])
2532
        # add a child of lancestor and base to join the two roots
2533
        files.add_lines(self.get_simple_key('otherchild'),
2534
            self.get_parents([self.get_simple_key('lancestor'),
2535
                self.get_simple_key('base')]),
2536
            ['base\n', 'lancestor\n', 'otherchild\n'])
2537
        def iter_with_keys(keys, expected):
2538
            # now we need to see what lines are returned, and how often.
2539
            lines = {}
2540
            progress = InstrumentedProgress()
2541
            # iterate over the lines
2542
            for line in files.iter_lines_added_or_present_in_keys(keys,
2543
                pb=progress):
2544
                lines.setdefault(line, 0)
2545
                lines[line] += 1
2546
            if []!= progress.updates:
2547
                self.assertEqual(expected, progress.updates)
2548
            return lines
2549
        lines = iter_with_keys(
2550
            [self.get_simple_key('child'), self.get_simple_key('otherchild')],
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
2551
            [('Walking content', 0, 2),
2552
             ('Walking content', 1, 2),
2553
             ('Walking content', 2, 2)])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2554
        # we must see child and otherchild
2555
        self.assertTrue(lines[('child\n', self.get_simple_key('child'))] > 0)
2556
        self.assertTrue(
2557
            lines[('otherchild\n', self.get_simple_key('otherchild'))] > 0)
2558
        # we dont care if we got more than that.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2559
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2560
        # test all lines
2561
        lines = iter_with_keys(files.keys(),
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
2562
            [('Walking content', 0, 5),
2563
             ('Walking content', 1, 5),
2564
             ('Walking content', 2, 5),
2565
             ('Walking content', 3, 5),
2566
             ('Walking content', 4, 5),
2567
             ('Walking content', 5, 5)])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2568
        # all lines must be seen at least once
2569
        self.assertTrue(lines[('base\n', self.get_simple_key('base'))] > 0)
2570
        self.assertTrue(
2571
            lines[('lancestor\n', self.get_simple_key('lancestor'))] > 0)
2572
        self.assertTrue(
2573
            lines[('rancestor\n', self.get_simple_key('rancestor'))] > 0)
2574
        self.assertTrue(lines[('child\n', self.get_simple_key('child'))] > 0)
2575
        self.assertTrue(
2576
            lines[('otherchild\n', self.get_simple_key('otherchild'))] > 0)
2577
2578
    def test_make_mpdiffs(self):
2579
        from bzrlib import multiparent
2580
        files = self.get_versionedfiles('source')
2581
        # add texts that should trip the knit maximum delta chain threshold
2582
        # as well as doing parallel chains of data in knits.
2583
        # this is done by two chains of 25 insertions
2584
        files.add_lines(self.get_simple_key('base'), [], ['line\n'])
2585
        files.add_lines(self.get_simple_key('noeol'),
2586
            self.get_parents([self.get_simple_key('base')]), ['line'])
2587
        # detailed eol tests:
2588
        # shared last line with parent no-eol
2589
        files.add_lines(self.get_simple_key('noeolsecond'),
2590
            self.get_parents([self.get_simple_key('noeol')]),
2591
                ['line\n', 'line'])
2592
        # differing last line with parent, both no-eol
2593
        files.add_lines(self.get_simple_key('noeolnotshared'),
2594
            self.get_parents([self.get_simple_key('noeolsecond')]),
2595
                ['line\n', 'phone'])
2596
        # add eol following a noneol parent, change content
2597
        files.add_lines(self.get_simple_key('eol'),
2598
            self.get_parents([self.get_simple_key('noeol')]), ['phone\n'])
2599
        # add eol following a noneol parent, no change content
2600
        files.add_lines(self.get_simple_key('eolline'),
2601
            self.get_parents([self.get_simple_key('noeol')]), ['line\n'])
2602
        # noeol with no parents:
2603
        files.add_lines(self.get_simple_key('noeolbase'), [], ['line'])
2604
        # noeol preceeding its leftmost parent in the output:
2605
        # this is done by making it a merge of two parents with no common
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2606
        # anestry: noeolbase and noeol with the
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2607
        # later-inserted parent the leftmost.
2608
        files.add_lines(self.get_simple_key('eolbeforefirstparent'),
2609
            self.get_parents([self.get_simple_key('noeolbase'),
2610
                self.get_simple_key('noeol')]),
2611
            ['line'])
2612
        # two identical eol texts
2613
        files.add_lines(self.get_simple_key('noeoldup'),
2614
            self.get_parents([self.get_simple_key('noeol')]), ['line'])
2615
        next_parent = self.get_simple_key('base')
2616
        text_name = 'chain1-'
2617
        text = ['line\n']
2618
        sha1s = {0 :'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
2619
                 1 :'45e21ea146a81ea44a821737acdb4f9791c8abe7',
2620
                 2 :'e1f11570edf3e2a070052366c582837a4fe4e9fa',
2621
                 3 :'26b4b8626da827088c514b8f9bbe4ebf181edda1',
2622
                 4 :'e28a5510be25ba84d31121cff00956f9970ae6f6',
2623
                 5 :'d63ec0ce22e11dcf65a931b69255d3ac747a318d',
2624
                 6 :'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
2625
                 7 :'95c14da9cafbf828e3e74a6f016d87926ba234ab',
2626
                 8 :'779e9a0b28f9f832528d4b21e17e168c67697272',
2627
                 9 :'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
2628
                 10:'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
2629
                 11:'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
2630
                 12:'31a2286267f24d8bedaa43355f8ad7129509ea85',
2631
                 13:'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
2632
                 14:'2c4b1736566b8ca6051e668de68650686a3922f2',
2633
                 15:'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
2634
                 16:'b0d2e18d3559a00580f6b49804c23fea500feab3',
2635
                 17:'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
2636
                 18:'5cf64a3459ae28efa60239e44b20312d25b253f3',
2637
                 19:'1ebed371807ba5935958ad0884595126e8c4e823',
2638
                 20:'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
2639
                 21:'01edc447978004f6e4e962b417a4ae1955b6fe5d',
2640
                 22:'d8d8dc49c4bf0bab401e0298bb5ad827768618bb',
2641
                 23:'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
2642
                 24:'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
2643
                 25:'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
2644
                 }
2645
        for depth in range(26):
2646
            new_version = self.get_simple_key(text_name + '%s' % depth)
2647
            text = text + ['line\n']
2648
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2649
            next_parent = new_version
2650
        next_parent = self.get_simple_key('base')
2651
        text_name = 'chain2-'
2652
        text = ['line\n']
2653
        for depth in range(26):
2654
            new_version = self.get_simple_key(text_name + '%s' % depth)
2655
            text = text + ['line\n']
2656
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2657
            next_parent = new_version
2658
        target = self.get_versionedfiles('target')
2659
        for key in multiparent.topo_iter_keys(files, files.keys()):
2660
            mpdiff = files.make_mpdiffs([key])[0]
2661
            parents = files.get_parent_map([key])[key] or []
2662
            target.add_mpdiffs(
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2663
                [(key, parents, files.get_sha1s([key])[key], mpdiff)])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2664
            self.assertEqualDiff(
2665
                files.get_record_stream([key], 'unordered',
2666
                    True).next().get_bytes_as('fulltext'),
2667
                target.get_record_stream([key], 'unordered',
2668
                    True).next().get_bytes_as('fulltext')
2669
                )
2670
2671
    def test_keys(self):
2672
        # While use is discouraged, versions() is still needed by aspects of
2673
        # bzr.
2674
        files = self.get_versionedfiles()
2675
        self.assertEqual(set(), set(files.keys()))
2676
        if self.key_length == 1:
2677
            key = ('foo',)
2678
        else:
2679
            key = ('foo', 'bar',)
2680
        files.add_lines(key, (), [])
2681
        self.assertEqual(set([key]), set(files.keys()))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2682
2683
2684
class VirtualVersionedFilesTests(TestCase):
2685
    """Basic tests for the VirtualVersionedFiles implementations."""
2686
2687
    def _get_parent_map(self, keys):
2688
        ret = {}
2689
        for k in keys:
2690
            if k in self._parent_map:
2691
                ret[k] = self._parent_map[k]
2692
        return ret
2693
2694
    def setUp(self):
2695
        TestCase.setUp(self)
2696
        self._lines = {}
2697
        self._parent_map = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2698
        self.texts = VirtualVersionedFiles(self._get_parent_map,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2699
                                           self._lines.get)
2700
2701
    def test_add_lines(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2702
        self.assertRaises(NotImplementedError,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2703
                self.texts.add_lines, "foo", [], [])
2704
2705
    def test_add_mpdiffs(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2706
        self.assertRaises(NotImplementedError,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2707
                self.texts.add_mpdiffs, [])
2708
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
2709
    def test_check_noerrors(self):
2710
        self.texts.check()
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2711
2712
    def test_insert_record_stream(self):
2713
        self.assertRaises(NotImplementedError, self.texts.insert_record_stream,
2714
                          [])
2715
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
2716
    def test_get_sha1s_nonexistent(self):
2717
        self.assertEquals({}, self.texts.get_sha1s([("NONEXISTENT",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2718
2719
    def test_get_sha1s(self):
2720
        self._lines["key"] = ["dataline1", "dataline2"]
2721
        self.assertEquals({("key",): osutils.sha_strings(self._lines["key"])},
2722
                           self.texts.get_sha1s([("key",)]))
2723
2724
    def test_get_parent_map(self):
2725
        self._parent_map = {"G": ("A", "B")}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2726
        self.assertEquals({("G",): (("A",),("B",))},
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2727
                          self.texts.get_parent_map([("G",), ("L",)]))
2728
2729
    def test_get_record_stream(self):
2730
        self._lines["A"] = ["FOO", "BAR"]
2731
        it = self.texts.get_record_stream([("A",)], "unordered", True)
2732
        record = it.next()
3890.2.2 by John Arbash Meinel
Change the signature to report the storage kind as 'chunked'
2733
        self.assertEquals("chunked", record.storage_kind)
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2734
        self.assertEquals("FOOBAR", record.get_bytes_as("fulltext"))
3890.2.2 by John Arbash Meinel
Change the signature to report the storage kind as 'chunked'
2735
        self.assertEquals(["FOO", "BAR"], record.get_bytes_as("chunked"))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2736
2737
    def test_get_record_stream_absent(self):
2738
        it = self.texts.get_record_stream([("A",)], "unordered", True)
2739
        record = it.next()
2740
        self.assertEquals("absent", record.storage_kind)
2741
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2742
    def test_iter_lines_added_or_present_in_keys(self):
2743
        self._lines["A"] = ["FOO", "BAR"]
2744
        self._lines["B"] = ["HEY"]
2745
        self._lines["C"] = ["Alberta"]
2746
        it = self.texts.iter_lines_added_or_present_in_keys([("A",), ("B",)])
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2747
        self.assertEquals(sorted([("FOO", "A"), ("BAR", "A"), ("HEY", "B")]),
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2748
            sorted(list(it)))
2749
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2750
2751
class TestOrderingVersionedFilesDecorator(TestCaseWithMemoryTransport):
2752
2753
    def get_ordering_vf(self, key_priority):
2754
        builder = self.make_branch_builder('test')
2755
        builder.start_series()
2756
        builder.build_snapshot('A', None, [
2757
            ('add', ('', 'TREE_ROOT', 'directory', None))])
2758
        builder.build_snapshot('B', ['A'], [])
2759
        builder.build_snapshot('C', ['B'], [])
2760
        builder.build_snapshot('D', ['C'], [])
2761
        builder.finish_series()
2762
        b = builder.get_branch()
2763
        b.lock_read()
2764
        self.addCleanup(b.unlock)
2765
        vf = b.repository.inventories
2766
        return versionedfile.OrderingVersionedFilesDecorator(vf, key_priority)
2767
2768
    def test_get_empty(self):
2769
        vf = self.get_ordering_vf({})
2770
        self.assertEqual([], vf.calls)
2771
2772
    def test_get_record_stream_topological(self):
2773
        vf = self.get_ordering_vf({('A',): 3, ('B',): 2, ('C',): 4, ('D',): 1})
2774
        request_keys = [('B',), ('C',), ('D',), ('A',)]
2775
        keys = [r.key for r in vf.get_record_stream(request_keys,
2776
                                    'topological', False)]
2777
        # We should have gotten the keys in topological order
2778
        self.assertEqual([('A',), ('B',), ('C',), ('D',)], keys)
2779
        # And recorded that the request was made
2780
        self.assertEqual([('get_record_stream', request_keys, 'topological',
2781
                           False)], vf.calls)
2782
2783
    def test_get_record_stream_ordered(self):
2784
        vf = self.get_ordering_vf({('A',): 3, ('B',): 2, ('C',): 4, ('D',): 1})
2785
        request_keys = [('B',), ('C',), ('D',), ('A',)]
2786
        keys = [r.key for r in vf.get_record_stream(request_keys,
2787
                                   'unordered', False)]
2788
        # They should be returned based on their priority
2789
        self.assertEqual([('D',), ('B',), ('A',), ('C',)], keys)
2790
        # And the request recorded
2791
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2792
                           False)], vf.calls)
2793
2794
    def test_get_record_stream_implicit_order(self):
2795
        vf = self.get_ordering_vf({('B',): 2, ('D',): 1})
2796
        request_keys = [('B',), ('C',), ('D',), ('A',)]
2797
        keys = [r.key for r in vf.get_record_stream(request_keys,
2798
                                   'unordered', False)]
2799
        # A and C are not in the map, so they get sorted to the front. A comes
2800
        # before C alphabetically, so it comes back first
2801
        self.assertEqual([('A',), ('C',), ('D',), ('B',)], keys)
2802
        # And the request recorded
2803
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2804
                           False)], vf.calls)