~bzr-pqm/bzr/bzr.dev

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