/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
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
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.
26
import operator
27
4476.3.9 by Andrew Bennetts
Further reduce duplication.
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
30
from bzrlib import (
5539.2.1 by Andrew Bennetts
Start defining an 'everything' fetch spec.
31
    graph,
4476.3.9 by Andrew Bennetts
Further reduce duplication.
32
    tsort,
33
    versionedfile,
34
    )
35
""")
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.
36
import bzrlib
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
37
from bzrlib import (
38
    errors,
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
39
    ui,
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
40
    )
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)
41
from bzrlib.revision import NULL_REVISION
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
42
from bzrlib.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.
43
1238 by Martin Pool
- remove a lot of dead code from fetch
44
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
45
class RepoFetcher(object):
46
    """Pull revisions and texts from one repository to another.
47
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
48
    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.
49
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
50
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
51
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
52
    def __init__(self, to_repository, from_repository, last_revision=None,
4961.2.3 by Martin Pool
Delete deprecated pb parameter to RepoFetcher
53
        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
54
        """Create a repo fetcher.
55
4110.2.2 by Martin Pool
Remove obsolete comments
56
        :param last_revision: If set, try to limit to the data this revision
57
            references.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
58
        :param find_ghosts: If True search the entire history for ghosts.
59
        """
4509.3.18 by Martin Pool
RepoFetcher relies on Repository.fetch to shortcircuit no-op fetches
60
        # repository.fetch has the responsibility for short-circuiting
61
        # attempts to copy between a repository and itself.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
62
        self.to_repository = to_repository
63
        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)
64
        self.sink = to_repository._get_sink()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
65
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
66
        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.
67
        self._fetch_spec = fetch_spec
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
68
        self.find_ghosts = find_ghosts
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
69
        self.from_repository.lock_read()
4110.2.22 by Martin Pool
Re-add mutter calls during fetch
70
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
71
               self.from_repository, self.from_repository._format,
72
               self.to_repository, self.to_repository._format)
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
73
        try:
4110.2.3 by Martin Pool
Remove redundant variable from fetch.
74
            self.__fetch()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
75
        finally:
76
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
77
78
    def __fetch(self):
79
        """Primary worker function.
80
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
        This initialises all the needed variables, and then fetches the
1185.65.27 by Robert Collins
Tweak storage towards mergability.
82
        requested revisions, finally clearing the progress bar.
83
        """
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)
84
        # Roughly this is what we're aiming for fetch to become:
85
        #
86
        # missing = self.sink.insert_stream(self.source.get_stream(search))
87
        # if missing:
88
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
89
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
90
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
91
        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.
92
        pb = ui.ui_factory.nested_progress_bar()
4110.2.14 by Martin Pool
Small fetch progress tweaks
93
        pb.show_pct = pb.show_count = False
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
94
        try:
4110.2.14 by Martin Pool
Small fetch progress tweaks
95
            pb.update("Finding revisions", 0, 2)
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
96
            search = self._revids_to_fetch()
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
97
            mutter('fetching: %s', search)
98
            if search.is_empty():
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
99
                return
4110.2.14 by Martin Pool
Small fetch progress tweaks
100
            pb.update("Fetching revisions", 1, 2)
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
101
            self._fetch_everything_for_search(search)
102
        finally:
103
            pb.finished()
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
104
4110.2.6 by Martin Pool
Remove more progressbar cruft from fetch
105
    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.
106
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
107
        # 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.
108
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
109
        # that phase is progressing than we do.  Progress updates for the other
110
        # phases are taken care of in this function.
111
        # 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.
112
        # item_keys_introduced_by should have a richer API than it does at the
113
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
114
        # function?
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
115
        if (self.from_repository._format.rich_root_data and
116
            not self.to_repository._format.rich_root_data):
117
            raise errors.IncompatibleRepositories(
118
                self.from_repository, self.to_repository,
119
                "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.
120
        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.
121
        try:
4110.2.12 by Martin Pool
Add more fetch progress
122
            pb.update("Get stream source")
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
123
            source = self.from_repository._get_source(
124
                self.to_repository._format)
125
            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)
126
            from_format = self.from_repository._format
4110.2.12 by Martin Pool
Add more fetch progress
127
            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.
128
            resume_tokens, missing_keys = self.sink.insert_stream(
5195.3.14 by Parth Malwankar
optimized to use "revisions" insert_record_stream for counting #records
129
                stream, from_format, [])
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
130
            if missing_keys:
4110.2.12 by Martin Pool
Add more fetch progress
131
                pb.update("Missing keys")
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
132
                stream = source.get_stream_for_missing_keys(missing_keys)
4110.2.12 by Martin Pool
Add more fetch progress
133
                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.
134
                resume_tokens, missing_keys = self.sink.insert_stream(
5195.3.14 by Parth Malwankar
optimized to use "revisions" insert_record_stream for counting #records
135
                    stream, from_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
136
            if missing_keys:
137
                raise AssertionError(
138
                    "second push failed to complete a fetch %r." % (
139
                        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.
140
            if resume_tokens:
141
                raise AssertionError(
142
                    "second push failed to commit the fetch %r." % (
143
                        resume_tokens,))
4110.2.12 by Martin Pool
Add more fetch progress
144
            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)
145
            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.
146
        finally:
4110.2.6 by Martin Pool
Remove more progressbar cruft from fetch
147
            pb.finished()
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
148
1185.65.30 by Robert Collins
Merge integration.
149
    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.
150
        """Determines the exact revisions needed from self.from_repository to
151
        install self._last_revision in self.to_repository.
152
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
153
        :returns: A SearchResult of some sort.  (Possibly a
154
        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.
155
        """
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
156
        mutter("self._fetch_spec, self._last_revision: %r, %r",
157
                self._fetch_spec, self._last_revision)
5539.2.19 by Andrew Bennetts
Define SearchResult/Search interfaces with explicit abstract base classes, add some docstrings and change a method name.
158
        get_search_result = getattr(self._fetch_spec, 'get_search_result', None)
159
        if get_search_result is not None:
160
            mutter(
161
                'resolving fetch_spec into search result: %s', 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'.
162
            # This is EverythingNotInOther or a similar kind of fetch_spec.
163
            # Turn it into a search result.
5539.2.19 by Andrew Bennetts
Define SearchResult/Search interfaces with explicit abstract base classes, add some docstrings and change a method name.
164
            return get_search_result()
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
165
        elif self._fetch_spec is not None:
166
            # 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.
167
            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'.
168
        elif self._last_revision == NULL_REVISION:
169
            # 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.
170
            # explicit limit of no revisions needed
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
171
            return graph.EmptySearchResult()
172
        elif self._last_revision is not None:
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
173
            return graph.NotInOtherForRevs(self.to_repository,
174
                self.from_repository, [self._last_revision],
5539.2.19 by Andrew Bennetts
Define SearchResult/Search interfaces with explicit abstract base classes, add some docstrings and change a method name.
175
                find_ghosts=self.find_ghosts).get_search_result()
5539.2.8 by Andrew Bennetts
Refactor call to search_missing_revision_ids out from RepoFetcher._revids_to_fetch into the 'fetch spec'.
176
        else: # self._last_revision is None:
177
            return graph.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.
178
                self.from_repository,
179
                find_ghosts=self.find_ghosts).get_search_result()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
180
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
181
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
182
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
183
    """Helper for operations that convert data from model 1 and 2
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
184
1910.2.48 by Aaron Bentley
Update from review comments
185
    This is for use by fetchers and converters.
186
    """
187
5050.32.1 by Andrew Bennetts
Fix fetching more than 100 revisions from non-rich-root to rich-root repositories.
188
    # This is a class variable so that the test suite can override it.
189
    known_graph_threshold = 100
190
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)
191
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
192
        """Constructor.
193
194
        :param source: The repository data comes from
195
        """
196
        self.source = source
197
198
    def iter_rev_trees(self, revs):
199
        """Iterate through RevisionTrees efficiently.
200
201
        Additionally, the inventory's revision_id is set if unset.
202
203
        Trees are retrieved in batches of 100, and then yielded in the order
204
        they were requested.
205
206
        :param revs: A list of revision ids
207
        """
3172.4.4 by Robert Collins
Review feedback.
208
        # In case that revs is not a list.
209
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
210
        while revs:
211
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
212
                if tree.inventory.revision_id is None:
213
                    tree.inventory.revision_id = tree.get_revision_id()
214
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
215
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
216
3380.2.4 by Aaron Bentley
Updates from review
217
    def _find_root_ids(self, revs, parent_map, graph):
218
        revision_root = {}
1910.2.48 by Aaron Bentley
Update from review comments
219
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
220
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
221
            root_id = tree.get_root_id()
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
222
            revision_root[revision_id] = root_id
223
        # Find out which parents we don't already know root ids for
224
        parents = set()
225
        for revision_parents in parent_map.itervalues():
226
            parents.update(revision_parents)
227
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
228
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
229
        parents = graph.get_parent_map(parents).keys()
230
        for tree in self.iter_rev_trees(parents):
231
            root_id = tree.get_root_id()
232
            revision_root[tree.get_revision_id()] = root_id
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
233
        return revision_root
3380.2.4 by Aaron Bentley
Updates from review
234
235
    def generate_root_texts(self, revs):
236
        """Generate VersionedFiles for all root ids.
237
238
        :param revs: the revisions to include
239
        """
240
        graph = self.source.get_graph()
241
        parent_map = graph.get_parent_map(revs)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
242
        rev_order = tsort.topo_sort(parent_map)
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
243
        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.
244
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
245
            rev_order]
