/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 (
3350.6.2 by Robert Collins
Prepare parameterised test environment.
62
    ConstantMapper,
63
    HashEscapedPrefixMapper,
64
    PrefixMapper,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
65
    VirtualVersionedFiles,
3350.6.2 by Robert Collins
Prepare parameterised test environment.
66
    make_versioned_files_factory,
67
    )
6731 by Jelmer Vernooij
Move weave errors to breezy.bzr.weave.
68
from ..bzr.weave import (
69
    WeaveFile,
70
    WeaveInvalidChecksum,
71
    )
6670.4.1 by Jelmer Vernooij
Update imports.
72
from ..bzr.weavefile import write_weave
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
73
from .scenarios import load_tests_apply_scenarios
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
74
75
76
load_tests = load_tests_apply_scenarios
3350.6.2 by Robert Collins
Prepare parameterised test environment.
77
78
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
79
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.
80
    """Get a diamond graph to exercise deltas and merges.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
82
    :param trailing_eol: If True end the last line with \n.
83
    """
84
    parents = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
85
        b'origin': (),
86
        b'base': ((b'origin',),),
87
        b'left': ((b'base',),),
88
        b'right': ((b'base',),),
89
        b'merged': ((b'left',), (b'right',)),
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
90
        }
91
    # insert a diamond graph to exercise deltas and merges.
92
    if trailing_eol:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
93
        last_char = b'\n'
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
94
    else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
95
        last_char = b''
96
    f.add_lines(b'origin', [], [b'origin' + last_char])
97
    f.add_lines(b'base', [b'origin'], [b'base' + last_char])
98
    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.
99
    if not left_only:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
100
        f.add_lines(b'right', [b'base'],
7143.15.2 by Jelmer Vernooij
Run autopep8.
101
                    [b'base\n', b'right' + last_char])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
