/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
1
# Copyright (C) 2007-2010 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,
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
27
    cleanup,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
28
    debug,
29
    graph,
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
30
    osutils,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
31
    pack,
32
    transactions,
33
    ui,
3224.5.16 by Andrew Bennetts
Merge from bzr.dev.
34
    xml5,
35
    xml6,
36
    xml7,
3603.2.1 by Andrew Bennetts
Remove duplicated class definitions, remove unused imports.
37
    )
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
38
from bzrlib.index import (
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
39
    CombinedGraphIndex,
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
40
    GraphIndexPrefixAdapter,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
41
    )
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.
42
from bzrlib.knit import (
43
    KnitPlainFactory,
44
    KnitVersionedFiles,
45
    _KnitGraphIndex,
46
    _DirectPackAccess,
47
    )
3063.2.1 by Robert Collins
Solve reconciling erroring when multiple portions of a single delta chain are being reinserted.
48
from bzrlib import tsort
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
49
""")
50
from bzrlib import (
51
    bzrdir,
52
    errors,
53
    lockable_files,
54
    lockdir,
3735.4.1 by Andrew Bennetts
Add _find_revision_outside_set.
55
    revision as _mod_revision,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
56
    )
57
4634.85.10 by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise.
58
from bzrlib.decorators import needs_write_lock, only_raises
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
59
from bzrlib.btree_index import (
60
    BTreeGraphIndex,
61
    BTreeBuilder,
62
    )
63
from bzrlib.index import (
64
    GraphIndex,
65
    InMemoryGraphIndex,
66
    )
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
67
from bzrlib.repofmt.knitrepo import KnitRepository
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
68
from bzrlib.repository import (
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
69
    CommitBuilder,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
70
    MetaDirRepositoryFormat,
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
71
    RepositoryFormat,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
72
    RootCommitBuilder,
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
73
    StreamSource,
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
74
    )
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
75
from bzrlib.trace import (
76
    mutter,
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
77
    note,
3376.2.12 by Martin Pool
pyflakes corrections (thanks spiv)
78
    warning,
79
    )
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
80
81
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
82
class PackCommitBuilder(CommitBuilder):
83
    """A subclass of CommitBuilder to add texts with pack semantics.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
84
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
85
    Specifically this uses one knit object rather than one knit object per
86
    added text, reducing memory and object pressure.
87
    """
88
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
89
    def __init__(self, repository, parents, config, timestamp=None,
90
                 timezone=None, committer=None, revprops=None,
91
                 revision_id=None):
92
        CommitBuilder.__init__(self, repository, parents, config,
93
            timestamp=timestamp, timezone=timezone, committer=committer,
94
            revprops=revprops, revision_id=revision_id)
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
95
        self._file_graph = graph.Graph(
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
96
            repository._pack_collection.text_index.combined_index)
97
2979.2.5 by Robert Collins
Make CommitBuilder.heads be _heads as its internal to CommitBuilder only.
98
    def _heads(self, file_id, revision_ids):
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
99
        keys = [(file_id, revision_id) for revision_id in revision_ids]
100
        return set([key[1] for key in self._file_graph.heads(keys)])
101
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
102
103
class PackRootCommitBuilder(RootCommitBuilder):
104
    """A subclass of RootCommitBuilder to add texts with pack semantics.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
105
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
106
    Specifically this uses one knit object rather than one knit object per
107
    added text, reducing memory and object pressure.
108
    """
109
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
110
    def __init__(self, repository, parents, config, timestamp=None,
111
                 timezone=None, committer=None, revprops=None,
112
                 revision_id=None):
113
        CommitBuilder.__init__(self, repository, parents, config,
114
            timestamp=timestamp, timezone=timezone, committer=committer,
115
            revprops=revprops, revision_id=revision_id)
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
116
        self._file_graph = graph.Graph(
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
117
            repository._pack_collection.text_index.combined_index)
118
2979.2.5 by Robert Collins
Make CommitBuilder.heads be _heads as its internal to CommitBuilder only.
119
    def _heads(self, file_id, revision_ids):
2979.2.2 by Robert Collins
Per-file graph heads detection during commit for pack repositories.
120
        keys = [(file_id, revision_id) for revision_id in revision_ids]
121
        return set([key[1] for key in self._file_graph.heads(keys)])
122
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
123
2592.3.90 by Robert Collins
Slightly broken, but branch and fetch performance is now roughly on par (for bzr.dev) with knits - should be much faster for large repos.
124
class Pack(object):
2592.3.191 by Robert Collins
Give Pack responsibility for index naming, and two concrete classes - NewPack for new packs and ExistingPack for packs we read from disk.
125
    """An in memory proxy for a pack and its indices.
126
127
    This is a base class that is not directly used, instead the classes
128
    ExistingPack and NewPack are used.
129
    """
130
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
131
    # A map of index 'type' to the file extension and position in the
132
    # index_sizes array.
133
    index_definitions = {
3735.2.98 by John Arbash Meinel
Merge bzr.dev 4032. Resolve the new streaming fetch.
134
        'chk': ('.cix', 4),
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
135
        'revision': ('.rix', 0),
136
        'inventory': ('.iix', 1),
137
        'text': ('.tix', 2),
138
        'signature': ('.six', 3),
139
        }
140
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
141
    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.
142
        signature_index, chk_index=None):
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
143
        """Create a pack instance.
144
145
        :param revision_index: A GraphIndex for determining what revisions are
146
            present in the Pack and accessing the locations of their texts.
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
147
        :param inventory_index: A GraphIndex for determining what inventories are
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
148
            present in the Pack and accessing the locations of their
149
            texts/deltas.
150
        :param text_index: A GraphIndex for determining what file texts
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
151
            are present in the pack and accessing the locations of their
152
            texts/deltas (via (fileid, revisionid) tuples).
3495.3.1 by Martin Pool
doc correction from SuperMMX
153
        :param signature_index: A GraphIndex for determining what signatures are
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
154
            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.
155
        :param chk_index: A GraphIndex for accessing content by CHK, if the
156
            pack has one.
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
157
        """
158
        self.revision_index = revision_index
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
159
        self.inventory_index = inventory_index
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
160
        self.text_index = text_index
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
161
        self.signature_index = signature_index
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
162
        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.
163
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
164
    def access_tuple(self):
165
        """Return a tuple (transport, name) for the pack content."""
166
        return self.pack_transport, self.file_name()
167
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
168
    def _check_references(self):
169
        """Make sure our external references are present.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
170
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
171
        Packs are allowed to have deltas whose base is not in the pack, but it
172
        must be present somewhere in this collection.  It is not allowed to
173
        have deltas based on a fallback repository.
174
        (See <https://bugs.launchpad.net/bzr/+bug/288751>)
175
        """
176
        missing_items = {}
177
        for (index_name, external_refs, index) in [
178
            ('texts',
179
                self._get_external_refs(self.text_index),
180
                self._pack_collection.text_index.combined_index),
181
            ('inventories',
182
                self._get_external_refs(self.inventory_index),
183
                self._pack_collection.inventory_index.combined_index),
184
            ]:
185
            missing = external_refs.difference(
186
                k for (idx, k, v, r) in
187
                index.iter_entries(external_refs))
188
            if missing:
189
                missing_items[index_name] = sorted(list(missing))
190
        if missing_items:
191
            from pprint import pformat
192
            raise errors.BzrCheckError(
193
                "Newly created pack file %r has delta references to "
194
                "items not in its repository:\n%s"
195
                % (self, pformat(missing_items)))
196
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.
197
    def file_name(self):
198
        """Get the file name for the pack on disk."""
199
        return self.name + '.pack'
200
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
201
    def get_revision_count(self):
202
        return self.revision_index.key_count()
203
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
204
    def index_name(self, index_type, name):
205
        """Get the disk name of an index type for pack name 'name'."""
206
        return name + Pack.index_definitions[index_type][0]
207
208
    def index_offset(self, index_type):
209
        """Get the position in a index_size array for a given index type."""
210
        return Pack.index_definitions[index_type][1]
211
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
212
    def inventory_index_name(self, name):
213
        """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.
214
        return self.index_name('inventory', name)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
215
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.
216
    def revision_index_name(self, name):
217
        """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.
218
        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.
219
220
    def signature_index_name(self, name):
221
        """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.
222
        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.
223
224
    def text_index_name(self, name):
225
        """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.
226
        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.
227
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
228
    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).
229
        unlimited_cache = False
230
        if index_type == 'chk':
231
            unlimited_cache = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
232
        setattr(self, index_type + '_index',
233
            self.index_class(self.index_transport,
234
                self.index_name(index_type, self.name),
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
235
                self.index_sizes[self.index_offset(index_type)],
236
                unlimited_cache=unlimited_cache))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
237
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.
238
239
class ExistingPack(Pack):
2592.3.222 by Robert Collins
More review feedback.
240
    """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.
241
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.
242
    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.
243
        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.
244
        """Create an ExistingPack object.
245
246
        :param pack_transport: The transport where the pack file resides.
247
        :param name: The name of the pack on disk in the pack_transport.
248
        """
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
249
        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.
250
            signature_index, chk_index)
2592.3.173 by Robert Collins
Basic implementation of all_packs.
251
        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.
252
        self.pack_transport = pack_transport
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
253
        if None in (revision_index, inventory_index, text_index,
254
                signature_index, name, pack_transport):
255
            raise AssertionError()
2592.3.173 by Robert Collins
Basic implementation of all_packs.
256
257
    def __eq__(self, other):
258
        return self.__dict__ == other.__dict__
259
260
    def __ne__(self, other):
261
        return not self.__eq__(other)
262
263
    def __repr__(self):
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
264
        return "<%s.%s object at 0x%x, %s, %s" % (
265
            self.__class__.__module__, self.__class__.__name__, id(self),
266
            self.pack_transport, self.name)
267
268
269
class ResumedPack(ExistingPack):
270
271
    def __init__(self, name, revision_index, inventory_index, text_index,
272
        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
273
        pack_collection, chk_index=None):
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
274
        """Create a ResumedPack object."""
275
        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
276
            inventory_index, text_index, signature_index,
277
            chk_index=chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
278
        self.upload_transport = upload_transport
279
        self.index_transport = index_transport
280
        self.index_sizes = [None, None, None, None]
281
        indices = [
282
            ('revision', revision_index),
283
            ('inventory', inventory_index),
284
            ('text', text_index),
285
            ('signature', signature_index),
286
            ]
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
287
        if chk_index is not None:
288
            indices.append(('chk', chk_index))
289
            self.index_sizes.append(None)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
290
        for index_type, index in indices:
291
            offset = self.index_offset(index_type)
292
            self.index_sizes[offset] = index._size
293
        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.
294
        self._pack_collection = pack_collection
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
295
        self._state = 'resumed'
296
        # XXX: perhaps check that the .pack file exists?
297
298
    def access_tuple(self):
299
        if self._state == 'finished':
300
            return Pack.access_tuple(self)
301
        elif self._state == 'resumed':
302
            return self.upload_transport, self.file_name()
303
        else:
304
            raise AssertionError(self._state)
305
306
    def abort(self):
307
        self.upload_transport.delete(self.file_name())
308
        indices = [self.revision_index, self.inventory_index, self.text_index,
309
            self.signature_index]
4343.3.7 by John Arbash Meinel
Update the suspend/resume/commit/abort_write_group tests for CHK1.
310
        if self.chk_index is not None:
