/brz/remove-bazaar

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