102
        f.add_lines(b'merged', [b'left', b'right'],
7143.15.2 by Jelmer Vernooij
Run autopep8.
103
                    [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.
104
    return f, parents
105
106
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.
107
def get_diamond_files(files, key_length, trailing_eol=True, left_only=False,
7143.15.2 by Jelmer Vernooij
Run autopep8.
108
                      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.
109
    """Get a diamond graph to exercise deltas and merges.
110
111
    This creates a 5-node graph in files. If files supports 2-length keys two
112
    graphs are made to exercise the support for multiple ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
113
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.
114
    :param trailing_eol: If True end the last line with \n.
115
    :param key_length: The length of keys in files. Currently supports length 1
116
        and 2 keys.
117
    :param left_only: If True do not add the right and merged nodes.
118
    :param nograph: If True, do not provide parents to the add_lines calls;
119
        this is useful for tests that need inserted data but have graphless
120
        stores.
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
121
    :param nokeys: If True, pass None is as the key for all insertions.
122
        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.
123
    :return: The results of the add_lines calls.
124
    """
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
125
    if nokeys:
126
        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.
127
    if key_length == 1:
128
        prefixes = [()]
129
    else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
130
        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.
131
    # insert a diamond graph to exercise deltas and merges.
132
    if trailing_eol:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
133
        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.
134
    else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
135
        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.
136
    result = []
7143.15.2 by Jelmer Vernooij
Run autopep8.
137
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.
138
    def get_parents(suffix_list):
139
        if nograph:
140
            return ()
141
        else:
142
            result = [prefix + suffix for suffix in suffix_list]
143
            return result
7143.15.2 by Jelmer Vernooij
Run autopep8.
144
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
145
    def get_key(suffix):
146
        if nokeys:
147
            return (None, )
148
        else:
149
            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.
150
    # we loop over each key because that spreads the inserts across prefixes,
151
    # which is how commit operates.
152
    for prefix in prefixes:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
153
        result.append(files.add_lines(prefix + get_key(b'origin'), (),
7143.15.2 by Jelmer Vernooij
Run autopep8.
154
                                      [b'origin' + last_char]))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
155
    for prefix in prefixes:
156
        result.append(files.add_lines(prefix + get_key(b'base'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
157
                                      get_parents([(b'origin',)]), [b'base' + last_char]))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
158
    for prefix in prefixes:
159
        result.append(files.add_lines(prefix + get_key(b'left'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
160
                                      get_parents([(b'base',)]),
161
                                      [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.
162
    if not left_only:
163
        for prefix in prefixes:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
164
            result.append(files.add_lines(prefix + get_key(b'right'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
165
                                          get_parents([(b'base',)]),
166
                                          [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.
167
        for prefix in prefixes:
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
168
            result.append(files.add_lines(prefix + get_key(b'merged'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
169
                                          get_parents(
170
                                              [(b'left',), (b'right',)]),
171
                                          [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.
172
    return result
173
174
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
175
class VersionedFileTestMixIn(object):
176
    """A mixin test class for testing VersionedFiles.
177
178
    This is not an adaptor-style test at this point because
179
    theres no dynamic substitution of versioned file implementations,
180
    they are strictly controlled by their owning repositories.
181
    """
182
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
183
    def get_transaction(self):
184
        if not hasattr(self, '_transaction'):
185
            self._transaction = None
186
        return self._transaction
187
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
188
    def test_add(self):
189
        f = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
190
        f.add_lines(b'r0', [], [b'a\n', b'b\n'])
191
        f.add_lines(b'r1', [b'r0'], [b'b\n', b'c\n'])
7143.15.2 by Jelmer Vernooij
Run autopep8.
192
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
193
        def verify_file(f):
194
            versions = f.versions()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
195
            self.assertTrue(b'r0' in versions)
196
            self.assertTrue(b'r1' in versions)
197
            self.assertEqual(f.get_lines(b'r0'), [b'a\n', b'b\n'])
198
            self.assertEqual(f.get_text(b'r0'), b'a\nb\n')
199
            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.
200
            self.assertEqual(2, len(f))
201
            self.assertEqual(2, f.num_versions())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
202
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
203
            self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
204
                              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.
205
            self.assertRaises(RevisionAlreadyPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
206
                              f.add_lines, b'r1', [], [])
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
207
        verify_file(f)
1666.1.6 by Robert Collins
Make knit the default format.
208
        # this checks that reopen with create=True does not break anything.
209
        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.
210
        verify_file(f)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
211
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
212
    def test_adds_with_parent_texts(self):
213
        f = self.get_file()
214
        parent_texts = {}
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
215
        _, _, 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.
216
        try:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
217
            _, _, parent_texts[b'r1'] = f.add_lines_with_ghosts(b'r1',
7143.15.2 by Jelmer Vernooij
Run autopep8.
218
                                                                [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.
219
        except NotImplementedError:
220
            # if the format doesn't support ghosts, just add normally.
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
221
            _, _, parent_texts[b'r1'] = f.add_lines(b'r1',
7143.15.2 by Jelmer Vernooij
Run autopep8.
222
                                                    [b'r0'], [b'b\n', b'c\n'], parent_texts=parent_texts)
223
        f.add_lines(b'r2', [b'r1'], [b'c\n', b'd\n'],
224
                    parent_texts=parent_texts)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
225
        self.assertNotEqual(None, parent_texts[b'r0'])
226
        self.assertNotEqual(None, parent_texts[b'r1'])
7143.15.2 by Jelmer Vernooij
Run autopep8.
227
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
228
        def verify_file(f):
229
            versions = f.versions()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
230
            self.assertTrue(b'r0' in versions)
231
            self.assertTrue(b'r1' in versions)
232
            self.assertTrue(b'r2' in versions)
233
            self.assertEqual(f.get_lines(b'r0'), [b'a\n', b'b\n'])
234
            self.assertEqual(f.get_lines(b'r1'), [b'b\n', b'c\n'])
235
            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.
236
            self.assertEqual(3, f.num_versions())
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
237
            origins = f.annotate(b'r1')
238
            self.assertEqual(origins[0][0], b'r0')
239
            self.assertEqual(origins[1][0], b'r1')
240
            origins = f.annotate(b'r2')
241
            self.assertEqual(origins[0][0], b'r1')
242
            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.
243
244
        verify_file(f)
245
        f = self.reopen_file()
246
        verify_file(f)
247
2805.6.7 by Robert Collins
Review feedback.
248
    def test_add_unicode_content(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
249
        # unicode content is not permitted in versioned files.
2805.6.7 by Robert Collins
Review feedback.
250
        # versioned files version sequences of bytes only.
251
        vf = self.get_file()
252
        self.assertRaises(errors.BzrBadParameterUnicode,
7143.15.2 by Jelmer Vernooij
Run autopep8.
253
                          vf.add_lines, b'a', [], [b'a\n', u'b\n', b'c\n'])
2805.6.7 by Robert Collins
Review feedback.
254
        self.assertRaises(
255
            (errors.BzrBadParameterUnicode, NotImplementedError),
6973.14.4 by Jelmer Vernooij
Fix checking for options.
256
            vf.add_lines_with_ghosts, b'a', [], [b'a\n', u'b\n', b'c\n'])
2805.6.7 by Robert Collins
Review feedback.
257
2520.4.150 by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines
258
    def test_add_follows_left_matching_blocks(self):
259
        """If we change left_matching_blocks, delta changes
260
261
        Note: There are multiple correct deltas in this case, because
262
        we start with 1 "a" and we get 3.
263
        """
264
        vf = self.get_file()
265
        if isinstance(vf, WeaveFile):
266
            raise TestSkipped("WeaveFile ignores left_matching_blocks")
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
267
        vf.add_lines(b'1', [], [b'a\n'])
268
        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
269
                     left_matching_blocks=[(0, 0, 1), (1, 3, 0)])
6963.2.4 by Jelmer Vernooij
Add bees.
270
        self.assertEqual([b'a\n', b'a\n', b'a\n'], vf.get_lines(b'2'))
271
        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
272
                     left_matching_blocks=[(0, 2, 1), (1, 3, 0)])
6963.2.4 by Jelmer Vernooij
Add bees.
273
        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
274
2805.6.7 by Robert Collins
Review feedback.
275
    def test_inline_newline_throws(self):
276
        # \r characters are not permitted in lines being added
277
        vf = self.get_file()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
278
        self.assertRaises(errors.BzrBadParameterContainsNewline,
7143.15.2 by Jelmer Vernooij
Run autopep8.
279
                          vf.add_lines, b'a', [], [b'a\n\n'])
2805.6.7 by Robert Collins
Review feedback.
280
        self.assertRaises(
281
            (errors.BzrBadParameterContainsNewline, NotImplementedError),
6963.2.3 by Jelmer Vernooij
Fix some more tests.
282
            vf.add_lines_with_ghosts, b'a', [], [b'a\n\n'])
2805.6.7 by Robert Collins
Review feedback.
283
        # but inline CR's are allowed
6963.2.3 by Jelmer Vernooij
Fix some more tests.
284
        vf.add_lines(b'a', [], [b'a\r\n'])
2805.6.7 by Robert Collins
Review feedback.
285
        try:
6963.2.3 by Jelmer Vernooij
Fix some more tests.
286
            vf.add_lines_with_ghosts(b'b', [], [b'a\r\n'])
2805.6.7 by Robert Collins
Review feedback.
287
        except NotImplementedError:
288
            pass
289
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
290
    def test_add_reserved(self):
291
        vf = self.get_file()
292
        self.assertRaises(errors.ReservedId,
7143.15.2 by Jelmer Vernooij
Run autopep8.
293
                          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
294
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
295
    def test_add_lines_nostoresha(self):
296
        """When nostore_sha is supplied using old content raises."""
297
        vf = self.get_file()
6963.2.4 by Jelmer Vernooij
Add bees.
298
        empty_text = (b'a', [])
299
        sample_text_nl = (b'b', [b"foo\n", b"bar\n"])
300
        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.
301
        shas = []
302
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
303
            sha, _, _ = vf.add_lines(version, [], lines)
304
            shas.append(sha)
305
        # we now have a copy of all the lines in the vf.
306
        for sha, (version, lines) in zip(
7143.15.2 by Jelmer Vernooij
Run autopep8.
307
                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.
308
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
309
                              vf.add_lines, version + b"2", [], lines,
310
                              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.
311
            # and no new version should have been added.
312
            self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
7143.15.2 by Jelmer Vernooij
Run autopep8.
313
                              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.
314
2803.1.1 by Robert Collins
Fix typo in ghosts version of test_add_lines_nostoresha.
315
    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.
316
        """When nostore_sha is supplied using old content raises."""
317
        vf = self.get_file()
6963.2.4 by Jelmer Vernooij
Add bees.
318
        empty_text = (b'a', [])
319
        sample_text_nl = (b'b', [b"foo\n", b"bar\n"])
320
        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.
321
        shas = []
322
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
323
            sha, _, _ = vf.add_lines(version, [], lines)
324
            shas.append(sha)
325
        # we now have a copy of all the lines in the vf.
326
        # is the test applicable to this vf implementation?
327
        try:
6963.2.4 by Jelmer Vernooij
Add bees.
328
            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.
329
        except NotImplementedError:
330
            raise TestSkipped("add_lines_with_ghosts is optional")
331
        for sha, (version, lines) in zip(
7143.15.2 by Jelmer Vernooij
Run autopep8.
332
                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.
333
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
334
                              vf.add_lines_with_ghosts, version + b"2", [], lines,
335
                              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.
336
            # and no new version should have been added.
337
            self.assertRaises(errors.RevisionNotPresent, vf.get_lines,
7143.15.2 by Jelmer Vernooij
Run autopep8.
338
                              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.
339
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
340
    def test_add_lines_return_value(self):
341
        # add_lines should return the sha1 and the text size.
342
        vf = self.get_file()
6963.2.4 by Jelmer Vernooij
Add bees.
343
        empty_text = (b'a', [])
344
        sample_text_nl = (b'b', [b"foo\n", b"bar\n"])
345
        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
346
        # check results for the three cases:
347
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
348
            # the first two elements are the same for all versioned files:
349
            # - the digest and the size of the text. For some versioned files
350
            #   additional data is returned in additional tuple elements.
351
            result = vf.add_lines(version, [], lines)
352
            self.assertEqual(3, len(result))
353
            self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
7143.15.2 by Jelmer Vernooij
Run autopep8.
354
                             result[0:2])
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
355
        # parents should not affect the result:
356
        lines = sample_text_nl[1]
357
        self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))),
7143.15.2 by Jelmer Vernooij
Run autopep8.
358
                         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
359
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
360
    def test_get_reserved(self):
361
        vf = self.get_file()
6963.2.4 by Jelmer Vernooij
Add bees.
362
        self.assertRaises(errors.ReservedId, vf.get_texts, [b'b:'])
363
        self.assertRaises(errors.ReservedId, vf.get_lines, b'b:')
364
        self.assertRaises(errors.ReservedId, vf.get_text, b'b:')
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
365
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
366
    def test_add_unchanged_last_line_noeol_snapshot(self):
367
        """Add a text with an unchanged last line with no eol should work."""
368
        # Test adding this in a number of chain lengths; because the interface
369
        # for VersionedFile does not allow forcing a specific chain length, we
370
        # just use a small base to get the first snapshot, then a much longer
371
        # first line for the next add (which will make the third add snapshot)
372
        # and so on. 20 has been chosen as an aribtrary figure - knits use 200
373
        # as a capped delta length, but ideally we would have some way of
374
        # tuning the test to the store (e.g. keep going until a snapshot
375
        # happens).
376
        for length in range(20):
377
            version_lines = {}
378
            vf = self.get_file('case-%d' % length)
6963.2.4 by Jelmer Vernooij
Add bees.
379
            prefix = b'step-%d'
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
380
            parents = []
381
            for step in range(length):
382
                version = prefix % step
6963.2.4 by Jelmer Vernooij
Add bees.
383
                lines = ([b'prelude \n'] * step) + [b'line']
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
384
                vf.add_lines(version, parents, lines)
385
                version_lines[version] = lines
386
                parents = [version]
6963.2.4 by Jelmer Vernooij
Add bees.
387
            vf.add_lines(b'no-eol', parents, [b'line'])
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
388
            vf.get_texts(version_lines.keys())
6963.2.4 by Jelmer Vernooij
Add bees.
389
            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
390
391
    def test_get_texts_eol_variation(self):
392
        # similar to the failure in <http://bugs.launchpad.net/234748>
393
        vf = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
394
        sample_text_nl = [b"line\n"]
395
        sample_text_no_nl = [b"line"]
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
396
        versions = []
397
        version_lines = {}
398
        parents = []
399
        for i in range(4):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
400
            version = b'v%d' % i
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
401
            if i % 2:
402
                lines = sample_text_nl
403
            else:
404
                lines = sample_text_no_nl
405
            # left_matching blocks is an internal api; it operates on the
406
            # *internal* representation for a knit, which is with *all* lines
407
            # being normalised to end with \n - even the final line in a no_nl
408
            # file. Using it here ensures that a broken internal implementation
409
            # (which is what this test tests) will generate a correct line
410
            # delta (which is to say, an empty delta).
411
            vf.add_lines(version, parents, lines,
7143.15.2 by Jelmer Vernooij
Run autopep8.
412
                         left_matching_blocks=[(0, 0, 1)])
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
413
            parents = [version]
414
            versions.append(version)
415
            version_lines[version] = lines
416
        vf.check()
417
        vf.get_texts(versions)
418
        vf.get_texts(reversed(versions))
419
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
420
    def test_add_lines_with_matching_blocks_noeol_last_line(self):
421
        """Add a text with an unchanged last line with no eol should work."""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
422
        from breezy import multiparent
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
423
        # Hand verified sha1 of the text we're adding.
424
        sha1 = '6a1d115ec7b60afb664dc14890b5af5ce3c827a4'
425
        # Create a mpdiff which adds a new line before the trailing line, and
426
        # reuse the last line unaltered (which can cause annotation reuse).
427
        # Test adding this in two situations:
428
        # On top of a new insertion
429
        vf = self.get_file('fulltext')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
430
        vf.add_lines(b'noeol', [], [b'line'])
431
        vf.add_lines(b'noeol2', [b'noeol'], [b'newline\n', b'line'],
7143.15.2 by Jelmer Vernooij
Run autopep8.
432
                     left_matching_blocks=[(0, 1, 1)])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
433
        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
434
        # On top of a delta
435
        vf = self.get_file('delta')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
436
        vf.add_lines(b'base', [], [b'line'])
437
        vf.add_lines(b'noeol', [b'base'], [b'prelude\n', b'line'])
438
        vf.add_lines(b'noeol2', [b'noeol'], [b'newline\n', b'line'],
7143.15.2 by Jelmer Vernooij
Run autopep8.
439
                     left_matching_blocks=[(1, 1, 1)])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
440
        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
441
2520.4.85 by Aaron Bentley
Get all test passing (which just proves there aren't enough tests!)
442
    def test_make_mpdiffs(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
443
        from breezy import multiparent
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
444
        vf = self.get_file('foo')
445
        sha1s = self._setup_for_deltas(vf)
446
        new_vf = self.get_file('bar')
447
        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!)
448
            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.
449
            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.
450
                                 vf.get_sha1s([version])[version], mpdiff)])
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
451
            self.assertEqualDiff(vf.get_text(version),
452
                                 new_vf.get_text(version))
453
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
454
    def test_make_mpdiffs_with_ghosts(self):
455
        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
456
        try:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
457
            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
458
        except NotImplementedError:
459
            # old Weave formats do not allow ghosts
460
            return
7143.15.2 by Jelmer Vernooij
Run autopep8.
461
        self.assertRaises(errors.RevisionNotPresent,
462
                          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
463
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
464
    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.
465
        self.assertFalse(f.has_version('base'))
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
466
        # add texts that should trip the knit maximum delta chain threshold
467
        # as well as doing parallel chains of data in knits.
468
        # this is done by two chains of 25 insertions
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
469
        f.add_lines(b'base', [], [b'line\n'])
470
        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.
471
        # detailed eol tests:
472
        # shared last line with parent no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
473
        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.
474
        # differing last line with parent, both no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
475
        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.
476
        # add eol following a noneol parent, change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
477
        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.
478
        # add eol following a noneol parent, no change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
479
        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.
480
        # noeol with no parents:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
481
        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.
482
        # noeol preceeding its leftmost parent in the output:
483
        # 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
484
        # 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.
485
        # later-inserted parent the leftmost.
7143.15.2 by Jelmer Vernooij
Run autopep8.
486
        f.add_lines(b'eolbeforefirstparent', [
487
                    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.
488
        # two identical eol texts
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
489
        f.add_lines(b'noeoldup', [b'noeol'], [b'line'])
490
        next_parent = b'base'
491
        text_name = b'chain1-'
492
        text = [b'line\n']
493
        sha1s = {0: b'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
494
                 1: b'45e21ea146a81ea44a821737acdb4f9791c8abe7',
495
                 2: b'e1f11570edf3e2a070052366c582837a4fe4e9fa',
496
                 3: b'26b4b8626da827088c514b8f9bbe4ebf181edda1',
497
                 4: b'e28a5510be25ba84d31121cff00956f9970ae6f6',
498
                 5: b'd63ec0ce22e11dcf65a931b69255d3ac747a318d',
499
                 6: b'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
500
                 7: b'95c14da9cafbf828e3e74a6f016d87926ba234ab',
501
                 8: b'779e9a0b28f9f832528d4b21e17e168c67697272',
502
                 9: b'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
503
                 10: b'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
504
                 11: b'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
505
                 12: b'31a2286267f24d8bedaa43355f8ad7129509ea85',
506
                 13: b'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
507
                 14: b'2c4b1736566b8ca6051e668de68650686a3922f2',
508
                 15: b'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
509
                 16: b'b0d2e18d3559a00580f6b49804c23fea500feab3',
510
                 17: b'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
511
                 18: b'5cf64a3459ae28efa60239e44b20312d25b253f3',
512
                 19: b'1ebed371807ba5935958ad0884595126e8c4e823',
513
                 20: b'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
514
                 21: b'01edc447978004f6e4e962b417a4ae1955b6fe5d',
515
                 22: b'd8d8dc49c4bf0bab401e0298bb5ad827768618bb',
516
                 23: b'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
517
                 24: b'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
6986.1.1 by Jelmer Vernooij
Address review comments.
518
                 25: b'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
519
                 }
520
        for depth in range(26):
6963.2.12 by Jelmer Vernooij
Fix some more tests.
521
            new_version = text_name + b'%d' % depth
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
522
            text = text + [b'line\n']
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
523
            f.add_lines(new_version, [next_parent], text)
524
            next_parent = new_version
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
525
        next_parent = b'base'
526
        text_name = b'chain2-'
527
        text = [b'line\n']
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
528
        for depth in range(26):
6963.2.12 by Jelmer Vernooij
Fix some more tests.
529
            new_version = text_name + b'%d' % depth
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
530
            text = text + [b'line\n']
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
531
            f.add_lines(new_version, [next_parent], text)
532
            next_parent = new_version
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
533
        return sha1s
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
534
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
535
    def test_ancestry(self):
536
        f = self.get_file()
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
537
        self.assertEqual([], f.get_ancestry([]))
6963.2.4 by Jelmer Vernooij
Add bees.
538
        f.add_lines(b'r0', [], [b'a\n', b'b\n'])
539
        f.add_lines(b'r1', [b'r0'], [b'b\n', b'c\n'])
540
        f.add_lines(b'r2', [b'r0'], [b'b\n', b'c\n'])
541
        f.add_lines(b'r3', [b'r2'], [b'b\n', b'c\n'])
542
        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.
543
        self.assertEqual([], f.get_ancestry([]))
6963.2.4 by Jelmer Vernooij
Add bees.
544
        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.
545
        # there are some possibilities:
546
        # r0 r1 r2 rM r3
547
        # r0 r1 r2 r3 rM
548
        # etc
549
        # so we check indexes
6963.2.4 by Jelmer Vernooij
Add bees.
550
        r0 = versions.index(b'r0')
551
        r1 = versions.index(b'r1')
552
        r2 = versions.index(b'r2')
553
        self.assertFalse(b'r3' in versions)
554
        rM = versions.index(b'rM')
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
555
        self.assertTrue(r0 < r1)
556
        self.assertTrue(r0 < r2)
557
        self.assertTrue(r1 < rM)
558
        self.assertTrue(r2 < rM)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
559
560
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
561
                          f.get_ancestry, [b'rM', b'rX'])
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
562
6963.2.4 by Jelmer Vernooij
Add bees.
563
        self.assertEqual(set(f.get_ancestry(b'rM')),
7143.15.2 by Jelmer Vernooij
Run autopep8.
564
                         set(f.get_ancestry(b'rM', topo_sorted=False)))
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
565
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
566
    def test_mutate_after_finish(self):
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
567
        self._transaction = 'before'
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
568
        f = self.get_file()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
569
        self._transaction = 'after'
6963.2.4 by Jelmer Vernooij
Add bees.
570
        self.assertRaises(errors.OutSideTransaction, f.add_lines, b'', [], [])
7143.15.2 by Jelmer Vernooij
Run autopep8.
571
        self.assertRaises(errors.OutSideTransaction,
572
                          f.add_lines_with_ghosts, b'', [], [])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
573
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
574
    def test_copy_to(self):
575
        f = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
576
        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.
577
        t = MemoryTransport()
578
        f.copy_to('foo', t)
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
579
        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.
580
            self.assertTrue(t.has('foo' + suffix))
581
582
    def test_get_suffixes(self):
583
        f = self.get_file()
584
        # and should be a list
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
585
        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.
586
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
587
    def test_get_parent_map(self):
588
        f = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
589
        f.add_lines(b'r0', [], [b'a\n', b'b\n'])
590
        self.assertEqual(
7143.15.2 by Jelmer Vernooij
Run autopep8.
591
            {b'r0': ()}, f.get_parent_map([b'r0']))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
592
        f.add_lines(b'r1', [b'r0'], [b'a\n', b'b\n'])
593
        self.assertEqual(
7143.15.2 by Jelmer Vernooij
Run autopep8.
594
            {b'r1': (b'r0',)}, f.get_parent_map([b'r1']))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
595
        self.assertEqual(
7143.15.2 by Jelmer Vernooij
Run autopep8.
596
            {b'r0': (),
597
             b'r1': (b'r0',)},
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
598
            f.get_parent_map([b'r0', b'r1']))
599
        f.add_lines(b'r2', [], [b'a\n', b'b\n'])
600
        f.add_lines(b'r3', [], [b'a\n', b'b\n'])
601
        f.add_lines(b'm', [b'r0', b'r1', b'r2', b'r3'], [b'a\n', b'b\n'])
602
        self.assertEqual(
7143.15.2 by Jelmer Vernooij
Run autopep8.
603
            {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.
604
        self.assertEqual({}, f.get_parent_map(b'y'))
605
        self.assertEqual(
7143.15.2 by Jelmer Vernooij
Run autopep8.
606
            {b'r0': (),
607
             b'r1': (b'r0',)},
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
608
            f.get_parent_map([b'r0', b'y', b'r1']))
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
609
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
610
    def test_annotate(self):
611
        f = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
612
        f.add_lines(b'r0', [], [b'a\n', b'b\n'])
613
        f.add_lines(b'r1', [b'r0'], [b'c\n', b'b\n'])
614
        origins = f.annotate(b'r1')
615
        self.assertEqual(origins[0][0], b'r1')
616
        self.assertEqual(origins[1][0], b'r0')
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
617
618
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
619
                          f.annotate, b'foo')
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
620
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
621
    def test_detection(self):
622
        # Test weaves detect corruption.
623
        #
624
        # Weaves contain a checksum of their texts.
625
        # When a text is extracted, this checksum should be
626
        # verified.
627
628
        w = self.get_file_corrupted_text()
629
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
630
        self.assertEqual(b'hello\n', w.get_text(b'v1'))
631
        self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2')
632
        self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2')
6731 by Jelmer Vernooij
Move weave errors to breezy.bzr.weave.
633
        self.assertRaises(WeaveInvalidChecksum, w.check)
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
634
635
        w = self.get_file_corrupted_checksum()
636
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
637
        self.assertEqual(b'hello\n', w.get_text(b'v1'))
638
        self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2')
639
        self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2')
6731 by Jelmer Vernooij
Move weave errors to breezy.bzr.weave.
640
        self.assertRaises(WeaveInvalidChecksum, w.check)
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
641
642
    def get_file_corrupted_text(self):
643
        """Return a versioned file with corrupt text but valid metadata."""
644
        raise NotImplementedError(self.get_file_corrupted_text)
645
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
646
    def reopen_file(self, name='foo'):
647
        """Open the versioned file from disk again."""
648
        raise NotImplementedError(self.reopen_file)
649
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
650
    def test_iter_lines_added_or_present_in_versions(self):
651
        # 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
652
        # 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.
653
        # the ordering here is to make a tree so that dumb searches have
654
        # more changes to muck up.
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
655
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
656
        class InstrumentedProgress(progress.ProgressTask):
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
657
658
            def __init__(self):
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
659
                progress.ProgressTask.__init__(self)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
660
                self.updates = []
661
662
            def update(self, msg=None, current=None, total=None):
663
                self.updates.append((msg, current, total))
664
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
665
        vf = self.get_file()
666
        # add a base to get included
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
667
        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.
668
        # add a ancestor to be included on one side
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
669
        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.
670
        # add a ancestor to be included on the other side
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
671
        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.
672
        # add a child of rancestor with no eofile-nl
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
673
        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.
674
        # add a child of lancestor and base to join the two roots
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
675
        vf.add_lines(b'otherchild',
676
                     [b'lancestor', b'base'],
677
                     [b'base\n', b'lancestor\n', b'otherchild\n'])
7143.15.2 by Jelmer Vernooij
Run autopep8.
678
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
679
        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.
680
            # now we need to see what lines are returned, and how often.
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
681
            lines = {}
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
682
            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.
683
            # iterate over the lines
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
684
            for line in vf.iter_lines_added_or_present_in_versions(versions,
7143.15.2 by Jelmer Vernooij
Run autopep8.
685
                                                                   pb=progress):
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
686
                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.
687
                lines[line] += 1
7143.15.2 by Jelmer Vernooij
Run autopep8.
688
            if [] != progress.updates:
2039.1.2 by Aaron Bentley
Tweak test to avoid catching assert
689
                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.
690
            return lines
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
691
        lines = iter_with_versions([b'child', b'otherchild'],
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
692
                                   [('Walking content', 0, 2),
693
                                    ('Walking content', 1, 2),
694
                                    ('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.
695
        # we must see child and otherchild
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
696
        self.assertTrue(lines[(b'child\n', b'child')] > 0)
697
        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.
698
        # we dont care if we got more than that.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
699
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
700
        # test all lines
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
701
        lines = iter_with_versions(None, [('Walking content', 0, 5),
702
                                          ('Walking content', 1, 5),
703
                                          ('Walking content', 2, 5),
704
                                          ('Walking content', 3, 5),
705
                                          ('Walking content', 4, 5),
706
                                          ('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.
707
        # all lines must be seen at least once
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
708
        self.assertTrue(lines[(b'base\n', b'base')] > 0)
709
        self.assertTrue(lines[(b'lancestor\n', b'lancestor')] > 0)
710
        self.assertTrue(lines[(b'rancestor\n', b'rancestor')] > 0)
711
        self.assertTrue(lines[(b'child\n', b'child')] > 0)
712
        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.
713
1594.2.8 by Robert Collins
add ghost aware apis to knits.
714
    def test_add_lines_with_ghosts(self):
715
        # some versioned file formats allow lines to be added with parent
716
        # information that is > than that in the format. Formats that do
717
        # not support this need to raise NotImplementedError on the
718
        # add_lines_with_ghosts api.
719
        vf = self.get_file()
720
        # 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
721
        # The preferred form is utf8, but we should translate when needed
722
        parent_id_unicode = u'b\xbfse'
723
        parent_id_utf8 = parent_id_unicode.encode('utf8')
1594.2.8 by Robert Collins
add ghost aware apis to knits.
724
        try:
6963.2.4 by Jelmer Vernooij
Add bees.
725
            vf.add_lines_with_ghosts(b'notbxbfse', [parent_id_utf8], [])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
726
        except NotImplementedError:
727
            # check the other ghost apis are also not implemented
7143.15.2 by Jelmer Vernooij
Run autopep8.
728
            self.assertRaises(NotImplementedError,
729
                              vf.get_ancestry_with_ghosts, [b'foo'])
730
            self.assertRaises(NotImplementedError,
731
                              vf.get_parents_with_ghosts, b'foo')
1594.2.8 by Robert Collins
add ghost aware apis to knits.
732
            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.
733
        vf = self.reopen_file()
1594.2.8 by Robert Collins
add ghost aware apis to knits.
734
        # test key graph related apis: getncestry, _graph, get_parents
735
        # has_version
736
        # - these are ghost unaware and must not be reflect ghosts
6963.2.4 by Jelmer Vernooij
Add bees.
737
        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
738
        self.assertFalse(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
739
        # we have _with_ghost apis to give us ghost information.
7143.15.2 by Jelmer Vernooij
Run autopep8.
740
        self.assertEqual([parent_id_utf8, b'notbxbfse'],
741
                         vf.get_ancestry_with_ghosts([b'notbxbfse']))
742
        self.assertEqual([parent_id_utf8],
743
                         vf.get_parents_with_ghosts(b'notbxbfse'))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
744
        # if we add something that is a ghost of another, it should correct the
745
        # results of the prior apis
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
746
        vf.add_lines(parent_id_utf8, [], [])
7143.15.2 by Jelmer Vernooij
Run autopep8.
747
        self.assertEqual([parent_id_utf8, b'notbxbfse'],
748
                         vf.get_ancestry([b'notbxbfse']))
749
        self.assertEqual({b'notbxbfse': (parent_id_utf8,)},
750
                         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
751
        self.assertTrue(vf.has_version(parent_id_utf8))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
752
        # we have _with_ghost apis to give us ghost information.
6963.2.4 by Jelmer Vernooij
Add bees.
753
        self.assertEqual([parent_id_utf8, b'notbxbfse'],
7143.15.2 by Jelmer Vernooij
Run autopep8.
754
                         vf.get_ancestry_with_ghosts([b'notbxbfse']))
755
        self.assertEqual([parent_id_utf8],
756
                         vf.get_parents_with_ghosts(b'notbxbfse'))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
757
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
758
    def test_add_lines_with_ghosts_after_normal_revs(self):
759
        # some versioned file formats allow lines to be added with parent
760
        # information that is > than that in the format. Formats that do
761
        # not support this need to raise NotImplementedError on the
762
        # add_lines_with_ghosts api.
763
        vf = self.get_file()
764
        # probe for ghost support
765
        try:
6963.2.4 by Jelmer Vernooij
Add bees.
766
            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.
767
        except NotImplementedError:
768
            return
6963.2.4 by Jelmer Vernooij
Add bees.
769
        vf.add_lines_with_ghosts(b'references_ghost',
770
                                 [b'base', b'a_ghost'],
771
                                 [b'line\n', b'line_b\n', b'line_c\n'])
772
        origins = vf.annotate(b'references_ghost')
773
        self.assertEqual((b'base', b'line\n'), origins[0])
774
        self.assertEqual((b'base', b'line_b\n'), origins[1])
775
        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.
776
777
    def test_readonly_mode(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
778
        t = self.get_transport()
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
779
        factory = self.get_factory()
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
780
        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
781
        vf = factory('id', t, access_mode='r')
6963.2.4 by Jelmer Vernooij
Add bees.
782
        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.
783
        self.assertRaises(errors.ReadOnlyError,
784
                          vf.add_lines_with_ghosts,
6963.2.4 by Jelmer Vernooij
Add bees.
785
                          b'base',
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
786
                          [],
787
                          [])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
788
3316.2.9 by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use
789
    def test_get_sha1s(self):
1666.1.6 by Robert Collins
Make knit the default format.
790
        # check the sha1 data is available
791
        vf = self.get_file()
792
        # a simple file
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
793
        vf.add_lines(b'a', [], [b'a\n'])
1666.1.6 by Robert Collins
Make knit the default format.
794
        # the same file, different metadata
6973.14.4 by Jelmer Vernooij
Fix checking for options.
795
        vf.add_lines(b'b', [b'a'], [b'a\n'])
1666.1.6 by Robert Collins
Make knit the default format.
796
        # a file differing only in last newline.
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
797
        vf.add_lines(b'c', [], [b'a'])
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
798
        self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
799
            b'a': b'3f786850e387550fdab836ed7e6dc881de23001b',
800
            b'c': b'86f7e437faa5a7fce15d1ddcb9eaeaea377667b8',
801
            b'b': b'3f786850e387550fdab836ed7e6dc881de23001b',
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
802
            },
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
803
            vf.get_sha1s([b'a', b'c', b'b']))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
804
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
805
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
806
class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
807
808
    def get_file(self, name='foo'):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
809
        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
810
                         create=True,
811
                         get_scope=self.get_transaction)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
812
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
813
    def get_file_corrupted_text(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
814
        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
815
                      create=True,
816
                      get_scope=self.get_transaction)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
817
        w.add_lines(b'v1', [], [b'hello\n'])
818
        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
819
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
820
        # We are going to invasively corrupt the text
821
        # Make sure the internals of weave are the same
7143.15.2 by Jelmer Vernooij
Run autopep8.
822
        self.assertEqual([(b'{', 0), b'hello\n', (b'}', None), (b'{', 1), b'there\n', (b'}', None)
823
                          ], w._weave)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
824
7143.15.2 by Jelmer Vernooij
Run autopep8.
825
        self.assertEqual([b'f572d396fae9206628714fb2ce00f72e94f2258f', b'90f265c6e75f1c8f9ab76dcf85528352c5f215ef'
826
                          ], w._sha1s)
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
827
        w.check()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
828
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
829
        # Corrupted
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
830
        w._weave[4] = b'There\n'
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
831
        return w
832
833
    def get_file_corrupted_checksum(self):
834
        w = self.get_file_corrupted_text()
835
        # Corrected
6963.2.4 by Jelmer Vernooij
Add bees.
836
        w._weave[4] = b'there\n'
837
        self.assertEqual(b'hello\nthere\n', w.get_text(b'v2'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
838
7143.15.2 by Jelmer Vernooij
Run autopep8.
839
        # Invalid checksum, first digit changed
840
        w._sha1s[1] = b'f0f265c6e75f1c8f9ab76dcf85528352c5f215ef'
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
841
        return w
842
1666.1.6 by Robert Collins
Make knit the default format.
843
    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.
844
        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
845
                         create=create,
846
                         get_scope=self.get_transaction)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
847
1563.2.25 by Robert Collins
Merge in upstream.
848
    def test_no_implicit_create(self):
849
        self.assertRaises(errors.NoSuchFile,
850
                          WeaveFile,
851
                          'foo',
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
852
                          self.get_transport(),
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
853
                          get_scope=self.get_transaction)
1563.2.25 by Robert Collins
Merge in upstream.
854
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
855
    def get_factory(self):
856
        return WeaveFile
857
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
858
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
859
class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
860
861
    def setUp(self):
6552.1.4 by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super().
862
        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.
863
        mapper = PrefixMapper()
864
        factory = make_file_factory(True, mapper)
865
        self.vf1 = factory(self.get_transport('root-1'))
866
        self.vf2 = factory(self.get_transport('root-2'))
867
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root')
868
        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
869
870
    def test_add_lines(self):
6963.2.4 by Jelmer Vernooij
Add bees.
871
        self.plan_merge_vf.add_lines((b'root', b'a:'), [], [])
872
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
7143.15.2 by Jelmer Vernooij
Run autopep8.
873
                          (b'root', b'a'), [], [])
874
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
875
                          (b'root', b'a:'), None, [])
876
        self.assertRaises(ValueError, self.plan_merge_vf.add_lines,
877
                          (b'root', b'a:'), [], None)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
878
879
    def setup_abcde(self):
6963.2.4 by Jelmer Vernooij
Add bees.
880
        self.vf1.add_lines((b'root', b'A'), [], [b'a'])
881
        self.vf1.add_lines((b'root', b'B'), [(b'root', b'A')], [b'b'])
882
        self.vf2.add_lines((b'root', b'C'), [], [b'c'])
883
        self.vf2.add_lines((b'root', b'D'), [(b'root', b'C')], [b'd'])
884
        self.plan_merge_vf.add_lines((b'root', b'E:'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
885
                                     [(b'root', b'B'), (b'root', b'D')], [b'e'])
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
886
887
    def test_get_parents(self):
888
        self.setup_abcde()
6963.2.4 by Jelmer Vernooij
Add bees.
889
        self.assertEqual({(b'root', b'B'): ((b'root', b'A'),)},
7143.15.2 by Jelmer Vernooij
Run autopep8.
890
                         self.plan_merge_vf.get_parent_map([(b'root', b'B')]))
6963.2.4 by Jelmer Vernooij
Add bees.
891
        self.assertEqual({(b'root', b'D'): ((b'root', b'C'),)},
7143.15.2 by Jelmer Vernooij
Run autopep8.
892
                         self.plan_merge_vf.get_parent_map([(b'root', b'D')]))
6963.2.4 by Jelmer Vernooij
Add bees.
893
        self.assertEqual({(b'root', b'E:'): ((b'root', b'B'), (b'root', b'D'))},
7143.15.2 by Jelmer Vernooij
Run autopep8.
894
                         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.
895
        self.assertEqual({},
7143.15.2 by Jelmer Vernooij
Run autopep8.
896
                         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.
897
        self.assertEqual({
7143.15.2 by Jelmer Vernooij
Run autopep8.
898
            (b'root', b'B'): ((b'root', b'A'),),
899
            (b'root', b'D'): ((b'root', b'C'),),
900
            (b'root', b'E:'): ((b'root', b'B'), (b'root', b'D')),
901
            },
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.
902
            self.plan_merge_vf.get_parent_map(
6963.2.4 by Jelmer Vernooij
Add bees.
903
                [(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
904
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.
905
    def test_get_record_stream(self):
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
906
        self.setup_abcde()
7143.15.2 by Jelmer Vernooij
Run autopep8.
907
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.
908
        def get_record(suffix):
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
909
            return next(self.plan_merge_vf.get_record_stream(
6963.2.4 by Jelmer Vernooij
Add bees.
910
                [(b'root', suffix)], 'unordered', True))
6963.2.13 by Jelmer Vernooij
Fix more tests.
911
        self.assertEqual(b'a', get_record(b'A').get_bytes_as('fulltext'))
7462.1.3 by Jelmer Vernooij
Add some tests.
912
        self.assertEqual(b'a', b''.join(get_record(b'A').iter_bytes_as('chunked')))
6963.2.13 by Jelmer Vernooij
Fix more tests.
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')
1550
        f.add_chunks(key0, [], [b'a', b'\nb\n'])
1551
        if self.graph:
1552
            f.add_chunks(key1, [key0], [b'b', b'\n', b'c\n'])
1553
        else:
1554
            f.add_chunks(key1, [], [b'b\n', b'c\n'])
1555
        keys = f.keys()
7331.4.9 by Jelmer Vernooij
Use assertIn.
1556
        self.assertIn(key0, keys)
1557
        self.assertIn(key1, keys)
7331.4.8 by Jelmer Vernooij
Add unit test.
1558
        records = []
1559
        for record in f.get_record_stream([key0, key1], 'unordered', True):
1560
            records.append((record.key, record.get_bytes_as('fulltext')))
1561
        records.sort()
1562
        self.assertEqual([(key0, b'a\nb\n'), (key1, b'b\nc\n')], records)
1563
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.
1564
    def test_annotate(self):
1565
        files = self.get_versionedfiles()
1566
        self.get_diamond_files(files)
1567
        if self.key_length == 1:
1568
            prefix = ()
1569
        else:
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1570
            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.
1571
        # introduced full text
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1572
        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.
1573
        self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1574
            (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.
1575
            origins)
1576
        # a delta
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1577
        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.
1578
        self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1579
            (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.
1580
            origins)
1581
        # a merge
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1582
        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.
1583
        if self.graph:
1584
            self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1585
                (prefix + (b'base',), b'base\n'),
1586
                (prefix + (b'left',), b'left\n'),
1587
                (prefix + (b'right',), b'right\n'),
1588
                (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.
1589
                ],
1590
                origins)
1591
        else:
1592
            # Without a graph everything is new.
1593
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1594
                (prefix + (b'merged',), b'base\n'),
1595
                (prefix + (b'merged',), b'left\n'),
1596
                (prefix + (b'merged',), b'right\n'),
1597
                (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.
1598
                ],
1599
                origins)
1600
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1601
                          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.
1602
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1603
    def test_check_no_parameters(self):
1604
        files = self.get_versionedfiles()
1605
1606
    def test_check_progressbar_parameter(self):
1607
        """A progress bar can be supplied because check can be a generator."""
1608
        pb = ui.ui_factory.nested_progress_bar()
1609
        self.addCleanup(pb.finished)
1610
        files = self.get_versionedfiles()
1611
        files.check(progress_bar=pb)
1612
1613
    def test_check_with_keys_becomes_generator(self):
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1614
        files = self.get_versionedfiles()
1615
        self.get_diamond_files(files)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1616
        keys = files.keys()
1617
        entries = files.check(keys=keys)
1618
        seen = set()
1619
        # Texts output should be fulltexts.
1620
        self.capture_stream(files, entries, seen.add,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1621
                            files.get_parent_map(keys), require_fulltext=True)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1622
        # All texts should be output.
1623
        self.assertEqual(set(keys), seen)
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1624
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1625
    def test_clear_cache(self):
1626
        files = self.get_versionedfiles()
1627
        files.clear_cache()
1628
3350.6.2 by Robert Collins
Prepare parameterised test environment.
1629
    def test_construct(self):
1630
        """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.
1631
        files = self.get_versionedfiles()
1632
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1633
    def get_diamond_files(self, files, trailing_eol=True, left_only=False,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1634
                          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.
1635
        return get_diamond_files(files, self.key_length,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1636
                                 trailing_eol=trailing_eol, nograph=not self.graph,
1637
                                 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.
1638
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1639
    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.
1640
        """When nostore_sha is supplied using old content raises."""
1641
        vf = self.get_versionedfiles()
6963.2.4 by Jelmer Vernooij
Add bees.
1642
        empty_text = (b'a', [])
1643
        sample_text_nl = (b'b', [b"foo\n", b"bar\n"])
1644
        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.
1645
        shas = []
1646
        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
1647
            if add_lines:
1648
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
1649
                                         lines)
1650
            else:
6839 by Jelmer Vernooij
Merge lp:~jelmer/brz/get-full.
1651
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
1652
                                         lines)
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1653
            shas.append(sha)
1654
        # we now have a copy of all the lines in the vf.
1655
        for sha, (version, lines) in zip(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1656
                shas, (empty_text, sample_text_nl, sample_text_no_nl)):
6963.2.4 by Jelmer Vernooij
Add bees.
1657
            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.
1658
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1659
                              vf.add_lines, new_key, [], lines,
1660
                              nostore_sha=sha)
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1661
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1662
                              vf.add_lines, new_key, [], lines,
1663
                              nostore_sha=sha)
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1664
            # and no new version should have been added.
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1665
            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.
1666
            self.assertEqual('absent', record.storage_kind)
1667
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1668
    def test_add_lines_nostoresha(self):
1669
        self._add_content_nostoresha(add_lines=True)
1670
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.
1671
    def test_add_lines_return(self):
1672
        files = self.get_versionedfiles()
1673
        # save code by using the stock data insertion helper.
1674
        adds = self.get_diamond_files(files)
1675
        results = []
1676
        # We can only validate the first 2 elements returned from add_lines.
1677
        for add in adds:
1678
            self.assertEqual(3, len(add))
1679
            results.append(add[:2])
1680
        if self.key_length == 1:
1681
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1682
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1683
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1684
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1685
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1686
                (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.
1687
                results)
1688
        elif self.key_length == 2:
1689
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1690
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1691
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1692
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1693
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1694
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1695
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1696
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1697
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1698
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1699
                (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.
1700
                results)
1701
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1702
    def test_add_lines_no_key_generates_chk_key(self):
1703
        files = self.get_versionedfiles()
1704
        # save code by using the stock data insertion helper.
1705
        adds = self.get_diamond_files(files, nokeys=True)
1706
        results = []
1707
        # We can only validate the first 2 elements returned from add_lines.
1708
        for add in adds:
1709
            self.assertEqual(3, len(add))
1710
            results.append(add[:2])
1711
        if self.key_length == 1:
1712
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1713
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1714
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1715
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1716
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1717
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1718
                results)
1719
            # Check the added items got CHK keys.
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1720
            self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1721
                (b'sha1:00e364d235126be43292ab09cb4686cf703ddc17',),
1722
                (b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',),
1723
                (b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',),
1724
                (b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f',),
1725
                (b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d',),
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1726
                },
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1727
                files.keys())
1728
        elif self.key_length == 2:
1729
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1730
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1731
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1732
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1733
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1734
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1735
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1736
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1737
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1738
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1739
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1740
                results)
1741
            # Check the added items got CHK keys.
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1742
            self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1743
                (b'FileA', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1744
                (b'FileA', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1745
                (b'FileA', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1746
                (b'FileA', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1747
                (b'FileA', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
1748
                (b'FileB', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1749
                (b'FileB', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1750
                (b'FileB', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1751
                (b'FileB', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1752
                (b'FileB', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1753
                },
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1754
                files.keys())
1755
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.
1756
    def test_empty_lines(self):
1757
        """Empty files can be stored."""
1758
        f = self.get_versionedfiles()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1759
        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.
1760
        f.add_lines(key_a, [], [])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1761
        self.assertEqual(b'',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1762
                         next(f.get_record_stream([key_a], 'unordered', True
1763
                                                  )).get_bytes_as('fulltext'))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1764
        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.
1765
        f.add_lines(key_b, self.get_parents([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_b], 'unordered', True
1768
                                                  )).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.
1769
1770
    def test_newline_only(self):
1771
        f = self.get_versionedfiles()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1772
        key_a = self.get_simple_key(b'a')
1773
        f.add_lines(key_a, [], [b'\n'])
1774
        self.assertEqual(b'\n',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1775
                         next(f.get_record_stream([key_a], 'unordered', True
1776
                                                  )).get_bytes_as('fulltext'))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1777
        key_b = self.get_simple_key(b'b')
1778
        f.add_lines(key_b, self.get_parents([key_a]), [b'\n'])
1779
        self.assertEqual(b'\n',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1780
                         next(f.get_record_stream([key_b], 'unordered', True
1781
                                                  )).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.
1782
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
1783
    def test_get_known_graph_ancestry(self):
1784
        f = self.get_versionedfiles()
4593.5.36 by John Arbash Meinel
a few more implementations of the interface.
1785
        if not self.graph:
1786
            raise TestNotApplicable('ancestry info only relevant with graph.')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1787
        key_a = self.get_simple_key(b'a')
1788
        key_b = self.get_simple_key(b'b')
1789
        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.
1790
        # A
1791
        # |\
1792
        # | B
1793
        # |/
1794
        # C
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1795
        f.add_lines(key_a, [], [b'\n'])
1796
        f.add_lines(key_b, [key_a], [b'\n'])
1797
        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.
1798
        kg = f.get_known_graph_ancestry([key_c])
1799
        self.assertIsInstance(kg, _mod_graph.KnownGraph)
1800
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1801
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1802
    def test_known_graph_with_fallbacks(self):
1803
        f = self.get_versionedfiles('files')
1804
        if not self.graph:
1805
            raise TestNotApplicable('ancestry info only relevant with graph.')
1806
        if getattr(f, 'add_fallback_versioned_files', None) is None:
1807
            raise TestNotApplicable("%s doesn't support fallbacks"
1808
                                    % (f.__class__.__name__,))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1809
        key_a = self.get_simple_key(b'a')
1810
        key_b = self.get_simple_key(b'b')
1811
        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)
1812
        # A     only in fallback
1813
        # |\
1814
        # | B
1815
        # |/
1816
        # C
1817
        g = self.get_versionedfiles('fallback')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1818
        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)
1819
        f.add_fallback_versioned_files(g)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1820
        f.add_lines(key_b, [key_a], [b'\n'])
1821
        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)
1822
        kg = f.get_known_graph_ancestry([key_c])
1823
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1824
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.
1825
    def test_get_record_stream_empty(self):
1826
        """An empty stream can be requested without error."""
1827
        f = self.get_versionedfiles()
1828
        entries = f.get_record_stream([], 'unordered', False)
1829
        self.assertEqual([], list(entries))
1830
1831
    def assertValidStorageKind(self, storage_kind):
1832
        """Assert that storage_kind is a valid storage_kind."""
1833
        self.assertSubset([storage_kind],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1834
                          ['mpdiff', 'knit-annotated-ft', 'knit-annotated-delta',
1835
                           'knit-ft', 'knit-delta', 'chunked', 'fulltext',
1836
                           'knit-annotated-ft-gz', 'knit-annotated-delta-gz', 'knit-ft-gz',
1837
                           'knit-delta-gz',
1838
                           'knit-delta-closure', 'knit-delta-closure-ref',
1839
                           '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.
1840
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1841
    def capture_stream(self, f, entries, on_seen, parents,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1842
                       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.
1843
        """Capture a stream for testing."""
1844
        for factory in entries:
1845
            on_seen(factory.key)
1846
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1847
            if factory.sha1 is not None:
1848
                self.assertEqual(f.get_sha1s([factory.key])[factory.key],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1849
                                 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.
1850
            self.assertEqual(parents[factory.key], factory.parents)
1851
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
1852
                                  bytes)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1853
            if require_fulltext:
1854
                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.
1855
1856
    def test_get_record_stream_interface(self):
1857
        """each item in a stream has to provide a regular interface."""
1858
        files = self.get_versionedfiles()
1859
        self.get_diamond_files(files)
1860
        keys, _ = self.get_keys_and_sort_order()
1861
        parent_map = files.get_parent_map(keys)
1862
        entries = files.get_record_stream(keys, 'unordered', False)
1863
        seen = set()
1864
        self.capture_stream(files, entries, seen.add, parent_map)
1865
        self.assertEqual(set(keys), seen)
1866
1867
    def get_keys_and_sort_order(self):
1868
        """Get diamond test keys list, and their sort ordering."""
1869
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1870
            keys = [(b'merged',), (b'left',), (b'right',), (b'base',)]
7143.15.2 by Jelmer Vernooij
Run autopep8.
1871
            sort_order = {(b'merged',): 2, (b'left',): 1,
1872
                          (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.
1873
        else:
1874
            keys = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1875
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1876
                (b'FileA', b'base'),
1877
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1878
                (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.
1879
                ]
1880
            sort_order = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1881
                (b'FileA', b'merged'): 2, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1,
1882
                (b'FileA', b'base'): 0,
1883
                (b'FileB', b'merged'): 2, (b'FileB', b'left'): 1, (b'FileB', b'right'): 1,
1884
                (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.
1885
                }
1886
        return keys, sort_order
1887
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1888
    def get_keys_and_groupcompress_sort_order(self):
1889
        """Get diamond test keys list, and their groupcompress sort ordering."""
1890
        if self.key_length == 1:
6963.2.4 by Jelmer Vernooij
Add bees.
1891
            keys = [(b'merged',), (b'left',), (b'right',), (b'base',)]
7143.15.2 by Jelmer Vernooij
Run autopep8.
1892
            sort_order = {(b'merged',): 0, (b'left',): 1,
1893
                          (b'right',): 1, (b'base',): 2}
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1894
        else:
1895
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
1896
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1897
                (b'FileA', b'base'),
1898
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1899
                (b'FileB', b'base'),
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1900
                ]
1901
            sort_order = {
6963.2.4 by Jelmer Vernooij
Add bees.
1902
                (b'FileA', b'merged'): 0, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1,
1903
                (b'FileA', b'base'): 2,
1904
                (b'FileB', b'merged'): 3, (b'FileB', b'left'): 4, (b'FileB', b'right'): 4,
1905
                (b'FileB', b'base'): 5,
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1906
                }
1907
        return keys, sort_order
1908
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1909
    def test_get_record_stream_interface_ordered(self):
1910
        """each item in a stream has to provide a regular interface."""
1911
        files = self.get_versionedfiles()
1912
        self.get_diamond_files(files)
1913
        keys, sort_order = self.get_keys_and_sort_order()
1914
        parent_map = files.get_parent_map(keys)
1915
        entries = files.get_record_stream(keys, 'topological', False)
1916
        seen = []
1917
        self.capture_stream(files, entries, seen.append, parent_map)
1918
        self.assertStreamOrder(sort_order, seen, keys)
1919
1920
    def test_get_record_stream_interface_ordered_with_delta_closure(self):
1921
        """each item must be accessible as a fulltext."""
1922
        files = self.get_versionedfiles()
1923
        self.get_diamond_files(files)
1924
        keys, sort_order = self.get_keys_and_sort_order()
1925
        parent_map = files.get_parent_map(keys)
1926
        entries = files.get_record_stream(keys, 'topological', True)
1927
        seen = []
1928
        for factory in entries:
1929
            seen.append(factory.key)
1930
            self.assertValidStorageKind(factory.storage_kind)
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1931
            self.assertSubset([factory.sha1],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1932
                              [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.
1933
            self.assertEqual(parent_map[factory.key], factory.parents)
1934
            # self.assertEqual(files.get_text(factory.key),
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1935
            ft_bytes = factory.get_bytes_as('fulltext')
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1936
            self.assertIsInstance(ft_bytes, bytes)
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1937
            chunked_bytes = factory.get_bytes_as('chunked')
6963.2.4 by Jelmer Vernooij
Add bees.
1938
            self.assertEqualDiff(ft_bytes, b''.join(chunked_bytes))
7462.1.3 by Jelmer Vernooij
Add some tests.
1939
            chunked_bytes = factory.iter_bytes_as('chunked')
1940
            self.assertEqualDiff(ft_bytes, b''.join(chunked_bytes))
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1941
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.
1942
        self.assertStreamOrder(sort_order, seen, keys)
1943
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1944
    def test_get_record_stream_interface_groupcompress(self):
1945
        """each item in a stream has to provide a regular interface."""
1946
        files = self.get_versionedfiles()
1947
        self.get_diamond_files(files)
1948
        keys, sort_order = self.get_keys_and_groupcompress_sort_order()
1949
        parent_map = files.get_parent_map(keys)
1950
        entries = files.get_record_stream(keys, 'groupcompress', False)
1951
        seen = []
1952
        self.capture_stream(files, entries, seen.append, parent_map)
1953
        self.assertStreamOrder(sort_order, seen, keys)
1954
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.
1955
    def assertStreamOrder(self, sort_order, seen, keys):
1956
        self.assertEqual(len(set(seen)), len(keys))
1957
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1958
            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.
1959
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1960
            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.
1961
        if not self.graph:
1962
            self.assertEqual(set(keys), set(seen))
1963
        else:
1964
            for key in seen:
1965
                sort_pos = sort_order[key]
1966
                self.assertTrue(sort_pos >= lows[key[:-1]],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1967
                                "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.
1968
                lows[key[:-1]] = sort_pos
1969
1970
    def test_get_record_stream_unknown_storage_kind_raises(self):
1971
        """Asking for a storage kind that the stream cannot supply raises."""
1972
        files = self.get_versionedfiles()
1973
        self.get_diamond_files(files)
1974
        if self.key_length == 1:
6963.2.4 by Jelmer Vernooij
Add bees.
1975
            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.
1976
        else:
1977
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
1978
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1979
                (b'FileA', b'base'),
1980
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1981
                (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.
1982
                ]
1983
        parent_map = files.get_parent_map(keys)
1984
        entries = files.get_record_stream(keys, 'unordered', False)
1985
        # We track the contents because we should be able to try, fail a
1986
        # particular kind and then ask for one that works and continue.
1987
        seen = set()
1988
        for factory in entries:
1989
            seen.add(factory.key)
1990
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1991
            if factory.sha1 is not None:
1992
                self.assertEqual(files.get_sha1s([factory.key])[factory.key],
1993
                                 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.
1994
            self.assertEqual(parent_map[factory.key], factory.parents)
1995
            # currently no stream emits mpdiff
1996
            self.assertRaises(errors.UnavailableRepresentation,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1997
                              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.
1998
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
1999
                                  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.
2000
        self.assertEqual(set(keys), seen)
2001
2002
    def test_get_record_stream_missing_records_are_absent(self):
2003
        files = self.get_versionedfiles()
2004
        self.get_diamond_files(files)
2005
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2006
            keys = [(b'merged',), (b'left',), (b'right',),
2007
                    (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.
2008
        else:
2009
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
2010
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
2011
                (b'FileA', b'absent'), (b'FileA', b'base'),
2012
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
2013
                (b'FileB', b'absent'), (b'FileB', b'base'),
2014
                (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.
2015
                ]
2016
        parent_map = files.get_parent_map(keys)
2017
        entries = files.get_record_stream(keys, 'unordered', False)
2018
        self.assertAbsentRecord(files, keys, parent_map, entries)
2019
        entries = files.get_record_stream(keys, 'topological', False)
2020
        self.assertAbsentRecord(files, keys, parent_map, entries)
2021
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2022
    def assertRecordHasContent(self, record, bytes):
2023
        """Assert that record has the bytes bytes."""
2024
        self.assertEqual(bytes, record.get_bytes_as('fulltext'))
6963.2.4 by Jelmer Vernooij
Add bees.
2025
        self.assertEqual(bytes, b''.join(record.get_bytes_as('chunked')))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2026
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.
2027
    def test_get_record_stream_native_formats_are_wire_ready_one_ft(self):
2028
        files = self.get_versionedfiles()
6963.2.3 by Jelmer Vernooij
Fix some more tests.
2029
        key = self.get_simple_key(b'foo')
2030
        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.
2031
        stream = files.get_record_stream([key], 'unordered', False)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2032
        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.
2033
        if record.storage_kind in ('chunked', 'fulltext'):
2034
            # chunked and fulltext representations are for direct use not wire
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2035
            # serialisation: check they are able to be used directly. To send
2036
            # such records over the wire translation will be needed.
6963.2.3 by Jelmer Vernooij
Fix some more tests.
2037
            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.
2038
        else:
2039
            bytes = [record.get_bytes_as(record.storage_kind)]
2040
            network_stream = versionedfile.NetworkRecordStream(bytes).read()
2041
            source_record = record
2042
            records = []
2043
            for record in network_stream:
2044
                records.append(record)
2045
                self.assertEqual(source_record.storage_kind,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2046
                                 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.
2047
                self.assertEqual(source_record.parents, record.parents)
2048
                self.assertEqual(
2049
                    source_record.get_bytes_as(source_record.storage_kind),
2050
                    record.get_bytes_as(record.storage_kind))
2051
            self.assertEqual(1, len(records))
2052
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2053
    def assertStreamMetaEqual(self, records, expected, stream):
2054
        """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.
2055
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2056
        :param records: A list to collect the seen records.
2057
        :return: A generator of the records in stream.
2058
        """
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2059
        # We make assertions during copying to catch things early for easier
2060
        # debugging. This must use the iterating zip() from the future.
6631.2.2 by Martin
Run 2to3 itertools fixer and refactor
2061
        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.
2062
            records.append(record)
2063
            self.assertEqual(ref_record.key, record.key)
2064
            self.assertEqual(ref_record.storage_kind, record.storage_kind)
2065
            self.assertEqual(ref_record.parents, record.parents)
2066
            yield record
2067
2068
    def stream_to_bytes_or_skip_counter(self, skipped_records, full_texts,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2069
                                        stream):
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2070
        """Convert a stream to a bytes iterator.
2071
2072
        :param skipped_records: A list with one element to increment when a
2073
            record is skipped.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2074
        :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.
2075
            checking chunked or fulltext stored records.
2076
        :param stream: A record_stream.
2077
        :return: An iterator over the bytes of each record.
2078
        """
2079
        for record in stream:
2080
            if record.storage_kind in ('chunked', 'fulltext'):
2081
                skipped_records[0] += 1
2082
                # check the content is correct for direct use.
2083
                self.assertRecordHasContent(record, full_texts[record.key])
2084
            else:
2085
                yield record.get_bytes_as(record.storage_kind)
2086
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2087
    def test_get_record_stream_native_formats_are_wire_ready_ft_delta(self):
2088
        files = self.get_versionedfiles()
2089
        target_files = self.get_versionedfiles('target')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2090
        key = self.get_simple_key(b'ft')
2091
        key_delta = self.get_simple_key(b'delta')
2092
        files.add_lines(key, (), [b'my text\n', b'content'])
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2093
        if self.graph:
2094
            delta_parents = (key,)
2095
        else:
2096
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2097
        files.add_lines(key_delta, delta_parents, [
2098
                        b'different\n', b'content\n'])
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2099
        local = files.get_record_stream([key, key_delta], 'unordered', False)
2100
        ref = files.get_record_stream([key, key_delta], 'unordered', False)
2101
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2102
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2103
            key: b"my text\ncontent",
2104
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2105
            }
2106
        byte_stream = self.stream_to_bytes_or_skip_counter(
2107
            skipped_records, full_texts, local)
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2108
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2109
        records = []
2110
        # insert the stream from the network into a versioned files object so we can
2111
        # check the content was carried across correctly without doing delta
2112
        # inspection.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2113
        target_files.insert_record_stream(
2114
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2115
        # No duplicates on the wire thank you!
2116
        self.assertEqual(2, len(records) + skipped_records[0])
2117
        if len(records):
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2118
            # if any content was copied it all must have all been.
2119
            self.assertIdenticalVersionedFile(files, target_files)
2120
2121
    def test_get_record_stream_native_formats_are_wire_ready_delta(self):
2122
        # copy a delta over the wire
2123
        files = self.get_versionedfiles()
2124
        target_files = self.get_versionedfiles('target')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2125
        key = self.get_simple_key(b'ft')
2126
        key_delta = self.get_simple_key(b'delta')
2127
        files.add_lines(key, (), [b'my text\n', b'content'])
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2128
        if self.graph:
2129
            delta_parents = (key,)
2130
        else:
2131
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2132
        files.add_lines(key_delta, delta_parents, [
2133
                        b'different\n', b'content\n'])
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2134
        # Copy the basis text across so we can reconstruct the delta during
2135
        # insertion into target.
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2136
        target_files.insert_record_stream(files.get_record_stream([key],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2137
                                                                  'unordered', False))
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2138
        local = files.get_record_stream([key_delta], 'unordered', False)
2139
        ref = files.get_record_stream([key_delta], 'unordered', False)
2140
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2141
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2142
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2143
            }
2144
        byte_stream = self.stream_to_bytes_or_skip_counter(
2145
            skipped_records, full_texts, local)
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2146
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2147
        records = []
2148
        # insert the stream from the network into a versioned files object so we can
2149
        # check the content was carried across correctly without doing delta
2150
        # inspection during check_stream.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2151
        target_files.insert_record_stream(
2152
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2153
        # No duplicates on the wire thank you!
2154
        self.assertEqual(1, len(records) + skipped_records[0])
2155
        if len(records):
2156
            # if any content was copied it all must have all been
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2157
            self.assertIdenticalVersionedFile(files, target_files)
2158
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2159
    def test_get_record_stream_wire_ready_delta_closure_included(self):
2160
        # copy a delta over the wire with the ability to get its full text.
2161
        files = self.get_versionedfiles()
6963.2.12 by Jelmer Vernooij
Fix some more tests.
2162
        key = self.get_simple_key(b'ft')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2163
        key_delta = self.get_simple_key(b'delta')
2164
        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.
2165
        if self.graph:
2166
            delta_parents = (key,)
2167
        else:
2168
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2169
        files.add_lines(key_delta, delta_parents, [
2170
                        b'different\n', b'content\n'])
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2171
        local = files.get_record_stream([key_delta], 'unordered', True)
2172
        ref = files.get_record_stream([key_delta], 'unordered', True)
2173
        skipped_records = [0]
2174
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2175
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2176
            }
2177
        byte_stream = self.stream_to_bytes_or_skip_counter(
2178
            skipped_records, full_texts, local)
2179
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2180
        records = []
2181
        # insert the stream from the network into a versioned files object so we can
2182
        # check the content was carried across correctly without doing delta
2183
        # inspection during check_stream.
2184
        for record in self.assertStreamMetaEqual(records, ref, network_stream):
2185
            # we have to be able to get the full text out:
2186
            self.assertRecordHasContent(record, full_texts[record.key])
2187
        # No duplicates on the wire thank you!
2188
        self.assertEqual(1, len(records) + skipped_records[0])
2189
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.
2190
    def assertAbsentRecord(self, files, keys, parents, entries):
2191
        """Helper for test_get_record_stream_missing_records_are_absent."""
2192
        seen = set()
2193
        for factory in entries:
2194
            seen.add(factory.key)
6963.2.4 by Jelmer Vernooij
Add bees.
2195
            if factory.key[-1] == b'absent':
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2196
                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.
2197
                self.assertEqual(None, factory.sha1)
2198
                self.assertEqual(None, factory.parents)
2199
            else:
2200
                self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
2201
                if factory.sha1 is not None:
2202
                    sha1 = files.get_sha1s([factory.key])[factory.key]
2203
                    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.
2204
                self.assertEqual(parents[factory.key], factory.parents)
2205
                self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2206
                                      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.
2207
        self.assertEqual(set(keys), seen)
2208
2209
    def test_filter_absent_records(self):
2210
        """Requested missing records can be filter trivially."""
2211
        files = self.get_versionedfiles()
2212
        self.get_diamond_files(files)
2213
        keys, _ = self.get_keys_and_sort_order()
2214
        parent_map = files.get_parent_map(keys)
2215
        # Add an absent record in the middle of the present keys. (We don't ask
2216
        # for just absent keys to ensure that content before and after the
2217
        # absent keys is still delivered).
2218
        present_keys = list(keys)
2219
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2220
            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.
2221
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2222
            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.
2223
        entries = files.get_record_stream(keys, 'unordered', False)
2224
        seen = set()
2225
        self.capture_stream(files, versionedfile.filter_absent(entries), seen.add,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2226
                            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.
2227
        self.assertEqual(set(present_keys), seen)
2228
2229
    def get_mapper(self):
2230
        """Get a mapper suitable for the key length of the test interface."""
2231
        if self.key_length == 1:
2232
            return ConstantMapper('source')
2233
        else:
2234
            return HashEscapedPrefixMapper()
2235
2236
    def get_parents(self, parents):
2237
        """Get parents, taking self.graph into consideration."""
2238
        if self.graph:
2239
            return parents
2240
        else:
2241
            return None
2242
4332.3.32 by Robert Collins
Merge bzr.dev.
2243
    def test_get_annotator(self):
2244
        files = self.get_versionedfiles()
2245
        self.get_diamond_files(files)
6963.2.4 by Jelmer Vernooij
Add bees.
2246
        origin_key = self.get_simple_key(b'origin')
2247
        base_key = self.get_simple_key(b'base')
2248
        left_key = self.get_simple_key(b'left')
2249
        right_key = self.get_simple_key(b'right')
2250
        merged_key = self.get_simple_key(b'merged')
4332.3.32 by Robert Collins
Merge bzr.dev.
2251
        # annotator = files.get_annotator()
2252
        # introduced full text
2253
        origins, lines = files.get_annotator().annotate(origin_key)
2254
        self.assertEqual([(origin_key,)], origins)
6963.2.4 by Jelmer Vernooij
Add bees.
2255
        self.assertEqual([b'origin\n'], lines)
4332.3.32 by Robert Collins
Merge bzr.dev.
2256
        # a delta
2257
        origins, lines = files.get_annotator().annotate(base_key)
2258
        self.assertEqual([(base_key,)], origins)
2259
        # a merge
2260
        origins, lines = files.get_annotator().annotate(merged_key)
2261
        if self.graph:
2262
            self.assertEqual([
2263
                (base_key,),
2264
                (left_key,),
2265
                (right_key,),
2266
                (merged_key,),
2267
                ], origins)
2268
        else:
2269
            # Without a graph everything is new.
2270
            self.assertEqual([
2271
                (merged_key,),
2272
                (merged_key,),
2273
                (merged_key,),
2274
                (merged_key,),
2275
                ], origins)
2276
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2277
                          files.get_annotator().annotate, self.get_simple_key(b'missing-key'))
4332.3.32 by Robert Collins
Merge bzr.dev.
2278
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.
2279
    def test_get_parent_map(self):
2280
        files = self.get_versionedfiles()
2281
        if self.key_length == 1:
2282
            parent_details = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2283
                ((b'r0',), self.get_parents(())),
2284
                ((b'r1',), self.get_parents(((b'r0',),))),
2285
                ((b'r2',), self.get_parents(())),
2286
                ((b'r3',), self.get_parents(())),
2287
                ((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.
2288
                ]
2289
        else:
2290
            parent_details = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2291
                ((b'FileA', b'r0'), self.get_parents(())),
2292
                ((b'FileA', b'r1'), self.get_parents(((b'FileA', b'r0'),))),
2293
                ((b'FileA', b'r2'), self.get_parents(())),
2294
                ((b'FileA', b'r3'), self.get_parents(())),
2295
                ((b'FileA', b'm'), self.get_parents(((b'FileA', b'r0'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2296
                                                     (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.
2297
                ]
2298
        for key, parents in parent_details:
2299
            files.add_lines(key, parents, [])
2300
            # immediately after adding it should be queryable.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2301
            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.
2302
        # We can ask for an empty set
2303
        self.assertEqual({}, files.get_parent_map([]))
2304
        # We can ask for many keys
2305
        all_parents = dict(parent_details)
2306
        self.assertEqual(all_parents, files.get_parent_map(all_parents.keys()))
2307
        # Absent keys are just not included in the result.
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2308
        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.
2309
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2310
            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.
2311
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2312
            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.
2313
        # Absent keys are just ignored
2314
        self.assertEqual(all_parents, files.get_parent_map(keys))
2315
2316
    def test_get_sha1s(self):
2317
        files = self.get_versionedfiles()
2318
        self.get_diamond_files(files)
2319
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2320
            keys = [(b'base',), (b'origin',), (b'left',),
2321
                    (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.
2322
        else:
2323
            # ask for shas from different prefixes.
2324
            keys = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2325
                (b'FileA', b'base'), (b'FileB', b'origin'), (b'FileA', b'left'),
2326
                (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.
2327
                ]
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2328
        self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2329
            keys[0]: b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',
2330
            keys[1]: b'00e364d235126be43292ab09cb4686cf703ddc17',
2331
            keys[2]: b'a8478686da38e370e32e42e8a0c220e33ee9132f',
2332
            keys[3]: b'ed8bce375198ea62444dc71952b22cfc2b09226d',
2333
            keys[4]: b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2334
            },
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.
2335
            files.get_sha1s(keys))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2336
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.
2337
    def test_insert_record_stream_empty(self):
2338
        """Inserting an empty record stream should work."""
2339
        files = self.get_versionedfiles()
2340
        files.insert_record_stream([])
2341
2342
    def assertIdenticalVersionedFile(self, expected, actual):
2343
        """Assert that left and right have the same contents."""
2344
        self.assertEqual(set(actual.keys()), set(expected.keys()))
2345
        actual_parents = actual.get_parent_map(actual.keys())
2346
        if self.graph:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2347
            self.assertEqual(
2348
                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.
2349
        else:
2350
            for key, parents in actual_parents.items():
2351
                self.assertEqual(None, parents)
2352
        for key in actual.keys():
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2353
            actual_text = next(actual.get_record_stream(
2354
                [key], 'unordered', True)).get_bytes_as('fulltext')
2355
            expected_text = next(expected.get_record_stream(
2356
                [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.
2357
            self.assertEqual(actual_text, expected_text)
2358
2359
    def test_insert_record_stream_fulltexts(self):
2360
        """Any file should accept a stream of fulltexts."""
2361
        files = self.get_versionedfiles()
2362
        mapper = self.get_mapper()
2363
        source_transport = self.get_transport('source')
2364
        source_transport.mkdir('.')
2365
        # weaves always output fulltexts.
2366
        source = make_versioned_files_factory(WeaveFile, mapper)(
2367
            source_transport)
2368
        self.get_diamond_files(source, trailing_eol=False)
2369
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2370
                                          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.
2371
        files.insert_record_stream(stream)
2372
        self.assertIdenticalVersionedFile(source, files)
2373
2374
    def test_insert_record_stream_fulltexts_noeol(self):
2375
        """Any file should accept a stream of fulltexts."""
2376
        files = self.get_versionedfiles()
2377
        mapper = self.get_mapper()
2378
        source_transport = self.get_transport('source')
2379
        source_transport.mkdir('.')
2380
        # weaves always output fulltexts.
2381
        source = make_versioned_files_factory(WeaveFile, mapper)(
2382
            source_transport)
2383
        self.get_diamond_files(source, trailing_eol=False)
2384
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2385
                                          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.
2386
        files.insert_record_stream(stream)
2387
        self.assertIdenticalVersionedFile(source, files)
2388
2389
    def test_insert_record_stream_annotated_knits(self):
2390
        """Any file should accept a stream from plain knits."""
2391
        files = self.get_versionedfiles()
2392
        mapper = self.get_mapper()
2393
        source_transport = self.get_transport('source')
2394
        source_transport.mkdir('.')
2395
        source = make_file_factory(True, mapper)(source_transport)
2396
        self.get_diamond_files(source)
2397
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2398
                                          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.
2399
        files.insert_record_stream(stream)
2400
        self.assertIdenticalVersionedFile(source, files)
2401
2402
    def test_insert_record_stream_annotated_knits_noeol(self):
2403
        """Any file should accept a stream from plain knits."""
2404
        files = self.get_versionedfiles()
2405
        mapper = self.get_mapper()
2406
        source_transport = self.get_transport('source')
2407
        source_transport.mkdir('.')
2408
        source = make_file_factory(True, mapper)(source_transport)
2409
        self.get_diamond_files(source, trailing_eol=False)
2410
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2411
                                          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.
2412
        files.insert_record_stream(stream)
2413
        self.assertIdenticalVersionedFile(source, files)
2414
2415
    def test_insert_record_stream_plain_knits(self):
2416
        """Any file should accept a stream from plain knits."""
2417
        files = self.get_versionedfiles()
2418
        mapper = self.get_mapper()
2419
        source_transport = self.get_transport('source')
2420
        source_transport.mkdir('.')
2421
        source = make_file_factory(False, mapper)(source_transport)
2422
        self.get_diamond_files(source)
2423
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2424
                                          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.
2425
        files.insert_record_stream(stream)
2426
        self.assertIdenticalVersionedFile(source, files)
2427
2428
    def test_insert_record_stream_plain_knits_noeol(self):
2429
        """Any file should accept a stream from plain knits."""
2430
        files = self.get_versionedfiles()
2431
        mapper = self.get_mapper()
2432
        source_transport = self.get_transport('source')
2433
        source_transport.mkdir('.')
2434
        source = make_file_factory(False, mapper)(source_transport)
2435
        self.get_diamond_files(source, trailing_eol=False)
2436
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2437
                                          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.
2438
        files.insert_record_stream(stream)
2439
        self.assertIdenticalVersionedFile(source, files)
2440
2441
    def test_insert_record_stream_existing_keys(self):
2442
        """Inserting keys already in a file should not error."""
2443
        files = self.get_versionedfiles()
2444
        source = self.get_versionedfiles('source')
2445
        self.get_diamond_files(source)
2446
        # insert some keys into f.
2447
        self.get_diamond_files(files, left_only=True)
2448
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2449
                                          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.
2450
        files.insert_record_stream(stream)
2451
        self.assertIdenticalVersionedFile(source, files)
2452
2453
    def test_insert_record_stream_missing_keys(self):
2454
        """Inserting a stream with absent keys should raise an error."""
2455
        files = self.get_versionedfiles()
2456
        source = self.get_versionedfiles('source')
6963.2.11 by Jelmer Vernooij
Fix some more tests.
2457
        stream = source.get_record_stream([(b'missing',) * self.key_length],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2458
                                          '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.
2459
        self.assertRaises(errors.RevisionNotPresent, files.insert_record_stream,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2460
                          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.
2461
2462
    def test_insert_record_stream_out_of_order(self):
2463
        """An out of order stream can either error or work."""
2464
        files = self.get_versionedfiles()
2465
        source = self.get_versionedfiles('source')
2466
        self.get_diamond_files(source)
2467
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2468
            origin_keys = [(b'origin',)]
2469
            end_keys = [(b'merged',), (b'left',)]
2470
            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.
2471
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2472
            origin_keys = [(b'FileA', b'origin'), (b'FileB', b'origin')]
2473
            end_keys = [(b'FileA', b'merged',), (b'FileA', b'left',),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2474
                        (b'FileB', b'merged',), (b'FileB', b'left',)]
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2475
            start_keys = [(b'FileA', b'right',), (b'FileA', b'base',),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2476
                          (b'FileB', b'right',), (b'FileB', b'base',)]
2477
        origin_entries = source.get_record_stream(
2478
            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.
2479
        end_entries = source.get_record_stream(end_keys, 'topological', False)
7143.15.2 by Jelmer Vernooij
Run autopep8.
2480
        start_entries = source.get_record_stream(
2481
            start_keys, 'topological', False)
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2482
        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.
2483
        try:
2484
            files.insert_record_stream(entries)
2485
        except RevisionNotPresent:
2486
            # Must not have corrupted the file.
2487
            files.check()
2488
        else:
2489
            self.assertIdenticalVersionedFile(source, files)
2490
4634.84.2 by Andrew Bennetts
Add test.
2491
    def test_insert_record_stream_long_parent_chain_out_of_order(self):
2492
        """An out of order stream can either error or work."""
2493
        if not self.graph:
2494
            raise TestNotApplicable('ancestry info only relevant with graph.')
2495
        # Create a reasonably long chain of records based on each other, where
2496
        # most will be deltas.
2497
        source = self.get_versionedfiles('source')
2498
        parents = ()
2499
        keys = []
6963.2.4 by Jelmer Vernooij
Add bees.
2500
        content = [(b'same same %d\n' % n) for n in range(500)]
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2501
        letters = b'abcdefghijklmnopqrstuvwxyz'
2502
        for i in range(len(letters)):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2503
            letter = letters[i:i + 1]
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2504
            key = (b'key-' + letter,)
4634.84.2 by Andrew Bennetts
Add test.
2505
            if self.key_length == 2:
6963.2.4 by Jelmer Vernooij
Add bees.
2506
                key = (b'prefix',) + key
2507
            content.append(b'content for ' + letter + b'\n')
4634.84.2 by Andrew Bennetts
Add test.
2508
            source.add_lines(key, parents, content)
2509
            keys.append(key)
2510
            parents = (key,)
2511
        # Create a stream of these records, excluding the first record that the
2512
        # rest ultimately depend upon, and insert it into a new vf.
2513
        streams = []
2514
        for key in reversed(keys):
2515
            streams.append(source.get_record_stream([key], 'unordered', False))
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2516
        deltas = itertools.chain.from_iterable(streams[:-1])
4634.84.2 by Andrew Bennetts
Add test.
2517
        files = self.get_versionedfiles()
2518
        try:
2519
            files.insert_record_stream(deltas)
2520
        except RevisionNotPresent:
2521
            # Must not have corrupted the file.
2522
            files.check()
2523
        else:
2524
            # Must only report either just the first key as a missing parent,
2525
            # no key as missing (for nodelta scenarios).
2526
            missing = set(files.get_missing_compression_parent_keys())
2527
            missing.discard(keys[0])
2528
            self.assertEqual(set(), missing)
2529
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2530
    def get_knit_delta_source(self):
2531
        """Get a source that can produce a stream with knit delta records,
2532
        regardless of this test's scenario.
2533
        """
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.
2534
        mapper = self.get_mapper()
2535
        source_transport = self.get_transport('source')
2536
        source_transport.mkdir('.')
2537
        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.
2538
        get_diamond_files(source, self.key_length, trailing_eol=True,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2539
                          nograph=False, left_only=False)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2540
        return source
2541
2542
    def test_insert_record_stream_delta_missing_basis_no_corruption(self):
2543
        """Insertion where a needed basis is not included notifies the caller
2544
        of the missing basis.  In the meantime a record missing its basis is
2545
        not added.
2546
        """
2547
        source = self.get_knit_delta_source()
6963.2.4 by Jelmer Vernooij
Add bees.
2548
        keys = [self.get_simple_key(b'origin'), self.get_simple_key(b'merged')]
4009.3.7 by Andrew Bennetts
Most tests passing.
2549
        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.
2550
        files = self.get_versionedfiles()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2551
        if self.support_partial_insertion:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2552
            self.assertEqual([],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2553
                             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.
2554
            files.insert_record_stream(entries)
2555
            missing_bases = files.get_missing_compression_parent_keys()
6963.2.4 by Jelmer Vernooij
Add bees.
2556
            self.assertEqual({self.get_simple_key(b'left')},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2557
                             set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2558
            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.
2559
        else:
2560
            self.assertRaises(
2561
                errors.RevisionNotPresent, files.insert_record_stream, entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2562
            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.
2563
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2564
    def test_insert_record_stream_delta_missing_basis_can_be_added_later(self):
2565
        """Insertion where a needed basis is not included notifies the caller
2566
        of the missing basis.  That basis can be added in a second
2567
        insert_record_stream call that does not need to repeat records present
4009.3.3 by Andrew Bennetts
Add docstrings.
2568
        in the previous stream.  The record(s) that required that basis are
2569
        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.
2570
        """
2571
        if not self.support_partial_insertion:
2572
            raise TestNotApplicable(
2573
                'versioned file scenario does not support partial insertion')
2574
        source = self.get_knit_delta_source()
6963.2.4 by Jelmer Vernooij
Add bees.
2575
        entries = source.get_record_stream([self.get_simple_key(b'origin'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2576
                                            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.
2577
        files = self.get_versionedfiles()
2578
        files.insert_record_stream(entries)
2579
        missing_bases = files.get_missing_compression_parent_keys()
6963.2.4 by Jelmer Vernooij
Add bees.
2580
        self.assertEqual({self.get_simple_key(b'left')},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2581
                         set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2582
        # 'merged' is inserted (although a commit of a write group involving
2583
        # this versionedfiles would fail).
6963.2.4 by Jelmer Vernooij
Add bees.
2584
        merged_key = self.get_simple_key(b'merged')
4009.3.7 by Andrew Bennetts
Most tests passing.
2585
        self.assertEqual(
6973.14.4 by Jelmer Vernooij
Fix checking for options.
2586
            [merged_key], list(files.get_parent_map([merged_key]).keys()))
4009.3.7 by Andrew Bennetts
Most tests passing.
2587
        # 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.
2588
        missing_entries = source.get_record_stream(
4009.3.7 by Andrew Bennetts
Most tests passing.
2589
            missing_bases, 'unordered', True)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2590
        files.insert_record_stream(missing_entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2591
        # 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.
2592
        self.assertEqual([], list(files.get_missing_compression_parent_keys()))
2593
        self.assertEqual(
6973.14.4 by Jelmer Vernooij
Fix checking for options.
2594
            [merged_key], list(files.get_parent_map([merged_key]).keys()))
4009.3.7 by Andrew Bennetts
Most tests passing.
2595
        files.check()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2596
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.
2597
    def test_iter_lines_added_or_present_in_keys(self):
2598
        # test that we get at least an equalset of the lines added by
2599
        # versions in the store.
2600
        # the ordering here is to make a tree so that dumb searches have
2601
        # more changes to muck up.
2602
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2603
        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.
2604
2605
            def __init__(self):
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2606
                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.
2607
                self.updates = []
2608
2609
            def update(self, msg=None, current=None, total=None):
2610
                self.updates.append((msg, current, total))
2611
2612
        files = self.get_versionedfiles()
2613
        # add a base to get included
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2614
        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.
2615
        # add a ancestor to be included on one side
7143.15.2 by Jelmer Vernooij
Run autopep8.
2616
        files.add_lines(self.get_simple_key(
2617
            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.
2618
        # add a ancestor to be included on the other side
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2619
        files.add_lines(self.get_simple_key(b'rancestor'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2620
                        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.
2621
        # add a child of rancestor with no eofile-nl
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2622
        files.add_lines(self.get_simple_key(b'child'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2623
                        self.get_parents([self.get_simple_key(b'rancestor')]),
2624
                        [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.
2625
        # add a child of lancestor and base to join the two roots
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2626
        files.add_lines(self.get_simple_key(b'otherchild'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2627
                        self.get_parents([self.get_simple_key(b'lancestor'),
2628
                                          self.get_simple_key(b'base')]),
2629
                        [b'base\n', b'lancestor\n', b'otherchild\n'])
2630
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.
2631
        def iter_with_keys(keys, expected):
2632
            # now we need to see what lines are returned, and how often.
2633
            lines = {}
2634
            progress = InstrumentedProgress()
2635
            # iterate over the lines
2636
            for line in files.iter_lines_added_or_present_in_keys(keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2637
                                                                  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.
2638
                lines.setdefault(line, 0)
2639
                lines[line] += 1
7143.15.2 by Jelmer Vernooij
Run autopep8.
2640
            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.
2641
                self.assertEqual(expected, progress.updates)
2642
            return lines
2643
        lines = iter_with_keys(
7143.15.2 by Jelmer Vernooij
Run autopep8.
2644
            [self.get_simple_key(b'child'),
2645
             self.get_simple_key(b'otherchild')],
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
2646
            [('Walking content', 0, 2),
2647
             ('Walking content', 1, 2),
2648
             ('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.
2649
        # we must see child and otherchild
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2650
        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.
2651
        self.assertTrue(
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2652
            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.
2653
        # we dont care if we got more than that.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2654
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.
2655
        # test all lines
2656
        lines = iter_with_keys(files.keys(),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2657
                               [('Walking content', 0, 5),
2658
                                ('Walking content', 1, 5),
2659
                                ('Walking content', 2, 5),
2660
                                ('Walking content', 3, 5),
2661
                                ('Walking content', 4, 5),
2662
                                ('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.
2663
        # all lines must be seen at least once
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2664
        self.assertTrue(lines[(b'base\n', self.get_simple_key(b'base'))] > 0)
2665
        self.assertTrue(
2666
            lines[(b'lancestor\n', self.get_simple_key(b'lancestor'))] > 0)
2667
        self.assertTrue(
2668
            lines[(b'rancestor\n', self.get_simple_key(b'rancestor'))] > 0)
2669
        self.assertTrue(lines[(b'child\n', self.get_simple_key(b'child'))] > 0)
2670
        self.assertTrue(
2671
            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.
2672
2673
    def test_make_mpdiffs(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2674
        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.
2675
        files = self.get_versionedfiles('source')
2676
        # add texts that should trip the knit maximum delta chain threshold
2677
        # as well as doing parallel chains of data in knits.
2678
        # this is done by two chains of 25 insertions
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2679
        files.add_lines(self.get_simple_key(b'base'), [], [b'line\n'])
2680
        files.add_lines(self.get_simple_key(b'noeol'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2681
                        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.
2682
        # detailed eol tests:
2683
        # shared last line with parent no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2684
        files.add_lines(self.get_simple_key(b'noeolsecond'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2685
                        self.get_parents([self.get_simple_key(b'noeol')]),
2686
                        [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.
2687
        # differing last line with parent, both no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2688
        files.add_lines(self.get_simple_key(b'noeolnotshared'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2689
                        self.get_parents(
2690
                            [self.get_simple_key(b'noeolsecond')]),
2691
                        [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.
2692
        # add eol following a noneol parent, change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2693
        files.add_lines(self.get_simple_key(b'eol'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2694
                        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.
2695
        # add eol following a noneol parent, no change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2696
        files.add_lines(self.get_simple_key(b'eolline'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2697
                        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.
2698
        # noeol with no parents:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2699
        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.
2700
        # noeol preceeding its leftmost parent in the output:
2701
        # 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
2702
        # 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.
2703
        # later-inserted parent the leftmost.
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2704
        files.add_lines(self.get_simple_key(b'eolbeforefirstparent'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2705
                        self.get_parents([self.get_simple_key(b'noeolbase'),
2706
                                          self.get_simple_key(b'noeol')]),
2707
                        [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.
2708
        # two identical eol texts
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2709
        files.add_lines(self.get_simple_key(b'noeoldup'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2710
                        self.get_parents([self.get_simple_key(b'noeol')]), [b'line'])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2711
        next_parent = self.get_simple_key(b'base')
2712
        text_name = b'chain1-'
2713
        text = [b'line\n']
2714
        sha1s = {0: b'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
2715
                 1: b'45e21ea146a81ea44a821737acdb4f9791c8abe7',
2716
                 2: b'e1f11570edf3e2a070052366c582837a4fe4e9fa',
2717
                 3: b'26b4b8626da827088c514b8f9bbe4ebf181edda1',
2718
                 4: b'e28a5510be25ba84d31121cff00956f9970ae6f6',
2719
                 5: b'd63ec0ce22e11dcf65a931b69255d3ac747a318d',
2720
                 6: b'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
2721
                 7: b'95c14da9cafbf828e3e74a6f016d87926ba234ab',
2722
                 8: b'779e9a0b28f9f832528d4b21e17e168c67697272',
2723
                 9: b'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
2724
                 10: b'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
2725
                 11: b'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
2726
                 12: b'31a2286267f24d8bedaa43355f8ad7129509ea85',
2727
                 13: b'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
2728
                 14: b'2c4b1736566b8ca6051e668de68650686a3922f2',
2729
                 15: b'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
2730
                 16: b'b0d2e18d3559a00580f6b49804c23fea500feab3',
2731
                 17: b'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
2732
                 18: b'5cf64a3459ae28efa60239e44b20312d25b253f3',
2733
                 19: b'1ebed371807ba5935958ad0884595126e8c4e823',
2734
                 20: b'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
2735
                 21: b'01edc447978004f6e4e962b417a4ae1955b6fe5d',
2736
                 22: b'd8d8dc49c4bf0bab401e0298bb5ad827768618bb',
2737
                 23: b'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
2738
                 24: b'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
2739
                 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.
2740
                 }
2741
        for depth in range(26):
6963.2.6 by Jelmer Vernooij
Fix some more tests.
2742
            new_version = self.get_simple_key(text_name + b'%d' % depth)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2743
            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.
2744
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2745
            next_parent = new_version
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2746
        next_parent = self.get_simple_key(b'base')
2747
        text_name = b'chain2-'
2748
        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.
2749
        for depth in range(26):
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2750
            new_version = self.get_simple_key(text_name + b'%d' % depth)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2751
            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.
2752
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2753
            next_parent = new_version
2754
        target = self.get_versionedfiles('target')
2755
        for key in multiparent.topo_iter_keys(files, files.keys()):
2756
            mpdiff = files.make_mpdiffs([key])[0]
2757
            parents = files.get_parent_map([key])[key] or []
2758
            target.add_mpdiffs(
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2759
                [(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.
2760
            self.assertEqualDiff(
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2761
                next(files.get_record_stream([key], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2762
                                             True)).get_bytes_as('fulltext'),
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2763
                next(target.get_record_stream([key], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2764
                                              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.
2765
                )
2766
2767
    def test_keys(self):
2768
        # While use is discouraged, versions() is still needed by aspects of
2769
        # bzr.
2770
        files = self.get_versionedfiles()
2771
        self.assertEqual(set(), set(files.keys()))
2772
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2773
            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.
2774
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2775
            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.
2776
        files.add_lines(key, (), [])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
2777
        self.assertEqual({key}, set(files.keys()))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2778
2779
2780
class VirtualVersionedFilesTests(TestCase):
2781
    """Basic tests for the VirtualVersionedFiles implementations."""
2782
2783
    def _get_parent_map(self, keys):
2784
        ret = {}
2785
        for k in keys:
2786
            if k in self._parent_map:
2787
                ret[k] = self._parent_map[k]
2788
        return ret
2789
2790
    def setUp(self):
6552.1.4 by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super().
2791
        super(VirtualVersionedFilesTests, self).setUp()
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2792
        self._lines = {}
2793
        self._parent_map = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2794
        self.texts = VirtualVersionedFiles(self._get_parent_map,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2795
                                           self._lines.get)
2796
2797
    def test_add_lines(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2798
        self.assertRaises(NotImplementedError,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2799
                          self.texts.add_lines, b"foo", [], [])
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2800
2801
    def test_add_mpdiffs(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2802
        self.assertRaises(NotImplementedError,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2803
                          self.texts.add_mpdiffs, [])
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2804
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
2805
    def test_check_noerrors(self):
2806
        self.texts.check()
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2807
2808
    def test_insert_record_stream(self):
2809
        self.assertRaises(NotImplementedError, self.texts.insert_record_stream,
2810
                          [])
2811
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
2812
    def test_get_sha1s_nonexistent(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2813
        self.assertEqual({}, self.texts.get_sha1s([(b"NONEXISTENT",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2814
2815
    def test_get_sha1s(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2816
        self._lines[b"key"] = [b"dataline1", b"dataline2"]
2817
        self.assertEqual({(b"key",): osutils.sha_strings(self._lines[b"key"])},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2818
                         self.texts.get_sha1s([(b"key",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2819
2820
    def test_get_parent_map(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2821
        self._parent_map = {b"G": (b"A", b"B")}
2822
        self.assertEqual({(b"G",): ((b"A",), (b"B",))},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2823
                         self.texts.get_parent_map([(b"G",), (b"L",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2824
2825
    def test_get_record_stream(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2826
        self._lines[b"A"] = [b"FOO", b"BAR"]
2827
        it = self.texts.get_record_stream([(b"A",)], "unordered", True)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2828
        record = next(it)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
2829
        self.assertEqual("chunked", record.storage_kind)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2830
        self.assertEqual(b"FOOBAR", record.get_bytes_as("fulltext"))
2831
        self.assertEqual([b"FOO", b"BAR"], record.get_bytes_as("chunked"))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2832
2833
    def test_get_record_stream_absent(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2834
        it = self.texts.get_record_stream([(b"A",)], "unordered", True)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2835
        record = next(it)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
2836
        self.assertEqual("absent", record.storage_kind)
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2837
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2838
    def test_iter_lines_added_or_present_in_keys(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2839
        self._lines[b"A"] = [b"FOO", b"BAR"]
2840
        self._lines[b"B"] = [b"HEY"]
2841
        self._lines[b"C"] = [b"Alberta"]
2842
        it = self.texts.iter_lines_added_or_present_in_keys([(b"A",), (b"B",)])
2843
        self.assertEqual(sorted([(b"FOO", b"A"), (b"BAR", b"A"), (b"HEY", b"B")]),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2844
                         sorted(list(it)))
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2845
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2846
2847
class TestOrderingVersionedFilesDecorator(TestCaseWithMemoryTransport):
2848
2849
    def get_ordering_vf(self, key_priority):
2850
        builder = self.make_branch_builder('test')
2851
        builder.start_series()
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
2852
        builder.build_snapshot(None, [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2853
            ('add', ('', b'TREE_ROOT', 'directory', None))],
2854
            revision_id=b'A')
2855
        builder.build_snapshot([b'A'], [], revision_id=b'B')
2856
        builder.build_snapshot([b'B'], [], revision_id=b'C')
2857
        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
2858
        builder.finish_series()
2859
        b = builder.get_branch()
2860
        b.lock_read()
2861
        self.addCleanup(b.unlock)
2862
        vf = b.repository.inventories
2863
        return versionedfile.OrderingVersionedFilesDecorator(vf, key_priority)
2864
2865
    def test_get_empty(self):
2866
        vf = self.get_ordering_vf({})
2867
        self.assertEqual([], vf.calls)
2868
2869
    def test_get_record_stream_topological(self):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2870
        vf = self.get_ordering_vf(
2871
            {(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1})
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2872
        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
2873
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2874
                                                    'topological', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2875
        # We should have gotten the keys in topological order
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2876
        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
2877
        # And recorded that the request was made
2878
        self.assertEqual([('get_record_stream', request_keys, 'topological',
2879
                           False)], vf.calls)
2880
2881
    def test_get_record_stream_ordered(self):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2882
        vf = self.get_ordering_vf(
2883
            {(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1})
6963.2.4 by Jelmer Vernooij
Add bees.
2884
        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
2885
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2886
                                                    'unordered', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2887
        # They should be returned based on their priority
6963.2.4 by Jelmer Vernooij
Add bees.
2888
        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
2889
        # And the request recorded
2890
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2891
                           False)], vf.calls)
2892
2893
    def test_get_record_stream_implicit_order(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2894
        vf = self.get_ordering_vf({(b'B',): 2, (b'D',): 1})
2895
        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
2896
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2897
                                                    'unordered', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2898
        # A and C are not in the map, so they get sorted to the front. A comes
2899
        # before C alphabetically, so it comes back first
6963.2.4 by Jelmer Vernooij
Add bees.
2900
        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
2901
        # And the request recorded
2902
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2903
                           False)], vf.calls)