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