/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
1
# Copyright (C) 2005 by Canonical Ltd
2
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.
7
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.
12
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
30
the ids we need, and then pull those ids and finally actually join
31
the inventories.
1231 by Martin Pool
- more progress on fetch on top of weaves
32
"""
33
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.
34
import bzrlib
35
import bzrlib.errors as errors
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
36
from bzrlib.errors import (InstallFailed, NoSuchRevision,
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
                           MissingText)
38
from bzrlib.trace import mutter
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
39
from bzrlib.reconcile import RepoReconciler
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.
40
from bzrlib.revision import NULL_REVISION
41
from bzrlib.symbol_versioning import *
42
43
1231 by Martin Pool
- more progress on fetch on top of weaves
44
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
45
1238 by Martin Pool
- remove a lot of dead code from fetch
46
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
47
# all yet.  I'm not sure they really should be supported.
48
1262 by Martin Pool
- fetch should also copy ancestry records
49
# NOTE: This doesn't copy revisions which may be present but not
50
# 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
51
52
# - get a list of revisions that need to be pulled in
53
# - for each one, pull in that revision file
54
#   and get the inventory, and store the inventory with right
55
#   parents.
56
# - and get the ancestry, and store that with right parents too
57
# - and keep a note of all file ids and version seen
58
# - then go through all files; for each one get the weave,
59
#   and add in all file versions
60
61
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.
62
@deprecated_function(zero_eight)
1260 by Martin Pool
- some updates for fetch/update function
63
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
64
    """Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
65
    f = Fetcher(to_branch, from_branch, revision, pb)
66
    return f.count_copied, f.failed_revisions
67
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
68
fetch = greedy_fetch
69
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
70
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
71
class RepoFetcher(object):
72
    """Pull revisions and texts from one repository to another.
73
74
    last_revision
75
        if set, try to limit to the data this revision references.
76
77
    after running:
1260 by Martin Pool
- some updates for fetch/update function
78
    count_copied -- number of revisions copied
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.
79
80
    This should not be used directory, its essential a object to encapsulate
81
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
82
    """
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.
83
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
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.
84
        # result variables.
85
        self.failed_revisions = []
86
        self.count_copied = 0
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
87
        if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
88
            # check that last_revision is in 'from' and then return a no-operation.
89
            if last_revision not in (None, NULL_REVISION):
90
                from_repository.get_revision(last_revision)
91
            return
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
92
        self.to_repository = to_repository
93
        self.from_repository = from_repository
94
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
95
        self._last_revision = last_revision
96
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
97
            self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
98
            self.nested_pb = self.pb
1185.65.27 by Robert Collins
Tweak storage towards mergability.
99
        else:
100
            self.pb = pb
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
101
            self.nested_pb = None
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
102
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
103
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
104
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
105
            try:
106
                self.__fetch()
107
            finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
108
                if self.nested_pb is not None:
109
                    self.nested_pb.finished()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
110
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
111
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
112
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
113
114
    def __fetch(self):
