/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3350.6.12 by Martin Pool
merge trunk; remove RemoteToOtherFetcher
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
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
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
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
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
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
1218 by Martin Pool
- fix up import
16
1231 by Martin Pool
- more progress on fetch on top of weaves
17
18
"""Copying of history from one branch to another.
19
20
The basic plan is that every branch knows the history of everything
21
that has merged into it.  As the first step of a merge, pull, or
22
branch operation we copy history from the source into the destination
23
branch.
24
25
The copying is done in a slightly complicated order.  We don't want to
26
add a revision to the store until everything it refers to is also
27
stored, so that if a revision is present we can totally recreate it.
28
However, we can't know what files are included in a revision until we
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
29
read its inventory.  So we query the inventory store of the source for
3316.2.14 by Robert Collins
Spelling in NEWS.
30
the ids we need, and then pull those ids and then return to the inventories.
1231 by Martin Pool
- more progress on fetch on top of weaves
31
"""
32
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
33
import operator
34
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.
35
import bzrlib
36
import bzrlib.errors as errors
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
37
from bzrlib.errors import InstallFailed
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
38
from bzrlib.progress import ProgressPhase
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
39
from bzrlib.revision import NULL_REVISION
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
40
from bzrlib.tsort import topo_sort
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
41
from bzrlib.trace import mutter
42
import bzrlib.ui
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
43
from bzrlib.versionedfile import filter_absent, FulltextContentFactory
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.
44
1231 by Martin Pool
- more progress on fetch on top of weaves
45
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
46
1238 by Martin Pool
- remove a lot of dead code from fetch
47
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
48
# all yet.  I'm not sure they really should be supported.
49
1262 by Martin Pool
- fetch should also copy ancestry records
50
# NOTE: This doesn't copy revisions which may be present but not
51
# merged into the last revision.  I'm not sure we want to do that.
1238 by Martin Pool
- remove a lot of dead code from fetch
52
53
# - get a list of revisions that need to be pulled in
54
# - for each one, pull in that revision file
55
#   and get the inventory, and store the inventory with right
56
#   parents.
57
# - and get the ancestry, and store that with right parents too
58
# - and keep a note of all file ids and version seen
59
# - then go through all files; for each one get the weave,
60
#   and add in all file versions
61
62
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
63
class RepoFetcher(object):
64
    """Pull revisions and texts from one repository to another.
65
66
    last_revision
67
        if set, try to limit to the data this revision references.
68
69
    after running:
1260 by Martin Pool
- some updates for fetch/update function
70
    count_copied -- number of revisions copied
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.
71
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
72
    This should not be used directly, it's essential a object to encapsulate
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.
73
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
74
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
75
76
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
3871.3.1 by Martin Pool
Don't set a pack write cache size from RepoFetcher, because the cache is not coherent with reads and causes ShortReadvErrors
77
        find_ghosts=True):
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
78
        """Create a repo fetcher.
79
80
        :param find_ghosts: If True search the entire history for ghosts.
3834.4.5 by Andrew Bennetts
Add some comments to fetch.py
81
        :param _write_group_acquired_callable: Don't use; this parameter only
82
            exists to facilitate a hack done in InterPackRepo.fetch.  We would
83
            like to remove this parameter.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
84
        """
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.
85
        # result variables.
86
        self.failed_revisions = []
87
        self.count_copied = 0
2668.2.6 by Andrew Bennetts
Merge repository-equality.
88
        if to_repository.has_same_location(from_repository):
2592.3.115 by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit.
89
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
90
            raise errors.BzrError('RepoFetcher run '
91
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
92
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
93
        self.to_repository = to_repository
94
        self.from_repository = from_repository
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
95
        self.sink = to_repository._get_sink()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
96
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
97
        self._last_revision = last_revision
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
98
        self.find_ghosts = find_ghosts
1185.65.27 by Robert Collins
Tweak storage towards mergability.
99
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
100
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
101
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
102
        else:
103
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
104
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
105
        self.from_repository.lock_read()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
106
        try:
107
            try:
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
108
                self.__fetch()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
109
            finally:
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
110
                if self.nested_pb is not None:
111
                    self.nested_pb.finished()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
112
        finally:
113
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
114
115
    def __fetch(self):
116
        """Primary worker function.
