/brz/remove-bazaar

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