/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'))
912
        self.assertEqual(b'c', get_record(b'C').get_bytes_as('fulltext'))
913
        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.
914
        self.assertEqual('absent', get_record('F').storage_kind)
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
915
916
917
class TestReadonlyHttpMixin(object):
918
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
919
    def get_transaction(self):
920
        return 1
921
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
922
    def test_readonly_http_works(self):
923
        # we should be able to read from http with a versioned file.
924
        vf = self.get_file()
1666.1.6 by Robert Collins
Make knit the default format.
925
        # try an empty file access
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
926
        readonly_vf = self.get_factory()('foo',
7143.15.2 by Jelmer Vernooij
Run autopep8.
927
                                         transport.get_transport_from_url(self.get_readonly_url('.')))
1666.1.6 by Robert Collins
Make knit the default format.
928
        self.assertEqual([], readonly_vf.versions())
5229.1.13 by Vincent Ladeuil
Eager tests are bad, we really want two tests here.
929
930
    def test_readonly_http_works_with_feeling(self):
931
        # we should be able to read from http with a versioned file.
932
        vf = self.get_file()
1666.1.6 by Robert Collins
Make knit the default format.
933
        # now with feeling.
6963.2.4 by Jelmer Vernooij
Add bees.
934
        vf.add_lines(b'1', [], [b'a\n'])
935
        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.
936
        readonly_vf = self.get_factory()('foo',
7143.15.2 by Jelmer Vernooij
Run autopep8.
937
                                         transport.get_transport_from_url(self.get_readonly_url('.')))
6963.2.4 by Jelmer Vernooij
Add bees.
938
        self.assertEqual([b'1', b'2'], vf.versions())
939
        self.assertEqual([b'1', b'2'], readonly_vf.versions())
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
940
        for version in readonly_vf.versions():
941
            readonly_vf.get_lines(version)
942
943
944
class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
945
946
    def get_file(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
947
        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
948
                         create=True,
949
                         get_scope=self.get_transaction)
1666.1.1 by Robert Collins
Add trivial http-using test for versioned files.
950
951
    def get_factory(self):
952
        return WeaveFile
953
954
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
955
class MergeCasesMixin(object):
956
957
    def doMerge(self, base, a, b, mp):
958
        from textwrap import dedent
959
960
        def addcrlf(x):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
961
            return x + b'\n'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
962
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
963
        w = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
964
        w.add_lines(b'text0', [], list(map(addcrlf, base)))
965
        w.add_lines(b'text1', [b'text0'], list(map(addcrlf, a)))
966
        w.add_lines(b'text2', [b'text0'], list(map(addcrlf, b)))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
967
968
        self.log_contents(w)
969
970
        self.log('merge plan:')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
971
        p = list(w.plan_merge(b'text1', b'text2'))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
972
        for state, line in p:
973
            if line:
974
                self.log('%12s | %s' % (state, line[:-1]))
975
976
        self.log('merge:')
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
977
        mt = BytesIO()
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
978
        mt.writelines(w.weave_merge(p))
979
        mt.seek(0)
980
        self.log(mt.getvalue())
981
6631.3.1 by Martin
Run 2to3 map fixer and refactor after
982
        mp = list(map(addcrlf, mp))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
983
        self.assertEqual(mt.readlines(), mp)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
984
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
985
    def testOneInsert(self):
986
        self.doMerge([],
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
987
                     [b'aa'],
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
988
                     [],
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
989
                     [b'aa'])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
