~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 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
30
the ids we need, and then pull those ids and finally actually join
31
the inventories.
1231 by Martin Pool
- more progress on fetch on top of weaves
32
"""
33
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.
34
import bzrlib
35
import bzrlib.errors as errors
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
36
from bzrlib.errors import InstallFailed
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
37
from bzrlib.progress import ProgressPhase
2668.2.7 by Andrew Bennetts
Use bzrlib.revision.is_null rather than comparing against NULL_REVISION.
38
from bzrlib.revision import is_null, NULL_REVISION
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
39
from bzrlib.symbol_versioning import (deprecated_function,
40
        deprecated_method,
41
        )
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
42
from bzrlib.trace import mutter
43
import bzrlib.ui
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
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
45
from bzrlib.lazy_import import lazy_import
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.
46
1231 by Martin Pool
- more progress on fetch on top of weaves
47
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
48
1238 by Martin Pool
- remove a lot of dead code from fetch
49
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
50
# all yet.  I'm not sure they really should be supported.
51
1262 by Martin Pool
- fetch should also copy ancestry records
52
# NOTE: This doesn't copy revisions which may be present but not
53
# 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
54
55
# - get a list of revisions that need to be pulled in
56
# - for each one, pull in that revision file
57
#   and get the inventory, and store the inventory with right
58
#   parents.
59
# - and get the ancestry, and store that with right parents too
60
# - and keep a note of all file ids and version seen
61
# - then go through all files; for each one get the weave,
62
#   and add in all file versions
63
64
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
65
class RepoFetcher(object):
66
    """Pull revisions and texts from one repository to another.
67
68
    last_revision
69
        if set, try to limit to the data this revision references.
70
71
    after running:
1260 by Martin Pool
- some updates for fetch/update function
72
    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.
73
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
74
    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.
75
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
76
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
77
78
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
79
        find_ghosts=True):
80
        """Create a repo fetcher.
81
82
        :param find_ghosts: If True search the entire history for ghosts.
83
        """
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.
84
        # result variables.
85
        self.failed_revisions = []
86
        self.count_copied = 0
2668.2.6 by Andrew Bennetts
Merge repository-equality.
87
        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.
88
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
89
            raise errors.BzrError('RepoFetcher run '
90
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
91
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
92
        self.to_repository = to_repository
93
        self.from_repository = from_repository
94
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
95
        self._last_revision = last_revision
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
96
        self.find_ghosts = find_ghosts
1185.65.27 by Robert Collins
Tweak storage towards mergability.
97
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
98
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
99
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
100
        else:
101
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
102
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
103
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
104
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
105
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
106
            try:
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
107
                self.to_repository.start_write_group()
108
                try:
109
                    self.__fetch()
110
                except:
111
                    self.to_repository.abort_write_group()
112
                    raise
113
                else:
114
                    self.to_repository.commit_write_group()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
115
            finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
116
                if self.nested_pb is not None:
117
                    self.nested_pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
118
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
119
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
120
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
121
122
    def __fetch(self):
123
        """Primary worker function.
124
125
        This initialises all the needed variables, and then fetches the 
126
        requested revisions, finally clearing the progress bar.
127
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
128
        self.to_weaves = self.to_repository.weave_store
129
        self.from_weaves = self.from_repository.weave_store
1240 by Martin Pool
- clean up fetch code and add progress bar
130
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
131
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
132
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
133
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
134
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
135
            search = self._revids_to_fetch()
136
            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.
137
                return
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
138
            if getattr(self, '_fetch_everything_for_search', None) is not None:
139
                self._fetch_everything_for_search(search, pp)
140
            else:
141
                # backward compatibility
142
                self._fetch_everything_for_revisions(search.get_keys, pp)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
143
        finally:
144
            self.pb.clear()
145
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
146
    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.
147
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
148
        # 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.
149
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
150
        # that phase is progressing than we do.  Progress updates for the other
151
        # phases are taken care of in this function.
152
        # 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.
153
        # item_keys_introduced_by should have a richer API than it does at the
154
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
155
        # function?
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
156
        phase = 'file'
157
        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.
158
        try:
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
159
            revs = search.get_keys()
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
160
            data_to_fetch = self.from_repository.item_keys_introduced_by(revs, pb)
2668.2.5 by Andrew Bennetts
Rename get_data_about_revision_ids to get_data_to_fetch_for_revision_ids.
161
            for knit_kind, file_id, revisions in data_to_fetch:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
162
                if knit_kind != phase:
163
                    phase = knit_kind
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
164
                    # Make a new progress bar for this phase
165
                    pb.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
                    pp.next_phase()
167
                    pb = bzrlib.ui.ui_factory.nested_progress_bar()
168
                if knit_kind == "file":
169
                    self._fetch_weave_text(file_id, revisions)
170
                elif knit_kind == "inventory":
3316.2.6 by Robert Collins
* ``VersionedFileStore`` no longer uses the transaction parameter given
171
                    # Before we process the inventory we generate the root
172
                    # texts (if necessary) so that the inventories references
173
                    # will be valid.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
174
                    self._generate_root_texts(revs)
3316.2.6 by Robert Collins
* ``VersionedFileStore`` no longer uses the transaction parameter given
175
                    # NB: This currently reopens the inventory weave in source;
176
                    # using a full get_data_stream instead would avoid this.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
177
                    self._fetch_inventory_weave(revs, pb)
2535.3.25 by Andrew Bennetts
Fetch signatures too.
178
                elif knit_kind == "signatures":
179
                    # Nothing to do here; this will be taken care of when
180
                    # _fetch_revision_texts happens.
181
                    pass
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
182
                elif knit_kind == "revisions":
183
                    self._fetch_revision_texts(revs, pb)
184
                else:
185
                    raise AssertionError("Unknown knit kind %r" % knit_kind)
186
        finally:
187
            if pb is not None:
188
                pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
189
        self.count_copied += len(revs)
190
        
1185.65.30 by Robert Collins
Merge integration.
191
    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.
192
        """Determines the exact revisions needed from self.from_repository to
193
        install self._last_revision in self.to_repository.
194
195
        If no revisions need to be fetched, then this just returns None.
196
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
197
        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.
198
        if self._last_revision is NULL_REVISION:
199
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
200
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
201
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
202
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
203
            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
204
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
205
            return self.to_repository.search_missing_revision_ids(
206
                self.from_repository, self._last_revision,
207
                find_ghosts=self.find_ghosts)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
208
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
209
            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
210
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
211
    def _fetch_weave_text(self, file_id, required_versions):
212
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
213
            self.to_repository.get_transaction())
