~bzr-pqm/bzr/bzr.dev

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
            self.to_repository.lock_write()
108
            try:
109
                self.to_repository.start_write_group()
110
                try:
111
                    self.__fetch()
112
                except:
113
                    self.to_repository.abort_write_group(suppress_errors=True)
114
                    raise
115
                else:
116
                    self.to_repository.commit_write_group()
117
            finally:
118
                try:
119
                    if self.nested_pb is not None:
120
                        self.nested_pb.finished()
121
                finally:
122
                    self.to_repository.unlock()
123
        finally:
124
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
125
126
    def __fetch(self):
127
        """Primary worker function.
128
129
        This initialises all the needed variables, and then fetches the 
130
        requested revisions, finally clearing the progress bar.
131
        """
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)
132
        # Roughly this is what we're aiming for fetch to become:
133
        #
134
        # missing = self.sink.insert_stream(self.source.get_stream(search))
135
        # if missing:
136
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
137
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
138
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
139
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
140
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
141
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
142
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
143
            search = self._revids_to_fetch()
144
            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.
145
                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)
146
            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.
147
        finally:
148
            self.pb.clear()
149
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
150
    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.
151
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
152
        # 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.
153
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
154
        # that phase is progressing than we do.  Progress updates for the other
155
        # phases are taken care of in this function.
156
        # 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.
157
        # item_keys_introduced_by should have a richer API than it does at the
158
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
159
        # function?
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
160
        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.
161
        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)
162
            from_format = self.from_repository._format
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
163
            stream = self.get_stream(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)
164
            self.sink.insert_stream(stream, from_format)
165
            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.
166
        finally:
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
167
            if self.pb is not None:
168
                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)
169
        
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
170
    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)
171
        phase = 'file'
172
        revs = search.get_keys()
173
        graph = self.from_repository.get_graph()
174
        revs = list(graph.iter_topo_order(revs))
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
175
        data_to_fetch = self.from_repository.item_keys_introduced_by(
176
            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)
177
        text_keys = []
178
        for knit_kind, file_id, revisions in data_to_fetch:
179
            if knit_kind != phase:
180
                phase = knit_kind
181
                # Make a new progress bar for this phase
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
182
                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)
183
                pp.next_phase()
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
184
                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)
185
            if knit_kind == "file":
186
                # Accumulate file texts
187
                text_keys.extend([(file_id, revision) for revision in
188
                    revisions])
189
            elif knit_kind == "inventory":
190
                # Now copy the file texts.
191
                to_texts = self.to_repository.texts
192
                from_texts = self.from_repository.texts
193
                yield ('texts', from_texts.get_record_stream(
194
                    text_keys, self.to_repository._fetch_order,
195
                    not self.to_repository._fetch_uses_deltas))
196
                # Cause an error if a text occurs after we have done the
197
                # copy.
198
                text_keys = None
199
                # Before we process the inventory we generate the root
200
                # texts (if necessary) so that the inventories references
201
                # will be valid.
202
                for _ in self._generate_root_texts(revs):
203
                    yield _
204
                # NB: This currently reopens the inventory weave in source;
205
                # using a single stream interface instead would avoid this.
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
206
                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)
207
                from_weave = self.from_repository.inventories
208
                # we fetch only the referenced inventories because we do not
209
                # know for unselected inventories whether all their required
210
                # texts are present in the other repository - it could be
211
                # corrupt.
212
                yield ('inventories', from_weave.get_record_stream(
213
                    [(rev_id,) for rev_id in revs],
214
                    self.inventory_fetch_order(),
215
                    not self.delta_on_metadata()))
216
            elif knit_kind == "signatures":
217
                # Nothing to do here; this will be taken care of when
218
                # _fetch_revision_texts happens.
219
                pass
220
            elif knit_kind == "revisions":
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
221
                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)
222
                    yield _
223
            else:
224
                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.
225
        self.count_copied += len(revs)
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)
226
1185.65.30 by Robert Collins
Merge integration.
227
    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.
228
        """Determines the exact revisions needed from self.from_repository to
229
        install self._last_revision in self.to_repository.
230
231
        If no revisions need to be fetched, then this just returns None.
232
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
233
        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.
234
        if self._last_revision is NULL_REVISION:
235
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
236
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
237
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
238
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
239
            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
240
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
241
            return self.to_repository.search_missing_revision_ids(
242
                self.from_repository, self._last_revision,
243
                find_ghosts=self.find_ghosts)
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
244
        except errors.NoSuchRevision, e:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
245
            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
246
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
247
    def _fetch_revision_texts(self, revs, pb):
3830.3.6 by Martin Pool
Document _fetch_uses_delta and make it a class attribute
248
        # fetch signatures first and then the revision texts
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
249
        # 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.
250
        from_sf = self.from_repository.signatures
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
251
        # 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)
252
        keys = [(rev_id,) for rev_id in revs]
253
        signatures = filter_absent(from_sf.get_record_stream(
254
            keys,
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
255
            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)
256
            not self.to_repository._fetch_uses_deltas))
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
257
        # If a revision has a delta, this is actually expanded inside the
258
        # insert_record_stream code now, which is an alternate fix for
259
        # 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)
260
        from_rf = self.from_repository.revisions
261
        revisions = from_rf.get_record_stream(
262
            keys,
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
263
            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)
264
            not self.delta_on_metadata())
265
        return [('signatures', signatures), ('revisions', revisions)]
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
266
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
267
    def _generate_root_texts(self, revs):
268
        """This will be called by __fetch between fetching weave texts and
