/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
65
def _pb_stream_adapter(pb, msg, num_keys, stream):
66
    def adapter():
67
        for idx, record in enumerate(stream):
68
            pb.update(msg, idx, num_keys)
69
            yield record
70
    return adapter
71
1238 by Martin Pool
- remove a lot of dead code from fetch
72
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
73
class RepoFetcher(object):
74
    """Pull revisions and texts from one repository to another.
75
76
    last_revision
77
        if set, try to limit to the data this revision references.
78
79
    after running:
1260 by Martin Pool
- some updates for fetch/update function
80
    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.
81
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
82
    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.
83
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
84
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
85
86
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
3871.3.1 by Martin Pool
Don't set a pack write cache size from RepoFetcher, because the cache is not coherent with reads and causes ShortReadvErrors
87
        find_ghosts=True):
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
88
        """Create a repo fetcher.
89
90
        :param find_ghosts: If True search the entire history for ghosts.
3834.4.5 by Andrew Bennetts
Add some comments to fetch.py
91
        :param _write_group_acquired_callable: Don't use; this parameter only
92
            exists to facilitate a hack done in InterPackRepo.fetch.  We would
93
            like to remove this parameter.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
94
        """
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.
95
        # result variables.
96
        self.failed_revisions = []
97
        self.count_copied = 0
2668.2.6 by Andrew Bennetts
Merge repository-equality.
98
        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.
99
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
100
            raise errors.BzrError('RepoFetcher run '
101
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
102
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
103
        self.to_repository = to_repository
104
        self.from_repository = from_repository
105
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
106
        self._last_revision = last_revision
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
107
        self.find_ghosts = find_ghosts
1185.65.27 by Robert Collins
Tweak storage towards mergability.
108
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
109
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
110
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
111
        else:
112
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
113
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
114
        self.from_repository.lock_read()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
115
        try:
116
            self.to_repository.lock_write()
117
            try:
118
                self.to_repository.start_write_group()
119
                try:
120
                    self.__fetch()
121
                except:
122
                    self.to_repository.abort_write_group(suppress_errors=True)
123
                    raise
124
                else:
125
                    self.to_repository.commit_write_group()
126
            finally:
127
                try:
128
                    if self.nested_pb is not None:
129
                        self.nested_pb.finished()
130
                finally:
131
                    self.to_repository.unlock()
132
        finally:
133
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
134
135
    def __fetch(self):
136
        """Primary worker function.
137
138
        This initialises all the needed variables, and then fetches the 
139
        requested revisions, finally clearing the progress bar.