214
        from_weave = self.from_weaves.get_weave(file_id,
215
            self.from_repository.get_transaction())
216
        # we fetch all the texts, because texts do
217
        # not reference anything, and its cheap enough
218
        to_weave.join(from_weave, version_ids=required_versions)
219
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
220
    def _fetch_inventory_weave(self, revs, pb):
221
        pb.update("fetch inventory", 0, 2)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
222
        to_weave = self.to_repository.get_inventory_weave()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
223
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
224
        try:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
225
            # just merge, this is optimisable and its means we don't
226
            # copy unreferenced data such as not-needed inventories.
227
            pb.update("fetch inventory", 1, 3)
228
            from_weave = self.from_repository.get_inventory_weave()
229
            pb.update("fetch inventory", 2, 3)
230
            # we fetch only the referenced inventories because we do not
231
            # know for unselected inventories whether all their required
232
            # texts are present in the other repository - it could be
233
            # corrupt.
234
            to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
235
                          version_ids=revs)
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
236
        finally:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
237
            child_pb.finished()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
238
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
239
    def _generate_root_texts(self, revs):
240
        """This will be called by __fetch between fetching weave texts and
241
        fetching the inventory weave.
242
243
        Subclasses should override this if they need to generate root texts
244
        after fetching weave texts.
245
        """
246
        pass
2743.1.2 by Robert Collins
This cleans up a few things in fetch.py that are bit-rotten:
247
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
248
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
249
class GenericRepoFetcher(RepoFetcher):
250
    """This is a generic repo to repo fetcher.
251
252
    This makes minimal assumptions about repo layout and contents.
253
    It triggers a reconciliation after fetching to ensure integrity.
254
    """
255
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
    def _fetch_revision_texts(self, revs, pb):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
257
        """Fetch revision object texts"""
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
258
        to_txn = self.to_transaction = self.to_repository.get_transaction()
259
        count = 0
260
        total = len(revs)
261
        to_store = self.to_repository._revision_store
262
        for rev in revs:
263
            pb.update('copying revisions', count, total)
264
            try:
265
                sig_text = self.from_repository.get_signature_text(rev)
266
                to_store.add_revision_signature_text(rev, sig_text, to_txn)
267
            except errors.NoSuchRevision:
268
                # not signed.
269
                pass
270
            to_store.add_revision(self.from_repository.get_revision(rev),
271
                                  to_txn)
272
            count += 1
273
        # fixup inventory if needed: 
274
        # this is expensive because we have no inverse index to current ghosts.
275
        # but on local disk its a few seconds and sftp push is already insane.
276
        # so we just-do-it.
