/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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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."""
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
728
        return NewPack(self._pack_collection, upload_suffix=self.suffix,
729
                file_mode=self._pack_collection.repo.bzrdir._get_file_mode())
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
730
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
731
    def _update_pack_order(self, entries, index_to_pack_map):
732
        """Determine how we want our packs to be ordered.
733
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
734
        This changes the sort order of the self.packs list so that packs unused
735
        by 'entries' will be at the end of the list, so that future requests
736
        can avoid probing them.  Used packs will be at the front of the
737
        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
738
739
        :param entries: A list of (index, ...) tuples
740
        :param index_to_pack_map: A mapping from index objects to pack objects.
741
        """
742
        packs = []
743
        seen_indexes = set()
744
        for entry in entries:
745
            index = entry[0]
746
            if index not in seen_indexes:
747
                packs.append(index_to_pack_map[index])
748
                seen_indexes.add(index)
749
        if len(packs) == len(self.packs):
750
            if 'pack' in debug.debug_flags:
751
                mutter('Not changing pack list, all packs used.')
752
            return
753
        seen_packs = set(packs)
754
        for pack in self.packs:
755
            if pack not in seen_packs:
756
                packs.append(pack)
757
                seen_packs.add(pack)
758
        if 'pack' in debug.debug_flags:
759
            old_names = [p.access_tuple()[1] for p in self.packs]
760
            new_names = [p.access_tuple()[1] for p in packs]
761
            mutter('Reordering packs\nfrom: %s\n  to: %s',
762
                   old_names, new_names)
763
        self.packs = packs
764
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
765
    def _copy_revision_texts(self):
766
        """Copy revision data to the new pack."""
767
        # select revisions
768
        if self.revision_ids:
769
            revision_keys = [(revision_id,) for revision_id in self.revision_ids]
770
        else:
771
            revision_keys = None
772
        # select revision keys
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
773
        revision_index_map, revision_indices = self._pack_map_and_index_list(
774
            'revision_index')
775
        revision_nodes = self._index_contents(revision_indices, revision_keys)
776
        revision_nodes = list(revision_nodes)
777
        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.
778
        # copy revision keys and adjust values
779
        self.pb.update("Copying revision texts", 1)
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
780
        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
781
        list(self._copy_nodes_graph(revision_index_map, self.new_pack._writer,
782
            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.
783
        if 'pack' in debug.debug_flags:
784
            mutter('%s: create_pack: revisions copied: %s%s %d items t+%6.3fs',
785
                time.ctime(), self._pack_collection._upload_transport.base,
786
                self.new_pack.random_name,
787
                self.new_pack.revision_index.key_count(),
788
                time.time() - self.new_pack.start_time)
789
        self._revision_keys = revision_keys
790
2951.2.2 by Robert Collins
Factor out inventory text copying in Packer to a single helper method.
791
    def _copy_inventory_texts(self):
792
        """Copy the inventory texts to the new pack.
793
794
        self._revision_keys is used to determine what inventories to copy.
795
796
        Sets self._text_filter appropriately.
797
        """
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.
798
        # select inventory keys
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
799
        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.
800
        # querying for keys here could introduce a bug where an inventory item
801
        # is missed, so do not change it to query separately without cross
802
        # checking like the text key check below.
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
803
        inventory_index_map, inventory_indices = self._pack_map_and_index_list(
804
            'inventory_index')
805
        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.
806
        # copy inventory keys and adjust values
2592.3.104 by Robert Collins
hackish fix, but all tests passing again.
807
        # XXX: Should be a helper function to allow different inv representation
808
        # at this point.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
809
        self.pb.update("Copying inventory texts", 2)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
810
        total_items, readv_group_iter = self._least_readv_node_readv(inv_nodes)
3253.1.1 by John Arbash Meinel
Reduce memory consumption during autopack.
811
        # Only grab the output lines if we will be processing them
812
        output_lines = bool(self.revision_ids)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
813
        inv_lines = self._copy_nodes_graph(inventory_index_map,
814
            self.new_pack._writer, self.new_pack.inventory_index,
3253.1.1 by John Arbash Meinel
Reduce memory consumption during autopack.
815
            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.
816
        if self.revision_ids:
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
817
            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.
818
        else:
2592.3.145 by Robert Collins
Fix test_fetch_missing_text_other_location_fails for pack repositories.
819
            # 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.
820
            list(inv_lines)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
821
            self._text_filter = None
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
822
        if 'pack' in debug.debug_flags:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
823
            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.
824
                time.ctime(), self._pack_collection._upload_transport.base,
825
                self.new_pack.random_name,
826
                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.
827
                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.
828
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
829
    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.
830
        # select text keys
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
831
        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.
832
        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.
833
            # We could return the keys copied as part of the return value from
834
            # _copy_nodes_graph but this doesn't work all that well with the
835
            # need to get line output too, so we check separately, and as we're
836
            # going to buffer everything anyway, we check beforehand, which
837
            # saves reading knit data over the wire when we know there are
838
            # mising records.
839
            text_nodes = set(text_nodes)
840
            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.
841
            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.
842
            if missing_text_keys:
843
                # TODO: raise a specific error that can handle many missing
844
                # keys.
4084.3.1 by Robert Collins
Log all missing keys in pack fetch operations that fail due to missing keys.
845
                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.
846
                a_missing_key = missing_text_keys.pop()
847
                raise errors.RevisionNotPresent(a_missing_key[1],
848
                    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.
849
        # copy text keys and adjust values
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
850
        self.pb.update("Copying content texts", 3)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
851
        total_items, readv_group_iter = self._least_readv_node_readv(text_nodes)
852
        list(self._copy_nodes_graph(text_index_map, self.new_pack._writer,
853
            self.new_pack.text_index, readv_group_iter, total_items))
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
854
        self._log_copied_texts()
855
856
    def _create_pack_from_packs(self):
857
        self.pb.update("Opening pack", 0, 5)
858
        self.new_pack = self.open_pack()
859
        new_pack = self.new_pack
860
        # buffer data - we won't be reading-back during the pack creation and
861
        # this makes a significant difference on sftp pushes.
862
        new_pack.set_write_cache_size(1024*1024)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
863
        if 'pack' in debug.debug_flags:
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
864
            plain_pack_list = ['%s%s' % (a_pack.pack_transport.base, a_pack.name)
865
                for a_pack in self.packs]
866
            if self.revision_ids is not None:
867
                rev_count = len(self.revision_ids)
868
            else:
869
                rev_count = 'all'
870
            mutter('%s: create_pack: creating pack from source packs: '
871
                '%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.
872
                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.
873
                plain_pack_list, rev_count)
874
        self._copy_revision_texts()
875
        self._copy_inventory_texts()
876
        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.
877
        # select signature keys
2951.2.1 by Robert Collins
Factor out revision text copying in Packer to a single helper method.
878
        signature_filter = self._revision_keys # same keyspace
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
879
        signature_index_map, signature_indices = self._pack_map_and_index_list(
880
            'signature_index')
881
        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.
882
            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.
883
        # copy signature keys and adjust values
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
884
        self.pb.update("Copying signature texts", 4)
2592.3.205 by Robert Collins
Move the pack ContainerWriter instance into NewPack.
885
        self._copy_nodes(signature_nodes, signature_index_map, new_pack._writer,
886
            new_pack.signature_index)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
887
        if 'pack' in debug.debug_flags:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
888
            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.
889
                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.
890
                new_pack.signature_index.key_count(),
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
891
                time.time() - new_pack.start_time)
3830.3.2 by Martin Pool
Check that newly created packs don't have missing delta bases.
892
        new_pack._check_references()
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
893
        if not self._use_pack(new_pack):
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
894
            new_pack.abort()
895
            return None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
896
        self.pb.update("Finishing pack", 5)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
897
        new_pack.finish()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
898
        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.
899
        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.
900
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
901
    def _copy_nodes(self, nodes, index_map, writer, write_index):
902
        """Copy knit nodes between packs with no graph references."""
903
        pb = ui.ui_factory.nested_progress_bar()
904
        try:
905
            return self._do_copy_nodes(nodes, index_map, writer,
906
                write_index, pb)
907
        finally:
908
            pb.finished()
909
910
    def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb):
911
        # 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.
912
        knit = KnitVersionedFiles(None, None)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
913
        # plan a readv on each source pack:
914
        # group by pack
915
        nodes = sorted(nodes)
916
        # how to map this into knit.py - or knit.py into this?
917
        # 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
918
        # 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.
919
        # duplication points?
920
        request_groups = {}
921
        for index, key, value in nodes:
922
            if index not in request_groups:
923
                request_groups[index] = []
924
            request_groups[index].append((key, value))
925
        record_index = 0
926
        pb.update("Copied record", record_index, len(nodes))
927
        for index, items in request_groups.iteritems():
928
            pack_readv_requests = []
929
            for key, value in items:
930
                # ---- KnitGraphIndex.get_position
931
                bits = value[1:].split(' ')
932
                offset, length = int(bits[0]), int(bits[1])
933
                pack_readv_requests.append((offset, length, (key, value[0])))
934
            # linear scan up the pack
935
            pack_readv_requests.sort()
936
            # copy the data
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
937
            pack_obj = index_map[index]
938
            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.
939
            try:
940
                reader = pack.make_readv_reader(transport, path,
941
                    [offset[0:2] for offset in pack_readv_requests])
942
            except errors.NoSuchFile:
943
                if self._reload_func is not None:
944
                    self._reload_func()
945
                raise
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
946
            for (names, read_func), (_1, _2, (key, eol_flag)) in \
947
                izip(reader.iter_records(), pack_readv_requests):
948
                raw_data = read_func(None)
949
                # 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.
950
                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.
951
                df.close()
952
                pos, size = writer.add_bytes_record(raw_data, names)
953
                write_index.add_node(key, eol_flag + "%d %d" % (pos, size))
954
                pb.update("Copied record", record_index)
955
                record_index += 1
956
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
957
    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.
958
        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.
959
        """Copy knit nodes between packs.
