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