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