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