~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
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
        zero_eight,
43
        )
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
44
from bzrlib.trace import mutter
45
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.
46
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
47
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.
48
1231 by Martin Pool
- more progress on fetch on top of weaves
49
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
50
1238 by Martin Pool
- remove a lot of dead code from fetch
51
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
52
# all yet.  I'm not sure they really should be supported.
53
1262 by Martin Pool
- fetch should also copy ancestry records
54
# NOTE: This doesn't copy revisions which may be present but not
55
# 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
56
57
# - get a list of revisions that need to be pulled in
58
# - for each one, pull in that revision file
59
#   and get the inventory, and store the inventory with right
60
#   parents.
61
# - and get the ancestry, and store that with right parents too
62
# - and keep a note of all file ids and version seen
63
# - then go through all files; for each one get the weave,
64
#   and add in all file versions
65
66
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.
67
@deprecated_function(zero_eight)
1260 by Martin Pool
- some updates for fetch/update function
68
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
69
    """Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
70
    f = Fetcher(to_branch, from_branch, revision, pb)
71
    return f.count_copied, f.failed_revisions
72
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
73
fetch = greedy_fetch
74
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
75
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
76
class RepoFetcher(object):
77
    """Pull revisions and texts from one repository to another.
78
79
    last_revision
80
        if set, try to limit to the data this revision references.
81
82
    after running:
1260 by Martin Pool
- some updates for fetch/update function
83
    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.
84
85
    This should not be used directory, its essential a object to encapsulate
86
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
87
    """
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.
88
    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.
89
        # result variables.
90
        self.failed_revisions = []
91
        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 :(
92
        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.
93
            # check that last_revision is in 'from' and then return a no-operation.
94
            if last_revision not in (None, NULL_REVISION):
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
95
                to_repository.get_revision(last_revision)
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
96
            return
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
97
        self.to_repository = to_repository
98
        self.from_repository = from_repository
99
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
100
        self._last_revision = last_revision
101
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
102
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
103
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
104
        else:
105
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
106
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
107
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
108
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
109
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
110
            try:
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
111
                self.to_repository.start_write_group()
112
                try:
113
                    self.__fetch()
114
                except:
115
                    self.to_repository.abort_write_group()
116
                    raise
117
                else:
118
                    self.to_repository.commit_write_group()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
119
            finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
120
                if self.nested_pb is not None:
121
                    self.nested_pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
122
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
123
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
124
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
125
126
    def __fetch(self):
127
        """Primary worker function.
128
129
        This initialises all the needed variables, and then fetches the 
130
        requested revisions, finally clearing the progress bar.
131
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
132
        self.to_weaves = self.to_repository.weave_store
133
        self.to_control = self.to_repository.control_weaves
134
        self.from_weaves = self.from_repository.weave_store
135
        self.from_control = self.from_repository.control_weaves
