/brz/remove-bazaar

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