990
991
    def testSeparateInserts(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
992
        self.doMerge([b'aaa', b'bbb', b'ccc'],
993
                     [b'aaa', b'xxx', b'bbb', b'ccc'],
994
                     [b'aaa', b'bbb', b'yyy', b'ccc'],
995
                     [b'aaa', b'xxx', b'bbb', b'yyy', b'ccc'])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
996
997
    def testSameInsert(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
998
        self.doMerge([b'aaa', b'bbb', b'ccc'],
999
                     [b'aaa', b'xxx', b'bbb', b'ccc'],
1000
                     [b'aaa', b'xxx', b'bbb', b'yyy', b'ccc'],
1001
                     [b'aaa', b'xxx', b'bbb', b'yyy', b'ccc'])
1002
    overlappedInsertExpected = [b'aaa', b'xxx', b'yyy', b'bbb']
7143.15.2 by Jelmer Vernooij
Run autopep8.
1003
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1004
    def testOverlappedInsert(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1005
        self.doMerge([b'aaa', b'bbb'],
1006
                     [b'aaa', b'xxx', b'yyy', b'bbb'],
1007
                     [b'aaa', b'xxx', b'bbb'], self.overlappedInsertExpected)
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1008
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1009
        # really it ought to reduce this to
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1010
        # [b'aaa', b'xxx', b'yyy', b'bbb']
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1011
1012
    def testClashReplace(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1013
        self.doMerge([b'aaa'],
1014
                     [b'xxx'],
1015
                     [b'yyy', b'zzz'],
1016
                     [b'<<<<<<< ', b'xxx', b'=======', b'yyy', b'zzz',
1017
                      b'>>>>>>> '])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1018
1019
    def testNonClashInsert1(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1020
        self.doMerge([b'aaa'],
1021
                     [b'xxx', b'aaa'],
1022
                     [b'yyy', b'zzz'],
1023
                     [b'<<<<<<< ', b'xxx', b'aaa', b'=======', b'yyy', b'zzz',
1024
                      b'>>>>>>> '])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1025
1026
    def testNonClashInsert2(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1027
        self.doMerge([b'aaa'],
1028
                     [b'aaa'],
1029
                     [b'yyy', b'zzz'],
1030
                     [b'yyy', b'zzz'])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1031
1032
    def testDeleteAndModify(self):
1033
        """Clashing delete and modification.
1034
1035
        If one side modifies a region and the other deletes it then
1036
        there should be a conflict with one side blank.
1037
        """
1038
1039
        #######################################
1040
        # skippd, not working yet
1041
        return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1042
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1043
        self.doMerge([b'aaa', b'bbb', b'ccc'],
1044
                     [b'aaa', b'ddd', b'ccc'],
1045
                     [b'aaa', b'ccc'],
1046
                     [b'<<<<<<<< ', b'aaa', b'=======', b'>>>>>>> ', b'ccc'])
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1047
1048
    def _test_merge_from_strings(self, base, a, b, expected):
1049
        w = self.get_file()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1050
        w.add_lines(b'text0', [], base.splitlines(True))
1051
        w.add_lines(b'text1', [b'text0'], a.splitlines(True))
1052
        w.add_lines(b'text2', [b'text0'], b.splitlines(True))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1053
        self.log('merge plan:')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1054
        p = list(w.plan_merge(b'text1', b'text2'))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1055
        for state, line in p:
1056
            if line:
1057
                self.log('%12s | %s' % (state, line[:-1]))
1058
        self.log('merge result:')
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1059
        result_text = b''.join(w.weave_merge(p))
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1060
        self.log(result_text)
1061
        self.assertEqualDiff(result_text, expected)
1062
1063
    def test_weave_merge_conflicts(self):
1064
        # does weave merge properly handle plans that end with unchanged?
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1065
        result = b''.join(self.get_file().weave_merge([('new-a', b'hello\n')]))
1066
        self.assertEqual(result, b'hello\n')
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1067
1068
    def test_deletion_extended(self):
1069
        """One side deletes, the other deletes more.
1070
        """
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1071
        base = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1072
            line 1
1073
            line 2
1074
            line 3
1075
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1076
        a = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1077
            line 1
1078
            line 2
1079
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1080
        b = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1081
            line 1
1082
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1083
        result = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1084
            line 1
4312.1.3 by John Arbash Meinel
Different sides deleting different amounts is now a conflict.
1085
<<<<<<<\x20
1086
            line 2
1087
=======
1088
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1089
            """
1090
        self._test_merge_from_strings(base, a, b, result)
1091
1092
    def test_deletion_overlap(self):
1093
        """Delete overlapping regions with no other conflict.
1094
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1095
        Arguably it'd be better to treat these as agreement, rather than
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1096
        conflict, but for now conflict is safer.
1097
        """
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1098
        base = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1099
            start context
1100
            int a() {}
1101
            int b() {}
1102
            int c() {}
1103
            end context
1104
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1105
        a = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1106
            start context
1107
            int a() {}
1108
            end context
1109
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1110
        b = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1111
            start context
1112
            int c() {}
1113
            end context
1114
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1115
        result = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1116
            start context
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1117
<<<<<<<\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1118
            int a() {}
1119
=======
1120
            int c() {}
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1121
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1122
            end context
1123
            """
1124
        self._test_merge_from_strings(base, a, b, result)
1125
1126
    def test_agreement_deletion(self):
1127
        """Agree to delete some lines, without conflicts."""
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1128
        base = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1129
            start context
1130
            base line 1
1131
            base line 2
1132
            end context
1133
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1134
        a = b"""\
1135
            start context
1136
            base line 1
1137
            end context
1138
            """
1139
        b = b"""\
1140
            start context
1141
            base line 1
1142
            end context
1143
            """
1144
        result = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1145
            start context
1146
            base line 1
1147
            end context
1148
            """
1149
        self._test_merge_from_strings(base, a, b, result)
1150
1151
    def test_sync_on_deletion(self):
1152
        """Specific case of merge where we can synchronize incorrectly.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1153
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1154
        A previous version of the weave merge concluded that the two versions
1155
        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
1156
        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
1157
        both sides.
1158
1159
        It's better to consider the whole thing as a disagreement region.
1160
        """
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1161
        base = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1162
            start context
1163
            base line 1
1164
            base line 2
1165
            end context
1166
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1167
        a = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1168
            start context
1169
            base line 1
1170
            a's replacement line 2
1171
            end context
1172
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1173
        b = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1174
            start context
1175
            b replaces
1176
            both lines
1177
            end context
1178
            """
6963.2.4 by Jelmer Vernooij
Add bees.
1179
        result = b"""\
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1180
            start context
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1181
<<<<<<<\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1182
            base line 1
1183
            a's replacement line 2
1184
=======
1185
            b replaces
1186
            both lines
3943.8.2 by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20.
1187
>>>>>>>\x20
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1188
            end context
1189
            """
1190
        self._test_merge_from_strings(base, a, b, result)
1191
1192
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
1193
class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1194
1195
    def get_file(self, name='foo'):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
1196
        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
1197
                         create=True)
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1198
1199
    def log_contents(self, w):
1200
        self.log('weave is:')
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1201
        tmpf = BytesIO()
1664.2.9 by Aaron Bentley
Ported weave merge test to versionedfile
1202
        write_weave(w, tmpf)
1203
        self.log(tmpf.getvalue())
1204
6963.2.4 by Jelmer Vernooij
Add bees.
1205
    overlappedInsertExpected = [b'aaa', b'<<<<<<< ', b'xxx', b'yyy', b'=======',
1206
                                b'xxx', b'>>>>>>> ', b'bbb']
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1207
1208
1209
class TestContentFactoryAdaption(TestCaseWithMemoryTransport):
1210
1211
    def test_select_adaptor(self):
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
1212
        """Test expected adapters exist."""
1213
        # One scenario for each lookup combination we expect to use.
1214
        # Each is source_kind, requested_kind, adapter class
1215
        scenarios = [
1216
            ('knit-delta-gz', 'fulltext', _mod_knit.DeltaPlainToFullText),
1217
            ('knit-ft-gz', 'fulltext', _mod_knit.FTPlainToFullText),
1218
            ('knit-annotated-delta-gz', 'knit-delta-gz',
1219
                _mod_knit.DeltaAnnotatedToUnannotated),
1220
            ('knit-annotated-delta-gz', 'fulltext',
1221
                _mod_knit.DeltaAnnotatedToFullText),
1222
            ('knit-annotated-ft-gz', 'knit-ft-gz',
1223
                _mod_knit.FTAnnotatedToUnannotated),
1224
            ('knit-annotated-ft-gz', 'fulltext',
1225
                _mod_knit.FTAnnotatedToFullText),
1226
            ]
1227
        for source, requested, klass in scenarios:
1228
            adapter_factory = versionedfile.adapter_registry.get(
1229
                (source, requested))
1230
            adapter = adapter_factory(None)
1231
            self.assertIsInstance(adapter, klass)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1232
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1233
    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.
1234
        mapper = ConstantMapper('knit')
1235
        transport = self.get_transport()
1236
        return make_file_factory(annotated, mapper)(transport)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1237
1238
    def helpGetBytes(self, f, ft_adapter, delta_adapter):
3350.3.22 by Robert Collins
Review feedback.
1239
        """Grab the interested adapted texts for tests."""
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1240
        # origin is a fulltext
6963.2.4 by Jelmer Vernooij
Add bees.
1241
        entries = f.get_record_stream([(b'origin',)], 'unordered', False)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1242
        base = next(entries)
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1243
        ft_data = ft_adapter.get_bytes(base)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1244
        # merged is both a delta and multiple parents.
6963.2.4 by Jelmer Vernooij
Add bees.
1245
        entries = f.get_record_stream([(b'merged',)], 'unordered', False)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1246
        merged = next(entries)
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1247
        delta_data = delta_adapter.get_bytes(merged)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1248
        return ft_data, delta_data
1249
1250
    def test_deannotation_noeol(self):
1251
        """Test converting annotated knits to unannotated knits."""
1252
        # 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.
1253
        f = self.get_knit()
1254
        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.
1255
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1256
                                                _mod_knit.FTAnnotatedToUnannotated(
1257
                                                    None),
1258
                                                _mod_knit.DeltaAnnotatedToUnannotated(None))
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1259
        self.assertEqual(
6963.2.4 by Jelmer Vernooij
Add bees.
1260
            b'version origin 1 b284f94827db1fa2970d9e2014f080413b547a7e\n'
1261
            b'origin\n'
1262
            b'end origin\n',
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1263
            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.
1264
        self.assertEqual(
6963.2.4 by Jelmer Vernooij
Add bees.
1265
            b'version merged 4 32c2e79763b3f90e8ccde37f9710b6629c25a796\n'
1266
            b'1,2,3\nleft\nright\nmerged\nend merged\n',
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1267
            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.
1268
1269
    def test_deannotation(self):
1270
        """Test converting annotated knits to unannotated knits."""
1271
        # 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.
1272
        f = self.get_knit()
1273
        get_diamond_files(f, 1)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1274
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1275
                                                _mod_knit.FTAnnotatedToUnannotated(
1276
                                                    None),
1277
                                                _mod_knit.DeltaAnnotatedToUnannotated(None))
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1278
        self.assertEqual(
6963.2.4 by Jelmer Vernooij
Add bees.
1279
            b'version origin 1 00e364d235126be43292ab09cb4686cf703ddc17\n'
1280
            b'origin\n'
1281
            b'end origin\n',
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1282
            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.
1283
        self.assertEqual(
6963.2.4 by Jelmer Vernooij
Add bees.
1284
            b'version merged 3 ed8bce375198ea62444dc71952b22cfc2b09226d\n'
1285
            b'2,2,2\nright\nmerged\nend merged\n',
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1286
            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.
1287
1288
    def test_annotated_to_fulltext_no_eol(self):
1289
        """Test adapting annotated knits to full texts (for -> weaves)."""
1290
        # 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.
1291
        f = self.get_knit()
1292
        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.
1293
        # Reconstructing a full text requires a backing versioned file, and it
1294
        # 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.
1295
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1296
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1297
                                                _mod_knit.FTAnnotatedToFullText(
1298
                                                    None),
1299
                                                _mod_knit.DeltaAnnotatedToFullText(logged_vf))
6963.2.4 by Jelmer Vernooij
Add bees.
1300
        self.assertEqual(b'origin', ft_data)
1301
        self.assertEqual(b'base\nleft\nright\nmerged', delta_data)
1302
        self.assertEqual([('get_record_stream', [(b'left',)], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1303
                           True)], logged_vf.calls)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1304
1305
    def test_annotated_to_fulltext(self):
1306
        """Test adapting annotated knits to full texts (for -> weaves)."""
1307
        # 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.
1308
        f = self.get_knit()
1309
        get_diamond_files(f, 1)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1310
        # Reconstructing a full text requires a backing versioned file, and it
1311
        # 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.
1312
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
1313
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1314
                                                _mod_knit.FTAnnotatedToFullText(
1315
                                                    None),
1316
                                                _mod_knit.DeltaAnnotatedToFullText(logged_vf))
6963.2.4 by Jelmer Vernooij
Add bees.
1317
        self.assertEqual(b'origin\n', ft_data)
1318
        self.assertEqual(b'base\nleft\nright\nmerged\n', delta_data)
1319
        self.assertEqual([('get_record_stream', [(b'left',)], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1320
                           True)], logged_vf.calls)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1321
1322
    def test_unannotated_to_fulltext(self):
1323
        """Test adapting unannotated knits to full texts.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1324
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1325
        This is used for -> weaves, and for -> annotated knits.
1326
        """
1327
        # 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.
1328
        f = self.get_knit(annotated=False)
1329
        get_diamond_files(f, 1)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1330
        # Reconstructing a full text requires a backing versioned file, and it
1331
        # 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.
1332
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1333
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1334
                                                _mod_knit.FTPlainToFullText(
1335
                                                    None),
1336
                                                _mod_knit.DeltaPlainToFullText(logged_vf))
6963.2.4 by Jelmer Vernooij
Add bees.
1337
        self.assertEqual(b'origin\n', ft_data)
1338
        self.assertEqual(b'base\nleft\nright\nmerged\n', delta_data)
1339
        self.assertEqual([('get_record_stream', [(b'left',)], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1340
                           True)], logged_vf.calls)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
1341
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1342
    def test_unannotated_to_fulltext_no_eol(self):
1343
        """Test adapting unannotated knits to full texts.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1344
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1345
        This is used for -> weaves, and for -> annotated knits.
1346
        """
1347
        # 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.
1348
        f = self.get_knit(annotated=False)
1349
        get_diamond_files(f, 1, trailing_eol=False)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1350
        # Reconstructing a full text requires a backing versioned file, and it
1351
        # 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.
1352
        logged_vf = versionedfile.RecordingVersionedFilesDecorator(f)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1353
        ft_data, delta_data = self.helpGetBytes(f,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1354
                                                _mod_knit.FTPlainToFullText(
1355
                                                    None),
1356
                                                _mod_knit.DeltaPlainToFullText(logged_vf))
6963.2.4 by Jelmer Vernooij
Add bees.
1357
        self.assertEqual(b'origin', ft_data)
1358
        self.assertEqual(b'base\nleft\nright\nmerged', delta_data)
1359
        self.assertEqual([('get_record_stream', [(b'left',)], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1360
                           True)], logged_vf.calls)
3350.3.6 by Robert Collins
Test EOL behaviour of plain knit record adapters.
1361
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
1362
1363
class TestKeyMapper(TestCaseWithMemoryTransport):
1364
    """Tests for various key mapping logic."""
1365
1366
    def test_identity_mapper(self):
1367
        mapper = versionedfile.ConstantMapper("inventory")
6963.2.4 by Jelmer Vernooij
Add bees.
1368
        self.assertEqual("inventory", mapper.map((b'foo@ar',)))
1369
        self.assertEqual("inventory", mapper.map((b'quux',)))
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
1370
1371
    def test_prefix_mapper(self):
1372
        #format5: plain
1373
        mapper = versionedfile.PrefixMapper()
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1374
        self.assertEqual("file-id", mapper.map((b"file-id", b"revision-id")))
1375
        self.assertEqual("new-id", mapper.map((b"new-id", b"revision-id")))
1376
        self.assertEqual((b'file-id',), mapper.unmap("file-id"))
1377
        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
1378
1379
    def test_hash_prefix_mapper(self):
1380
        #format6: hash + plain
1381
        mapper = versionedfile.HashPrefixMapper()
7143.15.2 by Jelmer Vernooij
Run autopep8.
1382
        self.assertEqual(
1383
            "9b/file-id", mapper.map((b"file-id", b"revision-id")))
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1384
        self.assertEqual("45/new-id", mapper.map((b"new-id", b"revision-id")))
6963.2.12 by Jelmer Vernooij
Fix some more tests.
1385
        self.assertEqual((b'file-id',), mapper.unmap("9b/file-id"))
1386
        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
1387
1388
    def test_hash_escaped_mapper(self):
1389
        #knit1: hash + escaped
1390
        mapper = versionedfile.HashEscapedPrefixMapper()
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1391
        self.assertEqual("88/%2520", mapper.map((b" ", b"revision-id")))
1392
        self.assertEqual("ed/fil%2545-%2549d", mapper.map((b"filE-Id",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1393
                                                           b"revision-id")))
6963.2.13 by Jelmer Vernooij
Fix more tests.
1394
        self.assertEqual("88/ne%2557-%2549d", mapper.map((b"neW-Id",
7143.15.2 by Jelmer Vernooij
Run autopep8.
1395
                                                          b"revision-id")))
6963.2.12 by Jelmer Vernooij
Fix some more tests.
1396
        self.assertEqual((b'filE-Id',), mapper.unmap("ed/fil%2545-%2549d"))
1397
        self.assertEqual((b'neW-Id',), mapper.unmap("88/ne%2557-%2549d"))
3350.6.2 by Robert Collins
Prepare parameterised test environment.
1398
1399
1400
class TestVersionedFiles(TestCaseWithMemoryTransport):
1401
    """Tests for the multiple-file variant of VersionedFile."""
1402
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1403
    # We want to be sure of behaviour for:
1404
    # weaves prefix layout (weave texts)
1405
    # individually named weaves (weave inventories)
1406
    # annotated knits - prefix|hash|hash-escape layout, we test the third only
1407
    #                   as it is the most complex mapper.
1408
    # individually named knits
1409
    # individual no-graph knits in packs (signatures)
1410
    # individual graph knits in packs (inventories)
1411
    # individual graph nocompression knits in packs (revisions)
1412
    # plain text knits in packs (texts)
1413
    len_one_scenarios = [
1414
        ('weave-named', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1415
            'cleanup': None,
1416
            'factory': make_versioned_files_factory(WeaveFile,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1417
                                                    ConstantMapper('inventory')),
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1418
            'graph': True,
1419
            'key_length': 1,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1420
            'support_partial_insertion': False,
1421
            }),
1422
        ('named-knit', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1423
            'cleanup': None,
1424
            'factory': make_file_factory(False, ConstantMapper('revisions')),
1425
            'graph': True,
1426
            'key_length': 1,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1427
            'support_partial_insertion': False,
1428
            }),
1429
        ('named-nograph-nodelta-knit-pack', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1430
            'cleanup': cleanup_pack_knit,
1431
            'factory': make_pack_factory(False, False, 1),
1432
            'graph': False,
1433
            'key_length': 1,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1434
            'support_partial_insertion': False,
1435
            }),
1436
        ('named-graph-knit-pack', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1437
            'cleanup': cleanup_pack_knit,
1438
            'factory': make_pack_factory(True, True, 1),
1439
            'graph': True,
1440
            'key_length': 1,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1441
            'support_partial_insertion': True,
1442
            }),
1443
        ('named-graph-nodelta-knit-pack', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1444
            'cleanup': cleanup_pack_knit,
1445
            'factory': make_pack_factory(True, False, 1),
1446
            'graph': True,
1447
            'key_length': 1,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1448
            'support_partial_insertion': False,
1449
            }),
