/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
1
# Copyright (C) 2007-2010 Canonical Ltd
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2
#
3
# This program is free software; you can redistribute it and/or modify
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
#
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.
12
#
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
16
4002.1.5 by Andrew Bennetts
Fix possible security issue with resuming write groups: make sure the token is well-formed so that it's not possible to steal a write group from another repo.
17
import re
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
18
import sys
19
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
22
from itertools import izip
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
23
import time
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
24
25
from bzrlib import (
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
26
    chk_map,
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
27
    cleanup,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
28
    debug,
29
    graph,
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
30
    osutils,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
31
    pack,
32
    transactions,
33
    ui,
3224.5.16 by Andrew Bennetts
Merge from bzr.dev.
34
    xml5,
35
    xml6,
36
    xml7,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
37
    )
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
38
from bzrlib.index import (
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
39
    CombinedGraphIndex,
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
40
    GraphIndexPrefixAdapter,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
41
    )
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
42
from bzrlib.knit import (
43
    KnitPlainFactory,
44
    KnitVersionedFiles,
45
    _KnitGraphIndex,
46
    _DirectPackAccess,
47
    )
3063.2.1 by Robert Collins
Solve reconciling erroring when multiple portions of a single delta chain are being reinserted.
48
from bzrlib import tsort
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
49
""")
50
from bzrlib import (
51
    bzrdir,
52
    errors,
53
    lockable_files,
54
    lockdir,
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
55
    revision as _mod_revision,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
56
    )
57
4634.85.10 by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise.
58
from bzrlib.decorators import needs_write_lock, only_raises
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
59
from bzrlib.btree_index import (
60
    BTreeGraphIndex,
61
    BTreeBuilder,
62
    )
63
from bzrlib.index import (
64
    GraphIndex,
65
    InMemoryGraphIndex,
66
    )
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
67
from bzrlib.repofmt.knitrepo import KnitRepository
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
68
from bzrlib.repository import (
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
69
    CommitBuilder,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
70
    MetaDirRepositoryFormat,
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
71
    RepositoryFormat,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
72
    RootCommitBuilder,
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
73
    StreamSource,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
74
    )
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
75
from bzrlib.trace import (
76
    mutter,
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
77
    note,
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
78
    warning,
79
    )
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
80
81
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
82
class PackCommitBuilder(CommitBuilder):
83
    """A subclass of CommitBuilder to add texts with pack semantics.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
84
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
85
    Specifically this uses one knit object rather than one knit object per
86
    added text, reducing memory and object pressure.
87
    """
88
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
89
    def __init__(self, repository, parents, config, timestamp=None,
90
                 timezone=None, committer=None, revprops=None,
91
                 revision_id=None):
92
        CommitBuilder.__init__(self, repository, parents, config,
93
            timestamp=timestamp, timezone=timezone, committer=committer,
94
            revprops=revprops, revision_id=revision_id)
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
95
        self._file_graph = graph.Graph(
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
96
            repository._pack_collection.text_index.combined_index)
97
2979.2.5 by Robert Collins
Make CommitBuilder.heads be _heads as its internal to CommitBuilder only.
98
    def _heads(self, file_id, revision_ids):
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
99
        keys = [(file_id, revision_id) for revision_id in revision_ids]
100
        return set([key[1] for key in self._file_graph.heads(keys)])
101
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
102
103
class PackRootCommitBuilder(RootCommitBuilder):
104
    """A subclass of RootCommitBuilder to add texts with pack semantics.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
105
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
106
    Specifically this uses one knit object rather than one knit object per
107
    added text, reducing memory and object pressure.
108
    """
109
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
110
    def __init__(self, repository, parents, config, timestamp=None,
111
                 timezone=None, committer=None, revprops=None,
112
                 revision_id=None):
113
        CommitBuilder.__init__(self, repository, parents, config,
114
            timestamp=timestamp, timezone=timezone, committer=committer,
115
            revprops=revprops, revision_id=revision_id)
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
116
        self._file_graph = graph.Graph(
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
117
            repository._pack_collection.text_index.combined_index)
118
2979.2.5 by Robert Collins
Make CommitBuilder.heads be _heads as its internal to CommitBuilder only.
119
    def _heads(self, file_id, revision_ids):
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
120
        keys = [(file_id, revision_id) for revision_id in revision_ids]
121
        return set([key[1] for key in self._file_graph.heads(keys)])
122
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
123
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
124
class Pack(object):
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
125
    """An in memory proxy for a pack and its indices.
126
127
    This is a base class that is not directly used, instead the classes
128
    ExistingPack and NewPack are used.
129
    """
130
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
131
    # A map of index 'type' to the file extension and position in the
132
    # index_sizes array.
133
    index_definitions = {
3735.2.98 by John Arbash Meinel
Merge bzr.dev 4032. Resolve the new streaming fetch.
134
        'chk': ('.cix', 4),
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
135
        'revision': ('.rix', 0),
136
        'inventory': ('.iix', 1),
137
        'text': ('.tix', 2),
138
        'signature': ('.six', 3),
139
        }
140
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
141
    def __init__(self, revision_index, inventory_index, text_index,
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
142
        signature_index, chk_index=None):
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
143
        """Create a pack instance.
144
145
        :param revision_index: A GraphIndex for determining what revisions are
146
            present in the Pack and accessing the locations of their texts.
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
147
        :param inventory_index: A GraphIndex for determining what inventories are
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
148
            present in the Pack and accessing the locations of their
149
            texts/deltas.
150
        :param text_index: A GraphIndex for determining what file texts
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
151
            are present in the pack and accessing the locations of their
152
            texts/deltas (via (fileid, revisionid) tuples).
3495.3.1 by Martin Pool
doc correction from SuperMMX
153
        :param signature_index: A GraphIndex for determining what signatures are
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
154
            present in the Pack and accessing the locations of their texts.
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
155
        :param chk_index: A GraphIndex for accessing content by CHK, if the
156
            pack has one.
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
157
        """
158
        self.revision_index = revision_index
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
159
        self.inventory_index = inventory_index
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
160
        self.text_index = text_index
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
161
        self.signature_index = signature_index
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
162
        self.chk_index = chk_index
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
163
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
164
    def access_tuple(self):
165
        """Return a tuple (transport, name) for the pack content."""
166
        return self.pack_transport, self.file_name()
167
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
168
    def _check_references(self):
169
        """Make sure our external references are present.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
170
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
171
        Packs are allowed to have deltas whose base is not in the pack, but it
172
        must be present somewhere in this collection.  It is not allowed to
173
        have deltas based on a fallback repository.
