~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
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
36
from bzrlib.errors import (InstallFailed,
37
                           )
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
    """
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.
78
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
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.
79
        # result variables.
80
        self.failed_revisions = []
81
        self.count_copied = 0
2668.2.6 by Andrew Bennetts
Merge repository-equality.
82
        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.
83
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
84
            raise errors.BzrError('RepoFetcher run '
85
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
86
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
87
        self.to_repository = to_repository
88
        self.from_repository = from_repository
89
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
90
        self._last_revision = last_revision
91
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
92
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
93
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
94
        else:
95
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
96
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
97
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
98
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
99
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
100
            try:
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
101
                self.to_repository.start_write_group()
102
                try:
103
                    self.__fetch()
104
                except:
105
                    self.to_repository.abort_write_group()
106
                    raise
107
                else:
108
                    self.to_repository.commit_write_group()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
109
            finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
110
                if self.nested_pb is not None:
111
                    self.nested_pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
112
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
113
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
114
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
115
116
    def __fetch(self):
117
        """Primary worker function.
118
119
        This initialises all the needed variables, and then fetches the 
120
        requested revisions, finally clearing the progress bar.
121
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
122
        self.to_weaves = self.to_repository.weave_store
123
        self.from_weaves = self.from_repository.weave_store
1240 by Martin Pool
- clean up fetch code and add progress bar
124
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
125
        self.file_ids_names = {}
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
126
        pp = ProgressPhase('Fetch phase', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
127
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
128
            pp.next_phase()
1185.65.30 by Robert Collins
Merge integration.
129
            revs = self._revids_to_fetch()
2535.3.46 by Andrew Bennetts
Fix a bug when "fetching" from a RemoteRepository when the target already has the last revision.
130
            if revs is None:
131
                return
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
132
            self._fetch_everything_for_revisions(revs, pp)
133
        finally:
134
            self.pb.clear()
135
136
    def _fetch_everything_for_revisions(self, revs, pp):
137
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
138
        # 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.
139
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
140
        # that phase is progressing than we do.  Progress updates for the other
141
        # phases are taken care of in this function.
142
        # 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.
143
        # item_keys_introduced_by should have a richer API than it does at the
144
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
145
        # function?
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
146
        phase = 'file'
147
        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.
148
        try:
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
149
            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.
150
            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.
151
                if knit_kind != phase:
152
                    phase = knit_kind
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
153
                    # Make a new progress bar for this phase
154
                    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.
155
                    pp.next_phase()
156
                    pb = bzrlib.ui.ui_factory.nested_progress_bar()
157
                if knit_kind == "file":
158
                    self._fetch_weave_text(file_id, revisions)
159
                elif knit_kind == "inventory":
160
                    # XXX:
161
                    # Once we've processed all the files, then we generate the root
162
                    # texts (if necessary), then we process the inventory.  It's a
163
                    # bit distasteful to have knit_kind == "inventory" mean this,
164
                    # perhaps it should happen on the first non-"file" knit, in case
165
                    # it's not always inventory?
166
                    self._generate_root_texts(revs)
167
                    self._fetch_inventory_weave(revs, pb)
2535.3.25 by Andrew Bennetts
Fetch signatures too.
168
                elif knit_kind == "signatures":
169
                    # Nothing to do here; this will be taken care of when
170
                    # _fetch_revision_texts happens.
171
                    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.
172
                elif knit_kind == "revisions":
173
                    self._fetch_revision_texts(revs, pb)
174
                else:
175
                    raise AssertionError("Unknown knit kind %r" % knit_kind)
176
        finally:
177
            if pb is not None:
178
                pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
179
        self.count_copied += len(revs)
180
        
1185.65.30 by Robert Collins
Merge integration.
181
    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.
182
        """Determines the exact revisions needed from self.from_repository to
183
        install self._last_revision in self.to_repository.
184
185
        If no revisions need to be fetched, then this just returns None.
186
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
187
        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.
188
        if self._last_revision is NULL_REVISION:
189
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
190
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
191
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
192
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
193
            return None
194
            
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
195
        try:
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
196
            # XXX: this gets the full graph on both sides, and will make sure
197
            # that ghosts are filled whether or not you care about them.
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
            return self.to_repository.missing_revision_ids(self.from_repository,
199
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
200
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
201
            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
202
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
203
    def _fetch_weave_text(self, file_id, required_versions):
204
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
205
            self.to_repository.get_transaction())
206
        from_weave = self.from_weaves.get_weave(file_id,
207
            self.from_repository.get_transaction())
208
        # we fetch all the texts, because texts do
209
        # not reference anything, and its cheap enough
210
        to_weave.join(from_weave, version_ids=required_versions)
211
        # we don't need *all* of this data anymore, but we dont know
212
        # what we do. This cache clearing will result in a new read 
213
        # of the knit data when we do the checkout, but probably we
214
        # want to emit the needed data on the fly rather than at the
215
        # end anyhow.
216
        # the from weave should know not to cache data being joined,
217
        # but its ok to ask it to clear.
218
        from_weave.clear_cache()
219
        to_weave.clear_cache()
220
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
221
    def _fetch_inventory_weave(self, revs, pb):
222
        pb.update("fetch inventory", 0, 2)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
223
        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.
224
        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.
225
        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.
226
            # just merge, this is optimisable and its means we don't
227
            # copy unreferenced data such as not-needed inventories.
228
            pb.update("fetch inventory", 1, 3)
229
            from_weave = self.from_repository.get_inventory_weave()
230
            pb.update("fetch inventory", 2, 3)
231
            # we fetch only the referenced inventories because we do not
232
            # know for unselected inventories whether all their required
233
            # texts are present in the other repository - it could be
234
            # corrupt.
235
            to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
236
                          version_ids=revs)
237
            from_weave.clear_cache()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
238
        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.
239
            child_pb.finished()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
240
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
241
    def _generate_root_texts(self, revs):
242
        """This will be called by __fetch between fetching weave texts and
243
        fetching the inventory weave.
244
245
        Subclasses should override this if they need to generate root texts
246
        after fetching weave texts.
247
        """
248
        pass
2743.1.2 by Robert Collins
This cleans up a few things in fetch.py that are bit-rotten:
249
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
250
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
251
class GenericRepoFetcher(RepoFetcher):
252
    """This is a generic repo to repo fetcher.
253
254
    This makes minimal assumptions about repo layout and contents.
255
    It triggers a reconciliation after fetching to ensure integrity.
256
    """
257
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
    def _fetch_revision_texts(self, revs, pb):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
259
        """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.
260
        to_txn = self.to_transaction = self.to_repository.get_transaction()
261
        count = 0
262
        total = len(revs)
263
        to_store = self.to_repository._revision_store
264
        for rev in revs:
265
            pb.update('copying revisions', count, total)
266
            try:
267
                sig_text = self.from_repository.get_signature_text(rev)
268
                to_store.add_revision_signature_text(rev, sig_text, to_txn)
269
            except errors.NoSuchRevision:
270
                # not signed.
271
                pass
272
            to_store.add_revision(self.from_repository.get_revision(rev),
273
                                  to_txn)
274
            count += 1
275
        # fixup inventory if needed: 
276
        # this is expensive because we have no inverse index to current ghosts.
277
        # but on local disk its a few seconds and sftp push is already insane.
278
        # so we just-do-it.
279
        # FIXME: repository should inform if this is needed.
280
        self.to_repository.reconcile()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
281
    
282
283
class KnitRepoFetcher(RepoFetcher):
284
    """This is a knit format repository specific fetcher.
285
286
    This differs from the GenericRepoFetcher by not doing a 
287
    reconciliation after copying, and using knit joining to
288
    copy revision texts.
289
    """
290
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
291
    def _fetch_revision_texts(self, revs, pb):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
292
        # may need to be a InterRevisionStore call here.
293
        from_transaction = self.from_repository.get_transaction()
294
        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.
295
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
296
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
297
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
298
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
299
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
300
        to_rf = self.to_repository._revision_store.get_revision_file(
301
            to_transaction)
302
        from_rf = self.from_repository._revision_store.get_revision_file(
303
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
304
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
305
306
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
307
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
308
    """Helper for operations that convert data from model 1 and 2
309
    
310
    This is for use by fetchers and converters.
311
    """
312
313
    def __init__(self, source, target):
314
        """Constructor.
315
316
        :param source: The repository data comes from
317
        :param target: The repository data goes to
318
        """
319
        self.source = source
320
        self.target = target
321
322
    def iter_rev_trees(self, revs):
323
        """Iterate through RevisionTrees efficiently.
324
325
        Additionally, the inventory's revision_id is set if unset.
326
327
        Trees are retrieved in batches of 100, and then yielded in the order
328
        they were requested.
329
330
        :param revs: A list of revision ids
331
        """
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
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
1910.2.48 by Aaron Bentley
Update from review comments
350
            root_id = tree.inventory.root.file_id
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
351
            parents = inventory_weave.get_parents(revision_id)
1910.2.48 by Aaron Bentley
Update from review comments
352
            if root_id not in versionedfile:
353
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id, 
354
                    self.target.get_transaction())
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
355
            _, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
1910.2.48 by Aaron Bentley
Update from review comments
356
                revision_id, parents, [], parent_texts)