115
        """Primary worker function.
116
117
        This initialises all the needed variables, and then fetches the 
118
        requested revisions, finally clearing the progress bar.
119
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
120
        self.to_weaves = self.to_repository.weave_store
121
        self.to_control = self.to_repository.control_weaves
122
        self.from_weaves = self.from_repository.weave_store
123
        self.from_control = self.from_repository.control_weaves
1240 by Martin Pool
- clean up fetch code and add progress bar
124
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
125
        self.file_ids_names = {}
1596.2.22 by Robert Collins
Fetch changes to use new pb.
126
        self.total_steps = 4
1392 by Robert Collins
reinstate testfetch test case
127
        try:
1185.65.30 by Robert Collins
Merge integration.
128
            revs = self._revids_to_fetch()
1596.2.22 by Robert Collins
Fetch changes to use new pb.
129
            # something to do ?
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
130
            if revs: 
1596.2.22 by Robert Collins
Fetch changes to use new pb.
131
                self.pb.update('Fetching text', 1, self.total_steps)
1534.1.11 by Robert Collins
Format tweaks for latest merges.
132
                self._fetch_weave_texts(revs)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
133
                self.pb.update('Fetching inventories', 2, self.total_steps)
1534.1.11 by Robert Collins
Format tweaks for latest merges.
134
                self._fetch_inventory_weave(revs)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
135
                self.pb.update('Fetching revisions', 3, self.total_steps)
1534.1.11 by Robert Collins
Format tweaks for latest merges.
136
                self._fetch_revision_texts(revs)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
137
                self.pb.update('Fetching revisions', 4, self.total_steps)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
138
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
139
        finally:
140
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
141
1185.65.30 by Robert Collins
Merge integration.
142
    def _revids_to_fetch(self):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
143
        self.pb.update('Calculating needed data', 0, self.total_steps)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
144
        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.
145
        if self._last_revision is NULL_REVISION:
146
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
147
            return None
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.
148
        if (self._last_revision != None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
149
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
150
            return None
151
            
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
152
        try:
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.
153
            return self.to_repository.missing_revision_ids(self.from_repository,
154
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
155
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
156
            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
157
1534.1.11 by Robert Collins
Format tweaks for latest merges.
158
    def _fetch_weave_texts(self, revs):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
159
        texts_pb = bzrlib.ui.ui_factory.nested_progress_bar()
160
        try:
161
            file_ids = self.from_repository.fileid_involved_by_set(revs)
162
            count = 0
163
            num_file_ids = len(file_ids)
164
            for file_id in file_ids:
165
                texts_pb.update("fetch texts", count, num_file_ids)
166
                count +=1
167
                to_weave = self.to_weaves.get_weave_or_empty(file_id,
168
                    self.to_repository.get_transaction())
169
    
170
                if to_weave.num_versions() > 0:
171
                    # destination has contents, must merge
172
                    from_weave = self.from_weaves.get_weave(file_id,
173
                        self.from_repository.get_transaction())
174
                    # we fetch all the texts, because texts do
175
                    # not reference anything, and its cheap enough
176
                    to_weave.join(from_weave)
177
                else:
178
                    # destination is empty, just copy it.
179
                    # this copies all the texts, which is useful and 
180
                    # on per-file basis quite cheap.
181
                    self.to_weaves.copy_multi(
182
                        self.from_weaves,
183
                        [file_id],
184
                        None,
185
                        self.from_repository.get_transaction(),
186
                        self.to_repository.get_transaction())
187
        finally:
188
            texts_pb.finished()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
189
1534.1.11 by Robert Collins
Format tweaks for latest merges.
190
    def _fetch_inventory_weave(self, revs):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
191
        inv_pb = bzrlib.ui.ui_factory.nested_progress_bar()
192
        try:
193
            inv_pb.update("fetch inventory", 0, 2)
194
            to_weave = self.to_control.get_weave('inventory',
195
                    self.to_repository.get_transaction())
196
    
197
            # just merge, this is optimisable and its means we dont
198
            # copy unreferenced data such as not-needed inventories.
199
            self.pb.update("fetch inventory", 1, 2)
200
            from_weave = self.from_repository.get_inventory_weave()
201
            self.pb.update("fetch inventory", 2, 2)
202
            # we fetch only the referenced inventories because we do not
203
            # know for unselected inventories whether all their required
204
            # texts are present in the other repository - it could be
205
            # corrupt.
206
            to_weave.join(from_weave, msg='fetch inventory', version_ids=revs)
207
        finally:
208
            inv_pb.finished()
1240 by Martin Pool
- clean up fetch code and add progress bar
209
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
210
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
211
class GenericRepoFetcher(RepoFetcher):
212
    """This is a generic repo to repo fetcher.
213
214
    This makes minimal assumptions about repo layout and contents.
215
    It triggers a reconciliation after fetching to ensure integrity.
216
    """
217
218
    def _fetch_revision_texts(self, revs):
1596.2.22 by Robert Collins
Fetch changes to use new pb.
219
        rev_pb = bzrlib.ui.ui_factory.nested_progress_bar()
220
        try:
221
            self.to_transaction = self.to_repository.get_transaction()
222
            count = 0
223
            total = len(revs)
224
            for rev in revs:
1596.2.23 by Robert Collins
Doh, fetch-pb-unbreak.
225
                rev_pb.update('fetch revisions', count, total)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
226
                try:
227
                    sig_text = self.from_repository.get_signature_text(rev)
228
                    self.to_repository._revision_store.add_revision_signature_text(
229
                        rev, sig_text, self.to_transaction)
230
                except errors.NoSuchRevision:
231
                    # not signed.
232
                    pass
233
                self.to_repository._revision_store.add_revision(
234
                    self.from_repository.get_revision(rev),
235
                    self.to_transaction)
236
                count += 1
237
            rev_pb.update('copying revisions', count, total)
238
            # fixup inventory if needed: 
239
            # this is expensive because we have no inverse index to current ghosts.
240
            # but on local disk its a few seconds and sftp push is already insane.
241
            # so we just-do-it.
242
            # FIXME: repository should inform if this is needed.
243
            self.to_repository.reconcile()
244
        finally:
245
            rev_pb.finished()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
246
    
247
248
class KnitRepoFetcher(RepoFetcher):
249
    """This is a knit format repository specific fetcher.
250
251
    This differs from the GenericRepoFetcher by not doing a 
252
    reconciliation after copying, and using knit joining to
253
    copy revision texts.
254
    """
255
256
    def _fetch_revision_texts(self, revs):
257
        # may need to be a InterRevisionStore call here.
258
        from_transaction = self.from_repository.get_transaction()
259
        to_transaction = self.to_repository.get_transaction()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
260
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
261
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
262
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
263
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
264
        to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
265
        to_rf = self.to_repository._revision_store.get_revision_file(
266
            to_transaction)
267
        from_rf = self.from_repository._revision_store.get_revision_file(
268
            from_transaction)
1596.2.22 by Robert Collins
Fetch changes to use new pb.
269
        to_rf.join(from_rf, version_ids=revs)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
270
271
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
272
class Fetcher(object):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
273
    """Backwards compatability glue for branch.fetch()."""
274
275
    @deprecated_method(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
276
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
277
        """Please see branch.fetch()."""
278
        to_branch.fetch(from_branch, last_revision, pb)