/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1218 by Martin Pool
- fix up import
16
1231 by Martin Pool
- more progress on fetch on top of weaves
17
"""Copying of history from one branch to another.
18
19
The basic plan is that every branch knows the history of everything
20
that has merged into it.  As the first step of a merge, pull, or
21
branch operation we copy history from the source into the destination
22
branch.
23
"""
24
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
25
from __future__ import absolute_import
26
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.
27
import operator
28
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
29
from .lazy_import import lazy_import
4476.3.9 by Andrew Bennetts
Further reduce duplication.
30
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
31
from breezy import (
4476.3.9 by Andrew Bennetts
Further reduce duplication.
32
    tsort,
6670.4.1 by Jelmer Vernooij
Update imports.
33
    )
34
from breezy.bzr import (
4476.3.9 by Andrew Bennetts
Further reduce duplication.
35
    versionedfile,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
36
    vf_search,
4476.3.9 by Andrew Bennetts
Further reduce duplication.
37
    )
38
""")
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
39
from . import (
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
40
    errors,
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
41
    ui,
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
42
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
43
from .i18n import gettext
44
from .revision import NULL_REVISION
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
45
from .sixish import (
46
    viewvalues,
47
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
48
from .trace import mutter
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.
49
1238 by Martin Pool
- remove a lot of dead code from fetch
50
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
51
class RepoFetcher(object):
52
    """Pull revisions and texts from one repository to another.
53
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
54
    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.
55
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
56
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
57
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
58
    def __init__(self, to_repository, from_repository, last_revision=None,
4961.2.3 by Martin Pool
Delete deprecated pb parameter to RepoFetcher
59
        find_ghosts=True, fetch_spec=None):
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
60
        """Create a repo fetcher.
61
4110.2.2 by Martin Pool
Remove obsolete comments
62
        :param last_revision: If set, try to limit to the data this revision
63
            references.
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
64
        :param fetch_spec: A SearchResult specifying which revisions to fetch.
65
            If set, this overrides last_revision.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
66
        :param find_ghosts: If True search the entire history for ghosts.
67
        """
4509.3.18 by Martin Pool
RepoFetcher relies on Repository.fetch to shortcircuit no-op fetches
68
        # repository.fetch has the responsibility for short-circuiting
69
        # attempts to copy between a repository and itself.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
70
        self.to_repository = to_repository
71
        self.from_repository = from_repository
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
72
        self.sink = to_repository._get_sink()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
73
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
74
        self._last_revision = last_revision
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
75
        self._fetch_spec = fetch_spec
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
76
        self.find_ghosts = find_ghosts
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
77
        self.from_repository.lock_read()
4110.2.22 by Martin Pool
Re-add mutter calls during fetch
78
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
79
               self.from_repository, self.from_repository._format,
80
               self.to_repository, self.to_repository._format)
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
81
        try:
4110.2.3 by Martin Pool
Remove redundant variable from fetch.
82
            self.__fetch()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
83
        finally:
84
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
85
86
    def __fetch(self):
87
        """Primary worker function.
88
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
89
        This initialises all the needed variables, and then fetches the
1185.65.27 by Robert Collins
Tweak storage towards mergability.
90
        requested revisions, finally clearing the progress bar.
91
        """
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
92
        # Roughly this is what we're aiming for fetch to become:
93
        #
94
        # missing = self.sink.insert_stream(self.source.get_stream(search))
95
        # if missing:
96
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
97
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
98
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
99
        self.file_ids_names = {}
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
100
        pb = ui.ui_factory.nested_progress_bar()
4110.2.14 by Martin Pool
Small fetch progress tweaks
101
        pb.show_pct = pb.show_count = False
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
102
        try:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
103
            pb.update(gettext("Finding revisions"), 0, 2)
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
104
            search_result = self._revids_to_fetch()
105
            mutter('fetching: %s', search_result)
106
            if search_result.is_empty():
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
107
                return
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
108
            pb.update(gettext("Fetching revisions"), 1, 2)
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
109
            self._fetch_everything_for_search(search_result)
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
110
        finally:
111
            pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
112
4110.2.6 by Martin Pool
Remove more progressbar cruft from fetch
113
    def _fetch_everything_for_search(self, search):
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
114
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
115
        # 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.
116
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
117
        # that phase is progressing than we do.  Progress updates for the other
118
        # phases are taken care of in this function.
119
        # 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.
120
        # item_keys_introduced_by should have a richer API than it does at the
121
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
122
        # function?
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
123
        if (self.from_repository._format.rich_root_data and
124
            not self.to_repository._format.rich_root_data):
125
            raise errors.IncompatibleRepositories(
126
                self.from_repository, self.to_repository,
127
                "different rich-root support")
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
128
        pb = 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.
129
        try:
4110.2.12 by Martin Pool
Add more fetch progress
130
            pb.update("Get stream source")
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
131
            source = self.from_repository._get_source(
132
                self.to_repository._format)
133
            stream = source.get_stream(search)
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
134
            from_format = self.from_repository._format
4110.2.12 by Martin Pool
Add more fetch progress
135
            pb.update("Inserting stream")
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
136
            resume_tokens, missing_keys = self.sink.insert_stream(
5195.3.14 by Parth Malwankar
optimized to use "revisions" insert_record_stream for counting #records
137
                stream, from_format, [])
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
138
            if missing_keys:
4110.2.12 by Martin Pool
Add more fetch progress
139
                pb.update("Missing keys")
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
140
                stream = source.get_stream_for_missing_keys(missing_keys)
