~bzr-pqm/bzr/bzr.dev

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