/brz/remove-bazaar

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