1450
        ('groupcompress-nograph', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1451
            'cleanup': groupcompress.cleanup_pack_group,
1452
            'factory': groupcompress.make_pack_factory(False, False, 1),
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1453
            'graph': False,
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1454
            'key_length': 1,
1455
            'support_partial_insertion': False,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1456
            }),
1457
        ]
1458
    len_two_scenarios = [
1459
        ('weave-prefix', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1460
            'cleanup': None,
1461
            'factory': make_versioned_files_factory(WeaveFile,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1462
                                                    PrefixMapper()),
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1463
            'graph': True,
1464
            'key_length': 2,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1465
            'support_partial_insertion': False,
1466
            }),
1467
        ('annotated-knit-escape', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1468
            'cleanup': None,
1469
            'factory': make_file_factory(True, HashEscapedPrefixMapper()),
1470
            'graph': True,
1471
            'key_length': 2,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1472
            'support_partial_insertion': False,
1473
            }),
1474
        ('plain-knit-pack', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1475
            'cleanup': cleanup_pack_knit,
1476
            'factory': make_pack_factory(True, True, 2),
1477
            'graph': True,
1478
            'key_length': 2,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1479
            'support_partial_insertion': True,
1480
            }),
1481
        ('groupcompress', {
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1482
            'cleanup': groupcompress.cleanup_pack_group,
1483
            'factory': groupcompress.make_pack_factory(True, False, 1),
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1484
            'graph': True,
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1485
            'key_length': 1,
1486
            'support_partial_insertion': False,
5559.2.2 by Martin Pool
Change to using standard load_tests_apply_scenarios.
1487
            }),
1488
        ]
1489
1490
    scenarios = len_one_scenarios + len_two_scenarios
1491
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1492
    def get_versionedfiles(self, relpath='files'):
1493
        transport = self.get_transport(relpath)
1494
        if relpath != '.':
1495
            transport.mkdir('.')
1496
        files = self.factory(transport)
1497
        if self.cleanup is not None:
4985.2.1 by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite.
1498
            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.
1499
        return files
1500
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1501
    def get_simple_key(self, suffix):
1502
        """Return a key for the object under test."""
1503
        if self.key_length == 1:
1504
            return (suffix,)
1505
        else:
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1506
            return (b'FileA',) + (suffix,)
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1507
5816.8.2 by Andrew Bennetts
Add test for without_fallbacks.
1508
    def test_add_fallback_implies_without_fallbacks(self):
1509
        f = self.get_versionedfiles('files')
1510
        if getattr(f, 'add_fallback_versioned_files', None) is None:
1511
            raise TestNotApplicable("%s doesn't support fallbacks"
1512
                                    % (f.__class__.__name__,))
1513
        g = self.get_versionedfiles('fallback')
6963.2.4 by Jelmer Vernooij
Add bees.
1514
        key_a = self.get_simple_key(b'a')
1515
        g.add_lines(key_a, [], [b'\n'])
5816.8.2 by Andrew Bennetts
Add test for without_fallbacks.
1516
        f.add_fallback_versioned_files(g)
1517
        self.assertTrue(key_a in f.get_parent_map([key_a]))
7143.15.2 by Jelmer Vernooij
Run autopep8.
1518
        self.assertFalse(
1519
            key_a in f.without_fallbacks().get_parent_map([key_a]))
5816.8.2 by Andrew Bennetts
Add test for without_fallbacks.
1520
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1521
    def test_add_lines(self):
1522
        f = self.get_versionedfiles()
6963.2.4 by Jelmer Vernooij
Add bees.
1523
        key0 = self.get_simple_key(b'r0')
1524
        key1 = self.get_simple_key(b'r1')
1525
        key2 = self.get_simple_key(b'r2')
1526
        keyf = self.get_simple_key(b'foo')
1527
        f.add_lines(key0, [], [b'a\n', b'b\n'])
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1528
        if self.graph:
6963.2.4 by Jelmer Vernooij
Add bees.
1529
            f.add_lines(key1, [key0], [b'b\n', b'c\n'])
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1530
        else:
6963.2.4 by Jelmer Vernooij
Add bees.
1531
            f.add_lines(key1, [], [b'b\n', b'c\n'])
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1532
        keys = f.keys()
1533
        self.assertTrue(key0 in keys)
1534
        self.assertTrue(key1 in keys)
1535
        records = []
1536
        for record in f.get_record_stream([key0, key1], 'unordered', True):
1537
            records.append((record.key, record.get_bytes_as('fulltext')))
1538
        records.sort()
6963.2.4 by Jelmer Vernooij
Add bees.
1539
        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.
1540
7331.4.8 by Jelmer Vernooij
Add unit test.
1541
    def test_add_chunks(self):
1542
        f = self.get_versionedfiles()
1543
        key0 = self.get_simple_key(b'r0')
1544
        key1 = self.get_simple_key(b'r1')
1545
        key2 = self.get_simple_key(b'r2')
1546
        keyf = self.get_simple_key(b'foo')
1547
        f.add_chunks(key0, [], [b'a', b'\nb\n'])
1548
        if self.graph:
1549
            f.add_chunks(key1, [key0], [b'b', b'\n', b'c\n'])
1550
        else:
1551
            f.add_chunks(key1, [], [b'b\n', b'c\n'])
1552
        keys = f.keys()
7331.4.9 by Jelmer Vernooij
Use assertIn.
1553
        self.assertIn(key0, keys)
1554
        self.assertIn(key1, keys)
7331.4.8 by Jelmer Vernooij
Add unit test.
1555
        records = []
1556
        for record in f.get_record_stream([key0, key1], 'unordered', True):
1557
            records.append((record.key, record.get_bytes_as('fulltext')))
1558
        records.sort()
1559
        self.assertEqual([(key0, b'a\nb\n'), (key1, b'b\nc\n')], records)
1560
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1561
    def test_annotate(self):
1562
        files = self.get_versionedfiles()
1563
        self.get_diamond_files(files)
1564
        if self.key_length == 1:
1565
            prefix = ()
1566
        else:
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1567
            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.
1568
        # introduced full text
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1569
        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.
1570
        self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1571
            (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.
1572
            origins)
1573
        # a delta
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1574
        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.
1575
        self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1576
            (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.
1577
            origins)
1578
        # a merge
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1579
        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.
1580
        if self.graph:
1581
            self.assertEqual([
6963.2.3 by Jelmer Vernooij
Fix some more tests.
1582
                (prefix + (b'base',), b'base\n'),
1583
                (prefix + (b'left',), b'left\n'),
1584
                (prefix + (b'right',), b'right\n'),
1585
                (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.
1586
                ],
1587
                origins)
1588
        else:
1589
            # Without a graph everything is new.
1590
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1591
                (prefix + (b'merged',), b'base\n'),
1592
                (prefix + (b'merged',), b'left\n'),
1593
                (prefix + (b'merged',), b'right\n'),
1594
                (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.
1595
                ],
1596
                origins)
1597
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1598
                          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.
1599
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1600
    def test_check_no_parameters(self):
1601
        files = self.get_versionedfiles()
1602
1603
    def test_check_progressbar_parameter(self):
1604
        """A progress bar can be supplied because check can be a generator."""
1605
        pb = ui.ui_factory.nested_progress_bar()
1606
        self.addCleanup(pb.finished)
1607
        files = self.get_versionedfiles()
1608
        files.check(progress_bar=pb)
1609
1610
    def test_check_with_keys_becomes_generator(self):
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1611
        files = self.get_versionedfiles()
1612
        self.get_diamond_files(files)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1613
        keys = files.keys()
1614
        entries = files.check(keys=keys)
1615
        seen = set()
1616
        # Texts output should be fulltexts.
1617
        self.capture_stream(files, entries, seen.add,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1618
                            files.get_parent_map(keys), require_fulltext=True)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1619
        # All texts should be output.
1620
        self.assertEqual(set(keys), seen)
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1621
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1622
    def test_clear_cache(self):
1623
        files = self.get_versionedfiles()
1624
        files.clear_cache()
1625
3350.6.2 by Robert Collins
Prepare parameterised test environment.
1626
    def test_construct(self):
