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