311
            indices.append(self.chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
312
        for index in indices:
313
            index._transport.delete(index._name)
314
315
    def finish(self):
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
316
        self._check_references()
4343.3.7 by John Arbash Meinel
Update the suspend/resume/commit/abort_write_group tests for CHK1.
317
        index_types = ['revision', 'inventory', 'text', 'signature']
318
        if self.chk_index is not None:
319
            index_types.append('chk')
320
        for index_type in index_types:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
321
            old_name = self.index_name(index_type, self.name)
322
            new_name = '../indices/' + old_name
323
            self.upload_transport.rename(old_name, new_name)
324
            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.
325
        new_name = '../packs/' + self.file_name()
326
        self.upload_transport.rename(self.file_name(), new_name)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
327
        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.
328
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
329
    def _get_external_refs(self, index):
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
330
        """Return compression parents for this index that are not present.
331
332
        This returns any compression parents that are referenced by this index,
333
        which are not contained *in* this index. They may be present elsewhere.
334
        """
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
335
        return index.external_references(1)
336
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.
337
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.
338
class NewPack(Pack):
339
    """An in memory proxy for a pack which is being created."""
340
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
341
    def __init__(self, pack_collection, upload_suffix='', file_mode=None):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
342
        """Create a NewPack instance.
343
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
344
        :param pack_collection: A PackCollection into which this is being inserted.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
345
        :param upload_suffix: An optional suffix to be given to any temporary
346
            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
347
        :param file_mode: Unix permissions for newly created file.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
348
        """
2592.3.228 by Martin Pool
docstrings and error messages from review
349
        # The relative locations of the packs are constrained, but all are
350
        # passed in because the caller has them, so as to avoid object churn.
3735.13.3 by John Arbash Meinel
Quick typo fix.
351
        index_builder_class = pack_collection._index_builder_class
3735.12.1 by John Arbash Meinel
Merge bzr.dev into brisbane-core and resolve conflicts.
352
        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.
353
            chk_index = index_builder_class(reference_lists=0)
354
        else:
355
            chk_index = None
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
356
        Pack.__init__(self,
357
            # Revisions: parents list, no text compression.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
358
            index_builder_class(reference_lists=1),
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
359
            # Inventory: We want to map compression only, but currently the
360
            # knit code hasn't been updated enough to understand that, so we
361
            # have a regular 2-list index giving parents and compression
362
            # source.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
363
            index_builder_class(reference_lists=2),
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
364
            # Texts: compression and per file graph, for all fileids - so two
365
            # reference lists and two elements in the key tuple.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
366
            index_builder_class(reference_lists=2, key_elements=2),
2592.3.197 by Robert Collins
Hand over signature index creation to NewPack.
367
            # Signatures: Just blobs to store, no compression, no parents
368
            # listing.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
369
            index_builder_class(reference_lists=0),
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
370
            # CHK based storage - just blobs, no compression or parents.
371
            chk_index=chk_index
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
372
            )
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
373
        self._pack_collection = pack_collection
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
374
        # 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
375
        self.index_class = pack_collection._index_class
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
376
        # 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
377
        self.upload_transport = pack_collection._upload_transport
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
378
        # where are indices written out to
3830.3.1 by Martin Pool
NewPack should be constructed from the PackCollection, rather than attributes of it
379
        self.index_transport = pack_collection._index_transport
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
380
        # 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
381
        self.pack_transport = pack_collection._pack_transport
3010.1.11 by Robert Collins
Provide file modes to files created by pack repositories
382
        # What file mode to upload the pack and indices with.
383
        self._file_mode = file_mode
2592.3.193 by Robert Collins
Move hash tracking of new packs into NewPack.
384
        # tracks the content written to the .pack file.
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
385
        self._hash = osutils.md5()
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
386
        # a tuple with the length in bytes of the indices, once the pack
387
        # is finalised. (rev, inv, text, sigs, chk_if_in_use)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
388
        self.index_sizes = None
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
389
        # How much data to cache when writing packs. Note that this is not
2592.3.222 by Robert Collins
More review feedback.
390
        # 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.
391
        # is not safe unless the client knows it won't be reading from the pack
392
        # under creation.
393
        self._cache_limit = 0
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
394
        # the temporary pack file name.
2929.3.5 by Vincent Ladeuil
New files, same warnings, same fixes.
395
        self.random_name = osutils.rand_chars(20) + upload_suffix
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
396
        # when was this pack started ?
397
        self.start_time = time.time()
2592.3.202 by Robert Collins
Move write stream management into NewPack.
398
        # open an output stream for the data added to the pack.
399
        self.write_stream = self.upload_transport.open_write_stream(
3010.1.11 by Robert Collins
Provide file modes to files created by pack repositories
400
            self.random_name, mode=self._file_mode)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
401
        if 'pack' in debug.debug_flags:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
402
            mutter('%s: create_pack: pack stream open: %s%s t+%6.3fs',
403
                time.ctime(), self.upload_transport.base, self.random_name,
404
                time.time() - self.start_time)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
405
        # A list of byte sequences to be written to the new pack, and the
406
        # aggregate size of them.  Stored as a list rather than separate
2592.3.233 by Martin Pool
Review cleanups
407
        # 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.
408
        self._buffer = [[], 0]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
409
        # create a callable for adding data
2592.3.233 by Martin Pool
Review cleanups
410
        #
411
        # robertc says- this is a closure rather than a method on the object
412
        # so that the variables are locals, and faster than accessing object
413
        # members.
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
414
        def _write_data(bytes, flush=False, _buffer=self._buffer,
415
            _write=self.write_stream.write, _update=self._hash.update):
416
            _buffer[0].append(bytes)
417
            _buffer[1] += len(bytes)
2592.3.222 by Robert Collins
More review feedback.
418
            # buffer cap
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
419
            if _buffer[1] > self._cache_limit or flush:
420
                bytes = ''.join(_buffer[0])
421
                _write(bytes)
422
                _update(bytes)
423
                _buffer[:] = [[], 0]
2592.3.202 by Robert Collins
Move write stream management into NewPack.
424
        # expose this on self, for the occasion when clients want to add data.
425
        self._write_data = _write_data
2592.3.205 by Robert Collins
Move the pack ContainerWriter instance into NewPack.
426
        # a pack writer object to serialise pack records.
427
        self._writer = pack.ContainerWriter(self._write_data)
428
        self._writer.begin()
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
429
        # what state is the pack in? (open, finished, aborted)
430
        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.
431
        # no name until we finish writing the content
432
        self.name = None
2592.3.202 by Robert Collins
Move write stream management into NewPack.
433
434
    def abort(self):
435
        """Cancel creating this pack."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
436
        self._state = 'aborted'
2938.1.1 by Robert Collins
trivial fix for packs@win32: explicitly close file before deleting
437
        self.write_stream.close()
2592.3.202 by Robert Collins
Move write stream management into NewPack.
438
        # Remove the temporary pack file.
439
        self.upload_transport.delete(self.random_name)
440
        # The indices have no state on disk.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
441
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
442
    def access_tuple(self):
443
        """Return a tuple (transport, name) for the pack content."""
444
        if self._state == 'finished':
445
            return Pack.access_tuple(self)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
446
        elif self._state == 'open':
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
447
            return self.upload_transport, self.random_name
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
448
        else:
449
            raise AssertionError(self._state)
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
450
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
451
    def data_inserted(self):
452
        """True if data has been added to this pack."""
2592.3.233 by Martin Pool
Review cleanups
453
        return bool(self.get_revision_count() or
454
            self.inventory_index.key_count() or
455
            self.text_index.key_count() or
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
456
            self.signature_index.key_count() or
457
            (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.
458
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.
459
    def finish_content(self):
460
        if self.name is not None:
461
            return
462
        self._writer.end()
463
        if self._buffer[1]:
464
            self._write_data('', flush=True)
465
        self.name = self._hash.hexdigest()
466
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
467
    def finish(self, suspend=False):
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
468
        """Finish the new pack.
469
470
        This:
471
         - finalises the content
472
         - assigns a name (the md5 of the content, currently)
473
         - writes out the associated indices
474
         - renames the pack into place.
475
         - stores the index size tuple for the pack in the index_sizes
476
           attribute.
477
        """
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.
478
        self.finish_content()
4002.1.11 by Andrew Bennetts
Fix latest test.
479
        if not suspend:
480
            self._check_references()
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
481
        # write indices
2592.3.233 by Martin Pool
Review cleanups
482
        # XXX: It'd be better to write them all to temporary names, then
483
        # rename them all into place, so that the window when only some are
484
        # visible is smaller.  On the other hand none will be seen until
485
        # they're in the names list.
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
486
        self.index_sizes = [None, None, None, None]
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
487
        self._write_index('revision', self.revision_index, 'revision', suspend)
488
        self._write_index('inventory', self.inventory_index, 'inventory',
489
            suspend)
490
        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.
491
        self._write_index('signature', self.signature_index,
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
492
            'revision signatures', suspend)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
493
        if self.chk_index is not None:
494
            self.index_sizes.append(None)
495
            self._write_index('chk', self.chk_index,
3735.2.98 by John Arbash Meinel
Merge bzr.dev 4032. Resolve the new streaming fetch.
496
                'content hash bytes', suspend)
2592.3.202 by Robert Collins
Move write stream management into NewPack.
497
        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.
498
        # Note that this will clobber an existing pack with the same name,
499
        # without checking for hash collisions. While this is undesirable this
500
        # is something that can be rectified in a subsequent release. One way
501
        # to rectify it may be to leave the pack at the original name, writing
502
        # its pack-names entry as something like 'HASH: index-sizes
503
        # temporary-name'. Allocate that and check for collisions, if it is
504
        # collision free then rename it into place. If clients know this scheme
505
        # they can handle missing-file errors by:
506
        #  - try for HASH.pack
507
        #  - try for temporary-name
508
        #  - 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.
509
        new_name = self.name + '.pack'
510
        if not suspend:
511
            new_name = '../packs/' + new_name
512
        self.upload_transport.rename(self.random_name, new_name)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
513
        self._state = 'finished'
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
514
        if 'pack' in debug.debug_flags:
2592.3.219 by Robert Collins
Review feedback.
515
            # XXX: size might be interesting?
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
516
            mutter('%s: create_pack: pack finished: %s%s->%s t+%6.3fs',
2592.3.219 by Robert Collins
Review feedback.
517
                time.ctime(), self.upload_transport.base, self.random_name,
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
518
                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.
519
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
520
    def flush(self):
521
        """Flush any current data."""
522
        if self._buffer[1]:
523
            bytes = ''.join(self._buffer[0])
524
            self.write_stream.write(bytes)
525
            self._hash.update(bytes)
526
            self._buffer[:] = [[], 0]
527
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
528
    def _get_external_refs(self, index):
529
        return index._external_references()
530
2592.3.203 by Robert Collins
Teach NewPack how to buffer for pack operations.
531
    def set_write_cache_size(self, size):
532
        self._cache_limit = size
533
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
534
    def _write_index(self, index_type, index, label, suspend=False):
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
535
        """Write out an index.
536
2592.3.222 by Robert Collins
More review feedback.
537
        :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.
538
        :param index: The index object to serialise.
539
        :param label: What label to give the index e.g. 'revision'.
540
        """
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.
541
        index_name = self.index_name(index_type, self.name)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
542
        if suspend:
543
            transport = self.upload_transport
544
        else:
545
            transport = self.index_transport
546
        self.index_sizes[self.index_offset(index_type)] = transport.put_file(
547
            index_name, index.finish(), mode=self._file_mode)
2592.3.234 by Martin Pool
Use -Dpack not -Dfetch for pack traces
548
        if 'pack' in debug.debug_flags:
2592.3.196 by Robert Collins
Move some text index logic to NewPack.
549
            # XXX: size might be interesting?
550
            mutter('%s: create_pack: wrote %s index: %s%s t+%6.3fs',
551
                time.ctime(), label, self.upload_transport.base,
552
                self.random_name, time.time() - self.start_time)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
553
        # Replace the writable index on this object with a readonly,
2592.3.233 by Martin Pool
Review cleanups
554
        # presently unloaded index. We should alter
555
        # 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.
556
        # subsequently used. RBC
2592.3.233 by Martin Pool
Review cleanups
557
        self._replace_index_with_readonly(index_type)
2592.3.195 by Robert Collins
Move some inventory index logic to NewPack.
558
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.
559
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
560
class AggregateIndex(object):
561
    """An aggregated index for the RepositoryPackCollection.
562
563
    AggregateIndex is reponsible for managing the PackAccess object,
564
    Index-To-Pack mapping, and all indices list for a specific type of index
565
    such as 'revision index'.
2592.3.228 by Martin Pool
docstrings and error messages from review
566
567
    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
568
    from several on-disk indices.  The AggregateIndex builds on this
2592.3.228 by Martin Pool
docstrings and error messages from review
569
    to provide a knit access layer, and allows having up to one writable
570
    index within the collection.
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
571
    """
2592.3.235 by Martin Pool
Review cleanups
572
    # XXX: Probably 'can be written to' could/should be separated from 'acts
573
    # like a knit index' -- mbp 20071024
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
574
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
575
    def __init__(self, reload_func=None, flush_func=None):
3789.1.3 by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count().
576
        """Create an AggregateIndex.
577
578
        :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.
579
            index. Should have the form reload_func() => True if the list of
580
            active pack files has changed.
3789.1.3 by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count().
581
        """
582
        self._reload_func = reload_func
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
583
        self.index_to_pack = {}
3789.1.3 by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count().
584
        self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
3789.2.14 by John Arbash Meinel
Update AggregateIndex to pass the reload_func into _DirectPackAccess
585
        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.
586
                                             reload_func=reload_func,
587
                                             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.
588
        self.add_callback = None
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
589
590
    def replace_indices(self, index_to_pack, indices):
591
        """Replace the current mappings with fresh ones.
592
593
        This should probably not be used eventually, rather incremental add and
594
        removal of indices. It has been added during refactoring of existing
595
        code.
596
597
        :param index_to_pack: A mapping from index objects to
598
            (transport, name) tuples for the pack file data.
599
        :param indices: A list of indices.
600
        """
601
        # refresh the revision pack map dict without replacing the instance.
602
        self.index_to_pack.clear()
603
        self.index_to_pack.update(index_to_pack)
604
        # XXX: API break - clearly a 'replace' method would be good?
605
        self.combined_index._indices[:] = indices
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
606
        # the current add nodes callback for the current writable index if
607
        # there is one.
608
        self.add_callback = None
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
609
610
    def add_index(self, index, pack):
611
        """Add index to the aggregate, which is an index for Pack pack.
2592.3.226 by Martin Pool
formatting and docstrings
612
613
        Future searches on the aggregate index will seach this new index
614
        before all previously inserted indices.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
615
2592.3.226 by Martin Pool
formatting and docstrings
616
        :param index: An Index for the pack.
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
617
        :param pack: A Pack instance.
618
        """
619
        # expose it to the index map
620
        self.index_to_pack[index] = pack.access_tuple()
621
        # put it at the front of the linear index list
622
        self.combined_index.insert_index(0, index)
623
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
624
    def add_writable_index(self, index, pack):
625
        """Add an index which is able to have data added to it.
2592.3.235 by Martin Pool
Review cleanups
626
627
        There can be at most one writable index at any time.  Any
628
        modifications made to the knit are put into this index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
629
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
630
        :param index: An index from the pack parameter.
631
        :param pack: A Pack instance.
632
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
633
        if self.add_callback is not None:
634
            raise AssertionError(
635
                "%s already has a writable index through %s" % \
636
                (self, self.add_callback))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
637
        # allow writing: queue writes to a new index
638
        self.add_index(index, pack)
639
        # 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.
640
        self.data_access.set_writer(pack._writer, index, pack.access_tuple())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
641
        self.add_callback = index.add_nodes
642
643
    def clear(self):
644
        """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.
645
        self.data_access.set_writer(None, None, (None, None))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
646
        self.index_to_pack.clear()
647
        del self.combined_index._indices[:]
648
        self.add_callback = None
649
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
650
    def remove_index(self, index):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
651
        """Remove index from the indices used to answer queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
652
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
653
        :param index: An index from the pack parameter.
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
4928.1.1 by Martin Pool
Give RepositoryPackCollection a repr
1426
    def __repr__(self):
1427
        return '%s(%r)' % (self.__class__.__name__, self.repo)
1428
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1429
    def add_pack_to_memory(self, pack):
1430
        """Make a Pack object available to the repository to satisfy queries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1431
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1432
        :param pack: A Pack object.
1433
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1434
        if pack.name in self._packs_by_name:
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1435
            raise AssertionError(
1436
                '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.
1437
        self.packs.append(pack)
1438
        self._packs_by_name[pack.name] = pack
1439
        self.revision_index.add_index(pack.revision_index, pack)
1440
        self.inventory_index.add_index(pack.inventory_index, pack)
1441
        self.text_index.add_index(pack.text_index, pack)
1442
        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.
1443
        if self.chk_index is not None:
1444
            self.chk_index.add_index(pack.chk_index, pack)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1445
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1446
    def all_packs(self):
1447
        """Return a list of all the Pack objects this repository has.
1448
1449
        Note that an in-progress pack being created is not returned.
1450
1451
        :return: A list of Pack objects for all the packs in the repository.
1452
        """
1453
        result = []
1454
        for name in self.names():
1455
            result.append(self.get_pack_by_name(name))
1456
        return result
1457
1458
    def autopack(self):
1459
        """Pack the pack collection incrementally.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1460
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1461
        This will not attempt global reorganisation or recompression,
1462
        rather it will just ensure that the total number of packs does
1463
        not grow without bound. It uses the _max_pack_count method to
1464
        determine if autopacking is needed, and the pack_distribution
1465
        method to determine the number of revisions in each pack.
1466
1467
        If autopacking takes place then the packs name collection will have
1468
        been flushed to disk - packing requires updating the name collection
1469
        in synchronisation with certain steps. Otherwise the names collection
1470
        is not flushed.
1471
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1472
        :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.
1473
        """
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1474
        while True:
1475
            try:
1476
                return self._do_autopack()
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1477
            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.
1478
                # If we get a RetryAutopack exception, we should abort the
1479
                # 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.
1480
                pass
1481
1482
    def _do_autopack(self):
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1483
        # 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.
1484
        total_revisions = self.revision_index.combined_index.key_count()
1485
        total_packs = len(self._names)
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1486
        if self._max_pack_count(total_revisions) >= total_packs:
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1487
            return None
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1488
        # determine which packs need changing
1489
        pack_distribution = self.pack_distribution(total_revisions)
1490
        existing_packs = []
1491
        for pack in self.all_packs():
1492
            revision_count = pack.get_revision_count()
1493
            if revision_count == 0:
1494
                # revision less packs are not generated by normal operation,
1495
                # only by operations like sign-my-commits, and thus will not
1496
                # tend to grow rapdily or without bound like commit containing
1497
                # packs do - leave them alone as packing them really should
1498
                # group their data with the relevant commit, and that may
1499
                # involve rewriting ancient history - which autopack tries to
1500
                # avoid. Alternatively we could not group the data but treat
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1501
                # 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.
1502
                # one revision for each to the total revision count, to get
1503
                # a matching distribution.
1504
                continue
1505
            existing_packs.append((revision_count, pack))
1506
        pack_operations = self.plan_autopack_combinations(
1507
            existing_packs, pack_distribution)
3824.2.3 by John Arbash Meinel
Reorder the packs list after determining what packs
1508
        num_new_packs = len(pack_operations)
1509
        num_old_packs = sum([len(po[1]) for po in pack_operations])
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1510
        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
1511
        mutter('Auto-packing repository %s, which has %d pack files, '
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1512
            '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
1513
            ' revisions', self, total_packs, total_revisions, num_old_packs,
3824.2.5 by Andrew Bennetts
Minor tweaks to comments etc.
1514
            num_new_packs, num_revs_affected)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1515
        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.
1516
                                      reload_func=self._restart_autopack)
3735.2.37 by Robert Collins
Better autopack cleanup.
1517
        mutter('Auto-packing repository %s completed', self)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1518
        return result
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
1519
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
1520
    def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1521
                                 reload_func=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1522
        """Execute a series of pack operations.
1523
1524
        :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
1525
        :param _packer_class: The class of packer to use (default: Packer).
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1526
        :return: The new pack names.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1527
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1528
        for revision_count, packs in pack_operations:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1529
            # 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.
1530
            if len(packs) == 0:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1531
                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.
1532
            packer = _packer_class(self, packs, '.autopack',
1533
                                   reload_func=reload_func)
1534
            try:
1535
                packer.pack()
1536
            except errors.RetryWithNewPacks:
1537
                # An exception is propagating out of this context, make sure
3789.2.23 by John Arbash Meinel
Clarify the comment.
1538
                # this packer has cleaned up. Packer() doesn't set its new_pack
1539
                # state into the RepositoryPackCollection object, so we only
1540
                # 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.
1541
                if packer.new_pack is not None:
1542
                    packer.new_pack.abort()
1543
                raise
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1544
            for pack in packs:
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1545
                self._remove_pack_from_memory(pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1546
        # record the newly available packs and stop advertising the old
1547
        # packs
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1548
        to_be_obsoleted = []
1549
        for _, packs in pack_operations:
1550
            to_be_obsoleted.extend(packs)
1551
        result = self._save_pack_names(clear_obsolete_packs=True,
1552
                                       obsolete_packs=to_be_obsoleted)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1553
        return result
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1554
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
1555
    def _flush_new_pack(self):
1556
        if self._new_pack is not None:
1557
            self._new_pack.flush()
1558
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1559
    def lock_names(self):
1560
        """Acquire the mutex around the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1561
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1562
        This cannot be used in the middle of a read-only transaction on the
1563
        repository.
1564
        """
1565
        self.repo.control_files.lock_write()
1566
3735.2.150 by Ian Clatworthy
always repack gc repositories for now, even if only one pack there
1567
    def _already_packed(self):
1568
        """Is the collection already packed?"""
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1569
        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
1570
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1571
    def pack(self, hint=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1572
        """Pack the pack collection totally."""
1573
        self.ensure_loaded()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1574
        total_packs = len(self._names)
3735.2.150 by Ian Clatworthy
always repack gc repositories for now, even if only one pack there
1575
        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.
1576
            return
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1577
        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.
1578
        # XXX: the following may want to be a class, to pack with a given
1579
        # policy.
1580
        mutter('Packing repository %s, which has %d pack files, '
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1581
            'containing %d revisions with hint %r.', self, total_packs,
1582
            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.
1583
        # determine which packs need changing
1584
        pack_operations = [[0, []]]
1585
        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=[]).
1586
            if hint is None or pack.name in hint:
4476.3.80 by Andrew Bennetts
Comment/docstring tweaks prompted by review.
1587
                # Either no hint was provided (so we are packing everything),
1588
                # or this pack was included in the hint.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1589
                pack_operations[-1][0] += pack.get_revision_count()
1590
                pack_operations[-1][1].append(pack)
3070.1.1 by Robert Collins
* ``bzr pack`` now orders revision texts in topological order, with newest
1591
        self._execute_pack_operations(pack_operations, OptimisingPacker)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1592
1593
    def plan_autopack_combinations(self, existing_packs, pack_distribution):
2592.3.176 by Robert Collins
Various pack refactorings.
1594
        """Plan a pack operation.
1595
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1596
        :param existing_packs: The packs to pack. (A list of (revcount, Pack)
1597
            tuples).
2592.3.235 by Martin Pool
Review cleanups
1598
        :param pack_distribution: A list with the number of revisions desired
2592.3.176 by Robert Collins
Various pack refactorings.
1599
            in each pack.
1600
        """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1601
        if len(existing_packs) <= len(pack_distribution):
1602
            return []
1603
        existing_packs.sort(reverse=True)
1604
        pack_operations = [[0, []]]
1605
        # plan out what packs to keep, and what to reorganise
1606
        while len(existing_packs):
1607
            # 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,
1608
            # distribution chart we will include its contents in the new pack
1609
            # 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.
1610
            # distribution chart
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1611
            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.
1612
            if next_pack_rev_count >= pack_distribution[0]:
1613
                # this is already packed 'better' than this, so we can
1614
                # not waste time packing it.
1615
                while next_pack_rev_count > 0:
1616
                    next_pack_rev_count -= pack_distribution[0]
1617
                    if next_pack_rev_count >= 0:
1618
                        # more to go
1619
                        del pack_distribution[0]
1620
                    else:
1621
                        # didn't use that entire bucket up
1622
                        pack_distribution[0] = -next_pack_rev_count
1623
            else:
1624
                # add the revisions we're going to add to the next output pack
1625
                pack_operations[-1][0] += next_pack_rev_count
1626
                # 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.
1627
                pack_operations[-1][1].append(next_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1628
                if pack_operations[-1][0] >= pack_distribution[0]:
1629
                    # this pack is used up, shift left.
1630
                    del pack_distribution[0]
1631
                    pack_operations.append([0, []])
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1632
        # Now that we know which pack files we want to move, shove them all
1633
        # into a single pack file.
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1634
        final_rev_count = 0
1635
        final_pack_list = []
1636
        for num_revs, pack_files in pack_operations:
1637
            final_rev_count += num_revs
1638
            final_pack_list.extend(pack_files)
1639
        if len(final_pack_list) == 1:
1640
            raise AssertionError('We somehow generated an autopack with a'
3711.4.3 by John Arbash Meinel
Small cleanups from Robert
1641
                ' single pack file being moved.')
3711.4.2 by John Arbash Meinel
Change the logic to solve it in a different way.
1642
            return []
1643
        return [[final_rev_count, final_pack_list]]
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1644
1645
    def ensure_loaded(self):
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1646
        """Ensure we have read names from disk.
1647
1648
        :return: True if the disk names had not been previously read.
1649
        """
2592.3.214 by Robert Collins
Merge bzr.dev.
1650
        # NB: if you see an assertion error here, its probably access against
1651
        # an unlocked repo. Naughty.
3052.1.6 by John Arbash Meinel
Change the lock check to raise ObjectNotLocked.
1652
        if not self.repo.is_locked():
1653
            raise errors.ObjectNotLocked(self.repo)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1654
        if self._names is None:
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1655
            self._names = {}
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 = set()
1657
            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.
1658
                name = key[0]
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1659
                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.
1660
                self._packs_at_load.add((key, value))
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1661
            result = True
1662
        else:
1663
            result = False
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1664
        # populate all the metadata.
1665
        self.all_packs()
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
1666
        return result
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1667
1668
    def _parse_index_sizes(self, value):
1669
        """Parse a string of index sizes."""
1670
        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.
1671
2592.3.176 by Robert Collins
Various pack refactorings.
1672
    def get_pack_by_name(self, name):
1673
        """Get a Pack object by name.
1674
1675
        :param name: The name of the pack - e.g. '123456'
1676
        :return: A Pack object.
1677
        """
1678
        try:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1679
            return self._packs_by_name[name]
2592.3.176 by Robert Collins
Various pack refactorings.
1680
        except KeyError:
1681
            rev_index = self._make_index(name, '.rix')
1682
            inv_index = self._make_index(name, '.iix')
1683
            txt_index = self._make_index(name, '.tix')
1684
            sig_index = self._make_index(name, '.six')
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1685
            if self.chk_index is not None:
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1686
                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.
1687
            else:
1688
                chk_index = None
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1689
            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.
1690
                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.
1691
            self.add_pack_to_memory(result)
2592.3.176 by Robert Collins
Various pack refactorings.
1692
            return result
1693
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1694
    def _resume_pack(self, name):
1695
        """Get a suspended Pack object by name.
1696
1697
        :param name: The name of the pack - e.g. '123456'
1698
        :return: A Pack object.
1699
        """
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
        if not re.match('[a-f0-9]{32}', name):
1701
            # Tokens should be md5sums of the suspended pack file, i.e. 32 hex
1702
            # digits.
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1703
            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.
1704
                self.repo, [name], 'Malformed write group token')
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1705
        try:
1706
            rev_index = self._make_index(name, '.rix', resume=True)
1707
            inv_index = self._make_index(name, '.iix', resume=True)
1708
            txt_index = self._make_index(name, '.tix', resume=True)
1709
            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
1710
            if self.chk_index is not None:
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1711
                chk_index = self._make_index(name, '.cix', resume=True,
1712
                                             unlimited_cache=True)
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
1713
            else:
1714
                chk_index = None
1715
            result = self.resumed_pack_factory(name, rev_index, inv_index,
1716
                txt_index, sig_index, self._upload_transport,
1717
                self._pack_transport, self._index_transport, self,
1718
                chk_index=chk_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1719
        except errors.NoSuchFile, e:
4002.1.7 by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup.
1720
            raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1721
        self.add_pack_to_memory(result)
1722
        self._resumed_packs.append(result)
1723
        return result
1724
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1725
    def allocate(self, a_new_pack):
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1726
        """Allocate name in the list of packs.
1727
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1728
        :param a_new_pack: A NewPack instance to be added to the collection of
1729
            packs for this repository.
2592.3.118 by Robert Collins
Record the size of the index files in the pack-names index.
1730
        """
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
1731
        self.ensure_loaded()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1732
        if a_new_pack.name in self._names:
2951.2.7 by Robert Collins
Raise an error on duplicate pack name allocation.
1733
            raise errors.BzrError(
1734
                '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.
1735
        self._names[a_new_pack.name] = tuple(a_new_pack.index_sizes)
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
1736
        self.add_pack_to_memory(a_new_pack)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1737
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1738
    def _iter_disk_pack_index(self):
1739
        """Iterate over the contents of the pack-names index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1740
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1741
        This is used when loading the list from disk, and before writing to
1742
        detect updates from others during our write operation.
1743
        :return: An iterator of the index contents.
1744
        """
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
1745
        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.
1746
                ).iter_all_entries()
1747
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1748
    def _make_index(self, name, suffix, resume=False, unlimited_cache=False):
2592.3.176 by Robert Collins
Various pack refactorings.
1749
        size_offset = self._suffix_offsets[suffix]
1750
        index_name = name + suffix
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
1751
        if resume:
1752
            transport = self._upload_transport
1753
            index_size = transport.stat(index_name).st_size
1754
        else:
1755
            transport = self._index_transport
1756
            index_size = self._names[name][size_offset]
4634.71.1 by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True).
1757
        return self._index_class(transport, index_name, index_size,
1758
                                 unlimited_cache=unlimited_cache)
2592.5.5 by Martin Pool
Make RepositoryPackCollection remember the index transport, and responsible for getting a map of indexes
1759
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1760
    def _max_pack_count(self, total_revisions):
1761
        """Return the maximum number of packs to use for total revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1762
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1763
        :param total_revisions: The total number of revisions in the
1764
            repository.
1765
        """
1766
        if not total_revisions:
1767
            return 1
1768
        digits = str(total_revisions)
1769
        result = 0
1770
        for digit in digits:
1771
            result += int(digit)
1772
        return result
1773
1774
    def names(self):
1775
        """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.
1776
        return sorted(self._names.keys())
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1777
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1778
    def _obsolete_packs(self, packs):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1779
        """Move a number of packs which have been obsoleted out of the way.
1780
1781
        Each pack and its associated indices are moved out of the way.
1782
1783
        Note: for correctness this function should only be called after a new
1784
        pack names index has been written without these pack names, and with
1785
        the names of packs that contain the data previously available via these
1786
        packs.
1787
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1788
        :param packs: The packs to obsolete.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1789
        :param return: None.
1790
        """
2592.3.187 by Robert Collins
Finish cleaning up the packing logic to take Pack objects - all tests pass.
1791
        for pack in packs:
4634.127.2 by John Arbash Meinel
Change the _obsolete_packs code to handle files that are already gone.
1792
            try:
1793
                pack.pack_transport.rename(pack.file_name(),
1794
                    '../obsolete_packs/' + pack.file_name())
1795
            except (errors.PathError, errors.TransportError), e:
1796
                # TODO: Should these be warnings or mutters?
4634.127.7 by John Arbash Meinel
downgrade the rename warnings to mutters.
1797
                mutter("couldn't rename obsolete pack, skipping it:\n%s"
1798
                       % (e,))
2592.3.226 by Martin Pool
formatting and docstrings
1799
            # TODO: Probably needs to know all possible indices for this pack
1800
            # - or maybe list the directory and move all indices matching this
2592.5.13 by Martin Pool
Clean up duplicate index_transport variables
1801
            # name whether we recognize it or not?
3735.11.14 by John Arbash Meinel
obsolete the .cix index along with the rest.
1802
            suffixes = ['.iix', '.six', '.tix', '.rix']
1803
            if self.chk_index is not None:
1804
                suffixes.append('.cix')
1805
            for suffix in suffixes:
4634.127.2 by John Arbash Meinel
Change the _obsolete_packs code to handle files that are already gone.
1806
                try:
1807
                    self._index_transport.rename(pack.name + suffix,
1808
                        '../obsolete_packs/' + pack.name + suffix)
1809
                except (errors.PathError, errors.TransportError), e:
4634.127.7 by John Arbash Meinel
downgrade the rename warnings to mutters.
1810
                    mutter("couldn't rename obsolete index, skipping it:\n%s"
1811
                           % (e,))
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1812
1813
    def pack_distribution(self, total_revisions):
1814
        """Generate a list of the number of revisions to put in each pack.
1815
1816
        :param total_revisions: The total number of revisions in the
1817
            repository.
1818
        """
1819
        if total_revisions == 0:
1820
            return [0]
1821
        digits = reversed(str(total_revisions))
1822
        result = []
1823
        for exponent, count in enumerate(digits):
1824
            size = 10 ** exponent
1825
            for pos in range(int(count)):
1826
                result.append(size)
1827
        return list(reversed(result))
1828
2592.5.12 by Martin Pool
Move pack_transport and pack_name onto RepositoryPackCollection
1829
    def _pack_tuple(self, name):
1830
        """Return a tuple with the transport and file name for a pack name."""
1831
        return self._pack_transport, name + '.pack'
1832
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1833
    def _remove_pack_from_memory(self, pack):
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1834
        """Remove pack from the packs accessed by this repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1835
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1836
        Only affects memory state, until self._save_pack_names() is invoked.
1837
        """
1838
        self._names.pop(pack.name)
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1839
        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.
1840
        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.
1841
        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.
1842
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
1843
    def _remove_pack_indices(self, pack, ignore_missing=False):
1844
        """Remove the indices for pack from the aggregated indices.
1845
        
1846
        :param ignore_missing: Suppress KeyErrors from calling remove_index.
1847
        """
1848
        for index_type in Pack.index_definitions.keys():
1849
            attr_name = index_type + '_index'
1850
            aggregate_index = getattr(self, attr_name)
1851
            if aggregate_index is not None:
1852
                pack_index = getattr(pack, attr_name)
1853
                try:
1854
                    aggregate_index.remove_index(pack_index)
1855
                except KeyError:
1856
                    if ignore_missing:
1857
                        continue
1858
                    raise
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1859
1860
    def reset(self):
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1861
        """Clear all cached data."""
1862
        # cached revision data
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1863
        self.revision_index.clear()
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1864
        # cached signature data
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
1865
        self.signature_index.clear()
2592.3.212 by Robert Collins
Cleanup text index management in packs.
1866
        # cached file text data
1867
        self.text_index.clear()
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
1868
        # cached inventory data
1869
        self.inventory_index.clear()
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
1870
        # cached chk data
1871
        if self.chk_index is not None:
1872
            self.chk_index.clear()
2592.3.192 by Robert Collins
Move new revision index management to NewPack.
1873
        # remove the open pack
1874
        self._new_pack = None
2592.3.190 by Robert Collins
Move flush and reset operations to the pack collection rather than the thunk layers.
1875
        # information about packs.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1876
        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.
1877
        self.packs = []
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
1878
        self._packs_by_name = {}
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1879
        self._packs_at_load = None
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1880
2592.3.237 by Martin Pool
Rename RepositoryPackCollection.release_names to _unlock_names
1881
    def _unlock_names(self):
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
1882
        """Release the mutex around the pack-names index."""
1883
        self.repo.control_files.unlock()
1884
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1885
    def _diff_pack_names(self):
1886
        """Read the pack names from disk, and compare it to the one in memory.
1887
1888
        :return: (disk_nodes, deleted_nodes, new_nodes)
1889
            disk_nodes    The final set of nodes that should be referenced
1890
            deleted_nodes Nodes which have been removed from when we started
1891
            new_nodes     Nodes that are newly introduced
1892
        """
1893
        # load the disk nodes across
1894
        disk_nodes = set()
1895
        for index, key, value in self._iter_disk_pack_index():
1896
            disk_nodes.add((key, value))
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1897
        orig_disk_nodes = set(disk_nodes)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1898
1899
        # do a two-way diff against our original content
1900
        current_nodes = set()
1901
        for name, sizes in self._names.iteritems():
1902
            current_nodes.add(
1903
                ((name, ), ' '.join(str(size) for size in sizes)))
1904
1905
        # Packs no longer present in the repository, which were present when we
1906
        # locked the repository
1907
        deleted_nodes = self._packs_at_load - current_nodes
1908
        # Packs which this process is adding
1909
        new_nodes = current_nodes - self._packs_at_load
1910
1911
        # Update the disk_nodes set to include the ones we are adding, and
1912
        # remove the ones which were removed by someone else
1913
        disk_nodes.difference_update(deleted_nodes)
1914
        disk_nodes.update(new_nodes)
1915
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1916
        return disk_nodes, deleted_nodes, new_nodes, orig_disk_nodes
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1917
1918
    def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1919
        """Given the correct set of pack files, update our saved info.
1920
1921
        :return: (removed, added, modified)
1922
            removed     pack names removed from self._names
1923
            added       pack names added to self._names
1924
            modified    pack names that had changed value
1925
        """
1926
        removed = []
1927
        added = []
1928
        modified = []
1929
        ## self._packs_at_load = disk_nodes
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1930
        new_names = dict(disk_nodes)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1931
        # drop no longer present nodes
1932
        for pack in self.all_packs():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1933
            if (pack.name,) not in new_names:
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1934
                removed.append(pack.name)
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1935
                self._remove_pack_from_memory(pack)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1936
        # add new nodes/refresh existing ones
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1937
        for key, value in disk_nodes:
1938
            name = key[0]
1939
            sizes = self._parse_index_sizes(value)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1940
            if name in self._names:
1941
                # existing
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1942
                if sizes != self._names[name]:
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1943
                    # the pack for name has had its indices replaced - rare but
1944
                    # important to handle. XXX: probably can never happen today
1945
                    # because the three-way merge code above does not handle it
1946
                    # - you may end up adding the same key twice to the new
1947
                    # disk index because the set values are the same, unless
1948
                    # the only index shows up as deleted by the set difference
1949
                    # - which it may. Until there is a specific test for this,
1950
                    # assume its broken. RBC 20071017.
2592.3.236 by Martin Pool
Make RepositoryPackCollection.remove_pack_from_memory private
1951
                    self._remove_pack_from_memory(self.get_pack_by_name(name))
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1952
                    self._names[name] = sizes
1953
                    self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1954
                    modified.append(name)
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1955
            else:
1956
                # new
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
1957
                self._names[name] = sizes
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
1958
                self.get_pack_by_name(name)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1959
                added.append(name)
1960
        return removed, added, modified
1961
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1962
    def _save_pack_names(self, clear_obsolete_packs=False, obsolete_packs=None):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1963
        """Save the list of packs.
1964
1965
        This will take out the mutex around the pack names list for the
1966
        duration of the method call. If concurrent updates have been made, a
1967
        three-way merge between the current list and the current in memory list
1968
        is performed.
1969
1970
        :param clear_obsolete_packs: If True, clear out the contents of the
1971
            obsolete_packs directory.
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1972
        :param obsolete_packs: Packs that are obsolete once the new pack-names
1973
            file has been written.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1974
        :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()
1975
        """
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1976
        already_obsolete = []
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1977
        self.lock_names()
1978
        try:
1979
            builder = self._index_builder_class()
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1980
            (disk_nodes, deleted_nodes, new_nodes,
1981
             orig_disk_nodes) = self._diff_pack_names()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1982
            # TODO: handle same-name, index-size-changes here -
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1983
            # e.g. use the value from disk, not ours, *unless* we're the one
1984
            # changing it.
1985
            for key, value in disk_nodes:
1986
                builder.add_node(key, value)
1987
            self.transport.put_file('pack-names', builder.finish(),
1988
                mode=self.repo.bzrdir._get_file_mode())
1989
            self._packs_at_load = disk_nodes
1990
            if clear_obsolete_packs:
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1991
                to_preserve = None
1992
                if obsolete_packs:
1993
                    to_preserve = set([o.name for o in obsolete_packs])
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
1994
                already_obsolete = self._clear_obsolete_packs(to_preserve)
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
1995
        finally:
1996
            self._unlock_names()
1997
        # synchronise the memory packs list with what we just wrote:
1998
        self._syncronize_pack_names_from_disk_nodes(disk_nodes)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
1999
        if obsolete_packs:
4634.127.6 by John Arbash Meinel
change tack. Always try to obsolete our current list.
2000
            # TODO: We could add one more condition here. "if o.name not in
2001
            #       orig_disk_nodes and o != the new_pack we haven't written to
2002
            #       disk yet. However, the new pack object is not easily
2003
            #       accessible here (it would have to be passed through the
2004
            #       autopacking code, etc.)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2005
            obsolete_packs = [o for o in obsolete_packs
4634.127.6 by John Arbash Meinel
change tack. Always try to obsolete our current list.
2006
                              if o.name not in already_obsolete]
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2007
            self._obsolete_packs(obsolete_packs)
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2008
        return [new_node[0][0] for new_node in new_nodes]
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2009
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
2010
    def reload_pack_names(self):
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2011
        """Sync our pack listing with what is present in the repository.
2012
2013
        This should be called when we find out that something we thought was
2014
        present is now missing. This happens when another process re-packs the
2015
        repository, etc.
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
2016
2017
        :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()
2018
        """
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.
2019
        # The ensure_loaded call is to handle the case where the first call
2020
        # made involving the collection was to reload_pack_names, where we 
2021
        # don't have a view of disk contents. Its a bit of a bandaid, and
2022
        # causes two reads of pack-names, but its a rare corner case not struck
2023
        # with regular push/pull etc.
4145.1.4 by Robert Collins
Prevent regression to overhead of lock_read on pack repositories.
2024
        first_read = self.ensure_loaded()
2025
        if first_read:
2026
            return True
3789.1.2 by John Arbash Meinel
Add RepositoryPackCollection.reload_pack_names()
2027
        # out the new value.
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2028
        (disk_nodes, deleted_nodes, new_nodes,
2029
         orig_disk_nodes) = self._diff_pack_names()
4634.126.1 by John Arbash Meinel
(jam) Fix bug #507566, concurrent autopacking correctness.
2030
        # _packs_at_load is meant to be the explicit list of names in
2031
        # 'pack-names' at then start. As such, it should not contain any
2032
        # pending names that haven't been written out yet.
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2033
        self._packs_at_load = orig_disk_nodes
3789.1.8 by John Arbash Meinel
Change the api of reload_pack_names().
2034
        (removed, added,
2035
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2036
        if removed or added or modified:
2037
            return True
2038
        return False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2039
3789.2.20 by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails.
2040
    def _restart_autopack(self):
2041
        """Reload the pack names list, and restart the autopack code."""
2042
        if not self.reload_pack_names():
2043
            # Re-raise the original exception, because something went missing
2044
            # and a restart didn't find it
2045
            raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2046
        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.
2047
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2048
    def _clear_obsolete_packs(self, preserve=None):
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2049
        """Delete everything from the obsolete-packs directory.
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2050
2051
        :return: A list of pack identifiers (the filename without '.pack') that
2052
            were found in obsolete_packs.
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2053
        """
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2054
        found = []
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2055
        obsolete_pack_transport = self.transport.clone('obsolete_packs')
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2056
        if preserve is None:
2057
            preserve = set()
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2058
        for filename in obsolete_pack_transport.list_dir('.'):
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2059
            name, ext = osutils.splitext(filename)
2060
            if ext == '.pack':
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2061
                found.append(name)
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2062
            if name in preserve:
2063
                continue
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2064
            try:
2065
                obsolete_pack_transport.delete(filename)
2066
            except (errors.PathError, errors.TransportError), e:
4634.127.1 by John Arbash Meinel
Partial fix for bug #507557.
2067
                warning("couldn't delete obsolete pack, skipping it:\n%s"
2068
                        % (e,))
4634.127.3 by John Arbash Meinel
Add code so we don't try to obsolete files someone else has 'claimed'.
2069
        return found
3446.2.1 by Martin Pool
Failure to delete an obsolete pack file should not be fatal.
2070
2592.3.202 by Robert Collins
Move write stream management into NewPack.
2071
    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.
2072
        # 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.
2073
        if not self.repo.is_write_locked():
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2074
            raise errors.NotWriteLocked(self)
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
2075
        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
2076
            file_mode=self.repo.bzrdir._get_file_mode())
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
2077
        # allow writing: queue writes to a new index
2078
        self.revision_index.add_writable_index(self._new_pack.revision_index,
2079
            self._new_pack)
2592.3.211 by Robert Collins
Pack inventory index management cleaned up.
2080
        self.inventory_index.add_writable_index(self._new_pack.inventory_index,
2081
            self._new_pack)
2592.3.212 by Robert Collins
Cleanup text index management in packs.
2082
        self.text_index.add_writable_index(self._new_pack.text_index,
2083
            self._new_pack)
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
2084
        self._new_pack.text_index.set_optimize(combine_backing_indices=False)
2592.3.210 by Robert Collins
Signature index management looking sane for packs.
2085
        self.signature_index.add_writable_index(self._new_pack.signature_index,
2086
            self._new_pack)
3735.2.6 by Robert Collins
Basic add-and-pack of CHK content from within a repository.
2087
        if self.chk_index is not None:
2088
            self.chk_index.add_writable_index(self._new_pack.chk_index,
2089
                self._new_pack)
2090
            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.
2091
            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.
2092
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.
2093
        self.repo.inventories._index._add_callback = self.inventory_index.add_callback
2094
        self.repo.revisions._index._add_callback = self.revision_index.add_callback
2095
        self.repo.signatures._index._add_callback = self.signature_index.add_callback
2096
        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
2097
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
2098
    def _abort_write_group(self):
2099
        # FIXME: just drop the transient index.
2100
        # 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)
2101
        if self._new_pack is not None:
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
2102
            operation = cleanup.OperationWithCleanups(self._new_pack.abort)
2103
            operation.add_cleanup(setattr, self, '_new_pack', None)
2104
            # If we aborted while in the middle of finishing the write
2105
            # group, _remove_pack_indices could fail because the indexes are
2106
            # already gone.  But they're not there we shouldn't fail in this
2107
            # case, so we pass ignore_missing=True.
2108
            operation.add_cleanup(self._remove_pack_indices, self._new_pack,
2109
                ignore_missing=True)
2110
            operation.run_simple()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2111
        for resumed_pack in self._resumed_packs:
4797.15.1 by Andrew Bennetts
Suppress KeyError from remove_index during _abort_write_group.
2112
            operation = cleanup.OperationWithCleanups(resumed_pack.abort)
2113
            # See comment in previous finally block.
2114
            operation.add_cleanup(self._remove_pack_indices, resumed_pack,
2115
                ignore_missing=True)
2116
            operation.run_simple()
4002.1.12 by Andrew Bennetts
Add another test, fix the code so it passes, and remove some cruft.
2117
        del self._resumed_packs[:]
2592.5.6 by Martin Pool
Move pack repository start_write_group to pack collection object
2118
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2119
    def _remove_resumed_pack_indices(self):
2120
        for resumed_pack in self._resumed_packs:
2121
            self._remove_pack_indices(resumed_pack)
2122
        del self._resumed_packs[:]
2123
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2124
    def _check_new_inventories(self):
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
2125
        """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.
2126
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
2127
        :returns: list of strs, summarising any problems found.  If the list is
2128
            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.
2129
        """
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
2130
        # The base implementation does no checks.  GCRepositoryPackCollection
2131
        # overrides this.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
2132
        return []
4634.29.8 by Andrew Bennetts
Fix bugs: check for chk roots for parent inventories, and don't get fooled by fallback repositories.
2133
        
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
2134
    def _commit_write_group(self):
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2135
        all_missing = set()
2136
        for prefix, versioned_file in (
2137
                ('revisions', self.repo.revisions),
2138
                ('inventories', self.repo.inventories),
2139
                ('texts', self.repo.texts),
2140
                ('signatures', self.repo.signatures),
2141
                ):
4002.1.9 by Andrew Bennetts
Merge VersionedFiles.insert-record-stream.partial from Robert.
2142
            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
2143
            all_missing.update([(prefix,) + key for key in missing])
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2144
        if all_missing:
2145
            raise errors.BzrCheckError(
2146
                "Repository %s has missing compression parent(s) %r "
2147
                 % (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.
2148
        problems = self._check_new_inventories()
2149
        if problems:
2150
            problems_summary = '\n'.join(problems)
2151
            raise errors.BzrCheckError(
2152
                "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.
2153
        self._remove_pack_indices(self._new_pack)
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2154
        any_new_content = False
2592.3.198 by Robert Collins
Factor out data_inserted to reduce code duplication in detecting empty packs.
2155
        if self._new_pack.data_inserted():
2592.3.209 by Robert Collins
Revision index management looking sane for packs.
2156
            # get all the data to disk and read to use
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
2157
            self._new_pack.finish()
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
2158
            self.allocate(self._new_pack)
2592.3.194 by Robert Collins
Output the revision index from NewPack.finish
2159
            self._new_pack = None
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2160
            any_new_content = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2161
        else:
2162
            self._new_pack.abort()
2163
            self._new_pack = None
2164
        for resumed_pack in self._resumed_packs:
2165
            # XXX: this is a pretty ugly way to turn the resumed pack into a
2166
            # properly committed pack.
2167
            self._names[resumed_pack.name] = None
2168
            self._remove_pack_from_memory(resumed_pack)
2169
            resumed_pack.finish()
2170
            self.allocate(resumed_pack)
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2171
            any_new_content = True
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2172
        del self._resumed_packs[:]
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2173
        if any_new_content:
2174
            result = self.autopack()
2175
            if not result:
2592.3.201 by Robert Collins
Cleanup RepositoryPackCollection.allocate.
2176
                # when autopack takes no steps, the names list is still
2177
                # unsaved.
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2178
                return self._save_pack_names()
4634.30.1 by Robert Collins
Properly pack 2a repositories during conversion operations. (Robert Collins. #423818)
2179
            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=[]).
2180
        return []
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2181
2182
    def _suspend_write_group(self):
2183
        tokens = [pack.name for pack in self._resumed_packs]
2184
        self._remove_pack_indices(self._new_pack)
2185
        if self._new_pack.data_inserted():
2186
            # get all the data to disk and read to use
2187
            self._new_pack.finish(suspend=True)
2188
            tokens.append(self._new_pack.name)
2189
            self._new_pack = None
2592.5.7 by Martin Pool
move commit_write_group to RepositoryPackCollection
2190
        else:
2592.3.202 by Robert Collins
Move write stream management into NewPack.
2191
            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)
2192
            self._new_pack = None
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2193
        self._remove_resumed_pack_indices()
2194
        return tokens
2195
2196
    def _resume_write_group(self, tokens):
2197
        for token in tokens:
2198
            self._resume_pack(token)
2592.5.8 by Martin Pool
Delegate abort_write_group to RepositoryPackCollection
2199
2200
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2201
class KnitPackRepository(KnitRepository):
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2202
    """Repository with knit objects stored inside pack containers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2203
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2204
    The layering for a KnitPackRepository is:
2205
2206
    Graph        |  HPSS    | Repository public layer |
2207
    ===================================================
2208
    Tuple based apis below, string based, and key based apis above
2209
    ---------------------------------------------------
2210
    KnitVersionedFiles
2211
      Provides .texts, .revisions etc
2212
      This adapts the N-tuple keys to physical knit records which only have a
2213
      single string identifier (for historical reasons), which in older formats
2214
      was always the revision_id, and in the mapped code for packs is always
2215
      the last element of key tuples.
2216
    ---------------------------------------------------
2217
    GraphIndex
2218
      A separate GraphIndex is used for each of the
2219
      texts/inventories/revisions/signatures contained within each individual
2220
      pack file. The GraphIndex layer works in N-tuples and is unaware of any
2221
      semantic value.
2222
    ===================================================
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2223
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
2224
    """
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2225
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.
2226
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
2227
        _serializer):
2228
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
2229
            _commit_builder_class, _serializer)
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2230
        index_transport = self._transport.clone('indices')
3350.6.5 by Robert Collins
Update to bzr.dev.
2231
        self._pack_collection = RepositoryPackCollection(self, self._transport,
2592.5.11 by Martin Pool
Move upload_transport from pack repositories to the pack collection
2232
            index_transport,
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2233
            self._transport.clone('upload'),
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2234
            self._transport.clone('packs'),
2235
            _format.index_builder_class,
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
2236
            _format.index_class,
2237
            use_chk_index=self._format.supports_chks,
2238
            )
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.
2239
        self.inventories = KnitVersionedFiles(
2240
            _KnitGraphIndex(self._pack_collection.inventory_index.combined_index,
2241
                add_callback=self._pack_collection.inventory_index.add_callback,
2242
                deltas=True, parents=True, is_locked=self.is_locked),
2243
            data_access=self._pack_collection.inventory_index.data_access,
2244
            max_delta_chain=200)
2245
        self.revisions = KnitVersionedFiles(
2246
            _KnitGraphIndex(self._pack_collection.revision_index.combined_index,
2247
                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.
2248
                deltas=False, parents=True, is_locked=self.is_locked,
4257.4.11 by Andrew Bennetts
Polish the patch.
2249
                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.
2250
            data_access=self._pack_collection.revision_index.data_access,
2251
            max_delta_chain=0)
2252
        self.signatures = KnitVersionedFiles(
2253
            _KnitGraphIndex(self._pack_collection.signature_index.combined_index,
2254
                add_callback=self._pack_collection.signature_index.add_callback,
2255
                deltas=False, parents=False, is_locked=self.is_locked),
2256
            data_access=self._pack_collection.signature_index.data_access,
2257
            max_delta_chain=0)
2258
        self.texts = KnitVersionedFiles(
2259
            _KnitGraphIndex(self._pack_collection.text_index.combined_index,
2260
                add_callback=self._pack_collection.text_index.add_callback,
2261
                deltas=True, parents=True, is_locked=self.is_locked),
2262
            data_access=self._pack_collection.text_index.data_access,
2263
            max_delta_chain=200)
3735.2.3 by Robert Collins
Create a format which passes the basic smoke test for CHK availability.
2264
        if _format.supports_chks:
2265
            # No graph, no compression:- references from chks are between
2266
            # different objects not temporal versions of the same; and without
2267
            # some sort of temporal structure knit compression will just fail.
2268
            self.chk_bytes = KnitVersionedFiles(
2269
                _KnitGraphIndex(self._pack_collection.chk_index.combined_index,
2270
                    add_callback=self._pack_collection.chk_index.add_callback,
2271
                    deltas=False, parents=False, is_locked=self.is_locked),
2272
                data_access=self._pack_collection.chk_index.data_access,
2273
                max_delta_chain=0)
2274
        else:
2275
            self.chk_bytes = None
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2276
        # 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
2277
        # 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.
2278
        # Another way to represent this would be a decorator around the control
2279
        # files object that presents logical locks as physical ones - if this
2280
        # gets ugly consider that alternative design. RBC 20071011
2281
        self._write_lock_count = 0
2282
        self._transaction = None
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
2283
        # for tests
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2284
        self._reconcile_does_inventory_gc = True
2951.2.9 by Robert Collins
* ``pack-0.92`` repositories can now be reconciled.
2285
        self._reconcile_fixes_text_parents = True
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
2286
        self._reconcile_backsup_inventory = False
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2287
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2288
    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.
2289
        # This class isn't deprecated, but one sub-format is
2290
        if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2291
            super(KnitPackRepository, self)._warn_if_deprecated(branch)
3575.3.1 by Andrew Bennetts
Deprecate knit repositories.
2292
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2293
    def _abort_write_group(self):
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2294
        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
2295
        self._pack_collection._abort_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2296
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2297
    def _get_source(self, to_format):
2298
        if to_format.network_name() == self._format.network_name():
2299
            return KnitPackStreamSource(self, to_format)
2300
        return super(KnitPackRepository, self)._get_source(to_format)
2301
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2302
    def _make_parents_provider(self):
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
2303
        return graph.CachingParentsProvider(self)
2592.3.216 by Robert Collins
Implement get_parents and _make_parents_provider for Pack repositories.
2304
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2305
    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.
2306
        if not self.is_locked():
2307
            return
2308
        self._pack_collection.reload_pack_names()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2309
2310
    def _start_write_group(self):
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2311
        self._pack_collection._start_write_group()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2312
2313
    def _commit_write_group(self):
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2314
        hint = self._pack_collection._commit_write_group()
2315
        self.revisions._index._key_dependencies.clear()
2316
        return hint
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2317
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2318
    def suspend_write_group(self):
2319
        # XXX check self._write_group is self.get_transaction()?
2320
        tokens = self._pack_collection._suspend_write_group()
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2321
        self.revisions._index._key_dependencies.clear()
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2322
        self._write_group = None
2323
        return tokens
2324
2325
    def _resume_write_group(self, tokens):
2326
        self._start_write_group()
4395.1.1 by John Arbash Meinel
If _resume_write_group aborts, make sure to clean up pending packs.
2327
        try:
2328
            self._pack_collection._resume_write_group(tokens)
2329
        except errors.UnresumableWriteGroup:
2330
            self._abort_write_group()
2331
            raise
4257.4.10 by Andrew Bennetts
Observe new revisions in _KnitGraphIndex.add_record rather than iterating all the uncommitted packs' indices.
2332
        for pack in self._pack_collection._resumed_packs:
2333
            self.revisions._index.scan_unvalidated_index(pack.revision_index)
4002.1.1 by Andrew Bennetts
Implement suspend_write_group/resume_write_group.
2334
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2335
    def get_transaction(self):
2336
        if self._write_lock_count:
2337
            return self._transaction
2338
        else:
2339
            return self.control_files.get_transaction()
2340
2341
    def is_locked(self):
2342
        return self._write_lock_count or self.control_files.is_locked()
2343
2344
    def is_write_locked(self):
2345
        return self._write_lock_count
2346
2347
    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.
2348
        locked = self.is_locked()
2349
        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.
2350
            raise errors.ReadOnlyError(self)
2351
        self._write_lock_count += 1
2352
        if self._write_lock_count == 1:
2353
            self._transaction = transactions.WriteTransaction()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2354
        if not locked:
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
2355
            if 'relock' in debug.debug_flags and self._prev_lock == 'w':
2356
                note('%r was write locked again', self)
2357
            self._prev_lock = 'w'
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2358
            for repo in self._fallback_repositories:
2359
                # Writes don't affect fallback repos
2360
                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.
2361
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2362
2363
    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.
2364
        locked = self.is_locked()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2365
        if self._write_lock_count:
2366
            self._write_lock_count += 1
2367
        else:
2368
            self.control_files.lock_read()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2369
        if not locked:
4731.1.1 by Andrew Bennetts
Add -Drelock debug flag.
2370
            if 'relock' in debug.debug_flags and self._prev_lock == 'r':
2371
                note('%r was read locked again', self)
2372
            self._prev_lock = 'r'
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2373
            for repo in self._fallback_repositories:
2374
                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.
2375
            self._refresh_data()
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2376
2377
    def leave_lock_in_place(self):
2378
        # not supported - raise an error
2379
        raise NotImplementedError(self.leave_lock_in_place)
2380
2381
    def dont_leave_lock_in_place(self):
2382
        # not supported - raise an error
2383
        raise NotImplementedError(self.dont_leave_lock_in_place)
2384
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2385
    @needs_write_lock
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2386
    def pack(self, hint=None):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2387
        """Compress the data within the repository.
2388
2389
        This will pack all the data to a single pack. In future it may
2390
        recompress deltas or do other such expensive operations.
2391
        """
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
2392
        self._pack_collection.pack(hint=hint)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2393
2394
    @needs_write_lock
2395
    def reconcile(self, other=None, thorough=False):
2396
        """Reconcile this repository."""
2397
        from bzrlib.reconcile import PackReconciler
2398
        reconciler = PackReconciler(self, thorough=thorough)
2399
        reconciler.reconcile()
2400
        return reconciler
2401
4245.1.1 by Ian Clatworthy
minor test clean-ups & _reconcile_pack API
2402
    def _reconcile_pack(self, collection, packs, extension, revs, pb):
2403
        packer = ReconcilePacker(collection, packs, extension, revs)
2404
        return packer.pack(pb)
2405
4634.85.10 by Andrew Bennetts
Change test_unlock_in_write_group to expect a log_exception_quietly rather than a raise.
2406
    @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.
2407
    def unlock(self):
2408
        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.
2409
            self.abort_write_group()
2410
            self._transaction = None
2411
            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.
2412
            raise errors.BzrError(
2592.3.244 by Martin Pool
unlock while in a write group now aborts the write group, unlocks, and errors.
2413
                'Must end write group before releasing write lock on %s'
2414
                % self)
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
2415
        if self._write_lock_count:
2416
            self._write_lock_count -= 1
2417
            if not self._write_lock_count:
2418
                transaction = self._transaction
2419
                self._transaction = None
2420
                transaction.finish()
2421
        else:
2422
            self.control_files.unlock()
4379.2.1 by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition.
2423
2424
        if not self.is_locked():
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2425
            for repo in self._fallback_repositories:
2426
                repo.unlock()
2427
2428
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2429
class KnitPackStreamSource(StreamSource):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2430
    """A StreamSource used to transfer data between same-format KnitPack repos.
2431
2432
    This source assumes:
2433
        1) Same serialization format for all objects
2434
        2) Same root information
2435
        3) XML format inventories