1627
        """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.
1628
        files = self.get_versionedfiles()
1629
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1630
    def get_diamond_files(self, files, trailing_eol=True, left_only=False,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1631
                          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.
1632
        return get_diamond_files(files, self.key_length,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1633
                                 trailing_eol=trailing_eol, nograph=not self.graph,
1634
                                 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.
1635
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1636
    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.
1637
        """When nostore_sha is supplied using old content raises."""
1638
        vf = self.get_versionedfiles()
6963.2.4 by Jelmer Vernooij
Add bees.
1639
        empty_text = (b'a', [])
1640
        sample_text_nl = (b'b', [b"foo\n", b"bar\n"])
1641
        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.
1642
        shas = []
1643
        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
1644
            if add_lines:
1645
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
1646
                                         lines)
1647
            else:
6839 by Jelmer Vernooij
Merge lp:~jelmer/brz/get-full.
1648
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
1649
                                         lines)
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1650
            shas.append(sha)
1651
        # we now have a copy of all the lines in the vf.
1652
        for sha, (version, lines) in zip(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1653
                shas, (empty_text, sample_text_nl, sample_text_no_nl)):
6963.2.4 by Jelmer Vernooij
Add bees.
1654
            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.
1655
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1656
                              vf.add_lines, new_key, [], lines,
1657
                              nostore_sha=sha)
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1658
            self.assertRaises(errors.ExistingContent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1659
                              vf.add_lines, new_key, [], lines,
1660
                              nostore_sha=sha)
4119.1.1 by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations.
1661
            # and no new version should have been added.
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1662
            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.
1663
            self.assertEqual('absent', record.storage_kind)
1664
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1665
    def test_add_lines_nostoresha(self):
1666
        self._add_content_nostoresha(add_lines=True)
1667
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1668
    def test_add_lines_return(self):
1669
        files = self.get_versionedfiles()
1670
        # save code by using the stock data insertion helper.
1671
        adds = self.get_diamond_files(files)
1672
        results = []
1673
        # We can only validate the first 2 elements returned from add_lines.
1674
        for add in adds:
1675
            self.assertEqual(3, len(add))
1676
            results.append(add[:2])
1677
        if self.key_length == 1:
1678
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1679
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1680
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1681
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1682
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1683
                (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.
1684
                results)
1685
        elif self.key_length == 2:
1686
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1687
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1688
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1689
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1690
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1691
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1692
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1693
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1694
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1695
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1696
                (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.
1697
                results)
1698
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1699
    def test_add_lines_no_key_generates_chk_key(self):
1700
        files = self.get_versionedfiles()
1701
        # save code by using the stock data insertion helper.
1702
        adds = self.get_diamond_files(files, nokeys=True)
1703
        results = []
1704
        # We can only validate the first 2 elements returned from add_lines.
1705
        for add in adds:
1706
            self.assertEqual(3, len(add))
1707
            results.append(add[:2])
1708
        if self.key_length == 1:
1709
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1710
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1711
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1712
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1713
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1714
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1715
                results)
1716
            # Check the added items got CHK keys.
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1717
            self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1718
                (b'sha1:00e364d235126be43292ab09cb4686cf703ddc17',),
1719
                (b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',),
1720
                (b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',),
1721
                (b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f',),
1722
                (b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d',),
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1723
                },
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1724
                files.keys())
1725
        elif self.key_length == 2:
1726
            self.assertEqual([
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1727
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1728
                (b'00e364d235126be43292ab09cb4686cf703ddc17', 7),
1729
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1730
                (b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5),
1731
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1732
                (b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10),
1733
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1734
                (b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11),
1735
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23),
1736
                (b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)],
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1737
                results)
1738
            # Check the added items got CHK keys.
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1739
            self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1740
                (b'FileA', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1741
                (b'FileA', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1742
                (b'FileA', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1743
                (b'FileA', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1744
                (b'FileA', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
1745
                (b'FileB', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'),
1746
                (b'FileB', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'),
1747
                (b'FileB', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'),
1748
                (b'FileB', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'),
1749
                (b'FileB', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'),
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1750
                },
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1751
                files.keys())
1752
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1753
    def test_empty_lines(self):
1754
        """Empty files can be stored."""
1755
        f = self.get_versionedfiles()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1756
        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.
1757
        f.add_lines(key_a, [], [])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1758
        self.assertEqual(b'',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1759
                         next(f.get_record_stream([key_a], 'unordered', True
1760
                                                  )).get_bytes_as('fulltext'))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1761
        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.
1762
        f.add_lines(key_b, self.get_parents([key_a]), [])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1763
        self.assertEqual(b'',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1764
                         next(f.get_record_stream([key_b], 'unordered', True
1765
                                                  )).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.
1766
1767
    def test_newline_only(self):
1768
        f = self.get_versionedfiles()
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1769
        key_a = self.get_simple_key(b'a')
1770
        f.add_lines(key_a, [], [b'\n'])
1771
        self.assertEqual(b'\n',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1772
                         next(f.get_record_stream([key_a], 'unordered', True
1773
                                                  )).get_bytes_as('fulltext'))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1774
        key_b = self.get_simple_key(b'b')
1775
        f.add_lines(key_b, self.get_parents([key_a]), [b'\n'])
1776
        self.assertEqual(b'\n',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1777
                         next(f.get_record_stream([key_b], 'unordered', True
1778
                                                  )).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.
1779
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
1780
    def test_get_known_graph_ancestry(self):
1781
        f = self.get_versionedfiles()
4593.5.36 by John Arbash Meinel
a few more implementations of the interface.
1782
        if not self.graph:
1783
            raise TestNotApplicable('ancestry info only relevant with graph.')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1784
        key_a = self.get_simple_key(b'a')
1785
        key_b = self.get_simple_key(b'b')
1786
        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.
1787
        # A
1788
        # |\
1789
        # | B
1790
        # |/
1791
        # C
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1792
        f.add_lines(key_a, [], [b'\n'])
1793
        f.add_lines(key_b, [key_a], [b'\n'])
1794
        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.
1795
        kg = f.get_known_graph_ancestry([key_c])
1796
        self.assertIsInstance(kg, _mod_graph.KnownGraph)
1797
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1798
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1799
    def test_known_graph_with_fallbacks(self):
1800
        f = self.get_versionedfiles('files')
1801
        if not self.graph:
1802
            raise TestNotApplicable('ancestry info only relevant with graph.')
1803
        if getattr(f, 'add_fallback_versioned_files', None) is None:
1804
            raise TestNotApplicable("%s doesn't support fallbacks"
1805
                                    % (f.__class__.__name__,))
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1806
        key_a = self.get_simple_key(b'a')
1807
        key_b = self.get_simple_key(b'b')
1808
        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)
1809
        # A     only in fallback
1810
        # |\
1811
        # | B
1812
        # |/
1813
        # C
1814
        g = self.get_versionedfiles('fallback')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1815
        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)
1816
        f.add_fallback_versioned_files(g)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1817
        f.add_lines(key_b, [key_a], [b'\n'])
1818
        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)
1819
        kg = f.get_known_graph_ancestry([key_c])
1820
        self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort()))
1821
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1822
    def test_get_record_stream_empty(self):
1823
        """An empty stream can be requested without error."""
1824
        f = self.get_versionedfiles()
1825
        entries = f.get_record_stream([], 'unordered', False)
1826
        self.assertEqual([], list(entries))
1827
1828
    def assertValidStorageKind(self, storage_kind):
1829
        """Assert that storage_kind is a valid storage_kind."""
1830
        self.assertSubset([storage_kind],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1831
                          ['mpdiff', 'knit-annotated-ft', 'knit-annotated-delta',
1832
                           'knit-ft', 'knit-delta', 'chunked', 'fulltext',
1833
                           'knit-annotated-ft-gz', 'knit-annotated-delta-gz', 'knit-ft-gz',
1834
                           'knit-delta-gz',
1835
                           'knit-delta-closure', 'knit-delta-closure-ref',
1836
                           '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.
1837
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1838
    def capture_stream(self, f, entries, on_seen, parents,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1839
                       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.
1840
        """Capture a stream for testing."""
1841
        for factory in entries:
1842
            on_seen(factory.key)
1843
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1844
            if factory.sha1 is not None:
1845
                self.assertEqual(f.get_sha1s([factory.key])[factory.key],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1846
                                 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.
1847
            self.assertEqual(parents[factory.key], factory.parents)
1848
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
1849
                                  bytes)
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1850
            if require_fulltext:
1851
                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.
1852
1853
    def test_get_record_stream_interface(self):
1854
        """each item in a stream has to provide a regular interface."""
1855
        files = self.get_versionedfiles()
1856
        self.get_diamond_files(files)
1857
        keys, _ = self.get_keys_and_sort_order()
1858
        parent_map = files.get_parent_map(keys)
1859
        entries = files.get_record_stream(keys, 'unordered', False)
1860
        seen = set()
1861
        self.capture_stream(files, entries, seen.add, parent_map)
1862
        self.assertEqual(set(keys), seen)
1863
1864
    def get_keys_and_sort_order(self):
1865
        """Get diamond test keys list, and their sort ordering."""
1866
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1867
            keys = [(b'merged',), (b'left',), (b'right',), (b'base',)]
7143.15.2 by Jelmer Vernooij
Run autopep8.
1868
            sort_order = {(b'merged',): 2, (b'left',): 1,
1869
                          (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.
1870
        else:
1871
            keys = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1872
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1873
                (b'FileA', b'base'),
1874
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1875
                (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.
1876
                ]
1877
            sort_order = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
1878
                (b'FileA', b'merged'): 2, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1,
1879
                (b'FileA', b'base'): 0,
1880
                (b'FileB', b'merged'): 2, (b'FileB', b'left'): 1, (b'FileB', b'right'): 1,
1881
                (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.
1882
                }
1883
        return keys, sort_order
1884
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1885
    def get_keys_and_groupcompress_sort_order(self):
1886
        """Get diamond test keys list, and their groupcompress sort ordering."""
1887
        if self.key_length == 1:
6963.2.4 by Jelmer Vernooij
Add bees.
1888
            keys = [(b'merged',), (b'left',), (b'right',), (b'base',)]
7143.15.2 by Jelmer Vernooij
Run autopep8.
1889
            sort_order = {(b'merged',): 0, (b'left',): 1,
1890
                          (b'right',): 1, (b'base',): 2}
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1891
        else:
1892
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
1893
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1894
                (b'FileA', b'base'),
1895
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1896
                (b'FileB', b'base'),
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1897
                ]
1898
            sort_order = {
6963.2.4 by Jelmer Vernooij
Add bees.
1899
                (b'FileA', b'merged'): 0, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1,
1900
                (b'FileA', b'base'): 2,
1901
                (b'FileB', b'merged'): 3, (b'FileB', b'left'): 4, (b'FileB', b'right'): 4,
1902
                (b'FileB', b'base'): 5,
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1903
                }
1904
        return keys, sort_order
1905
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1906
    def test_get_record_stream_interface_ordered(self):
1907
        """each item in a stream has to provide a regular interface."""
1908
        files = self.get_versionedfiles()
1909
        self.get_diamond_files(files)
1910
        keys, sort_order = self.get_keys_and_sort_order()
1911
        parent_map = files.get_parent_map(keys)
1912
        entries = files.get_record_stream(keys, 'topological', False)
1913
        seen = []
1914
        self.capture_stream(files, entries, seen.append, parent_map)
1915
        self.assertStreamOrder(sort_order, seen, keys)
1916
1917
    def test_get_record_stream_interface_ordered_with_delta_closure(self):
1918
        """each item must be accessible as a fulltext."""
1919
        files = self.get_versionedfiles()
1920
        self.get_diamond_files(files)
1921
        keys, sort_order = self.get_keys_and_sort_order()
1922
        parent_map = files.get_parent_map(keys)
1923
        entries = files.get_record_stream(keys, 'topological', True)
1924
        seen = []
1925
        for factory in entries:
1926
            seen.append(factory.key)
1927
            self.assertValidStorageKind(factory.storage_kind)
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1928
            self.assertSubset([factory.sha1],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1929
                              [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.
1930
            self.assertEqual(parent_map[factory.key], factory.parents)
1931
            # self.assertEqual(files.get_text(factory.key),
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1932
            ft_bytes = factory.get_bytes_as('fulltext')
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
1933
            self.assertIsInstance(ft_bytes, bytes)
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1934
            chunked_bytes = factory.get_bytes_as('chunked')
6963.2.4 by Jelmer Vernooij
Add bees.
1935
            self.assertEqualDiff(ft_bytes, b''.join(chunked_bytes))
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1936
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1937
        self.assertStreamOrder(sort_order, seen, keys)
1938
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1939
    def test_get_record_stream_interface_groupcompress(self):
1940
        """each item in a stream has to provide a regular interface."""
1941
        files = self.get_versionedfiles()
1942
        self.get_diamond_files(files)
1943
        keys, sort_order = self.get_keys_and_groupcompress_sort_order()
1944
        parent_map = files.get_parent_map(keys)
1945
        entries = files.get_record_stream(keys, 'groupcompress', False)
1946
        seen = []
1947
        self.capture_stream(files, entries, seen.append, parent_map)
1948
        self.assertStreamOrder(sort_order, seen, keys)
1949
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1950
    def assertStreamOrder(self, sort_order, seen, keys):
1951
        self.assertEqual(len(set(seen)), len(keys))
1952
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1953
            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.
1954
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1955
            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.
1956
        if not self.graph:
1957
            self.assertEqual(set(keys), set(seen))
1958
        else:
1959
            for key in seen:
1960
                sort_pos = sort_order[key]
1961
                self.assertTrue(sort_pos >= lows[key[:-1]],
7143.15.2 by Jelmer Vernooij
Run autopep8.
1962
                                "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.
1963
                lows[key[:-1]] = sort_pos
1964
1965
    def test_get_record_stream_unknown_storage_kind_raises(self):
1966
        """Asking for a storage kind that the stream cannot supply raises."""
1967
        files = self.get_versionedfiles()
1968
        self.get_diamond_files(files)
1969
        if self.key_length == 1:
6963.2.4 by Jelmer Vernooij
Add bees.
1970
            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.
1971
        else:
1972
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
1973
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
1974
                (b'FileA', b'base'),
1975
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
1976
                (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.
1977
                ]
1978
        parent_map = files.get_parent_map(keys)
1979
        entries = files.get_record_stream(keys, 'unordered', False)
1980
        # We track the contents because we should be able to try, fail a
1981
        # particular kind and then ask for one that works and continue.
1982
        seen = set()
1983
        for factory in entries:
1984
            seen.add(factory.key)
1985
            self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1986
            if factory.sha1 is not None:
1987
                self.assertEqual(files.get_sha1s([factory.key])[factory.key],
1988
                                 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.
1989
            self.assertEqual(parent_map[factory.key], factory.parents)
1990
            # currently no stream emits mpdiff
1991
            self.assertRaises(errors.UnavailableRepresentation,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1992
                              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.
1993
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
1994
                                  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.
1995
        self.assertEqual(set(keys), seen)
1996
1997
    def test_get_record_stream_missing_records_are_absent(self):
1998
        files = self.get_versionedfiles()
1999
        self.get_diamond_files(files)
2000
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2001
            keys = [(b'merged',), (b'left',), (b'right',),
2002
                    (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.
2003
        else:
2004
            keys = [
6963.2.4 by Jelmer Vernooij
Add bees.
2005
                (b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'),
2006
                (b'FileA', b'absent'), (b'FileA', b'base'),
2007
                (b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'),
2008
                (b'FileB', b'absent'), (b'FileB', b'base'),
2009
                (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.
2010
                ]
2011
        parent_map = files.get_parent_map(keys)
2012
        entries = files.get_record_stream(keys, 'unordered', False)
2013
        self.assertAbsentRecord(files, keys, parent_map, entries)
2014
        entries = files.get_record_stream(keys, 'topological', False)
2015
        self.assertAbsentRecord(files, keys, parent_map, entries)
2016
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2017
    def assertRecordHasContent(self, record, bytes):
2018
        """Assert that record has the bytes bytes."""
2019
        self.assertEqual(bytes, record.get_bytes_as('fulltext'))
6963.2.4 by Jelmer Vernooij
Add bees.
2020
        self.assertEqual(bytes, b''.join(record.get_bytes_as('chunked')))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2021
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.
2022
    def test_get_record_stream_native_formats_are_wire_ready_one_ft(self):
2023
        files = self.get_versionedfiles()
6963.2.3 by Jelmer Vernooij
Fix some more tests.
2024
        key = self.get_simple_key(b'foo')
2025
        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.
2026
        stream = files.get_record_stream([key], 'unordered', False)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2027
        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.
2028
        if record.storage_kind in ('chunked', 'fulltext'):
2029
            # chunked and fulltext representations are for direct use not wire
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2030
            # serialisation: check they are able to be used directly. To send
2031
            # such records over the wire translation will be needed.
6963.2.3 by Jelmer Vernooij
Fix some more tests.
2032
            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.
2033
        else:
2034
            bytes = [record.get_bytes_as(record.storage_kind)]
2035
            network_stream = versionedfile.NetworkRecordStream(bytes).read()
2036
            source_record = record
2037
            records = []
2038
            for record in network_stream:
2039
                records.append(record)
2040
                self.assertEqual(source_record.storage_kind,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2041
                                 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.
2042
                self.assertEqual(source_record.parents, record.parents)
2043
                self.assertEqual(
2044
                    source_record.get_bytes_as(source_record.storage_kind),
2045
                    record.get_bytes_as(record.storage_kind))
2046
            self.assertEqual(1, len(records))
2047
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2048
    def assertStreamMetaEqual(self, records, expected, stream):
2049
        """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.
