~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
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
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):
2881.4.1 by Robert Collins
Move responsibility for detecting same-repo fetching from the
83
            # repository.fetch should be taking care of this case.
84
            raise errors.BzrError('RepoFetcher run '
85
                    'between two objects at the same location: '
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()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
130
            self._fetch_everything_for_revisions(revs, pp)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
131
        finally:
132
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
133
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
134
    def _fetch_everything_for_revisions(self, revs, pp):
135
        """Fetch all data for the given set of revisions."""
136
        if revs is None:
137
            return
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
140
        # that phase is progressing than we do.  Progress updates for the other
141
        # phases are taken care of in this function.
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
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
145
        # function?
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
146
        phase = 'file'
147
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
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:
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
151
                if knit_kind != phase:
152
                    phase = knit_kind
153
                    # Make a new progress bar for this phase
154
                    pb.finished()
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)
168
                elif knit_kind == "signatures":
169
                    # Nothing to do here; this will be taken care of when
170
                    # _fetch_revision_texts happens.
171
                    pass
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()
179
        self.count_copied += len(revs)
180
        
1185.65.30 by Robert Collins
Merge integration.
181
    def _revids_to_fetch(self):
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
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:
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.
196
            return self.to_repository.missing_revision_ids(self.from_repository,
197
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
198
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
199
            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
200
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
201
    def _fetch_weave_text(self, file_id, required_versions):
202
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
203
            self.to_repository.get_transaction())
204
        from_weave = self.from_weaves.get_weave(file_id,
205
            self.from_repository.get_transaction())
206
        # we fetch all the texts, because texts do
207
        # not reference anything, and its cheap enough
208
        to_weave.join(from_weave, version_ids=required_versions)
209
        # we don't need *all* of this data anymore, but we dont know
210
        # what we do. This cache clearing will result in a new read 
211
        # of the knit data when we do the checkout, but probably we
212
        # want to emit the needed data on the fly rather than at the
213
        # end anyhow.
214
        # the from weave should know not to cache data being joined,
215
        # but its ok to ask it to clear.
216
        from_weave.clear_cache()
217
        to_weave.clear_cache()
218
219
    def _fetch_inventory_weave(self, revs, pb):
220
        pb.update("fetch inventory", 0, 2)
2743.1.2 by Robert Collins
This cleans up a few things in fetch.py that are bit-rotten:
221
        to_weave = self.to_repository.get_inventory_weave()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
222
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
223
        try:
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)
235
            from_weave.clear_cache()
236
        finally:
237
            child_pb.finished()
238
239
    def _generate_root_texts(self, revs):
240
        """This will be called by __fetch between fetching weave texts and
241
        fetching the inventory weave.
242
243
        Subclasses should override this if they need to generate root texts
244
        after fetching weave texts.
245
        """
246
        pass
2743.1.2 by Robert Collins
This cleans up a few things in fetch.py that are bit-rotten:
247
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
248
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
249
class GenericRepoFetcher(RepoFetcher):
250
    """This is a generic repo to repo fetcher.
251
252
    This makes minimal assumptions about repo layout and contents.
253
    It triggers a reconciliation after fetching to ensure integrity.
254
    """
255
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
256
    def _fetch_revision_texts(self, revs, pb):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
257
        """Fetch revision object texts"""
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
258
        to_txn = self.to_transaction = self.to_repository.get_transaction()
259
        count = 0
260
        total = len(revs)
261
        to_store = self.to_repository._revision_store
262
        for rev in revs:
263
            pb.update('copying revisions', count, total)
264
            try:
265
                sig_text = self.from_repository.get_signature_text(rev)
266
                to_store.add_revision_signature_text(rev, sig_text, to_txn)
267
            except errors.NoSuchRevision:
268
                # not signed.
269
                pass
270
            to_store.add_revision(self.from_repository.get_revision(rev),
271
                                  to_txn)
272
            count += 1
273
        # fixup inventory if needed: 
274
        # this is expensive because we have no inverse index to current ghosts.
275
        # but on local disk its a few seconds and sftp push is already insane.
276
        # so we just-do-it.
277
        # FIXME: repository should inform if this is needed.