277
        # FIXME: repository should inform if this is needed.
278
        self.to_repository.reconcile()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
279
    
280
281
class KnitRepoFetcher(RepoFetcher):
282
    """This is a knit format repository specific fetcher.
283
284
    This differs from the GenericRepoFetcher by not doing a 
285
    reconciliation after copying, and using knit joining to
286
    copy revision texts.
287
    """
288
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
289
    def _fetch_revision_texts(self, revs, pb):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
290
        # may need to be a InterRevisionStore call here.
291
        from_transaction = self.from_repository.get_transaction()
292
        to_transaction = self.to_repository.get_transaction()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
293
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
294
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
295
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
296
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
297
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
298
        to_rf = self.to_repository._revision_store.get_revision_file(
299
            to_transaction)
300
        from_rf = self.from_repository._revision_store.get_revision_file(
301
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
302
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
303
304
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
305
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
306
    """Helper for operations that convert data from model 1 and 2
307
    
308
    This is for use by fetchers and converters.
309
    """
310
311
    def __init__(self, source, target):
312
        """Constructor.
313
314
        :param source: The repository data comes from
315
        :param target: The repository data goes to
316
        """
317
        self.source = source
318
        self.target = target
319
320
    def iter_rev_trees(self, revs):
321
        """Iterate through RevisionTrees efficiently.
322
323
        Additionally, the inventory's revision_id is set if unset.
324
325
        Trees are retrieved in batches of 100, and then yielded in the order
326
        they were requested.
327
328
        :param revs: A list of revision ids
329
        """
3172.4.4 by Robert Collins
Review feedback.
330
        # In case that revs is not a list.
331
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
332
        while revs:
333
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
334
                if tree.inventory.revision_id is None:
335
                    tree.inventory.revision_id = tree.get_revision_id()
336
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
337
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
338
1910.2.48 by Aaron Bentley
Update from review comments
339
    def generate_root_texts(self, revs):
340
        """Generate VersionedFiles for all root ids.
341
        
342
        :param revs: the revisions to include
343
        """
344
        inventory_weave = self.source.get_inventory_weave()
345
        parent_texts = {}
346
        versionedfile = {}
347
        to_store = self.target.weave_store
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
348
        parent_map = self.source.get_graph().get_parent_map(revs)
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()
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
352
            parents = parent_map[revision_id]
353
            if parents[0] == NULL_REVISION:
354
                parents = ()
1910.2.48 by Aaron Bentley
Update from review comments
355
            if root_id not in versionedfile:
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
356
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id,
1910.2.48 by Aaron Bentley
Update from review comments
357
                    self.target.get_transaction())
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
358
            _, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
1910.2.48 by Aaron Bentley
Update from review comments
359
                revision_id, parents, [], parent_texts)
360
361
    def regenerate_inventory(self, revs):
362
        """Generate a new inventory versionedfile in target, convertin data.
363
        
364
        The inventory is retrieved from the source, (deserializing it), and
365
        stored in the target (reserializing it in a different format).
366
        :param revs: The revisions to include
367
        """
368
        for tree in self.iter_rev_trees(revs):
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.
369
            parents = tree.get_parent_ids()
1910.2.48 by Aaron Bentley
Update from review comments
370
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
371
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
372
373
374
class Model1toKnit2Fetcher(GenericRepoFetcher):
375
    """Fetch from a Model1 repository into a Knit2 repository
376
    """
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.
377
    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
378
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
379
        self.helper = Inter1and2Helper(from_repository, to_repository)
380
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
381
            last_revision, pb, find_ghosts)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
382
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
383
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
384
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
385
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
386
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
387
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
388
 
389
390
class Knit1to2Fetcher(KnitRepoFetcher):
391
    """Fetch from a Knit1 repository into a Knit2 repository"""
392
1910.2.48 by Aaron Bentley
Update from review comments
393
    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
394
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
395
        self.helper = Inter1and2Helper(from_repository, to_repository)
396
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
397
            last_revision, pb, find_ghosts)
1910.2.48 by Aaron Bentley
Update from review comments
398
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
399
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
400
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
401
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
402
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
403
        self.helper.regenerate_inventory(revs)
2535.3.62 by Andrew Bennetts
Cosmetic changes.
404
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
405
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
406
class RemoteToOtherFetcher(GenericRepoFetcher):
2535.3.62 by Andrew Bennetts
Cosmetic changes.
407
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
408
    def _fetch_everything_for_search(self, search, pp):
409
        data_stream = self.from_repository.get_data_stream_for_search(search)
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
410
        self.to_repository.insert_data_stream(data_stream)
411
412