/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.1 by Martin Pool
Start adding space for tags stored in the repository
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
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
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
16
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
17
from cStringIO import StringIO
18
19
from bzrlib.lazy_import import lazy_import
20
lazy_import(globals(), """
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
21
import re
22
import time
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
23
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
24
from bzrlib import (
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
25
    bzrdir,
26
    check,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
27
    debug,
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
28
    deprecated_graph,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
29
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
30
    generate_ids,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
31
    gpg,
32
    graph,
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
33
    lazy_regex,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
34
    lockable_files,
35
    lockdir,
2988.1.5 by Robert Collins
Use a LRU cache when generating the text index to reduce inventory deserialisations.
36
    lru_cache,
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
37
    osutils,
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
38
    registry,
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
39
    remote,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
40
    revision as _mod_revision,
41
    symbol_versioning,
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
42
    transactions,
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
43
    tsort,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
44
    ui,
45
    )
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
46
from bzrlib.bundle import serializer
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
47
from bzrlib.revisiontree import RevisionTree
48
from bzrlib.store.versioned import VersionedFileStore
49
from bzrlib.store.text import TextStore
50
from bzrlib.testament import Testament
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
51
from bzrlib.util import bencode
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
52
""")
53
1534.4.28 by Robert Collins
first cut at merge from integration.
54
from bzrlib.decorators import needs_read_lock, needs_write_lock
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
55
from bzrlib.inter import InterObject
1910.2.3 by Aaron Bentley
All tests pass
56
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
57
from bzrlib.symbol_versioning import (
58
        deprecated_method,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
59
        )
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
60
from bzrlib.trace import mutter, mutter_callsite, note, warning
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
61
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
62
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
63
# Old formats display a warning, but only once
64
_deprecation_warning_done = False
65
66
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
67
class CommitBuilder(object):
68
    """Provides an interface to build up a commit.
69
70
    This allows describing a tree to be committed without needing to 
71
    know the internals of the format of the repository.
72
    """
73
    
74
    # all clients should supply tree roots.
75
    record_root_entry = True
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
76
    # the default CommitBuilder does not manage trees whose root is versioned.
77
    _versioned_root = False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
78
79
    def __init__(self, repository, parents, config, timestamp=None, 
80
                 timezone=None, committer=None, revprops=None, 
81
                 revision_id=None):
82
        """Initiate a CommitBuilder.
83
84
        :param repository: Repository to commit to.
85
        :param parents: Revision ids of the parents of the new revision.
86
        :param config: Configuration to use.
87
        :param timestamp: Optional timestamp recorded for commit.
88
        :param timezone: Optional timezone for timestamp.
89
        :param committer: Optional committer to set for commit.
90
        :param revprops: Optional dictionary of revision properties.
91
        :param revision_id: Optional revision id.
92
        """
93
        self._config = config
94
95
        if committer is None:
96
            self._committer = self._config.username()
97
        else:
98
            assert isinstance(committer, basestring), type(committer)
99
            self._committer = committer
100
101
        self.new_inventory = Inventory(None)
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
102
        self._new_revision_id = revision_id
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
103
        self.parents = parents
104
        self.repository = repository
105
106
        self._revprops = {}
107
        if revprops is not None:
108
            self._revprops.update(revprops)
109
110
        if timestamp is None:
111
            timestamp = time.time()
112
        # Restrict resolution to 1ms
113
        self._timestamp = round(timestamp, 3)
114
115
        if timezone is None:
116
            self._timezone = osutils.local_time_offset()
117
        else:
118
            self._timezone = int(timezone)
119
120
        self._generate_revision_if_needed()
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
121
        self._heads = graph.HeadsCache(repository.get_graph()).heads
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
122
123
    def commit(self, message):
124
        """Make the actual commit.
125
126
        :return: The revision id of the recorded revision.
127
        """
128
        rev = _mod_revision.Revision(
129
                       timestamp=self._timestamp,
130
                       timezone=self._timezone,
131
                       committer=self._committer,
132
                       message=message,
133
                       inventory_sha1=self.inv_sha1,
134
                       revision_id=self._new_revision_id,
135
                       properties=self._revprops)
136
        rev.parent_ids = self.parents
137
        self.repository.add_revision(self._new_revision_id, rev,
138
            self.new_inventory, self._config)
139
        self.repository.commit_write_group()
140
        return self._new_revision_id
141
142
    def abort(self):
143
        """Abort the commit that is being built.
144
        """
145
        self.repository.abort_write_group()
146
147
    def revision_tree(self):
148
        """Return the tree that was just committed.
149
150
        After calling commit() this can be called to get a RevisionTree
151
        representing the newly committed tree. This is preferred to
152
        calling Repository.revision_tree() because that may require
153
        deserializing the inventory, while we already have a copy in
154
        memory.
155
        """
156
        return RevisionTree(self.repository, self.new_inventory,
157
                            self._new_revision_id)
158
159
    def finish_inventory(self):
160
        """Tell the builder that the inventory is finished."""
161
        if self.new_inventory.root is None:
2903.2.9 by Martin Pool
Review cleanups, mostly documentation
162
            raise AssertionError('Root entry should be supplied to'
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
163
                ' record_entry_contents, as of bzr 0.10.',
164
                 DeprecationWarning, stacklevel=2)
165
            self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
166
        self.new_inventory.revision_id = self._new_revision_id
167
        self.inv_sha1 = self.repository.add_inventory(
168
            self._new_revision_id,
169
            self.new_inventory,
170
            self.parents
171
            )
172
173
    def _gen_revision_id(self):
174
        """Return new revision-id."""
175
        return generate_ids.gen_revision_id(self._config.username(),
176
                                            self._timestamp)
177
178
    def _generate_revision_if_needed(self):
179
        """Create a revision id if None was supplied.
180
        
181
        If the repository can not support user-specified revision ids
182
        they should override this function and raise CannotSetRevisionId
183
        if _new_revision_id is not None.
184
185
        :raises: CannotSetRevisionId
186
        """
187
        if self._new_revision_id is None:
188
            self._new_revision_id = self._gen_revision_id()
189
            self.random_revid = True
190
        else:
191
            self.random_revid = False
192
193
    def _check_root(self, ie, parent_invs, tree):
194
        """Helper for record_entry_contents.
195
196
        :param ie: An entry being added.
197
        :param parent_invs: The inventories of the parent revisions of the
198
            commit.
199
        :param tree: The tree that is being committed.
200
        """
2871.1.2 by Robert Collins
* ``CommitBuilder.record_entry_contents`` now requires the root entry of a
201
        # In this revision format, root entries have no knit or weave When
202
        # serializing out to disk and back in root.revision is always
203
        # _new_revision_id
204
        ie.revision = self._new_revision_id
2818.3.1 by Robert Collins
Change CommitBuilder factory delegation to allow simple declaration.
205
2871.1.4 by Robert Collins
Merge bzr.dev.
206
    def _get_delta(self, ie, basis_inv, path):
207
        """Get a delta against the basis inventory for ie."""
208
        if ie.file_id not in basis_inv:
209
            # add
210
            return (None, path, ie.file_id, ie)
211
        elif ie != basis_inv[ie.file_id]:
212
            # common but altered
213
            # TODO: avoid tis id2path call.
214
            return (basis_inv.id2path(ie.file_id), path, ie.file_id, ie)
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
215
        else:
2871.1.4 by Robert Collins
Merge bzr.dev.
216
            # common, unaltered
217
            return None
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
218
219
    def record_entry_contents(self, ie, parent_invs, path, tree,
220
        content_summary):
221
        """Record the content of ie from tree into the commit if needed.
222
223
        Side effect: sets ie.revision when unchanged
224
225
        :param ie: An inventory entry present in the commit.
226
        :param parent_invs: The inventories of the parent revisions of the
227
            commit.
228
        :param path: The path the entry is at in the tree.
229
        :param tree: The tree which contains this entry and should be used to 
230
            obtain content.
231
        :param content_summary: Summary data from the tree about the paths
232
            content - stat, length, exec, sha/link target. This is only
233
            accessed when the entry has a revision of None - that is when it is
234
            a candidate to commit.
2871.1.3 by Robert Collins
* The CommitBuilder method ``record_entry_contents`` now returns summary
235
        :return: A tuple (change_delta, version_recorded). change_delta is 
236
            an inventory_delta change for this entry against the basis tree of
237
            the commit, or None if no change occured against the basis tree.
238
            version_recorded is True if a new version of the entry has been
239
            recorded. For instance, committing a merge where a file was only
240
            changed on the other side will return (delta, False).
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
241
        """
242
        if self.new_inventory.root is None:
2871.1.2 by Robert Collins
* ``CommitBuilder.record_entry_contents`` now requires the root entry of a
243
            if ie.parent_id is not None:
244
                raise errors.RootMissing()
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
245
            self._check_root(ie, parent_invs, tree)
246
        if ie.revision is None:
247
            kind = content_summary[0]
248
        else:
249
            # ie is carried over from a prior commit
250
            kind = ie.kind
251
        # XXX: repository specific check for nested tree support goes here - if
252
        # the repo doesn't want nested trees we skip it ?
253
        if (kind == 'tree-reference' and
254
            not self.repository._format.supports_tree_reference):
255
            # mismatch between commit builder logic and repository:
256
            # this needs the entry creation pushed down into the builder.
2776.4.18 by Robert Collins
Review feedback.
257
            raise NotImplementedError('Missing repository subtree support.')
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
258
        self.new_inventory.add(ie)
259
2871.1.3 by Robert Collins
* The CommitBuilder method ``record_entry_contents`` now returns summary
260
        # TODO: slow, take it out of the inner loop.
261
        try:
262
            basis_inv = parent_invs[0]
263
        except IndexError:
264
            basis_inv = Inventory(root_id=None)
265
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
266
        # ie.revision is always None if the InventoryEntry is considered
2776.4.13 by Robert Collins
Merge bzr.dev.
267
        # for committing. We may record the previous parents revision if the
268
        # content is actually unchanged against a sole head.
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
269
        if ie.revision is not None:
2903.2.5 by Martin Pool
record_entry_contents should give back deltas for changed roots; clean it up a bit
270
            if not self._versioned_root and path == '':
2871.1.3 by Robert Collins
* The CommitBuilder method ``record_entry_contents`` now returns summary
271
                # repositories that do not version the root set the root's
272
                # revision to the new commit even when no change occurs, and
273
                # this masks when a change may have occurred against the basis,
274
                # so calculate if one happened.
2903.2.5 by Martin Pool
record_entry_contents should give back deltas for changed roots; clean it up a bit
275
                if ie.file_id in basis_inv:
276
                    delta = (basis_inv.id2path(ie.file_id), path,
277
                        ie.file_id, ie)
278
                else:
2871.1.3 by Robert Collins
* The CommitBuilder method ``record_entry_contents`` now returns summary
279
                    # add
280
                    delta = (None, path, ie.file_id, ie)
2903.2.5 by Martin Pool
record_entry_contents should give back deltas for changed roots; clean it up a bit
281
                return delta, False
282
            else:
283
                # we don't need to commit this, because the caller already
284
                # determined that an existing revision of this file is
285
                # appropriate.
2903.2.9 by Martin Pool
Review cleanups, mostly documentation
286
                return None, (ie.revision == self._new_revision_id)
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
287
        # XXX: Friction: parent_candidates should return a list not a dict
288
        #      so that we don't have to walk the inventories again.
289
        parent_candiate_entries = ie.parent_candidates(parent_invs)
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
290
        head_set = self._heads(parent_candiate_entries.keys())
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
291
        heads = []
292
        for inv in parent_invs:
293
            if ie.file_id in inv:
294
                old_rev = inv[ie.file_id].revision
295
                if old_rev in head_set:
296
                    heads.append(inv[ie.file_id].revision)
297
                    head_set.remove(inv[ie.file_id].revision)
298
299
        store = False
300
        # now we check to see if we need to write a new record to the
301
        # file-graph.
302
        # We write a new entry unless there is one head to the ancestors, and
303
        # the kind-derived content is unchanged.
304
305
        # Cheapest check first: no ancestors, or more the one head in the
306
        # ancestors, we write a new node.
307
        if len(heads) != 1:
308
            store = True
309
        if not store:
310
            # There is a single head, look it up for comparison
311
            parent_entry = parent_candiate_entries[heads[0]]
312
            # if the non-content specific data has changed, we'll be writing a
313
            # node:
314
            if (parent_entry.parent_id != ie.parent_id or
315
                parent_entry.name != ie.name):
316
                store = True
317
        # now we need to do content specific checks:
318
        if not store:
319
            # if the kind changed the content obviously has
320
            if kind != parent_entry.kind:
321
                store = True
322
        if kind == 'file':
2911.5.3 by John Arbash Meinel
Revert the changes to CommitBuilder.record_entry_contents.
323
            assert content_summary[2] is not None, \
324
                "Files must not have executable = None"
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
325
            if not store:
326
                if (# if the file length changed we have to store:
327
                    parent_entry.text_size != content_summary[1] or
328
                    # if the exec bit has changed we have to store:
329
                    parent_entry.executable != content_summary[2]):
330
                    store = True
331
                elif parent_entry.text_sha1 == content_summary[3]:
332
                    # all meta and content is unchanged (using a hash cache
333
                    # hit to check the sha)
334
                    ie.revision = parent_entry.revision
335
                    ie.text_size = parent_entry.text_size
336
                    ie.text_sha1 = parent_entry.text_sha1
337
                    ie.executable = parent_entry.executable
2871.1.4 by Robert Collins
Merge bzr.dev.
338
                    return self._get_delta(ie, basis_inv, path), False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
339
                else:
340
                    # Either there is only a hash change(no hash cache entry,
341
                    # or same size content change), or there is no change on
342
                    # this file at all.
2776.4.19 by Robert Collins
Final review tweaks.
343
                    # Provide the parent's hash to the store layer, so that the
344
                    # content is unchanged we will not store a new node.
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
345
                    nostore_sha = parent_entry.text_sha1
346
            if store:
2776.4.18 by Robert Collins
Review feedback.
347
                # We want to record a new node regardless of the presence or
348
                # absence of a content change in the file.
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
349
                nostore_sha = None
2776.4.18 by Robert Collins
Review feedback.
350
            ie.executable = content_summary[2]
351
            lines = tree.get_file(ie.file_id, path).readlines()
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
352
            try:
353
                ie.text_sha1, ie.text_size = self._add_text_to_weave(
354
                    ie.file_id, lines, heads, nostore_sha)
355
            except errors.ExistingContent:
2776.4.18 by Robert Collins
Review feedback.
356
                # Turns out that the file content was unchanged, and we were
357
                # only going to store a new node if it was changed. Carry over
358
                # the entry.
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
359
                ie.revision = parent_entry.revision
360
                ie.text_size = parent_entry.text_size
361
                ie.text_sha1 = parent_entry.text_sha1
362
                ie.executable = parent_entry.executable
2871.1.4 by Robert Collins
Merge bzr.dev.
363
                return self._get_delta(ie, basis_inv, path), False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
364
        elif kind == 'directory':
365
            if not store:
366
                # all data is meta here, nothing specific to directory, so
367
                # carry over:
368
                ie.revision = parent_entry.revision
2871.1.4 by Robert Collins
Merge bzr.dev.
369
                return self._get_delta(ie, basis_inv, path), False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
370
            lines = []
371
            self._add_text_to_weave(ie.file_id, lines, heads, None)
372
        elif kind == 'symlink':
373
            current_link_target = content_summary[3]
374
            if not store:
2776.4.18 by Robert Collins
Review feedback.
375
                # symlink target is not generic metadata, check if it has
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
376
                # changed.
377
                if current_link_target != parent_entry.symlink_target:
378
                    store = True
379
            if not store:
380
                # unchanged, carry over.
381
                ie.revision = parent_entry.revision
382
                ie.symlink_target = parent_entry.symlink_target
