/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
1
# Copyright (C) 2008-2011 Canonical Ltd
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
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,
29
    osutils,
5757.1.3 by Jelmer Vernooij
Revert noknit branch for the moment.
30
    pack,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
31
    revision as _mod_revision,
0.23.28 by John Arbash Meinel
Gotta import 'trace' if you want to use trace.mutter()
32
    trace,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
33
    ui,
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
34
    versionedfile,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
35
    )
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)
36
from bzrlib.btree_index import (
37
    BTreeGraphIndex,
38
    BTreeBuilder,
39
    )
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
40
from bzrlib.decorators import needs_write_lock
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
41
from bzrlib.groupcompress import (
0.17.9 by Robert Collins
Initial stab at repository format support.
42
    _GCGraphIndex,
43
    GroupCompressVersionedFiles,
44
    )
45
from bzrlib.repofmt.pack_repo import (
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
46
    _DirectPackAccess,
0.17.9 by Robert Collins
Initial stab at repository format support.
47
    Pack,
48
    NewPack,
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
49
    PackRepository,
3735.31.9 by John Arbash Meinel
Setting the _commit_builder_class makes commit with rich_root_data=True work.
50
    PackRootCommitBuilder,
0.17.9 by Robert Collins
Initial stab at repository format support.
51
    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)
52
    RepositoryFormatPack,
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
53
    ResumedPack,
0.17.9 by Robert Collins
Initial stab at repository format support.
54
    Packer,
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
55
    )
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
56
from bzrlib.vf_repository import (
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
57
    StreamSource,
58
    )
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
59
from bzrlib.static_tuple import StaticTuple
0.17.9 by Robert Collins
Initial stab at repository format support.
60
61
62
class GCPack(NewPack):
63
0.17.22 by Robert Collins
really get gc working with 1.10
64
    def __init__(self, pack_collection, upload_suffix='', file_mode=None):
0.17.9 by Robert Collins
Initial stab at repository format support.
65
        """Create a NewPack instance.
66
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
67
        :param pack_collection: A PackCollection into which this is being
68
            inserted.
0.17.9 by Robert Collins
Initial stab at repository format support.
69
        :param upload_suffix: An optional suffix to be given to any temporary
70
            files created during the pack creation. e.g '.autopack'
71
        :param file_mode: An optional file mode to create the new files with.
72
        """
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
73
        # replaced from NewPack to:
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
74
        # - change inventory reference list length to 1
75
        # - change texts reference lists to 1
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
76
        # TODO: patch this to be parameterised
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
77
0.17.9 by Robert Collins
Initial stab at repository format support.
78
        # The relative locations of the packs are constrained, but all are
79
        # 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
80
        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.
81
        # from brisbane-core
82
        if pack_collection.chk_index is not None:
83
            chk_index = index_builder_class(reference_lists=0)
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
84
        else:
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
85
            chk_index = None
86
        Pack.__init__(self,
87
            # Revisions: parents list, no text compression.
88
            index_builder_class(reference_lists=1),
89
            # Inventory: We want to map compression only, but currently the
90
            # knit code hasn't been updated enough to understand that, so we
91
            # have a regular 2-list index giving parents and compression
92
            # source.
93
            index_builder_class(reference_lists=1),
4371.2.2 by Vincent Ladeuil
Fix comment as per John's review.
94
            # Texts: per file graph, for all fileids - so one reference list
95
            # 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.
96
            index_builder_class(reference_lists=1, key_elements=2),
97
            # Signatures: Just blobs to store, no compression, no parents
98
            # listing.
99
            index_builder_class(reference_lists=0),
100
            # CHK based storage - just blobs, no compression or parents.
101
            chk_index=chk_index
102
            )
0.17.22 by Robert Collins
really get gc working with 1.10
103
        self._pack_collection = pack_collection
104
        # When we make readonly indices, we need this.
105
        self.index_class = pack_collection._index_class
0.17.9 by Robert Collins
Initial stab at repository format support.
106
        # where should the new pack be opened
0.17.22 by Robert Collins
really get gc working with 1.10
107
        self.upload_transport = pack_collection._upload_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
108
        # where are indices written out to
0.17.22 by Robert Collins
really get gc working with 1.10
109
        self.index_transport = pack_collection._index_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
110
        # where is the pack renamed to when it is finished?
0.17.22 by Robert Collins
really get gc working with 1.10
111
        self.pack_transport = pack_collection._pack_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
112
        # What file mode to upload the pack and indices with.
113
        self._file_mode = file_mode
114
        # 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.
115
        self._hash = osutils.md5()
0.17.9 by Robert Collins
Initial stab at repository format support.
116
        # a four-tuple with the length in bytes of the indices, once the pack
117
        # is finalised. (rev, inv, text, sigs)
118
        self.index_sizes = None
119
        # How much data to cache when writing packs. Note that this is not
120
        # synchronised with reads, because it's not in the transport layer, so
121
        # is not safe unless the client knows it won't be reading from the pack
122
        # under creation.
123
        self._cache_limit = 0
124
        # the temporary pack file name.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
125
        self.random_name = osutils.rand_chars(20) + upload_suffix
0.17.9 by Robert Collins
Initial stab at repository format support.
126
        # when was this pack started ?
127
        self.start_time = time.time()
128
        # open an output stream for the data added to the pack.
129
        self.write_stream = self.upload_transport.open_write_stream(
130
            self.random_name, mode=self._file_mode)
131
        if 'pack' in debug.debug_flags:
0.23.30 by John Arbash Meinel
Merge in Ian's groupcompress trunk updates
132
            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.
133
                time.ctime(), self.upload_transport.base, self.random_name,
134
                time.time() - self.start_time)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
135
        # A list of byte sequences to be written to the new pack, and the
136
        # aggregate size of them.  Stored as a list rather than separate
0.17.9 by Robert Collins
Initial stab at repository format support.
137
        # variables so that the _write_data closure below can update them.
138
        self._buffer = [[], 0]
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
139
        # create a callable for adding data
0.17.9 by Robert Collins
Initial stab at repository format support.
140
        #
141
        # robertc says- this is a closure rather than a method on the object
142
        # so that the variables are locals, and faster than accessing object
143
        # members.
144
        def _write_data(bytes, flush=False, _buffer=self._buffer,
145
            _write=self.write_stream.write, _update=self._hash.update):
146
            _buffer[0].append(bytes)
147
            _buffer[1] += len(bytes)
148
            # buffer cap
149
            if _buffer[1] > self._cache_limit or flush:
150
                bytes = ''.join(_buffer[0])
151
                _write(bytes)
152
                _update(bytes)
153
                _buffer[:] = [[], 0]
154
        # expose this on self, for the occasion when clients want to add data.
155
        self._write_data = _write_data
156
        # a pack writer object to serialise pack records.
5757.1.3 by Jelmer Vernooij
Revert noknit branch for the moment.
157
        self._writer = pack.ContainerWriter(self._write_data)
0.17.9 by Robert Collins
Initial stab at repository format support.
158
        self._writer.begin()
159
        # what state is the pack in? (open, finished, aborted)
160
        self._state = 'open'
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
161
        # no name until we finish writing the content
162
        self.name = None
0.17.9 by Robert Collins
Initial stab at repository format support.
163
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
164
    def _check_references(self):
165
        """Make sure our external references are present.
166
167
        Packs are allowed to have deltas whose base is not in the pack, but it
168
        must be present somewhere in this collection.  It is not allowed to
169
        have deltas based on a fallback repository.
170
        (See <https://bugs.launchpad.net/bzr/+bug/288751>)
171
        """
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
172
        # Groupcompress packs don't have any external references, arguably CHK
173
        # pages have external references, but we cannot 'cheaply' determine
174
        # them without actually walking all of the chk pages.
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
175
0.17.9 by Robert Collins
Initial stab at repository format support.
176
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
177
class ResumedGCPack(ResumedPack):
178
4343.3.8 by John Arbash Meinel
Some cleanup passes.
179
    def _check_references(self):
180
        """Make sure our external compression parents are present."""
181
        # See GCPack._check_references for why this is empty
182
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
183
    def _get_external_refs(self, index):
184
        # GC repositories don't have compression parents external to a given
185
        # pack file
186
        return set()
187
188
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
189
class GCCHKPacker(Packer):
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
190
    """This class understand what it takes to collect a GCCHK repo."""
