~bzr-pqm/bzr/bzr.dev

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