/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
1
# Copyright (C) 2005, 2006 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
from binascii import hexlify
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
22
from copy import deepcopy
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
23
import re
24
import time
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
25
import unittest
26
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
27
from bzrlib import (
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
28
    bzrdir,
29
    check,
30
    delta,
31
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
32
    generate_ids,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
33
    gpg,
34
    graph,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
35
    knit,
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
36
    lazy_regex,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
37
    lockable_files,
38
    lockdir,
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
39
    osutils,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
40
    revision as _mod_revision,
41
    symbol_versioning,
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
42
    transactions,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
43
    ui,
44
    weave,
45
    weavefile,
46
    xml5,
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
47
    xml6,
48
    )
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
49
from bzrlib.osutils import (
50
    rand_bytes,
51
    compact_date, 
52
    local_time_offset,
53
    )
54
from bzrlib.revisiontree import RevisionTree
55
from bzrlib.store.versioned import VersionedFileStore
56
from bzrlib.store.text import TextStore
57
from bzrlib.testament import Testament
58
""")
59
1534.4.28 by Robert Collins
first cut at merge from integration.
60
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.
61
from bzrlib.inter import InterObject
1910.2.3 by Aaron Bentley
All tests pass
62
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
63
from bzrlib.symbol_versioning import (
64
        deprecated_method,
65
        zero_nine,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
66
        )
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
67
from bzrlib.trace import mutter, note, warning
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
68
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
69
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
70
# Old formats display a warning, but only once
71
_deprecation_warning_done = False
72
73
1185.66.5 by Aaron Bentley
Renamed RevisionStorage to Repository
74
class Repository(object):
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
75
    """Repository holding history for one or more branches.
76
77
    The repository holds and retrieves historical information including
78
    revisions and file history.  It's normally accessed only by the Branch,
79
    which views a particular line of development through that history.
80
81
    The Repository builds on top of Stores and a Transport, which respectively 
82
    describe the disk data format and the way of accessing the (possibly 
83
    remote) disk.
84
    """
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
85
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
86
    _file_ids_altered_regex = lazy_regex.lazy_compile(
87
        r'file_id="(?P<file_id>[^"]+)"'
88
        r'.*revision="(?P<revision_id>[^"]+)"'
89
        )
90
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
91
    @needs_write_lock
92
    def add_inventory(self, revid, inv, parents):
93
        """Add the inventory inv to the repository as revid.
94
        
95
        :param parents: The revision ids of the parents that revid
96
                        is known to have and are in the repository already.
97
98
        returns the sha1 of the serialized inventory.
99
        """
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
100
        assert inv.revision_id is None or inv.revision_id == revid, \
101
            "Mismatch between inventory revision" \
102
            " id and insertion revid (%r, %r)" % (inv.revision_id, revid)
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
103
        assert inv.root is not None
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
104
        inv_text = self.serialise_inventory(inv)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
105
        inv_sha1 = osutils.sha_string(inv_text)
1563.2.25 by Robert Collins
Merge in upstream.
106
        inv_vf = self.control_weaves.get_weave('inventory',
107
                                               self.get_transaction())
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
108
        self._inventory_add_lines(inv_vf, revid, parents, osutils.split_lines(inv_text))
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
109
        return inv_sha1
110
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
111
    def _inventory_add_lines(self, inv_vf, revid, parents, lines):
112
        final_parents = []
113
        for parent in parents:
114
            if parent in inv_vf:
115
                final_parents.append(parent)
116
117
        inv_vf.add_lines(revid, final_parents, lines)
118
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
119
    @needs_write_lock
120
    def add_revision(self, rev_id, rev, inv=None, config=None):
121
        """Add rev to the revision store as rev_id.
122
123
        :param rev_id: the revision id to use.
124
        :param rev: The revision object.
125
        :param inv: The inventory for the revision. if None, it will be looked
126
                    up in the inventory storer
127
        :param config: If None no digital signature will be created.
128
                       If supplied its signature_needed method will be used
129
                       to determine if a signature should be made.
130
        """
131
        if config is not None and config.signature_needed():
132
            if inv is None:
133
                inv = self.get_inventory(rev_id)
134
            plaintext = Testament(rev, inv).as_short_text()
135
            self.store_revision_signature(
136
                gpg.GPGStrategy(config), plaintext, rev_id)
137
        if not rev_id in self.get_inventory_weave():
138
            if inv is None:
139
                raise errors.WeaveRevisionNotPresent(rev_id,
140
                                                     self.get_inventory_weave())
141
            else:
142
                # yes, this is not suitable for adding with ghosts.
143
                self.add_inventory(rev_id, inv, rev.parent_ids)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
144
        self._revision_store.add_revision(rev, self.get_transaction())
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
145
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
146
    @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.
147
    def _all_possible_ids(self):
148
        """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.
149
        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.
150
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
151
    def all_revision_ids(self):
152
        """Returns a list of all the revision ids in the repository. 
153
154
        This is deprecated because code should generally work on the graph
155
        reachable from a particular revision, and ignore any other revisions
156
        that might be present.  There is no direct replacement method.
157
        """
158
        return self._all_revision_ids()
159
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.
160
    @needs_read_lock
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
161
    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.
162
        """Returns a list of all the revision ids in the repository. 
163
164
        These are in as much topological order as the underlying store can 
165
        present: for weaves ghosts may lead to a lack of correctness until
166
        the reweave updates the parents list.
167
        """
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
168
        if self._revision_store.text_store.listable():
169
            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.
170
        result = self._all_possible_ids()
171
        return self._eliminate_revisions_not_present(result)
172
1687.1.7 by Robert Collins
Teach Repository about break_lock.
173
    def break_lock(self):
174
        """Break a lock if one is present from another instance.
175
176
        Uses the ui factory to ask for confirmation if the lock may be from
177
        an active process.
178
        """
179
        self.control_files.break_lock()
180
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.
181
    @needs_read_lock
182
    def _eliminate_revisions_not_present(self, revision_ids):
183
        """Check every revision id in revision_ids to see if we have it.
184
185
        Returns a set of the present revisions.
186
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
187
        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.
188
        for id in revision_ids:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
189
            if self.has_revision(id):
190
               result.append(id)
191
        return result
192
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
193
    @staticmethod
194
    def create(a_bzrdir):
195
        """Construct the current default format repository in a_bzrdir."""
196
        return RepositoryFormat.get_default_format().initialize(a_bzrdir)
197
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
198
    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
199
        """instantiate a Repository.
200
201
        :param _format: The format of the repository on disk.
202
        :param a_bzrdir: The BzrDir of the repository.
203
204
        In the future we will have a single api for all stores for
205
        getting file texts, inventories and revisions, then
206
        this construct will accept instances of those things.
207
        """
1608.2.1 by Martin Pool
[merge] Storage filename escaping
208
        super(Repository, self).__init__()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
209
        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
210
        # 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.
211
        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
212
        self.control_files = control_files
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
213
        self._revision_store = _revision_store
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
214
        self.text_store = text_store
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
215
        # backwards compatibility
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
216
        self.weave_store = text_store
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
217
        # not right yet - should be more semantically clear ? 
218
        # 
219
        self.control_store = control_store
220
        self.control_weaves = control_store
1608.2.1 by Martin Pool
[merge] Storage filename escaping
221
        # TODO: make sure to construct the right store classes, etc, depending
222
        # on whether escaping is required.
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
223
        self._warn_if_deprecated()
1910.2.48 by Aaron Bentley
Update from review comments
224
        self._serializer = xml5.serializer_v5
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
225
1668.1.3 by Martin Pool
[patch] use the correct transaction when committing snapshot (Malone: #43959)
226
    def __repr__(self):
227
        return '%s(%r)' % (self.__class__.__name__, 
228
                           self.bzrdir.transport.base)
229
1694.2.6 by Martin Pool
[merge] bzr.dev
230
    def is_locked(self):
231
        return self.control_files.is_locked()
232
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
233
    def lock_write(self):
234
        self.control_files.lock_write()
235
236
    def lock_read(self):
1553.5.55 by Martin Pool
[revert] broken changes
237
        self.control_files.lock_read()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
238
1694.2.6 by Martin Pool
[merge] bzr.dev
239
    def get_physical_lock_status(self):
240
        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
241
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.
242
    @needs_read_lock
243
    def missing_revision_ids(self, other, revision_id=None):
244
        """Return the revision ids that other has that this does not.
245
        
246
        These are returned in topological order.
247
248
        revision_id: only return revision ids included by revision_id.
249
        """
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
250
        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.
251
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
252
    @staticmethod
253
    def open(base):
254
        """Open the repository rooted at base.
255
256
        For instance, if the repository is at URL/.bzr/repository,
257
        Repository.open(URL) -> a Repository instance.
258
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
259
        control = bzrdir.BzrDir.open(base)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
260
        return control.open_repository()