0.17.9 by Robert Collins
Initial stab at repository format support.
191
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
192
    def __init__(self, pack_collection, packs, suffix, revision_ids=None,
193
                 reload_func=None):
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
194
        super(GCCHKPacker, self).__init__(pack_collection, packs, suffix,
195
                                          revision_ids=revision_ids,
196
                                          reload_func=reload_func)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
197
        self._pack_collection = pack_collection
198
        # 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)
199
        if pack_collection.chk_index is None:
200
            raise AssertionError('pack_collection.chk_index should not be None')
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
201
        self._gather_text_refs = False
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
202
        self._chk_id_roots = []
203
        self._chk_p_id_roots = []
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
204
        self._text_refs = None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
205
        # set by .pack() if self.revision_ids is not None
206
        self.revision_keys = None
0.17.9 by Robert Collins
Initial stab at repository format support.
207
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
208
    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.
209
        def pb_stream():
210
            substream = source_vf.get_record_stream(keys, 'groupcompress', True)
211
            for idx, record in enumerate(substream):
212
                if pb is not None:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
213
                    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.
214
                yield record
215
        return pb_stream()
216
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
217
    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.
218
        """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
219
        total_keys = len(keys)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
220
        def _filtered_inv_stream():
221
            id_roots_set = set()
222
            p_id_roots_set = set()
223
            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.
224
            for idx, record in enumerate(stream):
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
225
                # Inventories should always be with revisions; assume success.
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
226
                bytes = record.get_bytes_as('fulltext')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
227
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
228
                                                             record.key)
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
229
                if pb is not None:
230
                    pb.update('inv', idx, total_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
231
                key = chk_inv.id_to_entry.key()
232
                if key not in id_roots_set:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
233
                    self._chk_id_roots.append(key)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
234
                    id_roots_set.add(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
235
                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)
236
                if p_id_map is None:
237
                    raise AssertionError('Parent id -> file_id map not set')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
238
                key = p_id_map.key()
239
                if key not in p_id_roots_set:
240
                    p_id_roots_set.add(key)
241
                    self._chk_p_id_roots.append(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
242
                yield record
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
243
            # We have finished processing all of the inventory records, we
244
            # don't need these sets anymore
245
            id_roots_set.clear()
246
            p_id_roots_set.clear()
3735.42.3 by John Arbash Meinel
Fix a bug introduced into GCPacker.
247
        return _filtered_inv_stream()
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
248
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
249
    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.
250
        # We want to stream the keys from 'id_roots', and things they
251
        # reference, and then stream things from p_id_roots and things they
252
        # reference, and then any remaining keys that we didn't get to.
253
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
254
        # We also group referenced texts together, so if one root references a
255
        # text with prefix 'a', and another root references a node with prefix
256
        # 'a', we want to yield those nodes before we yield the nodes for 'b'
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
257
        # This keeps 'similar' nodes together.
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
258
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
259
        # Note: We probably actually want multiple streams here, to help the
260
        #       client understand that the different levels won't compress well
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
261
        #       against each other.
0.20.27 by John Arbash Meinel
Update a Note/Todo
262
        #       Test the difference between using one Group per level, and
263
        #       using 1 Group per prefix. (so '' (root) would get a group, then
264
        #       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
265
        total_keys = len(keys)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
266
        remaining_keys = set(keys)
0.20.25 by John Arbash Meinel
As expected, splitting things up into streams of streams
267
        counter = [0]
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
268
        if self._gather_text_refs:
269
            self._text_refs = set()
270
        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.
271
            cur_keys = root_keys
272
            while cur_keys:
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
273
                keys_by_search_prefix = {}
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
274
                remaining_keys.difference_update(cur_keys)
275
                next_keys = set()
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
276
                def handle_internal_node(node):
277
                    for prefix, value in node._items.iteritems():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
278
                        # We don't want to request the same key twice, and we
279
                        # want to order it by the first time it is seen.
280
                        # Even further, we don't want to request a key which is
281
                        # not in this group of pack files (it should be in the
282
                        # repo, but it doesn't have to be in the group being
283
                        # packed.)
284
                        # TODO: consider how to treat externally referenced chk
285
                        #       pages as 'external_references' so that we
286
                        #       always fill them in for stacked branches
287
                        if value not in next_keys and value in remaining_keys:
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
288
                            keys_by_search_prefix.setdefault(prefix,
289
                                []).append(value)
290
                            next_keys.add(value)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
291
                def handle_leaf_node(node):
292
                    # Store is None, because we know we have a LeafNode, and we
293
                    # just want its entries
294
                    for file_id, bytes in node.iteritems(None):
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
295
                        self._text_refs.add(chk_map._bytes_to_text_key(bytes))
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
296
                def next_stream():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
297
                    stream = source_vf.get_record_stream(cur_keys,
298
                                                         'as-requested', True)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
299
                    for record in stream:
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
300
                        if record.storage_kind == 'absent':
301
                            # An absent CHK record: we assume that the missing
302
                            # record is in a different pack - e.g. a page not
303
                            # altered by the commit we're packing.
304
                            continue
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
305
                        bytes = record.get_bytes_as('fulltext')
306
                        # We don't care about search_key_func for this code,
307
                        # because we only care about external references.
308
                        node = chk_map._deserialise(bytes, record.key,
309
                                                    search_key_func=None)
310
                        common_base = node._search_prefix
311
                        if isinstance(node, chk_map.InternalNode):
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
312
                            handle_internal_node(node)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
313
                        elif parse_leaf_nodes:
314
                            handle_leaf_node(node)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
315
                        counter[0] += 1
316
                        if pb is not None:
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
317
                            pb.update('chk node', counter[0], total_keys)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
318
                        yield record
319
                yield next_stream()
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
320
                # Double check that we won't be emitting any keys twice
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
321
                # If we get rid of the pre-calculation of all keys, we could
322
                # turn this around and do
323
                # next_keys.difference_update(seen_keys)
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
324
                # However, we also may have references to chk pages in another
325
                # pack file during autopack. We filter earlier, so we should no
326
                # longer need to do this
327
                # next_keys = next_keys.intersection(remaining_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
328
                cur_keys = []
329
                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.
330
                    cur_keys.extend(keys_by_search_prefix.pop(prefix))
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
331
        for stream in _get_referenced_stream(self._chk_id_roots,
332
                                             self._gather_text_refs):
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
333
            yield stream
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
334
        del self._chk_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
335
        # while it isn't really possible for chk_id_roots to not be in the
336
        # local group of packs, it is possible that the tree shape has not
337
        # changed recently, so we need to filter _chk_p_id_roots by the
338
        # available keys
339
        chk_p_id_roots = [key for key in self._chk_p_id_roots
340
                          if key in remaining_keys]
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
341
        del self._chk_p_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
342
        for stream in _get_referenced_stream(chk_p_id_roots, False):
343
            yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
344
        if remaining_keys:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
345
            trace.mutter('There were %d keys in the chk index, %d of which'
346
                         ' were not referenced', total_keys,
347
                         len(remaining_keys))
348
            if self.revision_ids is None:
349
                stream = source_vf.get_record_stream(remaining_keys,
350
                                                     'unordered', True)
351
                yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
352
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
353
    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.
354
        """Build a VersionedFiles instance on top of this group of packs."""
355
        index_name = index_name + '_index'
356
        index_to_pack = {}
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
357
        access = _DirectPackAccess(index_to_pack,
5757.5.2 by Jelmer Vernooij
merge bzr.dev.
358
                                   reload_func=self._reload_func)
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
359
        if for_write:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
360
            # 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)
361
            if self.new_pack is None:
362
                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.
363
            index = getattr(self.new_pack, index_name)
364
            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.
365
            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.
366
            access.set_writer(self.new_pack._writer, index,
367
                              self.new_pack.access_tuple())
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
368
            add_callback = index.add_nodes
369
        else:
370
            indices = []
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
371
            for pack in self.packs:
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
372
                sub_index = getattr(pack, index_name)
373
                index_to_pack[sub_index] = pack.access_tuple()
374
                indices.append(sub_index)
375
            index = _mod_index.CombinedGraphIndex(indices)
376
            add_callback = None
377
        vf = GroupCompressVersionedFiles(
378
            _GCGraphIndex(index,
379
                          add_callback=add_callback,
380
                          parents=parents,
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
381
                          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.
382
            access=access,
383
            delta=delta)
384
        return vf
385
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
386
    def _build_vfs(self, index_name, parents, delta):
387
        """Build the source and target VersionedFiles."""
388
        source_vf = self._build_vf(index_name, parents,
389
                                   delta, for_write=False)
390
        target_vf = self._build_vf(index_name, parents,
391
                                   delta, for_write=True)
392
        return source_vf, target_vf
393
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
394
    def _copy_stream(self, source_vf, target_vf, keys, message, vf_to_stream,
395
                     pb_offset):
396
        trace.mutter('repacking %d %s', len(keys), message)
3735.2.146 by John Arbash Meinel
Give the right progress message.
397
        self.pb.update('repacking %s' % (message,), pb_offset)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
398
        child_pb = ui.ui_factory.nested_progress_bar()
399
        try:
400
            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.
401
            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.
402
                                                     random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
403
                                                     reuse_blocks=False):
404
                pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
405
        finally:
406
            child_pb.finished()
407
408
    def _copy_revision_texts(self):
409
        source_vf, target_vf = self._build_vfs('revision', True, False)
410
        if not self.revision_keys:
411
            # We are doing a full fetch, aka 'pack'
412
            self.revision_keys = source_vf.keys()
413
        self._copy_stream(source_vf, target_vf, self.revision_keys,
414
                          'revisions', self._get_progress_stream, 1)
415
416
    def _copy_inventory_texts(self):
417
        source_vf, target_vf = self._build_vfs('inventory', True, True)
4597.1.6 by John Arbash Meinel
Add a test that inventory texts are preserved during pack.
418
        # It is not sufficient to just use self.revision_keys, as stacked
419
        # repositories can have more inventories than they have revisions.
420
        # One alternative would be to do something with
421
        # get_parent_map(self.revision_keys), but that shouldn't be any faster
422
        # than this.
423
        inventory_keys = source_vf.keys()
4597.1.8 by John Arbash Meinel
Add a safety check that there is an inventory being transmitted for
424
        missing_inventories = set(self.revision_keys).difference(inventory_keys)
425
        if missing_inventories:
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
426
            # Go back to the original repo, to see if these are really missing
427
            # https://bugs.launchpad.net/bzr/+bug/437003
428
            # If we are packing a subset of the repo, it is fine to just have
429
            # the data in another Pack file, which is not included in this pack
430
            # operation.
431
            inv_index = self._pack_collection.repo.inventories._index
432
            pmap = inv_index.get_parent_map(missing_inventories)
433
            really_missing = missing_inventories.difference(pmap)
434
            if really_missing:
435
                missing_inventories = sorted(really_missing)
436
                raise ValueError('We are missing inventories for revisions: %s'
437
                    % (missing_inventories,))
4597.1.6 by John Arbash Meinel
Add a test that inventory texts are preserved during pack.
438
        self._copy_stream(source_vf, target_vf, inventory_keys,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
439
                          'inventories', self._get_filtered_inv_stream, 2)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
440
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
441
    def _get_chk_vfs_for_copy(self):
442
        return self._build_vfs('chk', False, False)
443
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
444
    def _copy_chk_texts(self):
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
445
        source_vf, target_vf = self._get_chk_vfs_for_copy()
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
446
        # TODO: This is technically spurious... if it is a performance issue,
447
        #       remove it
448
        total_keys = source_vf.keys()
449
        trace.mutter('repacking chk: %d id_to_entry roots,'
450
                     ' %d p_id_map roots, %d total keys',
451
                     len(self._chk_id_roots), len(self._chk_p_id_roots),
452
                     len(total_keys))
453
        self.pb.update('repacking chk', 3)
454
        child_pb = ui.ui_factory.nested_progress_bar()
455
        try:
456
            for stream in self._get_chk_streams(source_vf, total_keys,
457
                                                pb=child_pb):
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
458
                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.
459
                                                         random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
460
                                                         reuse_blocks=False):
461
                    pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
462
        finally:
463
            child_pb.finished()
464
465
    def _copy_text_texts(self):
466
        source_vf, target_vf = self._build_vfs('text', True, True)
467
        # XXX: We don't walk the chk map to determine referenced (file_id,
468
        #      revision_id) keys.  We don't do it yet because you really need
469
        #      to filter out the ones that are present in the parents of the
470
        #      rev just before the ones you are copying, otherwise the filter
471
        #      is grabbing too many keys...
472
        text_keys = source_vf.keys()
473
        self._copy_stream(source_vf, target_vf, text_keys,
4511.2.1 by Matt Nordhoff
Fix pluralisation of gc's "repacking N texts" message
474
                          'texts', self._get_progress_stream, 4)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
475
476
    def _copy_signature_texts(self):
477
        source_vf, target_vf = self._build_vfs('signature', False, False)
478
        signature_keys = source_vf.keys()
479
        signature_keys.intersection(self.revision_keys)
480
        self._copy_stream(source_vf, target_vf, signature_keys,
481
                          'signatures', self._get_progress_stream, 5)
482
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
483
    def _create_pack_from_packs(self):
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
484
        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.
485
        self.new_pack = self.open_pack()
486
        # Is this necessary for GC ?
487
        self.new_pack.set_write_cache_size(1024*1024)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
488
        self._copy_revision_texts()
489
        self._copy_inventory_texts()
490
        self._copy_chk_texts()
491
        self._copy_text_texts()
492
        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.
493
        self.new_pack._check_references()
494
        if not self._use_pack(self.new_pack):
495
            self.new_pack.abort()
496
            return None
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
497
        self.new_pack.finish_content()
498
        if len(self.packs) == 1:
499
            old_pack = self.packs[0]
500
            if old_pack.name == self.new_pack._hash.hexdigest():
501
                # The single old pack was already optimally packed.
4476.3.68 by Andrew Bennetts
Review comments from John.
502
                trace.mutter('single pack %s was already optimally packed',
4476.3.67 by Andrew Bennetts
mutter when gc packer encounters a single, optimally packed pack.
503
                    old_pack.name)
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
504
                self.new_pack.abort()
505
                return None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
506
        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.
507
        self.new_pack.finish()
508
        self._pack_collection.allocate(self.new_pack)
509
        return self.new_pack
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
510
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
511
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
512
class GCCHKReconcilePacker(GCCHKPacker):
513
    """A packer which regenerates indices etc as it copies.
