1
# Copyright (C) 2005 by Canonical Ltd
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.
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.
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
19
from cStringIO import StringIO
22
import bzrlib.errors as errors
23
from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError,
25
from bzrlib.trace import mutter, note, warning
26
from bzrlib.branch import Branch
27
from bzrlib.progress import ProgressBar
28
from bzrlib.xml5 import serializer_v5
29
from bzrlib.osutils import sha_string, split_lines
31
"""Copying of history from one branch to another.
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
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.
46
# TODO: Avoid repeatedly opening weaves so many times.
48
# XXX: This doesn't handle ghost (not present in branch) revisions at
49
# all yet. I'm not sure they really should be supported.
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.
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
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
65
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
66
f = Fetcher(to_branch, from_branch, revision, pb)
67
return f.count_copied, f.failed_revisions
71
class Fetcher(object):
72
"""Pull revisions and texts from one branch to another.
74
This doesn't update the destination's history; that can be done
75
separately if desired.
78
If set, pull only up to this revision_id.
82
last_revision -- if last_revision
83
is given it will be that, otherwise the last revision of
86
count_copied -- number of revisions copied
88
count_weaves -- number of file weaves copied
90
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
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))
95
self.to_branch = to_branch
96
self.from_branch = from_branch
97
self._last_revision = last_revision
99
self.pb = bzrlib.ui.ui_factory.progress_bar()
102
self.from_branch.lock_read()
104
self.to_branch.lock_write()
108
self.to_branch.unlock()
110
self.from_branch.unlock()
113
"""Primary worker function.
115
This initialises all the needed variables, and then fetches the
116
requested revisions, finally clearing the progress bar.
118
self.to_repository = self.to_branch.repository
119
self.to_weaves = self.to_repository.weave_store
120
self.to_control = self.to_repository.control_weaves
121
self.from_repository = self.from_branch.repository
122
self.from_weaves = self.from_repository.weave_store
123
self.from_control = self.from_repository.control_weaves
124
self.failed_revisions = []
125
self.count_copied = 0
127
self.count_weaves = 0
128
self.copied_file_ids = set()
129
self.file_ids_names = {}
131
revs = self._revids_to_fetch()
134
self._fetch_weave_texts(revs)
135
self._fetch_inventory_weave(revs)
136
self._fetch_revision_texts(revs)
137
self.count_copied += len(revs)
141
def _revids_to_fetch(self):
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)):
148
branch_from_revs = set(self.from_repository.get_ancestry(self._last_revision))
150
raise InstallFailed([self._last_revision])
152
self.dest_last_rev = self.to_branch.last_revision()
153
branch_to_revs = set(self.to_repository.get_ancestry(self.dest_last_rev))
155
return branch_from_revs.difference(branch_to_revs)
157
def _fetch_revision_texts(self, revs):
158
self.to_repository.revision_store.copy_multi(
159
self.from_repository.revision_store, revs)
161
def _fetch_weave_texts(self, revs):
162
file_ids = self.from_branch.fileid_involved_by_set(revs)
164
num_file_ids = len(file_ids)
165
for file_id in file_ids:
166
self.pb.update("merge weave merge", count, num_file_ids)
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())
173
if to_weave.numversions() > 0:
174
# destination has contents, must merge
176
to_weave.join(from_weave)
177
except errors.WeaveParentMismatch:
178
to_weave.reweave(from_weave)
180
# destination is empty, just replace it
181
to_weave = from_weave.copy()
183
self.to_weaves.put_weave(file_id, to_weave,
184
self.to_branch.get_transaction())
188
def _fetch_inventory_weave(self, revs):
189
self.pb.update("inventory merge", 0, 1)
190
from_weave = self.from_repository.get_inventory_weave()
191
to_weave = self.to_repository.get_inventory_weave()
193
if to_weave.numversions() > 0:
194
# destination has contents, must merge
196
to_weave.join(from_weave)
197
except errors.WeaveParentMismatch:
198
to_weave.reweave(from_weave)
200
# destination is empty, just replace it
201
to_weave = from_weave.copy()
203
self.to_control.put_weave('inventory', to_weave,
204
self.to_branch.get_transaction())
208
def _find_last_revision(self):
209
"""Find the limiting source revision.
211
Every ancestor of that revision will be merged across.
213
Returns the revision_id, or returns None if there's no history
214
in the source branch."""
215
if self._last_revision:
217
self.pb.update('get source history')
218
from_history = self.from_branch.revision_history()
219
self.pb.update('get destination history')
221
self._last_revision = from_history[-1]
223
# no history in the source branch
224
self._last_revision = None
added
removed
bzrlib/fetch.py
