/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,
3834.4.1 by Andrew Bennetts
Make InterPackRepo set the packer cache size even when there is stacking.
80
        find_ghosts=True, _write_group_acquired_callable=None):
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
3834.4.1 by Andrew Bennetts
Make InterPackRepo set the packer cache size even when there is stacking.
101
        self._write_group_acquired_callable = _write_group_acquired_callable
1185.65.27 by Robert Collins
Tweak storage towards mergability.
102
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
103
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
104
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
105
        else:
106
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
107
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
108
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
109
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
110
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
111
            try:
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
112
                self.to_repository.start_write_group()
113
                try:
3834.4.1 by Andrew Bennetts
Make InterPackRepo set the packer cache size even when there is stacking.
114
                    if self._write_group_acquired_callable is not None:
3834.4.5 by Andrew Bennetts
Add some comments to fetch.py
115
                        # Used by InterPackRepo.fetch to set_write_cache_size
116
                        # on the new pack.
3834.4.1 by Andrew Bennetts
Make InterPackRepo set the packer cache size even when there is stacking.
117
                        self._write_group_acquired_callable()
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
118
                    self.__fetch()
119
                except:
3825.4.1 by Andrew Bennetts
Add suppress_errors to abort_write_group.
120
                    self.to_repository.abort_write_group(suppress_errors=True)
2617.6.2 by Robert Collins
Add abort_write_group and wire write_groups into fetch and commit.
121
                    raise
122
                else:
123
                    self.to_repository.commit_write_group()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
124
            finally:
3381.1.2 by Aaron Bentley
Cleanup
125
                try:
126
                    if self.nested_pb is not None:
127
                        self.nested_pb.finished()
128
                finally:
129
                    self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
130
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
131
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
132
133
    def __fetch(self):
134
        """Primary worker function.
135
136
        This initialises all the needed variables, and then fetches the 
137
        requested revisions, finally clearing the progress bar.
138
        """
1240 by Martin Pool
- clean up fetch code and add progress bar
139
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
140
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
141
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
142
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
143
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
144
            search = self._revids_to_fetch()
145
            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.
146
                return
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
147
            if getattr(self, '_fetch_everything_for_search', None) is not None:
148
                self._fetch_everything_for_search(search, pp)
149
            else:
150
                # backward compatibility
151
                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.
152
        finally:
153
            self.pb.clear()
154
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
155
    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.
156
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
157
        # 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.
158
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
159
        # that phase is progressing than we do.  Progress updates for the other
160
        # phases are taken care of in this function.
161
        # 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.
162
        # item_keys_introduced_by should have a richer API than it does at the
163
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
164
        # function?
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
165
        phase = 'file'
166
        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.
167
        try:
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
168
            revs = search.get_keys()
3380.1.1 by Aaron Bentley
Fix inventory insertion to work in topological order
169
            graph = self.from_repository.get_graph()
170
            revs = list(graph.iter_topo_order(revs))