514
515
    This is used by ``bzr reconcile`` to cause parent text pointers to be
516
    regenerated.
517
    """
518
519
    def __init__(self, *args, **kwargs):
520
        super(GCCHKReconcilePacker, self).__init__(*args, **kwargs)
521
        self._data_changed = False
522
        self._gather_text_refs = True
523
524
    def _copy_inventory_texts(self):
525
        source_vf, target_vf = self._build_vfs('inventory', True, True)
526
        self._copy_stream(source_vf, target_vf, self.revision_keys,
527
                          'inventories', self._get_filtered_inv_stream, 2)
528
        if source_vf.keys() != self.revision_keys:
529
            self._data_changed = True
530
531
    def _copy_text_texts(self):
532
        """generate what texts we should have and then copy."""
533
        source_vf, target_vf = self._build_vfs('text', True, True)
534
        trace.mutter('repacking %d texts', len(self._text_refs))
535
        self.pb.update("repacking texts", 4)
536
        # we have three major tasks here:
537
        # 1) generate the ideal index
538
        repo = self._pack_collection.repo
539
        # We want the one we just wrote, so base it on self.new_pack
540
        revision_vf = self._build_vf('revision', True, False, for_write=True)
541
        ancestor_keys = revision_vf.get_parent_map(revision_vf.keys())
542
        # Strip keys back into revision_ids.
543
        ancestors = dict((k[0], tuple([p[0] for p in parents]))
544
                         for k, parents in ancestor_keys.iteritems())
545
        del ancestor_keys
546
        # TODO: _generate_text_key_index should be much cheaper to generate from
547
        #       a chk repository, rather than the current implementation
548
        ideal_index = repo._generate_text_key_index(None, ancestors)
549
        file_id_parent_map = source_vf.get_parent_map(self._text_refs)
550
        # 2) generate a keys list that contains all the entries that can
551
        #    be used as-is, with corrected parents.
552
        ok_keys = []
553
        new_parent_keys = {} # (key, parent_keys)
554
        discarded_keys = []
555
        NULL_REVISION = _mod_revision.NULL_REVISION
556
        for key in self._text_refs:
557
            # 0 - index
558
            # 1 - key
559
            # 2 - value
560
            # 3 - refs
561
            try:
562
                ideal_parents = tuple(ideal_index[key])
563
            except KeyError:
564
                discarded_keys.append(key)
565
                self._data_changed = True
566
            else:
567
                if ideal_parents == (NULL_REVISION,):
568
                    ideal_parents = ()
569
                source_parents = file_id_parent_map[key]
570
                if ideal_parents == source_parents:
571
                    # no change needed.
572
                    ok_keys.append(key)
573
                else:
574
                    # We need to change the parent graph, but we don't need to
575
                    # re-insert the text (since we don't pun the compression
576
                    # parent with the parents list)
577
                    self._data_changed = True
578
                    new_parent_keys[key] = ideal_parents
579
        # we're finished with some data.
580
        del ideal_index
581
        del file_id_parent_map
582
        # 3) bulk copy the data, updating records than need it
583
        def _update_parents_for_texts():
584
            stream = source_vf.get_record_stream(self._text_refs,
585
                'groupcompress', False)
586
            for record in stream:
587
                if record.key in new_parent_keys:
588
                    record.parents = new_parent_keys[record.key]
589
                yield record
590
        target_vf.insert_record_stream(_update_parents_for_texts())
591
592
    def _use_pack(self, new_pack):
593
        """Override _use_pack to check for reconcile having changed content."""
594
        return new_pack.data_inserted() and self._data_changed
595
596
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
597
class GCCHKCanonicalizingPacker(GCCHKPacker):
598
    """A packer that ensures inventories have canonical-form CHK maps.
