/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
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
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.
39
from bzrlib.revision import 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
2018.5.85 by Andrew Bennetts
Revert change to fetch.py that broke test_upgrade_preserves_signatures for non-Remote repositories. Still hangs for Remote repos too :(
82
        if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
83
            # check that last_revision is in 'from' and then return a no-operation.
84
            if last_revision not in (None, NULL_REVISION):
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
85
                to_repository.get_revision(last_revision)
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
86
            return
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.to_control = self.to_repository.control_weaves
124
        self.from_weaves = self.from_repository.weave_store
125
        self.from_control = self.from_repository.control_weaves
1240 by Martin Pool
- clean up fetch code and add progress bar
126
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
127
        self.file_ids_names = {}
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
128
        pp = ProgressPhase('Fetch phase', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
129
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
130
            pp.next_phase()
1185.65.30 by Robert Collins
Merge integration.
131
            revs = self._revids_to_fetch()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
132
            # something to do ?
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
133
            if revs:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
134
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
135
                self._fetch_weave_texts(revs)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
136
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
137
                self._fetch_inventory_weave(revs)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
138
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
139
                self._fetch_revision_texts(revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
140
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
141
        finally:
142
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
143
1185.65.30 by Robert Collins
Merge integration.
144
    def _revids_to_fetch(self):
1185.65.27 by Robert Collins
Tweak storage towards mergability.
145
        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.
146
        if self._last_revision is NULL_REVISION:
147
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
148
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
149
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
150
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
151
            return None
152
            
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
153
        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.
154
            return self.to_repository.missing_revision_ids(self.from_repository,
155
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
156
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
157
            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
158
1534.1.11 by Robert Collins
Format tweaks for latest merges.
159
    def _fetch_weave_texts(self, revs):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
160
        texts_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
161
        try:
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
162
            # fileids_altered_by_revision_ids requires reading the inventory
163
            # weave, we will need to read the inventory weave again when
164
            # all this is done, so enable caching for that specific weave
165
            inv_w = self.from_repository.get_inventory_weave()
166
            inv_w.enable_cache()
1694.2.6 by Martin Pool
[merge] bzr.dev
167
            file_ids = self.from_repository.fileids_altered_by_revision_ids(revs)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
168
            count = 0
169
            num_file_ids = len(file_ids)
1694.2.6 by Martin Pool
[merge] bzr.dev
170
            for file_id, required_versions in file_ids.items():
1596.2.22 by Robert Collins
Fetch changes to use new pb.
171
                texts_pb.update("fetch texts", count, num_file_ids)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
172
                count +=1
1666.1.8 by Robert Collins
Remove unneeded optimisation in fetch_texts - the interversioned file optimisers now do this.
173
                to_weave = self.to_weaves.get_weave_or_empty(file_id,
174
                    self.to_repository.get_transaction())
175
                from_weave = self.from_weaves.get_weave(file_id,
176
                    self.from_repository.get_transaction())
177
                # we fetch all the texts, because texts do
178
                # not reference anything, and its cheap enough
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
179
                to_weave.join(from_weave, version_ids=required_versions)
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
180
                # we don't need *all* of this data anymore, but we dont know
1753.1.2 by Robert Collins
Shrink memory usage in branch.
181
                # what we do. This cache clearing will result in a new read 
182
                # of the knit data when we do the checkout, but probably we
183
                # want to emit the needed data on the fly rather than at the
184
                # end anyhow.
185
                # the from weave should know not to cache data being joined,
186
                # but its ok to ask it to clear.
187
                from_weave.clear_cache()
188
                to_weave.clear_cache()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
189
        finally:
1596.2.22 by Robert Collins
Fetch changes to use new pb.
190
            texts_pb.finished()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
191
1534.1.11 by Robert Collins
Format tweaks for latest merges.
192
    def _fetch_inventory_weave(self, revs):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
193
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
194
        try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
195
            pb.update("fetch inventory", 0, 2)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
196
            to_weave = self.to_control.get_weave('inventory',
197
                    self.to_repository.get_transaction())
1596.2.22 by Robert Collins
Fetch changes to use new pb.
198
    
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
199
            child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
200
            try:
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
201
                # just merge, this is optimisable and its means we don't
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
202
                # copy unreferenced data such as not-needed inventories.
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
203
                pb.update("fetch inventory", 1, 3)
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
204
                from_weave = self.from_repository.get_inventory_weave()
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
205
                pb.update("fetch inventory", 2, 3)
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
206
                # we fetch only the referenced inventories because we do not
207
                # know for unselected inventories whether all their required
208
                # texts are present in the other repository - it could be
209
                # corrupt.
210
                to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
211
                              version_ids=revs)
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
212
                from_weave.clear_cache()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
213
            finally:
214
                child_pb.finished()
215
        finally:
216
            pb.finished()
1240 by Martin Pool
- clean up fetch code and add progress bar
217
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
218
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
219
class GenericRepoFetcher(RepoFetcher):
220
    """This is a generic repo to repo fetcher.
221
222
    This makes minimal assumptions about repo layout and contents.
223
    It triggers a reconciliation after fetching to ensure integrity.
224
    """
225
226
    def _fetch_revision_texts(self, revs):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
227
        """Fetch revision object texts"""
1596.2.22 by Robert Collins
Fetch changes to use new pb.
228
        rev_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
229
        try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
230
            to_txn = self.to_transaction = self.to_repository.get_transaction()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
231
            count = 0
232
            total = len(revs)
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
233
            to_store = self.to_repository._revision_store
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
234
            for rev in revs:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
235
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
236
                try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
237
                    pb.update('copying revisions', count, total)
238
                    try:
239
                        sig_text = self.from_repository.get_signature_text(rev)
240
                        to_store.add_revision_signature_text(rev, sig_text, to_txn)
241
                    except errors.NoSuchRevision:
242
                        # not signed.
243
                        pass
244
                    to_store.add_revision(self.from_repository.get_revision(rev),
245
                                          to_txn)
246
                    count += 1
247
                finally:
248
                    pb.finished()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
249
            # fixup inventory if needed: 
250
            # this is expensive because we have no inverse index to current ghosts.
251
            # but on local disk its a few seconds and sftp push is already insane.
252
            # so we just-do-it.
253
            # FIXME: repository should inform if this is needed.
254
            self.to_repository.reconcile()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
255
        finally:
1596.2.22 by Robert Collins
Fetch changes to use new pb.
256
            rev_pb.finished()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
257
    
258
259
class KnitRepoFetcher(RepoFetcher):
260
    """This is a knit format repository specific fetcher.
261
262
    This differs from the GenericRepoFetcher by not doing a 
263
    reconciliation after copying, and using knit joining to
264
    copy revision texts.
265
    """
266
267
    def _fetch_revision_texts(self, revs):
268
        # may need to be a InterRevisionStore call here.
269
        from_transaction = self.from_repository.get_transaction()
270
        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.
271
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
272
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
273
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
274
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
275
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
276
        to_rf = self.to_repository._revision_store.get_revision_file(
277
            to_transaction)
278
        from_rf = self.from_repository._revision_store.get_revision_file(
279
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
280
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
281
282
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
283
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
284
    """Helper for operations that convert data from model 1 and 2
285
    
286
    This is for use by fetchers and converters.
287
    """
288
289
    def __init__(self, source, target):
290
        """Constructor.
291
292
        :param source: The repository data comes from
293
        :param target: The repository data goes to
294
        """
295
        self.source = source
296
        self.target = target
297
298
    def iter_rev_trees(self, revs):
299
        """Iterate through RevisionTrees efficiently.
300
301
        Additionally, the inventory's revision_id is set if unset.
302
303
        Trees are retrieved in batches of 100, and then yielded in the order
304
        they were requested.
305
306
        :param revs: A list of revision ids
307
        """
308
        while revs:
309
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
310
                if tree.inventory.revision_id is None:
311
                    tree.inventory.revision_id = tree.get_revision_id()
312
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
313
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
314
1910.2.48 by Aaron Bentley
Update from review comments
315
    def generate_root_texts(self, revs):
316
        """Generate VersionedFiles for all root ids.
317
        
318
        :param revs: the revisions to include
319
        """
320
        inventory_weave = self.source.get_inventory_weave()
321
        parent_texts = {}
322
        versionedfile = {}
323
        to_store = self.target.weave_store
324
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
325
            revision_id = tree.inventory.root.revision
1910.2.48 by Aaron Bentley
Update from review comments
326
            root_id = tree.inventory.root.file_id
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
327
            parents = inventory_weave.get_parents(revision_id)
1910.2.48 by Aaron Bentley
Update from review comments
328
            if root_id not in versionedfile:
329
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id, 
330
                    self.target.get_transaction())
331
            parent_texts[root_id] = versionedfile[root_id].add_lines(
332
                revision_id, parents, [], parent_texts)
333
334
    def regenerate_inventory(self, revs):
335
        """Generate a new inventory versionedfile in target, convertin data.
336
        
337
        The inventory is retrieved from the source, (deserializing it), and
338
        stored in the target (reserializing it in a different format).
339
        :param revs: The revisions to include
340
        """
341
        inventory_weave = self.source.get_inventory_weave()
342
        for tree in self.iter_rev_trees(revs):
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
343
            parents = inventory_weave.get_parents(tree.get_revision_id())
1910.2.48 by Aaron Bentley
Update from review comments
344
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
345
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
346
347
348
class Model1toKnit2Fetcher(GenericRepoFetcher):
349
    """Fetch from a Model1 repository into a Knit2 repository
350
    """
1910.2.48 by Aaron Bentley
Update from review comments
351
    def __init__(self, to_repository, from_repository, last_revision=None, 
352
                 pb=None):
353
        self.helper = Inter1and2Helper(from_repository, to_repository)
354
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
355
                                    last_revision, pb)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
356
357
    def _fetch_weave_texts(self, revs):
358
        GenericRepoFetcher._fetch_weave_texts(self, revs)
359
        # Now generate a weave for the tree root
1910.2.48 by Aaron Bentley
Update from review comments
360
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
361
362
    def _fetch_inventory_weave(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
363
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
364
 
365
366
class Knit1to2Fetcher(KnitRepoFetcher):
367
    """Fetch from a Knit1 repository into a Knit2 repository"""
368
1910.2.48 by Aaron Bentley
Update from review comments
369
    def __init__(self, to_repository, from_repository, last_revision=None, 
370
                 pb=None):
371
        self.helper = Inter1and2Helper(from_repository, to_repository)
372
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
373
                                 last_revision, pb)
374
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
375
    def _fetch_weave_texts(self, revs):
376
        KnitRepoFetcher._fetch_weave_texts(self, revs)
377
        # Now generate a weave for the tree root
1910.2.48 by Aaron Bentley
Update from review comments
378
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
379
380
    def _fetch_inventory_weave(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
381
        self.helper.regenerate_inventory(revs)