/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
49
""")
50
1534.4.28 by Robert Collins
first cut at merge from integration.
51
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.
52
from bzrlib.inter import InterObject
1910.2.3 by Aaron Bentley
All tests pass
53
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
54
from bzrlib.symbol_versioning import (
55
        deprecated_method,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
56
        )
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
57
from bzrlib.trace import mutter, mutter_callsite, note, warning
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
58
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
59
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
60
# Old formats display a warning, but only once
61
_deprecation_warning_done = False
62
63
2818.3.1 by Robert Collins
Change CommitBuilder factory delegation to allow simple declaration.
64
class CommitBuilder(object):
65
    """Provides an interface to build up a commit.
66
67
    This allows describing a tree to be committed without needing to 
68
    know the internals of the format of the repository.
69
    """
70
    
71
    # all clients should supply tree roots.
72
    record_root_entry = True
73
74
    def __init__(self, repository, parents, config, timestamp=None, 
75
                 timezone=None, committer=None, revprops=None, 
76
                 revision_id=None):
77
        """Initiate a CommitBuilder.
78
79
        :param repository: Repository to commit to.
80
        :param parents: Revision ids of the parents of the new revision.
81
        :param config: Configuration to use.
82
        :param timestamp: Optional timestamp recorded for commit.
83
        :param timezone: Optional timezone for timestamp.
84
        :param committer: Optional committer to set for commit.
85
        :param revprops: Optional dictionary of revision properties.
86
        :param revision_id: Optional revision id.
87
        """
88
        self._config = config
89
90
        if committer is None:
91
            self._committer = self._config.username()
92
        else:
93
            assert isinstance(committer, basestring), type(committer)
94
            self._committer = committer
95
96
        self.new_inventory = Inventory(None)
97
        self._new_revision_id = osutils.safe_revision_id(revision_id)
98
        self.parents = parents
99
        self.repository = repository
100
101
        self._revprops = {}
102
        if revprops is not None:
103
            self._revprops.update(revprops)
104
105
        if timestamp is None:
106
            timestamp = time.time()
107
        # Restrict resolution to 1ms
108
        self._timestamp = round(timestamp, 3)
109
110
        if timezone is None:
111
            self._timezone = osutils.local_time_offset()
112
        else:
113
            self._timezone = int(timezone)
114
115
        self._generate_revision_if_needed()
116
117
    def commit(self, message):
118
        """Make the actual commit.
119
120
        :return: The revision id of the recorded revision.
121
        """
122
        rev = _mod_revision.Revision(
123
                       timestamp=self._timestamp,
124
                       timezone=self._timezone,
125
                       committer=self._committer,
126
                       message=message,
127
                       inventory_sha1=self.inv_sha1,
128
                       revision_id=self._new_revision_id,
129
                       properties=self._revprops)
130
        rev.parent_ids = self.parents
131
        self.repository.add_revision(self._new_revision_id, rev,
132
            self.new_inventory, self._config)
133
        self.repository.commit_write_group()
134
        return self._new_revision_id
135
136
    def abort(self):
137
        """Abort the commit that is being built.
138
        """
139
        self.repository.abort_write_group()
140
141
    def revision_tree(self):
142
        """Return the tree that was just committed.
143
144
        After calling commit() this can be called to get a RevisionTree
145
        representing the newly committed tree. This is preferred to
146
        calling Repository.revision_tree() because that may require
147
        deserializing the inventory, while we already have a copy in
148
        memory.
149
        """
150
        return RevisionTree(self.repository, self.new_inventory,
151
                            self._new_revision_id)
152
153
    def finish_inventory(self):
154
        """Tell the builder that the inventory is finished."""
155
        if self.new_inventory.root is None:
156
            symbol_versioning.warn('Root entry should be supplied to'
157
                ' record_entry_contents, as of bzr 0.10.',
158
                 DeprecationWarning, stacklevel=2)
159
            self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
160
        self.new_inventory.revision_id = self._new_revision_id
161
        self.inv_sha1 = self.repository.add_inventory(
162
            self._new_revision_id,
163
            self.new_inventory,
164
            self.parents
165
            )
166
167
    def _gen_revision_id(self):
168
        """Return new revision-id."""
169
        return generate_ids.gen_revision_id(self._config.username(),
170
                                            self._timestamp)
171
172
    def _generate_revision_if_needed(self):
173
        """Create a revision id if None was supplied.
174
        
175
        If the repository can not support user-specified revision ids
176
        they should override this function and raise CannotSetRevisionId
177
        if _new_revision_id is not None.
178
179
        :raises: CannotSetRevisionId
180
        """
181
        if self._new_revision_id is None:
182
            self._new_revision_id = self._gen_revision_id()
183
            self.random_revid = True
184
        else:
185
            self.random_revid = False
186
187
    def _check_root(self, ie, parent_invs, tree):
188
        """Helper for record_entry_contents.
189
190
        :param ie: An entry being added.
191
        :param parent_invs: The inventories of the parent revisions of the
192
            commit.
193
        :param tree: The tree that is being committed.
194
        """
195
        if ie.parent_id is not None:
196
            # if ie is not root, add a root automatically.
197
            symbol_versioning.warn('Root entry should be supplied to'
198
                ' record_entry_contents, as of bzr 0.10.',
199
                 DeprecationWarning, stacklevel=2)
200
            self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
201
                                       '', tree)
202
        else:
203
            # In this revision format, root entries have no knit or weave When
204
            # serializing out to disk and back in root.revision is always
205
            # _new_revision_id
206
            ie.revision = self._new_revision_id
207
208
    def record_entry_contents(self, ie, parent_invs, path, tree):
209
        """Record the content of ie from tree into the commit if needed.
210
211
        Side effect: sets ie.revision when unchanged
212
213
        :param ie: An inventory entry present in the commit.
214
        :param parent_invs: The inventories of the parent revisions of the
215
            commit.
216
        :param path: The path the entry is at in the tree.
217
        :param tree: The tree which contains this entry and should be used to 
218
        obtain content.
219
        """
220
        if self.new_inventory.root is None:
221
            self._check_root(ie, parent_invs, tree)
222
        self.new_inventory.add(ie)
223
224
        # ie.revision is always None if the InventoryEntry is considered
225
        # for committing. ie.snapshot will record the correct revision 
226
        # which may be the sole parent if it is untouched.
227
        if ie.revision is not None:
228
            return
229
230
        parent_candiate_entries = ie.parent_candidates(parent_invs)
231
        heads = self.repository.get_graph().heads(parent_candiate_entries.keys())
232
        # XXX: Note that this is unordered - and this is tolerable because 
233
        # the previous code was also unordered.
234
        previous_entries = dict((head, parent_candiate_entries[head]) for head
235
            in heads)
236
        # we are creating a new revision for ie in the history store and
237
        # inventory.
238
        ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
239
240
    def modified_directory(self, file_id, file_parents):
241
        """Record the presence of a symbolic link.
242
243
        :param file_id: The file_id of the link to record.
244
        :param file_parents: The per-file parent revision ids.
245
        """
246
        self._add_text_to_weave(file_id, [], file_parents.keys())
247
248
    def modified_reference(self, file_id, file_parents):
249
        """Record the modification of a reference.
250
251
        :param file_id: The file_id of the link to record.
252
        :param file_parents: The per-file parent revision ids.
253
        """
254
        self._add_text_to_weave(file_id, [], file_parents.keys())
255
    
256
    def modified_file_text(self, file_id, file_parents,
257
                           get_content_byte_lines, text_sha1=None,
258
                           text_size=None):
259
        """Record the text of file file_id
260
261
        :param file_id: The file_id of the file to record the text of.
262
        :param file_parents: The per-file parent revision ids.
263
        :param get_content_byte_lines: A callable which will return the byte
264
            lines for the file.
265
        :param text_sha1: Optional SHA1 of the file contents.
266
        :param text_size: Optional size of the file contents.
267
        """
268
        # mutter('storing text of file {%s} in revision {%s} into %r',
269
        #        file_id, self._new_revision_id, self.repository.weave_store)
270
        # special case to avoid diffing on renames or 
271
        # reparenting
272
        if (len(file_parents) == 1
273
            and text_sha1 == file_parents.values()[0].text_sha1
274
            and text_size == file_parents.values()[0].text_size):
275
            previous_ie = file_parents.values()[0]
276
            versionedfile = self.repository.weave_store.get_weave(file_id,
277
                self.repository.get_transaction())
278
            versionedfile.clone_text(self._new_revision_id,
279
                previous_ie.revision, file_parents.keys())
280
            return text_sha1, text_size
281
        else:
282
            new_lines = get_content_byte_lines()
283
            return self._add_text_to_weave(file_id, new_lines,
284
                file_parents.keys())
285
286
    def modified_link(self, file_id, file_parents, link_target):
287
        """Record the presence of a symbolic link.
288
289
        :param file_id: The file_id of the link to record.
290
        :param file_parents: The per-file parent revision ids.
291
        :param link_target: Target location of this link.
292
        """
293
        self._add_text_to_weave(file_id, [], file_parents.keys())
294
295
    def _add_text_to_weave(self, file_id, new_lines, parents):
296
        versionedfile = self.repository.weave_store.get_weave_or_empty(
297
            file_id, self.repository.get_transaction())
298
        # Don't change this to add_lines - add_lines_with_ghosts is cheaper
299
        # than add_lines, and allows committing when a parent is ghosted for
300
        # some reason.
301
        # Note: as we read the content directly from the tree, we know its not
302
        # been turned into unicode or badly split - but a broken tree
303
        # implementation could give us bad output from readlines() so this is
304
        # not a guarantee of safety. What would be better is always checking
305
        # the content during test suite execution. RBC 20070912
306
        result = versionedfile.add_lines_with_ghosts(
307
            self._new_revision_id, parents, new_lines,
308
            random_id=self.random_revid, check_content=False)[0:2]
309
        versionedfile.clear_cache()
310
        return result
311
312
313
class RootCommitBuilder(CommitBuilder):
314
    """This commitbuilder actually records the root id"""
315
    
316
    def _check_root(self, ie, parent_invs, tree):
317
        """Helper for record_entry_contents.
318
319
        :param ie: An entry being added.
320
        :param parent_invs: The inventories of the parent revisions of the
321
            commit.
322
        :param tree: The tree that is being committed.
323
        """
324
        # ie must be root for this builder
325
        assert ie.parent_id is None
326
327
2220.2.3 by Martin Pool
Add tag: revision namespace.
328
######################################################################
329
# Repositories
330
1185.66.5 by Aaron Bentley
Renamed RevisionStorage to Repository
331
class Repository(object):
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
332
    """Repository holding history for one or more branches.
333
334
    The repository holds and retrieves historical information including
335
    revisions and file history.  It's normally accessed only by the Branch,
336
    which views a particular line of development through that history.
337
338
    The Repository builds on top of Stores and a Transport, which respectively 
339
    describe the disk data format and the way of accessing the (possibly 
340
    remote) disk.
341
    """
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
342
2818.3.1 by Robert Collins
Change CommitBuilder factory delegation to allow simple declaration.
343
    # What class to use for a CommitBuilder. Often its simpler to change this
344
    # in a Repository class subclass rather than to override
345
    # get_commit_builder.
346
    _commit_builder_class = CommitBuilder
347
    # The search regex used by xml based repositories to determine what things
348
    # where changed in a single commit.
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
349
    _file_ids_altered_regex = lazy_regex.lazy_compile(
350
        r'file_id="(?P<file_id>[^"]+)"'
2814.1.1 by Robert Collins
* Pushing, pulling and branching branches with subtree references was not
351
        r'.* revision="(?P<revision_id>[^"]+)"'
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
352
        )
353
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
354
    def abort_write_group(self):
355
        """Commit the contents accrued within the current write group.
356
357
        :seealso: start_write_group.
