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