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