~bzr-pqm/bzr/bzr.dev

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