/brz/remove-bazaar

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