117
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
118
        This initialises all the needed variables, and then fetches the
1185.65.27 by Robert Collins
Tweak storage towards mergability.
119
        requested revisions, finally clearing the progress bar.
120
        """
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
121
        # Roughly this is what we're aiming for fetch to become:
122
        #
123
        # missing = self.sink.insert_stream(self.source.get_stream(search))
124
        # if missing:
125
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
126
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
127
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
128
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
129
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
130
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
131
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
132
            search = self._revids_to_fetch()
133
            if search is None:
2535.3.46 by Andrew Bennetts
Fix a bug when "fetching" from a RemoteRepository when the target already has the last revision.
134
                return
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
135
            self._fetch_everything_for_search(search, pp)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
136
        finally:
137
            self.pb.clear()
138
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
139
    def _fetch_everything_for_search(self, search, pp):
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
140
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
141
        # The first phase is "file".  We pass the progress bar for it directly
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
142
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
143
        # that phase is progressing than we do.  Progress updates for the other
144
        # phases are taken care of in this function.
145
        # XXX: there should be a clear owner of the progress reporting.  Perhaps
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
146
        # item_keys_introduced_by should have a richer API than it does at the
147
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
148
        # function?
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
149
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
150
        try:
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
151
            from_format = self.from_repository._format
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
152
            stream = self.get_stream(search, pp)
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
153
            resume_tokens, missing_keys = self.sink.insert_stream(
154
                stream, from_format, [])
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
155
            if missing_keys:
156
                stream = self.get_stream_for_missing_keys(missing_keys)
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
157
                resume_tokens, missing_keys = self.sink.insert_stream(
158
                    stream, from_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
159
            if missing_keys:
160
                raise AssertionError(
161
                    "second push failed to complete a fetch %r." % (
162
                        missing_keys,))
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
163
            if resume_tokens:
164
                raise AssertionError(
165
                    "second push failed to commit the fetch %r." % (
166
                        resume_tokens,))
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
167
            self.sink.finished()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
168
        finally:
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
169
            if self.pb is not None:
170
                self.pb.finished()
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
171
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
172
    def get_stream(self, search, pp):
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
173
        phase = 'file'
174
        revs = search.get_keys()
4053.2.1 by Andrew Bennetts
Quick fix for 'null: not in present in ...' bug when pushing via HPSS.
175
        revs = revs.difference([NULL_REVISION])
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
176
        graph = self.from_repository.get_graph()
177
        revs = list(graph.iter_topo_order(revs))
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
178
        data_to_fetch = self.from_repository.item_keys_introduced_by(
179
            revs, self.pb)
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
180
        text_keys = []
181
        for knit_kind, file_id, revisions in data_to_fetch:
182
            if knit_kind != phase:
183
                phase = knit_kind
184
                # Make a new progress bar for this phase
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
185
                self.pb.finished()
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
186
                pp.next_phase()
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
187
                self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
188
            if knit_kind == "file":
189
                # Accumulate file texts
190
                text_keys.extend([(file_id, revision) for revision in
191
                    revisions])
192
            elif knit_kind == "inventory":
193
                # Now copy the file texts.
194
                from_texts = self.from_repository.texts
195
                yield ('texts', from_texts.get_record_stream(
196
                    text_keys, self.to_repository._fetch_order,
197
                    not self.to_repository._fetch_uses_deltas))
198
                # Cause an error if a text occurs after we have done the
199
                # copy.
200
                text_keys = None
201
                # Before we process the inventory we generate the root
202
                # texts (if necessary) so that the inventories references
203
                # will be valid.
204
                for _ in self._generate_root_texts(revs):
205
                    yield _
206
                # NB: This currently reopens the inventory weave in source;
207
                # using a single stream interface instead would avoid this.
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
208
                self.pb.update("fetch inventory", 0, 1)
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
209
                from_weave = self.from_repository.inventories
210
                # we fetch only the referenced inventories because we do not
211
                # know for unselected inventories whether all their required
212
                # texts are present in the other repository - it could be
213
                # corrupt.
214
                yield ('inventories', from_weave.get_record_stream(
215
                    [(rev_id,) for rev_id in revs],
216
                    self.inventory_fetch_order(),
217
                    not self.delta_on_metadata()))
218
            elif knit_kind == "signatures":
219
                # Nothing to do here; this will be taken care of when
220
                # _fetch_revision_texts happens.
221
                pass
222
            elif knit_kind == "revisions":
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
223
                for _ in self._fetch_revision_texts(revs, self.pb):
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
224
                    yield _
225
            else:
226
                raise AssertionError("Unknown knit kind %r" % knit_kind)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
227
        self.count_copied += len(revs)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
228
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
229
    def get_stream_for_missing_keys(self, missing_keys):
230
        # missing keys can only occur when we are byte copying and not
231
        # translating (because translation means we don't send
232
        # unreconstructable deltas ever).
233
        keys = {}
234
        keys['texts'] = set()
235
        keys['revisions'] = set()
236
        keys['inventories'] = set()
237
        keys['signatures'] = set()
238
        for key in missing_keys:
239
            keys[key[0]].add(key[1:])
240
        if len(keys['revisions']):
241
            # If we allowed copying revisions at this point, we could end up
242
            # copying a revision without copying its required texts: a
243
            # violation of the requirements for repository integrity.
244
            raise AssertionError(
245
                'cannot copy revisions to fill in missing deltas %s' % (
246
                    keys['revisions'],))
247
        for substream_kind, keys in keys.iteritems():
248
            vf = getattr(self.from_repository, substream_kind)
249
            # Ask for full texts always so that we don't need more round trips
250
            # after this stream.
251
            stream = vf.get_record_stream(keys,
252
                self.to_repository._fetch_order, True)
253
            yield substream_kind, stream
254
1185.65.30 by Robert Collins
Merge integration.
255
    def _revids_to_fetch(self):
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
256
        """Determines the exact revisions needed from self.from_repository to