269
        fetching the inventory weave.
270
271
        Subclasses should override this if they need to generate root texts
272
        after fetching weave texts.
273
        """
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)
274
        return []
275
276
    def inventory_fetch_order(self):
277
        return self.to_repository._fetch_order
278
279
    def delta_on_metadata(self):
280
        src_serializer = self.from_repository._format._serializer
281
        target_serializer = self.to_repository._format._serializer
282
        return (self.to_repository._fetch_uses_deltas and
283
            src_serializer == target_serializer)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
284
285
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
286
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
287
    """Helper for operations that convert data from model 1 and 2
288
    
289
    This is for use by fetchers and converters.
290
    """
291
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
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
293
        """Constructor.
294
295
        :param source: The repository data comes from
296
        """
297
        self.source = source
298
299
    def iter_rev_trees(self, revs):
300
        """Iterate through RevisionTrees efficiently.
301
302
        Additionally, the inventory's revision_id is set if unset.
303
304
        Trees are retrieved in batches of 100, and then yielded in the order
305
        they were requested.
306
307
        :param revs: A list of revision ids
308
        """
3172.4.4 by Robert Collins
Review feedback.
309
        # In case that revs is not a list.
310
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
311
        while revs:
312
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
313
                if tree.inventory.revision_id is None:
314
                    tree.inventory.revision_id = tree.get_revision_id()
315
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
316
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
317
3380.2.4 by Aaron Bentley
Updates from review
318
    def _find_root_ids(self, revs, parent_map, graph):
319
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
320
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
321
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
322
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
323
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
324
            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
325
            revision_root[revision_id] = root_id
326
        # Find out which parents we don't already know root ids for
327
        parents = set()
328
        for revision_parents in parent_map.itervalues():
329
            parents.update(revision_parents)
330
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
331
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
332
        parents = graph.get_parent_map(parents).keys()
333
        for tree in self.iter_rev_trees(parents):
334
            root_id = tree.get_root_id()
335
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
336
        return revision_root, planned_versions
337
338
    def generate_root_texts(self, revs):
339
        """Generate VersionedFiles for all root ids.
340
341
        :param revs: the revisions to include
342
        """
343
        graph = self.source.get_graph()
344
        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.
345
        rev_order = topo_sort(parent_map)
346
        rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
3380.2.4 by Aaron Bentley
Updates from review
347
            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.
348
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
349
            rev_order]
350
        # Guaranteed stable, this groups all the file id operations together
351
        # retaining topological order within the revisions of a file id.
352
        # File id splits and joins would invalidate this, but they don't exist
353
        # yet, and are unlikely to in non-rich-root environments anyway.
354
        root_id_order.sort(key=operator.itemgetter(0))
355
        # Create a record stream containing the roots to create.
356
        def yield_roots():
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
357
            for key in root_id_order:
358
                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.
359
                rev_parents = parent_map[rev_id]
3380.2.4 by Aaron Bentley
Updates from review
360
                # 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.
361
                # that represents a rename of the root to a different location
362
                # - its not actually a parent for us. (We could look for that
363
                # file id in the revision tree at considerably more expense,
364
                # but for now this is sufficient (and reconcile will catch and
365
                # correct this anyway).
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
366
                # 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.
367
                # was unchanged (rather than trimming it from the parent list).
368
                parent_keys = tuple((root_id, parent) for parent in rev_parents
369
                    if parent != NULL_REVISION and
370
                        rev_id_to_root_id.get(parent, root_id) == root_id)
371
                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)
372
        return [('texts', yield_roots())]
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
373
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
374
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
375
class Model1toKnit2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
376
    """Fetch from a Model1 repository into a Knit2 repository
377
    """
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.
378
    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
379
                 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)
380
        self.helper = Inter1and2Helper(from_repository)
381
        RepoFetcher.__init__(self, to_repository, from_repository,
382
            last_revision, pb, find_ghosts)
383
384
    def _generate_root_texts(self, revs):
385
        return self.helper.generate_root_texts(revs)
386
387
    def inventory_fetch_order(self):
388
        return 'topological'
389
390
Knit1to2Fetcher = Model1toKnit2Fetcher