~bzr-pqm/bzr/bzr.dev

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
17
import os
1231 by Martin Pool
- more progress on fetch on top of weaves
18
from cStringIO import StringIO
1218 by Martin Pool
- fix up import
19
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
20
import bzrlib
21
import bzrlib.errors as errors
22
from bzrlib.errors import InstallFailed, NoSuchRevision, WeaveError
1231 by Martin Pool
- more progress on fetch on top of weaves
23
from bzrlib.trace import mutter, note, warning
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
24
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
25
from bzrlib.progress import ProgressBar
1231 by Martin Pool
- more progress on fetch on top of weaves
26
from bzrlib.xml5 import serializer_v5
27
from bzrlib.osutils import sha_string, split_lines
28
29
"""Copying of history from one branch to another.
30
31
The basic plan is that every branch knows the history of everything
32
that has merged into it.  As the first step of a merge, pull, or
33
branch operation we copy history from the source into the destination
34
branch.
35
36
The copying is done in a slightly complicated order.  We don't want to
37
add a revision to the store until everything it refers to is also
38
stored, so that if a revision is present we can totally recreate it.
39
However, we can't know what files are included in a revision until we
40
read its inventory.  Therefore, we first pull the XML and hold it in
41
memory until we've updated all of the files referenced.
42
"""
43
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
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
62
1260 by Martin Pool
- some updates for fetch/update function
63
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
64
    f = Fetcher(to_branch, from_branch, revision, pb)
65
    return f.count_copied, f.failed_revisions
66
67
1265 by Martin Pool
- add function-style synonym 'fetch'
68
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
69
class Fetcher(object):
1260 by Martin Pool
- some updates for fetch/update function
70
    """Pull revisions and texts from one branch to another.
71
72
    This doesn't update the destination's history; that can be done
73
    separately if desired.  
1231 by Martin Pool
- more progress on fetch on top of weaves
74
75
    revision_limit
76
        If set, pull only up to this revision_id.
1260 by Martin Pool
- some updates for fetch/update function
77
78
    After running:
79
80
    last_revision -- if last_revision
81
        is given it will be that, otherwise the last revision of
82
        from_branch
83
84
    count_copied -- number of revisions copied
85
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
86
    count_weaves -- number of file weaves copied
1260 by Martin Pool
- some updates for fetch/update function
87
    """
88
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1393.1.17 by Martin Pool
- add assertion to fetch
89
        if to_branch == from_branch:
90
            raise Exception("can't fetch from a branch to itself")
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
91
        self.to_branch = to_branch
1260 by Martin Pool
- some updates for fetch/update function
92
        self.to_weaves = to_branch.weave_store
1392 by Robert Collins
reinstate testfetch test case
93
        self.to_control = to_branch.control_weaves
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
94
        self.from_branch = from_branch
1260 by Martin Pool
- some updates for fetch/update function
95
        self.from_weaves = from_branch.weave_store
1392 by Robert Collins
reinstate testfetch test case
96
        self.from_control = from_branch.control_weaves
1231 by Martin Pool
- more progress on fetch on top of weaves
97
        self.failed_revisions = []
98
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
99
        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
100
        self.count_weaves = 0
1404 by Robert Collins
only pull remote text weaves once per fetch operation
101
        self.copied_file_ids = set()
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
102
        if pb is None:
103
            self.pb = bzrlib.ui.ui_factory.progress_bar()
104
        else:
105
            self.pb = pb
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
106
        self.from_branch.lock_read()
1392 by Robert Collins
reinstate testfetch test case
107
        try:
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
108
            self._fetch_revisions(last_revision)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
109
        finally:
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
110
            self.from_branch.unlock()
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
111
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
112
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
113
    def _fetch_revisions(self, last_revision):
114
        try:
115
            self.last_revision = self._find_last_revision(last_revision)
116
        except NoSuchRevision, e:
117
            mutter('failed getting last revision: %s', e)
118
            raise InstallFailed([last_revision])