257
        install self._last_revision in self.to_repository.
258
259
        If no revisions need to be fetched, then this just returns None.
260
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
261
        mutter('fetch up to rev {%s}', self._last_revision)
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.
262
        if self._last_revision is NULL_REVISION:
263
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
264
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
265
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
266
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
267
            return None
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
268
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
269
            return self.to_repository.search_missing_revision_ids(
270
                self.from_repository, self._last_revision,
271
                find_ghosts=self.find_ghosts)
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
272
        except errors.NoSuchRevision, e:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
273
            raise InstallFailed([self._last_revision])
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
274
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
275
    def _fetch_revision_texts(self, revs, pb):
3830.3.6 by Martin Pool
Document _fetch_uses_delta and make it a class attribute
276
        # fetch signatures first and then the revision texts
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
277
        # may need to be a InterRevisionStore call here.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
278
        from_sf = self.from_repository.signatures
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
279
        # A missing signature is just skipped.
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
280
        keys = [(rev_id,) for rev_id in revs]
281
        signatures = filter_absent(from_sf.get_record_stream(
282
            keys,
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
283
            self.to_repository._fetch_order,
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
284
            not self.to_repository._fetch_uses_deltas))
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
285
        # If a revision has a delta, this is actually expanded inside the
286
        # insert_record_stream code now, which is an alternate fix for
287
        # bug #261339
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
288
        from_rf = self.from_repository.revisions
289
        revisions = from_rf.get_record_stream(
290
            keys,
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
291
            self.to_repository._fetch_order,
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
292
            not self.delta_on_metadata())
293
        return [('signatures', signatures), ('revisions', revisions)]
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
294
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
295
    def _generate_root_texts(self, revs):
296
        """This will be called by __fetch between fetching weave texts and
297
        fetching the inventory weave.
298
299
        Subclasses should override this if they need to generate root texts
300
        after fetching weave texts.
301
        """
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
302
        return []
303
304
    def inventory_fetch_order(self):
305
        return self.to_repository._fetch_order
306
307
    def delta_on_metadata(self):
308
        src_serializer = self.from_repository._format._serializer
309
        target_serializer = self.to_repository._format._serializer
