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