1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Copying of history from one branch to another.
The basic plan is that every branch knows the history of everything
that has merged into it. As the first step of a merge, pull, or
branch operation we copy history from the source into the destination
branch.
The copying is done in a slightly complicated order. We don't want to
add a revision to the store until everything it refers to is also
stored, so that if a revision is present we can totally recreate it.
However, we can't know what files are included in a revision until we
read its inventory. Therefore, we first pull the XML and hold it in
memory until we've updated all of the files referenced.
"""
import bzrlib
import bzrlib.errors as errors
from bzrlib.errors import (InstallFailed, NoSuchRevision,
MissingText)
from bzrlib.trace import mutter
from bzrlib.progress import ProgressBar
from bzrlib.revision import NULL_REVISION
from bzrlib.symbol_versioning import *
# TODO: Avoid repeatedly opening weaves so many times.
# XXX: This doesn't handle ghost (not present in branch) revisions at
# all yet. I'm not sure they really should be supported.
# NOTE: This doesn't copy revisions which may be present but not
# merged into the last revision. I'm not sure we want to do that.
# - get a list of revisions that need to be pulled in
# - for each one, pull in that revision file
# and get the inventory, and store the inventory with right
# parents.
# - and get the ancestry, and store that with right parents too
# - and keep a note of all file ids and version seen
# - then go through all files; for each one get the weave,
# and add in all file versions
@deprecated_function(zero_eight)
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
"""Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
f = Fetcher(to_branch, from_branch, revision, pb)
return f.count_copied, f.failed_revisions
fetch = greedy_fetch
class RepoFetcher(object):
"""Pull revisions and texts from one repository to another.
last_revision
if set, try to limit to the data this revision references.
after running:
count_copied -- number of revisions copied
This should not be used directory, its essential a object to encapsulate
the logic in InterRepository.fetch().
"""
def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
# result variables.
self.failed_revisions = []
self.count_copied = 0
if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
# check that last_revision is in 'from' and then return a no-operation.
if last_revision not in (None, NULL_REVISION):
from_repository.get_revision(last_revision)
return
self.to_repository = to_repository
self.from_repository = from_repository
# must not mutate self._last_revision as its potentially a shared instance
self._last_revision = last_revision
if pb is None:
self.pb = bzrlib.ui.ui_factory.progress_bar()
else:
self.pb = pb
self.from_repository.lock_read()
try:
self.to_repository.lock_write()
try:
self.__fetch()
finally:
self.to_repository.unlock()
finally:
self.from_repository.unlock()
def __fetch(self):
"""Primary worker function.
This initialises all the needed variables, and then fetches the
requested revisions, finally clearing the progress bar.
"""
self.to_weaves = self.to_repository.weave_store
self.to_control = self.to_repository.control_weaves
self.from_weaves = self.from_repository.weave_store
self.from_control = self.from_repository.control_weaves
self.count_total = 0
self.file_ids_names = {}
try:
revs = self._revids_to_fetch()
# nothing to do
if revs:
self._fetch_weave_texts(revs)
self._fetch_inventory_weave(revs)
self._fetch_revision_texts(revs)
self.count_copied += len(revs)
finally:
self.pb.clear()
def _revids_to_fetch(self):
self.pb.update('get destination history')
mutter('fetch up to rev {%s}', self._last_revision)
if self._last_revision is NULL_REVISION:
# explicit limit of no revisions needed
return None
if (self._last_revision != None and
self.to_repository.has_revision(self._last_revision)):
return None
try:
return self.to_repository.missing_revision_ids(self.from_repository,
self._last_revision)
except errors.NoSuchRevision:
raise InstallFailed([self._last_revision])
def _fetch_revision_texts(self, revs):
self.to_repository.revision_store.copy_multi(
self.from_repository.revision_store,
revs,
pb=self.pb)
def _fetch_weave_texts(self, revs):
file_ids = self.from_repository.fileid_involved_by_set(revs)
count = 0
num_file_ids = len(file_ids)
for file_id in file_ids:
self.pb.update("merge weaves", count, num_file_ids)
count +=1
to_weave = self.to_weaves.get_weave_or_empty(file_id,
self.to_repository.get_transaction())
if to_weave.numversions() > 0:
# destination has contents, must merge
from_weave = self.from_weaves.get_weave(file_id,
self.from_repository.get_transaction())
try:
to_weave.join(from_weave)
except errors.WeaveParentMismatch:
to_weave.reweave(from_weave)
else:
# destination is empty, just replace it
self.to_weaves.copy_multi(self.from_weaves, [file_id], self.pb)
self.pb.clear()
def _fetch_inventory_weave(self, revs):
self.pb.update("inventory fetch", 0, 2)
to_weave = self.to_control.get_weave('inventory',
self.to_repository.get_transaction())
if to_weave.numversions() > 0:
# destination has contents, must merge
self.pb.update("inventory fetch", 1, 2)
from_weave = self.from_repository.get_inventory_weave()
self.pb.update("inventory fetch", 2, 2)
try:
to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
except errors.WeaveParentMismatch:
to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
else:
# destination is empty, just replace it
self.to_control.copy_multi(self.from_control,
['inventory'],
self.pb,
self.from_repository.get_transaction())
self.pb.clear()
class Fetcher(object):
"""Backwards compatability glue for branch.fetch()."""
@deprecated_method(zero_eight)
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
"""Please see branch.fetch()."""
to_branch.fetch(from_branch, last_revision, pb)
|