/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
        """
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
1300
        # XXX: This should call self.reset()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1301
        self.repo = repo
1302
        self.transport = transport
1303
        self._index_transport = index_transport
1304
        self._upload_transport = upload_transport
1305
        self._pack_transport = pack_transport
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1306
        self._index_builder_class = index_builder_class
1307
        self._index_class = index_class
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1308
        self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3}
1309
        self.packs = []
1310
        # name:Pack mapping
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
1311
        self._names = None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1312
        self._packs_by_name = {}
1313
        # the previous pack-names content
1314
        self._packs_at_load = None
1315
        # when a pack is being created by this object, the state of that pack.
1316
        self._new_pack = None
1317
        # aggregated revision index data
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1318
        self.revision_index = AggregateIndex(self.reload_pack_names)
1319
        self.inventory_index = AggregateIndex(self.reload_pack_names)
1320
        self.text_index = AggregateIndex(self.reload_pack_names)
1321
        self.signature_index = AggregateIndex(self.reload_pack_names)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1322
        # resumed packs
1323
        self._resumed_packs = []
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1324
1325
    def add_pack_to_memory(self, pack):
1326
        """Make a Pack object available to the repository to satisfy queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1327
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1328
        :param pack: A Pack object.
1329
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1330
        if pack.name in self._packs_by_name:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1331
            raise AssertionError(
1332
                '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.
1333
        self.packs.append(pack)
1334
        self._packs_by_name[pack.name] = pack
1335
        self.revision_index.add_index(pack.revision_index, pack)
1336
        self.inventory_index.add_index(pack.inventory_index, pack)
1337
        self.text_index.add_index(pack.text_index, pack)
1338
        self.signature_index.add_index(pack.signature_index, pack)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1339
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1340
    def all_packs(self):
1341
        """Return a list of all the Pack objects this repository has.
1342
1343
        Note that an in-progress pack being created is not returned.
1344
1345
        :return: A list of Pack objects for all the packs in the repository.
1346
        """
1347
        result = []
1348
        for name in self.names():
1349
            result.append(self.get_pack_by_name(name))
1350
        return result
1351
1352
    def autopack(self):
1353
        """Pack the pack collection incrementally.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1354
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1355
        This will not attempt global reorganisation or recompression,
1356
        rather it will just ensure that the total number of packs does
1357
        not grow without bound. It uses the _max_pack_count method to
1358
        determine if autopacking is needed, and the pack_distribution
1359
        method to determine the number of revisions in each pack.
1360
1361
        If autopacking takes place then the packs name collection will have
1362
        been flushed to disk - packing requires updating the name collection
1363
        in synchronisation with certain steps. Otherwise the names collection
1364
        is not flushed.
1365
1366
        :return: True if packing took place.
1367
        """
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1368
        while True:
1369
            try:
1370
                return self._do_autopack()
1371
            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.
1372
                # If we get a RetryAutopack exception, we should abort the
1373
                # 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.
1374
                pass
1375
1376
    def _do_autopack(self):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1377
        # 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.
1378
        total_revisions = self.revision_index.combined_index.key_count()
1379
        total_packs = len(self._names)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1380
        if self._max_pack_count(total_revisions) >= total_packs:
1381
            return False
1382
        # XXX: the following may want to be a class, to pack with a given
1383
        # policy.
1384
        # determine which packs need changing
1385
        pack_distribution = self.pack_distribution(total_revisions)
1386
        existing_packs = []
1387
        for pack in self.all_packs():
1388
            revision_count = pack.get_revision_count()
1389
            if revision_count == 0:
1390
                # revision less packs are not generated by normal operation,
1391
                # only by operations like sign-my-commits, and thus will not
1392
                # tend to grow rapdily or without bound like commit containing
1393
                # packs do - leave them alone as packing them really should
1394
                # group their data with the relevant commit, and that may
1395
                # involve rewriting ancient history - which autopack tries to
1396
                # avoid. Alternatively we could not group the data but treat
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1397
                # 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.
1398
                # one revision for each to the total revision count, to get
1399
                # a matching distribution.
1400
                continue
1401
            existing_packs.append((revision_count, pack))
1402
        pack_operations = self.plan_autopack_combinations(
1403
            existing_packs, pack_distribution)
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1404
        num_new_packs = len(pack_operations)
1405
        num_old_packs = sum([len(po[1]) for po in pack_operations])
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1406
        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
1407
        mutter('Auto-packing repository %s, which has %d pack files, '
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1408
            '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
1409
            ' revisions', self, total_packs, total_revisions, num_old_packs,
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1410
            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.
1411
        self._execute_pack_operations(pack_operations,
1412
                                      reload_func=self._restart_autopack)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1413
        return True
1414
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1415
    def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1416
                                 reload_func=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1417
        """Execute a series of pack operations.
1418
1419
        :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
1420
        :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.
1421
        :return: None.
1422
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1423
        for revision_count, packs in pack_operations:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1424
            # 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.
1425
            if len(packs) == 0:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1426
                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.
1427
            packer = _packer_class(self, packs, '.autopack',
1428
                                   reload_func=reload_func)
1429
            try:
1430
                packer.pack()
1431
            except errors.RetryWithNewPacks:
1432
                # An exception is propagating out of this context, make sure
3789.2.23 by John Arbash Meinel
Clarify the comment.
1433
                # this packer has cleaned up. Packer() doesn't set its new_pack
1434
                # state into the RepositoryPackCollection object, so we only
1435
                # 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.
1436
                if packer.new_pack is not None:
1437
                    packer.new_pack.abort()
1438
                raise
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1439
            for pack in packs:
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1440
                self._remove_pack_from_memory(pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1441
        # record the newly available packs and stop advertising the old
1442
        # packs
2948.1.1 by Robert Collins
* Obsolete packs are now cleaned up by pack and autopack operations.
1443
        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.
1444
        # Move the old packs out of the way now they are no longer referenced.
1445
        for revision_count, packs in pack_operations:
1446
            self._obsolete_packs(packs)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1447
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1448
    def lock_names(self):
1449
        """Acquire the mutex around the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1450
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1451
        This cannot be used in the middle of a read-only transaction on the
1452
        repository.
1453
        """
1454
        self.repo.control_files.lock_write()
1455
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1456
    def pack(self):
1457
        """Pack the pack collection totally."""
1458
        self.ensure_loaded()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1459
        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.
1460
        if total_packs < 2:
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1461
            # This is arguably wrong because we might not be optimal, but for
1462
            # now lets leave it in. (e.g. reconcile -> one pack. But not
1463
            # optimal.
2592.3.213 by Robert Collins
Retain packs and indices in memory within a lock, even when write groups are entered and exited.
1464
            return
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1465
        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.
1466
        # XXX: the following may want to be a class, to pack with a given
1467
        # policy.
1468
        mutter('Packing repository %s, which has %d pack files, '
1469
            'containing %d revisions into 1 packs.', self, total_packs,
1470
            total_revisions)
1471
        # determine which packs need changing
1472
        pack_distribution = [1]
1473
        pack_operations = [[0, []]]
1474
        for pack in self.all_packs():
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1475
            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.
1476
            pack_operations[-1][1].append(pack)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1477
        self._execute_pack_operations(pack_operations, OptimisingPacker)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1478
1479
    def plan_autopack_combinations(self, existing_packs, pack_distribution):
2592.3.176 by Robert Collins
Various pack refactorings.
1480
        """Plan a pack operation.
1481
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1482
        :param existing_packs: The packs to pack. (A list of (revcount, Pack)
1483
            tuples).
2592.3.235 by Martin Pool
Review cleanups
1484
        :param pack_distribution: A list with the number of revisions desired
2592.3.176 by Robert Collins
Various pack refactorings.
1485
            in each pack.
1486
        """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1487
        if len(existing_packs) <= len(pack_distribution):
1488
            return []
1489
        existing_packs.sort(reverse=True)
1490
        pack_operations = [[0, []]]
1491
        # plan out what packs to keep, and what to reorganise
1492
        while len(existing_packs):
1493
            # 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,
1494
            # distribution chart we will include its contents in the new pack
1495
            # 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.
1496
            # distribution chart
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1497
            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.
1498
            if next_pack_rev_count >= pack_distribution[0]:
1499
                # this is already packed 'better' than this, so we can
1500
                # not waste time packing it.
1501
                while next_pack_rev_count > 0:
1502
                    next_pack_rev_count -= pack_distribution[0]
1503
                    if next_pack_rev_count >= 0:
1504
                        # more to go
1505
                        del pack_distribution[0]
1506
                    else:
1507
                        # didn't use that entire bucket up
1508
                        pack_distribution[0] = -next_pack_rev_count
1509
            else:
1510
                # add the revisions we're going to add to the next output pack
1511
                pack_operations[-1][0] += next_pack_rev_count
1512
                # 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.
1513
                pack_operations[-1][1].append(next_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1514
                if pack_operations[-1][0] >= pack_distribution[0]:
1515
                    # this pack is used up, shift left.
1516
                    del pack_distribution[0]
1517
                    pack_operations.append([0, []])
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1518
        # Now that we know which pack files we want to move, shove them all
1519
        # into a single pack file.
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1520
        final_rev_count = 0
1521
        final_pack_list = []
1522
        for num_revs, pack_files in pack_operations:
1523
            final_rev_count += num_revs
1524
            final_pack_list.extend(pack_files)
1525
        if len(final_pack_list) == 1:
1526
            raise AssertionError('We somehow generated an autopack with a'
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1527
                ' single pack file being moved.')
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1528
            return []
1529
        return [[final_rev_count, final_pack_list]]
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1530
1531
    def ensure_loaded(self):
2592.3.214 by Robert Collins
Merge bzr.dev.
1532
        # NB: if you see an assertion error here, its probably access against
1533
        # an unlocked repo. Naughty.
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1534
        if not self.repo.is_locked():
1535
            raise errors.ObjectNotLocked(self.repo)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1536
        if self._names is None:
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1537
            self._names = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1538
            self._packs_at_load = set()
1539
            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.
1540
                name = key[0]
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1541
                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.
1542
                self._packs_at_load.add((key, value))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1543
        # populate all the metadata.
1544
        self.all_packs()
1545
1546
    def _parse_index_sizes(self, value):
1547
        """Parse a string of index sizes."""
1548
        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.
1549
2592.3.176 by Robert Collins
Various pack refactorings.
1550
    def get_pack_by_name(self, name):
1551
        """Get a Pack object by name.
1552
1553
        :param name: The name of the pack - e.g. '123456'
1554
        :return: A Pack object.
1555
        """
1556
        try:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1557
            return self._packs_by_name[name]
2592.3.176 by Robert Collins
Various pack refactorings.
1558
        except KeyError:
1559
            rev_index = self._make_index(name, '.rix')
1560
            inv_index = self._make_index(name, '.iix')
1561
            txt_index = self._make_index(name, '.tix')
1562
            sig_index = self._make_index(name, '.six')
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1563
            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.
1564
                inv_index, txt_index, sig_index)
2592.3.178 by Robert Collins
Add pack objects to the api for PackCollection.create_pack_from_packs.
1565
            self.add_pack_to_memory(result)
2592.3.176 by Robert Collins
Various pack refactorings.
1566
            return result
1567
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1568
    def _resume_pack(self, name):
1569
        """Get a suspended Pack object by name.
1570
1571
        :param name: The name of the pack - e.g. '123456'
1572
        :return: A Pack object.
1573
        """
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.
1574
        if not re.match('[a-f0-9]{32}', name):
1575
            # Tokens should be md5sums of the suspended pack file, i.e. 32 hex
1576
            # digits.
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1577
            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.
1578
                self.repo, [name], 'Malformed write group token')
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1579
        try:
1580
            rev_index = self._make_index(name, '.rix', resume=True)
1581
            inv_index = self._make_index(name, '.iix', resume=True)
1582
            txt_index = self._make_index(name, '.tix', resume=True)
1583
            sig_index = self._make_index(name, '.six', resume=True)
1584
            result = ResumedPack(name, rev_index, inv_index, txt_index,
1585
                sig_index, self._upload_transport, self._pack_transport,
1586
                self._index_transport, self)
1587
        except errors.NoSuchFile, e:
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1588
            raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1589
        self.add_pack_to_memory(result)
1590
        self._resumed_packs.append(result)
1591
        return result
1592
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1593
    def allocate(self, a_new_pack):
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1594
        """Allocate name in the list of packs.
1595
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1596
        :param a_new_pack: A NewPack instance to be added to the collection of
1597
            packs for this repository.
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1598
        """
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
1599
        self.ensure_loaded()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1600
        if a_new_pack.name in self._names:
2951.2.7 by Robert Collins
Raise an error on duplicate pack name allocation.
1601
            raise errors.BzrError(
1602
                '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.
1603
        self._names[a_new_pack.name] = tuple(a_new_pack.index_sizes)
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1604
        self.add_pack_to_memory(a_new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1605
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1606
    def _iter_disk_pack_index(self):
1607
        """Iterate over the contents of the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1608
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1609
        This is used when loading the list from disk, and before writing to
1610
        detect updates from others during our write operation.
1611
        :return: An iterator of the index contents.
1612
        """
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1613
        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.
1614
                ).iter_all_entries()
1615
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1616
    def _make_index(self, name, suffix, resume=False):
2592.3.176 by Robert Collins
Various pack refactorings.
1617
        size_offset = self._suffix_offsets[suffix]
1618
        index_name = name + suffix
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1619
        if resume:
1620
            transport = self._upload_transport
1621
            index_size = transport.stat(index_name).st_size
1622
        else:
1623
            transport = self._index_transport
1624
            index_size = self._names[name][size_offset]
1625
        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
1626
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1627
    def _max_pack_count(self, total_revisions):
1628
        """Return the maximum number of packs to use for total revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1629
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1630
        :param total_revisions: The total number of revisions in the
1631
            repository.
1632
        """
1633
        if not total_revisions:
1634
            return 1
1635
        digits = str(total_revisions)
1636
        result = 0
1637
        for digit in digits:
1638
            result += int(digit)
1639
        return result
1640
1641
    def names(self):
1642
        """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.
1643
        return sorted(self._names.keys())
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1644
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1645
    def _obsolete_packs(self, packs):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1646
        """Move a number of packs which have been obsoleted out of the way.
1647
1648
        Each pack and its associated indices are moved out of the way.
1649
1650
        Note: for correctness this function should only be called after a new
1651
        pack names index has been written without these pack names, and with
1652
        the names of packs that contain the data previously available via these
1653
        packs.
1654
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1655
        :param packs: The packs to obsolete.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1656
        :param return: None.
1657
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1658
        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.
1659
            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.
1660
                '../obsolete_packs/' + pack.file_name())
2592.3.226 by Martin Pool
formatting and docstrings
1661
            # TODO: Probably needs to know all possible indices for this pack
1662
            # - or maybe list the directory and move all indices matching this
2592.5.13 by Martin Pool
Clean up duplicate index_transport variables
1663
            # 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.
1664
            for suffix in ('.iix', '.six', '.tix', '.rix'):
1665
                self._index_transport.rename(pack.name + suffix,
1666
                    '../obsolete_packs/' + pack.name + suffix)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1667
1668
    def pack_distribution(self, total_revisions):
1669
        """Generate a list of the number of revisions to put in each pack.
1670
1671
        :param total_revisions: The total number of revisions in the
1672
            repository.
1673
        """
1674
        if total_revisions == 0:
1675
            return [0]
1676
        digits = reversed(str(total_revisions))
1677
        result = []
1678
        for exponent, count in enumerate(digits):
1679
            size = 10 ** exponent
1680
            for pos in range(int(count)):
1681
                result.append(size)
1682
        return list(reversed(result))
1683
2592.5.12 by Martin Pool
Move pack_transport and pack_name onto RepositoryPackCollection
1684
    def _pack_tuple(self, name):
1685
        """Return a tuple with the transport and file name for a pack name."""
1686
        return self._pack_transport, name + '.pack'
1687
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1688
    def _remove_pack_from_memory(self, pack):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1689
        """Remove pack from the packs accessed by this repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1690
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1691
        Only affects memory state, until self._save_pack_names() is invoked.
1692
        """
1693
        self._names.pop(pack.name)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1694
        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.
1695
        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.
1696
        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.
1697
1698
    def _remove_pack_indices(self, pack):
1699
        """Remove the indices for pack from the aggregated indices."""
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1700
        self.revision_index.remove_index(pack.revision_index, pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1701
        self.inventory_index.remove_index(pack.inventory_index, pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1702
        self.text_index.remove_index(pack.text_index, pack)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1703
        self.signature_index.remove_index(pack.signature_index, pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1704
1705
    def reset(self):
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1706
        """Clear all cached data."""
1707
        # cached revision data
1708
        self.repo._revision_knit = None
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1709
        self.revision_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1710
        # cached signature data
1711
        self.repo._signature_knit = None
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1712
        self.signature_index.clear()
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1713
        # cached file text data
1714
        self.text_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1715
        self.repo._text_knit = None
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1716
        # cached inventory data
1717
        self.inventory_index.clear()
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1718
        # remove the open pack
1719
        self._new_pack = None
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1720
        # information about packs.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1721
        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.
1722
        self.packs = []
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1723
        self._packs_by_name = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1724
        self._packs_at_load = None
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1725
2592.3.237 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1726
    def _unlock_names(self):
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1727
        """Release the mutex around the pack-names index."""
1728
        self.repo.control_files.unlock()
1729
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1730
    def _diff_pack_names(self):
1731
        """Read the pack names from disk, and compare it to the one in memory.
1732
1733
        :return: (disk_nodes, deleted_nodes, new_nodes)
1734
            disk_nodes    The final set of nodes that should be referenced
1735
            deleted_nodes Nodes which have been removed from when we started
1736
            new_nodes     Nodes that are newly introduced
1737
        """
1738
        # load the disk nodes across
1739
        disk_nodes = set()
1740
        for index, key, value in self._iter_disk_pack_index():
1741
            disk_nodes.add((key, value))
1742
1743
        # do a two-way diff against our original content
1744
        current_nodes = set()
1745
        for name, sizes in self._names.iteritems():
1746
            current_nodes.add(
1747
                ((name, ), ' '.join(str(size) for size in sizes)))
1748
1749
        # Packs no longer present in the repository, which were present when we
1750
        # locked the repository
1751
        deleted_nodes = self._packs_at_load - current_nodes
1752
        # Packs which this process is adding
1753
        new_nodes = current_nodes - self._packs_at_load
1754
1755
        # Update the disk_nodes set to include the ones we are adding, and
1756
        # remove the ones which were removed by someone else
1757
        disk_nodes.difference_update(deleted_nodes)
1758
        disk_nodes.update(new_nodes)
1759
1760
        return disk_nodes, deleted_nodes, new_nodes
1761
1762
    def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1763
        """Given the correct set of pack files, update our saved info.
1764
1765
        :return: (removed, added, modified)
1766
            removed     pack names removed from self._names
1767
            added       pack names added to self._names
1768
            modified    pack names that had changed value
1769
        """
1770
        removed = []
1771
        added = []
1772
        modified = []
1773
        ## self._packs_at_load = disk_nodes
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1774
        new_names = dict(disk_nodes)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1775
        # drop no longer present nodes
1776
        for pack in self.all_packs():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1777
            if (pack.name,) not in new_names:
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1778
                removed.append(pack.name)
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1779
                self._remove_pack_from_memory(pack)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1780
        # add new nodes/refresh existing ones
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1781
        for key, value in disk_nodes:
1782
            name = key[0]
1783
            sizes = self._parse_index_sizes(value)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1784
            if name in self._names:
1785
                # existing
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1786
                if sizes != self._names[name]:
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1787
                    # the pack for name has had its indices replaced - rare but
1788
                    # important to handle. XXX: probably can never happen today
1789
                    # because the three-way merge code above does not handle it
1790
                    # - you may end up adding the same key twice to the new
1791
                    # disk index because the set values are the same, unless
1792
                    # the only index shows up as deleted by the set difference
1793
                    # - which it may. Until there is a specific test for this,
1794
                    # assume its broken. RBC 20071017.
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1795
                    self._remove_pack_from_memory(self.get_pack_by_name(name))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1796
                    self._names[name] = sizes
1797
                    self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1798
                    modified.append(name)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1799
            else:
1800
                # new
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1801
                self._names[name] = sizes
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1802
                self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1803
                added.append(name)
1804
        return removed, added, modified
1805
1806
    def _save_pack_names(self, clear_obsolete_packs=False):
1807
        """Save the list of packs.
1808
1809
        This will take out the mutex around the pack names list for the
1810
        duration of the method call. If concurrent updates have been made, a
1811
        three-way merge between the current list and the current in memory list
1812
        is performed.
1813
1814
        :param clear_obsolete_packs: If True, clear out the contents of the
1815
            obsolete_packs directory.
1816
        """
1817
        self.lock_names()
1818
        try:
1819
            builder = self._index_builder_class()
1820
            disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1821
            # TODO: handle same-name, index-size-changes here -
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1822
            # e.g. use the value from disk, not ours, *unless* we're the one
1823
            # changing it.
1824
            for key, value in disk_nodes:
1825
                builder.add_node(key, value)
1826
            self.transport.put_file('pack-names', builder.finish(),
1827
                mode=self.repo.bzrdir._get_file_mode())
1828
            # move the baseline forward
1829
            self._packs_at_load = disk_nodes
1830
            if clear_obsolete_packs:
1831
                self._clear_obsolete_packs()
1832
        finally:
1833
            self._unlock_names()
1834
        # synchronise the memory packs list with what we just wrote:
1835
        self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1836
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1837
    def reload_pack_names(self):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1838
        """Sync our pack listing with what is present in the repository.
1839
1840
        This should be called when we find out that something we thought was
1841
        present is now missing. This happens when another process re-packs the
1842
        repository, etc.
1843
        """
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
1844
        # The ensure_loaded call is to handle the case where the first call
1845
        # made involving the collection was to reload_pack_names, where we 
1846
        # don't have a view of disk contents. Its a bit of a bandaid, and
1847
        # causes two reads of pack-names, but its a rare corner case not struck
1848
        # with regular push/pull etc.
1849
        self.ensure_loaded()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1850
        # This is functionally similar to _save_pack_names, but we don't write
1851
        # out the new value.
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1852
        disk_nodes, _, _ = self._diff_pack_names()
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1853
        self._packs_at_load = disk_nodes
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
1854
        (removed, added,
1855
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1856
        if removed or added or modified:
1857
            return True
1858
        return False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1859
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1860
    def _restart_autopack(self):
1861
        """Reload the pack names list, and restart the autopack code."""
1862
        if not self.reload_pack_names():
1863
            # Re-raise the original exception, because something went missing
1864
            # and a restart didn't find it
1865
            raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
1866
        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.
1867
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
1868
    def _clear_obsolete_packs(self):
1869
        """Delete everything from the obsolete-packs directory.
1870
        """
1871
        obsolete_pack_transport = self.transport.clone('obsolete_packs')
1872
        for filename in obsolete_pack_transport.list_dir('.'):
1873
            try:
1874
                obsolete_pack_transport.delete(filename)
1875
            except (errors.PathError, errors.TransportError), e:
1876
                warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
1877
2592.3.202 by Robert Collins
Move write stream management into NewPack.
1878
    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.
1879
        # 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.
1880
        if not self.repo.is_write_locked():
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1881
            raise errors.NotWriteLocked(self)
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
1882
        self._new_pack = NewPack(self, upload_suffix='.pack',
1883
            file_mode=self.repo.bzrdir._get_file_mode())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1884
        # allow writing: queue writes to a new index
1885
        self.revision_index.add_writable_index(self._new_pack.revision_index,
1886
            self._new_pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1887
        self.inventory_index.add_writable_index(self._new_pack.inventory_index,
1888
            self._new_pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1889
        self.text_index.add_writable_index(self._new_pack.text_index,
1890
            self._new_pack)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1891
        self.signature_index.add_writable_index(self._new_pack.signature_index,
1892
            self._new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1893
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.
1894
        self.repo.inventories._index._add_callback = self.inventory_index.add_callback
1895
        self.repo.revisions._index._add_callback = self.revision_index.add_callback
1896
        self.repo.signatures._index._add_callback = self.signature_index.add_callback
1897
        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
1898
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
1899
    def _abort_write_group(self):
1900
        # FIXME: just drop the transient index.
1901
        # 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)
1902
        if self._new_pack is not None:
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
1903
            try:
1904
                self._new_pack.abort()
1905
            finally:
3830.3.21 by John Arbash Meinel
Merge in bzr.dev 3845 and handle the trivial conflicts.
1906
                # XXX: If we aborted while in the middle of finishing the write
1907
                # group, _remove_pack_indices can fail because the indexes are
1908
                # already gone.  If they're not there we shouldn't fail in this
1909
                # case.  -- mbp 20081113
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
1910
                self._remove_pack_indices(self._new_pack)
1911
                self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1912
        for resumed_pack in self._resumed_packs:
1913
            try:
1914
                resumed_pack.abort()
1915
            finally:
1916
                # 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.
1917
                try:
1918
                    self._remove_pack_indices(resumed_pack)
1919
                except KeyError:
1920
                    pass
1921
        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.
1922
        self.repo._text_knit = None
2592.5.6 by Martin Pool
Move pack repository start_write_group to pack collection object
1923
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1924
    def _remove_resumed_pack_indices(self):
1925
        for resumed_pack in self._resumed_packs:
1926
            self._remove_pack_indices(resumed_pack)
1927
        del self._resumed_packs[:]
1928
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1929
    def _commit_write_group(self):
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
1930
        all_missing = set()
1931
        for prefix, versioned_file in (
1932
                ('revisions', self.repo.revisions),
1933
                ('inventories', self.repo.inventories),
1934
                ('texts', self.repo.texts),
1935
                ('signatures', self.repo.signatures),
1936
                ):
4002.1.9 by Andrew Bennetts
Merge VersionedFiles.insert-record-stream.partial from Robert.
1937
            missing = versioned_file.get_missing_compression_parent_keys()
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
1938
            all_missing.update([(prefix,) + key for key in missing])
1939
        if all_missing:
1940
            raise errors.BzrCheckError(
1941
                "Repository %s has missing compression parent(s) %r "
1942
                 % (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.
1943
        self._remove_pack_indices(self._new_pack)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1944
        should_autopack = False
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
1945
        if self._new_pack.data_inserted():
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1946
            # get all the data to disk and read to use
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1947
            self._new_pack.finish()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1948
            self.allocate(self._new_pack)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
1949
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1950
            should_autopack = True
1951
        else:
1952
            self._new_pack.abort()
1953
            self._new_pack = None
1954
        for resumed_pack in self._resumed_packs:
1955
            # XXX: this is a pretty ugly way to turn the resumed pack into a
1956
            # properly committed pack.
1957
            self._names[resumed_pack.name] = None
1958
            self._remove_pack_from_memory(resumed_pack)
1959
            resumed_pack.finish()
1960
            self.allocate(resumed_pack)
1961
            should_autopack = True
1962
        del self._resumed_packs[:]
1963
        if should_autopack:
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1964
            if not self.autopack():
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1965
                # when autopack takes no steps, the names list is still
1966
                # unsaved.
2592.5.10 by Martin Pool
Rename RepositoryPackCollection.save to _save_pack_names
1967
                self._save_pack_names()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1968
        self.repo._text_knit = None
1969
1970
    def _suspend_write_group(self):
1971
        tokens = [pack.name for pack in self._resumed_packs]
1972
        self._remove_pack_indices(self._new_pack)
1973
        if self._new_pack.data_inserted():
1974
            # get all the data to disk and read to use
1975
            self._new_pack.finish(suspend=True)
1976
            tokens.append(self._new_pack.name)
1977
            self._new_pack = None
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
1978
        else:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
1979
            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)
1980
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1981
        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.
1982
        self.repo._text_knit = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1983
        return tokens
1984
1985
    def _resume_write_group(self, tokens):
1986
        for token in tokens:
1987
            self._resume_pack(token)
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
1988
1989
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
1990
class KnitPackRepository(KnitRepository):
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
1991
    """Repository with knit objects stored inside pack containers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1992
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
1993
    The layering for a KnitPackRepository is:
1994
1995
    Graph        |  HPSS    | Repository public layer |
1996
    ===================================================
1997
    Tuple based apis below, string based, and key based apis above
1998
    ---------------------------------------------------
1999
    KnitVersionedFiles
2000
      Provides .texts, .revisions etc
2001
      This adapts the N-tuple keys to physical knit records which only have a
2002
      single string identifier (for historical reasons), which in older formats
2003
      was always the revision_id, and in the mapped code for packs is always
2004
      the last element of key tuples.
2005
    ---------------------------------------------------
2006
    GraphIndex
2007
      A separate GraphIndex is used for each of the
2008
      texts/inventories/revisions/signatures contained within each individual
2009
      pack file. The GraphIndex layer works in N-tuples and is unaware of any
2010
      semantic value.
2011
    ===================================================
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2012
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2013
    """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2014
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.
2015
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
2016
        _serializer):
2017
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
2018
            _commit_builder_class, _serializer)
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2019
        index_transport = self._transport.clone('indices')
3350.6.5 by Robert Collins
Update to bzr.dev.
2020
        self._pack_collection = RepositoryPackCollection(self, self._transport,
2592.5.11 by Martin Pool
Move upload_transport from pack repositories to the pack collection
2021
            index_transport,
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2022
            self._transport.clone('upload'),
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2023
            self._transport.clone('packs'),
2024
            _format.index_builder_class,
2025
            _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.
2026
        self.inventories = KnitVersionedFiles(
2027
            _KnitGraphIndex(self._pack_collection.inventory_index.combined_index,
2028
                add_callback=self._pack_collection.inventory_index.add_callback,
2029
                deltas=True, parents=True, is_locked=self.is_locked),
2030
            data_access=self._pack_collection.inventory_index.data_access,
2031
            max_delta_chain=200)
2032
        self.revisions = KnitVersionedFiles(
2033
            _KnitGraphIndex(self._pack_collection.revision_index.combined_index,
2034
                add_callback=self._pack_collection.revision_index.add_callback,
2035
                deltas=False, parents=True, is_locked=self.is_locked),
2036
            data_access=self._pack_collection.revision_index.data_access,
2037
            max_delta_chain=0)
2038
        self.signatures = KnitVersionedFiles(
2039
            _KnitGraphIndex(self._pack_collection.signature_index.combined_index,
2040
                add_callback=self._pack_collection.signature_index.add_callback,
2041
                deltas=False, parents=False, is_locked=self.is_locked),
2042
            data_access=self._pack_collection.signature_index.data_access,
2043
            max_delta_chain=0)
2044
        self.texts = KnitVersionedFiles(
2045
            _KnitGraphIndex(self._pack_collection.text_index.combined_index,
2046
                add_callback=self._pack_collection.text_index.add_callback,
2047
                deltas=True, parents=True, is_locked=self.is_locked),
2048
            data_access=self._pack_collection.text_index.data_access,
2049
            max_delta_chain=200)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2050
        # 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
2051
        # 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.
2052
        # Another way to represent this would be a decorator around the control
2053
        # files object that presents logical locks as physical ones - if this
2054
        # gets ugly consider that alternative design. RBC 20071011
2055
        self._write_lock_count = 0
2056
        self._transaction = None
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
2057
        # for tests
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2058
        self._reconcile_does_inventory_gc = True
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
2059
        self._reconcile_fixes_text_parents = True
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2060
        self._reconcile_backsup_inventory = False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2061
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2062
    def _warn_if_deprecated(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2063
        # This class isn't deprecated, but one sub-format is
2064
        if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
3606.10.3 by John Arbash Meinel
When warning give an exact upgrade request.
2065
            from bzrlib import repository
2066
            if repository._deprecation_warning_done:
2067
                return
2068
            repository._deprecation_warning_done = True
2069
            warning("Format %s for %s is deprecated - please use"
2070
                    " 'bzr upgrade --1.6.1-rich-root'"
2071
                    % (self._format, self.bzrdir.transport.base))
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2072
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2073
    def _abort_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2074
        self._pack_collection._abort_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2075
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2076
    def _find_inconsistent_revision_parents(self):
2077
        """Find revisions with incorrectly cached parents.
2078
2079
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
2080
            parents-in-revision).
2081
        """
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
2082
        if not self.is_locked():
2083
            raise errors.ObjectNotLocked(self)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2084
        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.
2085
        result = []
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2086
        try:
2087
            revision_nodes = self._pack_collection.revision_index \
2088
                .combined_index.iter_all_entries()
2089
            index_positions = []
2090
            # Get the cached index values for all revisions, and also the location
2091
            # in each index of the revision text so we can perform linear IO.
2092
            for index, key, value, refs in revision_nodes:
2093
                pos, length = value[1:].split(' ')
2094
                index_positions.append((index, int(pos), key[0],
2095
                    tuple(parent[0] for parent in refs[0])))
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
2096
                pb.update("Reading revision index", 0, 0)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2097
            index_positions.sort()
2951.1.10 by Robert Collins
Peer review feedback with Ian.
2098
            batch_count = len(index_positions) / 1000 + 1
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
2099
            pb.update("Checking cached revision graph", 0, batch_count)
2951.1.10 by Robert Collins
Peer review feedback with Ian.
2100
            for offset in xrange(batch_count):
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
2101
                pb.update("Checking cached revision graph", offset)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2102
                to_query = index_positions[offset * 1000:(offset + 1) * 1000]
2103
                if not to_query:
2104
                    break
2105
                rev_ids = [item[2] for item in to_query]
2106
                revs = self.get_revisions(rev_ids)
2107
                for revision, item in zip(revs, to_query):
2108
                    index_parents = item[3]
2109
                    rev_parents = tuple(revision.parent_ids)
2110
                    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.
2111
                        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.
2112
        finally:
2113
            pb.finished()
2951.1.11 by Robert Collins
Do not try to use try:finally: around a yield for python 2.4.
2114
        return result
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2115
3099.3.3 by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map()
2116
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2117
    def get_parents(self, revision_ids):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2118
        """See graph._StackedParentsProvider.get_parents."""
2119
        parent_map = self.get_parent_map(revision_ids)
2120
        return [parent_map.get(r, None) for r in revision_ids]
2121
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2122
    def _make_parents_provider(self):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2123
        return graph.CachingParentsProvider(self)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2124
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2125
    def _refresh_data(self):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2126
        if not self.is_locked():
2127
            return
2128
        self._pack_collection.reload_pack_names()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2129
2130
    def _start_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2131
        self._pack_collection._start_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2132
2133
    def _commit_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2134
        return self._pack_collection._commit_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2135
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2136
    def suspend_write_group(self):
2137
        # XXX check self._write_group is self.get_transaction()?
2138
        tokens = self._pack_collection._suspend_write_group()
2139
        self._write_group = None
2140
        return tokens
2141
2142
    def _resume_write_group(self, tokens):
2143
        self._start_write_group()
2144
        self._pack_collection._resume_write_group(tokens)
2145
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2146
    def get_transaction(self):
2147
        if self._write_lock_count:
2148
            return self._transaction
2149
        else:
2150
            return self.control_files.get_transaction()
2151
2152
    def is_locked(self):
2153
        return self._write_lock_count or self.control_files.is_locked()
2154
2155
    def is_write_locked(self):
2156
        return self._write_lock_count
2157
2158
    def lock_write(self, token=None):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2159
        locked = self.is_locked()
2160
        if not self._write_lock_count and locked:
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2161
            raise errors.ReadOnlyError(self)
2162
        self._write_lock_count += 1
2163
        if self._write_lock_count == 1:
2164
            self._transaction = transactions.WriteTransaction()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2165
            for repo in self._fallback_repositories:
2166
                # Writes don't affect fallback repos
2167
                repo.lock_read()
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2168
        if not locked:
2169
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2170
2171
    def lock_read(self):
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2172
        locked = self.is_locked()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2173
        if self._write_lock_count:
2174
            self._write_lock_count += 1
2175
        else:
2176
            self.control_files.lock_read()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2177
            for repo in self._fallback_repositories:
2178
                # Writes don't affect fallback repos
2179
                repo.lock_read()
4145.1.2 by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.
2180
        if not locked:
2181
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2182
2183
    def leave_lock_in_place(self):
2184
        # not supported - raise an error
2185
        raise NotImplementedError(self.leave_lock_in_place)
2186
2187
    def dont_leave_lock_in_place(self):
2188
        # not supported - raise an error
2189
        raise NotImplementedError(self.dont_leave_lock_in_place)
2190
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2191
    @needs_write_lock
2192
    def pack(self):
2193
        """Compress the data within the repository.
2194
2195
        This will pack all the data to a single pack. In future it may
2196
        recompress deltas or do other such expensive operations.
2197
        """
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2198
        self._pack_collection.pack()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2199
2200
    @needs_write_lock
2201
    def reconcile(self, other=None, thorough=False):
2202
        """Reconcile this repository."""
2203
        from bzrlib.reconcile import PackReconciler
2204
        reconciler = PackReconciler(self, thorough=thorough)
2205
        reconciler.reconcile()
2206
        return reconciler
2207
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2208
    def unlock(self):
2209
        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.
2210
            self.abort_write_group()
2211
            self._transaction = None
2212
            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.
2213
            raise errors.BzrError(
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
2214
                'Must end write group before releasing write lock on %s'
2215
                % self)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2216
        if self._write_lock_count:
2217
            self._write_lock_count -= 1
2218
            if not self._write_lock_count:
2219
                transaction = self._transaction
2220
                self._transaction = None
2221
                transaction.finish()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2222
                for repo in self._fallback_repositories:
2223
                    repo.unlock()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2224
        else:
2225
            self.control_files.unlock()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2226
            for repo in self._fallback_repositories:
2227
                repo.unlock()
2228
2229
2230
class RepositoryFormatPack(MetaDirRepositoryFormat):
2231
    """Format logic for pack structured repositories.
2232
2233
    This repository format has:
2234
     - a list of packs in pack-names
2235
     - packs in packs/NAME.pack
2236
     - indices in indices/NAME.{iix,six,tix,rix}
2237
     - knit deltas in the packs, knit indices mapped to the indices.
2238
     - thunk objects to support the knits programming API.
2239
     - a format marker of its own
2240
     - an optional 'shared-storage' flag
2241
     - an optional 'no-working-trees' flag
2242
     - a LockDir lock
2243
    """
2244
2245
    # Set this attribute in derived classes to control the repository class
2246
    # created by open and initialize.
2247
    repository_class = None
2248
    # Set this attribute in derived classes to control the
2249
    # _commit_builder_class that the repository objects will have passed to
2250
    # their constructor.
2251
    _commit_builder_class = None
2252
    # Set this attribute in derived clases to control the _serializer that the
2253
    # repository objects will have passed to their constructor.
2254
    _serializer = None
2949.1.5 by Robert Collins
Packs support ghosts.
2255
    # Packs are not confused by ghosts.
2256
    supports_ghosts = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2257
    # External references are not supported in pack repositories yet.
2258
    supports_external_lookups = False
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2259
    # What index classes to use
2260
    index_builder_class = None
2261
    index_class = None
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2262
    _fetch_uses_deltas = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2263
2264
    def initialize(self, a_bzrdir, shared=False):
2265
        """Create a pack based repository.
2266
2267
        :param a_bzrdir: bzrdir to contain the new repository; must already
2268
            be initialized.
2269
        :param shared: If true the repository will be initialized as a shared
2270
                       repository.
2271
        """
2272
        mutter('creating repository in %s.', a_bzrdir.transport.base)
2273
        dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2274
        builder = self.index_builder_class()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2275
        files = [('pack-names', builder.finish())]
2276
        utf8_files = [('format', self.get_format_string())]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2277
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2278
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2279
        return self.open(a_bzrdir=a_bzrdir, _found=True)
2280
2281
    def open(self, a_bzrdir, _found=False, _override_transport=None):
2282
        """See RepositoryFormat.open().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2283
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2284
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
2285
                                    repository at a slightly different url
2286
                                    than normal. I.e. during 'upgrade'.
2287
        """
2288
        if not _found:
2289
            format = RepositoryFormat.find_format(a_bzrdir)
2290
        if _override_transport is not None:
2291
            repo_transport = _override_transport
2292
        else:
2293
            repo_transport = a_bzrdir.get_repository_transport(None)
2294
        control_files = lockable_files.LockableFiles(repo_transport,
2295
                                'lock', lockdir.LockDir)
2296
        return self.repository_class(_format=self,
2297
                              a_bzrdir=a_bzrdir,
2298
                              control_files=control_files,
2299
                              _commit_builder_class=self._commit_builder_class,
2300
                              _serializer=self._serializer)
2301
2302
2303
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2304
    """A no-subtrees parameterized Pack repository.
2305
2306
    This format was introduced in 0.92.
2307
    """
2308
2309
    repository_class = KnitPackRepository
2310
    _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.
2311
    @property
2312
    def _serializer(self):
2313
        return xml5.serializer_v5
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2314
    # What index classes to use
2315
    index_builder_class = InMemoryGraphIndex
2316
    index_class = GraphIndex
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2317
2318
    def _get_matching_bzrdir(self):
2319
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2320
2321
    def _ignore_setting_bzrdir(self, format):
2322
        pass
2323
2324
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2325
2326
    def get_format_string(self):
2327
        """See RepositoryFormat.get_format_string()."""
2328
        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2329
2330
    def get_format_description(self):
2331
        """See RepositoryFormat.get_format_description()."""
2332
        return "Packs containing knits without subtree support"
2333
2334
    def check_conversion_target(self, target_format):
2335
        pass
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2336
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2337
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2338
class RepositoryFormatKnitPack3(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2339
    """A subtrees parameterized Pack repository.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2340
2592.3.215 by Robert Collins
Review feedback.
2341
    This repository format uses the xml7 serializer to get:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2342
     - support for recording full info about the tree root
2343
     - support for recording tree-references
2592.3.215 by Robert Collins
Review feedback.
2344
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2345
    This format was introduced in 0.92.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2346
    """
2347
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2348
    repository_class = KnitPackRepository
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
2349
    _commit_builder_class = PackRootCommitBuilder
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2350
    rich_root_data = True
2351
    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.
2352
    @property
2353
    def _serializer(self):
2354
        return xml7.serializer_v7
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2355
    # What index classes to use
2356
    index_builder_class = InMemoryGraphIndex
2357
    index_class = GraphIndex
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2358
2359
    def _get_matching_bzrdir(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
2360
        return bzrdir.format_registry.make_bzrdir(
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
2361
            'pack-0.92-subtree')
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2362
2363
    def _ignore_setting_bzrdir(self, format):
2364
        pass
2365
2366
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2367
2368
    def check_conversion_target(self, target_format):
2369
        if not target_format.rich_root_data:
2370
            raise errors.BadConversionTarget(
2371
                'Does not support rich root data.', target_format)
2372
        if not getattr(target_format, 'supports_tree_reference', False):
2373
            raise errors.BadConversionTarget(
2374
                'Does not support nested trees', target_format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2375
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2376
    def get_format_string(self):
2377
        """See RepositoryFormat.get_format_string()."""
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2378
        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.
2379
2380
    def get_format_description(self):
2381
        """See RepositoryFormat.get_format_description()."""
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2382
        return "Packs containing knits with subtree support\n"
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2383
2384
2385
class RepositoryFormatKnitPack4(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2386
    """A rich-root, no subtrees parameterized Pack repository.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2387
2996.2.12 by Aaron Bentley
Text fixes from review
2388
    This repository format uses the xml6 serializer to get:
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2389
     - support for recording full info about the tree root
2390
2996.2.12 by Aaron Bentley
Text fixes from review
2391
    This format was introduced in 1.0.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2392
    """
2393
2394
    repository_class = KnitPackRepository
2395
    _commit_builder_class = PackRootCommitBuilder
2396
    rich_root_data = True
2397
    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.
2398
    @property
2399
    def _serializer(self):
2400
        return xml6.serializer_v6
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2401
    # What index classes to use
2402
    index_builder_class = InMemoryGraphIndex
2403
    index_class = GraphIndex
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2404
2405
    def _get_matching_bzrdir(self):
2406
        return bzrdir.format_registry.make_bzrdir(
2407
            'rich-root-pack')
2408
2409
    def _ignore_setting_bzrdir(self, format):
2410
        pass
2411
2412
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2413
2414
    def check_conversion_target(self, target_format):
2415
        if not target_format.rich_root_data:
2416
            raise errors.BadConversionTarget(
2417
                'Does not support rich root data.', target_format)
2418
2419
    def get_format_string(self):
2420
        """See RepositoryFormat.get_format_string()."""
2421
        return ("Bazaar pack repository format 1 with rich root"
2422
                " (needs bzr 1.0)\n")
2423
2424
    def get_format_description(self):
2425
        """See RepositoryFormat.get_format_description()."""
2426
        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
2427
2428
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2429
class RepositoryFormatKnitPack5(RepositoryFormatPack):
2430
    """Repository that supports external references to allow stacking.
2431
2432
    New in release 1.6.
2433
2434
    Supports external lookups, which results in non-truncated ghosts after
2435
    reconcile compared to pack-0.92 formats.
2436
    """
2437
2438
    repository_class = KnitPackRepository
2439
    _commit_builder_class = PackCommitBuilder
2440
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2441
    # What index classes to use
2442
    index_builder_class = InMemoryGraphIndex
2443
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2444
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2445
    @property
2446
    def _serializer(self):
2447
        return xml5.serializer_v5
2448
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2449
    def _get_matching_bzrdir(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2450
        return bzrdir.format_registry.make_bzrdir('1.6')
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2451
2452
    def _ignore_setting_bzrdir(self, format):
2453
        pass
2454
2455
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2456
2457
    def get_format_string(self):
2458
        """See RepositoryFormat.get_format_string()."""
2459
        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
2460
2461
    def get_format_description(self):
2462
        """See RepositoryFormat.get_format_description()."""
3606.3.1 by Aaron Bentley
Update repo format strings
2463
        return "Packs 5 (adds stacking support, requires bzr 1.6)"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2464
2465
    def check_conversion_target(self, target_format):
2466
        pass
2467
2468
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2469
class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2470
    """A repository with rich roots and stacking.
2471
2472
    New in release 1.6.1.
2473
2474
    Supports stacking on other repositories, allowing data to be accessed
2475
    without being stored locally.
2476
    """
2477
2478
    repository_class = KnitPackRepository
2479
    _commit_builder_class = PackRootCommitBuilder
2480
    rich_root_data = True
2481
    supports_tree_reference = False # no subtrees
2482
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2483
    # What index classes to use
2484
    index_builder_class = InMemoryGraphIndex
2485
    index_class = GraphIndex
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2486
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2487
    @property
2488
    def _serializer(self):
2489
        return xml6.serializer_v6
2490
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2491
    def _get_matching_bzrdir(self):
2492
        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
2493
            '1.6.1-rich-root')
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2494
2495
    def _ignore_setting_bzrdir(self, format):
2496
        pass
2497
2498
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2499
2500
    def check_conversion_target(self, target_format):
2501
        if not target_format.rich_root_data:
2502
            raise errors.BadConversionTarget(
2503
                'Does not support rich root data.', target_format)
2504
2505
    def get_format_string(self):
2506
        """See RepositoryFormat.get_format_string()."""
2507
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2508
2509
    def get_format_description(self):
2510
        return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
2511
2512
2513
class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
3606.3.1 by Aaron Bentley
Update repo format strings
2514
    """A repository with rich roots and external references.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2515
2516
    New in release 1.6.
2517
2518
    Supports external lookups, which results in non-truncated ghosts after
2519
    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.
2520
2521
    This format was deprecated because the serializer it uses accidentally
2522
    supported subtrees, when the format was not intended to. This meant that
2523
    someone could accidentally fetch from an incorrect repository.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2524
    """
2525
2526
    repository_class = KnitPackRepository
2527
    _commit_builder_class = PackRootCommitBuilder
2528
    rich_root_data = True
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2529
    supports_tree_reference = False # no subtrees
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2530
2531
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2532
    # What index classes to use
2533
    index_builder_class = InMemoryGraphIndex
2534
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2535
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2536
    @property
2537
    def _serializer(self):
2538
        return xml7.serializer_v7
2539
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2540
    def _get_matching_bzrdir(self):
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2541
        matching = bzrdir.format_registry.make_bzrdir(
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2542
            '1.6.1-rich-root')
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2543
        matching.repository_format = self
2544
        return matching
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2545
2546
    def _ignore_setting_bzrdir(self, format):
2547
        pass
2548
2549
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2550
2551
    def check_conversion_target(self, target_format):
2552
        if not target_format.rich_root_data:
2553
            raise errors.BadConversionTarget(
2554
                '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.
2555
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2556
    def get_format_string(self):
2557
        """See RepositoryFormat.get_format_string()."""
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2558
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2559
2560
    def get_format_description(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2561
        return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
2562
                " (deprecated)")
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2563
2564
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2565
class RepositoryFormatKnitPack6(RepositoryFormatPack):
2566
    """A repository with stacking and btree indexes,
2567
    without rich roots or subtrees.
2568
2569
    This is equivalent to pack-1.6 with B+Tree indices.
2570
    """
2571
2572
    repository_class = KnitPackRepository
2573
    _commit_builder_class = PackCommitBuilder
2574
    supports_external_lookups = True
2575
    # What index classes to use
2576
    index_builder_class = BTreeBuilder
2577
    index_class = BTreeGraphIndex
2578
2579
    @property
2580
    def _serializer(self):
2581
        return xml5.serializer_v5
2582
2583
    def _get_matching_bzrdir(self):
2584
        return bzrdir.format_registry.make_bzrdir('1.9')
2585
2586
    def _ignore_setting_bzrdir(self, format):
2587
        pass
2588
2589
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2590
2591
    def get_format_string(self):
2592
        """See RepositoryFormat.get_format_string()."""
2593
        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2594
2595
    def get_format_description(self):
2596
        """See RepositoryFormat.get_format_description()."""
2597
        return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2598
2599
    def check_conversion_target(self, target_format):
2600
        pass
2601
2602
2603
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2604
    """A repository with rich roots, no subtrees, stacking and btree indexes.
2605
3805.5.1 by John Arbash Meinel
Fix a docstring.
2606
    1.6-rich-root with B+Tree indices.
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2607
    """
2608
2609
    repository_class = KnitPackRepository
2610
    _commit_builder_class = PackRootCommitBuilder
2611
    rich_root_data = True
2612
    supports_tree_reference = False # no subtrees
2613
    supports_external_lookups = True
2614
    # What index classes to use
2615
    index_builder_class = BTreeBuilder
2616
    index_class = BTreeGraphIndex
2617
2618
    @property
2619
    def _serializer(self):
2620
        return xml6.serializer_v6
2621
2622
    def _get_matching_bzrdir(self):
2623
        return bzrdir.format_registry.make_bzrdir(
2624
            '1.9-rich-root')
2625
2626
    def _ignore_setting_bzrdir(self, format):
2627
        pass
2628
2629
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2630
2631
    def check_conversion_target(self, target_format):
2632
        if not target_format.rich_root_data:
2633
            raise errors.BadConversionTarget(
2634
                'Does not support rich root data.', target_format)
2635
2636
    def get_format_string(self):
2637
        """See RepositoryFormat.get_format_string()."""
2638
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2639
2640
    def get_format_description(self):
2641
        return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2642
2643
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2644
class RepositoryFormatPackDevelopment2(RepositoryFormatPack):
2645
    """A no-subtrees development repository.
2646
2647
    This format should be retained until the second release after bzr 1.7.
2648
2649
    This is pack-1.6.1 with B+Tree indices.
2650
    """
2651
2652
    repository_class = KnitPackRepository
2653
    _commit_builder_class = PackCommitBuilder
2654
    supports_external_lookups = True
2655
    # What index classes to use
2656
    index_builder_class = BTreeBuilder
2657
    index_class = BTreeGraphIndex
2658
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2659
    @property
2660
    def _serializer(self):
2661
        return xml5.serializer_v5
2662
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2663
    def _get_matching_bzrdir(self):
2664
        return bzrdir.format_registry.make_bzrdir('development2')
2665
2666
    def _ignore_setting_bzrdir(self, format):
2667
        pass
2668
2669
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2670
2671
    def get_format_string(self):
2672
        """See RepositoryFormat.get_format_string()."""
2673
        return "Bazaar development format 2 (needs bzr.dev from before 1.8)\n"
2674
2675
    def get_format_description(self):
2676
        """See RepositoryFormat.get_format_description()."""
2677
        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.
2678
            "1.6.1 with B+Trees.\n")
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2679
2680
    def check_conversion_target(self, target_format):
2681
        pass
2682
2683
2684
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2685
    """A subtrees development repository.
2686
2687
    This format should be retained until the second release after bzr 1.7.
2688
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2689
    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.
2690
    """
2691
2692
    repository_class = KnitPackRepository
2693
    _commit_builder_class = PackRootCommitBuilder
2694
    rich_root_data = True
2695
    supports_tree_reference = True
2696
    supports_external_lookups = True
2697
    # What index classes to use
2698
    index_builder_class = BTreeBuilder
2699
    index_class = BTreeGraphIndex
2700
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2701
    @property
2702
    def _serializer(self):
2703
        return xml7.serializer_v7
2704
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2705
    def _get_matching_bzrdir(self):
2706
        return bzrdir.format_registry.make_bzrdir(
2707
            'development2-subtree')
2708
2709
    def _ignore_setting_bzrdir(self, format):
2710
        pass
2711
2712
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2713
2714
    def check_conversion_target(self, target_format):
2715
        if not target_format.rich_root_data:
2716
            raise errors.BadConversionTarget(
2717
                'Does not support rich root data.', target_format)
2718
        if not getattr(target_format, 'supports_tree_reference', False):
2719
            raise errors.BadConversionTarget(
2720
                'Does not support nested trees', target_format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2721
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2722
    def get_format_string(self):
2723
        """See RepositoryFormat.get_format_string()."""
2724
        return ("Bazaar development format 2 with subtree support "
2725
            "(needs bzr.dev from before 1.8)\n")
2726
2727
    def get_format_description(self):
2728
        """See RepositoryFormat.get_format_description()."""
2729
        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.
2730
            "1.6.1-subtree with B+Tree indices.\n")