2871.1.4 by Robert Collins
Merge bzr.dev.
383
                return self._get_delta(ie, basis_inv, path), False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
384
            ie.symlink_target = current_link_target
385
            lines = []
386
            self._add_text_to_weave(ie.file_id, lines, heads, None)
387
        elif kind == 'tree-reference':
388
            if not store:
389
                if content_summary[3] != parent_entry.reference_revision:
390
                    store = True
391
            if not store:
392
                # unchanged, carry over.
393
                ie.reference_revision = parent_entry.reference_revision
394
                ie.revision = parent_entry.revision
2871.1.4 by Robert Collins
Merge bzr.dev.
395
                return self._get_delta(ie, basis_inv, path), False
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
396
            ie.reference_revision = content_summary[3]
397
            lines = []
398
            self._add_text_to_weave(ie.file_id, lines, heads, None)
399
        else:
400
            raise NotImplementedError('unknown kind')
401
        ie.revision = self._new_revision_id
2871.1.4 by Robert Collins
Merge bzr.dev.
402
        return self._get_delta(ie, basis_inv, path), True
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
403
404
    def _add_text_to_weave(self, file_id, new_lines, parents, nostore_sha):
405
        versionedfile = self.repository.weave_store.get_weave_or_empty(
406
            file_id, self.repository.get_transaction())
407
        # Don't change this to add_lines - add_lines_with_ghosts is cheaper
408
        # than add_lines, and allows committing when a parent is ghosted for
409
        # some reason.
2592.3.136 by Robert Collins
Merge bzr.dev.
410
        # Note: as we read the content directly from the tree, we know its not
411
        # been turned into unicode or badly split - but a broken tree
412
        # implementation could give us bad output from readlines() so this is
413
        # not a guarantee of safety. What would be better is always checking
414
        # the content during test suite execution. RBC 20070912
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
415
        try:
416
            return versionedfile.add_lines_with_ghosts(
417
                self._new_revision_id, parents, new_lines,
2592.3.136 by Robert Collins
Merge bzr.dev.
418
                nostore_sha=nostore_sha, random_id=self.random_revid,
419
                check_content=False)[0:2]
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
420
        finally:
421
            versionedfile.clear_cache()
422
423
424
class RootCommitBuilder(CommitBuilder):
425
    """This commitbuilder actually records the root id"""
426
    
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
427
    # the root entry gets versioned properly by this builder.
2840.1.1 by Ian Clatworthy
faster pointless commit detection (Robert Collins)
428
    _versioned_root = True
2825.5.2 by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately.
429
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
430
    def _check_root(self, ie, parent_invs, tree):
431
        """Helper for record_entry_contents.
432
433
        :param ie: An entry being added.
434
        :param parent_invs: The inventories of the parent revisions of the
435
            commit.
436
        :param tree: The tree that is being committed.
437
        """
438
439
2220.2.3 by Martin Pool
Add tag: revision namespace.
440
######################################################################
441
# Repositories
442
1185.66.5 by Aaron Bentley
Renamed RevisionStorage to Repository
443
class Repository(object):
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
444
    """Repository holding history for one or more branches.
445
446
    The repository holds and retrieves historical information including
447
    revisions and file history.  It's normally accessed only by the Branch,
448
    which views a particular line of development through that history.
449
450
    The Repository builds on top of Stores and a Transport, which respectively 
451
    describe the disk data format and the way of accessing the (possibly 
452
    remote) disk.
453
    """
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
454
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
455
    # What class to use for a CommitBuilder. Often its simpler to change this
456
    # in a Repository class subclass rather than to override
457
    # get_commit_builder.
458
    _commit_builder_class = CommitBuilder
459
    # The search regex used by xml based repositories to determine what things
460
    # where changed in a single commit.
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
461
    _file_ids_altered_regex = lazy_regex.lazy_compile(
462
        r'file_id="(?P<file_id>[^"]+)"'
2776.4.6 by Robert Collins
Fixup various commit test failures falling out from the other commit changes.
463
        r'.* revision="(?P<revision_id>[^"]+)"'
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
464
        )
465
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
466
    def abort_write_group(self):
467
        """Commit the contents accrued within the current write group.
468
469
        :seealso: start_write_group.
470
        """
471
        if self._write_group is not self.get_transaction():
472
            # has an unlock or relock occured ?
473
            raise errors.BzrError('mismatched lock context and write group.')
474
        self._abort_write_group()
475
        self._write_group = None
476
477
    def _abort_write_group(self):
478
        """Template method for per-repository write group cleanup.
479
        
480
        This is called during abort before the write group is considered to be 
481
        finished and should cleanup any internal state accrued during the write
482
        group. There is no requirement that data handed to the repository be
483
        *not* made available - this is not a rollback - but neither should any
484
        attempt be made to ensure that data added is fully commited. Abort is
485
        invoked when an error has occured so futher disk or network operations
486
        may not be possible or may error and if possible should not be
487
        attempted.
488
        """
489
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
490
    @needs_write_lock
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
491
    def add_inventory(self, revision_id, inv, parents):
492
        """Add the inventory inv to the repository as revision_id.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
493
        
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
494
        :param parents: The revision ids of the parents that revision_id
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
495
                        is known to have and are in the repository already.
496
497
        returns the sha1 of the serialized inventory.
498
        """
2592.3.61 by Robert Collins
Remove inventory.kndx.
499
        assert self.is_in_write_group()
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
500
        _mod_revision.check_not_reserved_id(revision_id)
501
        assert inv.revision_id is None or inv.revision_id == revision_id, \
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
502
            "Mismatch between inventory revision" \
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
503
            " id and insertion revid (%r, %r)" % (inv.revision_id, revision_id)
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
504
        assert inv.root is not None
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
505
        inv_lines = self._serialise_inventory_to_lines(inv)
2592.3.61 by Robert Collins
Remove inventory.kndx.
506
        inv_vf = self.get_inventory_weave()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
507
        return self._inventory_add_lines(inv_vf, revision_id, parents,
508
            inv_lines, check_content=False)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
509
2805.6.7 by Robert Collins
Review feedback.
510
    def _inventory_add_lines(self, inv_vf, revision_id, parents, lines,
511
        check_content=True):
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
512
        """Store lines in inv_vf and return the sha1 of the inventory."""
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
513
        final_parents = []
514
        for parent in parents:
515
            if parent in inv_vf:
516
                final_parents.append(parent)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
517
        return inv_vf.add_lines(revision_id, final_parents, lines,
518
            check_content=check_content)[0]
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
519
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
520
    @needs_write_lock
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
521
    def add_revision(self, revision_id, rev, inv=None, config=None):
522
        """Add rev to the revision store as revision_id.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
523
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
524
        :param revision_id: the revision id to use.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
525
        :param rev: The revision object.
526
        :param inv: The inventory for the revision. if None, it will be looked
527
                    up in the inventory storer
528
        :param config: If None no digital signature will be created.
529
                       If supplied its signature_needed method will be used
530
                       to determine if a signature should be made.
531
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
532
        # TODO: jam 20070210 Shouldn't we check rev.revision_id and
533
        #       rev.parent_ids?
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
534
        _mod_revision.check_not_reserved_id(revision_id)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
535
        if config is not None and config.signature_needed():
536
            if inv is None:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
537
                inv = self.get_inventory(revision_id)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
538
            plaintext = Testament(rev, inv).as_short_text()
539
            self.store_revision_signature(
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
540
                gpg.GPGStrategy(config), plaintext, revision_id)
541
        if not revision_id in self.get_inventory_weave():
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
542
            if inv is None:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
543
                raise errors.WeaveRevisionNotPresent(revision_id,
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
544
                                                     self.get_inventory_weave())
545
            else:
546
                # yes, this is not suitable for adding with ghosts.
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
547
                self.add_inventory(revision_id, inv, rev.parent_ids)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
548
        self._revision_store.add_revision(rev, self.get_transaction())
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
549
2520.4.10 by Aaron Bentley
Enable installation of revisions
550
    def _add_revision_text(self, revision_id, text):
551
        revision = self._revision_store._serializer.read_revision_from_string(
552
            text)
553
        self._revision_store._add_revision(revision, StringIO(text),
554
                                           self.get_transaction())
555
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
556
    def all_revision_ids(self):
557
        """Returns a list of all the revision ids in the repository. 
558
559
        This is deprecated because code should generally work on the graph
560
        reachable from a particular revision, and ignore any other revisions
561
        that might be present.  There is no direct replacement method.
562
        """
2592.3.114 by Robert Collins
More evil mutterings.
563
        if 'evil' in debug.debug_flags:
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
564
            mutter_callsite(2, "all_revision_ids is linear with history.")
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
565
        return self._all_revision_ids()
566
567
    def _all_revision_ids(self):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
568
        """Returns a list of all the revision ids in the repository. 
569
570
        These are in as much topological order as the underlying store can 
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
571
        present.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
572
        """
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
573
        raise NotImplementedError(self._all_revision_ids)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
574
1687.1.7 by Robert Collins
Teach Repository about break_lock.
575
    def break_lock(self):
576
        """Break a lock if one is present from another instance.
577
578
        Uses the ui factory to ask for confirmation if the lock may be from
579
        an active process.
580
        """
581
        self.control_files.break_lock()
582
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
583
    @needs_read_lock
584
    def _eliminate_revisions_not_present(self, revision_ids):
585
        """Check every revision id in revision_ids to see if we have it.
586
587
        Returns a set of the present revisions.
588
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
589
        result = []
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
590
        for id in revision_ids:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
591
            if self.has_revision(id):
592
               result.append(id)
593
        return result
594
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
595
    @staticmethod
596
    def create(a_bzrdir):
597
        """Construct the current default format repository in a_bzrdir."""
598
        return RepositoryFormat.get_default_format().initialize(a_bzrdir)
599
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
600
    def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
601
        """instantiate a Repository.
602
603
        :param _format: The format of the repository on disk.
604
        :param a_bzrdir: The BzrDir of the repository.
605
606
        In the future we will have a single api for all stores for
607
        getting file texts, inventories and revisions, then
608
        this construct will accept instances of those things.
609
        """
1608.2.1 by Martin Pool
[merge] Storage filename escaping
610
        super(Repository, self).__init__()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
611
        self._format = _format
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
612
        # the following are part of the public API for Repository:
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
613
        self.bzrdir = a_bzrdir
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
614
        self.control_files = control_files
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
615
        self._revision_store = _revision_store
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
616
        # backwards compatibility
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
617
        self.weave_store = text_store
2671.4.2 by Robert Collins
Review feedback.
618
        # for tests
619
        self._reconcile_does_inventory_gc = True
2745.6.16 by Aaron Bentley
Update from review
620
        self._reconcile_fixes_text_parents = False
2951.1.3 by Robert Collins
Partial support for native reconcile with packs.
621
        self._reconcile_backsup_inventory = True
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
622
        # not right yet - should be more semantically clear ? 
623
        # 
624
        self.control_store = control_store
625
        self.control_weaves = control_store
1608.2.1 by Martin Pool
[merge] Storage filename escaping
626
        # TODO: make sure to construct the right store classes, etc, depending
627
        # on whether escaping is required.
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
628
        self._warn_if_deprecated()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
629
        self._write_group = None
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
630
        self.base = control_files._transport.base
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
631
1668.1.3 by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959)
632
    def __repr__(self):
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
633
        return '%s(%r)' % (self.__class__.__name__,
634
                           self.base)
1668.1.3 by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959)
635
2671.1.4 by Andrew Bennetts
Rename is_same_repository to has_same_location, thanks Aaron!
636
    def has_same_location(self, other):
2671.1.3 by Andrew Bennetts
Remove Repository.__eq__/__ne__ methods, replace with is_same_repository method.
637
        """Returns a boolean indicating if this repository is at the same
638
        location as another repository.
639
640
        This might return False even when two repository objects are accessing
641
        the same physical repository via different URLs.
642
        """
2592.3.162 by Robert Collins
Remove some arbitrary differences from bzr.dev.
643
        if self.__class__ is not other.__class__:
644
            return False
645
        return (self.control_files._transport.base ==
646
                other.control_files._transport.base)
2671.1.1 by Andrew Bennetts
Add support for comparing Repositories with == and != operators.
647
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
648
    def is_in_write_group(self):
649
        """Return True if there is an open write group.
650
651
        :seealso: start_write_group.
652
        """
653
        return self._write_group is not None
654
1694.2.6 by Martin Pool
[merge] bzr.dev
655
    def is_locked(self):
656
        return self.control_files.is_locked()
657
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
658
    def is_write_locked(self):
659
        """Return True if this object is write locked."""
660
        return self.is_locked() and self.control_files._lock_mode == 'w'
661
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
662
    def lock_write(self, token=None):
663
        """Lock this repository for writing.
2617.6.8 by Robert Collins
Review feedback and documentation.
664
665
        This causes caching within the repository obejct to start accumlating
666
        data during reads, and allows a 'write_group' to be obtained. Write
667
        groups must be used for actual data insertion.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
668
        
669
        :param token: if this is already locked, then lock_write will fail
670
            unless the token matches the existing lock.
671
        :returns: a token if this instance supports tokens, otherwise None.
672
        :raises TokenLockingNotSupported: when a token is given but this
673
            instance doesn't support using token locks.
674
        :raises MismatchedToken: if the specified token doesn't match the token
675
            of the existing lock.
2617.6.8 by Robert Collins
Review feedback and documentation.
676
        :seealso: start_write_group.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
677
2018.5.145 by Andrew Bennetts
Add a brief explanation of what tokens are used for to lock_write docstrings.
678
        A token should be passed in if you know that you have locked the object
679
        some other way, and need to synchronise this object's state with that
680
        fact.
681
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
682
        XXX: this docstring is duplicated in many places, e.g. lockable_files.py
683
        """
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
684
        result = self.control_files.lock_write(token=token)
685
        self._refresh_data()
686
        return result
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
687
688
    def lock_read(self):
1553.5.55 by Martin Pool
[revert] broken changes
689
        self.control_files.lock_read()
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
690
        self._refresh_data()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
691
1694.2.6 by Martin Pool
[merge] bzr.dev
692
    def get_physical_lock_status(self):
693
        return self.control_files.get_physical_lock_status()
1624.3.36 by Olaf Conradi
Rename is_transport_locked() to get_physical_lock_status() as the
694
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
695
    def leave_lock_in_place(self):
696
        """Tell this repository not to release the physical lock when this
697
        object is unlocked.
2018.5.76 by Andrew Bennetts
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.
698
        
699
        If lock_write doesn't return a token, then this method is not supported.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
700
        """
701
        self.control_files.leave_in_place()
702
703
    def dont_leave_lock_in_place(self):
704
        """Tell this repository to release the physical lock when this
705
        object is unlocked, even if it didn't originally acquire it.
2018.5.76 by Andrew Bennetts
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.
706
707
        If lock_write doesn't return a token, then this method is not supported.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
708
        """
709
        self.control_files.dont_leave_in_place()
710
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
711
    @needs_read_lock
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
712
    def gather_stats(self, revid=None, committers=None):
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
713
        """Gather statistics from a revision id.
714
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
715
        :param revid: The revision id to gather statistics from, if None, then
716
            no revision specific statistics are gathered.
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
717
        :param committers: Optional parameter controlling whether to grab
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
718
            a count of committers from the revision specific statistics.
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
719
        :return: A dictionary of statistics. Currently this contains:
720
            committers: The number of committers if requested.
721
            firstrev: A tuple with timestamp, timezone for the penultimate left
722
                most ancestor of revid, if revid is not the NULL_REVISION.
723
            latestrev: A tuple with timestamp, timezone for revid, if revid is
724
                not the NULL_REVISION.
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
725
            revisions: The total revision count in the repository.
726
            size: An estimate disk size of the repository in bytes.
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
727
        """
728
        result = {}
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
729
        if revid and committers:
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
730
            result['committers'] = 0
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
731
        if revid and revid != _mod_revision.NULL_REVISION:
732
            if committers:
