/brz/remove-bazaar

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