/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
1480 by Robert Collins
BUGFIX: fetch was not skipping all missing parents for inventory insertion
17
from copy import copy
1218 by Martin Pool
- fix up import
18
import os
1231 by Martin Pool
- more progress on fetch on top of weaves
19
from cStringIO import StringIO
1218 by Martin Pool
- fix up import
20
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
21
import bzrlib
22
import bzrlib.errors as errors
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
23
from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError,
24
                           MissingText)
1231 by Martin Pool
- more progress on fetch on top of weaves
25
from bzrlib.trace import mutter, note, warning
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
26
from bzrlib.branch import Branch
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
27
from bzrlib.progress import ProgressBar
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
28
from bzrlib.revision import NULL_REVISION
1231 by Martin Pool
- more progress on fetch on top of weaves
29
from bzrlib.xml5 import serializer_v5
30
from bzrlib.osutils import sha_string, split_lines
31
32
"""Copying of history from one branch to another.
33
34
The basic plan is that every branch knows the history of everything
35
that has merged into it.  As the first step of a merge, pull, or
36
branch operation we copy history from the source into the destination
37
branch.
38
39
The copying is done in a slightly complicated order.  We don't want to
40
add a revision to the store until everything it refers to is also
41
stored, so that if a revision is present we can totally recreate it.
42
However, we can't know what files are included in a revision until we
43
read its inventory.  Therefore, we first pull the XML and hold it in
44
memory until we've updated all of the files referenced.
45
"""
46
47
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
48
1238 by Martin Pool
- remove a lot of dead code from fetch
49
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
50
# all yet.  I'm not sure they really should be supported.
51
1262 by Martin Pool
- fetch should also copy ancestry records
52
# NOTE: This doesn't copy revisions which may be present but not
53
# 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
54
55
# - get a list of revisions that need to be pulled in
56
# - for each one, pull in that revision file
57
#   and get the inventory, and store the inventory with right
58
#   parents.
59
# - and get the ancestry, and store that with right parents too
60
# - and keep a note of all file ids and version seen
61
# - then go through all files; for each one get the weave,
62
#   and add in all file versions
63
64
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
65
1260 by Martin Pool
- some updates for fetch/update function
66
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
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
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
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
79
    count_weaves -- number of file weaves copied
1260 by Martin Pool
- some updates for fetch/update function
80
    """
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.
81
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
82
        if to_repository.bzrdir.transport.base == from_repository.bzrdir.transport.base:
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
83
            # check that last_revision is in 'from' and then return a no-operation.
84
            if last_revision not in (None, NULL_REVISION):
85
                from_repository.get_revision(last_revision)
86
            return
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
87
        self.to_repository = to_repository
88
        self.from_repository = from_repository
89
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
90
        self._last_revision = last_revision
91
        if pb is None:
92
            self.pb = bzrlib.ui.ui_factory.progress_bar()
93
        else:
94
            self.pb = pb
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
95
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
96
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
97
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
98
            try:
99
                self.__fetch()
100
            finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
101
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
102
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
103
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
104
105
    def __fetch(self):
106
        """Primary worker function.
107
108
        This initialises all the needed variables, and then fetches the 
109
        requested revisions, finally clearing the progress bar.
110
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
111
        self.to_weaves = self.to_repository.weave_store
112
        self.to_control = self.to_repository.control_weaves
113
        self.from_weaves = self.from_repository.weave_store
114
        self.from_control = self.from_repository.control_weaves
1231 by Martin Pool
- more progress on fetch on top of weaves
115
        self.failed_revisions = []
116
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
117
        self.count_total = 0
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
118
        self.count_weaves = 0
1404 by Robert Collins
only pull remote text weaves once per fetch operation
119
        self.copied_file_ids = set()
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
120
        self.file_ids_names = {}
1392 by Robert Collins
reinstate testfetch test case
121
        try:
1185.65.30 by Robert Collins
Merge integration.
122
            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
123
            # nothing to do
124
            if revs: 
1534.1.11 by Robert Collins
Format tweaks for latest merges.
125
                self._fetch_weave_texts(revs)
126
                self._fetch_inventory_weave(revs)
127
                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
128
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
129
        finally:
130
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
131
1185.65.30 by Robert Collins
Merge integration.
132
    def _revids_to_fetch(self):
1185.65.27 by Robert Collins
Tweak storage towards mergability.
133
        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.
134
        if self._last_revision is NULL_REVISION:
135
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
136
            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.