1240 by Martin Pool
- clean up fetch code and add progress bar
136
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
137
        self.file_ids_names = {}
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
138
        pp = ProgressPhase('Fetch phase', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
139
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
140
            pp.next_phase()
1185.65.30 by Robert Collins
Merge integration.
141
            revs = self._revids_to_fetch()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
142
            # something to do ?
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
143
            if revs:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
144
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
145
                self._fetch_weave_texts(revs)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
146
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
147
                self._fetch_inventory_weave(revs)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
148
                pp.next_phase()
1534.1.11 by Robert Collins
Format tweaks for latest merges.
149
                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
150
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
151
        finally:
152
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
153
1185.65.30 by Robert Collins
Merge integration.
154
    def _revids_to_fetch(self):
1185.65.27 by Robert Collins
Tweak storage towards mergability.
155
        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.
156
        if self._last_revision is NULL_REVISION:
157
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
158
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
159
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
160
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
161
            return None
162
            
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
163
        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.
164
            return self.to_repository.missing_revision_ids(self.from_repository,
165
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
166
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
167
            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
168
1534.1.11 by Robert Collins
Format tweaks for latest merges.
169
    def _fetch_weave_texts(self, revs):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
170
        texts_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
171
        try:
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
172
            # fileids_altered_by_revision_ids requires reading the inventory
173
            # weave, we will need to read the inventory weave again when
174
            # all this is done, so enable caching for that specific weave
175
            inv_w = self.from_repository.get_inventory_weave()
176
            inv_w.enable_cache()
1694.2.6 by Martin Pool
[merge] bzr.dev
177
            file_ids = self.from_repository.fileids_altered_by_revision_ids(revs)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
178
            count = 0
179
            num_file_ids = len(file_ids)
1694.2.6 by Martin Pool
[merge] bzr.dev
180
            for file_id, required_versions in file_ids.items():
1596.2.22 by Robert Collins
Fetch changes to use new pb.
181
                texts_pb.update("fetch texts", count, num_file_ids)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
182
                count +=1
1666.1.8 by Robert Collins
Remove unneeded optimisation in fetch_texts - the interversioned file optimisers now do this.
183
                to_weave = self.to_weaves.get_weave_or_empty(file_id,
184
                    self.to_repository.get_transaction())
185
                from_weave = self.from_weaves.get_weave(file_id,
186
                    self.from_repository.get_transaction())
187
                # we fetch all the texts, because texts do
188
                # not reference anything, and its cheap enough
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
189
                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.
190
                # we don't need *all* of this data anymore, but we dont know
1753.1.2 by Robert Collins
Shrink memory usage in branch.
191
                # what we do. This cache clearing will result in a new read 
192
                # of the knit data when we do the checkout, but probably we
193
                # want to emit the needed data on the fly rather than at the
194
                # end anyhow.
195
                # the from weave should know not to cache data being joined,
196
                # but its ok to ask it to clear.
197
                from_weave.clear_cache()
198
                to_weave.clear_cache()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
199
        finally:
1596.2.22 by Robert Collins
Fetch changes to use new pb.
200
            texts_pb.finished()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
201
1534.1.11 by Robert Collins
Format tweaks for latest merges.
202
    def _fetch_inventory_weave(self, revs):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
203
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
204
        try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
205
            pb.update("fetch inventory", 0, 2)
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
206
            to_weave = self.to_control.get_weave('inventory',
207
                    self.to_repository.get_transaction())
1596.2.22 by Robert Collins
Fetch changes to use new pb.
208
    
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
209
            child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
210
            try:
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
211
                # just merge, this is optimisable and its means we don't
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
212
                # copy unreferenced data such as not-needed inventories.
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
213
                pb.update("fetch inventory", 1, 3)
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
214
                from_weave = self.from_repository.get_inventory_weave()
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
215
                pb.update("fetch inventory", 2, 3)
1551.2.37 by Aaron Bentley
Merge from bzr.ab.integration
216
                # we fetch only the referenced inventories because we do not
217
                # know for unselected inventories whether all their required
218
                # texts are present in the other repository - it could be
219
                # corrupt.
220
                to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
221
                              version_ids=revs)
1863.1.2 by John Arbash Meinel
Enable caching for the from inventory while fetching.
222
                from_weave.clear_cache()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
223
            finally:
224
                child_pb.finished()
225
        finally:
226
            pb.finished()
1240 by Martin Pool
- clean up fetch code and add progress bar
227
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
228
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
229
class GenericRepoFetcher(RepoFetcher):
230
    """This is a generic repo to repo fetcher.
231
232
    This makes minimal assumptions about repo layout and contents.
233
    It triggers a reconciliation after fetching to ensure integrity.
234
    """
235
236
    def _fetch_revision_texts(self, revs):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
237
        """Fetch revision object texts"""
1596.2.22 by Robert Collins
Fetch changes to use new pb.
238
        rev_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
239
        try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
240
            to_txn = self.to_transaction = self.to_repository.get_transaction()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
241
            count = 0
242
            total = len(revs)
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
243
            to_store = self.to_repository._revision_store
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
244
            for rev in revs:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
245
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
246
                try:
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
247
                    pb.update('copying revisions', count, total)
248
                    try:
249
                        sig_text = self.from_repository.get_signature_text(rev)
250
                        to_store.add_revision_signature_text(rev, sig_text, to_txn)
251
                    except errors.NoSuchRevision:
252
                        # not signed.
253
                        pass
254
                    to_store.add_revision(self.from_repository.get_revision(rev),
255
                                          to_txn)
256
                    count += 1
257
                finally:
258
                    pb.finished()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
259
            # fixup inventory if needed: 
260
            # this is expensive because we have no inverse index to current ghosts.
261
            # but on local disk its a few seconds and sftp push is already insane.
262
            # so we just-do-it.
263
            # FIXME: repository should inform if this is needed.
264
            self.to_repository.reconcile()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
265
        finally:
1596.2.22 by Robert Collins
Fetch changes to use new pb.
266
            rev_pb.finished()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
267
    
268
269
class KnitRepoFetcher(RepoFetcher):
270
    """This is a knit format repository specific fetcher.
271
272
    This differs from the GenericRepoFetcher by not doing a 
273
    reconciliation after copying, and using knit joining to
274
    copy revision texts.
275
    """
276
277
    def _fetch_revision_texts(self, revs):
278
        # may need to be a InterRevisionStore call here.
279
        from_transaction = self.from_repository.get_transaction()
280
        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.
281
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
282
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
283
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
284
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
285
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
286
        to_rf = self.to_repository._revision_store.get_revision_file(
287
            to_transaction)
288
        from_rf = self.from_repository._revision_store.get_revision_file(
289
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
290
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
291
292
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
293
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
294
    """Helper for operations that convert data from model 1 and 2
295
    
296
    This is for use by fetchers and converters.
297
    """
298
299
    def __init__(self, source, target):
300
        """Constructor.
301
302
        :param source: The repository data comes from
303
        :param target: The repository data goes to
304
        """
305
        self.source = source
306
        self.target = target
307
308
    def iter_rev_trees(self, revs):
309
        """Iterate through RevisionTrees efficiently.
310
311
        Additionally, the inventory's revision_id is set if unset.
312
313
        Trees are retrieved in batches of 100, and then yielded in the order
314
        they were requested.
315
316
        :param revs: A list of revision ids
317
        """
318
        while revs:
319
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
320
                if tree.inventory.revision_id is None:
321
                    tree.inventory.revision_id = tree.get_revision_id()
322
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
323
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
324
1910.2.48 by Aaron Bentley
Update from review comments
325
    def generate_root_texts(self, revs):
326
        """Generate VersionedFiles for all root ids.
327
        
328
        :param revs: the revisions to include
329
        """
330
        inventory_weave = self.source.get_inventory_weave()
331
        parent_texts = {}
332
        versionedfile = {}
333
        to_store = self.target.weave_store
334
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
335
            revision_id = tree.inventory.root.revision
1910.2.48 by Aaron Bentley
Update from review comments
336
            root_id = tree.inventory.root.file_id
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
337
            parents = inventory_weave.get_parents(revision_id)
1910.2.48 by Aaron Bentley
Update from review comments
338
            if root_id not in versionedfile:
339
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id, 
340
                    self.target.get_transaction())
341
            parent_texts[root_id] = versionedfile[root_id].add_lines(
342
                revision_id, parents, [], parent_texts)
343
344
    def regenerate_inventory(self, revs):
345
        """Generate a new inventory versionedfile in target, convertin data.
346
        
347
        The inventory is retrieved from the source, (deserializing it), and
348
        stored in the target (reserializing it in a different format).
349
        :param revs: The revisions to include
350
        """
351
        inventory_weave = self.source.get_inventory_weave()
352
        for tree in self.iter_rev_trees(revs):
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
353
            parents = inventory_weave.get_parents(tree.get_revision_id())
1910.2.48 by Aaron Bentley
Update from review comments
354
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
355
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
356
357
358
class Model1toKnit2Fetcher(GenericRepoFetcher):
359
    """Fetch from a Model1 repository into a Knit2 repository
360
    """
1910.2.48 by Aaron Bentley
Update from review comments
361
    def __init__(self, to_repository, from_repository, last_revision=None, 
362
                 pb=None):
363
        self.helper = Inter1and2Helper(from_repository, to_repository)
364
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
365
                                    last_revision, pb)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
