/brz/remove-bazaar

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