/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
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
85
    count_texts -- number of file texts copied
86
    """
87
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
88
        self.to_branch = to_branch
1260 by Martin Pool
- some updates for fetch/update function
89
        self.to_weaves = to_branch.weave_store
1392 by Robert Collins
reinstate testfetch test case
90
        self.to_control = to_branch.control_weaves
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
91
        self.from_branch = from_branch
1260 by Martin Pool
- some updates for fetch/update function
92
        self.from_weaves = from_branch.weave_store
1392 by Robert Collins
reinstate testfetch test case
93
        self.from_control = from_branch.control_weaves
1231 by Martin Pool
- more progress on fetch on top of weaves
94
        self.failed_revisions = []
95
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
96
        self.count_total = 0
1260 by Martin Pool
- some updates for fetch/update function
97
        self.count_texts = 0
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
98
        if pb is None:
99
            self.pb = bzrlib.ui.ui_factory.progress_bar()
100
        else:
101
            self.pb = pb
1392 by Robert Collins
reinstate testfetch test case
102
        try:
103
            self.last_revision = self._find_last_revision(last_revision)
104
        except NoSuchRevision:
105
            raise InstallFailed([last_revision])
1260 by Martin Pool
- some updates for fetch/update function
106
        mutter('fetch up to rev {%s}', self.last_revision)
1392 by Robert Collins
reinstate testfetch test case
107
        try:
108
            revs_to_fetch = self._compare_ancestries()
109
        except WeaveError:
110
            raise InstallFailed([self.last_revision])
1231 by Martin Pool
- more progress on fetch on top of weaves
111
        self._copy_revisions(revs_to_fetch)
1260 by Martin Pool
- some updates for fetch/update function
112
        self.new_ancestry = revs_to_fetch
1231 by Martin Pool
- more progress on fetch on top of weaves
113
1240 by Martin Pool
- clean up fetch code and add progress bar
114
1260 by Martin Pool
- some updates for fetch/update function
115
    def _find_last_revision(self, last_revision):
1240 by Martin Pool
- clean up fetch code and add progress bar
116
        """Find the limiting source revision.
117
118
        Every ancestor of that revision will be merged across.
119
120
        Returns the revision_id, or returns None if there's no history
121
        in the source branch."""
122
        self.pb.update('get source history')
123
        from_history = self.from_branch.revision_history()
124
        self.pb.update('get destination history')
1260 by Martin Pool
- some updates for fetch/update function
125
        if last_revision:
1392 by Robert Collins
reinstate testfetch test case
126
            self.from_branch.get_revision(last_revision)
127
            return last_revision
1240 by Martin Pool
- clean up fetch code and add progress bar
128
        elif from_history:
129
            return from_history[-1]
130
        else:
131
            return None                 # no history in the source branch
1231 by Martin Pool
- more progress on fetch on top of weaves
132
            
133
134
    def _compare_ancestries(self):
135
        """Get a list of revisions that must be copied.
136
137
        That is, every revision that's in the ancestry of the source
