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