/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2005-2010 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 (
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
31
    graph as _mod_graph,
32
    static_tuple,
4476.3.9 by Andrew Bennetts
Further reduce duplication.
33
    tsort,
34
    versionedfile,
35
    )
36
""")
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.
37
import bzrlib
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
38
from bzrlib import (
39
    errors,
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
40
    ui,
4110.2.4 by Martin Pool
Deprecate passing a pb in to RepoFetcher
41
    )
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)
42
from bzrlib.revision import NULL_REVISION
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
43
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.
44
1238 by Martin Pool
- remove a lot of dead code from fetch
45
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
46
class RepoFetcher(object):
47
    """Pull revisions and texts from one repository to another.
48
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
49
    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.
50
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
51
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
52
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
53
    def __init__(self, to_repository, from_repository, last_revision=None,
4961.2.3 by Martin Pool
Delete deprecated pb parameter to RepoFetcher
54
        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
55
        """Create a repo fetcher.
56
4110.2.2 by Martin Pool
Remove obsolete comments
57
        :param last_revision: If set, try to limit to the data this revision
58
            references.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
59
        :param find_ghosts: If True search the entire history for ghosts.
60
        """
4509.3.18 by Martin Pool
RepoFetcher relies on Repository.fetch to shortcircuit no-op fetches
61
        # repository.fetch has the responsibility for short-circuiting
62
        # attempts to copy between a repository and itself.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
63
        self.to_repository = to_repository
64
        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)
65
        self.sink = to_repository._get_sink()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
66
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
67
        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.
68
        self._fetch_spec = fetch_spec
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
69
        self.find_ghosts = find_ghosts
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
70
        self.from_repository.lock_read()
4110.2.22 by Martin Pool
Re-add mutter calls during fetch
71
        mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
72
               self.from_repository, self.from_repository._format,
73
               self.to_repository, self.to_repository._format)
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
74
        try:
4110.2.3 by Martin Pool
Remove redundant variable from fetch.
75
            self.__fetch()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
76
        finally:
77
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
78
79
    def __fetch(self):
80
        """Primary worker function.
81
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
82
        This initialises all the needed variables, and then fetches the
1185.65.27 by Robert Collins
Tweak storage towards mergability.
83
        requested revisions, finally clearing the progress bar.
84
        """
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)
85
        # Roughly this is what we're aiming for fetch to become:
86
        #
87
        # missing = self.sink.insert_stream(self.source.get_stream(search))
88
        # if missing:
89
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
90
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
91
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
92
        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.
93
        pb = ui.ui_factory.nested_progress_bar()
4110.2.14 by Martin Pool
Small fetch progress tweaks
94
        pb.show_pct = pb.show_count = False
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
95
        try:
4110.2.14 by Martin Pool
Small fetch progress tweaks
96
            pb.update("Finding revisions", 0, 2)
4110.2.9 by Martin Pool
Re-add very basic top-level pb for fetch
97
            search = self._revids_to_fetch()
98
            if search is None:
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(
129
                stream, from_format, [])
4257.3.2 by Andrew Bennetts
Check during fetch if we are going to be missing data necessary to calculate altered fileids for stacked revisions.
130
            if self.to_repository._fallback_repositories:
4241.18.1 by Andrew Bennetts
Cherry pick stacking push fix from bzr.dev r4289, make a 'Changes from RC1 to Final' section in NEWS.
131
                missing_keys.update(
4257.4.12 by Andrew Bennetts
Move _parent_inventories helper to RepoFetcher.
132
                    self._parent_inventories(search.get_keys()))
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
133
            if missing_keys:
4110.2.12 by Martin Pool
Add more fetch progress
134
                pb.update("Missing keys")
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
135
                stream = source.get_stream_for_missing_keys(missing_keys)
4110.2.12 by Martin Pool
Add more fetch progress
136
                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.
