111
114
return self._lookup_revno(self.new_revid)
114
class GitTags(tag.BasicTags):
115
"""Ref-based tag dictionary."""
117
def __init__(self, branch):
119
self.repository = branch.repository
121
def _merge_to_remote_git(self, target_repo, source_tag_refs,
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):
134
source_tag_refs = self.source.branch.get_tag_refs()
126
137
def get_changed_refs(old_refs):
127
138
ret = dict(old_refs)
128
139
for ref_name, tag_name, peeled, unpeeled in (
129
140
source_tag_refs.iteritems()):
141
if selector and not selector(tag_name):
130
143
if old_refs.get(ref_name) == unpeeled:
132
145
elif overwrite or ref_name not in old_refs:
133
146
ret[ref_name] = unpeeled
134
updates[tag_name] = target_repo.lookup_foreign_revision_id(
147
updates[tag_name] = self.target.branch.repository.lookup_foreign_revision_id(
149
ref_to_tag_map[ref_name] = tag_name
150
self.target.branch._tag_refs = None
137
152
conflicts.append(
139
154
self.repository.lookup_foreign_revision_id(peeled),
140
target_repo.lookup_foreign_revision_id(
155
self.target.branch.repository.lookup_foreign_revision_id(
141
156
old_refs[ref_name])))
143
target_repo.controldir.send_pack(
158
result = self.target.branch.repository.controldir.send_pack(
144
159
get_changed_refs, lambda have, want: [])
145
return updates, conflicts
147
def _merge_to_local_git(self, target_repo, source_tag_refs,
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):
187
source_tag_refs = self.source.branch.get_tag_refs()
189
target_repo = self.target.branch.repository
151
191
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
192
if selector and not selector(tag_name):
152
194
if target_repo._git.refs.get(ref_name) == unpeeled:
154
196
elif overwrite or ref_name not in target_repo._git.refs:
181
224
conflicts.append((tag_name, source_revid, target_revid))
182
return updates, conflicts
184
def _merge_to_git(self, to_tags, source_tag_refs, overwrite=False):
185
target_repo = to_tags.repository
186
if self.repository.has_same_location(target_repo):
189
if getattr(target_repo, "_git", None):
190
return self._merge_to_local_git(
191
target_repo, source_tag_refs, overwrite)
193
return self._merge_to_remote_git(
194
target_repo, source_tag_refs, overwrite)
196
to_tags.branch._tag_refs = None
198
def _merge_to_non_git(self, to_tags, source_tag_refs, overwrite=False):
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,
199
262
unpeeled_map = defaultdict(set)
202
265
result = dict(to_tags.get_tag_dict())
203
266
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
267
if selector and not selector(tag_name):
204
269
if unpeeled is not None:
205
270
unpeeled_map[peeled].add(unpeeled)
207
bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
272
bzr_revid = self.source.branch.lookup_foreign_revision_id(peeled)
208
273
except NotCommitError:
210
275
if result.get(tag_name) == bzr_revid:
219
284
map_file = UnpeelMap.from_repository(to_tags.branch.repository)
220
285
map_file.update(unpeeled_map)
221
286
map_file.save_in_repository(to_tags.branch.repository)
222
return updates, conflicts
224
def merge_to(self, to_tags, overwrite=False, ignore_master=False,
225
source_tag_refs=None):
226
"""See Tags.merge_to."""
227
if source_tag_refs is None:
228
source_tag_refs = self.branch.get_tag_refs()
231
if isinstance(to_tags, GitTags):
232
return self._merge_to_git(to_tags, source_tag_refs,
238
master = to_tags.branch.get_master_branch()
239
with contextlib.ExitStack() as es:
240
if master is not None:
241
es.enter_context(master.lock_write())
242
updates, conflicts = self._merge_to_non_git(
243
to_tags, source_tag_refs, overwrite=overwrite)
244
if master is not None:
245
extra_updates, extra_conflicts = self.merge_to(
246
master.tags, overwrite=overwrite,
247
source_tag_refs=source_tag_refs,
248
ignore_master=ignore_master)
249
updates.update(extra_updates)
250
conflicts += extra_conflicts
251
return updates, conflicts
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
253
302
def get_tag_dict(self):
612
672
return revision.NULL_REVISION
613
673
return self.lookup_foreign_revision_id(self.head)
615
def _basic_push(self, target, overwrite=False, stop_revision=None):
675
def _basic_push(self, target, overwrite=False, stop_revision=None,
616
677
return branch.InterBranch.get(self, target)._basic_push(
617
overwrite, stop_revision)
678
overwrite, stop_revision, tag_selector=tag_selector)
619
680
def lookup_foreign_revision_id(self, foreign_revid):
934
995
stop_revision, fetch_tags=fetch_tags, limit=limit, lossy=lossy)
935
996
return _mod_repository.FetchResult()
937
def fetch_objects(self, stop_revision, fetch_tags, limit=None, lossy=False):
998
def fetch_objects(self, stop_revision, fetch_tags, limit=None, lossy=False, tag_selector=None):
938
999
interrepo = self._get_interrepo(self.source, self.target)
939
1000
if fetch_tags is None:
940
1001
c = self.source.get_config_stack()
982
1043
for path, url, section in parse_submodules(
983
1044
GitConfigFile.from_file(f)):
984
1045
self.target.set_reference_info(
985
tree.path2id(path.decode('utf-8')), url.decode('utf-8'),
986
path.decode('utf-8'))
1046
tree.path2id(decode_git_path(path)), url.decode('utf-8'),
1047
decode_git_path(path))
987
1048
except errors.NoSuchFile:
990
1051
def _basic_pull(self, stop_revision, overwrite, run_hooks,
991
_override_hook_target, _hook_master):
1052
_override_hook_target, _hook_master, tag_selector=None):
992
1053
if overwrite is True:
993
1054
overwrite = set(["history", "tags"])
994
1055
elif not overwrite:
1005
1066
(result.old_revno, result.old_revid) = \
1006
1067
self.target.last_revision_info()
1007
1068
result.new_git_head, remote_refs = self._update_revisions(
1008
stop_revision, overwrite=("history" in overwrite))
1069
stop_revision, overwrite=("history" in overwrite),
1070
tag_selector=tag_selector)
1009
1071
tags_ret = self.source.tags.merge_to(
1010
1072
self.target.tags, ("tags" in overwrite), ignore_master=True)
1011
1073
if isinstance(tags_ret, tuple):
1066
1128
master_branch = None
1067
1129
return self._basic_pull(stop_revision, overwrite, run_hooks,
1068
1130
_override_hook_target,
1069
_hook_master=master_branch)
1131
_hook_master=master_branch,
1132
tag_selector=tag_selector)
1071
def _basic_push(self, overwrite, stop_revision):
1134
def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1072
1135
if overwrite is True:
1073
1136
overwrite = set(["history", "tags"])
1074
1137
elif not overwrite:
1078
1141
result.target_branch = self.target
1079
1142
result.old_revno, result.old_revid = self.target.last_revision_info()
1080
1143
result.new_git_head, remote_refs = self._update_revisions(
1081
stop_revision, overwrite=("history" in overwrite))
1144
stop_revision, overwrite=("history" in overwrite),
1145
tag_selector=tag_selector)
1082
1146
tags_ret = self.source.tags.merge_to(
1083
self.target.tags, "tags" in overwrite, ignore_master=True)
1147
self.target.tags, "tags" in overwrite, ignore_master=True,
1148
selector=tag_selector)
1084
1149
(result.tag_updates, result.tag_conflicts) = tags_ret
1085
1150
result.new_revno, result.new_revid = self.target.last_revision_info()
1086
1151
self.update_references(revid=result.new_revid)
1109
1174
return (isinstance(source, LocalGitBranch) and
1110
1175
isinstance(target, RemoteGitBranch))
1112
def _basic_push(self, overwrite, stop_revision):
1177
def _basic_push(self, overwrite, stop_revision, tag_selector=None):
1178
from .remote import parse_git_error
1113
1179
result = GitBranchPushResult()
1114
1180
result.source_branch = self.source
1115
1181
result.target_branch = self.target
1134
1200
result.new_revid = stop_revision
1135
1201
for name, sha in (
1136
1202
self.source.repository._git.refs.as_dict(b"refs/tags").items()):
1203
if tag_selector and not tag_selector(name):
1137
1205
if sha not in self.source.repository._git:
1138
1206
trace.mutter('Ignoring missing SHA: %s', sha)
1140
1208
refs[tag_name_to_ref(name)] = sha
1142
self.target.repository.send_pack(
1210
dw_result = self.target.repository.send_pack(
1143
1211
get_changed_refs,
1144
self.source.repository._git.object_store.generate_pack_data)
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)
1307
1383
refs[ref] = (None, revid)
1308
1384
return refs, main_ref, (stop_revno, stop_revision)
1310
def _update_refs(self, result, old_refs, new_refs, overwrite):
1386
def _update_refs(self, result, old_refs, new_refs, overwrite, tag_selector):
1311
1387
mutter("updating refs. old refs: %r, new refs: %r",
1312
1388
old_refs, new_refs)
1313
1389
result.tag_updates = {}
1314
1390
result.tag_conflicts = []
1315
ret = dict(old_refs)
1317
1393
def ref_equals(refs, ref, git_sha, revid):
1381
1459
for (old_revid, (new_sha, new_revid)) in revidmap.items()})
1383
1461
def pull(self, overwrite=False, stop_revision=None, local=False,
1384
possible_transports=None, run_hooks=True, _stop_revno=None):
1462
possible_transports=None, run_hooks=True, _stop_revno=None,
1385
1464
result = GitBranchPullResult()
1386
1465
result.source_branch = self.source
1387
1466
result.target_branch = self.target
1390
1469
stop_revision, stop_revno=_stop_revno)
1392
1471
def update_refs(old_refs):
1393
return self._update_refs(result, old_refs, new_refs, overwrite)
1472
return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
1395
1474
result.revidmap, old_refs, new_refs = (
1396
1475
self.interrepo.fetch_refs(update_refs, lossy=False))
1421
1501
stop_revision, stop_revno=_stop_revno)
1423
1503
def update_refs(old_refs):
1424
return self._update_refs(result, old_refs, new_refs, overwrite)
1504
return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
1426
1506
result.revidmap, old_refs, new_refs = (
1427
1507
self.interrepo.fetch_refs(