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