/brz/remove-bazaar

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