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