119
        mutter('fetch up to rev {%s}', 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
120
        if (self.last_revision is not None and 
121
            self.to_branch.has_revision(self.last_revision)):
122
            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
123
        try:
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
124
            revs_to_fetch = self._compare_ancestries()
125
        except WeaveError:
126
            raise InstallFailed([self.last_revision])
127
        self._copy_revisions(revs_to_fetch)
128
        self.new_ancestry = revs_to_fetch
1240 by Martin Pool
- clean up fetch code and add progress bar
129
1260 by Martin Pool
- some updates for fetch/update function
130
    def _find_last_revision(self, last_revision):
1240 by Martin Pool
- clean up fetch code and add progress bar
131
        """Find the limiting source revision.
132
133
        Every ancestor of that revision will be merged across.
134
135
        Returns the revision_id, or returns None if there's no history
136
        in the source branch."""
137
        self.pb.update('get source history')
138
        from_history = self.from_branch.revision_history()
139
        self.pb.update('get destination history')
1260 by Martin Pool
- some updates for fetch/update function
140
        if last_revision:
1392 by Robert Collins
reinstate testfetch test case
141
            self.from_branch.get_revision(last_revision)
142
            return last_revision
1240 by Martin Pool
- clean up fetch code and add progress bar
143
        elif from_history:
144
            return from_history[-1]
145
        else:
146
            return None                 # no history in the source branch
1231 by Martin Pool
- more progress on fetch on top of weaves
147
            
148
149
    def _compare_ancestries(self):
150
        """Get a list of revisions that must be copied.
151
152
        That is, every revision that's in the ancestry of the source
153
        branch and not in the destination branch."""
1240 by Martin Pool
- clean up fetch code and add progress bar
154
        self.pb.update('get source ancestry')
1260 by Martin Pool
- some updates for fetch/update function
155
        self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
1240 by Martin Pool
- clean up fetch code and add progress bar
156
1241 by Martin Pool
- rename last_patch to last_revision
157
        dest_last_rev = self.to_branch.last_revision()
1240 by Martin Pool
- clean up fetch code and add progress bar
158
        self.pb.update('get destination ancestry')
159
        if dest_last_rev:
160
            dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
161
        else:
162
            dest_ancestry = []
163
        ss = set(dest_ancestry)
1231 by Martin Pool
- more progress on fetch on top of weaves
164
        to_fetch = []
165
        for rev_id in self.from_ancestry:
166
            if rev_id not in ss:
167
                to_fetch.append(rev_id)
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
168
                mutter('need to get revision {%s}', rev_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
169
        mutter('need to get %d revisions in total', len(to_fetch))
1240 by Martin Pool
- clean up fetch code and add progress bar
170
        self.count_total = len(to_fetch)
1231 by Martin Pool
- more progress on fetch on top of weaves
171
        return to_fetch
172
173
    def _copy_revisions(self, revs_to_fetch):
1240 by Martin Pool
- clean up fetch code and add progress bar
174
        i = 0
1231 by Martin Pool
- more progress on fetch on top of weaves
175
        for rev_id in revs_to_fetch:
1261 by Martin Pool
- new method Branch.has_revision
176
            i += 1
1390 by Robert Collins
pair programming worx... merge integration and weave
177
            if rev_id is None:
178
                continue
1261 by Martin Pool
- new method Branch.has_revision
179
            if self.to_branch.has_revision(rev_id):
180
                continue
1240 by Martin Pool
- clean up fetch code and add progress bar
181
            self.pb.update('fetch revision', i, self.count_total)
1231 by Martin Pool
- more progress on fetch on top of weaves
182
            self._copy_one_revision(rev_id)
1260 by Martin Pool
- some updates for fetch/update function
183
            self.count_copied += 1
1231 by Martin Pool
- more progress on fetch on top of weaves
184
185
186
    def _copy_one_revision(self, rev_id):
187
        """Copy revision and everything referenced by it."""
188
        mutter('copying revision {%s}', rev_id)
189
        rev_xml = self.from_branch.get_revision_xml(rev_id)
190
        inv_xml = self.from_branch.get_inventory_xml(rev_id)
191
        rev = serializer_v5.read_revision_from_string(rev_xml)
192
        inv = serializer_v5.read_inventory_from_string(inv_xml)
193
        assert rev.revision_id == rev_id
194
        assert rev.inventory_sha1 == sha_string(inv_xml)
195
        mutter('  commiter %s, %d parents',
196
               rev.committer,
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
197
               len(rev.parent_ids))
1231 by Martin Pool
- more progress on fetch on top of weaves
198
        self._copy_new_texts(rev_id, inv)
1092.2.26 by Robert Collins
fetch should work with ghosts
199
        parents = rev.parent_ids
200
        for parent in parents:
201
            if not self.to_branch.has_revision(parent):
202
                parents.pop(parents.index(parent))
203
        self._copy_inventory(rev_id, inv_xml, parents)
1262 by Martin Pool
- fetch should also copy ancestry records
204
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
1404 by Robert Collins
only pull remote text weaves once per fetch operation
205
        mutter('copied revision %s', rev_id)
1262 by Martin Pool
- fetch should also copy ancestry records
206
207
208
    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
209
        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
210
                                split_lines(inv_xml), parent_ids,
211
                                self.to_branch.get_transaction())
1262 by Martin Pool
- fetch should also copy ancestry records
212
1231 by Martin Pool
- more progress on fetch on top of weaves
213
    def _copy_new_texts(self, rev_id, inv):
214
        """Copy any new texts occuring in this revision."""
215
        # TODO: Rather than writing out weaves every time, hold them
216
        # in memory until everything's done?  But this way is nicer
217
        # if it's interrupted.
218
        for path, ie in inv.iter_entries():
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
219
            if ie.revision != rev_id:
1231 by Martin Pool
- more progress on fetch on top of weaves
220
                continue
221
            mutter('%s {%s} is changed in this revision',
222
                   path, ie.file_id)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
223
            self._copy_one_weave(rev_id, ie.file_id)
224
225
226
    def _copy_one_weave(self, rev_id, file_id):
227
        """Copy one file weave."""
1404 by Robert Collins
only pull remote text weaves once per fetch operation
228
        mutter('copy file {%s} modified in {%s}', file_id, rev_id)
229
        if file_id in self.copied_file_ids:
230
            mutter('file {%s} already copied', file_id)
231
            return
1185.1.51 by Robert Collins
merge in reweave support
232
        from_weave = self.from_weaves.get_weave(file_id,
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
233
            self.from_branch.get_transaction())
234
        to_weave = self.to_weaves.get_weave_or_empty(file_id,
235
            self.to_branch.get_transaction())
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
236
        try:
237
            to_weave.join(from_weave)
238
        except errors.WeaveParentMismatch:
239
            to_weave.reweave(from_weave)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
240
        self.to_weaves.put_weave(file_id, to_weave,
241
            self.to_branch.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
242
        self.count_weaves += 1
1404 by Robert Collins
only pull remote text weaves once per fetch operation
243
        self.copied_file_ids.add(file_id)
244
        mutter('copied file {%s}', file_id)
1265 by Martin Pool
- add function-style synonym 'fetch'
245
246
247
fetch = Fetcher