733
                all_committers = set()
734
            revisions = self.get_ancestry(revid)
735
            # pop the leading None
736
            revisions.pop(0)
737
            first_revision = None
738
            if not committers:
739
                # ignore the revisions in the middle - just grab first and last
740
                revisions = revisions[0], revisions[-1]
741
            for revision in self.get_revisions(revisions):
742
                if not first_revision:
743
                    first_revision = revision
744
                if committers:
745
                    all_committers.add(revision.committer)
746
            last_revision = revision
747
            if committers:
748
                result['committers'] = len(all_committers)
749
            result['firstrev'] = (first_revision.timestamp,
750
                first_revision.timezone)
751
            result['latestrev'] = (last_revision.timestamp,
752
                last_revision.timezone)
753
754
        # now gather global repository information
755
        if self.bzrdir.root_transport.listable():
756
            c, t = self._revision_store.total_size(self.get_transaction())
757
            result['revisions'] = c
758
            result['size'] = t
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
759
        return result
760
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
761
    def get_data_stream(self, revision_ids):
762
        raise NotImplementedError(self.get_data_stream)
763
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
764
    def insert_data_stream(self, stream):
2592.3.214 by Robert Collins
Merge bzr.dev.
765
        """XXX What does this really do? 
766
        
767
        Is it a substitute for fetch? 
768
        Should it manage its own write group ?
769
        """
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
770
        for item_key, bytes in stream:
771
            if item_key[0] == 'file':
772
                (file_id,) = item_key[1:]
2535.3.27 by Andrew Bennetts
Merge from bzr.dev.
773
                knit = self.weave_store.get_weave_or_empty(
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
774
                    file_id, self.get_transaction())
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
775
            elif item_key == ('inventory',):
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
776
                knit = self.get_inventory_weave()
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
777
            elif item_key == ('revisions',):
2535.3.28 by Andrew Bennetts
Use self._revision_store.get_revision_file rather that self.control_store.get_weave('revisions', ...)
778
                knit = self._revision_store.get_revision_file(
779
                    self.get_transaction())
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
780
            elif item_key == ('signatures',):
2535.3.25 by Andrew Bennetts
Fetch signatures too.
781
                knit = self._revision_store.get_signature_file(
782
                    self.get_transaction())
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
783
            else:
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
784
                raise RepositoryDataStreamError(
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
785
                    "Unrecognised data stream key '%s'" % (item_key,))
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
786
            decoded_list = bencode.bdecode(bytes)
787
            format = decoded_list.pop(0)
788
            data_list = []
789
            knit_bytes = ''
790
            for version, options, parents, some_bytes in decoded_list:
791
                data_list.append((version, options, len(some_bytes), parents))
792
                knit_bytes += some_bytes
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
793
            knit.insert_data_stream(
794
                (format, data_list, StringIO(knit_bytes).read))
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
795
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
796
    @needs_read_lock
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
797
    def missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
798
        """Return the revision ids that other has that this does not.
799
        
800
        These are returned in topological order.
801
802
        revision_id: only return revision ids included by revision_id.
803
        """
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
804
        return InterRepository.get(other, self).missing_revision_ids(
805
            revision_id, find_ghosts)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
806
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
807
    @staticmethod
808
    def open(base):
809
        """Open the repository rooted at base.
810
811
        For instance, if the repository is at URL/.bzr/repository,
812
        Repository.open(URL) -> a Repository instance.
813
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
814
        control = bzrdir.BzrDir.open(base)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
815
        return control.open_repository()
816
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
817
    def copy_content_into(self, destination, revision_id=None):
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
818
        """Make a complete copy of the content in self into destination.
819
        
820
        This is a destructive operation! Do not use it on existing 
821
        repositories.
822
        """
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
823
        return InterRepository.get(self, destination).copy_content(revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
824
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
825
    def commit_write_group(self):
826
        """Commit the contents accrued within the current write group.
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
827
828
        :seealso: start_write_group.
829
        """
830
        if self._write_group is not self.get_transaction():
831
            # has an unlock or relock occured ?
2592.3.38 by Robert Collins
All experimental format tests passing again.
832
            raise errors.BzrError('mismatched lock context %r and '
833
                'write group %r.' %
834
                (self.get_transaction(), self._write_group))
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
835
        self._commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
836
        self._write_group = None
837
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
838
    def _commit_write_group(self):
839
        """Template method for per-repository write group cleanup.
840
        
841
        This is called before the write group is considered to be 
842
        finished and should ensure that all data handed to the repository
843
        for writing during the write group is safely committed (to the 
844
        extent possible considering file system caching etc).
845
        """
846
2949.1.1 by Robert Collins
Change Repository.fetch to provide a find_ghosts parameter which triggers ghost filling.
847
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
848
        """Fetch the content required to construct revision_id from source.
849
850
        If revision_id is None all content is copied.
2949.1.1 by Robert Collins
Change Repository.fetch to provide a find_ghosts parameter which triggers ghost filling.
851
        :param find_ghosts: Find and copy revisions in the source that are
852
            ghosts in the target (and not reachable directly by walking out to
853
            the first-present revision in target from revision_id).
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
854
        """
2592.3.115 by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit.
855
        # fast path same-url fetch operations
856
        if self.has_same_location(source):
857
            # check that last_revision is in 'from' and then return a
858
            # no-operation.
859
            if (revision_id is not None and
860
                not _mod_revision.is_null(revision_id)):
861
                self.get_revision(revision_id)
862
            return 0, []
2323.8.3 by Aaron Bentley
Reduce scope of try/except, update NEWS
863
        inter = InterRepository.get(source, self)
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
864
        try:
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
865
            return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
866
        except NotImplementedError:
867
            raise errors.IncompatibleRepositories(source, self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
868
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
869
    def create_bundle(self, target, base, fileobj, format=None):
870
        return serializer.write_bundle(self, target, base, fileobj, format)
871
2803.2.1 by Robert Collins
* CommitBuilder now advertises itself as requiring the root entry to be
872
    def get_commit_builder(self, branch, parents, config, timestamp=None,
873
                           timezone=None, committer=None, revprops=None,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
874
                           revision_id=None):
875
        """Obtain a CommitBuilder for this repository.
876
        
877
        :param branch: Branch to commit to.
878
        :param parents: Revision ids of the parents of the new revision.
879
        :param config: Configuration to use.
880
        :param timestamp: Optional timestamp recorded for commit.
881
        :param timezone: Optional timezone for timestamp.
882
        :param committer: Optional committer to set for commit.
883
        :param revprops: Optional dictionary of revision properties.
884
        :param revision_id: Optional revision id.
885
        """
2818.3.2 by Robert Collins
Review feedback.
886
        result = self._commit_builder_class(self, parents, config,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
887
            timestamp, timezone, committer, revprops, revision_id)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
888
        self.start_write_group()
889
        return result
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
890
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
891
    def unlock(self):
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
892
        if (self.control_files._lock_count == 1 and
893
            self.control_files._lock_mode == 'w'):
894
            if 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.
895
                self.abort_write_group()
896
                self.control_files.unlock()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
897
                raise errors.BzrError(
898
                    'Must end write groups before releasing write locks.')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
899
        self.control_files.unlock()
900
1185.65.27 by Robert Collins
Tweak storage towards mergability.
901
    @needs_read_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
902
    def clone(self, a_bzrdir, revision_id=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
903
        """Clone this repository into a_bzrdir using the current format.
904
905
        Currently no check is made that the format of this repository and
906
        the bzrdir format are compatible. FIXME RBC 20060201.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
907
908
        :return: The newly created destination repository.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
909
        """
2440.1.1 by Martin Pool
Add new Repository.sprout,
910
        # TODO: deprecate after 0.16; cloning this with all its settings is
911
        # probably not very useful -- mbp 20070423
912
        dest_repo = self._create_sprouting_repo(a_bzrdir, shared=self.is_shared())
913
        self.copy_content_into(dest_repo, revision_id)
914
        return dest_repo
915
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
916
    def start_write_group(self):
917
        """Start a write group in the repository.
918
919
        Write groups are used by repositories which do not have a 1:1 mapping
920
        between file ids and backend store to manage the insertion of data from
921
        both fetch and commit operations.
922
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
923
        A write lock is required around the start_write_group/commit_write_group
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
924
        for the support of lock-requiring repository formats.
2617.6.8 by Robert Collins
Review feedback and documentation.
925
926
        One can only insert data into a repository inside a write group.
927
2617.6.6 by Robert Collins
Some review feedback.
928
        :return: None.
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
929
        """
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
930
        if not self.is_write_locked():
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
931
            raise errors.NotWriteLocked(self)
932
        if self._write_group:
933
            raise errors.BzrError('already in a write group')
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
934
        self._start_write_group()
935
        # so we can detect unlock/relock - the write group is now entered.
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
936
        self._write_group = self.get_transaction()
937
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
938
    def _start_write_group(self):
939
        """Template method for per-repository write group startup.
940
        
941
        This is called before the write group is considered to be 
942
        entered.
943
        """
944
2440.1.1 by Martin Pool
Add new Repository.sprout,
945
    @needs_read_lock
946
    def sprout(self, to_bzrdir, revision_id=None):
947
        """Create a descendent repository for new development.
948
949
        Unlike clone, this does not copy the settings of the repository.
950
        """
951
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
952
        dest_repo.fetch(self, revision_id=revision_id)
953
        return dest_repo
954
955
    def _create_sprouting_repo(self, a_bzrdir, shared):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
956
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
957
            # use target default format.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
958
            dest_repo = a_bzrdir.create_repository()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
959
        else:
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
960
            # Most control formats need the repository to be specifically
961
            # created, but on some old all-in-one formats it's not needed
962
            try:
2440.1.1 by Martin Pool
Add new Repository.sprout,
963
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
964
            except errors.UninitializableFormat:
965
                dest_repo = a_bzrdir.open_repository()
966
        return dest_repo
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
967
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
968
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
969
    def has_revision(self, revision_id):
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
970
        """True if this repository has a copy of the revision."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
971
        if 'evil' in debug.debug_flags:
2592.3.112 by Robert Collins
Various fixups found dogfooding.
972
            mutter_callsite(3, "has_revision is a LBYL symptom.")
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
973
        return self._revision_store.has_revision_id(revision_id,
974
                                                    self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
975
1185.65.27 by Robert Collins
Tweak storage towards mergability.
976
    @needs_read_lock
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
977
    def get_revision(self, revision_id):
978
        """Return the Revision object for a named revision."""
979
        return self.get_revisions([revision_id])[0]
980
981
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
982
    def get_revision_reconcile(self, revision_id):
983
        """'reconcile' helper routine that allows access to a revision always.
984
        
985
        This variant of get_revision does not cross check the weave graph
986
        against the revision one as get_revision does: but it should only
987
        be used by reconcile, or reconcile-alike commands that are correcting
988
        or testing the revision graph.
989
        """
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
990
        return self._get_revisions([revision_id])[0]
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
991
1756.1.2 by Aaron Bentley
Show logs using get_revisions
992
    @needs_read_lock
993
    def get_revisions(self, revision_ids):
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
994
        """Get many revisions at once."""
995
        return self._get_revisions(revision_ids)
996
997
    @needs_read_lock
998
    def _get_revisions(self, revision_ids):
999
        """Core work logic to get many revisions without sanity checks."""
1000
        for rev_id in revision_ids:
1001
            if not rev_id or not isinstance(rev_id, basestring):
1002
                raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1003
        revs = self._revision_store.get_revisions(revision_ids,
1756.1.2 by Aaron Bentley
Show logs using get_revisions
1004
                                                  self.get_transaction())
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1005
        for rev in revs:
1006
            assert not isinstance(rev.revision_id, unicode)
1007
            for parent_id in rev.parent_ids:
1008
                assert not isinstance(parent_id, unicode)
1009
        return revs
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1010
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1011
    @needs_read_lock
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1012
    def get_revision_xml(self, revision_id):
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1013
        # TODO: jam 20070210 This shouldn't be necessary since get_revision
1014
        #       would have already do it.
1015
        # TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1016
        rev = self.get_revision(revision_id)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1017
        rev_tmp = StringIO()
1018
        # the current serializer..
1019
        self._revision_store._serializer.write_revision(rev, rev_tmp)
1020
        rev_tmp.seek(0)
1021
        return rev_tmp.getvalue()
1022
1023
    @needs_read_lock
1756.3.22 by Aaron Bentley
Tweaks from review
1024
    def get_deltas_for_revisions(self, revisions):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1025
        """Produce a generator of revision deltas.
1026
        
1027
        Note that the input is a sequence of REVISIONS, not revision_ids.
1028
        Trees will be held in memory until the generator exits.
1029
        Each delta is relative to the revision's lefthand predecessor.
1030
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1031
        required_trees = set()
1032
        for revision in revisions:
1033
            required_trees.add(revision.revision_id)
1034
            required_trees.update(revision.parent_ids[:1])
1035
        trees = dict((t.get_revision_id(), t) for 
1036
                     t in self.revision_trees(required_trees))
1037
        for revision in revisions:
1038
            if not revision.parent_ids:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1039
                old_tree = self.revision_tree(None)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1040
            else:
1041
                old_tree = trees[revision.parent_ids[0]]
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
1042
            yield trees[revision.revision_id].changes_from(old_tree)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1043
1756.3.19 by Aaron Bentley
Documentation and cleanups
1044
    @needs_read_lock
1744.2.2 by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
1045
    def get_revision_delta(self, revision_id):
1046
        """Return the delta for one revision.
1047
1048
        The delta is relative to the left-hand predecessor of the
1049
        revision.
1050
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1051
        r = self.get_revision(revision_id)
1756.3.22 by Aaron Bentley
Tweaks from review
1052
        return list(self.get_deltas_for_revisions([r]))[0]
1744.2.2 by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
1053
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1054
    @needs_write_lock
1055
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1056
        signature = gpg_strategy.sign(plaintext)
2996.2.4 by Aaron Bentley
Rename function to add_signature_text
1057
        self.add_signature_text(revision_id, signature)
2996.2.3 by Aaron Bentley
Add tests for install_revisions and add_signature
1058
1059
    @needs_write_lock
2996.2.4 by Aaron Bentley
Rename function to add_signature_text
1060
    def add_signature_text(self, revision_id, signature):
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1061
        self._revision_store.add_revision_signature_text(revision_id,
1062
                                                         signature,
1063
                                                         self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1064
2988.1.2 by Robert Collins
New Repository API find_text_key_references for use by reconcile and check.
1065
    def find_text_key_references(self):
1066
        """Find the text key references within the repository.
1067
1068
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
1069
        revision_ids. Each altered file-ids has the exact revision_ids that
1070
        altered it listed explicitly.
1071
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1072
            to whether they were referred to by the inventory of the
1073
            revision_id that they contain. The inventory texts from all present
1074
            revision ids are assessed to generate this report.
1075
        """
1076
        revision_ids = self.all_revision_ids()
1077
        w = self.get_inventory_weave()
1078
        pb = ui.ui_factory.nested_progress_bar()
1079
        try:
1080
            return self._find_text_key_references_from_xml_inventory_lines(
1081
                w.iter_lines_added_or_present_in_versions(revision_ids, pb=pb))
1082
        finally:
1083
            pb.finished()
1084
2988.1.1 by Robert Collins
Refactor fetch's xml inventory parsing into a core routine that extracts the data and a separate one that filters for fetch.
1085
    def _find_text_key_references_from_xml_inventory_lines(self,
1086
        line_iterator):
1087
        """Core routine for extracting references to texts from inventories.
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1088
1089
        This performs the translation of xml lines to revision ids.
1090
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1091
        :param line_iterator: An iterator of lines, origin_version_id
2988.1.1 by Robert Collins
Refactor fetch's xml inventory parsing into a core routine that extracts the data and a separate one that filters for fetch.
1092
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1093
            to whether they were referred to by the inventory of the
1094
            revision_id that they contain. Note that if that revision_id was
1095
            not part of the line_iterator's output then False will be given -
1096
            even though it may actually refer to that key.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1097
        """
2988.2.2 by Robert Collins
Review feedback.
1098
        if not self._serializer.support_altered_by_hack:
1099
            raise AssertionError(
1100
                "_find_text_key_references_from_xml_inventory_lines only "
1101
                "supported for branches which store inventory as unnested xml"
1102
                ", not on %r" % self)
1694.2.6 by Martin Pool
[merge] bzr.dev
1103
        result = {}
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1104
1694.2.6 by Martin Pool
[merge] bzr.dev
1105
        # this code needs to read every new line in every inventory for the
1106
        # inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1107
        # not present in one of those inventories is unnecessary but not 
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
1108
        # harmful because we are filtering by the revision id marker in the
1694.2.6 by Martin Pool
[merge] bzr.dev
1109
        # inventory lines : we only select file ids altered in one of those  
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1110
        # revisions. We don't need to see all lines in the inventory because
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
1111
        # only those added in an inventory in rev X can contain a revision=X
1112
        # line.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1113
        unescape_revid_cache = {}
1114
        unescape_fileid_cache = {}
1115
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
1116
        # jam 20061218 In a big fetch, this handles hundreds of thousands
1117
        # of lines, so it has had a lot of inlining and optimizing done.
1118
        # Sorry that it is a little bit messy.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1119
        # Move several functions to be local variables, since this is a long
1120
        # running loop.
1121
        search = self._file_ids_altered_regex.search
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
1122
        unescape = _unescape_xml
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1123
        setdefault = result.setdefault
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1124
        for line, version_id in line_iterator:
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1125
            match = search(line)
1126
            if match is None:
1127
                continue
1128
            # One call to match.group() returning multiple items is quite a
1129
            # bit faster than 2 calls to match.group() each returning 1
1130
            file_id, revision_id = match.group('file_id', 'revision_id')
1131
1132
            # Inlining the cache lookups helps a lot when you make 170,000
1133
            # lines and 350k ids, versus 8.4 unique ids.
1134
            # Using a cache helps in 2 ways:
1135
            #   1) Avoids unnecessary decoding calls
1136
            #   2) Re-uses cached strings, which helps in future set and
1137
            #      equality checks.
1138
            # (2) is enough that removing encoding entirely along with
1139
            # the cache (so we are using plain strings) results in no
1140
            # performance improvement.
1141
            try:
1142
                revision_id = unescape_revid_cache[revision_id]
1143
            except KeyError:
1144
                unescaped = unescape(revision_id)
1145
                unescape_revid_cache[revision_id] = unescaped
1146
                revision_id = unescaped
1147
2988.2.2 by Robert Collins
Review feedback.
1148
            # Note that unconditionally unescaping means that we deserialise
1149
            # every fileid, which for general 'pull' is not great, but we don't
1150
            # really want to have some many fulltexts that this matters anyway.
1151
            # RBC 20071114.
2988.1.1 by Robert Collins
Refactor fetch's xml inventory parsing into a core routine that extracts the data and a separate one that filters for fetch.
1152
            try:
1153
                file_id = unescape_fileid_cache[file_id]
1154
            except KeyError:
1155
                unescaped = unescape(file_id)
1156
                unescape_fileid_cache[file_id] = unescaped
1157
                file_id = unescaped
1158
1159
            key = (file_id, revision_id)
1160
            setdefault(key, False)
1161
            if revision_id == version_id:
1162
                result[key] = True
1163
        return result
1164
1165
    def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
1166
        revision_ids):
1167
        """Helper routine for fileids_altered_by_revision_ids.
1168
1169
        This performs the translation of xml lines to revision ids.
1170
1171
        :param line_iterator: An iterator of lines, origin_version_id
1172
        :param revision_ids: The revision ids to filter for. This should be a
1173
            set or other type which supports efficient __contains__ lookups, as
1174
            the revision id from each parsed line will be looked up in the
1175
            revision_ids filter.
1176
        :return: a dictionary mapping altered file-ids to an iterable of
1177
        revision_ids. Each altered file-ids has the exact revision_ids that
1178
        altered it listed explicitly.
1179
        """
1180
        result = {}
1181
        setdefault = result.setdefault
1182
        for file_id, revision_id in \
1183
            self._find_text_key_references_from_xml_inventory_lines(
1184
                line_iterator).iterkeys():
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1185
            # once data is all ensured-consistent; then this is
1186
            # if revision_id == version_id
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1187
            if revision_id in revision_ids:
1188
                setdefault(file_id, set()).add(revision_id)
1189
        return result
1190
1191
    def fileids_altered_by_revision_ids(self, revision_ids):
1192
        """Find the file ids and versions affected by revisions.
1193
1194
        :param revisions: an iterable containing revision ids.
1195
        :return: a dictionary mapping altered file-ids to an iterable of
1196
        revision_ids. Each altered file-ids has the exact revision_ids that
1197
        altered it listed explicitly.
1198
        """
2592.3.185 by Robert Collins
Merge bzr.dev.
1199
        selected_revision_ids = set(revision_ids)
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1200
        w = self.get_inventory_weave()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1201
        pb = ui.ui_factory.nested_progress_bar()
1202
        try:
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1203
            return self._find_file_ids_from_xml_inventory_lines(
1204
                w.iter_lines_added_or_present_in_versions(
1205
                    selected_revision_ids, pb=pb),
1206
                selected_revision_ids)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1207
        finally:
1208
            pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1209
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1210
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1211
        """Iterate through file versions.
1212
2708.1.10 by Aaron Bentley
Update docstrings
1213
        Files will not necessarily be returned in the order they occur in
1214
        desired_files.  No specific order is guaranteed.
1215
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1216
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
2708.1.10 by Aaron Bentley
Update docstrings
1217
        value supplied by the caller as part of desired_files.  It should
1218
        uniquely identify the file version in the caller's context.  (Examples:
1219
        an index number or a TreeTransform trans_id.)
1220
1221
        bytes_iterator is an iterable of bytestrings for the file.  The
1222
        kind of iterable and length of the bytestrings are unspecified, but for
1223
        this implementation, it is a list of lines produced by
1224
        VersionedFile.get_lines().
1225
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1226
        :param desired_files: a list of (file_id, revision_id, identifier)
2708.1.10 by Aaron Bentley
Update docstrings
1227
            triples
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1228
        """
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1229
        transaction = self.get_transaction()
1230
        for file_id, revision_id, callable_data in desired_files:
2708.1.11 by Aaron Bentley
Test and tweak error handling
1231
            try:
1232
                weave = self.weave_store.get_weave(file_id, transaction)
1233
            except errors.NoSuchFile:
1234
                raise errors.NoSuchIdInRepository(self, file_id)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1235
            yield callable_data, weave.get_lines(revision_id)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1236
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
1237
    def _generate_text_key_index(self):
1238
        """Generate a new text key index for the repository.
1239
1240
        This is an expensive function that will take considerable time to run.
1241
1242
        :return: A dict mapping text keys ((file_id, revision_id) tuples) to a
1243
            list of parents, also text keys. When a given key has no parents,
1244
            the parents list will be [NULL_REVISION].
1245
        """
1246
        # All revisions, to find inventory parents.
1247
        revision_graph = self.get_revision_graph_with_ghosts()
1248
        ancestors = revision_graph.get_ancestors()
2988.3.1 by Robert Collins
Handle the progress bar in _generate_text_key_index correctly.
1249
        text_key_references = self.find_text_key_references()
1250
        pb = ui.ui_factory.nested_progress_bar()
1251
        try:
1252
            return self._do_generate_text_key_index(ancestors,
1253
                text_key_references, pb)
1254
        finally:
1255
            pb.finished()
1256
1257
    def _do_generate_text_key_index(self, ancestors, text_key_references, pb):
1258
        """Helper for _generate_text_key_index to avoid deep nesting."""
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
1259
        revision_order = tsort.topo_sort(ancestors)
1260
        invalid_keys = set()
1261
        revision_keys = {}
1262
        for revision_id in revision_order:
1263
            revision_keys[revision_id] = set()
1264
        text_count = len(text_key_references)
1265
        # a cache of the text keys to allow reuse; costs a dict of all the
1266
        # keys, but saves a 2-tuple for every child of a given key.
1267
        text_key_cache = {}
1268
        for text_key, valid in text_key_references.iteritems():
1269
            if not valid:
1270
                invalid_keys.add(text_key)
1271
            else:
1272
                revision_keys[text_key[1]].add(text_key)
1273
            text_key_cache[text_key] = text_key
1274
        del text_key_references
1275
        text_index = {}
1276
        text_graph = graph.Graph(graph.DictParentsProvider(text_index))
1277
        NULL_REVISION = _mod_revision.NULL_REVISION
2988.1.5 by Robert Collins
Use a LRU cache when generating the text index to reduce inventory deserialisations.
1278
        # Set a cache with a size of 10 - this suffices for bzr.dev but may be
1279
        # too small for large or very branchy trees. However, for 55K path
1280
        # trees, it would be easy to use too much memory trivially. Ideally we
1281
        # could gauge this by looking at available real memory etc, but this is
1282
        # always a tricky proposition.
1283
        inventory_cache = lru_cache.LRUCache(10)
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
1284
        batch_size = 10 # should be ~150MB on a 55K path tree
1285
        batch_count = len(revision_order) / batch_size + 1
1286
        processed_texts = 0
1287
        pb.update("Calculating text parents.", processed_texts, text_count)
1288
        for offset in xrange(batch_count):
1289
            to_query = revision_order[offset * batch_size:(offset + 1) *
1290
                batch_size]
1291
            if not to_query:
1292
                break
1293
            for rev_tree in self.revision_trees(to_query):
1294
                revision_id = rev_tree.get_revision_id()
1295
                parent_ids = ancestors[revision_id]
1296
                for text_key in revision_keys[revision_id]:
1297
                    pb.update("Calculating text parents.", processed_texts)
1298
                    processed_texts += 1
1299
                    candidate_parents = []
1300
                    for parent_id in parent_ids:
1301
                        parent_text_key = (text_key[0], parent_id)
1302
                        try:
1303
                            check_parent = parent_text_key not in \
1304
                                revision_keys[parent_id]
1305
                        except KeyError:
1306
                            # the parent parent_id is a ghost:
1307
                            check_parent = False
1308
                            # truncate the derived graph against this ghost.
1309
                            parent_text_key = None
1310
                        if check_parent:
1311
                            # look at the parent commit details inventories to
1312
                            # determine possible candidates in the per file graph.
1313
                            # TODO: cache here.
2988.1.5 by Robert Collins
Use a LRU cache when generating the text index to reduce inventory deserialisations.
1314
                            try:
1315
                                inv = inventory_cache[parent_id]
1316
                            except KeyError:
1317
                                inv = self.revision_tree(parent_id).inventory
1318
                                inventory_cache[parent_id] = inv
1319
                            parent_entry = inv._byid.get(text_key[0], None)
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
1320
                            if parent_entry is not None:
1321
                                parent_text_key = (
1322
                                    text_key[0], parent_entry.revision)
1323
                            else:
1324
                                parent_text_key = None
1325
                        if parent_text_key is not None:
1326
                            candidate_parents.append(
1327
                                text_key_cache[parent_text_key])
1328
                    parent_heads = text_graph.heads(candidate_parents)
1329
                    new_parents = list(parent_heads)
1330
                    new_parents.sort(key=lambda x:candidate_parents.index(x))
1331
                    if new_parents == []:
1332
                        new_parents = [NULL_REVISION]
1333
                    text_index[text_key] = new_parents
1334
1335
        for text_key in invalid_keys:
1336
            text_index[text_key] = [NULL_REVISION]
1337
        return text_index
1338
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
1339
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1340
        """Get an iterable listing the keys of all the data introduced by a set
1341
        of revision IDs.
1342
1343
        The keys will be ordered so that the corresponding items can be safely
1344
        fetched and inserted in that order.
1345
1346
        :returns: An iterable producing tuples of (knit-kind, file-id,
1347
            versions).  knit-kind is one of 'file', 'inventory', 'signatures',
1348
            'revisions'.  file-id is None unless knit-kind is 'file'.
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1349
        """
1350
        # XXX: it's a bit weird to control the inventory weave caching in this
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
1351
        # generator.  Ideally the caching would be done in fetch.py I think.  Or
1352
        # maybe this generator should explicitly have the contract that it
1353
        # should not be iterated until the previously yielded item has been
1354
        # processed?
2535.3.47 by Andrew Bennetts
Massively improve item_keys_introduced_by performance by calling self.lock_read().
1355
        self.lock_read()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1356
        inv_w = self.get_inventory_weave()
1357
        inv_w.enable_cache()
1358
1359
        # file ids that changed
1360
        file_ids = self.fileids_altered_by_revision_ids(revision_ids)
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
1361
        count = 0
1362
        num_file_ids = len(file_ids)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1363
        for file_id, altered_versions in file_ids.iteritems():
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
1364
            if _files_pb is not None:
1365
                _files_pb.update("fetch texts", count, num_file_ids)
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
1366
            count += 1
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1367
            yield ("file", file_id, altered_versions)
2535.3.9 by Andrew Bennetts
More comments.
1368
        # We're done with the files_pb.  Note that it finished by the caller,
1369
        # just as it was created by the caller.
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
1370
        del _files_pb
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1371
1372
        # inventory
1373
        yield ("inventory", None, revision_ids)
1374
        inv_w.clear_cache()
1375
1376
        # signatures
2535.3.25 by Andrew Bennetts
Fetch signatures too.
1377
        revisions_with_signatures = set()
1378
        for rev_id in revision_ids:
1379
            try:
1380
                self.get_signature_text(rev_id)
1381
            except errors.NoSuchRevision:
1382
                # not signed.
1383
                pass
1384
            else:
1385
                revisions_with_signatures.add(rev_id)
2535.3.47 by Andrew Bennetts
Massively improve item_keys_introduced_by performance by calling self.lock_read().
1386
        self.unlock()
2535.3.25 by Andrew Bennetts
Fetch signatures too.
1387
        yield ("signatures", None, revisions_with_signatures)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1388
1389
        # revisions
1390
        yield ("revisions", None, revision_ids)
1391
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1392
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1393
    def get_inventory_weave(self):
1394
        return self.control_weaves.get_weave('inventory',
1395
            self.get_transaction())
1396
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1397
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1398
    def get_inventory(self, revision_id):
1399
        """Get Inventory object by hash."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1400
        return self.deserialise_inventory(
1401
            revision_id, self.get_inventory_xml(revision_id))
1402
1403
    def deserialise_inventory(self, revision_id, xml):
1404
        """Transform the xml into an inventory object. 
1405
1406
        :param revision_id: The expected revision id of the inventory.
1407
        :param xml: A serialised inventory.
1408
        """
2889.1.3 by Robert Collins
Merge bzr.dev.
1409
        return self._serializer.read_inventory_from_string(xml, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1410
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1411
    def serialise_inventory(self, inv):
1910.2.48 by Aaron Bentley
Update from review comments
1412
        return self._serializer.write_inventory_to_string(inv)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1413
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
1414
    def _serialise_inventory_to_lines(self, inv):
1415
        return self._serializer.write_inventory_to_lines(inv)
1416
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1417
    def get_serializer_format(self):
1418
        return self._serializer.format_num
1419
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1420
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1421
    def get_inventory_xml(self, revision_id):
1422
        """Get inventory XML as a file object."""
1423
        try:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1424
            assert isinstance(revision_id, str), type(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1425
            iw = self.get_inventory_weave()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1426
            return iw.get_text(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1427
        except IndexError:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1428
            raise errors.HistoryMissing(self, 'inventory', revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1429
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1430
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1431
    def get_inventory_sha1(self, revision_id):
1432
        """Return the sha1 hash of the inventory entry
1433
        """
1434
        return self.get_revision(revision_id).inventory_sha1
1435
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1436
    @needs_read_lock
2850.3.2 by Robert Collins
Review feedback.
1437
    def get_revision_graph(self, revision_id=None):
1438
        """Return a dictionary containing the revision graph.
1439
1440
        NB: This method should not be used as it accesses the entire graph all
1441
        at once, which is much more data than most operations should require.
1442
1443
        :param revision_id: The revision_id to get a graph from. If None, then
1444
        the entire revision graph is returned. This is a deprecated mode of
1445
        operation and will be removed in the future.
1446
        :return: a dictionary of revision_id->revision_parents_list.
1447
        """
1448
        raise NotImplementedError(self.get_revision_graph)
1449
1450
    @needs_read_lock
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1451
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1452
        """Return a graph of the revisions with ghosts marked as applicable.
1453
1454
        :param revision_ids: an iterable of revisions to graph or None for all.
1455
        :return: a Graph object with the graph reachable from revision_ids.
1456
        """
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1457
        if 'evil' in debug.debug_flags:
2592.3.112 by Robert Collins
Various fixups found dogfooding.
1458
            mutter_callsite(3,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1459
                "get_revision_graph_with_ghosts scales with size of history.")
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1460
        result = deprecated_graph.Graph()
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1461
        if not revision_ids:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1462
            pending = set(self.all_revision_ids())
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1463
            required = set([])
1464
        else:
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
1465
            pending = set(revision_ids)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1466
            # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1467
            if _mod_revision.NULL_REVISION in pending:
1468
                pending.remove(_mod_revision.NULL_REVISION)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1469
            required = set(pending)
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1470
        done = set([])
1471
        while len(pending):
1472
            revision_id = pending.pop()
1473
            try:
1474
                rev = self.get_revision(revision_id)
1475
            except errors.NoSuchRevision:
1476
                if revision_id in required:
1477
                    raise
1478
                # a ghost
1479
                result.add_ghost(revision_id)
1480
                continue
1481
            for parent_id in rev.parent_ids:
1482
                # is this queued or done ?
1483
                if (parent_id not in pending and
1484
                    parent_id not in done):
1485
                    # no, queue it.
1486
                    pending.add(parent_id)
1487
            result.add_node(revision_id, rev.parent_ids)
1594.2.15 by Robert Collins
Unfuck performance.
1488
            done.add(revision_id)
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1489
        return result
1490
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1491
    def _get_history_vf(self):
1492
        """Get a versionedfile whose history graph reflects all revisions.
1493
1494
        For weave repositories, this is the inventory weave.
1495
        """
1496
        return self.get_inventory_weave()
1497
1498
    def iter_reverse_revision_history(self, revision_id):
1499
        """Iterate backwards through revision ids in the lefthand history
1500
1501
        :param revision_id: The revision id to start with.  All its lefthand
1502
            ancestors will be traversed.
1503
        """
1504
        if revision_id in (None, _mod_revision.NULL_REVISION):
1505
            return
1506
        next_id = revision_id
1507
        versionedfile = self._get_history_vf()
1508
        while True:
1509
            yield next_id
1510
            parents = versionedfile.get_parents(next_id)
1511
            if len(parents) == 0:
1512
                return
1513
            else:
1514
                next_id = parents[0]
1515
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1516
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1517
    def get_revision_inventory(self, revision_id):
1518
        """Return inventory of a past revision."""
1519
        # TODO: Unify this with get_inventory()
1520
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
1521
        # must be the same as its revision, so this is trivial.
1534.4.28 by Robert Collins
first cut at merge from integration.
1522
        if revision_id is None:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1523
            # This does not make sense: if there is no revision,
1524
            # then it is the current tree inventory surely ?!
1525
            # and thus get_root_id() is something that looks at the last
1526
            # commit on the branch, and the get_root_id is an inventory check.
1527
            raise NotImplementedError
1528
            # return Inventory(self.get_root_id())
1529
        else:
1530
            return self.get_inventory(revision_id)
1531
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1532
    @needs_read_lock
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1533
    def is_shared(self):
1534
        """Return True if this repository is flagged as a shared repository."""
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1535
        raise NotImplementedError(self.is_shared)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1536
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1537
    @needs_write_lock
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1538
    def reconcile(self, other=None, thorough=False):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1539
        """Reconcile this repository."""
1540
        from bzrlib.reconcile import RepoReconciler
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1541
        reconciler = RepoReconciler(self, thorough=thorough)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1542
        reconciler.reconcile()
1543
        return reconciler
2440.1.1 by Martin Pool
Add new Repository.sprout,
1544
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1545
    def _refresh_data(self):
1546
        """Helper called from lock_* to ensure coherency with disk.
1547
1548
        The default implementation does nothing; it is however possible
1549
        for repositories to maintain loaded indices across multiple locks
1550
        by checking inside their implementation of this method to see
1551
        whether their indices are still valid. This depends of course on
1552
        the disk format being validatable in this manner.
1553
        """
1554
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1555
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1556
    def revision_tree(self, revision_id):
1557
        """Return Tree for a revision on this branch.
1558
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1559
        `revision_id` may be None for the empty tree revision.
1560
        """
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1561
        # TODO: refactor this to use an existing revision object
1562
        # so we don't need to read it in twice.
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1563
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1731.1.61 by Aaron Bentley
Merge bzr.dev
1564
            return RevisionTree(self, Inventory(root_id=None), 
1565
                                _mod_revision.NULL_REVISION)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1566
        else:
1567
            inv = self.get_revision_inventory(revision_id)
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
1568
            return RevisionTree(self, inv, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1569
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1570
    @needs_read_lock
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1571
    def revision_trees(self, revision_ids):
1572
        """Return Tree for a revision on this branch.
1573
1756.3.19 by Aaron Bentley
Documentation and cleanups
1574
        `revision_id` may not be None or 'null:'"""
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1575
        assert None not in revision_ids
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1576
        assert _mod_revision.NULL_REVISION not in revision_ids
1756.3.5 by Aaron Bentley
Switch to get_texts, optimize get_texts
1577
        texts = self.get_inventory_weave().get_texts(revision_ids)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1578
        for text, revision_id in zip(texts, revision_ids):
1579
            inv = self.deserialise_inventory(revision_id, text)
1580
            yield RevisionTree(self, inv, revision_id)
1581
1582
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1583
    def get_ancestry(self, revision_id, topo_sorted=True):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1584
        """Return a list of revision-ids integrated by a revision.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1585
1586
        The first element of the list is always None, indicating the origin 
1587
        revision.  This might change when we have history horizons, or 
1588
        perhaps we should have a new API.
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1589
        
1590
        This is topologically sorted.
1591
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1592
        if _mod_revision.is_null(revision_id):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1593
            return [None]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1594
        if not self.has_revision(revision_id):
1595
            raise errors.NoSuchRevision(self, revision_id)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1596
        w = self.get_inventory_weave()
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1597
        candidates = w.get_ancestry(revision_id, topo_sorted)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1598
        return [None] + candidates # self._eliminate_revisions_not_present(candidates)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1599
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1600
    def pack(self):
1601
        """Compress the data within the repository.
1602
1603
        This operation only makes sense for some repository types. For other
1604
        types it should be a no-op that just returns.
1605
1606
        This stub method does not require a lock, but subclasses should use
1607
        @needs_write_lock as this is a long running call its reasonable to 
1608
        implicitly lock for the user.
1609
        """
1610
1185.65.4 by Aaron Bentley
Fixed cat command
1611
    @needs_read_lock
1612
    def print_file(self, file, revision_id):
1185.65.29 by Robert Collins
Implement final review suggestions.
1613
        """Print `file` to stdout.
1614
        
1615
        FIXME RBC 20060125 as John Meinel points out this is a bad api
1616
        - it writes to stdout, it assumes that that is valid etc. Fix
1617
        by creating a new more flexible convenience function.
1618
        """
1185.65.4 by Aaron Bentley
Fixed cat command
1619
        tree = self.revision_tree(revision_id)
1620
        # use inventory as it was in that revision
1621
        file_id = tree.inventory.path2id(file)
1622
        if not file_id:
1685.1.26 by John Arbash Meinel
Repository had a bug with what exception was raised when a file was missing
1623
            # TODO: jam 20060427 Write a test for this code path
1624
            #       it had a bug in it, and was raising the wrong
1625
            #       exception.
1626
            raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
1185.65.4 by Aaron Bentley
Fixed cat command
1627
        tree.print_file(file_id)
1628
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1629
    def get_transaction(self):
1630
        return self.control_files.get_transaction()
1631
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1632
    def revision_parents(self, revision_id):
1633
        return self.get_inventory_weave().parent_names(revision_id)
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1634
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1635
    def get_parents(self, revision_ids):
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1636
        """See StackedParentsProvider.get_parents"""
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1637
        parents_list = []
1638
        for revision_id in revision_ids:
1639
            if revision_id == _mod_revision.NULL_REVISION:
1640
                parents = []
1641
            else:
1642
                try:
1643
                    parents = self.get_revision(revision_id).parent_ids
1644
                except errors.NoSuchRevision:
1645
                    parents = None
1646
                else:
1647
                    if len(parents) == 0:
1648
                        parents = [_mod_revision.NULL_REVISION]
1649
            parents_list.append(parents)
1650
        return parents_list
1651
1652
    def _make_parents_provider(self):
1653
        return self
1654
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1655
    def get_graph(self, other_repository=None):
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1656
        """Return the graph walker for this repository format"""
1657
        parents_provider = self._make_parents_provider()
2490.2.14 by Aaron Bentley
Avoid StackedParentsProvider when underlying repos match
1658
        if (other_repository is not None and
1659
            other_repository.bzrdir.transport.base !=
1660
            self.bzrdir.transport.base):
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1661
            parents_provider = graph._StackedParentsProvider(
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1662
                [parents_provider, other_repository._make_parents_provider()])
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1663
        return graph.Graph(parents_provider)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1664
2988.1.6 by Robert Collins
Change the contract for VersionedFileChecker to consolidate related parameters rather than splitting them across two api calls. This allows better reuse of a single checker object.
1665
    def get_versioned_file_checker(self):
1666
        """Return an object suitable for checking versioned files."""
1667
        return VersionedFileChecker(self)
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
1668
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1669
    @needs_write_lock
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1670
    def set_make_working_trees(self, new_value):
1671
        """Set the policy flag for making working trees when creating branches.
1672
1673
        This only applies to branches that use this repository.
1674
1675
        The default is 'True'.
1676
        :param new_value: True to restore the default, False to disable making
1677
                          working trees.
1678
        """
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1679
        raise NotImplementedError(self.set_make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1680
    
1681
    def make_working_trees(self):
1682
        """Returns the policy for making working trees on new branches."""
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1683
        raise NotImplementedError(self.make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1684
1685
    @needs_write_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1686
    def sign_revision(self, revision_id, gpg_strategy):
1687
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1688
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1689
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1690
    @needs_read_lock
1691
    def has_signature_for_revision_id(self, revision_id):
1692
        """Query for a revision signature for revision_id in the repository."""
1693
        return self._revision_store.has_signature(revision_id,
1694
                                                  self.get_transaction())
1695
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1696
    @needs_read_lock
1697
    def get_signature_text(self, revision_id):
1698
        """Return the text for a signature."""
1699
        return self._revision_store.get_signature_text(revision_id,
1700
                                                       self.get_transaction())
1701
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1702
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1703
    def check(self, revision_ids=None):
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1704
        """Check consistency of all history of given revision_ids.
1705
1706
        Different repository implementations should override _check().
1707
1708
        :param revision_ids: A non-empty list of revision_ids whose ancestry
1709
             will be checked.  Typically the last revision_id of a branch.
1710
        """
1711
        return self._check(revision_ids)
1712
1713
    def _check(self, revision_ids):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1714
        result = check.Check(self)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1715
        result.check()
1716
        return result
1717
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1718
    def _warn_if_deprecated(self):
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
1719
        global _deprecation_warning_done
1720
        if _deprecation_warning_done:
1721
            return
1722
        _deprecation_warning_done = True
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1723
        warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
1724
                % (self._format, self.bzrdir.transport.base))
1725
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1726
    def supports_rich_root(self):
1727
        return self._format.rich_root_data
1728
2150.2.2 by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr.
1729
    def _check_ascii_revisionid(self, revision_id, method):
1730
        """Private helper for ascii-only repositories."""
1731
        # weave repositories refuse to store revisionids that are non-ascii.
1732
        if revision_id is not None:
1733
            # weaves require ascii revision ids.
1734
            if isinstance(revision_id, unicode):
1735
                try:
1736
                    revision_id.encode('ascii')
1737
                except UnicodeEncodeError:
1738
                    raise errors.NonAsciiRevisionId(method, self)
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
1739
            else:
1740
                try:
1741
                    revision_id.decode('ascii')
1742
                except UnicodeDecodeError:
1743
                    raise errors.NonAsciiRevisionId(method, self)
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1744
    
1745
    def revision_graph_can_have_wrong_parents(self):
1746
        """Is it possible for this repository to have a revision graph with
1747
        incorrect parents?
2150.2.2 by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr.
1748
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1749
        If True, then this repository must also implement
1750
        _find_inconsistent_revision_parents so that check and reconcile can
1751
        check for inconsistencies before proceeding with other checks that may
1752
        depend on the revision index being consistent.
1753
        """
1754
        raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
1755
        
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1756
# remove these delegates a while after bzr 0.15
1757
def __make_delegated(name, from_module):
1758
    def _deprecated_repository_forwarder():
1759
        symbol_versioning.warn('%s moved to %s in bzr 0.15'
1760
            % (name, from_module),
2241.1.20 by mbp at sourcefrog
update tests for new locations of weave repos
1761
            DeprecationWarning,
1762
            stacklevel=2)
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1763
        m = __import__(from_module, globals(), locals(), [name])
1764
        try:
1765
            return getattr(m, name)
1766
        except AttributeError:
1767
            raise AttributeError('module %s has no name %s'
1768
                    % (m, name))
1769
    globals()[name] = _deprecated_repository_forwarder
1770
1771
for _name in [
1772
        'AllInOneRepository',
1773
        'WeaveMetaDirRepository',
1774
        'PreSplitOutRepositoryFormat',
1775
        'RepositoryFormat4',
1776
        'RepositoryFormat5',
1777
        'RepositoryFormat6',
1778
        'RepositoryFormat7',
1779
        ]:
1780
    __make_delegated(_name, 'bzrlib.repofmt.weaverepo')
1781
1782
for _name in [
1783
        'KnitRepository',
1784
        'RepositoryFormatKnit',
1785
        'RepositoryFormatKnit1',
1786
        ]:
1787
    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
1788
1789
2996.2.2 by Aaron Bentley
Create install_revisions function
1790
def install_revision(repository, rev, revision_tree):
1791
    """Install all revision data into a repository."""
1792
    install_revisions(repository, [(rev, revision_tree, None)])
1793
1794
1795
def install_revisions(repository, iterable):
2996.2.4 by Aaron Bentley
Rename function to add_signature_text
1796
    """Install all revision data into a repository.
1797
1798
    Accepts an iterable of revision, tree, signature tuples.  The signature
1799
    may be None.
1800
    """
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1801
    repository.start_write_group()
1802
    try:
2996.2.2 by Aaron Bentley
Create install_revisions function
1803
        for revision, revision_tree, signature in iterable:
1804
            _install_revision(repository, revision, revision_tree, signature)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1805
    except:
1806
        repository.abort_write_group()
2592.3.101 by Robert Collins
Correctly propogate exceptions from repository.install_revisions.
1807
        raise
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1808
    else:
1809
        repository.commit_write_group()
1810
1811
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
1812
def _install_revision(repository, rev, revision_tree, signature):
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1813
    """Install all revision data into a repository."""
1185.82.84 by Aaron Bentley
Moved stuff around
1814
    present_parents = []
1815
    parent_trees = {}
1816
    for p_id in rev.parent_ids:
1817
        if repository.has_revision(p_id):
1818
            present_parents.append(p_id)
1819
            parent_trees[p_id] = repository.revision_tree(p_id)
1820
        else:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1821
            parent_trees[p_id] = repository.revision_tree(None)
1185.82.84 by Aaron Bentley
Moved stuff around
1822
1823
    inv = revision_tree.inventory
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
1824
    entries = inv.iter_entries()
2617.6.6 by Robert Collins
Some review feedback.
1825
    # backwards compatibility hack: skip the root id.
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1826
    if not repository.supports_rich_root():
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
1827
        path, root = entries.next()
1828
        if root.revision != rev.revision_id:
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1829
            raise errors.IncompatibleRevision(repr(repository))
1185.82.84 by Aaron Bentley
Moved stuff around
1830
    # Add the texts that are not already present
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1831
    for path, ie in entries:
1185.82.84 by Aaron Bentley
Moved stuff around
1832
        w = repository.weave_store.get_weave_or_empty(ie.file_id,
1833
                repository.get_transaction())
1834
        if ie.revision not in w:
1835
            text_parents = []
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
1836
            # FIXME: TODO: The following loop *may* be overlapping/duplicate
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1837
            # with InventoryEntry.find_previous_heads(). if it is, then there
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
1838
            # is a latent bug here where the parents may have ancestors of each
1839
            # other. RBC, AB
1185.82.84 by Aaron Bentley
Moved stuff around
1840
            for revision, tree in parent_trees.iteritems():
1841
                if ie.file_id not in tree:
1842
                    continue
1843
                parent_id = tree.inventory[ie.file_id].revision
1844
                if parent_id in text_parents:
1845
                    continue
1846
                text_parents.append(parent_id)
1847
                    
1848
            vfile = repository.weave_store.get_weave_or_empty(ie.file_id, 
1849
                repository.get_transaction())
1850
            lines = revision_tree.get_file(ie.file_id).readlines()
1851
            vfile.add_lines(rev.revision_id, text_parents, lines)
1852
    try:
1853
        # install the inventory
1854
        repository.add_inventory(rev.revision_id, inv, present_parents)
1855
    except errors.RevisionAlreadyPresent:
1856
        pass
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
1857
    if signature is not None:
2996.2.8 by Aaron Bentley
Fix add_signature discrepancies
1858
        repository.add_signature_text(rev.revision_id, signature)
1185.82.84 by Aaron Bentley
Moved stuff around
1859
    repository.add_revision(rev.revision_id, rev, inv)
1860
1861
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1862
class MetaDirRepository(Repository):
1863
    """Repositories in the new meta-dir layout."""
1864
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1865
    def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1866
        super(MetaDirRepository, self).__init__(_format,
1867
                                                a_bzrdir,
1868
                                                control_files,
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1869
                                                _revision_store,
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1870
                                                control_store,
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1871
                                                text_store)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1872
        dir_mode = self.control_files._dir_mode
1873
        file_mode = self.control_files._file_mode
1874
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1875
    @needs_read_lock
1876
    def is_shared(self):
1877
        """Return True if this repository is flagged as a shared repository."""
1878
        return self.control_files._transport.has('shared-storage')
1879
1880
    @needs_write_lock
1881
    def set_make_working_trees(self, new_value):
1882
        """Set the policy flag for making working trees when creating branches.
1883
1884
        This only applies to branches that use this repository.
1885
1886
        The default is 'True'.
1887
        :param new_value: True to restore the default, False to disable making
1888
                          working trees.
1889
        """
1890
        if new_value:
1891
            try:
1892
                self.control_files._transport.delete('no-working-trees')
1893
            except errors.NoSuchFile:
1894
                pass
1895
        else:
1896
            self.control_files.put_utf8('no-working-trees', '')
1897
    
1898
    def make_working_trees(self):
1899
        """Returns the policy for making working trees on new branches."""
1900
        return not self.control_files._transport.has('no-working-trees')
1901
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1902
2241.1.2 by Martin Pool
change to using external Repository format registry
1903
class RepositoryFormatRegistry(registry.Registry):
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
1904
    """Registry of RepositoryFormats."""
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1905
1906
    def get(self, format_string):
1907
        r = registry.Registry.get(self, format_string)
1908
        if callable(r):
1909
            r = r()
1910
        return r
2241.1.2 by Martin Pool
change to using external Repository format registry
1911
    
1912
1913
format_registry = RepositoryFormatRegistry()
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1914
"""Registry of formats, indexed by their identifying format string.
1915
1916
This can contain either format instances themselves, or classes/factories that
1917
can be called to obtain one.
1918
"""
2241.1.2 by Martin Pool
change to using external Repository format registry
1919
2220.2.3 by Martin Pool
Add tag: revision namespace.
1920
1921
#####################################################################
1922
# Repository Formats
1910.2.46 by Aaron Bentley
Whitespace fix
1923
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1924
class RepositoryFormat(object):
1925
    """A repository format.
1926
1927
    Formats provide three things:
1928
     * An initialization routine to construct repository data on disk.
1929
     * a format string which is used when the BzrDir supports versioned
1930
       children.
1931
     * an open routine which returns a Repository instance.
1932
2889.1.2 by Robert Collins
Review feedback.
1933
    There is one and only one Format subclass for each on-disk format. But
1934
    there can be one Repository subclass that is used for several different
1935
    formats. The _format attribute on a Repository instance can be used to
1936
    determine the disk format.
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
1937
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1938
    Formats are placed in an dict by their format string for reference 
1939
    during opening. These should be subclasses of RepositoryFormat
1940
    for consistency.
1941
1942
    Once a format is deprecated, just deprecate the initialize and open
1943
    methods on the format class. Do not deprecate the object, as the 
1944
    object will be created every system load.
1945
1946
    Common instance attributes:
1947
    _matchingbzrdir - the bzrdir format that the repository format was
1948
    originally written to work with. This can be used if manually
1949
    constructing a bzrdir and repository, or more commonly for test suite
1950
    parameterisation.
1951
    """
1952
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
1953
    # Set to True or False in derived classes. True indicates that the format
1954
    # supports ghosts gracefully.
1955
    supports_ghosts = None
1956
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1957
    def __str__(self):
1958
        return "<%s>" % self.__class__.__name__
1959
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1960
    def __eq__(self, other):
1961
        # format objects are generally stateless
1962
        return isinstance(other, self.__class__)
1963
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1964
    def __ne__(self, other):
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
1965
        return not self == other
1966
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1967
    @classmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1968
    def find_format(klass, a_bzrdir):
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1969
        """Return the format for the repository object in a_bzrdir.
1970
        
1971
        This is used by bzr native formats that have a "format" file in
1972
        the repository.  Other methods may be used by different types of 
1973
        control directory.
1974
        """
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1975
        try:
1976
            transport = a_bzrdir.get_repository_transport(None)
1977
            format_string = transport.get("format").read()
2241.1.2 by Martin Pool
change to using external Repository format registry
1978
            return format_registry.get(format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1979
        except errors.NoSuchFile:
1980
            raise errors.NoRepositoryPresent(a_bzrdir)
1981
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1982
            raise errors.UnknownFormatError(format=format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1983
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1984
    @classmethod
2241.1.2 by Martin Pool
change to using external Repository format registry
1985
    def register_format(klass, format):
1986
        format_registry.register(format.get_format_string(), format)
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1987
1988
    @classmethod
1989
    def unregister_format(klass, format):
2241.1.2 by Martin Pool
change to using external Repository format registry
1990
        format_registry.remove(format.get_format_string())
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1991
    
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1992
    @classmethod
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1993
    def get_default_format(klass):
1994
        """Return the current default format."""
2204.5.3 by Aaron Bentley
zap old repository default handling
1995
        from bzrlib import bzrdir
1996
        return bzrdir.format_registry.make_bzrdir('default').repository_format
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1997
1998
    def _get_control_store(self, repo_transport, control_files):
1999
        """Return the control store for this repository."""
2000
        raise NotImplementedError(self._get_control_store)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2001
2002
    def get_format_string(self):
2003
        """Return the ASCII format string that identifies this format.
2004
        
2005
        Note that in pre format ?? repositories the format string is 
2006
        not permitted nor written to disk.
2007
        """
2008
        raise NotImplementedError(self.get_format_string)
2009
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2010
    def get_format_description(self):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2011
        """Return the short description for this format."""
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2012
        raise NotImplementedError(self.get_format_description)
2013
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2014
    def _get_revision_store(self, repo_transport, control_files):
2015
        """Return the revision store object for this a_bzrdir."""
1556.1.5 by Robert Collins
Review feedback.
2016
        raise NotImplementedError(self._get_revision_store)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2017
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
2018
    def _get_text_rev_store(self,
2019
                            transport,
2020
                            control_files,
2021
                            name,
2022
                            compressed=True,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
2023
                            prefixed=False,
2024
                            serializer=None):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2025
        """Common logic for getting a revision store for a repository.
2026
        
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
2027
        see self._get_revision_store for the subclass-overridable method to 
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2028
        get the store for a repository.
2029
        """
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
2030
        from bzrlib.store.revision.text import TextRevisionStore
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2031
        dir_mode = control_files._dir_mode
2032
        file_mode = control_files._file_mode
2220.2.2 by Martin Pool
Add tag command and basic implementation
2033
        text_store = TextStore(transport.clone(name),
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
2034
                              prefixed=prefixed,
2035
                              compressed=compressed,
2036
                              dir_mode=dir_mode,
2037
                              file_mode=file_mode)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
2038
        _revision_store = TextRevisionStore(text_store, serializer)
2039
        return _revision_store
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2040
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2041
    # TODO: this shouldn't be in the base class, it's specific to things that
2042
    # use weaves or knits -- mbp 20070207
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
2043
    def _get_versioned_file_store(self,
2044
                                  name,
2045
                                  transport,
2046
                                  control_files,
2047
                                  prefixed=True,
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
2048
                                  versionedfile_class=None,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
2049
                                  versionedfile_kwargs={},
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
2050
                                  escaped=False):
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
2051
        if versionedfile_class is None:
2052
            versionedfile_class = self._versionedfile_class
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
2053
        weave_transport = control_files._transport.clone(name)
2054
        dir_mode = control_files._dir_mode
2055
        file_mode = control_files._file_mode
2056
        return VersionedFileStore(weave_transport, prefixed=prefixed,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
2057
                                  dir_mode=dir_mode,
2058
                                  file_mode=file_mode,
2059
                                  versionedfile_class=versionedfile_class,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
2060
                                  versionedfile_kwargs=versionedfile_kwargs,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
2061
                                  escaped=escaped)
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
2062
1534.6.1 by Robert Collins
allow API creation of shared repositories
2063
    def initialize(self, a_bzrdir, shared=False):
2064
        """Initialize a repository of this format in a_bzrdir.
2065
2066
        :param a_bzrdir: The bzrdir to put the new repository in it.
2067
        :param shared: The repository should be initialized as a sharable one.
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2068
        :returns: The new repository object.
2069
        
1534.6.1 by Robert Collins
allow API creation of shared repositories
2070
        This may raise UninitializableFormat if shared repository are not
2071
        compatible the a_bzrdir.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2072
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
2073
        raise NotImplementedError(self.initialize)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2074
2075
    def is_supported(self):
2076
        """Is this format supported?
2077
2078
        Supported formats must be initializable and openable.
2079
        Unsupported formats may not support initialization or committing or 
2080
        some other features depending on the reason for not being supported.
2081
        """
2082
        return True
2083
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2084
    def check_conversion_target(self, target_format):
2085
        raise NotImplementedError(self.check_conversion_target)
2086
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2087
    def open(self, a_bzrdir, _found=False):
2088
        """Return an instance of this format for the bzrdir a_bzrdir.
2089
        
2090
        _found is a private parameter, do not use it.
2091
        """
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2092
        raise NotImplementedError(self.open)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2093
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2094
2095
class MetaDirRepositoryFormat(RepositoryFormat):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2096
    """Common base class for the new repositories using the metadir layout."""
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2097
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2098
    rich_root_data = False
2323.5.17 by Martin Pool
Add supports_tree_reference to all repo formats (robert)
2099
    supports_tree_reference = False
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2100
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2101
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2102
    def __init__(self):
2103
        super(MetaDirRepositoryFormat, self).__init__()
2104
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2105
    def _create_control_files(self, a_bzrdir):
2106
        """Create the required files and the initial control_files object."""
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2107
        # FIXME: RBC 20060125 don't peek under the covers
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
2108
        # NB: no need to escape relative paths that are url safe.
2109
        repository_transport = a_bzrdir.get_repository_transport(self)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
2110
        control_files = lockable_files.LockableFiles(repository_transport,
2111
                                'lock', lockdir.LockDir)
1553.5.61 by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use.
2112
        control_files.create_lock()
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2113
        return control_files
2114
2115
    def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
2116
        """Upload the initial blank content."""
2117
        control_files = self._create_control_files(a_bzrdir)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
2118
        control_files.lock_write()
2119
        try:
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
2120
            control_files._transport.mkdir_multi(dirs,
2121
                    mode=control_files._dir_mode)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
2122
            for file, content in files:
2123
                control_files.put(file, content)
2124
            for file, content in utf8_files:
2125
                control_files.put_utf8(file, content)
1534.6.1 by Robert Collins
allow API creation of shared repositories
2126
            if shared == True:
2127
                control_files.put_utf8('shared-storage', '')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
2128
        finally:
2129
            control_files.unlock()
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
2130
2131
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2132
# formats which have no format string are not discoverable
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2133
# and not independently creatable, so are not registered.  They're 
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2134
# all in bzrlib.repofmt.weaverepo now.  When an instance of one of these is
2135
# needed, it's constructed directly by the BzrDir.  Non-native formats where
2136
# the repository is not separately opened are similar.
2137
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2138
format_registry.register_lazy(
2139
    'Bazaar-NG Repository format 7',
2140
    'bzrlib.repofmt.weaverepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2141
    'RepositoryFormat7'
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2142
    )
2592.3.22 by Robert Collins
Add new experimental repository formats.
2143
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
2144
# KEEP in sync with bzrdir.format_registry default, which controls the overall
2145
# default control directory format
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2146
format_registry.register_lazy(
2147
    'Bazaar-NG Knit Repository Format 1',
2148
    'bzrlib.repofmt.knitrepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2149
    'RepositoryFormatKnit1',
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2150
    )
2151
format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
2152
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
2153
format_registry.register_lazy(
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
2154
    'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
2155
    'bzrlib.repofmt.knitrepo',
2156
    'RepositoryFormatKnit3',
2157
    )
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2158
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2159
format_registry.register_lazy(
2160
    'Bazaar Knit Repository Format 4 (bzr 1.0)\n',
2161
    'bzrlib.repofmt.knitrepo',
2162
    'RepositoryFormatKnit4',
2163
    )
2164
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
2165
# Pack-based formats. There is one format for pre-subtrees, and one for
2166
# post-subtrees to allow ease of testing.
2939.2.5 by Ian Clatworthy
review feedback from lifeless
2167
# NOTE: These are experimental in 0.92.
2592.3.22 by Robert Collins
Add new experimental repository formats.
2168
format_registry.register_lazy(
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2169
    '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.
2170
    'bzrlib.repofmt.pack_repo',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2171
    'RepositoryFormatKnitPack1',
2592.3.22 by Robert Collins
Add new experimental repository formats.
2172
    )
2173
format_registry.register_lazy(
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2174
    '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.
2175
    'bzrlib.repofmt.pack_repo',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2176
    'RepositoryFormatKnitPack3',
2592.3.22 by Robert Collins
Add new experimental repository formats.
2177
    )
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2178
format_registry.register_lazy(
2179
    'Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n',
2180
    'bzrlib.repofmt.pack_repo',
2181
    'RepositoryFormatKnitPack4',
2182
    )
2592.3.22 by Robert Collins
Add new experimental repository formats.
2183
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2184
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
2185
class InterRepository(InterObject):
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
2186
    """This class represents operations taking place between two repositories.
2187
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2188
    Its instances have methods like copy_content and fetch, and contain
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
2189
    references to the source and target repositories these operations can be 
2190
    carried out on.
2191
2192
    Often we will provide convenience methods on 'repository' which carry out
2193
    operations with another repository - they will always forward to
2194
    InterRepository.get(other).method_name(parameters).
2195
    """
2196
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2197
    _optimisers = []
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
2198
    """The available optimised InterRepository types."""
2199
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2200
    def copy_content(self, revision_id=None):
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2201
        raise NotImplementedError(self.copy_content)
2202
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2203
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
2204
        """Fetch the content required to construct revision_id.
2205
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
2206
        The content is copied from self.source to self.target.
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
2207
2208
        :param revision_id: if None all content is copied, if NULL_REVISION no
2209
                            content is copied.
2210
        :param pb: optional progress bar to use for progress reports. If not
2211
                   provided a default one will be created.
2212
2213
        Returns the copied revision count and the failed revisions in a tuple:
2214
        (copied, failures).
2215
        """
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2216
        raise NotImplementedError(self.fetch)
2217
   
2218
    @needs_read_lock
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2219
    def missing_revision_ids(self, revision_id=None, find_ghosts=True):
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2220
        """Return the revision ids that source has that target does not.
2221
        
2222
        These are returned in topological order.
2223
2224
        :param revision_id: only return revision ids included by this
2225
                            revision_id.
2226
        """
2227
        # generic, possibly worst case, slow code path.
2228
        target_ids = set(self.target.all_revision_ids())
2229
        if revision_id is not None:
2230
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2231
            assert source_ids[0] is None
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2232
            source_ids.pop(0)
2233
        else:
2234
            source_ids = self.source.all_revision_ids()
2235
        result_set = set(source_ids).difference(target_ids)
2236
        # this may look like a no-op: its not. It preserves the ordering
2237
        # other_ids had while only returning the members from other_ids
2238
        # that we've decided we need.
2239
        return [rev_id for rev_id in source_ids if rev_id in result_set]
2240
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2241
    @staticmethod
2242
    def _same_model(source, target):
2243
        """True if source and target have the same data representation."""
2244
        if source.supports_rich_root() != target.supports_rich_root():
2245
            return False
2246
        if source._serializer != target._serializer:
2247
            return False
2248
        return True
2249
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2250
2251
class InterSameDataRepository(InterRepository):
2252
    """Code for converting between repositories that represent the same data.
2253
    
2254
    Data format and model must match for this to work.
2255
    """
2256
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2257
    @classmethod
2241.1.7 by Martin Pool
rename method
2258
    def _get_repo_format_to_test(self):
2814.1.1 by Robert Collins
* Pushing, pulling and branching branches with subtree references was not
2259
        """Repository format for testing with.
2260
        
2261
        InterSameData can pull from subtree to subtree and from non-subtree to
2262
        non-subtree, so we test this with the richest repository format.
2263
        """
2264
        from bzrlib.repofmt import knitrepo
2265
        return knitrepo.RepositoryFormatKnit3()
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2266
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2267
    @staticmethod
2268
    def is_compatible(source, target):
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2269
        return InterRepository._same_model(source, target)
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2270
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2271
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2272
    def copy_content(self, revision_id=None):
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2273
        """Make a complete copy of the content in self into destination.
2440.1.1 by Martin Pool
Add new Repository.sprout,
2274
2275
        This copies both the repository's revision data, and configuration information
2276
        such as the make_working_trees setting.
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2277
        
2278
        This is a destructive operation! Do not use it on existing 
2279
        repositories.
2280
2281
        :param revision_id: Only copy the content needed to construct
2282
                            revision_id and its parents.
2283
        """
2284
        try:
2285
            self.target.set_make_working_trees(self.source.make_working_trees())
2286
        except NotImplementedError:
2287
            pass
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2288
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2289
        if (revision_id not in (None, _mod_revision.NULL_REVISION) and 
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2290
            self.target.has_revision(revision_id)):
2291
            return
2292
        self.target.fetch(self.source, revision_id=revision_id)
2293
2294
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2295
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
1910.7.20 by Andrew Bennetts
Merge from bzr.dev
2296
        """See InterRepository.fetch()."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2297
        from bzrlib.fetch import GenericRepoFetcher
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
2298
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
2299
               self.source, self.source._format, self.target,
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2300
               self.target._format)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2301
        f = GenericRepoFetcher(to_repository=self.target,
2302
                               from_repository=self.source,
2303
                               last_revision=revision_id,
2304
                               pb=pb)
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
2305
        return f.count_copied, f.failed_revisions
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
2306
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2307
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2308
class InterWeaveRepo(InterSameDataRepository):
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
2309
    """Optimised code paths between Weave based repositories.
2310
    
2311
    This should be in bzrlib/repofmt/weaverepo.py but we have not yet
2312
    implemented lazy inter-object optimisation.
2313
    """
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2314
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
2315
    @classmethod
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2316
    def _get_repo_format_to_test(self):
2317
        from bzrlib.repofmt import weaverepo
2318
        return weaverepo.RepositoryFormat7()
2319
2320
    @staticmethod
2321
    def is_compatible(source, target):
2322
        """Be compatible with known Weave formats.
2323
        
2324
        We don't test for the stores being of specific types because that
2325
        could lead to confusing results, and there is no need to be 
2326
        overly general.
2327
        """
2328
        from bzrlib.repofmt.weaverepo import (
2329
                RepositoryFormat5,
2330
                RepositoryFormat6,
2331
                RepositoryFormat7,
2332
                )
2333
        try:
2334
            return (isinstance(source._format, (RepositoryFormat5,
2335
                                                RepositoryFormat6,
2336
                                                RepositoryFormat7)) and
2337
                    isinstance(target._format, (RepositoryFormat5,
2338
                                                RepositoryFormat6,
2339
                                                RepositoryFormat7)))
2340
        except AttributeError:
2341
            return False
2342
    
2343
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2344
    def copy_content(self, revision_id=None):
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2345
        """See InterRepository.copy_content()."""
2346
        # weave specific optimised path:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2347
        try:
2348
            self.target.set_make_working_trees(self.source.make_working_trees())
2349
        except NotImplementedError:
2350
            pass
2351
        # FIXME do not peek!
2352
        if self.source.control_files._transport.listable():
2353
            pb = ui.ui_factory.nested_progress_bar()
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2354
            try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2355
                self.target.weave_store.copy_all_ids(
2356
                    self.source.weave_store,
2357
                    pb=pb,
2358
                    from_transaction=self.source.get_transaction(),
2359
                    to_transaction=self.target.get_transaction())
2360
                pb.update('copying inventory', 0, 1)
2361
                self.target.control_weaves.copy_multi(
2362
                    self.source.control_weaves, ['inventory'],
2363
                    from_transaction=self.source.get_transaction(),
2364
                    to_transaction=self.target.get_transaction())
2365
                self.target._revision_store.text_store.copy_all_ids(
2366
                    self.source._revision_store.text_store,
2367
                    pb=pb)
2368
            finally:
2369
                pb.finished()
2370
        else:
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2371
            self.target.fetch(self.source, revision_id=revision_id)
2372
2373
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2374
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2375
        """See InterRepository.fetch()."""
2376
        from bzrlib.fetch import GenericRepoFetcher
2377
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2378
               self.source, self.source._format, self.target, self.target._format)
2379
        f = GenericRepoFetcher(to_repository=self.target,
2380
                               from_repository=self.source,
2381
                               last_revision=revision_id,
2382
                               pb=pb)
2383
        return f.count_copied, f.failed_revisions
2384
2385
    @needs_read_lock
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2386
    def missing_revision_ids(self, revision_id=None, find_ghosts=True):
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2387
        """See InterRepository.missing_revision_ids()."""
2388
        # we want all revisions to satisfy revision_id in source.
2389
        # but we don't want to stat every file here and there.
2390
        # we want then, all revisions other needs to satisfy revision_id 
2391
        # checked, but not those that we have locally.
2392
        # so the first thing is to get a subset of the revisions to 
2393
        # satisfy revision_id in source, and then eliminate those that
2394
        # we do already have. 
2395
        # this is slow on high latency connection to self, but as as this
2396
        # disk format scales terribly for push anyway due to rewriting 
2397
        # inventory.weave, this is considered acceptable.
2398
        # - RBC 20060209
2399
        if revision_id is not None:
2400
            source_ids = self.source.get_ancestry(revision_id)
2401
            assert source_ids[0] is None
2402
            source_ids.pop(0)
2403
        else:
2404
            source_ids = self.source._all_possible_ids()
2405
        source_ids_set = set(source_ids)
2406
        # source_ids is the worst possible case we may need to pull.
2407
        # now we want to filter source_ids against what we actually
2408
        # have in target, but don't try to check for existence where we know
2409
        # we do not have a revision as that would be pointless.
2410
        target_ids = set(self.target._all_possible_ids())
2411
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2412
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2413
        required_revisions = source_ids_set.difference(actually_present_revisions)
2414
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2415
        if revision_id is not None:
2416
            # we used get_ancestry to determine source_ids then we are assured all
2417
            # revisions referenced are present as they are installed in topological order.
2418
            # and the tip revision was validated by get_ancestry.
2419
            return required_topo_revisions
2420
        else:
2421
            # if we just grabbed the possibly available ids, then 
2422
            # we only have an estimate of whats available and need to validate
2423
            # that against the revision records.
2424
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2425
2426
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2427
class InterKnitRepo(InterSameDataRepository):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2428
    """Optimised code paths between Knit based repositories."""
2429
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2430
    @classmethod
2241.1.7 by Martin Pool
rename method
2431
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2432
        from bzrlib.repofmt import knitrepo
2433
        return knitrepo.RepositoryFormatKnit1()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2434
2435
    @staticmethod
2436
    def is_compatible(source, target):
2437
        """Be compatible with known Knit formats.
2438
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2439
        We don't test for the stores being of specific types because that
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2440
        could lead to confusing results, and there is no need to be 
2441
        overly general.
2442
        """
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2443
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2444
        try:
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2445
            are_knits = (isinstance(source._format, RepositoryFormatKnit) and
2446
                isinstance(target._format, RepositoryFormatKnit))
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2447
        except AttributeError:
2448
            return False
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2449
        return are_knits and InterRepository._same_model(source, target)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2450
2451
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2452
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2453
        """See InterRepository.fetch()."""
2454
        from bzrlib.fetch import KnitRepoFetcher
2455
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2456
               self.source, self.source._format, self.target, self.target._format)
2457
        f = KnitRepoFetcher(to_repository=self.target,
2458
                            from_repository=self.source,
2459
                            last_revision=revision_id,
2460
                            pb=pb)
2461
        return f.count_copied, f.failed_revisions
2462
2463
    @needs_read_lock
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2464
    def missing_revision_ids(self, revision_id=None, find_ghosts=True):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2465
        """See InterRepository.missing_revision_ids()."""
2466
        if revision_id is not None:
2467
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2468
            assert source_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
2469
            source_ids.pop(0)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2470
        else:
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
2471
            source_ids = self.source.all_revision_ids()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2472
        source_ids_set = set(source_ids)
2473
        # source_ids is the worst possible case we may need to pull.
2474
        # now we want to filter source_ids against what we actually
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2475
        # have in target, but don't try to check for existence where we know
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2476
        # we do not have a revision as that would be pointless.
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
2477
        target_ids = set(self.target.all_revision_ids())
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2478
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2479
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2480
        required_revisions = source_ids_set.difference(actually_present_revisions)
2481
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2482
        if revision_id is not None:
2483
            # we used get_ancestry to determine source_ids then we are assured all
2484
            # revisions referenced are present as they are installed in topological order.
2485
            # and the tip revision was validated by get_ancestry.
2486
            return required_topo_revisions
2487
        else:
2488
            # if we just grabbed the possibly available ids, then 
2489
            # we only have an estimate of whats available and need to validate
2490
            # that against the revision records.
2491
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2492
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2493
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2494
class InterPackRepo(InterSameDataRepository):
2495
    """Optimised code paths between Pack based repositories."""
2496
2497
    @classmethod
2498
    def _get_repo_format_to_test(self):
2499
        from bzrlib.repofmt import pack_repo
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2500
        return pack_repo.RepositoryFormatKnitPack1()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2501
2502
    @staticmethod
2503
    def is_compatible(source, target):
2504
        """Be compatible with known Pack formats.
2505
        
2506
        We don't test for the stores being of specific types because that
2507
        could lead to confusing results, and there is no need to be 
2508
        overly general.
2509
        """
2510
        from bzrlib.repofmt.pack_repo import RepositoryFormatPack
2511
        try:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2512
            are_packs = (isinstance(source._format, RepositoryFormatPack) and
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2513
                isinstance(target._format, RepositoryFormatPack))
2514
        except AttributeError:
2515
            return False
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2516
        return are_packs and InterRepository._same_model(source, target)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2517
2518
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2519
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2520
        """See InterRepository.fetch()."""
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2521
        from bzrlib.repofmt.pack_repo import Packer
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2522
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2523
               self.source, self.source._format, self.target, self.target._format)
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.
2524
        self.count_copied = 0
