/brz/remove-bazaar

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