2436
        4) Atomic inserts (so we can stream inventory texts before text
2437
           content)
2438
        5) No chk_bytes
2439
    """
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2440
2441
    def __init__(self, from_repository, to_format):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2442
        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.
2443
        self._text_keys = None
2444
        self._text_fetch_order = 'unordered'
2445
2446
    def _get_filtered_inv_stream(self, revision_ids):
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2447
        from_repo = self.from_repository
4360.4.10 by John Arbash Meinel
Remove some of the code duplication.
2448
        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.
2449
        parent_keys = [(p,) for p in parent_ids]
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2450
        find_text_keys = from_repo._find_text_key_references_from_xml_inventory_lines
2451
        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.
2452
            from_repo._inventory_xml_lines_for_keys(parent_keys)))
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2453
        content_text_keys = set()
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2454
        knit = KnitVersionedFiles(None, None)
2455
        factory = KnitPlainFactory()
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2456
        def find_text_keys_from_content(record):
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2457
            if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):
2458
                raise ValueError("Unknown content storage kind for"
2459
                    " inventory text: %s" % (record.storage_kind,))
2460
            # It's a knit record, it has a _raw_record field (even if it was
2461
            # reconstituted from a network stream).
2462
            raw_data = record._raw_record
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2463
            # read the entire thing
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2464
            revision_id = record.key[-1]
2465
            content, _ = knit._parse_record(revision_id, raw_data)
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2466
            if record.storage_kind == 'knit-delta-gz':
2467
                line_iterator = factory.get_linedelta_content(content)
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2468
            elif record.storage_kind == 'knit-ft-gz':
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2469
                line_iterator = factory.get_fulltext_content(content)
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2470
            content_text_keys.update(find_text_keys(
2471
                [(line, revision_id) for line in line_iterator]))
2472
        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.
2473
        def _filtered_inv_stream():
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2474
            source_vf = from_repo.inventories
4360.4.6 by John Arbash Meinel
Change how 'missing.*parent_prevents_commit' determines what to skip.
2475
            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.
2476
                                                 'unordered', False)
2477
            for record in stream:
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2478
                if record.storage_kind == 'absent':
2479
                    raise errors.NoSuchRevision(from_repo, record.key)
2480
                find_text_keys_from_content(record)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2481
                yield record
4360.4.5 by John Arbash Meinel
Implement a KnitPackStreamSource
2482
            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.
2483
        return ('inventories', _filtered_inv_stream())
2484
2485
    def _get_text_stream(self):
2486
        # Note: We know we don't have to handle adding root keys, because both
2487
        # 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.
2488
        text_stream = self.from_repository.texts.get_record_stream(
2489
                        self._text_keys, self._text_fetch_order, False)
2490
        return ('texts', text_stream)
4360.4.4 by John Arbash Meinel
(broken) In the middle of creating an 'optimal' knit streamer.
2491
2492
    def get_stream(self, search):
2493
        revision_ids = search.get_keys()
2494
        for stream_info in self._fetch_revision_texts(revision_ids):
2495
            yield stream_info
2496
        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.
2497
        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.
2498
        yield self._get_text_stream()
2499
4360.4.3 by John Arbash Meinel
Introduce a KnitPackStreamSource which is used when
2500
2501
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2502
class RepositoryFormatPack(MetaDirRepositoryFormat):
2503
    """Format logic for pack structured repositories.