140
        """
1240 by Martin Pool
- clean up fetch code and add progress bar
141
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
142
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
143
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
144
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
145
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
146
            search = self._revids_to_fetch()
147
            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.
148
                return
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
149
            if getattr(self, '_fetch_everything_for_search', None) is not None:
150
                self._fetch_everything_for_search(search, pp)
151
            else:
152
                # backward compatibility
153
                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.
154
        finally:
155
            self.pb.clear()
156
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
157
    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.
158
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
159
        # 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.
160
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
161
        # that phase is progressing than we do.  Progress updates for the other
162
        # phases are taken care of in this function.
163
        # 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.
164
        # item_keys_introduced_by should have a richer API than it does at the
165
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
166
        # function?
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
167
        phase = 'file'
168
        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.
169
        try:
3735.4.3 by Andrew Bennetts
Add _find_keys_to_fetch, and use it instead of item_keys_introduced_by when available.
170
            from_repo = self.from_repository
3735.4.4 by Andrew Bennetts
Change the layering, to put the custom file_id list underneath item_keys_intoduced_by
171
            revs = search.get_keys()
172
            revs = list(from_repo.get_graph().iter_topo_order(revs))
173
            data_to_fetch = from_repo.item_keys_introduced_by(revs, 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.
174
            text_keys = []
2668.2.5 by Andrew Bennetts
Rename get_data_about_revision_ids to get_data_to_fetch_for_revision_ids.
175
            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.
176
                if knit_kind != phase:
177
                    phase = knit_kind
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
178
                    # Make a new progress bar for this phase
179
                    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.
180
                    pp.next_phase()
181
                    pb = bzrlib.ui.ui_factory.nested_progress_bar()
182
                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.
183
                    # Accumulate file texts
184
                    text_keys.extend([(file_id, revision) for revision in
185
                        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.
186
                elif knit_kind == "inventory":
3735.2.9 by Robert Collins
Get a working chk_map using inventory implementation bootstrapped.
187
                    # When the inventory keys start being reported, all text
188
                    # keys have already been issued - and we want the text keys
189
                    # inserted before inventory keys: copy the texts.
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
190
                    self._fetch_text_texts(text_keys, pb=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.
191
                    # Cause an error if a text occurs after we have done the
192
                    # copy.
193
                    text_keys = None
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
194
                    # Before we process the inventory we generate the root
195
                    # texts (if necessary) so that the inventories references
196
                    # will be valid.
3735.4.3 by Andrew Bennetts
Add _find_keys_to_fetch, and use it instead of item_keys_introduced_by when available.
197
                    self._generate_root_texts(revisions)
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
198
                    # 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.
199
                    # using a single stream interface instead would avoid this.
3735.4.3 by Andrew Bennetts
Add _find_keys_to_fetch, and use it instead of item_keys_introduced_by when available.
200
                    self._fetch_inventory_weave(revisions, pb)
2535.3.25 by Andrew Bennetts
Fetch signatures too.
201
                elif knit_kind == "signatures":
202
                    # Nothing to do here; this will be taken care of when
203
                    # _fetch_revision_texts happens.
204
                    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.
205
                elif knit_kind == "revisions":
3735.4.3 by Andrew Bennetts
Add _find_keys_to_fetch, and use it instead of item_keys_introduced_by when available.
206
                    self._fetch_revision_texts(revisions, pb)
207
                    self.count_copied += len(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.
208
                else:
209
                    raise AssertionError("Unknown knit kind %r" % knit_kind)
3565.3.4 by Robert Collins
Defer decision to reconcile to the repository being fetched into.
210
            if self.to_repository._fetch_reconcile:
211
                self.to_repository.reconcile()
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
212
        finally:
213
            if pb is not None:
214
                pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
215
        
1185.65.30 by Robert Collins
Merge integration.
216
    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.
217
        """Determines the exact revisions needed from self.from_repository to
218
        install self._last_revision in self.to_repository.
219
220
        If no revisions need to be fetched, then this just returns None.
221
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
222
        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.
223
        if self._last_revision is NULL_REVISION:
224
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
225
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
226
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
227
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
228
            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
229
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
230
            return self.to_repository.search_missing_revision_ids(
231
                self.from_repository, self._last_revision,
232
                find_ghosts=self.find_ghosts)
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
233
        except errors.NoSuchRevision, e:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
234
            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
235
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
236
    def _fetch_text_texts(self, text_keys, pb):
237
        to_texts = self.to_repository.texts
238
        from_texts = self.from_repository.texts
239
        text_stream = from_texts.get_record_stream(text_keys,
240
                            self.to_repository._fetch_order,
241
                            not self.to_repository._fetch_uses_deltas)
242
        adapter = _pb_stream_adapter(pb, 'fetch text', len(text_keys),
243
                                     text_stream)
244
        to_texts.insert_record_stream(adapter())
245
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
246
    def _fetch_inventory_weave(self, revs, pb):
3735.18.1 by John Arbash Meinel
Change the fetch logic to properly use the child_pb for child ops.
247
        # we fetch only the referenced inventories because we do not
248
        # know for unselected inventories whether all their required
249
        # texts are present in the other repository - it could be
250
        # corrupt.
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
251
        if (self.from_repository._format.supports_chks and
252
            self.to_repository._format.supports_chks):
253
            self._fetch_chk_inventories(revs, pb)
254
        elif (self.from_repository._format.supports_chks or
255
              self.to_repository._format.supports_chks):
256
            # Hack to make not-chk->chk fetch: copy the inventories as
257
            # inventories.
258
            total = len(revs)
259
            for idx, inv in enumerate(
260
                self.from_repository.iter_inventories(revs)):
261
                pb.update("Copying inventories", idx, total)