358
        """
359
        if self._write_group is not self.get_transaction():
360
            # has an unlock or relock occured ?
361
            raise errors.BzrError('mismatched lock context and write group.')
362
        self._abort_write_group()
363
        self._write_group = None
364
365
    def _abort_write_group(self):
366
        """Template method for per-repository write group cleanup.
367
        
368
        This is called during abort before the write group is considered to be 
369
        finished and should cleanup any internal state accrued during the write
370
        group. There is no requirement that data handed to the repository be
371
        *not* made available - this is not a rollback - but neither should any
372
        attempt be made to ensure that data added is fully commited. Abort is
373
        invoked when an error has occured so futher disk or network operations
374
        may not be possible or may error and if possible should not be
375
        attempted.
376
        """
377
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
378
    @needs_write_lock
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
379
    def add_inventory(self, revision_id, inv, parents):
380
        """Add the inventory inv to the repository as revision_id.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
381
        
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
382
        :param parents: The revision ids of the parents that revision_id
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
383
                        is known to have and are in the repository already.
384
385
        returns the sha1 of the serialized inventory.
386
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
387
        revision_id = osutils.safe_revision_id(revision_id)
388
        _mod_revision.check_not_reserved_id(revision_id)
389
        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.
390
            "Mismatch between inventory revision" \
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
391
            " id and insertion revid (%r, %r)" % (inv.revision_id, revision_id)
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
392
        assert inv.root is not None
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
393
        inv_lines = self._serialise_inventory_to_lines(inv)
394
        inv_vf = self.get_inventory_weave()
395
        return self._inventory_add_lines(inv_vf, revision_id, parents,
396
            inv_lines, check_content=False)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
397
2805.6.7 by Robert Collins
Review feedback.
398
    def _inventory_add_lines(self, inv_vf, revision_id, parents, lines,
399
        check_content=True):
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
400
        """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.
401
        final_parents = []
402
        for parent in parents:
403
            if parent in inv_vf:
404
                final_parents.append(parent)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
405
        return inv_vf.add_lines(revision_id, final_parents, lines,
406
            check_content=check_content)[0]
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
407
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
408
    @needs_write_lock
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
409
    def add_revision(self, revision_id, rev, inv=None, config=None):
410
        """Add rev to the revision store as revision_id.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
411
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
412
        :param revision_id: the revision id to use.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
413
        :param rev: The revision object.
414
        :param inv: The inventory for the revision. if None, it will be looked
415
                    up in the inventory storer
416
        :param config: If None no digital signature will be created.
417
                       If supplied its signature_needed method will be used
418
                       to determine if a signature should be made.
419
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
420
        revision_id = osutils.safe_revision_id(revision_id)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
421
        # TODO: jam 20070210 Shouldn't we check rev.revision_id and
422
        #       rev.parent_ids?
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
423
        _mod_revision.check_not_reserved_id(revision_id)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
424
        if config is not None and config.signature_needed():
425
            if inv is None:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
426
                inv = self.get_inventory(revision_id)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
427
            plaintext = Testament(rev, inv).as_short_text()
428
            self.store_revision_signature(
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
429
                gpg.GPGStrategy(config), plaintext, revision_id)
430
        if not revision_id in self.get_inventory_weave():
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
431
            if inv is None:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
432
                raise errors.WeaveRevisionNotPresent(revision_id,
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
433
                                                     self.get_inventory_weave())
434
            else:
435
                # 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
436
                self.add_inventory(revision_id, inv, rev.parent_ids)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
437
        self._revision_store.add_revision(rev, self.get_transaction())
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
438
2520.4.10 by Aaron Bentley
Enable installation of revisions
439
    def _add_revision_text(self, revision_id, text):
440
        revision = self._revision_store._serializer.read_revision_from_string(
441
            text)
442
        self._revision_store._add_revision(revision, StringIO(text),
443
                                           self.get_transaction())
444
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
445
    @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.
446
    def _all_possible_ids(self):
447
        """Return all the possible revisions that we could find."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
448
        return self.get_inventory_weave().versions()
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.
449
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
450
    def all_revision_ids(self):
451
        """Returns a list of all the revision ids in the repository. 
452
453
        This is deprecated because code should generally work on the graph
454
        reachable from a particular revision, and ignore any other revisions
455
        that might be present.  There is no direct replacement method.
456
        """
457
        return self._all_revision_ids()
458
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.
459
    @needs_read_lock
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
460
    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.
461
        """Returns a list of all the revision ids in the repository. 
462
463
        These are in as much topological order as the underlying store can 
464
        present: for weaves ghosts may lead to a lack of correctness until
465
        the reweave updates the parents list.
466
        """
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
467
        if self._revision_store.text_store.listable():
468
            return self._revision_store.all_revision_ids(self.get_transaction())
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.
469
        result = self._all_possible_ids()
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
470
        # TODO: jam 20070210 Ensure that _all_possible_ids returns non-unicode
471
        #       ids. (It should, since _revision_store's API should change to
472
        #       return utf8 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.
473
        return self._eliminate_revisions_not_present(result)
474
1687.1.7 by Robert Collins
Teach Repository about break_lock.
475
    def break_lock(self):
476
        """Break a lock if one is present from another instance.
477
478
        Uses the ui factory to ask for confirmation if the lock may be from
479
        an active process.
480
        """
481
        self.control_files.break_lock()
482
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.
483
    @needs_read_lock
484
    def _eliminate_revisions_not_present(self, revision_ids):
485
        """Check every revision id in revision_ids to see if we have it.
486
487
        Returns a set of the present revisions.
488
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
489
        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.
490
        for id in revision_ids:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
491
            if self.has_revision(id):
492
               result.append(id)
493
        return result
494
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
495
    @staticmethod
496
    def create(a_bzrdir):
497
        """Construct the current default format repository in a_bzrdir."""
498
        return RepositoryFormat.get_default_format().initialize(a_bzrdir)
499
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
500
    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
501
        """instantiate a Repository.
502
503
        :param _format: The format of the repository on disk.
504
        :param a_bzrdir: The BzrDir of the repository.
505
506
        In the future we will have a single api for all stores for
507
        getting file texts, inventories and revisions, then
508
        this construct will accept instances of those things.
509
        """
1608.2.1 by Martin Pool
[merge] Storage filename escaping
510
        super(Repository, self).__init__()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
511
        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
512
        # 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.
513
        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
514
        self.control_files = control_files
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
515
        self._revision_store = _revision_store
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
516
        # backwards compatibility
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
517
        self.weave_store = text_store
2671.4.2 by Robert Collins
Review feedback.
518
        # for tests
519
        self._reconcile_does_inventory_gc = True
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
520
        # not right yet - should be more semantically clear ? 
521
        # 
522
        self.control_store = control_store
523
        self.control_weaves = control_store
1608.2.1 by Martin Pool
[merge] Storage filename escaping
524
        # TODO: make sure to construct the right store classes, etc, depending
525
        # on whether escaping is required.
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
526
        self._warn_if_deprecated()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
527
        self._write_group = None
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
528
1668.1.3 by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959)
529
    def __repr__(self):
530
        return '%s(%r)' % (self.__class__.__name__, 
531
                           self.bzrdir.transport.base)
532
2671.1.4 by Andrew Bennetts
Rename is_same_repository to has_same_location, thanks Aaron!
533
    def has_same_location(self, other):
2671.1.3 by Andrew Bennetts
Remove Repository.__eq__/__ne__ methods, replace with is_same_repository method.
534
        """Returns a boolean indicating if this repository is at the same
535
        location as another repository.
536
537
        This might return False even when two repository objects are accessing
538
        the same physical repository via different URLs.
539
        """
2671.1.1 by Andrew Bennetts
Add support for comparing Repositories with == and != operators.
540
        if self.__class__ is not other.__class__:
541
            return False
542
        return (self.control_files._transport.base ==
543
                other.control_files._transport.base)
544
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
545
    def is_in_write_group(self):
546
        """Return True if there is an open write group.
547
548
        :seealso: start_write_group.
549
        """
550
        return self._write_group is not None
551
1694.2.6 by Martin Pool
[merge] bzr.dev
552
    def is_locked(self):
553
        return self.control_files.is_locked()
554
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
555
    def lock_write(self, token=None):
556
        """Lock this repository for writing.
2617.6.8 by Robert Collins
Review feedback and documentation.
557
558
        This causes caching within the repository obejct to start accumlating
559
        data during reads, and allows a 'write_group' to be obtained. Write
560
        groups must be used for actual data insertion.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
561
        
562
        :param token: if this is already locked, then lock_write will fail
563
            unless the token matches the existing lock.
564
        :returns: a token if this instance supports tokens, otherwise None.
565
        :raises TokenLockingNotSupported: when a token is given but this
566
            instance doesn't support using token locks.
567
        :raises MismatchedToken: if the specified token doesn't match the token
568
            of the existing lock.
2617.6.8 by Robert Collins
Review feedback and documentation.
569
        :seealso: start_write_group.
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
570
2018.5.145 by Andrew Bennetts
Add a brief explanation of what tokens are used for to lock_write docstrings.
571
        A token should be passed in if you know that you have locked the object
572
        some other way, and need to synchronise this object's state with that
573
        fact.
574
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
575
        XXX: this docstring is duplicated in many places, e.g. lockable_files.py
576
        """
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
577
        result = self.control_files.lock_write(token=token)
578
        self._refresh_data()
579
        return result
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
580
581
    def lock_read(self):
1553.5.55 by Martin Pool
[revert] broken changes
582
        self.control_files.lock_read()
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
583
        self._refresh_data()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
584
1694.2.6 by Martin Pool
[merge] bzr.dev
585
    def get_physical_lock_status(self):
586
        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
587
2018.5.75 by Andrew Bennetts
Add Repository.{dont_,}leave_lock_in_place.
588
    def leave_lock_in_place(self):
589
        """Tell this repository not to release the physical lock when this
590
        object is unlocked.
2018.5.76 by Andrew Bennetts
Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.
591
        
592
        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.
593
        """
594
        self.control_files.leave_in_place()
595
596
    def dont_leave_lock_in_place(self):
597
        """Tell this repository to release the physical lock when this
598
        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.
599
600
        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.
601
        """
602
        self.control_files.dont_leave_in_place()
603
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.
604
    @needs_read_lock
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
605
    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).
606
        """Gather statistics from a revision id.
607
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
608
        :param revid: The revision id to gather statistics from, if None, then
609
            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).
610
        :param committers: Optional parameter controlling whether to grab
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
611
            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).
612
        :return: A dictionary of statistics. Currently this contains:
613
            committers: The number of committers if requested.
614
            firstrev: A tuple with timestamp, timezone for the penultimate left
615
                most ancestor of revid, if revid is not the NULL_REVISION.
616
            latestrev: A tuple with timestamp, timezone for revid, if revid is
617
                not the NULL_REVISION.
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
618
            revisions: The total revision count in the repository.
619
            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).
620
        """
621
        result = {}
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
622
        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).
623
            result['committers'] = 0
2258.1.2 by Robert Collins
New version of gather_stats which gathers aggregate data too.
624
        if revid and revid != _mod_revision.NULL_REVISION:
625
            if committers:
626
                all_committers = set()
627
            revisions = self.get_ancestry(revid)
628
            # pop the leading None
629
            revisions.pop(0)
630
            first_revision = None
631
            if not committers:
632
                # ignore the revisions in the middle - just grab first and last
633
                revisions = revisions[0], revisions[-1]
634
            for revision in self.get_revisions(revisions):
635
                if not first_revision:
636
                    first_revision = revision
637
                if committers:
638
                    all_committers.add(revision.committer)
639
            last_revision = revision
640
            if committers:
641
                result['committers'] = len(all_committers)
642
            result['firstrev'] = (first_revision.timestamp,
643
                first_revision.timezone)
644
            result['latestrev'] = (last_revision.timestamp,
645
                last_revision.timezone)