137
                resume_tokens, missing_keys = self.sink.insert_stream(
138
                    stream, from_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
139
            if missing_keys:
140
                raise AssertionError(
141
                    "second push failed to complete a fetch %r." % (
142
                        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.
143
            if resume_tokens:
144
                raise AssertionError(
145
                    "second push failed to commit the fetch %r." % (
146
                        resume_tokens,))
4110.2.12 by Martin Pool
Add more fetch progress
147
            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)
148
            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.
149
        finally:
4110.2.6 by Martin Pool
Remove more progressbar cruft from fetch
150
            pb.finished()
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
151
1185.65.30 by Robert Collins
Merge integration.
152
    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.
153
        """Determines the exact revisions needed from self.from_repository to
154
        install self._last_revision in self.to_repository.
155
156
        If no revisions need to be fetched, then this just returns None.
157
        """
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
158
        if self._fetch_spec is not None:
159
            return self._fetch_spec
4110.2.22 by Martin Pool
Re-add mutter calls during fetch
160
        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.
161
        if self._last_revision is NULL_REVISION:
162
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
163
            return None
4316.1.3 by Jonathan Lange
Don't bother wrapping the NoSuchRevision in an InstallFailed.
164
        return self.to_repository.search_missing_revision_ids(
165
            self.from_repository, self._last_revision,
166
            find_ghosts=self.find_ghosts)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
167
4257.4.12 by Andrew Bennetts
Move _parent_inventories helper to RepoFetcher.
168
    def _parent_inventories(self, revision_ids):
169
        # Find all the parent revisions referenced by the stream, but
4257.4.13 by Andrew Bennetts
Tweak comment.
170
        # not present in the stream, and make sure we send their
4257.4.12 by Andrew Bennetts
Move _parent_inventories helper to RepoFetcher.
171
        # inventories.
172
        parent_maps = self.to_repository.get_parent_map(revision_ids)
173
        parents = set()
174
        map(parents.update, parent_maps.itervalues())
175
        parents.discard(NULL_REVISION)
176
        parents.difference_update(revision_ids)
177
        missing_keys = set(('inventories', rev_id) for rev_id in parents)
178
        return missing_keys
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
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)
187
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
188
        """Constructor.
189
190
        :param source: The repository data comes from
191
        """
192
        self.source = source
193
194
    def iter_rev_trees(self, revs):
195
        """Iterate through RevisionTrees efficiently.
196
197
        Additionally, the inventory's revision_id is set if unset.
198
199
        Trees are retrieved in batches of 100, and then yielded in the order
200
        they were requested.
201
202
        :param revs: A list of revision ids
203
        """
3172.4.4 by Robert Collins
Review feedback.
204
        # In case that revs is not a list.
205
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
206
        while revs:
207
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
208
                if tree.inventory.revision_id is None:
209
                    tree.inventory.revision_id = tree.get_revision_id()
210
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
211
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
212
3380.2.4 by Aaron Bentley
Updates from review
213
    def _find_root_ids(self, revs, parent_map, graph):
214
        revision_root = {}
1910.2.48 by Aaron Bentley
Update from review comments
215
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
216
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
217
            root_id = tree.get_root_id()
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
218
            revision_root[revision_id] = root_id
219
        # Find out which parents we don't already know root ids for
220
        parents = set()
221
        for revision_parents in parent_map.itervalues():
222
            parents.update(revision_parents)
223
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
224
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
225
        parents = graph.get_parent_map(parents).keys()
226
        for tree in self.iter_rev_trees(parents):
227
            root_id = tree.get_root_id()
228
            revision_root[tree.get_revision_id()] = root_id
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
229
        return revision_root
3380.2.4 by Aaron Bentley
Updates from review
230
231
    def generate_root_texts(self, revs):
232
        """Generate VersionedFiles for all root ids.
233
234
        :param revs: the revisions to include
235
        """
236
        graph = self.source.get_graph()
237
        parent_map = graph.get_parent_map(revs)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
238
        rev_order = tsort.topo_sort(parent_map)
4476.3.11 by Andrew Bennetts
All fetch and interrepo tests passing.
239
        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.
240
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
241
            rev_order]
242
        # Guaranteed stable, this groups all the file id operations together
243
        # retaining topological order within the revisions of a file id.
244
        # File id splits and joins would invalidate this, but they don't exist
245
        # yet, and are unlikely to in non-rich-root environments anyway.
246
        root_id_order.sort(key=operator.itemgetter(0))
247
        # Create a record stream containing the roots to create.
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
248
        if len(revs) > 100:
4988.2.2 by Martin Pool
Even trivial fixes can have silly typos
249
            # XXX: not covered by tests, should have a flag to always run
250
            # this. -- mbp 20100129
