1
# Copyright (C) 2007,2012 Canonical Ltd
2
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""An adapter between a Git Branch and a Bazaar Branch"""
20
from __future__ import absolute_import
22
from io import BytesIO
23
from collections import defaultdict
25
from dulwich.config import (
26
ConfigFile as GitConfigFile,
30
from dulwich.objects import (
34
from dulwich.repo import check_ref_format
43
repository as _mod_repository,
50
from ..foreign import ForeignBranch
51
from ..revision import (
54
from ..sixish import (
79
remote_refs_dict_to_tag_refs,
82
from .unpeel_map import (
91
def _calculate_revnos(branch):
92
if branch._format.stores_revno():
94
config = branch.get_config_stack()
95
return config.get('calculate_revnos')
98
class GitPullResult(branch.PullResult):
99
"""Result of a pull from a Git branch."""
101
def _lookup_revno(self, revid):
102
if not isinstance(revid, bytes):
103
raise TypeError(revid)
104
if not _calculate_revnos(self.target_branch):
106
# Try in source branch first, it'll be faster
107
with self.target_branch.lock_read():
108
return self.target_branch.revision_id_to_revno(revid)
112
return self._lookup_revno(self.old_revid)
116
return self._lookup_revno(self.new_revid)
119
class GitTags(tag.BasicTags):
120
"""Ref-based tag dictionary."""
122
def __init__(self, branch):
124
self.repository = branch.repository
126
def _merge_to_remote_git(self, target_repo, source_tag_refs,
131
def get_changed_refs(old_refs):
133
for ref_name, tag_name, peeled, unpeeled in (
134
source_tag_refs.iteritems()):
135
if old_refs.get(ref_name) == unpeeled:
137
elif overwrite or ref_name not in old_refs:
138
ret[ref_name] = unpeeled
139
updates[tag_name] = target_repo.lookup_foreign_revision_id(
144
self.repository.lookup_foreign_revision_id(peeled),
145
target_repo.lookup_foreign_revision_id(
146
old_refs[ref_name])))
148
target_repo.controldir.send_pack(
149
get_changed_refs, lambda have, want: [])
150
return updates, conflicts
152
def _merge_to_local_git(self, target_repo, source_tag_refs,
156
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
157
if target_repo._git.refs.get(ref_name) == unpeeled:
159
elif overwrite or ref_name not in target_repo._git.refs:
161
updates[tag_name] = (
162
target_repo.lookup_foreign_revision_id(peeled))
164
trace.warning('%s does not point to a valid object',
167
except NotCommitError:
168
trace.warning('%s points to a non-commit object',
171
target_repo._git.refs[ref_name] = unpeeled or peeled
174
source_revid = self.repository.lookup_foreign_revision_id(
176
target_revid = target_repo.lookup_foreign_revision_id(
177
target_repo._git.refs[ref_name])
179
trace.warning('%s does not point to a valid object',
182
except NotCommitError:
183
trace.warning('%s points to a non-commit object',
186
conflicts.append((tag_name, source_revid, target_revid))
187
return updates, conflicts
189
def _merge_to_git(self, to_tags, source_tag_refs, overwrite=False):
190
target_repo = to_tags.repository
191
if self.repository.has_same_location(target_repo):
194
if getattr(target_repo, "_git", None):
195
return self._merge_to_local_git(
196
target_repo, source_tag_refs, overwrite)
198
return self._merge_to_remote_git(
199
target_repo, source_tag_refs, overwrite)
201
to_tags.branch._tag_refs = None
203
def _merge_to_non_git(self, to_tags, source_tag_refs, overwrite=False):
204
unpeeled_map = defaultdict(set)
207
result = dict(to_tags.get_tag_dict())
208
for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
209
if unpeeled is not None:
210
unpeeled_map[peeled].add(unpeeled)
212
bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
213
except NotCommitError:
215
if result.get(tag_name) == bzr_revid:
217
elif tag_name not in result or overwrite:
218
result[tag_name] = bzr_revid
219
updates[tag_name] = bzr_revid
221
conflicts.append((tag_name, bzr_revid, result[tag_name]))
222
to_tags._set_tag_dict(result)
223
if len(unpeeled_map) > 0:
224
map_file = UnpeelMap.from_repository(to_tags.branch.repository)
225
map_file.update(unpeeled_map)
226
map_file.save_in_repository(to_tags.branch.repository)
227
return updates, conflicts
229
def merge_to(self, to_tags, overwrite=False, ignore_master=False,
230
source_tag_refs=None):
231
"""See Tags.merge_to."""
232
if source_tag_refs is None:
233
source_tag_refs = self.branch.get_tag_refs()
236
if isinstance(to_tags, GitTags):
237
return self._merge_to_git(to_tags, source_tag_refs,
243
master = to_tags.branch.get_master_branch()
244
with cleanup.ExitStack() as es:
245
if master is not None:
246
es.enter_context(master.lock_write())
247
updates, conflicts = self._merge_to_non_git(
248
to_tags, source_tag_refs, overwrite=overwrite)
249
if master is not None:
250
extra_updates, extra_conflicts = self.merge_to(
251
master.tags, overwrite=overwrite,
252
source_tag_refs=source_tag_refs,
253
ignore_master=ignore_master)
254
updates.update(extra_updates)
255
conflicts += extra_conflicts
256
return updates, conflicts
258
def get_tag_dict(self):
260
for (ref_name, tag_name, peeled, unpeeled) in (
261
self.branch.get_tag_refs()):
263
bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
264
except NotCommitError:
267
ret[tag_name] = bzr_revid
271
class LocalGitTagDict(GitTags):
272
"""Dictionary with tags in a local repository."""
274
def __init__(self, branch):
275
super(LocalGitTagDict, self).__init__(branch)
276
self.refs = self.repository.controldir._git.refs
278
def _set_tag_dict(self, to_dict):
279
extra = set(self.refs.allkeys())
280
for k, revid in viewitems(to_dict):
281
name = tag_name_to_ref(k)
284
self.set_tag(k, revid)
287
del self.repository._git[name]
289
def set_tag(self, name, revid):
291
git_sha, mapping = self.branch.lookup_bzr_revision_id(revid)
292
except errors.NoSuchRevision:
293
raise errors.GhostTagsNotSupported(self)
294
self.refs[tag_name_to_ref(name)] = git_sha
295
self.branch._tag_refs = None
297
def delete_tag(self, name):
298
ref = tag_name_to_ref(name)
299
if ref not in self.refs:
300
raise errors.NoSuchTag(name)
302
self.branch._tag_refs = None
305
class GitBranchFormat(branch.BranchFormat):
307
def network_name(self):
310
def supports_tags(self):
313
def supports_leaving_lock(self):
316
def supports_tags_referencing_ghosts(self):
319
def tags_are_versioned(self):
322
def get_foreign_tests_branch_factory(self):
323
from .tests.test_branch import ForeignTestsBranchFactory
324
return ForeignTestsBranchFactory()
326
def make_tags(self, branch):
329
except AttributeError:
331
if getattr(branch.repository, "_git", None) is None:
332
from .remote import RemoteGitTagDict
333
return RemoteGitTagDict(branch)
335
return LocalGitTagDict(branch)
337
def initialize(self, a_controldir, name=None, repository=None,
338
append_revisions_only=None):
339
raise NotImplementedError(self.initialize)
341
def get_reference(self, controldir, name=None):
342
return controldir.get_branch_reference(name=name)
344
def set_reference(self, controldir, name, target):
345
return controldir.set_branch_reference(target, name)
347
def stores_revno(self):
348
"""True if this branch format store revision numbers."""
352
class LocalGitBranchFormat(GitBranchFormat):
354
def get_format_description(self):
355
return 'Local Git Branch'
358
def _matchingcontroldir(self):
359
from .dir import LocalGitControlDirFormat
360
return LocalGitControlDirFormat()
362
def initialize(self, a_controldir, name=None, repository=None,
363
append_revisions_only=None):
364
from .dir import LocalGitDir
365
if not isinstance(a_controldir, LocalGitDir):
366
raise errors.IncompatibleFormat(self, a_controldir._format)
367
return a_controldir.create_branch(
368
repository=repository, name=name,
369
append_revisions_only=append_revisions_only)
372
class GitBranch(ForeignBranch):
373
"""An adapter to git repositories for bzr Branch objects."""
376
def control_transport(self):
377
return self._control_transport
380
def user_transport(self):
381
return self._user_transport
383
def __init__(self, controldir, repository, ref, format):
384
self.repository = repository
385
self._format = format
386
self.controldir = controldir
387
self._lock_mode = None
389
super(GitBranch, self).__init__(repository.get_mapping())
392
self._user_transport = controldir.user_transport.clone('.')
393
self._control_transport = controldir.control_transport.clone('.')
394
self._tag_refs = None
397
self.name = ref_to_branch_name(ref)
400
if self.ref is not None:
401
params = {"ref": urlutils.escape(self.ref)}
404
params = {"branch": urlutils.escape(self.name)}
405
for k, v in params.items():
406
self._user_transport.set_segment_parameter(k, v)
407
self._control_transport.set_segment_parameter(k, v)
408
self.base = controldir.user_transport.base
410
def _get_checkout_format(self, lightweight=False):
411
"""Return the most suitable metadir for a checkout of this branch.
412
Weaves are used if this branch's repository uses weaves.
415
return controldir.format_registry.make_controldir("git")
417
return controldir.format_registry.make_controldir("default")
419
def get_child_submit_format(self):
420
"""Return the preferred format of submissions to this branch."""
421
ret = self.get_config_stack().get("child_submit_format")
426
def get_config(self):
427
return GitBranchConfig(self)
429
def get_config_stack(self):
430
return GitBranchStack(self)
432
def _get_nick(self, local=False, possible_master_transports=None):
433
"""Find the nick name for this branch.
437
if getattr(self.repository, '_git', None):
438
cs = self.repository._git.get_config_stack()
440
return cs.get((b"branch", self.name.encode('utf-8')),
441
b"nick").decode("utf-8")
444
return self.name or u"HEAD"
446
def _set_nick(self, nick):
447
cf = self.repository._git.get_config()
448
cf.set((b"branch", self.name.encode('utf-8')),
449
b"nick", nick.encode("utf-8"))
452
self.repository._git._put_named_file('config', f.getvalue())
454
nick = property(_get_nick, _set_nick)
457
return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
460
def generate_revision_history(self, revid, last_rev=None,
462
if last_rev is not None:
463
graph = self.repository.get_graph()
464
if not graph.is_ancestor(last_rev, revid):
465
# our previous tip is not merged into stop_revision
466
raise errors.DivergedBranches(self, other_branch)
468
self.set_last_revision(revid)
470
def lock_write(self, token=None):
471
if token is not None:
472
raise errors.TokenLockingNotSupported(self)
474
if self._lock_mode == 'r':
475
raise errors.ReadOnlyError(self)
476
self._lock_count += 1
479
self._lock_mode = 'w'
481
self.repository.lock_write()
482
return lock.LogicalLockResult(self.unlock)
484
def leave_lock_in_place(self):
485
raise NotImplementedError(self.leave_lock_in_place)
487
def dont_leave_lock_in_place(self):
488
raise NotImplementedError(self.dont_leave_lock_in_place)
490
def get_stacked_on_url(self):
491
# Git doesn't do stacking (yet...)
492
raise branch.UnstackableBranchFormat(self._format, self.base)
494
def _get_push_origin(self, cs):
495
"""Get the name for the push origin.
497
The exact behaviour is documented in the git-config(1) manpage.
500
return cs.get((b'branch', self.name.encode('utf-8')), b'pushRemote')
503
return cs.get((b'branch', ), b'remote')
506
return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
510
def _get_origin(self, cs):
512
return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
516
def _get_related_push_branch(self, cs):
517
remote = self._get_push_origin(cs)
519
location = cs.get((b"remote", remote), b"url")
523
return git_url_to_bzr_url(location.decode('utf-8'), ref=self.ref)
525
def _get_related_merge_branch(self, cs):
526
remote = self._get_origin(cs)
528
location = cs.get((b"remote", remote), b"url")
533
ref = cs.get((b"branch", remote), b"merge")
537
return git_url_to_bzr_url(location.decode('utf-8'), ref=ref)
539
def _get_parent_location(self):
540
"""See Branch.get_parent()."""
541
cs = self.repository._git.get_config_stack()
542
return self._get_related_merge_branch(cs)
544
def _write_git_config(self, cs):
547
self.repository._git._put_named_file('config', f.getvalue())
549
def set_parent(self, location):
550
cs = self.repository._git.get_config()
551
remote = self._get_origin(cs)
552
this_url = urlutils.strip_segment_parameters(self.user_url)
553
target_url, branch, ref = bzr_url_to_git_url(location)
554
location = urlutils.relative_url(this_url, target_url)
555
cs.set((b"remote", remote), b"url", location)
557
cs.set((b"branch", remote), b"merge", branch_name_to_ref(branch))
559
cs.set((b"branch", remote), b"merge", ref)
561
# TODO(jelmer): Maybe unset rather than setting to HEAD?
562
cs.set((b"branch", remote), b"merge", b'HEAD')
563
self._write_git_config(cs)
565
def break_lock(self):
566
raise NotImplementedError(self.break_lock)
570
if self._lock_mode not in ('r', 'w'):
571
raise ValueError(self._lock_mode)
572
self._lock_count += 1
574
self._lock_mode = 'r'
576
self.repository.lock_read()
577
return lock.LogicalLockResult(self.unlock)
579
def peek_lock_mode(self):
580
return self._lock_mode
583
return (self._lock_mode is not None)
588
def _unlock_ref(self):
592
"""See Branch.unlock()."""
593
if self._lock_count == 0:
594
raise errors.LockNotHeld(self)
596
self._lock_count -= 1
597
if self._lock_count == 0:
598
if self._lock_mode == 'w':
600
self._lock_mode = None
601
self._clear_cached_state()
603
self.repository.unlock()
605
def get_physical_lock_status(self):
608
def last_revision(self):
609
with self.lock_read():
610
# perhaps should escape this ?
611
if self.head is None:
612
return revision.NULL_REVISION
613
return self.lookup_foreign_revision_id(self.head)
615
def _basic_push(self, target, overwrite=False, stop_revision=None):
616
return branch.InterBranch.get(self, target)._basic_push(
617
overwrite, stop_revision)
619
def lookup_foreign_revision_id(self, foreign_revid):
621
return self.repository.lookup_foreign_revision_id(foreign_revid,
625
return self.mapping.revision_id_foreign_to_bzr(foreign_revid)
627
def lookup_bzr_revision_id(self, revid):
628
return self.repository.lookup_bzr_revision_id(
629
revid, mapping=self.mapping)
631
def get_unshelver(self, tree):
632
raise errors.StoringUncommittedNotSupported(self)
634
def _clear_cached_state(self):
635
super(GitBranch, self)._clear_cached_state()
636
self._tag_refs = None
638
def _iter_tag_refs(self, refs):
639
"""Iterate over the tag refs.
641
:param refs: Refs dictionary (name -> git sha1)
642
:return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
644
raise NotImplementedError(self._iter_tag_refs)
646
def get_tag_refs(self):
647
with self.lock_read():
648
if self._tag_refs is None:
649
self._tag_refs = list(self._iter_tag_refs())
650
return self._tag_refs
652
def import_last_revision_info_and_tags(self, source, revno, revid,
654
"""Set the last revision info, importing from another repo if necessary.
656
This is used by the bound branch code to upload a revision to
657
the master branch first before updating the tip of the local branch.
658
Revisions referenced by source's tags are also transferred.
660
:param source: Source branch to optionally fetch from
661
:param revno: Revision number of the new tip
662
:param revid: Revision id of the new tip
663
:param lossy: Whether to discard metadata that can not be
665
:return: Tuple with the new revision number and revision id
666
(should only be different from the arguments when lossy=True)
668
push_result = source.push(
669
self, stop_revision=revid, lossy=lossy, _stop_revno=revno)
670
return (push_result.new_revno, push_result.new_revid)
672
def reconcile(self, thorough=True):
673
"""Make sure the data stored in this branch is consistent."""
674
from ..reconcile import ReconcileResult
676
return ReconcileResult()
679
class LocalGitBranch(GitBranch):
680
"""A local Git branch."""
682
def __init__(self, controldir, repository, ref):
683
super(LocalGitBranch, self).__init__(controldir, repository, ref,
684
LocalGitBranchFormat())
686
def create_checkout(self, to_location, revision_id=None, lightweight=False,
687
accelerator_tree=None, hardlink=False):
688
t = transport.get_transport(to_location)
690
format = self._get_checkout_format(lightweight=lightweight)
691
checkout = format.initialize_on_transport(t)
693
from_branch = checkout.set_branch_reference(target_branch=self)
695
policy = checkout.determine_repository_policy()
696
policy.acquire_repository()
697
checkout_branch = checkout.create_branch()
698
checkout_branch.bind(self)
699
checkout_branch.pull(self, stop_revision=revision_id)
701
return checkout.create_workingtree(
702
revision_id, from_branch=from_branch, hardlink=hardlink)
705
self._ref_lock = self.repository._git.refs.lock_ref(self.ref)
707
def _unlock_ref(self):
708
self._ref_lock.unlock()
710
def break_lock(self):
711
self.repository._git.refs.unlock_ref(self.ref)
713
def fetch(self, from_branch, last_revision=None, limit=None):
714
return branch.InterBranch.get(from_branch, self).fetch(
715
stop_revision=last_revision, limit=limit)
717
def _gen_revision_history(self):
718
if self.head is None:
720
last_revid = self.last_revision()
721
graph = self.repository.get_graph()
723
ret = list(graph.iter_lefthand_ancestry(
724
last_revid, (revision.NULL_REVISION, )))
725
except errors.RevisionNotPresent as e:
726
raise errors.GhostRevisionsHaveNoRevno(last_revid, e.revision_id)
732
return self.repository._git.refs[self.ref]
736
def _read_last_revision_info(self):
737
last_revid = self.last_revision()
738
graph = self.repository.get_graph()
740
revno = graph.find_distance_to_null(
741
last_revid, [(revision.NULL_REVISION, 0)])
742
except errors.GhostRevisionsHaveNoRevno:
744
return revno, last_revid
746
def set_last_revision_info(self, revno, revision_id):
747
self.set_last_revision(revision_id)
748
self._last_revision_info_cache = revno, revision_id
750
def set_last_revision(self, revid):
751
if not revid or not isinstance(revid, bytes):
752
raise errors.InvalidRevisionId(revision_id=revid, branch=self)
753
if revid == NULL_REVISION:
756
(newhead, self.mapping) = self.repository.lookup_bzr_revision_id(
758
if self.mapping is None:
760
self._set_head(newhead)
762
def _set_head(self, value):
763
if value == ZERO_SHA:
764
raise ValueError(value)
767
del self.repository._git.refs[self.ref]
769
self.repository._git.refs[self.ref] = self._head
770
self._clear_cached_state()
772
head = property(_get_head, _set_head)
774
def get_push_location(self):
775
"""See Branch.get_push_location."""
776
push_loc = self.get_config_stack().get('push_location')
777
if push_loc is not None:
779
cs = self.repository._git.get_config_stack()
780
return self._get_related_push_branch(cs)
782
def set_push_location(self, location):
783
"""See Branch.set_push_location."""
784
self.get_config().set_user_option('push_location', location,
785
store=config.STORE_LOCATION)
787
def supports_tags(self):
790
def store_uncommitted(self, creator):
791
raise errors.StoringUncommittedNotSupported(self)
793
def _iter_tag_refs(self):
794
"""Iterate over the tag refs.
796
:param refs: Refs dictionary (name -> git sha1)
797
:return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
799
refs = self.repository.controldir.get_refs_container()
800
for ref_name, unpeeled in viewitems(refs.as_dict()):
802
tag_name = ref_to_tag_name(ref_name)
803
except (ValueError, UnicodeDecodeError):
805
peeled = refs.get_peeled(ref_name)
808
if not isinstance(tag_name, text_type):
809
raise TypeError(tag_name)
810
yield (ref_name, tag_name, peeled, unpeeled)
812
def create_memorytree(self):
813
from .memorytree import GitMemoryTree
814
return GitMemoryTree(self, self.repository._git.object_store,
818
def _quick_lookup_revno(local_branch, remote_branch, revid):
819
if not isinstance(revid, bytes):
820
raise TypeError(revid)
821
# Try in source branch first, it'll be faster
822
with local_branch.lock_read():
823
if not _calculate_revnos(local_branch):
826
return local_branch.revision_id_to_revno(revid)
827
except errors.NoSuchRevision:
828
graph = local_branch.repository.get_graph()
830
return graph.find_distance_to_null(
831
revid, [(revision.NULL_REVISION, 0)])
832
except errors.GhostRevisionsHaveNoRevno:
833
if not _calculate_revnos(remote_branch):
835
# FIXME: Check using graph.find_distance_to_null() ?
836
with remote_branch.lock_read():
837
return remote_branch.revision_id_to_revno(revid)
840
class GitBranchPullResult(branch.PullResult):
843
super(GitBranchPullResult, self).__init__()
844
self.new_git_head = None
845
self._old_revno = None
846
self._new_revno = None
848
def report(self, to_file):
850
if self.old_revid == self.new_revid:
851
to_file.write('No revisions to pull.\n')
852
elif self.new_git_head is not None:
853
to_file.write('Now on revision %d (git sha: %s).\n' %
854
(self.new_revno, self.new_git_head))
856
to_file.write('Now on revision %d.\n' % (self.new_revno,))
857
self._show_tag_conficts(to_file)
859
def _lookup_revno(self, revid):
860
return _quick_lookup_revno(self.target_branch, self.source_branch,
863
def _get_old_revno(self):
864
if self._old_revno is not None:
865
return self._old_revno
866
return self._lookup_revno(self.old_revid)
868
def _set_old_revno(self, revno):
869
self._old_revno = revno
871
old_revno = property(_get_old_revno, _set_old_revno)
873
def _get_new_revno(self):
874
if self._new_revno is not None:
875
return self._new_revno
876
return self._lookup_revno(self.new_revid)
878
def _set_new_revno(self, revno):
879
self._new_revno = revno
881
new_revno = property(_get_new_revno, _set_new_revno)
884
class GitBranchPushResult(branch.BranchPushResult):
886
def _lookup_revno(self, revid):
887
return _quick_lookup_revno(self.source_branch, self.target_branch,
892
return self._lookup_revno(self.old_revid)
896
new_original_revno = getattr(self, "new_original_revno", None)
897
if new_original_revno:
898
return new_original_revno
899
if getattr(self, "new_original_revid", None) is not None:
900
return self._lookup_revno(self.new_original_revid)
901
return self._lookup_revno(self.new_revid)
904
class InterFromGitBranch(branch.GenericInterBranch):
905
"""InterBranch implementation that pulls from Git into bzr."""
908
def _get_branch_formats_to_test():
910
default_format = branch.format_registry.get_default()
911
except AttributeError:
912
default_format = branch.BranchFormat._default_format
913
from .remote import RemoteGitBranchFormat
915
(RemoteGitBranchFormat(), default_format),
916
(LocalGitBranchFormat(), default_format)]
919
def _get_interrepo(self, source, target):
920
return _mod_repository.InterRepository.get(
921
source.repository, target.repository)
924
def is_compatible(cls, source, target):
925
if not isinstance(source, GitBranch):
927
if isinstance(target, GitBranch):
928
# InterLocalGitRemoteGitBranch or InterToGitBranch should be used
930
if (getattr(cls._get_interrepo(source, target), "fetch_objects", None)
932
# fetch_objects is necessary for this to work
936
def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
937
self.fetch_objects(stop_revision, fetch_tags=fetch_tags, limit=limit)
939
def fetch_objects(self, stop_revision, fetch_tags, limit=None):
940
interrepo = self._get_interrepo(self.source, self.target)
941
if fetch_tags is None:
942
c = self.source.get_config_stack()
943
fetch_tags = c.get('branch.fetch_tags')
945
def determine_wants(heads):
946
if stop_revision is None:
948
head = heads[self.source.ref]
950
self._last_revid = revision.NULL_REVISION
952
self._last_revid = self.source.lookup_foreign_revision_id(
955
self._last_revid = stop_revision
956
real = interrepo.get_determine_wants_revids(
957
[self._last_revid], include_tags=fetch_tags)
959
pack_hint, head, refs = interrepo.fetch_objects(
960
determine_wants, self.source.mapping, limit=limit)
961
if (pack_hint is not None and
962
self.target.repository._format.pack_compresses):
963
self.target.repository.pack(hint=pack_hint)
966
def _update_revisions(self, stop_revision=None, overwrite=False):
967
head, refs = self.fetch_objects(stop_revision, fetch_tags=None)
969
prev_last_revid = None
971
prev_last_revid = self.target.last_revision()
972
self.target.generate_revision_history(
973
self._last_revid, last_rev=prev_last_revid,
974
other_branch=self.source)
977
def update_references(self, revid=None):
979
revid = self.target.last_revision()
980
tree = self.target.repository.revision_tree(revid)
982
with tree.get_file('.gitmodules') as f:
983
for path, url, section in parse_submodules(
984
GitConfigFile.from_file(f)):
985
self.target.set_reference_info(
986
path.decode('utf-8'), url.decode('utf-8'),
987
tree.path2id(path.decode('utf-8')))
988
except errors.NoSuchFile:
991
def _basic_pull(self, stop_revision, overwrite, run_hooks,
992
_override_hook_target, _hook_master):
993
if overwrite is True:
994
overwrite = set(["history", "tags"])
997
result = GitBranchPullResult()
998
result.source_branch = self.source
999
if _override_hook_target is None:
1000
result.target_branch = self.target
1002
result.target_branch = _override_hook_target
1003
with self.target.lock_write(), self.source.lock_read():
1004
# We assume that during 'pull' the target repository is closer than
1006
(result.old_revno, result.old_revid) = \
1007
self.target.last_revision_info()
1008
result.new_git_head, remote_refs = self._update_revisions(
1009
stop_revision, overwrite=("history" in overwrite))
1010
tags_ret = self.source.tags.merge_to(
1011
self.target.tags, ("tags" in overwrite), ignore_master=True)
1012
if isinstance(tags_ret, tuple):
1013
result.tag_updates, result.tag_conflicts = tags_ret
1015
result.tag_conflicts = tags_ret
1016
(result.new_revno, result.new_revid) = \
1017
self.target.last_revision_info()
1018
self.update_references(revid=result.new_revid)
1020
result.master_branch = _hook_master
1021
result.local_branch = result.target_branch
1023
result.master_branch = result.target_branch
1024
result.local_branch = None
1026
for hook in branch.Branch.hooks['post_pull']:
1030
def pull(self, overwrite=False, stop_revision=None,
1031
possible_transports=None, _hook_master=None, run_hooks=True,
1032
_override_hook_target=None, local=False):
1035
:param _hook_master: Private parameter - set the branch to
1036
be supplied as the master to pull hooks.
1037
:param run_hooks: Private parameter - if false, this branch
1038
is being called because it's the master of the primary branch,
1039
so it should not run its hooks.
1040
:param _override_hook_target: Private parameter - set the branch to be
1041
supplied as the target_branch to pull hooks.
1043
# This type of branch can't be bound.
1044
bound_location = self.target.get_bound_location()
1045
if local and not bound_location:
1046
raise errors.LocalRequiresBoundBranch()
1047
source_is_master = False
1048
with cleanup.ExitStack() as es:
1049
es.enter_context(self.source.lock_read())
1051
# bound_location comes from a config file, some care has to be
1052
# taken to relate it to source.user_url
1053
normalized = urlutils.normalize_url(bound_location)
1055
relpath = self.source.user_transport.relpath(normalized)
1056
source_is_master = (relpath == '')
1057
except (errors.PathNotChild, urlutils.InvalidURL):
1058
source_is_master = False
1059
if not local and bound_location and not source_is_master:
1060
# not pulling from master, so we need to update master.
1061
master_branch = self.target.get_master_branch(possible_transports)
1062
es.enter_context(master_branch.lock_write())
1063
# pull from source into master.
1064
master_branch.pull(self.source, overwrite, stop_revision,
1067
master_branch = None
1068
return self._basic_pull(stop_revision, overwrite, run_hooks,
1069
_override_hook_target,
1070
_hook_master=master_branch)
1072
def _basic_push(self, overwrite, stop_revision):
1073
if overwrite is True:
1074
overwrite = set(["history", "tags"])
1077
result = branch.BranchPushResult()
1078
result.source_branch = self.source
1079
result.target_branch = self.target
1080
result.old_revno, result.old_revid = self.target.last_revision_info()
1081
result.new_git_head, remote_refs = self._update_revisions(
1082
stop_revision, overwrite=("history" in overwrite))
1083
tags_ret = self.source.tags.merge_to(
1084
self.target.tags, "tags" in overwrite, ignore_master=True)
1085
(result.tag_updates, result.tag_conflicts) = tags_ret
1086
result.new_revno, result.new_revid = self.target.last_revision_info()
1087
self.update_references(revid=result.new_revid)
1091
class InterGitBranch(branch.GenericInterBranch):
1092
"""InterBranch implementation that pulls between Git branches."""
1094
def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
1095
raise NotImplementedError(self.fetch)
1098
class InterLocalGitRemoteGitBranch(InterGitBranch):
1099
"""InterBranch that copies from a local to a remote git branch."""
1102
def _get_branch_formats_to_test():
1103
from .remote import RemoteGitBranchFormat
1105
(LocalGitBranchFormat(), RemoteGitBranchFormat())]
1108
def is_compatible(self, source, target):
1109
from .remote import RemoteGitBranch
1110
return (isinstance(source, LocalGitBranch) and
1111
isinstance(target, RemoteGitBranch))
1113
def _basic_push(self, overwrite, stop_revision):
1114
result = GitBranchPushResult()
1115
result.source_branch = self.source
1116
result.target_branch = self.target
1117
if stop_revision is None:
1118
stop_revision = self.source.last_revision()
1120
def get_changed_refs(old_refs):
1121
old_ref = old_refs.get(self.target.ref, None)
1123
result.old_revid = revision.NULL_REVISION
1125
result.old_revid = self.target.lookup_foreign_revision_id(
1127
new_ref = self.source.repository.lookup_bzr_revision_id(
1130
if remote_divergence(
1132
self.source.repository._git.object_store):
1133
raise errors.DivergedBranches(self.source, self.target)
1134
refs = {self.target.ref: new_ref}
1135
result.new_revid = stop_revision
1136
for name, sha in viewitems(
1137
self.source.repository._git.refs.as_dict(b"refs/tags")):
1138
if sha not in self.source.repository._git:
1139
trace.mutter('Ignoring missing SHA: %s', sha)
1141
refs[tag_name_to_ref(name)] = sha
1143
self.target.repository.send_pack(
1145
self.source.repository._git.object_store.generate_pack_data)
1149
class InterGitLocalGitBranch(InterGitBranch):
1150
"""InterBranch that copies from a remote to a local git branch."""
1153
def _get_branch_formats_to_test():
1154
from .remote import RemoteGitBranchFormat
1156
(RemoteGitBranchFormat(), LocalGitBranchFormat()),
1157
(LocalGitBranchFormat(), LocalGitBranchFormat())]
1160
def is_compatible(self, source, target):
1161
return (isinstance(source, GitBranch) and
1162
isinstance(target, LocalGitBranch))
1164
def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
1165
interrepo = _mod_repository.InterRepository.get(self.source.repository,
1166
self.target.repository)
1167
if stop_revision is None:
1168
stop_revision = self.source.last_revision()
1169
if fetch_tags is None:
1170
c = self.source.get_config_stack()
1171
fetch_tags = c.get('branch.fetch_tags')
1172
determine_wants = interrepo.get_determine_wants_revids(
1173
[stop_revision], include_tags=fetch_tags)
1174
interrepo.fetch_objects(determine_wants, limit=limit)
1176
def _basic_push(self, overwrite=False, stop_revision=None):
1177
if overwrite is True:
1178
overwrite = set(["history", "tags"])
1181
result = GitBranchPushResult()
1182
result.source_branch = self.source
1183
result.target_branch = self.target
1184
result.old_revid = self.target.last_revision()
1185
refs, stop_revision = self.update_refs(stop_revision)
1186
self.target.generate_revision_history(
1188
(result.old_revid if ("history" not in overwrite) else None),
1189
other_branch=self.source)
1190
tags_ret = self.source.tags.merge_to(
1192
source_tag_refs=remote_refs_dict_to_tag_refs(refs),
1193
overwrite=("tags" in overwrite))
1194
if isinstance(tags_ret, tuple):
1195
(result.tag_updates, result.tag_conflicts) = tags_ret
1197
result.tag_conflicts = tags_ret
1198
result.new_revid = self.target.last_revision()
1201
def update_refs(self, stop_revision=None):
1202
interrepo = _mod_repository.InterRepository.get(
1203
self.source.repository, self.target.repository)
1204
c = self.source.get_config_stack()
1205
fetch_tags = c.get('branch.fetch_tags')
1207
if stop_revision is None:
1208
refs = interrepo.fetch(branches=[self.source.ref], include_tags=fetch_tags)
1210
head = refs[self.source.ref]
1212
stop_revision = revision.NULL_REVISION
1214
stop_revision = self.target.lookup_foreign_revision_id(head)
1216
refs = interrepo.fetch(
1217
revision_id=stop_revision, include_tags=fetch_tags)
1218
return refs, stop_revision
1220
def pull(self, stop_revision=None, overwrite=False,
1221
possible_transports=None, run_hooks=True, local=False):
1222
# This type of branch can't be bound.
1224
raise errors.LocalRequiresBoundBranch()
1225
if overwrite is True:
1226
overwrite = set(["history", "tags"])
1230
result = GitPullResult()
1231
result.source_branch = self.source
1232
result.target_branch = self.target
1233
with self.target.lock_write(), self.source.lock_read():
1234
result.old_revid = self.target.last_revision()
1235
refs, stop_revision = self.update_refs(stop_revision)
1236
self.target.generate_revision_history(
1238
(result.old_revid if ("history" not in overwrite) else None),
1239
other_branch=self.source)
1240
tags_ret = self.source.tags.merge_to(
1241
self.target.tags, overwrite=("tags" in overwrite),
1242
source_tag_refs=remote_refs_dict_to_tag_refs(refs))
1243
if isinstance(tags_ret, tuple):
1244
(result.tag_updates, result.tag_conflicts) = tags_ret
1246
result.tag_conflicts = tags_ret
1247
result.new_revid = self.target.last_revision()
1248
result.local_branch = None
1249
result.master_branch = result.target_branch
1251
for hook in branch.Branch.hooks['post_pull']:
1256
class InterToGitBranch(branch.GenericInterBranch):
1257
"""InterBranch implementation that pulls into a Git branch."""
1259
def __init__(self, source, target):
1260
super(InterToGitBranch, self).__init__(source, target)
1261
self.interrepo = _mod_repository.InterRepository.get(source.repository,
1265
def _get_branch_formats_to_test():
1267
default_format = branch.format_registry.get_default()
1268
except AttributeError:
1269
default_format = branch.BranchFormat._default_format
1270
from .remote import RemoteGitBranchFormat
1272
(default_format, LocalGitBranchFormat()),
1273
(default_format, RemoteGitBranchFormat())]
1276
def is_compatible(self, source, target):
1277
return (not isinstance(source, GitBranch) and
1278
isinstance(target, GitBranch))
1280
def _get_new_refs(self, stop_revision=None, fetch_tags=None,
1282
if not self.source.is_locked():
1283
raise errors.ObjectNotLocked(self.source)
1284
if stop_revision is None:
1285
(stop_revno, stop_revision) = self.source.last_revision_info()
1286
elif stop_revno is None:
1288
stop_revno = self.source.revision_id_to_revno(stop_revision)
1289
except errors.NoSuchRevision:
1291
if not isinstance(stop_revision, bytes):
1292
raise TypeError(stop_revision)
1293
main_ref = self.target.ref
1294
refs = {main_ref: (None, stop_revision)}
1295
if fetch_tags is None:
1296
c = self.source.get_config_stack()
1297
fetch_tags = c.get('branch.fetch_tags')
1298
for name, revid in viewitems(self.source.tags.get_tag_dict()):
1299
if self.source.repository.has_revision(revid):
1300
ref = tag_name_to_ref(name)
1301
if not check_ref_format(ref):
1302
warning("skipping tag with invalid characters %s (%s)",
1306
# FIXME: Skip tags that are not in the ancestry
1307
refs[ref] = (None, revid)
1308
return refs, main_ref, (stop_revno, stop_revision)
1310
def _update_refs(self, result, old_refs, new_refs, overwrite):
1311
mutter("updating refs. old refs: %r, new refs: %r",
1313
result.tag_updates = {}
1314
result.tag_conflicts = []
1315
ret = dict(old_refs)
1317
def ref_equals(refs, ref, git_sha, revid):
1322
if (value[0] is not None and
1323
git_sha is not None and
1324
value[0] == git_sha):
1326
if (value[1] is not None and
1327
revid is not None and
1330
# FIXME: If one side only has the git sha available and the other
1331
# only has the bzr revid, then this will cause us to show a tag as
1332
# updated that hasn't actually been updated.
1334
# FIXME: Check for diverged branches
1335
for ref, (git_sha, revid) in viewitems(new_refs):
1336
if ref_equals(ret, ref, git_sha, revid):
1337
# Already up to date
1339
git_sha = old_refs[ref][0]
1341
revid = old_refs[ref][1]
1342
ret[ref] = new_refs[ref] = (git_sha, revid)
1343
elif ref not in ret or overwrite:
1345
tag_name = ref_to_tag_name(ref)
1349
result.tag_updates[tag_name] = revid
1350
ret[ref] = (git_sha, revid)
1352
# FIXME: Check diverged
1356
name = ref_to_tag_name(ref)
1360
result.tag_conflicts.append(
1361
(name, revid, ret[name][1]))
1363
ret[ref] = (git_sha, revid)
1366
def fetch(self, stop_revision=None, fetch_tags=None, lossy=False,
1368
if stop_revision is None:
1369
stop_revision = self.source.last_revision()
1372
for k, v in viewitems(self.source.tags.get_tag_dict()):
1373
ret.append((None, v))
1374
ret.append((None, stop_revision))
1376
self.interrepo.fetch_objects(ret, lossy=lossy, limit=limit)
1377
except NoPushSupport:
1378
raise errors.NoRoundtrippingSupport(self.source, self.target)
1380
def pull(self, overwrite=False, stop_revision=None, local=False,
1381
possible_transports=None, run_hooks=True, _stop_revno=None):
1382
result = GitBranchPullResult()
1383
result.source_branch = self.source
1384
result.target_branch = self.target
1385
with self.source.lock_read(), self.target.lock_write():
1386
new_refs, main_ref, stop_revinfo = self._get_new_refs(
1387
stop_revision, stop_revno=_stop_revno)
1389
def update_refs(old_refs):
1390
return self._update_refs(result, old_refs, new_refs, overwrite)
1392
result.revidmap, old_refs, new_refs = (
1393
self.interrepo.fetch_refs(update_refs, lossy=False))
1394
except NoPushSupport:
1395
raise errors.NoRoundtrippingSupport(self.source, self.target)
1396
(old_sha1, result.old_revid) = old_refs.get(
1397
main_ref, (ZERO_SHA, NULL_REVISION))
1398
if result.old_revid is None:
1399
result.old_revid = self.target.lookup_foreign_revision_id(
1401
result.new_revid = new_refs[main_ref][1]
1402
result.local_branch = None
1403
result.master_branch = self.target
1405
for hook in branch.Branch.hooks['post_pull']:
1409
def push(self, overwrite=False, stop_revision=None, lossy=False,
1410
_override_hook_source_branch=None, _stop_revno=None):
1411
result = GitBranchPushResult()
1412
result.source_branch = self.source
1413
result.target_branch = self.target
1414
result.local_branch = None
1415
result.master_branch = result.target_branch
1416
with self.source.lock_read(), self.target.lock_write():
1417
new_refs, main_ref, stop_revinfo = self._get_new_refs(
1418
stop_revision, stop_revno=_stop_revno)
1420
def update_refs(old_refs):
1421
return self._update_refs(result, old_refs, new_refs, overwrite)
1423
result.revidmap, old_refs, new_refs = (
1424
self.interrepo.fetch_refs(
1425
update_refs, lossy=lossy, overwrite=overwrite))
1426
except NoPushSupport:
1427
raise errors.NoRoundtrippingSupport(self.source, self.target)
1428
(old_sha1, result.old_revid) = old_refs.get(
1429
main_ref, (ZERO_SHA, NULL_REVISION))
1430
if lossy or result.old_revid is None:
1431
result.old_revid = self.target.lookup_foreign_revision_id(
1433
result.new_revid = new_refs[main_ref][1]
1434
(result.new_original_revno,
1435
result.new_original_revid) = stop_revinfo
1436
for hook in branch.Branch.hooks['post_push']:
1441
branch.InterBranch.register_optimiser(InterGitLocalGitBranch)
1442
branch.InterBranch.register_optimiser(InterFromGitBranch)
1443
branch.InterBranch.register_optimiser(InterToGitBranch)
1444
branch.InterBranch.register_optimiser(InterLocalGitRemoteGitBranch)
added
removed
breezy/git/branch.py
