/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
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
48
# TODO: This doesn't handle revisions which may be present but not
49
# merged into the last revision.
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
67
class Fetcher(object):
1260 by Martin Pool
- some updates for fetch/update function
68
    """Pull revisions and texts from one branch to another.
69
70
    This doesn't update the destination's history; that can be done
71
    separately if desired.  
1231 by Martin Pool
- more progress on fetch on top of weaves
72
73
    revision_limit
74
        If set, pull only up to this revision_id.
1260 by Martin Pool
- some updates for fetch/update function
75
76
    After running:
77
78
    last_revision -- if last_revision
79
        is given it will be that, otherwise the last revision of
80
        from_branch
81
82
    count_copied -- number of revisions copied
83
84
    count_texts -- number of file texts copied
85
    """
86
    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
87
        self.to_branch = to_branch
1260 by Martin Pool
- some updates for fetch/update function
88
        self.to_weaves = to_branch.weave_store
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
89
        self.from_branch = from_branch
1260 by Martin Pool
- some updates for fetch/update function
90
        self.from_weaves = from_branch.weave_store
1231 by Martin Pool
- more progress on fetch on top of weaves
91
        self.failed_revisions = []
92
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
93
        self.count_total = 0
1260 by Martin Pool
- some updates for fetch/update function
94
        self.count_texts = 0
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
95
        if pb is None:
96
            self.pb = bzrlib.ui.ui_factory.progress_bar()
97
        else:
98
            self.pb = pb
1260 by Martin Pool
- some updates for fetch/update function
99
        self.last_revision = self._find_last_revision(last_revision)
100
        mutter('fetch up to rev {%s}', self.last_revision)
1231 by Martin Pool
- more progress on fetch on top of weaves
101
        revs_to_fetch = self._compare_ancestries()
102
        self._copy_revisions(revs_to_fetch)
1260 by Martin Pool
- some updates for fetch/update function
103
        self.new_ancestry = revs_to_fetch
1231 by Martin Pool
- more progress on fetch on top of weaves
104
1240 by Martin Pool
- clean up fetch code and add progress bar
105
        
106
1260 by Martin Pool
- some updates for fetch/update function
107
    def _find_last_revision(self, last_revision):
1240 by Martin Pool
- clean up fetch code and add progress bar
108
        """Find the limiting source revision.
109
110
        Every ancestor of that revision will be merged across.
111
112
        Returns the revision_id, or returns None if there's no history
113
        in the source branch."""
114
        self.pb.update('get source history')
115
        from_history = self.from_branch.revision_history()
116
        self.pb.update('get destination history')
1260 by Martin Pool
- some updates for fetch/update function
117
        if last_revision:
118
            if last_revision not in from_history:
119
                raise NoSuchRevision(self.from_branch, last_revision)
1231 by Martin Pool
- more progress on fetch on top of weaves
120
            else:
1260 by Martin Pool
- some updates for fetch/update function
121
                return last_revision
1240 by Martin Pool
- clean up fetch code and add progress bar
122
        elif from_history:
123
            return from_history[-1]
124
        else:
125
            return None                 # no history in the source branch
1231 by Martin Pool
- more progress on fetch on top of weaves
126
            
127
128
    def _compare_ancestries(self):
129
        """Get a list of revisions that must be copied.
130
131
        That is, every revision that's in the ancestry of the source
132
        branch and not in the destination branch."""
1240 by Martin Pool
- clean up fetch code and add progress bar
133
        self.pb.update('get source ancestry')
1260 by Martin Pool
- some updates for fetch/update function
134
        self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
1240 by Martin Pool
- clean up fetch code and add progress bar
135
1241 by Martin Pool
- rename last_patch to last_revision
136
        dest_last_rev = self.to_branch.last_revision()
1240 by Martin Pool
- clean up fetch code and add progress bar
137
        self.pb.update('get destination ancestry')
138
        if dest_last_rev:
139
            dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
140
        else:
141
            dest_ancestry = []
142
        ss = set(dest_ancestry)
1231 by Martin Pool
- more progress on fetch on top of weaves
143
        to_fetch = []
144
        for rev_id in self.from_ancestry:
145
            if rev_id not in ss:
