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