/brz/remove-bazaar

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