146
                to_fetch.append(rev_id)
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
147
                mutter('need to get revision {%s}', rev_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
148
        mutter('need to get %d revisions in total', len(to_fetch))
1240 by Martin Pool
- clean up fetch code and add progress bar
149
        self.count_total = len(to_fetch)
1231 by Martin Pool
- more progress on fetch on top of weaves
150
        return to_fetch
151
                
152
153
154
    def _copy_revisions(self, revs_to_fetch):
1240 by Martin Pool
- clean up fetch code and add progress bar
155
        i = 0
1231 by Martin Pool
- more progress on fetch on top of weaves
156
        for rev_id in revs_to_fetch:
1261 by Martin Pool
- new method Branch.has_revision
157
            i += 1
158
            if self.to_branch.has_revision(rev_id):
159
                continue
1240 by Martin Pool
- clean up fetch code and add progress bar
160
            self.pb.update('fetch revision', i, self.count_total)
1231 by Martin Pool
- more progress on fetch on top of weaves
161
            self._copy_one_revision(rev_id)
1260 by Martin Pool
- some updates for fetch/update function
162
            self.count_copied += 1
1231 by Martin Pool
- more progress on fetch on top of weaves
163
164
165
    def _copy_one_revision(self, rev_id):
166
        """Copy revision and everything referenced by it."""
167
        mutter('copying revision {%s}', rev_id)
168
        rev_xml = self.from_branch.get_revision_xml(rev_id)
169
        inv_xml = self.from_branch.get_inventory_xml(rev_id)
170
        rev = serializer_v5.read_revision_from_string(rev_xml)
171
        inv = serializer_v5.read_inventory_from_string(inv_xml)
172
        assert rev.revision_id == rev_id
173
        assert rev.inventory_sha1 == sha_string(inv_xml)
174
        mutter('  commiter %s, %d parents',
175
               rev.committer,
176
               len(rev.parents))
177
        self._copy_new_texts(rev_id, inv)
1260 by Martin Pool
- some updates for fetch/update function
178
        parent_ids = [x.revision_id for x in rev.parents]
179
        self.to_weaves.add_text(INVENTORY_FILEID, rev_id,
180
                                            split_lines(inv_xml), parent_ids)
1261 by Martin Pool
- new method Branch.has_revision
181
1231 by Martin Pool
- more progress on fetch on top of weaves
182
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
183
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
184
        
1231 by Martin Pool
- more progress on fetch on top of weaves
185
    def _copy_new_texts(self, rev_id, inv):
186
        """Copy any new texts occuring in this revision."""
187
        # TODO: Rather than writing out weaves every time, hold them
188
        # in memory until everything's done?  But this way is nicer
189
        # if it's interrupted.
190
        for path, ie in inv.iter_entries():
191
            if ie.kind != 'file':
192
                continue
193
            if ie.text_version != rev_id:
194
                continue
195
            mutter('%s {%s} is changed in this revision',
196
                   path, ie.file_id)
197
            self._copy_one_text(rev_id, ie.file_id)
198
199
200
    def _copy_one_text(self, rev_id, file_id):
201
        """Copy one file text."""
1260 by Martin Pool
- some updates for fetch/update function
202
        mutter('copy text version {%s} of file {%s}',
203
               rev_id, file_id)
204
        from_weave = self.from_weaves.get_weave(file_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
205
        from_idx = from_weave.lookup(rev_id)
206
        from_parents = map(from_weave.idx_to_name, from_weave.parents(from_idx))
207
        text_lines = from_weave.get(from_idx)
1260 by Martin Pool
- some updates for fetch/update function
208
        to_weave = self.to_weaves.get_weave_or_empty(file_id)
1231 by Martin Pool
- more progress on fetch on top of weaves
209
        to_parents = map(to_weave.lookup, from_parents)
1238 by Martin Pool
- remove a lot of dead code from fetch
210
        # it's ok to add even if the text is already there
1231 by Martin Pool
- more progress on fetch on top of weaves
211
        to_weave.add(rev_id, to_parents, text_lines)
1260 by Martin Pool
- some updates for fetch/update function
212
        self.to_weaves.put_weave(file_id, to_weave)
213
        self.count_texts += 1