~bzr-pqm/bzr/bzr.dev

3350.6.12 by Martin Pool
merge trunk; remove RemoteToOtherFetcher
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
1218 by Martin Pool
- fix up import
16
1231 by Martin Pool
- more progress on fetch on top of weaves
17
18
"""Copying of history from one branch to another.
19
20
The basic plan is that every branch knows the history of everything
21
that has merged into it.  As the first step of a merge, pull, or
22
branch operation we copy history from the source into the destination
23
branch.
24
25
The copying is done in a slightly complicated order.  We don't want to
26
add a revision to the store until everything it refers to is also
27
stored, so that if a revision is present we can totally recreate it.
28
However, we can't know what files are included in a revision until we
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
29
read its inventory.  So we query the inventory store of the source for
3316.2.14 by Robert Collins
Spelling in NEWS.
30
the ids we need, and then pull those ids and then return to the inventories.
1231 by Martin Pool
- more progress on fetch on top of weaves
31
"""
32
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.
33
import operator
34
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.
35
import bzrlib
36
import bzrlib.errors as errors
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
37
from bzrlib.errors import InstallFailed
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
38
from bzrlib.progress import ProgressPhase
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)
39
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.
40
from bzrlib.tsort import topo_sort
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
41
from bzrlib.trace import mutter
42
import bzrlib.ui
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
43
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.
44
1231 by Martin Pool
- more progress on fetch on top of weaves
45
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
46
1238 by Martin Pool
- remove a lot of dead code from fetch
47
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
48
# all yet.  I'm not sure they really should be supported.
49
1262 by Martin Pool
- fetch should also copy ancestry records
50
# NOTE: This doesn't copy revisions which may be present but not
51
# merged into the last revision.  I'm not sure we want to do that.
1238 by Martin Pool
- remove a lot of dead code from fetch
52
53
# - get a list of revisions that need to be pulled in
54
# - for each one, pull in that revision file
55
#   and get the inventory, and store the inventory with right
56
#   parents.
57
# - and get the ancestry, and store that with right parents too
58
# - and keep a note of all file ids and version seen
59
# - then go through all files; for each one get the weave,
60
#   and add in all file versions
61
62
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
63
class RepoFetcher(object):
64
    """Pull revisions and texts from one repository to another.
65
66
    last_revision
67
        if set, try to limit to the data this revision references.
68
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
69
    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.
70
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
71
    """
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
72
73
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
3871.3.1 by Martin Pool
Don't set a pack write cache size from RepoFetcher, because the cache is not coherent with reads and causes ShortReadvErrors
74
        find_ghosts=True):
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
75
        """Create a repo fetcher.
76
77
        :param find_ghosts: If True search the entire history for ghosts.
3834.4.5 by Andrew Bennetts
Add some comments to fetch.py
78
        :param _write_group_acquired_callable: Don't use; this parameter only
79
            exists to facilitate a hack done in InterPackRepo.fetch.  We would
80
            like to remove this parameter.
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
81
        """
2668.2.6 by Andrew Bennetts
Merge repository-equality.
82
        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.
83
            # repository.fetch should be taking care of this case.
2592.4.5 by Martin Pool
Add Repository.base on all repositories.
84
            raise errors.BzrError('RepoFetcher run '
85
                    'between two objects at the same location: '
2592.4.4 by Martin Pool
better message for attempted fetch between aliased repositories
86
                    '%r and %r' % (to_repository, from_repository))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
87
        self.to_repository = to_repository
88
        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)
89
        self.sink = to_repository._get_sink()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
90
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
91
        self._last_revision = last_revision
3172.4.1 by Robert Collins
* Fetching via bzr+ssh will no longer fill ghosts by default (this is
92
        self.find_ghosts = find_ghosts
1185.65.27 by Robert Collins
Tweak storage towards mergability.
93
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
94
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
95
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
96
        else:
97
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
98
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
99
        self.from_repository.lock_read()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
100
        try:
101
            try:
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.
102
                self.__fetch()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
103
            finally:
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.
104
                if self.nested_pb is not None:
105
                    self.nested_pb.finished()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
106
        finally:
107
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
108
109
    def __fetch(self):
110
        """Primary worker function.
111
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
112
        This initialises all the needed variables, and then fetches the
1185.65.27 by Robert Collins
Tweak storage towards mergability.
113
        requested revisions, finally clearing the progress bar.
114
        """
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)
115
        # Roughly this is what we're aiming for fetch to become:
116
        #
117
        # missing = self.sink.insert_stream(self.source.get_stream(search))
118
        # if missing:
119
        #     missing = self.sink.insert_stream(self.source.get_items(missing))
120
        # assert not missing
1240 by Martin Pool
- clean up fetch code and add progress bar
121
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
122
        self.file_ids_names = {}
3009.1.1 by Martin Albisetti
Changes Fetch to Transferring to better reflect what is going on
123
        pp = ProgressPhase('Transferring', 4, self.pb)
1392 by Robert Collins
reinstate testfetch test case
124
        try:
1733.2.6 by Michael Ellerman
Fix phase handling in fetch code.
125
            pp.next_phase()
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
126
            search = self._revids_to_fetch()
127
            if search is None:
2535.3.46 by Andrew Bennetts
Fix a bug when "fetching" from a RemoteRepository when the target already has the last revision.
128
                return
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)
129
            self._fetch_everything_for_search(search, pp)
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
130
        finally:
131
            self.pb.clear()
132
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
133
    def _fetch_everything_for_search(self, search, pp):
2535.3.6 by Andrew Bennetts
Move some "what repo data to fetch logic" from RepoFetcher to Repository.
134
        """Fetch all data for the given set of revisions."""
2535.3.9 by Andrew Bennetts
More comments.
135
        # 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.
136
        # into item_keys_introduced_by, which has more information about how
2535.3.9 by Andrew Bennetts
More comments.
137
        # that phase is progressing than we do.  Progress updates for the other
138
        # phases are taken care of in this function.
139
        # 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.
140
        # item_keys_introduced_by should have a richer API than it does at the
141
        # moment, so that it can feed the progress information back to this
2535.3.9 by Andrew Bennetts
More comments.
142
        # function?
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
143
        if (self.from_repository._format.rich_root_data and
144
            not self.to_repository._format.rich_root_data):
145
            raise errors.IncompatibleRepositories(
146
                self.from_repository, self.to_repository,
147
                "different rich-root support")
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
148
        self.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.
149
        try:
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
150
            source = self.from_repository._get_source(
151
                self.to_repository._format)
152
            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)
153
            from_format = self.from_repository._format
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.
154
            resume_tokens, missing_keys = self.sink.insert_stream(
155
                stream, from_format, [])
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
156
            if missing_keys:
4060.1.3 by Robert Collins
Implement the separate source component for fetch - repository.StreamSource.
157
                stream = source.get_stream_for_missing_keys(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.
158
                resume_tokens, missing_keys = self.sink.insert_stream(
159
                    stream, from_format, resume_tokens)
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
160
            if missing_keys:
161
                raise AssertionError(
162
                    "second push failed to complete a fetch %r." % (
163
                        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.
164
            if resume_tokens:
165
                raise AssertionError(
166
                    "second push failed to commit the fetch %r." % (
167
                        resume_tokens,))
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)
168
            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.
169
        finally:
4022.1.2 by Robert Collins
Fix progress bars in fetch after refactoring.
170
            if self.pb is not None:
171
                self.pb.finished()
4029.2.1 by Robert Collins
Support streaming push to stacked branches.
172
1185.65.30 by Robert Collins
Merge integration.
173
    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.
174
        """Determines the exact revisions needed from self.from_repository to
175
        install self._last_revision in self.to_repository.
176
177
        If no revisions need to be fetched, then this just returns None.
178
        """
1185.65.27 by Robert Collins
Tweak storage towards mergability.
179
        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.
180
        if self._last_revision is NULL_REVISION:
181
            # explicit limit of no revisions needed
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
182
            return None
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
183
        if (self._last_revision is not None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
184
            self.to_repository.has_revision(self._last_revision)):
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
185
            return None
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
186
        try:
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
187
            return self.to_repository.search_missing_revision_ids(
188
                self.from_repository, self._last_revision,
189
                find_ghosts=self.find_ghosts)
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
190
        except errors.NoSuchRevision, e:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
191
            raise InstallFailed([self._last_revision])
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
192
3565.3.3 by Robert Collins
* Fetching data between repositories that have the same model but no
193
1910.2.24 by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types
194
class Inter1and2Helper(object):
1910.2.48 by Aaron Bentley
Update from review comments
195
    """Helper for operations that convert data from model 1 and 2
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
196
1910.2.48 by Aaron Bentley
Update from review comments
197
    This is for use by fetchers and converters.
198
    """
199
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)
200
    def __init__(self, source):
1910.2.48 by Aaron Bentley
Update from review comments
201
        """Constructor.
202
203
        :param source: The repository data comes from
204
        """
205
        self.source = source
206
207
    def iter_rev_trees(self, revs):
208
        """Iterate through RevisionTrees efficiently.
209
210
        Additionally, the inventory's revision_id is set if unset.
211
212
        Trees are retrieved in batches of 100, and then yielded in the order
213
        they were requested.
214
215
        :param revs: A list of revision ids
216
        """
3172.4.4 by Robert Collins
Review feedback.
217
        # In case that revs is not a list.
218
        revs = list(revs)
1910.2.48 by Aaron Bentley
Update from review comments
219
        while revs:
220
            for tree in self.source.revision_trees(revs[:100]):
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
221
                if tree.inventory.revision_id is None:
222
                    tree.inventory.revision_id = tree.get_revision_id()
223
                yield tree
1910.2.48 by Aaron Bentley
Update from review comments
224
            revs = revs[100:]
1910.2.44 by Aaron Bentley
Retrieve only 500 revision trees at once
225
3380.2.4 by Aaron Bentley
Updates from review
226
    def _find_root_ids(self, revs, parent_map, graph):
227
        revision_root = {}
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
228
        planned_versions = {}
1910.2.48 by Aaron Bentley
Update from review comments
229
        for tree in self.iter_rev_trees(revs):
1910.2.18 by Aaron Bentley
Implement creation of knits for tree roots
230
            revision_id = tree.inventory.root.revision
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
231
            root_id = tree.get_root_id()
3380.1.2 by Aaron Bentley
Improve handling ghosts and changing root_ids
232
            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
233
            revision_root[revision_id] = root_id
234
        # Find out which parents we don't already know root ids for
235
        parents = set()
236
        for revision_parents in parent_map.itervalues():
237
            parents.update(revision_parents)
238
        parents.difference_update(revision_root.keys() + [NULL_REVISION])
3380.2.7 by Aaron Bentley
Update docs
239
        # Limit to revisions present in the versionedfile
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
240
        parents = graph.get_parent_map(parents).keys()
241
        for tree in self.iter_rev_trees(parents):
242
            root_id = tree.get_root_id()
243
            revision_root[tree.get_revision_id()] = root_id
3380.2.4 by Aaron Bentley
Updates from review
244
        return revision_root, planned_versions
245
246
    def generate_root_texts(self, revs):
247
        """Generate VersionedFiles for all root ids.
248
249
        :param revs: the revisions to include
250
        """
251
        graph = self.source.get_graph()
252
        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.
253
        rev_order = topo_sort(parent_map)
254
        rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
3380.2.4 by Aaron Bentley
Updates from review
255
            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.
256
        root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
257
            rev_order]
258
        # Guaranteed stable, this groups all the file id operations together
259
        # retaining topological order within the revisions of a file id.
260
        # File id splits and joins would invalidate this, but they don't exist
261
        # yet, and are unlikely to in non-rich-root environments anyway.
262
        root_id_order.sort(key=operator.itemgetter(0))
263
        # Create a record stream containing the roots to create.
264
        def yield_roots():
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
265
            for key in root_id_order:
266
                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.
267
                rev_parents = parent_map[rev_id]
3380.2.4 by Aaron Bentley
Updates from review
268
                # 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.
269
                # that represents a rename of the root to a different location
270
                # - its not actually a parent for us. (We could look for that
271
                # file id in the revision tree at considerably more expense,
272
                # but for now this is sufficient (and reconcile will catch and
273
                # correct this anyway).
3380.1.3 by Aaron Bentley
Fix model-change fetching with ghosts and when fetch is resumed
274
                # 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.
275
                # was unchanged (rather than trimming it from the parent list).
276
                parent_keys = tuple((root_id, parent) for parent in rev_parents
277
                    if parent != NULL_REVISION and
278
                        rev_id_to_root_id.get(parent, root_id) == root_id)
279
                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)
280
        return [('texts', yield_roots())]