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