262
                self.to_repository.add_inventory(inv.revision_id, inv, [])
263
        else:
264
            to_weave = self.to_repository.inventories
265
            from_weave = self.from_repository.inventories
266
            adapter = _pb_stream_adapter(pb, 'fetch inv', len(revs),
267
                from_weave.get_record_stream([(rev_id,) for rev_id in revs],
268
                            self.to_repository._fetch_order,
269
                            not self.to_repository._fetch_uses_deltas))
270
            to_weave.insert_record_stream(adapter())
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
271
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
    def _fetch_revision_texts(self, revs, pb):
3830.3.6 by Martin Pool
Document _fetch_uses_delta and make it a class attribute
273
        # fetch signatures first and then the revision texts
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
274
        # 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.
275
        to_sf = self.to_repository.signatures
276
        from_sf = self.from_repository.signatures
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
277
        # 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.
278
        to_sf.insert_record_stream(filter_absent(from_sf.get_record_stream(
279
            [(rev_id,) for rev_id in revs],
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
280
            self.to_repository._fetch_order,
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
281
            not self.to_repository._fetch_uses_deltas)))
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.
282
        self._fetch_just_revision_texts(revs)
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 _fetch_just_revision_texts(self, version_ids):
285
        to_rf = self.to_repository.revisions
286
        from_rf = self.from_repository.revisions
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
287
        # If a revision has a delta, this is actually expanded inside the
288
        # insert_record_stream code now, which is an alternate fix for
289
        # bug #261339
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.
290
        to_rf.insert_record_stream(from_rf.get_record_stream(
291
            [(rev_id,) for rev_id in version_ids],
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
292
            self.to_repository._fetch_order,
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
293
            not self.to_repository._fetch_uses_deltas))
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
294
3735.9.14 by John Arbash Meinel
Start using the iter_interesting_nodes.
295
    def _fetch_chk_inventories(self, revs, pb):
296
        """Fetch the inventory texts, along with the associated chk maps."""
297
        from bzrlib import inventory, chk_map
298
        # We want an inventory outside of the search set, so that we can filter
299
        # out uninteresting chk pages. For now we use
300
        # _find_revision_outside_set, but if we had a Search with cut_revs, we
301
        # could use that instead.
302
        start_rev_id = self.from_repository._find_revision_outside_set(revs)
303
        start_rev_key = (start_rev_id,)
304
        inv_keys_to_fetch = [(rev_id,) for rev_id in revs]
305
        if start_rev_id != NULL_REVISION:
306
            inv_keys_to_fetch.append((start_rev_id,))
307
        # Any repo that supports chk_bytes must also support out-of-order
308
        # insertion. At least, that is how we expect it to work
309
        # We use get_record_stream instead of iter_inventories because we want
310
        # to be able to insert the stream as well. We could instead fetch
311
        # allowing deltas, and then iter_inventories, but we don't know whether
312
        # source or target is more 'local' anway.
313
        inv_stream = self.from_repository.inventories.get_record_stream(
314
            inv_keys_to_fetch, 'unordered',
315
            True) # We need them as full-texts so we can find their references
316
        uninteresting_chk_roots = set()
317
        interesting_chk_roots = set()
3735.2.76 by Robert Collins
Insert a single stream with all inventories being fetched, not one per inventory.
318
        def filter_inv_stream(inv_stream):
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
319
            for idx, record in enumerate(inv_stream):
320
                child_pb.update('fetch inv', idx, len(inv_keys_to_fetch))
3735.2.76 by Robert Collins
Insert a single stream with all inventories being fetched, not one per inventory.
321
                bytes = record.get_bytes_as('fulltext')
322
                chk_inv = inventory.CHKInventory.deserialise(
323
                    self.from_repository.chk_bytes, bytes, record.key)
324
                if record.key == start_rev_key:
325
                    uninteresting_chk_roots.add(chk_inv.id_to_entry.key())
326
                    p_id_map = chk_inv.parent_id_basename_to_file_id
327
                    if p_id_map is not None:
328
                        uninteresting_chk_roots.add(p_id_map.key())
329
                else:
330
                    yield record