2525
        if revision_id is None:
2526
            # TODO:
2527
            # everything to do - use pack logic
2528
            # to fetch from all packs to one without
2592.3.93 by Robert Collins
Steps toward filtering revisions/inventories/texts during fetch.
2529
            # inventory parsing etc, IFF nothing to be copied is in the target.
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.
2530
            # till then:
2531
            revision_ids = self.source.all_revision_ids()
2592.3.93 by Robert Collins
Steps toward filtering revisions/inventories/texts during fetch.
2532
            # implementing the TODO will involve:
2533
            # - detecting when all of a pack is selected
2534
            # - avoiding as much as possible pre-selection, so the
2535
            # more-core routines such as create_pack_from_packs can filter in
2536
            # a just-in-time fashion. (though having a HEADS list on a
2537
            # repository might make this a lot easier, because we could
2538
            # sensibly detect 'new revisions' without doing a full index scan.
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2539
        elif _mod_revision.is_null(revision_id):
2540
            # nothing to do:
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2541
            return (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.
2542
        else:
2543
            try:
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2544
                revision_ids = self.missing_revision_ids(revision_id,
2545
                    find_ghosts=find_ghosts)
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.
2546
            except errors.NoSuchRevision:
2547
                raise errors.InstallFailed([revision_id])
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2548
        packs = self.source._pack_collection.all_packs()
2951.1.2 by Robert Collins
Partial refactoring of pack_repo to create a Packer object for packing.
2549
        pack = Packer(self.target._pack_collection, packs, '.fetch',
2550
            revision_ids).pack()
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2551
        if pack is not None:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2552
            self.target._pack_collection._save_pack_names()
2592.3.108 by Robert Collins
Autopack after pack to pack fetching too.
2553
            # Trigger an autopack. This may duplicate effort as we've just done
2554
            # a pack creation, but for now it is simpler to think about as
2555
            # 'upload data, then repack if needed'.
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2556
            self.target._pack_collection.autopack()
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2557
            return (pack.get_revision_count(), [])
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2558
        else:
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2559
            return (0, [])
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2560
2561
    @needs_read_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2562
    def missing_revision_ids(self, revision_id=None, find_ghosts=True):
2563
        """See InterRepository.missing_revision_ids().
2564
        
2565
        :param find_ghosts: Find ghosts throughough the ancestry of
2566
            revision_id.
2567
        """
2568
        if not find_ghosts and revision_id is not None:
2569
            graph = self.source.get_graph()
2570
            missing_revs = set()
2571
            searcher = graph._make_breadth_first_searcher([revision_id])
2572
            target_index = \
2573
                self.target._pack_collection.revision_index.combined_index
2574
            null_set = frozenset([_mod_revision.NULL_REVISION])
2575
            while True:
2576
                try:
2577
                    next_revs = set(searcher.next())
2578
                except StopIteration:
2579
                    break
2580
                next_revs.difference_update(null_set)
2949.1.4 by Robert Collins
Use a list comprehension not a generator.
2581
                target_keys = [(key,) for key in next_revs]
2949.1.3 by Robert Collins
Review feedback.
2582
                have_revs = frozenset(node[1][0] for node in
2583
                    target_index.iter_entries(target_keys))
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2584
                missing_revs.update(next_revs - have_revs)
2585
                searcher.stop_searching_any(have_revs)
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
2586
            if next_revs - have_revs == set([revision_id]):
2587
                # we saw the start rev itself, but no parents from it (or
2588
                # next_revs would have been updated to e.g. set(). We remove
2589
                # have_revs because if we found revision_id locally we
2590
                # stop_searching at the first time around.
2591
                raise errors.NoSuchRevision(self.source, revision_id)
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2592
            return missing_revs
2593
        elif revision_id is not None:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2594
            source_ids = self.source.get_ancestry(revision_id)
2595
            assert source_ids[0] is None
2596
            source_ids.pop(0)
2597
        else:
2592.3.151 by Robert Collins
Use the revision index, not the inventory index, for missing and fetch operations.
2598
            source_ids = self.source.all_revision_ids()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2599
        # source_ids is the worst possible case we may need to pull.
2600
        # now we want to filter source_ids against what we actually
2601
        # have in target, but don't try to check for existence where we know
2602
        # we do not have a revision as that would be pointless.
2592.3.151 by Robert Collins
Use the revision index, not the inventory index, for missing and fetch operations.
2603
        target_ids = set(self.target.all_revision_ids())
2592.3.241 by Martin Pool
Remove redundant set construction from InterPackRepo.missing_revisions
2604
        return [r for r in source_ids if (r not in target_ids)]
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2605
2606
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2607
class InterModel1and2(InterRepository):
2608
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2609
    @classmethod
2241.1.7 by Martin Pool
rename method
2610
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2611
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2612
2613
    @staticmethod
2614
    def is_compatible(source, target):
2305.2.1 by Andrew Bennetts
Use repo.supports_rich_root() everywhere rather than
2615
        if not source.supports_rich_root() and target.supports_rich_root():
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2616
            return True
2617
        else:
2618
            return False
2619
2620
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2621
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2622
        """See InterRepository.fetch()."""
2623
        from bzrlib.fetch import Model1toKnit2Fetcher
2624
        f = Model1toKnit2Fetcher(to_repository=self.target,
2625
                                 from_repository=self.source,
2626
                                 last_revision=revision_id,
2627
                                 pb=pb)
2628
        return f.count_copied, f.failed_revisions
2629
1910.2.26 by Aaron Bentley
Fix up some test cases
2630
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2631
    def copy_content(self, revision_id=None):
1910.2.26 by Aaron Bentley
Fix up some test cases
2632
        """Make a complete copy of the content in self into destination.
2633
        
2634
        This is a destructive operation! Do not use it on existing 
2635
        repositories.
2636
2637
        :param revision_id: Only copy the content needed to construct
2638
                            revision_id and its parents.
2639
        """
2640
        try:
2641
            self.target.set_make_working_trees(self.source.make_working_trees())
2642
        except NotImplementedError:
2643
            pass
2644
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2645
        if (revision_id not in (None, _mod_revision.NULL_REVISION) and 
1910.2.26 by Aaron Bentley
Fix up some test cases
2646
            self.target.has_revision(revision_id)):
2647
            return
2648
        self.target.fetch(self.source, revision_id=revision_id)
2649
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2650
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2651
class InterKnit1and2(InterKnitRepo):
2652
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2653
    @classmethod
2241.1.7 by Martin Pool
rename method
2654
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2655
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2656
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2657
    @staticmethod
2658
    def is_compatible(source, target):
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
2659
        """Be compatible with Knit1 source and Knit3 target"""
2660
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2661
        try:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2662
            from bzrlib.repofmt.knitrepo import (RepositoryFormatKnit1,
2663
                RepositoryFormatKnit3)
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2664
            from bzrlib.repofmt.pack_repo import (RepositoryFormatKnitPack1,
2665
                RepositoryFormatKnitPack3)
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2666
            return (isinstance(source._format,
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2667
                    (RepositoryFormatKnit1, RepositoryFormatKnitPack1)) and
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2668
                isinstance(target._format,
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2669
                    (RepositoryFormatKnit3, RepositoryFormatKnitPack3))
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2670
                )
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2671
        except AttributeError:
2672
            return False
2673
2674
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2675
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2676
        """See InterRepository.fetch()."""
2677
        from bzrlib.fetch import Knit1to2Fetcher
2678
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2679
               self.source, self.source._format, self.target, 
2680
               self.target._format)
