/brz/remove-bazaar

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