960
961
        :param output_lines: Return lines present in the copied data as
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
962
            an iterator of line,version_id.
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
963
        """
964
        pb = ui.ui_factory.nested_progress_bar()
965
        try:
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
966
            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.
967
                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).
968
                yield result
3039.1.2 by Robert Collins
python2.4 'compatibility'.
969
        except Exception:
3039.1.3 by Robert Collins
Document the try:except:else: rather than a finally: in pack_repo.._copy_nodes_graph.
970
            # Python 2.4 does not permit try:finally: in a generator.
3039.1.2 by Robert Collins
python2.4 'compatibility'.
971
            pb.finished()
972
            raise
973
        else:
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
974
            pb.finished()
975
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
976
    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.
977
        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.
978
        # 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.
979
        knit = KnitVersionedFiles(None, None)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
980
        # for line extraction when requested (inventories only)
981
        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.
982
            factory = KnitPlainFactory()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
983
        record_index = 0
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
984
        pb.update("Copied record", record_index, total_items)
985
        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.
986
            # copy the data
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
987
            pack_obj = index_map[index]
988
            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.
989
            try:
990
                reader = pack.make_readv_reader(transport, path, readv_vector)
991
            except errors.NoSuchFile:
992
                if self._reload_func is not None:
993
                    self._reload_func()
994
                raise
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
995
            for (names, read_func), (key, eol_flag, references) in \
996
                izip(reader.iter_records(), node_vector):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
997
                raw_data = read_func(None)
998
                if output_lines:
999
                    # 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.
1000
                    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.
1001
                    if len(references[-1]) == 0:
1002
                        line_iterator = factory.get_fulltext_content(content)
1003
                    else:
1004
                        line_iterator = factory.get_linedelta_content(content)
1005
                    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.
1006
                        yield line, key
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1007
                else:
1008
                    # 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.
1009
                    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.
1010
                    df.close()
1011
                pos, size = writer.add_bytes_record(raw_data, names)
1012
                write_index.add_node(key, eol_flag + "%d %d" % (pos, size), references)
1013
                pb.update("Copied record", record_index)
1014
                record_index += 1
1015
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1016
    def _get_text_nodes(self):
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1017
        text_index_map, text_indices = self._pack_map_and_index_list(
1018
            'text_index')
1019
        return text_index_map, self._index_contents(text_indices,
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1020
            self._text_filter)
1021
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1022
    def _least_readv_node_readv(self, nodes):
1023
        """Generate request groups for nodes using the least readv's.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1024
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1025
        :param nodes: An iterable of graph index nodes.
1026
        :return: Total node count and an iterator of the data needed to perform
1027
            readvs to obtain the data for nodes. Each item yielded by the
1028
            iterator is a tuple with:
1029
            index, readv_vector, node_vector. readv_vector is a list ready to
1030
            hand to the transport readv method, and node_vector is a list of
1031
            (key, eol_flag, references) for the the node retrieved by the
1032
            matching readv_vector.
1033
        """
1034
        # group by pack so we do one readv per pack
1035
        nodes = sorted(nodes)
1036
        total = len(nodes)
1037
        request_groups = {}
1038
        for index, key, value, references in nodes:
1039
            if index not in request_groups:
1040
                request_groups[index] = []
1041
            request_groups[index].append((key, value, references))
1042
        result = []
1043
        for index, items in request_groups.iteritems():
1044
            pack_readv_requests = []
1045
            for key, value, references in items:
1046
                # ---- KnitGraphIndex.get_position
1047
                bits = value[1:].split(' ')
1048
                offset, length = int(bits[0]), int(bits[1])
1049
                pack_readv_requests.append(
1050
                    ((offset, length), (key, value[0], references)))
1051
            # linear scan up the pack to maximum range combining.
1052
            pack_readv_requests.sort()
1053
            # split out the readv and the node data.
1054
            pack_readv = [readv for readv, node in pack_readv_requests]
1055
            node_vector = [node for readv, node in pack_readv_requests]
1056
            result.append((index, pack_readv, node_vector))
1057
        return total, result
1058
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1059
    def _log_copied_texts(self):
1060
        if 'pack' in debug.debug_flags:
1061
            mutter('%s: create_pack: file texts copied: %s%s %d items t+%6.3fs',
1062
                time.ctime(), self._pack_collection._upload_transport.base,
1063
                self.new_pack.random_name,
1064
                self.new_pack.text_index.key_count(),
1065
                time.time() - self.new_pack.start_time)
1066
1067
    def _process_inventory_lines(self, inv_lines):
1068
        """Use up the inv_lines generator and setup a text key filter."""
1069
        repo = self._pack_collection.repo
1070
        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.
1071
            inv_lines, self.revision_keys)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1072
        text_filter = []
1073
        for fileid, file_revids in fileid_revisions.iteritems():
1074
            text_filter.extend([(fileid, file_revid) for file_revid in file_revids])
1075
        self._text_filter = text_filter
1076
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
1077
    def _revision_node_readv(self, revision_nodes):
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1078
        """Return the total revisions and the readv's to issue.
1079
1080
        :param revision_nodes: The revision index contents for the packs being
1081
            incorporated into the new pack.
1082
        :return: As per _least_readv_node_readv.
1083
        """
1084
        return self._least_readv_node_readv(revision_nodes)
1085
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
1086
    def _use_pack(self, new_pack):
1087
        """Return True if new_pack should be used.
1088
1089
        :param new_pack: The pack that has just been created.
1090
        :return: True if the pack should be used.
1091
        """
1092
        return new_pack.data_inserted()
1093
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1094
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1095
class OptimisingPacker(Packer):
1096
    """A packer which spends more time to create better disk layouts."""
1097
3070.1.2 by John Arbash Meinel
Cleanup OptimizingPacker code according to my review feedback
1098
    def _revision_node_readv(self, revision_nodes):
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1099
        """Return the total revisions and the readv's to issue.
1100
1101
        This sort places revisions in topological order with the ancestors
1102
        after the children.
1103
1104
        :param revision_nodes: The revision index contents for the packs being
1105
            incorporated into the new pack.
1106
        :return: As per _least_readv_node_readv.
1107
        """
1108
        # build an ancestors dict
1109
        ancestors = {}
1110
        by_key = {}
1111
        for index, key, value, references in revision_nodes:
1112
            ancestors[key] = references[0]
1113
            by_key[key] = (index, value, references)
1114
        order = tsort.topo_sort(ancestors)
1115
        total = len(order)
1116
        # Single IO is pathological, but it will work as a starting point.
1117
        requests = []
1118
        for key in reversed(order):
1119
            index, value, references = by_key[key]
1120
            # ---- KnitGraphIndex.get_position
1121
            bits = value[1:].split(' ')
1122
            offset, length = int(bits[0]), int(bits[1])
1123
            requests.append(
1124
                (index, [(offset, length)], [(key, value[0], references)]))
1125
        # TODO: combine requests in the same index that are in ascending order.
1126
        return total, requests
1127
3777.5.4 by John Arbash Meinel
OptimisingPacker now sets the optimize flags for the indexes being built.
1128
    def open_pack(self):
1129
        """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.
1130
        new_pack = super(OptimisingPacker, self).open_pack()
1131
        # 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.
1132
        new_pack.revision_index.set_optimize(for_size=True)
1133
        new_pack.inventory_index.set_optimize(for_size=True)
1134
        new_pack.text_index.set_optimize(for_size=True)
1135
        new_pack.signature_index.set_optimize(for_size=True)
1136
        return new_pack
1137
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1138
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
1139
class ReconcilePacker(Packer):
1140
    """A packer which regenerates indices etc as it copies.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1141
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
1142
    This is used by ``bzr reconcile`` to cause parent text pointers to be
1143
    regenerated.
1144
    """
1145
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1146
    def _extra_init(self):
1147
        self._data_changed = False
1148
1149
    def _process_inventory_lines(self, inv_lines):
1150
        """Generate a text key reference map rather for reconciling with."""
1151
        repo = self._pack_collection.repo
1152
        refs = repo._find_text_key_references_from_xml_inventory_lines(
1153
            inv_lines)
1154
        self._text_refs = refs
1155
        # during reconcile we:
1156
        #  - convert unreferenced texts to full texts
1157
        #  - correct texts which reference a text not copied to be full texts
1158
        #  - copy all others as-is but with corrected parents.
1159
        #  - so at this point we don't know enough to decide what becomes a full
1160
        #    text.
1161
        self._text_filter = None
1162
1163
    def _copy_text_texts(self):
1164
        """generate what texts we should have and then copy."""
1165
        self.pb.update("Copying content texts", 3)
1166
        # we have three major tasks here:
1167
        # 1) generate the ideal index
1168
        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.
1169
        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
1170
            _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.
1171
            self.new_pack.revision_index.iter_all_entries()])
1172
        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.
1173
        # 2) generate a text_nodes list that contains all the deltas that can
1174
        #    be used as-is, with corrected parents.
1175
        ok_nodes = []
1176
        bad_texts = []
1177
        discarded_nodes = []
1178
        NULL_REVISION = _mod_revision.NULL_REVISION
1179
        text_index_map, text_nodes = self._get_text_nodes()
1180
        for node in text_nodes:
1181
            # 0 - index
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1182
            # 1 - key
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1183
            # 2 - value
1184
            # 3 - refs
1185
            try:
1186
                ideal_parents = tuple(ideal_index[node[1]])
1187
            except KeyError:
1188
                discarded_nodes.append(node)
1189
                self._data_changed = True
1190
            else:
1191
                if ideal_parents == (NULL_REVISION,):
1192
                    ideal_parents = ()
1193
                if ideal_parents == node[3][0]:
1194
                    # no change needed.
1195
                    ok_nodes.append(node)
1196
                elif ideal_parents[0:1] == node[3][0][0:1]:
1197
                    # the left most parent is the same, or there are no parents
1198
                    # today. Either way, we can preserve the representation as
1199
                    # long as we change the refs to be inserted.
1200
                    self._data_changed = True
