/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
39
from bzrlib.progress import ProgressBar
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 *
43
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.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.
63
@deprecated_function(zero_eight)
1260 by Martin Pool
- some updates for fetch/update function
64
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
65
    """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
66
    f = Fetcher(to_branch, from_branch, revision, pb)
67
    return f.count_copied, f.failed_revisions
68
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
69
fetch = greedy_fetch
70
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
71
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
72
class RepoFetcher(object):
73
    """Pull revisions and texts from one repository to another.
74
75
    last_revision
76
        if set, try to limit to the data this revision references.
77
78
    after running:
1260 by Martin Pool
- some updates for fetch/update function
79
    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.
80
81
    This should not be used directory, its essential a object to encapsulate
82
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
83
    """
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.
84
    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.
85
        # result variables.
86
        self.failed_revisions = []
87
        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.
88
        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.
89
            # check that last_revision is in 'from' and then return a no-operation.
90
            if last_revision not in (None, NULL_REVISION):
91
                from_repository.get_revision(last_revision)
92
            return
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
93
        self.to_repository = to_repository
94
        self.from_repository = from_repository
95
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
96
        self._last_revision = last_revision
97
        if pb is None:
98
            self.pb = bzrlib.ui.ui_factory.progress_bar()
99
        else:
100
            self.pb = pb
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
101
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
102
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
103
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
104
            try:
105
                self.__fetch()
106
            finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
107
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
108
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
109
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
110
111
    def __fetch(self):
112
        """Primary worker function.
113
114
        This initialises all the needed variables, and then fetches the 
115
        requested revisions, finally clearing the progress bar.
116
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
117
        self.to_weaves = self.to_repository.weave_store
118
        self.to_control = self.to_repository.control_weaves
119
        self.from_weaves = self.from_repository.weave_store
120
        self.from_control = self.from_repository.control_weaves
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 = {}
1392 by Robert Collins
reinstate testfetch test case
123
        try:
1185.65.30 by Robert Collins
Merge integration.
124
            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
125
            # nothing to do
126
            if revs: 
1534.1.11 by Robert Collins
Format tweaks for latest merges.
127
                self._fetch_weave_texts(revs)
128
                self._fetch_inventory_weave(revs)
129
                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
130
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
131
        finally:
132
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
133
1185.65.30 by Robert Collins
Merge integration.
134
    def _revids_to_fetch(self):
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.
135
        self.pb.update('get destination history')
1185.65.27 by Robert Collins
Tweak storage towards mergability.
136
        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.
137
        if self._last_revision is NULL_REVISION:
138
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
139
            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.
140
        if (self._last_revision != None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
141
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
142
            return None
143
            
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
144
        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.
145
            return self.to_repository.missing_revision_ids(self.from_repository,
146
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
147
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
148
            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
149
1534.1.11 by Robert Collins
Format tweaks for latest merges.
150
    def _fetch_weave_texts(self, revs):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
151
        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
152
        count = 0
153
        num_file_ids = len(file_ids)
154
        for file_id in file_ids:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
155
            self.pb.update("merge weaves", count, num_file_ids)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
156
            count +=1
157
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
158
                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
159
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
160
            if to_weave.num_versions() > 0:
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
161
                # destination has contents, must merge
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
162
                from_weave = self.from_weaves.get_weave(file_id,
163
                    self.from_repository.get_transaction())
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
164
                to_weave.join(from_weave)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
165
            else:
166
                # destination is empty, just replace it
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
167
                self.to_weaves.copy_multi(self.from_weaves, [file_id], self.pb,
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
168
                                          self.from_repository.get_transaction(),
169
                                          self.to_repository.get_transaction())
1534.1.11 by Robert Collins
Format tweaks for latest merges.
170
        self.pb.clear()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
171
1534.1.11 by Robert Collins
Format tweaks for latest merges.
172
    def _fetch_inventory_weave(self, revs):
1551.3.11 by Aaron Bentley
Merge from Robert
173
        self.pb.update("inventory fetch", 0, 2)
174
        to_weave = self.to_control.get_weave('inventory',
1534.4.43 by Robert Collins
Merge from integration
175
                self.to_repository.get_transaction())
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
176
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
177
        if to_weave.num_versions() > 0:
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
178
            # destination has contents, must merge
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
179
            self.pb.update("inventory fetch", 1, 2)
180
            from_weave = self.from_repository.get_inventory_weave()
181
            self.pb.update("inventory fetch", 2, 2)
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
182
            to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
183
        else:
184
            # destination is empty, just replace it
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
185
            self.to_control.copy_multi(self.from_control,
186
                                       ['inventory'],
187
                                       self.pb,
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
188
                                       self.from_repository.get_transaction(),
189
                                       self.to_repository.get_transaction())
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
190
1534.1.11 by Robert Collins
Format tweaks for latest merges.
191
        self.pb.clear()
1240 by Martin Pool
- clean up fetch code and add progress bar
192
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
193
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
194
class GenericRepoFetcher(RepoFetcher):
195
    """This is a generic repo to repo fetcher.
196
197
    This makes minimal assumptions about repo layout and contents.
198
    It triggers a reconciliation after fetching to ensure integrity.
199
    """
200
201
    def _fetch_revision_texts(self, revs):
202
        self.to_transaction = self.to_repository.get_transaction()
203
        count = 0
204
        total = len(revs)
205
        for rev in revs:
206
            self.pb.update('copying revisions', count, total)
207
            try:
208
                sig_text = self.from_repository.get_signature_text(rev)
209
                self.to_repository._revision_store.add_revision_signature_text(
210
                    rev, sig_text, self.to_transaction)
211
            except errors.NoSuchRevision:
212
                # not signed.
213
                pass
214
            self.to_repository._revision_store.add_revision(
215
                self.from_repository.get_revision(rev),
216
                self.to_transaction)
217
            count += 1
218
        self.pb.update('copying revisions', count, total)
219
        # fixup inventory if needed: 
220
        # this is expensive because we have no inverse index to current ghosts.
221
        # but on local disk its a few seconds and sftp push is already insane.
222
        # so we just-do-it.
223
        # FIXME: repository should inform if this is needed.
224
        reconciler = RepoReconciler(self.to_repository)
225
        reconciler.reconcile()
226
    
227
228
class KnitRepoFetcher(RepoFetcher):
229
    """This is a knit format repository specific fetcher.
230
231
    This differs from the GenericRepoFetcher by not doing a 
232
    reconciliation after copying, and using knit joining to
233
    copy revision texts.
234
    """
235
236
    def _fetch_revision_texts(self, revs):
237
        # may need to be a InterRevisionStore call here.
238
        from_transaction = self.from_repository.get_transaction()
239
        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.
240
        to_sf = self.to_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
241
            to_transaction)
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
242
        from_sf = self.from_repository._revision_store.get_signature_file(
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
243
            from_transaction)
244
        to_sf.join(from_sf, version_ids=revs, pb=self.pb, ignore_missing=True)
245
        to_rf = self.to_repository._revision_store.get_revision_file(
246
            to_transaction)
247
        from_rf = self.from_repository._revision_store.get_revision_file(
248
            from_transaction)
249
        to_rf.join(from_rf, version_ids=revs, pb=self.pb)
250
        reconciler = RepoReconciler(self.to_repository)
251
        reconciler.reconcile()
252
253
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
254
class Fetcher(object):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
255
    """Backwards compatability glue for branch.fetch()."""
256
257
    @deprecated_method(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
258
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
259
        """Please see branch.fetch()."""
260
        to_branch.fetch(from_branch, last_revision, pb)