/brz/remove-bazaar

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