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