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