2504
2505
    This repository format has:
2506
     - a list of packs in pack-names
2507
     - packs in packs/NAME.pack
2508
     - indices in indices/NAME.{iix,six,tix,rix}
2509
     - knit deltas in the packs, knit indices mapped to the indices.
2510
     - thunk objects to support the knits programming API.
2511
     - a format marker of its own
2512
     - an optional 'shared-storage' flag
2513
     - an optional 'no-working-trees' flag
2514
     - a LockDir lock
2515
    """
2516
2517
    # Set this attribute in derived classes to control the repository class
2518
    # created by open and initialize.
2519
    repository_class = None
2520
    # Set this attribute in derived classes to control the
2521
    # _commit_builder_class that the repository objects will have passed to
2522
    # their constructor.
2523
    _commit_builder_class = None
2524
    # Set this attribute in derived clases to control the _serializer that the
2525
    # repository objects will have passed to their constructor.
2526
    _serializer = None
2949.1.5 by Robert Collins
Packs support ghosts.
2527
    # Packs are not confused by ghosts.
2528
    supports_ghosts = True
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2529
    # External references are not supported in pack repositories yet.
2530
    supports_external_lookups = False
4246.2.1 by Ian Clatworthy
supports_chks flag on repo formats & log tuning
2531
    # Most pack formats do not use chk lookups.
2532
    supports_chks = False
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2533
    # What index classes to use
2534
    index_builder_class = None
2535
    index_class = None
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
2536
    _fetch_uses_deltas = True
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
2537
    fast_deltas = False
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2538
2539
    def initialize(self, a_bzrdir, shared=False):
2540
        """Create a pack based repository.
