/brz/remove-bazaar

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