171
            data_to_fetch = self.from_repository.item_keys_introduced_by(revs,
172
                                                                         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.
173
            text_keys = []
2668.2.5 by Andrew Bennetts
Rename get_data_about_revision_ids to get_data_to_fetch_for_revision_ids.
174
            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.
175
                if knit_kind != phase:
176
                    phase = knit_kind
2535.3.8 by Andrew Bennetts
Unbreak progress reporting.
177
                    # Make a new progress bar for this phase
178
                    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.
179
                    pp.next_phase()
180
                    pb = bzrlib.ui.ui_factory.nested_progress_bar()
181
                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.
182
                    # Accumulate file texts
183
                    text_keys.extend([(file_id, revision) for revision in
184
                        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.
185
                elif knit_kind == "inventory":
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
186
                    # Now copy the file texts.
187
                    to_texts = self.to_repository.texts
188
                    from_texts = self.from_repository.texts
189
                    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
190
                        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.
191
                        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.
192
                    # Cause an error if a text occurs after we have done the
193
                    # copy.
194
                    text_keys = None
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
195
                    # Before we process the inventory we generate the root
196
                    # texts (if necessary) so that the inventories references
197
                    # will be valid.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
198
                    self._generate_root_texts(revs)
3422.1.1 by John Arbash Meinel
merge in bzr-1.5rc1, revert the transaction cache change
199
                    # 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.
200
                    # using a single stream interface instead would avoid this.
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
201
                    self._fetch_inventory_weave(revs, pb)
2535.3.25 by Andrew Bennetts
Fetch signatures too.
202
                elif knit_kind == "signatures":
203
                    # Nothing to do here; this will be taken care of when
204
                    # _fetch_revision_texts happens.
205
                    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.
206
                elif knit_kind == "revisions":
207
                    self._fetch_revision_texts(revs, pb)
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
        self.count_copied += len(revs)
216
        
1185.65.30 by Robert Collins
Merge integration.
217
    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.
218
        """Determines the exact revisions needed from self.from_repository to
219
        install self._last_revision in self.to_repository.
220
221
        If no revisions need to be fetched, then this just returns None.
222
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
223
        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.
224
        if self._last_revision is NULL_REVISION:
225
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
226
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
227
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
228
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
229
            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
230
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
231
            return self.to_repository.search_missing_revision_ids(
232
                self.from_repository, self._last_revision,
233
                find_ghosts=self.find_ghosts)
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
234
        except errors.NoSuchRevision, e:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
235
            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
236
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
237
    def _fetch_inventory_weave(self, revs, pb):
238
        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.
239
        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.
240
        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.
241
        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.
242
            # just merge, this is optimisable and its means we don't
243
            # copy unreferenced data such as not-needed inventories.
244
            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.
245
            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.
246
            pb.update("fetch inventory", 2, 3)
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.
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.
251
            to_weave.insert_record_stream(from_weave.get_record_stream(
252
                [(rev_id,) for rev_id in revs],
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
253
                self.to_repository._fetch_order,
3606.7.2 by John Arbash Meinel
Find a couple more places with incorrect logic, and fix the tests effected.
254
                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.
255
        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.
256
            child_pb.finished()
2668.2.1 by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids.
257
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
258
    def _fetch_revision_texts(self, revs, pb):
3830.3.6 by Martin Pool
Document _fetch_uses_delta and make it a class attribute
259
        # fetch signatures first and then the revision texts
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
260
        # 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.
261
        to_sf = self.to_repository.signatures
262
        from_sf = self.from_repository.signatures
3350.3.19 by Robert Collins
Eliminate the use of VersionedFile.join when fetching data.
263
        # 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.
264
        to_sf.insert_record_stream(filter_absent(from_sf.get_record_stream(
265
            [(rev_id,) for rev_id in revs],
3565.3.1 by Robert Collins
* The generic fetch code now uses two attributes on Repository objects
266
            self.to_repository._fetch_order,
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
267
            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.
268
        self._fetch_just_revision_texts(revs)
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
269
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
    def _fetch_just_revision_texts(self, version_ids):
271
        to_rf = self.to_repository.revisions
272
        from_rf = self.from_repository.revisions
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
273
        # If a revision has a delta, this is actually expanded inside the
274
        # insert_record_stream code now, which is an alternate fix for
275
        # 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.
276
        to_rf.insert_record_stream(from_rf.get_record_stream(
277
            [(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
278
            self.to_repository._fetch_order,
3849.3.1 by John Arbash Meinel
Part of bug #300289, stop requiring plain fulltexts for revisions.
279
            not self.to_repository._fetch_uses_deltas))
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
280
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
281
    def _generate_root_texts(self, revs):
282
        """This will be called by __fetch between fetching weave texts and
283
        fetching the inventory weave.
284
285
        Subclasses should override this if they need to generate root texts
286
        after fetching weave texts.
287
        """
288
        pass
289
290
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
291
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
292
    """Helper for operations that convert data from model 1 and 2
293
    
294
    This is for use by fetchers and converters.
295
    """
296
297
    def __init__(self, source, target):
298
        """Constructor.
299
300
        :param source: The repository data comes from
301
        :param target: The repository data goes to
302
        """
303
        self.source = source
304
        self.target = target
305
306
    def iter_rev_trees(self, revs):
307
        """Iterate through RevisionTrees efficiently.
308
309
        Additionally, the inventory's revision_id is set if unset.
310
311
        Trees are retrieved in batches of 100, and then yielded in the order
312
        they were requested.
313
314
        :param revs: A list of revision ids
315
        """
3172.4.4 by Robert Collins
Review feedback.
316
        # In case that revs is not a list.
317
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
318
        while revs:
319
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
320
                if tree.inventory.revision_id is None:
321
                    tree.inventory.revision_id = tree.get_revision_id()
322
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
323
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
324
3380.2.4 by Aaron Bentley
Updates from review
325
    def _find_root_ids(self, revs, parent_map, graph):
326
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
327
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
328
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
329
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
330
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
331
            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
332
            revision_root[revision_id] = root_id
333
        # Find out which parents we don't already know root ids for
334
        parents = set()
335
        for revision_parents in parent_map.itervalues():
336
            parents.update(revision_parents)
337
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
338
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
339
        parents = graph.get_parent_map(parents).keys()
340
        for tree in self.iter_rev_trees(parents):
341
            root_id = tree.get_root_id()
342
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
343
        return revision_root, planned_versions
344
345
    def generate_root_texts(self, revs):
346
        """Generate VersionedFiles for all root ids.
347
348
        :param revs: the revisions to include
349
        """
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.
350
        to_texts = self.target.texts
3380.2.4 by Aaron Bentley
Updates from review
351
        graph = self.source.get_graph()
352
        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.
353
        rev_order = topo_sort(parent_map)
354
        rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
3380.2.4 by Aaron Bentley
Updates from review
355
            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.
356
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
357
            rev_order]
358
        # Guaranteed stable, this groups all the file id operations together
359
        # retaining topological order within the revisions of a file id.
360
        # File id splits and joins would invalidate this, but they don't exist
361
        # yet, and are unlikely to in non-rich-root environments anyway.
362
        root_id_order.sort(key=operator.itemgetter(0))
363
        # Create a record stream containing the roots to create.
364
        def yield_roots():
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
365
            for key in root_id_order:
366
                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.
367
                rev_parents = parent_map[rev_id]
3380.2.4 by Aaron Bentley
Updates from review
368
                # 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.
369
                # that represents a rename of the root to a different location
370
                # - its not actually a parent for us. (We could look for that
371
                # file id in the revision tree at considerably more expense,
372
                # but for now this is sufficient (and reconcile will catch and
373
                # correct this anyway).
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
374
                # 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.
375
                # was unchanged (rather than trimming it from the parent list).
376
                parent_keys = tuple((root_id, parent) for parent in rev_parents
377
                    if parent != NULL_REVISION and
378
                        rev_id_to_root_id.get(parent, root_id) == root_id)
379
                yield FulltextContentFactory(key, parent_keys, None, '')
380
        to_texts.insert_record_stream(yield_roots())
1910.2.48 by Aaron Bentley
Update from review comments
381
382
    def regenerate_inventory(self, revs):
383
        """Generate a new inventory versionedfile in target, convertin data.
384
        
385
        The inventory is retrieved from the source, (deserializing it), and
386
        stored in the target (reserializing it in a different format).
387
        :param revs: The revisions to include
388
        """
389
        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.
390
            parents = tree.get_parent_ids()
1910.2.48 by Aaron Bentley
Update from review comments
391
            self.target.add_inventory(tree.get_revision_id(), tree.inventory,
392
                                      parents)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
393
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
394
    def fetch_revisions(self, revision_ids):
3606.11.1 by John Arbash Meinel
Fix bug #261339, Always request full texts for Revision texts.
395
        # TODO: should this batch them up rather than requesting 10,000
396
        #       revisions at once?
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
397
        for revision in self.source.get_revisions(revision_ids):
398
            self.target.add_revision(revision.revision_id, revision)
399
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
400
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
401
class Model1toKnit2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
402
    """Fetch from a Model1 repository into a Knit2 repository
403
    """
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.
404
    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
405
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
406
        self.helper = Inter1and2Helper(from_repository, to_repository)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
407
        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
408
            last_revision, pb, find_ghosts)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
409
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
410
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
411
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
412
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
413
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
414
        self.helper.regenerate_inventory(revs)
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
415
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
416
    def _fetch_revision_texts(self, revs, pb):
417
        """Fetch revision object texts"""
418
        count = 0
419
        total = len(revs)
420
        for rev in revs:
421
            pb.update('copying revisions', count, total)
422
            try:
423
                sig_text = self.from_repository.get_signature_text(rev)
424
                self.to_repository.add_signature_text(rev, sig_text)
425
            except errors.NoSuchRevision:
426
                # not signed.
427
                pass
428
            self._copy_revision(rev)
429
            count += 1
430
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.
431
    def _copy_revision(self, rev):
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
432
        self.helper.fetch_revisions([rev])
433
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
434
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
435
class Knit1to2Fetcher(RepoFetcher):
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
436
    """Fetch from a Knit1 repository into a Knit2 repository"""
437
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
438
    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
439
                 pb=None, find_ghosts=True):
1910.2.48 by Aaron Bentley
Update from review comments
440
        self.helper = Inter1and2Helper(from_repository, to_repository)
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
441
        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
442
            last_revision, pb, find_ghosts)
1910.2.48 by Aaron Bentley
Update from review comments
443
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
444
    def _generate_root_texts(self, revs):
1910.2.48 by Aaron Bentley
Update from review comments
445
        self.helper.generate_root_texts(revs)
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
446
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
447
    def _fetch_inventory_weave(self, revs, pb):
1910.2.48 by Aaron Bentley
Update from review comments
448
        self.helper.regenerate_inventory(revs)
2535.3.62 by Andrew Bennetts
Cosmetic changes.
449
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.
450
    def _fetch_just_revision_texts(self, version_ids):
3380.1.6 by Aaron Bentley
Ensure fetching munges sha1s
451
        self.helper.fetch_revisions(version_ids)