/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
1231 by Martin Pool
- more progress on fetch on top of weaves
28
from bzrlib.xml5 import serializer_v5
29
from bzrlib.osutils import sha_string, split_lines
30
31
"""Copying of history from one branch to another.
32
33
The basic plan is that every branch knows the history of everything
34
that has merged into it.  As the first step of a merge, pull, or
35
branch operation we copy history from the source into the destination
36
branch.
37
38
The copying is done in a slightly complicated order.  We don't want to
39
add a revision to the store until everything it refers to is also
40
stored, so that if a revision is present we can totally recreate it.
41
However, we can't know what files are included in a revision until we
42
read its inventory.  Therefore, we first pull the XML and hold it in
43
memory until we've updated all of the files referenced.
44
"""
45
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
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
64
1260 by Martin Pool
- some updates for fetch/update function
65
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
66
    f = Fetcher(to_branch, from_branch, revision, pb)
67
    return f.count_copied, f.failed_revisions
68
69
1265 by Martin Pool
- add function-style synonym 'fetch'
70
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
71
class Fetcher(object):
1260 by Martin Pool
- some updates for fetch/update function
72
    """Pull revisions and texts from one branch to another.
73
74
    This doesn't update the destination's history; that can be done
75
    separately if desired.  
1231 by Martin Pool
- more progress on fetch on top of weaves
76
77
    revision_limit
78
        If set, pull only up to this revision_id.
1260 by Martin Pool
- some updates for fetch/update function
79
80
    After running:
81
82
    last_revision -- if last_revision
83
        is given it will be that, otherwise the last revision of
84
        from_branch
85
86
    count_copied -- number of revisions copied
87
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
88
    count_weaves -- number of file weaves copied
1260 by Martin Pool
- some updates for fetch/update function
89
    """
90
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1393.1.17 by Martin Pool
- add assertion to fetch
91
        if to_branch == from_branch:
92
            raise Exception("can't fetch from a branch to itself")
1185.65.27 by Robert Collins
Tweak storage towards mergability.
93
        
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
94
        self.to_branch = to_branch
1185.65.27 by Robert Collins
Tweak storage towards mergability.
95
        self.from_branch = from_branch
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
101
        self.from_branch.lock_read()
102
        try:
103
            self.to_branch.lock_write()
104
            try:
105
                self.__fetch()
106
            finally:
107
                self.to_branch.unlock()
108
        finally:
109
            self.from_branch.unlock()
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
        """
117
        self.to_repository = self.to_branch.repository
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
118
        self.to_weaves = self.to_repository.weave_store
119
        self.to_control = self.to_repository.control_weaves
1185.65.27 by Robert Collins
Tweak storage towards mergability.
120
        self.from_repository = self.from_branch.repository
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
121
        self.from_weaves = self.from_repository.weave_store
122
        self.from_control = self.from_repository.control_weaves
1231 by Martin Pool
- more progress on fetch on top of weaves
123
        self.failed_revisions = []
124
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
125
        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
126
        self.count_weaves = 0
1404 by Robert Collins
only pull remote text weaves once per fetch operation
127
        self.copied_file_ids = set()
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
128
        self.file_ids_names = {}
1392 by Robert Collins
reinstate testfetch test case
129
        try:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
130
            self._fetch_revisions()
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.27 by Robert Collins
Tweak storage towards mergability.
134
    def _fetch_revisions(self):
135
        self._find_last_revision()
136
        mutter('fetch up to rev {%s}', self._last_revision)
137
        if (self._last_revision is not None and 
138
            self.to_repository.has_revision(self._last_revision)):
1440 by Robert Collins
further tuning of pull, do not do a local merge or fetch at all, if the remote branch is no newer than we are
139
            return
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
140
        try:
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
141
            revs_to_fetch = self._compare_ancestries()
142
        except WeaveError:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
143
            raise InstallFailed([self._last_revision])
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
144
        self._copy_revisions(revs_to_fetch)
145
        self.new_ancestry = revs_to_fetch
1240 by Martin Pool
- clean up fetch code and add progress bar
146
1185.65.27 by Robert Collins
Tweak storage towards mergability.
147
    def _find_last_revision(self):
1240 by Martin Pool
- clean up fetch code and add progress bar
148
        """Find the limiting source revision.
