1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2009 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 dulwich.objects import (
36
from bzrlib.decorators import (
39
from bzrlib.trace import (
44
from bzrlib.plugins.git import (
47
from bzrlib.plugins.git.config import (
50
from bzrlib.plugins.git.errors import (
56
from bzrlib.foreign import ForeignBranch
58
class ForeignBranch(branch.Branch):
59
def __init__(self, mapping):
60
self.mapping = mapping
61
super(ForeignBranch, self).__init__()
64
def extract_tags(refs, mapping):
66
for k,v in refs.iteritems():
67
if k.startswith("refs/tags/") and not k.endswith("^{}"):
68
v = refs.get(k+"^{}", v)
69
ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
73
class GitPullResult(branch.PullResult):
75
def _lookup_revno(self, revid):
76
assert isinstance(revid, str), "was %r" % revid
77
# Try in source branch first, it'll be faster
78
return self.target_branch.revision_id_to_revno(revid)
82
return self._lookup_revno(self.old_revid)
86
return self._lookup_revno(self.new_revid)
89
class LocalGitTagDict(tag.BasicTags):
90
"""Dictionary with tags in a local repository."""
92
def __init__(self, branch):
94
self.repository = branch.repository
96
def get_tag_dict(self):
98
for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
99
obj = self.repository._git.get_object(v)
100
while isinstance(obj, Tag):
102
obj = self.repository._git.get_object(v)
103
if not isinstance(obj, Commit):
104
mutter("Tag %s points at object %r that is not a commit, "
107
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
110
def set_tag(self, name, revid):
111
self.repository._git.refs["refs/tags/%s" % name], _ = \
112
self.branch.mapping.revision_id_bzr_to_foreign(revid)
115
class GitBranchFormat(branch.BranchFormat):
117
def get_format_description(self):
120
def supports_tags(self):
123
def make_tags(self, branch):
124
if getattr(branch.repository, "get_refs", None) is not None:
125
from bzrlib.plugins.git.remote import RemoteGitTagDict
126
return RemoteGitTagDict(branch)
128
return LocalGitTagDict(branch)
131
class GitBranch(ForeignBranch):
132
"""An adapter to git repositories for bzr Branch objects."""
134
def __init__(self, bzrdir, repository, name, lockfiles):
135
self.repository = repository
136
self._format = GitBranchFormat()
137
self.control_files = lockfiles
139
super(GitBranch, self).__init__(repository.get_mapping())
142
self.base = bzrdir.transport.base
144
def _get_nick(self, local=False, possible_master_transports=None):
145
"""Find the nick name for this branch.
151
def _set_nick(self, nick):
152
raise NotImplementedError
154
nick = property(_get_nick, _set_nick)
157
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
159
def generate_revision_history(self, revid, old_revid=None):
160
# FIXME: Check that old_revid is in the ancestry of revid
161
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
162
self._set_head(newhead)
164
def lock_write(self):
165
self.control_files.lock_write()
167
def get_stacked_on_url(self):
168
# Git doesn't do stacking (yet...)
171
def get_parent(self):
172
"""See Branch.get_parent()."""
173
# FIXME: Set "origin" url from .git/config ?
176
def set_parent(self, url):
177
# FIXME: Set "origin" url in .git/config ?
181
self.control_files.lock_read()
184
return self.control_files.is_locked()
187
self.control_files.unlock()
189
def get_physical_lock_status(self):
193
def last_revision(self):
194
# perhaps should escape this ?
195
if self.head is None:
196
return revision.NULL_REVISION
197
return self.mapping.revision_id_foreign_to_bzr(self.head)
199
def _basic_push(self, target, overwrite=False, stop_revision=None):
200
return branch.InterBranch.get(self, target)._basic_push(
201
overwrite, stop_revision)
204
class LocalGitBranch(GitBranch):
205
"""A local Git branch."""
207
def _get_checkout_format(self):
208
"""Return the most suitable metadir for a checkout of this branch.
209
Weaves are used if this branch's repository uses weaves.
211
format = self.repository.bzrdir.checkout_metadir()
212
format.set_branch_format(self._format)
215
def create_checkout(self, to_location, revision_id=None, lightweight=False,
216
accelerator_tree=None, hardlink=False):
218
t = transport.get_transport(to_location)
220
format = self._get_checkout_format()
221
checkout = format.initialize_on_transport(t)
222
from_branch = branch.BranchReferenceFormat().initialize(checkout,
224
tree = checkout.create_workingtree(revision_id,
225
from_branch=from_branch, hardlink=hardlink)
228
return self._create_heavyweight_checkout(to_location, revision_id,
231
def _create_heavyweight_checkout(self, to_location, revision_id=None,
233
"""Create a new heavyweight checkout of this branch.
235
:param to_location: URL of location to create the new checkout in.
236
:param revision_id: Revision that should be the tip of the checkout.
237
:param hardlink: Whether to hardlink
238
:return: WorkingTree object of checkout.
240
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
241
to_location, force_new_tree=False, format=get_rich_root_format())
242
checkout = checkout_branch.bzrdir
243
checkout_branch.bind(self)
244
# pull up to the specified revision_id to set the initial
245
# branch tip correctly, and seed it with history.
246
checkout_branch.pull(self, stop_revision=revision_id)
247
return checkout.create_workingtree(revision_id, hardlink=hardlink)
249
def _gen_revision_history(self):
250
if self.head is None:
252
ret = list(self.repository.iter_reverse_revision_history(
253
self.last_revision()))
259
return self.repository._git.ref(self.name)
263
def set_last_revision_info(self, revno, revid):
264
self.set_last_revision(revid)
266
def set_last_revision(self, revid):
267
(newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
271
def _set_head(self, value):
273
self.repository._git.refs[self.name] = self._head
274
self._clear_cached_state()
276
head = property(_get_head, _set_head)
278
def get_config(self):
279
return GitBranchConfig(self)
281
def get_push_location(self):
282
"""See Branch.get_push_location."""
283
push_loc = self.get_config().get_user_option('push_location')
286
def set_push_location(self, location):
287
"""See Branch.set_push_location."""
288
self.get_config().set_user_option('push_location', location,
289
store=config.STORE_LOCATION)
291
def supports_tags(self):
295
class GitBranchPullResult(branch.PullResult):
297
def report(self, to_file):
299
if self.old_revid == self.new_revid:
300
to_file.write('No revisions to pull.\n')
302
to_file.write('Now on revision %d (git sha: %s).\n' %
303
(self.new_revno, self.new_git_head))
304
self._show_tag_conficts(to_file)
307
class GitBranchPushResult(branch.BranchPushResult):
309
def _lookup_revno(self, revid):
310
assert isinstance(revid, str), "was %r" % revid
311
# Try in source branch first, it'll be faster
313
return self.source_branch.revision_id_to_revno(revid)
314
except errors.NoSuchRevision:
315
# FIXME: Check using graph.find_distance_to_null() ?
316
return self.target_branch.revision_id_to_revno(revid)
320
return self._lookup_revno(self.old_revid)
324
return self._lookup_revno(self.new_revid)
327
class InterFromGitBranch(branch.GenericInterBranch):
328
"""InterBranch implementation that pulls from Git into bzr."""
331
def is_compatible(self, source, target):
332
return (isinstance(source, GitBranch) and
333
not isinstance(target, GitBranch))
335
def update_revisions(self, stop_revision=None, overwrite=False,
337
"""See InterBranch.update_revisions()."""
338
interrepo = repository.InterRepository.get(self.source.repository,
339
self.target.repository)
341
self._last_revid = None
342
def determine_wants(heads):
343
if not self.source.name in heads:
344
raise NoSuchRef(self.source.name, heads.keys())
345
if stop_revision is not None:
346
self._last_revid = stop_revision
347
self._head, mapping = self.source.repository.lookup_git_revid(
350
self._head = heads[self.source.name]
352
self.source.mapping.revision_id_foreign_to_bzr(self._head)
353
if self.target.repository.has_revision(self._last_revid):
356
interrepo.fetch_objects(determine_wants, self.source.mapping)
358
prev_last_revid = None
360
prev_last_revid = self.target.last_revision()
361
self.target.generate_revision_history(self._last_revid, prev_last_revid)
363
def pull(self, overwrite=False, stop_revision=None,
364
possible_transports=None, _hook_master=None, run_hooks=True,
365
_override_hook_target=None, local=False):
368
:param _hook_master: Private parameter - set the branch to
369
be supplied as the master to pull hooks.
370
:param run_hooks: Private parameter - if false, this branch
371
is being called because it's the master of the primary branch,
372
so it should not run its hooks.
373
:param _override_hook_target: Private parameter - set the branch to be
374
supplied as the target_branch to pull hooks.
376
# This type of branch can't be bound.
378
raise errors.LocalRequiresBoundBranch()
379
result = GitBranchPullResult()
380
result.source_branch = self.source
381
if _override_hook_target is None:
382
result.target_branch = self.target
384
result.target_branch = _override_hook_target
385
self.source.lock_read()
387
# We assume that during 'pull' the target repository is closer than
389
graph = self.target.repository.get_graph(self.source.repository)
390
result.old_revno, result.old_revid = \
391
self.target.last_revision_info()
392
self.update_revisions(stop_revision, overwrite=overwrite,
394
result.new_git_head = self._head
395
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
397
result.new_revno, result.new_revid = self.target.last_revision_info()
399
result.master_branch = _hook_master
400
result.local_branch = result.target_branch
402
result.master_branch = result.target_branch
403
result.local_branch = None
405
for hook in branch.Branch.hooks['post_pull']:
411
def _basic_push(self, overwrite=False, stop_revision=None):
412
result = branch.BranchPushResult()
413
result.source_branch = self.source
414
result.target_branch = self.target
415
graph = self.target.repository.get_graph(self.source.repository)
416
result.old_revno, result.old_revid = self.target.last_revision_info()
417
self.update_revisions(stop_revision, overwrite=overwrite,
419
result.new_git_head = self._head
420
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
422
result.new_revno, result.new_revid = self.target.last_revision_info()
426
class InterGitBranch(branch.GenericInterBranch):
427
"""InterBranch implementation that pulls between Git branches."""
430
class InterGitLocalRemoteBranch(InterGitBranch):
431
"""InterBranch that copies from a local to a remote git branch."""
434
def is_compatible(self, source, target):
435
from bzrlib.plugins.git.remote import RemoteGitBranch
436
return (isinstance(source, LocalGitBranch) and
437
isinstance(target, RemoteGitBranch))
439
def _basic_push(self, overwrite=False, stop_revision=None):
440
result = GitBranchPushResult()
441
result.source_branch = self.source
442
result.target_branch = self.target
443
if stop_revision is None:
444
stop_revision = self.source.last_revision()
445
# FIXME: Check for diverged branches
446
def get_changed_refs(old_refs):
447
result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs["refs/heads/master"])
448
refs = { "refs/heads/master": self.source.repository.lookup_git_revid(stop_revision)[0] }
449
result.new_revid = stop_revision
450
for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
451
refs["refs/tags/%s" % name] = sha
453
self.target.repository.send_pack(get_changed_refs,
454
self.source.repository._git.object_store.generate_pack_contents)
458
class InterGitRemoteLocalBranch(InterGitBranch):
459
"""InterBranch that copies from a remote to a local git branch."""
462
def is_compatible(self, source, target):
463
from bzrlib.plugins.git.remote import RemoteGitBranch
464
return (isinstance(source, RemoteGitBranch) and
465
isinstance(target, LocalGitBranch))
467
def _basic_push(self, overwrite=False, stop_revision=None):
468
result = branch.BranchPushResult()
469
result.source_branch = self.source
470
result.target_branch = self.target
471
result.old_revid = self.target.last_revision()
472
refs, stop_revision = self.update_refs(stop_revision)
473
self.target.generate_revision_history(stop_revision, result.old_revid)
474
self.update_tags(refs)
475
result.new_revid = self.target.last_revision()
478
def update_tags(self, refs):
479
for name, revid in extract_tags(refs, self.target.mapping).iteritems():
480
self.target.tags.set_tag(name, revid)
482
def update_refs(self, stop_revision=None):
483
interrepo = repository.InterRepository.get(self.source.repository,
484
self.target.repository)
485
if stop_revision is None:
486
refs = interrepo.fetch_refs(branches=["HEAD"])
487
stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
489
refs = interrepo.fetch_refs(revision_id=stop_revision)
490
return refs, stop_revision
492
def pull(self, stop_revision=None, overwrite=False,
493
possible_transports=None, local=False):
494
# This type of branch can't be bound.
496
raise errors.LocalRequiresBoundBranch()
497
result = GitPullResult()
498
result.source_branch = self.source
499
result.target_branch = self.target
500
result.old_revid = self.target.last_revision()
501
refs, stop_revision = self.update_refs(stop_revision)
502
self.target.generate_revision_history(stop_revision, result.old_revid)
503
self.update_tags(refs)
504
result.new_revid = self.target.last_revision()
508
class InterToGitBranch(branch.InterBranch):
509
"""InterBranch implementation that pulls from Git into bzr."""
512
def is_compatible(self, source, target):
513
return (not isinstance(source, GitBranch) and
514
isinstance(target, GitBranch))
516
def push(self, overwrite=True, stop_revision=None,
517
_override_hook_source_branch=None):
518
raise NoPushSupport()
520
def lossy_push(self, stop_revision=None):
521
result = GitBranchPushResult()
522
result.source_branch = self.source
523
result.target_branch = self.target
524
result.old_revid = self.target.last_revision()
525
if stop_revision is None:
526
stop_revision = self.source.last_revision()
527
# FIXME: Check for diverged branches
528
refs = { "refs/heads/master": stop_revision }
529
for name, revid in self.source.tags.get_tag_dict().iteritems():
530
if self.source.repository.has_revision(revid):
531
refs["refs/tags/%s" % name] = revid
532
revidmap, new_refs = self.target.repository.dfetch_refs(
533
self.source.repository, refs)
535
self.target.generate_revision_history(revidmap[stop_revision])
536
result.new_revid = revidmap[stop_revision]
538
result.new_revid = result.old_revid
539
result.revidmap = revidmap
543
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
544
branch.InterBranch.register_optimiser(InterFromGitBranch)
545
branch.InterBranch.register_optimiser(InterToGitBranch)
546
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)
added
removed
branch.py
