/brz/remove-bazaar

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