2541
2542
        :param a_bzrdir: bzrdir to contain the new repository; must already
2543
            be initialized.
2544
        :param shared: If true the repository will be initialized as a shared
2545
                       repository.
2546
        """
2547
        mutter('creating repository in %s.', a_bzrdir.transport.base)
2548
        dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2549
        builder = self.index_builder_class()
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2550
        files = [('pack-names', builder.finish())]
2551
        utf8_files = [('format', self.get_format_string())]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2552
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2553
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2554
        return self.open(a_bzrdir=a_bzrdir, _found=True)
2555
2556
    def open(self, a_bzrdir, _found=False, _override_transport=None):
2557
        """See RepositoryFormat.open().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2558
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2559
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
2560
                                    repository at a slightly different url
2561
                                    than normal. I.e. during 'upgrade'.
2562
        """
2563
        if not _found:
2564
            format = RepositoryFormat.find_format(a_bzrdir)
2565
        if _override_transport is not None:
2566
            repo_transport = _override_transport
2567
        else:
2568
            repo_transport = a_bzrdir.get_repository_transport(None)
2569
        control_files = lockable_files.LockableFiles(repo_transport,
2570
                                'lock', lockdir.LockDir)
2571
        return self.repository_class(_format=self,
2572
                              a_bzrdir=a_bzrdir,
2573
                              control_files=control_files,
2574
                              _commit_builder_class=self._commit_builder_class,
2575
                              _serializer=self._serializer)
2576
2577
2578
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2579
    """A no-subtrees parameterized Pack repository.