599
    
600
    Ideally this would be part of reconcile, but it's very slow and rarely
5375.1.5 by Andrew Bennetts
Tweak comment.
601
    needed.  (It repairs repositories affected by
602
    https://bugs.launchpad.net/bzr/+bug/522637).
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
603
    """
604
605
    def __init__(self, *args, **kwargs):
606
        super(GCCHKCanonicalizingPacker, self).__init__(*args, **kwargs)
607
        self._data_changed = False
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
608
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
609
    def _exhaust_stream(self, source_vf, keys, message, vf_to_stream, pb_offset):
610
        """Create and exhaust a stream, but don't insert it.
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
611
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
612
        This is useful to get the side-effects of generating a stream.
613
        """
614
        self.pb.update('scanning %s' % (message,), pb_offset)
615
        child_pb = ui.ui_factory.nested_progress_bar()
616
        try:
617
            list(vf_to_stream(source_vf, keys, message, child_pb))
618
        finally:
619
            child_pb.finished()
620
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
621
    def _copy_inventory_texts(self):
622
        source_vf, target_vf = self._build_vfs('inventory', True, True)
623
        source_chk_vf, target_chk_vf = self._get_chk_vfs_for_copy()
624
        inventory_keys = source_vf.keys()
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
625
        # First, copy the existing CHKs on the assumption that most of them
626
        # will be correct.  This will save us from having to reinsert (and
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
627
        # recompress) these records later at the cost of perhaps preserving a
628
        # few unused CHKs. 
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
629
        # (Iterate but don't insert _get_filtered_inv_stream to populate the
630
        # variables needed by GCCHKPacker._copy_chk_texts.)
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
631
        self._exhaust_stream(source_vf, inventory_keys, 'inventories',
632
                self._get_filtered_inv_stream, 2)
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
633
        GCCHKPacker._copy_chk_texts(self)
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
634
        # Now copy and fix the inventories, and any regenerated CHKs.
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
635
        def chk_canonicalizing_inv_stream(source_vf, keys, message, pb=None):
636
            return self._get_filtered_canonicalizing_inv_stream(
637
                source_vf, keys, message, pb, source_chk_vf, target_chk_vf)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
638
        self._copy_stream(source_vf, target_vf, inventory_keys,
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
639
                          'inventories', chk_canonicalizing_inv_stream, 4)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
640
641
    def _copy_chk_texts(self):
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
642
        # No-op; in this class this happens during _copy_inventory_texts.
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
643
        pass
644
645
    def _get_filtered_canonicalizing_inv_stream(self, source_vf, keys, message,
646
            pb=None, source_chk_vf=None, target_chk_vf=None):
647
        """Filter the texts of inventories, regenerating CHKs to make sure they
648
        are canonical.
649
        """
650
        total_keys = len(keys)
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
651
        target_chk_vf = versionedfile.NoDupeAddLinesDecorator(target_chk_vf)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
652
        def _filtered_inv_stream():
653
            stream = source_vf.get_record_stream(keys, 'groupcompress', True)
654
            search_key_name = None
655
            for idx, record in enumerate(stream):
656
                # Inventories should always be with revisions; assume success.
657
                bytes = record.get_bytes_as('fulltext')
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
658
                chk_inv = inventory.CHKInventory.deserialise(
659
                    source_chk_vf, bytes, record.key)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
660
                if pb is not None:
661
                    pb.update('inv', idx, total_keys)
662
                chk_inv.id_to_entry._ensure_root()
663
                if search_key_name is None:
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
664
                    # Find the name corresponding to the search_key_func
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
665
                    search_key_reg = chk_map.search_key_registry
666
                    for search_key_name, func in search_key_reg.iteritems():
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
667
                        if func == chk_inv.id_to_entry._search_key_func:
668
                            break
669
                canonical_inv = inventory.CHKInventory.from_inventory(
670
                    target_chk_vf, chk_inv,
671
                    maximum_size=chk_inv.id_to_entry._root_node._maximum_size,
672
                    search_key_name=search_key_name)
673
                if chk_inv.id_to_entry.key() != canonical_inv.id_to_entry.key():
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
674
                    trace.mutter(
675
                        'Non-canonical CHK map for id_to_entry of inv: %s '
676
                        '(root is %s, should be %s)' % (chk_inv.revision_id,
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
677
                        chk_inv.id_to_entry.key()[0],
678
                        canonical_inv.id_to_entry.key()[0]))
679
                    self._data_changed = True
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
680
                p_id_map = chk_inv.parent_id_basename_to_file_id
681
                p_id_map._ensure_root()
682
                canon_p_id_map = canonical_inv.parent_id_basename_to_file_id
683
                if p_id_map.key() != canon_p_id_map.key():
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
684
                    trace.mutter(
685
                        'Non-canonical CHK map for parent_id_to_basename of '
686
                        'inv: %s (root is %s, should be %s)'
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
687
                        % (chk_inv.revision_id, p_id_map.key()[0],
688
                           canon_p_id_map.key()[0]))
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
689
                    self._data_changed = True
690
                yield versionedfile.ChunkedContentFactory(record.key,
691
                        record.parents, record.sha1,
692
                        canonical_inv.to_lines())
693
            # We have finished processing all of the inventory records, we
694
            # don't need these sets anymore
695
        return _filtered_inv_stream()
696
697
    def _use_pack(self, new_pack):
698
        """Override _use_pack to check for reconcile having changed content."""
699
        return new_pack.data_inserted() and self._data_changed
700
701
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
702
class GCRepositoryPackCollection(RepositoryPackCollection):
703
704
    pack_factory = GCPack
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
705
    resumed_pack_factory = ResumedGCPack
5757.7.3 by Jelmer Vernooij
Move more knitpack-specific functionality out of Packer.
706
    normal_packer_class = GCCHKPacker
707
    optimising_packer_class = GCCHKPacker
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
708
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
709
    def _check_new_inventories(self):
710
        """Detect missing inventories or chk root entries for the new revisions
711
        in this write group.
712
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
713
        :returns: list of strs, summarising any problems found.  If the list is
714
            empty no problems were found.
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
715
        """
716
        # Ensure that all revisions added in this write group have:
717
        #   - corresponding inventories,
718
        #   - chk root entries for those inventories,
719
        #   - and any present parent inventories have their chk root
720
        #     entries too.
721
        # And all this should be independent of any fallback repository.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
722
        problems = []
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
723
        key_deps = self.repo.revisions._index._key_dependencies
724
        new_revisions_keys = key_deps.get_new_keys()
725
        no_fallback_inv_index = self.repo.inventories._index
726
        no_fallback_chk_bytes_index = self.repo.chk_bytes._index
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
727
        no_fallback_texts_index = self.repo.texts._index
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
728
        inv_parent_map = no_fallback_inv_index.get_parent_map(
729
            new_revisions_keys)
730
        # Are any inventories for corresponding to the new revisions missing?
731
        corresponding_invs = set(inv_parent_map)
732
        missing_corresponding = set(new_revisions_keys)
733
        missing_corresponding.difference_update(corresponding_invs)
734
        if missing_corresponding:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
735
            problems.append("inventories missing for revisions %s" %
736
                (sorted(missing_corresponding),))
737
            return problems
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
738
        # Are any chk root entries missing for any inventories?  This includes
739
        # any present parent inventories, which may be used when calculating
740
        # deltas for streaming.
741
        all_inv_keys = set(corresponding_invs)
742
        for parent_inv_keys in inv_parent_map.itervalues():
743
            all_inv_keys.update(parent_inv_keys)
744
        # Filter out ghost parents.
745
        all_inv_keys.intersection_update(
746
            no_fallback_inv_index.get_parent_map(all_inv_keys))
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
747
        parent_invs_only_keys = all_inv_keys.symmetric_difference(
748
            corresponding_invs)
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
749
        all_missing = set()
750
        inv_ids = [key[-1] for key in all_inv_keys]
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
751
        parent_invs_only_ids = [key[-1] for key in parent_invs_only_keys]
752
        root_key_info = _build_interesting_key_sets(
753
            self.repo, inv_ids, parent_invs_only_ids)
754
        expected_chk_roots = root_key_info.all_keys()
755
        present_chk_roots = no_fallback_chk_bytes_index.get_parent_map(
756
            expected_chk_roots)
757
        missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
758
        if missing_chk_roots:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
759
            problems.append("missing referenced chk root keys: %s"
760
                % (sorted(missing_chk_roots),))
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
761
            # Don't bother checking any further.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
762
            return problems
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
763
        # Find all interesting chk_bytes records, and make sure they are
764
        # present, as well as the text keys they reference.
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
765
        chk_bytes_no_fallbacks = self.repo.chk_bytes.without_fallbacks()
766
        chk_bytes_no_fallbacks._search_key_func = \
767
            self.repo.chk_bytes._search_key_func
768
        chk_diff = chk_map.iter_interesting_nodes(
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
769
            chk_bytes_no_fallbacks, root_key_info.interesting_root_keys,
770
            root_key_info.uninteresting_root_keys)
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
771
        text_keys = set()
772
        try:
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
773
            for record in _filter_text_keys(chk_diff, text_keys,
774
                                            chk_map._bytes_to_text_key):
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
775
                pass
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
776
        except errors.NoSuchRevision, e:
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
777
            # XXX: It would be nice if we could give a more precise error here.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
778
            problems.append("missing chk node(s) for id_to_entry maps")
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
779
        chk_diff = chk_map.iter_interesting_nodes(
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
780
            chk_bytes_no_fallbacks, root_key_info.interesting_pid_root_keys,
781
            root_key_info.uninteresting_pid_root_keys)
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
782
        try:
783
            for interesting_rec, interesting_map in chk_diff:
784
                pass
785
        except errors.NoSuchRevision, e:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
786
            problems.append(
787
                "missing chk node(s) for parent_id_basename_to_file_id maps")
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
788
        present_text_keys = no_fallback_texts_index.get_parent_map(text_keys)
789
        missing_text_keys = text_keys.difference(present_text_keys)
790
        if missing_text_keys:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
791
            problems.append("missing text keys: %r"
792
                % (sorted(missing_text_keys),))
793
        return problems
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
794
0.17.9 by Robert Collins
Initial stab at repository format support.
795
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
796
class CHKInventoryRepository(PackRepository):
797
    """subclass of PackRepository that uses CHK based inventories."""
0.17.26 by Robert Collins
Working better --gc-plain-chk.
798
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
799
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
800
        _serializer):
801
        """Overridden to change pack collection class."""
5757.8.10 by Jelmer Vernooij
Merge direct pack access branch.
802
        super(CHKInventoryRepository, self).__init__(_format, a_bzrdir,
803
            control_files, _commit_builder_class, _serializer)
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
804
        index_transport = self._transport.clone('indices')
805
        self._pack_collection = GCRepositoryPackCollection(self,
806
            self._transport, index_transport,
807
            self._transport.clone('upload'),
808
            self._transport.clone('packs'),
809
            _format.index_builder_class,
810
            _format.index_class,
811
            use_chk_index=self._format.supports_chks,
812
            )
813
        self.inventories = GroupCompressVersionedFiles(
814
            _GCGraphIndex(self._pack_collection.inventory_index.combined_index,
815
                add_callback=self._pack_collection.inventory_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
816
                parents=True, is_locked=self.is_locked,
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
817
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
818
            access=self._pack_collection.inventory_index.data_access)
819
        self.revisions = GroupCompressVersionedFiles(
820
            _GCGraphIndex(self._pack_collection.revision_index.combined_index,
821
                add_callback=self._pack_collection.revision_index.add_callback,
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
822
                parents=True, is_locked=self.is_locked,
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
823
                track_external_parent_refs=True, track_new_keys=True),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
824
            access=self._pack_collection.revision_index.data_access,
825
            delta=False)
826
        self.signatures = GroupCompressVersionedFiles(
827
            _GCGraphIndex(self._pack_collection.signature_index.combined_index,
828
                add_callback=self._pack_collection.signature_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
829
                parents=False, is_locked=self.is_locked,
830
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
831
            access=self._pack_collection.signature_index.data_access,
832
            delta=False)
833
        self.texts = GroupCompressVersionedFiles(
834
            _GCGraphIndex(self._pack_collection.text_index.combined_index,
835
                add_callback=self._pack_collection.text_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
836
                parents=True, is_locked=self.is_locked,
837
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
838
            access=self._pack_collection.text_index.data_access)
839
        # No parents, individual CHK pages don't have specific ancestry
840
        self.chk_bytes = GroupCompressVersionedFiles(
841
            _GCGraphIndex(self._pack_collection.chk_index.combined_index,
842
                add_callback=self._pack_collection.chk_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
843
                parents=False, is_locked=self.is_locked,
844
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
845
            access=self._pack_collection.chk_index.data_access)
4476.1.17 by John Arbash Meinel
Start running all of the iter_interesting_nodes tests
846
        search_key_name = self._format._serializer.search_key_name
847
        search_key_func = chk_map.search_key_registry.get(search_key_name)
848
        self.chk_bytes._search_key_func = search_key_func
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
849
        # True when the repository object is 'write locked' (as opposed to the
850
        # physical lock only taken out around changes to the pack-names list.)
851
        # Another way to represent this would be a decorator around the control
852
        # files object that presents logical locks as physical ones - if this
853
        # gets ugly consider that alternative design. RBC 20071011
854
        self._write_lock_count = 0
855
        self._transaction = None
856
        # for tests
857
        self._reconcile_does_inventory_gc = True
858
        self._reconcile_fixes_text_parents = True
859
        self._reconcile_backsup_inventory = False
0.17.26 by Robert Collins
Working better --gc-plain-chk.
860
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)
861
    def _add_inventory_checked(self, revision_id, inv, parents):
862
        """Add inv to the repository after checking the inputs.
863
864
        This function can be overridden to allow different inventory styles.
865
866
        :seealso: add_inventory, for the contract.
867
        """
868
        # make inventory
869
        serializer = self._format._serializer
870
        result = inventory.CHKInventory.from_inventory(self.chk_bytes, inv,
871
            maximum_size=serializer.maximum_size,
872
            search_key_name=serializer.search_key_name)
873
        inv_lines = result.to_lines()
874
        return self._inventory_add_lines(revision_id, parents,
875
            inv_lines, check_content=False)
876
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
877
    def _create_inv_from_null(self, delta, revision_id):
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
878
        """This will mutate new_inv directly.
879
880
        This is a simplified form of create_by_apply_delta which knows that all
881
        the old values must be None, so everything is a create.
882
        """
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
883
        serializer = self._format._serializer
884
        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
885
        new_inv.revision_id = revision_id
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
886
        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.
887
        id_to_entry_dict = {}
888
        parent_id_basename_dict = {}
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
889
        for old_path, new_path, file_id, entry in delta:
4413.5.8 by John Arbash Meinel
Change some asserts into raise: calls.
890
            if old_path is not None:
891
                raise ValueError('Invalid delta, somebody tried to delete %r'
892
                                 ' from the NULL_REVISION'
893
                                 % ((old_path, file_id),))
894
            if new_path is None:
895
                raise ValueError('Invalid delta, delta from NULL_REVISION has'
896
                                 ' no new_path %r' % (file_id,))
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
897
            if new_path == '':
898
                new_inv.root_id = file_id
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
899
                parent_id_basename_key = StaticTuple('', '').intern()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
900
            else:
901
                utf8_entry_name = entry.name.encode('utf-8')
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
902
                parent_id_basename_key = StaticTuple(entry.parent_id,
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
903
                                                     utf8_entry_name).intern()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
904
            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.
905
            # Populate Caches?
906
            # new_inv._path_to_fileid_cache[new_path] = file_id
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
907
            key = StaticTuple(file_id).intern()
908
            id_to_entry_dict[key] = new_value
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
909
            parent_id_basename_dict[parent_id_basename_key] = file_id
910
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
911
        new_inv._populate_from_dicts(self.chk_bytes, id_to_entry_dict,
912
            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.
913
        return new_inv
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
914
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)
915
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
916
                               parents, basis_inv=None, propagate_caches=False):
917
        """Add a new inventory expressed as a delta against another revision.
918
919
        :param basis_revision_id: The inventory id the delta was created
920
            against.
921
        :param delta: The inventory delta (see Inventory.apply_delta for
922
            details).
923
        :param new_revision_id: The revision id that the inventory is being
924
            added for.
925
        :param parents: The revision ids of the parents that revision_id is
926
            known to have and are in the repository already. These are supplied
927
            for repositories that depend on the inventory graph for revision
928
            graph access, as well as for those that pun ancestry with delta
929
            compression.
930
        :param basis_inv: The basis inventory if it is already known,
931
            otherwise None.
932
        :param propagate_caches: If True, the caches for this inventory are
933
          copied to and updated for the result if possible.
934
935
        :returns: (validator, new_inv)
936
            The validator(which is a sha1 digest, though what is sha'd is
937
            repository format specific) of the serialized inventory, and the
938
            resulting inventory.
939
        """
940
        if not self.is_in_write_group():
941
            raise AssertionError("%r not in write group" % (self,))
942
        _mod_revision.check_not_reserved_id(new_revision_id)
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
943
        basis_tree = None
944
        if basis_inv is None:
945
            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.
946
                new_inv = self._create_inv_from_null(delta, new_revision_id)
5222.1.1 by Aaron Bentley
Refuse to commit trees with no root.
947
                if new_inv.root_id is None:
948
                    raise errors.RootMissing()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
949
                inv_lines = new_inv.to_lines()
950
                return self._inventory_add_lines(new_revision_id, parents,
951
                    inv_lines, check_content=False), new_inv
952
            else:
953
                basis_tree = self.revision_tree(basis_revision_id)
954
                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)
955
                basis_inv = basis_tree.inventory
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
956
        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)
957
            result = basis_inv.create_by_apply_delta(delta, new_revision_id,
958
                propagate_caches=propagate_caches)
959
            inv_lines = result.to_lines()
960
            return self._inventory_add_lines(new_revision_id, parents,
961
                inv_lines, check_content=False), result
962
        finally:
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
963
            if basis_tree is not None:
964
                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)
965
4988.3.3 by Jelmer Vernooij
rename Repository.deserialise_inventory to Repository._deserialise_inventory.
966
    def _deserialise_inventory(self, revision_id, bytes):
4332.3.27 by Robert Collins
Fix deserialise_inventory to work with CHK repositories.
967
        return inventory.CHKInventory.deserialise(self.chk_bytes, bytes,
968
            (revision_id,))
969
4476.3.1 by Andrew Bennetts
Initial hacking to use inventory deltas for cross-format fetch.
970
    def _iter_inventories(self, revision_ids, ordering):
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)
971
        """Iterate over many inventory objects."""
4476.3.68 by Andrew Bennetts
Review comments from John.
972
        if ordering is None:
973
            ordering = 'unordered'
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)
974
        keys = [(revision_id,) for revision_id in revision_ids]
4476.3.1 by Andrew Bennetts
Initial hacking to use inventory deltas for cross-format fetch.
975
        stream = self.inventories.get_record_stream(keys, ordering, 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)
976
        texts = {}
977
        for record in stream:
978
            if record.storage_kind != 'absent':
979
                texts[record.key] = record.get_bytes_as('fulltext')
980
            else:
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
981
                texts[record.key] = None
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)
982
        for key in keys:
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
983
            bytes = texts[key]
984
            if bytes is None:
985
                yield (None, key[-1])
986
            else:
987
                yield (inventory.CHKInventory.deserialise(
988
                    self.chk_bytes, bytes, key), key[-1])
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)
989
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
990
    def _get_inventory_xml(self, revision_id):
991
        """Get serialized inventory as a string."""
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
992
        # Without a native 'xml' inventory, this method doesn't make sense.
993
        # However older working trees, and older bundles want it - so we supply
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
994
        # it allowing _get_inventory_xml to work. Bundles currently use the
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
995
        # serializer directly; this also isn't ideal, but there isn't an xml
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
996
        # iteration interface offered at all for repositories.
6282.6.19 by Jelmer Vernooij
More test fixes.
997
        return self._serializer.write_inventory_to_string(
998
            self.get_inventory(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)
999
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1000
    def _find_present_inventory_keys(self, revision_keys):
1001
        parent_map = self.inventories.get_parent_map(revision_keys)
1002
        present_inventory_keys = set(k for k in parent_map)
1003
        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)
1004
1005
    def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
1006
        """Find the file ids and versions affected by revisions.
1007
1008
        :param revisions: an iterable containing revision ids.
1009
        :param _inv_weave: The inventory weave from this repository or None.
1010
            If None, the inventory weave will be opened automatically.
1011
        :return: a dictionary mapping altered file-ids to an iterable of
1012
            revision_ids. Each altered file-ids has the exact revision_ids that
1013
            altered it listed explicitly.
1014
        """
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1015
        rich_root = self.supports_rich_root()
1016
        bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
1017
        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)
1018
        pb = ui.ui_factory.nested_progress_bar()
1019
        try:
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1020
            revision_keys = [(r,) for r in revision_ids]
1021
            parent_keys = self._find_parent_keys_of_revisions(revision_keys)
1022
            # TODO: instead of using _find_present_inventory_keys, change the
1023
            #       code paths to allow missing inventories to be tolerated.
1024
            #       However, we only want to tolerate missing parent
1025
            #       inventories, not missing inventories for revision_ids
1026
            present_parent_inv_keys = self._find_present_inventory_keys(
1027
                                        parent_keys)
1028
            present_parent_inv_ids = set(
1029
                [k[-1] for k in present_parent_inv_keys])
1030
            inventories_to_read = set(revision_ids)
1031
            inventories_to_read.update(present_parent_inv_ids)
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
1032
            root_key_info = _build_interesting_key_sets(
1033
                self, inventories_to_read, present_parent_inv_ids)
1034
            interesting_root_keys = root_key_info.interesting_root_keys
1035
            uninteresting_root_keys = root_key_info.uninteresting_root_keys
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1036
            chk_bytes = self.chk_bytes
1037
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
1038
                        interesting_root_keys, uninteresting_root_keys,
1039
                        pb=pb):
1040
                for name, bytes in items:
1041
                    (name_utf8, file_id, revision_id) = bytes_to_info(bytes)
4679.9.23 by John Arbash Meinel
Mostly TODO entries.
1042
                    # TODO: consider interning file_id, revision_id here, or
1043
                    #       pushing that intern() into bytes_to_info()
1044
                    # TODO: rich_root should always be True here, for all
1045
                    #       repositories that support chk_bytes
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1046
                    if not rich_root and name_utf8 == '':
1047
                        continue
1048
                    try:
1049
                        file_id_revisions[file_id].add(revision_id)
1050
                    except KeyError:
1051
                        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)
1052
        finally:
1053
            pb.finished()
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1054
        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)
1055
1056
    def find_text_key_references(self):
1057
        """Find the text key references within the repository.
1058
1059
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1060
            to whether they were referred to by the inventory of the
1061
            revision_id that they contain. The inventory texts from all present
1062
            revision ids are assessed to generate this report.
1063
        """
1064
        # XXX: Slow version but correct: rewrite as a series of delta
1065
        # examinations/direct tree traversal. Note that that will require care
1066
        # as a common node is reachable both from the inventory that added it,
1067
        # and others afterwards.
1068
        revision_keys = self.revisions.keys()
1069
        result = {}
1070
        rich_roots = self.supports_rich_root()
1071
        pb = ui.ui_factory.nested_progress_bar()
1072
        try:
1073
            all_revs = self.all_revision_ids()
1074
            total = len(all_revs)
1075
            for pos, inv in enumerate(self.iter_inventories(all_revs)):
1076
                pb.update("Finding text references", pos, total)
1077
                for _, entry in inv.iter_entries():
1078
                    if not rich_roots and entry.file_id == inv.root_id:
1079
                        continue
1080
                    key = (entry.file_id, entry.revision)
1081
                    result.setdefault(key, False)
1082
                    if entry.revision == inv.revision_id:
1083
                        result[key] = True
1084
            return result
1085
        finally:
1086
            pb.finished()
1087
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1088
    @needs_write_lock
1089
    def reconcile_canonicalize_chks(self):
1090
        """Reconcile this repository to make sure all CHKs are in canonical
1091
        form.
1092
        """
1093
        from bzrlib.reconcile import PackReconciler
1094
        reconciler = PackReconciler(self, thorough=True, canonicalize_chks=True)
1095
        reconciler.reconcile()
1096
        return reconciler
1097
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)
1098
    def _reconcile_pack(self, collection, packs, extension, revs, pb):
1099
        packer = GCCHKReconcilePacker(collection, packs, extension)
1100
        return packer.pack(pb)
1101
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1102
    def _canonicalize_chks_pack(self, collection, packs, extension, revs, pb):
1103
        packer = GCCHKCanonicalizingPacker(collection, packs, extension, revs)
1104
        return packer.pack(pb)
1105
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1106
    def _get_source(self, to_format):
1107
        """Return a source for streaming from this repository."""
4476.3.74 by Andrew Bennetts
Remove unnecessary clause from if.
1108
        if self._format._serializer == to_format._serializer:
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1109
            # We must be exactly the same format, otherwise stuff like the chk
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
1110
            # page layout might be different.
1111
            # Actually, this test is just slightly looser than exact so that
1112
            # CHK2 <-> 2a transfers will work.
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1113
            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)
1114
        return super(CHKInventoryRepository, self)._get_source(to_format)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1115
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
1116
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1117
        """Find revisions with different parent lists in the revision object
1118
        and in the index graph.
1119
1120
        :param revisions_iterator: None, or an iterator of (revid,
1121
            Revision-or-None). This iterator controls the revisions checked.
1122
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
1123
            parents-in-revision).
