/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1
# Copyright (C) 2008, 2009 Canonical Ltd
2
#
0.17.9 by Robert Collins
Initial stab at repository format support.
3
# This program is free software; you can redistribute it and/or modify
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
0.17.9 by Robert Collins
Initial stab at repository format support.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
12
#
0.17.9 by Robert Collins
Initial stab at repository format support.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
3735.36.3 by John Arbash Meinel
Add the new address for FSF to the new files.
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.17.9 by Robert Collins
Initial stab at repository format support.
16
4277.2.1 by Vincent Ladeuil
Fix misleading signature and one typo.
17
"""Repository formats using CHK inventories and groupcompress compression."""
0.17.9 by Robert Collins
Initial stab at repository format support.
18
19
import time
20
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
21
from bzrlib import (
3735.31.16 by John Arbash Meinel
Add _get_matching_bzrdir methods to all of the GC Formats.
22
    bzrdir,
3735.31.3 by John Arbash Meinel
Rename gc_repo to groupcompress_repo, start trying to remove some of the special casing and get tests passing.
23
    chk_map,
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
24
    chk_serializer,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
25
    debug,
26
    errors,
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
27
    index as _mod_index,
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
28
    inventory,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
29
    knit,
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
30
    osutils,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
31
    pack,
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
32
    remote,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
33
    repository,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
34
    revision as _mod_revision,
0.23.28 by John Arbash Meinel
Gotta import 'trace' if you want to use trace.mutter()
35
    trace,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
36
    ui,
37
    )
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
38
from bzrlib.btree_index import (
39
    BTreeGraphIndex,
40
    BTreeBuilder,
41
    )
0.17.9 by Robert Collins
Initial stab at repository format support.
42
from bzrlib.index import GraphIndex, GraphIndexBuilder
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
43
from bzrlib.groupcompress import (
0.17.9 by Robert Collins
Initial stab at repository format support.
44
    _GCGraphIndex,
45
    GroupCompressVersionedFiles,
46
    )
47
from bzrlib.repofmt.pack_repo import (
48
    Pack,
49
    NewPack,
50
    KnitPackRepository,
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
51
    KnitPackStreamSource,
3735.31.9 by John Arbash Meinel
Setting the _commit_builder_class makes commit with rich_root_data=True work.
52
    PackRootCommitBuilder,
0.17.9 by Robert Collins
Initial stab at repository format support.
53
    RepositoryPackCollection,
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
54
    RepositoryFormatPack,
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
55
    ResumedPack,
0.17.9 by Robert Collins
Initial stab at repository format support.
56
    Packer,
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
57
    )
0.17.9 by Robert Collins
Initial stab at repository format support.
58
59
60
class GCPack(NewPack):
61
0.17.22 by Robert Collins
really get gc working with 1.10
62
    def __init__(self, pack_collection, upload_suffix='', file_mode=None):
0.17.9 by Robert Collins
Initial stab at repository format support.
63
        """Create a NewPack instance.
64
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
65
        :param pack_collection: A PackCollection into which this is being
66
            inserted.
0.17.9 by Robert Collins
Initial stab at repository format support.
67
        :param upload_suffix: An optional suffix to be given to any temporary
68
            files created during the pack creation. e.g '.autopack'
69
        :param file_mode: An optional file mode to create the new files with.
70
        """
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
71
        # replaced from NewPack to:
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
72
        # - change inventory reference list length to 1
73
        # - change texts reference lists to 1
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
74
        # TODO: patch this to be parameterised
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
75
0.17.9 by Robert Collins
Initial stab at repository format support.
76
        # The relative locations of the packs are constrained, but all are
77
        # passed in because the caller has them, so as to avoid object churn.
0.17.22 by Robert Collins
really get gc working with 1.10
78
        index_builder_class = pack_collection._index_builder_class
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
79
        # from brisbane-core
80
        if pack_collection.chk_index is not None:
81
            chk_index = index_builder_class(reference_lists=0)
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
82
        else:
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
83
            chk_index = None
84
        Pack.__init__(self,
85
            # Revisions: parents list, no text compression.
86
            index_builder_class(reference_lists=1),
87
            # Inventory: We want to map compression only, but currently the
88
            # knit code hasn't been updated enough to understand that, so we
89
            # have a regular 2-list index giving parents and compression
90
            # source.
91
            index_builder_class(reference_lists=1),
4371.2.2 by Vincent Ladeuil
Fix comment as per John's review.
92
            # Texts: per file graph, for all fileids - so one reference list
93
            # and two elements in the key tuple.
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
94
            index_builder_class(reference_lists=1, key_elements=2),
95
            # Signatures: Just blobs to store, no compression, no parents
96
            # listing.
97
            index_builder_class(reference_lists=0),
98
            # CHK based storage - just blobs, no compression or parents.
99
            chk_index=chk_index
100
            )
0.17.22 by Robert Collins
really get gc working with 1.10
101
        self._pack_collection = pack_collection
102
        # When we make readonly indices, we need this.
103
        self.index_class = pack_collection._index_class
0.17.9 by Robert Collins
Initial stab at repository format support.
104
        # where should the new pack be opened
0.17.22 by Robert Collins
really get gc working with 1.10
105
        self.upload_transport = pack_collection._upload_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
106
        # where are indices written out to
0.17.22 by Robert Collins
really get gc working with 1.10
107
        self.index_transport = pack_collection._index_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
108
        # where is the pack renamed to when it is finished?
0.17.22 by Robert Collins
really get gc working with 1.10
109
        self.pack_transport = pack_collection._pack_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
110
        # What file mode to upload the pack and indices with.
111
        self._file_mode = file_mode
112
        # tracks the content written to the .pack file.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
113
        self._hash = osutils.md5()
0.17.9 by Robert Collins
Initial stab at repository format support.
114
        # a four-tuple with the length in bytes of the indices, once the pack
115
        # is finalised. (rev, inv, text, sigs)
116
        self.index_sizes = None
117
        # How much data to cache when writing packs. Note that this is not
118
        # synchronised with reads, because it's not in the transport layer, so
119
        # is not safe unless the client knows it won't be reading from the pack
120
        # under creation.
121
        self._cache_limit = 0
122
        # the temporary pack file name.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
123
        self.random_name = osutils.rand_chars(20) + upload_suffix
0.17.9 by Robert Collins
Initial stab at repository format support.
124
        # when was this pack started ?
125
        self.start_time = time.time()
126
        # open an output stream for the data added to the pack.
127
        self.write_stream = self.upload_transport.open_write_stream(
128
            self.random_name, mode=self._file_mode)
129
        if 'pack' in debug.debug_flags:
