~bzr-pqm/bzr/bzr.dev

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