1124
        """
1125
        if not self.is_locked():
1126
            raise AssertionError()
1127
        vf = self.revisions
1128
        if revisions_iterator is None:
1129
            revisions_iterator = self._iter_revisions(None)
1130
        for revid, revision in revisions_iterator:
1131
            if revision is None:
1132
                pass
1133
            parent_map = vf.get_parent_map([(revid,)])
1134
            parents_according_to_index = tuple(parent[-1] for parent in
1135
                parent_map[(revid,)])
1136
            parents_according_to_revision = tuple(revision.parent_ids)
1137
            if parents_according_to_index != parents_according_to_revision:
1138
                yield (revid, parents_according_to_index,
1139
                    parents_according_to_revision)
1140
1141
    def _check_for_inconsistent_revision_parents(self):
1142
        inconsistencies = list(self._find_inconsistent_revision_parents())
1143
        if inconsistencies:
1144
            raise errors.BzrCheckError(
1145
                "Revision index has inconsistent parents.")
1146
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1147
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
1148
class GroupCHKStreamSource(StreamSource):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1149
    """Used when both the source and target repo are GroupCHK repos."""
1150
1151
    def __init__(self, from_repository, to_format):
1152
        """Create a StreamSource streaming from from_repository."""
1153
        super(GroupCHKStreamSource, self).__init__(from_repository, to_format)
1154
        self._revision_keys = None
1155
        self._text_keys = None
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
1156
        self._text_fetch_order = 'groupcompress'
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1157
        self._chk_id_roots = None
1158
        self._chk_p_id_roots = None
1159
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1160
    def _get_inventory_stream(self, inventory_keys, allow_absent=False):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1161
        """Get a stream of inventory texts.