2580
2581
    This format was introduced in 0.92.
2582
    """
2583
2584
    repository_class = KnitPackRepository
2585
    _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.
2586
    @property
2587
    def _serializer(self):
2588
        return xml5.serializer_v5
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2589
    # What index classes to use
2590
    index_builder_class = InMemoryGraphIndex
2591
    index_class = GraphIndex
3221.12.13 by Robert Collins
Implement generic stacking rather than pack-internals based stacking.
2592
2593
    def _get_matching_bzrdir(self):
2594
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
2595
2596
    def _ignore_setting_bzrdir(self, format):
2597
        pass
2598
2599
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2600
2601
    def get_format_string(self):
2602
        """See RepositoryFormat.get_format_string()."""
2603
        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2604
2605
    def get_format_description(self):
2606
        """See RepositoryFormat.get_format_description()."""
2607
        return "Packs containing knits without subtree support"
2608
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2609
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2610
class RepositoryFormatKnitPack3(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2611
    """A subtrees parameterized Pack repository.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2612
2592.3.215 by Robert Collins
Review feedback.
2613
    This repository format uses the xml7 serializer to get:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2614
     - support for recording full info about the tree root
2615
     - support for recording tree-references
2592.3.215 by Robert Collins
Review feedback.
2616
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2617
    This format was introduced in 0.92.
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2618
    """
2619
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2620
    repository_class = KnitPackRepository
2592.3.166 by Robert Collins
Merge KnitRepository3 removal branch.
2621
    _commit_builder_class = PackRootCommitBuilder
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2622
    rich_root_data = True
4988.9.1 by Jelmer Vernooij
Add experimental flag to RepositoryFormat.
2623
    experimental = True
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2624
    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.
2625
    @property
2626
    def _serializer(self):
2627
        return xml7.serializer_v7
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2628
    # What index classes to use
2629
    index_builder_class = InMemoryGraphIndex
2630
    index_class = GraphIndex
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2631
2632
    def _get_matching_bzrdir(self):
2939.2.5 by Ian Clatworthy
review feedback from lifeless
2633
        return bzrdir.format_registry.make_bzrdir(
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
2634
            'pack-0.92-subtree')
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2635
2636
    def _ignore_setting_bzrdir(self, format):
2637
        pass
2638
2639
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2640
2641
    def get_format_string(self):
2642
        """See RepositoryFormat.get_format_string()."""
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2643
        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.
2644
2645
    def get_format_description(self):
2646
        """See RepositoryFormat.get_format_description()."""
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2647
        return "Packs containing knits with subtree support\n"
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2648
2649
2650
class RepositoryFormatKnitPack4(RepositoryFormatPack):
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
2651
    """A rich-root, no subtrees parameterized Pack repository.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2652
