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