366
367
    def _fetch_weave_texts(self, revs):
368
        GenericRepoFetcher._fetch_weave_texts(self, revs)
369
        # Now generate a weave for the tree root
1910.2.48 by Aaron Bentley
Update from review comments
370
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
371
372
    def _fetch_inventory_weave(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
373
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
374
 
375
376
class Knit1to2Fetcher(KnitRepoFetcher):
377
    """Fetch from a Knit1 repository into a Knit2 repository"""
378
1910.2.48 by Aaron Bentley
Update from review comments
379
    def __init__(self, to_repository, from_repository, last_revision=None, 
380
                 pb=None):
381
        self.helper = Inter1and2Helper(from_repository, to_repository)
382
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
383
                                 last_revision, pb)
384
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
385
    def _fetch_weave_texts(self, revs):
386
        KnitRepoFetcher._fetch_weave_texts(self, revs)
387
        # Now generate a weave for the tree root
1910.2.48 by Aaron Bentley
Update from review comments
388
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
389
390
    def _fetch_inventory_weave(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
391
        self.helper.regenerate_inventory(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
392
        
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
393
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
394
class Fetcher(object):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
395
    """Backwards compatibility glue for branch.fetch()."""
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
396
397
    @deprecated_method(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
398
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
399
        """Please see branch.fetch()."""
400
        to_branch.fetch(from_branch, last_revision, pb)