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