2050
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2051
        :param records: A list to collect the seen records.
2052
        :return: A generator of the records in stream.
2053
        """
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2054
        # We make assertions during copying to catch things early for easier
2055
        # debugging. This must use the iterating zip() from the future.
6631.2.2 by Martin
Run 2to3 itertools fixer and refactor
2056
        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.
2057
            records.append(record)
2058
            self.assertEqual(ref_record.key, record.key)
2059
            self.assertEqual(ref_record.storage_kind, record.storage_kind)
2060
            self.assertEqual(ref_record.parents, record.parents)
2061
            yield record
2062
2063
    def stream_to_bytes_or_skip_counter(self, skipped_records, full_texts,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2064
                                        stream):
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2065
        """Convert a stream to a bytes iterator.
2066
2067
        :param skipped_records: A list with one element to increment when a
2068
            record is skipped.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2069
        :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.
2070
            checking chunked or fulltext stored records.
2071
        :param stream: A record_stream.
2072
        :return: An iterator over the bytes of each record.
2073
        """
2074
        for record in stream:
2075
            if record.storage_kind in ('chunked', 'fulltext'):
2076
                skipped_records[0] += 1
2077
                # check the content is correct for direct use.
2078
                self.assertRecordHasContent(record, full_texts[record.key])
2079
            else:
2080
                yield record.get_bytes_as(record.storage_kind)
2081
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2082
    def test_get_record_stream_native_formats_are_wire_ready_ft_delta(self):
2083
        files = self.get_versionedfiles()
2084
        target_files = self.get_versionedfiles('target')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2085
        key = self.get_simple_key(b'ft')
2086
        key_delta = self.get_simple_key(b'delta')
2087
        files.add_lines(key, (), [b'my text\n', b'content'])
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2088
        if self.graph:
2089
            delta_parents = (key,)
2090
        else:
2091
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2092
        files.add_lines(key_delta, delta_parents, [
2093
                        b'different\n', b'content\n'])
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2094
        local = files.get_record_stream([key, key_delta], 'unordered', False)
2095
        ref = files.get_record_stream([key, key_delta], 'unordered', False)
2096
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2097
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2098
            key: b"my text\ncontent",
2099
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2100
            }
2101
        byte_stream = self.stream_to_bytes_or_skip_counter(
2102
            skipped_records, full_texts, local)
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2103
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2104
        records = []
2105
        # insert the stream from the network into a versioned files object so we can
2106
        # check the content was carried across correctly without doing delta
2107
        # inspection.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2108
        target_files.insert_record_stream(
2109
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2110
        # No duplicates on the wire thank you!
2111
        self.assertEqual(2, len(records) + skipped_records[0])
2112
        if len(records):
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2113
            # if any content was copied it all must have all been.
2114
            self.assertIdenticalVersionedFile(files, target_files)
2115
2116
    def test_get_record_stream_native_formats_are_wire_ready_delta(self):
2117
        # copy a delta over the wire
2118
        files = self.get_versionedfiles()
2119
        target_files = self.get_versionedfiles('target')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2120
        key = self.get_simple_key(b'ft')
2121
        key_delta = self.get_simple_key(b'delta')
2122
        files.add_lines(key, (), [b'my text\n', b'content'])
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2123
        if self.graph:
2124
            delta_parents = (key,)
2125
        else:
2126
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2127
        files.add_lines(key_delta, delta_parents, [
2128
                        b'different\n', b'content\n'])
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2129
        # Copy the basis text across so we can reconstruct the delta during
2130
        # insertion into target.
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2131
        target_files.insert_record_stream(files.get_record_stream([key],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2132
                                                                  'unordered', False))
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2133
        local = files.get_record_stream([key_delta], 'unordered', False)
2134
        ref = files.get_record_stream([key_delta], 'unordered', False)
2135
        skipped_records = [0]
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2136
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2137
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2138
            }
2139
        byte_stream = self.stream_to_bytes_or_skip_counter(
2140
            skipped_records, full_texts, local)
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2141
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2142
        records = []
2143
        # insert the stream from the network into a versioned files object so we can
2144
        # check the content was carried across correctly without doing delta
2145
        # inspection during check_stream.
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2146
        target_files.insert_record_stream(
2147
            self.assertStreamMetaEqual(records, ref, network_stream))
4005.3.4 by Robert Collins
Test copying just a delta over the wire.
2148
        # No duplicates on the wire thank you!
2149
        self.assertEqual(1, len(records) + skipped_records[0])
2150
        if len(records):
2151
            # if any content was copied it all must have all been
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
2152
            self.assertIdenticalVersionedFile(files, target_files)
2153
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2154
    def test_get_record_stream_wire_ready_delta_closure_included(self):
2155
        # copy a delta over the wire with the ability to get its full text.
2156
        files = self.get_versionedfiles()
6963.2.12 by Jelmer Vernooij
Fix some more tests.
2157
        key = self.get_simple_key(b'ft')
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2158
        key_delta = self.get_simple_key(b'delta')
2159
        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.
2160
        if self.graph:
2161
            delta_parents = (key,)
2162
        else:
2163
            delta_parents = ()
7143.15.2 by Jelmer Vernooij
Run autopep8.
2164
        files.add_lines(key_delta, delta_parents, [
2165
                        b'different\n', b'content\n'])
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2166
        local = files.get_record_stream([key_delta], 'unordered', True)
2167
        ref = files.get_record_stream([key_delta], 'unordered', True)
2168
        skipped_records = [0]
2169
        full_texts = {
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2170
            key_delta: b"different\ncontent\n",
4005.3.5 by Robert Collins
Interface level test for using delta_closure=True over the network.
2171
            }
2172
        byte_stream = self.stream_to_bytes_or_skip_counter(
2173
            skipped_records, full_texts, local)
2174
        network_stream = versionedfile.NetworkRecordStream(byte_stream).read()
2175
        records = []
2176
        # insert the stream from the network into a versioned files object so we can
2177
        # check the content was carried across correctly without doing delta
2178
        # inspection during check_stream.
2179
        for record in self.assertStreamMetaEqual(records, ref, network_stream):
2180
            # we have to be able to get the full text out:
2181
            self.assertRecordHasContent(record, full_texts[record.key])
2182
        # No duplicates on the wire thank you!
2183
        self.assertEqual(1, len(records) + skipped_records[0])
2184
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2185
    def assertAbsentRecord(self, files, keys, parents, entries):
2186
        """Helper for test_get_record_stream_missing_records_are_absent."""
2187
        seen = set()
2188
        for factory in entries:
2189
            seen.add(factory.key)
6963.2.4 by Jelmer Vernooij
Add bees.
2190
            if factory.key[-1] == b'absent':
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2191
                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.
2192
                self.assertEqual(None, factory.sha1)
2193
                self.assertEqual(None, factory.parents)
2194
            else:
2195
                self.assertValidStorageKind(factory.storage_kind)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
2196
                if factory.sha1 is not None:
2197
                    sha1 = files.get_sha1s([factory.key])[factory.key]
2198
                    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.
2199
                self.assertEqual(parents[factory.key], factory.parents)
2200
                self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2201
                                      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.
2202
        self.assertEqual(set(keys), seen)
2203
2204
    def test_filter_absent_records(self):
2205
        """Requested missing records can be filter trivially."""
2206
        files = self.get_versionedfiles()
2207
        self.get_diamond_files(files)
2208
        keys, _ = self.get_keys_and_sort_order()
2209
        parent_map = files.get_parent_map(keys)
2210
        # Add an absent record in the middle of the present keys. (We don't ask
2211
        # for just absent keys to ensure that content before and after the
2212
        # absent keys is still delivered).
2213
        present_keys = list(keys)
2214
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2215
            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.
2216
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2217
            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.
2218
        entries = files.get_record_stream(keys, 'unordered', False)
2219
        seen = set()
2220
        self.capture_stream(files, versionedfile.filter_absent(entries), seen.add,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2221
                            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.
2222
        self.assertEqual(set(present_keys), seen)
2223
2224
    def get_mapper(self):
2225
        """Get a mapper suitable for the key length of the test interface."""
2226
        if self.key_length == 1:
2227
            return ConstantMapper('source')
2228
        else:
2229
            return HashEscapedPrefixMapper()
2230
2231
    def get_parents(self, parents):
2232
        """Get parents, taking self.graph into consideration."""
2233
        if self.graph:
2234
            return parents
2235
        else:
2236
            return None
2237
4332.3.32 by Robert Collins
Merge bzr.dev.
2238
    def test_get_annotator(self):
2239
        files = self.get_versionedfiles()
2240
        self.get_diamond_files(files)
6963.2.4 by Jelmer Vernooij
Add bees.
2241
        origin_key = self.get_simple_key(b'origin')
2242
        base_key = self.get_simple_key(b'base')
2243
        left_key = self.get_simple_key(b'left')
2244
        right_key = self.get_simple_key(b'right')
2245
        merged_key = self.get_simple_key(b'merged')
4332.3.32 by Robert Collins
Merge bzr.dev.
2246
        # annotator = files.get_annotator()
2247
        # introduced full text
2248
        origins, lines = files.get_annotator().annotate(origin_key)
2249
        self.assertEqual([(origin_key,)], origins)
6963.2.4 by Jelmer Vernooij
Add bees.
2250
        self.assertEqual([b'origin\n'], lines)
4332.3.32 by Robert Collins
Merge bzr.dev.
2251
        # a delta
2252
        origins, lines = files.get_annotator().annotate(base_key)
2253
        self.assertEqual([(base_key,)], origins)
2254
        # a merge
2255
        origins, lines = files.get_annotator().annotate(merged_key)
2256
        if self.graph:
2257
            self.assertEqual([
2258
                (base_key,),
2259
                (left_key,),
2260
                (right_key,),
2261
                (merged_key,),
2262
                ], origins)
2263
        else:
2264
            # Without a graph everything is new.
2265
            self.assertEqual([
2266
                (merged_key,),
2267
                (merged_key,),
2268
                (merged_key,),
2269
                (merged_key,),
2270
                ], origins)
2271
        self.assertRaises(RevisionNotPresent,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2272
                          files.get_annotator().annotate, self.get_simple_key(b'missing-key'))
4332.3.32 by Robert Collins
Merge bzr.dev.
2273
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2274
    def test_get_parent_map(self):
2275
        files = self.get_versionedfiles()
2276
        if self.key_length == 1:
2277
            parent_details = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2278
                ((b'r0',), self.get_parents(())),
2279
                ((b'r1',), self.get_parents(((b'r0',),))),
2280
                ((b'r2',), self.get_parents(())),
2281
                ((b'r3',), self.get_parents(())),
2282
                ((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.
2283
                ]
2284
        else:
2285
            parent_details = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2286
                ((b'FileA', b'r0'), self.get_parents(())),
2287
                ((b'FileA', b'r1'), self.get_parents(((b'FileA', b'r0'),))),
2288
                ((b'FileA', b'r2'), self.get_parents(())),
2289
                ((b'FileA', b'r3'), self.get_parents(())),
2290
                ((b'FileA', b'm'), self.get_parents(((b'FileA', b'r0'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2291
                                                     (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.
2292
                ]
2293
        for key, parents in parent_details:
2294
            files.add_lines(key, parents, [])
2295
            # immediately after adding it should be queryable.
7143.15.2 by Jelmer Vernooij
Run autopep8.
2296
            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.
2297
        # We can ask for an empty set
2298
        self.assertEqual({}, files.get_parent_map([]))
2299
        # We can ask for many keys
2300
        all_parents = dict(parent_details)
2301
        self.assertEqual(all_parents, files.get_parent_map(all_parents.keys()))
2302
        # Absent keys are just not included in the result.
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2303
        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.
2304
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2305
            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.
2306
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2307
            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.
2308
        # Absent keys are just ignored
2309
        self.assertEqual(all_parents, files.get_parent_map(keys))
2310
2311
    def test_get_sha1s(self):
2312
        files = self.get_versionedfiles()
2313
        self.get_diamond_files(files)
2314
        if self.key_length == 1:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2315
            keys = [(b'base',), (b'origin',), (b'left',),
2316
                    (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.
2317
        else:
2318
            # ask for shas from different prefixes.
2319
            keys = [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2320
                (b'FileA', b'base'), (b'FileB', b'origin'), (b'FileA', b'left'),
2321
                (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.
2322
                ]
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2323
        self.assertEqual({
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2324
            keys[0]: b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',
2325
            keys[1]: b'00e364d235126be43292ab09cb4686cf703ddc17',
2326
            keys[2]: b'a8478686da38e370e32e42e8a0c220e33ee9132f',
2327
            keys[3]: b'ed8bce375198ea62444dc71952b22cfc2b09226d',
2328
            keys[4]: b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2329
            },
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2330
            files.get_sha1s(keys))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2331
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2332
    def test_insert_record_stream_empty(self):
2333
        """Inserting an empty record stream should work."""
2334
        files = self.get_versionedfiles()
2335
        files.insert_record_stream([])
2336
2337
    def assertIdenticalVersionedFile(self, expected, actual):
2338
        """Assert that left and right have the same contents."""
2339
        self.assertEqual(set(actual.keys()), set(expected.keys()))
2340
        actual_parents = actual.get_parent_map(actual.keys())
2341
        if self.graph:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2342
            self.assertEqual(
2343
                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.
2344
        else:
2345
            for key, parents in actual_parents.items():
2346
                self.assertEqual(None, parents)
2347
        for key in actual.keys():
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2348
            actual_text = next(actual.get_record_stream(
2349
                [key], 'unordered', True)).get_bytes_as('fulltext')
2350
            expected_text = next(expected.get_record_stream(
2351
                [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.
2352
            self.assertEqual(actual_text, expected_text)
2353
2354
    def test_insert_record_stream_fulltexts(self):
2355
        """Any file should accept a stream of fulltexts."""
2356
        files = self.get_versionedfiles()
2357
        mapper = self.get_mapper()
2358
        source_transport = self.get_transport('source')
2359
        source_transport.mkdir('.')
2360
        # weaves always output fulltexts.
2361
        source = make_versioned_files_factory(WeaveFile, mapper)(
2362
            source_transport)
2363
        self.get_diamond_files(source, trailing_eol=False)
2364
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2365
                                          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.
2366
        files.insert_record_stream(stream)
2367
        self.assertIdenticalVersionedFile(source, files)
2368
2369
    def test_insert_record_stream_fulltexts_noeol(self):
2370
        """Any file should accept a stream of fulltexts."""
2371
        files = self.get_versionedfiles()
2372
        mapper = self.get_mapper()
2373
        source_transport = self.get_transport('source')
2374
        source_transport.mkdir('.')
2375
        # weaves always output fulltexts.
2376
        source = make_versioned_files_factory(WeaveFile, mapper)(
2377
            source_transport)
2378
        self.get_diamond_files(source, trailing_eol=False)
2379
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2380
                                          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.
2381
        files.insert_record_stream(stream)
2382
        self.assertIdenticalVersionedFile(source, files)
2383
2384
    def test_insert_record_stream_annotated_knits(self):
2385
        """Any file should accept a stream from plain knits."""
2386
        files = self.get_versionedfiles()
2387
        mapper = self.get_mapper()
2388
        source_transport = self.get_transport('source')
2389
        source_transport.mkdir('.')
2390
        source = make_file_factory(True, mapper)(source_transport)
2391
        self.get_diamond_files(source)
2392
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2393
                                          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.
2394
        files.insert_record_stream(stream)
2395
        self.assertIdenticalVersionedFile(source, files)
2396
2397
    def test_insert_record_stream_annotated_knits_noeol(self):
2398
        """Any file should accept a stream from plain knits."""
2399
        files = self.get_versionedfiles()
2400
        mapper = self.get_mapper()
2401
        source_transport = self.get_transport('source')
2402
        source_transport.mkdir('.')
2403
        source = make_file_factory(True, mapper)(source_transport)
2404
        self.get_diamond_files(source, trailing_eol=False)
2405
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2406
                                          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.
2407
        files.insert_record_stream(stream)
2408
        self.assertIdenticalVersionedFile(source, files)
2409
2410
    def test_insert_record_stream_plain_knits(self):
2411
        """Any file should accept a stream from plain knits."""
2412
        files = self.get_versionedfiles()
2413
        mapper = self.get_mapper()
2414
        source_transport = self.get_transport('source')
2415
        source_transport.mkdir('.')
2416
        source = make_file_factory(False, mapper)(source_transport)
2417
        self.get_diamond_files(source)
2418
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2419
                                          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.
2420
        files.insert_record_stream(stream)
2421
        self.assertIdenticalVersionedFile(source, files)
2422
2423
    def test_insert_record_stream_plain_knits_noeol(self):
2424
        """Any file should accept a stream from plain knits."""
2425
        files = self.get_versionedfiles()
2426
        mapper = self.get_mapper()
2427
        source_transport = self.get_transport('source')
2428
        source_transport.mkdir('.')
2429
        source = make_file_factory(False, mapper)(source_transport)
2430
        self.get_diamond_files(source, trailing_eol=False)
2431
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2432
                                          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.
2433
        files.insert_record_stream(stream)
2434
        self.assertIdenticalVersionedFile(source, files)
2435
2436
    def test_insert_record_stream_existing_keys(self):
2437
        """Inserting keys already in a file should not error."""
2438
        files = self.get_versionedfiles()
2439
        source = self.get_versionedfiles('source')
2440
        self.get_diamond_files(source)
2441
        # insert some keys into f.
2442
        self.get_diamond_files(files, left_only=True)
2443
        stream = source.get_record_stream(source.keys(), 'topological',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2444
                                          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.
2445
        files.insert_record_stream(stream)
2446
        self.assertIdenticalVersionedFile(source, files)
2447
2448
    def test_insert_record_stream_missing_keys(self):
2449
        """Inserting a stream with absent keys should raise an error."""
2450
        files = self.get_versionedfiles()
2451
        source = self.get_versionedfiles('source')
6963.2.11 by Jelmer Vernooij
Fix some more tests.
2452
        stream = source.get_record_stream([(b'missing',) * self.key_length],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2453
                                          '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.
2454
        self.assertRaises(errors.RevisionNotPresent, files.insert_record_stream,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2455
                          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.
2456
2457
    def test_insert_record_stream_out_of_order(self):
2458
        """An out of order stream can either error or work."""
2459
        files = self.get_versionedfiles()
2460
        source = self.get_versionedfiles('source')
2461
        self.get_diamond_files(source)
2462
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2463
            origin_keys = [(b'origin',)]
2464
            end_keys = [(b'merged',), (b'left',)]
2465
            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.
2466
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2467
            origin_keys = [(b'FileA', b'origin'), (b'FileB', b'origin')]
2468
            end_keys = [(b'FileA', b'merged',), (b'FileA', b'left',),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2469
                        (b'FileB', b'merged',), (b'FileB', b'left',)]
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2470
            start_keys = [(b'FileA', b'right',), (b'FileA', b'base',),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2471
                          (b'FileB', b'right',), (b'FileB', b'base',)]
2472
        origin_entries = source.get_record_stream(
2473
            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.
2474
        end_entries = source.get_record_stream(end_keys, 'topological', False)
7143.15.2 by Jelmer Vernooij
Run autopep8.
2475
        start_entries = source.get_record_stream(
2476
            start_keys, 'topological', False)
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2477
        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.
2478
        try:
2479
            files.insert_record_stream(entries)
2480
        except RevisionNotPresent:
2481
            # Must not have corrupted the file.
2482
            files.check()
2483
        else:
2484
            self.assertIdenticalVersionedFile(source, files)
2485
4634.84.2 by Andrew Bennetts
Add test.
2486
    def test_insert_record_stream_long_parent_chain_out_of_order(self):
2487
        """An out of order stream can either error or work."""
2488
        if not self.graph:
2489
            raise TestNotApplicable('ancestry info only relevant with graph.')
2490
        # Create a reasonably long chain of records based on each other, where
2491
        # most will be deltas.
2492
        source = self.get_versionedfiles('source')
2493
        parents = ()
2494
        keys = []
6963.2.4 by Jelmer Vernooij
Add bees.
2495
        content = [(b'same same %d\n' % n) for n in range(500)]
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2496
        letters = b'abcdefghijklmnopqrstuvwxyz'
2497
        for i in range(len(letters)):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2498
            letter = letters[i:i + 1]
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2499
            key = (b'key-' + letter,)
4634.84.2 by Andrew Bennetts
Add test.
2500
            if self.key_length == 2:
6963.2.4 by Jelmer Vernooij
Add bees.
2501
                key = (b'prefix',) + key
2502
            content.append(b'content for ' + letter + b'\n')
4634.84.2 by Andrew Bennetts
Add test.
2503
            source.add_lines(key, parents, content)
2504
            keys.append(key)
2505
            parents = (key,)
2506
        # Create a stream of these records, excluding the first record that the
2507
        # rest ultimately depend upon, and insert it into a new vf.
2508
        streams = []
2509
        for key in reversed(keys):
2510
            streams.append(source.get_record_stream([key], 'unordered', False))
6631.2.3 by Martin
Fix per_versionedfile test failures and rethink future_builtins
2511
        deltas = itertools.chain.from_iterable(streams[:-1])
4634.84.2 by Andrew Bennetts
Add test.
2512
        files = self.get_versionedfiles()
2513
        try:
2514
            files.insert_record_stream(deltas)
2515
        except RevisionNotPresent:
2516
            # Must not have corrupted the file.
2517
            files.check()
2518
        else:
2519
            # Must only report either just the first key as a missing parent,
2520
            # no key as missing (for nodelta scenarios).
2521
            missing = set(files.get_missing_compression_parent_keys())
2522
            missing.discard(keys[0])
2523
            self.assertEqual(set(), missing)
2524
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2525
    def get_knit_delta_source(self):
2526
        """Get a source that can produce a stream with knit delta records,
