~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
3316.2.14 by Robert Collins
Spelling in NEWS.
30
the ids we need, and then pull those ids and then return to the inventories.
1231 by Martin Pool
- more progress on fetch on top of weaves
31
"""
32
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.
33
import bzrlib
34
import bzrlib.errors as errors
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
35
from bzrlib.errors import InstallFailed
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
36
from bzrlib.progress import ProgressPhase
2668.2.7 by Andrew Bennetts
Use bzrlib.revision.is_null rather than comparing against NULL_REVISION.
37
from bzrlib.revision import is_null, NULL_REVISION
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
38
from bzrlib.symbol_versioning import (deprecated_function,
39
        deprecated_method,
40
        )
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
41
from bzrlib.trace import mutter
42
import bzrlib.ui
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
43
from bzrlib.versionedfile import filter_absent
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.
44
1231 by Martin Pool
- more progress on fetch on top of weaves
45
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
46
1238 by Martin Pool
- remove a lot of dead code from fetch
47
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
48
# all yet.  I'm not sure they really should be supported.
49
1262 by Martin Pool
- fetch should also copy ancestry records
50
# NOTE: This doesn't copy revisions which may be present but not
51
# 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
52
53
# - get a list of revisions that need to be pulled in
54
# - for each one, pull in that revision file
55
#   and get the inventory, and store the inventory with right
56
#   parents.
57
# - and get the ancestry, and store that with right parents too
58
# - and keep a note of all file ids and version seen
59
# - then go through all files; for each one get the weave,
60
#   and add in all file versions
61
62
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
63
class RepoFetcher(object):
64
    """Pull revisions and texts from one repository to another.
65
66
    last_revision
67
        if set, try to limit to the data this revision references.
68
69
    after running:
1260 by Martin Pool
- some updates for fetch/update function
70
    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.
71
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
72
    This should not be used directly, it's essential a object to encapsulate
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.
73
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
74
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
75
76
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
77
        find_ghosts=True):
78
        """Create a repo fetcher.
79
80
        :param find_ghosts: If True search the entire history for ghosts.
81
        """
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.
82
        # result variables.
83
        self.failed_revisions = []
84
        self.count_copied = 0
2668.2.6 by Andrew Bennetts
Merge repository-equality.
85
        if to_repository.has_same_location(from_repository):
