bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4110.2.2
by Martin Pool
 Remove obsolete comments  | 
1  | 
# Copyright (C) 2005, 2006, 2008, 2009 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  | 
||
| 
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.  | 
28  | 
import bzrlib  | 
| 
4110.2.4
by Martin Pool
 Deprecate passing a pb in to RepoFetcher  | 
29  | 
from bzrlib import (  | 
30  | 
errors,  | 
|
31  | 
symbol_versioning,  | 
|
32  | 
    )
 | 
|
| 
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)  | 
33  | 
from bzrlib.revision import NULL_REVISION  | 
| 
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.  | 
34  | 
from bzrlib.tsort import topo_sort  | 
| 
2094.3.5
by John Arbash Meinel
 Fix imports to ensure modules are loaded before they are used  | 
35  | 
from bzrlib.trace import mutter  | 
36  | 
import bzrlib.ui  | 
|
| 
4060.1.4
by Robert Collins
 Streaming fetch from remote servers.  | 
37  | 
from bzrlib.versionedfile import FulltextContentFactory  | 
| 
1534.1.31
by Robert Collins
 Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.  | 
38  | 
|
| 
1238
by Martin Pool
 - remove a lot of dead code from fetch  | 
39  | 
|
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
40  | 
class RepoFetcher(object):  | 
41  | 
"""Pull revisions and texts from one repository to another.  | 
|
42  | 
||
| 
2592.4.5
by Martin Pool
 Add Repository.base on all repositories.  | 
43  | 
    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.  | 
44  | 
    the logic in InterRepository.fetch().
 | 
| 
1260
by Martin Pool
 - some updates for fetch/update function  | 
45  | 
    """
 | 
