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