0.23.30 by John Arbash Meinel
Merge in Ian's groupcompress trunk updates
130
            trace.mutter('%s: create_pack: pack stream open: %s%s t+%6.3fs',
0.17.9 by Robert Collins
Initial stab at repository format support.
131
                time.ctime(), self.upload_transport.base, self.random_name,
132
                time.time() - self.start_time)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
133
        # A list of byte sequences to be written to the new pack, and the
134
        # aggregate size of them.  Stored as a list rather than separate
0.17.9 by Robert Collins
Initial stab at repository format support.
135
        # variables so that the _write_data closure below can update them.
136
        self._buffer = [[], 0]
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
137
        # create a callable for adding data
0.17.9 by Robert Collins
Initial stab at repository format support.
138
        #
139
        # robertc says- this is a closure rather than a method on the object
140
        # so that the variables are locals, and faster than accessing object
141
        # members.
142
        def _write_data(bytes, flush=False, _buffer=self._buffer,
143
            _write=self.write_stream.write, _update=self._hash.update):
144
            _buffer[0].append(bytes)
145
            _buffer[1] += len(bytes)
146
            # buffer cap
147
            if _buffer[1] > self._cache_limit or flush:
148
                bytes = ''.join(_buffer[0])
149
                _write(bytes)
150
                _update(bytes)
151
                _buffer[:] = [[], 0]
152
        # expose this on self, for the occasion when clients want to add data.
153
        self._write_data = _write_data
154
        # a pack writer object to serialise pack records.
155
        self._writer = pack.ContainerWriter(self._write_data)
156
        self._writer.begin()
157
        # what state is the pack in? (open, finished, aborted)
158
        self._state = 'open'
159
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
160
    def _check_references(self):
161
        """Make sure our external references are present.
162
163
        Packs are allowed to have deltas whose base is not in the pack, but it
164
        must be present somewhere in this collection.  It is not allowed to
165
        have deltas based on a fallback repository.
166
        (See <https://bugs.launchpad.net/bzr/+bug/288751>)
167
        """
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
168
        # Groupcompress packs don't have any external references, arguably CHK
169
        # pages have external references, but we cannot 'cheaply' determine
170
        # them without actually walking all of the chk pages.
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
171
0.17.9 by Robert Collins
Initial stab at repository format support.
172
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
173
class ResumedGCPack(ResumedPack):
174
4343.3.8 by John Arbash Meinel
Some cleanup passes.
175
    def _check_references(self):
176
        """Make sure our external compression parents are present."""
177
        # See GCPack._check_references for why this is empty
178
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
179
    def _get_external_refs(self, index):
180
        # GC repositories don't have compression parents external to a given
181
        # pack file
182
        return set()
183
184
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
185
class GCCHKPacker(Packer):
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
186
    """This class understand what it takes to collect a GCCHK repo."""
0.17.9 by Robert Collins
Initial stab at repository format support.
187
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
188
    def __init__(self, pack_collection, packs, suffix, revision_ids=None,
189
                 reload_func=None):
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
190
        super(GCCHKPacker, self).__init__(pack_collection, packs, suffix,
191
                                          revision_ids=revision_ids,
192
                                          reload_func=reload_func)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
193
        self._pack_collection = pack_collection
194
        # ATM, We only support this for GCCHK repositories
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
195
        if pack_collection.chk_index is None:
196
            raise AssertionError('pack_collection.chk_index should not be None')
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
197
        self._gather_text_refs = False
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
198
        self._chk_id_roots = []
199
        self._chk_p_id_roots = []
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
200
        self._text_refs = None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
201
        # set by .pack() if self.revision_ids is not None
202
        self.revision_keys = None
0.17.9 by Robert Collins
Initial stab at repository format support.
203
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
204
    def _get_progress_stream(self, source_vf, keys, message, pb):
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
205
        def pb_stream():
206
            substream = source_vf.get_record_stream(keys, 'groupcompress', True)
207
            for idx, record in enumerate(substream):
208
                if pb is not None:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
209
                    pb.update(message, idx + 1, len(keys))
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
210
                yield record
211
        return pb_stream()
212
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
213
    def _get_filtered_inv_stream(self, source_vf, keys, message, pb=None):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
214
        """Filter the texts of inventories, to find the chk pages."""
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
215
        total_keys = len(keys)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
216
        def _filtered_inv_stream():
217
            id_roots_set = set()
218
            p_id_roots_set = set()
219
            stream = source_vf.get_record_stream(keys, 'groupcompress', True)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
220
            for idx, record in enumerate(stream):
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
221
                # Inventories should always be with revisions; assume success.
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
222
                bytes = record.get_bytes_as('fulltext')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
223
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
224
                                                             record.key)
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
225
                if pb is not None:
226
                    pb.update('inv', idx, total_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
227
                key = chk_inv.id_to_entry.key()
228
                if key not in id_roots_set:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
229
                    self._chk_id_roots.append(key)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
230
                    id_roots_set.add(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
231
                p_id_map = chk_inv.parent_id_basename_to_file_id
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
232
                if p_id_map is None:
233
                    raise AssertionError('Parent id -> file_id map not set')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
234
                key = p_id_map.key()
235
                if key not in p_id_roots_set:
236
                    p_id_roots_set.add(key)
237
                    self._chk_p_id_roots.append(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
238
                yield record
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
239
            # We have finished processing all of the inventory records, we
240
            # don't need these sets anymore
241
            id_roots_set.clear()
242
            p_id_roots_set.clear()
3735.42.3 by John Arbash Meinel
Fix a bug introduced into GCPacker.
243
        return _filtered_inv_stream()
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
244
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
245
    def _get_chk_streams(self, source_vf, keys, pb=None):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
246
        # We want to stream the keys from 'id_roots', and things they
247
        # reference, and then stream things from p_id_roots and things they
248
        # reference, and then any remaining keys that we didn't get to.
249
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
250
        # We also group referenced texts together, so if one root references a
251
        # text with prefix 'a', and another root references a node with prefix
252
        # 'a', we want to yield those nodes before we yield the nodes for 'b'
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
253
        # This keeps 'similar' nodes together.
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
254
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
255
        # Note: We probably actually want multiple streams here, to help the
256
        #       client understand that the different levels won't compress well
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
257
        #       against each other.
0.20.27 by John Arbash Meinel
Update a Note/Todo
258
        #       Test the difference between using one Group per level, and
259
        #       using 1 Group per prefix. (so '' (root) would get a group, then
260
        #       all the references to search-key 'a' would get a group, etc.)
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
261
        total_keys = len(keys)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
262
        remaining_keys = set(keys)
0.20.25 by John Arbash Meinel
As expected, splitting things up into streams of streams
263
        counter = [0]
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
264
        if self._gather_text_refs:
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
265
            bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
266
            self._text_refs = set()
267
        def _get_referenced_stream(root_keys, parse_leaf_nodes=False):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
268
            cur_keys = root_keys
269
            while cur_keys:
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
270
                keys_by_search_prefix = {}
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
271
                remaining_keys.difference_update(cur_keys)
272
                next_keys = set()
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
273
                def handle_internal_node(node):
274
                    for prefix, value in node._items.iteritems():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
275
                        # We don't want to request the same key twice, and we
276
                        # want to order it by the first time it is seen.
277
                        # Even further, we don't want to request a key which is
278
                        # not in this group of pack files (it should be in the
279
                        # repo, but it doesn't have to be in the group being
280
                        # packed.)
281
                        # TODO: consider how to treat externally referenced chk
282
                        #       pages as 'external_references' so that we
283
                        #       always fill them in for stacked branches
284
                        if value not in next_keys and value in remaining_keys:
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
285
                            keys_by_search_prefix.setdefault(prefix,
286
                                []).append(value)
287
                            next_keys.add(value)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
288
                def handle_leaf_node(node):
289
                    # Store is None, because we know we have a LeafNode, and we
290
                    # just want its entries
291
                    for file_id, bytes in node.iteritems(None):
3735.36.12 by John Arbash Meinel
Add some direct tests for CHKInventory._entry_to_bytes
292
                        name_utf8, file_id, revision_id = bytes_to_info(bytes)
3735.36.16 by John Arbash Meinel
Handle a typo in 'handle_leaf_node' during Reconcile tests.
293
                        self._text_refs.add((file_id, revision_id))
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
294
                def next_stream():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
295
                    stream = source_vf.get_record_stream(cur_keys,
296
                                                         'as-requested', True)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
297
                    for record in stream:
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
298
                        if record.storage_kind == 'absent':
299
                            # An absent CHK record: we assume that the missing
300
                            # record is in a different pack - e.g. a page not
301
                            # altered by the commit we're packing.
302
                            continue
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
303
                        bytes = record.get_bytes_as('fulltext')
304
                        # We don't care about search_key_func for this code,
305
                        # because we only care about external references.
306
                        node = chk_map._deserialise(bytes, record.key,
307
                                                    search_key_func=None)
308
                        common_base = node._search_prefix
309
                        if isinstance(node, chk_map.InternalNode):
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
310
                            handle_internal_node(node)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
311
                        elif parse_leaf_nodes:
312
                            handle_leaf_node(node)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
313
                        counter[0] += 1
314
                        if pb is not None:
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
315
                            pb.update('chk node', counter[0], total_keys)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
316
                        yield record
317
                yield next_stream()
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
318
                # Double check that we won't be emitting any keys twice
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
319
                # If we get rid of the pre-calculation of all keys, we could
320
                # turn this around and do
321
                # next_keys.difference_update(seen_keys)
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
322
                # However, we also may have references to chk pages in another
323
                # pack file during autopack. We filter earlier, so we should no
324
                # longer need to do this
325
                # next_keys = next_keys.intersection(remaining_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
326
                cur_keys = []
327
                for prefix in sorted(keys_by_search_prefix):
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
328
                    cur_keys.extend(keys_by_search_prefix.pop(prefix))
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
329
        for stream in _get_referenced_stream(self._chk_id_roots,
330
                                             self._gather_text_refs):
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
331
            yield stream
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
332
        del self._chk_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
333
        # while it isn't really possible for chk_id_roots to not be in the
334
        # local group of packs, it is possible that the tree shape has not
335
        # changed recently, so we need to filter _chk_p_id_roots by the
336
        # available keys
337
        chk_p_id_roots = [key for key in self._chk_p_id_roots
338
                          if key in remaining_keys]
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
339
        del self._chk_p_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
340
        for stream in _get_referenced_stream(chk_p_id_roots, False):
341
            yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
342
        if remaining_keys:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
343
            trace.mutter('There were %d keys in the chk index, %d of which'
344
                         ' were not referenced', total_keys,
345
                         len(remaining_keys))
346
            if self.revision_ids is None:
347
                stream = source_vf.get_record_stream(remaining_keys,
348
                                                     'unordered', True)
349
                yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
350
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
351
    def _build_vf(self, index_name, parents, delta, for_write=False):
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
352
        """Build a VersionedFiles instance on top of this group of packs."""
353
        index_name = index_name + '_index'
354
        index_to_pack = {}
355
        access = knit._DirectPackAccess(index_to_pack)
356
        if for_write:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
357
            # Use new_pack
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
358
            if self.new_pack is None:
359
                raise AssertionError('No new pack has been set')
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
360
            index = getattr(self.new_pack, index_name)
361
            index_to_pack[index] = self.new_pack.access_tuple()
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
362
            index.set_optimize(for_size=True)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
363
            access.set_writer(self.new_pack._writer, index,
364
                              self.new_pack.access_tuple())
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
365
            add_callback = index.add_nodes
366
        else:
367
            indices = []
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
368
            for pack in self.packs:
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
369
                sub_index = getattr(pack, index_name)
370
                index_to_pack[sub_index] = pack.access_tuple()
371
                indices.append(sub_index)
372
            index = _mod_index.CombinedGraphIndex(indices)
373
            add_callback = None
374
        vf = GroupCompressVersionedFiles(
375
            _GCGraphIndex(index,
376
                          add_callback=add_callback,
377
                          parents=parents,
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
378
                          is_locked=self._pack_collection.repo.is_locked),
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
379
            access=access,
380
            delta=delta)
381
        return vf
382
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
383
    def _build_vfs(self, index_name, parents, delta):
384
        """Build the source and target VersionedFiles."""
385
        source_vf = self._build_vf(index_name, parents,
386
                                   delta, for_write=False)
387
        target_vf = self._build_vf(index_name, parents,
388
                                   delta, for_write=True)
389
        return source_vf, target_vf
390
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
391
    def _copy_stream(self, source_vf, target_vf, keys, message, vf_to_stream,
392
                     pb_offset):
393
        trace.mutter('repacking %d %s', len(keys), message)
3735.2.146 by John Arbash Meinel
Give the right progress message.
394
        self.pb.update('repacking %s' % (message,), pb_offset)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
395
        child_pb = ui.ui_factory.nested_progress_bar()
396
        try:
397
            stream = vf_to_stream(source_vf, keys, message, child_pb)
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
398
            for _ in target_vf._insert_record_stream(stream,
3735.32.28 by John Arbash Meinel
We can use 'random_id=True' when copying the streams.
399
                                                     random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
400
                                                     reuse_blocks=False):
401
                pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
402
        finally:
403
            child_pb.finished()
404
405
    def _copy_revision_texts(self):
406
        source_vf, target_vf = self._build_vfs('revision', True, False)
407
        if not self.revision_keys:
408
            # We are doing a full fetch, aka 'pack'
409
            self.revision_keys = source_vf.keys()
410
        self._copy_stream(source_vf, target_vf, self.revision_keys,
411
                          'revisions', self._get_progress_stream, 1)
412
413
    def _copy_inventory_texts(self):
414
        source_vf, target_vf = self._build_vfs('inventory', True, True)
415
        self._copy_stream(source_vf, target_vf, self.revision_keys,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
416
                          'inventories', self._get_filtered_inv_stream, 2)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
417
418
    def _copy_chk_texts(self):
419
        source_vf, target_vf = self._build_vfs('chk', False, False)
420
        # TODO: This is technically spurious... if it is a performance issue,
421
        #       remove it
422
        total_keys = source_vf.keys()
423
        trace.mutter('repacking chk: %d id_to_entry roots,'
424
                     ' %d p_id_map roots, %d total keys',
425
                     len(self._chk_id_roots), len(self._chk_p_id_roots),
426
                     len(total_keys))
427
        self.pb.update('repacking chk', 3)
428
        child_pb = ui.ui_factory.nested_progress_bar()
429
        try:
430
            for stream in self._get_chk_streams(source_vf, total_keys,
431
                                                pb=child_pb):
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
432
                for _ in target_vf._insert_record_stream(stream,
3735.32.28 by John Arbash Meinel
We can use 'random_id=True' when copying the streams.
433
                                                         random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
434
                                                         reuse_blocks=False):
435
                    pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
436
        finally:
437
            child_pb.finished()
438
439
    def _copy_text_texts(self):
440
        source_vf, target_vf = self._build_vfs('text', True, True)
441
        # XXX: We don't walk the chk map to determine referenced (file_id,
442
        #      revision_id) keys.  We don't do it yet because you really need
443
        #      to filter out the ones that are present in the parents of the
444
        #      rev just before the ones you are copying, otherwise the filter
445
        #      is grabbing too many keys...
446
        text_keys = source_vf.keys()
447
        self._copy_stream(source_vf, target_vf, text_keys,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
448
                          'text', self._get_progress_stream, 4)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
449
450
    def _copy_signature_texts(self):
451
        source_vf, target_vf = self._build_vfs('signature', False, False)
452
        signature_keys = source_vf.keys()
453
        signature_keys.intersection(self.revision_keys)
454
        self._copy_stream(source_vf, target_vf, signature_keys,
455
                          'signatures', self._get_progress_stream, 5)
456
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
457
    def _create_pack_from_packs(self):
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
458
        self.pb.update('repacking', 0, 7)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
459
        self.new_pack = self.open_pack()
460
        # Is this necessary for GC ?
461
        self.new_pack.set_write_cache_size(1024*1024)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
462
        self._copy_revision_texts()
463
        self._copy_inventory_texts()
464
        self._copy_chk_texts()
465
        self._copy_text_texts()
466
        self._copy_signature_texts()
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
467
        self.new_pack._check_references()
468
        if not self._use_pack(self.new_pack):
469
            self.new_pack.abort()
470
            return None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
471
        self.pb.update('finishing repack', 6, 7)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
472
        self.new_pack.finish()
473
        self._pack_collection.allocate(self.new_pack)
474
        return self.new_pack
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
475
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
476
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
477
class GCCHKReconcilePacker(GCCHKPacker):
478
    """A packer which regenerates indices etc as it copies.
479
480
    This is used by ``bzr reconcile`` to cause parent text pointers to be
481
    regenerated.
482
    """
483
484
    def __init__(self, *args, **kwargs):
485
        super(GCCHKReconcilePacker, self).__init__(*args, **kwargs)
486
        self._data_changed = False
487
        self._gather_text_refs = True
488
489
    def _copy_inventory_texts(self):
490
        source_vf, target_vf = self._build_vfs('inventory', True, True)
491
        self._copy_stream(source_vf, target_vf, self.revision_keys,
492
                          'inventories', self._get_filtered_inv_stream, 2)
493
        if source_vf.keys() != self.revision_keys:
494
            self._data_changed = True
495
496
    def _copy_text_texts(self):
497
        """generate what texts we should have and then copy."""
498
        source_vf, target_vf = self._build_vfs('text', True, True)
499
        trace.mutter('repacking %d texts', len(self._text_refs))
500
        self.pb.update("repacking texts", 4)
501
        # we have three major tasks here:
502
        # 1) generate the ideal index
503
        repo = self._pack_collection.repo
504
        # We want the one we just wrote, so base it on self.new_pack
505
        revision_vf = self._build_vf('revision', True, False, for_write=True)
506
        ancestor_keys = revision_vf.get_parent_map(revision_vf.keys())
507
        # Strip keys back into revision_ids.
508
        ancestors = dict((k[0], tuple([p[0] for p in parents]))
509
                         for k, parents in ancestor_keys.iteritems())
510
        del ancestor_keys
511
        # TODO: _generate_text_key_index should be much cheaper to generate from
512
        #       a chk repository, rather than the current implementation
513
        ideal_index = repo._generate_text_key_index(None, ancestors)
514
        file_id_parent_map = source_vf.get_parent_map(self._text_refs)
515
        # 2) generate a keys list that contains all the entries that can
516
        #    be used as-is, with corrected parents.
517
        ok_keys = []
518
        new_parent_keys = {} # (key, parent_keys)
519
        discarded_keys = []
520
        NULL_REVISION = _mod_revision.NULL_REVISION
521
        for key in self._text_refs:
522
            # 0 - index
523
            # 1 - key
524
            # 2 - value
525
            # 3 - refs
526
            try:
527
                ideal_parents = tuple(ideal_index[key])
528
            except KeyError:
529
                discarded_keys.append(key)
530
                self._data_changed = True
531
            else:
532
                if ideal_parents == (NULL_REVISION,):
533
                    ideal_parents = ()
534
                source_parents = file_id_parent_map[key]
535
                if ideal_parents == source_parents:
536
                    # no change needed.
537
                    ok_keys.append(key)
538
                else:
539
                    # We need to change the parent graph, but we don't need to
540
                    # re-insert the text (since we don't pun the compression
541
                    # parent with the parents list)
542
                    self._data_changed = True
543
                    new_parent_keys[key] = ideal_parents
544
        # we're finished with some data.
545
        del ideal_index
546
        del file_id_parent_map
547
        # 3) bulk copy the data, updating records than need it
548
        def _update_parents_for_texts():
549
            stream = source_vf.get_record_stream(self._text_refs,
550
                'groupcompress', False)
551
            for record in stream:
552
                if record.key in new_parent_keys:
553
                    record.parents = new_parent_keys[record.key]
554
                yield record
555
        target_vf.insert_record_stream(_update_parents_for_texts())
556
557
    def _use_pack(self, new_pack):
558
        """Override _use_pack to check for reconcile having changed content."""
559
        return new_pack.data_inserted() and self._data_changed
560
561
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
562
class GCRepositoryPackCollection(RepositoryPackCollection):
563
564
    pack_factory = GCPack
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
565
    resumed_pack_factory = ResumedGCPack
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
566
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
567
    def _execute_pack_operations(self, pack_operations,
568
                                 _packer_class=GCCHKPacker,
0.22.1 by John Arbash Meinel
A first-cut at implementing an auto-pack by copying everything.
569
                                 reload_func=None):
570
        """Execute a series of pack operations.
571
572
        :param pack_operations: A list of [revision_count, packs_to_combine].
573
        :param _packer_class: The class of packer to use (default: Packer).
574
        :return: None.
575
        """
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
576
        # XXX: Copied across from RepositoryPackCollection simply because we
577
        #      want to override the _packer_class ... :(
0.22.1 by John Arbash Meinel
A first-cut at implementing an auto-pack by copying everything.
578
        for revision_count, packs in pack_operations:
579
            # we may have no-ops from the setup logic
580
            if len(packs) == 0:
581
                continue
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
582
            packer = GCCHKPacker(self, packs, '.autopack',
583
                                 reload_func=reload_func)
0.22.1 by John Arbash Meinel
A first-cut at implementing an auto-pack by copying everything.
584
            try:
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
585
                packer.pack()
586
            except errors.RetryWithNewPacks:
587
                # An exception is propagating out of this context, make sure
588
                # this packer has cleaned up. Packer() doesn't set its new_pack
589
                # state into the RepositoryPackCollection object, so we only
590
                # have access to it directly here.
591
                if packer.new_pack is not None:
592
                    packer.new_pack.abort()
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
593
                raise
0.22.1 by John Arbash Meinel
A first-cut at implementing an auto-pack by copying everything.
594
            for pack in packs:
595
                self._remove_pack_from_memory(pack)
596
        # record the newly available packs and stop advertising the old
597
        # packs
598
        self._save_pack_names(clear_obsolete_packs=True)
599
        # Move the old packs out of the way now they are no longer referenced.
600
        for revision_count, packs in pack_operations:
601
            self._obsolete_packs(packs)
0.20.7 by John Arbash Meinel
(ugly hack) autopacking doesn't work, so don't do it.
602
0.17.9 by Robert Collins
Initial stab at repository format support.
603
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
604
class CHKInventoryRepository(KnitPackRepository):
605
    """subclass of KnitPackRepository that uses CHK based inventories."""
0.17.26 by Robert Collins
Working better --gc-plain-chk.
606
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
607
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
608
        _serializer):
609
        """Overridden to change pack collection class."""
610
        KnitPackRepository.__init__(self, _format, a_bzrdir, control_files,
611
            _commit_builder_class, _serializer)
612
        # and now replace everything it did :)
613
        index_transport = self._transport.clone('indices')
614
        self._pack_collection = GCRepositoryPackCollection(self,
615
            self._transport, index_transport,
616
            self._transport.clone('upload'),
617
            self._transport.clone('packs'),
618
            _format.index_builder_class,
619
            _format.index_class,
620
            use_chk_index=self._format.supports_chks,
621
            )
622
        self.inventories = GroupCompressVersionedFiles(
623
            _GCGraphIndex(self._pack_collection.inventory_index.combined_index,
624
                add_callback=self._pack_collection.inventory_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
625
                parents=True, is_locked=self.is_locked,
626
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
627
            access=self._pack_collection.inventory_index.data_access)
628
        self.revisions = GroupCompressVersionedFiles(
629
            _GCGraphIndex(self._pack_collection.revision_index.combined_index,
630
                add_callback=self._pack_collection.revision_index.add_callback,
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
631
                parents=True, is_locked=self.is_locked,
632
                track_external_parent_refs=True),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
633
            access=self._pack_collection.revision_index.data_access,
634
            delta=False)
635
        self.signatures = GroupCompressVersionedFiles(
636
            _GCGraphIndex(self._pack_collection.signature_index.combined_index,
637
                add_callback=self._pack_collection.signature_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
638
                parents=False, is_locked=self.is_locked,
639
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
640
            access=self._pack_collection.signature_index.data_access,
641
            delta=False)
642
        self.texts = GroupCompressVersionedFiles(
643
            _GCGraphIndex(self._pack_collection.text_index.combined_index,
644
                add_callback=self._pack_collection.text_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
645
                parents=True, is_locked=self.is_locked,
646
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
647
            access=self._pack_collection.text_index.data_access)
648
        # No parents, individual CHK pages don't have specific ancestry
649
        self.chk_bytes = GroupCompressVersionedFiles(
650
            _GCGraphIndex(self._pack_collection.chk_index.combined_index,
651
                add_callback=self._pack_collection.chk_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
652
                parents=False, is_locked=self.is_locked,
653
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
654
            access=self._pack_collection.chk_index.data_access)
655
        # True when the repository object is 'write locked' (as opposed to the
656
        # physical lock only taken out around changes to the pack-names list.)
657
        # Another way to represent this would be a decorator around the control
658
        # files object that presents logical locks as physical ones - if this
659
        # gets ugly consider that alternative design. RBC 20071011
660
        self._write_lock_count = 0
661
        self._transaction = None
662
        # for tests
663
        self._reconcile_does_inventory_gc = True
664
        self._reconcile_fixes_text_parents = True
665
        self._reconcile_backsup_inventory = False
0.17.26 by Robert Collins
Working better --gc-plain-chk.
666
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
667
    def _add_inventory_checked(self, revision_id, inv, parents):
668
        """Add inv to the repository after checking the inputs.
669
670
        This function can be overridden to allow different inventory styles.
671
672
        :seealso: add_inventory, for the contract.
673
        """
674
        # make inventory
675
        serializer = self._format._serializer
676
        result = inventory.CHKInventory.from_inventory(self.chk_bytes, inv,
677
            maximum_size=serializer.maximum_size,
678
            search_key_name=serializer.search_key_name)
679
        inv_lines = result.to_lines()
680
        return self._inventory_add_lines(revision_id, parents,
681
            inv_lines, check_content=False)
682
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
683
    def _create_inv_from_null(self, delta, revision_id):
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
684
        """This will mutate new_inv directly.
685
686
        This is a simplified form of create_by_apply_delta which knows that all
687
        the old values must be None, so everything is a create.
688
        """
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
689
        serializer = self._format._serializer
690
        new_inv = inventory.CHKInventory(serializer.search_key_name)
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
691
        new_inv.revision_id = revision_id
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
692
        entry_to_bytes = new_inv._entry_to_bytes
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
693
        id_to_entry_dict = {}
694
        parent_id_basename_dict = {}
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
695
        for old_path, new_path, file_id, entry in delta:
4413.5.8 by John Arbash Meinel
Change some asserts into raise: calls.
696
            if old_path is not None:
697
                raise ValueError('Invalid delta, somebody tried to delete %r'
698
                                 ' from the NULL_REVISION'
699
                                 % ((old_path, file_id),))
700
            if new_path is None:
701
                raise ValueError('Invalid delta, delta from NULL_REVISION has'
702
                                 ' no new_path %r' % (file_id,))
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
703
            if new_path == '':
704
                new_inv.root_id = file_id
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
705
                parent_id_basename_key = ('', '')
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
706
            else:
707
                utf8_entry_name = entry.name.encode('utf-8')
708
                parent_id_basename_key = (entry.parent_id, utf8_entry_name)
709
            new_value = entry_to_bytes(entry)
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
710
            # Populate Caches?
711
            # new_inv._path_to_fileid_cache[new_path] = file_id
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
712
            id_to_entry_dict[(file_id,)] = new_value
713
            parent_id_basename_dict[parent_id_basename_key] = file_id
714
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
715
        new_inv._populate_from_dicts(self.chk_bytes, id_to_entry_dict,
716
            parent_id_basename_dict, maximum_size=serializer.maximum_size)
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
717
        return new_inv
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
718
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
719
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
720
                               parents, basis_inv=None, propagate_caches=False):
721
        """Add a new inventory expressed as a delta against another revision.
722
723
        :param basis_revision_id: The inventory id the delta was created
724
            against.
725
        :param delta: The inventory delta (see Inventory.apply_delta for
726
            details).
727
        :param new_revision_id: The revision id that the inventory is being
728
            added for.
729
        :param parents: The revision ids of the parents that revision_id is
730
            known to have and are in the repository already. These are supplied
731
            for repositories that depend on the inventory graph for revision
732
            graph access, as well as for those that pun ancestry with delta
733
            compression.
734
        :param basis_inv: The basis inventory if it is already known,
735
            otherwise None.
736
        :param propagate_caches: If True, the caches for this inventory are
737
          copied to and updated for the result if possible.
738
739
        :returns: (validator, new_inv)
740
            The validator(which is a sha1 digest, though what is sha'd is
741
            repository format specific) of the serialized inventory, and the
742
            resulting inventory.
743
        """
744
        if not self.is_in_write_group():
745
            raise AssertionError("%r not in write group" % (self,))
746
        _mod_revision.check_not_reserved_id(new_revision_id)
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
747
        basis_tree = None
748
        if basis_inv is None:
749
            if basis_revision_id == _mod_revision.NULL_REVISION:
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
750
                new_inv = self._create_inv_from_null(delta, new_revision_id)
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
751
                inv_lines = new_inv.to_lines()
752
                return self._inventory_add_lines(new_revision_id, parents,
753
                    inv_lines, check_content=False), new_inv
754
            else:
755
                basis_tree = self.revision_tree(basis_revision_id)
756
                basis_tree.lock_read()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
757
                basis_inv = basis_tree.inventory
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
758
        try:
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
759
            result = basis_inv.create_by_apply_delta(delta, new_revision_id,
760
                propagate_caches=propagate_caches)
761
            inv_lines = result.to_lines()
762
            return self._inventory_add_lines(new_revision_id, parents,
763
                inv_lines, check_content=False), result
764
        finally:
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
765
            if basis_tree is not None:
766
                basis_tree.unlock()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
767
768
    def _iter_inventories(self, revision_ids):
769
        """Iterate over many inventory objects."""
770
        keys = [(revision_id,) for revision_id in revision_ids]
771
        stream = self.inventories.get_record_stream(keys, 'unordered', True)
772
        texts = {}
773
        for record in stream:
774
            if record.storage_kind != 'absent':
775
                texts[record.key] = record.get_bytes_as('fulltext')
776
            else:
777
                raise errors.NoSuchRevision(self, record.key)
778
        for key in keys:
779
            yield inventory.CHKInventory.deserialise(self.chk_bytes, texts[key], key)
780
781
    def _iter_inventory_xmls(self, revision_ids):
782
        # Without a native 'xml' inventory, this method doesn't make sense, so
783
        # make it raise to trap naughty direct users.
784
        raise NotImplementedError(self._iter_inventory_xmls)
785
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
786
    def _find_present_inventory_keys(self, revision_keys):
787
        parent_map = self.inventories.get_parent_map(revision_keys)
788
        present_inventory_keys = set(k for k in parent_map)
789
        return present_inventory_keys
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
790
791
    def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
792
        """Find the file ids and versions affected by revisions.
793
794
        :param revisions: an iterable containing revision ids.
795
        :param _inv_weave: The inventory weave from this repository or None.
796
            If None, the inventory weave will be opened automatically.
797
        :return: a dictionary mapping altered file-ids to an iterable of
798
            revision_ids. Each altered file-ids has the exact revision_ids that
799
            altered it listed explicitly.
800
        """
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
801
        rich_root = self.supports_rich_root()
802
        bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
803
        file_id_revisions = {}
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
804
        pb = ui.ui_factory.nested_progress_bar()
805
        try:
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
806
            revision_keys = [(r,) for r in revision_ids]
807
            parent_keys = self._find_parent_keys_of_revisions(revision_keys)
808
            # TODO: instead of using _find_present_inventory_keys, change the
809
            #       code paths to allow missing inventories to be tolerated.
810
            #       However, we only want to tolerate missing parent
811
            #       inventories, not missing inventories for revision_ids
812
            present_parent_inv_keys = self._find_present_inventory_keys(
813
                                        parent_keys)
814
            present_parent_inv_ids = set(
815
                [k[-1] for k in present_parent_inv_keys])
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
816
            uninteresting_root_keys = set()
817
            interesting_root_keys = set()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
818
            inventories_to_read = set(revision_ids)
819
            inventories_to_read.update(present_parent_inv_ids)
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
820
            for inv in self.iter_inventories(inventories_to_read):
821
                entry_chk_root_key = inv.id_to_entry.key()
822
                if inv.revision_id in present_parent_inv_ids:
823
                    uninteresting_root_keys.add(entry_chk_root_key)
824
                else:
825
                    interesting_root_keys.add(entry_chk_root_key)
826
827
            chk_bytes = self.chk_bytes
828
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
829
                        interesting_root_keys, uninteresting_root_keys,
830
                        pb=pb):
831
                for name, bytes in items:
832
                    (name_utf8, file_id, revision_id) = bytes_to_info(bytes)
833
                    if not rich_root and name_utf8 == '':
834
                        continue
835
                    try:
836
                        file_id_revisions[file_id].add(revision_id)
837
                    except KeyError:
838
                        file_id_revisions[file_id] = set([revision_id])
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
839
        finally:
840
            pb.finished()
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
841
        return file_id_revisions
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
842
843
    def find_text_key_references(self):
844
        """Find the text key references within the repository.
845
846
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
847
            to whether they were referred to by the inventory of the
848
            revision_id that they contain. The inventory texts from all present
849
            revision ids are assessed to generate this report.
850
        """
851
        # XXX: Slow version but correct: rewrite as a series of delta
852
        # examinations/direct tree traversal. Note that that will require care
853
        # as a common node is reachable both from the inventory that added it,
854
        # and others afterwards.
855
        revision_keys = self.revisions.keys()
856
        result = {}
857
        rich_roots = self.supports_rich_root()
858
        pb = ui.ui_factory.nested_progress_bar()
859
        try:
860
            all_revs = self.all_revision_ids()
861
            total = len(all_revs)
862
            for pos, inv in enumerate(self.iter_inventories(all_revs)):
863
                pb.update("Finding text references", pos, total)
864
                for _, entry in inv.iter_entries():
865
                    if not rich_roots and entry.file_id == inv.root_id:
866
                        continue
867
                    key = (entry.file_id, entry.revision)
868
                    result.setdefault(key, False)
869
                    if entry.revision == inv.revision_id:
870
                        result[key] = True
871
            return result
872
        finally:
873
            pb.finished()
874
875
    def _reconcile_pack(self, collection, packs, extension, revs, pb):
876
        packer = GCCHKReconcilePacker(collection, packs, extension)
877
        return packer.pack(pb)
878
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
879
    def _get_source(self, to_format):
880
        """Return a source for streaming from this repository."""
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
881
        if isinstance(to_format, remote.RemoteRepositoryFormat):
882
            # Can't just check attributes on to_format with the current code,
883
            # work around this:
884
            to_format._ensure_real()
885
            to_format = to_format._custom_format
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
886
        if to_format.__class__ is self._format.__class__:
887
            # We must be exactly the same format, otherwise stuff like the chk
888
            # page layout might be different
889
            return GroupCHKStreamSource(self, to_format)
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
890
        return super(CHKInventoryRepository, self)._get_source(to_format)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
891
892
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
893
class GroupCHKStreamSource(KnitPackStreamSource):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
894
    """Used when both the source and target repo are GroupCHK repos."""
895
896
    def __init__(self, from_repository, to_format):
897
        """Create a StreamSource streaming from from_repository."""
898
        super(GroupCHKStreamSource, self).__init__(from_repository, to_format)
899
        self._revision_keys = None
900
        self._text_keys = None
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
901
        self._text_fetch_order = 'groupcompress'
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
902
        self._chk_id_roots = None
903
        self._chk_p_id_roots = None
904
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
905
    def _get_inventory_stream(self, inventory_keys, allow_absent=False):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
906
        """Get a stream of inventory texts.
907
908
        When this function returns, self._chk_id_roots and self._chk_p_id_roots
909
        should be populated.
910
        """
911
        self._chk_id_roots = []
912
        self._chk_p_id_roots = []
913
        def _filtered_inv_stream():
914
            id_roots_set = set()
915
            p_id_roots_set = set()
916
            source_vf = self.from_repository.inventories
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
917
            stream = source_vf.get_record_stream(inventory_keys,
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
918
                                                 'groupcompress', True)
919
            for record in stream:
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
920
                if record.storage_kind == 'absent':
921
                    if allow_absent:
922
                        continue
923
                    else:
924
                        raise errors.NoSuchRevision(self, record.key)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
925
                bytes = record.get_bytes_as('fulltext')
926
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
927
                                                             record.key)
928
                key = chk_inv.id_to_entry.key()
929
                if key not in id_roots_set:
930
                    self._chk_id_roots.append(key)
931
                    id_roots_set.add(key)
932
                p_id_map = chk_inv.parent_id_basename_to_file_id
933
                if p_id_map is None:
934
                    raise AssertionError('Parent id -> file_id map not set')
935
                key = p_id_map.key()
936
                if key not in p_id_roots_set:
937
                    p_id_roots_set.add(key)
938
                    self._chk_p_id_roots.append(key)
939
                yield record
940
            # We have finished processing all of the inventory records, we
941
            # don't need these sets anymore
942
            id_roots_set.clear()
943
            p_id_roots_set.clear()
944
        return ('inventories', _filtered_inv_stream())
945
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
946
    def _get_filtered_chk_streams(self, excluded_revision_keys):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
947
        self._text_keys = set()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
948
        excluded_revision_keys.discard(_mod_revision.NULL_REVISION)
949
        if not excluded_revision_keys:
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
950
            uninteresting_root_keys = set()
951
            uninteresting_pid_root_keys = set()
952
        else:
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
953
            # filter out any excluded revisions whose inventories are not
954
            # actually present
955
            # TODO: Update Repository.iter_inventories() to add
956
            #       ignore_missing=True
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
957
            present_keys = self.from_repository._find_present_inventory_keys(
958
                            excluded_revision_keys)
959
            present_ids = [k[-1] for k in present_keys]
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
960
            uninteresting_root_keys = set()
961
            uninteresting_pid_root_keys = set()
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
962
            for inv in self.from_repository.iter_inventories(present_ids):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
963
                uninteresting_root_keys.add(inv.id_to_entry.key())
964
                uninteresting_pid_root_keys.add(
965
                    inv.parent_id_basename_to_file_id.key())
966
        bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
967
        chk_bytes = self.from_repository.chk_bytes
968
        def _filter_id_to_entry():
969
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
970
                        self._chk_id_roots, uninteresting_root_keys):
971
                for name, bytes in items:
972
                    # Note: we don't care about name_utf8, because we are always
973
                    # rich-root = True
974
                    _, file_id, revision_id = bytes_to_info(bytes)
975
                    self._text_keys.add((file_id, revision_id))
976
                if record is not None:
977
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
978
            # Consumed
979
            self._chk_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
980
        yield 'chk_bytes', _filter_id_to_entry()
981
        def _get_parent_id_basename_to_file_id_pages():
982
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
983
                        self._chk_p_id_roots, uninteresting_pid_root_keys):
984
                if record is not None:
985
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
986
            # Consumed
987
            self._chk_p_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
988
        yield 'chk_bytes', _get_parent_id_basename_to_file_id_pages()
989
990
    def get_stream(self, search):
991
        revision_ids = search.get_keys()
992
        for stream_info in self._fetch_revision_texts(revision_ids):
993
            yield stream_info
994
        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
995
        yield self._get_inventory_stream(self._revision_keys)
4343.3.12 by John Arbash Meinel
instead of trusting the Search, use a get_parent_map call.
996
        # TODO: The keys to exclude might be part of the search recipe
997
        # For now, exclude all parents that are at the edge of ancestry, for
998
        # which we have inventories
4343.3.36 by John Arbash Meinel
Some review feedback from Andrew.
999
        from_repo = self.from_repository
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1000
        parent_keys = from_repo._find_parent_keys_of_revisions(
1001
                        self._revision_keys)
1002
        for stream_info in self._get_filtered_chk_streams(parent_keys):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1003
            yield stream_info
1004
        yield self._get_text_stream()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1005
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1006
    def get_stream_for_missing_keys(self, missing_keys):
1007
        # missing keys can only occur when we are byte copying and not
1008
        # translating (because translation means we don't send
1009
        # unreconstructable deltas ever).
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1010
        missing_inventory_keys = set()
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1011
        for key in missing_keys:
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1012
            if key[0] != 'inventories':
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1013
                raise AssertionError('The only missing keys we should'
1014
                    ' be filling in are inventory keys, not %s'
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1015
                    % (key[0],))
1016
            missing_inventory_keys.add(key[1:])
1017
        if self._chk_id_roots or self._chk_p_id_roots:
1018
            raise AssertionError('Cannot call get_stream_for_missing_keys'
1019
                ' untill all of get_stream() has been consumed.')
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1020
        # Yield the inventory stream, so we can find the chk stream
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1021
        # Some of the missing_keys will be missing because they are ghosts.
1022
        # As such, we can ignore them. The Sink is required to verify there are
1023
        # no unavailable texts when the ghost inventories are not filled in.
1024
        yield self._get_inventory_stream(missing_inventory_keys,
1025
                                         allow_absent=True)
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1026
        # We use the empty set for excluded_revision_keys, to make it clear
1027
        # that we want to transmit all referenced chk pages.
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1028
        for stream_info in self._get_filtered_chk_streams(set()):
1029
            yield stream_info
1030
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1031
1032
class RepositoryFormatCHK1(RepositoryFormatPack):
1033
    """A hashed CHK+group compress pack repository."""
1034
1035
    repository_class = CHKInventoryRepository
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
1036
    supports_external_lookups = True
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1037
    supports_chks = True
1038
    # For right now, setting this to True gives us InterModel1And2 rather
1039
    # than InterDifferingSerializer
1040
    _commit_builder_class = PackRootCommitBuilder
1041
    rich_root_data = True
1042
    _serializer = chk_serializer.chk_serializer_255_bigpage
1043
    _commit_inv_deltas = True
1044
    # What index classes to use
1045
    index_builder_class = BTreeBuilder
1046
    index_class = BTreeGraphIndex
1047
    # Note: We cannot unpack a delta that references a text we haven't
1048
    # seen yet. There are 2 options, work in fulltexts, or require
1049
    # topological sorting. Using fulltexts is more optimal for local
1050
    # operations, because the source can be smart about extracting
1051
    # multiple in-a-row (and sharing strings). Topological is better
1052
    # for remote, because we access less data.
1053
    _fetch_order = 'unordered'
4265.1.2 by John Arbash Meinel
Set _fetch_uses_deltas back to False, so that conversions from arbitrary sources can still fetch 'unordered'
1054
    _fetch_uses_deltas = False # essentially ignored by the groupcompress code.
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1055
    fast_deltas = True
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1056
    pack_compresses = True
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1057
1058
    def _get_matching_bzrdir(self):
1059
        return bzrdir.format_registry.make_bzrdir('development6-rich-root')
1060
1061
    def _ignore_setting_bzrdir(self, format):
1062
        pass
1063
1064
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1065
1066
    def get_format_string(self):
1067
        """See RepositoryFormat.get_format_string()."""
1068
        return ('Bazaar development format - group compression and chk inventory'
1069
                ' (needs bzr.dev from 1.14)\n')
1070
1071
    def get_format_description(self):
1072
        """See RepositoryFormat.get_format_description()."""
1073
        return ("Development repository format - rich roots, group compression"
1074
            " and chk inventories")
1075
1076
    def check_conversion_target(self, target_format):
1077
        if not target_format.rich_root_data:
1078
            raise errors.BadConversionTarget(
1079
                'Does not support rich root data.', target_format)
4413.3.2 by Jelmer Vernooij
During groupcompress repository upgrades, only require subtree support in the target if the source had subtree support.
1080
        if (self.supports_tree_reference and 
1081
            not getattr(target_format, 'supports_tree_reference', False)):
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1082
            raise errors.BadConversionTarget(
1083
                'Does not support nested trees', target_format)
1084
1085
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
1086
1087
class RepositoryFormatCHK2(RepositoryFormatCHK1):
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
1088
    """A CHK repository that uses the bencode revision serializer."""
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
1089
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
1090
    _serializer = chk_serializer.chk_bencode_serializer
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
1091
1092
    def _get_matching_bzrdir(self):
1093
        return bzrdir.format_registry.make_bzrdir('development7-rich-root')
1094
1095
    def _ignore_setting_bzrdir(self, format):
1096
        pass
1097
1098
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1099
1100
    def get_format_string(self):
1101
        """See RepositoryFormat.get_format_string()."""
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
1102
        return ('Bazaar development format - chk repository with bencode '
4413.3.1 by Jelmer Vernooij
Mention bzr 1.16 in the dev7 format description.
1103
                'revision serialization (needs bzr.dev from 1.16)\n')
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
1104
1105
4428.2.1 by Martin Pool
Add 2a format
1106
class RepositoryFormat2a(RepositoryFormatCHK2):
1107
    """A CHK repository that uses the bencode revision serializer.
1108
    
1109
    This is the same as RepositoryFormatCHK2 but with a public name.
1110
    """
1111
1112
    _serializer = chk_serializer.chk_bencode_serializer
1113
1114
    def _get_matching_bzrdir(self):
1115
        return bzrdir.format_registry.make_bzrdir('2a')
1116
1117
    def _ignore_setting_bzrdir(self, format):
1118
        pass
1119
1120
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1121
1122
    def get_format_string(self):
1123
        return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')