| 
3172.4.1
by Robert Collins
 * Fetching via bzr+ssh will no longer fill ghosts by default (this is  | 
46  | 
|
| 
4070.9.2
by Andrew Bennetts
 Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.  | 
47  | 
def __init__(self, to_repository, from_repository, last_revision=None,  | 
48  | 
pb=None, 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  | 
49  | 
"""Create a repo fetcher.  | 
50  | 
||
| 
4110.2.2
by Martin Pool
 Remove obsolete comments  | 
51  | 
        :param last_revision: If set, try to limit to the data this revision
 | 
52  | 
            references.
 | 
|
| 
3172.4.1
by Robert Collins
 * Fetching via bzr+ssh will no longer fill ghosts by default (this is  | 
53  | 
        :param find_ghosts: If True search the entire history for ghosts.
 | 
| 
3834.4.5
by Andrew Bennetts
 Add some comments to fetch.py  | 
54  | 
        :param _write_group_acquired_callable: Don't use; this parameter only
 | 
55  | 
            exists to facilitate a hack done in InterPackRepo.fetch.  We would
 | 
|
56  | 
            like to remove this parameter.
 | 
|
| 
4110.2.6
by Martin Pool
 Remove more progressbar cruft from fetch  | 
57  | 
        :param pb: ProgressBar object to use; deprecated and ignored.
 | 
58  | 
            This method will just create one on top of the stack.
 | 
|
| 
3172.4.1
by Robert Collins
 * Fetching via bzr+ssh will no longer fill ghosts by default (this is  | 
59  | 
        """
 | 
| 
4110.2.6
by Martin Pool
 Remove more progressbar cruft from fetch  | 
60  | 
if pb is not None:  | 
61  | 
symbol_versioning.warn(  | 
|
62  | 
symbol_versioning.deprecated_in((1, 14, 0))  | 
|
63  | 
% "pb parameter to RepoFetcher.__init__")  | 
|
64  | 
            # and for simplicity it is in fact ignored
 | 
|
| 
2668.2.6
by Andrew Bennetts
 Merge repository-equality.  | 
65  | 
if to_repository.has_same_location(from_repository):  | 
| 
2592.3.115
by Robert Collins
 Move same repository check up to Repository.fetch to allow all fetch implementations to benefit.  | 
66  | 
            # repository.fetch should be taking care of this case.
 | 
| 
2592.4.5
by Martin Pool
 Add Repository.base on all repositories.  | 
67  | 
raise errors.BzrError('RepoFetcher run '  | 
68  | 
                    'between two objects at the same location: '
 | 
|
| 
2592.4.4
by Martin Pool
 better message for attempted fetch between aliased repositories  | 
69  | 
'%r and %r' % (to_repository, from_repository))  | 
| 
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 = {}  | 
| 
4110.2.9
by Martin Pool
 Re-add very basic top-level pb for fetch  | 
100  | 
pb = bzrlib.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:  | 
| 
4110.2.14
by Martin Pool
 Small fetch progress tweaks  | 
103  | 
pb.update("Finding revisions", 0, 2)  | 
| 
4110.2.9
by Martin Pool
 Re-add very basic top-level pb for fetch  | 
104  | 
search = self._revids_to_fetch()  | 
105  | 
if search is None:  | 
|
106  | 
                return
 | 
|
| 
4110.2.14
by Martin Pool
 Small fetch progress tweaks  | 
107  | 
pb.update("Fetching revisions", 1, 2)  | 
| 
4110.2.9
by Martin Pool
 Re-add very basic top-level pb for fetch  | 
108  | 
self._fetch_everything_for_search(search)  | 
109  | 
finally:  | 
|
110  | 
pb.finished()  | 
|
| 
2535.3.6
by Andrew Bennetts
 Move some "what repo data to fetch logic" from RepoFetcher to Repository.  | 
111  | 
|
| 
4110.2.6
by Martin Pool
 Remove more progressbar cruft from fetch  | 
112  | 
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.  | 
113  | 
"""Fetch all data for the given set of revisions."""  | 
| 
2535.3.9
by Andrew Bennetts
 More comments.  | 
114  | 
        # 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.  | 
115  | 
        # into item_keys_introduced_by, which has more information about how
 | 
| 
2535.3.9
by Andrew Bennetts
 More comments.  | 
116  | 
        # that phase is progressing than we do.  Progress updates for the other
 | 
117  | 
        # phases are taken care of in this function.
 | 
|
118  | 
        # 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.  | 
119  | 
        # item_keys_introduced_by should have a richer API than it does at the
 | 
120  | 
        # moment, so that it can feed the progress information back to this
 | 
|
| 
2535.3.9
by Andrew Bennetts
 More comments.  | 
121  | 
        # function?
 | 
| 
4060.1.3
by Robert Collins
 Implement the separate source component for fetch - repository.StreamSource.  | 
122  | 
if (self.from_repository._format.rich_root_data and  | 
123  | 
not self.to_repository._format.rich_root_data):  | 
|
124  | 
raise errors.IncompatibleRepositories(  | 
|
125  | 
self.from_repository, self.to_repository,  | 
|
126  | 
"different rich-root support")  | 
|
| 
4110.2.6
by Martin Pool
 Remove more progressbar cruft from fetch  | 
127  | 
pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
| 
2535.3.7
by Andrew Bennetts
 Remove now unused _fetch_weave_texts, make progress reporting closer to how it was before I refactored __fetch.  | 
128  | 
try:  | 
| 
4110.2.12
by Martin Pool
 Add more fetch progress  | 
129  | 
pb.update("Get stream source")  | 
| 
4060.1.3
by Robert Collins
 Implement the separate source component for fetch - repository.StreamSource.  | 
130  | 
source = self.from_repository._get_source(  | 
131  | 
self.to_repository._format)  | 
|
132  | 
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)  | 
133  | 
from_format = self.from_repository._format  | 
| 
4110.2.12
by Martin Pool
 Add more fetch progress  | 
134  | 
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.  | 
135  | 
resume_tokens, missing_keys = self.sink.insert_stream(  | 
136  | 
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.  | 
137  | 
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.  | 
138  | 
missing_keys.update(  | 
| 
4257.4.12
by Andrew Bennetts
 Move _parent_inventories helper to RepoFetcher.  | 
139  | 
self._parent_inventories(search.get_keys()))  | 
| 
4029.2.1
by Robert Collins
 Support streaming push to stacked branches.  | 
140  | 
if missing_keys:  | 
| 
4110.2.12
by Martin Pool
 Add more fetch progress  | 
141  | 
pb.update("Missing keys")  | 
| 
4060.1.3
by Robert Collins
 Implement the separate source component for fetch - repository.StreamSource.  | 
142  | 
stream = source.get_stream_for_missing_keys(missing_keys)  | 
| 
4110.2.12
by Martin Pool
 Add more fetch progress  | 
143  | 
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.  | 
144  | 
resume_tokens, missing_keys = self.sink.insert_stream(  | 
145  | 
stream, from_format, resume_tokens)  | 
|
| 
4029.2.1
by Robert Collins
 Support streaming push to stacked branches.  | 
146  | 
if missing_keys:  | 
147  | 
raise AssertionError(  | 
|
148  | 
"second push failed to complete a fetch %r." % (  | 
|
149  | 
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.  | 
150  | 
if resume_tokens:  | 
151  | 
raise AssertionError(  | 
|
152  | 
"second push failed to commit the fetch %r." % (  | 
|
153  | 
resume_tokens,))  | 
|
| 
4110.2.12
by Martin Pool
 Add more fetch progress  | 
154  | 
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)  | 
155  | 
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.  | 
156  | 
finally:  | 
| 
4110.2.6
by Martin Pool
 Remove more progressbar cruft from fetch  | 
157  | 
pb.finished()  | 
| 
4029.2.1
by Robert Collins
 Support streaming push to stacked branches.  | 
158  | 
|
| 
1185.65.30
by Robert Collins
 Merge integration.  | 
159  | 
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.  | 
160  | 
"""Determines the exact revisions needed from self.from_repository to  | 
161  | 
        install self._last_revision in self.to_repository.
 | 
|
162  | 
||
163  | 
        If no revisions need to be fetched, then this just returns None.
 | 
|
164  | 
        """
 | 
|
| 
4070.9.2
by Andrew Bennetts
 Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.  | 
165  | 
if self._fetch_spec is not None:  | 
166  | 
return self._fetch_spec  | 
|
| 
4110.2.22
by Martin Pool
 Re-add mutter calls during fetch  | 
167  | 
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.  | 
168  | 
if self._last_revision is NULL_REVISION:  | 
169  | 
            # explicit limit of no revisions needed
 | 
|
| 
3184.1.9
by Robert Collins
 * ``Repository.get_data_stream`` is now deprecated in favour of  | 
170  | 
return None  | 
| 
4316.1.3
by Jonathan Lange
 Don't bother wrapping the NoSuchRevision in an InstallFailed.  | 
171  | 
return self.to_repository.search_missing_revision_ids(  | 
172  | 
self.from_repository, self._last_revision,  | 
|
173  | 
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  | 
174  | 
|
| 
4257.4.12
by Andrew Bennetts
 Move _parent_inventories helper to RepoFetcher.  | 
175  | 
def _parent_inventories(self, revision_ids):  | 
176  | 
        # Find all the parent revisions referenced by the stream, but
 | 
|
| 
4257.4.13
by Andrew Bennetts
 Tweak comment.  | 
177  | 
        # not present in the stream, and make sure we send their
 | 
| 
4257.4.12
by Andrew Bennetts
 Move _parent_inventories helper to RepoFetcher.  | 
178  | 
        # inventories.
 | 
179  | 
parent_maps = self.to_repository.get_parent_map(revision_ids)  | 
|
180  | 
parents = set()  | 
|
181  | 
map(parents.update, parent_maps.itervalues())  | 
|
182  | 
parents.discard(NULL_REVISION)  | 
|
183  | 
parents.difference_update(revision_ids)  | 
|
184  | 
missing_keys = set(('inventories', rev_id) for rev_id in parents)  | 
|
185  | 
return missing_keys  | 
|
186  | 
||
| 
3565.3.3
by Robert Collins
 * Fetching data between repositories that have the same model but no  | 
187  | 
|
| 
1910.2.24
by Aaron Bentley
 Got intra-repository fetch working between model1 and 2 for all types  | 
188  | 
class Inter1and2Helper(object):  | 
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
189  | 
"""Helper for operations that convert data from model 1 and 2  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
190  | 
|
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
191  | 
    This is for use by fetchers and converters.
 | 
192  | 
    """
 | 
|
193  | 
||
| 
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)  | 
194  | 
def __init__(self, source):  | 
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
195  | 
"""Constructor.  | 
196  | 
||
197  | 
        :param source: The repository data comes from
 | 
|
198  | 
        """
 | 
|
199  | 
self.source = source  | 
|
200  | 
||
201  | 
def iter_rev_trees(self, revs):  | 
|
202  | 
"""Iterate through RevisionTrees efficiently.  | 
|
203  | 
||
204  | 
        Additionally, the inventory's revision_id is set if unset.
 | 
|
205  | 
||
206  | 
        Trees are retrieved in batches of 100, and then yielded in the order
 | 
|
207  | 
        they were requested.
 | 
|
208  | 
||
209  | 
        :param revs: A list of revision ids
 | 
|
210  | 
        """
 | 
|
| 
3172.4.4
by Robert Collins
 Review feedback.  | 
211  | 
        # In case that revs is not a list.
 | 
212  | 
revs = list(revs)  | 
|
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
213  | 
while revs:  | 
214  | 
for tree in self.source.revision_trees(revs[:100]):  | 
|
| 
1910.2.44
by Aaron Bentley
 Retrieve only 500 revision trees at once  | 
215  | 
if tree.inventory.revision_id is None:  | 
216  | 
tree.inventory.revision_id = tree.get_revision_id()  | 
|
217  | 
yield tree  | 
|
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
218  | 
revs = revs[100:]  | 
| 
1910.2.44
by Aaron Bentley
 Retrieve only 500 revision trees at once  | 
219  | 
|
| 
3380.2.4
by Aaron Bentley
 Updates from review  | 
220  | 
def _find_root_ids(self, revs, parent_map, graph):  | 
221  | 
revision_root = {}  | 
|
| 
3380.1.2
by Aaron Bentley
 Improve handling ghosts and changing root_ids  | 
222  | 
planned_versions = {}  | 
| 
1910.2.48
by Aaron Bentley
 Update from review comments  | 
223  | 
for tree in self.iter_rev_trees(revs):  | 
| 
1910.2.18
by Aaron Bentley
 Implement creation of knits for tree roots  | 
224  | 
revision_id = tree.inventory.root.revision  | 
| 
2946.3.3
by John Arbash Meinel
 Prefer tree.get_root_id() as more explicit than tree.path2id('')  | 
225  | 
root_id = tree.get_root_id()  | 
| 
3380.1.2
by Aaron Bentley
 Improve handling ghosts and changing root_ids  | 
226  | 
planned_versions.setdefault(root_id, []).append(revision_id)  | 
| 
3380.1.3
by Aaron Bentley
 Fix model-change fetching with ghosts and when fetch is resumed  | 
227  | 
revision_root[revision_id] = root_id  | 
228  | 
        # Find out which parents we don't already know root ids for
 | 
|
229  | 
parents = set()  | 
|
230  | 
for revision_parents in parent_map.itervalues():  | 
|
231  | 
parents.update(revision_parents)  | 
|
232  | 
parents.difference_update(revision_root.keys() + [NULL_REVISION])  | 
|
| 
3380.2.7
by Aaron Bentley
 Update docs  | 
233  | 
        # Limit to revisions present in the versionedfile
 | 
| 
3380.1.3
by Aaron Bentley
 Fix model-change fetching with ghosts and when fetch is resumed  | 
234  | 
parents = graph.get_parent_map(parents).keys()  | 
235  | 
for tree in self.iter_rev_trees(parents):  | 
|
236  | 
root_id = tree.get_root_id()  | 
|
237  | 
revision_root[tree.get_revision_id()] = root_id  | 
|
| 
3380.2.4
by Aaron Bentley
 Updates from review  | 
238  | 
return revision_root, planned_versions  | 
239  | 
||
240  | 
def generate_root_texts(self, revs):  | 
|
241  | 
"""Generate VersionedFiles for all root ids.  | 
|
242  | 
||
243  | 
        :param revs: the revisions to include
 | 
|
244  | 
        """
 | 
|
245  | 
graph = self.source.get_graph()  | 
|
246  | 
parent_map = graph.get_parent_map(revs)  | 
|
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
247  | 
rev_order = topo_sort(parent_map)  | 
248  | 
rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(  | 
|
| 
3380.2.4
by Aaron Bentley
 Updates from review  | 
249  | 
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.  | 
250  | 
root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in  | 
251  | 
rev_order]  | 
|
252  | 
        # Guaranteed stable, this groups all the file id operations together
 | 
|
253  | 
        # retaining topological order within the revisions of a file id.
 | 
|
254  | 
        # File id splits and joins would invalidate this, but they don't exist
 | 
|
255  | 
        # yet, and are unlikely to in non-rich-root environments anyway.
 | 
|
256  | 
root_id_order.sort(key=operator.itemgetter(0))  | 
|
257  | 
        # Create a record stream containing the roots to create.
 | 
|
258  | 
def yield_roots():  | 
|
| 
3350.6.7
by Robert Collins
 Review feedback, making things more clear, adding documentation on what is used where.  | 
259  | 
for key in root_id_order:  | 
260  | 
root_id, rev_id = key  | 
|
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
261  | 
rev_parents = parent_map[rev_id]  | 
| 
3380.2.4
by Aaron Bentley
 Updates from review  | 
262  | 
                # We drop revision parents with different file-ids, because
 | 
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
263  | 
                # that represents a rename of the root to a different location
 | 
264  | 
                # - its not actually a parent for us. (We could look for that
 | 
|
265  | 
                # file id in the revision tree at considerably more expense,
 | 
|
266  | 
                # but for now this is sufficient (and reconcile will catch and
 | 
|
267  | 
                # correct this anyway).
 | 
|
| 
3380.1.3
by Aaron Bentley
 Fix model-change fetching with ghosts and when fetch is resumed  | 
268  | 
                # When a parent revision is a ghost, we guess that its root id
 | 
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
269  | 
                # was unchanged (rather than trimming it from the parent list).
 | 
270  | 
parent_keys = tuple((root_id, parent) for parent in rev_parents  | 
|
271  | 
if parent != NULL_REVISION and  | 
|
272  | 
rev_id_to_root_id.get(parent, root_id) == root_id)  | 
|
273  | 
yield FulltextContentFactory(key, parent_keys, None, '')  | 
|
| 
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)  | 
274  | 
return [('texts', yield_roots())]  |