310
        return (self.to_repository._fetch_uses_deltas and
311
            src_serializer == target_serializer)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
312
313
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
314
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
315
    """Helper for operations that convert data from model 1 and 2
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
316
1910.2.48 by Aaron Bentley
Update from review comments
317
    This is for use by fetchers and converters.
318
    """
319
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
320
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
321
        """Constructor.
322
323
        :param source: The repository data comes from
324
        """
325
        self.source = source
326
327
    def iter_rev_trees(self, revs):
328
        """Iterate through RevisionTrees efficiently.
329
330
        Additionally, the inventory's revision_id is set if unset.
331
332
        Trees are retrieved in batches of 100, and then yielded in the order
333
        they were requested.
334
335
        :param revs: A list of revision ids
336
        """
3172.4.4 by Robert Collins
Review feedback.
337
        # In case that revs is not a list.
338
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
339
        while revs:
340
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
341
                if tree.inventory.revision_id is None:
342
                    tree.inventory.revision_id = tree.get_revision_id()
343
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
344
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
345
3380.2.4 by Aaron Bentley
Updates from review
346
    def _find_root_ids(self, revs, parent_map, graph):
347
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
348
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
349
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
350
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
351
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
352
            planned_versions.setdefault(root_id, []).append(revision_id)
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
353
            revision_root[revision_id] = root_id
354
        # Find out which parents we don't already know root ids for
355
        parents = set()
356
        for revision_parents in parent_map.itervalues():
357
            parents.update(revision_parents)
358
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
359
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
360
        parents = graph.get_parent_map(parents).keys()
361
        for tree in self.iter_rev_trees(parents):
362
            root_id = tree.get_root_id()
363
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
364
        return revision_root, planned_versions
365
366
    def generate_root_texts(self, revs):
367
        """Generate VersionedFiles for all root ids.
368
369
        :param revs: the revisions to include
370
        """
371
        graph = self.source.get_graph()
372
        parent_map = graph.get_parent_map(revs)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
373
        rev_order = topo_sort(parent_map)
374
        rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
3380.2.4 by Aaron Bentley
Updates from review
375
            revs, parent_map, graph)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
376
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
377
            rev_order]
378
        # Guaranteed stable, this groups all the file id operations together
379
        # retaining topological order within the revisions of a file id.
380
        # File id splits and joins would invalidate this, but they don't exist
381
        # yet, and are unlikely to in non-rich-root environments anyway.
382
        root_id_order.sort(key=operator.itemgetter(0))
383
        # Create a record stream containing the roots to create.
384
        def yield_roots():
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
385
            for key in root_id_order:
386
                root_id, rev_id = key
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
387
                rev_parents = parent_map[rev_id]
3380.2.4 by Aaron Bentley
Updates from review
388
                # We drop revision parents with different file-ids, because
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
389
                # that represents a rename of the root to a different location
390
                # - its not actually a parent for us. (We could look for that
391
                # file id in the revision tree at considerably more expense,
392
                # but for now this is sufficient (and reconcile will catch and
393
                # correct this anyway).
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
394
                # When a parent revision is a ghost, we guess that its root id
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
395
                # was unchanged (rather than trimming it from the parent list).
396
                parent_keys = tuple((root_id, parent) for parent in rev_parents
397
                    if parent != NULL_REVISION and
398
                        rev_id_to_root_id.get(parent, root_id) == root_id)
399
                yield FulltextContentFactory(key, parent_keys, None, '')
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
400
        return [('texts', yield_roots())]
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
401
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
402
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
403
class Model1toKnit2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
404
    """Fetch from a Model1 repository into a Knit2 repository
405
    """
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
406
    def __init__(self, to_repository, from_repository, last_revision=None,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
407
                 pb=None, find_ghosts=True):
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
408
        self.helper = Inter1and2Helper(from_repository)
409
        RepoFetcher.__init__(self, to_repository, from_repository,
410
            last_revision, pb, find_ghosts)
411
412
    def _generate_root_texts(self, revs):
413
        return self.helper.generate_root_texts(revs)
414
415
    def inventory_fetch_order(self):
416
        return 'topological'
417
418
Knit1to2Fetcher = Model1toKnit2Fetcher