114
112
return self._lookup_revno(self.new_revid)
117
class InterTagsFromGitToRemoteGit(InterTags):
120
def is_compatible(klass, source, target):
121
if not isinstance(source, GitTags):
123
if not isinstance(target, GitTags):
125
if getattr(target.branch.repository, "_git", None) is not None:
129
def merge(self, overwrite=False, ignore_master=False, selector=None):
130
if self.source.branch.repository.has_same_location(self.target.branch.repository):
115
class GitTags(tag.BasicTags):
116
"""Ref-based tag dictionary."""
118
def __init__(self, branch):
120
self.repository = branch.repository
122
def _merge_to_remote_git(self, target_repo, source_tag_refs,
134
source_tag_refs = self.source.branch.get_tag_refs()
137
127
def get_changed_refs(old_refs):
138
128
ret = dict(old_refs)
139
129
for ref_name, tag_name, peeled, unpeeled in (
140
130
source_tag_refs.iteritems()):
141
if selector and not selector(tag_name):
143
131
if old_refs.get(ref_name) == unpeeled:
145
133
elif overwrite or ref_name not in old_refs:
146
134
ret[ref_name] = unpeeled
147
updates[tag_name] = self.target.branch.repository.lookup_foreign_revision_id(
135
updates[tag_name] = target_repo.lookup_foreign_revision_id(
149
ref_to_tag_map[ref_name] = tag_name
150
self.target.branch._tag_refs = None
152
138
conflicts.append(
154
140
self.repository.lookup_foreign_revision_id(peeled),
155
self.target.branch.repository.lookup_foreign_revision_id(
141
target_repo.lookup_foreign_revision_id(
156
142
old_refs[ref_name])))
158
result = self.target.branch.repository.controldir.send_pack(
144
target_repo.controldir.send_pack(
159
145
get_changed_refs, lambda have, want: [])
160
if result is not None and not isinstance(result, dict):
161
for ref, error in result.ref_status.items():
163
warning('unable to update ref %s: %s',
165
del updates[ref_to_tag_map[ref]]
166
return updates, set(conflicts)
169
class InterTagsFromGitToLocalGit(InterTags):
172
def is_compatible(klass, source, target):
173
if not isinstance(source, GitTags):
175
if not isinstance(target, GitTags):
177
if getattr(target.branch.repository, "_git", None) is None:
181
def merge(self, overwrite=False, ignore_master=False, selector=None):
182
if self.source.branch.repository.has_same_location(self.target.branch.repository):
146
return updates, conflicts
148
def _merge_to_local_git(self, target_repo, source_tag_refs,
187
source_tag_refs = self.source.branch.get_tag_refs()
189
target_repo = self.target.branch.repository
191
152
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
192
if selector and not selector(tag_name):
194
153
if target_repo._git.refs.get(ref_name) == unpeeled:
196
155
elif overwrite or ref_name not in target_repo._git.refs:
224
182
conflicts.append((tag_name, source_revid, target_revid))
225
return updates, set(conflicts)
228
class InterTagsFromGitToNonGit(InterTags):
231
def is_compatible(klass, source, target):
232
if not isinstance(source, GitTags):
234
if isinstance(target, GitTags):
238
def merge(self, overwrite=False, ignore_master=False, selector=None):
239
"""See Tags.merge_to."""
240
source_tag_refs = self.source.branch.get_tag_refs()
244
master = self.target.branch.get_master_branch()
245
with contextlib.ExitStack() as es:
246
if master is not None:
247
es.enter_context(master.lock_write())
248
updates, conflicts = self._merge_to(
249
self.target, source_tag_refs, overwrite=overwrite,
251
if master is not None:
252
extra_updates, extra_conflicts = self._merge_to(
253
master.tags, overwrite=overwrite,
254
source_tag_refs=source_tag_refs,
255
ignore_master=ignore_master, selector=selector)
256
updates.update(extra_updates)
257
conflicts.update(extra_conflicts)
258
return updates, conflicts
260
def _merge_to(self, to_tags, source_tag_refs, overwrite=False,
183
return updates, conflicts
185
def _merge_to_git(self, to_tags, source_tag_refs, overwrite=False):
186
target_repo = to_tags.repository
187
if self.repository.has_same_location(target_repo):
190
if getattr(target_repo, "_git", None):
191
return self._merge_to_local_git(
192
target_repo, source_tag_refs, overwrite)
194
return self._merge_to_remote_git(
195
target_repo, source_tag_refs, overwrite)
197
to_tags.branch._tag_refs = None
199
def _merge_to_non_git(self, to_tags, source_tag_refs, overwrite=False):
262
200
unpeeled_map = defaultdict(set)
265
203
result = dict(to_tags.get_tag_dict())
266
204
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
267
if selector and not selector(tag_name):
269
205
if unpeeled is not None:
270
206
unpeeled_map[peeled].add(unpeeled)
272
bzr_revid = self.source.branch.lookup_foreign_revision_id(peeled)
208
bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
273
209
except NotCommitError:
275
211
if result.get(tag_name) == bzr_revid:
284
220
map_file = UnpeelMap.from_repository(to_tags.branch.repository)
285
221
map_file.update(unpeeled_map)
286
222
map_file.save_in_repository(to_tags.branch.repository)
287
return updates, set(conflicts)
290
InterTags.register_optimiser(InterTagsFromGitToRemoteGit)
291
InterTags.register_optimiser(InterTagsFromGitToLocalGit)
292
InterTags.register_optimiser(InterTagsFromGitToNonGit)
296
"""Ref-based tag dictionary."""
298
def __init__(self, branch):
300
self.repository = branch.repository
223
return updates, conflicts
225
def merge_to(self, to_tags, overwrite=False, ignore_master=False,
226
source_tag_refs=None):
227
"""See Tags.merge_to."""
228
if source_tag_refs is None:
229
source_tag_refs = self.branch.get_tag_refs()
232
if isinstance(to_tags, GitTags):
233
return self._merge_to_git(to_tags, source_tag_refs,
239
master = to_tags.branch.get_master_branch()
240
with contextlib.ExitStack() as es:
241
if master is not None:
242
es.enter_context(master.lock_write())
243
updates, conflicts = self._merge_to_non_git(
244
to_tags, source_tag_refs, overwrite=overwrite)
245
if master is not None:
246
extra_updates, extra_conflicts = self.merge_to(
247
master.tags, overwrite=overwrite,
248
source_tag_refs=source_tag_refs,
249
ignore_master=ignore_master)
250
updates.update(extra_updates)
251
conflicts += extra_conflicts
252
return updates, conflicts
302
254
def get_tag_dict(self):
672
613
return revision.NULL_REVISION
673
614
return self.lookup_foreign_revision_id(self.head)
675
def _basic_push(self, target, overwrite=False, stop_revision=None,
616
def _basic_push(self, target, overwrite=False, stop_revision=None):
677
617
return branch.InterBranch.get(self, target)._basic_push(
678
overwrite, stop_revision, tag_selector=tag_selector)
618
overwrite, stop_revision)
680
620
def lookup_foreign_revision_id(self, foreign_revid):
995
935
stop_revision, fetch_tags=fetch_tags, limit=limit, lossy=lossy)
996
936
return _mod_repository.FetchResult()
998
def fetch_objects(self, stop_revision, fetch_tags, limit=None, lossy=False, tag_selector=None):
938
def fetch_objects(self, stop_revision, fetch_tags, limit=None, lossy=False):
999
939
interrepo = self._get_interrepo(self.source, self.target)
1000
940
if fetch_tags is None:
1001
941
c = self.source.get_config_stack()
1043
983
for path, url, section in parse_submodules(
1044
984
GitConfigFile.from_file(f)):
1045
985
self.target.set_reference_info(
1046
tree.path2id(decode_git_path(path)), url.decode('utf-8'),
1047
decode_git_path(path))
986
tree.path2id(path.decode('utf-8')), url.decode('utf-8'),
987
path.decode('utf-8'))
1048
988
except errors.NoSuchFile:
1051
991
def _basic_pull(self, stop_revision, overwrite, run_hooks,
1052
_override_hook_target, _hook_master, tag_selector=None):
992
_override_hook_target, _hook_master):
1053
993
if overwrite is True:
1054
994
overwrite = set(["history", "tags"])
1055
995
elif not overwrite:
1066
1006
(result.old_revno, result.old_revid) = \
1067
1007
self.target.last_revision_info()
1068
1008
result.new_git_head, remote_refs = self._update_revisions(
1069
stop_revision, overwrite=("history" in overwrite),
1070
tag_selector=tag_selector)
1009
stop_revision, overwrite=("history" in overwrite))
1071
1010
tags_ret = self.source.tags.merge_to(
1072
1011
self.target.tags, ("tags" in overwrite), ignore_master=True)
1073
1012
if isinstance(tags_ret, tuple):
1128
1067
master_branch = None
1129
1068
return self._basic_pull(stop_revision, overwrite, run_hooks,
1130
1069
_override_hook_target,
1131
_hook_master=master_branch,
1132
tag_selector=tag_selector)
1070
_hook_master=master_branch)
1134
def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1072
def _basic_push(self, overwrite, stop_revision):
1135
1073
if overwrite is True:
1136
1074
overwrite = set(["history", "tags"])
1137
1075
elif not overwrite:
1141
1079
result.target_branch = self.target
1142
1080
result.old_revno, result.old_revid = self.target.last_revision_info()
1143
1081
result.new_git_head, remote_refs = self._update_revisions(
1144
stop_revision, overwrite=("history" in overwrite),
1145
tag_selector=tag_selector)
1082
stop_revision, overwrite=("history" in overwrite))
1146
1083
tags_ret = self.source.tags.merge_to(
1147
self.target.tags, "tags" in overwrite, ignore_master=True,
1148
selector=tag_selector)
1084
self.target.tags, "tags" in overwrite, ignore_master=True)
1149
1085
(result.tag_updates, result.tag_conflicts) = tags_ret
1150
1086
result.new_revno, result.new_revid = self.target.last_revision_info()
1151
1087
self.update_references(revid=result.new_revid)
1174
1110
return (isinstance(source, LocalGitBranch) and
1175
1111
isinstance(target, RemoteGitBranch))
1177
def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1178
from .remote import parse_git_error
1113
def _basic_push(self, overwrite, stop_revision):
1179
1114
result = GitBranchPushResult()
1180
1115
result.source_branch = self.source
1181
1116
result.target_branch = self.target
1200
1135
result.new_revid = stop_revision
1201
1136
for name, sha in (
1202
1137
self.source.repository._git.refs.as_dict(b"refs/tags").items()):
1203
if tag_selector and not tag_selector(name):
1205
1138
if sha not in self.source.repository._git:
1206
1139
trace.mutter('Ignoring missing SHA: %s', sha)
1208
1141
refs[tag_name_to_ref(name)] = sha
1210
dw_result = self.target.repository.send_pack(
1143
self.target.repository.send_pack(
1211
1144
get_changed_refs,
1212
self.source.repository._git.generate_pack_data)
1213
if dw_result is not None and not isinstance(dw_result, dict):
1214
error = dw_result.ref_status.get(self.target.ref)
1216
raise parse_git_error(self.target.user_url, error)
1217
for ref, error in dw_result.ref_status.items():
1219
trace.warning('unable to open ref %s: %s', ref, error)
1145
self.source.repository._git.object_store.generate_pack_data)
1383
1308
refs[ref] = (None, revid)
1384
1309
return refs, main_ref, (stop_revno, stop_revision)
1386
def _update_refs(self, result, old_refs, new_refs, overwrite, tag_selector):
1311
def _update_refs(self, result, old_refs, new_refs, overwrite):
1387
1312
mutter("updating refs. old refs: %r, new refs: %r",
1388
1313
old_refs, new_refs)
1389
1314
result.tag_updates = {}
1390
1315
result.tag_conflicts = []
1316
ret = dict(old_refs)
1393
1318
def ref_equals(refs, ref, git_sha, revid):
1459
1382
for (old_revid, (new_sha, new_revid)) in revidmap.items()})
1461
1384
def pull(self, overwrite=False, stop_revision=None, local=False,
1462
possible_transports=None, run_hooks=True, _stop_revno=None,
1385
possible_transports=None, run_hooks=True, _stop_revno=None):
1464
1386
result = GitBranchPullResult()
1465
1387
result.source_branch = self.source
1466
1388
result.target_branch = self.target
1469
1391
stop_revision, stop_revno=_stop_revno)
1471
1393
def update_refs(old_refs):
1472
return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
1394
return self._update_refs(result, old_refs, new_refs, overwrite)
1474
1396
result.revidmap, old_refs, new_refs = (
1475
1397
self.interrepo.fetch_refs(update_refs, lossy=False))
1501
1422
stop_revision, stop_revno=_stop_revno)
1503
1424
def update_refs(old_refs):
1504
return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
1425
return self._update_refs(result, old_refs, new_refs, overwrite)
1506
1427
result.revidmap, old_refs, new_refs = (
1507
1428
self.interrepo.fetch_refs(