/brz/remove-bazaar

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