1162
1163
        When this function returns, self._chk_id_roots and self._chk_p_id_roots
1164
        should be populated.
1165
        """
1166
        self._chk_id_roots = []
1167
        self._chk_p_id_roots = []
1168
        def _filtered_inv_stream():
1169
            id_roots_set = set()
1170
            p_id_roots_set = set()
1171
            source_vf = self.from_repository.inventories
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1172
            stream = source_vf.get_record_stream(inventory_keys,
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
1173
                                                 'groupcompress', True)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1174
            for record in stream:
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1175
                if record.storage_kind == 'absent':
1176
                    if allow_absent:
1177
                        continue
1178
                    else:
1179
                        raise errors.NoSuchRevision(self, record.key)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1180
                bytes = record.get_bytes_as('fulltext')
1181
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
1182
                                                             record.key)
1183
                key = chk_inv.id_to_entry.key()
1184
                if key not in id_roots_set:
1185
                    self._chk_id_roots.append(key)
1186
                    id_roots_set.add(key)
1187
                p_id_map = chk_inv.parent_id_basename_to_file_id
1188
                if p_id_map is None:
1189
                    raise AssertionError('Parent id -> file_id map not set')
1190
                key = p_id_map.key()
1191
                if key not in p_id_roots_set:
1192
                    p_id_roots_set.add(key)
1193
                    self._chk_p_id_roots.append(key)
1194
                yield record
1195
            # We have finished processing all of the inventory records, we
1196
            # don't need these sets anymore
1197
            id_roots_set.clear()
1198
            p_id_roots_set.clear()
1199
        return ('inventories', _filtered_inv_stream())
1200
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1201
    def _get_filtered_chk_streams(self, excluded_revision_keys):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1202
        self._text_keys = set()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1203
        excluded_revision_keys.discard(_mod_revision.NULL_REVISION)
1204
        if not excluded_revision_keys:
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1205
            uninteresting_root_keys = set()
1206
            uninteresting_pid_root_keys = set()
1207
        else:
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
1208
            # filter out any excluded revisions whose inventories are not
1209
            # actually present
1210
            # TODO: Update Repository.iter_inventories() to add
1211
            #       ignore_missing=True
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1212
            present_keys = self.from_repository._find_present_inventory_keys(
1213
                            excluded_revision_keys)
1214
            present_ids = [k[-1] for k in present_keys]
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1215
            uninteresting_root_keys = set()
1216
            uninteresting_pid_root_keys = set()
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
1217
            for inv in self.from_repository.iter_inventories(present_ids):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1218
                uninteresting_root_keys.add(inv.id_to_entry.key())
1219
                uninteresting_pid_root_keys.add(
1220
                    inv.parent_id_basename_to_file_id.key())
1221
        chk_bytes = self.from_repository.chk_bytes
1222
        def _filter_id_to_entry():
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1223
            interesting_nodes = chk_map.iter_interesting_nodes(chk_bytes,
1224
                        self._chk_id_roots, uninteresting_root_keys)
1225
            for record in _filter_text_keys(interesting_nodes, self._text_keys,
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1226
                    chk_map._bytes_to_text_key):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1227
                if record is not None:
1228
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1229
            # Consumed
1230
            self._chk_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1231
        yield 'chk_bytes', _filter_id_to_entry()
1232
        def _get_parent_id_basename_to_file_id_pages():
1233
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
1234
                        self._chk_p_id_roots, uninteresting_pid_root_keys):
1235
                if record is not None:
1236
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1237
            # Consumed
1238
            self._chk_p_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1239
        yield 'chk_bytes', _get_parent_id_basename_to_file_id_pages()
1240
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
1241
    def _get_text_stream(self):
1242
        # Note: We know we don't have to handle adding root keys, because both
1243
        # the source and target are the identical network name.
1244
        text_stream = self.from_repository.texts.get_record_stream(
1245
                        self._text_keys, self._text_fetch_order, False)
1246
        return ('texts', text_stream)
1247
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1248
    def get_stream(self, search):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1249
        def wrap_and_count(pb, rc, stream):
5195.3.27 by Parth Malwankar
code cleanup and comments.
1250
            """Yield records from stream while showing progress."""
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1251
            count = 0
1252
            for record in stream:
1253
                if count == rc.STEP:
1254
                    rc.increment(count)
1255
                    pb.update('Estimate', rc.current, rc.max)
1256
                    count = 0
1257
                count += 1
1258
                yield record
1259
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1260
        revision_ids = search.get_keys()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1261
        pb = ui.ui_factory.nested_progress_bar()
1262
        rc = self._record_counter
1263
        self._record_counter.setup(len(revision_ids))
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1264
        for stream_info in self._fetch_revision_texts(revision_ids):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1265
            yield (stream_info[0],
1266
                wrap_and_count(pb, rc, stream_info[1]))
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1267
        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
4343.3.12 by John Arbash Meinel
instead of trusting the Search, use a get_parent_map call.
1268
        # TODO: The keys to exclude might be part of the search recipe
1269
        # For now, exclude all parents that are at the edge of ancestry, for
1270
        # which we have inventories
4343.3.36 by John Arbash Meinel
Some review feedback from Andrew.
1271
        from_repo = self.from_repository
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1272
        parent_keys = from_repo._find_parent_keys_of_revisions(
1273
                        self._revision_keys)
5829.1.1 by Andrew Bennetts
Share _group_cache when using GroupCompressVersionedFiles.without_fallbacks, and move _find_parents_keys_of_revisions call to before we clear repo.revisions' cache.
1274
        self.from_repository.revisions.clear_cache()
1275
        self.from_repository.signatures.clear_cache()
5816.8.7 by Andrew Bennetts
Some tweaks to caching prompted by John's review.
1276
        # Clear the repo's get_parent_map cache too.
1277
        self.from_repository._unstacked_provider.disable_cache()
1278
        self.from_repository._unstacked_provider.enable_cache()
5829.1.1 by Andrew Bennetts
Share _group_cache when using GroupCompressVersionedFiles.without_fallbacks, and move _find_parents_keys_of_revisions call to before we clear repo.revisions' cache.
1279
        s = self._get_inventory_stream(self._revision_keys)
1280
        yield (s[0], wrap_and_count(pb, rc, s[1]))
1281
        self.from_repository.inventories.clear_cache()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1282
        for stream_info in self._get_filtered_chk_streams(parent_keys):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1283
            yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1284
        self.from_repository.chk_bytes.clear_cache()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1285
        s = self._get_text_stream()
1286
        yield (s[0], wrap_and_count(pb, rc, s[1]))
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1287
        self.from_repository.texts.clear_cache()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1288
        pb.update('Done', rc.max, rc.max)
1289
        pb.finished()
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)
1290
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1291
    def get_stream_for_missing_keys(self, missing_keys):
1292
        # missing keys can only occur when we are byte copying and not
1293
        # translating (because translation means we don't send
1294
        # unreconstructable deltas ever).
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1295
        missing_inventory_keys = set()
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1296
        for key in missing_keys:
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1297
            if key[0] != 'inventories':
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1298
                raise AssertionError('The only missing keys we should'
1299
                    ' be filling in are inventory keys, not %s'
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1300
                    % (key[0],))
1301
            missing_inventory_keys.add(key[1:])
1302
        if self._chk_id_roots or self._chk_p_id_roots:
1303
            raise AssertionError('Cannot call get_stream_for_missing_keys'
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
1304
                ' until all of get_stream() has been consumed.')
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1305
        # 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.
1306
        # Some of the missing_keys will be missing because they are ghosts.
1307
        # As such, we can ignore them. The Sink is required to verify there are
1308
        # no unavailable texts when the ghost inventories are not filled in.
1309
        yield self._get_inventory_stream(missing_inventory_keys,
1310
                                         allow_absent=True)
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1311
        # We use the empty set for excluded_revision_keys, to make it clear
1312
        # 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.
1313
        for stream_info in self._get_filtered_chk_streams(set()):
1314
            yield stream_info
1315
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)
1316
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
1317
class _InterestingKeyInfo(object):
1318
    def __init__(self):
1319
        self.interesting_root_keys = set()
1320
        self.interesting_pid_root_keys = set()
1321
        self.uninteresting_root_keys = set()
1322
        self.uninteresting_pid_root_keys = set()
1323
1324
    def all_interesting(self):
1325
        return self.interesting_root_keys.union(self.interesting_pid_root_keys)
1326
1327
    def all_uninteresting(self):
1328
        return self.uninteresting_root_keys.union(
1329
            self.uninteresting_pid_root_keys)
1330
1331
    def all_keys(self):
1332
        return self.all_interesting().union(self.all_uninteresting())
1333
1334
1335
def _build_interesting_key_sets(repo, inventory_ids, parent_only_inv_ids):
1336
    result = _InterestingKeyInfo()
1337
    for inv in repo.iter_inventories(inventory_ids, 'unordered'):
1338
        root_key = inv.id_to_entry.key()
1339
        pid_root_key = inv.parent_id_basename_to_file_id.key()
1340
        if inv.revision_id in parent_only_inv_ids:
1341
            result.uninteresting_root_keys.add(root_key)
1342
            result.uninteresting_pid_root_keys.add(pid_root_key)
1343
        else:
1344
            result.interesting_root_keys.add(root_key)
1345
            result.interesting_pid_root_keys.add(pid_root_key)
1346
    return result
1347
1348
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1349
def _filter_text_keys(interesting_nodes_iterable, text_keys, bytes_to_text_key):
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1350
    """Iterate the result of iter_interesting_nodes, yielding the records