138
        branch and not in the destination branch."""
1240 by Martin Pool
- clean up fetch code and add progress bar
139
        self.pb.update('get source ancestry')
1260 by Martin Pool
- some updates for fetch/update function
140
        self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
1240 by Martin Pool
- clean up fetch code and add progress bar
141
1241 by Martin Pool
- rename last_patch to last_revision
142
        dest_last_rev = self.to_branch.last_revision()
1240 by Martin Pool
- clean up fetch code and add progress bar
143
        self.pb.update('get destination ancestry')
144
        if dest_last_rev:
145
            dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
146
        else:
147
            dest_ancestry = []
148
        ss = set(dest_ancestry)
1231 by Martin Pool
- more progress on fetch on top of weaves
149
        to_fetch = []
150
        for rev_id in self.from_ancestry:
151
            if rev_id not in ss:
152
                to_fetch.append(rev_id)
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
153
                mutter('need to get revision {%s}', rev_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
154
        mutter('need to get %d revisions in total', len(to_fetch))
1240 by Martin Pool
- clean up fetch code and add progress bar
155
        self.count_total = len(to_fetch)
1231 by Martin Pool
- more progress on fetch on top of weaves
156
        return to_fetch
157
158
    def _copy_revisions(self, revs_to_fetch):
1240 by Martin Pool
- clean up fetch code and add progress bar
159
        i = 0
1231 by Martin Pool
- more progress on fetch on top of weaves
160
        for rev_id in revs_to_fetch:
1261 by Martin Pool
- new method Branch.has_revision
161
            i += 1
1390 by Robert Collins
pair programming worx... merge integration and weave
162
            if rev_id is None:
163
                continue
1261 by Martin Pool
- new method Branch.has_revision
164
            if self.to_branch.has_revision(rev_id):
165
                continue
1240 by Martin Pool
- clean up fetch code and add progress bar
166
            self.pb.update('fetch revision', i, self.count_total)
1231 by Martin Pool
- more progress on fetch on top of weaves
167
            self._copy_one_revision(rev_id)
1260 by Martin Pool
- some updates for fetch/update function
168
            self.count_copied += 1
1231 by Martin Pool
- more progress on fetch on top of weaves
169
170
171
    def _copy_one_revision(self, rev_id):
172
        """Copy revision and everything referenced by it."""
173
        mutter('copying revision {%s}', rev_id)
174
        rev_xml = self.from_branch.get_revision_xml(rev_id)
175
        inv_xml = self.from_branch.get_inventory_xml(rev_id)
176
        rev = serializer_v5.read_revision_from_string(rev_xml)
177
        inv = serializer_v5.read_inventory_from_string(inv_xml)
178
        assert rev.revision_id == rev_id
179
        assert rev.inventory_sha1 == sha_string(inv_xml)
180
        mutter('  commiter %s, %d parents',
181
               rev.committer,
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
182
               len(rev.parent_ids))
1231 by Martin Pool
- more progress on fetch on top of weaves
183
        self._copy_new_texts(rev_id, inv)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
184
        self._copy_inventory(rev_id, inv_xml, rev.parent_ids)
185
        self._copy_ancestry(rev_id, rev.parent_ids)
1262 by Martin Pool
- fetch should also copy ancestry records
186
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
187
188
189
    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
190
        self.to_control.add_text('inventory', rev_id,
1262 by Martin Pool
- fetch should also copy ancestry records
191
                                split_lines(inv_xml), parent_ids)
192
193
194
    def _copy_ancestry(self, rev_id, parent_ids):
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
195
        ancestry_lines = self.from_control.get_lines('ancestry', rev_id)
196
        self.to_control.add_text('ancestry', rev_id, ancestry_lines,
197
                                 parent_ids)
1231 by Martin Pool
- more progress on fetch on top of weaves
198
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
199
        
1231 by Martin Pool
- more progress on fetch on top of weaves
200
    def _copy_new_texts(self, rev_id, inv):
201
        """Copy any new texts occuring in this revision."""
202
        # TODO: Rather than writing out weaves every time, hold them
203
        # in memory until everything's done?  But this way is nicer
204
        # if it's interrupted.
205
        for path, ie in inv.iter_entries():
206
            if ie.kind != 'file':
207
                continue
208
            if ie.text_version != rev_id:
209
                continue
210
            mutter('%s {%s} is changed in this revision',
211
                   path, ie.file_id)
212
            self._copy_one_text(rev_id, ie.file_id)
213
214
215
    def _copy_one_text(self, rev_id, file_id):
216
        """Copy one file text."""
1260 by Martin Pool
- some updates for fetch/update function
217
        mutter('copy text version {%s} of file {%s}',
218
               rev_id, file_id)
219
        from_weave = self.from_weaves.get_weave(file_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
220
        from_idx = from_weave.lookup(rev_id)
221
        from_parents = map(from_weave.idx_to_name, from_weave.parents(from_idx))
222
        text_lines = from_weave.get(from_idx)
1260 by Martin Pool
- some updates for fetch/update function
223
        to_weave = self.to_weaves.get_weave_or_empty(file_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
224
        to_parents = map(to_weave.lookup, from_parents)
1238 by Martin Pool
- remove a lot of dead code from fetch
225
        # it's ok to add even if the text is already there
1231 by Martin Pool
- more progress on fetch on top of weaves
226
        to_weave.add(rev_id, to_parents, text_lines)
1260 by Martin Pool
- some updates for fetch/update function
227
        self.to_weaves.put_weave(file_id, to_weave)
228
        self.count_texts += 1
1265 by Martin Pool
- add function-style synonym 'fetch'
229
230
231
fetch = Fetcher