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