1351
    and adding to text_keys.
1352
    """
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1353
    text_keys_update = text_keys.update
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1354
    for record, items in interesting_nodes_iterable:
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1355
        text_keys_update([bytes_to_text_key(b) for n,b in items])
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1356
        yield record
1357
1358
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
1359
class RepositoryFormat2a(RepositoryFormatPack):
1360
    """A CHK repository that uses the bencode revision serializer."""
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)
1361
1362
    repository_class = CHKInventoryRepository
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
1363
    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)
1364
    supports_chks = True
1365
    _commit_builder_class = PackRootCommitBuilder
1366
    rich_root_data = True
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
1367
    _serializer = chk_serializer.chk_bencode_serializer
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)
1368
    _commit_inv_deltas = True
1369
    # What index classes to use
1370
    index_builder_class = BTreeBuilder
1371
    index_class = BTreeGraphIndex
1372
    # Note: We cannot unpack a delta that references a text we haven't
1373
    # seen yet. There are 2 options, work in fulltexts, or require
1374
    # topological sorting. Using fulltexts is more optimal for local
1375
    # operations, because the source can be smart about extracting
1376
    # multiple in-a-row (and sharing strings). Topological is better
1377
    # for remote, because we access less data.
1378
    _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'
1379
    _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)
1380
    fast_deltas = True
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1381
    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)
1382
1383
    def _get_matching_bzrdir(self):
4428.2.1 by Martin Pool
Add 2a format
1384
        return bzrdir.format_registry.make_bzrdir('2a')
1385
1386
    def _ignore_setting_bzrdir(self, format):
1387
        pass
1388
1389
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1390
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
1391
    @classmethod
1392
    def get_format_string(cls):
4428.2.1 by Martin Pool
Add 2a format
1393
        return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')
4634.28.1 by John Arbash Meinel
Update format description for --2a, it is no longer a 'development format'
1394
1395
    def get_format_description(self):
1396
        """See RepositoryFormat.get_format_description()."""
1397
        return ("Repository format 2a - rich roots, group compression"
1398
            " and chk inventories")
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
1399
1400
1401
class RepositoryFormat2aSubtree(RepositoryFormat2a):
1402
    """A 2a repository format that supports nested trees.
1403
1404
    """
1405
1406
    def _get_matching_bzrdir(self):
1407
        return bzrdir.format_registry.make_bzrdir('development-subtree')
1408
1409
    def _ignore_setting_bzrdir(self, format):
1410
        pass
1411
1412
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1413
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
1414
    @classmethod
1415
    def get_format_string(cls):
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
1416
        return ('Bazaar development format 8\n')
1417
1418
    def get_format_description(self):
1419
        """See RepositoryFormat.get_format_description()."""
1420
        return ("Development repository format 8 - nested trees, "
1421
                "group compression and chk inventories")
1422
1423
    experimental = True
1424
    supports_tree_reference = True