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