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