331
                    interesting_chk_roots.add(chk_inv.id_to_entry.key())
332
                    p_id_map = chk_inv.parent_id_basename_to_file_id
333
                    if p_id_map is not None:
334
                        interesting_chk_roots.add(p_id_map.key())
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
335
        pb.update('fetch inventory', 0, 2)
336
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
337
        try:
338
            self.to_repository.inventories.insert_record_stream(
339
                filter_inv_stream(inv_stream))
340
        finally:
341
            child_pb.finished()
3735.9.14 by John Arbash Meinel
Start using the iter_interesting_nodes.
342
        # Now that we have worked out all of the interesting root nodes, grab
343
        # all of the interesting pages and insert them
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
344
        pb.update('fetch inventory', 1, 2)
345
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
346
        try:
347
            interesting = chk_map.iter_interesting_nodes(
348
                self.from_repository.chk_bytes, interesting_chk_roots,
349
                uninteresting_chk_roots, pb=child_pb)
350
            def to_stream_adapter():
351
                """Adapt the iter_interesting_nodes result to a single stream.
3735.9.19 by John Arbash Meinel
Refactor iter_interesting a little bit.
352
3735.2.97 by John Arbash Meinel
Change the generic fetch code to give better progress indication.
353
                iter_interesting_nodes returns records as it processes them, which
354
                can be in batches. But we only want a single stream to be inserted.
355
                """
356
                for record, items in interesting:
357
                    for value in record.itervalues():
358
                        yield value
359
            # XXX: We could instead call get_record_stream(records.keys())
360
            #      ATM, this will always insert the records as fulltexts, and
361
            #      requires that you can hang on to records once you have gone
362
            #      on to the next one. Further, it causes the target to
363
            #      recompress the data. Testing shows it to be faster than
364
            #      requesting the records again, though.
365
            self.to_repository.chk_bytes.insert_record_stream(
366
                to_stream_adapter())
367
        finally:
368
            child_pb.finished()
369
        pb.update('fetch inventory', 2, 2)
3735.9.14 by John Arbash Meinel
Start using the iter_interesting_nodes.
370
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
371
    def _generate_root_texts(self, revs):
372
        """This will be called by __fetch between fetching weave texts and
373
        fetching the inventory weave.
374
375
        Subclasses should override this if they need to generate root texts
376
        after fetching weave texts.
377
        """
378
        pass
379
380
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
381
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
382
    """Helper for operations that convert data from model 1 and 2
383
    
384
    This is for use by fetchers and converters.
385
    """
386
387
    def __init__(self, source, target):
388
        """Constructor.
389
390
        :param source: The repository data comes from
391
        :param target: The repository data goes to
392
        """
393
        self.source = source
394
        self.target = target
395
396
    def iter_rev_trees(self, revs):
397
        """Iterate through RevisionTrees efficiently.
398
399
        Additionally, the inventory's revision_id is set if unset.
400
401
        Trees are retrieved in batches of 100, and then yielded in the order
402
        they were requested.
403
404
        :param revs: A list of revision ids
405
        """
3172.4.4 by Robert Collins
Review feedback.
406
        # In case that revs is not a list.
407
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
408
        while revs:
409
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
410
                if tree.inventory.revision_id is None:
411
                    tree.inventory.revision_id = tree.get_revision_id()
412
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
413
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
414
3380.2.4 by Aaron Bentley
Updates from review
415
    def _find_root_ids(self, revs, parent_map, graph):
416
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
417
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
418
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
419
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
420
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
421
            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
422
            revision_root[revision_id] = root_id
423
        # Find out which parents we don't already know root ids for
424
        parents = set()
425
        for revision_parents in parent_map.itervalues():
426
            parents.update(revision_parents)
427
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
428
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
429
        parents = graph.get_parent_map(parents).keys()
430
        for tree in self.iter_rev_trees(parents):
431
            root_id = tree.get_root_id()
432
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
433
        return revision_root, planned_versions
434
435
    def generate_root_texts(self, revs):
436
        """Generate VersionedFiles for all root ids.
437
438
        :param revs: the revisions to include
439
        """
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.
440
        to_texts = self.target.texts
