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