/brz/remove-bazaar

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