246
        # Guaranteed stable, this groups all the file id operations together
247
        # retaining topological order within the revisions of a file id.
248
        # File id splits and joins would invalidate this, but they don't exist
249
        # yet, and are unlikely to in non-rich-root environments anyway.
250
        root_id_order.sort(key=operator.itemgetter(0))
251
        # 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.
252
        if len(revs) > self.known_graph_threshold:
253
            graph = self.source.get_known_graph_ancestry(revs)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
254
        new_roots_stream = _new_root_data_stream(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
255
            root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
256
        return [('texts', new_roots_stream)]
257
258
259
def _new_root_data_stream(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
260
    root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
261
    """Generate a texts substream of synthesised root entries.
262
263
    Used in fetches that do rich-root upgrades.
264
    
265
    :param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
266
        the root entries to create.
267
    :param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
268
        calculating the parents.  If a parent rev_id is not found here then it
269
        will be recalculated.
270
    :param parent_map: a parent map for all the revisions in
271
        root_keys_to_create.
272
    :param graph: a graph to use instead of repo.get_graph().
273
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
274
    for root_key in root_keys_to_create:
275
        root_id, rev_id = root_key
276
        parent_keys = _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
277
            root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
278
        yield versionedfile.FulltextContentFactory(
279
            root_key, parent_keys, None, '')
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
280
281
282
def _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
283
    root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
284
    """Get the parent keys for a given root id.
285
    
286
    A helper function for _new_root_data_stream.
287
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
288
    # Include direct parents of the revision, but only if they used the same
289
    # root_id and are heads.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
290
    rev_parents = parent_map[rev_id]
291
    parent_ids = []
292
    for parent_id in rev_parents:
293
        if parent_id == NULL_REVISION:
294
            continue
295
        if parent_id not in rev_id_to_root_id_map:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
296
            # We probably didn't read this revision, go spend the extra effort
297
            # to actually check
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
298
            try:
299
                tree = repo.revision_tree(parent_id)
300
            except errors.NoSuchRevision:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
301
                # Ghost, fill out rev_id_to_root_id in case we encounter this
302
                # again.
303
                # 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.
304
                parent_root_id = None
305
            else:
306
                parent_root_id = tree.get_root_id()
307
            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.
308
            # XXX: why not:
309
            #   rev_id_to_root_id_map[parent_id] = parent_root_id
310
            # memory consumption maybe?
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
311
        else:
312
            parent_root_id = rev_id_to_root_id_map[parent_id]
313
        if root_id == parent_root_id:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
314
            # With stacking we _might_ want to refer to a non-local revision,
315
            # but this code path only applies when we have the full content
316
            # available, so ghosts really are ghosts, not just the edge of
317
            # local data.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
318
            parent_ids.append(parent_id)
319
        else:
320
            # root_id may be in the parent anyway.
321
            try:
322
                tree = repo.revision_tree(parent_id)
323
            except errors.NoSuchRevision:
324
                # ghost, can't refer to it.
325
                pass
326
            else:
327
                try:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
328
                    parent_ids.append(tree.inventory[root_id].revision)
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
329
                except errors.NoSuchId:
330
                    # not in the tree
331
                    pass
332
    # Drop non-head parents
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
333
    if graph is None:
334
        graph = repo.get_graph()
335
    heads = graph.heads(parent_ids)
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
336
    selected_ids = []
337
    for parent_id in parent_ids:
338
        if parent_id in heads and parent_id not in selected_ids:
339
            selected_ids.append(parent_id)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
340
    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.
341
    return parent_keys