3380.2.4 by Aaron Bentley
Updates from review
441
        graph = self.source.get_graph()
442
        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.
443
        rev_order = topo_sort(parent_map)
444
        rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
3380.2.4 by Aaron Bentley
Updates from review
445
            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.
446
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
447
            rev_order]
448
        # Guaranteed stable, this groups all the file id operations together
449
        # retaining topological order within the revisions of a file id.
450
        # File id splits and joins would invalidate this, but they don't exist
451
        # yet, and are unlikely to in non-rich-root environments anyway.
452
        root_id_order.sort(key=operator.itemgetter(0))
453
        # Create a record stream containing the roots to create.
454
        def yield_roots():
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
455
            for key in root_id_order:
456
                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.
457
                rev_parents = parent_map[rev_id]
3380.2.4 by Aaron Bentley
Updates from review
458
                # 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.
459
                # that represents a rename of the root to a different location
460
                # - its not actually a parent for us. (We could look for that
461
                # file id in the revision tree at considerably more expense,
462
                # but for now this is sufficient (and reconcile will catch and
463
                # correct this anyway).
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
464
                # 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.
465
                # was unchanged (rather than trimming it from the parent list).
466
                parent_keys = tuple((root_id, parent) for parent in rev_parents
467
                    if parent != NULL_REVISION and
468
                        rev_id_to_root_id.get(parent, root_id) == root_id)
469
                yield FulltextContentFactory(key, parent_keys, None, '')
470
        to_texts.insert_record_stream(yield_roots())
1910.2.48 by Aaron Bentley
Update from review comments
471
472
    def regenerate_inventory(self, revs):
473
        """Generate a new inventory versionedfile in target, convertin data.
474
        
475
        The inventory is retrieved from the source, (deserializing it), and
476
        stored in the target (reserializing it in a different format).
477
        :param revs: The revisions to include
478
        """
479
        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.
480
            parents = tree.get_parent_ids()
1910.2.48 by Aaron Bentley
Update from review comments
481
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
482
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
483
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
484
    def fetch_revisions(self, revision_ids):
3606.11.1 by John Arbash Meinel
Fix bug #261339, Always request full texts for Revision texts.
485
        # TODO: should this batch them up rather than requesting 10,000
486
        #       revisions at once?
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
487
        for revision in self.source.get_revisions(revision_ids):
488
            self.target.add_revision(revision.revision_id, revision)
489
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
490
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
491
class Model1toKnit2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
492
    """Fetch from a Model1 repository into a Knit2 repository
493
    """
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.
494
    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
495
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
496
        self.helper = Inter1and2Helper(from_repository, to_repository)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
497
        RepoFetcher.__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
498
            last_revision, pb, find_ghosts)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
499
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
500
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
501
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
502
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
503
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
504
        self.helper.regenerate_inventory(revs)
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
505
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
506
    def _fetch_revision_texts(self, revs, pb):
507
        """Fetch revision object texts"""
508
        count = 0
509
        total = len(revs)
510
        for rev in revs:
511
            pb.update('copying revisions', count, total)
512
            try:
513
                sig_text = self.from_repository.get_signature_text(rev)
514
                self.to_repository.add_signature_text(rev, sig_text)
515
            except errors.NoSuchRevision:
516
                # not signed.
517
                pass
518
            self._copy_revision(rev)
519
            count += 1
520
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.
521
    def _copy_revision(self, rev):
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
522
        self.helper.fetch_revisions([rev])
523
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
524
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
525
class Knit1to2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
526
    """Fetch from a Knit1 repository into a Knit2 repository"""
527
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
528
    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
529
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
530
        self.helper = Inter1and2Helper(from_repository, to_repository)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
531
        RepoFetcher.__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
532
            last_revision, pb, find_ghosts)
1910.2.48 by Aaron Bentley
Update from review comments
533
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
534
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
535
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
536
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
537
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
538
        self.helper.regenerate_inventory(revs)
2535.3.62 by Andrew Bennetts
Cosmetic changes.
539
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.
540
    def _fetch_just_revision_texts(self, version_ids):
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
541
        self.helper.fetch_revisions(version_ids)