4110.2.12 by Martin Pool
Add more fetch progress
141
                pb.update("Inserting missing keys")
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
142
                resume_tokens, missing_keys = self.sink.insert_stream(
5195.3.14 by Parth Malwankar
optimized to use "revisions" insert_record_stream for counting #records
143
                    stream, from_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
144
            if missing_keys:
145
                raise AssertionError(
146
                    "second push failed to complete a fetch %r." % (
147
                        missing_keys,))
4032.3.7 by Robert Collins
Move write locking and write group responsibilities into the Sink objects themselves, allowing complete avoidance of unnecessary calls when the sink is a RemoteSink.
148
            if resume_tokens:
149
                raise AssertionError(
150
                    "second push failed to commit the fetch %r." % (
151
                        resume_tokens,))
4110.2.12 by Martin Pool
Add more fetch progress
152
            pb.update("Finishing stream")
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
153
            self.sink.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.
154
        finally:
4110.2.6 by Martin Pool
Remove more progressbar cruft from fetch
155
            pb.finished()
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
156
1185.65.30 by Robert Collins
Merge integration.
157
    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.
158
        """Determines the exact revisions needed from self.from_repository to
159
        install self._last_revision in self.to_repository.
160
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
161
        :returns: A SearchResult of some sort.  (Possibly a
5535.3.21 by Andrew Bennetts
Cosmetic tweaks.
162
            PendingAncestryResult, EmptySearchResult, etc.)
2535.3.7 by Andrew Bennetts
Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.
163
        """
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
164
        if self._fetch_spec is not None:
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
165
            # The fetch spec is already a concrete search result.
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
166
            return self._fetch_spec
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
167
        elif self._last_revision == NULL_REVISION:
168
            # fetch_spec is None + last_revision is null => empty fetch.
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.
169
            # explicit limit of no revisions needed
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
170
            return vf_search.EmptySearchResult()
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
171
        elif self._last_revision is not None:
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
172
            return vf_search.NotInOtherForRevs(self.to_repository,
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
173
                self.from_repository, [self._last_revision],
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
174
                find_ghosts=self.find_ghosts).execute()
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
175
        else: # self._last_revision is None:
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
176
            return vf_search.EverythingNotInOther(self.to_repository,
5539.2.19 by Andrew Bennetts
Define SearchResult/Search interfaces with explicit abstract base classes, add some docstrings and change a method name.
177
                self.from_repository,
5536.3.1 by Andrew Bennetts
Rename get_search_result to execute, require a SearchResult (and not a search) be passed to fetch.
178
                find_ghosts=self.find_ghosts).execute()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
179
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
180
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
181
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
182
    """Helper for operations that convert data from model 1 and 2
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
183
1910.2.48 by Aaron Bentley
Update from review comments
184
    This is for use by fetchers and converters.
185
    """
186
5050.32.1 by Andrew Bennetts
Fix fetching more than 100 revisions from non-rich-root to rich-root repositories.
187
    # This is a class variable so that the test suite can override it.
188
    known_graph_threshold = 100
189
4022.1.1 by Robert Collins
Refactoring of fetch to have a sender and sink component enabling splitting the logic over a network stream. (Robert Collins, Andrew Bennetts)
190
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
191
        """Constructor.
192
193
        :param source: The repository data comes from
194
        """
195
        self.source = source
196
197
    def iter_rev_trees(self, revs):
198
        """Iterate through RevisionTrees efficiently.
199
200
        Additionally, the inventory's revision_id is set if unset.
201
202
        Trees are retrieved in batches of 100, and then yielded in the order
203
        they were requested.
204
205
        :param revs: A list of revision ids
206
        """
3172.4.4 by Robert Collins
Review feedback.
207
        # In case that revs is not a list.
208
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
209
        while revs:
210
            for tree in self.source.revision_trees(revs[:100]):
6405.2.6 by Jelmer Vernooij
Lots of test fixes.
211
                if tree.root_inventory.revision_id is None:
212
                    tree.root_inventory.revision_id = tree.get_revision_id()
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
213
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
214
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
215
3380.2.4 by Aaron Bentley
Updates from review
216
    def _find_root_ids(self, revs, parent_map, graph):
217
        revision_root = {}
1910.2.48 by Aaron Bentley
Update from review comments
218
        for tree in self.iter_rev_trees(revs):
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
219
            root_id = tree.get_root_id()
6405.2.6 by Jelmer Vernooij
Lots of test fixes.
220
            revision_id = tree.get_file_revision(root_id, u"")
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
221
            revision_root[revision_id] = root_id
222
        # Find out which parents we don't already know root ids for
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
223
        parents = set(viewvalues(parent_map))
224
        parents.difference_update(revision_root)
225
        parents.discard(NULL_REVISION)
3380.2.7 by Aaron Bentley
Update docs
226
        # Limit to revisions present in the versionedfile
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
227
        parents = graph.get_parent_map(parents)
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
228
        for tree in self.iter_rev_trees(parents):
229
            root_id = tree.get_root_id()
230
            revision_root[tree.get_revision_id()] = root_id
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
231
        return revision_root
3380.2.4 by Aaron Bentley
Updates from review
232
233
    def generate_root_texts(self, revs):
234
        """Generate VersionedFiles for all root ids.
235
236
        :param revs: the revisions to include
237
        """
238
        graph = self.source.get_graph()
239
        parent_map = graph.get_parent_map(revs)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
240
        rev_order = tsort.topo_sort(parent_map)
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
241
        rev_id_to_root_id = self._find_root_ids(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.
242
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
243
            rev_order]
244
        # Guaranteed stable, this groups all the file id operations together
245
        # retaining topological order within the revisions of a file id.
246
        # File id splits and joins would invalidate this, but they don't exist
247
        # yet, and are unlikely to in non-rich-root environments anyway.
248
        root_id_order.sort(key=operator.itemgetter(0))
249
        # Create a record stream containing the roots to create.
5050.32.1 by Andrew Bennetts
Fix fetching more than 100 revisions from non-rich-root to rich-root repositories.
250
        if len(revs) > self.known_graph_threshold:
251
            graph = self.source.get_known_graph_ancestry(revs)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
252
        new_roots_stream = _new_root_data_stream(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
253
            root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
254
        return [('texts', new_roots_stream)]
255
256
257
def _new_root_data_stream(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
258
    root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
259
    """Generate a texts substream of synthesised root entries.
260
261
    Used in fetches that do rich-root upgrades.
262
    
263
    :param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
264
        the root entries to create.
265
    :param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
266
        calculating the parents.  If a parent rev_id is not found here then it
267
        will be recalculated.
268
    :param parent_map: a parent map for all the revisions in
269
        root_keys_to_create.
270
    :param graph: a graph to use instead of repo.get_graph().
271
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
272
    for root_key in root_keys_to_create:
273
        root_id, rev_id = root_key
274
        parent_keys = _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
275
            root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
276
        yield versionedfile.FulltextContentFactory(
277
            root_key, parent_keys, None, '')
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
278
279
280
def _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
281
    root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
282
    """Get the parent keys for a given root id.
283
    
284
    A helper function for _new_root_data_stream.
285
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
286
    # Include direct parents of the revision, but only if they used the same
287
    # root_id and are heads.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
288
    rev_parents = parent_map[rev_id]
289
    parent_ids = []
290
    for parent_id in rev_parents:
291
        if parent_id == NULL_REVISION:
292
            continue
293
        if parent_id not in rev_id_to_root_id_map:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
294
            # We probably didn't read this revision, go spend the extra effort
295
            # to actually check
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
296
            try:
297
                tree = repo.revision_tree(parent_id)
298
            except errors.NoSuchRevision:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
299
                # Ghost, fill out rev_id_to_root_id in case we encounter this
300
                # again.
301
                # But set parent_root_id to None since we don't really know
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
302
                parent_root_id = None
303
            else:
304
                parent_root_id = tree.get_root_id()
305
            rev_id_to_root_id_map[parent_id] = None
4476.3.21 by Andrew Bennetts
Clarify some code and comments, and s/1.17/1.18/ in a few places.
306
            # XXX: why not:
307
            #   rev_id_to_root_id_map[parent_id] = parent_root_id
308
            # memory consumption maybe?
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
309
        else:
310
            parent_root_id = rev_id_to_root_id_map[parent_id]
311
        if root_id == parent_root_id:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
312
            # With stacking we _might_ want to refer to a non-local revision,
313
            # but this code path only applies when we have the full content
314
            # available, so ghosts really are ghosts, not just the edge of
315
            # local data.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
316
            parent_ids.append(parent_id)
317
        else:
318
            # root_id may be in the parent anyway.
319
            try:
320
                tree = repo.revision_tree(parent_id)
321
            except errors.NoSuchRevision:
322
                # ghost, can't refer to it.
323
                pass
324
            else:
325
                try:
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
326
                    parent_ids.append(tree.get_file_revision(root_id))
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
327
                except errors.NoSuchId:
328
                    # not in the tree
329
                    pass
330
    # Drop non-head parents
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
331
    if graph is None:
332
        graph = repo.get_graph()
333
    heads = graph.heads(parent_ids)
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
334
    selected_ids = []
335
    for parent_id in parent_ids:
336
        if parent_id in heads and parent_id not in selected_ids:
337
            selected_ids.append(parent_id)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
338
    parent_keys = [(root_id, parent_id) for parent_id in selected_ids]
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
339
    return parent_keys
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
340
341
342
class TargetRepoKinds(object):
343
    """An enum-like set of constants.
344
    
345
    They are the possible values of FetchSpecFactory.target_repo_kinds.
346
    """
347
    
348
    PREEXISTING = 'preexisting'
349
    STACKED = 'stacked'
350
    EMPTY = 'empty'
351
352
353
class FetchSpecFactory(object):
354
    """A helper for building the best fetch spec for a sprout call.
355
356
    Factors that go into determining the sort of fetch to perform:
357
     * did the caller specify any revision IDs?
5672.1.3 by Andrew Bennetts
Rename a variable, update a docstring.
358
     * did the caller specify a source branch (need to fetch its
359
       heads_to_fetch(), usually the tip + tags)
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
360
     * is there an existing target repo (don't need to refetch revs it
361
       already has)
362
     * target is stacked?  (similar to pre-existing target repo: even if
363
       the target itself is new don't want to refetch existing revs)
364
365
    :ivar source_branch: the source branch if one specified, else None.
366
    :ivar source_branch_stop_revision_id: fetch up to this revision of
367
        source_branch, rather than its tip.
368
    :ivar source_repo: the source repository if one found, else None.
369
    :ivar target_repo: the target repository acquired by sprout.
370
    :ivar target_repo_kind: one of the TargetRepoKinds constants.
371
    """
372
373
    def __init__(self):
374
        self._explicit_rev_ids = set()
375
        self.source_branch = None
376
        self.source_branch_stop_revision_id = None
377
        self.source_repo = None
378
        self.target_repo = None
379
        self.target_repo_kind = None
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
380
        self.limit = None
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
381
382
    def add_revision_ids(self, revision_ids):
383
        """Add revision_ids to the set of revision_ids to be fetched."""
384
        self._explicit_rev_ids.update(revision_ids)
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
385
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
386
    def make_fetch_spec(self):
387
        """Build a SearchResult or PendingAncestryResult or etc."""
388
        if self.target_repo_kind is None or self.source_repo is None:
389
            raise AssertionError(
390
                'Incomplete FetchSpecFactory: %r' % (self.__dict__,))
391
        if len(self._explicit_rev_ids) == 0 and self.source_branch is None:
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
392
            if self.limit is not None:
5852.1.11 by Jelmer Vernooij
Review feedback from Andrew: use NotImplementedError instead of UnsupportedOperation, use simpler build_commit rather than build_snapshot.
393
                raise NotImplementedError(
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
394
                    "limit is only supported with a source branch set")
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
395
            # Caller hasn't specified any revisions or source branch
396
            if self.target_repo_kind == TargetRepoKinds.EMPTY:
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
397
                return vf_search.EverythingResult(self.source_repo)
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
398
            else:
399
                # We want everything not already in the target (or target's
400
                # fallbacks).
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
401
                return vf_search.EverythingNotInOther(
5535.4.25 by Andrew Bennetts
Update some more code paths for the change to only accepting SearchResults to fetch().
402
                    self.target_repo, self.source_repo).execute()
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
403
        heads_to_fetch = set(self._explicit_rev_ids)
404
        if self.source_branch is not None:
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
405
            must_fetch, if_present_fetch = self.source_branch.heads_to_fetch()
406
            if self.source_branch_stop_revision_id is not None:
407
                # Replace the tip rev from must_fetch with the stop revision
408
                # XXX: this might be wrong if the tip rev is also in the
409
                # must_fetch set for other reasons (e.g. it's the tip of
410
                # multiple loom threads?), but then it's pretty unclear what it
411
                # should mean to specify a stop_revision in that case anyway.
412
                must_fetch.discard(self.source_branch.last_revision())
413
                must_fetch.add(self.source_branch_stop_revision_id)
5672.1.1 by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it.
414
            heads_to_fetch.update(must_fetch)
415
        else:
5672.1.3 by Andrew Bennetts
Rename a variable, update a docstring.
416
            if_present_fetch = set()
5535.4.23 by Andrew Bennetts
Move FetchSpecFactory and TargetRepoKinds to bzrlib.fetch (from bzrlib.controldir).
417
        if self.target_repo_kind == TargetRepoKinds.EMPTY:
418
            # PendingAncestryResult does not raise errors if a requested head
419
            # is absent.  Ideally it would support the
420
            # required_ids/if_present_ids distinction, but in practice
421
            # heads_to_fetch will almost certainly be present so this doesn't
422
            # matter much.
5672.1.3 by Andrew Bennetts
Rename a variable, update a docstring.
423
            all_heads = heads_to_fetch.union(if_present_fetch)
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
424
            ret = vf_search.PendingAncestryResult(all_heads, self.source_repo)
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
425
            if self.limit is not None:
426
                graph = self.source_repo.get_graph()
427
                topo_order = list(graph.iter_topo_order(ret.get_keys()))
5852.1.6 by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids.
428
                result_set = topo_order[:self.limit]
429
                ret = self.source_repo.revision_ids_to_search_result(result_set)
430
            return ret
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
431
        else:
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
432
            return vf_search.NotInOtherForRevs(self.target_repo, self.source_repo,
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
433
                required_ids=heads_to_fetch, if_present_ids=if_present_fetch,
434
                limit=self.limit).execute()