251
            graph = _get_rich_root_heads_graph(self.source, 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
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
257
def _get_rich_root_heads_graph(source_repo, revision_ids):
258
    """Get a Graph object suitable for asking heads() for new rich roots."""
259
    st = static_tuple.StaticTuple
260
    revision_keys = [st(r_id).intern() for r_id in revision_ids]
261
    known_graph = source_repo.revisions.get_known_graph_ancestry(
262
                    revision_keys)
4849.1.1 by John Arbash Meinel
Typo fix, not caught by pqm because it requires 100 revs.
263
    return _mod_graph.GraphThunkIdsToKeys(known_graph)
4819.2.4 by John Arbash Meinel
Factor out the common code into a helper so that smart streaming also benefits.
264
265
4476.3.9 by Andrew Bennetts
Further reduce duplication.
266
def _new_root_data_stream(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
267
    root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
268
    """Generate a texts substream of synthesised root entries.
269
270
    Used in fetches that do rich-root upgrades.
271
    
272
    :param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
273
        the root entries to create.
274
    :param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
275
        calculating the parents.  If a parent rev_id is not found here then it
276
        will be recalculated.
277
    :param parent_map: a parent map for all the revisions in
278
        root_keys_to_create.
279
    :param graph: a graph to use instead of repo.get_graph().
280
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
281
    for root_key in root_keys_to_create:
282
        root_id, rev_id = root_key
283
        parent_keys = _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
284
            root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
285
        yield versionedfile.FulltextContentFactory(
286
            root_key, parent_keys, None, '')
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
287
288
289
def _parent_keys_for_root_version(
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
290
    root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
4476.3.69 by Andrew Bennetts
Elaborate some docstrings.
291
    """Get the parent keys for a given root id.
292
    
293
    A helper function for _new_root_data_stream.
294
    """
4476.3.9 by Andrew Bennetts
Further reduce duplication.
295
    # Include direct parents of the revision, but only if they used the same
296
    # root_id and are heads.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
297
    rev_parents = parent_map[rev_id]
298
    parent_ids = []
299
    for parent_id in rev_parents:
300
        if parent_id == NULL_REVISION:
301
            continue
302
        if parent_id not in rev_id_to_root_id_map:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
303
            # We probably didn't read this revision, go spend the extra effort
304
            # to actually check
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
305
            try:
306
                tree = repo.revision_tree(parent_id)
307
            except errors.NoSuchRevision:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
308
                # Ghost, fill out rev_id_to_root_id in case we encounter this
309
                # again.
310
                # 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.
311
                parent_root_id = None
312
            else:
313
                parent_root_id = tree.get_root_id()
314
            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.
315
            # XXX: why not:
316
            #   rev_id_to_root_id_map[parent_id] = parent_root_id
317
            # memory consumption maybe?
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
318
        else:
319
            parent_root_id = rev_id_to_root_id_map[parent_id]
320
        if root_id == parent_root_id:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
321
            # With stacking we _might_ want to refer to a non-local revision,
322
            # but this code path only applies when we have the full content
323
            # available, so ghosts really are ghosts, not just the edge of
324
            # local data.
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
325
            parent_ids.append(parent_id)
326
        else:
327
            # root_id may be in the parent anyway.
328
            try:
329
                tree = repo.revision_tree(parent_id)
330
            except errors.NoSuchRevision:
331
                # ghost, can't refer to it.
332
                pass
333
            else:
334
                try:
4476.3.9 by Andrew Bennetts
Further reduce duplication.
335
                    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.
336
                except errors.NoSuchId:
337
                    # not in the tree
338
                    pass
339
    # Drop non-head parents
4476.3.41 by Andrew Bennetts
Use FrozenHeadsCache to speed up root generation.
340
    if graph is None:
341
        graph = repo.get_graph()
342
    heads = graph.heads(parent_ids)
4476.3.6 by Andrew Bennetts
Refactor out duplicated get parent keys logic from Inter1and2Helper and InterDifferingSerializer.
343
    selected_ids = []
344
    for parent_id in parent_ids:
345
        if parent_id in heads and parent_id not in selected_ids:
346
            selected_ids.append(parent_id)
4476.3.9 by Andrew Bennetts
Further reduce duplication.
347
    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.
348
    return parent_keys