~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
1480 by Robert Collins
BUGFIX: fetch was not skipping all missing parents for inventory insertion
17
from copy import copy
1218 by Martin Pool
- fix up import
18
import os
1231 by Martin Pool
- more progress on fetch on top of weaves
19
from cStringIO import StringIO
1218 by Martin Pool
- fix up import
20
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
21
import bzrlib
22
import bzrlib.errors as errors
1185.35.42 by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches
23
from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError,
24
                           MissingText)
1231 by Martin Pool
- more progress on fetch on top of weaves
25
from bzrlib.trace import mutter, note, warning
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
26
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
27
from bzrlib.progress import ProgressBar
1231 by Martin Pool
- more progress on fetch on top of weaves
28
from bzrlib.xml5 import serializer_v5
29
from bzrlib.osutils import sha_string, split_lines
30
31
"""Copying of history from one branch to another.
32
33
The basic plan is that every branch knows the history of everything
34
that has merged into it.  As the first step of a merge, pull, or
35
branch operation we copy history from the source into the destination
36
branch.
37
38
The copying is done in a slightly complicated order.  We don't want to
39
add a revision to the store until everything it refers to is also
40
stored, so that if a revision is present we can totally recreate it.
41
However, we can't know what files are included in a revision until we
42
read its inventory.  Therefore, we first pull the XML and hold it in
43
memory until we've updated all of the files referenced.
44
"""
45
46
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
47
1238 by Martin Pool
- remove a lot of dead code from fetch
48
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
49
# all yet.  I'm not sure they really should be supported.
50
1262 by Martin Pool
- fetch should also copy ancestry records
51
# NOTE: This doesn't copy revisions which may be present but not
52
# 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
53
54
# - get a list of revisions that need to be pulled in
55
# - for each one, pull in that revision file
56
#   and get the inventory, and store the inventory with right
57
#   parents.
58
# - and get the ancestry, and store that with right parents too
59
# - and keep a note of all file ids and version seen
60
# - then go through all files; for each one get the weave,
61
#   and add in all file versions
62
63
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
64
1260 by Martin Pool
- some updates for fetch/update function
65
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
66
    f = Fetcher(to_branch, from_branch, revision, pb)
67
    return f.count_copied, f.failed_revisions
68
69
1265 by Martin Pool
- add function-style synonym 'fetch'
70
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
71
class Fetcher(object):
1260 by Martin Pool
- some updates for fetch/update function
72
    """Pull revisions and texts from one branch to another.
73
74
    This doesn't update the destination's history; that can be done
75
    separately if desired.  
1231 by Martin Pool
- more progress on fetch on top of weaves
76
77
    revision_limit
78
        If set, pull only up to this revision_id.
1260 by Martin Pool
- some updates for fetch/update function
79
80
    After running:
81
82
    last_revision -- if last_revision
83
        is given it will be that, otherwise the last revision of
84
        from_branch
85
86
    count_copied -- number of revisions copied
87
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
88
    count_weaves -- number of file weaves copied
1260 by Martin Pool
- some updates for fetch/update function
89
    """
90
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1185.65.30 by Robert Collins
Merge integration.
91
        if to_branch.base == from_branch.base:
92
            raise Exception("can't fetch from a branch to itself %s, %s" % 
93
                            (from_branch.base, to_branch.base))
1185.65.27 by Robert Collins
Tweak storage towards mergability.
94
        
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
95
        self.to_branch = to_branch
1185.65.27 by Robert Collins
Tweak storage towards mergability.
96
        self.from_branch = from_branch
97
        self._last_revision = last_revision
98
        if pb is None:
99
            self.pb = bzrlib.ui.ui_factory.progress_bar()
100
        else:
101
            self.pb = pb
102
        self.from_branch.lock_read()
103
        try:
104
            self.to_branch.lock_write()
105
            try:
106
                self.__fetch()
107
            finally:
108
                self.to_branch.unlock()
109
        finally:
110
            self.from_branch.unlock()
111
112
    def __fetch(self):
113
        """Primary worker function.
114
115
        This initialises all the needed variables, and then fetches the 
116
        requested revisions, finally clearing the progress bar.
117
        """
118
        self.to_repository = self.to_branch.repository
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
119
        self.to_weaves = self.to_repository.weave_store
120
        self.to_control = self.to_repository.control_weaves
1185.65.27 by Robert Collins
Tweak storage towards mergability.
121
        self.from_repository = self.from_branch.repository
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
122
        self.from_weaves = self.from_repository.weave_store
123
        self.from_control = self.from_repository.control_weaves
1231 by Martin Pool
- more progress on fetch on top of weaves
124
        self.failed_revisions = []
125
        self.count_copied = 0
1240 by Martin Pool
- clean up fetch code and add progress bar
126
        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
127
        self.count_weaves = 0
1404 by Robert Collins
only pull remote text weaves once per fetch operation
128
        self.copied_file_ids = set()
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
129
        self.file_ids_names = {}
1392 by Robert Collins
reinstate testfetch test case
130
        try:
1185.65.30 by Robert Collins
Merge integration.
131
            revs = self._revids_to_fetch()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
132
            # nothing to do
133
            if revs: 