261
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.
262
    def copy_content_into(self, destination, revision_id=None, basis=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.
263
        """Make a complete copy of the content in self into destination.
264
        
265
        This is a destructive operation! Do not use it on existing 
266
        repositories.
267
        """
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.
268
        return InterRepository.get(self, destination).copy_content(revision_id, basis)
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.
269
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.
270
    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.
271
        """Fetch the content required to construct revision_id from source.
272
273
        If revision_id is None all content is copied.
274
        """
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.
275
        return InterRepository.get(source, self).fetch(revision_id=revision_id,
276
                                                       pb=pb)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
277
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
278
    def get_commit_builder(self, branch, parents, config, timestamp=None, 
279
                           timezone=None, committer=None, revprops=None, 
280
                           revision_id=None):
281
        """Obtain a CommitBuilder for this repository.
282
        
283
        :param branch: Branch to commit to.
284
        :param parents: Revision ids of the parents of the new revision.
285
        :param config: Configuration to use.
286
        :param timestamp: Optional timestamp recorded for commit.
287
        :param timezone: Optional timezone for timestamp.
288
        :param committer: Optional committer to set for commit.
289
        :param revprops: Optional dictionary of revision properties.
290
        :param revision_id: Optional revision id.
291
        """
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
292
        return _CommitBuilder(self, parents, config, timestamp, timezone,
293
                              committer, revprops, revision_id)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
294
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
295
    def unlock(self):
296
        self.control_files.unlock()
297
1185.65.27 by Robert Collins
Tweak storage towards mergability.
298
    @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.
299
    def clone(self, a_bzrdir, revision_id=None, basis=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
300
        """Clone this repository into a_bzrdir using the current format.
301
302
        Currently no check is made that the format of this repository and
303
        the bzrdir format are compatible. FIXME RBC 20060201.
304
        """
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.
305
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
306
            # use target default format.
307
            result = a_bzrdir.create_repository()
308
        # FIXME RBC 20060209 split out the repository type to avoid this check ?
309
        elif isinstance(a_bzrdir._format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
310
                      (bzrdir.BzrDirFormat4,
311
                       bzrdir.BzrDirFormat5,
312
                       bzrdir.BzrDirFormat6)):
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.
313
            result = a_bzrdir.open_repository()
314
        else:
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
315
            result = self._format.initialize(a_bzrdir, shared=self.is_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.
316
        self.copy_content_into(result, revision_id, basis)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
317
        return result
318
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
319
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
320
    def has_revision(self, revision_id):
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
321
        """True if this repository has a copy of the revision."""
322
        return self._revision_store.has_revision_id(revision_id,
323
                                                    self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
324
1185.65.27 by Robert Collins
Tweak storage towards mergability.
325
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
326
    def get_revision_reconcile(self, revision_id):
327
        """'reconcile' helper routine that allows access to a revision always.
328
        
329
        This variant of get_revision does not cross check the weave graph
330
        against the revision one as get_revision does: but it should only
331
        be used by reconcile, or reconcile-alike commands that are correcting
332
        or testing the revision graph.
333
        """
1563.2.25 by Robert Collins
Merge in upstream.
334
        if not revision_id or not isinstance(revision_id, basestring):
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
335
            raise errors.InvalidRevisionId(revision_id=revision_id,
336
                                           branch=self)
1756.1.2 by Aaron Bentley
Show logs using get_revisions
337
        return self._revision_store.get_revisions([revision_id],
338
                                                  self.get_transaction())[0]
339
    @needs_read_lock
340
    def get_revisions(self, revision_ids):
341
        return self._revision_store.get_revisions(revision_ids,
342
                                                  self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
343
1185.65.27 by Robert Collins
Tweak storage towards mergability.
344
    @needs_read_lock
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
345
    def get_revision_xml(self, revision_id):
346
        rev = self.get_revision(revision_id) 
347
        rev_tmp = StringIO()
348
        # the current serializer..
349
        self._revision_store._serializer.write_revision(rev, rev_tmp)
350
        rev_tmp.seek(0)
351
        return rev_tmp.getvalue()
352
353
    @needs_read_lock
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
354
    def get_revision(self, revision_id):
355
        """Return the Revision object for a named revision"""
356
        r = self.get_revision_reconcile(revision_id)
357
        # weave corruption can lead to absent revision markers that should be
358
        # present.
359
        # the following test is reasonably cheap (it needs a single weave read)
360
        # and the weave is cached in read transactions. In write transactions
361
        # it is not cached but typically we only read a small number of
362
        # revisions. For knits when they are introduced we will probably want
363
        # to ensure that caching write transactions are in use.
364
        inv = self.get_inventory_weave()
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
365
        self._check_revision_parents(r, inv)
366
        return r
367
1756.3.19 by Aaron Bentley
Documentation and cleanups
368
    @needs_read_lock
1756.3.22 by Aaron Bentley
Tweaks from review
369
    def get_deltas_for_revisions(self, revisions):
1756.3.19 by Aaron Bentley
Documentation and cleanups
370
        """Produce a generator of revision deltas.
371
        
372
        Note that the input is a sequence of REVISIONS, not revision_ids.
373
        Trees will be held in memory until the generator exits.
374
        Each delta is relative to the revision's lefthand predecessor.
375
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
376
        required_trees = set()
377
        for revision in revisions:
378
            required_trees.add(revision.revision_id)
379
            required_trees.update(revision.parent_ids[:1])
380
        trees = dict((t.get_revision_id(), t) for 
381
                     t in self.revision_trees(required_trees))
382
        for revision in revisions:
383
            if not revision.parent_ids:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
384
                old_tree = self.revision_tree(None)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
385
            else:
386
                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.
387
            yield trees[revision.revision_id].changes_from(old_tree)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
388
1756.3.19 by Aaron Bentley
Documentation and cleanups
389
    @needs_read_lock
1744.2.2 by Johan Rydberg
Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
390
    def get_revision_delta(self, revision_id):
391
        """Return the delta for one revision.
392
393
        The delta is relative to the left-hand predecessor of the
394
        revision.
395
        """
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
396
        r = self.get_revision(revision_id)
1756.3.22 by Aaron Bentley
Tweaks from review
397
        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.
398
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
399
    def _check_revision_parents(self, revision, inventory):
400
        """Private to Repository and Fetch.
401
        
402
        This checks the parentage of revision in an inventory weave for 
403
        consistency and is only applicable to inventory-weave-for-ancestry
404
        using repository formats & fetchers.
405
        """
1563.2.25 by Robert Collins
Merge in upstream.
406
        weave_parents = inventory.get_parents(revision.revision_id)
407
        weave_names = inventory.versions()
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
408
        for parent_id in revision.parent_ids:
1570.1.13 by Robert Collins
Check for incorrect revision parentage in the weave during revision access.
409
            if parent_id in weave_names:
410
                # this parent must not be a ghost.
411
                if not parent_id in weave_parents:
412
                    # but it is a ghost
413
                    raise errors.CorruptRepository(self)
414
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
415
    @needs_write_lock
416
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
417
        signature = gpg_strategy.sign(plaintext)
418
        self._revision_store.add_revision_signature_text(revision_id,
419
                                                         signature,
420
                                                         self.get_transaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
421
1694.2.6 by Martin Pool
[merge] bzr.dev
422
    def fileids_altered_by_revision_ids(self, revision_ids):
423
        """Find the file ids and versions affected by revisions.
424
425
        :param revisions: an iterable containing revision ids.
426
        :return: a dictionary mapping altered file-ids to an iterable of
427
        revision_ids. Each altered file-ids has the exact revision_ids that
428
        altered it listed explicitly.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
429
        """
1910.2.48 by Aaron Bentley
Update from review comments
430
        assert self._serializer.support_altered_by_hack, \
1732.2.1 by Martin Pool
Remove obsolete fileid_involved from KnitRepository, fix error message.
431
            ("fileids_altered_by_revision_ids only supported for branches " 
432
             "which store inventory as unnested xml, not on %r" % self)
1694.2.6 by Martin Pool
[merge] bzr.dev
433
        selected_revision_ids = set(revision_ids)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
434
        w = self.get_inventory_weave()
1694.2.6 by Martin Pool
[merge] bzr.dev
435
        result = {}
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
436
1694.2.6 by Martin Pool
[merge] bzr.dev
437
        # this code needs to read every new line in every inventory for the
438
        # inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
439
        # 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.
440
        # harmful because we are filtering by the revision id marker in the
1694.2.6 by Martin Pool
[merge] bzr.dev
441
        # 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.
442
        # 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.
443
        # only those added in an inventory in rev X can contain a revision=X
444
        # line.
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
445
        unescape_revid_cache = {}
446
        unescape_fileid_cache = {}
447
448
        # Move several functions to be local variables, since this is a long
449
        # running loop.
450
        search = self._file_ids_altered_regex.search
451
        unescape = _unescape_xml_cached
452
        setdefault = result.setdefault
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
453
        pb = ui.ui_factory.nested_progress_bar()
454
        try:
455
            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
456
                                        selected_revision_ids, pb=pb):
457
                match = search(line)
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
458
                if match is None:
459
                    continue
460
                file_id, revision_id = match.group('file_id', 'revision_id')
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
461
                revision_id = unescape(revision_id, unescape_revid_cache)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
462
                if revision_id in selected_revision_ids:
2163.2.3 by John Arbash Meinel
Change to local variables to save another 300ms
463
                    file_id = unescape(file_id, unescape_fileid_cache)
464
                    setdefault(file_id, set()).add(revision_id)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
465
        finally:
466
            pb.finished()
1694.2.6 by Martin Pool
[merge] bzr.dev
467
        return result
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
468
1185.65.27 by Robert Collins
Tweak storage towards mergability.
469
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
470
    def get_inventory_weave(self):
471
        return self.control_weaves.get_weave('inventory',
472
            self.get_transaction())
473
1185.65.27 by Robert Collins
Tweak storage towards mergability.
474
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
475
    def get_inventory(self, revision_id):
476
        """Get Inventory object by hash."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
477
        return self.deserialise_inventory(
478
            revision_id, self.get_inventory_xml(revision_id))
479
480
    def deserialise_inventory(self, revision_id, xml):
481
        """Transform the xml into an inventory object. 
482
483
        :param revision_id: The expected revision id of the inventory.
484
        :param xml: A serialised inventory.
485
        """
1910.2.48 by Aaron Bentley
Update from review comments
486
        result = self._serializer.read_inventory_from_string(xml)
1910.2.1 by Aaron Bentley
Ensure root entry always has a revision
487
        result.root.revision = revision_id
488
        return result
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
489
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
490
    def serialise_inventory(self, inv):
1910.2.48 by Aaron Bentley
Update from review comments
491
        return self._serializer.write_inventory_to_string(inv)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
492
1185.65.27 by Robert Collins
Tweak storage towards mergability.
493
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
494
    def get_inventory_xml(self, revision_id):
495
        """Get inventory XML as a file object."""
496
        try:
497
            assert isinstance(revision_id, basestring), type(revision_id)
498
            iw = self.get_inventory_weave()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
499
            return iw.get_text(revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
500
        except IndexError:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
501
            raise errors.HistoryMissing(self, 'inventory', revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
502
1185.65.27 by Robert Collins
Tweak storage towards mergability.
503
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
504
    def get_inventory_sha1(self, revision_id):
505
        """Return the sha1 hash of the inventory entry
506
        """
507
        return self.get_revision(revision_id).inventory_sha1
508
1185.65.27 by Robert Collins
Tweak storage towards mergability.
509
    @needs_read_lock
1590.1.1 by Robert Collins
Improve common_ancestor performance.
510
    def get_revision_graph(self, revision_id=None):
511
        """Return a dictionary containing the revision graph.
512
        
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
513
        :param revision_id: The revision_id to get a graph from. If None, then
514
        the entire revision graph is returned. This is a deprecated mode of
515
        operation and will be removed in the future.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
516
        :return: a dictionary of revision_id->revision_parents_list.
517
        """
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
518
        # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
519
        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.
520
            return {}
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
521
        a_weave = self.get_inventory_weave()
522
        all_revisions = self._eliminate_revisions_not_present(
523
                                a_weave.versions())
524
        entire_graph = dict([(node, a_weave.get_parents(node)) for 
1590.1.1 by Robert Collins
Improve common_ancestor performance.
525
                             node in all_revisions])
526
        if revision_id is None:
527
            return entire_graph
528
        elif revision_id not in entire_graph:
529
            raise errors.NoSuchRevision(self, revision_id)
530
        else:
531
            # add what can be reached from revision_id
532
            result = {}
533
            pending = set([revision_id])
534
            while len(pending) > 0:
535
                node = pending.pop()
536
                result[node] = entire_graph[node]
537
                for revision_id in result[node]:
538
                    if revision_id not in result:
539
                        pending.add(revision_id)
540
            return result
541
542
    @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.
543
    def get_revision_graph_with_ghosts(self, revision_ids=None):
544
        """Return a graph of the revisions with ghosts marked as applicable.
545
546
        :param revision_ids: an iterable of revisions to graph or None for all.
547
        :return: a Graph object with the graph reachable from revision_ids.
548
        """
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
549
        result = 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.
550
        if not revision_ids:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
551
            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.
552
            required = set([])
553
        else:
554
            pending = set(revision_ids)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
555
            # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
556
            if _mod_revision.NULL_REVISION in pending:
557
                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.
558
            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.
559
        done = set([])
560
        while len(pending):
561
            revision_id = pending.pop()
562
            try:
563
                rev = self.get_revision(revision_id)
564
            except errors.NoSuchRevision:
565
                if revision_id in required:
566
                    raise
567
                # a ghost
568
                result.add_ghost(revision_id)
569
                continue
570
            for parent_id in rev.parent_ids:
571
                # is this queued or done ?
572
                if (parent_id not in pending and
573
                    parent_id not in done):
574
                    # no, queue it.
575
                    pending.add(parent_id)
576
            result.add_node(revision_id, rev.parent_ids)
1594.2.15 by Robert Collins
Unfuck performance.
577
            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.
578
        return result
579
580
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
581
    def get_revision_inventory(self, revision_id):
582
        """Return inventory of a past revision."""
583
        # TODO: Unify this with get_inventory()
584
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
585
        # must be the same as its revision, so this is trivial.
1534.4.28 by Robert Collins
first cut at merge from integration.
586
        if revision_id is None:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
587
            # This does not make sense: if there is no revision,
588
            # then it is the current tree inventory surely ?!
589
            # and thus get_root_id() is something that looks at the last
590
            # commit on the branch, and the get_root_id is an inventory check.
591
            raise NotImplementedError
592
            # return Inventory(self.get_root_id())
593
        else:
594
            return self.get_inventory(revision_id)
595
1185.65.27 by Robert Collins
Tweak storage towards mergability.
596
    @needs_read_lock
1534.6.3 by Robert Collins
find_repository sufficiently robust.
597
    def is_shared(self):
598
        """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.
599
        raise NotImplementedError(self.is_shared)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
600
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
601
    @needs_write_lock
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
602
    def reconcile(self, other=None, thorough=False):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
603
        """Reconcile this repository."""
604
        from bzrlib.reconcile import RepoReconciler
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
605
        reconciler = RepoReconciler(self, thorough=thorough)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
606
        reconciler.reconcile()
607
        return reconciler
608
    
1534.6.3 by Robert Collins
find_repository sufficiently robust.
609
    @needs_read_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
610
    def revision_tree(self, revision_id):
611
        """Return Tree for a revision on this branch.
612
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
613
        `revision_id` may be None for the empty tree revision.
614
        """
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
615
        # TODO: refactor this to use an existing revision object
616
        # so we don't need to read it in twice.
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
617
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1731.1.61 by Aaron Bentley
Merge bzr.dev
618
            return RevisionTree(self, Inventory(root_id=None), 
619
                                _mod_revision.NULL_REVISION)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
620
        else:
621
            inv = self.get_revision_inventory(revision_id)
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
622
            return RevisionTree(self, inv, revision_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
623
1185.65.27 by Robert Collins
Tweak storage towards mergability.
624
    @needs_read_lock
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
625
    def revision_trees(self, revision_ids):
626
        """Return Tree for a revision on this branch.
627
1756.3.19 by Aaron Bentley
Documentation and cleanups
628
        `revision_id` may not be None or 'null:'"""
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
629
        assert None not in revision_ids
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
630
        assert _mod_revision.NULL_REVISION not in revision_ids
1756.3.5 by Aaron Bentley
Switch to get_texts, optimize get_texts
631
        texts = self.get_inventory_weave().get_texts(revision_ids)
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
632
        for text, revision_id in zip(texts, revision_ids):
633
            inv = self.deserialise_inventory(revision_id, text)
634
            yield RevisionTree(self, inv, revision_id)
635
636
    @needs_read_lock
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
637
    def get_ancestry(self, revision_id):
638
        """Return a list of revision-ids integrated by a revision.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
639
640
        The first element of the list is always None, indicating the origin 
641
        revision.  This might change when we have history horizons, or 
642
        perhaps we should have a new API.
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
643
        
644
        This is topologically sorted.
645
        """
646
        if revision_id is None:
647
            return [None]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
648
        if not self.has_revision(revision_id):
649
            raise errors.NoSuchRevision(self, revision_id)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
650
        w = self.get_inventory_weave()
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
651
        candidates = w.get_ancestry(revision_id)
652
        return [None] + candidates # self._eliminate_revisions_not_present(candidates)
1185.66.2 by Aaron Bentley
Moved get_ancestry to RevisionStorage
653
1185.65.4 by Aaron Bentley
Fixed cat command
654
    @needs_read_lock
655
    def print_file(self, file, revision_id):
1185.65.29 by Robert Collins
Implement final review suggestions.
656
        """Print `file` to stdout.
657
        
658
        FIXME RBC 20060125 as John Meinel points out this is a bad api
659
        - it writes to stdout, it assumes that that is valid etc. Fix
660
        by creating a new more flexible convenience function.
661
        """
1185.65.4 by Aaron Bentley
Fixed cat command
662
        tree = self.revision_tree(revision_id)
663
        # use inventory as it was in that revision
664
        file_id = tree.inventory.path2id(file)
665
        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
666
            # TODO: jam 20060427 Write a test for this code path
667
            #       it had a bug in it, and was raising the wrong
668
            #       exception.
669
            raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
1185.65.4 by Aaron Bentley
Fixed cat command
670
        tree.print_file(file_id)
671
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
672
    def get_transaction(self):
673
        return self.control_files.get_transaction()
674
1590.1.1 by Robert Collins
Improve common_ancestor performance.
675
    def revision_parents(self, revid):
676
        return self.get_inventory_weave().parent_names(revid)
677
1185.65.27 by Robert Collins
Tweak storage towards mergability.
678
    @needs_write_lock
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
679
    def set_make_working_trees(self, new_value):
680
        """Set the policy flag for making working trees when creating branches.
681
682
        This only applies to branches that use this repository.
683
684
        The default is 'True'.
685
        :param new_value: True to restore the default, False to disable making
686
                          working trees.
687
        """
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
688
        raise NotImplementedError(self.set_make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
689
    
690
    def make_working_trees(self):
691
        """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.
692
        raise NotImplementedError(self.make_working_trees)
1534.6.5 by Robert Collins
Cloning of repos preserves shared and make-working-tree attributes.
693
694
    @needs_write_lock
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
695
    def sign_revision(self, revision_id, gpg_strategy):
696
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
697
        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.
698
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
699
    @needs_read_lock
700
    def has_signature_for_revision_id(self, revision_id):
701
        """Query for a revision signature for revision_id in the repository."""
702
        return self._revision_store.has_signature(revision_id,
703
                                                  self.get_transaction())
704
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
705
    @needs_read_lock
706
    def get_signature_text(self, revision_id):
707
        """Return the text for a signature."""
708
        return self._revision_store.get_signature_text(revision_id,
709
                                                       self.get_transaction())
710
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
711
    @needs_read_lock
712
    def check(self, revision_ids):
713
        """Check consistency of all history of given revision_ids.
714
715
        Different repository implementations should override _check().
716
717
        :param revision_ids: A non-empty list of revision_ids whose ancestry
718
             will be checked.  Typically the last revision_id of a branch.
719
        """
720
        if not revision_ids:
721
            raise ValueError("revision_ids must be non-empty in %s.check" 
722
                    % (self,))
723
        return self._check(revision_ids)
724
725
    def _check(self, revision_ids):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
726
        result = check.Check(self)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
727
        result.check()
728
        return result
729
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
730
    def _warn_if_deprecated(self):
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
731
        global _deprecation_warning_done
732
        if _deprecation_warning_done:
733
            return
734
        _deprecation_warning_done = True
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
735
        warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
736
                % (self._format, self.bzrdir.transport.base))
737
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
738
    def supports_rich_root(self):
739
        return self._format.rich_root_data
740
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.
741
    def _check_ascii_revisionid(self, revision_id, method):
742
        """Private helper for ascii-only repositories."""
743
        # weave repositories refuse to store revisionids that are non-ascii.
744
        if revision_id is not None:
745
            # weaves require ascii revision ids.
746
            if isinstance(revision_id, unicode):
747
                try:
748
                    revision_id.encode('ascii')
749
                except UnicodeEncodeError:
750
                    raise errors.NonAsciiRevisionId(method, self)
751
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
752
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
753
class AllInOneRepository(Repository):
754
    """Legacy support - the repository behaviour for all-in-one branches."""
755
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
756
    def __init__(self, _format, a_bzrdir, _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
757
        # we reuse one control files instance.
758
        dir_mode = a_bzrdir._control_files._dir_mode
759
        file_mode = a_bzrdir._control_files._file_mode
760
761
        def get_store(name, compressed=True, prefixed=False):
762
            # FIXME: This approach of assuming stores are all entirely compressed
763
            # or entirely uncompressed is tidy, but breaks upgrade from 
764
            # some existing branches where there's a mixture; we probably 
765
            # still want the option to look for both.
766
            relpath = a_bzrdir._control_files._escape(name)
767
            store = TextStore(a_bzrdir._control_files._transport.clone(relpath),
768
                              prefixed=prefixed, compressed=compressed,
769
                              dir_mode=dir_mode,
770
                              file_mode=file_mode)
771
            #if self._transport.should_cache():
772
            #    cache_path = os.path.join(self.cache_root, name)
773
            #    os.mkdir(cache_path)
774
            #    store = bzrlib.store.CachedStore(store, cache_path)
775
            return store
776
777
        # not broken out yet because the controlweaves|inventory_store
778
        # and text_store | weave_store bits are still different.
779
        if isinstance(_format, RepositoryFormat4):
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
780
            # cannot remove these - there is still no consistent api 
781
            # which allows access to this old info.
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
782
            self.inventory_store = get_store('inventory-store')
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
783
            text_store = get_store('text-store')
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
784
        super(AllInOneRepository, self).__init__(_format, a_bzrdir, 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
785
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.
786
    def get_commit_builder(self, branch, parents, config, timestamp=None,
787
                           timezone=None, committer=None, revprops=None,
788
                           revision_id=None):
789
        self._check_ascii_revisionid(revision_id, self.get_commit_builder)
790
        return Repository.get_commit_builder(self, branch, parents, config,
791
            timestamp, timezone, committer, revprops, revision_id)
792
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
793
    @needs_read_lock
794
    def is_shared(self):
795
        """AllInOne repositories cannot be shared."""
796
        return False
797
798
    @needs_write_lock
799
    def set_make_working_trees(self, new_value):
800
        """Set the policy flag for making working trees when creating branches.
801
802
        This only applies to branches that use this repository.
803
804
        The default is 'True'.
805
        :param new_value: True to restore the default, False to disable making
806
                          working trees.
807
        """
808
        raise NotImplementedError(self.set_make_working_trees)
809
    
810
    def make_working_trees(self):
811
        """Returns the policy for making working trees on new branches."""
812
        return True
813
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
814
1185.82.84 by Aaron Bentley
Moved stuff around
815
def install_revision(repository, rev, revision_tree):
816
    """Install all revision data into a repository."""
817
    present_parents = []
818
    parent_trees = {}
819
    for p_id in rev.parent_ids:
820
        if repository.has_revision(p_id):
821
            present_parents.append(p_id)
822
            parent_trees[p_id] = repository.revision_tree(p_id)
823
        else:
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
824
            parent_trees[p_id] = repository.revision_tree(None)
1185.82.84 by Aaron Bentley
Moved stuff around
825
826
    inv = revision_tree.inventory
1910.2.51 by Aaron Bentley
Bundles now corrupt repositories
827
    entries = inv.iter_entries()
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
828
    # backwards compatability hack: skip the root id.
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
829
    if not repository.supports_rich_root():
1910.2.60 by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos
830
        path, root = entries.next()
831
        if root.revision != rev.revision_id:
1910.2.63 by Aaron Bentley
Add supports_rich_root member to repository
832
            raise errors.IncompatibleRevision(repr(repository))
1185.82.84 by Aaron Bentley
Moved stuff around
833
    # Add the texts that are not already present
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
834
    for path, ie in entries:
1185.82.84 by Aaron Bentley
Moved stuff around
835
        w = repository.weave_store.get_weave_or_empty(ie.file_id,
836
                repository.get_transaction())
837
        if ie.revision not in w:
838
            text_parents = []
1740.2.2 by Aaron Bentley
Add test for the basis inventory automatically adding the revision id.
839
            # FIXME: TODO: The following loop *may* be overlapping/duplicate
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
840
            # 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.
841
            # is a latent bug here where the parents may have ancestors of each
842
            # other. RBC, AB
1185.82.84 by Aaron Bentley
Moved stuff around
843
            for revision, tree in parent_trees.iteritems():
844
                if ie.file_id not in tree:
845
                    continue
846
                parent_id = tree.inventory[ie.file_id].revision
847
                if parent_id in text_parents:
848
                    continue
849
                text_parents.append(parent_id)
850
                    
851
            vfile = repository.weave_store.get_weave_or_empty(ie.file_id, 
852
                repository.get_transaction())
853
            lines = revision_tree.get_file(ie.file_id).readlines()
854
            vfile.add_lines(rev.revision_id, text_parents, lines)
855
    try:
856
        # install the inventory
857
        repository.add_inventory(rev.revision_id, inv, present_parents)
858
    except errors.RevisionAlreadyPresent:
859
        pass
860
    repository.add_revision(rev.revision_id, rev, inv)
861
862
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
863
class MetaDirRepository(Repository):
864
    """Repositories in the new meta-dir layout."""
865
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
866
    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
867
        super(MetaDirRepository, self).__init__(_format,
868
                                                a_bzrdir,
869
                                                control_files,
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
870
                                                _revision_store,
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
871
                                                control_store,
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
872
                                                text_store)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
873
        dir_mode = self.control_files._dir_mode
874
        file_mode = self.control_files._file_mode
875
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
876
    @needs_read_lock
877
    def is_shared(self):
878
        """Return True if this repository is flagged as a shared repository."""
879
        return self.control_files._transport.has('shared-storage')
880
881
    @needs_write_lock
882
    def set_make_working_trees(self, new_value):
883
        """Set the policy flag for making working trees when creating branches.
884
885
        This only applies to branches that use this repository.
886
887
        The default is 'True'.
888
        :param new_value: True to restore the default, False to disable making
889
                          working trees.
890
        """
891
        if new_value:
892
            try:
893
                self.control_files._transport.delete('no-working-trees')
894
            except errors.NoSuchFile:
895
                pass
896
        else:
897
            self.control_files.put_utf8('no-working-trees', '')
898
    
899
    def make_working_trees(self):
900
        """Returns the policy for making working trees on new branches."""
901
        return not self.control_files._transport.has('no-working-trees')
902
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
903
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.
904
class WeaveMetaDirRepository(MetaDirRepository):
905
    """A subclass of MetaDirRepository to set weave specific policy."""
906
907
    def get_commit_builder(self, branch, parents, config, timestamp=None,
908
                           timezone=None, committer=None, revprops=None,
909
                           revision_id=None):
910
        self._check_ascii_revisionid(revision_id, self.get_commit_builder)
911
        return MetaDirRepository.get_commit_builder(self, branch, parents,
912
            config, timestamp, timezone, committer, revprops, revision_id)
913
914
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
915
class KnitRepository(MetaDirRepository):
916
    """Knit format repository."""
917
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
918
    def _warn_if_deprecated(self):
919
        # This class isn't deprecated
920
        pass
921
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
922
    def _inventory_add_lines(self, inv_vf, revid, parents, lines):
923
        inv_vf.add_lines_with_ghosts(revid, parents, lines)
924
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
925
    @needs_read_lock
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
926
    def _all_revision_ids(self):
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
927
        """See Repository.all_revision_ids()."""
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
928
        # Knits get the revision graph from the index of the revision knit, so
929
        # it's always possible even if they're on an unlistable transport.
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
930
        return self._revision_store.all_revision_ids(self.get_transaction())
931
1732.2.6 by Martin Pool
Restore removed fileid_involved* methods
932
    def fileid_involved_between_revs(self, from_revid, to_revid):
933
        """Find file_id(s) which are involved in the changes between revisions.
934
935
        This determines the set of revisions which are involved, and then
936
        finds all file ids affected by those revisions.
937
        """
938
        vf = self._get_revision_vf()
939
        from_set = set(vf.get_ancestry(from_revid))
940
        to_set = set(vf.get_ancestry(to_revid))
941
        changed = to_set.difference(from_set)
942
        return self._fileid_involved_by_set(changed)
943
944
    def fileid_involved(self, last_revid=None):
945
        """Find all file_ids modified in the ancestry of last_revid.
946
947
        :param last_revid: If None, last_revision() will be used.
948
        """
949
        if not last_revid:
950
            changed = set(self.all_revision_ids())
951
        else:
952
            changed = set(self.get_ancestry(last_revid))
953
        if None in changed:
954
            changed.remove(None)
955
        return self._fileid_involved_by_set(changed)
956
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
957
    @needs_read_lock
958
    def get_ancestry(self, revision_id):
959
        """Return a list of revision-ids integrated by a revision.
960
        
961
        This is topologically sorted.
962
        """
963
        if revision_id is None:
964
            return [None]
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
965
        vf = self._get_revision_vf()
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
966
        try:
967
            return [None] + vf.get_ancestry(revision_id)
968
        except errors.RevisionNotPresent:
969
            raise errors.NoSuchRevision(self, revision_id)
970
971
    @needs_read_lock
1594.2.10 by Robert Collins
Teach knit fetching and branching to only duplicate relevant data avoiding unnecessary reconciles.
972
    def get_revision(self, revision_id):
973
        """Return the Revision object for a named revision"""
974
        return self.get_revision_reconcile(revision_id)
975
976
    @needs_read_lock
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
977
    def get_revision_graph(self, revision_id=None):
978
        """Return a dictionary containing the revision graph.
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
979
980
        :param revision_id: The revision_id to get a graph from. If None, then
981
        the entire revision graph is returned. This is a deprecated mode of
982
        operation and will be removed in the future.
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
983
        :return: a dictionary of revision_id->revision_parents_list.
984
        """
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
985
        # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
986
        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.
987
            return {}
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
988
        a_weave = self._get_revision_vf()
989
        entire_graph = a_weave.get_graph()
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
990
        if revision_id is None:
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
991
            return a_weave.get_graph()
992
        elif revision_id not in a_weave:
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
993
            raise errors.NoSuchRevision(self, revision_id)
994
        else:
995
            # add what can be reached from revision_id
996
            result = {}
997
            pending = set([revision_id])
998
            while len(pending) > 0:
999
                node = pending.pop()
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1000
                result[node] = a_weave.get_parents(node)
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1001
                for revision_id in result[node]:
1002
                    if revision_id not in result:
1003
                        pending.add(revision_id)
1004
            return result
1005
1006
    @needs_read_lock
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1007
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1008
        """Return a graph of the revisions with ghosts marked as applicable.
1009
1010
        :param revision_ids: an iterable of revisions to graph or None for all.
1011
        :return: a Graph object with the graph reachable from revision_ids.
1012
        """
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1013
        result = graph.Graph()
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1014
        vf = self._get_revision_vf()
1628.1.7 by Robert Collins
Tune get_revision_graph_with_ghosts for Knit repositories.
1015
        versions = set(vf.versions())
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1016
        if not revision_ids:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1017
            pending = set(self.all_revision_ids())
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1018
            required = set([])
1019
        else:
1020
            pending = set(revision_ids)
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
1021
            # special case NULL_REVISION
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1022
            if _mod_revision.NULL_REVISION in pending:
1023
                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.
1024
            required = set(pending)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1025
        done = set([])
1026
        while len(pending):
1027
            revision_id = pending.pop()
1028
            if not revision_id in versions:
1029
                if revision_id in required:
1030
                    raise errors.NoSuchRevision(self, revision_id)
1031
                # a ghost
1032
                result.add_ghost(revision_id)
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1033
                # mark it as done so we don't try for it again.
1628.1.7 by Robert Collins
Tune get_revision_graph_with_ghosts for Knit repositories.
1034
                done.add(revision_id)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1035
                continue
1036
            parent_ids = vf.get_parents_with_ghosts(revision_id)
1037
            for parent_id in parent_ids:
1038
                # is this queued or done ?
1039
                if (parent_id not in pending and
1040
                    parent_id not in done):
1041
                    # no, queue it.
1042
                    pending.add(parent_id)
1043
            result.add_node(revision_id, parent_ids)
1628.1.7 by Robert Collins
Tune get_revision_graph_with_ghosts for Knit repositories.
1044
            done.add(revision_id)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1045
        return result
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1046
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1047
    def _get_revision_vf(self):
1607.1.2 by Robert Collins
Merge in knit-using-revision-versioned-file-graph tuning work.
1048
        """:return: a versioned file containing the revisions."""
1596.2.12 by Robert Collins
Merge and make Knit Repository use the revision store for all possible queries.
1049
        vf = self._revision_store.get_revision_file(self.get_transaction())
1050
        return vf
1051
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1052
    @needs_write_lock
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1053
    def reconcile(self, other=None, thorough=False):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1054
        """Reconcile this repository."""
1055
        from bzrlib.reconcile import KnitReconciler
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
1056
        reconciler = KnitReconciler(self, thorough=thorough)
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
1057
        reconciler.reconcile()
1058
        return reconciler
1059
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1060
    def revision_parents(self, revision_id):
1061
        return self._get_revision_vf().get_parents(revision_id)
1062
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1063
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1064
class KnitRepository2(KnitRepository):
1065
    """"""
1910.2.48 by Aaron Bentley
Update from review comments
1066
    def __init__(self, _format, a_bzrdir, control_files, _revision_store,
1067
                 control_store, text_store):
1068
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
1069
                              _revision_store, control_store, text_store)
1070
        self._serializer = xml6.serializer_v6
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1071
1072
    def deserialise_inventory(self, revision_id, xml):
1073
        """Transform the xml into an inventory object. 
1074
1075
        :param revision_id: The expected revision id of the inventory.
1076
        :param xml: A serialised inventory.
1077
        """
1910.2.48 by Aaron Bentley
Update from review comments
1078
        result = self._serializer.read_inventory_from_string(xml)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1079
        assert result.root.revision is not None
1080
        return result
1081
1082
    def serialise_inventory(self, inv):
1083
        """Transform the inventory object into XML text.
1084
1085
        :param revision_id: The expected revision id of the inventory.
1086
        :param xml: A serialised inventory.
1087
        """
1910.2.23 by Aaron Bentley
Fix up test cases that manually construct inventories
1088
        assert inv.revision_id is not None
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1089
        assert inv.root.revision is not None
1910.2.48 by Aaron Bentley
Update from review comments
1090
        return KnitRepository.serialise_inventory(self, inv)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1091
1092
    def get_commit_builder(self, branch, parents, config, timestamp=None, 
1093
                           timezone=None, committer=None, revprops=None, 
1094
                           revision_id=None):
1095
        """Obtain a CommitBuilder for this repository.
1096
        
1097
        :param branch: Branch to commit to.
1098
        :param parents: Revision ids of the parents of the new revision.
1099
        :param config: Configuration to use.
1100
        :param timestamp: Optional timestamp recorded for commit.
1101
        :param timezone: Optional timezone for timestamp.
1102
        :param committer: Optional committer to set for commit.
1103
        :param revprops: Optional dictionary of revision properties.
1104
        :param revision_id: Optional revision id.
1105
        """
1106
        return RootCommitBuilder(self, parents, config, timestamp, timezone,
1107
                                 committer, revprops, revision_id)
1108
1910.2.46 by Aaron Bentley
Whitespace fix
1109
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1110
class RepositoryFormat(object):
1111
    """A repository format.
1112
1113
    Formats provide three things:
1114
     * An initialization routine to construct repository data on disk.
1115
     * a format string which is used when the BzrDir supports versioned
1116
       children.
1117
     * an open routine which returns a Repository instance.
1118
1119
    Formats are placed in an dict by their format string for reference 
1120
    during opening. These should be subclasses of RepositoryFormat
1121
    for consistency.
1122
1123
    Once a format is deprecated, just deprecate the initialize and open
1124
    methods on the format class. Do not deprecate the object, as the 
1125
    object will be created every system load.
1126
1127
    Common instance attributes:
1128
    _matchingbzrdir - the bzrdir format that the repository format was
1129
    originally written to work with. This can be used if manually
1130
    constructing a bzrdir and repository, or more commonly for test suite
1131
    parameterisation.
1132
    """
1133
1134
    _default_format = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1135
    """The default format used for new repositories."""
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1136
1137
    _formats = {}
1138
    """The known formats."""
1139
1904.2.3 by Martin Pool
Give a warning on access to old repository formats
1140
    def __str__(self):
1141
        return "<%s>" % self.__class__.__name__
1142
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1143
    @classmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1144
    def find_format(klass, a_bzrdir):
1145
        """Return the format for the repository object in a_bzrdir."""
1146
        try:
1147
            transport = a_bzrdir.get_repository_transport(None)
1148
            format_string = transport.get("format").read()
1149
            return klass._formats[format_string]
1150
        except errors.NoSuchFile:
1151
            raise errors.NoRepositoryPresent(a_bzrdir)
1152
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1153
            raise errors.UnknownFormatError(format=format_string)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1154
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1155
    def _get_control_store(self, repo_transport, control_files):
1156
        """Return the control store for this repository."""
1157
        raise NotImplementedError(self._get_control_store)
1158
    
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1159
    @classmethod
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1160
    def get_default_format(klass):
1161
        """Return the current default format."""
1162
        return klass._default_format
1163
1164
    def get_format_string(self):
1165
        """Return the ASCII format string that identifies this format.
1166
        
1167
        Note that in pre format ?? repositories the format string is 
1168
        not permitted nor written to disk.
1169
        """
1170
        raise NotImplementedError(self.get_format_string)
1171
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1172
    def get_format_description(self):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1173
        """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
1174
        raise NotImplementedError(self.get_format_description)
1175
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1176
    def _get_revision_store(self, repo_transport, control_files):
1177
        """Return the revision store object for this a_bzrdir."""
1556.1.5 by Robert Collins
Review feedback.
1178
        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
1179
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1180
    def _get_text_rev_store(self,
1181
                            transport,
1182
                            control_files,
1183
                            name,
1184
                            compressed=True,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1185
                            prefixed=False,
1186
                            serializer=None):
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1187
        """Common logic for getting a revision store for a repository.
1188
        
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1189
        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
1190
        get the store for a repository.
1191
        """
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1192
        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
1193
        dir_mode = control_files._dir_mode
1194
        file_mode = control_files._file_mode
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1195
        text_store =TextStore(transport.clone(name),
1196
                              prefixed=prefixed,
1197
                              compressed=compressed,
1198
                              dir_mode=dir_mode,
1199
                              file_mode=file_mode)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1200
        _revision_store = TextRevisionStore(text_store, serializer)
1201
        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
1202
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1203
    def _get_versioned_file_store(self,
1204
                                  name,
1205
                                  transport,
1206
                                  control_files,
1207
                                  prefixed=True,
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1208
                                  versionedfile_class=weave.WeaveFile,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1209
                                  versionedfile_kwargs={},
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1210
                                  escaped=False):
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1211
        weave_transport = control_files._transport.clone(name)
1212
        dir_mode = control_files._dir_mode
1213
        file_mode = control_files._file_mode
1214
        return VersionedFileStore(weave_transport, prefixed=prefixed,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1215
                                  dir_mode=dir_mode,
1216
                                  file_mode=file_mode,
1217
                                  versionedfile_class=versionedfile_class,
1946.2.5 by John Arbash Meinel
Make knit stores delay creation, but not control stores
1218
                                  versionedfile_kwargs=versionedfile_kwargs,
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1219
                                  escaped=escaped)
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1220
1534.6.1 by Robert Collins
allow API creation of shared repositories
1221
    def initialize(self, a_bzrdir, shared=False):
1222
        """Initialize a repository of this format in a_bzrdir.
1223
1224
        :param a_bzrdir: The bzrdir to put the new repository in it.
1225
        :param shared: The repository should be initialized as a sharable one.
1226
1227
        This may raise UninitializableFormat if shared repository are not
1228
        compatible the a_bzrdir.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1229
        """
1230
1231
    def is_supported(self):
1232
        """Is this format supported?
1233
1234
        Supported formats must be initializable and openable.
1235
        Unsupported formats may not support initialization or committing or 
1236
        some other features depending on the reason for not being supported.
1237
        """
1238
        return True
1239
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1240
    def check_conversion_target(self, target_format):
1241
        raise NotImplementedError(self.check_conversion_target)
1242
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1243
    def open(self, a_bzrdir, _found=False):
1244
        """Return an instance of this format for the bzrdir a_bzrdir.
1245
        
1246
        _found is a private parameter, do not use it.
1247
        """
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1248
        raise NotImplementedError(self.open)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1249
1250
    @classmethod
1251
    def register_format(klass, format):
1252
        klass._formats[format.get_format_string()] = format
1253
1254
    @classmethod
1255
    def set_default_format(klass, format):
1256
        klass._default_format = format
1257
1258
    @classmethod
1259
    def unregister_format(klass, format):
1260
        assert klass._formats[format.get_format_string()] is format
1261
        del klass._formats[format.get_format_string()]
1262
1263
1534.6.1 by Robert Collins
allow API creation of shared repositories
1264
class PreSplitOutRepositoryFormat(RepositoryFormat):
1265
    """Base class for the pre split out repository formats."""
1266
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1267
    rich_root_data = False
1268
1534.6.1 by Robert Collins
allow API creation of shared repositories
1269
    def initialize(self, a_bzrdir, shared=False, _internal=False):
1270
        """Create a weave repository.
1271
        
1272
        TODO: when creating split out bzr branch formats, move this to a common
1273
        base for Format5, Format6. or something like that.
1274
        """
1275
        if shared:
1276
            raise errors.IncompatibleFormat(self, a_bzrdir._format)
1277
1278
        if not _internal:
1279
            # always initialized when the bzrdir is.
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1280
            return self.open(a_bzrdir, _found=True)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1281
        
1282
        # Create an empty weave
1283
        sio = StringIO()
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1284
        weavefile.write_weave_v5(weave.Weave(), sio)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1285
        empty_weave = sio.getvalue()
1286
1287
        mutter('creating repository in %s.', a_bzrdir.transport.base)
1288
        dirs = ['revision-store', 'weaves']
1553.5.56 by Martin Pool
Format 7 repo now uses LockDir!
1289
        files = [('inventory.weave', StringIO(empty_weave)),
1534.6.1 by Robert Collins
allow API creation of shared repositories
1290
                 ]
1291
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1292
        # FIXME: RBC 20060125 don't peek under the covers
1534.6.1 by Robert Collins
allow API creation of shared repositories
1293
        # NB: no need to escape relative paths that are url safe.
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1294
        control_files = lockable_files.LockableFiles(a_bzrdir.transport,
1295
                                'branch-lock', lockable_files.TransportLock)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
1296
        control_files.create_lock()
1534.6.1 by Robert Collins
allow API creation of shared repositories
1297
        control_files.lock_write()
1298
        control_files._transport.mkdir_multi(dirs,
1299
                mode=control_files._dir_mode)
1300
        try:
1301
            for file, content in files:
1302
                control_files.put(file, content)
1303
        finally:
1304
            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
1305
        return self.open(a_bzrdir, _found=True)
1306
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1307
    def _get_control_store(self, repo_transport, control_files):
1308
        """Return the control store for this repository."""
1309
        return self._get_versioned_file_store('',
1310
                                              repo_transport,
1311
                                              control_files,
1312
                                              prefixed=False)
1313
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1314
    def _get_text_store(self, transport, control_files):
1315
        """Get a store for file texts for this format."""
1316
        raise NotImplementedError(self._get_text_store)
1317
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1318
    def open(self, a_bzrdir, _found=False):
1319
        """See RepositoryFormat.open()."""
1320
        if not _found:
1321
            # we are being called directly and must probe.
1322
            raise NotImplementedError
1323
1324
        repo_transport = a_bzrdir.get_repository_transport(None)
1325
        control_files = a_bzrdir._control_files
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1326
        text_store = self._get_text_store(repo_transport, control_files)
1327
        control_store = self._get_control_store(repo_transport, control_files)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1328
        _revision_store = self._get_revision_store(repo_transport, control_files)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1329
        return AllInOneRepository(_format=self,
1330
                                  a_bzrdir=a_bzrdir,
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1331
                                  _revision_store=_revision_store,
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1332
                                  control_store=control_store,
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1333
                                  text_store=text_store)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1334
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1335
    def check_conversion_target(self, target_format):
1336
        pass
1337
1534.6.1 by Robert Collins
allow API creation of shared repositories
1338
1339
class RepositoryFormat4(PreSplitOutRepositoryFormat):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1340
    """Bzr repository format 4.
1341
1342
    This repository format has:
1343
     - flat stores
1344
     - TextStores for texts, inventories,revisions.
1345
1346
    This format is deprecated: it indexes texts using a text id which is
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1347
    removed in format 5; initialization and write support for this format
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1348
    has been removed.
1349
    """
1350
1351
    def __init__(self):
1352
        super(RepositoryFormat4, self).__init__()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1353
        self._matchingbzrdir = bzrdir.BzrDirFormat4()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1354
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1355
    def get_format_description(self):
1356
        """See RepositoryFormat.get_format_description()."""
1357
        return "Repository format 4"
1358
1534.6.1 by Robert Collins
allow API creation of shared repositories
1359
    def initialize(self, url, shared=False, _internal=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1360
        """Format 4 branches cannot be created."""
1361
        raise errors.UninitializableFormat(self)
1362
1363
    def is_supported(self):
1364
        """Format 4 is not supported.
1365
1366
        It is not supported because the model changed from 4 to 5 and the
1367
        conversion logic is expensive - so doing it on the fly was not 
1368
        feasible.
1369
        """
1370
        return False
1371
1563.2.23 by Robert Collins
Add add_revision and get_revision methods to RevisionStore
1372
    def _get_control_store(self, repo_transport, control_files):
1373
        """Format 4 repositories have no formal control store at this point.
1374
        
1375
        This will cause any control-file-needing apis to fail - this is desired.
1376
        """
1377
        return None
1378
    
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1379
    def _get_revision_store(self, repo_transport, control_files):
1380
        """See RepositoryFormat._get_revision_store()."""
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1381
        from bzrlib.xml4 import serializer_v4
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1382
        return self._get_text_rev_store(repo_transport,
1383
                                        control_files,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1384
                                        'revision-store',
1385
                                        serializer=serializer_v4)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1386
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1387
    def _get_text_store(self, transport, control_files):
1388
        """See RepositoryFormat._get_text_store()."""
1389
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1390
1534.6.1 by Robert Collins
allow API creation of shared repositories
1391
class RepositoryFormat5(PreSplitOutRepositoryFormat):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1392
    """Bzr control format 5.
1393
1394
    This repository format has:
1395
     - weaves for file texts and inventory
1396
     - flat stores
1397
     - TextStores for revisions and signatures.
1398
    """
1399
1400
    def __init__(self):
1401
        super(RepositoryFormat5, self).__init__()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1402
        self._matchingbzrdir = bzrdir.BzrDirFormat5()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1403
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1404
    def get_format_description(self):
1405
        """See RepositoryFormat.get_format_description()."""
1406
        return "Weave repository format 5"
1407
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1408
    def _get_revision_store(self, repo_transport, control_files):
1409
        """See RepositoryFormat._get_revision_store()."""
1410
        """Return the revision store object for this a_bzrdir."""
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1411
        return self._get_text_rev_store(repo_transport,
1412
                                        control_files,
1413
                                        'revision-store',
1414
                                        compressed=False)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1415
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1416
    def _get_text_store(self, transport, control_files):
1417
        """See RepositoryFormat._get_text_store()."""
1418
        return self._get_versioned_file_store('weaves', transport, control_files, prefixed=False)
1419
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1420
1534.6.1 by Robert Collins
allow API creation of shared repositories
1421
class RepositoryFormat6(PreSplitOutRepositoryFormat):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1422
    """Bzr control format 6.
1423
1424
    This repository format has:
1425
     - weaves for file texts and inventory
1426
     - hash subdirectory based stores.
1427
     - TextStores for revisions and signatures.
1428
    """
1429
1430
    def __init__(self):
1431
        super(RepositoryFormat6, self).__init__()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1432
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1433
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1434
    def get_format_description(self):
1435
        """See RepositoryFormat.get_format_description()."""
1436
        return "Weave repository format 6"
1437
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1438
    def _get_revision_store(self, repo_transport, control_files):
1439
        """See RepositoryFormat._get_revision_store()."""
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1440
        return self._get_text_rev_store(repo_transport,
1441
                                        control_files,
1442
                                        'revision-store',
1443
                                        compressed=False,
1444
                                        prefixed=True)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1445
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1446
    def _get_text_store(self, transport, control_files):
1447
        """See RepositoryFormat._get_text_store()."""
1448
        return self._get_versioned_file_store('weaves', transport, control_files)
1449
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1450
1451
class MetaDirRepositoryFormat(RepositoryFormat):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1452
    """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
1453
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1454
    rich_root_data = False
1455
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.
1456
    def __init__(self):
1457
        super(MetaDirRepositoryFormat, self).__init__()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1458
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
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.
1459
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1460
    def _create_control_files(self, a_bzrdir):
1461
        """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.
1462
        # FIXME: RBC 20060125 don't peek under the covers
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1463
        # NB: no need to escape relative paths that are url safe.
1464
        repository_transport = a_bzrdir.get_repository_transport(self)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1465
        control_files = lockable_files.LockableFiles(repository_transport,
1466
                                'lock', lockdir.LockDir)
1553.5.61 by Martin Pool
Locks protecting LockableFiles must now be explicitly created before use.
1467
        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
1468
        return control_files
1469
1470
    def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
1471
        """Upload the initial blank content."""
1472
        control_files = self._create_control_files(a_bzrdir)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1473
        control_files.lock_write()
1474
        try:
1553.5.49 by Martin Pool
Use LockDirs for repo format 7
1475
            control_files._transport.mkdir_multi(dirs,
1476
                    mode=control_files._dir_mode)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1477
            for file, content in files:
1478
                control_files.put(file, content)
1479
            for file, content in utf8_files:
1480
                control_files.put_utf8(file, content)
1534.6.1 by Robert Collins
allow API creation of shared repositories
1481
            if shared == True:
1482
                control_files.put_utf8('shared-storage', '')
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1483
        finally:
1484
            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
1485
1486
1487
class RepositoryFormat7(MetaDirRepositoryFormat):
1488
    """Bzr repository 7.
1489
1490
    This repository format has:
1491
     - weaves for file texts and inventory
1492
     - hash subdirectory based stores.
1493
     - TextStores for revisions and signatures.
1494
     - a format marker of its own
1495
     - an optional 'shared-storage' flag
1496
     - an optional 'no-working-trees' flag
1497
    """
1498
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1499
    def _get_control_store(self, repo_transport, control_files):
1500
        """Return the control store for this repository."""
1501
        return self._get_versioned_file_store('',
1502
                                              repo_transport,
1503
                                              control_files,
1504
                                              prefixed=False)
1505
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1506
    def get_format_string(self):
1507
        """See RepositoryFormat.get_format_string()."""
1508
        return "Bazaar-NG Repository format 7"
1509
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1510
    def get_format_description(self):
1511
        """See RepositoryFormat.get_format_description()."""
1512
        return "Weave repository format 7"
1513
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1514
    def check_conversion_target(self, target_format):
1515
        pass
1516
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1517
    def _get_revision_store(self, repo_transport, control_files):
1518
        """See RepositoryFormat._get_revision_store()."""
1519
        return self._get_text_rev_store(repo_transport,
1520
                                        control_files,
1521
                                        'revision-store',
1522
                                        compressed=False,
1523
                                        prefixed=True,
1524
                                        )
1525
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1526
    def _get_text_store(self, transport, control_files):
1527
        """See RepositoryFormat._get_text_store()."""
1528
        return self._get_versioned_file_store('weaves',
1529
                                              transport,
1530
                                              control_files)
1531
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1532
    def initialize(self, a_bzrdir, shared=False):
1533
        """Create a weave repository.
1534
1535
        :param shared: If true the repository will be initialized as a shared
1536
                       repository.
1537
        """
1538
        # Create an empty weave
1539
        sio = StringIO()
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1540
        weavefile.write_weave_v5(weave.Weave(), sio)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1541
        empty_weave = sio.getvalue()
1542
1543
        mutter('creating repository in %s.', a_bzrdir.transport.base)
1544
        dirs = ['revision-store', 'weaves']
1545
        files = [('inventory.weave', StringIO(empty_weave)), 
1546
                 ]
1547
        utf8_files = [('format', self.get_format_string())]
1548
 
1549
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
1550
        return self.open(a_bzrdir=a_bzrdir, _found=True)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1551
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1552
    def open(self, a_bzrdir, _found=False, _override_transport=None):
1553
        """See RepositoryFormat.open().
1554
        
1555
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
1556
                                    repository at a slightly different url
1557
                                    than normal. I.e. during 'upgrade'.
1558
        """
1559
        if not _found:
1560
            format = RepositoryFormat.find_format(a_bzrdir)
1561
            assert format.__class__ ==  self.__class__
1562
        if _override_transport is not None:
1563
            repo_transport = _override_transport
1564
        else:
1565
            repo_transport = a_bzrdir.get_repository_transport(None)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1566
        control_files = lockable_files.LockableFiles(repo_transport,
1567
                                'lock', lockdir.LockDir)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1568
        text_store = self._get_text_store(repo_transport, control_files)
1569
        control_store = self._get_control_store(repo_transport, control_files)
1570
        _revision_store = self._get_revision_store(repo_transport, control_files)
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.
1571
        return WeaveMetaDirRepository(_format=self,
1572
            a_bzrdir=a_bzrdir,
1573
            control_files=control_files,
1574
            _revision_store=_revision_store,
1575
            control_store=control_store,
1576
            text_store=text_store)
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
1577
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1578
1910.2.11 by Aaron Bentley
Start work on Knit format 2
1579
class RepositoryFormatKnit(MetaDirRepositoryFormat):
1580
    """Bzr repository knit format (generalized). 
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1581
1582
    This repository format has:
1583
     - knits for file texts and inventory
1584
     - hash subdirectory based stores.
1585
     - knits for revisions and signatures
1586
     - TextStores for revisions and signatures.
1587
     - a format marker of its own
1588
     - an optional 'shared-storage' flag
1589
     - an optional 'no-working-trees' flag
1553.5.62 by Martin Pool
Add tests that MetaDir repositories use LockDirs
1590
     - a LockDir lock
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1591
    """
1592
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1593
    def _get_control_store(self, repo_transport, control_files):
1594
        """Return the control store for this repository."""
1628.1.5 by Robert Collins
Make inventory knits not annotated, only delta compressed.
1595
        return VersionedFileStore(
1596
            repo_transport,
1597
            prefixed=False,
1598
            file_mode=control_files._file_mode,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
1599
            versionedfile_class=knit.KnitVersionedFile,
1600
            versionedfile_kwargs={'factory':knit.KnitPlainFactory()},
1628.1.5 by Robert Collins
Make inventory knits not annotated, only delta compressed.
1601
            )
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1602
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1603
    def _get_revision_store(self, repo_transport, control_files):
1604
        """See RepositoryFormat._get_revision_store()."""
1605
        from bzrlib.store.revision.knit import KnitRevisionStore
1606
        versioned_file_store = VersionedFileStore(
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1607
            repo_transport,
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
1608
            file_mode=control_files._file_mode,
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1609
            prefixed=False,
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1610
            precious=True,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
1611
            versionedfile_class=knit.KnitVersionedFile,
1612
            versionedfile_kwargs={'delta':False,
1613
                                  'factory':knit.KnitPlainFactory(),
1614
                                 },
1608.2.12 by Martin Pool
Store-escaping must quote uppercase characters too, so that they're safely
1615
            escaped=True,
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
1616
            )
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1617
        return KnitRevisionStore(versioned_file_store)
1618
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1619
    def _get_text_store(self, transport, control_files):
1620
        """See RepositoryFormat._get_text_store()."""
1621
        return self._get_versioned_file_store('knits',
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
1622
                                  transport,
1623
                                  control_files,
1624
                                  versionedfile_class=knit.KnitVersionedFile,
1625
                                  versionedfile_kwargs={
1626
                                      'create_parent_dir':True,
1627
                                      'delay_create':True,
1628
                                      'dir_mode':control_files._dir_mode,
1629
                                  },
1630
                                  escaped=True)
1563.2.17 by Robert Collins
Change knits repositories to use a knit versioned file store for file texts.
1631
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1632
    def initialize(self, a_bzrdir, shared=False):
1633
        """Create a knit format 1 repository.
1634
1658.1.7 by Martin Pool
(RepositoryFormatKnit1.initialize) remove dead code that constructs weaves
1635
        :param a_bzrdir: bzrdir to contain the new repository; must already
1636
            be initialized.
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1637
        :param shared: If true the repository will be initialized as a shared
1638
                       repository.
1639
        """
1640
        mutter('creating repository in %s.', a_bzrdir.transport.base)
1707.3.29 by John Arbash Meinel
reverting 1734
1641
        dirs = ['revision-store', 'knits']
1658.1.7 by Martin Pool
(RepositoryFormatKnit1.initialize) remove dead code that constructs weaves
1642
        files = []
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1643
        utf8_files = [('format', self.get_format_string())]
1644
        
1645
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
1563.2.25 by Robert Collins
Merge in upstream.
1646
        repo_transport = a_bzrdir.get_repository_transport(None)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1647
        control_files = lockable_files.LockableFiles(repo_transport,
1648
                                'lock', lockdir.LockDir)
1563.2.25 by Robert Collins
Merge in upstream.
1649
        control_store = self._get_control_store(repo_transport, control_files)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1650
        transaction = transactions.WriteTransaction()
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1651
        # trigger a write of the inventory store.
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1652
        control_store.get_weave_or_empty('inventory', transaction)
1653
        _revision_store = self._get_revision_store(repo_transport, control_files)
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.
1654
        # the revision id here is irrelevant: it will not be stored, and cannot
1655
        # already exist.
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1656
        _revision_store.has_revision_id('A', transaction)
1657
        _revision_store.get_signature_file(transaction)
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1658
        return self.open(a_bzrdir=a_bzrdir, _found=True)
1659
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1660
    def open(self, a_bzrdir, _found=False, _override_transport=None):
1661
        """See RepositoryFormat.open().
1662
        
1663
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
1664
                                    repository at a slightly different url
1665
                                    than normal. I.e. during 'upgrade'.
1666
        """
1667
        if not _found:
1668
            format = RepositoryFormat.find_format(a_bzrdir)
1669
            assert format.__class__ ==  self.__class__
1670
        if _override_transport is not None:
1671
            repo_transport = _override_transport
1672
        else:
1673
            repo_transport = a_bzrdir.get_repository_transport(None)
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
1674
        control_files = lockable_files.LockableFiles(repo_transport,
1675
                                'lock', lockdir.LockDir)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1676
        text_store = self._get_text_store(repo_transport, control_files)
1677
        control_store = self._get_control_store(repo_transport, control_files)
1678
        _revision_store = self._get_revision_store(repo_transport, control_files)
1679
        return KnitRepository(_format=self,
1680
                              a_bzrdir=a_bzrdir,
1681
                              control_files=control_files,
1682
                              _revision_store=_revision_store,
1683
                              control_store=control_store,
1684
                              text_store=text_store)
1685
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1686
1910.2.11 by Aaron Bentley
Start work on Knit format 2
1687
class RepositoryFormatKnit1(RepositoryFormatKnit):
1688
    """Bzr repository knit format 1.
1689
1690
    This repository format has:
1691
     - knits for file texts and inventory
1692
     - hash subdirectory based stores.
1693
     - knits for revisions and signatures
1694
     - TextStores for revisions and signatures.
1695
     - a format marker of its own
1696
     - an optional 'shared-storage' flag
1697
     - an optional 'no-working-trees' flag
1698
     - a LockDir lock
1699
1700
    This format was introduced in bzr 0.8.
1701
    """
1702
    def get_format_string(self):
1703
        """See RepositoryFormat.get_format_string()."""
1704
        return "Bazaar-NG Knit Repository Format 1"
1705
1706
    def get_format_description(self):
1707
        """See RepositoryFormat.get_format_description()."""
1708
        return "Knit repository format 1"
1556.1.3 by Robert Collins
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
1709
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1710
    def check_conversion_target(self, target_format):
1711
        pass
1712
1713
1714
class RepositoryFormatKnit2(RepositoryFormatKnit):
1715
    """Bzr repository knit format 2.
1716
1717
    THIS FORMAT IS EXPERIMENTAL
1718
    This repository format has:
1719
     - knits for file texts and inventory
1720
     - hash subdirectory based stores.
1721
     - knits for revisions and signatures
1722
     - TextStores for revisions and signatures.
1723
     - a format marker of its own
1724
     - an optional 'shared-storage' flag
1725
     - an optional 'no-working-trees' flag
1726
     - a LockDir lock
1727
     - Support for recording full info about the tree root
1728
1729
    """
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1730
    
1731
    rich_root_data = True
1732
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1733
    def get_format_string(self):
1734
        """See RepositoryFormat.get_format_string()."""
1910.2.48 by Aaron Bentley
Update from review comments
1735
        return "Bazaar Knit Repository Format 2\n"
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1736
1737
    def get_format_description(self):
1738
        """See RepositoryFormat.get_format_description()."""
1739
        return "Knit repository format 2"
1740
1741
    def check_conversion_target(self, target_format):
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1742
        if not target_format.rich_root_data:
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1743
            raise errors.BadConversionTarget(
1744
                'Does not support rich root data.', target_format)
1745
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1746
    def open(self, a_bzrdir, _found=False, _override_transport=None):
1747
        """See RepositoryFormat.open().
1748
        
1749
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
1750
                                    repository at a slightly different url
1751
                                    than normal. I.e. during 'upgrade'.
1752
        """
1753
        if not _found:
1754
            format = RepositoryFormat.find_format(a_bzrdir)
1755
            assert format.__class__ ==  self.__class__
1756
        if _override_transport is not None:
1757
            repo_transport = _override_transport
1758
        else:
1759
            repo_transport = a_bzrdir.get_repository_transport(None)
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1760
        control_files = lockable_files.LockableFiles(repo_transport, 'lock',
1761
                                                     lockdir.LockDir)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1762
        text_store = self._get_text_store(repo_transport, control_files)
1763
        control_store = self._get_control_store(repo_transport, control_files)
1764
        _revision_store = self._get_revision_store(repo_transport, control_files)
1765
        return KnitRepository2(_format=self,
1766
                               a_bzrdir=a_bzrdir,
1767
                               control_files=control_files,
1768
                               _revision_store=_revision_store,
1769
                               control_store=control_store,
1770
                               text_store=text_store)
1771
1772
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1773
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1774
# formats which have no format string are not discoverable
1775
# and not independently creatable, so are not registered.
1666.1.6 by Robert Collins
Make knit the default format.
1776
RepositoryFormat.register_format(RepositoryFormat7())
1910.2.42 by Aaron Bentley
Restore RepositoryFormatKnit1 as the default
1777
_default_format = RepositoryFormatKnit1()
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.
1778
RepositoryFormat.register_format(_default_format)
1910.2.42 by Aaron Bentley
Restore RepositoryFormatKnit1 as the default
1779
RepositoryFormat.register_format(RepositoryFormatKnit2())
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.
1780
RepositoryFormat.set_default_format(_default_format)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1781
_legacy_formats = [RepositoryFormat4(),
1782
                   RepositoryFormat5(),
1783
                   RepositoryFormat6()]
1784
1785
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.
1786
class InterRepository(InterObject):
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1787
    """This class represents operations taking place between two repositories.
1788
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.
1789
    Its instances have methods like copy_content and fetch, and contain
1534.1.27 by Robert Collins
Start InterRepository with InterRepository.get.
1790
    references to the source and target repositories these operations can be 
1791
    carried out on.
1792
1793
    Often we will provide convenience methods on 'repository' which carry out
1794
    operations with another repository - they will always forward to
1795
    InterRepository.get(other).method_name(parameters).
1796
    """
1797
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1798
    _optimisers = []
1534.1.28 by Robert Collins
Allow for optimised InterRepository selection.
1799
    """The available optimised InterRepository types."""
1800
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1801
    def copy_content(self, revision_id=None, basis=None):
1802
        raise NotImplementedError(self.copy_content)
1803
1804
    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.
1805
        """Fetch the content required to construct revision_id.
1806
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1807
        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.
1808
1809
        :param revision_id: if None all content is copied, if NULL_REVISION no
1810
                            content is copied.
1811
        :param pb: optional progress bar to use for progress reports. If not
1812
                   provided a default one will be created.
1813
1814
        Returns the copied revision count and the failed revisions in a tuple:
1815
        (copied, failures).
1816
        """
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1817
        raise NotImplementedError(self.fetch)
1818
   
1819
    @needs_read_lock
1820
    def missing_revision_ids(self, revision_id=None):
1821
        """Return the revision ids that source has that target does not.
1822
        
1823
        These are returned in topological order.
1824
1825
        :param revision_id: only return revision ids included by this
1826
                            revision_id.
1827
        """
1828
        # generic, possibly worst case, slow code path.
1829
        target_ids = set(self.target.all_revision_ids())
1830
        if revision_id is not None:
1831
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1832
            assert source_ids[0] is None
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1833
            source_ids.pop(0)
1834
        else:
1835
            source_ids = self.source.all_revision_ids()
1836
        result_set = set(source_ids).difference(target_ids)
1837
        # this may look like a no-op: its not. It preserves the ordering
1838
        # other_ids had while only returning the members from other_ids
1839
        # that we've decided we need.
1840
        return [rev_id for rev_id in source_ids if rev_id in result_set]
1841
1842
1843
class InterSameDataRepository(InterRepository):
1844
    """Code for converting between repositories that represent the same data.
1845
    
1846
    Data format and model must match for this to work.
1847
    """
1848
1849
    _matching_repo_format = RepositoryFormat4()
1850
    """Repository format for testing with."""
1851
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1852
    @staticmethod
1853
    def is_compatible(source, target):
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1854
        if not isinstance(source, Repository):
1855
            return False
1856
        if not isinstance(target, Repository):
1857
            return False
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1858
        if source._format.rich_root_data == target._format.rich_root_data:
1859
            return True
1860
        else:
1861
            return False
1862
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.
1863
    @needs_write_lock
1864
    def copy_content(self, revision_id=None, basis=None):
1865
        """Make a complete copy of the content in self into destination.
1866
        
1867
        This is a destructive operation! Do not use it on existing 
1868
        repositories.
1869
1870
        :param revision_id: Only copy the content needed to construct
1871
                            revision_id and its parents.
1872
        :param basis: Copy the needed data preferentially from basis.
1873
        """
1874
        try:
1875
            self.target.set_make_working_trees(self.source.make_working_trees())
1876
        except NotImplementedError:
1877
            pass
1878
        # grab the basis available data
1879
        if basis is not None:
1880
            self.target.fetch(basis, revision_id=revision_id)
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1881
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1882
        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.
1883
            self.target.has_revision(revision_id)):
1884
            return
1885
        self.target.fetch(self.source, revision_id=revision_id)
1886
1887
    @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.
1888
    def fetch(self, revision_id=None, pb=None):
1910.7.20 by Andrew Bennetts
Merge from bzr.dev
1889
        """See InterRepository.fetch()."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1890
        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.
1891
        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
1892
               self.source, self.source._format, self.target, 
1893
               self.target._format)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1894
        f = GenericRepoFetcher(to_repository=self.target,
1895
                               from_repository=self.source,
1896
                               last_revision=revision_id,
1897
                               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.
1898
        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.
1899
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
1900
1901
class InterWeaveRepo(InterSameDataRepository):
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.
1902
    """Optimised code paths between Weave based repositories."""
1903
1666.1.6 by Robert Collins
Make knit the default format.
1904
    _matching_repo_format = RepositoryFormat7()
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.
1905
    """Repository format for testing with."""
1906
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.
1907
    @staticmethod
1908
    def is_compatible(source, target):
1909
        """Be compatible with known Weave formats.
1910
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1911
        We don't test for the stores being of specific types because that
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.
1912
        could lead to confusing results, and there is no need to be 
1913
        overly general.
1914
        """
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.
1915
        try:
1916
            return (isinstance(source._format, (RepositoryFormat5,
1917
                                                RepositoryFormat6,
1918
                                                RepositoryFormat7)) and
1919
                    isinstance(target._format, (RepositoryFormat5,
1920
                                                RepositoryFormat6,
1921
                                                RepositoryFormat7)))
1922
        except AttributeError:
1923
            return False
1924
    
1925
    @needs_write_lock
1926
    def copy_content(self, revision_id=None, basis=None):
1927
        """See InterRepository.copy_content()."""
1928
        # weave specific optimised path:
1929
        if basis is not None:
1930
            # copy the basis in, then fetch remaining data.
1931
            basis.copy_content_into(self.target, revision_id)
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1932
            # the basis copy_content_into could miss-set this.
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.
1933
            try:
1934
                self.target.set_make_working_trees(self.source.make_working_trees())
1935
            except NotImplementedError:
1936
                pass
1937
            self.target.fetch(self.source, revision_id=revision_id)
1938
        else:
1939
            try:
1940
                self.target.set_make_working_trees(self.source.make_working_trees())
1941
            except NotImplementedError:
1942
                pass
1943
            # FIXME do not peek!
1944
            if self.source.control_files._transport.listable():
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1945
                pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1946
                try:
1563.2.37 by Robert Collins
Merge in nested progress bars
1947
                    self.target.weave_store.copy_all_ids(
1948
                        self.source.weave_store,
1949
                        pb=pb,
1950
                        from_transaction=self.source.get_transaction(),
1951
                        to_transaction=self.target.get_transaction())
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1952
                    pb.update('copying inventory', 0, 1)
1953
                    self.target.control_weaves.copy_multi(
1563.2.37 by Robert Collins
Merge in nested progress bars
1954
                        self.source.control_weaves, ['inventory'],
1955
                        from_transaction=self.source.get_transaction(),
1956
                        to_transaction=self.target.get_transaction())
1957
                    self.target._revision_store.text_store.copy_all_ids(
1958
                        self.source._revision_store.text_store,
1959
                        pb=pb)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1960
                finally:
1961
                    pb.finished()
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.
1962
            else:
1963
                self.target.fetch(self.source, revision_id=revision_id)
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.
1964
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.
1965
    @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.
1966
    def fetch(self, revision_id=None, pb=None):
1967
        """See InterRepository.fetch()."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1968
        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.
1969
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1970
               self.source, self.source._format, self.target, self.target._format)
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
1976
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
1977
    @needs_read_lock
1978
    def missing_revision_ids(self, revision_id=None):
1979
        """See InterRepository.missing_revision_ids()."""
1980
        # we want all revisions to satisfy revision_id in source.
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1981
        # but we don't want to stat every file here and there.
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
1982
        # we want then, all revisions other needs to satisfy revision_id 
1983
        # checked, but not those that we have locally.
1984
        # so the first thing is to get a subset of the revisions to 
1985
        # satisfy revision_id in source, and then eliminate those that
1986
        # we do already have. 
1987
        # this is slow on high latency connection to self, but as as this
1988
        # disk format scales terribly for push anyway due to rewriting 
1989
        # inventory.weave, this is considered acceptable.
1990
        # - RBC 20060209
1991
        if revision_id is not None:
1992
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1993
            assert source_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
1994
            source_ids.pop(0)
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
1995
        else:
1996
            source_ids = self.source._all_possible_ids()
1997
        source_ids_set = set(source_ids)
1998
        # source_ids is the worst possible case we may need to pull.
1999
        # 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.
2000
        # have in target, but don't try to check for existence where we know
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
2001
        # we do not have a revision as that would be pointless.
2002
        target_ids = set(self.target._all_possible_ids())
2003
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2004
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2005
        required_revisions = source_ids_set.difference(actually_present_revisions)
2006
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2007
        if revision_id is not None:
2008
            # we used get_ancestry to determine source_ids then we are assured all
2009
            # revisions referenced are present as they are installed in topological order.
2010
            # and the tip revision was validated by get_ancestry.
2011
            return required_topo_revisions
2012
        else:
2013
            # if we just grabbed the possibly available ids, then 
2014
            # we only have an estimate of whats available and need to validate
2015
            # that against the revision records.
2016
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2017
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.
2018
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2019
class InterKnitRepo(InterSameDataRepository):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2020
    """Optimised code paths between Knit based repositories."""
2021
2022
    _matching_repo_format = RepositoryFormatKnit1()
2023
    """Repository format for testing with."""
2024
2025
    @staticmethod
2026
    def is_compatible(source, target):
2027
        """Be compatible with known Knit formats.
2028
        
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2029
        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.
2030
        could lead to confusing results, and there is no need to be 
2031
        overly general.
2032
        """
2033
        try:
2034
            return (isinstance(source._format, (RepositoryFormatKnit1)) and
2035
                    isinstance(target._format, (RepositoryFormatKnit1)))
2036
        except AttributeError:
2037
            return False
2038
2039
    @needs_write_lock
2040
    def fetch(self, revision_id=None, pb=None):
2041
        """See InterRepository.fetch()."""
2042
        from bzrlib.fetch import KnitRepoFetcher
2043
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2044
               self.source, self.source._format, self.target, self.target._format)
2045
        f = KnitRepoFetcher(to_repository=self.target,
2046
                            from_repository=self.source,
2047
                            last_revision=revision_id,
2048
                            pb=pb)
2049
        return f.count_copied, f.failed_revisions
2050
2051
    @needs_read_lock
2052
    def missing_revision_ids(self, revision_id=None):
2053
        """See InterRepository.missing_revision_ids()."""
2054
        if revision_id is not None:
2055
            source_ids = self.source.get_ancestry(revision_id)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2056
            assert source_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
2057
            source_ids.pop(0)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2058
        else:
2059
            source_ids = self.source._all_possible_ids()
2060
        source_ids_set = set(source_ids)
2061
        # source_ids is the worst possible case we may need to pull.
2062
        # 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.
2063
        # 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.
2064
        # we do not have a revision as that would be pointless.
2065
        target_ids = set(self.target._all_possible_ids())
2066
        possibly_present_revisions = target_ids.intersection(source_ids_set)
2067
        actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
2068
        required_revisions = source_ids_set.difference(actually_present_revisions)
2069
        required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
2070
        if revision_id is not None:
2071
            # we used get_ancestry to determine source_ids then we are assured all
2072
            # revisions referenced are present as they are installed in topological order.
2073
            # and the tip revision was validated by get_ancestry.
2074
            return required_topo_revisions
2075
        else:
2076
            # if we just grabbed the possibly available ids, then 
2077
            # we only have an estimate of whats available and need to validate
2078
            # that against the revision records.
2079
            return self.source._eliminate_revisions_not_present(required_topo_revisions)
2080
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2081
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2082
class InterModel1and2(InterRepository):
2083
2084
    _matching_repo_format = None
2085
2086
    @staticmethod
2087
    def is_compatible(source, target):
2088
        if not isinstance(source, Repository):
2089
            return False
2090
        if not isinstance(target, Repository):
2091
            return False
2092
        if not source._format.rich_root_data and target._format.rich_root_data:
2093
            return True
2094
        else:
2095
            return False
2096
2097
    @needs_write_lock
2098
    def fetch(self, revision_id=None, pb=None):
2099
        """See InterRepository.fetch()."""
2100
        from bzrlib.fetch import Model1toKnit2Fetcher
2101
        f = Model1toKnit2Fetcher(to_repository=self.target,
2102
                                 from_repository=self.source,
2103
                                 last_revision=revision_id,
2104
                                 pb=pb)
2105
        return f.count_copied, f.failed_revisions
2106
1910.2.26 by Aaron Bentley
Fix up some test cases
2107
    @needs_write_lock
2108
    def copy_content(self, revision_id=None, basis=None):
2109
        """Make a complete copy of the content in self into destination.
2110
        
2111
        This is a destructive operation! Do not use it on existing 
2112
        repositories.
2113
2114
        :param revision_id: Only copy the content needed to construct
2115
                            revision_id and its parents.
2116
        :param basis: Copy the needed data preferentially from basis.
2117
        """
2118
        try:
2119
            self.target.set_make_working_trees(self.source.make_working_trees())
2120
        except NotImplementedError:
2121
            pass
2122
        # grab the basis available data
2123
        if basis is not None:
2124
            self.target.fetch(basis, revision_id=revision_id)
2125
        # but don't bother fetching if we have the needed data now.
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
2126
        if (revision_id not in (None, _mod_revision.NULL_REVISION) and 
1910.2.26 by Aaron Bentley
Fix up some test cases
2127
            self.target.has_revision(revision_id)):
2128
            return
2129
        self.target.fetch(self.source, revision_id=revision_id)
2130
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2131
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2132
class InterKnit1and2(InterKnitRepo):
2133
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2134
    _matching_repo_format = None
2135
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2136
    @staticmethod
2137
    def is_compatible(source, target):
2138
        """Be compatible with Knit1 source and Knit2 target"""
2139
        try:
2140
            return (isinstance(source._format, (RepositoryFormatKnit1)) and
2141
                    isinstance(target._format, (RepositoryFormatKnit2)))
2142
        except AttributeError:
2143
            return False
2144
2145
    @needs_write_lock
2146
    def fetch(self, revision_id=None, pb=None):
2147
        """See InterRepository.fetch()."""
2148
        from bzrlib.fetch import Knit1to2Fetcher
2149
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
2150
               self.source, self.source._format, self.target, 
2151
               self.target._format)
2152
        f = Knit1to2Fetcher(to_repository=self.target,
2153
                            from_repository=self.source,
2154
                            last_revision=revision_id,
2155
                            pb=pb)
2156
        return f.count_copied, f.failed_revisions
2157
2158
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
2159
InterRepository.register_optimiser(InterSameDataRepository)
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.
2160
InterRepository.register_optimiser(InterWeaveRepo)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2161
InterRepository.register_optimiser(InterKnitRepo)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2162
InterRepository.register_optimiser(InterModel1and2)
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
2163
InterRepository.register_optimiser(InterKnit1and2)
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.
2164
2165
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2166
class RepositoryTestProviderAdapter(object):
2167
    """A tool to generate a suite testing multiple repository formats at once.
2168
2169
    This is done by copying the test once for each transport and injecting
2170
    the transport_server, transport_readonly_server, and bzrdir_format and
2171
    repository_format classes into each copy. Each copy is also given a new id()
2172
    to make it easy to identify.
2173
    """
2174
2175
    def __init__(self, transport_server, transport_readonly_server, formats):
2176
        self._transport_server = transport_server
2177
        self._transport_readonly_server = transport_readonly_server
2178
        self._formats = formats
2179
    
2180
    def adapt(self, test):
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
2181
        result = unittest.TestSuite()
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2182
        for repository_format, bzrdir_format in self._formats:
2183
            new_test = deepcopy(test)
2184
            new_test.transport_server = self._transport_server
2185
            new_test.transport_readonly_server = self._transport_readonly_server
2186
            new_test.bzrdir_format = bzrdir_format
2187
            new_test.repository_format = repository_format
2188
            def make_new_test_id():
2189
                new_id = "%s(%s)" % (new_test.id(), repository_format.__class__.__name__)
2190
                return lambda: new_id
2191
            new_test.id = make_new_test_id()
2192
            result.addTest(new_test)
2193
        return result
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
2194
2195
2196
class InterRepositoryTestProviderAdapter(object):
2197
    """A tool to generate a suite testing multiple inter repository formats.
2198
2199
    This is done by copying the test once for each interrepo provider and injecting
2200
    the transport_server, transport_readonly_server, repository_format and 
2201
    repository_to_format classes into each copy.
2202
    Each copy is also given a new id() to make it easy to identify.
2203
    """
2204
2205
    def __init__(self, transport_server, transport_readonly_server, formats):
2206
        self._transport_server = transport_server
2207
        self._transport_readonly_server = transport_readonly_server
2208
        self._formats = formats
2209
    
2210
    def adapt(self, test):
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
2211
        result = unittest.TestSuite()
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
2212
        for interrepo_class, repository_format, repository_format_to in self._formats:
2213
            new_test = deepcopy(test)
2214
            new_test.transport_server = self._transport_server
2215
            new_test.transport_readonly_server = self._transport_readonly_server
2216
            new_test.interrepo_class = interrepo_class
2217
            new_test.repository_format = repository_format
2218
            new_test.repository_format_to = repository_format_to
2219
            def make_new_test_id():
2220
                new_id = "%s(%s)" % (new_test.id(), interrepo_class.__name__)
2221
                return lambda: new_id
2222
            new_test.id = make_new_test_id()
2223
            result.addTest(new_test)
2224
        return result
2225
2226
    @staticmethod
2227
    def default_test_list():
2228
        """Generate the default list of interrepo permutations to test."""
2229
        result = []
2230
        # test the default InterRepository between format 6 and the current 
2231
        # default format.
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.
2232
        # XXX: robertc 20060220 reinstate this when there are two supported
2233
        # formats which do not have an optimal code path between them.
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2234
        #result.append((InterRepository,
2235
        #               RepositoryFormat6(),
2236
        #               RepositoryFormatKnit1()))
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
2237
        for optimiser in InterRepository._optimisers:
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2238
            if optimiser._matching_repo_format is not None:
2239
                result.append((optimiser,
2240
                               optimiser._matching_repo_format,
2241
                               optimiser._matching_repo_format
2242
                               ))
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
2243
        # if there are specific combinations we want to use, we can add them 
2244
        # here.
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
2245
        result.append((InterModel1and2, RepositoryFormat5(),
2246
                       RepositoryFormatKnit2()))
2247
        result.append((InterKnit1and2, RepositoryFormatKnit1(),
2248
                       RepositoryFormatKnit2()))
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
2249
        return result
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.
2250
2251
2252
class CopyConverter(object):
2253
    """A repository conversion tool which just performs a copy of the content.
2254
    
2255
    This is slow but quite reliable.
2256
    """
2257
2258
    def __init__(self, target_format):
2259
        """Create a CopyConverter.
2260
2261
        :param target_format: The format the resulting repository should be.
2262
        """
2263
        self.target_format = target_format
2264
        
2265
    def convert(self, repo, pb):
2266
        """Perform the conversion of to_convert, giving feedback via pb.
2267
2268
        :param to_convert: The disk object to convert.
2269
        :param pb: a progress bar to use for progress information.
2270
        """
2271
        self.pb = pb
2272
        self.count = 0
1596.2.22 by Robert Collins
Fetch changes to use new pb.
2273
        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.
2274
        # this is only useful with metadir layouts - separated repo content.
2275
        # trigger an assertion if not such
2276
        repo._format.get_format_string()
2277
        self.repo_dir = repo.bzrdir
2278
        self.step('Moving repository to repository.backup')
2279
        self.repo_dir.transport.move('repository', 'repository.backup')
2280
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2281
        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.
2282
        self.source_repo = repo._format.open(self.repo_dir,
2283
            _found=True,
2284
            _override_transport=backup_transport)
2285
        self.step('Creating new repository')
2286
        converted = self.target_format.initialize(self.repo_dir,
2287
                                                  self.source_repo.is_shared())
2288
        converted.lock_write()
2289
        try:
2290
            self.step('Copying content into repository.')
2291
            self.source_repo.copy_content_into(converted)
2292
        finally:
2293
            converted.unlock()
2294
        self.step('Deleting old repository content.')
2295
        self.repo_dir.transport.delete_tree('repository.backup')
2296
        self.pb.note('repository converted')
2297
2298
    def step(self, message):
2299
        """Update the pb by a step."""
2300
        self.count +=1
2301
        self.pb.update(message, self.count, self.total)
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2302
2303
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2304
class CommitBuilder(object):
2305
    """Provides an interface to build up a commit.
2306
2307
    This allows describing a tree to be committed without needing to 
2308
    know the internals of the format of the repository.
2309
    """
1910.2.4 by Aaron Bentley
Support old CommitBuilders
2310
    
2311
    record_root_entry = False
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2312
    def __init__(self, repository, parents, config, timestamp=None, 
2313
                 timezone=None, committer=None, revprops=None, 
2314
                 revision_id=None):
2315
        """Initiate a CommitBuilder.
2316
2317
        :param repository: Repository to commit to.
2318
        :param parents: Revision ids of the parents of the new revision.
2319
        :param config: Configuration to use.
2320
        :param timestamp: Optional timestamp recorded for commit.
2321
        :param timezone: Optional timezone for timestamp.
2322
        :param committer: Optional committer to set for commit.
2323
        :param revprops: Optional dictionary of revision properties.
2324
        :param revision_id: Optional revision id.
2325
        """
2326
        self._config = config
2327
2328
        if committer is None:
2329
            self._committer = self._config.username()
2330
        else:
2331
            assert isinstance(committer, basestring), type(committer)
2332
            self._committer = committer
2333
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2334
        self.new_inventory = Inventory(None)
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2335
        self._new_revision_id = revision_id
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2336
        self.parents = parents
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2337
        self.repository = repository
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2338
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2339
        self._revprops = {}
2340
        if revprops is not None:
2341
            self._revprops.update(revprops)
2342
2343
        if timestamp is None:
1864.2.1 by John Arbash Meinel
Commit timestamp restricted to 1ms precision.
2344
            timestamp = time.time()
2345
        # Restrict resolution to 1ms
2346
        self._timestamp = round(timestamp, 3)
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2347
2348
        if timezone is None:
2349
            self._timezone = local_time_offset()
2350
        else:
2351
            self._timezone = int(timezone)
2352
2353
        self._generate_revision_if_needed()
2354
1740.3.9 by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit().
2355
    def commit(self, message):
1740.3.8 by Jelmer Vernooij
Move make_revision() to commit builder.
2356
        """Make the actual commit.
2357
2358
        :return: The revision id of the recorded revision.
2359
        """
1996.3.4 by John Arbash Meinel
lazy_import bzrlib/repository.py
2360
        rev = _mod_revision.Revision(
2361
                       timestamp=self._timestamp,
1740.3.8 by Jelmer Vernooij
Move make_revision() to commit builder.
2362
                       timezone=self._timezone,
2363
                       committer=self._committer,
1740.3.9 by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit().
2364
                       message=message,
1740.3.8 by Jelmer Vernooij
Move make_revision() to commit builder.
2365
                       inventory_sha1=self.inv_sha1,
2366
                       revision_id=self._new_revision_id,
2367
                       properties=self._revprops)
2368
        rev.parent_ids = self.parents
2369
        self.repository.add_revision(self._new_revision_id, rev, 
2370
            self.new_inventory, self._config)
2371
        return self._new_revision_id
2372
2041.1.5 by John Arbash Meinel
CommitBuilder.get_tree => CommitBuilder.revision_tree
2373
    def revision_tree(self):
2041.1.1 by John Arbash Meinel
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree
2374
        """Return the tree that was just committed.
2375
2376
        After calling commit() this can be called to get a RevisionTree
2377
        representing the newly committed tree. This is preferred to
2378
        calling Repository.revision_tree() because that may require
2379
        deserializing the inventory, while we already have a copy in
2380
        memory.
2381
        """
2382
        return RevisionTree(self.repository, self.new_inventory,
2383
                            self._new_revision_id)
2384
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2385
    def finish_inventory(self):
1740.3.9 by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit().
2386
        """Tell the builder that the inventory is finished."""
1910.2.3 by Aaron Bentley
All tests pass
2387
        if self.new_inventory.root is None:
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
2388
            symbol_versioning.warn('Root entry should be supplied to'
2389
                ' record_entry_contents, as of bzr 0.10.',
1910.2.3 by Aaron Bentley
All tests pass
2390
                 DeprecationWarning, stacklevel=2)
2391
            self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
1757.1.2 by Robert Collins
Bugfix CommitBuilders recording of the inventory revision id.
2392
        self.new_inventory.revision_id = self._new_revision_id
1740.3.8 by Jelmer Vernooij
Move make_revision() to commit builder.
2393
        self.inv_sha1 = self.repository.add_inventory(
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2394
            self._new_revision_id,
2395
            self.new_inventory,
2396
            self.parents
2397
            )
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2398
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2399
    def _gen_revision_id(self):
2400
        """Return new revision-id."""
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
2401
        return generate_ids.gen_revision_id(self._config.username(),
2402
                                            self._timestamp)
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2403
2404
    def _generate_revision_if_needed(self):
2405
        """Create a revision id if None was supplied.
2406
        
2407
        If the repository can not support user-specified revision ids
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.
2408
        they should override this function and raise CannotSetRevisionId
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2409
        if _new_revision_id is not None.
2410
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.
2411
        :raises: CannotSetRevisionId
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2412
        """
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2413
        if self._new_revision_id is None:
2414
            self._new_revision_id = self._gen_revision_id()
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2415
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2416
    def record_entry_contents(self, ie, parent_invs, path, tree):
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2417
        """Record the content of ie from tree into the commit if needed.
2418
1910.2.3 by Aaron Bentley
All tests pass
2419
        Side effect: sets ie.revision when unchanged
2420
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2421
        :param ie: An inventory entry present in the commit.
2422
        :param parent_invs: The inventories of the parent revisions of the
2423
            commit.
2424
        :param path: The path the entry is at in the tree.
2425
        :param tree: The tree which contains this entry and should be used to 
2426
        obtain content.
2427
        """
1910.2.8 by Aaron Bentley
Fix commit_builder when root not passed to record_entry_contents
2428
        if self.new_inventory.root is None and ie.parent_id is not None:
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
2429
            symbol_versioning.warn('Root entry should be supplied to'
2430
                ' record_entry_contents, as of bzr 0.10.',
1910.2.8 by Aaron Bentley
Fix commit_builder when root not passed to record_entry_contents
2431
                 DeprecationWarning, stacklevel=2)
2432
            self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
2433
                                       '', tree)
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
2434
        self.new_inventory.add(ie)
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2435
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
2436
        # ie.revision is always None if the InventoryEntry is considered
2437
        # for committing. ie.snapshot will record the correct revision 
2438
        # which may be the sole parent if it is untouched.
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2439
        if ie.revision is not None:
2440
            return
1910.2.3 by Aaron Bentley
All tests pass
2441
2442
        # In this revision format, root entries have no knit or weave
2443
        if ie is self.new_inventory.root:
2044.1.1 by Robert Collins
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.
2444
            # When serializing out to disk and back in
2445
            # root.revision is always _new_revision_id
2446
            ie.revision = self._new_revision_id
1910.2.3 by Aaron Bentley
All tests pass
2447
            return
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2448
        previous_entries = ie.find_previous_heads(
2449
            parent_invs,
2450
            self.repository.weave_store,
2451
            self.repository.get_transaction())
1740.3.6 by Jelmer Vernooij
Move inventory writing to the commit builder.
2452
        # we are creating a new revision for ie in the history store
2453
        # and inventory.
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
2454
        ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2455
2456
    def modified_directory(self, file_id, file_parents):
2457
        """Record the presence of a symbolic link.
2458
2459
        :param file_id: The file_id of the link to record.
2460
        :param file_parents: The per-file parent revision ids.
2461
        """
2462
        self._add_text_to_weave(file_id, [], file_parents.keys())
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2463
    
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2464
    def modified_file_text(self, file_id, file_parents,
2465
                           get_content_byte_lines, text_sha1=None,
2466
                           text_size=None):
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2467
        """Record the text of file file_id
2468
2469
        :param file_id: The file_id of the file to record the text of.
2470
        :param file_parents: The per-file parent revision ids.
2471
        :param get_content_byte_lines: A callable which will return the byte
2472
            lines for the file.
2473
        :param text_sha1: Optional SHA1 of the file contents.
2474
        :param text_size: Optional size of the file contents.
2475
        """
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
2476
        # mutter('storing text of file {%s} in revision {%s} into %r',
2477
        #        file_id, self._new_revision_id, self.repository.weave_store)
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2478
        # special case to avoid diffing on renames or 
2479
        # reparenting
2480
        if (len(file_parents) == 1
2481
            and text_sha1 == file_parents.values()[0].text_sha1
2482
            and text_size == file_parents.values()[0].text_size):
2483
            previous_ie = file_parents.values()[0]
2484
            versionedfile = self.repository.weave_store.get_weave(file_id, 
2485
                self.repository.get_transaction())
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2486
            versionedfile.clone_text(self._new_revision_id, 
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2487
                previous_ie.revision, file_parents.keys())
2488
            return text_sha1, text_size
2489
        else:
2490
            new_lines = get_content_byte_lines()
2491
            # TODO: Rather than invoking sha_strings here, _add_text_to_weave
2492
            # should return the SHA1 and size
2493
            self._add_text_to_weave(file_id, new_lines, file_parents.keys())
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2494
            return osutils.sha_strings(new_lines), \
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2495
                sum(map(len, new_lines))
2496
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2497
    def modified_link(self, file_id, file_parents, link_target):
2498
        """Record the presence of a symbolic link.
2499
2500
        :param file_id: The file_id of the link to record.
2501
        :param file_parents: The per-file parent revision ids.
2502
        :param link_target: Target location of this link.
2503
        """
2504
        self._add_text_to_weave(file_id, [], file_parents.keys())
2505
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2506
    def _add_text_to_weave(self, file_id, new_lines, parents):
2507
        versionedfile = self.repository.weave_store.get_weave_or_empty(
2508
            file_id, self.repository.get_transaction())
1740.3.3 by Jelmer Vernooij
Move storing directories and links to commit builder.
2509
        versionedfile.add_lines(self._new_revision_id, parents, new_lines)
1740.3.2 by Jelmer Vernooij
Move storing file texts to commit builder.
2510
        versionedfile.clear_cache()
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
2511
2512
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
2513
class _CommitBuilder(CommitBuilder):
1910.2.4 by Aaron Bentley
Support old CommitBuilders
2514
    """Temporary class so old CommitBuilders are detected properly
2515
    
2516
    Note: CommitBuilder works whether or not root entry is recorded.
2517
    """
2518
2519
    record_root_entry = True
2520
2521
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
2522
class RootCommitBuilder(CommitBuilder):
2523
    """This commitbuilder actually records the root id"""
2524
    
2525
    record_root_entry = True
2526
2527
    def record_entry_contents(self, ie, parent_invs, path, tree):
2528
        """Record the content of ie from tree into the commit if needed.
2529
2530
        Side effect: sets ie.revision when unchanged
2531
2532
        :param ie: An inventory entry present in the commit.
2533
        :param parent_invs: The inventories of the parent revisions of the
2534
            commit.
2535
        :param path: The path the entry is at in the tree.
2536
        :param tree: The tree which contains this entry and should be used to 
2537
        obtain content.
2538
        """
2539
        assert self.new_inventory.root is not None or ie.parent_id is None
2540
        self.new_inventory.add(ie)
2541
2542
        # ie.revision is always None if the InventoryEntry is considered
2543
        # for committing. ie.snapshot will record the correct revision 
2544
        # which may be the sole parent if it is untouched.
2545
        if ie.revision is not None:
2546
            return
2547
2548
        previous_entries = ie.find_previous_heads(
2549
            parent_invs,
2550
            self.repository.weave_store,
2551
            self.repository.get_transaction())
2552
        # we are creating a new revision for ie in the history store
2553
        # and inventory.
2554
        ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
2555
2556
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2557
_unescape_map = {
2558
    'apos':"'",
2559
    'quot':'"',
2560
    'amp':'&',
2561
    'lt':'<',
2562
    'gt':'>'
2563
}
2564
2565
2566
def _unescaper(match, _map=_unescape_map):
2567
    return _map[match.group(1)]
2568
2569
2570
_unescape_re = None
2571
2572
1596.1.1 by Martin Pool
Use simple xml unescaping rather than importing xml.sax
2573
def _unescape_xml(data):
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2574
    """Unescape predefined XML entities in a string of data."""
2575
    global _unescape_re
2576
    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.
2577
        _unescape_re = re.compile('\&([^;]*);')
1843.2.4 by Aaron Bentley
Switch to John Meinel's _unescape_xml implementation
2578
    return _unescape_re.sub(_unescaper, data)
2163.2.1 by John Arbash Meinel
Speed up the fileids_altered_by_revision_ids processing
2579
2580
2581
def _unescape_xml_cached(data, cache):
2582
    try:
2583
        return cache[data]
2584
    except KeyError:
2585
        unescaped = _unescape_xml(data)
2586
        cache[data] = unescaped
2587
        return unescaped