137
        if (self._last_revision != None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
138
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
139
            return None
140
            
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
141
        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.
142
            return self.to_repository.missing_revision_ids(self.from_repository,
143
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
144
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
145
            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
146
1534.1.11 by Robert Collins
Format tweaks for latest merges.
147
    def _fetch_revision_texts(self, revs):
1185.65.30 by Robert Collins
Merge integration.
148
        self.to_repository.revision_store.copy_multi(
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
149
            self.from_repository.revision_store,
150
            revs,
151
            pb=self.pb)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
152
1534.1.11 by Robert Collins
Format tweaks for latest merges.
153
    def _fetch_weave_texts(self, revs):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
154
        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
155
        count = 0
156
        num_file_ids = len(file_ids)
157
        for file_id in file_ids:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
158
            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
159
            count +=1
160
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
161
                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
162
            from_weave = self.from_weaves.get_weave(file_id,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
163
                self.from_repository.get_transaction())
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
164
165
            if to_weave.numversions() > 0:
166
                # destination has contents, must merge
167
                try:
168
                    to_weave.join(from_weave)
169
                except errors.WeaveParentMismatch:
170
                    to_weave.reweave(from_weave)
171
            else:
172
                # destination is empty, just replace it
1534.1.11 by Robert Collins
Format tweaks for latest merges.
173
                to_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
174
175
            self.to_weaves.put_weave(file_id, to_weave,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
176
                self.to_repository.get_transaction())
1534.1.11 by Robert Collins
Format tweaks for latest merges.
177
        self.pb.clear()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
178
1534.1.11 by Robert Collins
Format tweaks for latest merges.
179
    def _fetch_inventory_weave(self, revs):
1549.1.2 by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
180
        self.pb.update("inventory fetch", 0, 2)
1185.65.30 by Robert Collins
Merge integration.
181
        from_weave = self.from_repository.get_inventory_weave()
182
        to_weave = self.to_repository.get_inventory_weave()
1549.1.2 by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
183
        self.pb.update("inventory fetch", 1, 2)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
184
        to_weave = self.to_control.get_weave('inventory',
1534.4.43 by Robert Collins
Merge from integration
185
                self.to_repository.get_transaction())
1549.1.2 by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
186
        self.pb.update("inventory fetch", 2, 2)
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
187
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
188
        if to_weave.numversions() > 0:
189
            # destination has contents, must merge
190
            try:
1549.1.2 by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
191
                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
192
            except errors.WeaveParentMismatch:
1549.1.2 by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
193
                to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
194
        else:
195
            # destination is empty, just replace it
1534.1.11 by Robert Collins
Format tweaks for latest merges.
196
            to_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
197
198
        self.to_control.put_weave('inventory', to_weave,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
199
            self.to_repository.get_transaction())
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
200
1534.1.11 by Robert Collins
Format tweaks for latest merges.
201
        self.pb.clear()
1240 by Martin Pool
- clean up fetch code and add progress bar
202
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
203
204
class Fetcher(object):
205
    """Pull revisions and texts from one branch to another.
206
207
    This doesn't update the destination's history; that can be done
208
    separately if desired.  
209
210
    revision_limit
211
        If set, pull only up to this revision_id.
212
213
    After running:
214
215
    last_revision -- if last_revision
216
        is given it will be that, otherwise the last revision of
217
        from_branch
218
219
    count_copied -- number of revisions copied
220
221
    count_weaves -- number of file weaves copied
222
    """
223
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
224
        if to_branch.base == from_branch.base:
225
            raise Exception("can't fetch from a branch to itself %s, %s" % 
226
                            (from_branch.base, to_branch.base))
227
        
228
        self.to_branch = to_branch
229
        self.from_branch = from_branch
230
        self._last_revision = last_revision
231
        if pb is None:
232
            self.pb = bzrlib.ui.ui_factory.progress_bar()
233
        else:
234
            self.pb = pb
235
        self.from_branch.lock_read()
236
        try:
237
            self.to_branch.lock_write()
238
            try:
239
                self.__fetch()
240
            finally:
241
                self.to_branch.unlock()
242
        finally:
243
            self.from_branch.unlock()
244
245
    def __fetch(self):
246
        self._find_last_revision()
247
        repo_fetcher = RepoFetcher(to_repository=self.to_branch.repository,
248
                                   from_repository=self.from_branch.repository,
249
                                   pb=self.pb,
250
                                   last_revision=self._last_revision)
251
        self.failed_revisions = repo_fetcher.failed_revisions
252
        self.count_copied = repo_fetcher.count_copied
253
        self.count_total = repo_fetcher.count_total
254
        self.count_weaves = repo_fetcher.count_weaves
255
        self.copied_file_ids = repo_fetcher.copied_file_ids
256
1185.65.27 by Robert Collins
Tweak storage towards mergability.
257
    def _find_last_revision(self):
1240 by Martin Pool
- clean up fetch code and add progress bar
258
        """Find the limiting source revision.
259
260
        Every ancestor of that revision will be merged across.
261
262
        Returns the revision_id, or returns None if there's no history
263
        in the source branch."""
1185.65.27 by Robert Collins
Tweak storage towards mergability.
264
        if self._last_revision:
265
            return
1240 by Martin Pool
- clean up fetch code and add progress bar
266
        self.pb.update('get source history')
267
        from_history = self.from_branch.revision_history()
268
        self.pb.update('get destination history')
1185.12.21 by aaron.bentley at utoronto
Cleaned up Fetcher._find_last_revision
269
        if from_history:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
270
            self._last_revision = from_history[-1]
1240 by Martin Pool
- clean up fetch code and add progress bar
271
        else:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
272
            # no history in the source branch
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.
273
            self._last_revision = NULL_REVISION
1265 by Martin Pool
- add function-style synonym 'fetch'
274
275
fetch = Fetcher