2996.2.12 by Aaron Bentley
Text fixes from review
2653
    This repository format uses the xml6 serializer to get:
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2654
     - support for recording full info about the tree root
2655
2996.2.12 by Aaron Bentley
Text fixes from review
2656
    This format was introduced in 1.0.
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2657
    """
2658
2659
    repository_class = KnitPackRepository
2660
    _commit_builder_class = PackRootCommitBuilder
2661
    rich_root_data = True
2662
    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.
2663
    @property
2664
    def _serializer(self):
2665
        return xml6.serializer_v6
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2666
    # What index classes to use
2667
    index_builder_class = InMemoryGraphIndex
2668
    index_class = GraphIndex
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2669
2670
    def _get_matching_bzrdir(self):
2671
        return bzrdir.format_registry.make_bzrdir(
2672
            'rich-root-pack')
2673
2674
    def _ignore_setting_bzrdir(self, format):
2675
        pass
2676
2677
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2678
2679
    def get_format_string(self):
2680
        """See RepositoryFormat.get_format_string()."""
2681
        return ("Bazaar pack repository format 1 with rich root"
2682
                " (needs bzr 1.0)\n")
2683
2684
    def get_format_description(self):
2685
        """See RepositoryFormat.get_format_description()."""
2686
        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
2687
2688
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2689
class RepositoryFormatKnitPack5(RepositoryFormatPack):
2690
    """Repository that supports external references to allow stacking.