174
        (See <https://bugs.launchpad.net/bzr/+bug/288751>)
175
        """
176
        missing_items = {}
177
        for (index_name, external_refs, index) in [
178
            ('texts',
179
                self._get_external_refs(self.text_index),
180
                self._pack_collection.text_index.combined_index),
181
            ('inventories',
182
                self._get_external_refs(self.inventory_index),
183
                self._pack_collection.inventory_index.combined_index),
184
            ]:
185
            missing = external_refs.difference(
186
                k for (idx, k, v, r) in
187
                index.iter_entries(external_refs))
188
            if missing:
189
                missing_items[index_name] = sorted(list(missing))
190
        if missing_items:
191
            from pprint import pformat
192
            raise errors.BzrCheckError(
193
                "Newly created pack file %r has delta references to "
194
                "items not in its repository:\n%s"
195
                % (self, pformat(missing_items)))
196
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
197
    def file_name(self):
198
        """Get the file name for the pack on disk."""
199
        return self.name + '.pack'
200
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
201
    def get_revision_count(self):
202
        return self.revision_index.key_count()
203
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
204
    def index_name(self, index_type, name):
205
        """Get the disk name of an index type for pack name 'name'."""
206
        return name + Pack.index_definitions[index_type][0]
207
208
    def index_offset(self, index_type):
209
        """Get the position in a index_size array for a given index type."""
210
        return Pack.index_definitions[index_type][1]
211
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
212
    def inventory_index_name(self, name):
213
        """The inv index is the name + .iix."""
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
214
        return self.index_name('inventory', name)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
215
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
216
    def revision_index_name(self, name):
217
        """The revision index is the name + .rix."""
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
218
        return self.index_name('revision', name)
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
219
220
    def signature_index_name(self, name):
221
        """The signature index is the name + .six."""
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
222
        return self.index_name('signature', name)
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
223
224
    def text_index_name(self, name):
225
        """The text index is the name + .tix."""
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
226
        return self.index_name('text', name)
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
227
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
228
    def _replace_index_with_readonly(self, index_type):
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
229
        unlimited_cache = False
230
        if index_type == 'chk':
231
            unlimited_cache = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
232
        setattr(self, index_type + '_index',
233
            self.index_class(self.index_transport,
234
                self.index_name(index_type, self.name),
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
235
                self.index_sizes[self.index_offset(index_type)],
236
                unlimited_cache=unlimited_cache))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
237
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
238
239
class ExistingPack(Pack):
2592.3.222 by Robert Collins
More review feedback.
240
    """An in memory proxy for an existing .pack and its disk indices."""
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
241
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
242
    def __init__(self, pack_transport, name, revision_index, inventory_index,
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
243
        text_index, signature_index, chk_index=None):
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
244
        """Create an ExistingPack object.
245
246
        :param pack_transport: The transport where the pack file resides.
247
        :param name: The name of the pack on disk in the pack_transport.
248
        """
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
249
        Pack.__init__(self, revision_index, inventory_index, text_index,
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
250
            signature_index, chk_index)
2592.3.173 by Robert Collins
Basic implementation of all_packs.
251
        self.name = name
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
252
        self.pack_transport = pack_transport
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
253
        if None in (revision_index, inventory_index, text_index,
254
                signature_index, name, pack_transport):
255
            raise AssertionError()
2592.3.173 by Robert Collins
Basic implementation of all_packs.
256
257
    def __eq__(self, other):
258
        return self.__dict__ == other.__dict__
259
260
    def __ne__(self, other):
261
        return not self.__eq__(other)
262
263
    def __repr__(self):
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
264
        return "<%s.%s object at 0x%x, %s, %s" % (
265
            self.__class__.__module__, self.__class__.__name__, id(self),
266
            self.pack_transport, self.name)
267
268
269
class ResumedPack(ExistingPack):
270
271
    def __init__(self, name, revision_index, inventory_index, text_index,
272
        signature_index, upload_transport, pack_transport, index_transport,
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
273
        pack_collection, chk_index=None):
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
274
        """Create a ResumedPack object."""
275
        ExistingPack.__init__(self, pack_transport, name, revision_index,
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
276
            inventory_index, text_index, signature_index,
277
            chk_index=chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
278
        self.upload_transport = upload_transport
279
        self.index_transport = index_transport
280
        self.index_sizes = [None, None, None, None]
281
        indices = [
282
            ('revision', revision_index),
283
            ('inventory', inventory_index),
284
            ('text', text_index),
285
            ('signature', signature_index),
286
            ]
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
287
        if chk_index is not None:
288
            indices.append(('chk', chk_index))
289
            self.index_sizes.append(None)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
290
        for index_type, index in indices:
291
            offset = self.index_offset(index_type)
292
            self.index_sizes[offset] = index._size
293
        self.index_class = pack_collection._index_class
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
294
        self._pack_collection = pack_collection
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
295
        self._state = 'resumed'
296
        # XXX: perhaps check that the .pack file exists?
297
298
    def access_tuple(self):
299
        if self._state == 'finished':
300
            return Pack.access_tuple(self)
301
        elif self._state == 'resumed':
302
            return self.upload_transport, self.file_name()
303
        else:
304
            raise AssertionError(self._state)
305
306
    def abort(self):
307
        self.upload_transport.delete(self.file_name())
308
        indices = [self.revision_index, self.inventory_index, self.text_index,
309
            self.signature_index]
4343.3.7 by John Arbash Meinel
Update the suspend/resume/commit/abort_write_group tests for CHK1.
310
        if self.chk_index is not None:
311
            indices.append(self.chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
312
        for index in indices:
313
            index._transport.delete(index._name)
314
315
    def finish(self):
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
316
        self._check_references()
4343.3.7 by John Arbash Meinel
Update the suspend/resume/commit/abort_write_group tests for CHK1.
317
        index_types = ['revision', 'inventory', 'text', 'signature']
318
        if self.chk_index is not None:
319
            index_types.append('chk')
320
        for index_type in index_types:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
321
            old_name = self.index_name(index_type, self.name)
322
            new_name = '../indices/' + old_name
323
            self.upload_transport.rename(old_name, new_name)
324
            self._replace_index_with_readonly(index_type)
4470.1.1 by John Arbash Meinel
We should write the indexes before we write the pack file.
325
        new_name = '../packs/' + self.file_name()
326
        self.upload_transport.rename(self.file_name(), new_name)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
327
        self._state = 'finished'
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
328
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
329
    def _get_external_refs(self, index):
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
330
        """Return compression parents for this index that are not present.
331
332
        This returns any compression parents that are referenced by this index,
333
        which are not contained *in* this index. They may be present elsewhere.
334
        """
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
335
        return index.external_references(1)
336
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
337
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
338
class NewPack(Pack):
339
    """An in memory proxy for a pack which is being created."""
340
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
341
    def __init__(self, pack_collection, upload_suffix='', file_mode=None):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
342
        """Create a NewPack instance.
343
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
344
        :param pack_collection: A PackCollection into which this is being inserted.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
345
        :param upload_suffix: An optional suffix to be given to any temporary
346
            files created during the pack creation. e.g '.autopack'
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
347
        :param file_mode: Unix permissions for newly created file.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
348
        """
2592.3.228 by Martin Pool
docstrings and error messages from review
349
        # The relative locations of the packs are constrained, but all are
350
        # passed in because the caller has them, so as to avoid object churn.
3735.13.3 by John Arbash Meinel
Quick typo fix.
351
        index_builder_class = pack_collection._index_builder_class
3735.12.1 by John Arbash Meinel
Merge bzr.dev into brisbane-core and resolve conflicts.
352
        if pack_collection.chk_index is not None:
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
353
            chk_index = index_builder_class(reference_lists=0)
354
        else:
355
            chk_index = None
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
356
        Pack.__init__(self,
357
            # Revisions: parents list, no text compression.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
358
            index_builder_class(reference_lists=1),
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
359
            # Inventory: We want to map compression only, but currently the
360
            # knit code hasn't been updated enough to understand that, so we
361
            # have a regular 2-list index giving parents and compression
362
            # source.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
363
            index_builder_class(reference_lists=2),
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
364
            # Texts: compression and per file graph, for all fileids - so two
365
            # reference lists and two elements in the key tuple.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
366
            index_builder_class(reference_lists=2, key_elements=2),
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
367
            # Signatures: Just blobs to store, no compression, no parents
368
            # listing.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
369
            index_builder_class(reference_lists=0),
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
370
            # CHK based storage - just blobs, no compression or parents.
371
            chk_index=chk_index
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
372
            )
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
373
        self._pack_collection = pack_collection
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
374
        # When we make readonly indices, we need this.
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
375
        self.index_class = pack_collection._index_class
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
376
        # where should the new pack be opened
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
377
        self.upload_transport = pack_collection._upload_transport
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
378
        # where are indices written out to
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
379
        self.index_transport = pack_collection._index_transport
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
380
        # where is the pack renamed to when it is finished?
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
381
        self.pack_transport = pack_collection._pack_transport
3010.1.11 by Robert Collins
Provide file modes to files created by pack repositories
382
        # What file mode to upload the pack and indices with.
383
        self._file_mode = file_mode
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
384
        # tracks the content written to the .pack file.
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
385
        self._hash = osutils.md5()
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
386
        # a tuple with the length in bytes of the indices, once the pack
387
        # is finalised. (rev, inv, text, sigs, chk_if_in_use)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
388
        self.index_sizes = None
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
389
        # How much data to cache when writing packs. Note that this is not
2592.3.222 by Robert Collins
More review feedback.
390
        # synchronised with reads, because it's not in the transport layer, so
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
391
        # is not safe unless the client knows it won't be reading from the pack
392
        # under creation.
393
        self._cache_limit = 0
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
394
        # the temporary pack file name.
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
395
        self.random_name = osutils.rand_chars(20) + upload_suffix
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
396
        # when was this pack started ?
397
        self.start_time = time.time()
2592.3.202 by Robert Collins
Move write stream management into NewPack.
398
        # open an output stream for the data added to the pack.
399
        self.write_stream = self.upload_transport.open_write_stream(
3010.1.11 by Robert Collins
Provide file modes to files created by pack repositories
400
            self.random_name, mode=self._file_mode)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
401
        if 'pack' in debug.debug_flags:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
402
            mutter('%s: create_pack: pack stream open: %s%s t+%6.3fs',
403
                time.ctime(), self.upload_transport.base, self.random_name,
404
                time.time() - self.start_time)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
405
        # A list of byte sequences to be written to the new pack, and the
406
        # aggregate size of them.  Stored as a list rather than separate
2592.3.233 by Martin Pool
Review cleanups
407
        # variables so that the _write_data closure below can update them.
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
408
        self._buffer = [[], 0]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
409
        # create a callable for adding data
2592.3.233 by Martin Pool
Review cleanups
410
        #
411
        # robertc says- this is a closure rather than a method on the object
412
        # so that the variables are locals, and faster than accessing object
413
        # members.
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
414
        def _write_data(bytes, flush=False, _buffer=self._buffer,
415
            _write=self.write_stream.write, _update=self._hash.update):
416
            _buffer[0].append(bytes)
417
            _buffer[1] += len(bytes)
2592.3.222 by Robert Collins
More review feedback.
418
            # buffer cap
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
419
            if _buffer[1] > self._cache_limit or flush:
420
                bytes = ''.join(_buffer[0])
421
                _write(bytes)
422
                _update(bytes)
423
                _buffer[:] = [[], 0]
2592.3.202 by Robert Collins
Move write stream management into NewPack.
424
        # expose this on self, for the occasion when clients want to add data.
425
        self._write_data = _write_data
2592.3.205 by Robert Collins
Move the pack ContainerWriter instance into NewPack.
426
        # a pack writer object to serialise pack records.
427
        self._writer = pack.ContainerWriter(self._write_data)
428
        self._writer.begin()
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
429
        # what state is the pack in? (open, finished, aborted)
430
        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.
431
        # no name until we finish writing the content
432
        self.name = None
2592.3.202 by Robert Collins
Move write stream management into NewPack.
433
434
    def abort(self):
435
        """Cancel creating this pack."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
436
        self._state = 'aborted'
2938.1.1 by Robert Collins
trivial fix for packs@win32: explicitly close file before deleting
437
        self.write_stream.close()
2592.3.202 by Robert Collins
Move write stream management into NewPack.
438
        # Remove the temporary pack file.
439
        self.upload_transport.delete(self.random_name)
440
        # The indices have no state on disk.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
441
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
442
    def access_tuple(self):
443
        """Return a tuple (transport, name) for the pack content."""
444
        if self._state == 'finished':
445
            return Pack.access_tuple(self)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
446
        elif self._state == 'open':
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
447
            return self.upload_transport, self.random_name
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
448
        else:
449
            raise AssertionError(self._state)
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
450
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
451
    def data_inserted(self):
452
        """True if data has been added to this pack."""
2592.3.233 by Martin Pool
Review cleanups
453
        return bool(self.get_revision_count() or
454
            self.inventory_index.key_count() or
455
            self.text_index.key_count() or
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
456
            self.signature_index.key_count() or
457
            (self.chk_index is not None and self.chk_index.key_count()))
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
458
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.
459
    def finish_content(self):
460
        if self.name is not None:
461
            return
462
        self._writer.end()
463
        if self._buffer[1]:
464
            self._write_data('', flush=True)
465
        self.name = self._hash.hexdigest()
466
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
467
    def finish(self, suspend=False):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
468
        """Finish the new pack.
469
470
        This:
471
         - finalises the content
472
         - assigns a name (the md5 of the content, currently)
473
         - writes out the associated indices
474
         - renames the pack into place.
475
         - stores the index size tuple for the pack in the index_sizes
476
           attribute.
477
        """
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.
478
        self.finish_content()
4002.1.11 by Andrew Bennetts
Fix latest test.
479
        if not suspend:
480
            self._check_references()
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
481
        # write indices
2592.3.233 by Martin Pool
Review cleanups
482
        # XXX: It'd be better to write them all to temporary names, then
483
        # rename them all into place, so that the window when only some are
484
        # visible is smaller.  On the other hand none will be seen until
485
        # they're in the names list.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
486
        self.index_sizes = [None, None, None, None]
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
487
        self._write_index('revision', self.revision_index, 'revision', suspend)
488
        self._write_index('inventory', self.inventory_index, 'inventory',
489
            suspend)
490
        self._write_index('text', self.text_index, 'file texts', suspend)
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
491
        self._write_index('signature', self.signature_index,
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
492
            'revision signatures', suspend)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
493
        if self.chk_index is not None:
494
            self.index_sizes.append(None)
495
            self._write_index('chk', self.chk_index,
3735.2.98 by John Arbash Meinel
Merge bzr.dev 4032. Resolve the new streaming fetch.
496
                'content hash bytes', suspend)
2592.3.202 by Robert Collins
Move write stream management into NewPack.
497
        self.write_stream.close()
2592.3.206 by Robert Collins
Move pack rename-into-place into NewPack.finish and document hash-collision cases somewhat better.
498
        # Note that this will clobber an existing pack with the same name,
499
        # without checking for hash collisions. While this is undesirable this
500
        # is something that can be rectified in a subsequent release. One way
501
        # to rectify it may be to leave the pack at the original name, writing
502
        # its pack-names entry as something like 'HASH: index-sizes
503
        # temporary-name'. Allocate that and check for collisions, if it is
504
        # collision free then rename it into place. If clients know this scheme
505
        # they can handle missing-file errors by:
506
        #  - try for HASH.pack
507
        #  - try for temporary-name
508
        #  - refresh the pack-list to see if the pack is now absent
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
509
        new_name = self.name + '.pack'
510
        if not suspend:
511
            new_name = '../packs/' + new_name
512
        self.upload_transport.rename(self.random_name, new_name)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
513
        self._state = 'finished'
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
514
        if 'pack' in debug.debug_flags:
2592.3.219 by Robert Collins
Review feedback.
515
            # XXX: size might be interesting?
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
516
            mutter('%s: create_pack: pack finished: %s%s->%s t+%6.3fs',
2592.3.219 by Robert Collins
Review feedback.
517
                time.ctime(), self.upload_transport.base, self.random_name,
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
518
                new_name, time.time() - self.start_time)
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
519
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
520
    def flush(self):
521
        """Flush any current data."""
522
        if self._buffer[1]:
523
            bytes = ''.join(self._buffer[0])
524
            self.write_stream.write(bytes)
525
            self._hash.update(bytes)
526
            self._buffer[:] = [[], 0]
527
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
528
    def _get_external_refs(self, index):
529
        return index._external_references()
530
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
531
    def set_write_cache_size(self, size):
532
        self._cache_limit = size
533
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
534
    def _write_index(self, index_type, index, label, suspend=False):
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
535
        """Write out an index.
536
2592.3.222 by Robert Collins
More review feedback.
537
        :param index_type: The type of index to write - e.g. 'revision'.
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
538
        :param index: The index object to serialise.
539
        :param label: What label to give the index e.g. 'revision'.
540
        """
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
541
        index_name = self.index_name(index_type, self.name)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
542
        if suspend:
543
            transport = self.upload_transport
544
        else:
545
            transport = self.index_transport
546
        self.index_sizes[self.index_offset(index_type)] = transport.put_file(
547
            index_name, index.finish(), mode=self._file_mode)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
548
        if 'pack' in debug.debug_flags:
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
549
            # XXX: size might be interesting?
550
            mutter('%s: create_pack: wrote %s index: %s%s t+%6.3fs',
551
                time.ctime(), label, self.upload_transport.base,
552
                self.random_name, time.time() - self.start_time)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
553
        # Replace the writable index on this object with a readonly,
2592.3.233 by Martin Pool
Review cleanups
554
        # presently unloaded index. We should alter
555
        # the index layer to make its finish() error if add_node is
2592.3.200 by Robert Collins
Make NewPack reopen the index files, separating out the task of refreshing the index maps in the repository and managing the completion of writing a single pack to disk.
556
        # subsequently used. RBC
2592.3.233 by Martin Pool
Review cleanups
557
        self._replace_index_with_readonly(index_type)
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
558
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
559
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
560
class AggregateIndex(object):
561
    """An aggregated index for the RepositoryPackCollection.
562
563
    AggregateIndex is reponsible for managing the PackAccess object,
564
    Index-To-Pack mapping, and all indices list for a specific type of index
565
    such as 'revision index'.
2592.3.228 by Martin Pool
docstrings and error messages from review
566
567
    A CombinedIndex provides an index on a single key space built up
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
568
    from several on-disk indices.  The AggregateIndex builds on this
2592.3.228 by Martin Pool
docstrings and error messages from review
569
    to provide a knit access layer, and allows having up to one writable
570
    index within the collection.
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
571
    """
2592.3.235 by Martin Pool
Review cleanups
572
    # XXX: Probably 'can be written to' could/should be separated from 'acts
573
    # like a knit index' -- mbp 20071024
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
574
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
575
    def __init__(self, reload_func=None, flush_func=None):
3789.1.3 by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count().
576
        """Create an AggregateIndex.
577
578
        :param reload_func: A function to call if we find we are missing an
3789.1.10 by John Arbash Meinel
Review comments from Martin.
579
            index. Should have the form reload_func() => True if the list of
580
            active pack files has changed.
3789.1.3 by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count().
581
        """
582
        self._reload_func = reload_func
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
583
        self.index_to_pack = {}
5086.7.4 by Andrew Bennetts
Remove auto_reorder param, just do it unconditionally. Add some -Dindex mutters.
584
        self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
3789.2.14 by John Arbash Meinel
Update AggregateIndex to pass the reload_func into _DirectPackAccess
585
        self.data_access = _DirectPackAccess(self.index_to_pack,
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
586
                                             reload_func=reload_func,
587
                                             flush_func=flush_func)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
588
        self.add_callback = None
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
589
590
    def add_index(self, index, pack):
591
        """Add index to the aggregate, which is an index for Pack pack.
2592.3.226 by Martin Pool
formatting and docstrings
592
593
        Future searches on the aggregate index will seach this new index
594
        before all previously inserted indices.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
595
2592.3.226 by Martin Pool
formatting and docstrings
596
        :param index: An Index for the pack.
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
597
        :param pack: A Pack instance.
598
        """
599
        # expose it to the index map
600
        self.index_to_pack[index] = pack.access_tuple()
601
        # put it at the front of the linear index list
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
602
        self.combined_index.insert_index(0, index, pack.name)
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
603
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
604
    def add_writable_index(self, index, pack):
605
        """Add an index which is able to have data added to it.
2592.3.235 by Martin Pool
Review cleanups
606
607
        There can be at most one writable index at any time.  Any
608
        modifications made to the knit are put into this index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
609
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
610
        :param index: An index from the pack parameter.
611
        :param pack: A Pack instance.
612
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
613
        if self.add_callback is not None:
614
            raise AssertionError(
615
                "%s already has a writable index through %s" % \
616
                (self, self.add_callback))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
617
        # allow writing: queue writes to a new index
618
        self.add_index(index, pack)
619
        # Updates the index to packs mapping as a side effect,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
620
        self.data_access.set_writer(pack._writer, index, pack.access_tuple())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
621
        self.add_callback = index.add_nodes
622
623
    def clear(self):
624
        """Reset all the aggregate data to nothing."""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
625
        self.data_access.set_writer(None, None, (None, None))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
626
        self.index_to_pack.clear()
627
        del self.combined_index._indices[:]
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
628
        del self.combined_index._index_names[:]
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
629
        self.add_callback = None
630
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
631
    def remove_index(self, index):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
632
        """Remove index from the indices used to answer queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
633
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
634
        :param index: An index from the pack parameter.
635
        """
636
        del self.index_to_pack[index]
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
637
        pos = self.combined_index._indices.index(index)
638
        del self.combined_index._indices[pos]
639
        del self.combined_index._index_names[pos]
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
640
        if (self.add_callback is not None and
641
            getattr(index, 'add_nodes', None) == self.add_callback):
642
            self.add_callback = None
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
643
            self.data_access.set_writer(None, None, (None, None))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
644
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
645
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
646
class Packer(object):
647
    """Create a pack from packs."""
648
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
649
    def __init__(self, pack_collection, packs, suffix, revision_ids=None,
650
                 reload_func=None):
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
651
        """Create a Packer.
652
653
        :param pack_collection: A RepositoryPackCollection object where the
654
            new pack is being written to.
655
        :param packs: The packs to combine.
656
        :param suffix: The suffix to use on the temporary files for the pack.
657
        :param revision_ids: Revision ids to limit the pack to.
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
658
        :param reload_func: A function to call if a pack file/index goes
659
            missing. The side effect of calling this function should be to
660
            update self.packs. See also AggregateIndex
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
661
        """
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
662
        self.packs = packs
663
        self.suffix = suffix
664
        self.revision_ids = revision_ids
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
665
        # The pack object we are creating.
666
        self.new_pack = None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
667
        self._pack_collection = pack_collection
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
668
        self._reload_func = reload_func
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
669
        # The index layer keys for the revisions being copied. None for 'all
670
        # objects'.
671
        self._revision_keys = None
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
672
        # What text keys to copy. None for 'all texts'. This is set by
673
        # _copy_inventory_texts
674
        self._text_filter = None
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
675
        self._extra_init()
676
677
    def _extra_init(self):
678
        """A template hook to allow extending the constructor trivially."""
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
679
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
680
    def _pack_map_and_index_list(self, index_attribute):
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
681
        """Convert a list of packs to an index pack map and index list.
682
683
        :param index_attribute: The attribute that the desired index is found
684
            on.
685
        :return: A tuple (map, list) where map contains the dict from
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
686
            index:pack_tuple, and list contains the indices in the preferred
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
687
            access order.
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
688
        """
689
        indices = []
690
        pack_map = {}
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
691
        for pack_obj in self.packs:
692
            index = getattr(pack_obj, index_attribute)
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
693
            indices.append(index)
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
694
            pack_map[index] = pack_obj
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
695
        return pack_map, indices
696
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
697
    def _index_contents(self, indices, key_filter=None):
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
698
        """Get an iterable of the index contents from a pack_map.
699
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
700
        :param indices: The list of indices to query
701
        :param key_filter: An optional filter to limit the keys returned.
3824.2.1 by John Arbash Meinel
Clean up some pack object functions.
702
        """
703
        all_index = CombinedGraphIndex(indices)
704
        if key_filter is None:
705
            return all_index.iter_all_entries()
706
        else:
707
            return all_index.iter_entries(key_filter)
708
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
709
    def pack(self, pb=None):
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
710
        """Create a new pack by reading data from other packs.
711
712
        This does little more than a bulk copy of data. One key difference
713
        is that data with the same item key across multiple packs is elided
714
        from the output. The new pack is written into the current pack store
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
715
        along with its indices, and the name added to the pack names. The
2592.3.182 by Robert Collins
Eliminate the need to use a transport,name tuple to represent a pack during fetch.
716
        source packs are not altered and are not required to be in the current
717
        pack collection.
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
718
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
719
        :param pb: An optional progress bar to use. A nested bar is created if
720
            this is None.
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
721
        :return: A Pack object, or None if nothing was copied.
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
722
        """
723
        # open a pack - using the same name as the last temporary file
724
        # - which has already been flushed, so its safe.
725
        # XXX: - duplicate code warning with start_write_group; fix before
726
        #      considering 'done'.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
727
        if self._pack_collection._new_pack is not None:
3789.2.22 by John Arbash Meinel
We need the Packer class to cleanup if it is getting a Retry it isn't handling.
728
            raise errors.BzrError('call to %s.pack() while another pack is'
729
                                  ' being written.'
730
                                  % (self.__class__.__name__,))
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
731
        if self.revision_ids is not None:
732
            if len(self.revision_ids) == 0:
2947.1.3 by Robert Collins
Unbreak autopack. Doh.
733
                # silly fetch request.
734
                return None
735
            else:
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
736
                self.revision_ids = frozenset(self.revision_ids)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
737
                self.revision_keys = frozenset((revid,) for revid in
738
                    self.revision_ids)
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
739
        if pb is None:
740
            self.pb = ui.ui_factory.nested_progress_bar()
741
        else:
742
            self.pb = pb
2592.6.11 by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching.
743
        try:
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
744
            return self._create_pack_from_packs()
2592.6.11 by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching.
745
        finally:
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
746
            if pb is None:
747
                self.pb.finished()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
748
749
    def open_pack(self):
750
        """Open a pack for the pack we are creating."""
3735.2.163 by John Arbash Meinel
Merge bzr.dev 4187, and revert the change to fix refcycle issues.
751
        new_pack = self._pack_collection.pack_factory(self._pack_collection,
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
752
                upload_suffix=self.suffix,
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
753
                file_mode=self._pack_collection.repo.bzrdir._get_file_mode())
4168.3.6 by John Arbash Meinel
Add 'combine_backing_indices' as a flag for GraphIndex.set_optimize().
754
        # We know that we will process all nodes in order, and don't need to
755
        # query, so don't combine any indices spilled to disk until we are done
756
        new_pack.revision_index.set_optimize(combine_backing_indices=False)
757
        new_pack.inventory_index.set_optimize(combine_backing_indices=False)
758
        new_pack.text_index.set_optimize(combine_backing_indices=False)
759
        new_pack.signature_index.set_optimize(combine_backing_indices=False)
760
        return new_pack
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
761
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
762
    def _update_pack_order(self, entries, index_to_pack_map):
763
        """Determine how we want our packs to be ordered.
764
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
765
        This changes the sort order of the self.packs list so that packs unused
766
        by 'entries' will be at the end of the list, so that future requests
767
        can avoid probing them.  Used packs will be at the front of the
768
        self.packs list, in the order of their first use in 'entries'.
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
769
770
        :param entries: A list of (index, ...) tuples
771
        :param index_to_pack_map: A mapping from index objects to pack objects.
772
        """
773
        packs = []
774
        seen_indexes = set()
775
        for entry in entries:
776
            index = entry[0]
777
            if index not in seen_indexes:
778
                packs.append(index_to_pack_map[index])
779
                seen_indexes.add(index)
780
        if len(packs) == len(self.packs):
781
            if 'pack' in debug.debug_flags:
782
                mutter('Not changing pack list, all packs used.')
783
            return
784
        seen_packs = set(packs)
785
        for pack in self.packs:
786
            if pack not in seen_packs:
787
                packs.append(pack)
788
                seen_packs.add(pack)
789
        if 'pack' in debug.debug_flags:
790
            old_names = [p.access_tuple()[1] for p in self.packs]
791
            new_names = [p.access_tuple()[1] for p in packs]
792
            mutter('Reordering packs\nfrom: %s\n  to: %s',
793
                   old_names, new_names)
794
        self.packs = packs
795
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
796
    def _copy_revision_texts(self):
797
        """Copy revision data to the new pack."""
798
        # select revisions
799
        if self.revision_ids:
800
            revision_keys = [(revision_id,) for revision_id in self.revision_ids]
801
        else:
802
            revision_keys = None
803
        # select revision keys
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
804
        revision_index_map, revision_indices = self._pack_map_and_index_list(
805
            'revision_index')
806
        revision_nodes = self._index_contents(revision_indices, revision_keys)
807
        revision_nodes = list(revision_nodes)
808
        self._update_pack_order(revision_nodes, revision_index_map)
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
809
        # copy revision keys and adjust values
810
        self.pb.update("Copying revision texts", 1)
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
811
        total_items, readv_group_iter = self._revision_node_readv(revision_nodes)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
812
        list(self._copy_nodes_graph(revision_index_map, self.new_pack._writer,
813
            self.new_pack.revision_index, readv_group_iter, total_items))
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
814
        if 'pack' in debug.debug_flags:
815
            mutter('%s: create_pack: revisions copied: %s%s %d items t+%6.3fs',
816
                time.ctime(), self._pack_collection._upload_transport.base,
817
                self.new_pack.random_name,
818
                self.new_pack.revision_index.key_count(),
819
                time.time() - self.new_pack.start_time)
820
        self._revision_keys = revision_keys
821
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
822
    def _copy_inventory_texts(self):
823
        """Copy the inventory texts to the new pack.
824
825
        self._revision_keys is used to determine what inventories to copy.
826
827
        Sets self._text_filter appropriately.
828
        """
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
829
        # select inventory keys
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
830
        inv_keys = self._revision_keys # currently the same keyspace, and note that
2592.3.145 by Robert Collins
Fix test_fetch_missing_text_other_location_fails for pack repositories.
831
        # querying for keys here could introduce a bug where an inventory item
832
        # is missed, so do not change it to query separately without cross
833
        # checking like the text key check below.
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
834
        inventory_index_map, inventory_indices = self._pack_map_and_index_list(
835
            'inventory_index')
836
        inv_nodes = self._index_contents(inventory_indices, inv_keys)
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
837
        # copy inventory keys and adjust values
2592.3.104 by Robert Collins
hackish fix, but all tests passing again.
838
        # XXX: Should be a helper function to allow different inv representation
839
        # at this point.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
840
        self.pb.update("Copying inventory texts", 2)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
841
        total_items, readv_group_iter = self._least_readv_node_readv(inv_nodes)
3253.1.1 by John Arbash Meinel
Reduce memory consumption during autopack.
842
        # Only grab the output lines if we will be processing them
843
        output_lines = bool(self.revision_ids)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
844
        inv_lines = self._copy_nodes_graph(inventory_index_map,
845
            self.new_pack._writer, self.new_pack.inventory_index,
3253.1.1 by John Arbash Meinel
Reduce memory consumption during autopack.
846
            readv_group_iter, total_items, output_lines=output_lines)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
847
        if self.revision_ids:
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
848
            self._process_inventory_lines(inv_lines)
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
849
        else:
2592.3.145 by Robert Collins
Fix test_fetch_missing_text_other_location_fails for pack repositories.
850
            # eat the iterator to cause it to execute.
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
851
            list(inv_lines)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
852
            self._text_filter = None
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
853
        if 'pack' in debug.debug_flags:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
854
            mutter('%s: create_pack: inventories copied: %s%s %d items t+%6.3fs',
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
855
                time.ctime(), self._pack_collection._upload_transport.base,
856
                self.new_pack.random_name,
857
                self.new_pack.inventory_index.key_count(),
3231.3.1 by James Westby
Make -Dpack not cause a error trying to use an unkown variable.
858
                time.time() - self.new_pack.start_time)
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
859
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
860
    def _copy_text_texts(self):
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
861
        # select text keys
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
862
        text_index_map, text_nodes = self._get_text_nodes()
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
863
        if self._text_filter is not None:
2592.3.149 by Robert Collins
Unbreak pack to pack fetching properly, with missing-text detection really working.
864
            # We could return the keys copied as part of the return value from
865
            # _copy_nodes_graph but this doesn't work all that well with the
866
            # need to get line output too, so we check separately, and as we're
867
            # going to buffer everything anyway, we check beforehand, which
868
            # saves reading knit data over the wire when we know there are
869
            # mising records.
870
            text_nodes = set(text_nodes)
871
            present_text_keys = set(_node[1] for _node in text_nodes)
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
872
            missing_text_keys = set(self._text_filter) - present_text_keys
2592.3.149 by Robert Collins
Unbreak pack to pack fetching properly, with missing-text detection really working.
873
            if missing_text_keys:
874
                # TODO: raise a specific error that can handle many missing
875
                # keys.
4084.3.1 by Robert Collins
Log all missing keys in pack fetch operations that fail due to missing keys.
876
                mutter("missing keys during fetch: %r", missing_text_keys)
2592.3.149 by Robert Collins
Unbreak pack to pack fetching properly, with missing-text detection really working.
877
                a_missing_key = missing_text_keys.pop()
878
                raise errors.RevisionNotPresent(a_missing_key[1],
879
                    a_missing_key[0])
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
880
        # copy text keys and adjust values
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
881
        self.pb.update("Copying content texts", 3)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
882
        total_items, readv_group_iter = self._least_readv_node_readv(text_nodes)
883
        list(self._copy_nodes_graph(text_index_map, self.new_pack._writer,
884
            self.new_pack.text_index, readv_group_iter, total_items))
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
885
        self._log_copied_texts()
886
887
    def _create_pack_from_packs(self):
888
        self.pb.update("Opening pack", 0, 5)
889
        self.new_pack = self.open_pack()
890
        new_pack = self.new_pack
891
        # buffer data - we won't be reading-back during the pack creation and
892
        # this makes a significant difference on sftp pushes.
893
        new_pack.set_write_cache_size(1024*1024)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
894
        if 'pack' in debug.debug_flags:
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
895
            plain_pack_list = ['%s%s' % (a_pack.pack_transport.base, a_pack.name)
896
                for a_pack in self.packs]
897
            if self.revision_ids is not None:
898
                rev_count = len(self.revision_ids)
899
            else:
900
                rev_count = 'all'
901
            mutter('%s: create_pack: creating pack from source packs: '
902
                '%s%s %s revisions wanted %s t=0',
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
903
                time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
904
                plain_pack_list, rev_count)
905
        self._copy_revision_texts()
906
        self._copy_inventory_texts()
907
        self._copy_text_texts()
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
908
        # select signature keys
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
909
        signature_filter = self._revision_keys # same keyspace
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
910
        signature_index_map, signature_indices = self._pack_map_and_index_list(
911
            'signature_index')
912
        signature_nodes = self._index_contents(signature_indices,
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
913
            signature_filter)
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
914
        # copy signature keys and adjust values
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
915
        self.pb.update("Copying signature texts", 4)
2592.3.205 by Robert Collins
Move the pack ContainerWriter instance into NewPack.
916
        self._copy_nodes(signature_nodes, signature_index_map, new_pack._writer,
917
            new_pack.signature_index)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
918
        if 'pack' in debug.debug_flags:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
919
            mutter('%s: create_pack: revision signatures copied: %s%s %d items t+%6.3fs',
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
920
                time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
921
                new_pack.signature_index.key_count(),
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
922
                time.time() - new_pack.start_time)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
923
        # copy chk contents
924
        # NB XXX: how to check CHK references are present? perhaps by yielding
925
        # the items? How should that interact with stacked repos?
926
        if new_pack.chk_index is not None:
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
927
            self._copy_chks()
3735.2.56 by John Arbash Meinel
With -Dpack we should only mutter about chk_index if it actually exists.
928
            if 'pack' in debug.debug_flags:
929
                mutter('%s: create_pack: chk content copied: %s%s %d items t+%6.3fs',
930
                    time.ctime(), self._pack_collection._upload_transport.base,
931
                    new_pack.random_name,
932
                    new_pack.chk_index.key_count(),
933
                    time.time() - new_pack.start_time)
3830.3.2 by Martin Pool
Check that newly created packs don't have missing delta bases.
934
        new_pack._check_references()
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
935
        if not self._use_pack(new_pack):
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
936
            new_pack.abort()
937
            return None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
938
        self.pb.update("Finishing pack", 5)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
939
        new_pack.finish()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
940
        self._pack_collection.allocate(new_pack)
2592.3.206 by Robert Collins
Move pack rename-into-place into NewPack.finish and document hash-collision cases somewhat better.
941
        return new_pack
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
942
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
943
    def _copy_chks(self, refs=None):
944
        # XXX: Todo, recursive follow-pointers facility when fetching some
945
        # revisions only.
3735.13.5 by John Arbash Meinel
Another code switch-around.
946
        chk_index_map, chk_indices = self._pack_map_and_index_list(
3735.13.6 by John Arbash Meinel
If you are going to do it, use the right index.
947
            'chk_index')
3735.13.5 by John Arbash Meinel
Another code switch-around.
948
        chk_nodes = self._index_contents(chk_indices, refs)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
949
        new_refs = set()
3735.16.8 by John Arbash Meinel
Expose 2 new formats for 'bzr init'.
950
        # TODO: This isn't strictly tasteful as we are accessing some private
951
        #       variables (_serializer). Perhaps a better way would be to have
952
        #       Repository._deserialise_chk_node()
953
        search_key_func = chk_map.search_key_registry.get(
954
            self._pack_collection.repo._serializer.search_key_name)
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
955
        def accumlate_refs(lines):
956
            # XXX: move to a generic location
3735.2.26 by Robert Collins
CHKInventory migrated to new CHKMap code.
957
            # Yay mismatch:
958
            bytes = ''.join(lines)
3735.16.8 by John Arbash Meinel
Expose 2 new formats for 'bzr init'.
959
            node = chk_map._deserialise(bytes, ("unknown",), search_key_func)
3735.2.26 by Robert Collins
CHKInventory migrated to new CHKMap code.
960
            new_refs.update(node.refs())
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
961
        self._copy_nodes(chk_nodes, chk_index_map, self.new_pack._writer,
962
            self.new_pack.chk_index, output_lines=accumlate_refs)
963
        return new_refs
964
965
    def _copy_nodes(self, nodes, index_map, writer, write_index,
966
        output_lines=None):
967
        """Copy knit nodes between packs with no graph references.
3735.2.99 by John Arbash Meinel
Merge bzr.dev 4034. Whitespace cleanup
968
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
969
        :param output_lines: Output full texts of copied items.
970
        """
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
971
        pb = ui.ui_factory.nested_progress_bar()
972
        try:
973
            return self._do_copy_nodes(nodes, index_map, writer,
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
974
                write_index, pb, output_lines=output_lines)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
975
        finally:
976
            pb.finished()
977
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
978
    def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb,
979
        output_lines=None):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
980
        # for record verification
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
981
        knit = KnitVersionedFiles(None, None)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
982
        # plan a readv on each source pack:
983
        # group by pack
984
        nodes = sorted(nodes)
985
        # how to map this into knit.py - or knit.py into this?
986
        # we don't want the typical knit logic, we want grouping by pack
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
987
        # at this point - perhaps a helper library for the following code
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
988
        # duplication points?
989
        request_groups = {}
990
        for index, key, value in nodes:
991
            if index not in request_groups:
992
                request_groups[index] = []
993
            request_groups[index].append((key, value))
994
        record_index = 0
995
        pb.update("Copied record", record_index, len(nodes))
996
        for index, items in request_groups.iteritems():
997
            pack_readv_requests = []
998
            for key, value in items:
999
                # ---- KnitGraphIndex.get_position
1000
                bits = value[1:].split(' ')
1001
                offset, length = int(bits[0]), int(bits[1])
1002
                pack_readv_requests.append((offset, length, (key, value[0])))
1003
            # linear scan up the pack
1004
            pack_readv_requests.sort()
1005
            # copy the data
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1006
            pack_obj = index_map[index]
1007
            transport, path = pack_obj.access_tuple()
3789.2.26 by John Arbash Meinel
Change the code so that we expect _reload_func to divert the flow by raising.
1008
            try:
1009
                reader = pack.make_readv_reader(transport, path,
1010
                    [offset[0:2] for offset in pack_readv_requests])
1011
            except errors.NoSuchFile:
1012
                if self._reload_func is not None:
1013
                    self._reload_func()
1014
                raise
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1015
            for (names, read_func), (_1, _2, (key, eol_flag)) in \
1016
                izip(reader.iter_records(), pack_readv_requests):
1017
                raw_data = read_func(None)
1018
                # check the header only
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
1019
                if output_lines is not None:
1020
                    output_lines(knit._parse_record(key[-1], raw_data)[0])
1021
                else:
1022
                    df, _ = knit._parse_record_header(key, raw_data)
1023
                    df.close()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1024
                pos, size = writer.add_bytes_record(raw_data, names)
1025
                write_index.add_node(key, eol_flag + "%d %d" % (pos, size))
1026
                pb.update("Copied record", record_index)
1027
                record_index += 1
1028
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1029
    def _copy_nodes_graph(self, index_map, writer, write_index,
3789.2.26 by John Arbash Meinel
Change the code so that we expect _reload_func to divert the flow by raising.
1030
        readv_group_iter, total_items, output_lines=False):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1031
        """Copy knit nodes between packs.
1032
1033
        :param output_lines: Return lines present in the copied data as
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1034
            an iterator of line,version_id.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1035
        """
1036
        pb = ui.ui_factory.nested_progress_bar()
1037
        try:
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1038
            for result in self._do_copy_nodes_graph(index_map, writer,
3789.2.26 by John Arbash Meinel
Change the code so that we expect _reload_func to divert the flow by raising.
1039
                write_index, output_lines, pb, readv_group_iter, total_items):
3039.1.1 by Robert Collins
(robertc) Fix the text progress for pack to pack fetches. (Robert Collins).
1040
                yield result
3039.1.2 by Robert Collins
python2.4 'compatibility'.
1041
        except Exception:
3039.1.3 by Robert Collins
Document the try:except:else: rather than a finally: in pack_repo.._copy_nodes_graph.
1042
            # Python 2.4 does not permit try:finally: in a generator.
3039.1.2 by Robert Collins
python2.4 'compatibility'.
1043
            pb.finished()
1044
            raise
1045
        else:
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1046
            pb.finished()
1047
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1048
    def _do_copy_nodes_graph(self, index_map, writer, write_index,
3789.2.26 by John Arbash Meinel
Change the code so that we expect _reload_func to divert the flow by raising.
1049
        output_lines, pb, readv_group_iter, total_items):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1050
        # for record verification
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1051
        knit = KnitVersionedFiles(None, None)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1052
        # for line extraction when requested (inventories only)
1053
        if output_lines:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1054
            factory = KnitPlainFactory()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1055
        record_index = 0
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1056
        pb.update("Copied record", record_index, total_items)
1057
        for index, readv_vector, node_vector in readv_group_iter:
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1058
            # copy the data
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1059
            pack_obj = index_map[index]
1060
            transport, path = pack_obj.access_tuple()
3789.2.26 by John Arbash Meinel
Change the code so that we expect _reload_func to divert the flow by raising.
1061
            try:
1062
                reader = pack.make_readv_reader(transport, path, readv_vector)
1063
            except errors.NoSuchFile:
1064
                if self._reload_func is not None:
1065
                    self._reload_func()
1066
                raise
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1067
            for (names, read_func), (key, eol_flag, references) in \
1068
                izip(reader.iter_records(), node_vector):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1069
                raw_data = read_func(None)
1070
                if output_lines:
1071
                    # read the entire thing
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1072
                    content, _ = knit._parse_record(key[-1], raw_data)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1073
                    if len(references[-1]) == 0:
1074
                        line_iterator = factory.get_fulltext_content(content)
1075
                    else:
1076
                        line_iterator = factory.get_linedelta_content(content)
1077
                    for line in line_iterator:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1078
                        yield line, key
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1079
                else:
1080
                    # check the header only
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1081
                    df, _ = knit._parse_record_header(key, raw_data)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1082
                    df.close()
1083
                pos, size = writer.add_bytes_record(raw_data, names)
1084
                write_index.add_node(key, eol_flag + "%d %d" % (pos, size), references)
1085
                pb.update("Copied record", record_index)
1086
                record_index += 1
1087
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1088
    def _get_text_nodes(self):
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1089
        text_index_map, text_indices = self._pack_map_and_index_list(
1090
            'text_index')
1091
        return text_index_map, self._index_contents(text_indices,
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1092
            self._text_filter)
1093
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1094
    def _least_readv_node_readv(self, nodes):
1095
        """Generate request groups for nodes using the least readv's.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1096
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1097
        :param nodes: An iterable of graph index nodes.
1098
        :return: Total node count and an iterator of the data needed to perform
1099
            readvs to obtain the data for nodes. Each item yielded by the
1100
            iterator is a tuple with:
1101
            index, readv_vector, node_vector. readv_vector is a list ready to
1102
            hand to the transport readv method, and node_vector is a list of
4775.1.1 by Martin Pool
Remove several 'the the' typos
1103
            (key, eol_flag, references) for the node retrieved by the
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1104
            matching readv_vector.
1105
        """
1106
        # group by pack so we do one readv per pack
1107
        nodes = sorted(nodes)
1108
        total = len(nodes)
1109
        request_groups = {}
1110
        for index, key, value, references in nodes:
1111
            if index not in request_groups:
1112
                request_groups[index] = []
1113
            request_groups[index].append((key, value, references))
1114
        result = []
1115
        for index, items in request_groups.iteritems():
1116
            pack_readv_requests = []
1117
            for key, value, references in items:
1118
                # ---- KnitGraphIndex.get_position
1119
                bits = value[1:].split(' ')
1120
                offset, length = int(bits[0]), int(bits[1])
1121
                pack_readv_requests.append(
1122
                    ((offset, length), (key, value[0], references)))
1123
            # linear scan up the pack to maximum range combining.
1124
            pack_readv_requests.sort()
1125
            # split out the readv and the node data.
1126
            pack_readv = [readv for readv, node in pack_readv_requests]
1127
            node_vector = [node for readv, node in pack_readv_requests]
1128
            result.append((index, pack_readv, node_vector))
1129
        return total, result
1130
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1131
    def _log_copied_texts(self):
1132
        if 'pack' in debug.debug_flags:
1133
            mutter('%s: create_pack: file texts copied: %s%s %d items t+%6.3fs',
1134
                time.ctime(), self._pack_collection._upload_transport.base,
1135
                self.new_pack.random_name,
1136
                self.new_pack.text_index.key_count(),
1137
                time.time() - self.new_pack.start_time)
1138
1139
    def _process_inventory_lines(self, inv_lines):
1140
        """Use up the inv_lines generator and setup a text key filter."""
1141
        repo = self._pack_collection.repo
1142
        fileid_revisions = repo._find_file_ids_from_xml_inventory_lines(
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1143
            inv_lines, self.revision_keys)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1144
        text_filter = []
1145
        for fileid, file_revids in fileid_revisions.iteritems():
1146
            text_filter.extend([(fileid, file_revid) for file_revid in file_revids])
1147
        self._text_filter = text_filter
1148
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
1149
    def _revision_node_readv(self, revision_nodes):
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1150
        """Return the total revisions and the readv's to issue.
1151
1152
        :param revision_nodes: The revision index contents for the packs being
1153
            incorporated into the new pack.
1154
        :return: As per _least_readv_node_readv.
1155
        """
1156
        return self._least_readv_node_readv(revision_nodes)
1157
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
1158
    def _use_pack(self, new_pack):
1159
        """Return True if new_pack should be used.
1160
1161
        :param new_pack: The pack that has just been created.
1162
        :return: True if the pack should be used.
1163
        """
1164
        return new_pack.data_inserted()
1165
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1166
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1167
class OptimisingPacker(Packer):
1168
    """A packer which spends more time to create better disk layouts."""
1169
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
1170
    def _revision_node_readv(self, revision_nodes):
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1171
        """Return the total revisions and the readv's to issue.
1172
1173
        This sort places revisions in topological order with the ancestors
1174
        after the children.
1175
1176
        :param revision_nodes: The revision index contents for the packs being
1177
            incorporated into the new pack.
1178
        :return: As per _least_readv_node_readv.
1179
        """
1180
        # build an ancestors dict
1181
        ancestors = {}
1182
        by_key = {}
1183
        for index, key, value, references in revision_nodes:
1184
            ancestors[key] = references[0]
1185
            by_key[key] = (index, value, references)
1186
        order = tsort.topo_sort(ancestors)
1187
        total = len(order)
1188
        # Single IO is pathological, but it will work as a starting point.
1189
        requests = []
1190
        for key in reversed(order):
1191
            index, value, references = by_key[key]
1192
            # ---- KnitGraphIndex.get_position
1193
            bits = value[1:].split(' ')
1194
            offset, length = int(bits[0]), int(bits[1])
1195
            requests.append(
1196
                (index, [(offset, length)], [(key, value[0], references)]))
1197
        # TODO: combine requests in the same index that are in ascending order.
1198
        return total, requests
1199
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1200
    def open_pack(self):
1201
        """Open a pack for the pack we are creating."""
3777.5.5 by John Arbash Meinel
Up-call to the parent as suggested by Andrew.
1202
        new_pack = super(OptimisingPacker, self).open_pack()
1203
        # Turn on the optimization flags for all the index builders.
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1204
        new_pack.revision_index.set_optimize(for_size=True)
1205
        new_pack.inventory_index.set_optimize(for_size=True)
1206
        new_pack.text_index.set_optimize(for_size=True)
1207
        new_pack.signature_index.set_optimize(for_size=True)
1208
        return new_pack
1209
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1210
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
1211
class ReconcilePacker(Packer):
1212
    """A packer which regenerates indices etc as it copies.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1213
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
1214
    This is used by ``bzr reconcile`` to cause parent text pointers to be
1215
    regenerated.
1216
    """
1217
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1218
    def _extra_init(self):
1219
        self._data_changed = False
1220
1221
    def _process_inventory_lines(self, inv_lines):
1222
        """Generate a text key reference map rather for reconciling with."""
1223
        repo = self._pack_collection.repo
1224
        refs = repo._find_text_key_references_from_xml_inventory_lines(
1225
            inv_lines)
1226
        self._text_refs = refs
1227
        # during reconcile we:
1228
        #  - convert unreferenced texts to full texts
1229
        #  - correct texts which reference a text not copied to be full texts
1230
        #  - copy all others as-is but with corrected parents.
1231
        #  - so at this point we don't know enough to decide what becomes a full
1232
        #    text.
1233
        self._text_filter = None
1234
1235
    def _copy_text_texts(self):
1236
        """generate what texts we should have and then copy."""
1237
        self.pb.update("Copying content texts", 3)
1238
        # we have three major tasks here:
1239
        # 1) generate the ideal index
1240
        repo = self._pack_collection.repo
3063.2.1 by Robert Collins
Solve reconciling erroring when multiple portions of a single delta chain are being reinserted.
1241
        ancestors = dict([(key[0], tuple(ref[0] for ref in refs[0])) for
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1242
            _1, key, _2, refs in
3063.2.1 by Robert Collins
Solve reconciling erroring when multiple portions of a single delta chain are being reinserted.
1243
            self.new_pack.revision_index.iter_all_entries()])
1244
        ideal_index = repo._generate_text_key_index(self._text_refs, ancestors)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1245
        # 2) generate a text_nodes list that contains all the deltas that can
1246
        #    be used as-is, with corrected parents.
1247
        ok_nodes = []
1248
        bad_texts = []
1249
        discarded_nodes = []
1250
        NULL_REVISION = _mod_revision.NULL_REVISION
1251
        text_index_map, text_nodes = self._get_text_nodes()
1252
        for node in text_nodes:
1253
            # 0 - index
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1254
            # 1 - key
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1255
            # 2 - value
1256
            # 3 - refs
1257
            try:
1258
                ideal_parents = tuple(ideal_index[node[1]])
1259
            except KeyError:
1260
                discarded_nodes.append(node)
1261
                self._data_changed = True
1262
            else:
1263
                if ideal_parents == (NULL_REVISION,):
1264
                    ideal_parents = ()
1265
                if ideal_parents == node[3][0]:
1266
                    # no change needed.
1267
                    ok_nodes.append(node)
1268
                elif ideal_parents[0:1] == node[3][0][0:1]:
1269
                    # the left most parent is the same, or there are no parents
1270
                    # today. Either way, we can preserve the representation as
1271
                    # long as we change the refs to be inserted.
1272
                    self._data_changed = True
1273
                    ok_nodes.append((node[0], node[1], node[2],
1274
                        (ideal_parents, node[3][1])))
1275
                    self._data_changed = True
1276
                else:
1277
                    # Reinsert this text completely
1278
                    bad_texts.append((node[1], ideal_parents))
1279
                    self._data_changed = True
1280
        # we're finished with some data.
1281
        del ideal_index
1282
        del text_nodes
3063.2.2 by Robert Collins
Review feedback.
1283
        # 3) bulk copy the ok data
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1284
        total_items, readv_group_iter = self._least_readv_node_readv(ok_nodes)
1285
        list(self._copy_nodes_graph(text_index_map, self.new_pack._writer,
1286
            self.new_pack.text_index, readv_group_iter, total_items))
3063.2.1 by Robert Collins
Solve reconciling erroring when multiple portions of a single delta chain are being reinserted.
1287
        # 4) adhoc copy all the other texts.
1288
        # We have to topologically insert all texts otherwise we can fail to
1289
        # reconcile when parts of a single delta chain are preserved intact,
1290
        # and other parts are not. E.g. Discarded->d1->d2->d3. d1 will be
1291
        # reinserted, and if d3 has incorrect parents it will also be
1292
        # reinserted. If we insert d3 first, d2 is present (as it was bulk
1293
        # copied), so we will try to delta, but d2 is not currently able to be
1294
        # extracted because it's basis d1 is not present. Topologically sorting
1295
        # addresses this. The following generates a sort for all the texts that
1296
        # are being inserted without having to reference the entire text key
1297
        # space (we only topo sort the revisions, which is smaller).
1298
        topo_order = tsort.topo_sort(ancestors)
1299
        rev_order = dict(zip(topo_order, range(len(topo_order))))
4385.3.1 by Jelmer Vernooij
Reconcile can now deal with text revisions that originated in revisions that are ghosts.
1300
        bad_texts.sort(key=lambda key:rev_order.get(key[0][1], 0))
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1301
        transaction = repo.get_transaction()
1302
        file_id_index = GraphIndexPrefixAdapter(
1303
            self.new_pack.text_index,
1304
            ('blank', ), 1,
1305
            add_nodes_callback=self.new_pack.text_index.add_nodes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1306
        data_access = _DirectPackAccess(
1307
                {self.new_pack.text_index:self.new_pack.access_tuple()})
1308
        data_access.set_writer(self.new_pack._writer, self.new_pack.text_index,
1309
            self.new_pack.access_tuple())
1310
        output_texts = KnitVersionedFiles(
1311
            _KnitGraphIndex(self.new_pack.text_index,
1312
                add_callback=self.new_pack.text_index.add_nodes,
1313
                deltas=True, parents=True, is_locked=repo.is_locked),
1314
            data_access=data_access, max_delta_chain=200)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1315
        for key, parent_keys in bad_texts:
1316
            # We refer to the new pack to delta data being output.
1317
            # A possible improvement would be to catch errors on short reads
1318
            # and only flush then.
1319
            self.new_pack.flush()
1320
            parents = []
1321
            for parent_key in parent_keys:
1322
                if parent_key[0] != key[0]:
1323
                    # Graph parents must match the fileid
1324
                    raise errors.BzrError('Mismatched key parent %r:%r' %
1325
                        (key, parent_keys))
1326
                parents.append(parent_key[1])
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
1327
            text_lines = osutils.split_lines(repo.texts.get_record_stream(
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1328
                [key], 'unordered', True).next().get_bytes_as('fulltext'))
1329
            output_texts.add_lines(key, parent_keys, text_lines,
1330
                random_id=True, check_content=False)
3063.2.2 by Robert Collins
Review feedback.
1331
        # 5) check that nothing inserted has a reference outside the keyspace.
3830.3.5 by Martin Pool
GraphIndexBuilder shouldn't know references are for compression so rename
1332
        missing_text_keys = self.new_pack.text_index._external_references()
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1333
        if missing_text_keys:
3830.3.4 by Martin Pool
Move _external_compression_references onto the GraphIndexBuilder, and check them for inventories too
1334
            raise errors.BzrCheckError('Reference to missing compression parents %r'
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
1335
                % (missing_text_keys,))
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1336
        self._log_copied_texts()
1337
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
1338
    def _use_pack(self, new_pack):
1339
        """Override _use_pack to check for reconcile having changed content."""
1340
        # XXX: we might be better checking this at the copy time.
1341
        original_inventory_keys = set()
1342
        inv_index = self._pack_collection.inventory_index.combined_index
1343
        for entry in inv_index.iter_all_entries():
1344
            original_inventory_keys.add(entry[1])
1345
        new_inventory_keys = set()
1346
        for entry in new_pack.inventory_index.iter_all_entries():
1347
            new_inventory_keys.add(entry[1])
1348
        if new_inventory_keys != original_inventory_keys:
1349
            self._data_changed = True
1350
        return new_pack.data_inserted() and self._data_changed
1351
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1352
1353
class RepositoryPackCollection(object):
3517.4.4 by Martin Pool
Document RepositoryPackCollection._names
1354
    """Management of packs within a repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1355
3517.4.4 by Martin Pool
Document RepositoryPackCollection._names
1356
    :ivar _names: map of {pack_name: (index_size,)}
1357
    """
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1358
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
1359
    pack_factory = NewPack
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
1360
    resumed_pack_factory = ResumedPack
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
1361
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1362
    def __init__(self, repo, transport, index_transport, upload_transport,
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
1363
                 pack_transport, index_builder_class, index_class,
1364
                 use_chk_index):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1365
        """Create a new RepositoryPackCollection.
1366
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1367
        :param transport: Addresses the repository base directory
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1368
            (typically .bzr/repository/).
1369
        :param index_transport: Addresses the directory containing indices.
1370
        :param upload_transport: Addresses the directory into which packs are written
1371
            while they're being created.
1372
        :param pack_transport: Addresses the directory of existing complete packs.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1373
        :param index_builder_class: The index builder class to use.
1374
        :param index_class: The index class to use.
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
1375
        :param use_chk_index: Whether to setup and manage a CHK index.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1376
        """
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
1377
        # XXX: This should call self.reset()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1378
        self.repo = repo
1379
        self.transport = transport
1380
        self._index_transport = index_transport
1381
        self._upload_transport = upload_transport
1382
        self._pack_transport = pack_transport
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1383
        self._index_builder_class = index_builder_class
1384
        self._index_class = index_class
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1385
        self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3,
1386
            '.cix': 4}
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1387
        self.packs = []
1388
        # name:Pack mapping
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
1389
        self._names = None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1390
        self._packs_by_name = {}
1391
        # the previous pack-names content
1392
        self._packs_at_load = None
1393
        # when a pack is being created by this object, the state of that pack.
1394
        self._new_pack = None
1395
        # aggregated revision index data
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
1396
        flush = self._flush_new_pack
1397
        self.revision_index = AggregateIndex(self.reload_pack_names, flush)
1398
        self.inventory_index = AggregateIndex(self.reload_pack_names, flush)
1399
        self.text_index = AggregateIndex(self.reload_pack_names, flush)
1400
        self.signature_index = AggregateIndex(self.reload_pack_names, flush)
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
1401
        all_indices = [self.revision_index, self.inventory_index,
1402
                self.text_index, self.signature_index]
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
1403
        if use_chk_index:
3735.36.8 by John Arbash Meinel
Merge bzr.dev 4208.
1404
            self.chk_index = AggregateIndex(self.reload_pack_names, flush)
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
1405
            all_indices.append(self.chk_index)
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
1406
        else:
1407
            # used to determine if we're using a chk_index elsewhere.
1408
            self.chk_index = None
5086.7.3 by Andrew Bennetts
Improve docstrings and refactor slightly for clarity.
1409
        # Tell all the CombinedGraphIndex objects about each other, so they can
1410
        # share hints about which pack names to search first.
5086.7.2 by Andrew Bennetts
Share ordering hints between CombinedIndex objects of one RepositoryPackCollection. Greatly improves small fetches from repos with many pack files.
1411
        all_combined = [agg_idx.combined_index for agg_idx in all_indices]
1412
        for combined_idx in all_combined:
5086.7.6 by Andrew Bennetts
Add public set_sibling_indices API so that AggregateIndex doesn't have to poke at _sibling_indices.
1413
            combined_idx.set_sibling_indices(
1414
                set(all_combined).difference([combined_idx]))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1415
        # resumed packs
1416
        self._resumed_packs = []
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1417
4928.1.1 by Martin Pool
Give RepositoryPackCollection a repr
1418
    def __repr__(self):
1419
        return '%s(%r)' % (self.__class__.__name__, self.repo)
1420
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1421
    def add_pack_to_memory(self, pack):
1422
        """Make a Pack object available to the repository to satisfy queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1423
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1424
        :param pack: A Pack object.
1425
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1426
        if pack.name in self._packs_by_name:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1427
            raise AssertionError(
1428
                'pack %s already in _packs_by_name' % (pack.name,))
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1429
        self.packs.append(pack)
1430
        self._packs_by_name[pack.name] = pack
1431
        self.revision_index.add_index(pack.revision_index, pack)
1432
        self.inventory_index.add_index(pack.inventory_index, pack)
1433
        self.text_index.add_index(pack.text_index, pack)
1434
        self.signature_index.add_index(pack.signature_index, pack)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1435
        if self.chk_index is not None:
1436
            self.chk_index.add_index(pack.chk_index, pack)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1437
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1438
    def all_packs(self):
1439
        """Return a list of all the Pack objects this repository has.
1440
1441
        Note that an in-progress pack being created is not returned.
1442
1443
        :return: A list of Pack objects for all the packs in the repository.
1444
        """
1445
        result = []
1446
        for name in self.names():
1447
            result.append(self.get_pack_by_name(name))
1448
        return result
1449
1450
    def autopack(self):
1451
        """Pack the pack collection incrementally.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1452
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1453
        This will not attempt global reorganisation or recompression,
1454
        rather it will just ensure that the total number of packs does
1455
        not grow without bound. It uses the _max_pack_count method to
1456
        determine if autopacking is needed, and the pack_distribution
1457
        method to determine the number of revisions in each pack.
1458
1459
        If autopacking takes place then the packs name collection will have
1460
        been flushed to disk - packing requires updating the name collection
1461
        in synchronisation with certain steps. Otherwise the names collection
1462
        is not flushed.
1463
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1464
        :return: Something evaluating true if packing took place.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1465
        """
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1466
        while True:
1467
            try:
1468
                return self._do_autopack()
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1469
            except errors.RetryAutopack:
3789.2.22 by John Arbash Meinel
We need the Packer class to cleanup if it is getting a Retry it isn't handling.
1470
                # If we get a RetryAutopack exception, we should abort the
1471
                # current action, and retry.
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1472
                pass
1473
1474
    def _do_autopack(self):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1475
        # XXX: Should not be needed when the management of indices is sane.
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1476
        total_revisions = self.revision_index.combined_index.key_count()
1477
        total_packs = len(self._names)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1478
        if self._max_pack_count(total_revisions) >= total_packs:
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1479
            return None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1480
        # determine which packs need changing
1481
        pack_distribution = self.pack_distribution(total_revisions)
1482
        existing_packs = []
1483
        for pack in self.all_packs():
1484
            revision_count = pack.get_revision_count()
1485
            if revision_count == 0:
1486
                # revision less packs are not generated by normal operation,
1487
                # only by operations like sign-my-commits, and thus will not
1488
                # tend to grow rapdily or without bound like commit containing
1489
                # packs do - leave them alone as packing them really should
1490
                # group their data with the relevant commit, and that may
1491
                # involve rewriting ancient history - which autopack tries to
1492
                # avoid. Alternatively we could not group the data but treat
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1493
                # each of these as having a single revision, and thus add
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1494
                # one revision for each to the total revision count, to get
1495
                # a matching distribution.
1496
                continue
1497
            existing_packs.append((revision_count, pack))
1498
        pack_operations = self.plan_autopack_combinations(
1499
            existing_packs, pack_distribution)
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1500
        num_new_packs = len(pack_operations)
1501
        num_old_packs = sum([len(po[1]) for po in pack_operations])
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1502
        num_revs_affected = sum([po[0] for po in pack_operations])
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1503
        mutter('Auto-packing repository %s, which has %d pack files, '
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1504
            'containing %d revisions. Packing %d files into %d affecting %d'
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1505
            ' revisions', self, total_packs, total_revisions, num_old_packs,
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1506
            num_new_packs, num_revs_affected)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1507
        result = self._execute_pack_operations(pack_operations,
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1508
                                      reload_func=self._restart_autopack)
3735.2.37 by Robert Collins
Better autopack cleanup.
1509
        mutter('Auto-packing repository %s completed', self)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1510
        return result
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1511
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1512
    def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1513
                                 reload_func=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1514
        """Execute a series of pack operations.
1515
1516
        :param pack_operations: A list of [revision_count, packs_to_combine].
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
1517
        :param _packer_class: The class of packer to use (default: Packer).
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1518
        :return: The new pack names.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1519
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1520
        for revision_count, packs in pack_operations:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1521
            # we may have no-ops from the setup logic
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1522
            if len(packs) == 0:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1523
                continue
3789.2.22 by John Arbash Meinel
We need the Packer class to cleanup if it is getting a Retry it isn't handling.
1524
            packer = _packer_class(self, packs, '.autopack',
1525
                                   reload_func=reload_func)
1526
            try:
1527
                packer.pack()
1528
            except errors.RetryWithNewPacks:
1529
                # An exception is propagating out of this context, make sure
3789.2.23 by John Arbash Meinel
Clarify the comment.
1530
                # this packer has cleaned up. Packer() doesn't set its new_pack
1531
                # state into the RepositoryPackCollection object, so we only
1532
                # have access to it directly here.
3789.2.22 by John Arbash Meinel
We need the Packer class to cleanup if it is getting a Retry it isn't handling.
1533
                if packer.new_pack is not None:
1534
                    packer.new_pack.abort()
1535
                raise
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1536
            for pack in packs:
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1537
                self._remove_pack_from_memory(pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1538
        # record the newly available packs and stop advertising the old
1539
        # packs
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1540
        to_be_obsoleted = []
1541
        for _, packs in pack_operations:
1542
            to_be_obsoleted.extend(packs)
1543
        result = self._save_pack_names(clear_obsolete_packs=True,
1544
                                       obsolete_packs=to_be_obsoleted)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1545
        return result
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1546
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
1547
    def _flush_new_pack(self):
1548
        if self._new_pack is not None:
1549
            self._new_pack.flush()
1550
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1551
    def lock_names(self):
1552
        """Acquire the mutex around the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1553
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1554
        This cannot be used in the middle of a read-only transaction on the
1555
        repository.
1556
        """
1557
        self.repo.control_files.lock_write()
1558
3735.2.150 by Ian Clatworthy
always repack gc repositories for now, even if only one pack there
1559
    def _already_packed(self):
1560
        """Is the collection already packed?"""
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1561
        return not (self.repo._format.pack_compresses or (len(self._names) > 1))
3735.2.150 by Ian Clatworthy
always repack gc repositories for now, even if only one pack there
1562
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
1563
    def pack(self, hint=None, clean_obsolete_packs=False):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1564
        """Pack the pack collection totally."""
1565
        self.ensure_loaded()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1566
        total_packs = len(self._names)
3735.2.150 by Ian Clatworthy
always repack gc repositories for now, even if only one pack there
1567
        if self._already_packed():
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1568
            return
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1569
        total_revisions = self.revision_index.combined_index.key_count()
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1570
        # XXX: the following may want to be a class, to pack with a given
1571
        # policy.
1572
        mutter('Packing repository %s, which has %d pack files, '
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1573
            'containing %d revisions with hint %r.', self, total_packs,
1574
            total_revisions, hint)
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1575
        # determine which packs need changing
1576
        pack_operations = [[0, []]]
1577
        for pack in self.all_packs():
4476.3.30 by Andrew Bennetts
Return [] rather than None from _commit_write_group if nothing was added, so that pack(hint=None) has a different meaning to pack(hint=[]).
1578
            if hint is None or pack.name in hint:
4476.3.80 by Andrew Bennetts
Comment/docstring tweaks prompted by review.
1579
                # Either no hint was provided (so we are packing everything),
1580
                # or this pack was included in the hint.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1581
                pack_operations[-1][0] += pack.get_revision_count()
1582
                pack_operations[-1][1].append(pack)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1583
        self._execute_pack_operations(pack_operations, OptimisingPacker)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1584
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
1585
        if clean_obsolete_packs:
1586
            self._clear_obsolete_packs()
1587
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1588
    def plan_autopack_combinations(self, existing_packs, pack_distribution):
2592.3.176 by Robert Collins
Various pack refactorings.
1589
        """Plan a pack operation.
1590
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1591
        :param existing_packs: The packs to pack. (A list of (revcount, Pack)
1592
            tuples).
2592.3.235 by Martin Pool
Review cleanups
1593
        :param pack_distribution: A list with the number of revisions desired
2592.3.176 by Robert Collins
Various pack refactorings.
1594
            in each pack.
1595
        """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1596
        if len(existing_packs) <= len(pack_distribution):
1597
            return []
1598
        existing_packs.sort(reverse=True)
1599
        pack_operations = [[0, []]]
1600
        # plan out what packs to keep, and what to reorganise
1601
        while len(existing_packs):
1602
            # take the largest pack, and if its less than the head of the
3711.4.1 by John Arbash Meinel
Fix bug #242510, when determining the autopack sequence,
1603
            # distribution chart we will include its contents in the new pack
1604
            # for that position. If its larger, we remove its size from the
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1605
            # distribution chart
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1606
            next_pack_rev_count, next_pack = existing_packs.pop(0)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1607
            if next_pack_rev_count >= pack_distribution[0]:
1608
                # this is already packed 'better' than this, so we can
1609
                # not waste time packing it.
1610
                while next_pack_rev_count > 0:
1611
                    next_pack_rev_count -= pack_distribution[0]
1612
                    if next_pack_rev_count >= 0:
1613
                        # more to go
1614
                        del pack_distribution[0]
1615
                    else:
1616
                        # didn't use that entire bucket up
1617
                        pack_distribution[0] = -next_pack_rev_count
1618
            else:
1619
                # add the revisions we're going to add to the next output pack
1620
                pack_operations[-1][0] += next_pack_rev_count
1621
                # allocate this pack to the next pack sub operation
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1622
                pack_operations[-1][1].append(next_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1623
                if pack_operations[-1][0] >= pack_distribution[0]:
1624
                    # this pack is used up, shift left.
1625
                    del pack_distribution[0]
1626
                    pack_operations.append([0, []])
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1627
        # Now that we know which pack files we want to move, shove them all
1628
        # into a single pack file.
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1629
        final_rev_count = 0
1630
        final_pack_list = []
1631
        for num_revs, pack_files in pack_operations:
1632
            final_rev_count += num_revs
1633
            final_pack_list.extend(pack_files)
1634
        if len(final_pack_list) == 1:
1635
            raise AssertionError('We somehow generated an autopack with a'
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1636
                ' single pack file being moved.')
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1637
            return []
1638
        return [[final_rev_count, final_pack_list]]
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1639
1640
    def ensure_loaded(self):
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1641
        """Ensure we have read names from disk.
1642
1643
        :return: True if the disk names had not been previously read.
1644
        """
2592.3.214 by Robert Collins
Merge bzr.dev.
1645
        # NB: if you see an assertion error here, its probably access against
1646
        # an unlocked repo. Naughty.
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1647
        if not self.repo.is_locked():
1648
            raise errors.ObjectNotLocked(self.repo)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1649
        if self._names is None:
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1650
            self._names = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1651
            self._packs_at_load = set()
1652
            for index, key, value in self._iter_disk_pack_index():
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1653
                name = key[0]
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1654
                self._names[name] = self._parse_index_sizes(value)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1655
                self._packs_at_load.add((key, value))
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1656
            result = True
1657
        else:
1658
            result = False
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1659
        # populate all the metadata.
1660
        self.all_packs()
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1661
        return result
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1662
1663
    def _parse_index_sizes(self, value):
1664
        """Parse a string of index sizes."""
1665
        return tuple([int(digits) for digits in value.split(' ')])
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1666
2592.3.176 by Robert Collins
Various pack refactorings.
1667
    def get_pack_by_name(self, name):
1668
        """Get a Pack object by name.
1669
1670
        :param name: The name of the pack - e.g. '123456'
1671
        :return: A Pack object.
1672
        """
1673
        try:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1674
            return self._packs_by_name[name]
2592.3.176 by Robert Collins
Various pack refactorings.
1675
        except KeyError:
1676
            rev_index = self._make_index(name, '.rix')
1677
            inv_index = self._make_index(name, '.iix')
1678
            txt_index = self._make_index(name, '.tix')
1679
            sig_index = self._make_index(name, '.six')
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1680
            if self.chk_index is not None:
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1681
                chk_index = self._make_index(name, '.cix', unlimited_cache=True)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1682
            else:
1683
                chk_index = None
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1684
            result = ExistingPack(self._pack_transport, name, rev_index,
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1685
                inv_index, txt_index, sig_index, chk_index)
2592.3.178 by Robert Collins
Add pack objects to the api for PackCollection.create_pack_from_packs.
1686
            self.add_pack_to_memory(result)
2592.3.176 by Robert Collins
Various pack refactorings.
1687
            return result
1688
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1689
    def _resume_pack(self, name):
1690
        """Get a suspended Pack object by name.
1691
1692
        :param name: The name of the pack - e.g. '123456'
1693
        :return: A Pack object.
1694
        """
4002.1.5 by Andrew Bennetts
Fix possible security issue with resuming write groups: make sure the token is well-formed so that it's not possible to steal a write group from another repo.
1695
        if not re.match('[a-f0-9]{32}', name):
1696
            # Tokens should be md5sums of the suspended pack file, i.e. 32 hex
1697
            # digits.
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1698
            raise errors.UnresumableWriteGroup(
4002.1.5 by Andrew Bennetts
Fix possible security issue with resuming write groups: make sure the token is well-formed so that it's not possible to steal a write group from another repo.
1699
                self.repo, [name], 'Malformed write group token')
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1700
        try:
1701
            rev_index = self._make_index(name, '.rix', resume=True)
1702
            inv_index = self._make_index(name, '.iix', resume=True)
1703
            txt_index = self._make_index(name, '.tix', resume=True)
1704
            sig_index = self._make_index(name, '.six', resume=True)
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
1705
            if self.chk_index is not None:
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1706
                chk_index = self._make_index(name, '.cix', resume=True,
1707
                                             unlimited_cache=True)
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
1708
            else:
1709
                chk_index = None
1710
            result = self.resumed_pack_factory(name, rev_index, inv_index,
1711
                txt_index, sig_index, self._upload_transport,
1712
                self._pack_transport, self._index_transport, self,
1713
                chk_index=chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1714
        except errors.NoSuchFile, e:
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1715
            raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1716
        self.add_pack_to_memory(result)
1717
        self._resumed_packs.append(result)
1718
        return result
1719
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1720
    def allocate(self, a_new_pack):
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1721
        """Allocate name in the list of packs.
1722
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1723
        :param a_new_pack: A NewPack instance to be added to the collection of
1724
            packs for this repository.
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1725
        """
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
1726
        self.ensure_loaded()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1727
        if a_new_pack.name in self._names:
2951.2.7 by Robert Collins
Raise an error on duplicate pack name allocation.
1728
            raise errors.BzrError(
1729
                'Pack %r already exists in %s' % (a_new_pack.name, self))
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1730
        self._names[a_new_pack.name] = tuple(a_new_pack.index_sizes)
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1731
        self.add_pack_to_memory(a_new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1732
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1733
    def _iter_disk_pack_index(self):
1734
        """Iterate over the contents of the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1735
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1736
        This is used when loading the list from disk, and before writing to
1737
        detect updates from others during our write operation.
1738
        :return: An iterator of the index contents.
1739
        """
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1740
        return self._index_class(self.transport, 'pack-names', None
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1741
                ).iter_all_entries()
1742
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1743
    def _make_index(self, name, suffix, resume=False, unlimited_cache=False):
2592.3.176 by Robert Collins
Various pack refactorings.
1744
        size_offset = self._suffix_offsets[suffix]
1745
        index_name = name + suffix
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1746
        if resume:
1747
            transport = self._upload_transport
1748
            index_size = transport.stat(index_name).st_size
1749
        else:
1750
            transport = self._index_transport
1751
            index_size = self._names[name][size_offset]
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1752
        return self._index_class(transport, index_name, index_size,
1753
                                 unlimited_cache=unlimited_cache)
2592.5.5 by Martin Pool
Make RepositoryPackCollection remember the index transport, and responsible for getting a map of indexes
1754
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1755
    def _max_pack_count(self, total_revisions):
1756
        """Return the maximum number of packs to use for total revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1757
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1758
        :param total_revisions: The total number of revisions in the
1759
            repository.
1760
        """
1761
        if not total_revisions:
1762
            return 1
1763
        digits = str(total_revisions)
1764
        result = 0
1765
        for digit in digits:
1766
            result += int(digit)
1767
        return result
1768
1769
    def names(self):
1770
        """Provide an order to the underlying names."""
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1771
        return sorted(self._names.keys())
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1772
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1773
    def _obsolete_packs(self, packs):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1774
        """Move a number of packs which have been obsoleted out of the way.
1775
1776
        Each pack and its associated indices are moved out of the way.
1777
1778
        Note: for correctness this function should only be called after a new
1779
        pack names index has been written without these pack names, and with
1780
        the names of packs that contain the data previously available via these
1781
        packs.
1782
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1783
        :param packs: The packs to obsolete.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1784
        :param return: None.
1785
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1786
        for pack in packs:
4634.127.2 by John Arbash Meinel
Change the _obsolete_packs code to handle files that are already gone.
1787
            try:
1788
                pack.pack_transport.rename(pack.file_name(),
1789
                    '../obsolete_packs/' + pack.file_name())
1790
            except (errors.PathError, errors.TransportError), e:
1791
                # TODO: Should these be warnings or mutters?
4634.127.7 by John Arbash Meinel
downgrade the rename warnings to mutters.
1792
                mutter("couldn't rename obsolete pack, skipping it:\n%s"
1793
                       % (e,))
2592.3.226 by Martin Pool
formatting and docstrings
1794
            # TODO: Probably needs to know all possible indices for this pack
1795
            # - or maybe list the directory and move all indices matching this
2592.5.13 by Martin Pool
Clean up duplicate index_transport variables
1796
            # name whether we recognize it or not?
3735.11.14 by John Arbash Meinel
obsolete the .cix index along with the rest.
1797
            suffixes = ['.iix', '.six', '.tix', '.rix']
1798
            if self.chk_index is not None:
1799
                suffixes.append('.cix')
1800
            for suffix in suffixes:
4634.127.2 by John Arbash Meinel
Change the _obsolete_packs code to handle files that are already gone.
1801
                try:
1802
                    self._index_transport.rename(pack.name + suffix,
1803
                        '../obsolete_packs/' + pack.name + suffix)
1804
                except (errors.PathError, errors.TransportError), e:
4634.127.7 by John Arbash Meinel
downgrade the rename warnings to mutters.
1805
                    mutter("couldn't rename obsolete index, skipping it:\n%s"
1806
                           % (e,))
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1807
1808
    def pack_distribution(self, total_revisions):
1809
        """Generate a list of the number of revisions to put in each pack.
1810
1811
        :param total_revisions: The total number of revisions in the
1812
            repository.
1813
        """
1814
        if total_revisions == 0:
1815
            return [0]
1816
        digits = reversed(str(total_revisions))
1817
        result = []
1818
        for exponent, count in enumerate(digits):
1819
            size = 10 ** exponent
1820
            for pos in range(int(count)):
1821
                result.append(size)
1822
        return list(reversed(result))
1823
2592.5.12 by Martin Pool
Move pack_transport and pack_name onto RepositoryPackCollection
1824
    def _pack_tuple(self, name):
1825
        """Return a tuple with the transport and file name for a pack name."""
1826
        return self._pack_transport, name + '.pack'
1827
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1828
    def _remove_pack_from_memory(self, pack):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1829
        """Remove pack from the packs accessed by this repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1830
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1831
        Only affects memory state, until self._save_pack_names() is invoked.
1832
        """
1833
        self._names.pop(pack.name)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1834
        self._packs_by_name.pop(pack.name)
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1835
        self._remove_pack_indices(pack)
3794.3.1 by John Arbash Meinel
In _remove_pack_from_memory, also remove the object from the PackCollection.packs list.
1836
        self.packs.remove(pack)
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1837
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
1838
    def _remove_pack_indices(self, pack, ignore_missing=False):
1839
        """Remove the indices for pack from the aggregated indices.
1840
        
1841
        :param ignore_missing: Suppress KeyErrors from calling remove_index.
1842
        """
1843
        for index_type in Pack.index_definitions.keys():
1844
            attr_name = index_type + '_index'
1845
            aggregate_index = getattr(self, attr_name)
1846
            if aggregate_index is not None:
1847
                pack_index = getattr(pack, attr_name)
1848
                try:
1849
                    aggregate_index.remove_index(pack_index)
1850
                except KeyError:
1851
                    if ignore_missing:
1852
                        continue
1853
                    raise
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1854
1855
    def reset(self):
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1856
        """Clear all cached data."""
1857
        # cached revision data
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1858
        self.revision_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1859
        # cached signature data
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1860
        self.signature_index.clear()
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1861
        # cached file text data
1862
        self.text_index.clear()
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1863
        # cached inventory data
1864
        self.inventory_index.clear()
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1865
        # cached chk data
1866
        if self.chk_index is not None:
1867
            self.chk_index.clear()
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1868
        # remove the open pack
1869
        self._new_pack = None
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1870
        # information about packs.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1871
        self._names = None
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
1872
        self.packs = []
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1873
        self._packs_by_name = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1874
        self._packs_at_load = None
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1875
2592.3.237 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1876
    def _unlock_names(self):
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1877
        """Release the mutex around the pack-names index."""
1878
        self.repo.control_files.unlock()
1879
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1880
    def _diff_pack_names(self):
1881
        """Read the pack names from disk, and compare it to the one in memory.
1882
1883
        :return: (disk_nodes, deleted_nodes, new_nodes)
1884
            disk_nodes    The final set of nodes that should be referenced
1885
            deleted_nodes Nodes which have been removed from when we started
1886
            new_nodes     Nodes that are newly introduced
1887
        """
1888
        # load the disk nodes across
1889
        disk_nodes = set()
1890
        for index, key, value in self._iter_disk_pack_index():
1891
            disk_nodes.add((key, value))
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1892
        orig_disk_nodes = set(disk_nodes)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1893
1894
        # do a two-way diff against our original content
1895
        current_nodes = set()
1896
        for name, sizes in self._names.iteritems():
1897
            current_nodes.add(
1898
                ((name, ), ' '.join(str(size) for size in sizes)))
1899
1900
        # Packs no longer present in the repository, which were present when we
1901
        # locked the repository
1902
        deleted_nodes = self._packs_at_load - current_nodes
1903
        # Packs which this process is adding
1904
        new_nodes = current_nodes - self._packs_at_load
1905
1906
        # Update the disk_nodes set to include the ones we are adding, and
1907
        # remove the ones which were removed by someone else
1908
        disk_nodes.difference_update(deleted_nodes)
1909
        disk_nodes.update(new_nodes)
1910
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1911
        return disk_nodes, deleted_nodes, new_nodes, orig_disk_nodes
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1912
1913
    def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1914
        """Given the correct set of pack files, update our saved info.
1915
1916
        :return: (removed, added, modified)
1917
            removed     pack names removed from self._names
1918
            added       pack names added to self._names
1919
            modified    pack names that had changed value
1920
        """
1921
        removed = []
1922
        added = []
1923
        modified = []
1924
        ## self._packs_at_load = disk_nodes
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1925
        new_names = dict(disk_nodes)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1926
        # drop no longer present nodes
1927
        for pack in self.all_packs():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1928
            if (pack.name,) not in new_names:
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1929
                removed.append(pack.name)
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1930
                self._remove_pack_from_memory(pack)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1931
        # add new nodes/refresh existing ones
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1932
        for key, value in disk_nodes:
1933
            name = key[0]
1934
            sizes = self._parse_index_sizes(value)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1935
            if name in self._names:
1936
                # existing
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1937
                if sizes != self._names[name]:
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1938
                    # the pack for name has had its indices replaced - rare but
1939
                    # important to handle. XXX: probably can never happen today
1940
                    # because the three-way merge code above does not handle it
1941
                    # - you may end up adding the same key twice to the new
1942
                    # disk index because the set values are the same, unless
1943
                    # the only index shows up as deleted by the set difference
1944
                    # - which it may. Until there is a specific test for this,
1945
                    # assume its broken. RBC 20071017.
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1946
                    self._remove_pack_from_memory(self.get_pack_by_name(name))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1947
                    self._names[name] = sizes
1948
                    self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1949
                    modified.append(name)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1950
            else:
1951
                # new
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1952
                self._names[name] = sizes
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1953
                self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1954
                added.append(name)
1955
        return removed, added, modified
1956
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1957
    def _save_pack_names(self, clear_obsolete_packs=False, obsolete_packs=None):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1958
        """Save the list of packs.
1959
1960
        This will take out the mutex around the pack names list for the
1961
        duration of the method call. If concurrent updates have been made, a
1962
        three-way merge between the current list and the current in memory list
1963
        is performed.
1964
1965
        :param clear_obsolete_packs: If True, clear out the contents of the
1966
            obsolete_packs directory.
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1967
        :param obsolete_packs: Packs that are obsolete once the new pack-names
1968
            file has been written.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1969
        :return: A list of the names saved that were not previously on disk.
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1970
        """
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1971
        already_obsolete = []
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1972
        self.lock_names()
1973
        try:
1974
            builder = self._index_builder_class()
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1975
            (disk_nodes, deleted_nodes, new_nodes,
1976
             orig_disk_nodes) = self._diff_pack_names()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1977
            # TODO: handle same-name, index-size-changes here -
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1978
            # e.g. use the value from disk, not ours, *unless* we're the one
1979
            # changing it.
1980
            for key, value in disk_nodes:
1981
                builder.add_node(key, value)
1982
            self.transport.put_file('pack-names', builder.finish(),
1983
                mode=self.repo.bzrdir._get_file_mode())
1984
            self._packs_at_load = disk_nodes
1985
            if clear_obsolete_packs:
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1986
                to_preserve = None
1987
                if obsolete_packs:
1988
                    to_preserve = set([o.name for o in obsolete_packs])
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1989
                already_obsolete = self._clear_obsolete_packs(to_preserve)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1990
        finally:
1991
            self._unlock_names()
1992
        # synchronise the memory packs list with what we just wrote:
1993
        self._syncronize_pack_names_from_disk_nodes(disk_nodes)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1994
        if obsolete_packs:
4634.127.6 by John Arbash Meinel
change tack. Always try to obsolete our current list.
1995
            # TODO: We could add one more condition here. "if o.name not in
1996
            #       orig_disk_nodes and o != the new_pack we haven't written to
1997
            #       disk yet. However, the new pack object is not easily
1998
            #       accessible here (it would have to be passed through the
1999
            #       autopacking code, etc.)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2000
            obsolete_packs = [o for o in obsolete_packs
4634.127.6 by John Arbash Meinel
change tack. Always try to obsolete our current list.
2001
                              if o.name not in already_obsolete]
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2002
            self._obsolete_packs(obsolete_packs)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2003
        return [new_node[0][0] for new_node in new_nodes]
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2004
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
2005
    def reload_pack_names(self):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2006
        """Sync our pack listing with what is present in the repository.
2007
2008
        This should be called when we find out that something we thought was
2009
        present is now missing. This happens when another process re-packs the
2010
        repository, etc.
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
2011
2012
        :return: True if the in-memory list of packs has been altered at all.
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2013
        """
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2014
        # The ensure_loaded call is to handle the case where the first call
2015
        # made involving the collection was to reload_pack_names, where we 
2016
        # don't have a view of disk contents. Its a bit of a bandaid, and
2017
        # causes two reads of pack-names, but its a rare corner case not struck
2018
        # with regular push/pull etc.
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
2019
        first_read = self.ensure_loaded()
2020
        if first_read:
2021
            return True
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2022
        # out the new value.
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2023
        (disk_nodes, deleted_nodes, new_nodes,
2024
         orig_disk_nodes) = self._diff_pack_names()
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
2025
        # _packs_at_load is meant to be the explicit list of names in
2026
        # 'pack-names' at then start. As such, it should not contain any
2027
        # pending names that haven't been written out yet.
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2028
        self._packs_at_load = orig_disk_nodes
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
2029
        (removed, added,
2030
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2031
        if removed or added or modified:
2032
            return True
2033
        return False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2034
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
2035
    def _restart_autopack(self):
2036
        """Reload the pack names list, and restart the autopack code."""
2037
        if not self.reload_pack_names():
2038
            # Re-raise the original exception, because something went missing
2039
            # and a restart didn't find it
2040
            raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2041
        raise errors.RetryAutopack(self.repo, False, sys.exc_info())
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
2042
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2043
    def _clear_obsolete_packs(self, preserve=None):
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2044
        """Delete everything from the obsolete-packs directory.
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2045
2046
        :return: A list of pack identifiers (the filename without '.pack') that
2047
            were found in obsolete_packs.
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2048
        """
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2049
        found = []
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2050
        obsolete_pack_transport = self.transport.clone('obsolete_packs')
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2051
        if preserve is None:
2052
            preserve = set()
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2053
        for filename in obsolete_pack_transport.list_dir('.'):
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2054
            name, ext = osutils.splitext(filename)
2055
            if ext == '.pack':
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2056
                found.append(name)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2057
            if name in preserve:
2058
                continue
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2059
            try:
2060
                obsolete_pack_transport.delete(filename)
2061
            except (errors.PathError, errors.TransportError), e:
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2062
                warning("couldn't delete obsolete pack, skipping it:\n%s"
2063
                        % (e,))
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2064
        return found
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2065
2592.3.202 by Robert Collins
Move write stream management into NewPack.
2066
    def _start_write_group(self):
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
2067
        # Do not permit preparation for writing if we're not in a 'write lock'.
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2068
        if not self.repo.is_write_locked():
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2069
            raise errors.NotWriteLocked(self)
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
2070
        self._new_pack = self.pack_factory(self, upload_suffix='.pack',
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
2071
            file_mode=self.repo.bzrdir._get_file_mode())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
2072
        # allow writing: queue writes to a new index
2073
        self.revision_index.add_writable_index(self._new_pack.revision_index,
2074
            self._new_pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
2075
        self.inventory_index.add_writable_index(self._new_pack.inventory_index,
2076
            self._new_pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
2077
        self.text_index.add_writable_index(self._new_pack.text_index,
2078
            self._new_pack)
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
2079
        self._new_pack.text_index.set_optimize(combine_backing_indices=False)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
2080
        self.signature_index.add_writable_index(self._new_pack.signature_index,
2081
            self._new_pack)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
2082
        if self.chk_index is not None:
2083
            self.chk_index.add_writable_index(self._new_pack.chk_index,
2084
                self._new_pack)
2085
            self.repo.chk_bytes._index._add_callback = self.chk_index.add_callback
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
2086
            self._new_pack.chk_index.set_optimize(combine_backing_indices=False)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2087
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2088
        self.repo.inventories._index._add_callback = self.inventory_index.add_callback
2089
        self.repo.revisions._index._add_callback = self.revision_index.add_callback
2090
        self.repo.signatures._index._add_callback = self.signature_index.add_callback
2091
        self.repo.texts._index._add_callback = self.text_index.add_callback
2592.5.9 by Martin Pool
Move some more bits that seem to belong in RepositoryPackCollection into there
2092
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
2093
    def _abort_write_group(self):
2094
        # FIXME: just drop the transient index.
2095
        # forget what names there are
3163.1.2 by Martin Pool
RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)
2096
        if self._new_pack is not None:
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
2097
            operation = cleanup.OperationWithCleanups(self._new_pack.abort)
2098
            operation.add_cleanup(setattr, self, '_new_pack', None)
2099
            # If we aborted while in the middle of finishing the write
2100
            # group, _remove_pack_indices could fail because the indexes are
2101
            # already gone.  But they're not there we shouldn't fail in this
2102
            # case, so we pass ignore_missing=True.
2103
            operation.add_cleanup(self._remove_pack_indices, self._new_pack,
2104
                ignore_missing=True)
2105
            operation.run_simple()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2106
        for resumed_pack in self._resumed_packs:
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
2107
            operation = cleanup.OperationWithCleanups(resumed_pack.abort)
2108
            # See comment in previous finally block.
2109
            operation.add_cleanup(self._remove_pack_indices, resumed_pack,
2110
                ignore_missing=True)
2111
            operation.run_simple()
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
2112
        del self._resumed_packs[:]
2592.5.6 by Martin Pool
Move pack repository start_write_group to pack collection object
2113
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2114
    def _remove_resumed_pack_indices(self):
2115
        for resumed_pack in self._resumed_packs:
2116
            self._remove_pack_indices(resumed_pack)
2117
        del self._resumed_packs[:]
2118
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2119
    def _check_new_inventories(self):
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
2120
        """Detect missing inventories in this write group.
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2121
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
2122
        :returns: list of strs, summarising any problems found.  If the list is
2123
            empty no problems were found.
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2124
        """
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
2125
        # The base implementation does no checks.  GCRepositoryPackCollection
2126
        # overrides this.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
2127
        return []
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2128
        
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
2129
    def _commit_write_group(self):
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2130
        all_missing = set()
2131
        for prefix, versioned_file in (
2132
                ('revisions', self.repo.revisions),
2133
                ('inventories', self.repo.inventories),
2134
                ('texts', self.repo.texts),
2135
                ('signatures', self.repo.signatures),
2136
                ):
4002.1.9 by Andrew Bennetts
Merge VersionedFiles.insert-record-stream.partial from Robert.
2137
            missing = versioned_file.get_missing_compression_parent_keys()
4759.2.3 by John Arbash Meinel
Revert the fix from vila and spiv, since now concatenating
2138
            all_missing.update([(prefix,) + key for key in missing])
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2139
        if all_missing:
2140
            raise errors.BzrCheckError(
2141
                "Repository %s has missing compression parent(s) %r "
2142
                 % (self.repo, sorted(all_missing)))
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
2143
        problems = self._check_new_inventories()
2144
        if problems:
2145
            problems_summary = '\n'.join(problems)
2146
            raise errors.BzrCheckError(
2147
                "Cannot add revision(s) to repository: " + problems_summary)
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
2148
        self._remove_pack_indices(self._new_pack)
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2149
        any_new_content = False
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
2150
        if self._new_pack.data_inserted():
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
2151
            # get all the data to disk and read to use
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
2152
            self._new_pack.finish()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
2153
            self.allocate(self._new_pack)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
2154
            self._new_pack = None
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2155
            any_new_content = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2156
        else:
2157
            self._new_pack.abort()
2158
            self._new_pack = None
2159
        for resumed_pack in self._resumed_packs:
2160
            # XXX: this is a pretty ugly way to turn the resumed pack into a
2161
            # properly committed pack.
2162
            self._names[resumed_pack.name] = None
2163
            self._remove_pack_from_memory(resumed_pack)
2164
            resumed_pack.finish()
2165
            self.allocate(resumed_pack)
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2166
            any_new_content = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2167
        del self._resumed_packs[:]
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2168
        if any_new_content:
2169
            result = self.autopack()
2170
            if not result:
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
2171
                # when autopack takes no steps, the names list is still
2172
                # unsaved.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2173
                return self._save_pack_names()
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2174
            return result
4476.3.30 by Andrew Bennetts
Return [] rather than None from _commit_write_group if nothing was added, so that pack(hint=None) has a different meaning to pack(hint=[]).
2175
        return []
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2176
2177
    def _suspend_write_group(self):
2178
        tokens = [pack.name for pack in self._resumed_packs]
2179
        self._remove_pack_indices(self._new_pack)
2180
        if self._new_pack.data_inserted():
2181
            # get all the data to disk and read to use
2182
            self._new_pack.finish(suspend=True)
2183
            tokens.append(self._new_pack.name)
2184
            self._new_pack = None
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
2185
        else:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
2186
            self._new_pack.abort()
2951.1.1 by Robert Collins
(robertc) Fix data-refresh logic for packs not to refresh mid-transaction when a names write lock is held. (Robert Collins)
2187
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2188
        self._remove_resumed_pack_indices()
2189
        return tokens
2190
2191
    def _resume_write_group(self, tokens):
2192
        for token in tokens:
2193
            self._resume_pack(token)
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
2194
2195
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2196
class KnitPackRepository(KnitRepository):
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2197
    """Repository with knit objects stored inside pack containers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2198
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2199
    The layering for a KnitPackRepository is:
2200
2201
    Graph        |  HPSS    | Repository public layer |
2202
    ===================================================
2203
    Tuple based apis below, string based, and key based apis above
2204
    ---------------------------------------------------
2205
    KnitVersionedFiles
2206
      Provides .texts, .revisions etc
2207
      This adapts the N-tuple keys to physical knit records which only have a
2208
      single string identifier (for historical reasons), which in older formats
2209
      was always the revision_id, and in the mapped code for packs is always
2210
      the last element of key tuples.
2211
    ---------------------------------------------------
2212
    GraphIndex
2213
      A separate GraphIndex is used for each of the
2214
      texts/inventories/revisions/signatures contained within each individual
2215
      pack file. The GraphIndex layer works in N-tuples and is unaware of any
2216
      semantic value.
2217
    ===================================================
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2218
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2219
    """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2220
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2221
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
2222
        _serializer):
2223
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
2224
            _commit_builder_class, _serializer)
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2225
        index_transport = self._transport.clone('indices')
3350.6.5 by Robert Collins
Update to bzr.dev.
2226
        self._pack_collection = RepositoryPackCollection(self, self._transport,
2592.5.11 by Martin Pool
Move upload_transport from pack repositories to the pack collection
2227
            index_transport,
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2228
            self._transport.clone('upload'),
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2229
            self._transport.clone('packs'),
2230
            _format.index_builder_class,
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
2231
            _format.index_class,
2232
            use_chk_index=self._format.supports_chks,
2233
            )
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2234
        self.inventories = KnitVersionedFiles(
2235
            _KnitGraphIndex(self._pack_collection.inventory_index.combined_index,
2236
                add_callback=self._pack_collection.inventory_index.add_callback,
2237
                deltas=True, parents=True, is_locked=self.is_locked),
2238
            data_access=self._pack_collection.inventory_index.data_access,
2239
            max_delta_chain=200)
2240
        self.revisions = KnitVersionedFiles(
2241
            _KnitGraphIndex(self._pack_collection.revision_index.combined_index,
2242
                add_callback=self._pack_collection.revision_index.add_callback,
4257.4.10 by Andrew Bennetts
Observe new revisions in _KnitGraphIndex.add_record rather than iterating all the uncommitted packs' indices.
2243
                deltas=False, parents=True, is_locked=self.is_locked,
4257.4.11 by Andrew Bennetts
Polish the patch.
2244
                track_external_parent_refs=True),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2245
            data_access=self._pack_collection.revision_index.data_access,
2246
            max_delta_chain=0)
2247
        self.signatures = KnitVersionedFiles(
2248
            _KnitGraphIndex(self._pack_collection.signature_index.combined_index,
2249
                add_callback=self._pack_collection.signature_index.add_callback,
2250
                deltas=False, parents=False, is_locked=self.is_locked),
2251
            data_access=self._pack_collection.signature_index.data_access,
2252
            max_delta_chain=0)
2253
        self.texts = KnitVersionedFiles(
2254
            _KnitGraphIndex(self._pack_collection.text_index.combined_index,
2255
                add_callback=self._pack_collection.text_index.add_callback,
2256
                deltas=True, parents=True, is_locked=self.is_locked),
2257
            data_access=self._pack_collection.text_index.data_access,
2258
            max_delta_chain=200)
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
2259
        if _format.supports_chks:
2260
            # No graph, no compression:- references from chks are between
2261
            # different objects not temporal versions of the same; and without
2262
            # some sort of temporal structure knit compression will just fail.
2263
            self.chk_bytes = KnitVersionedFiles(
2264
                _KnitGraphIndex(self._pack_collection.chk_index.combined_index,
2265
                    add_callback=self._pack_collection.chk_index.add_callback,
2266
                    deltas=False, parents=False, is_locked=self.is_locked),
2267
                data_access=self._pack_collection.chk_index.data_access,
2268
                max_delta_chain=0)
2269
        else:
2270
            self.chk_bytes = None
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2271
        # True when the repository object is 'write locked' (as opposed to the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2272
        # physical lock only taken out around changes to the pack-names list.)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2273
        # Another way to represent this would be a decorator around the control
2274
        # files object that presents logical locks as physical ones - if this
2275
        # gets ugly consider that alternative design. RBC 20071011
2276
        self._write_lock_count = 0
2277
        self._transaction = None
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
2278
        # for tests
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2279
        self._reconcile_does_inventory_gc = True
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
2280
        self._reconcile_fixes_text_parents = True
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2281
        self._reconcile_backsup_inventory = False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2282
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2283
    def _warn_if_deprecated(self, branch=None):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2284
        # This class isn't deprecated, but one sub-format is
2285
        if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2286
            super(KnitPackRepository, self)._warn_if_deprecated(branch)
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2287
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2288
    def _abort_write_group(self):
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2289
        self.revisions._index._key_dependencies.clear()
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2290
        self._pack_collection._abort_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2291
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2292
    def _get_source(self, to_format):
2293
        if to_format.network_name() == self._format.network_name():
2294
            return KnitPackStreamSource(self, to_format)
2295
        return super(KnitPackRepository, self)._get_source(to_format)
2296
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2297
    def _make_parents_provider(self):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2298
        return graph.CachingParentsProvider(self)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2299
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2300
    def _refresh_data(self):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2301
        if not self.is_locked():
2302
            return
2303
        self._pack_collection.reload_pack_names()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2304
2305
    def _start_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2306
        self._pack_collection._start_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2307
2308
    def _commit_write_group(self):
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2309
        hint = self._pack_collection._commit_write_group()
2310
        self.revisions._index._key_dependencies.clear()
2311
        return hint
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2312
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2313
    def suspend_write_group(self):
2314
        # XXX check self._write_group is self.get_transaction()?
2315
        tokens = self._pack_collection._suspend_write_group()
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2316
        self.revisions._index._key_dependencies.clear()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2317
        self._write_group = None
2318
        return tokens
2319
2320
    def _resume_write_group(self, tokens):
2321
        self._start_write_group()
4395.1.1 by John Arbash Meinel
If _resume_write_group aborts, make sure to clean up pending packs.
2322
        try:
2323
            self._pack_collection._resume_write_group(tokens)
2324
        except errors.UnresumableWriteGroup:
2325
            self._abort_write_group()
2326
            raise
4257.4.10 by Andrew Bennetts
Observe new revisions in _KnitGraphIndex.add_record rather than iterating all the uncommitted packs' indices.
2327
        for pack in self._pack_collection._resumed_packs:
2328
            self.revisions._index.scan_unvalidated_index(pack.revision_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2329
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2330
    def get_transaction(self):
2331
        if self._write_lock_count:
2332
            return self._transaction
2333
        else:
2334
            return self.control_files.get_transaction()
2335
2336
    def is_locked(self):
2337
        return self._write_lock_count or self.control_files.is_locked()
2338
2339
    def is_write_locked(self):
2340
        return self._write_lock_count
2341
2342
    def lock_write(self, token=None):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2343
        locked = self.is_locked()
2344
        if not self._write_lock_count and locked:
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2345
            raise errors.ReadOnlyError(self)
2346
        self._write_lock_count += 1
2347
        if self._write_lock_count == 1:
2348
            self._transaction = transactions.WriteTransaction()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2349
        if not locked:
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
2350
            if 'relock' in debug.debug_flags and self._prev_lock == 'w':
2351
                note('%r was write locked again', self)
2352
            self._prev_lock = 'w'
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2353
            for repo in self._fallback_repositories:
2354
                # Writes don't affect fallback repos
2355
                repo.lock_read()
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2356
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2357
2358
    def lock_read(self):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2359
        locked = self.is_locked()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2360
        if self._write_lock_count:
2361
            self._write_lock_count += 1
2362
        else:
2363
            self.control_files.lock_read()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2364
        if not locked:
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
2365
            if 'relock' in debug.debug_flags and self._prev_lock == 'r':
2366
                note('%r was read locked again', self)
2367
            self._prev_lock = 'r'
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2368
            for repo in self._fallback_repositories:
2369
                repo.lock_read()
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2370
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2371
2372
    def leave_lock_in_place(self):
2373
        # not supported - raise an error
2374
        raise NotImplementedError(self.leave_lock_in_place)
2375
2376
    def dont_leave_lock_in_place(self):
2377
        # not supported - raise an error
2378
        raise NotImplementedError(self.dont_leave_lock_in_place)
2379
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2380
    @needs_write_lock
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
2381
    def pack(self, hint=None, clean_obsolete_packs=False):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2382
        """Compress the data within the repository.
2383
2384
        This will pack all the data to a single pack. In future it may
2385
        recompress deltas or do other such expensive operations.
2386
        """
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
2387
        self._pack_collection.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2388
2389
    @needs_write_lock
2390
    def reconcile(self, other=None, thorough=False):
2391
        """Reconcile this repository."""
2392
        from bzrlib.reconcile import PackReconciler
2393
        reconciler = PackReconciler(self, thorough=thorough)
2394
        reconciler.reconcile()
2395
        return reconciler
2396
4245.1.1 by Ian Clatworthy
minor test clean-ups & _reconcile_pack API
2397
    def _reconcile_pack(self, collection, packs, extension, revs, pb):
2398
        packer = ReconcilePacker(collection, packs, extension, revs)
2399
        return packer.pack(pb)
2400
4634.85.10 by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise.
2401
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2402
    def unlock(self):
2403
        if self._write_lock_count == 1 and self._write_group is not None:
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
2404
            self.abort_write_group()
2405
            self._transaction = None
2406
            self._write_lock_count = 0
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2407
            raise errors.BzrError(
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
2408
                'Must end write group before releasing write lock on %s'
2409
                % self)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2410
        if self._write_lock_count:
2411
            self._write_lock_count -= 1
2412
            if not self._write_lock_count:
2413
                transaction = self._transaction
2414
                self._transaction = None
2415
                transaction.finish()
2416
        else:
2417
            self.control_files.unlock()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2418
2419
        if not self.is_locked():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2420
            for repo in self._fallback_repositories:
2421
                repo.unlock()
2422
2423
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2424
class KnitPackStreamSource(StreamSource):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2425
    """A StreamSource used to transfer data between same-format KnitPack repos.
2426
2427
    This source assumes:
2428
        1) Same serialization format for all objects
2429
        2) Same root information
2430
        3) XML format inventories
2431
        4) Atomic inserts (so we can stream inventory texts before text
2432
           content)
2433
        5) No chk_bytes
2434
    """
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2435
2436
    def __init__(self, from_repository, to_format):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2437
        super(KnitPackStreamSource, self).__init__(from_repository, to_format)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2438
        self._text_keys = None
2439
        self._text_fetch_order = 'unordered'
2440
2441
    def _get_filtered_inv_stream(self, revision_ids):
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2442
        from_repo = self.from_repository
4360.4.10 by John Arbash Meinel
Remove some of the code duplication.
2443
        parent_ids = from_repo._find_parent_ids_of_revisions(revision_ids)
4360.4.7 by John Arbash Meinel
It seems that inventory_xml_lines_for_keys really does want keys and not ids.
2444
        parent_keys = [(p,) for p in parent_ids]
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2445
        find_text_keys = from_repo._find_text_key_references_from_xml_inventory_lines
2446
        parent_text_keys = set(find_text_keys(
4360.4.7 by John Arbash Meinel
It seems that inventory_xml_lines_for_keys really does want keys and not ids.
2447
            from_repo._inventory_xml_lines_for_keys(parent_keys)))
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2448
        content_text_keys = set()
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2449
        knit = KnitVersionedFiles(None, None)
2450
        factory = KnitPlainFactory()
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2451
        def find_text_keys_from_content(record):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2452
            if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):
2453
                raise ValueError("Unknown content storage kind for"
2454
                    " inventory text: %s" % (record.storage_kind,))
2455
            # It's a knit record, it has a _raw_record field (even if it was
2456
            # reconstituted from a network stream).
2457
            raw_data = record._raw_record
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2458
            # read the entire thing
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2459
            revision_id = record.key[-1]
2460
            content, _ = knit._parse_record(revision_id, raw_data)
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2461
            if record.storage_kind == 'knit-delta-gz':
2462
                line_iterator = factory.get_linedelta_content(content)
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2463
            elif record.storage_kind == 'knit-ft-gz':
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2464
                line_iterator = factory.get_fulltext_content(content)
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2465
            content_text_keys.update(find_text_keys(
2466
                [(line, revision_id) for line in line_iterator]))
2467
        revision_keys = [(r,) for r in revision_ids]
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2468
        def _filtered_inv_stream():
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2469
            source_vf = from_repo.inventories
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2470
            stream = source_vf.get_record_stream(revision_keys,
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2471
                                                 'unordered', False)
2472
            for record in stream:
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2473
                if record.storage_kind == 'absent':
2474
                    raise errors.NoSuchRevision(from_repo, record.key)
2475
                find_text_keys_from_content(record)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2476
                yield record
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2477
            self._text_keys = content_text_keys - parent_text_keys
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2478
        return ('inventories', _filtered_inv_stream())
2479
2480
    def _get_text_stream(self):
2481
        # Note: We know we don't have to handle adding root keys, because both
2482
        # the source and target are the identical network name.
4360.4.7 by John Arbash Meinel
It seems that inventory_xml_lines_for_keys really does want keys and not ids.
2483
        text_stream = self.from_repository.texts.get_record_stream(
2484
                        self._text_keys, self._text_fetch_order, False)
2485
        return ('texts', text_stream)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2486
2487
    def get_stream(self, search):
2488
        revision_ids = search.get_keys()
2489
        for stream_info in self._fetch_revision_texts(revision_ids):
2490
            yield stream_info
2491
        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2492
        yield self._get_filtered_inv_stream(revision_ids)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2493
        yield self._get_text_stream()
2494
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2495
2496
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2497
class RepositoryFormatPack(MetaDirRepositoryFormat):
2498
    """Format logic for pack structured repositories.
2499
2500
    This repository format has:
2501
     - a list of packs in pack-names
2502
     - packs in packs/NAME.pack
2503
     - indices in indices/NAME.{iix,six,tix,rix}
2504
     - knit deltas in the packs, knit indices mapped to the indices.
2505
     - thunk objects to support the knits programming API.
2506
     - a format marker of its own
2507
     - an optional 'shared-storage' flag
2508
     - an optional 'no-working-trees' flag
2509
     - a LockDir lock
2510
    """
2511
2512
    # Set this attribute in derived classes to control the repository class
2513
    # created by open and initialize.
2514
    repository_class = None
2515
    # Set this attribute in derived classes to control the
2516
    # _commit_builder_class that the repository objects will have passed to
2517
    # their constructor.
2518
    _commit_builder_class = None
2519
    # Set this attribute in derived clases to control the _serializer that the
2520
    # repository objects will have passed to their constructor.
2521
    _serializer = None
2949.1.5 by Robert Collins
Packs support ghosts.
2522
    # Packs are not confused by ghosts.
2523
    supports_ghosts = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2524
    # External references are not supported in pack repositories yet.
2525
    supports_external_lookups = False
4246.2.1 by Ian Clatworthy
supports_chks flag on repo formats & log tuning
2526
    # Most pack formats do not use chk lookups.
2527
    supports_chks = False
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2528
    # What index classes to use
2529
    index_builder_class = None
2530
    index_class = None
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2531
    _fetch_uses_deltas = True
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
2532
    fast_deltas = False
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2533
2534
    def initialize(self, a_bzrdir, shared=False):
2535
        """Create a pack based repository.
2536
2537
        :param a_bzrdir: bzrdir to contain the new repository; must already
2538
            be initialized.
2539
        :param shared: If true the repository will be initialized as a shared
2540
                       repository.
2541
        """
2542
        mutter('creating repository in %s.', a_bzrdir.transport.base)
2543
        dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2544
        builder = self.index_builder_class()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2545
        files = [('pack-names', builder.finish())]
2546
        utf8_files = [('format', self.get_format_string())]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2547
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2548
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2549
        repository = self.open(a_bzrdir=a_bzrdir, _found=True)
2550
        self._run_post_repo_init_hooks(repository, a_bzrdir, shared)
2551
        return repository
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2552
2553
    def open(self, a_bzrdir, _found=False, _override_transport=None):
2554
        """See RepositoryFormat.open().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2555
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2556
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
2557
                                    repository at a slightly different url
2558
                                    than normal. I.e. during 'upgrade'.
2559
        """
2560
        if not _found:
2561
            format = RepositoryFormat.find_format(a_bzrdir)
2562
        if _override_transport is not None:
2563
            repo_transport = _override_transport
2564
        else:
2565
            repo_transport = a_bzrdir.get_repository_transport(None)
2566
        control_files = lockable_files.LockableFiles(repo_transport,
2567
                                'lock', lockdir.LockDir)
2568
        return self.repository_class(_format=self,
2569
                              a_bzrdir=a_bzrdir,
2570
                              control_files=control_files,
2571
                              _commit_builder_class=self._commit_builder_class,
2572
                              _serializer=self._serializer)
2573
2574
2575
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2576
    """A no-subtrees parameterized Pack repository.
2577
2578
    This format was introduced in 0.92.
2579
    """
2580
2581
    repository_class = KnitPackRepository
2582
    _commit_builder_class = PackCommitBuilder
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
2583
    @property
2584
    def _serializer(self):
2585
        return xml5.serializer_v5
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2586
    # What index classes to use
2587
    index_builder_class = InMemoryGraphIndex
2588
    index_class = GraphIndex
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2589
2590
    def _get_matching_bzrdir(self):
2591
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2592
2593
    def _ignore_setting_bzrdir(self, format):
2594
        pass
2595
2596
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2597
2598
    def get_format_string(self):
2599
        """See RepositoryFormat.get_format_string()."""
2600
        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2601
2602
    def get_format_description(self):
2603
        """See RepositoryFormat.get_format_description()."""
2604
        return "Packs containing knits without subtree support"
2605
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2606
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2607
class RepositoryFormatKnitPack3(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2608
    """A subtrees parameterized Pack repository.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2609
2592.3.215 by Robert Collins
Review feedback.
2610
    This repository format uses the xml7 serializer to get:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2611
     - support for recording full info about the tree root
2612
     - support for recording tree-references
2592.3.215 by Robert Collins
Review feedback.
2613
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2614
    This format was introduced in 0.92.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2615
    """
2616
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2617
    repository_class = KnitPackRepository
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
2618
    _commit_builder_class = PackRootCommitBuilder
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2619
    rich_root_data = True
4988.9.1 by Jelmer Vernooij
Add experimental flag to RepositoryFormat.
2620
    experimental = True
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2621
    supports_tree_reference = True
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
2622
    @property
2623
    def _serializer(self):
2624
        return xml7.serializer_v7
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2625
    # What index classes to use
2626
    index_builder_class = InMemoryGraphIndex
2627
    index_class = GraphIndex
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2628
2629
    def _get_matching_bzrdir(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
2630
        return bzrdir.format_registry.make_bzrdir(
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
2631
            'pack-0.92-subtree')
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2632
2633
    def _ignore_setting_bzrdir(self, format):
2634
        pass
2635
2636
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2637
2638
    def get_format_string(self):
2639
        """See RepositoryFormat.get_format_string()."""
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2640
        return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2641
2642
    def get_format_description(self):
2643
        """See RepositoryFormat.get_format_description()."""
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2644
        return "Packs containing knits with subtree support\n"
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2645
2646
2647
class RepositoryFormatKnitPack4(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2648
    """A rich-root, no subtrees parameterized Pack repository.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2649
2996.2.12 by Aaron Bentley
Text fixes from review
2650
    This repository format uses the xml6 serializer to get:
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2651
     - support for recording full info about the tree root
2652
2996.2.12 by Aaron Bentley
Text fixes from review
2653
    This format was introduced in 1.0.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2654
    """
2655
2656
    repository_class = KnitPackRepository
2657
    _commit_builder_class = PackRootCommitBuilder
2658
    rich_root_data = True
2659
    supports_tree_reference = False
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
2660
    @property
2661
    def _serializer(self):
2662
        return xml6.serializer_v6
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2663
    # What index classes to use
2664
    index_builder_class = InMemoryGraphIndex
2665
    index_class = GraphIndex
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2666
2667
    def _get_matching_bzrdir(self):
2668
        return bzrdir.format_registry.make_bzrdir(
2669
            'rich-root-pack')
2670
2671
    def _ignore_setting_bzrdir(self, format):
2672
        pass
2673
2674
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2675
2676
    def get_format_string(self):
2677
        """See RepositoryFormat.get_format_string()."""
2678
        return ("Bazaar pack repository format 1 with rich root"
2679
                " (needs bzr 1.0)\n")
2680
2681
    def get_format_description(self):
2682
        """See RepositoryFormat.get_format_description()."""
2683
        return "Packs containing knits with rich root support\n"
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2684
2685
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2686
class RepositoryFormatKnitPack5(RepositoryFormatPack):
2687
    """Repository that supports external references to allow stacking.
2688
2689
    New in release 1.6.
2690
2691
    Supports external lookups, which results in non-truncated ghosts after
2692
    reconcile compared to pack-0.92 formats.
2693
    """
2694
2695
    repository_class = KnitPackRepository
2696
    _commit_builder_class = PackCommitBuilder
2697
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2698
    # What index classes to use
2699
    index_builder_class = InMemoryGraphIndex
2700
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2701
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2702
    @property
2703
    def _serializer(self):
2704
        return xml5.serializer_v5
2705
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2706
    def _get_matching_bzrdir(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2707
        return bzrdir.format_registry.make_bzrdir('1.6')
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2708
2709
    def _ignore_setting_bzrdir(self, format):
2710
        pass
2711
2712
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2713
2714
    def get_format_string(self):
2715
        """See RepositoryFormat.get_format_string()."""
2716
        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
2717
2718
    def get_format_description(self):
2719
        """See RepositoryFormat.get_format_description()."""
3606.3.1 by Aaron Bentley
Update repo format strings
2720
        return "Packs 5 (adds stacking support, requires bzr 1.6)"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2721
2722
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2723
class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2724
    """A repository with rich roots and stacking.
2725
2726
    New in release 1.6.1.
2727
2728
    Supports stacking on other repositories, allowing data to be accessed
2729
    without being stored locally.
2730
    """
2731
2732
    repository_class = KnitPackRepository
2733
    _commit_builder_class = PackRootCommitBuilder
2734
    rich_root_data = True
2735
    supports_tree_reference = False # no subtrees
2736
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2737
    # What index classes to use
2738
    index_builder_class = InMemoryGraphIndex
2739
    index_class = GraphIndex
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2740
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2741
    @property
2742
    def _serializer(self):
2743
        return xml6.serializer_v6
2744
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2745
    def _get_matching_bzrdir(self):
2746
        return bzrdir.format_registry.make_bzrdir(
3606.10.2 by John Arbash Meinel
Name the new format 1.6.1-rich-root, and NEWS for fixing bug #262333
2747
            '1.6.1-rich-root')
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2748
2749
    def _ignore_setting_bzrdir(self, format):
2750
        pass
2751
2752
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2753
2754
    def get_format_string(self):
2755
        """See RepositoryFormat.get_format_string()."""
2756
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2757
2758
    def get_format_description(self):
2759
        return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
2760
2761
2762
class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
3606.3.1 by Aaron Bentley
Update repo format strings
2763
    """A repository with rich roots and external references.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2764
2765
    New in release 1.6.
2766
2767
    Supports external lookups, which results in non-truncated ghosts after
2768
    reconcile compared to pack-0.92 formats.
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2769
2770
    This format was deprecated because the serializer it uses accidentally
2771
    supported subtrees, when the format was not intended to. This meant that
2772
    someone could accidentally fetch from an incorrect repository.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2773
    """
2774
2775
    repository_class = KnitPackRepository
2776
    _commit_builder_class = PackRootCommitBuilder
2777
    rich_root_data = True
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2778
    supports_tree_reference = False # no subtrees
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2779
2780
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2781
    # What index classes to use
2782
    index_builder_class = InMemoryGraphIndex
2783
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2784
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2785
    @property
2786
    def _serializer(self):
2787
        return xml7.serializer_v7
2788
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2789
    def _get_matching_bzrdir(self):
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2790
        matching = bzrdir.format_registry.make_bzrdir(
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2791
            '1.6.1-rich-root')
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2792
        matching.repository_format = self
2793
        return matching
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2794
2795
    def _ignore_setting_bzrdir(self, format):
2796
        pass
2797
2798
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2799
2800
    def get_format_string(self):
2801
        """See RepositoryFormat.get_format_string()."""
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2802
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2803
2804
    def get_format_description(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2805
        return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
2806
                " (deprecated)")
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2807
2808
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2809
class RepositoryFormatKnitPack6(RepositoryFormatPack):
2810
    """A repository with stacking and btree indexes,
2811
    without rich roots or subtrees.
2812
2813
    This is equivalent to pack-1.6 with B+Tree indices.
2814
    """
2815
2816
    repository_class = KnitPackRepository
2817
    _commit_builder_class = PackCommitBuilder
2818
    supports_external_lookups = True
2819
    # What index classes to use
2820
    index_builder_class = BTreeBuilder
2821
    index_class = BTreeGraphIndex
2822
2823
    @property
2824
    def _serializer(self):
2825
        return xml5.serializer_v5
2826
2827
    def _get_matching_bzrdir(self):
2828
        return bzrdir.format_registry.make_bzrdir('1.9')
2829
2830
    def _ignore_setting_bzrdir(self, format):
2831
        pass
2832
2833
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2834
2835
    def get_format_string(self):
2836
        """See RepositoryFormat.get_format_string()."""
2837
        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2838
2839
    def get_format_description(self):
2840
        """See RepositoryFormat.get_format_description()."""
2841
        return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2842
2843
2844
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2845
    """A repository with rich roots, no subtrees, stacking and btree indexes.
2846
3805.5.1 by John Arbash Meinel
Fix a docstring.
2847
    1.6-rich-root with B+Tree indices.
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2848
    """
2849
2850
    repository_class = KnitPackRepository
2851
    _commit_builder_class = PackRootCommitBuilder
2852
    rich_root_data = True
2853
    supports_tree_reference = False # no subtrees
2854
    supports_external_lookups = True
2855
    # What index classes to use
2856
    index_builder_class = BTreeBuilder
2857
    index_class = BTreeGraphIndex
2858
2859
    @property
2860
    def _serializer(self):
2861
        return xml6.serializer_v6
2862
2863
    def _get_matching_bzrdir(self):
2864
        return bzrdir.format_registry.make_bzrdir(
2865
            '1.9-rich-root')
2866
2867
    def _ignore_setting_bzrdir(self, format):
2868
        pass
2869
2870
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2871
2872
    def get_format_string(self):
2873
        """See RepositoryFormat.get_format_string()."""
2874
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2875
2876
    def get_format_description(self):
2877
        return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2878
2879
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2880
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2881
    """A subtrees development repository.
2882
2883
    This format should be retained until the second release after bzr 1.7.
2884
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2885
    1.6.1-subtree[as it might have been] with B+Tree indices.
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)
2886
2887
    This is [now] retained until we have a CHK based subtree format in
2888
    development.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2889
    """
2890
2891
    repository_class = KnitPackRepository
2892
    _commit_builder_class = PackRootCommitBuilder
2893
    rich_root_data = True
4988.9.1 by Jelmer Vernooij
Add experimental flag to RepositoryFormat.
2894
    experimental = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2895
    supports_tree_reference = True
2896
    supports_external_lookups = True
2897
    # What index classes to use
2898
    index_builder_class = BTreeBuilder
2899
    index_class = BTreeGraphIndex
2900
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2901
    @property
2902
    def _serializer(self):
2903
        return xml7.serializer_v7
2904
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2905
    def _get_matching_bzrdir(self):
2906
        return bzrdir.format_registry.make_bzrdir(
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)
2907
            'development-subtree')
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2908
2909
    def _ignore_setting_bzrdir(self, format):
2910
        pass
2911
2912
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2913
2914
    def get_format_string(self):
2915
        """See RepositoryFormat.get_format_string()."""
2916
        return ("Bazaar development format 2 with subtree support "
2917
            "(needs bzr.dev from before 1.8)\n")
2918
2919
    def get_format_description(self):
2920
        """See RepositoryFormat.get_format_description()."""
2921
        return ("Development repository format, currently the same as "
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2922
            "1.6.1-subtree with B+Tree indices.\n")
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
2923