2681
        f = Knit1to2Fetcher(to_repository=self.target,
2682
                            from_repository=self.source,
2683
                            last_revision=revision_id,
2684
                            pb=pb)
2685
        return f.count_copied, f.failed_revisions
2686
2687
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2688
class InterDifferingSerializer(InterKnitRepo):
2689
2690
    @classmethod
2691
    def _get_repo_format_to_test(self):
2692
        return None
2693
2694
    @staticmethod
2695
    def is_compatible(source, target):
2696
        """Be compatible with Knit2 source and Knit3 target"""
2697
        if source.supports_rich_root() != target.supports_rich_root():
2698
            return False
2699
        # Ideally, we'd support fetching if the source had no tree references
2700
        # even if it supported them...
2701
        if (getattr(source, '_format.supports_tree_reference', False) and
2702
            not getattr(target, '_format.supports_tree_reference', False)):
2703
            return False
2704
        return True
2705
2706
    @needs_write_lock
2707
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2708
        """See InterRepository.fetch()."""
2709
        revision_ids = self.target.missing_revision_ids(self.source,
2710
                                                        revision_id)
2996.2.2 by Aaron Bentley
Create install_revisions function
2711
        def revisions_iterator():
2712
            for current_revision_id in revision_ids:
2713
                revision = self.source.get_revision(current_revision_id)