646
647
        # now gather global repository information
648
        if self.bzrdir.root_transport.listable():
649
            c, t = self._revision_store.total_size(self.get_transaction())
650
            result['revisions'] = c
651
            result['size'] = t
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
652
        return result
653
654
    @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.
655
    def missing_revision_ids(self, other, revision_id=None):
656
        """Return the revision ids that other has that this does not.
657
        
658
        These are returned in topological order.
659
660
        revision_id: only return revision ids included by revision_id.
661
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
662
        revision_id = osutils.safe_revision_id(revision_id)
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
663
        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.
664
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
665
    @staticmethod
666
    def open(base):
667
        """Open the repository rooted at base.
668
669
        For instance, if the repository is at URL/.bzr/repository,
670
        Repository.open(URL) -> a Repository instance.
671
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
672
        control = bzrdir.BzrDir.open(base)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
673
        return control.open_repository()
674
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
675
    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.
676
        """Make a complete copy of the content in self into destination.
677
        
678
        This is a destructive operation! Do not use it on existing 
679
        repositories.
680
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
681
        revision_id = osutils.safe_revision_id(revision_id)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
682
        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.
683
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
684
    def commit_write_group(self):
685
        """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``
686
687
        :seealso: start_write_group.
688
        """
689
        if self._write_group is not self.get_transaction():
690
            # has an unlock or relock occured ?
691
            raise errors.BzrError('mismatched lock context and write group.')
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
692
        self._commit_write_group()
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
693
        self._write_group = None
694
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
695
    def _commit_write_group(self):
696
        """Template method for per-repository write group cleanup.
697
        
698
        This is called before the write group is considered to be 
699
        finished and should ensure that all data handed to the repository
700
        for writing during the write group is safely committed (to the 
701
        extent possible considering file system caching etc).
702
        """
703
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.
704
    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.
705
        """Fetch the content required to construct revision_id from source.
706
707
        If revision_id is None all content is copied.
708
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
709
        revision_id = osutils.safe_revision_id(revision_id)
2323.8.3 by Aaron Bentley
Reduce scope of try/except, update NEWS
710
        inter = InterRepository.get(source, self)
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
711
        try:
2323.8.3 by Aaron Bentley
Reduce scope of try/except, update NEWS
712
            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
713
        except NotImplementedError:
714
            raise errors.IncompatibleRepositories(source, self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
715
2520.4.54 by Aaron Bentley
Hang a create_bundle method off repository
716
    def create_bundle(self, target, base, fileobj, format=None):
717
        return serializer.write_bundle(self, target, base, fileobj, format)
718
2803.2.1 by Robert Collins
* CommitBuilder now advertises itself as requiring the root entry to be
719
    def get_commit_builder(self, branch, parents, config, timestamp=None,
720
                           timezone=None, committer=None, revprops=None,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
721
                           revision_id=None):
722
        """Obtain a CommitBuilder for this repository.
723
        
724
        :param branch: Branch to commit to.
725
        :param parents: Revision ids of the parents of the new revision.
726
        :param config: Configuration to use.
727
        :param timestamp: Optional timestamp recorded for commit.
728
        :param timezone: Optional timezone for timestamp.
729
        :param committer: Optional committer to set for commit.
730
        :param revprops: Optional dictionary of revision properties.
731
        :param revision_id: Optional revision id.
732
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
733
        revision_id = osutils.safe_revision_id(revision_id)
2818.3.2 by Robert Collins
Review feedback.
734
        result = self._commit_builder_class(self, parents, config,
2818.3.1 by Robert Collins
Change CommitBuilder factory delegation to allow simple declaration.
735
            timestamp, timezone, committer, revprops, revision_id)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
736
        self.start_write_group()
737
        return result
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
738
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
739
    def unlock(self):
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
740
        if (self.control_files._lock_count == 1 and
741
            self.control_files._lock_mode == 'w'):
742
            if self._write_group is not None:
743
                raise errors.BzrError(
744
                    'Must end write groups before releasing write locks.')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
745
        self.control_files.unlock()
746
1185.65.27 by Robert Collins
Tweak storage towards mergability.
747
    @needs_read_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
748
    def clone(self, a_bzrdir, revision_id=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
749
        """Clone this repository into a_bzrdir using the current format.
750
751
        Currently no check is made that the format of this repository and
752
        the bzrdir format are compatible. FIXME RBC 20060201.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
753
754
        :return: The newly created destination repository.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
755
        """
2440.1.1 by Martin Pool
Add new Repository.sprout,
756
        # TODO: deprecate after 0.16; cloning this with all its settings is
757
        # probably not very useful -- mbp 20070423
758
        dest_repo = self._create_sprouting_repo(a_bzrdir, shared=self.is_shared())
759
        self.copy_content_into(dest_repo, revision_id)
760
        return dest_repo
761
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
762
    def start_write_group(self):
763
        """Start a write group in the repository.
764
765
        Write groups are used by repositories which do not have a 1:1 mapping
766
        between file ids and backend store to manage the insertion of data from
767
        both fetch and commit operations.
768
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
769
        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``
770
        for the support of lock-requiring repository formats.
2617.6.8 by Robert Collins
Review feedback and documentation.
771
772
        One can only insert data into a repository inside a write group.
773
2617.6.6 by Robert Collins
Some review feedback.
774
        :return: None.
2617.6.1 by Robert Collins
* New method on Repository - ``start_write_group``, ``end_write_group``
775
        """
776
        if not self.is_locked() or self.control_files._lock_mode != 'w':
777
            raise errors.NotWriteLocked(self)
778
        if self._write_group:
779
            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.
780
        self._start_write_group()
781
        # 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``
782
        self._write_group = self.get_transaction()
783
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
784
    def _start_write_group(self):
785
        """Template method for per-repository write group startup.
786
        
787
        This is called before the write group is considered to be 
788
        entered.
789
        """
790
2440.1.1 by Martin Pool
Add new Repository.sprout,
791
    @needs_read_lock
792
    def sprout(self, to_bzrdir, revision_id=None):
793
        """Create a descendent repository for new development.
794
795
        Unlike clone, this does not copy the settings of the repository.
796
        """
797
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
798
        dest_repo.fetch(self, revision_id=revision_id)
799
        return dest_repo
800
801
    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.
802
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
803
            # use target default format.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
804
            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.
805
        else:
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
806
            # Most control formats need the repository to be specifically
807
            # created, but on some old all-in-one formats it's not needed
808
            try:
2440.1.1 by Martin Pool
Add new Repository.sprout,
809
                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.
810
            except errors.UninitializableFormat:
811
                dest_repo = a_bzrdir.open_repository()
812
        return dest_repo
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
813
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
814
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
815
    def has_revision(self, revision_id):
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
816
        """True if this repository has a copy of the revision."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
817
        if 'evil' in debug.debug_flags:
818
            mutter_callsite(2, "has_revision is a LBYL symptom.")
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
819
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
820
        return self._revision_store.has_revision_id(revision_id,
821
                                                    self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
822
1185.65.27 by Robert Collins
Tweak storage towards mergability.
823
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
824
    def get_revision_reconcile(self, revision_id):
825
        """'reconcile' helper routine that allows access to a revision always.
826
        
827
        This variant of get_revision does not cross check the weave graph
828
        against the revision one as get_revision does: but it should only
829
        be used by reconcile, or reconcile-alike commands that are correcting
830
        or testing the revision graph.
831
        """
1563.2.25 by Robert Collins
Merge in upstream.
832
        if not revision_id or not isinstance(revision_id, basestring):
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
833
            raise errors.InvalidRevisionId(revision_id=revision_id,
834
                                           branch=self)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
835
        return self.get_revisions([revision_id])[0]
836
1756.1.2 by Aaron Bentley
Show logs using get_revisions
837
    @needs_read_lock
838
    def get_revisions(self, revision_ids):
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
839
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
840
        revs = self._revision_store.get_revisions(revision_ids,
1756.1.2 by Aaron Bentley
Show logs using get_revisions
841
                                                  self.get_transaction())
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
842
        for rev in revs:
843
            assert not isinstance(rev.revision_id, unicode)
844
            for parent_id in rev.parent_ids:
845
                assert not isinstance(parent_id, unicode)
846
        return revs
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
847
1185.65.27 by Robert Collins
Tweak storage towards mergability.
848
    @needs_read_lock
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
849
    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.
850
        # TODO: jam 20070210 This shouldn't be necessary since get_revision
851
        #       would have already do it.
852
        # TODO: jam 20070210 Just use _serializer.write_revision_to_string()
853
        revision_id = osutils.safe_revision_id(revision_id)
854
        rev = self.get_revision(revision_id)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
855
        rev_tmp = StringIO()
856
        # the current serializer..
857
        self._revision_store._serializer.write_revision(rev, rev_tmp)
858
        rev_tmp.seek(0)
859
        return rev_tmp.getvalue()
860
861
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
862
    def get_revision(self, revision_id):
863
        """Return the Revision object for a named revision"""
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
864
        # TODO: jam 20070210 get_revision_reconcile should do this for us
865
        revision_id = osutils.safe_revision_id(revision_id)
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
866
        r = self.get_revision_reconcile(revision_id)
867
        # weave corruption can lead to absent revision markers that should be
868
        # present.
869
        # the following test is reasonably cheap (it needs a single weave read)
870
        # and the weave is cached in read transactions. In write transactions
871
        # it is not cached but typically we only read a small number of
872
        # revisions. For knits when they are introduced we will probably want
873
        # to ensure that caching write transactions are in use.
874
        inv = self.get_inventory_weave()
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
875
        self._check_revision_parents(r, inv)
876
        return r
877
1756.3.19 by Aaron Bentley
Documentation and cleanups
878
    @needs_read_lock
1756.3.22 by Aaron Bentley
Tweaks from review
879
    def get_deltas_for_revisions(self, revisions):
1756.3.19 by Aaron Bentley
Documentation and cleanups
880
        """Produce a generator of revision deltas.
881
        
882
        Note that the input is a sequence of REVISIONS, not revision_ids.
883
        Trees will be held in memory until the generator exits.
884
        Each delta is relative to the revision's lefthand predecessor.
885
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
886
        required_trees = set()
887
        for revision in revisions:
888
            required_trees.add(revision.revision_id)
889
            required_trees.update(revision.parent_ids[:1])
890
        trees = dict((t.get_revision_id(), t) for 
891
                     t in self.revision_trees(required_trees))
892
        for revision in revisions:
893
            if not revision.parent_ids:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
894
                old_tree = self.revision_tree(None)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
895
            else:
896
                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.
897
            yield trees[revision.revision_id].changes_from(old_tree)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
898
1756.3.19 by Aaron Bentley
Documentation and cleanups
899
    @needs_read_lock
1744.2.2 by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
900
    def get_revision_delta(self, revision_id):
901
        """Return the delta for one revision.
902
903
        The delta is relative to the left-hand predecessor of the
904
        revision.
905
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
906
        r = self.get_revision(revision_id)
1756.3.22 by Aaron Bentley
Tweaks from review
907
        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.
908
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
909
    def _check_revision_parents(self, revision, inventory):
910
        """Private to Repository and Fetch.
911
        
912
        This checks the parentage of revision in an inventory weave for 
913
        consistency and is only applicable to inventory-weave-for-ancestry
914
        using repository formats & fetchers.
915
        """
1563.2.25 by Robert Collins
Merge in upstream.
916
        weave_parents = inventory.get_parents(revision.revision_id)
917
        weave_names = inventory.versions()
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
918
        for parent_id in revision.parent_ids:
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
919
            if parent_id in weave_names:
920
                # this parent must not be a ghost.
921
                if not parent_id in weave_parents:
922
                    # but it is a ghost
923
                    raise errors.CorruptRepository(self)
924
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
925
    @needs_write_lock
926
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
927
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
928
        signature = gpg_strategy.sign(plaintext)
929
        self._revision_store.add_revision_signature_text(revision_id,
930
                                                         signature,
931
                                                         self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
932
1694.2.6 by Martin Pool
[merge] bzr.dev
933
    def fileids_altered_by_revision_ids(self, revision_ids):
934
        """Find the file ids and versions affected by revisions.
935
936
        :param revisions: an iterable containing revision ids.
937
        :return: a dictionary mapping altered file-ids to an iterable of
938
        revision_ids. Each altered file-ids has the exact revision_ids that
939
        altered it listed explicitly.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
940
        """
1910.2.48 by Aaron Bentley
Update from review comments
941
        assert self._serializer.support_altered_by_hack, \
1732.2.1 by Martin Pool
Remove obsolete fileid_involved from KnitRepository, fix error message.
942
            ("fileids_altered_by_revision_ids only supported for branches " 
943
             "which store inventory as unnested xml, not on %r" % self)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
944
        selected_revision_ids = set(osutils.safe_revision_id(r)
945
                                    for r in revision_ids)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
946
        w = self.get_inventory_weave()
1694.2.6 by Martin Pool
[merge] bzr.dev
947
        result = {}
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
948
1694.2.6 by Martin Pool
[merge] bzr.dev
949
        # this code needs to read every new line in every inventory for the
950
        # inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
951
        # 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.
952
        # harmful because we are filtering by the revision id marker in the
1694.2.6 by Martin Pool
[merge] bzr.dev
953
        # 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.
954
        # 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.
955
        # only those added in an inventory in rev X can contain a revision=X
956
        # line.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
957
        unescape_revid_cache = {}
958
        unescape_fileid_cache = {}
959
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
960
        # jam 20061218 In a big fetch, this handles hundreds of thousands
961
        # of lines, so it has had a lot of inlining and optimizing done.
962
        # Sorry that it is a little bit messy.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
963
        # Move several functions to be local variables, since this is a long
964
        # running loop.
965
        search = self._file_ids_altered_regex.search
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
966
        unescape = _unescape_xml
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
967
        setdefault = result.setdefault
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
968
        pb = ui.ui_factory.nested_progress_bar()
969
        try:
970
            for line in w.iter_lines_added_or_present_in_versions(
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
971
                                        selected_revision_ids, pb=pb):
972
                match = search(line)
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
973
                if match is None:
974
                    continue
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
975
                # One call to match.group() returning multiple items is quite a
976
                # bit faster than 2 calls to match.group() each returning 1
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
977
                file_id, revision_id = match.group('file_id', 'revision_id')
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
978
979
                # Inlining the cache lookups helps a lot when you make 170,000
980
                # lines and 350k ids, versus 8.4 unique ids.
981
                # Using a cache helps in 2 ways:
982
                #   1) Avoids unnecessary decoding calls
983
                #   2) Re-uses cached strings, which helps in future set and
984
                #      equality checks.
985
                # (2) is enough that removing encoding entirely along with
986
                # the cache (so we are using plain strings) results in no
987
                # performance improvement.
988
                try:
989
                    revision_id = unescape_revid_cache[revision_id]
990
                except KeyError:
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
991
                    unescaped = unescape(revision_id)
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
992
                    unescape_revid_cache[revision_id] = unescaped
993
                    revision_id = unescaped
994
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
995
                if revision_id in selected_revision_ids:
2163.2.5 by John Arbash Meinel
Inline the cache lookup, and explain why
996
                    try:
997
                        file_id = unescape_fileid_cache[file_id]
998
                    except KeyError:
999
                        unescaped = unescape(file_id)
1000
                        unescape_fileid_cache[file_id] = unescaped
1001
                        file_id = unescaped
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
1002
                    setdefault(file_id, set()).add(revision_id)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1003
        finally:
1004
            pb.finished()
1694.2.6 by Martin Pool
[merge] bzr.dev
1005
        return result
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1006
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1007
    def iter_files_bytes(self, desired_files):
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1008
        """Iterate through file versions.
1009
2708.1.10 by Aaron Bentley
Update docstrings
1010
        Files will not necessarily be returned in the order they occur in
1011
        desired_files.  No specific order is guaranteed.
1012
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1013
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
2708.1.10 by Aaron Bentley
Update docstrings
1014
        value supplied by the caller as part of desired_files.  It should
1015
        uniquely identify the file version in the caller's context.  (Examples:
1016
        an index number or a TreeTransform trans_id.)
1017
1018
        bytes_iterator is an iterable of bytestrings for the file.  The
1019
        kind of iterable and length of the bytestrings are unspecified, but for
1020
        this implementation, it is a list of lines produced by
1021
        VersionedFile.get_lines().
1022
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1023
        :param desired_files: a list of (file_id, revision_id, identifier)
2708.1.10 by Aaron Bentley
Update docstrings
1024
            triples
2708.1.9 by Aaron Bentley
Clean-up docs and imports
1025
        """
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1026
        transaction = self.get_transaction()
1027
        for file_id, revision_id, callable_data in desired_files:
2708.1.11 by Aaron Bentley
Test and tweak error handling
1028
            try:
1029
                weave = self.weave_store.get_weave(file_id, transaction)
1030
            except errors.NoSuchFile:
1031
                raise errors.NoSuchIdInRepository(self, file_id)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1032
            yield callable_data, weave.get_lines(revision_id)
2708.1.3 by Aaron Bentley
Implement extract_files_bytes on Repository
1033
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
1034
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1035
        """Get an iterable listing the keys of all the data introduced by a set
1036
        of revision IDs.
1037
1038
        The keys will be ordered so that the corresponding items can be safely
1039
        fetched and inserted in that order.
1040
1041
        :returns: An iterable producing tuples of (knit-kind, file-id,
1042
            versions).  knit-kind is one of 'file', 'inventory', 'signatures',
1043
            'revisions'.  file-id is None unless knit-kind is 'file'.
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
1044
        """
1045
        # XXX: it's a bit weird to control the inventory weave caching in this
1046
        # generator.  Ideally the caching would be done in fetch.py I think.  Or
1047
        # maybe this generator should explicitly have the contract that it
1048
        # should not be iterated until the previously yielded item has been
1049
        # processed?
1050
        inv_w = self.get_inventory_weave()
1051
        inv_w.enable_cache()
1052
1053
        # file ids that changed
1054
        file_ids = self.fileids_altered_by_revision_ids(revision_ids)
1055
        count = 0
1056
        num_file_ids = len(file_ids)
1057
        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.
1058
            if _files_pb is not None:
1059
                _files_pb.update("fetch texts", count, num_file_ids)
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
1060
            count += 1
1061
            yield ("file", file_id, altered_versions)
1062
        # We're done with the files_pb.  Note that it finished by the caller,
1063
        # 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.
1064
        del _files_pb
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
1065
1066
        # inventory
1067
        yield ("inventory", None, revision_ids)
1068
        inv_w.clear_cache()
1069
1070
        # signatures
1071
        revisions_with_signatures = set()
1072
        for rev_id in revision_ids:
1073
            try:
1074
                self.get_signature_text(rev_id)
1075
            except errors.NoSuchRevision:
1076
                # not signed.
1077
                pass
1078
            else:
1079
                revisions_with_signatures.add(rev_id)
1080
        yield ("signatures", None, revisions_with_signatures)
1081
1082
        # revisions
1083
        yield ("revisions", None, revision_ids)
1084
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1085
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1086
    def get_inventory_weave(self):
1087
        return self.control_weaves.get_weave('inventory',
1088
            self.get_transaction())
1089
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1090
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1091
    def get_inventory(self, revision_id):
1092
        """Get Inventory object by hash."""
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1093
        # TODO: jam 20070210 Technically we don't need to sanitize, since all
1094
        #       called functions must sanitize.
1095
        revision_id = osutils.safe_revision_id(revision_id)
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1096
        return self.deserialise_inventory(
1097
            revision_id, self.get_inventory_xml(revision_id))
1098
1099
    def deserialise_inventory(self, revision_id, xml):
1100
        """Transform the xml into an inventory object. 
1101
1102
        :param revision_id: The expected revision id of the inventory.
1103
        :param xml: A serialised inventory.
1104
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1105
        revision_id = osutils.safe_revision_id(revision_id)
1910.2.48 by Aaron Bentley
Update from review comments
1106
        result = self._serializer.read_inventory_from_string(xml)
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
1107
        result.root.revision = revision_id
1108
        return result
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1109
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1110
    def serialise_inventory(self, inv):
1910.2.48 by Aaron Bentley
Update from review comments
1111
        return self._serializer.write_inventory_to_string(inv)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1112
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
1113
    def _serialise_inventory_to_lines(self, inv):
1114
        return self._serializer.write_inventory_to_lines(inv)
1115
2520.4.113 by Aaron Bentley
Avoid peeking at Repository._serializer
1116
    def get_serializer_format(self):
1117
        return self._serializer.format_num
1118
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1119
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1120
    def get_inventory_xml(self, revision_id):
1121
        """Get inventory XML as a file object."""
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1122
        revision_id = osutils.safe_revision_id(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1123
        try:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1124
            assert isinstance(revision_id, str), type(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1125
            iw = self.get_inventory_weave()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1126
            return iw.get_text(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1127
        except IndexError:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1128
            raise errors.HistoryMissing(self, 'inventory', revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1129
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1130
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1131
    def get_inventory_sha1(self, revision_id):
1132
        """Return the sha1 hash of the inventory entry
1133
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1134
        # TODO: jam 20070210 Shouldn't this be deprecated / removed?
1135
        revision_id = osutils.safe_revision_id(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1136
        return self.get_revision(revision_id).inventory_sha1
1137
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1138
    @needs_read_lock
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1139
    def get_revision_graph(self, revision_id=None):
1140
        """Return a dictionary containing the revision graph.
1141
        
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1142
        :param revision_id: The revision_id to get a graph from. If None, then
1143
        the entire revision graph is returned. This is a deprecated mode of
1144
        operation and will be removed in the future.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1145
        :return: a dictionary of revision_id->revision_parents_list.
1146
        """
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1147
        if 'evil' in debug.debug_flags:
1148
            mutter_callsite(2,
1149
                "get_revision_graph scales with size of history.")
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1150
        # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1151
        if revision_id == _mod_revision.NULL_REVISION:
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1152
            return {}
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1153
        revision_id = osutils.safe_revision_id(revision_id)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1154
        a_weave = self.get_inventory_weave()
1155
        all_revisions = self._eliminate_revisions_not_present(
1156
                                a_weave.versions())
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1157
        entire_graph = dict([(node, tuple(a_weave.get_parents(node))) for 
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1158
                             node in all_revisions])
1159
        if revision_id is None:
1160
            return entire_graph
1161
        elif revision_id not in entire_graph:
1162
            raise errors.NoSuchRevision(self, revision_id)
1163
        else:
1164
            # add what can be reached from revision_id
1165
            result = {}
1166
            pending = set([revision_id])
1167
            while len(pending) > 0:
1168
                node = pending.pop()
1169
                result[node] = entire_graph[node]
1170
                for revision_id in result[node]:
1171
                    if revision_id not in result:
1172
                        pending.add(revision_id)
1173
            return result
1174
1175
    @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.
1176
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1177
        """Return a graph of the revisions with ghosts marked as applicable.
1178
1179
        :param revision_ids: an iterable of revisions to graph or None for all.
1180
        :return: a Graph object with the graph reachable from revision_ids.
1181
        """
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
1182
        if 'evil' in debug.debug_flags:
1183
            mutter_callsite(2,
1184
                "get_revision_graph_with_ghosts scales with size of history.")
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1185
        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.
1186
        if not revision_ids:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1187
            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.
1188
            required = set([])
1189
        else:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1190
            pending = set(osutils.safe_revision_id(r) for r in revision_ids)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1191
            # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1192
            if _mod_revision.NULL_REVISION in pending:
1193
                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.
1194
            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.
1195
        done = set([])
1196
        while len(pending):
1197
            revision_id = pending.pop()
1198
            try:
1199
                rev = self.get_revision(revision_id)
1200
            except errors.NoSuchRevision:
1201
                if revision_id in required:
1202
                    raise
1203
                # a ghost
1204
                result.add_ghost(revision_id)
1205
                continue
1206
            for parent_id in rev.parent_ids:
1207
                # is this queued or done ?
1208
                if (parent_id not in pending and
1209
                    parent_id not in done):
1210
                    # no, queue it.
1211
                    pending.add(parent_id)
1212
            result.add_node(revision_id, rev.parent_ids)
1594.2.15 by Robert Collins
Unfuck performance.
1213
            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.
1214
        return result
1215
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1216
    def _get_history_vf(self):
1217
        """Get a versionedfile whose history graph reflects all revisions.
1218
1219
        For weave repositories, this is the inventory weave.
1220
        """
1221
        return self.get_inventory_weave()
1222
1223
    def iter_reverse_revision_history(self, revision_id):
1224
        """Iterate backwards through revision ids in the lefthand history
1225
1226
        :param revision_id: The revision id to start with.  All its lefthand
1227
            ancestors will be traversed.
1228
        """
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1229
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1230
        if revision_id in (None, _mod_revision.NULL_REVISION):
1231
            return
1232
        next_id = revision_id
1233
        versionedfile = self._get_history_vf()
1234
        while True:
1235
            yield next_id
1236
            parents = versionedfile.get_parents(next_id)
1237
            if len(parents) == 0:
1238
                return
1239
            else:
1240
                next_id = parents[0]
1241
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
1242
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1243
    def get_revision_inventory(self, revision_id):
1244
        """Return inventory of a past revision."""
1245
        # TODO: Unify this with get_inventory()
1246
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
1247
        # must be the same as its revision, so this is trivial.
1534.4.28 by Robert Collins
first cut at merge from integration.
1248
        if revision_id is None:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1249
            # This does not make sense: if there is no revision,
1250
            # then it is the current tree inventory surely ?!
1251
            # and thus get_root_id() is something that looks at the last
1252
            # commit on the branch, and the get_root_id is an inventory check.
1253
            raise NotImplementedError
1254
            # return Inventory(self.get_root_id())
1255
        else:
1256
            return self.get_inventory(revision_id)
1257
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1258
    @needs_read_lock
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1259
    def is_shared(self):
1260
        """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.
1261
        raise NotImplementedError(self.is_shared)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1262
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1263
    @needs_write_lock
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1264
    def reconcile(self, other=None, thorough=False):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1265
        """Reconcile this repository."""
1266
        from bzrlib.reconcile import RepoReconciler
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1267
        reconciler = RepoReconciler(self, thorough=thorough)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1268
        reconciler.reconcile()
1269
        return reconciler
2440.1.1 by Martin Pool
Add new Repository.sprout,
1270
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
1271
    def _refresh_data(self):
1272
        """Helper called from lock_* to ensure coherency with disk.
1273
1274
        The default implementation does nothing; it is however possible
1275
        for repositories to maintain loaded indices across multiple locks
1276
        by checking inside their implementation of this method to see
1277
        whether their indices are still valid. This depends of course on
1278
        the disk format being validatable in this manner.
1279
        """
1280
1534.6.3 by Robert Collins
find_repository sufficiently robust.
1281
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1282
    def revision_tree(self, revision_id):
1283
        """Return Tree for a revision on this branch.
1284
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1285
        `revision_id` may be None for the empty tree revision.
1286
        """
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1287
        # TODO: refactor this to use an existing revision object
1288
        # so we don't need to read it in twice.
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1289
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1731.1.61 by Aaron Bentley
Merge bzr.dev
1290
            return RevisionTree(self, Inventory(root_id=None), 
1291
                                _mod_revision.NULL_REVISION)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1292
        else:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1293
            revision_id = osutils.safe_revision_id(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1294
            inv = self.get_revision_inventory(revision_id)
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
1295
            return RevisionTree(self, inv, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1296
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1297
    @needs_read_lock
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1298
    def revision_trees(self, revision_ids):
1299
        """Return Tree for a revision on this branch.
1300
1756.3.19 by Aaron Bentley
Documentation and cleanups
1301
        `revision_id` may not be None or 'null:'"""
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1302
        assert None not in revision_ids
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1303
        assert _mod_revision.NULL_REVISION not in revision_ids
1756.3.5 by Aaron Bentley
Switch to get_texts, optimize get_texts
1304
        texts = self.get_inventory_weave().get_texts(revision_ids)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
1305
        for text, revision_id in zip(texts, revision_ids):
1306
            inv = self.deserialise_inventory(revision_id, text)
1307
            yield RevisionTree(self, inv, revision_id)
1308
1309
    @needs_read_lock
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1310
    def get_ancestry(self, revision_id, topo_sorted=True):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1311
        """Return a list of revision-ids integrated by a revision.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1312
1313
        The first element of the list is always None, indicating the origin 
1314
        revision.  This might change when we have history horizons, or 
1315
        perhaps we should have a new API.
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1316
        
1317
        This is topologically sorted.
1318
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1319
        if _mod_revision.is_null(revision_id):
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1320
            return [None]
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1321
        revision_id = osutils.safe_revision_id(revision_id)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1322
        if not self.has_revision(revision_id):
1323
            raise errors.NoSuchRevision(self, revision_id)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1324
        w = self.get_inventory_weave()
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1325
        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.
1326
        return [None] + candidates # self._eliminate_revisions_not_present(candidates)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
1327
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
1328
    def pack(self):
1329
        """Compress the data within the repository.
1330
1331
        This operation only makes sense for some repository types. For other
1332
        types it should be a no-op that just returns.
1333
1334
        This stub method does not require a lock, but subclasses should use
1335
        @needs_write_lock as this is a long running call its reasonable to 
1336
        implicitly lock for the user.
1337
        """
1338
1185.65.4 by Aaron Bentley
Fixed cat command
1339
    @needs_read_lock
1340
    def print_file(self, file, revision_id):
1185.65.29 by Robert Collins
Implement final review suggestions.
1341
        """Print `file` to stdout.
1342
        
1343
        FIXME RBC 20060125 as John Meinel points out this is a bad api
1344
        - it writes to stdout, it assumes that that is valid etc. Fix
1345
        by creating a new more flexible convenience function.
1346
        """
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1347
        revision_id = osutils.safe_revision_id(revision_id)
1185.65.4 by Aaron Bentley
Fixed cat command
1348
        tree = self.revision_tree(revision_id)
1349
        # use inventory as it was in that revision
1350
        file_id = tree.inventory.path2id(file)
1351
        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
1352
            # TODO: jam 20060427 Write a test for this code path
1353
            #       it had a bug in it, and was raising the wrong
1354
            #       exception.
1355
            raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
1185.65.4 by Aaron Bentley
Fixed cat command
1356
        tree.print_file(file_id)
1357
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1358
    def get_transaction(self):
1359
        return self.control_files.get_transaction()
1360
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1361
    def revision_parents(self, revision_id):
1362
        revision_id = osutils.safe_revision_id(revision_id)
1363
        return self.get_inventory_weave().parent_names(revision_id)
1590.1.1 by Robert Collins
Improve common_ancestor performance.
1364
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1365
    def get_parents(self, revision_ids):
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1366
        """See StackedParentsProvider.get_parents"""
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1367
        parents_list = []
1368
        for revision_id in revision_ids:
1369
            if revision_id == _mod_revision.NULL_REVISION:
1370
                parents = []
1371
            else:
1372
                try:
1373
                    parents = self.get_revision(revision_id).parent_ids
1374
                except errors.NoSuchRevision:
1375
                    parents = None
1376
                else:
1377
                    if len(parents) == 0:
1378
                        parents = [_mod_revision.NULL_REVISION]
1379
            parents_list.append(parents)
1380
        return parents_list
1381
1382
    def _make_parents_provider(self):
1383
        return self
1384
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1385
    def get_graph(self, other_repository=None):
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1386
        """Return the graph walker for this repository format"""
1387
        parents_provider = self._make_parents_provider()
2490.2.14 by Aaron Bentley
Avoid StackedParentsProvider when underlying repos match
1388
        if (other_repository is not None and
1389
            other_repository.bzrdir.transport.base !=
1390
            self.bzrdir.transport.base):
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
1391
            parents_provider = graph._StackedParentsProvider(
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1392
                [parents_provider, other_repository._make_parents_provider()])
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1393
        return graph.Graph(parents_provider)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
1394
1185.65.27 by Robert Collins
Tweak storage towards mergability.
1395
    @needs_write_lock
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1396
    def set_make_working_trees(self, new_value):
1397
        """Set the policy flag for making working trees when creating branches.
1398
1399
        This only applies to branches that use this repository.
1400
1401
        The default is 'True'.
1402
        :param new_value: True to restore the default, False to disable making
1403
                          working trees.
1404
        """
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1405
        raise NotImplementedError(self.set_make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1406
    
1407
    def make_working_trees(self):
1408
        """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.
1409
        raise NotImplementedError(self.make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
1410
1411
    @needs_write_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1412
    def sign_revision(self, revision_id, gpg_strategy):
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1413
        revision_id = osutils.safe_revision_id(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1414
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1415
        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.
1416
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1417
    @needs_read_lock
1418
    def has_signature_for_revision_id(self, revision_id):
1419
        """Query for a revision signature for revision_id in the repository."""
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1420
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1421
        return self._revision_store.has_signature(revision_id,
1422
                                                  self.get_transaction())
1423
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1424
    @needs_read_lock
1425
    def get_signature_text(self, revision_id):
1426
        """Return the text for a signature."""
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1427
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1428
        return self._revision_store.get_signature_text(revision_id,
1429
                                                       self.get_transaction())
1430
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1431
    @needs_read_lock
1432
    def check(self, revision_ids):
1433
        """Check consistency of all history of given revision_ids.
1434
1435
        Different repository implementations should override _check().
1436
1437
        :param revision_ids: A non-empty list of revision_ids whose ancestry
1438
             will be checked.  Typically the last revision_id of a branch.
1439
        """
1440
        if not revision_ids:
1441
            raise ValueError("revision_ids must be non-empty in %s.check" 
1442
                    % (self,))
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1443
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1444
        return self._check(revision_ids)
1445
1446
    def _check(self, revision_ids):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1447
        result = check.Check(self)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1448
        result.check()
1449
        return result
1450
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1451
    def _warn_if_deprecated(self):
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
1452
        global _deprecation_warning_done
1453
        if _deprecation_warning_done:
1454
            return
1455
        _deprecation_warning_done = True
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1456
        warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
1457
                % (self._format, self.bzrdir.transport.base))
1458
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1459
    def supports_rich_root(self):
1460
        return self._format.rich_root_data
1461
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.
1462
    def _check_ascii_revisionid(self, revision_id, method):
1463
        """Private helper for ascii-only repositories."""
1464
        # weave repositories refuse to store revisionids that are non-ascii.
1465
        if revision_id is not None:
1466
            # weaves require ascii revision ids.
1467
            if isinstance(revision_id, unicode):
1468
                try:
1469
                    revision_id.encode('ascii')
1470
                except UnicodeEncodeError:
1471
                    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
1472
            else:
1473
                try:
1474
                    revision_id.decode('ascii')
1475
                except UnicodeDecodeError:
1476
                    raise errors.NonAsciiRevisionId(method, self)
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.
1477
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1478
2241.1.14 by Martin Pool
Add deprecated forwarders for old formats from repository.py
1479
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1480
# remove these delegates a while after bzr 0.15
1481
def __make_delegated(name, from_module):
1482
    def _deprecated_repository_forwarder():
1483
        symbol_versioning.warn('%s moved to %s in bzr 0.15'
1484
            % (name, from_module),
2241.1.20 by mbp at sourcefrog
update tests for new locations of weave repos
1485
            DeprecationWarning,
1486
            stacklevel=2)
2241.1.18 by mbp at sourcefrog
Restore use of deprecating delegator for old formats in bzrlib.repository.
1487
        m = __import__(from_module, globals(), locals(), [name])
1488
        try:
1489
            return getattr(m, name)
1490
        except AttributeError:
1491
            raise AttributeError('module %s has no name %s'
1492
                    % (m, name))
1493
    globals()[name] = _deprecated_repository_forwarder
1494
1495
for _name in [
1496
        'AllInOneRepository',
1497
        'WeaveMetaDirRepository',
1498
        'PreSplitOutRepositoryFormat',
1499
        'RepositoryFormat4',
1500
        'RepositoryFormat5',
1501
        'RepositoryFormat6',
1502
        'RepositoryFormat7',
1503
        ]:
1504
    __make_delegated(_name, 'bzrlib.repofmt.weaverepo')
1505
1506
for _name in [
1507
        'KnitRepository',
1508
        'RepositoryFormatKnit',
1509
        'RepositoryFormatKnit1',
1510
        ]:
1511
    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
1512
1513
1185.82.84 by Aaron Bentley
Moved stuff around
1514
def install_revision(repository, rev, revision_tree):
1515
    """Install all revision data into a repository."""
1516
    present_parents = []
1517
    parent_trees = {}
1518
    for p_id in rev.parent_ids:
1519
        if repository.has_revision(p_id):
1520
            present_parents.append(p_id)
1521
            parent_trees[p_id] = repository.revision_tree(p_id)
1522
        else:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1523
            parent_trees[p_id] = repository.revision_tree(None)
1185.82.84 by Aaron Bentley
Moved stuff around
1524
1525
    inv = revision_tree.inventory
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
1526
    entries = inv.iter_entries()
2617.6.6 by Robert Collins
Some review feedback.
1527
    # backwards compatibility hack: skip the root id.
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1528
    if not repository.supports_rich_root():
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
1529
        path, root = entries.next()
1530
        if root.revision != rev.revision_id:
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
1531
            raise errors.IncompatibleRevision(repr(repository))
1185.82.84 by Aaron Bentley
Moved stuff around
1532
    # Add the texts that are not already present
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
1533
    for path, ie in entries:
1185.82.84 by Aaron Bentley
Moved stuff around
1534
        w = repository.weave_store.get_weave_or_empty(ie.file_id,
1535
                repository.get_transaction())
1536
        if ie.revision not in w:
1537
            text_parents = []
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
1538
            # FIXME: TODO: The following loop *may* be overlapping/duplicate
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1539
            # 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.
1540
            # is a latent bug here where the parents may have ancestors of each
1541
            # other. RBC, AB
1185.82.84 by Aaron Bentley
Moved stuff around
1542
            for revision, tree in parent_trees.iteritems():
1543
                if ie.file_id not in tree:
1544
                    continue
1545
                parent_id = tree.inventory[ie.file_id].revision
1546
                if parent_id in text_parents:
1547
                    continue
1548
                text_parents.append(parent_id)
1549
                    
1550
            vfile = repository.weave_store.get_weave_or_empty(ie.file_id, 
1551
                repository.get_transaction())
1552
            lines = revision_tree.get_file(ie.file_id).readlines()
1553
            vfile.add_lines(rev.revision_id, text_parents, lines)
1554
    try:
1555
        # install the inventory
1556
        repository.add_inventory(rev.revision_id, inv, present_parents)
1557
    except errors.RevisionAlreadyPresent:
1558
        pass
1559
    repository.add_revision(rev.revision_id, rev, inv)
1560
1561
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1562
class MetaDirRepository(Repository):
1563
    """Repositories in the new meta-dir layout."""
1564
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1565
    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
1566
        super(MetaDirRepository, self).__init__(_format,
1567
                                                a_bzrdir,
1568
                                                control_files,
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1569
                                                _revision_store,
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1570
                                                control_store,
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1571
                                                text_store)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1572
        dir_mode = self.control_files._dir_mode
1573
        file_mode = self.control_files._file_mode
1574
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1575
    @needs_read_lock
1576
    def is_shared(self):
1577
        """Return True if this repository is flagged as a shared repository."""
1578
        return self.control_files._transport.has('shared-storage')
1579
1580
    @needs_write_lock
1581
    def set_make_working_trees(self, new_value):
1582
        """Set the policy flag for making working trees when creating branches.
1583
1584
        This only applies to branches that use this repository.
1585
1586
        The default is 'True'.
1587
        :param new_value: True to restore the default, False to disable making
1588
                          working trees.
1589
        """
1590
        if new_value:
1591
            try:
1592
                self.control_files._transport.delete('no-working-trees')
1593
            except errors.NoSuchFile:
1594
                pass
1595
        else:
1596
            self.control_files.put_utf8('no-working-trees', '')
1597
    
1598
    def make_working_trees(self):
1599
        """Returns the policy for making working trees on new branches."""
1600
        return not self.control_files._transport.has('no-working-trees')
1601
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1602
2241.1.2 by Martin Pool
change to using external Repository format registry
1603
class RepositoryFormatRegistry(registry.Registry):
1604
    """Registry of RepositoryFormats.
1605
    """
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1606
1607
    def get(self, format_string):
1608
        r = registry.Registry.get(self, format_string)
1609
        if callable(r):
1610
            r = r()
1611
        return r
2241.1.2 by Martin Pool
change to using external Repository format registry
1612
    
1613
1614
format_registry = RepositoryFormatRegistry()
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1615
"""Registry of formats, indexed by their identifying format string.
1616
1617
This can contain either format instances themselves, or classes/factories that
1618
can be called to obtain one.
1619
"""
2241.1.2 by Martin Pool
change to using external Repository format registry
1620
2220.2.3 by Martin Pool
Add tag: revision namespace.
1621
1622
#####################################################################
1623
# Repository Formats
1910.2.46 by Aaron Bentley
Whitespace fix
1624
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1625
class RepositoryFormat(object):
1626
    """A repository format.
1627
1628
    Formats provide three things:
1629
     * An initialization routine to construct repository data on disk.
1630
     * a format string which is used when the BzrDir supports versioned
1631
       children.
1632
     * an open routine which returns a Repository instance.
1633
1634
    Formats are placed in an dict by their format string for reference 
1635
    during opening. These should be subclasses of RepositoryFormat
1636
    for consistency.
1637
1638
    Once a format is deprecated, just deprecate the initialize and open
1639
    methods on the format class. Do not deprecate the object, as the 
1640
    object will be created every system load.
1641
1642
    Common instance attributes:
1643
    _matchingbzrdir - the bzrdir format that the repository format was
1644
    originally written to work with. This can be used if manually
1645
    constructing a bzrdir and repository, or more commonly for test suite
1646
    parameterisation.
1647
    """
1648
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1649
    def __str__(self):
1650
        return "<%s>" % self.__class__.__name__
1651
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1652
    def __eq__(self, other):
1653
        # format objects are generally stateless
1654
        return isinstance(other, self.__class__)
1655
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1656
    def __ne__(self, other):
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
1657
        return not self == other
1658
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1659
    @classmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1660
    def find_format(klass, a_bzrdir):
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1661
        """Return the format for the repository object in a_bzrdir.
1662
        
1663
        This is used by bzr native formats that have a "format" file in
1664
        the repository.  Other methods may be used by different types of 
1665
        control directory.
1666
        """
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1667
        try:
1668
            transport = a_bzrdir.get_repository_transport(None)
1669
            format_string = transport.get("format").read()
2241.1.2 by Martin Pool
change to using external Repository format registry
1670
            return format_registry.get(format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1671
        except errors.NoSuchFile:
1672
            raise errors.NoRepositoryPresent(a_bzrdir)
1673
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1674
            raise errors.UnknownFormatError(format=format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1675
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1676
    @classmethod
2241.1.2 by Martin Pool
change to using external Repository format registry
1677
    def register_format(klass, format):
1678
        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
1679
1680
    @classmethod
1681
    def unregister_format(klass, format):
2241.1.2 by Martin Pool
change to using external Repository format registry
1682
        format_registry.remove(format.get_format_string())
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1683
    
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1684
    @classmethod
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1685
    def get_default_format(klass):
1686
        """Return the current default format."""
2204.5.3 by Aaron Bentley
zap old repository default handling
1687
        from bzrlib import bzrdir
1688
        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
1689
1690
    def _get_control_store(self, repo_transport, control_files):
1691
        """Return the control store for this repository."""
1692
        raise NotImplementedError(self._get_control_store)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1693
1694
    def get_format_string(self):
1695
        """Return the ASCII format string that identifies this format.
1696
        
1697
        Note that in pre format ?? repositories the format string is 
1698
        not permitted nor written to disk.
1699
        """
1700
        raise NotImplementedError(self.get_format_string)
1701
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1702
    def get_format_description(self):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1703
        """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
1704
        raise NotImplementedError(self.get_format_description)
1705
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1706
    def _get_revision_store(self, repo_transport, control_files):
1707
        """Return the revision store object for this a_bzrdir."""
1556.1.5 by Robert Collins
Review feedback.
1708
        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
1709
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1710
    def _get_text_rev_store(self,
1711
                            transport,
1712
                            control_files,
1713
                            name,
1714
                            compressed=True,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1715
                            prefixed=False,
1716
                            serializer=None):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1717
        """Common logic for getting a revision store for a repository.
1718
        
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1719
        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
1720
        get the store for a repository.
1721
        """
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1722
        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
1723
        dir_mode = control_files._dir_mode
1724
        file_mode = control_files._file_mode
2220.2.2 by Martin Pool
Add tag command and basic implementation
1725
        text_store = TextStore(transport.clone(name),
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1726
                              prefixed=prefixed,
1727
                              compressed=compressed,
1728
                              dir_mode=dir_mode,
1729
                              file_mode=file_mode)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1730
        _revision_store = TextRevisionStore(text_store, serializer)
1731
        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
1732
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1733
    # TODO: this shouldn't be in the base class, it's specific to things that
1734
    # 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.
1735
    def _get_versioned_file_store(self,
1736
                                  name,
1737
                                  transport,
1738
                                  control_files,
1739
                                  prefixed=True,
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
1740
                                  versionedfile_class=None,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1741
                                  versionedfile_kwargs={},
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1742
                                  escaped=False):
2241.1.10 by Martin Pool
Remove more references to weaves from the repository.py file
1743
        if versionedfile_class is None:
1744
            versionedfile_class = self._versionedfile_class
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1745
        weave_transport = control_files._transport.clone(name)
1746
        dir_mode = control_files._dir_mode
1747
        file_mode = control_files._file_mode
1748
        return VersionedFileStore(weave_transport, prefixed=prefixed,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1749
                                  dir_mode=dir_mode,
1750
                                  file_mode=file_mode,
1751
                                  versionedfile_class=versionedfile_class,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1752
                                  versionedfile_kwargs=versionedfile_kwargs,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1753
                                  escaped=escaped)
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1754
1534.6.1 by Robert Collins
allow API creation of shared repositories
1755
    def initialize(self, a_bzrdir, shared=False):
1756
        """Initialize a repository of this format in a_bzrdir.
1757
1758
        :param a_bzrdir: The bzrdir to put the new repository in it.
1759
        :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.
1760
        :returns: The new repository object.
1761
        
1534.6.1 by Robert Collins
allow API creation of shared repositories
1762
        This may raise UninitializableFormat if shared repository are not
1763
        compatible the a_bzrdir.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1764
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1765
        raise NotImplementedError(self.initialize)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1766
1767
    def is_supported(self):
1768
        """Is this format supported?
1769
1770
        Supported formats must be initializable and openable.
1771
        Unsupported formats may not support initialization or committing or 
1772
        some other features depending on the reason for not being supported.
1773
        """
1774
        return True
1775
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1776
    def check_conversion_target(self, target_format):
1777
        raise NotImplementedError(self.check_conversion_target)
1778
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1779
    def open(self, a_bzrdir, _found=False):
1780
        """Return an instance of this format for the bzrdir a_bzrdir.
1781
        
1782
        _found is a private parameter, do not use it.
1783
        """
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1784
        raise NotImplementedError(self.open)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1785
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1786
1787
class MetaDirRepositoryFormat(RepositoryFormat):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1788
    """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
1789
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1790
    rich_root_data = False
2323.5.17 by Martin Pool
Add supports_tree_reference to all repo formats (robert)
1791
    supports_tree_reference = False
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1792
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1793
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.
1794
    def __init__(self):
1795
        super(MetaDirRepositoryFormat, self).__init__()
1796
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1797
    def _create_control_files(self, a_bzrdir):
1798
        """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.
1799
        # FIXME: RBC 20060125 don't peek under the covers
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1800
        # NB: no need to escape relative paths that are url safe.
1801
        repository_transport = a_bzrdir.get_repository_transport(self)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1802
        control_files = lockable_files.LockableFiles(repository_transport,
1803
                                'lock', lockdir.LockDir)
1553.5.61 by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use.
1804
        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
1805
        return control_files
1806
1807
    def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
1808
        """Upload the initial blank content."""
1809
        control_files = self._create_control_files(a_bzrdir)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1810
        control_files.lock_write()
1811
        try:
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
1812
            control_files._transport.mkdir_multi(dirs,
1813
                    mode=control_files._dir_mode)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1814
            for file, content in files:
1815
                control_files.put(file, content)
1816
            for file, content in utf8_files:
1817
                control_files.put_utf8(file, content)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1818
            if shared == True:
1819
                control_files.put_utf8('shared-storage', '')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1820
        finally:
1821
            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
1822
1823
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1824
# 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.
1825
# 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
1826
# all in bzrlib.repofmt.weaverepo now.  When an instance of one of these is
1827
# needed, it's constructed directly by the BzrDir.  Non-native formats where
1828
# the repository is not separately opened are similar.
1829
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1830
format_registry.register_lazy(
1831
    'Bazaar-NG Repository format 7',
1832
    'bzrlib.repofmt.weaverepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1833
    'RepositoryFormat7'
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1834
    )
2241.1.1 by Martin Pool
Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
1835
# KEEP in sync with bzrdir.format_registry default, which controls the overall
1836
# default control directory format
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1837
1838
format_registry.register_lazy(
1839
    'Bazaar-NG Knit Repository Format 1',
1840
    'bzrlib.repofmt.knitrepo',
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
1841
    'RepositoryFormatKnit1',
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1842
    )
1843
format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
1844
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
1845
format_registry.register_lazy(
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1846
    'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
1847
    'bzrlib.repofmt.knitrepo',
1848
    'RepositoryFormatKnit3',
1849
    )
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1850
1851
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.
1852
class InterRepository(InterObject):
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1853
    """This class represents operations taking place between two repositories.
1854
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.
1855
    Its instances have methods like copy_content and fetch, and contain
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1856
    references to the source and target repositories these operations can be 
1857
    carried out on.
1858
1859
    Often we will provide convenience methods on 'repository' which carry out
1860
    operations with another repository - they will always forward to
1861
    InterRepository.get(other).method_name(parameters).
1862
    """
1863
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1864
    _optimisers = []
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
1865
    """The available optimised InterRepository types."""
1866
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1867
    def copy_content(self, revision_id=None):
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1868
        raise NotImplementedError(self.copy_content)
1869
1870
    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.
1871
        """Fetch the content required to construct revision_id.
1872
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1873
        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.
1874
1875
        :param revision_id: if None all content is copied, if NULL_REVISION no
1876
                            content is copied.
1877
        :param pb: optional progress bar to use for progress reports. If not
1878
                   provided a default one will be created.
1879
1880
        Returns the copied revision count and the failed revisions in a tuple:
1881
        (copied, failures).
1882
        """
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1883
        raise NotImplementedError(self.fetch)
1884
   
1885
    @needs_read_lock
1886
    def missing_revision_ids(self, revision_id=None):
1887
        """Return the revision ids that source has that target does not.
1888
        
1889
        These are returned in topological order.
1890
1891
        :param revision_id: only return revision ids included by this
1892
                            revision_id.
1893
        """
1894
        # generic, possibly worst case, slow code path.
1895
        target_ids = set(self.target.all_revision_ids())
1896
        if revision_id is not None:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1897
            # TODO: jam 20070210 InterRepository is internal enough that it
1898
            #       should assume revision_ids are already utf-8
1899
            revision_id = osutils.safe_revision_id(revision_id)
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1900
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1901
            assert source_ids[0] is None
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1902
            source_ids.pop(0)
1903
        else:
1904
            source_ids = self.source.all_revision_ids()
1905
        result_set = set(source_ids).difference(target_ids)
1906
        # this may look like a no-op: its not. It preserves the ordering
1907
        # other_ids had while only returning the members from other_ids
1908
        # that we've decided we need.
1909
        return [rev_id for rev_id in source_ids if rev_id in result_set]
1910
1911
1912
class InterSameDataRepository(InterRepository):
1913
    """Code for converting between repositories that represent the same data.
1914
    
1915
    Data format and model must match for this to work.
1916
    """
1917
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
1918
    @classmethod
2241.1.7 by Martin Pool
rename method
1919
    def _get_repo_format_to_test(self):
2814.1.1 by Robert Collins
* Pushing, pulling and branching branches with subtree references was not
1920
        """Repository format for testing with.
1921
        
1922
        InterSameData can pull from subtree to subtree and from non-subtree to
1923
        non-subtree, so we test this with the richest repository format.
1924
        """
1925
        from bzrlib.repofmt import knitrepo
1926
        return knitrepo.RepositoryFormatKnit3()
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1927
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1928
    @staticmethod
1929
    def is_compatible(source, target):
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1930
        if source.supports_rich_root() != target.supports_rich_root():
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
1931
            return False
2305.2.4 by Andrew Bennetts
Reinstate checking of source & targer _serializer that I accidentally clobbered.
1932
        if source._serializer != target._serializer:
1933
            return False
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1934
        return True
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1935
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.
1936
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1937
    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.
1938
        """Make a complete copy of the content in self into destination.
2440.1.1 by Martin Pool
Add new Repository.sprout,
1939
1940
        This copies both the repository's revision data, and configuration information
1941
        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.
1942
        
1943
        This is a destructive operation! Do not use it on existing 
1944
        repositories.
1945
1946
        :param revision_id: Only copy the content needed to construct
1947
                            revision_id and its parents.
1948
        """
1949
        try:
1950
            self.target.set_make_working_trees(self.source.make_working_trees())
1951
        except NotImplementedError:
1952
            pass
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1953
        # TODO: jam 20070210 This is fairly internal, so we should probably
1954
        #       just assert that revision_id is not unicode.
1955
        revision_id = osutils.safe_revision_id(revision_id)
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1956
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1957
        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.
1958
            self.target.has_revision(revision_id)):
1959
            return
1960
        self.target.fetch(self.source, revision_id=revision_id)
1961
1962
    @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.
1963
    def fetch(self, revision_id=None, pb=None):
1910.7.20 by Andrew Bennetts
Merge from bzr.dev
1964
        """See InterRepository.fetch()."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1965
        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.
1966
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1967
               self.source, self.source._format, self.target, 
1968
               self.target._format)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
1969
        # TODO: jam 20070210 This should be an assert, not a translate
1970
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1971
        f = GenericRepoFetcher(to_repository=self.target,
1972
                               from_repository=self.source,
1973
                               last_revision=revision_id,
1974
                               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.
1975
        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.
1976
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1977
2241.1.12 by Martin Pool
Restore InterWeaveRepo
1978
class InterWeaveRepo(InterSameDataRepository):
1979
    """Optimised code paths between Weave based repositories."""
1980
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
1981
    @classmethod
2241.1.12 by Martin Pool
Restore InterWeaveRepo
1982
    def _get_repo_format_to_test(self):
1983
        from bzrlib.repofmt import weaverepo
1984
        return weaverepo.RepositoryFormat7()
1985
1986
    @staticmethod
1987
    def is_compatible(source, target):
1988
        """Be compatible with known Weave formats.
1989
        
1990
        We don't test for the stores being of specific types because that
1991
        could lead to confusing results, and there is no need to be 
1992
        overly general.
1993
        """
1994
        from bzrlib.repofmt.weaverepo import (
1995
                RepositoryFormat5,
1996
                RepositoryFormat6,
1997
                RepositoryFormat7,
1998
                )
1999
        try:
2000
            return (isinstance(source._format, (RepositoryFormat5,
2001
                                                RepositoryFormat6,
2002
                                                RepositoryFormat7)) and
2003
                    isinstance(target._format, (RepositoryFormat5,
2004
                                                RepositoryFormat6,
2005
                                                RepositoryFormat7)))
2006
        except AttributeError:
2007
            return False
2008
    
2009
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2010
    def copy_content(self, revision_id=None):
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2011
        """See InterRepository.copy_content()."""
2012
        # weave specific optimised path:
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2013
        # TODO: jam 20070210 Internal, should be an assert, not translate
2014
        revision_id = osutils.safe_revision_id(revision_id)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2015
        try:
2016
            self.target.set_make_working_trees(self.source.make_working_trees())
2017
        except NotImplementedError:
2018
            pass
2019
        # FIXME do not peek!
2020
        if self.source.control_files._transport.listable():
2021
            pb = ui.ui_factory.nested_progress_bar()
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2022
            try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2023
                self.target.weave_store.copy_all_ids(
2024
                    self.source.weave_store,
2025
                    pb=pb,
2026
                    from_transaction=self.source.get_transaction(),
2027
                    to_transaction=self.target.get_transaction())
2028
                pb.update('copying inventory', 0, 1)
2029
                self.target.control_weaves.copy_multi(
2030
                    self.source.control_weaves, ['inventory'],
2031
                    from_transaction=self.source.get_transaction(),
2032
                    to_transaction=self.target.get_transaction())
2033
                self.target._revision_store.text_store.copy_all_ids(
2034
                    self.source._revision_store.text_store,
2035
                    pb=pb)
2036
            finally:
2037
                pb.finished()
2038
        else:
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2039
            self.target.fetch(self.source, revision_id=revision_id)
2040
2041
    @needs_write_lock
2042
    def fetch(self, revision_id=None, pb=None):
2043
        """See InterRepository.fetch()."""
2044
        from bzrlib.fetch import GenericRepoFetcher
2045
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2046
               self.source, self.source._format, self.target, self.target._format)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2047
        # TODO: jam 20070210 This should be an assert, not a translate
2048
        revision_id = osutils.safe_revision_id(revision_id)
2241.1.12 by Martin Pool
Restore InterWeaveRepo
2049
        f = GenericRepoFetcher(to_repository=self.target,
2050
                               from_repository=self.source,
2051
                               last_revision=revision_id,
2052
                               pb=pb)
2053
        return f.count_copied, f.failed_revisions
2054
2055
    @needs_read_lock
2056
    def missing_revision_ids(self, revision_id=None):
2057
        """See InterRepository.missing_revision_ids()."""
2058
        # we want all revisions to satisfy revision_id in source.
2059
        # but we don't want to stat every file here and there.
2060
        # we want then, all revisions other needs to satisfy revision_id 
2061
        # checked, but not those that we have locally.
2062
        # so the first thing is to get a subset of the revisions to 
2063
        # satisfy revision_id in source, and then eliminate those that
2064
        # we do already have. 
2065
        # this is slow on high latency connection to self, but as as this
2066
        # disk format scales terribly for push anyway due to rewriting 
2067
        # inventory.weave, this is considered acceptable.
2068
        # - RBC 20060209
2069
        if revision_id is not None:
2070
            source_ids = self.source.get_ancestry(revision_id)
2071
            assert source_ids[0] is None
2072
            source_ids.pop(0)
2073
        else:
2074
            source_ids = self.source._all_possible_ids()
2075
        source_ids_set = set(source_ids)
2076
        # source_ids is the worst possible case we may need to pull.
2077
        # now we want to filter source_ids against what we actually
2078
        # have in target, but don't try to check for existence where we know
2079
        # we do not have a revision as that would be pointless.
2080
        target_ids = set(self.target._all_possible_ids())
2081
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2082
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2083
        required_revisions = source_ids_set.difference(actually_present_revisions)
2084
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2085
        if revision_id is not None:
2086
            # we used get_ancestry to determine source_ids then we are assured all
2087
            # revisions referenced are present as they are installed in topological order.
2088
            # and the tip revision was validated by get_ancestry.
2089
            return required_topo_revisions
2090
        else:
2091
            # if we just grabbed the possibly available ids, then 
2092
            # we only have an estimate of whats available and need to validate
2093
            # that against the revision records.
2094
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2095
2096
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2097
class InterKnitRepo(InterSameDataRepository):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2098
    """Optimised code paths between Knit based repositories."""
2099
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2100
    @classmethod
2241.1.7 by Martin Pool
rename method
2101
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2102
        from bzrlib.repofmt import knitrepo
2103
        return knitrepo.RepositoryFormatKnit1()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2104
2105
    @staticmethod
2106
    def is_compatible(source, target):
2107
        """Be compatible with known Knit formats.
2108
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2109
        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.
2110
        could lead to confusing results, and there is no need to be 
2111
        overly general.
2112
        """
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2113
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2114
        try:
2115
            return (isinstance(source._format, (RepositoryFormatKnit1)) and
2116
                    isinstance(target._format, (RepositoryFormatKnit1)))
2117
        except AttributeError:
2118
            return False
2119
2120
    @needs_write_lock
2121
    def fetch(self, revision_id=None, pb=None):
2122
        """See InterRepository.fetch()."""
2123
        from bzrlib.fetch import KnitRepoFetcher
2124
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2125
               self.source, self.source._format, self.target, self.target._format)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2126
        # TODO: jam 20070210 This should be an assert, not a translate
2127
        revision_id = osutils.safe_revision_id(revision_id)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2128
        f = KnitRepoFetcher(to_repository=self.target,
2129
                            from_repository=self.source,
2130
                            last_revision=revision_id,
2131
                            pb=pb)
2132
        return f.count_copied, f.failed_revisions
2133
2134
    @needs_read_lock
2135
    def missing_revision_ids(self, revision_id=None):
2136
        """See InterRepository.missing_revision_ids()."""
2137
        if revision_id is not None:
2138
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2139
            assert source_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
2140
            source_ids.pop(0)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2141
        else:
2142
            source_ids = self.source._all_possible_ids()
2143
        source_ids_set = set(source_ids)
2144
        # source_ids is the worst possible case we may need to pull.
2145
        # 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.
2146
        # 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.
2147
        # we do not have a revision as that would be pointless.
2148
        target_ids = set(self.target._all_possible_ids())
2149
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2150
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2151
        required_revisions = source_ids_set.difference(actually_present_revisions)
2152
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2153
        if revision_id is not None:
2154
            # we used get_ancestry to determine source_ids then we are assured all
2155
            # revisions referenced are present as they are installed in topological order.
2156
            # and the tip revision was validated by get_ancestry.
2157
            return required_topo_revisions
2158
        else:
2159
            # if we just grabbed the possibly available ids, then 
2160
            # we only have an estimate of whats available and need to validate
2161
            # that against the revision records.
2162
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2163
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2164
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2165
class InterModel1and2(InterRepository):
2166
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2167
    @classmethod
2241.1.7 by Martin Pool
rename method
2168
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2169
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2170
2171
    @staticmethod
2172
    def is_compatible(source, target):
2305.2.1 by Andrew Bennetts
Use repo.supports_rich_root() everywhere rather than
2173
        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
2174
            return True
2175
        else:
2176
            return False
2177
2178
    @needs_write_lock
2179
    def fetch(self, revision_id=None, pb=None):
2180
        """See InterRepository.fetch()."""
2181
        from bzrlib.fetch import Model1toKnit2Fetcher
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2182
        # TODO: jam 20070210 This should be an assert, not a translate
2183
        revision_id = osutils.safe_revision_id(revision_id)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2184
        f = Model1toKnit2Fetcher(to_repository=self.target,
2185
                                 from_repository=self.source,
2186
                                 last_revision=revision_id,
2187
                                 pb=pb)
2188
        return f.count_copied, f.failed_revisions
2189
1910.2.26 by Aaron Bentley
Fix up some test cases
2190
    @needs_write_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
2191
    def copy_content(self, revision_id=None):
1910.2.26 by Aaron Bentley
Fix up some test cases
2192
        """Make a complete copy of the content in self into destination.
2193
        
2194
        This is a destructive operation! Do not use it on existing 
2195
        repositories.
2196
2197
        :param revision_id: Only copy the content needed to construct
2198
                            revision_id and its parents.
2199
        """
2200
        try:
2201
            self.target.set_make_working_trees(self.source.make_working_trees())
2202
        except NotImplementedError:
2203
            pass
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2204
        # TODO: jam 20070210 Internal, assert, don't translate
2205
        revision_id = osutils.safe_revision_id(revision_id)
1910.2.26 by Aaron Bentley
Fix up some test cases
2206
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2207
        if (revision_id not in (None, _mod_revision.NULL_REVISION) and 
1910.2.26 by Aaron Bentley
Fix up some test cases
2208
            self.target.has_revision(revision_id)):
2209
            return
2210
        self.target.fetch(self.source, revision_id=revision_id)
2211
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2212
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2213
class InterKnit1and2(InterKnitRepo):
2214
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2215
    @classmethod
2241.1.7 by Martin Pool
rename method
2216
    def _get_repo_format_to_test(self):
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2217
        return None
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2218
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2219
    @staticmethod
2220
    def is_compatible(source, target):
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
2221
        """Be compatible with Knit1 source and Knit3 target"""
2222
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2223
        try:
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2224
            from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1, \
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
2225
                    RepositoryFormatKnit3
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2226
            return (isinstance(source._format, (RepositoryFormatKnit1)) and
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
2227
                    isinstance(target._format, (RepositoryFormatKnit3)))
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2228
        except AttributeError:
2229
            return False
2230
2231
    @needs_write_lock
2232
    def fetch(self, revision_id=None, pb=None):
2233
        """See InterRepository.fetch()."""
2234
        from bzrlib.fetch import Knit1to2Fetcher
2235
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2236
               self.source, self.source._format, self.target, 
2237
               self.target._format)
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
2238
        # TODO: jam 20070210 This should be an assert, not a translate
2239
        revision_id = osutils.safe_revision_id(revision_id)
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2240
        f = Knit1to2Fetcher(to_repository=self.target,
2241
                            from_repository=self.source,
2242
                            last_revision=revision_id,
2243
                            pb=pb)
2244
        return f.count_copied, f.failed_revisions
2245
2246
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2247
class InterRemoteRepository(InterRepository):
2248
    """Code for converting between RemoteRepository objects.
2249
2250
    This just gets an non-remote repository from the RemoteRepository, and calls
2251
    InterRepository.get again.
2252
    """
2253
2254
    def __init__(self, source, target):
2255
        if isinstance(source, remote.RemoteRepository):
2256
            source._ensure_real()
2257
            real_source = source._real_repository
2258
        else:
2259
            real_source = source
2260
        if isinstance(target, remote.RemoteRepository):
2261
            target._ensure_real()
2262
            real_target = target._real_repository
2263
        else:
2264
            real_target = target
2265
        self.real_inter = InterRepository.get(real_source, real_target)
2266
2267
    @staticmethod
2268
    def is_compatible(source, target):
2269
        if isinstance(source, remote.RemoteRepository):
2270
            return True
2271
        if isinstance(target, remote.RemoteRepository):
2272
            return True
2273
        return False
2274
2275
    def copy_content(self, revision_id=None):
2276
        self.real_inter.copy_content(revision_id=revision_id)
2277
2278
    def fetch(self, revision_id=None, pb=None):
2279
        self.real_inter.fetch(revision_id=revision_id, pb=pb)
2280
2281
    @classmethod
2282
    def _get_repo_format_to_test(self):
2283
        return None
2284
2285
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2286
InterRepository.register_optimiser(InterSameDataRepository)
2241.1.13 by Martin Pool
Re-register InterWeaveRepo, fix test integration, add test for it
2287
InterRepository.register_optimiser(InterWeaveRepo)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2288
InterRepository.register_optimiser(InterKnitRepo)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2289
InterRepository.register_optimiser(InterModel1and2)
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2290
InterRepository.register_optimiser(InterKnit1and2)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2291
InterRepository.register_optimiser(InterRemoteRepository)
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.
2292
2293
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.
2294
class CopyConverter(object):
2295
    """A repository conversion tool which just performs a copy of the content.
2296
    
2297
    This is slow but quite reliable.
2298
    """
2299
2300
    def __init__(self, target_format):
2301
        """Create a CopyConverter.
2302
2303
        :param target_format: The format the resulting repository should be.
2304
        """
2305
        self.target_format = target_format
2306
        
2307
    def convert(self, repo, pb):
2308
        """Perform the conversion of to_convert, giving feedback via pb.
2309
2310
        :param to_convert: The disk object to convert.
2311
        :param pb: a progress bar to use for progress information.
2312
        """
2313
        self.pb = pb
2314
        self.count = 0
1596.2.22 by Robert Collins
Fetch changes to use new pb.
2315
        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.
2316
        # this is only useful with metadir layouts - separated repo content.
2317
        # trigger an assertion if not such
2318
        repo._format.get_format_string()
2319
        self.repo_dir = repo.bzrdir
2320
        self.step('Moving repository to repository.backup')
2321
        self.repo_dir.transport.move('repository', 'repository.backup')
2322
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2323
        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.
2324
        self.source_repo = repo._format.open(self.repo_dir,
2325
            _found=True,
2326
            _override_transport=backup_transport)
2327
        self.step('Creating new repository')
2328
        converted = self.target_format.initialize(self.repo_dir,
2329
                                                  self.source_repo.is_shared())
2330
        converted.lock_write()
2331
        try:
2332
            self.step('Copying content into repository.')
2333
            self.source_repo.copy_content_into(converted)
2334
        finally:
2335
            converted.unlock()
2336
        self.step('Deleting old repository content.')
2337
        self.repo_dir.transport.delete_tree('repository.backup')
2338
        self.pb.note('repository converted')
2339
2340
    def step(self, message):
2341
        """Update the pb by a step."""
2342
        self.count +=1
2343
        self.pb.update(message, self.count, self.total)
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2344
2345
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2346
_unescape_map = {
2347
    'apos':"'",
2348
    'quot':'"',
2349
    'amp':'&',
2350
    'lt':'<',
2351
    'gt':'>'
2352
}
2353
2354
2355
def _unescaper(match, _map=_unescape_map):
2294.1.2 by John Arbash Meinel
Track down and add tests that all tree.commit() can handle
2356
    code = match.group(1)
2357
    try:
2358
        return _map[code]
2359
    except KeyError:
2360
        if not code.startswith('#'):
2361
            raise
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
2362
        return unichr(int(code[1:])).encode('utf8')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2363
2364
2365
_unescape_re = None
2366
2367
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2368
def _unescape_xml(data):
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2369
    """Unescape predefined XML entities in a string of data."""
2370
    global _unescape_re
2371
    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.
2372
        _unescape_re = re.compile('\&([^;]*);')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2373
    return _unescape_re.sub(_unescaper, data)