278
        self.to_repository.reconcile()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
279
    
280
281
class KnitRepoFetcher(RepoFetcher):
282
    """This is a knit format repository specific fetcher.
283
284
    This differs from the GenericRepoFetcher by not doing a 
285
    reconciliation after copying, and using knit joining to
286
    copy revision texts.
287
    """
288
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
289
    def _fetch_revision_texts(self, revs, pb):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
290
        # may need to be a InterRevisionStore call here.
291
        from_transaction = self.from_repository.get_transaction()
292
        to_transaction = self.to_repository.get_transaction()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
293
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
294
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
295
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
296
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
297
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
298
        to_rf = self.to_repository._revision_store.get_revision_file(
299
            to_transaction)
300
        from_rf = self.from_repository._revision_store.get_revision_file(
301
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
302
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
303
304
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
305
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
306
    """Helper for operations that convert data from model 1 and 2
307
    
308
    This is for use by fetchers and converters.
309
    """
310
311
    def __init__(self, source, target):
312
        """Constructor.
313
314
        :param source: The repository data comes from
315
        :param target: The repository data goes to
316
        """
317
        self.source = source
318
        self.target = target
319
320
    def iter_rev_trees(self, revs):
321
        """Iterate through RevisionTrees efficiently.
322
323
        Additionally, the inventory's revision_id is set if unset.
324
325
        Trees are retrieved in batches of 100, and then yielded in the order
326
        they were requested.
327
328
        :param revs: A list of revision ids
329
        """
330
        while revs:
331
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
332
                if tree.inventory.revision_id is None:
333
                    tree.inventory.revision_id = tree.get_revision_id()
334
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
335
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
336
1910.2.48 by Aaron Bentley
Update from review comments
337
    def generate_root_texts(self, revs):
338
        """Generate VersionedFiles for all root ids.
339
        
340
        :param revs: the revisions to include
341
        """
342
        inventory_weave = self.source.get_inventory_weave()
343
        parent_texts = {}
344
        versionedfile = {}
345
        to_store = self.target.weave_store
346
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
347
            revision_id = tree.inventory.root.revision
1910.2.48 by Aaron Bentley
Update from review comments
348
            root_id = tree.inventory.root.file_id
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
349
            parents = inventory_weave.get_parents(revision_id)
1910.2.48 by Aaron Bentley
Update from review comments
350
            if root_id not in versionedfile:
351
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id, 
352
                    self.target.get_transaction())
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
353
            _, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
1910.2.48 by Aaron Bentley
Update from review comments
354
                revision_id, parents, [], parent_texts)
355
356
    def regenerate_inventory(self, revs):
357
        """Generate a new inventory versionedfile in target, convertin data.
358
        
359
        The inventory is retrieved from the source, (deserializing it), and
360
        stored in the target (reserializing it in a different format).
361
        :param revs: The revisions to include
362
        """
363
        inventory_weave = self.source.get_inventory_weave()
364
        for tree in self.iter_rev_trees(revs):
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
365
            parents = inventory_weave.get_parents(tree.get_revision_id())
1910.2.48 by Aaron Bentley
Update from review comments
366
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
367
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
368
369
370
class Model1toKnit2Fetcher(GenericRepoFetcher):
371
    """Fetch from a Model1 repository into a Knit2 repository
372
    """
1910.2.48 by Aaron Bentley
Update from review comments
373
    def __init__(self, to_repository, from_repository, last_revision=None, 
374
                 pb=None):
375
        self.helper = Inter1and2Helper(from_repository, to_repository)
376
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
377
                                    last_revision, pb)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
378
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
379
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
380
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
381
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
382
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
383
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
384
 
385
386
class Knit1to2Fetcher(KnitRepoFetcher):
387
    """Fetch from a Knit1 repository into a Knit2 repository"""
388
1910.2.48 by Aaron Bentley
Update from review comments
389
    def __init__(self, to_repository, from_repository, last_revision=None, 
390
                 pb=None):
391
        self.helper = Inter1and2Helper(from_repository, to_repository)
392
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
393
                                 last_revision, pb)
394
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
395
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
396
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
397
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
398
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
399
        self.helper.regenerate_inventory(revs)