1201
                    ok_nodes.append((node[0], node[1], node[2],
1202
                        (ideal_parents, node[3][1])))
1203
                    self._data_changed = True
1204
                else:
1205
                    # Reinsert this text completely
1206
                    bad_texts.append((node[1], ideal_parents))
1207
                    self._data_changed = True
1208
        # we're finished with some data.
1209
        del ideal_index
1210
        del text_nodes
3063.2.2 by Robert Collins
Review feedback.
1211
        # 3) bulk copy the ok data
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1212
        total_items, readv_group_iter = self._least_readv_node_readv(ok_nodes)
1213
        list(self._copy_nodes_graph(text_index_map, self.new_pack._writer,
1214
            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.
1215
        # 4) adhoc copy all the other texts.
1216
        # We have to topologically insert all texts otherwise we can fail to
1217
        # reconcile when parts of a single delta chain are preserved intact,
1218
        # and other parts are not. E.g. Discarded->d1->d2->d3. d1 will be
1219
        # reinserted, and if d3 has incorrect parents it will also be
1220
        # reinserted. If we insert d3 first, d2 is present (as it was bulk
1221
        # copied), so we will try to delta, but d2 is not currently able to be
1222
        # extracted because it's basis d1 is not present. Topologically sorting
1223
        # addresses this. The following generates a sort for all the texts that
1224
        # are being inserted without having to reference the entire text key
1225
        # space (we only topo sort the revisions, which is smaller).
1226
        topo_order = tsort.topo_sort(ancestors)
1227
        rev_order = dict(zip(topo_order, range(len(topo_order))))
1228
        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.
1229
        transaction = repo.get_transaction()
1230
        file_id_index = GraphIndexPrefixAdapter(
1231
            self.new_pack.text_index,
1232
            ('blank', ), 1,
1233
            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.
1234
        data_access = _DirectPackAccess(
1235
                {self.new_pack.text_index:self.new_pack.access_tuple()})
1236
        data_access.set_writer(self.new_pack._writer, self.new_pack.text_index,
1237
            self.new_pack.access_tuple())
1238
        output_texts = KnitVersionedFiles(
1239
            _KnitGraphIndex(self.new_pack.text_index,
1240
                add_callback=self.new_pack.text_index.add_nodes,
1241
                deltas=True, parents=True, is_locked=repo.is_locked),
1242
            data_access=data_access, max_delta_chain=200)
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1243
        for key, parent_keys in bad_texts:
1244
            # We refer to the new pack to delta data being output.
1245
            # A possible improvement would be to catch errors on short reads
1246
            # and only flush then.
1247
            self.new_pack.flush()
1248
            parents = []
1249
            for parent_key in parent_keys:
1250
                if parent_key[0] != key[0]:
1251
                    # Graph parents must match the fileid
1252
                    raise errors.BzrError('Mismatched key parent %r:%r' %
1253
                        (key, parent_keys))
1254
                parents.append(parent_key[1])
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
1255
            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.
1256
                [key], 'unordered', True).next().get_bytes_as('fulltext'))
1257
            output_texts.add_lines(key, parent_keys, text_lines,
1258
                random_id=True, check_content=False)
3063.2.2 by Robert Collins
Review feedback.
1259
        # 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
1260
        missing_text_keys = self.new_pack.text_index._external_references()
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1261
        if missing_text_keys:
3830.3.4 by Martin Pool
Move _external_compression_references onto the GraphIndexBuilder, and check them for inventories too
1262
            raise errors.BzrCheckError('Reference to missing compression parents %r'
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
1263
                % (missing_text_keys,))
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
1264
        self._log_copied_texts()
1265
2951.2.8 by Robert Collins
Test that reconciling a repository can be done twice in a row.
1266
    def _use_pack(self, new_pack):
1267
        """Override _use_pack to check for reconcile having changed content."""
1268
        # XXX: we might be better checking this at the copy time.
1269
        original_inventory_keys = set()
1270
        inv_index = self._pack_collection.inventory_index.combined_index
1271
        for entry in inv_index.iter_all_entries():
1272
            original_inventory_keys.add(entry[1])
1273
        new_inventory_keys = set()
1274
        for entry in new_pack.inventory_index.iter_all_entries():
1275
            new_inventory_keys.add(entry[1])
1276
        if new_inventory_keys != original_inventory_keys:
1277
            self._data_changed = True
1278
        return new_pack.data_inserted() and self._data_changed
1279
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1280
1281
class RepositoryPackCollection(object):
3517.4.4 by Martin Pool
Document RepositoryPackCollection._names
1282
    """Management of packs within a repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1283
3517.4.4 by Martin Pool
Document RepositoryPackCollection._names
1284
    :ivar _names: map of {pack_name: (index_size,)}
1285
    """
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1286
1287
    def __init__(self, repo, transport, index_transport, upload_transport,
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1288
                 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.
1289
        """Create a new RepositoryPackCollection.
1290
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1291
        :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.
1292
            (typically .bzr/repository/).
1293
        :param index_transport: Addresses the directory containing indices.
1294
        :param upload_transport: Addresses the directory into which packs are written
1295
            while they're being created.
1296
        :param pack_transport: Addresses the directory of existing complete packs.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1297
        :param index_builder_class: The index builder class to use.
1298
        :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.
1299
        """
1300
        self.repo = repo
1301
        self.transport = transport
1302
        self._index_transport = index_transport
1303
        self._upload_transport = upload_transport
1304
        self._pack_transport = pack_transport
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1305
        self._index_builder_class = index_builder_class
1306
        self._index_class = index_class
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1307
        self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3}
1308
        self.packs = []
1309
        # name:Pack mapping
1310
        self._packs_by_name = {}
1311
        # the previous pack-names content
1312
        self._packs_at_load = None
1313
        # when a pack is being created by this object, the state of that pack.
1314
        self._new_pack = None
1315
        # aggregated revision index data
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1316
        self.revision_index = AggregateIndex(self.reload_pack_names)
1317
        self.inventory_index = AggregateIndex(self.reload_pack_names)
1318
        self.text_index = AggregateIndex(self.reload_pack_names)
1319
        self.signature_index = AggregateIndex(self.reload_pack_names)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1320
        # resumed packs
1321
        self._resumed_packs = []
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1322
1323
    def add_pack_to_memory(self, pack):
1324
        """Make a Pack object available to the repository to satisfy queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1325
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1326
        :param pack: A Pack object.
1327
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1328
        if pack.name in self._packs_by_name:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1329
            raise AssertionError(
1330
                '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.
1331
        self.packs.append(pack)
1332
        self._packs_by_name[pack.name] = pack
1333
        self.revision_index.add_index(pack.revision_index, pack)
1334
        self.inventory_index.add_index(pack.inventory_index, pack)
1335
        self.text_index.add_index(pack.text_index, pack)
1336
        self.signature_index.add_index(pack.signature_index, pack)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1337
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1338
    def all_packs(self):
1339
        """Return a list of all the Pack objects this repository has.
1340
1341
        Note that an in-progress pack being created is not returned.
1342
1343
        :return: A list of Pack objects for all the packs in the repository.
1344
        """
1345
        result = []
1346
        for name in self.names():
1347
            result.append(self.get_pack_by_name(name))
1348
        return result
1349
1350
    def autopack(self):
1351
        """Pack the pack collection incrementally.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1352
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1353
        This will not attempt global reorganisation or recompression,
1354
        rather it will just ensure that the total number of packs does
1355
        not grow without bound. It uses the _max_pack_count method to
1356
        determine if autopacking is needed, and the pack_distribution
1357
        method to determine the number of revisions in each pack.
1358
1359
        If autopacking takes place then the packs name collection will have
1360
        been flushed to disk - packing requires updating the name collection
1361
        in synchronisation with certain steps. Otherwise the names collection
1362
        is not flushed.
1363
1364
        :return: True if packing took place.
1365
        """
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1366
        while True:
1367
            try:
1368
                return self._do_autopack()
1369
            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.
1370
                # If we get a RetryAutopack exception, we should abort the
1371
                # 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.
1372
                pass
1373
1374
    def _do_autopack(self):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1375
        # 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.
1376
        total_revisions = self.revision_index.combined_index.key_count()
1377
        total_packs = len(self._names)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1378
        if self._max_pack_count(total_revisions) >= total_packs:
1379
            return False
1380
        # XXX: the following may want to be a class, to pack with a given
1381
        # policy.
1382
        # determine which packs need changing
1383
        pack_distribution = self.pack_distribution(total_revisions)
1384
        existing_packs = []
1385
        for pack in self.all_packs():
1386
            revision_count = pack.get_revision_count()
1387
            if revision_count == 0:
1388
                # revision less packs are not generated by normal operation,
1389
                # only by operations like sign-my-commits, and thus will not
1390
                # tend to grow rapdily or without bound like commit containing
1391
                # packs do - leave them alone as packing them really should
1392
                # group their data with the relevant commit, and that may
1393
                # involve rewriting ancient history - which autopack tries to
1394
                # avoid. Alternatively we could not group the data but treat
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1395
                # 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.
1396
                # one revision for each to the total revision count, to get
1397
                # a matching distribution.
1398
                continue
1399
            existing_packs.append((revision_count, pack))
1400
        pack_operations = self.plan_autopack_combinations(
1401
            existing_packs, pack_distribution)
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1402
        num_new_packs = len(pack_operations)
1403
        num_old_packs = sum([len(po[1]) for po in pack_operations])
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1404
        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
1405
        mutter('Auto-packing repository %s, which has %d pack files, '
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1406
            '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
1407
            ' revisions', self, total_packs, total_revisions, num_old_packs,
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1408
            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.
1409
        self._execute_pack_operations(pack_operations,
1410
                                      reload_func=self._restart_autopack)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1411
        return True
1412
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1413
    def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1414
                                 reload_func=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1415
        """Execute a series of pack operations.
1416
1417
        :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
1418
        :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.
1419
        :return: None.
1420
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1421
        for revision_count, packs in pack_operations:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1422
            # 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.
1423
            if len(packs) == 0:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1424
                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.
1425
            packer = _packer_class(self, packs, '.autopack',
1426
                                   reload_func=reload_func)
1427
            try:
1428
                packer.pack()
1429
            except errors.RetryWithNewPacks:
1430
                # An exception is propagating out of this context, make sure
3789.2.23 by John Arbash Meinel
Clarify the comment.
1431
                # this packer has cleaned up. Packer() doesn't set its new_pack
1432
                # state into the RepositoryPackCollection object, so we only
1433
                # 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.
1434
                if packer.new_pack is not None:
1435
                    packer.new_pack.abort()
1436
                raise
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1437
            for pack in packs:
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1438
                self._remove_pack_from_memory(pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1439
        # record the newly available packs and stop advertising the old
1440
        # packs
2948.1.1 by Robert Collins
* Obsolete packs are now cleaned up by pack and autopack operations.
1441
        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.
1442
        # Move the old packs out of the way now they are no longer referenced.
1443
        for revision_count, packs in pack_operations:
1444
            self._obsolete_packs(packs)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1445
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1446
    def lock_names(self):
1447
        """Acquire the mutex around the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1448
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1449
        This cannot be used in the middle of a read-only transaction on the
1450
        repository.
1451
        """
1452
        self.repo.control_files.lock_write()
1453
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1454
    def pack(self):
1455
        """Pack the pack collection totally."""
1456
        self.ensure_loaded()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1457
        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.
1458
        if total_packs < 2:
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1459
            # This is arguably wrong because we might not be optimal, but for
1460
            # now lets leave it in. (e.g. reconcile -> one pack. But not
1461
            # optimal.
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1462
            return
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1463
        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.
1464
        # XXX: the following may want to be a class, to pack with a given
1465
        # policy.
1466
        mutter('Packing repository %s, which has %d pack files, '
1467
            'containing %d revisions into 1 packs.', self, total_packs,
1468
            total_revisions)
1469
        # determine which packs need changing
1470
        pack_distribution = [1]
1471
        pack_operations = [[0, []]]
1472
        for pack in self.all_packs():
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1473
            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.
1474
            pack_operations[-1][1].append(pack)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1475
        self._execute_pack_operations(pack_operations, OptimisingPacker)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1476
1477
    def plan_autopack_combinations(self, existing_packs, pack_distribution):
2592.3.176 by Robert Collins
Various pack refactorings.
1478
        """Plan a pack operation.
1479
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1480
        :param existing_packs: The packs to pack. (A list of (revcount, Pack)
1481
            tuples).
2592.3.235 by Martin Pool
Review cleanups
1482
        :param pack_distribution: A list with the number of revisions desired
2592.3.176 by Robert Collins
Various pack refactorings.
1483
            in each pack.
1484
        """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1485
        if len(existing_packs) <= len(pack_distribution):
1486
            return []
1487
        existing_packs.sort(reverse=True)
1488
        pack_operations = [[0, []]]
1489
        # plan out what packs to keep, and what to reorganise
1490
        while len(existing_packs):
1491
            # 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,
1492
            # distribution chart we will include its contents in the new pack
1493
            # 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.
1494
            # distribution chart
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1495
            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.
1496
            if next_pack_rev_count >= pack_distribution[0]:
1497
                # this is already packed 'better' than this, so we can
1498
                # not waste time packing it.
1499
                while next_pack_rev_count > 0:
1500
                    next_pack_rev_count -= pack_distribution[0]
1501
                    if next_pack_rev_count >= 0:
1502
                        # more to go
1503
                        del pack_distribution[0]
1504
                    else:
1505
                        # didn't use that entire bucket up
1506
                        pack_distribution[0] = -next_pack_rev_count
1507
            else:
1508
                # add the revisions we're going to add to the next output pack
1509
                pack_operations[-1][0] += next_pack_rev_count
1510
                # 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.
1511
                pack_operations[-1][1].append(next_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1512
                if pack_operations[-1][0] >= pack_distribution[0]:
1513
                    # this pack is used up, shift left.
1514
                    del pack_distribution[0]
1515
                    pack_operations.append([0, []])
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1516
        # Now that we know which pack files we want to move, shove them all
1517
        # into a single pack file.
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1518
        final_rev_count = 0
1519
        final_pack_list = []
1520
        for num_revs, pack_files in pack_operations:
1521
            final_rev_count += num_revs
1522
            final_pack_list.extend(pack_files)
1523
        if len(final_pack_list) == 1:
1524
            raise AssertionError('We somehow generated an autopack with a'
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1525
                ' single pack file being moved.')
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1526
            return []
1527
        return [[final_rev_count, final_pack_list]]
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1528
1529
    def ensure_loaded(self):
2592.3.214 by Robert Collins
Merge bzr.dev.
1530
        # NB: if you see an assertion error here, its probably access against
1531
        # an unlocked repo. Naughty.
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1532
        if not self.repo.is_locked():
1533
            raise errors.ObjectNotLocked(self.repo)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1534
        if self._names is None:
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1535
            self._names = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1536
            self._packs_at_load = set()
1537
            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.
1538
                name = key[0]
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1539
                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.
1540
                self._packs_at_load.add((key, value))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1541
        # populate all the metadata.
1542
        self.all_packs()
1543
1544
    def _parse_index_sizes(self, value):
1545
        """Parse a string of index sizes."""
1546
        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.
1547
2592.3.176 by Robert Collins
Various pack refactorings.
1548
    def get_pack_by_name(self, name):
1549
        """Get a Pack object by name.
1550
1551
        :param name: The name of the pack - e.g. '123456'
1552
        :return: A Pack object.
1553
        """
1554
        try:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1555
            return self._packs_by_name[name]
2592.3.176 by Robert Collins
Various pack refactorings.
1556
        except KeyError:
1557
            rev_index = self._make_index(name, '.rix')
1558
            inv_index = self._make_index(name, '.iix')
1559
            txt_index = self._make_index(name, '.tix')
1560
            sig_index = self._make_index(name, '.six')
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1561
            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.
1562
                inv_index, txt_index, sig_index)
2592.3.178 by Robert Collins
Add pack objects to the api for PackCollection.create_pack_from_packs.
1563
            self.add_pack_to_memory(result)
2592.3.176 by Robert Collins
Various pack refactorings.
1564
            return result
1565
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1566
    def _resume_pack(self, name):
1567
        """Get a suspended Pack object by name.
1568
1569
        :param name: The name of the pack - e.g. '123456'
1570
        :return: A Pack object.
1571
        """
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.
1572
        if not re.match('[a-f0-9]{32}', name):
1573
            # Tokens should be md5sums of the suspended pack file, i.e. 32 hex
1574
            # digits.
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1575
            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.
1576
                self.repo, [name], 'Malformed write group token')
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1577
        try:
1578
            rev_index = self._make_index(name, '.rix', resume=True)
1579
            inv_index = self._make_index(name, '.iix', resume=True)
1580
            txt_index = self._make_index(name, '.tix', resume=True)
1581
            sig_index = self._make_index(name, '.six', resume=True)
1582
            result = ResumedPack(name, rev_index, inv_index, txt_index,
1583
                sig_index, self._upload_transport, self._pack_transport,
1584
                self._index_transport, self)
1585
        except errors.NoSuchFile, e:
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1586
            raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1587
        self.add_pack_to_memory(result)
1588
        self._resumed_packs.append(result)
1589
        return result
1590
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1591
    def allocate(self, a_new_pack):
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1592
        """Allocate name in the list of packs.
1593
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1594
        :param a_new_pack: A NewPack instance to be added to the collection of
1595
            packs for this repository.
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1596
        """
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
1597
        self.ensure_loaded()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1598
        if a_new_pack.name in self._names:
2951.2.7 by Robert Collins
Raise an error on duplicate pack name allocation.
1599
            raise errors.BzrError(
1600
                '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.
1601
        self._names[a_new_pack.name] = tuple(a_new_pack.index_sizes)
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1602
        self.add_pack_to_memory(a_new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1603
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1604
    def _iter_disk_pack_index(self):
1605
        """Iterate over the contents of the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1606
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1607
        This is used when loading the list from disk, and before writing to
1608
        detect updates from others during our write operation.
1609
        :return: An iterator of the index contents.
1610
        """
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1611
        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.
1612
                ).iter_all_entries()
1613
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1614
    def _make_index(self, name, suffix, resume=False):
2592.3.176 by Robert Collins
Various pack refactorings.
1615
        size_offset = self._suffix_offsets[suffix]
1616
        index_name = name + suffix
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1617
        if resume:
1618
            transport = self._upload_transport
1619
            index_size = transport.stat(index_name).st_size
1620
        else:
1621
            transport = self._index_transport
1622
            index_size = self._names[name][size_offset]
1623
        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
1624
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1625
    def _max_pack_count(self, total_revisions):
1626
        """Return the maximum number of packs to use for total revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1627
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1628
        :param total_revisions: The total number of revisions in the
1629
            repository.
1630
        """
1631
        if not total_revisions:
1632
            return 1
1633
        digits = str(total_revisions)
1634
        result = 0
1635
        for digit in digits:
1636
            result += int(digit)
1637
        return result
1638
1639
    def names(self):
1640
        """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.
1641
        return sorted(self._names.keys())
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1642
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1643
    def _obsolete_packs(self, packs):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1644
        """Move a number of packs which have been obsoleted out of the way.
1645
1646
        Each pack and its associated indices are moved out of the way.
1647
1648
        Note: for correctness this function should only be called after a new
1649
        pack names index has been written without these pack names, and with
1650
        the names of packs that contain the data previously available via these
1651
        packs.
1652
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1653
        :param packs: The packs to obsolete.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1654
        :param return: None.
1655
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1656
        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.
1657
            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.
1658
                '../obsolete_packs/' + pack.file_name())
2592.3.226 by Martin Pool
formatting and docstrings
1659
            # TODO: Probably needs to know all possible indices for this pack
1660
            # - or maybe list the directory and move all indices matching this
2592.5.13 by Martin Pool
Clean up duplicate index_transport variables
1661
            # 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.
1662
            for suffix in ('.iix', '.six', '.tix', '.rix'):
1663
                self._index_transport.rename(pack.name + suffix,
1664
                    '../obsolete_packs/' + pack.name + suffix)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1665
1666
    def pack_distribution(self, total_revisions):
1667
        """Generate a list of the number of revisions to put in each pack.
1668
1669
        :param total_revisions: The total number of revisions in the
1670
            repository.
1671
        """
1672
        if total_revisions == 0:
1673
            return [0]
1674
        digits = reversed(str(total_revisions))
1675
        result = []
1676
        for exponent, count in enumerate(digits):
1677
            size = 10 ** exponent
1678
            for pos in range(int(count)):
1679
                result.append(size)
1680
        return list(reversed(result))
1681
2592.5.12 by Martin Pool
Move pack_transport and pack_name onto RepositoryPackCollection
1682
    def _pack_tuple(self, name):
1683
        """Return a tuple with the transport and file name for a pack name."""
1684
        return self._pack_transport, name + '.pack'
1685
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1686
    def _remove_pack_from_memory(self, pack):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1687
        """Remove pack from the packs accessed by this repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1688
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1689
        Only affects memory state, until self._save_pack_names() is invoked.
1690
        """
1691
        self._names.pop(pack.name)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1692
        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.
1693
        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.
1694
        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.
1695
1696
    def _remove_pack_indices(self, pack):
1697
        """Remove the indices for pack from the aggregated indices."""
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1698
        self.revision_index.remove_index(pack.revision_index, pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1699
        self.inventory_index.remove_index(pack.inventory_index, pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1700
        self.text_index.remove_index(pack.text_index, pack)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1701
        self.signature_index.remove_index(pack.signature_index, pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1702
1703
    def reset(self):
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1704
        """Clear all cached data."""
1705
        # cached revision data
1706
        self.repo._revision_knit = None
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1707
        self.revision_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1708
        # cached signature data
1709
        self.repo._signature_knit = None
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1710
        self.signature_index.clear()
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1711
        # cached file text data
1712
        self.text_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1713
        self.repo._text_knit = None
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1714
        # cached inventory data
1715
        self.inventory_index.clear()
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1716
        # remove the open pack
1717
        self._new_pack = None
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1718
        # information about packs.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1719
        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.
1720
        self.packs = []
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1721
        self._packs_by_name = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1722
        self._packs_at_load = None
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1723
2592.3.237 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1724
    def _unlock_names(self):
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1725
        """Release the mutex around the pack-names index."""
1726
        self.repo.control_files.unlock()
1727
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1728
    def _diff_pack_names(self):
1729
        """Read the pack names from disk, and compare it to the one in memory.
1730
1731
        :return: (disk_nodes, deleted_nodes, new_nodes)
1732
            disk_nodes    The final set of nodes that should be referenced
1733
            deleted_nodes Nodes which have been removed from when we started
1734
            new_nodes     Nodes that are newly introduced
1735
        """
1736
        # load the disk nodes across
1737
        disk_nodes = set()
1738
        for index, key, value in self._iter_disk_pack_index():
1739
            disk_nodes.add((key, value))
1740
1741
        # do a two-way diff against our original content
1742
        current_nodes = set()
1743
        for name, sizes in self._names.iteritems():
1744
            current_nodes.add(
1745
                ((name, ), ' '.join(str(size) for size in sizes)))
1746
1747
        # Packs no longer present in the repository, which were present when we
1748
        # locked the repository
1749
        deleted_nodes = self._packs_at_load - current_nodes
1750
        # Packs which this process is adding
1751
        new_nodes = current_nodes - self._packs_at_load
1752
1753
        # Update the disk_nodes set to include the ones we are adding, and
1754
        # remove the ones which were removed by someone else
1755
        disk_nodes.difference_update(deleted_nodes)
1756
        disk_nodes.update(new_nodes)
1757
1758
        return disk_nodes, deleted_nodes, new_nodes
1759
1760
    def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1761
        """Given the correct set of pack files, update our saved info.
1762
1763
        :return: (removed, added, modified)
1764
            removed     pack names removed from self._names
1765
            added       pack names added to self._names
1766
            modified    pack names that had changed value
1767
        """
1768
        removed = []
1769
        added = []
1770
        modified = []
1771
        ## self._packs_at_load = disk_nodes
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1772
        new_names = dict(disk_nodes)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1773
        # drop no longer present nodes
1774
        for pack in self.all_packs():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1775
            if (pack.name,) not in new_names:
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1776
                removed.append(pack.name)
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1777
                self._remove_pack_from_memory(pack)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1778
        # add new nodes/refresh existing ones
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1779
        for key, value in disk_nodes:
1780
            name = key[0]
1781
            sizes = self._parse_index_sizes(value)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1782
            if name in self._names:
1783
                # existing
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1784
                if sizes != self._names[name]:
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1785
                    # the pack for name has had its indices replaced - rare but
1786
                    # important to handle. XXX: probably can never happen today
1787
                    # because the three-way merge code above does not handle it
1788
                    # - you may end up adding the same key twice to the new
1789
                    # disk index because the set values are the same, unless
1790
                    # the only index shows up as deleted by the set difference
1791
                    # - which it may. Until there is a specific test for this,
1792
                    # assume its broken. RBC 20071017.
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1793
                    self._remove_pack_from_memory(self.get_pack_by_name(name))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1794
                    self._names[name] = sizes
1795
                    self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1796
                    modified.append(name)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1797
            else:
1798
                # new
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1799
                self._names[name] = sizes
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1800
                self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1801
                added.append(name)
1802
        return removed, added, modified
1803
1804
    def _save_pack_names(self, clear_obsolete_packs=False):
1805
        """Save the list of packs.
1806
1807
        This will take out the mutex around the pack names list for the
1808
        duration of the method call. If concurrent updates have been made, a
1809
        three-way merge between the current list and the current in memory list
1810
        is performed.
1811
1812
        :param clear_obsolete_packs: If True, clear out the contents of the
1813
            obsolete_packs directory.
1814
        """
1815
        self.lock_names()
1816
        try:
1817
            builder = self._index_builder_class()
1818
            disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1819
            # TODO: handle same-name, index-size-changes here -
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1820
            # e.g. use the value from disk, not ours, *unless* we're the one
1821
            # changing it.
1822
            for key, value in disk_nodes:
1823
                builder.add_node(key, value)
1824
            self.transport.put_file('pack-names', builder.finish(),
1825
                mode=self.repo.bzrdir._get_file_mode())
1826
            # move the baseline forward
1827
            self._packs_at_load = disk_nodes
1828
            if clear_obsolete_packs:
1829
                self._clear_obsolete_packs()
1830
        finally:
1831
            self._unlock_names()
1832
        # synchronise the memory packs list with what we just wrote:
1833
        self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1834
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1835
    def reload_pack_names(self):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1836
        """Sync our pack listing with what is present in the repository.
1837
1838
        This should be called when we find out that something we thought was
1839
        present is now missing. This happens when another process re-packs the
1840
        repository, etc.
1841
        """
1842
        # This is functionally similar to _save_pack_names, but we don't write
1843
        # out the new value.
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1844
        disk_nodes, _, _ = self._diff_pack_names()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1845
        self._packs_at_load = disk_nodes
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1846
        (removed, added,
1847
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1848
        if removed or added or modified:
1849
            return True
1850
        return False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1851
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1852
    def _restart_autopack(self):
1853
        """Reload the pack names list, and restart the autopack code."""
1854
        if not self.reload_pack_names():
1855
            # Re-raise the original exception, because something went missing
1856
            # and a restart didn't find it
1857
            raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
1858
        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.
1859
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
1860
    def _clear_obsolete_packs(self):
1861
        """Delete everything from the obsolete-packs directory.
1862
        """
1863
        obsolete_pack_transport = self.transport.clone('obsolete_packs')
1864
        for filename in obsolete_pack_transport.list_dir('.'):
1865
            try:
1866
                obsolete_pack_transport.delete(filename)
1867
            except (errors.PathError, errors.TransportError), e:
1868
                warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
1869
2592.3.202 by Robert Collins
Move write stream management into NewPack.
1870
    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.
1871
        # 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.
1872
        if not self.repo.is_write_locked():
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1873
            raise errors.NotWriteLocked(self)
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1874
        self._new_pack = NewPack(self, upload_suffix='.pack',
1875
            file_mode=self.repo.bzrdir._get_file_mode())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1876
        # allow writing: queue writes to a new index
1877
        self.revision_index.add_writable_index(self._new_pack.revision_index,
1878
            self._new_pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1879
        self.inventory_index.add_writable_index(self._new_pack.inventory_index,
1880
            self._new_pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1881
        self.text_index.add_writable_index(self._new_pack.text_index,
1882
            self._new_pack)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1883
        self.signature_index.add_writable_index(self._new_pack.signature_index,
1884
            self._new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1885
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.
1886
        self.repo.inventories._index._add_callback = self.inventory_index.add_callback
1887
        self.repo.revisions._index._add_callback = self.revision_index.add_callback
1888
        self.repo.signatures._index._add_callback = self.signature_index.add_callback
1889
        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
1890
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
1891
    def _abort_write_group(self):
1892
        # FIXME: just drop the transient index.
1893
        # 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)
1894
        if self._new_pack is not None:
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
1895
            try:
1896
                self._new_pack.abort()
1897
            finally:
3830.3.21 by John Arbash Meinel
Merge in bzr.dev 3845 and handle the trivial conflicts.
1898
                # XXX: If we aborted while in the middle of finishing the write
1899
                # group, _remove_pack_indices can fail because the indexes are
1900
                # already gone.  If they're not there we shouldn't fail in this
1901
                # case.  -- mbp 20081113
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
1902
                self._remove_pack_indices(self._new_pack)
1903
                self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1904
        for resumed_pack in self._resumed_packs:
1905
            try:
1906
                resumed_pack.abort()
1907
            finally:
1908
                # 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.
1909
                try:
1910
                    self._remove_pack_indices(resumed_pack)
1911
                except KeyError:
1912
                    pass
1913
        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.
1914
        self.repo._text_knit = None
2592.5.6 by Martin Pool
Move pack repository start_write_group to pack collection object
1915
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1916
    def _remove_resumed_pack_indices(self):
1917
        for resumed_pack in self._resumed_packs:
1918
            self._remove_pack_indices(resumed_pack)
1919
        del self._resumed_packs[:]
1920
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1921
    def _commit_write_group(self):
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
1922
        all_missing = set()
1923
        for prefix, versioned_file in (
1924
                ('revisions', self.repo.revisions),
1925
                ('inventories', self.repo.inventories),
1926
                ('texts', self.repo.texts),
1927
                ('signatures', self.repo.signatures),
1928
                ):
4002.1.9 by Andrew Bennetts
Merge VersionedFiles.insert-record-stream.partial from Robert.
1929
            missing = versioned_file.get_missing_compression_parent_keys()
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
1930
            all_missing.update([(prefix,) + key for key in missing])
1931
        if all_missing:
1932
            raise errors.BzrCheckError(
1933
                "Repository %s has missing compression parent(s) %r "
1934
                 % (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.
1935
        self._remove_pack_indices(self._new_pack)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1936
        should_autopack = False
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
1937
        if self._new_pack.data_inserted():
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1938
            # get all the data to disk and read to use
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1939
            self._new_pack.finish()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1940
            self.allocate(self._new_pack)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1941
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1942
            should_autopack = True
1943
        else:
1944
            self._new_pack.abort()
1945
            self._new_pack = None
1946
        for resumed_pack in self._resumed_packs:
1947
            # XXX: this is a pretty ugly way to turn the resumed pack into a
1948
            # properly committed pack.
1949
            self._names[resumed_pack.name] = None
1950
            self._remove_pack_from_memory(resumed_pack)
1951
            resumed_pack.finish()
1952
            self.allocate(resumed_pack)
1953
            should_autopack = True
1954
        del self._resumed_packs[:]
1955
        if should_autopack:
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1956
            if not self.autopack():
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1957
                # when autopack takes no steps, the names list is still
1958
                # unsaved.
2592.5.10 by Martin Pool
Rename RepositoryPackCollection.save to _save_pack_names
1959
                self._save_pack_names()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1960
        self.repo._text_knit = None
1961
1962
    def _suspend_write_group(self):
1963
        tokens = [pack.name for pack in self._resumed_packs]
1964
        self._remove_pack_indices(self._new_pack)
1965
        if self._new_pack.data_inserted():
1966
            # get all the data to disk and read to use
1967
            self._new_pack.finish(suspend=True)
1968
            tokens.append(self._new_pack.name)
1969
            self._new_pack = None
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1970
        else:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
1971
            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)
1972
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1973
        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.
1974
        self.repo._text_knit = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1975
        return tokens
1976
1977
    def _resume_write_group(self, tokens):
1978
        for token in tokens:
1979
            self._resume_pack(token)
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
1980
1981
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
1982
class KnitPackRepository(KnitRepository):
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
1983
    """Repository with knit objects stored inside pack containers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1984
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
1985
    The layering for a KnitPackRepository is:
1986
1987
    Graph        |  HPSS    | Repository public layer |
1988
    ===================================================
1989
    Tuple based apis below, string based, and key based apis above
1990
    ---------------------------------------------------
1991
    KnitVersionedFiles
1992
      Provides .texts, .revisions etc
1993
      This adapts the N-tuple keys to physical knit records which only have a
1994
      single string identifier (for historical reasons), which in older formats
1995
      was always the revision_id, and in the mapped code for packs is always
1996
      the last element of key tuples.
1997
    ---------------------------------------------------
1998
    GraphIndex
1999
      A separate GraphIndex is used for each of the
2000
      texts/inventories/revisions/signatures contained within each individual
2001
      pack file. The GraphIndex layer works in N-tuples and is unaware of any
2002
      semantic value.
2003
    ===================================================
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2004
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2005
    """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2006
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.
2007
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
2008
        _serializer):
2009
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
2010
            _commit_builder_class, _serializer)
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2011
        index_transport = self._transport.clone('indices')
3350.6.5 by Robert Collins
Update to bzr.dev.
2012
        self._pack_collection = RepositoryPackCollection(self, self._transport,
2592.5.11 by Martin Pool
Move upload_transport from pack repositories to the pack collection
2013
            index_transport,
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2014
            self._transport.clone('upload'),
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2015
            self._transport.clone('packs'),
2016
            _format.index_builder_class,
2017
            _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.
2018
        self.inventories = KnitVersionedFiles(
2019
            _KnitGraphIndex(self._pack_collection.inventory_index.combined_index,
2020
                add_callback=self._pack_collection.inventory_index.add_callback,
2021
                deltas=True, parents=True, is_locked=self.is_locked),
2022
            data_access=self._pack_collection.inventory_index.data_access,
2023
            max_delta_chain=200)
2024
        self.revisions = KnitVersionedFiles(
2025
            _KnitGraphIndex(self._pack_collection.revision_index.combined_index,
2026
                add_callback=self._pack_collection.revision_index.add_callback,
2027
                deltas=False, parents=True, is_locked=self.is_locked),
2028
            data_access=self._pack_collection.revision_index.data_access,
2029
            max_delta_chain=0)
2030
        self.signatures = KnitVersionedFiles(
2031
            _KnitGraphIndex(self._pack_collection.signature_index.combined_index,
2032
                add_callback=self._pack_collection.signature_index.add_callback,
2033
                deltas=False, parents=False, is_locked=self.is_locked),
2034
            data_access=self._pack_collection.signature_index.data_access,
2035
            max_delta_chain=0)
2036
        self.texts = KnitVersionedFiles(
2037
            _KnitGraphIndex(self._pack_collection.text_index.combined_index,
2038
                add_callback=self._pack_collection.text_index.add_callback,
2039
                deltas=True, parents=True, is_locked=self.is_locked),
2040
            data_access=self._pack_collection.text_index.data_access,
2041
            max_delta_chain=200)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2042
        # 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
2043
        # 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.
2044
        # Another way to represent this would be a decorator around the control
2045
        # files object that presents logical locks as physical ones - if this
2046
        # gets ugly consider that alternative design. RBC 20071011
2047
        self._write_lock_count = 0
2048
        self._transaction = None
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
2049
        # for tests
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2050
        self._reconcile_does_inventory_gc = True
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
2051
        self._reconcile_fixes_text_parents = True
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2052
        self._reconcile_backsup_inventory = False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2053
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2054
    def _warn_if_deprecated(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2055
        # This class isn't deprecated, but one sub-format is
2056
        if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
3606.10.3 by John Arbash Meinel
When warning give an exact upgrade request.
2057
            from bzrlib import repository
2058
            if repository._deprecation_warning_done:
2059
                return
2060
            repository._deprecation_warning_done = True
2061
            warning("Format %s for %s is deprecated - please use"
2062
                    " 'bzr upgrade --1.6.1-rich-root'"
2063
                    % (self._format, self.bzrdir.transport.base))
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2064
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2065
    def _abort_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2066
        self._pack_collection._abort_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2067
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2068
    def _find_inconsistent_revision_parents(self):
2069
        """Find revisions with incorrectly cached parents.
2070
2071
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
2072
            parents-in-revision).
2073
        """
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
2074
        if not self.is_locked():
2075
            raise errors.ObjectNotLocked(self)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2076
        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.
2077
        result = []
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2078
        try:
2079
            revision_nodes = self._pack_collection.revision_index \
2080
                .combined_index.iter_all_entries()
2081
            index_positions = []
2082
            # Get the cached index values for all revisions, and also the location
2083
            # in each index of the revision text so we can perform linear IO.
2084
            for index, key, value, refs in revision_nodes:
2085
                pos, length = value[1:].split(' ')
2086
                index_positions.append((index, int(pos), key[0],
2087
                    tuple(parent[0] for parent in refs[0])))
2088
                pb.update("Reading revision index.", 0, 0)
2089
            index_positions.sort()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
2090
            batch_count = len(index_positions) / 1000 + 1
2091
            pb.update("Checking cached revision graph.", 0, batch_count)
2092
            for offset in xrange(batch_count):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2093
                pb.update("Checking cached revision graph.", offset)
2094
                to_query = index_positions[offset * 1000:(offset + 1) * 1000]
2095
                if not to_query:
2096
                    break
2097
                rev_ids = [item[2] for item in to_query]
2098
                revs = self.get_revisions(rev_ids)
2099
                for revision, item in zip(revs, to_query):
2100
                    index_parents = item[3]
2101
                    rev_parents = tuple(revision.parent_ids)
2102
                    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.
2103
                        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.
2104
        finally:
2105
            pb.finished()
2951.1.11 by Robert Collins
Do not try to use try:finally: around a yield for python 2.4.
2106
        return result
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2107
3099.3.3 by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map()
2108
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2109
    def get_parents(self, revision_ids):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2110
        """See graph._StackedParentsProvider.get_parents."""
2111
        parent_map = self.get_parent_map(revision_ids)
2112
        return [parent_map.get(r, None) for r in revision_ids]
2113
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2114
    def _make_parents_provider(self):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2115
        return graph.CachingParentsProvider(self)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2116
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2117
    def _refresh_data(self):
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)
2118
        if self._write_lock_count == 1 or (
2119
            self.control_files._lock_count == 1 and
2120
            self.control_files._lock_mode == 'r'):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2121
            # forget what names there are
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2122
            self._pack_collection.reset()
2592.3.219 by Robert Collins
Review feedback.
2123
            # XXX: Better to do an in-memory merge when acquiring a new lock -
2124
            # factor out code from _save_pack_names.
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2125
            self._pack_collection.ensure_loaded()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2126
2127
    def _start_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2128
        self._pack_collection._start_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2129
2130
    def _commit_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2131
        return self._pack_collection._commit_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2132
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2133
    def suspend_write_group(self):
2134
        # XXX check self._write_group is self.get_transaction()?
2135
        tokens = self._pack_collection._suspend_write_group()
2136
        self._write_group = None
2137
        return tokens
2138
2139
    def _resume_write_group(self, tokens):
2140
        self._start_write_group()
2141
        self._pack_collection._resume_write_group(tokens)
2142
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2143
    def get_transaction(self):
2144
        if self._write_lock_count:
2145
            return self._transaction
2146
        else:
2147
            return self.control_files.get_transaction()
2148
2149
    def is_locked(self):
2150
        return self._write_lock_count or self.control_files.is_locked()
2151
2152
    def is_write_locked(self):
2153
        return self._write_lock_count
2154
2155
    def lock_write(self, token=None):
2156
        if not self._write_lock_count and self.is_locked():
2157
            raise errors.ReadOnlyError(self)
2158
        self._write_lock_count += 1
2159
        if self._write_lock_count == 1:
2160
            self._transaction = transactions.WriteTransaction()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2161
            for repo in self._fallback_repositories:
2162
                # Writes don't affect fallback repos
2163
                repo.lock_read()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2164
        self._refresh_data()
2165
2166
    def lock_read(self):
2167
        if self._write_lock_count:
2168
            self._write_lock_count += 1
2169
        else:
2170
            self.control_files.lock_read()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2171
            for repo in self._fallback_repositories:
2172
                # Writes don't affect fallback repos
2173
                repo.lock_read()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2174
        self._refresh_data()
2175
2176
    def leave_lock_in_place(self):
2177
        # not supported - raise an error
2178
        raise NotImplementedError(self.leave_lock_in_place)
2179
2180
    def dont_leave_lock_in_place(self):
2181
        # not supported - raise an error
2182
        raise NotImplementedError(self.dont_leave_lock_in_place)
2183
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2184
    @needs_write_lock
2185
    def pack(self):
2186
        """Compress the data within the repository.
2187
2188
        This will pack all the data to a single pack. In future it may
2189
        recompress deltas or do other such expensive operations.
2190
        """
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2191
        self._pack_collection.pack()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2192
2193
    @needs_write_lock
2194
    def reconcile(self, other=None, thorough=False):
2195
        """Reconcile this repository."""
2196
        from bzrlib.reconcile import PackReconciler
2197
        reconciler = PackReconciler(self, thorough=thorough)
2198
        reconciler.reconcile()
2199
        return reconciler
2200
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2201
    def unlock(self):
2202
        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.
2203
            self.abort_write_group()
2204
            self._transaction = None
2205
            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.
2206
            raise errors.BzrError(
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
2207
                'Must end write group before releasing write lock on %s'
2208
                % self)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2209
        if self._write_lock_count:
2210
            self._write_lock_count -= 1
2211
            if not self._write_lock_count:
2212
                transaction = self._transaction
2213
                self._transaction = None
2214
                transaction.finish()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2215
                for repo in self._fallback_repositories:
2216
                    repo.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2217
        else:
2218
            self.control_files.unlock()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2219
            for repo in self._fallback_repositories:
2220
                repo.unlock()
2221
2222
2223
class RepositoryFormatPack(MetaDirRepositoryFormat):
2224
    """Format logic for pack structured repositories.
2225
2226
    This repository format has:
2227
     - a list of packs in pack-names
2228
     - packs in packs/NAME.pack
2229
     - indices in indices/NAME.{iix,six,tix,rix}
2230
     - knit deltas in the packs, knit indices mapped to the indices.
2231
     - thunk objects to support the knits programming API.
2232
     - a format marker of its own
2233
     - an optional 'shared-storage' flag
2234
     - an optional 'no-working-trees' flag
2235
     - a LockDir lock
2236
    """
2237
2238
    # Set this attribute in derived classes to control the repository class
2239
    # created by open and initialize.
2240
    repository_class = None
2241
    # Set this attribute in derived classes to control the
2242
    # _commit_builder_class that the repository objects will have passed to
2243
    # their constructor.
2244
    _commit_builder_class = None
2245
    # Set this attribute in derived clases to control the _serializer that the
2246
    # repository objects will have passed to their constructor.
2247
    _serializer = None
2949.1.5 by Robert Collins
Packs support ghosts.
2248
    # Packs are not confused by ghosts.
2249
    supports_ghosts = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2250
    # External references are not supported in pack repositories yet.
2251
    supports_external_lookups = False
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2252
    # What index classes to use
2253
    index_builder_class = None
2254
    index_class = None
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2255
    _fetch_uses_deltas = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2256
2257
    def initialize(self, a_bzrdir, shared=False):
2258
        """Create a pack based repository.
2259
2260
        :param a_bzrdir: bzrdir to contain the new repository; must already
2261
            be initialized.
2262
        :param shared: If true the repository will be initialized as a shared
2263
                       repository.
2264
        """
2265
        mutter('creating repository in %s.', a_bzrdir.transport.base)
2266
        dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2267
        builder = self.index_builder_class()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2268
        files = [('pack-names', builder.finish())]
2269
        utf8_files = [('format', self.get_format_string())]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2270
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2271
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2272
        return self.open(a_bzrdir=a_bzrdir, _found=True)
2273
2274
    def open(self, a_bzrdir, _found=False, _override_transport=None):
2275
        """See RepositoryFormat.open().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2276
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2277
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
2278
                                    repository at a slightly different url
2279
                                    than normal. I.e. during 'upgrade'.
2280
        """
2281
        if not _found:
2282
            format = RepositoryFormat.find_format(a_bzrdir)
2283
        if _override_transport is not None:
2284
            repo_transport = _override_transport
2285
        else:
2286
            repo_transport = a_bzrdir.get_repository_transport(None)
2287
        control_files = lockable_files.LockableFiles(repo_transport,
2288
                                'lock', lockdir.LockDir)
2289
        return self.repository_class(_format=self,
2290
                              a_bzrdir=a_bzrdir,
2291
                              control_files=control_files,
2292
                              _commit_builder_class=self._commit_builder_class,
2293
                              _serializer=self._serializer)
2294
2295
2296
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2297
    """A no-subtrees parameterized Pack repository.
2298
2299
    This format was introduced in 0.92.
2300
    """
2301
2302
    repository_class = KnitPackRepository
2303
    _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.
2304
    @property
2305
    def _serializer(self):
2306
        return xml5.serializer_v5
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2307
    # What index classes to use
2308
    index_builder_class = InMemoryGraphIndex
2309
    index_class = GraphIndex
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2310
2311
    def _get_matching_bzrdir(self):
2312
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2313
2314
    def _ignore_setting_bzrdir(self, format):
2315
        pass
2316
2317
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2318
2319
    def get_format_string(self):
2320
        """See RepositoryFormat.get_format_string()."""
2321
        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2322
2323
    def get_format_description(self):
2324
        """See RepositoryFormat.get_format_description()."""
2325
        return "Packs containing knits without subtree support"
2326
2327
    def check_conversion_target(self, target_format):
2328
        pass
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2329
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2330
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2331
class RepositoryFormatKnitPack3(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2332
    """A subtrees parameterized Pack repository.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2333
2592.3.215 by Robert Collins
Review feedback.
2334
    This repository format uses the xml7 serializer to get:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2335
     - support for recording full info about the tree root
2336
     - support for recording tree-references
2592.3.215 by Robert Collins
Review feedback.
2337
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2338
    This format was introduced in 0.92.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2339
    """
2340
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2341
    repository_class = KnitPackRepository
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
2342
    _commit_builder_class = PackRootCommitBuilder
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2343
    rich_root_data = True
2344
    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.
2345
    @property
2346
    def _serializer(self):
2347
        return xml7.serializer_v7
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2348
    # What index classes to use
2349
    index_builder_class = InMemoryGraphIndex
2350
    index_class = GraphIndex
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2351
2352
    def _get_matching_bzrdir(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
2353
        return bzrdir.format_registry.make_bzrdir(
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
2354
            'pack-0.92-subtree')
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2355
2356
    def _ignore_setting_bzrdir(self, format):
2357
        pass
2358
2359
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2360
2361
    def check_conversion_target(self, target_format):
2362
        if not target_format.rich_root_data:
2363
            raise errors.BadConversionTarget(
2364
                'Does not support rich root data.', target_format)
2365
        if not getattr(target_format, 'supports_tree_reference', False):
2366
            raise errors.BadConversionTarget(
2367
                'Does not support nested trees', target_format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2368
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2369
    def get_format_string(self):
2370
        """See RepositoryFormat.get_format_string()."""
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2371
        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.
2372
2373
    def get_format_description(self):
2374
        """See RepositoryFormat.get_format_description()."""
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2375
        return "Packs containing knits with subtree support\n"
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2376
2377
2378
class RepositoryFormatKnitPack4(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2379
    """A rich-root, no subtrees parameterized Pack repository.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2380
2996.2.12 by Aaron Bentley
Text fixes from review
2381
    This repository format uses the xml6 serializer to get:
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2382
     - support for recording full info about the tree root
2383
2996.2.12 by Aaron Bentley
Text fixes from review
2384
    This format was introduced in 1.0.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2385
    """
2386
2387
    repository_class = KnitPackRepository
2388
    _commit_builder_class = PackRootCommitBuilder
2389
    rich_root_data = True
2390
    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.
2391
    @property
2392
    def _serializer(self):
2393
        return xml6.serializer_v6
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2394
    # What index classes to use
2395
    index_builder_class = InMemoryGraphIndex
2396
    index_class = GraphIndex
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2397
2398
    def _get_matching_bzrdir(self):
2399
        return bzrdir.format_registry.make_bzrdir(
2400
            'rich-root-pack')
2401
2402
    def _ignore_setting_bzrdir(self, format):
2403
        pass
2404
2405
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2406
2407
    def check_conversion_target(self, target_format):
2408
        if not target_format.rich_root_data:
2409
            raise errors.BadConversionTarget(
2410
                'Does not support rich root data.', target_format)
2411
2412
    def get_format_string(self):
2413
        """See RepositoryFormat.get_format_string()."""
2414
        return ("Bazaar pack repository format 1 with rich root"
2415
                " (needs bzr 1.0)\n")
2416
2417
    def get_format_description(self):
2418
        """See RepositoryFormat.get_format_description()."""
2419
        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
2420
2421
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2422
class RepositoryFormatKnitPack5(RepositoryFormatPack):
2423
    """Repository that supports external references to allow stacking.
2424
2425
    New in release 1.6.
2426
2427
    Supports external lookups, which results in non-truncated ghosts after
2428
    reconcile compared to pack-0.92 formats.
2429
    """
2430
2431
    repository_class = KnitPackRepository
2432
    _commit_builder_class = PackCommitBuilder
2433
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2434
    # What index classes to use
2435
    index_builder_class = InMemoryGraphIndex
2436
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2437
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2438
    @property
2439
    def _serializer(self):
2440
        return xml5.serializer_v5
2441
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2442
    def _get_matching_bzrdir(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2443
        return bzrdir.format_registry.make_bzrdir('1.6')
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2444
2445
    def _ignore_setting_bzrdir(self, format):
2446
        pass
2447
2448
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2449
2450
    def get_format_string(self):
2451
        """See RepositoryFormat.get_format_string()."""
2452
        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
2453
2454
    def get_format_description(self):
2455
        """See RepositoryFormat.get_format_description()."""
3606.3.1 by Aaron Bentley
Update repo format strings
2456
        return "Packs 5 (adds stacking support, requires bzr 1.6)"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2457
2458
    def check_conversion_target(self, target_format):
2459
        pass
2460
2461
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2462
class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2463
    """A repository with rich roots and stacking.
2464
2465
    New in release 1.6.1.
2466
2467
    Supports stacking on other repositories, allowing data to be accessed
2468
    without being stored locally.
2469
    """
2470
2471
    repository_class = KnitPackRepository
2472
    _commit_builder_class = PackRootCommitBuilder
2473
    rich_root_data = True
2474
    supports_tree_reference = False # no subtrees
2475
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2476
    # What index classes to use
2477
    index_builder_class = InMemoryGraphIndex
2478
    index_class = GraphIndex
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2479
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2480
    @property
2481
    def _serializer(self):
2482
        return xml6.serializer_v6
2483
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2484
    def _get_matching_bzrdir(self):
2485
        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
2486
            '1.6.1-rich-root')
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2487
2488
    def _ignore_setting_bzrdir(self, format):
2489
        pass
2490
2491
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2492
2493
    def check_conversion_target(self, target_format):
2494
        if not target_format.rich_root_data:
2495
            raise errors.BadConversionTarget(
2496
                'Does not support rich root data.', target_format)
2497
2498
    def get_format_string(self):
2499
        """See RepositoryFormat.get_format_string()."""
2500
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2501
2502
    def get_format_description(self):
2503
        return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
2504
2505
2506
class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
3606.3.1 by Aaron Bentley
Update repo format strings
2507
    """A repository with rich roots and external references.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2508
2509
    New in release 1.6.
2510
2511
    Supports external lookups, which results in non-truncated ghosts after
2512
    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.
2513
2514
    This format was deprecated because the serializer it uses accidentally
2515
    supported subtrees, when the format was not intended to. This meant that
2516
    someone could accidentally fetch from an incorrect repository.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2517
    """
2518
2519
    repository_class = KnitPackRepository
2520
    _commit_builder_class = PackRootCommitBuilder
2521
    rich_root_data = True
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2522
    supports_tree_reference = False # no subtrees
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2523
2524
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2525
    # What index classes to use
2526
    index_builder_class = InMemoryGraphIndex
2527
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2528
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2529
    @property
2530
    def _serializer(self):
2531
        return xml7.serializer_v7
2532
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2533
    def _get_matching_bzrdir(self):
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2534
        matching = bzrdir.format_registry.make_bzrdir(
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2535
            '1.6.1-rich-root')
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2536
        matching.repository_format = self
2537
        return matching
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2538
2539
    def _ignore_setting_bzrdir(self, format):
2540
        pass
2541
2542
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2543
2544
    def check_conversion_target(self, target_format):
2545
        if not target_format.rich_root_data:
2546
            raise errors.BadConversionTarget(
2547
                '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.
2548
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2549
    def get_format_string(self):
2550
        """See RepositoryFormat.get_format_string()."""
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2551
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2552
2553
    def get_format_description(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2554
        return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
2555
                " (deprecated)")
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2556
2557
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2558
class RepositoryFormatKnitPack6(RepositoryFormatPack):
2559
    """A repository with stacking and btree indexes,
2560
    without rich roots or subtrees.
2561
2562
    This is equivalent to pack-1.6 with B+Tree indices.
2563
    """
2564
2565
    repository_class = KnitPackRepository
2566
    _commit_builder_class = PackCommitBuilder
2567
    supports_external_lookups = True
2568
    # What index classes to use
2569
    index_builder_class = BTreeBuilder
2570
    index_class = BTreeGraphIndex
2571
2572
    @property
2573
    def _serializer(self):
2574
        return xml5.serializer_v5
2575
2576
    def _get_matching_bzrdir(self):
2577
        return bzrdir.format_registry.make_bzrdir('1.9')
2578
2579
    def _ignore_setting_bzrdir(self, format):
2580
        pass
2581
2582
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2583
2584
    def get_format_string(self):
2585
        """See RepositoryFormat.get_format_string()."""
2586
        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2587
2588
    def get_format_description(self):
2589
        """See RepositoryFormat.get_format_description()."""
2590
        return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2591
2592
    def check_conversion_target(self, target_format):
2593
        pass
2594
2595
2596
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2597
    """A repository with rich roots, no subtrees, stacking and btree indexes.
2598
3805.5.1 by John Arbash Meinel
Fix a docstring.
2599
    1.6-rich-root with B+Tree indices.
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2600
    """
2601
2602
    repository_class = KnitPackRepository
2603
    _commit_builder_class = PackRootCommitBuilder
2604
    rich_root_data = True
2605
    supports_tree_reference = False # no subtrees
2606
    supports_external_lookups = True
2607
    # What index classes to use
2608
    index_builder_class = BTreeBuilder
2609
    index_class = BTreeGraphIndex
2610
2611
    @property
2612
    def _serializer(self):
2613
        return xml6.serializer_v6
2614
2615
    def _get_matching_bzrdir(self):
2616
        return bzrdir.format_registry.make_bzrdir(
2617
            '1.9-rich-root')
2618
2619
    def _ignore_setting_bzrdir(self, format):
2620
        pass
2621
2622
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2623
2624
    def check_conversion_target(self, target_format):
2625
        if not target_format.rich_root_data:
2626
            raise errors.BadConversionTarget(
2627
                'Does not support rich root data.', target_format)
2628
2629
    def get_format_string(self):
2630
        """See RepositoryFormat.get_format_string()."""
2631
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2632
2633
    def get_format_description(self):
2634
        return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2635
2636
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2637
class RepositoryFormatPackDevelopment2(RepositoryFormatPack):
2638
    """A no-subtrees development repository.
2639
2640
    This format should be retained until the second release after bzr 1.7.
2641
2642
    This is pack-1.6.1 with B+Tree indices.
2643
    """
2644
2645
    repository_class = KnitPackRepository
2646
    _commit_builder_class = PackCommitBuilder
2647
    supports_external_lookups = True
2648
    # What index classes to use
2649
    index_builder_class = BTreeBuilder
2650
    index_class = BTreeGraphIndex
2651
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2652
    @property
2653
    def _serializer(self):
2654
        return xml5.serializer_v5
2655
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2656
    def _get_matching_bzrdir(self):
2657
        return bzrdir.format_registry.make_bzrdir('development2')
2658
2659
    def _ignore_setting_bzrdir(self, format):
2660
        pass
2661
2662
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2663
2664
    def get_format_string(self):
2665
        """See RepositoryFormat.get_format_string()."""
2666
        return "Bazaar development format 2 (needs bzr.dev from before 1.8)\n"
2667
2668
    def get_format_description(self):
2669
        """See RepositoryFormat.get_format_description()."""
2670
        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.
2671
            "1.6.1 with B+Trees.\n")
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2672
2673
    def check_conversion_target(self, target_format):
2674
        pass
2675
2676
2677
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2678
    """A subtrees development repository.
2679
2680
    This format should be retained until the second release after bzr 1.7.
2681
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2682
    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.
2683
    """
2684
2685
    repository_class = KnitPackRepository
2686
    _commit_builder_class = PackRootCommitBuilder
2687
    rich_root_data = True
2688
    supports_tree_reference = True
2689
    supports_external_lookups = True
2690
    # What index classes to use
2691
    index_builder_class = BTreeBuilder
2692
    index_class = BTreeGraphIndex
2693
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2694
    @property
2695
    def _serializer(self):
2696
        return xml7.serializer_v7
2697
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2698
    def _get_matching_bzrdir(self):
2699
        return bzrdir.format_registry.make_bzrdir(
2700
            'development2-subtree')
2701
2702
    def _ignore_setting_bzrdir(self, format):
2703
        pass
2704
2705
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2706
2707
    def check_conversion_target(self, target_format):
2708
        if not target_format.rich_root_data:
2709
            raise errors.BadConversionTarget(
2710
                'Does not support rich root data.', target_format)
2711
        if not getattr(target_format, 'supports_tree_reference', False):
2712
            raise errors.BadConversionTarget(
2713
                'Does not support nested trees', target_format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2714
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2715
    def get_format_string(self):
2716
        """See RepositoryFormat.get_format_string()."""
2717
        return ("Bazaar development format 2 with subtree support "
2718
            "(needs bzr.dev from before 1.8)\n")
2719
2720
    def get_format_description(self):
2721
        """See RepositoryFormat.get_format_description()."""
2722
        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.
2723
            "1.6.1-subtree with B+Tree indices.\n")