/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
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.
843
    def fetch(self, source, revision_id=None, pb=None):
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.
847
        """
2592.3.115 by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit.
848
        # fast path same-url fetch operations
849
        if self.has_same_location(source):
850
            # check that last_revision is in 'from' and then return a
851
            # no-operation.
852
            if (revision_id is not None and
853
                not _mod_revision.is_null(revision_id)):
854
                self.get_revision(revision_id)
855
            return 0, []
2323.8.3 by Aaron Bentley
Reduce scope of try/except, update NEWS
856
        inter = InterRepository.get(source, self)
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
857
        try:
2323.8.3 by Aaron Bentley
Reduce scope of try/except, update NEWS
858
            return inter.fetch(revision_id=revision_id, pb=pb)
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
859
        except NotImplementedError:
860
            raise errors.IncompatibleRepositories(source, self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
861
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
862
    def create_bundle(self, target, base, fileobj, format=None):
863
        return serializer.write_bundle(self, target, base, fileobj, format)
864
2803.2.1 by Robert Collins
* CommitBuilder now advertises itself as requiring the root entry to be
865
    def get_commit_builder(self, branch, parents, config, timestamp=None,
866
                           timezone=None, committer=None, revprops=None,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
867
                           revision_id=None):
868
        """Obtain a CommitBuilder for this repository.
869
        
870
        :param branch: Branch to commit to.
871
        :param parents: Revision ids of the parents of the new revision.
872
        :param config: Configuration to use.
873
        :param timestamp: Optional timestamp recorded for commit.
874
        :param timezone: Optional timezone for timestamp.
875
        :param committer: Optional committer to set for commit.
876
        :param revprops: Optional dictionary of revision properties.
877
        :param revision_id: Optional revision id.
878
        """
2818.3.2 by Robert Collins
Review feedback.
879
        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.
880
            timestamp, timezone, committer, revprops, revision_id)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
881
        self.start_write_group()
882
        return result
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
883
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
884
    def unlock(self):
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
885
        if (self.control_files._lock_count == 1 and
886
            self.control_files._lock_mode == 'w'):
887
            if self._write_group is not None:
888
                raise errors.BzrError(
889
                    'Must end write groups before releasing write locks.')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
890
        self.control_files.unlock()
891
1185.65.27 by Robert Collins
Tweak storage towards mergability.
892
    @needs_read_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
893
    def clone(self, a_bzrdir, revision_id=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
894
        """Clone this repository into a_bzrdir using the current format.
895
896
        Currently no check is made that the format of this repository and
897
        the bzrdir format are compatible. FIXME RBC 20060201.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
898
899
        :return: The newly created destination repository.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
900
        """
2440.1.1 by Martin Pool
Add new Repository.sprout,
901
        # TODO: deprecate after 0.16; cloning this with all its settings is
902
        # probably not very useful -- mbp 20070423
903
        dest_repo = self._create_sprouting_repo(a_bzrdir, shared=self.is_shared())
904
        self.copy_content_into(dest_repo, revision_id)
905
        return dest_repo
906
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
907
    def start_write_group(self):
908
        """Start a write group in the repository.
909
910
        Write groups are used by repositories which do not have a 1:1 mapping
911
        between file ids and backend store to manage the insertion of data from
912
        both fetch and commit operations.
913
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
914
        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``
915
        for the support of lock-requiring repository formats.
2617.6.8 by Robert Collins
Review feedback and documentation.
916
917
        One can only insert data into a repository inside a write group.
918
2617.6.6 by Robert Collins
Some review feedback.
919
        :return: None.
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
920
        """
2592.3.188 by Robert Collins
Allow pack repositories to have multiple writers active at one time, for greater concurrency.
921
        if not self.is_write_locked():
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
922
            raise errors.NotWriteLocked(self)
923
        if self._write_group:
924
            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.
925
        self._start_write_group()
926
        # 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``
927
        self._write_group = self.get_transaction()
928
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
929
    def _start_write_group(self):
930
        """Template method for per-repository write group startup.
931
        
932
        This is called before the write group is considered to be 
933
        entered.
934
        """
935
2440.1.1 by Martin Pool
Add new Repository.sprout,
936
    @needs_read_lock
937
    def sprout(self, to_bzrdir, revision_id=None):
938
        """Create a descendent repository for new development.
939
940
        Unlike clone, this does not copy the settings of the repository.
941
        """
942
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
943
        dest_repo.fetch(self, revision_id=revision_id)
944
        return dest_repo
945
946
    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.
947
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
948
            # use target default format.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
949
            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.
950
        else:
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
951
            # Most control formats need the repository to be specifically
952
            # created, but on some old all-in-one formats it's not needed
953
            try:
2440.1.1 by Martin Pool
Add new Repository.sprout,
954
                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.
955
            except errors.UninitializableFormat:
956
                dest_repo = a_bzrdir.open_repository()
957
        return dest_repo
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
958
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
959
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
960
    def has_revision(self, revision_id):
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
961
        """True if this repository has a copy of the revision."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
962
        if 'evil' in debug.debug_flags:
2592.3.112 by Robert Collins
Various fixups found dogfooding.
963
            mutter_callsite(3, "has_revision is a LBYL symptom.")
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
964
        return self._revision_store.has_revision_id(revision_id,
965
                                                    self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
966
1185.65.27 by Robert Collins
Tweak storage towards mergability.
967
    @needs_read_lock
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
968
    def get_revision(self, revision_id):
969
        """Return the Revision object for a named revision."""
970
        return self.get_revisions([revision_id])[0]
971
972
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
973
    def get_revision_reconcile(self, revision_id):
974
        """'reconcile' helper routine that allows access to a revision always.
975
        
976
        This variant of get_revision does not cross check the weave graph
977
        against the revision one as get_revision does: but it should only
978
        be used by reconcile, or reconcile-alike commands that are correcting
979
        or testing the revision graph.
980
        """
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
981
        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.
982
1756.1.2 by Aaron Bentley
Show logs using get_revisions
983
    @needs_read_lock
984
    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.
985
        """Get many revisions at once."""
986
        return self._get_revisions(revision_ids)
987
988
    @needs_read_lock
989
    def _get_revisions(self, revision_ids):
990
        """Core work logic to get many revisions without sanity checks."""
991
        for rev_id in revision_ids:
992
            if not rev_id or not isinstance(rev_id, basestring):
993
                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.
994
        revs = self._revision_store.get_revisions(revision_ids,
1756.1.2 by Aaron Bentley
Show logs using get_revisions
995
                                                  self.get_transaction())
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
996
        for rev in revs:
997
            assert not isinstance(rev.revision_id, unicode)
998
            for parent_id in rev.parent_ids:
999
                assert not isinstance(parent_id, unicode)
1000
        return revs
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1001
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1002
    @needs_read_lock
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1003
    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.
1004
        # TODO: jam 20070210 This shouldn't be necessary since get_revision
1005
        #       would have already do it.
1006
        # TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1007
        rev = self.get_revision(revision_id)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1008
        rev_tmp = StringIO()
1009
        # the current serializer..
1010
        self._revision_store._serializer.write_revision(rev, rev_tmp)
1011
        rev_tmp.seek(0)
1012
        return rev_tmp.getvalue()
1013
1014
    @needs_read_lock
1756.3.22 by Aaron Bentley
Tweaks from review
1015
    def get_deltas_for_revisions(self, revisions):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1016
        """Produce a generator of revision deltas.
1017
        
1018
        Note that the input is a sequence of REVISIONS, not revision_ids.
1019
        Trees will be held in memory until the generator exits.
1020
        Each delta is relative to the revision's lefthand predecessor.
1021
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1022
        required_trees = set()
1023
        for revision in revisions:
1024
            required_trees.add(revision.revision_id)
1025
            required_trees.update(revision.parent_ids[:1])
1026
        trees = dict((t.get_revision_id(), t) for 
1027
                     t in self.revision_trees(required_trees))
1028
        for revision in revisions:
1029
            if not revision.parent_ids:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1030
                old_tree = self.revision_tree(None)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1031
            else:
1032
                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.
1033
            yield trees[revision.revision_id].changes_from(old_tree)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1034
1756.3.19 by Aaron Bentley
Documentation and cleanups
1035
    @needs_read_lock
1744.2.2 by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
1036
    def get_revision_delta(self, revision_id):
1037
        """Return the delta for one revision.
1038
1039
        The delta is relative to the left-hand predecessor of the
1040
        revision.
1041
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1042
        r = self.get_revision(revision_id)
1756.3.22 by Aaron Bentley
Tweaks from review
1043
        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.
1044
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1045
    @needs_write_lock
1046
    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.
1047
        signature = gpg_strategy.sign(plaintext)
1048
        self._revision_store.add_revision_signature_text(revision_id,
1049
                                                         signature,
1050
                                                         self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1051
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1052
    def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
1053
        revision_ids):
1054
        """Helper routine for fileids_altered_by_revision_ids.
1055
1056
        This performs the translation of xml lines to revision ids.
1057
1058
        :param line_iterator: An iterator of lines
1059
        :param revision_ids: The revision ids to filter for.
1694.2.6 by Martin Pool
[merge] bzr.dev
1060
        :return: a dictionary mapping altered file-ids to an iterable of
1061
        revision_ids. Each altered file-ids has the exact revision_ids that
1062
        altered it listed explicitly.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1063
        """
1694.2.6 by Martin Pool
[merge] bzr.dev
1064
        result = {}
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1065
1694.2.6 by Martin Pool
[merge] bzr.dev
1066
        # this code needs to read every new line in every inventory for the
1067
        # inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1068
        # 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.
1069
        # harmful because we are filtering by the revision id marker in the
1694.2.6 by Martin Pool
[merge] bzr.dev
1070
        # 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.
1071
        # 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.
1072
        # only those added in an inventory in rev X can contain a revision=X
1073
        # line.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1074
        unescape_revid_cache = {}
1075
        unescape_fileid_cache = {}
1076
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
1077
        # jam 20061218 In a big fetch, this handles hundreds of thousands
1078
        # of lines, so it has had a lot of inlining and optimizing done.
1079
        # Sorry that it is a little bit messy.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1080
        # Move several functions to be local variables, since this is a long
1081
        # running loop.
1082
        search = self._file_ids_altered_regex.search
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
1083
        unescape = _unescape_xml
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1084
        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.
1085
        for line in line_iterator:
1086
            match = search(line)
1087
            if match is None:
1088
                continue
1089
            # One call to match.group() returning multiple items is quite a
1090
            # bit faster than 2 calls to match.group() each returning 1
1091
            file_id, revision_id = match.group('file_id', 'revision_id')
1092
1093
            # Inlining the cache lookups helps a lot when you make 170,000
1094
            # lines and 350k ids, versus 8.4 unique ids.
1095
            # Using a cache helps in 2 ways:
1096
            #   1) Avoids unnecessary decoding calls
1097
            #   2) Re-uses cached strings, which helps in future set and
1098
            #      equality checks.
1099
            # (2) is enough that removing encoding entirely along with
1100
            # the cache (so we are using plain strings) results in no
1101
            # performance improvement.
1102
            try:
1103
                revision_id = unescape_revid_cache[revision_id]
1104
            except KeyError:
1105
                unescaped = unescape(revision_id)
1106
                unescape_revid_cache[revision_id] = unescaped
1107
                revision_id = unescaped
1108
1109
            if revision_id in revision_ids:
1110
                try:
1111
                    file_id = unescape_fileid_cache[file_id]
1112
                except KeyError:
1113
                    unescaped = unescape(file_id)
1114
                    unescape_fileid_cache[file_id] = unescaped
1115
                    file_id = unescaped
1116
                setdefault(file_id, set()).add(revision_id)
1117
        return result
1118
1119
    def fileids_altered_by_revision_ids(self, revision_ids):
1120
        """Find the file ids and versions affected by revisions.
1121
1122
        :param revisions: an iterable containing revision ids.
1123
        :return: a dictionary mapping altered file-ids to an iterable of
1124
        revision_ids. Each altered file-ids has the exact revision_ids that
1125
        altered it listed explicitly.
1126
        """
1127
        assert self._serializer.support_altered_by_hack, \
1128
            ("fileids_altered_by_revision_ids only supported for branches " 
1129
             "which store inventory as unnested xml, not on %r" % self)
2592.3.185 by Robert Collins
Merge bzr.dev.
1130
        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.
1131
        w = self.get_inventory_weave()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1132
        pb = ui.ui_factory.nested_progress_bar()
1133
        try:
2592.3.110 by Robert Collins
Filter out texts and signatures not referenced by the revisions being copied during pack to pack fetching.
1134
            return self._find_file_ids_from_xml_inventory_lines(
1135
                w.iter_lines_added_or_present_in_versions(
1136
                    selected_revision_ids, pb=pb),
1137
                selected_revision_ids)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1138
        finally:
1139
            pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1140
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1141
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1142
        """Iterate through file versions.
1143
2708.1.10 by Aaron Bentley
Update docstrings
1144
        Files will not necessarily be returned in the order they occur in
1145
        desired_files.  No specific order is guaranteed.
1146
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1147
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
2708.1.10 by Aaron Bentley
Update docstrings
1148
        value supplied by the caller as part of desired_files.  It should
1149
        uniquely identify the file version in the caller's context.  (Examples:
1150
        an index number or a TreeTransform trans_id.)
1151
1152
        bytes_iterator is an iterable of bytestrings for the file.  The
1153
        kind of iterable and length of the bytestrings are unspecified, but for
1154
        this implementation, it is a list of lines produced by
1155
        VersionedFile.get_lines().
1156
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1157
        :param desired_files: a list of (file_id, revision_id, identifier)
2708.1.10 by Aaron Bentley
Update docstrings
1158
            triples
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1159
        """
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1160
        transaction = self.get_transaction()
1161
        for file_id, revision_id, callable_data in desired_files:
2708.1.11 by Aaron Bentley
Test and tweak error handling
1162
            try:
1163
                weave = self.weave_store.get_weave(file_id, transaction)
1164
            except errors.NoSuchFile:
1165
                raise errors.NoSuchIdInRepository(self, file_id)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1166
            yield callable_data, weave.get_lines(revision_id)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1167
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
1168
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1169
        """Get an iterable listing the keys of all the data introduced by a set
1170
        of revision IDs.
1171
1172
        The keys will be ordered so that the corresponding items can be safely
1173
        fetched and inserted in that order.
1174
1175
        :returns: An iterable producing tuples of (knit-kind, file-id,
1176
            versions).  knit-kind is one of 'file', 'inventory', 'signatures',
1177
            '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.
1178
        """
1179
        # 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.
1180
        # generator.  Ideally the caching would be done in fetch.py I think.  Or
1181
        # maybe this generator should explicitly have the contract that it
1182
        # should not be iterated until the previously yielded item has been
1183
        # processed?
2535.3.47 by Andrew Bennetts
Massively improve item_keys_introduced_by performance by calling self.lock_read().
1184
        self.lock_read()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1185
        inv_w = self.get_inventory_weave()
1186
        inv_w.enable_cache()
1187
1188
        # file ids that changed
1189
        file_ids = self.fileids_altered_by_revision_ids(revision_ids)
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
1190
        count = 0
1191
        num_file_ids = len(file_ids)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1192
        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.
1193
            if _files_pb is not None:
1194
                _files_pb.update("fetch texts", count, num_file_ids)
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
1195
            count += 1
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1196
            yield ("file", file_id, altered_versions)
2535.3.9 by Andrew Bennetts
More comments.
1197
        # We're done with the files_pb.  Note that it finished by the caller,
1198
        # 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.
1199
        del _files_pb
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1200
1201
        # inventory
1202
        yield ("inventory", None, revision_ids)
1203
        inv_w.clear_cache()
1204
1205
        # signatures
2535.3.25 by Andrew Bennetts
Fetch signatures too.
1206
        revisions_with_signatures = set()
1207
        for rev_id in revision_ids:
1208
            try:
1209
                self.get_signature_text(rev_id)
1210
            except errors.NoSuchRevision:
1211
                # not signed.
1212
                pass
1213
            else:
1214
                revisions_with_signatures.add(rev_id)
2535.3.47 by Andrew Bennetts
Massively improve item_keys_introduced_by performance by calling self.lock_read().
1215
        self.unlock()
2535.3.25 by Andrew Bennetts
Fetch signatures too.
1216
        yield ("signatures", None, revisions_with_signatures)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
1217
1218
        # revisions
1219
        yield ("revisions", None, revision_ids)
1220
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1221
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1222
    def get_inventory_weave(self):
1223
        return self.control_weaves.get_weave('inventory',
1224
            self.get_transaction())
1225
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1226
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1227
    def get_inventory(self, revision_id):
1228
        """Get Inventory object by hash."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1229
        return self.deserialise_inventory(
1230
            revision_id, self.get_inventory_xml(revision_id))
1231
1232
    def deserialise_inventory(self, revision_id, xml):
1233
        """Transform the xml into an inventory object. 
1234
1235
        :param revision_id: The expected revision id of the inventory.
1236
        :param xml: A serialised inventory.
1237
        """
2889.1.3 by Robert Collins
Merge bzr.dev.
1238
        return self._serializer.read_inventory_from_string(xml, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1239
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1240
    def serialise_inventory(self, inv):
1910.2.48 by Aaron Bentley
Update from review comments
1241
        return self._serializer.write_inventory_to_string(inv)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1242
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
1243
    def _serialise_inventory_to_lines(self, inv):
1244
        return self._serializer.write_inventory_to_lines(inv)
1245
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1246
    def get_serializer_format(self):
1247
        return self._serializer.format_num
1248
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1249
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1250
    def get_inventory_xml(self, revision_id):
1251
        """Get inventory XML as a file object."""
1252
        try:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1253
            assert isinstance(revision_id, str), type(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1254
            iw = self.get_inventory_weave()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1255
            return iw.get_text(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1256
        except IndexError:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1257
            raise errors.HistoryMissing(self, 'inventory', revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1258
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1259
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1260
    def get_inventory_sha1(self, revision_id):
1261
        """Return the sha1 hash of the inventory entry
1262
        """
1263
        return self.get_revision(revision_id).inventory_sha1
1264
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1265
    @needs_read_lock
2850.3.2 by Robert Collins
Review feedback.
1266
    def get_revision_graph(self, revision_id=None):
1267
        """Return a dictionary containing the revision graph.
1268
1269
        NB: This method should not be used as it accesses the entire graph all
1270
        at once, which is much more data than most operations should require.
1271
1272
        :param revision_id: The revision_id to get a graph from. If None, then
1273
        the entire revision graph is returned. This is a deprecated mode of
1274
        operation and will be removed in the future.
1275
        :return: a dictionary of revision_id->revision_parents_list.
1276
        """
1277
        raise NotImplementedError(self.get_revision_graph)
1278
1279
    @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.
1280
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1281
        """Return a graph of the revisions with ghosts marked as applicable.
1282
1283
        :param revision_ids: an iterable of revisions to graph or None for all.
1284
        :return: a Graph object with the graph reachable from revision_ids.
1285
        """
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1286
        if 'evil' in debug.debug_flags:
2592.3.112 by Robert Collins
Various fixups found dogfooding.
1287
            mutter_callsite(3,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1288
                "get_revision_graph_with_ghosts scales with size of history.")
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1289
        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.
1290
        if not revision_ids:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1291
            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.
1292
            required = set([])
1293
        else:
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
1294
            pending = set(revision_ids)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1295
            # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1296
            if _mod_revision.NULL_REVISION in pending:
1297
                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.
1298
            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.
1299
        done = set([])
1300
        while len(pending):
1301
            revision_id = pending.pop()
1302
            try:
1303
                rev = self.get_revision(revision_id)
1304
            except errors.NoSuchRevision:
1305
                if revision_id in required:
1306
                    raise
1307
                # a ghost
1308
                result.add_ghost(revision_id)
1309
                continue
1310
            for parent_id in rev.parent_ids:
1311
                # is this queued or done ?
1312
                if (parent_id not in pending and
1313
                    parent_id not in done):
1314
                    # no, queue it.
1315
                    pending.add(parent_id)
1316
            result.add_node(revision_id, rev.parent_ids)
1594.2.15 by Robert Collins
Unfuck performance.
1317
            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.
1318
        return result
1319
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1320
    def _get_history_vf(self):
1321
        """Get a versionedfile whose history graph reflects all revisions.
1322
1323
        For weave repositories, this is the inventory weave.
1324
        """
1325
        return self.get_inventory_weave()
1326
1327
    def iter_reverse_revision_history(self, revision_id):
1328
        """Iterate backwards through revision ids in the lefthand history
1329
1330
        :param revision_id: The revision id to start with.  All its lefthand
1331
            ancestors will be traversed.
1332
        """
1333
        if revision_id in (None, _mod_revision.NULL_REVISION):
1334
            return
1335
        next_id = revision_id
1336
        versionedfile = self._get_history_vf()
1337
        while True:
1338
            yield next_id
1339
            parents = versionedfile.get_parents(next_id)
1340
            if len(parents) == 0:
1341
                return
1342
            else:
1343
                next_id = parents[0]
1344
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1345
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1346
    def get_revision_inventory(self, revision_id):
1347
        """Return inventory of a past revision."""
1348
        # TODO: Unify this with get_inventory()
1349
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
1350
        # must be the same as its revision, so this is trivial.
1534.4.28 by Robert Collins
first cut at merge from integration.
1351
        if revision_id is None:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1352
            # This does not make sense: if there is no revision,
1353
            # then it is the current tree inventory surely ?!
1354
            # and thus get_root_id() is something that looks at the last
1355
            # commit on the branch, and the get_root_id is an inventory check.
1356
            raise NotImplementedError
1357
            # return Inventory(self.get_root_id())
1358
        else:
1359
            return self.get_inventory(revision_id)
1360
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1361
    @needs_read_lock
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1362
    def is_shared(self):
1363
        """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.
1364
        raise NotImplementedError(self.is_shared)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1365
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1366
    @needs_write_lock
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1367
    def reconcile(self, other=None, thorough=False):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1368
        """Reconcile this repository."""
1369
        from bzrlib.reconcile import RepoReconciler
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1370
        reconciler = RepoReconciler(self, thorough=thorough)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1371
        reconciler.reconcile()
1372
        return reconciler
2440.1.1 by Martin Pool
Add new Repository.sprout,
1373
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1374
    def _refresh_data(self):
1375
        """Helper called from lock_* to ensure coherency with disk.
1376
1377
        The default implementation does nothing; it is however possible
1378
        for repositories to maintain loaded indices across multiple locks
1379
        by checking inside their implementation of this method to see
1380
        whether their indices are still valid. This depends of course on
1381
        the disk format being validatable in this manner.
1382
        """
1383
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1384
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1385
    def revision_tree(self, revision_id):
1386
        """Return Tree for a revision on this branch.
1387
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1388
        `revision_id` may be None for the empty tree revision.
1389
        """
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1390
        # TODO: refactor this to use an existing revision object
1391
        # so we don't need to read it in twice.
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1392
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1731.1.61 by Aaron Bentley
Merge bzr.dev
1393
            return RevisionTree(self, Inventory(root_id=None), 
1394
                                _mod_revision.NULL_REVISION)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1395
        else:
1396
            inv = self.get_revision_inventory(revision_id)
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
1397
            return RevisionTree(self, inv, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1398
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1399
    @needs_read_lock
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1400
    def revision_trees(self, revision_ids):
1401
        """Return Tree for a revision on this branch.
1402
1756.3.19 by Aaron Bentley
Documentation and cleanups
1403
        `revision_id` may not be None or 'null:'"""
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1404
        assert None not in revision_ids
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1405
        assert _mod_revision.NULL_REVISION not in revision_ids
1756.3.5 by Aaron Bentley
Switch to get_texts, optimize get_texts
1406
        texts = self.get_inventory_weave().get_texts(revision_ids)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1407
        for text, revision_id in zip(texts, revision_ids):
1408
            inv = self.deserialise_inventory(revision_id, text)
1409
            yield RevisionTree(self, inv, revision_id)
1410
1411
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1412
    def get_ancestry(self, revision_id, topo_sorted=True):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1413
        """Return a list of revision-ids integrated by a revision.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1414
1415
        The first element of the list is always None, indicating the origin 
1416
        revision.  This might change when we have history horizons, or 
1417
        perhaps we should have a new API.
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1418
        
1419
        This is topologically sorted.
1420
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1421
        if _mod_revision.is_null(revision_id):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1422
            return [None]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1423
        if not self.has_revision(revision_id):
1424
            raise errors.NoSuchRevision(self, revision_id)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1425
        w = self.get_inventory_weave()
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1426
        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.
1427
        return [None] + candidates # self._eliminate_revisions_not_present(candidates)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1428
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1429
    def pack(self):
1430
        """Compress the data within the repository.
1431
1432
        This operation only makes sense for some repository types. For other
1433
        types it should be a no-op that just returns.
1434
1435
        This stub method does not require a lock, but subclasses should use
1436
        @needs_write_lock as this is a long running call its reasonable to 
1437
        implicitly lock for the user.
1438
        """
1439
1185.65.4 by Aaron Bentley
Fixed cat command
1440
    @needs_read_lock
1441
    def print_file(self, file, revision_id):
1185.65.29 by Robert Collins
Implement final review suggestions.
1442
        """Print `file` to stdout.
1443
        
1444
        FIXME RBC 20060125 as John Meinel points out this is a bad api
1445
        - it writes to stdout, it assumes that that is valid etc. Fix
1446
        by creating a new more flexible convenience function.
1447
        """
1185.65.4 by Aaron Bentley
Fixed cat command
1448
        tree = self.revision_tree(revision_id)
1449
        # use inventory as it was in that revision
1450
        file_id = tree.inventory.path2id(file)
1451
        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
1452
            # TODO: jam 20060427 Write a test for this code path
1453
            #       it had a bug in it, and was raising the wrong
1454
            #       exception.
1455
            raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
1185.65.4 by Aaron Bentley
Fixed cat command
1456
        tree.print_file(file_id)
1457
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1458
    def get_transaction(self):
1459
        return self.control_files.get_transaction()
1460
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1461
    def revision_parents(self, revision_id):
1462
        return self.get_inventory_weave().parent_names(revision_id)
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1463
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1464
    def get_parents(self, revision_ids):
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1465
        """See StackedParentsProvider.get_parents"""
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1466
        parents_list = []
1467
        for revision_id in revision_ids:
1468
            if revision_id == _mod_revision.NULL_REVISION:
1469
                parents = []
1470
            else:
1471
                try:
1472
                    parents = self.get_revision(revision_id).parent_ids
1473
                except errors.NoSuchRevision:
1474
                    parents = None
1475
                else:
1476
                    if len(parents) == 0:
1477
                        parents = [_mod_revision.NULL_REVISION]
1478
            parents_list.append(parents)
1479
        return parents_list
1480
1481
    def _make_parents_provider(self):
1482
        return self
1483
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1484
    def get_graph(self, other_repository=None):
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1485
        """Return the graph walker for this repository format"""
1486
        parents_provider = self._make_parents_provider()
2490.2.14 by Aaron Bentley
Avoid StackedParentsProvider when underlying repos match
1487
        if (other_repository is not None and
1488
            other_repository.bzrdir.transport.base !=
1489
            self.bzrdir.transport.base):
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1490
            parents_provider = graph._StackedParentsProvider(
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1491
                [parents_provider, other_repository._make_parents_provider()])
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1492
        return graph.Graph(parents_provider)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1493
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
1494
    def get_versioned_file_checker(self, revisions, revision_versions_cache):
2745.6.57 by Andrew Bennetts
Some improvements suggested by Martin's review.
1495
        return VersionedFileChecker(revisions, revision_versions_cache, self)
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
1496
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1497
    @needs_write_lock
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1498
    def set_make_working_trees(self, new_value):
1499
        """Set the policy flag for making working trees when creating branches.
1500
1501
        This only applies to branches that use this repository.
1502
1503
        The default is 'True'.
1504
        :param new_value: True to restore the default, False to disable making
1505
                          working trees.
1506
        """
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1507
        raise NotImplementedError(self.set_make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1508
    
1509
    def make_working_trees(self):
1510
        """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.
1511
        raise NotImplementedError(self.make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1512
1513
    @needs_write_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1514
    def sign_revision(self, revision_id, gpg_strategy):
1515
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1516
        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.
1517
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1518
    @needs_read_lock
1519
    def has_signature_for_revision_id(self, revision_id):
1520
        """Query for a revision signature for revision_id in the repository."""
1521
        return self._revision_store.has_signature(revision_id,
1522
                                                  self.get_transaction())
1523
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1524
    @needs_read_lock
1525
    def get_signature_text(self, revision_id):
1526
        """Return the text for a signature."""
1527
        return self._revision_store.get_signature_text(revision_id,
1528
                                                       self.get_transaction())
1529
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1530
    @needs_read_lock
2745.6.36 by Andrew Bennetts
Deprecate revision_ids arg to Repository.check and other tweaks.
1531
    def check(self, revision_ids=None):
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1532
        """Check consistency of all history of given revision_ids.
1533
1534
        Different repository implementations should override _check().
1535
1536
        :param revision_ids: A non-empty list of revision_ids whose ancestry
1537
             will be checked.  Typically the last revision_id of a branch.
1538
        """
1539
        return self._check(revision_ids)
1540
1541
    def _check(self, revision_ids):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1542
        result = check.Check(self)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1543
        result.check()
1544
        return result
1545
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1546
    def _warn_if_deprecated(self):
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
1547
        global _deprecation_warning_done
1548
        if _deprecation_warning_done:
1549
            return
1550
        _deprecation_warning_done = True
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1551
        warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
1552
                % (self._format, self.bzrdir.transport.base))
1553
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1554
    def supports_rich_root(self):
1555
        return self._format.rich_root_data
1556
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.
1557
    def _check_ascii_revisionid(self, revision_id, method):
1558
        """Private helper for ascii-only repositories."""
1559
        # weave repositories refuse to store revisionids that are non-ascii.
1560
        if revision_id is not None:
1561
            # weaves require ascii revision ids.
1562
            if isinstance(revision_id, unicode):
1563
                try:
1564
                    revision_id.encode('ascii')
1565
                except UnicodeEncodeError:
1566
                    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
1567
            else:
1568
                try:
1569
                    revision_id.decode('ascii')
1570
                except UnicodeDecodeError:
1571
                    raise errors.NonAsciiRevisionId(method, self)
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1572
    
1573
    def revision_graph_can_have_wrong_parents(self):
1574
        """Is it possible for this repository to have a revision graph with
1575
        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.
1576
2819.2.4 by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository.
1577
        If True, then this repository must also implement
1578
        _find_inconsistent_revision_parents so that check and reconcile can
1579
        check for inconsistencies before proceeding with other checks that may
1580
        depend on the revision index being consistent.
1581
        """
1582
        raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
1583
        
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1584
# remove these delegates a while after bzr 0.15
1585
def __make_delegated(name, from_module):
1586
    def _deprecated_repository_forwarder():
1587
        symbol_versioning.warn('%s moved to %s in bzr 0.15'
1588
            % (name, from_module),
2241.1.20 by mbp at sourcefrog
update tests for new locations of weave repos
1589
            DeprecationWarning,
1590
            stacklevel=2)
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1591
        m = __import__(from_module, globals(), locals(), [name])
1592
        try:
1593
            return getattr(m, name)
1594
        except AttributeError:
1595
            raise AttributeError('module %s has no name %s'
1596
                    % (m, name))
1597
    globals()[name] = _deprecated_repository_forwarder
1598
1599
for _name in [
1600
        'AllInOneRepository',
1601
        'WeaveMetaDirRepository',
1602
        'PreSplitOutRepositoryFormat',
1603
        'RepositoryFormat4',
1604
        'RepositoryFormat5',
1605
        'RepositoryFormat6',
1606
        'RepositoryFormat7',
1607
        ]:
1608
    __make_delegated(_name, 'bzrlib.repofmt.weaverepo')
1609
1610
for _name in [
1611
        'KnitRepository',
1612
        'RepositoryFormatKnit',
1613
        'RepositoryFormatKnit1',
1614
        ]:
1615
    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
1616
1617
1185.82.84 by Aaron Bentley
Moved stuff around
1618
def install_revision(repository, rev, revision_tree):
1619
    """Install all revision data into a repository."""
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1620
    repository.start_write_group()
1621
    try:
1622
        _install_revision(repository, rev, revision_tree)
1623
    except:
1624
        repository.abort_write_group()
2592.3.101 by Robert Collins
Correctly propogate exceptions from repository.install_revisions.
1625
        raise
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
1626
    else:
1627
        repository.commit_write_group()
1628
1629
1630
def _install_revision(repository, rev, revision_tree):
1631
    """Install all revision data into a repository."""
1185.82.84 by Aaron Bentley
Moved stuff around
1632
    present_parents = []
1633
    parent_trees = {}
1634
    for p_id in rev.parent_ids:
1635
        if repository.has_revision(p_id):
1636
            present_parents.append(p_id)
1637
            parent_trees[p_id] = repository.revision_tree(p_id)
1638
        else:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1639
            parent_trees[p_id] = repository.revision_tree(None)
1185.82.84 by Aaron Bentley
Moved stuff around
1640
1641
    inv = revision_tree.inventory
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
1642
    entries = inv.iter_entries()
2617.6.6 by Robert Collins
Some review feedback.
1643
    # backwards compatibility hack: skip the root id.
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1644
    if not repository.supports_rich_root():
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
1645
        path, root = entries.next()
1646
        if root.revision != rev.revision_id:
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1647
            raise errors.IncompatibleRevision(repr(repository))
1185.82.84 by Aaron Bentley
Moved stuff around
1648
    # Add the texts that are not already present
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1649
    for path, ie in entries:
1185.82.84 by Aaron Bentley
Moved stuff around
1650
        w = repository.weave_store.get_weave_or_empty(ie.file_id,
1651
                repository.get_transaction())
1652
        if ie.revision not in w:
1653
            text_parents = []
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
1654
            # FIXME: TODO: The following loop *may* be overlapping/duplicate
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1655
            # 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.
1656
            # is a latent bug here where the parents may have ancestors of each
1657
            # other. RBC, AB
1185.82.84 by Aaron Bentley
Moved stuff around
1658
            for revision, tree in parent_trees.iteritems():
1659
                if ie.file_id not in tree:
1660
                    continue
1661
                parent_id = tree.inventory[ie.file_id].revision
1662
                if parent_id in text_parents:
1663
                    continue
1664
                text_parents.append(parent_id)
1665
                    
1666
            vfile = repository.weave_store.get_weave_or_empty(ie.file_id, 
1667
                repository.get_transaction())
1668
            lines = revision_tree.get_file(ie.file_id).readlines()
1669
            vfile.add_lines(rev.revision_id, text_parents, lines)
1670
    try:
1671
        # install the inventory
1672
        repository.add_inventory(rev.revision_id, inv, present_parents)
1673
    except errors.RevisionAlreadyPresent:
1674
        pass
1675
    repository.add_revision(rev.revision_id, rev, inv)
1676
1677
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1678
class MetaDirRepository(Repository):
1679
    """Repositories in the new meta-dir layout."""
1680
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1681
    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
1682
        super(MetaDirRepository, self).__init__(_format,
1683
                                                a_bzrdir,
1684
                                                control_files,
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1685
                                                _revision_store,
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1686
                                                control_store,
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1687
                                                text_store)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1688
        dir_mode = self.control_files._dir_mode
1689
        file_mode = self.control_files._file_mode
1690
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1691
    @needs_read_lock
1692
    def is_shared(self):
1693
        """Return True if this repository is flagged as a shared repository."""
1694
        return self.control_files._transport.has('shared-storage')
1695
1696
    @needs_write_lock
1697
    def set_make_working_trees(self, new_value):
1698
        """Set the policy flag for making working trees when creating branches.
1699
1700
        This only applies to branches that use this repository.
1701
1702
        The default is 'True'.
1703
        :param new_value: True to restore the default, False to disable making
1704
                          working trees.
1705
        """
1706
        if new_value:
1707
            try:
1708
                self.control_files._transport.delete('no-working-trees')
1709
            except errors.NoSuchFile:
1710
                pass
1711
        else:
1712
            self.control_files.put_utf8('no-working-trees', '')
1713
    
1714
    def make_working_trees(self):
1715
        """Returns the policy for making working trees on new branches."""
1716
        return not self.control_files._transport.has('no-working-trees')
1717
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1718
2241.1.2 by Martin Pool
change to using external Repository format registry
1719
class RepositoryFormatRegistry(registry.Registry):
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
1720
    """Registry of RepositoryFormats."""
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1721
1722
    def get(self, format_string):
1723
        r = registry.Registry.get(self, format_string)
1724
        if callable(r):
1725
            r = r()
1726
        return r
2241.1.2 by Martin Pool
change to using external Repository format registry
1727
    
1728
1729
format_registry = RepositoryFormatRegistry()
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1730
"""Registry of formats, indexed by their identifying format string.
1731
1732
This can contain either format instances themselves, or classes/factories that
1733
can be called to obtain one.
1734
"""
2241.1.2 by Martin Pool
change to using external Repository format registry
1735
2220.2.3 by Martin Pool
Add tag: revision namespace.
1736
1737
#####################################################################
1738
# Repository Formats
1910.2.46 by Aaron Bentley
Whitespace fix
1739
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1740
class RepositoryFormat(object):
1741
    """A repository format.
1742
1743
    Formats provide three things:
1744
     * An initialization routine to construct repository data on disk.
1745
     * a format string which is used when the BzrDir supports versioned
1746
       children.
1747
     * an open routine which returns a Repository instance.
1748
2889.1.2 by Robert Collins
Review feedback.
1749
    There is one and only one Format subclass for each on-disk format. But
1750
    there can be one Repository subclass that is used for several different
1751
    formats. The _format attribute on a Repository instance can be used to
1752
    determine the disk format.
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
1753
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1754
    Formats are placed in an dict by their format string for reference 
1755
    during opening. These should be subclasses of RepositoryFormat
1756
    for consistency.
1757
1758
    Once a format is deprecated, just deprecate the initialize and open
1759
    methods on the format class. Do not deprecate the object, as the 
1760
    object will be created every system load.
1761
1762
    Common instance attributes:
1763
    _matchingbzrdir - the bzrdir format that the repository format was
1764
    originally written to work with. This can be used if manually
1765
    constructing a bzrdir and repository, or more commonly for test suite
1766
    parameterisation.
1767
    """
1768
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1769
    def __str__(self):
1770
        return "<%s>" % self.__class__.__name__
1771
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1772
    def __eq__(self, other):
1773
        # format objects are generally stateless
1774
        return isinstance(other, self.__class__)
1775
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1776
    def __ne__(self, other):
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
1777
        return not self == other
1778
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1779
    @classmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1780
    def find_format(klass, a_bzrdir):
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1781
        """Return the format for the repository object in a_bzrdir.
1782
        
1783
        This is used by bzr native formats that have a "format" file in
1784
        the repository.  Other methods may be used by different types of 
1785
        control directory.
1786
        """
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1787
        try:
1788
            transport = a_bzrdir.get_repository_transport(None)
1789
            format_string = transport.get("format").read()
2241.1.2 by Martin Pool
change to using external Repository format registry
1790
            return format_registry.get(format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1791
        except errors.NoSuchFile:
1792
            raise errors.NoRepositoryPresent(a_bzrdir)
1793
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1794
            raise errors.UnknownFormatError(format=format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1795
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1796
    @classmethod
2241.1.2 by Martin Pool
change to using external Repository format registry
1797
    def register_format(klass, format):
1798
        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
1799
1800
    @classmethod
1801
    def unregister_format(klass, format):
2241.1.2 by Martin Pool
change to using external Repository format registry
1802
        format_registry.remove(format.get_format_string())
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1803
    
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1804
    @classmethod
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1805
    def get_default_format(klass):
1806
        """Return the current default format."""
2204.5.3 by Aaron Bentley
zap old repository default handling
1807
        from bzrlib import bzrdir
1808
        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
1809
1810
    def _get_control_store(self, repo_transport, control_files):
1811
        """Return the control store for this repository."""
1812
        raise NotImplementedError(self._get_control_store)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1813
1814
    def get_format_string(self):
1815
        """Return the ASCII format string that identifies this format.
1816
        
1817
        Note that in pre format ?? repositories the format string is 
1818
        not permitted nor written to disk.
1819
        """
1820
        raise NotImplementedError(self.get_format_string)
1821
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1822
    def get_format_description(self):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1823
        """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
1824
        raise NotImplementedError(self.get_format_description)
1825
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1826
    def _get_revision_store(self, repo_transport, control_files):
1827
        """Return the revision store object for this a_bzrdir."""
1556.1.5 by Robert Collins
Review feedback.
1828
        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
1829
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1830
    def _get_text_rev_store(self,
1831
                            transport,
1832
                            control_files,
1833
                            name,
1834
                            compressed=True,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1835
                            prefixed=False,
1836
                            serializer=None):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1837
        """Common logic for getting a revision store for a repository.
1838
        
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1839
        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
1840
        get the store for a repository.
1841
        """
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1842
        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
1843
        dir_mode = control_files._dir_mode
1844
        file_mode = control_files._file_mode
2220.2.2 by Martin Pool
Add tag command and basic implementation
1845
        text_store = TextStore(transport.clone(name),
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1846
                              prefixed=prefixed,
1847
                              compressed=compressed,
1848
                              dir_mode=dir_mode,
1849
                              file_mode=file_mode)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1850
        _revision_store = TextRevisionStore(text_store, serializer)
1851
        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
1852
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1853
    # TODO: this shouldn't be in the base class, it's specific to things that
1854
    # 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.
1855
    def _get_versioned_file_store(self,
1856
                                  name,
1857
                                  transport,
1858
                                  control_files,
1859
                                  prefixed=True,
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
1860
                                  versionedfile_class=None,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1861
                                  versionedfile_kwargs={},
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1862
                                  escaped=False):
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
1863
        if versionedfile_class is None:
1864
            versionedfile_class = self._versionedfile_class
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1865
        weave_transport = control_files._transport.clone(name)
1866
        dir_mode = control_files._dir_mode
1867
        file_mode = control_files._file_mode
1868
        return VersionedFileStore(weave_transport, prefixed=prefixed,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1869
                                  dir_mode=dir_mode,
1870
                                  file_mode=file_mode,
1871
                                  versionedfile_class=versionedfile_class,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1872
                                  versionedfile_kwargs=versionedfile_kwargs,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1873
                                  escaped=escaped)
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1874
1534.6.1 by Robert Collins
allow API creation of shared repositories
1875
    def initialize(self, a_bzrdir, shared=False):
1876
        """Initialize a repository of this format in a_bzrdir.
1877
1878
        :param a_bzrdir: The bzrdir to put the new repository in it.
1879
        :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.
1880
        :returns: The new repository object.
1881
        
1534.6.1 by Robert Collins
allow API creation of shared repositories
1882
        This may raise UninitializableFormat if shared repository are not
1883
        compatible the a_bzrdir.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1884
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1885
        raise NotImplementedError(self.initialize)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1886
1887
    def is_supported(self):
1888
        """Is this format supported?
1889
1890
        Supported formats must be initializable and openable.
1891
        Unsupported formats may not support initialization or committing or 
1892
        some other features depending on the reason for not being supported.
1893
        """
1894
        return True
1895
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1896
    def check_conversion_target(self, target_format):
1897
        raise NotImplementedError(self.check_conversion_target)
1898
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1899
    def open(self, a_bzrdir, _found=False):
1900
        """Return an instance of this format for the bzrdir a_bzrdir.
1901
        
1902
        _found is a private parameter, do not use it.
1903
        """
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1904
        raise NotImplementedError(self.open)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1905
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1906
1907
class MetaDirRepositoryFormat(RepositoryFormat):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1908
    """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
1909
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1910
    rich_root_data = False
2323.5.17 by Martin Pool
Add supports_tree_reference to all repo formats (robert)
1911
    supports_tree_reference = False
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1912
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1913
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.
1914
    def __init__(self):
1915
        super(MetaDirRepositoryFormat, self).__init__()
1916
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1917
    def _create_control_files(self, a_bzrdir):
1918
        """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.
1919
        # FIXME: RBC 20060125 don't peek under the covers
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1920
        # NB: no need to escape relative paths that are url safe.
1921
        repository_transport = a_bzrdir.get_repository_transport(self)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1922
        control_files = lockable_files.LockableFiles(repository_transport,
1923
                                'lock', lockdir.LockDir)
1553.5.61 by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use.
1924
        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
1925
        return control_files
1926
1927
    def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
1928
        """Upload the initial blank content."""
1929
        control_files = self._create_control_files(a_bzrdir)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1930
        control_files.lock_write()
1931
        try:
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
1932
            control_files._transport.mkdir_multi(dirs,
1933
                    mode=control_files._dir_mode)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1934
            for file, content in files:
1935
                control_files.put(file, content)
1936
            for file, content in utf8_files:
1937
                control_files.put_utf8(file, content)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1938
            if shared == True:
1939
                control_files.put_utf8('shared-storage', '')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1940
        finally:
1941
            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
1942
1943
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1944
# 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.
1945
# 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
1946
# all in bzrlib.repofmt.weaverepo now.  When an instance of one of these is
1947
# needed, it's constructed directly by the BzrDir.  Non-native formats where
1948
# the repository is not separately opened are similar.
1949
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1950
format_registry.register_lazy(
1951
    'Bazaar-NG Repository format 7',
1952
    'bzrlib.repofmt.weaverepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1953
    'RepositoryFormat7'
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1954
    )
2592.3.22 by Robert Collins
Add new experimental repository formats.
1955
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1956
# KEEP in sync with bzrdir.format_registry default, which controls the overall
1957
# default control directory format
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1958
format_registry.register_lazy(
1959
    'Bazaar-NG Knit Repository Format 1',
1960
    'bzrlib.repofmt.knitrepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1961
    'RepositoryFormatKnit1',
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1962
    )
1963
format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
1964
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
1965
format_registry.register_lazy(
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1966
    'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
1967
    'bzrlib.repofmt.knitrepo',
1968
    'RepositoryFormatKnit3',
1969
    )
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1970
2592.3.22 by Robert Collins
Add new experimental repository formats.
1971
# Experimental formats. These make no guarantee about data stability.
1972
# There is one format for pre-subtrees, and one for post-subtrees to
1973
# allow ease of testing.
1974
format_registry.register_lazy(
1975
    'Bazaar Experimental no-subtrees\n',
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1976
    'bzrlib.repofmt.pack_repo',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
1977
    'RepositoryFormatKnitPack1',
2592.3.22 by Robert Collins
Add new experimental repository formats.
1978
    )
1979
format_registry.register_lazy(
1980
    'Bazaar Experimental subtrees\n',
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
1981
    'bzrlib.repofmt.pack_repo',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
1982
    'RepositoryFormatKnitPack3',
2592.3.22 by Robert Collins
Add new experimental repository formats.
1983
    )
1984
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1985
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.
1986
class InterRepository(InterObject):
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1987
    """This class represents operations taking place between two repositories.
1988
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.
1989
    Its instances have methods like copy_content and fetch, and contain
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1990
    references to the source and target repositories these operations can be 
1991
    carried out on.
1992
1993
    Often we will provide convenience methods on 'repository' which carry out
1994
    operations with another repository - they will always forward to
1995
    InterRepository.get(other).method_name(parameters).
1996
    """
1997
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1998
    _optimisers = []
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
1999
    """The available optimised InterRepository types."""
2000
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2001
    def copy_content(self, revision_id=None):
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2002
        raise NotImplementedError(self.copy_content)
2003
2004
    def fetch(self, revision_id=None, pb=None):
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.
2005
        """Fetch the content required to construct revision_id.
2006
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
2007
        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.
2008
2009
        :param revision_id: if None all content is copied, if NULL_REVISION no
2010
                            content is copied.
2011
        :param pb: optional progress bar to use for progress reports. If not
2012
                   provided a default one will be created.
2013
2014
        Returns the copied revision count and the failed revisions in a tuple:
2015
        (copied, failures).
2016
        """
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2017
        raise NotImplementedError(self.fetch)
2018
   
2019
    @needs_read_lock
2020
    def missing_revision_ids(self, revision_id=None):
2021
        """Return the revision ids that source has that target does not.
2022
        
2023
        These are returned in topological order.
2024
2025
        :param revision_id: only return revision ids included by this
2026
                            revision_id.
2027
        """
2028
        # generic, possibly worst case, slow code path.
2029
        target_ids = set(self.target.all_revision_ids())
2030
        if revision_id is not None:
2031
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2032
            assert source_ids[0] is None
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2033
            source_ids.pop(0)
2034
        else:
2035
            source_ids = self.source.all_revision_ids()
2036
        result_set = set(source_ids).difference(target_ids)
2037
        # this may look like a no-op: its not. It preserves the ordering
2038
        # other_ids had while only returning the members from other_ids
2039
        # that we've decided we need.
2040
        return [rev_id for rev_id in source_ids if rev_id in result_set]
2041
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2042
    @staticmethod
2043
    def _same_model(source, target):
2044
        """True if source and target have the same data representation."""
2045
        if source.supports_rich_root() != target.supports_rich_root():
2046
            return False
2047
        if source._serializer != target._serializer:
2048
            return False
2049
        return True
2050
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2051
2052
class InterSameDataRepository(InterRepository):
2053
    """Code for converting between repositories that represent the same data.
2054
    
2055
    Data format and model must match for this to work.
2056
    """
2057
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2058
    @classmethod
2241.1.7 by Martin Pool
rename method
2059
    def _get_repo_format_to_test(self):
2814.1.1 by Robert Collins
* Pushing, pulling and branching branches with subtree references was not
2060
        """Repository format for testing with.
2061
        
2062
        InterSameData can pull from subtree to subtree and from non-subtree to
2063
        non-subtree, so we test this with the richest repository format.
2064
        """
2065
        from bzrlib.repofmt import knitrepo
2066
        return knitrepo.RepositoryFormatKnit3()
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2067
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2068
    @staticmethod
2069
    def is_compatible(source, target):
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2070
        return InterRepository._same_model(source, target)
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2071
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.
2072
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2073
    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.
2074
        """Make a complete copy of the content in self into destination.
2440.1.1 by Martin Pool
Add new Repository.sprout,
2075
2076
        This copies both the repository's revision data, and configuration information
2077
        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.
2078
        
2079
        This is a destructive operation! Do not use it on existing 
2080
        repositories.
2081
2082
        :param revision_id: Only copy the content needed to construct
2083
                            revision_id and its parents.
2084
        """
2085
        try:
2086
            self.target.set_make_working_trees(self.source.make_working_trees())
2087
        except NotImplementedError:
2088
            pass
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2089
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2090
        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.
2091
            self.target.has_revision(revision_id)):
2092
            return
2093
        self.target.fetch(self.source, revision_id=revision_id)
2094
2095
    @needs_write_lock
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.
2096
    def fetch(self, revision_id=None, pb=None):
1910.7.20 by Andrew Bennetts
Merge from bzr.dev
2097
        """See InterRepository.fetch()."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2098
        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.
2099
        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.
2100
               self.source, self.source._format, self.target,
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2101
               self.target._format)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2102
        f = GenericRepoFetcher(to_repository=self.target,
2103
                               from_repository=self.source,
2104
                               last_revision=revision_id,
2105
                               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.
2106
        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.
2107
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2108
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2109
class InterWeaveRepo(InterSameDataRepository):
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
2110
    """Optimised code paths between Weave based repositories.
2111
    
2112
    This should be in bzrlib/repofmt/weaverepo.py but we have not yet
2113
    implemented lazy inter-object optimisation.
2114
    """
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2115
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
2116
    @classmethod
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2117
    def _get_repo_format_to_test(self):
2118
        from bzrlib.repofmt import weaverepo
2119
        return weaverepo.RepositoryFormat7()
2120
2121
    @staticmethod
2122
    def is_compatible(source, target):
2123
        """Be compatible with known Weave formats.
2124
        
2125
        We don't test for the stores being of specific types because that
2126
        could lead to confusing results, and there is no need to be 
2127
        overly general.
2128
        """
2129
        from bzrlib.repofmt.weaverepo import (
2130
                RepositoryFormat5,
2131
                RepositoryFormat6,
2132
                RepositoryFormat7,
2133
                )
2134
        try:
2135
            return (isinstance(source._format, (RepositoryFormat5,
2136
                                                RepositoryFormat6,
2137
                                                RepositoryFormat7)) and
2138
                    isinstance(target._format, (RepositoryFormat5,
2139
                                                RepositoryFormat6,
2140
                                                RepositoryFormat7)))
2141
        except AttributeError:
2142
            return False
2143
    
2144
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2145
    def copy_content(self, revision_id=None):
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2146
        """See InterRepository.copy_content()."""
2147
        # weave specific optimised path:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2148
        try:
2149
            self.target.set_make_working_trees(self.source.make_working_trees())
2150
        except NotImplementedError:
2151
            pass
2152
        # FIXME do not peek!
2153
        if self.source.control_files._transport.listable():
2154
            pb = ui.ui_factory.nested_progress_bar()
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2155
            try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2156
                self.target.weave_store.copy_all_ids(
2157
                    self.source.weave_store,
2158
                    pb=pb,
2159
                    from_transaction=self.source.get_transaction(),
2160
                    to_transaction=self.target.get_transaction())
2161
                pb.update('copying inventory', 0, 1)
2162
                self.target.control_weaves.copy_multi(
2163
                    self.source.control_weaves, ['inventory'],
2164
                    from_transaction=self.source.get_transaction(),
2165
                    to_transaction=self.target.get_transaction())
2166
                self.target._revision_store.text_store.copy_all_ids(
2167
                    self.source._revision_store.text_store,
2168
                    pb=pb)
2169
            finally:
2170
                pb.finished()
2171
        else:
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2172
            self.target.fetch(self.source, revision_id=revision_id)
2173
2174
    @needs_write_lock
2175
    def fetch(self, revision_id=None, pb=None):
2176
        """See InterRepository.fetch()."""
2177
        from bzrlib.fetch import GenericRepoFetcher
2178
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2179
               self.source, self.source._format, self.target, self.target._format)
2180
        f = GenericRepoFetcher(to_repository=self.target,
2181
                               from_repository=self.source,
2182
                               last_revision=revision_id,
2183
                               pb=pb)
2184
        return f.count_copied, f.failed_revisions
2185
2186
    @needs_read_lock
2187
    def missing_revision_ids(self, revision_id=None):
2188
        """See InterRepository.missing_revision_ids()."""
2189
        # we want all revisions to satisfy revision_id in source.
2190
        # but we don't want to stat every file here and there.
2191
        # we want then, all revisions other needs to satisfy revision_id 
2192
        # checked, but not those that we have locally.
2193
        # so the first thing is to get a subset of the revisions to 
2194
        # satisfy revision_id in source, and then eliminate those that
2195
        # we do already have. 
2196
        # this is slow on high latency connection to self, but as as this
2197
        # disk format scales terribly for push anyway due to rewriting 
2198
        # inventory.weave, this is considered acceptable.
2199
        # - RBC 20060209
2200
        if revision_id is not None:
2201
            source_ids = self.source.get_ancestry(revision_id)
2202
            assert source_ids[0] is None
2203
            source_ids.pop(0)
2204
        else:
2205
            source_ids = self.source._all_possible_ids()
2206
        source_ids_set = set(source_ids)
2207
        # source_ids is the worst possible case we may need to pull.
2208
        # now we want to filter source_ids against what we actually
2209
        # have in target, but don't try to check for existence where we know
2210
        # we do not have a revision as that would be pointless.
2211
        target_ids = set(self.target._all_possible_ids())
2212
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2213
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2214
        required_revisions = source_ids_set.difference(actually_present_revisions)
2215
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2216
        if revision_id is not None:
2217
            # we used get_ancestry to determine source_ids then we are assured all
2218
            # revisions referenced are present as they are installed in topological order.
2219
            # and the tip revision was validated by get_ancestry.
2220
            return required_topo_revisions
2221
        else:
2222
            # if we just grabbed the possibly available ids, then 
2223
            # we only have an estimate of whats available and need to validate
2224
            # that against the revision records.
2225
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2226
2227
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2228
class InterKnitRepo(InterSameDataRepository):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2229
    """Optimised code paths between Knit based repositories."""
2230
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2231
    @classmethod
2241.1.7 by Martin Pool
rename method
2232
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2233
        from bzrlib.repofmt import knitrepo
2234
        return knitrepo.RepositoryFormatKnit1()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2235
2236
    @staticmethod
2237
    def is_compatible(source, target):
2238
        """Be compatible with known Knit formats.
2239
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2240
        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.
2241
        could lead to confusing results, and there is no need to be 
2242
        overly general.
2243
        """
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2244
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2245
        try:
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2246
            are_knits = (isinstance(source._format, RepositoryFormatKnit) and
2247
                isinstance(target._format, RepositoryFormatKnit))
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2248
        except AttributeError:
2249
            return False
2592.3.28 by Robert Collins
Make InterKnitOptimiser be used between any same-model knit repository.
2250
        return are_knits and InterRepository._same_model(source, target)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2251
2252
    @needs_write_lock
2253
    def fetch(self, revision_id=None, pb=None):
2254
        """See InterRepository.fetch()."""
2255
        from bzrlib.fetch import KnitRepoFetcher
2256
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2257
               self.source, self.source._format, self.target, self.target._format)
2258
        f = KnitRepoFetcher(to_repository=self.target,
2259
                            from_repository=self.source,
2260
                            last_revision=revision_id,
2261
                            pb=pb)
2262
        return f.count_copied, f.failed_revisions
2263
2264
    @needs_read_lock
2265
    def missing_revision_ids(self, revision_id=None):
2266
        """See InterRepository.missing_revision_ids()."""
2267
        if revision_id is not None:
2268
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2269
            assert source_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
2270
            source_ids.pop(0)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2271
        else:
2850.3.1 by Robert Collins
Move various weave specific code out of the base Repository class to weaverepo.py.
2272
            source_ids = self.source.all_revision_ids()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2273
        source_ids_set = set(source_ids)
2274
        # source_ids is the worst possible case we may need to pull.
2275
        # 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.
2276
        # 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.
2277
        # 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.
2278
        target_ids = set(self.target.all_revision_ids())
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2279
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2280
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2281
        required_revisions = source_ids_set.difference(actually_present_revisions)
2282
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2283
        if revision_id is not None:
2284
            # we used get_ancestry to determine source_ids then we are assured all
2285
            # revisions referenced are present as they are installed in topological order.
2286
            # and the tip revision was validated by get_ancestry.
2287
            return required_topo_revisions
2288
        else:
2289
            # if we just grabbed the possibly available ids, then 
2290
            # we only have an estimate of whats available and need to validate
2291
            # that against the revision records.
2292
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2293
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2294
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2295
class InterPackRepo(InterSameDataRepository):
2296
    """Optimised code paths between Pack based repositories."""
2297
2298
    @classmethod
2299
    def _get_repo_format_to_test(self):
2300
        from bzrlib.repofmt import pack_repo
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2301
        return pack_repo.RepositoryFormatKnitPack1()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2302
2303
    @staticmethod
2304
    def is_compatible(source, target):
2305
        """Be compatible with known Pack formats.
2306
        
2307
        We don't test for the stores being of specific types because that
2308
        could lead to confusing results, and there is no need to be 
2309
        overly general.
2310
        """
2311
        from bzrlib.repofmt.pack_repo import RepositoryFormatPack
2312
        try:
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2313
            are_packs = (isinstance(source._format, RepositoryFormatPack) and
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2314
                isinstance(target._format, RepositoryFormatPack))
2315
        except AttributeError:
2316
            return False
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2317
        return are_packs and InterRepository._same_model(source, target)
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2318
2319
    @needs_write_lock
2320
    def fetch(self, revision_id=None, pb=None):
2321
        """See InterRepository.fetch()."""
2322
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2323
               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.
2324
        self.count_copied = 0
2325
        if revision_id is None:
2326
            # TODO:
2327
            # everything to do - use pack logic
2328
            # to fetch from all packs to one without
2592.3.93 by Robert Collins
Steps toward filtering revisions/inventories/texts during fetch.
2329
            # 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.
2330
            # till then:
2331
            revision_ids = self.source.all_revision_ids()
2592.3.93 by Robert Collins
Steps toward filtering revisions/inventories/texts during fetch.
2332
            # implementing the TODO will involve:
2333
            # - detecting when all of a pack is selected
2334
            # - avoiding as much as possible pre-selection, so the
2335
            # more-core routines such as create_pack_from_packs can filter in
2336
            # a just-in-time fashion. (though having a HEADS list on a
2337
            # repository might make this a lot easier, because we could
2338
            # 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.
2339
        elif _mod_revision.is_null(revision_id):
2340
            # nothing to do:
2341
            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.
2342
        else:
2343
            try:
2344
                revision_ids = self.missing_revision_ids(revision_id)
2345
            except errors.NoSuchRevision:
2346
                raise errors.InstallFailed([revision_id])
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2347
        packs = self.source._pack_collection.all_packs()
2348
        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.
2349
            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.
2350
            )
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2351
        if pack is not None:
2592.3.232 by Martin Pool
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
2352
            self.target._pack_collection._save_pack_names()
2592.3.108 by Robert Collins
Autopack after pack to pack fetching too.
2353
            # Trigger an autopack. This may duplicate effort as we've just done
2354
            # a pack creation, but for now it is simpler to think about as
2355
            # '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
2356
            self.target._pack_collection.autopack()
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
2357
            return pack.get_revision_count()
2358
        else:
2359
            return 0
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2360
2361
    @needs_read_lock
2362
    def missing_revision_ids(self, revision_id=None):
2363
        """See InterRepository.missing_revision_ids()."""
2364
        if revision_id is not None:
2365
            source_ids = self.source.get_ancestry(revision_id)
2366
            assert source_ids[0] is None
2367
            source_ids.pop(0)
2368
        else:
2592.3.151 by Robert Collins
Use the revision index, not the inventory index, for missing and fetch operations.
2369
            source_ids = self.source.all_revision_ids()
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2370
        # source_ids is the worst possible case we may need to pull.
2371
        # now we want to filter source_ids against what we actually
2372
        # have in target, but don't try to check for existence where we know
2373
        # 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.
2374
        target_ids = set(self.target.all_revision_ids())
2592.3.241 by Martin Pool
Remove redundant set construction from InterPackRepo.missing_revisions
2375
        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.
2376
2377
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2378
class InterModel1and2(InterRepository):
2379
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2380
    @classmethod
2241.1.7 by Martin Pool
rename method
2381
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2382
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2383
2384
    @staticmethod
2385
    def is_compatible(source, target):
2305.2.1 by Andrew Bennetts
Use repo.supports_rich_root() everywhere rather than
2386
        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
2387
            return True
2388
        else:
2389
            return False
2390
2391
    @needs_write_lock
2392
    def fetch(self, revision_id=None, pb=None):
2393
        """See InterRepository.fetch()."""
2394
        from bzrlib.fetch import Model1toKnit2Fetcher
2395
        f = Model1toKnit2Fetcher(to_repository=self.target,
2396
                                 from_repository=self.source,
2397
                                 last_revision=revision_id,
2398
                                 pb=pb)
2399
        return f.count_copied, f.failed_revisions
2400
1910.2.26 by Aaron Bentley
Fix up some test cases
2401
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2402
    def copy_content(self, revision_id=None):
1910.2.26 by Aaron Bentley
Fix up some test cases
2403
        """Make a complete copy of the content in self into destination.
2404
        
2405
        This is a destructive operation! Do not use it on existing 
2406
        repositories.
2407
2408
        :param revision_id: Only copy the content needed to construct
2409
                            revision_id and its parents.
2410
        """
2411
        try:
2412
            self.target.set_make_working_trees(self.source.make_working_trees())
2413
        except NotImplementedError:
2414
            pass
2415
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2416
        if (revision_id not in (None, _mod_revision.NULL_REVISION) and 
1910.2.26 by Aaron Bentley
Fix up some test cases
2417
            self.target.has_revision(revision_id)):
2418
            return
2419
        self.target.fetch(self.source, revision_id=revision_id)
2420
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2421
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2422
class InterKnit1and2(InterKnitRepo):
2423
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2424
    @classmethod
2241.1.7 by Martin Pool
rename method
2425
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2426
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2427
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2428
    @staticmethod
2429
    def is_compatible(source, target):
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
2430
        """Be compatible with Knit1 source and Knit3 target"""
2431
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2432
        try:
2592.3.88 by Robert Collins
Move Pack repository logic to bzrlib.repofmt.pack_repo.
2433
            from bzrlib.repofmt.knitrepo import (RepositoryFormatKnit1,
2434
                RepositoryFormatKnit3)
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2435
            from bzrlib.repofmt.pack_repo import (RepositoryFormatKnitPack1,
2436
                RepositoryFormatKnitPack3)
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2437
            return (isinstance(source._format,
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2438
                    (RepositoryFormatKnit1, RepositoryFormatKnitPack1)) and
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2439
                isinstance(target._format,
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
2440
                    (RepositoryFormatKnit3, RepositoryFormatKnitPack3))
2592.3.220 by Robert Collins
Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
2441
                )
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2442
        except AttributeError:
2443
            return False
2444
2445
    @needs_write_lock
2446
    def fetch(self, revision_id=None, pb=None):
2447
        """See InterRepository.fetch()."""
2448
        from bzrlib.fetch import Knit1to2Fetcher
2449
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2450
               self.source, self.source._format, self.target, 
2451
               self.target._format)
2452
        f = Knit1to2Fetcher(to_repository=self.target,
2453
                            from_repository=self.source,
2454
                            last_revision=revision_id,
2455
                            pb=pb)
2456
        return f.count_copied, f.failed_revisions
2457
2458
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2459
class InterRemoteToOther(InterRepository):
2460
2461
    def __init__(self, source, target):
2462
        InterRepository.__init__(self, source, target)
2463
        self._real_inter = None
2464
2465
    @staticmethod
2466
    def is_compatible(source, target):
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
2467
        if not isinstance(source, remote.RemoteRepository):
2468
            return False
2469
        source._ensure_real()
2470
        real_source = source._real_repository
2535.3.21 by Andrew Bennetts
All tests passing.
2471
        # Is source's model compatible with target's model, and are they the
2472
        # same format?  Currently we can only optimise fetching from an
2473
        # identical model & format repo.
2535.3.41 by Andrew Bennetts
Add tests for InterRemoteToOther.is_compatible.
2474
        assert not isinstance(real_source, remote.RemoteRepository), (
2475
            "We don't support remote repos backed by remote repos yet.")
2476
        return real_source._format == target._format
2477
2478
    @needs_write_lock
2479
    def fetch(self, revision_id=None, pb=None):
2480
        """See InterRepository.fetch()."""
2481
        from bzrlib.fetch import RemoteToOtherFetcher
2482
        mutter("Using fetch logic to copy between %s(remote) and %s(%s)",
2483
               self.source, self.target, self.target._format)
2484
        # TODO: jam 20070210 This should be an assert, not a translate
2485
        revision_id = osutils.safe_revision_id(revision_id)
2486
        f = RemoteToOtherFetcher(to_repository=self.target,
2487
                                 from_repository=self.source,
2488
                                 last_revision=revision_id,
2489
                                 pb=pb)
2490
        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.
2491
2492
    @classmethod
2493
    def _get_repo_format_to_test(self):
2494
        return None
2495
2496
2497
class InterOtherToRemote(InterRepository):
2498
2499
    def __init__(self, source, target):
2500
        InterRepository.__init__(self, source, target)
2501
        self._real_inter = None
2502
2503
    @staticmethod
2504
    def is_compatible(source, target):
2505
        if isinstance(target, remote.RemoteRepository):
2506
            return True
2507
        return False
2508
2509
    def _ensure_real_inter(self):
2510
        if self._real_inter is None:
2511
            self.target._ensure_real()
2512
            real_target = self.target._real_repository
2513
            self._real_inter = InterRepository.get(self.source, real_target)
2514
    
2515
    def copy_content(self, revision_id=None):
2516
        self._ensure_real_inter()
2517
        self._real_inter.copy_content(revision_id=revision_id)
2518
2519
    def fetch(self, revision_id=None, pb=None):
2520
        self._ensure_real_inter()
2521
        self._real_inter.fetch(revision_id=revision_id, pb=pb)
2522
2523
    @classmethod
2524
    def _get_repo_format_to_test(self):
2525
        return None
2526
2527
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2528
InterRepository.register_optimiser(InterSameDataRepository)
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
2529
InterRepository.register_optimiser(InterWeaveRepo)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2530
InterRepository.register_optimiser(InterKnitRepo)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2531
InterRepository.register_optimiser(InterModel1and2)
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2532
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.
2533
InterRepository.register_optimiser(InterPackRepo)
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
2534
InterRepository.register_optimiser(InterRemoteToOther)
2535
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.
2536
2537
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.
2538
class CopyConverter(object):
2539
    """A repository conversion tool which just performs a copy of the content.
2540
    
2541
    This is slow but quite reliable.
2542
    """
2543
2544
    def __init__(self, target_format):
2545
        """Create a CopyConverter.
2546
2547
        :param target_format: The format the resulting repository should be.
2548
        """
2549
        self.target_format = target_format
2550
        
2551
    def convert(self, repo, pb):
2552
        """Perform the conversion of to_convert, giving feedback via pb.
2553
2554
        :param to_convert: The disk object to convert.
2555
        :param pb: a progress bar to use for progress information.
2556
        """
2557
        self.pb = pb
2558
        self.count = 0
1596.2.22 by Robert Collins
Fetch changes to use new pb.
2559
        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.
2560
        # this is only useful with metadir layouts - separated repo content.
2561
        # trigger an assertion if not such
2562
        repo._format.get_format_string()
2563
        self.repo_dir = repo.bzrdir
2564
        self.step('Moving repository to repository.backup')
2565
        self.repo_dir.transport.move('repository', 'repository.backup')
2566
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2567
        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.
2568
        self.source_repo = repo._format.open(self.repo_dir,
2569
            _found=True,
2570
            _override_transport=backup_transport)
2571
        self.step('Creating new repository')
2572
        converted = self.target_format.initialize(self.repo_dir,
2573
                                                  self.source_repo.is_shared())
2574
        converted.lock_write()
2575
        try:
2576
            self.step('Copying content into repository.')
2577
            self.source_repo.copy_content_into(converted)
2578
        finally:
2579
            converted.unlock()
2580
        self.step('Deleting old repository content.')
2581
        self.repo_dir.transport.delete_tree('repository.backup')
2582
        self.pb.note('repository converted')
2583
2584
    def step(self, message):
2585
        """Update the pb by a step."""
2586
        self.count +=1
2587
        self.pb.update(message, self.count, self.total)
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2588
2589
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2590
_unescape_map = {
2591
    'apos':"'",
2592
    'quot':'"',
2593
    'amp':'&',
2594
    'lt':'<',
2595
    'gt':'>'
2596
}
2597
2598
2599
def _unescaper(match, _map=_unescape_map):
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
2600
    code = match.group(1)
2601
    try:
2602
        return _map[code]
2603
    except KeyError:
2604
        if not code.startswith('#'):
2605
            raise
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
2606
        return unichr(int(code[1:])).encode('utf8')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2607
2608
2609
_unescape_re = None
2610
2611
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2612
def _unescape_xml(data):
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2613
    """Unescape predefined XML entities in a string of data."""
2614
    global _unescape_re
2615
    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.
2616
        _unescape_re = re.compile('\&([^;]*);')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2617
    return _unescape_re.sub(_unescaper, data)
2745.6.3 by Aaron Bentley
Implement versionedfile checking for bzr check
2618
2619
2745.6.16 by Aaron Bentley
Update from review
2620
class _RevisionTextVersionCache(object):
2745.6.57 by Andrew Bennetts
Some improvements suggested by Martin's review.
2621
    """A cache of the versionedfile versions for revision and file-id."""
2745.6.16 by Aaron Bentley
Update from review
2622
2623
    def __init__(self, repository):
2624
        self.repository = repository
2625
        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.
2626
        self.revision_parents = {}
2627
        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.
2628
        # XXX: RBC: I haven't tracked down what uses this, but it would be
2629
        # better to use the headscache directly I think.
2630
        self.heads = graph.HeadsCache(self.repo_graph).heads
2745.6.16 by Aaron Bentley
Update from review
2631
2745.6.53 by Andrew Bennetts
Some more changes suggested by review.
2632
    def add_revision_text_versions(self, tree):
2745.6.16 by Aaron Bentley
Update from review
2633
        """Cache text version data from the supplied revision tree"""
2634
        inv_revisions = {}
2635
        for path, entry in tree.iter_entries_by_dir():
2636
            inv_revisions[entry.file_id] = entry.revision
2637
        self.revision_versions[tree.get_revision_id()] = inv_revisions
2638
        return inv_revisions
2639
2640
    def get_text_version(self, file_id, revision_id):
2641
        """Determine the text version for a given file-id and revision-id"""
2642
        try:
2643
            inv_revisions = self.revision_versions[revision_id]
2644
        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.
2645
            try:
2646
                tree = self.repository.revision_tree(revision_id)
2647
            except errors.RevisionNotPresent:
2648
                self.revision_versions[revision_id] = inv_revisions = {}
2649
            else:
2650
                inv_revisions = self.add_revision_text_versions(tree)
2745.6.16 by Aaron Bentley
Update from review
2651
        return inv_revisions.get(file_id)
2652
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.
2653
    def prepopulate_revs(self, revision_ids):
2654
        # Filter out versions that we don't have an inventory for, so that the
2655
        # revision_trees() call won't fail.
2656
        inv_weave = self.repository.get_inventory_weave()
2657
        revs = [r for r in revision_ids if inv_weave.has_version(r)]
2658
        # XXX: this loop is very similar to
2659
        # bzrlib.fetch.Inter1and2Helper.iter_rev_trees.
2660
        while revs:
2661
            for tree in self.repository.revision_trees(revs[:100]):
2662
                if tree.inventory.revision_id is None:
2663
                    tree.inventory.revision_id = tree.get_revision_id()
2664
                self.add_revision_text_versions(tree)
2665
            revs = revs[100:]
2666
2667
    def get_parents(self, revision_id):
2668
        try:
2669
            return self.revision_parents[revision_id]
2670
        except KeyError:
2671
            parents = self.repository.get_parents([revision_id])[0]
2672
            self.revision_parents[revision_id] = parents
2673
            return parents
2674
2745.6.16 by Aaron Bentley
Update from review
2675
2745.6.57 by Andrew Bennetts
Some improvements suggested by Martin's review.
2676
class VersionedFileChecker(object):
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2677
2678
    def __init__(self, planned_revisions, revision_versions, repository):
2679
        self.planned_revisions = planned_revisions
2680
        self.revision_versions = revision_versions
2681
        self.repository = repository
2745.6.49 by Andrew Bennetts
Get rid of bzrlib.repository._RevisionParentsProvider.
2682
    
2683
    def calculate_file_version_parents(self, revision_id, file_id):
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2684
        text_revision = self.revision_versions.get_text_version(
2685
            file_id, revision_id)
2686
        if text_revision is None:
2687
            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.
2688
        parents_of_text_revision = self.revision_versions.get_parents(
2689
            text_revision)
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2690
        parents_from_inventories = []
2691
        for parent in parents_of_text_revision:
2692
            if parent == _mod_revision.NULL_REVISION:
2693
                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.
2694
            introduced_in = self.revision_versions.get_text_version(file_id,
2695
                    parent)
2696
            if introduced_in is not None:
2697
                parents_from_inventories.append(introduced_in)
2698
        heads = set(self.revision_versions.heads(parents_from_inventories))
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2699
        new_parents = []
2700
        for parent in parents_from_inventories:
2701
            if parent in heads and parent not in new_parents:
2702
                new_parents.append(parent)
2592.3.214 by Robert Collins
Merge bzr.dev.
2703
        return tuple(new_parents)
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2704
2745.6.49 by Andrew Bennetts
Get rid of bzrlib.repository._RevisionParentsProvider.
2705
    def check_file_version_parents(self, weave, file_id):
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2706
        result = {}
2707
        for num, revision_id in enumerate(self.planned_revisions):
2708
            correct_parents = self.calculate_file_version_parents(
2745.6.49 by Andrew Bennetts
Get rid of bzrlib.repository._RevisionParentsProvider.
2709
                revision_id, file_id)
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2710
            if correct_parents is None:
2711
                continue
2712
            text_revision = self.revision_versions.get_text_version(
2713
                file_id, revision_id)
2592.3.214 by Robert Collins
Merge bzr.dev.
2714
            knit_parents = tuple(weave.get_parents(text_revision))
2745.6.47 by Andrew Bennetts
Move check_parents out of VersionedFile.
2715
            if correct_parents != knit_parents:
2716
                result[revision_id] = (knit_parents, correct_parents)
2717
        return result