2691
2692
    New in release 1.6.
2693
2694
    Supports external lookups, which results in non-truncated ghosts after
2695
    reconcile compared to pack-0.92 formats.
2696
    """
2697
2698
    repository_class = KnitPackRepository
2699
    _commit_builder_class = PackCommitBuilder
2700
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2701
    # What index classes to use
2702
    index_builder_class = InMemoryGraphIndex
2703
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2704
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2705
    @property
2706
    def _serializer(self):
2707
        return xml5.serializer_v5
2708
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2709
    def _get_matching_bzrdir(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2710
        return bzrdir.format_registry.make_bzrdir('1.6')
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2711
2712
    def _ignore_setting_bzrdir(self, format):
2713
        pass
2714
2715
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2716
2717
    def get_format_string(self):
2718
        """See RepositoryFormat.get_format_string()."""
2719
        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
2720
2721
    def get_format_description(self):
2722
        """See RepositoryFormat.get_format_description()."""
3606.3.1 by Aaron Bentley
Update repo format strings
2723
        return "Packs 5 (adds stacking support, requires bzr 1.6)"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2724
2725
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2726
class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2727
    """A repository with rich roots and stacking.
2728
2729
    New in release 1.6.1.
2730
2731
    Supports stacking on other repositories, allowing data to be accessed
2732
    without being stored locally.
2733
    """
2734
2735
    repository_class = KnitPackRepository
2736
    _commit_builder_class = PackRootCommitBuilder
2737
    rich_root_data = True
2738
    supports_tree_reference = False # no subtrees
2739
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2740
    # What index classes to use
2741
    index_builder_class = InMemoryGraphIndex
2742
    index_class = GraphIndex
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2743
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2744
    @property
2745
    def _serializer(self):
2746
        return xml6.serializer_v6
2747
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2748
    def _get_matching_bzrdir(self):
2749
        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
2750
            '1.6.1-rich-root')
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2751
2752
    def _ignore_setting_bzrdir(self, format):
2753
        pass
2754
2755
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2756
2757
    def get_format_string(self):
2758
        """See RepositoryFormat.get_format_string()."""
2759
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2760
2761
    def get_format_description(self):
2762
        return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
2763
2764
2765
class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
3606.3.1 by Aaron Bentley
Update repo format strings
2766
    """A repository with rich roots and external references.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2767
2768
    New in release 1.6.
2769
2770
    Supports external lookups, which results in non-truncated ghosts after
2771
    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.
2772
2773
    This format was deprecated because the serializer it uses accidentally
2774
    supported subtrees, when the format was not intended to. This meant that
2775
    someone could accidentally fetch from an incorrect repository.
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2776
    """
2777
2778
    repository_class = KnitPackRepository
2779
    _commit_builder_class = PackRootCommitBuilder
2780
    rich_root_data = True
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2781
    supports_tree_reference = False # no subtrees
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2782
2783
    supports_external_lookups = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2784
    # What index classes to use
2785
    index_builder_class = InMemoryGraphIndex
2786
    index_class = GraphIndex
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2787
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2788
    @property
2789
    def _serializer(self):
2790
        return xml7.serializer_v7
2791
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2792
    def _get_matching_bzrdir(self):
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2793
        matching = bzrdir.format_registry.make_bzrdir(
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2794
            '1.6.1-rich-root')
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2795
        matching.repository_format = self
2796
        return matching
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2797
2798
    def _ignore_setting_bzrdir(self, format):
2799
        pass
2800
2801
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2802
2803
    def get_format_string(self):
2804
        """See RepositoryFormat.get_format_string()."""
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
2805
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2806
2807
    def get_format_description(self):
3606.10.1 by John Arbash Meinel
Create a new --1.6-rich-root, deprecate the old one.
2808
        return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
2809
                " (deprecated)")
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2810
2811
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2812
class RepositoryFormatKnitPack6(RepositoryFormatPack):
2813
    """A repository with stacking and btree indexes,
2814
    without rich roots or subtrees.
2815
2816
    This is equivalent to pack-1.6 with B+Tree indices.
2817
    """
2818
2819
    repository_class = KnitPackRepository
2820
    _commit_builder_class = PackCommitBuilder
2821
    supports_external_lookups = True
2822
    # What index classes to use
2823
    index_builder_class = BTreeBuilder
2824
    index_class = BTreeGraphIndex
2825
2826
    @property
2827
    def _serializer(self):
2828
        return xml5.serializer_v5
2829
2830
    def _get_matching_bzrdir(self):
2831
        return bzrdir.format_registry.make_bzrdir('1.9')
2832
2833
    def _ignore_setting_bzrdir(self, format):
2834
        pass
2835
2836
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2837
2838
    def get_format_string(self):
2839
        """See RepositoryFormat.get_format_string()."""
2840
        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2841
2842
    def get_format_description(self):
2843
        """See RepositoryFormat.get_format_description()."""
2844
        return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2845
2846
2847
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2848
    """A repository with rich roots, no subtrees, stacking and btree indexes.
2849
3805.5.1 by John Arbash Meinel
Fix a docstring.
2850
    1.6-rich-root with B+Tree indices.
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2851
    """
2852
2853
    repository_class = KnitPackRepository
2854
    _commit_builder_class = PackRootCommitBuilder
2855
    rich_root_data = True
2856
    supports_tree_reference = False # no subtrees
2857
    supports_external_lookups = True
2858
    # What index classes to use
2859
    index_builder_class = BTreeBuilder
2860
    index_class = BTreeGraphIndex
2861
2862
    @property
2863
    def _serializer(self):
2864
        return xml6.serializer_v6
2865
2866
    def _get_matching_bzrdir(self):
2867
        return bzrdir.format_registry.make_bzrdir(
2868
            '1.9-rich-root')
2869
2870
    def _ignore_setting_bzrdir(self, format):
2871
        pass
2872
2873
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2874
2875
    def get_format_string(self):
2876
        """See RepositoryFormat.get_format_string()."""
2877
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2878
2879
    def get_format_description(self):
2880
        return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2881
2882
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2883
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2884
    """A subtrees development repository.
2885
2886
    This format should be retained until the second release after bzr 1.7.
2887
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
2888
    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)
2889
2890
    This is [now] retained until we have a CHK based subtree format in
2891
    development.
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2892
    """
2893
2894
    repository_class = KnitPackRepository
2895
    _commit_builder_class = PackRootCommitBuilder
2896
    rich_root_data = True
4988.9.1 by Jelmer Vernooij
Add experimental flag to RepositoryFormat.
2897
    experimental = True
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2898
    supports_tree_reference = True
2899
    supports_external_lookups = True
2900
    # What index classes to use
2901
    index_builder_class = BTreeBuilder
2902
    index_class = BTreeGraphIndex
2903
3224.5.27 by Andrew Bennetts
Avoid importing bzrlib.xml* as a side-effect of importing bzrlib.repofmt.pack_repo.
2904
    @property
2905
    def _serializer(self):
2906
        return xml7.serializer_v7
2907
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2908
    def _get_matching_bzrdir(self):
2909
        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)
2910
            'development-subtree')
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2911
2912
    def _ignore_setting_bzrdir(self, format):
2913
        pass
2914
2915
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2916
2917
    def get_format_string(self):
2918
        """See RepositoryFormat.get_format_string()."""
2919
        return ("Bazaar development format 2 with subtree support "
2920
            "(needs bzr.dev from before 1.8)\n")
2921
2922
    def get_format_description(self):
2923
        """See RepositoryFormat.get_format_description()."""
2924
        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.
2925
            "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.
2926