/brz/remove-bazaar

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