149
150
        Every ancestor of that revision will be merged across.
151
152
        Returns the revision_id, or returns None if there's no history
153
        in the source branch."""
1185.65.27 by Robert Collins
Tweak storage towards mergability.
154
        if self._last_revision:
155
            return
1240 by Martin Pool
- clean up fetch code and add progress bar
156
        self.pb.update('get source history')
157
        from_history = self.from_branch.revision_history()
158
        self.pb.update('get destination history')
1185.12.21 by aaron.bentley at utoronto
Cleaned up Fetcher._find_last_revision
159
        if from_history:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
160
            self._last_revision = from_history[-1]
1240 by Martin Pool
- clean up fetch code and add progress bar
161
        else:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
162
            # no history in the source branch
163
            self._last_revision = None
1231 by Martin Pool
- more progress on fetch on top of weaves
164
165
    def _compare_ancestries(self):
166
        """Get a list of revisions that must be copied.
167
168
        That is, every revision that's in the ancestry of the source
169
        branch and not in the destination branch."""
1240 by Martin Pool
- clean up fetch code and add progress bar
170
        self.pb.update('get source ancestry')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
171
        from_repository = self.from_branch.repository
1185.65.27 by Robert Collins
Tweak storage towards mergability.
172
        self.from_ancestry = from_repository.get_ancestry(self._last_revision)
1240 by Martin Pool
- clean up fetch code and add progress bar
173
1241 by Martin Pool
- rename last_patch to last_revision
174
        dest_last_rev = self.to_branch.last_revision()
1240 by Martin Pool
- clean up fetch code and add progress bar
175
        self.pb.update('get destination ancestry')
176
        if dest_last_rev:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
177
            to_repository = self.to_branch.repository
178
            dest_ancestry = to_repository.get_ancestry(dest_last_rev)
1240 by Martin Pool
- clean up fetch code and add progress bar
179
        else:
180
            dest_ancestry = []
181
        ss = set(dest_ancestry)
1231 by Martin Pool
- more progress on fetch on top of weaves
182
        to_fetch = []
183
        for rev_id in self.from_ancestry:
184
            if rev_id not in ss:
185
                to_fetch.append(rev_id)
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
186
                mutter('need to get revision {%s}', rev_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
187
        mutter('need to get %d revisions in total', len(to_fetch))
1240 by Martin Pool
- clean up fetch code and add progress bar
188
        self.count_total = len(to_fetch)
1231 by Martin Pool
- more progress on fetch on top of weaves
189
        return to_fetch
190
191
    def _copy_revisions(self, revs_to_fetch):
1240 by Martin Pool
- clean up fetch code and add progress bar
192
        i = 0
1231 by Martin Pool
- more progress on fetch on top of weaves
193
        for rev_id in revs_to_fetch:
1261 by Martin Pool
- new method Branch.has_revision
194
            i += 1
1390 by Robert Collins
pair programming worx... merge integration and weave
195
            if rev_id is None:
196
                continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
197
            if self.to_repository.has_revision(rev_id):
1261 by Martin Pool
- new method Branch.has_revision
198
                continue
1185.33.78 by Martin Pool
Change fetch status message to "copying revision" so it makes sense when pushing.
199
            self.pb.update('copy revision', i, self.count_total)
1231 by Martin Pool
- more progress on fetch on top of weaves
200
            self._copy_one_revision(rev_id)
1260 by Martin Pool
- some updates for fetch/update function
201
            self.count_copied += 1
1231 by Martin Pool
- more progress on fetch on top of weaves
202
203
204
    def _copy_one_revision(self, rev_id):
205
        """Copy revision and everything referenced by it."""
206
        mutter('copying revision {%s}', rev_id)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
207
        rev_xml = self.from_repository.get_revision_xml(rev_id)
208
        inv_xml = self.from_repository.get_inventory_xml(rev_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
209
        rev = serializer_v5.read_revision_from_string(rev_xml)
210
        inv = serializer_v5.read_inventory_from_string(inv_xml)
211
        assert rev.revision_id == rev_id
212
        assert rev.inventory_sha1 == sha_string(inv_xml)
213
        mutter('  commiter %s, %d parents',
214
               rev.committer,
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
215
               len(rev.parent_ids))
1231 by Martin Pool
- more progress on fetch on top of weaves
216
        self._copy_new_texts(rev_id, inv)
1092.2.26 by Robert Collins
fetch should work with ghosts
217
        parents = rev.parent_ids
1480 by Robert Collins
BUGFIX: fetch was not skipping all missing parents for inventory insertion
218
        new_parents = copy(parents)
1092.2.26 by Robert Collins
fetch should work with ghosts
219
        for parent in parents:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
220
            if not self.to_repository.has_revision(parent):
1480 by Robert Collins
BUGFIX: fetch was not skipping all missing parents for inventory insertion
221
                new_parents.pop(new_parents.index(parent))
222
        self._copy_inventory(rev_id, inv_xml, new_parents)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
223
        self.to_repository.revision_store.add(StringIO(rev_xml), rev_id)
1404 by Robert Collins
only pull remote text weaves once per fetch operation
224
        mutter('copied revision %s', rev_id)
1262 by Martin Pool
- fetch should also copy ancestry records
225
226
    def _copy_inventory(self, rev_id, inv_xml, parent_ids):
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
227
        self.to_control.add_text('inventory', rev_id,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
228
                                split_lines(inv_xml), parent_ids,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
229
                                self.to_repository.get_transaction())
1262 by Martin Pool
- fetch should also copy ancestry records
230
1231 by Martin Pool
- more progress on fetch on top of weaves
231
    def _copy_new_texts(self, rev_id, inv):
232
        """Copy any new texts occuring in this revision."""
233
        # TODO: Rather than writing out weaves every time, hold them
234
        # in memory until everything's done?  But this way is nicer
235
        # if it's interrupted.
236
        for path, ie in inv.iter_entries():
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
237
            self._copy_one_weave(rev_id, ie.file_id, ie.revision)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
238
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
239
    def _copy_one_weave(self, rev_id, file_id, text_revision):
240
        """Copy one file weave, esuring the result contains text_revision."""
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
241
        # check if the revision is already there
242
        if file_id in self.file_ids_names.keys( ) and \
243
            text_revision in self.file_ids_names[file_id]:
244
                return        
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
245
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
246
            self.to_repository.get_transaction())
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
247
        if not file_id in self.file_ids_names.keys( ):
248
            self.file_ids_names[file_id] = to_weave.names( )
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
249
        if text_revision in to_weave:
1404 by Robert Collins
only pull remote text weaves once per fetch operation
250
            return
1185.1.51 by Robert Collins
merge in reweave support
251
        from_weave = self.from_weaves.get_weave(file_id,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
252
            self.from_branch.repository.get_transaction())
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
253
        if text_revision not in from_weave:
254
            raise MissingText(self.from_branch, text_revision, file_id)
255
        mutter('copy file {%s} modified in {%s}', file_id, rev_id)
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
256
257
        if to_weave.numversions() > 0:
258
            # destination has contents, must merge
259
            try:
260
                to_weave.join(from_weave)
261
            except errors.WeaveParentMismatch:
262
                to_weave.reweave(from_weave)
263
        else:
264
            # destination is empty, just replace it
265
            to_weave = from_weave.copy( )
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
266
        self.to_weaves.put_weave(file_id, to_weave,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
267
            self.to_repository.get_transaction())
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
268
        self.count_weaves += 1
1404 by Robert Collins
only pull remote text weaves once per fetch operation
269
        self.copied_file_ids.add(file_id)
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
270
        self.file_ids_names[file_id] = to_weave.names()
1404 by Robert Collins
only pull remote text weaves once per fetch operation
271
        mutter('copied file {%s}', file_id)
1265 by Martin Pool
- add function-style synonym 'fetch'
272
273
274
fetch = Fetcher