2714
                tree = self.source.revision_tree(current_revision_id)
2715
                try:
2716
                    signature = self.source.get_signature_text(
2717
                        current_revision_id)
2718
                except errors.NoSuchRevision:
2719
                    signature = None
2720
                yield revision, tree, signature
2721
        install_revisions(self.target, revisions_iterator())
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2722
        return len(revision_ids), 0
2723
2724
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2725
class InterRemoteToOther(InterRepository):
2726
2727
    def __init__(self, source, target):
2728
        InterRepository.__init__(self, source, target)
2729
        self._real_inter = None
2730
2731
    @staticmethod
2732
    def is_compatible(source, target):
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
2733
        if not isinstance(source, remote.RemoteRepository):
2734
            return False
2735
        source._ensure_real()
2736
        real_source = source._real_repository
2535.3.21 by Andrew Bennetts
All tests passing.
2737
        # Is source's model compatible with target's model, and are they the
2738
        # same format?  Currently we can only optimise fetching from an
2739
        # identical model & format repo.
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
2740
        assert not isinstance(real_source, remote.RemoteRepository), (
2741
            "We don't support remote repos backed by remote repos yet.")
2742
        return real_source._format == target._format
2743
2744
    @needs_write_lock
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2745
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
2746
        """See InterRepository.fetch()."""