1534.1.11 by Robert Collins
Format tweaks for latest merges.
134
                self._fetch_weave_texts(revs)
135
                self._fetch_inventory_weave(revs)
136
                self._fetch_revision_texts(revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
137
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
138
        finally:
139
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
140
1185.65.30 by Robert Collins
Merge integration.
141
    def _revids_to_fetch(self):
1185.65.27 by Robert Collins
Tweak storage towards mergability.
142
        self._find_last_revision()
143
        mutter('fetch up to rev {%s}', self._last_revision)
144
        if (self._last_revision is not None and 
145
            self.to_repository.has_revision(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
146
            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
147
        try:
1185.65.30 by Robert Collins
Merge integration.
148
            branch_from_revs = set(self.from_repository.get_ancestry(self._last_revision))
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
149
        except WeaveError:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
150
            raise InstallFailed([self._last_revision])
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
151
152
        self.dest_last_rev = self.to_branch.last_revision()
1185.65.30 by Robert Collins
Merge integration.
153
        branch_to_revs = set(self.to_repository.get_ancestry(self.dest_last_rev))
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
154
1534.1.11 by Robert Collins
Format tweaks for latest merges.
155
        return branch_from_revs.difference(branch_to_revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
156
1534.1.11 by Robert Collins
Format tweaks for latest merges.
157
    def _fetch_revision_texts(self, revs):
1185.65.30 by Robert Collins
Merge integration.
158
        self.to_repository.revision_store.copy_multi(
159
            self.from_repository.revision_store, revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
160
1534.1.11 by Robert Collins
Format tweaks for latest merges.
161
    def _fetch_weave_texts(self, revs):
162
        file_ids = self.from_branch.fileid_involved_by_set(revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
163
        count = 0
164
        num_file_ids = len(file_ids)
165
        for file_id in file_ids:
1534.1.11 by Robert Collins
Format tweaks for latest merges.
166
            self.pb.update("merge weave merge", count, num_file_ids)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
167
            count +=1
168
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
169
                self.to_branch.get_transaction())
170
            from_weave = self.from_weaves.get_weave(file_id,
171
                self.from_branch.get_transaction())
172
173
            if to_weave.numversions() > 0:
174
                # destination has contents, must merge
175
                try:
176
                    to_weave.join(from_weave)
177
                except errors.WeaveParentMismatch:
178
                    to_weave.reweave(from_weave)
179
            else:
180
                # destination is empty, just replace it
1534.1.11 by Robert Collins
Format tweaks for latest merges.
181
                to_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
182
183
            self.to_weaves.put_weave(file_id, to_weave,
184
                self.to_branch.get_transaction())
185
1534.1.11 by Robert Collins
Format tweaks for latest merges.
186
        self.pb.clear()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
187
1534.1.11 by Robert Collins
Format tweaks for latest merges.
188
    def _fetch_inventory_weave(self, revs):
1551.3.11 by Aaron Bentley
Merge from Robert
189
        self.pb.update("inventory fetch", 0, 2)
1185.65.30 by Robert Collins
Merge integration.
190
        from_weave = self.from_repository.get_inventory_weave()
191
        to_weave = self.to_repository.get_inventory_weave()
1551.3.11 by Aaron Bentley
Merge from Robert
192
        self.pb.update("inventory fetch", 1, 2)
193
        to_weave = self.to_control.get_weave('inventory',
194
                self.to_branch.get_transaction())
195
        self.pb.update("inventory fetch", 2, 2)
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
196
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
197
        if to_weave.numversions() > 0:
198
            # destination has contents, must merge
199
            try:
1551.3.11 by Aaron Bentley
Merge from Robert
200
                to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
201
            except errors.WeaveParentMismatch:
1551.3.11 by Aaron Bentley
Merge from Robert
202
                to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
203
        else:
204
            # destination is empty, just replace it
1534.1.11 by Robert Collins
Format tweaks for latest merges.
205
            to_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
206
207
        self.to_control.put_weave('inventory', to_weave,
208
            self.to_branch.get_transaction())
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
209
1534.1.11 by Robert Collins
Format tweaks for latest merges.
210
        self.pb.clear()
1240 by Martin Pool
- clean up fetch code and add progress bar
211
1185.65.27 by Robert Collins
Tweak storage towards mergability.
212
    def _find_last_revision(self):
1240 by Martin Pool
- clean up fetch code and add progress bar
213
        """Find the limiting source revision.
214
215
        Every ancestor of that revision will be merged across.
216
217
        Returns the revision_id, or returns None if there's no history
218
        in the source branch."""
1185.65.27 by Robert Collins
Tweak storage towards mergability.
219
        if self._last_revision:
220
            return
1240 by Martin Pool
- clean up fetch code and add progress bar
221
        self.pb.update('get source history')
222
        from_history = self.from_branch.revision_history()
223
        self.pb.update('get destination history')
1185.12.21 by aaron.bentley at utoronto
Cleaned up Fetcher._find_last_revision
224
        if from_history:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
225
            self._last_revision = from_history[-1]
1240 by Martin Pool
- clean up fetch code and add progress bar
226
        else:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
227
            # no history in the source branch
228
            self._last_revision = None
1265 by Martin Pool
- add function-style synonym 'fetch'
229
230
fetch = Fetcher