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