1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""An adapter between a Git Branch and a Bazaar Branch"""
20
from collections import defaultdict
22
from dulwich.objects import (
33
repository as _mod_repository,
38
from bzrlib.decorators import (
41
from bzrlib.revision import (
44
from bzrlib.trace import (
49
from bzrlib.plugins.git.config import (
52
from bzrlib.plugins.git.errors import (
56
from bzrlib.plugins.git.refs import (
64
from bzrlib.plugins.git.unpeel_map import (
68
from bzrlib.foreign import ForeignBranch
71
class GitPullResult(branch.PullResult):
72
"""Result of a pull from a Git branch."""
74
def _lookup_revno(self, revid):
75
assert isinstance(revid, str), "was %r" % revid
76
# Try in source branch first, it'll be faster
77
return self.target_branch.revision_id_to_revno(revid)
81
return self._lookup_revno(self.old_revid)
85
return self._lookup_revno(self.new_revid)
88
class GitTags(tag.BasicTags):
89
"""Ref-based tag dictionary."""
91
def __init__(self, branch):
93
self.repository = branch.repository
96
raise NotImplementedError(self.get_refs)
98
def _iter_tag_refs(self, refs):
99
raise NotImplementedError(self._iter_tag_refs)
101
def _merge_to_git(self, to_tags, refs, overwrite=False):
102
target_repo = to_tags.repository
104
for k, v in refs.iteritems():
107
if overwrite or not k in target_repo._git.refs:
108
target_repo._git.refs[k] = v
109
elif target_repo._git.refs[k] == v:
112
conflicts.append((ref_to_tag_name(k), v, target_repo.refs[k]))
115
def _merge_to_non_git(self, to_tags, refs, overwrite=False):
116
unpeeled_map = defaultdict(set)
118
result = dict(to_tags.get_tag_dict())
119
for n, peeled, unpeeled, bzr_revid in self._iter_tag_refs(refs):
120
if unpeeled is not None:
121
unpeeled_map[peeled].add(unpeeled)
122
if n not in result or overwrite:
123
result[n] = bzr_revid
124
elif result[n] == bzr_revid:
127
conflicts.append((n, result[n], bzr_revid))
128
to_tags._set_tag_dict(result)
129
if len(unpeeled_map) > 0:
130
map_file = UnpeelMap.from_repository(to_tags.branch.repository)
131
map_file.update(unpeeled_map)
132
map_file.save_in_repository(to_tags.branch.repository)
135
def merge_to(self, to_tags, overwrite=False, ignore_master=False,
137
"""See Tags.merge_to."""
138
if source_refs is None:
139
source_refs = self.get_refs()
142
if isinstance(to_tags, GitTags):
143
return self._merge_to_git(to_tags, source_refs,
149
master = to_tags.branch.get_master_branch()
150
conflicts = self._merge_to_non_git(to_tags, source_refs,
152
if master is not None:
153
conflicts += self.merge_to(master.tags, overwrite=overwrite,
154
source_refs=source_refs,
155
ignore_master=ignore_master)
158
def get_tag_dict(self):
160
refs = self.get_refs()
161
for (name, peeled, unpeeled, bzr_revid) in self._iter_tag_refs(refs):
162
ret[name] = bzr_revid
166
class LocalGitTagDict(GitTags):
167
"""Dictionary with tags in a local repository."""
169
def __init__(self, branch):
170
super(LocalGitTagDict, self).__init__(branch)
171
self.refs = self.repository._git.refs
174
return self.repository._git.get_refs()
176
def _iter_tag_refs(self, refs):
177
"""Iterate over the tag refs.
179
:param refs: Refs dictionary (name -> git sha1)
180
:return: iterator over (name, peeled_sha1, unpeeled_sha1, bzr_revid)
182
for k, (peeled, unpeeled) in extract_tags(refs).iteritems():
184
obj = self.repository._git[peeled]
186
mutter("Tag %s points at unknown object %s, ignoring", peeled,
189
# FIXME: this shouldn't really be necessary, the repository
190
# already should have these unpeeled.
191
while isinstance(obj, Tag):
192
peeled = obj.object[1]
193
obj = self.repository._git[peeled]
194
if not isinstance(obj, Commit):
195
mutter("Tag %s points at object %r that is not a commit, "
198
yield (k, peeled, unpeeled,
199
self.branch.lookup_foreign_revision_id(peeled))
201
def _set_tag_dict(self, to_dict):
202
extra = set(self.get_refs().keys())
203
for k, revid in to_dict.iteritems():
204
name = tag_name_to_ref(k)
207
self.set_tag(k, revid)
210
del self.repository._git[name]
212
def set_tag(self, name, revid):
213
self.refs[tag_name_to_ref(name)], _ = \
214
self.branch.lookup_bzr_revision_id(revid)
217
class DictTagDict(tag.BasicTags):
219
def __init__(self, branch, tags):
220
super(DictTagDict, self).__init__(branch)
223
def get_tag_dict(self):
227
class GitSymrefBranchFormat(branch.BranchFormat):
229
def get_format_description(self):
230
return 'Git Symbolic Reference Branch'
232
def network_name(self):
235
def get_reference(self, controldir, name=None):
236
return controldir.get_branch_reference(name)
238
def set_reference(self, controldir, name, target):
239
return controldir.set_branch_reference(name, target)
242
class GitBranchFormat(branch.BranchFormat):
244
def get_format_description(self):
247
def network_name(self):
250
def supports_tags(self):
253
def supports_leaving_lock(self):
257
def _matchingbzrdir(self):
258
from bzrlib.plugins.git.dir import LocalGitControlDirFormat
259
return LocalGitControlDirFormat()
261
def get_foreign_tests_branch_factory(self):
262
from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory
263
return ForeignTestsBranchFactory()
265
def make_tags(self, branch):
266
if getattr(branch.repository, "get_refs", None) is not None:
267
from bzrlib.plugins.git.remote import RemoteGitTagDict
268
return RemoteGitTagDict(branch)
270
return LocalGitTagDict(branch)
272
def initialize(self, a_bzrdir, name=None, repository=None):
273
from bzrlib.plugins.git.dir import LocalGitDir
274
if not isinstance(a_bzrdir, LocalGitDir):
275
raise errors.IncompatibleFormat(self, a_bzrdir._format)
276
if repository is None:
277
repository = a_bzrdir.open_repository()
278
ref = branch_name_to_ref(name, "HEAD")
279
repository._git[ref] = ZERO_SHA
280
return LocalGitBranch(a_bzrdir, repository, ref, a_bzrdir._lockfiles)
283
class GitReadLock(object):
285
def __init__(self, unlock):
289
class GitWriteLock(object):
291
def __init__(self, unlock):
292
self.branch_token = None
296
class GitBranch(ForeignBranch):
297
"""An adapter to git repositories for bzr Branch objects."""
300
def control_transport(self):
301
return self.bzrdir.control_transport
303
def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
304
self.base = bzrdir.root_transport.base
305
self.repository = repository
306
self._format = GitBranchFormat()
307
self.control_files = lockfiles
309
self._lock_mode = None
311
super(GitBranch, self).__init__(repository.get_mapping())
312
if tagsdict is not None:
313
self.tags = DictTagDict(self, tagsdict)
315
self.name = ref_to_branch_name(ref)
318
def _get_checkout_format(self):
319
"""Return the most suitable metadir for a checkout of this branch.
320
Weaves are used if this branch's repository uses weaves.
322
return bzrdir.format_registry.make_bzrdir("default")
324
def get_child_submit_format(self):
325
"""Return the preferred format of submissions to this branch."""
326
ret = self.get_config().get_user_option("child_submit_format")
331
def _get_nick(self, local=False, possible_master_transports=None):
332
"""Find the nick name for this branch.
336
return self.name or "HEAD"
338
def _set_nick(self, nick):
339
raise NotImplementedError
341
nick = property(_get_nick, _set_nick)
344
return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
347
def generate_revision_history(self, revid, old_revid=None):
348
if revid == NULL_REVISION:
351
# FIXME: Check that old_revid is in the ancestry of revid
352
newhead, self.mapping = self.repository.lookup_bzr_revision_id(revid)
353
if self.mapping is None:
355
self._set_head(newhead)
357
def lock_write(self, token=None):
358
if token is not None:
359
raise errors.TokenLockingNotSupported(self)
361
assert self._lock_mode == 'w'
362
self._lock_count += 1
364
self._lock_mode = 'w'
366
self.repository.lock_write()
367
return GitWriteLock(self.unlock)
369
def get_stacked_on_url(self):
370
# Git doesn't do stacking (yet...)
371
raise errors.UnstackableBranchFormat(self._format, self.base)
373
def get_parent(self):
374
"""See Branch.get_parent()."""
375
# FIXME: Set "origin" url from .git/config ?
378
def set_parent(self, url):
379
# FIXME: Set "origin" url in .git/config ?
384
assert self._lock_mode in ('r', 'w')
385
self._lock_count += 1
387
self._lock_mode = 'r'
389
self.repository.lock_read()
390
return GitReadLock(self.unlock)
392
def peek_lock_mode(self):
393
return self._lock_mode
396
return (self._lock_mode is not None)
399
"""See Branch.unlock()."""
400
self._lock_count -= 1
401
if self._lock_count == 0:
402
self._lock_mode = None
403
self._clear_cached_state()
404
self.repository.unlock()
406
def get_physical_lock_status(self):
410
def last_revision(self):
411
# perhaps should escape this ?
412
if self.head is None:
413
return revision.NULL_REVISION
414
return self.lookup_foreign_revision_id(self.head)
416
def _basic_push(self, target, overwrite=False, stop_revision=None):
417
return branch.InterBranch.get(self, target)._basic_push(
418
overwrite, stop_revision)
420
def lookup_foreign_revision_id(self, foreign_revid):
421
return self.repository.lookup_foreign_revision_id(foreign_revid,
424
def lookup_bzr_revision_id(self, revid):
425
return self.repository.lookup_bzr_revision_id(
426
revid, mapping=self.mapping)
429
class LocalGitBranch(GitBranch):
430
"""A local Git branch."""
432
def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
433
super(LocalGitBranch, self).__init__(bzrdir, repository, ref,
435
refs = repository._git.get_refs()
436
if not (ref in refs.keys() or "HEAD" in refs.keys()):
437
raise errors.NotBranchError(self.base)
439
def create_checkout(self, to_location, revision_id=None, lightweight=False,
440
accelerator_tree=None, hardlink=False):
442
t = transport.get_transport(to_location)
444
format = self._get_checkout_format()
445
checkout = format.initialize_on_transport(t)
446
from_branch = branch.BranchReferenceFormat().initialize(checkout,
448
tree = checkout.create_workingtree(revision_id,
449
from_branch=from_branch, hardlink=hardlink)
452
return self._create_heavyweight_checkout(to_location, revision_id,
455
def _create_heavyweight_checkout(self, to_location, revision_id=None,
457
"""Create a new heavyweight checkout of this branch.
459
:param to_location: URL of location to create the new checkout in.
460
:param revision_id: Revision that should be the tip of the checkout.
461
:param hardlink: Whether to hardlink
462
:return: WorkingTree object of checkout.
464
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
465
to_location, force_new_tree=False)
466
checkout = checkout_branch.bzrdir
467
checkout_branch.bind(self)
468
# pull up to the specified revision_id to set the initial
469
# branch tip correctly, and seed it with history.
470
checkout_branch.pull(self, stop_revision=revision_id)
471
return checkout.create_workingtree(revision_id, hardlink=hardlink)
473
def _gen_revision_history(self):
474
if self.head is None:
476
graph = self.repository.get_graph()
477
ret = list(graph.iter_lefthand_ancestry(self.last_revision(),
478
(revision.NULL_REVISION, )))
484
return self.repository._git.ref(self.ref or "HEAD")
488
def _read_last_revision_info(self):
489
last_revid = self.last_revision()
490
graph = self.repository.get_graph()
491
revno = graph.find_distance_to_null(last_revid,
492
[(revision.NULL_REVISION, 0)])
493
return revno, last_revid
495
def set_last_revision_info(self, revno, revision_id):
496
self.set_last_revision(revision_id)
497
self._last_revision_info_cache = revno, revision_id
499
def set_last_revision(self, revid):
500
if not revid or not isinstance(revid, basestring):
501
raise errors.InvalidRevisionId(revision_id=revid, branch=self)
502
if revid == NULL_REVISION:
505
(newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
506
if self.mapping is None:
508
self._set_head(newhead)
510
def _set_head(self, value):
512
self.repository._git.refs[self.ref or "HEAD"] = self._head
513
self._clear_cached_state()
515
head = property(_get_head, _set_head)
517
def get_config(self):
518
return GitBranchConfig(self)
520
def get_push_location(self):
521
"""See Branch.get_push_location."""
522
push_loc = self.get_config().get_user_option('push_location')
525
def set_push_location(self, location):
526
"""See Branch.set_push_location."""
527
self.get_config().set_user_option('push_location', location,
528
store=config.STORE_LOCATION)
530
def supports_tags(self):
534
def _quick_lookup_revno(local_branch, remote_branch, revid):
535
assert isinstance(revid, str), "was %r" % revid
536
# Try in source branch first, it'll be faster
538
return local_branch.revision_id_to_revno(revid)
539
except errors.NoSuchRevision:
540
graph = local_branch.repository.get_graph()
542
return graph.find_distance_to_null(revid, [])
543
except errors.GhostRevisionsHaveNoRevno:
544
# FIXME: Check using graph.find_distance_to_null() ?
545
return remote_branch.revision_id_to_revno(revid)
548
class GitBranchPullResult(branch.PullResult):
551
super(GitBranchPullResult, self).__init__()
552
self.new_git_head = None
553
self._old_revno = None
554
self._new_revno = None
556
def report(self, to_file):
558
if self.old_revid == self.new_revid:
559
to_file.write('No revisions to pull.\n')
560
elif self.new_git_head is not None:
561
to_file.write('Now on revision %d (git sha: %s).\n' %
562
(self.new_revno, self.new_git_head))
564
to_file.write('Now on revision %d.\n' % (self.new_revno,))
565
self._show_tag_conficts(to_file)
567
def _lookup_revno(self, revid):
568
return _quick_lookup_revno(self.target_branch, self.source_branch,
571
def _get_old_revno(self):
572
if self._old_revno is not None:
573
return self._old_revno
574
return self._lookup_revno(self.old_revid)
576
def _set_old_revno(self, revno):
577
self._old_revno = revno
579
old_revno = property(_get_old_revno, _set_old_revno)
581
def _get_new_revno(self):
582
if self._new_revno is not None:
583
return self._new_revno
584
return self._lookup_revno(self.new_revid)
586
def _set_new_revno(self, revno):
587
self._new_revno = revno
589
new_revno = property(_get_new_revno, _set_new_revno)
592
class GitBranchPushResult(branch.BranchPushResult):
594
def _lookup_revno(self, revid):
595
return _quick_lookup_revno(self.source_branch, self.target_branch,
600
return self._lookup_revno(self.old_revid)
604
new_original_revno = getattr(self, "new_original_revno", None)
605
if new_original_revno:
606
return new_original_revno
607
if getattr(self, "new_original_revid", None) is not None:
608
return self._lookup_revno(self.new_original_revid)
609
return self._lookup_revno(self.new_revid)
612
class InterFromGitBranch(branch.GenericInterBranch):
613
"""InterBranch implementation that pulls from Git into bzr."""
616
def _get_branch_formats_to_test():
618
default_format = branch.format_registry.get_default()
619
except AttributeError:
620
default_format = branch.BranchFormat._default_format
622
(GitBranchFormat(), GitBranchFormat()),
623
(GitBranchFormat(), default_format)]
626
def _get_interrepo(self, source, target):
627
return _mod_repository.InterRepository.get(source.repository, target.repository)
630
def is_compatible(cls, source, target):
631
if not isinstance(source, GitBranch):
633
if isinstance(target, GitBranch):
634
# InterLocalGitRemoteGitBranch or InterToGitBranch should be used
636
if getattr(cls._get_interrepo(source, target), "fetch_objects", None) is None:
637
# fetch_objects is necessary for this to work
641
def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
642
self.fetch_objects(stop_revision, fetch_tags=fetch_tags, limit=limit)
644
def fetch_objects(self, stop_revision, fetch_tags, limit=None):
645
interrepo = self._get_interrepo(self.source, self.target)
646
if fetch_tags is None:
647
c = self.source.get_config()
648
fetch_tags = c.get_user_option_as_bool('branch.fetch_tags')
649
def determine_wants(heads):
650
if self.source.ref is not None and not self.source.ref in heads:
651
raise NoSuchRef(self.source.ref, heads.keys())
653
if stop_revision is None:
654
if self.source.ref is not None:
655
head = heads[self.source.ref]
658
self._last_revid = self.source.lookup_foreign_revision_id(head)
660
self._last_revid = stop_revision
661
real = interrepo.get_determine_wants_revids(
662
[self._last_revid], include_tags=fetch_tags)
664
pack_hint, head, refs = interrepo.fetch_objects(
665
determine_wants, self.source.mapping, limit=limit)
666
if (pack_hint is not None and
667
self.target.repository._format.pack_compresses):
668
self.target.repository.pack(hint=pack_hint)
671
def _update_revisions(self, stop_revision=None, overwrite=False):
672
head, refs = self.fetch_objects(stop_revision, fetch_tags=None)
674
prev_last_revid = None
676
prev_last_revid = self.target.last_revision()
677
self.target.generate_revision_history(self._last_revid,
678
prev_last_revid, self.source)
681
def pull(self, overwrite=False, stop_revision=None,
682
possible_transports=None, _hook_master=None, run_hooks=True,
683
_override_hook_target=None, local=False):
686
:param _hook_master: Private parameter - set the branch to
687
be supplied as the master to pull hooks.
688
:param run_hooks: Private parameter - if false, this branch
689
is being called because it's the master of the primary branch,
690
so it should not run its hooks.
691
:param _override_hook_target: Private parameter - set the branch to be
692
supplied as the target_branch to pull hooks.
694
# This type of branch can't be bound.
696
raise errors.LocalRequiresBoundBranch()
697
result = GitBranchPullResult()
698
result.source_branch = self.source
699
if _override_hook_target is None:
700
result.target_branch = self.target
702
result.target_branch = _override_hook_target
703
self.source.lock_read()
705
# We assume that during 'pull' the target repository is closer than
707
(result.old_revno, result.old_revid) = \
708
self.target.last_revision_info()
709
result.new_git_head, remote_refs = self._update_revisions(
710
stop_revision, overwrite=overwrite)
711
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
713
(result.new_revno, result.new_revid) = \
714
self.target.last_revision_info()
716
result.master_branch = _hook_master
717
result.local_branch = result.target_branch
719
result.master_branch = result.target_branch
720
result.local_branch = None
722
for hook in branch.Branch.hooks['post_pull']:
728
def _basic_push(self, overwrite=False, stop_revision=None):
729
result = branch.BranchPushResult()
730
result.source_branch = self.source
731
result.target_branch = self.target
732
result.old_revno, result.old_revid = self.target.last_revision_info()
733
result.new_git_head, remote_refs = self._update_revisions(
734
stop_revision, overwrite=overwrite)
735
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
737
result.new_revno, result.new_revid = self.target.last_revision_info()
741
class InterGitBranch(branch.GenericInterBranch):
742
"""InterBranch implementation that pulls between Git branches."""
745
class InterLocalGitRemoteGitBranch(InterGitBranch):
746
"""InterBranch that copies from a local to a remote git branch."""
749
def _get_branch_formats_to_test():
754
def is_compatible(self, source, target):
755
from bzrlib.plugins.git.remote import RemoteGitBranch
756
return (isinstance(source, LocalGitBranch) and
757
isinstance(target, RemoteGitBranch))
759
def _basic_push(self, overwrite=False, stop_revision=None):
760
result = GitBranchPushResult()
761
result.source_branch = self.source
762
result.target_branch = self.target
763
if stop_revision is None:
764
stop_revision = self.source.last_revision()
765
# FIXME: Check for diverged branches
766
def get_changed_refs(old_refs):
767
old_ref = old_refs.get(self.target.ref, ZERO_SHA)
768
result.old_revid = self.target.lookup_foreign_revision_id(old_ref)
769
refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
770
result.new_revid = stop_revision
771
for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
772
refs[tag_name_to_ref(name)] = sha
774
self.target.repository.send_pack(get_changed_refs,
775
self.source.repository._git.object_store.generate_pack_contents)
779
class InterGitLocalGitBranch(InterGitBranch):
780
"""InterBranch that copies from a remote to a local git branch."""
783
def _get_branch_formats_to_test():
788
def is_compatible(self, source, target):
789
return (isinstance(source, GitBranch) and
790
isinstance(target, LocalGitBranch))
792
def _basic_push(self, overwrite=False, stop_revision=None):
793
result = GitBranchPushResult()
794
result.source_branch = self.source
795
result.target_branch = self.target
796
result.old_revid = self.target.last_revision()
797
refs, stop_revision = self.update_refs(stop_revision)
798
self.target.generate_revision_history(stop_revision, result.old_revid)
799
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
800
source_refs=refs, overwrite=overwrite)
801
result.new_revid = self.target.last_revision()
804
def update_refs(self, stop_revision=None):
805
interrepo = _mod_repository.InterRepository.get(self.source.repository,
806
self.target.repository)
807
if stop_revision is None:
808
refs = interrepo.fetch(branches=["HEAD"])
809
stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
811
refs = interrepo.fetch(revision_id=stop_revision)
812
return refs, stop_revision
814
def pull(self, stop_revision=None, overwrite=False,
815
possible_transports=None, run_hooks=True,local=False):
816
# This type of branch can't be bound.
818
raise errors.LocalRequiresBoundBranch()
819
result = GitPullResult()
820
result.source_branch = self.source
821
result.target_branch = self.target
822
result.old_revid = self.target.last_revision()
823
refs, stop_revision = self.update_refs(stop_revision)
824
self.target.generate_revision_history(stop_revision, result.old_revid)
825
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
826
overwrite=overwrite, source_refs=refs)
827
result.new_revid = self.target.last_revision()
831
class InterToGitBranch(branch.GenericInterBranch):
832
"""InterBranch implementation that pulls into a Git branch."""
834
def __init__(self, source, target):
835
super(InterToGitBranch, self).__init__(source, target)
836
self.interrepo = _mod_repository.InterRepository.get(source.repository,
840
def _get_branch_formats_to_test():
842
default_format = branch.format_registry.get_default()
843
except AttributeError:
844
default_format = branch.BranchFormat._default_format
845
return [(default_format, GitBranchFormat())]
848
def is_compatible(self, source, target):
849
return (not isinstance(source, GitBranch) and
850
isinstance(target, GitBranch))
852
def _get_new_refs(self, stop_revision=None):
853
if stop_revision is None:
854
(stop_revno, stop_revision) = self.source.last_revision_info()
856
stop_revno = self.source.revision_id_to_revno(stop_revision)
857
assert type(stop_revision) is str
858
main_ref = self.target.ref or "refs/heads/master"
859
refs = { main_ref: (None, stop_revision) }
860
for name, revid in self.source.tags.get_tag_dict().iteritems():
861
if self.source.repository.has_revision(revid):
862
refs[tag_name_to_ref(name)] = (None, revid)
863
return refs, main_ref, (stop_revno, stop_revision)
865
def pull(self, overwrite=False, stop_revision=None, local=False,
866
possible_transports=None, run_hooks=True):
867
result = GitBranchPullResult()
868
result.source_branch = self.source
869
result.target_branch = self.target
870
new_refs, main_ref, stop_revinfo = self._get_new_refs(stop_revision)
871
def update_refs(old_refs):
872
# FIXME: Check for diverged branches
875
result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
876
update_refs, lossy=False)
877
except NoPushSupport:
878
raise errors.NoRoundtrippingSupport(self.source, self.target)
879
(result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
880
if result.old_revid is None:
881
result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
882
result.new_revid = new_refs[main_ref][1]
885
def push(self, overwrite=False, stop_revision=None, lossy=False,
886
_override_hook_source_branch=None):
887
result = GitBranchPushResult()
888
result.source_branch = self.source
889
result.target_branch = self.target
890
new_refs, main_ref, stop_revinfo = self._get_new_refs(stop_revision)
891
def update_refs(old_refs):
892
# FIXME: Check for diverged branches
895
result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
896
update_refs, lossy=lossy)
897
except NoPushSupport:
898
raise errors.NoRoundtrippingSupport(self.source, self.target)
899
(result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
900
if result.old_revid is None:
901
result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
902
result.new_revid = new_refs[main_ref][1]
903
(result.new_original_revno, result.new_original_revid) = stop_revinfo
906
def lossy_push(self, stop_revision=None):
907
# For compatibility with bzr < 2.4
908
return self.push(lossy=True, stop_revision=stop_revision)
911
branch.InterBranch.register_optimiser(InterGitLocalGitBranch)
912
branch.InterBranch.register_optimiser(InterFromGitBranch)
913
branch.InterBranch.register_optimiser(InterToGitBranch)
914
branch.InterBranch.register_optimiser(InterLocalGitRemoteGitBranch)
added
removed
branch.py