2592.3.115 by Robert Collins
Move same repository check up to Repository.fetch to allow all fetch implementations to benefit.
86
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
87
            raise errors.BzrError('RepoFetcher run '
88
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
89
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
90
        self.to_repository = to_repository
91
        self.from_repository = from_repository
92
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
93
        self._last_revision = last_revision
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
94
        self.find_ghosts = find_ghosts
1185.65.27 by Robert Collins
Tweak storage towards mergability.
95
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
96
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
97
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
98
        else:
99
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
100
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
101
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
102
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
103
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
104
            try:
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
105
                self.to_repository.start_write_group()
106
                try:
107
                    self.__fetch()
108
                except:
109
                    self.to_repository.abort_write_group()
110
                    raise
111
                else:
112
                    self.to_repository.commit_write_group()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
113
            finally:
3381.1.2 by Aaron Bentley
Cleanup
114
                try:
115
                    if self.nested_pb is not None:
116
                        self.nested_pb.finished()
117
                finally:
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.from_weaves = self.from_repository.weave_store
1240 by Martin Pool
- clean up fetch code and add progress bar
130
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
131
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
132
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
133
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
134
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
135
            search = self._revids_to_fetch()
136
            if search is None:
2535.3.46 by Andrew Bennetts
Fix a bug when "fetching" from a RemoteRepository when the target already has the last revision.
137
                return
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
138
            if getattr(self, '_fetch_everything_for_search', None) is not None:
139
                self._fetch_everything_for_search(search, pp)
140
            else:
141
                # backward compatibility
142
                self._fetch_everything_for_revisions(search.get_keys, pp)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
143
        finally:
144
            self.pb.clear()
145
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
146
    def _fetch_everything_for_search(self, search, pp):
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
147
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
148
        # The first phase is "file".  We pass the progress bar for it directly
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
149
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
150
        # that phase is progressing than we do.  Progress updates for the other
151
        # phases are taken care of in this function.
152
        # XXX: there should be a clear owner of the progress reporting.  Perhaps
2668.2.8 by Andrew Bennetts
Rename get_data_to_fetch_for_revision_ids as item_keys_introduced_by.
153
        # item_keys_introduced_by should have a richer API than it does at the
154
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
155
        # function?
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
156
        phase = 'file'
157
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
158
        try:
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
159
            revs = search.get_keys()
3380.1.1 by Aaron Bentley
Fix inventory insertion to work in topological order
160
            graph = self.from_repository.get_graph()
161
            revs = list(graph.iter_topo_order(revs))
162
            data_to_fetch = self.from_repository.item_keys_introduced_by(revs,
163
                                                                         pb)
2668.2.5 by Andrew Bennetts
Rename get_data_about_revision_ids to get_data_to_fetch_for_revision_ids.
164
            for knit_kind, file_id, revisions in data_to_fetch:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
165
                if knit_kind != phase:
166
                    phase = knit_kind
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
167
                    # Make a new progress bar for this phase
168
                    pb.finished()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
169
                    pp.next_phase()
170
                    pb = bzrlib.ui.ui_factory.nested_progress_bar()
171
                if knit_kind == "file":
172
                    self._fetch_weave_text(file_id, revisions)
173
                elif knit_kind == "inventory":
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
174
                    # Before we process the inventory we generate the root
175
                    # texts (if necessary) so that the inventories references
176
                    # will be valid.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
177
                    self._generate_root_texts(revs)
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
178
                    # NB: This currently reopens the inventory weave in source;
179
                    # using a full get_data_stream instead would avoid this.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
180
                    self._fetch_inventory_weave(revs, pb)
2535.3.25 by Andrew Bennetts
Fetch signatures too.
181
                elif knit_kind == "signatures":
182
                    # Nothing to do here; this will be taken care of when
183
                    # _fetch_revision_texts happens.
184
                    pass
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
185
                elif knit_kind == "revisions":
186
                    self._fetch_revision_texts(revs, pb)
187
                else:
188
                    raise AssertionError("Unknown knit kind %r" % knit_kind)
189
        finally:
190
            if pb is not None:
191
                pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
192
        self.count_copied += len(revs)
193
        
1185.65.30 by Robert Collins
Merge integration.
194
    def _revids_to_fetch(self):
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
195
        """Determines the exact revisions needed from self.from_repository to
196
        install self._last_revision in self.to_repository.
197
198
        If no revisions need to be fetched, then this just returns None.
199
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
200
        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.
201
        if self._last_revision is NULL_REVISION:
202
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
203
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
204
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
205
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
206
            return None
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
207
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
208
            return self.to_repository.search_missing_revision_ids(
209
                self.from_repository, self._last_revision,
210
                find_ghosts=self.find_ghosts)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
211
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
212
            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
213
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
214
    def _fetch_weave_text(self, file_id, required_versions):
215
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
216
            self.to_repository.get_transaction())
217
        from_weave = self.from_weaves.get_weave(file_id,
218
            self.from_repository.get_transaction())
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
219
        # Fetch all the texts.
3350.3.22 by Robert Collins
Review feedback.
220
        to_weave.insert_record_stream(from_weave.get_record_stream(
221
            required_versions, 'topological', False))
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
222
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
223
    def _fetch_inventory_weave(self, revs, pb):
224
        pb.update("fetch inventory", 0, 2)
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
225
        to_weave = self.to_repository.get_inventory_weave()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
226
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
227
        try:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
228
            # just merge, this is optimisable and its means we don't
229
            # copy unreferenced data such as not-needed inventories.
230
            pb.update("fetch inventory", 1, 3)
231
            from_weave = self.from_repository.get_inventory_weave()
232
            pb.update("fetch inventory", 2, 3)
233
            # we fetch only the referenced inventories because we do not
234
            # know for unselected inventories whether all their required
235
            # texts are present in the other repository - it could be
236
            # corrupt.
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
237
            to_weave.insert_record_stream(from_weave.get_record_stream(revs,
238
                'topological', False))
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
239
        finally:
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
240
            child_pb.finished()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
241
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
242
    def _generate_root_texts(self, revs):
243
        """This will be called by __fetch between fetching weave texts and
244
        fetching the inventory weave.
245
246
        Subclasses should override this if they need to generate root texts
247
        after fetching weave texts.
248
        """
249
        pass
2743.1.2 by Robert Collins
This cleans up a few things in fetch.py that are bit-rotten:
250
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
251
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
252
class GenericRepoFetcher(RepoFetcher):
253
    """This is a generic repo to repo fetcher.
254
255
    This makes minimal assumptions about repo layout and contents.
256
    It triggers a reconciliation after fetching to ensure integrity.
257
    """
258
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
259
    def _fetch_revision_texts(self, revs, pb):
1615.1.2 by Martin Pool
[merge] robert's knit-performance work
260
        """Fetch revision object texts"""
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
261
        to_txn = self.to_transaction = self.to_repository.get_transaction()
262
        count = 0
263
        total = len(revs)
264
        to_store = self.to_repository._revision_store
265
        for rev in revs:
266
            pb.update('copying revisions', count, total)
267
            try:
268
                sig_text = self.from_repository.get_signature_text(rev)
269
                to_store.add_revision_signature_text(rev, sig_text, to_txn)
270
            except errors.NoSuchRevision:
271
                # not signed.
272
                pass
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
273
            self._copy_revision(rev, to_txn)
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
274
            count += 1
275
        # fixup inventory if needed: 
276
        # this is expensive because we have no inverse index to current ghosts.
277
        # but on local disk its a few seconds and sftp push is already insane.
278
        # so we just-do-it.
279
        # FIXME: repository should inform if this is needed.
280
        self.to_repository.reconcile()
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
281
282
    def _copy_revision(self, rev, to_txn):
283
        to_store = self.to_repository._revision_store
284
        to_store.add_revision(self.from_repository.get_revision(rev), to_txn)
285
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
286
287
class KnitRepoFetcher(RepoFetcher):
288
    """This is a knit format repository specific fetcher.
289
290
    This differs from the GenericRepoFetcher by not doing a 
291
    reconciliation after copying, and using knit joining to
292
    copy revision texts.
293
    """
294
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
295
    def _fetch_revision_texts(self, revs, pb):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
296
        # may need to be a InterRevisionStore call here.
297
        from_transaction = self.from_repository.get_transaction()
298
        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.
299
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
300
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
301
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
302
            from_transaction)
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
303
        # A missing signature is just skipped.
304
        to_sf.insert_record_stream(filter_absent(from_sf.get_record_stream(revs,
305
            'unordered', False)))
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
306
        self._fetch_just_revision_texts(revs, from_transaction, to_transaction)
307
308
    def _fetch_just_revision_texts(self, version_ids, from_transaction,
309
                                   to_transaction):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
310
        to_rf = self.to_repository._revision_store.get_revision_file(
311
            to_transaction)
312
        from_rf = self.from_repository._revision_store.get_revision_file(
313
            from_transaction)
3350.3.21 by Robert Collins
Merge bzr.dev.
314
        to_rf.insert_record_stream(from_rf.get_record_stream(version_ids,
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
315
            'topological', False))
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
316
317
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
318
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
319
    """Helper for operations that convert data from model 1 and 2
320
    
321
    This is for use by fetchers and converters.
322
    """
323
324
    def __init__(self, source, target):
325
        """Constructor.
326
327
        :param source: The repository data comes from
328
        :param target: The repository data goes to
329
        """
330
        self.source = source
331
        self.target = target
332
333
    def iter_rev_trees(self, revs):
334
        """Iterate through RevisionTrees efficiently.
335
336
        Additionally, the inventory's revision_id is set if unset.
337
338
        Trees are retrieved in batches of 100, and then yielded in the order
339
        they were requested.
340
341
        :param revs: A list of revision ids
342
        """
3172.4.4 by Robert Collins
Review feedback.
343
        # In case that revs is not a list.
344
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
345
        while revs:
346
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
347
                if tree.inventory.revision_id is None:
348
                    tree.inventory.revision_id = tree.get_revision_id()
349
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
350
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
351
3380.2.4 by Aaron Bentley
Updates from review
352
    def _find_root_ids(self, revs, parent_map, graph):
353
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
354
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
355
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
356
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
357
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
358
            planned_versions.setdefault(root_id, []).append(revision_id)
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
359
            revision_root[revision_id] = root_id
360
        # Find out which parents we don't already know root ids for
361
        parents = set()
362
        for revision_parents in parent_map.itervalues():
363
            parents.update(revision_parents)
364
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
365
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
366
        parents = graph.get_parent_map(parents).keys()
367
        for tree in self.iter_rev_trees(parents):
368
            root_id = tree.get_root_id()
369
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
370
        return revision_root, planned_versions
371
372
    def generate_root_texts(self, revs):
373
        """Generate VersionedFiles for all root ids.
374
375
        :param revs: the revisions to include
376
        """
377
        to_store = self.target.weave_store
378
        graph = self.source.get_graph()
379
        parent_map = graph.get_parent_map(revs)
380
        revision_root, planned_versions = self._find_root_ids(
381
            revs, parent_map, graph)
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
382
        for root_id, versions in planned_versions.iteritems():
383
            versionedfile = to_store.get_weave_or_empty(root_id,
384
                self.target.get_transaction())
385
            parent_texts = {}
386
            for revision_id in versions:
387
                if revision_id in versionedfile:
388
                    continue
389
                parents = parent_map[revision_id]
3380.2.4 by Aaron Bentley
Updates from review
390
                # We drop revision parents with different file-ids, because
391
                # a version cannot have a version with another file-id as its
392
                # parent.
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
393
                # When a parent revision is a ghost, we guess that its root id
394
                # was unchanged.
395
                parents = tuple(p for p in parents if p != NULL_REVISION
396
                    and revision_root.get(p, root_id) == root_id)
397
                result = versionedfile.add_lines_with_ghosts(
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
398
                    revision_id, parents, [], parent_texts)
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
399
                parent_texts[revision_id] = result[2]
1910.2.48 by Aaron Bentley
Update from review comments
400
401
    def regenerate_inventory(self, revs):
402
        """Generate a new inventory versionedfile in target, convertin data.
403
        
404
        The inventory is retrieved from the source, (deserializing it), and
405
        stored in the target (reserializing it in a different format).
406
        :param revs: The revisions to include
407
        """
408
        for tree in self.iter_rev_trees(revs):
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
409
            parents = tree.get_parent_ids()
1910.2.48 by Aaron Bentley
Update from review comments
410
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
411
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
412
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
413
    def fetch_revisions(self, revision_ids):
414
        for revision in self.source.get_revisions(revision_ids):
415
            self.target.add_revision(revision.revision_id, revision)
416
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
417
418
class Model1toKnit2Fetcher(GenericRepoFetcher):
419
    """Fetch from a Model1 repository into a Knit2 repository
420
    """
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
421
    def __init__(self, to_repository, from_repository, last_revision=None,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
422
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
423
        self.helper = Inter1and2Helper(from_repository, to_repository)
424
        GenericRepoFetcher.__init__(self, to_repository, from_repository,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
425
            last_revision, pb, find_ghosts)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
426
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
427
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
428
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
429
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
430
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
431
        self.helper.regenerate_inventory(revs)
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
432
433
    def _copy_revision(self, rev, to_txn):
434
        self.helper.fetch_revisions([rev])
435
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
436
437
class Knit1to2Fetcher(KnitRepoFetcher):
438
    """Fetch from a Knit1 repository into a Knit2 repository"""
439
1910.2.48 by Aaron Bentley
Update from review comments
440
    def __init__(self, to_repository, from_repository, last_revision=None, 
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
441
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
442
        self.helper = Inter1and2Helper(from_repository, to_repository)
443
        KnitRepoFetcher.__init__(self, to_repository, from_repository,
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
444
            last_revision, pb, find_ghosts)
1910.2.48 by Aaron Bentley
Update from review comments
445
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
446
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
447
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
448
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
449
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
450
        self.helper.regenerate_inventory(revs)
2535.3.62 by Andrew Bennetts
Cosmetic changes.
451
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
452
    def _fetch_just_revision_texts(self, version_ids, from_transaction,
453
                                   to_transaction):
454
        self.helper.fetch_revisions(version_ids)
455
1910.2.17 by Aaron Bentley
Get fetching from 1 to 2 under test
456
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
457
class RemoteToOtherFetcher(GenericRepoFetcher):
2535.3.62 by Andrew Bennetts
Cosmetic changes.
458
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
459
    def _fetch_everything_for_search(self, search, pp):
460
        data_stream = self.from_repository.get_data_stream_for_search(search)
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
461
        self.to_repository.insert_data_stream(data_stream)
462
463