~bzr-pqm/bzr/bzr.dev

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