/brz/remove-bazaar

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