2747
        from bzrlib.fetch import RemoteToOtherFetcher
2748
        mutter("Using fetch logic to copy between %s(remote) and %s(%s)",
2749
               self.source, self.target, self.target._format)
2750
        # TODO: jam 20070210 This should be an assert, not a translate
2751
        revision_id = osutils.safe_revision_id(revision_id)
2752
        f = RemoteToOtherFetcher(to_repository=self.target,
2753
                                 from_repository=self.source,
2754
                                 last_revision=revision_id,
2755
                                 pb=pb)
2756
        return f.count_copied, f.failed_revisions
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2757
2758
    @classmethod
2759
    def _get_repo_format_to_test(self):
2760
        return None
2761
2762
2763
class InterOtherToRemote(InterRepository):
2764
2765
    def __init__(self, source, target):
2766
        InterRepository.__init__(self, source, target)
2767
        self._real_inter = None
2768
2769
    @staticmethod
2770
    def is_compatible(source, target):
2771
        if isinstance(target, remote.RemoteRepository):
2772
            return True
2773
        return False
2774
2775
    def _ensure_real_inter(self):
2776
        if self._real_inter is None:
2777
            self.target._ensure_real()
2778
            real_target = self.target._real_repository
2779
            self._real_inter = InterRepository.get(self.source, real_target)
2780
    
2781
    def copy_content(self, revision_id=None):
2782
        self._ensure_real_inter()
2783
        self._real_inter.copy_content(revision_id=revision_id)
2784
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
2785
    def fetch(self, revision_id=None, pb=None, find_ghosts=False):
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2786
        self._ensure_real_inter()
2787
        self._real_inter.fetch(revision_id=revision_id, pb=pb)
2788
2789
    @classmethod
2790
    def _get_repo_format_to_test(self):
2791
        return None
2792
2793
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2794
InterRepository.register_optimiser(InterDifferingSerializer)
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2795
InterRepository.register_optimiser(InterSameDataRepository)
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
2796
InterRepository.register_optimiser(InterWeaveRepo)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2797
InterRepository.register_optimiser(InterKnitRepo)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2798
InterRepository.register_optimiser(InterModel1and2)
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2799
InterRepository.register_optimiser(InterKnit1and2)
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.
2800
InterRepository.register_optimiser(InterPackRepo)
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2801
InterRepository.register_optimiser(InterRemoteToOther)
2802
InterRepository.register_optimiser(InterOtherToRemote)
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
2803
2804
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2805
class CopyConverter(object):
2806
    """A repository conversion tool which just performs a copy of the content.
2807
    
2808
    This is slow but quite reliable.
2809
    """
2810
2811
    def __init__(self, target_format):
2812
        """Create a CopyConverter.
2813
2814
        :param target_format: The format the resulting repository should be.
2815
        """
2816
        self.target_format = target_format
2817
        
2818
    def convert(self, repo, pb):
2819
        """Perform the conversion of to_convert, giving feedback via pb.
2820
2821
        :param to_convert: The disk object to convert.
2822
        :param pb: a progress bar to use for progress information.
2823
        """
2824
        self.pb = pb
2825
        self.count = 0
1596.2.22 by Robert Collins
Fetch changes to use new pb.
2826
        self.total = 4
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2827
        # this is only useful with metadir layouts - separated repo content.
2828
        # trigger an assertion if not such
2829
        repo._format.get_format_string()
2830
        self.repo_dir = repo.bzrdir
2831
        self.step('Moving repository to repository.backup')
2832
        self.repo_dir.transport.move('repository', 'repository.backup')
2833
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2834
        repo._format.check_conversion_target(self.target_format)
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2835
        self.source_repo = repo._format.open(self.repo_dir,
2836
            _found=True,
2837
            _override_transport=backup_transport)
2838
        self.step('Creating new repository')
2839
        converted = self.target_format.initialize(self.repo_dir,
2840
                                                  self.source_repo.is_shared())
2841
        converted.lock_write()
2842
        try:
2843
            self.step('Copying content into repository.')
2844
            self.source_repo.copy_content_into(converted)
2845
        finally:
2846
            converted.unlock()
2847
        self.step('Deleting old repository content.')
2848
        self.repo_dir.transport.delete_tree('repository.backup')
2849
        self.pb.note('repository converted')
2850
2851
    def step(self, message):
2852
        """Update the pb by a step."""
2853
        self.count +=1
2854
        self.pb.update(message, self.count, self.total)
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2855
2856
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2857
_unescape_map = {
2858
    'apos':"'",
2859
    'quot':'"',
2860
    'amp':'&',
2861
    'lt':'<',
2862
    'gt':'>'
2863
}
2864
2865
2866
def _unescaper(match, _map=_unescape_map):
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
2867
    code = match.group(1)
2868
    try:
2869
        return _map[code]
2870
    except KeyError:
2871
        if not code.startswith('#'):
2872
            raise
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
2873
        return unichr(int(code[1:])).encode('utf8')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2874
2875
2876
_unescape_re = None
2877
2878
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2879
def _unescape_xml(data):
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2880
    """Unescape predefined XML entities in a string of data."""
2881
    global _unescape_re
2882
    if _unescape_re is None:
2120.2.1 by John Arbash Meinel
Remove tabs from source files, and add a test to keep it that way.
2883
        _unescape_re = re.compile('\&([^;]*);')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2884
    return _unescape_re.sub(_unescaper, data)
2745.6.3 by Aaron Bentley
Implement versionedfile checking for bzr check
2885
2886
2745.6.57 by Andrew Bennetts
Some improvements suggested by Martin's review.
2887
class VersionedFileChecker(object):
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2888
2988.1.6 by Robert Collins
Change the contract for VersionedFileChecker to consolidate related parameters rather than splitting them across two api calls. This allows better reuse of a single checker object.
2889
    def __init__(self, repository):
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2890
        self.repository = repository
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
2891
        self.text_index = self.repository._generate_text_key_index()
2745.6.49 by Andrew Bennetts
Get rid of bzrlib.repository._RevisionParentsProvider.
2892
    
2893
    def calculate_file_version_parents(self, revision_id, file_id):
2927.2.10 by Andrew Bennetts
More docstrings, elaborate a comment with an XXX, and remove a little bit of cruft.
2894
        """Calculate the correct parents for a file version according to
2895
        the inventories.
2896
        """
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
2897
        parent_keys = self.text_index[(file_id, revision_id)]
2898
        if parent_keys == [_mod_revision.NULL_REVISION]:
2899
            return ()
2900
        # strip the file_id, for the weave api
2901
        return tuple([revision_id for file_id, revision_id in parent_keys])
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2902
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
2903
    def check_file_version_parents(self, weave, file_id, planned_revisions):
2927.2.10 by Andrew Bennetts
More docstrings, elaborate a comment with an XXX, and remove a little bit of cruft.
2904
        """Check the parents stored in a versioned file are correct.
2905
2906
        It also detects file versions that are not referenced by their
2907
        corresponding revision's inventory.
2908
2927.2.14 by Andrew Bennetts
Tweaks suggested by review.
2909
        :returns: A tuple of (wrong_parents, dangling_file_versions).
2927.2.10 by Andrew Bennetts
More docstrings, elaborate a comment with an XXX, and remove a little bit of cruft.
2910
            wrong_parents is a dict mapping {revision_id: (stored_parents,
2911
            correct_parents)} for each revision_id where the stored parents
2927.2.14 by Andrew Bennetts
Tweaks suggested by review.
2912
            are not correct.  dangling_file_versions is a set of (file_id,
2913
            revision_id) tuples for versions that are present in this versioned
2914
            file, but not used by the corresponding inventory.
2927.2.10 by Andrew Bennetts
More docstrings, elaborate a comment with an XXX, and remove a little bit of cruft.
2915
        """
2927.2.3 by Andrew Bennetts
Add fulltexts to avoid bug 155730.
2916
        wrong_parents = {}
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
2917
        unused_versions = set()
2918
        for num, revision_id in enumerate(planned_revisions):
2927.2.6 by Andrew Bennetts
Make some more check tests pass.
2919
            try:
2988.1.8 by Robert Collins
Change check and reconcile to use the new _generate_text_key_index rather
2920
                correct_parents = self.calculate_file_version_parents(
2921
                    revision_id, file_id)
2922
            except KeyError:
2923
                # we were asked to investigate a non-existant version.
2924
                unused_versions.add(revision_id)
2925
            else:
2926
                try:
2927
                    knit_parents = tuple(weave.get_parents(revision_id))
2928
                except errors.RevisionNotPresent:
2929
                    knit_parents = None
2930
                if correct_parents != knit_parents:
2931
                    wrong_parents[revision_id] = (knit_parents, correct_parents)
2932
        return wrong_parents, unused_versions