/brz/remove-bazaar

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