357
358
    def regenerate_inventory(self, revs):
359
        """Generate a new inventory versionedfile in target, convertin data.
360
        
361
        The inventory is retrieved from the source, (deserializing it), and
362
        stored in the target (reserializing it in a different format).
363
        :param revs: The revisions to include
364
        """
365
        inventory_weave = self.source.get_inventory_weave()
366
        for tree in self.iter_rev_trees(revs):
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
367
            parents = inventory_weave.get_parents(tree.get_revision_id())
1910.2.48 by Aaron Bentley
Update from review comments
368
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
369
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
370
371
372
class Model1toKnit2Fetcher(GenericRepoFetcher):
373
    """Fetch from a Model1 repository into a Knit2 repository
374
    """
1910.2.48 by Aaron Bentley
Update from review comments
375
    def __init__(self, to_repository, from_repository, last_revision=None, 
376
                 pb=None):
377
        self.helper = Inter1and2Helper(from_repository, to_repository)
378
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
379
                                    last_revision, pb)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
380
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
381
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
382
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
383
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
384
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
385
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
386
 
387
388
class Knit1to2Fetcher(KnitRepoFetcher):
389
    """Fetch from a Knit1 repository into a Knit2 repository"""
390
1910.2.48 by Aaron Bentley
Update from review comments
391
    def __init__(self, to_repository, from_repository, last_revision=None, 
392
                 pb=None):
393
        self.helper = Inter1and2Helper(from_repository, to_repository)
394
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
395
                                 last_revision, pb)
396
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
397
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
398
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
399
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
400
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
401
        self.helper.regenerate_inventory(revs)
2535.3.62 by Andrew Bennetts
Cosmetic changes.
402
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
403
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
404
class RemoteToOtherFetcher(GenericRepoFetcher):
2535.3.62 by Andrew Bennetts
Cosmetic changes.
405
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
406
    def _fetch_everything_for_revisions(self, revs, pp):
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
407
        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.
408
        self.to_repository.insert_data_stream(data_stream)
409
410