2527
        regardless of this test's scenario.
2528
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2529
        mapper = self.get_mapper()
2530
        source_transport = self.get_transport('source')
2531
        source_transport.mkdir('.')
2532
        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.
2533
        get_diamond_files(source, self.key_length, trailing_eol=True,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2534
                          nograph=False, left_only=False)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2535
        return source
2536
2537
    def test_insert_record_stream_delta_missing_basis_no_corruption(self):
2538
        """Insertion where a needed basis is not included notifies the caller
2539
        of the missing basis.  In the meantime a record missing its basis is
2540
        not added.
2541
        """
2542
        source = self.get_knit_delta_source()
6963.2.4 by Jelmer Vernooij
Add bees.
2543
        keys = [self.get_simple_key(b'origin'), self.get_simple_key(b'merged')]
4009.3.7 by Andrew Bennetts
Most tests passing.
2544
        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.
2545
        files = self.get_versionedfiles()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2546
        if self.support_partial_insertion:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2547
            self.assertEqual([],
7143.15.2 by Jelmer Vernooij
Run autopep8.
2548
                             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.
2549
            files.insert_record_stream(entries)
2550
            missing_bases = files.get_missing_compression_parent_keys()
6963.2.4 by Jelmer Vernooij
Add bees.
2551
            self.assertEqual({self.get_simple_key(b'left')},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2552
                             set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2553
            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.
2554
        else:
2555
            self.assertRaises(
2556
                errors.RevisionNotPresent, files.insert_record_stream, entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2557
            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.
2558
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2559
    def test_insert_record_stream_delta_missing_basis_can_be_added_later(self):
2560
        """Insertion where a needed basis is not included notifies the caller
2561
        of the missing basis.  That basis can be added in a second
2562
        insert_record_stream call that does not need to repeat records present
4009.3.3 by Andrew Bennetts
Add docstrings.
2563
        in the previous stream.  The record(s) that required that basis are
2564
        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.
2565
        """
2566
        if not self.support_partial_insertion:
2567
            raise TestNotApplicable(
2568
                'versioned file scenario does not support partial insertion')
2569
        source = self.get_knit_delta_source()
6963.2.4 by Jelmer Vernooij
Add bees.
2570
        entries = source.get_record_stream([self.get_simple_key(b'origin'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2571
                                            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.
2572
        files = self.get_versionedfiles()
2573
        files.insert_record_stream(entries)
2574
        missing_bases = files.get_missing_compression_parent_keys()
6963.2.4 by Jelmer Vernooij
Add bees.
2575
        self.assertEqual({self.get_simple_key(b'left')},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2576
                         set(missing_bases))
4009.3.7 by Andrew Bennetts
Most tests passing.
2577
        # 'merged' is inserted (although a commit of a write group involving
2578
        # this versionedfiles would fail).
6963.2.4 by Jelmer Vernooij
Add bees.
2579
        merged_key = self.get_simple_key(b'merged')
4009.3.7 by Andrew Bennetts
Most tests passing.
2580
        self.assertEqual(
6973.14.4 by Jelmer Vernooij
Fix checking for options.
2581
            [merged_key], list(files.get_parent_map([merged_key]).keys()))
4009.3.7 by Andrew Bennetts
Most tests passing.
2582
        # 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.
2583
        missing_entries = source.get_record_stream(
4009.3.7 by Andrew Bennetts
Most tests passing.
2584
            missing_bases, 'unordered', True)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2585
        files.insert_record_stream(missing_entries)
4009.3.7 by Andrew Bennetts
Most tests passing.
2586
        # 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.
2587
        self.assertEqual([], list(files.get_missing_compression_parent_keys()))
2588
        self.assertEqual(
6973.14.4 by Jelmer Vernooij
Fix checking for options.
2589
            [merged_key], list(files.get_parent_map([merged_key]).keys()))
4009.3.7 by Andrew Bennetts
Most tests passing.
2590
        files.check()
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
2591
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2592
    def test_iter_lines_added_or_present_in_keys(self):
2593
        # test that we get at least an equalset of the lines added by
2594
        # versions in the store.
2595
        # the ordering here is to make a tree so that dumb searches have
2596
        # more changes to muck up.
2597
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2598
        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.
2599
2600
            def __init__(self):
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2601
                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.
2602
                self.updates = []
2603
2604
            def update(self, msg=None, current=None, total=None):
2605
                self.updates.append((msg, current, total))
2606
2607
        files = self.get_versionedfiles()
2608
        # add a base to get included
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2609
        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.
2610
        # add a ancestor to be included on one side
7143.15.2 by Jelmer Vernooij
Run autopep8.
2611
        files.add_lines(self.get_simple_key(
2612
            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.
2613
        # add a ancestor to be included on the other side
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2614
        files.add_lines(self.get_simple_key(b'rancestor'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2615
                        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.
2616
        # add a child of rancestor with no eofile-nl
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2617
        files.add_lines(self.get_simple_key(b'child'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2618
                        self.get_parents([self.get_simple_key(b'rancestor')]),
2619
                        [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.
2620
        # add a child of lancestor and base to join the two roots
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2621
        files.add_lines(self.get_simple_key(b'otherchild'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2622
                        self.get_parents([self.get_simple_key(b'lancestor'),
2623
                                          self.get_simple_key(b'base')]),
2624
                        [b'base\n', b'lancestor\n', b'otherchild\n'])
2625
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2626
        def iter_with_keys(keys, expected):
2627
            # now we need to see what lines are returned, and how often.
2628
            lines = {}
2629
            progress = InstrumentedProgress()
2630
            # iterate over the lines
2631
            for line in files.iter_lines_added_or_present_in_keys(keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2632
                                                                  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.
2633
                lines.setdefault(line, 0)
2634
                lines[line] += 1
7143.15.2 by Jelmer Vernooij
Run autopep8.
2635
            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.
2636
                self.assertEqual(expected, progress.updates)
2637
            return lines
2638
        lines = iter_with_keys(
7143.15.2 by Jelmer Vernooij
Run autopep8.
2639
            [self.get_simple_key(b'child'),
2640
             self.get_simple_key(b'otherchild')],
4103.3.4 by Martin Pool
Update test that depends on progress bar strings
2641
            [('Walking content', 0, 2),
2642
             ('Walking content', 1, 2),
2643
             ('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.
2644
        # we must see child and otherchild
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2645
        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.
2646
        self.assertTrue(
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2647
            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.
2648
        # we dont care if we got more than that.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2649
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2650
        # test all lines
2651
        lines = iter_with_keys(files.keys(),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2652
                               [('Walking content', 0, 5),
2653
                                ('Walking content', 1, 5),
2654
                                ('Walking content', 2, 5),
2655
                                ('Walking content', 3, 5),
2656
                                ('Walking content', 4, 5),
2657
                                ('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.
2658
        # all lines must be seen at least once
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2659
        self.assertTrue(lines[(b'base\n', self.get_simple_key(b'base'))] > 0)
2660
        self.assertTrue(
2661
            lines[(b'lancestor\n', self.get_simple_key(b'lancestor'))] > 0)
2662
        self.assertTrue(
2663
            lines[(b'rancestor\n', self.get_simple_key(b'rancestor'))] > 0)
2664
        self.assertTrue(lines[(b'child\n', self.get_simple_key(b'child'))] > 0)
2665
        self.assertTrue(
2666
            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.
2667
2668
    def test_make_mpdiffs(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2669
        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.
2670
        files = self.get_versionedfiles('source')
2671
        # add texts that should trip the knit maximum delta chain threshold
2672
        # as well as doing parallel chains of data in knits.
2673
        # this is done by two chains of 25 insertions
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2674
        files.add_lines(self.get_simple_key(b'base'), [], [b'line\n'])
2675
        files.add_lines(self.get_simple_key(b'noeol'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2676
                        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.
2677
        # detailed eol tests:
2678
        # shared last line with parent no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2679
        files.add_lines(self.get_simple_key(b'noeolsecond'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2680
                        self.get_parents([self.get_simple_key(b'noeol')]),
2681
                        [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.
2682
        # differing last line with parent, both no-eol
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2683
        files.add_lines(self.get_simple_key(b'noeolnotshared'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2684
                        self.get_parents(
2685
                            [self.get_simple_key(b'noeolsecond')]),
2686
                        [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.
2687
        # add eol following a noneol parent, change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2688
        files.add_lines(self.get_simple_key(b'eol'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2689
                        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.
2690
        # add eol following a noneol parent, no change content
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2691
        files.add_lines(self.get_simple_key(b'eolline'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2692
                        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.
2693
        # noeol with no parents:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2694
        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.
2695
        # noeol preceeding its leftmost parent in the output:
2696
        # 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
2697
        # 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.
2698
        # later-inserted parent the leftmost.
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2699
        files.add_lines(self.get_simple_key(b'eolbeforefirstparent'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2700
                        self.get_parents([self.get_simple_key(b'noeolbase'),
2701
                                          self.get_simple_key(b'noeol')]),
2702
                        [b'line'])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2703
        # two identical eol texts
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2704
        files.add_lines(self.get_simple_key(b'noeoldup'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2705
                        self.get_parents([self.get_simple_key(b'noeol')]), [b'line'])
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2706
        next_parent = self.get_simple_key(b'base')
2707
        text_name = b'chain1-'
2708
        text = [b'line\n']
2709
        sha1s = {0: b'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
2710
                 1: b'45e21ea146a81ea44a821737acdb4f9791c8abe7',
2711
                 2: b'e1f11570edf3e2a070052366c582837a4fe4e9fa',
2712
                 3: b'26b4b8626da827088c514b8f9bbe4ebf181edda1',
2713
                 4: b'e28a5510be25ba84d31121cff00956f9970ae6f6',
2714
                 5: b'd63ec0ce22e11dcf65a931b69255d3ac747a318d',
2715
                 6: b'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
2716
                 7: b'95c14da9cafbf828e3e74a6f016d87926ba234ab',
2717
                 8: b'779e9a0b28f9f832528d4b21e17e168c67697272',
2718
                 9: b'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
2719
                 10: b'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
2720
                 11: b'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
2721
                 12: b'31a2286267f24d8bedaa43355f8ad7129509ea85',
2722
                 13: b'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
2723
                 14: b'2c4b1736566b8ca6051e668de68650686a3922f2',
2724
                 15: b'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
2725
                 16: b'b0d2e18d3559a00580f6b49804c23fea500feab3',
2726
                 17: b'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
2727
                 18: b'5cf64a3459ae28efa60239e44b20312d25b253f3',
2728
                 19: b'1ebed371807ba5935958ad0884595126e8c4e823',
2729
                 20: b'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
2730
                 21: b'01edc447978004f6e4e962b417a4ae1955b6fe5d',
2731
                 22: b'd8d8dc49c4bf0bab401e0298bb5ad827768618bb',
2732
                 23: b'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
2733
                 24: b'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
2734
                 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.
2735
                 }
2736
        for depth in range(26):
6963.2.6 by Jelmer Vernooij
Fix some more tests.
2737
            new_version = self.get_simple_key(text_name + b'%d' % depth)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2738
            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.
2739
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2740
            next_parent = new_version
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2741
        next_parent = self.get_simple_key(b'base')
2742
        text_name = b'chain2-'
2743
        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
        for depth in range(26):
6963.2.10 by Jelmer Vernooij
Fix a bunch of tests.
2745
            new_version = self.get_simple_key(text_name + b'%d' % depth)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2746
            text = text + [b'line\n']
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2747
            files.add_lines(new_version, self.get_parents([next_parent]), text)
2748
            next_parent = new_version
2749
        target = self.get_versionedfiles('target')
2750
        for key in multiparent.topo_iter_keys(files, files.keys()):
2751
            mpdiff = files.make_mpdiffs([key])[0]
2752
            parents = files.get_parent_map([key])[key] or []
2753
            target.add_mpdiffs(
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
2754
                [(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.
2755
            self.assertEqualDiff(
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2756
                next(files.get_record_stream([key], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2757
                                             True)).get_bytes_as('fulltext'),
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2758
                next(target.get_record_stream([key], 'unordered',
7143.15.2 by Jelmer Vernooij
Run autopep8.
2759
                                              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.
2760
                )
2761
2762
    def test_keys(self):
2763
        # While use is discouraged, versions() is still needed by aspects of
2764
        # bzr.
2765
        files = self.get_versionedfiles()
2766
        self.assertEqual(set(), set(files.keys()))
2767
        if self.key_length == 1:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2768
            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.
2769
        else:
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2770
            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.
2771
        files.add_lines(key, (), [])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
2772
        self.assertEqual({key}, set(files.keys()))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2773
2774
2775
class VirtualVersionedFilesTests(TestCase):
2776
    """Basic tests for the VirtualVersionedFiles implementations."""
2777
2778
    def _get_parent_map(self, keys):
2779
        ret = {}
2780
        for k in keys:
2781
            if k in self._parent_map:
2782
                ret[k] = self._parent_map[k]
2783
        return ret
2784
2785
    def setUp(self):
6552.1.4 by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super().
2786
        super(VirtualVersionedFilesTests, self).setUp()
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2787
        self._lines = {}
2788
        self._parent_map = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2789
        self.texts = VirtualVersionedFiles(self._get_parent_map,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2790
                                           self._lines.get)
2791
2792
    def test_add_lines(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2793
        self.assertRaises(NotImplementedError,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2794
                          self.texts.add_lines, b"foo", [], [])
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2795
2796
    def test_add_mpdiffs(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2797
        self.assertRaises(NotImplementedError,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2798
                          self.texts.add_mpdiffs, [])
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2799
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
2800
    def test_check_noerrors(self):
2801
        self.texts.check()
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2802
2803
    def test_insert_record_stream(self):
2804
        self.assertRaises(NotImplementedError, self.texts.insert_record_stream,
2805
                          [])
2806
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
2807
    def test_get_sha1s_nonexistent(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2808
        self.assertEqual({}, self.texts.get_sha1s([(b"NONEXISTENT",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2809
2810
    def test_get_sha1s(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2811
        self._lines[b"key"] = [b"dataline1", b"dataline2"]
2812
        self.assertEqual({(b"key",): osutils.sha_strings(self._lines[b"key"])},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2813
                         self.texts.get_sha1s([(b"key",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2814
2815
    def test_get_parent_map(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2816
        self._parent_map = {b"G": (b"A", b"B")}
2817
        self.assertEqual({(b"G",): ((b"A",), (b"B",))},
7143.15.2 by Jelmer Vernooij
Run autopep8.
2818
                         self.texts.get_parent_map([(b"G",), (b"L",)]))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2819
2820
    def test_get_record_stream(self):
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2821
        self._lines[b"A"] = [b"FOO", b"BAR"]
2822
        it = self.texts.get_record_stream([(b"A",)], "unordered", True)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2823
        record = next(it)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
2824
        self.assertEqual("chunked", record.storage_kind)
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2825
        self.assertEqual(b"FOOBAR", record.get_bytes_as("fulltext"))
2826
        self.assertEqual([b"FOO", b"BAR"], record.get_bytes_as("chunked"))
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2827
2828
    def test_get_record_stream_absent(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2829
        it = self.texts.get_record_stream([(b"A",)], "unordered", True)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2830
        record = next(it)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
2831
        self.assertEqual("absent", record.storage_kind)
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
2832
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2833
    def test_iter_lines_added_or_present_in_keys(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2834
        self._lines[b"A"] = [b"FOO", b"BAR"]
2835
        self._lines[b"B"] = [b"HEY"]
2836
        self._lines[b"C"] = [b"Alberta"]
2837
        it = self.texts.iter_lines_added_or_present_in_keys([(b"A",), (b"B",)])
2838
        self.assertEqual(sorted([(b"FOO", b"A"), (b"BAR", b"A"), (b"HEY", b"B")]),
7143.15.2 by Jelmer Vernooij
Run autopep8.
2839
                         sorted(list(it)))
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
2840
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2841
2842
class TestOrderingVersionedFilesDecorator(TestCaseWithMemoryTransport):
2843
2844
    def get_ordering_vf(self, key_priority):
2845
        builder = self.make_branch_builder('test')
2846
        builder.start_series()
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
2847
        builder.build_snapshot(None, [
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2848
            ('add', ('', b'TREE_ROOT', 'directory', None))],
2849
            revision_id=b'A')
2850
        builder.build_snapshot([b'A'], [], revision_id=b'B')
2851
        builder.build_snapshot([b'B'], [], revision_id=b'C')
2852
        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
2853
        builder.finish_series()
2854
        b = builder.get_branch()
2855
        b.lock_read()
2856
        self.addCleanup(b.unlock)
2857
        vf = b.repository.inventories
2858
        return versionedfile.OrderingVersionedFilesDecorator(vf, key_priority)
2859
2860
    def test_get_empty(self):
2861
        vf = self.get_ordering_vf({})
2862
        self.assertEqual([], vf.calls)
2863
2864
    def test_get_record_stream_topological(self):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2865
        vf = self.get_ordering_vf(
2866
            {(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1})
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2867
        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
2868
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2869
                                                    'topological', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2870
        # We should have gotten the keys in topological order
6963.2.1 by Jelmer Vernooij
Fix more python3 tests.
2871
        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
2872
        # And recorded that the request was made
2873
        self.assertEqual([('get_record_stream', request_keys, 'topological',
2874
                           False)], vf.calls)
2875
2876
    def test_get_record_stream_ordered(self):
7143.15.2 by Jelmer Vernooij
Run autopep8.
2877
        vf = self.get_ordering_vf(
2878
            {(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1})
6963.2.4 by Jelmer Vernooij
Add bees.
2879
        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
2880
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2881
                                                    'unordered', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2882
        # They should be returned based on their priority
6963.2.4 by Jelmer Vernooij
Add bees.
2883
        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
2884
        # And the request recorded
2885
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2886
                           False)], vf.calls)
2887
2888
    def test_get_record_stream_implicit_order(self):
6963.2.4 by Jelmer Vernooij
Add bees.
2889
        vf = self.get_ordering_vf({(b'B',): 2, (b'D',): 1})
2890
        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
2891
        keys = [r.key for r in vf.get_record_stream(request_keys,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2892
                                                    'unordered', False)]
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
2893
        # A and C are not in the map, so they get sorted to the front. A comes
2894
        # before C alphabetically, so it comes back first
6963.2.4 by Jelmer Vernooij
Add bees.
2895
        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
2896
        # And the request recorded
2897
        self.assertEqual([('get_record_stream', request_keys, 'unordered',
2898
                           False)], vf.calls)