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