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 (
35
from bzrlib.decorators import (
38
from bzrlib.trace import (
43
from bzrlib.plugins.git.config import (
46
from bzrlib.plugins.git.errors import (
51
from bzrlib.foreign import ForeignBranch
53
class ForeignBranch(branch.Branch):
54
def __init__(self, mapping):
55
self.mapping = mapping
56
super(ForeignBranch, self).__init__()
59
def extract_tags(refs, mapping):
61
for k,v in refs.iteritems():
62
if k.startswith("refs/tags/") and not k.endswith("^{}"):
63
v = refs.get(k+"^{}", v)
64
ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
68
class GitPullResult(branch.PullResult):
70
def _lookup_revno(self, revid):
71
assert isinstance(revid, str), "was %r" % revid
72
# Try in source branch first, it'll be faster
73
return self.target_branch.revision_id_to_revno(revid)
77
return self._lookup_revno(self.old_revid)
81
return self._lookup_revno(self.new_revid)
84
class LocalGitTagDict(tag.BasicTags):
85
"""Dictionary with tags in a local repository."""
87
def __init__(self, branch):
89
self.repository = branch.repository
91
def get_tag_dict(self):
93
for k,v in self.repository._git.tags.iteritems():
94
obj = self.repository._git.get_object(v)
95
while isinstance(obj, Tag):
97
obj = self.repository._git.get_object(v)
98
if not isinstance(obj, Commit):
99
mutter("Tag %s points at object %r that is not a commit, "
102
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
105
def set_tag(self, name, revid):
106
self.repository._git.tags[name], _ = \
107
self.branch.mapping.revision_id_bzr_to_foreign(revid)
110
class GitBranchFormat(branch.BranchFormat):
112
def get_format_description(self):
115
def supports_tags(self):
118
def make_tags(self, branch):
119
if getattr(branch.repository, "get_refs", None) is not None:
120
from bzrlib.plugins.git.remote import RemoteGitTagDict
121
return RemoteGitTagDict(branch)
123
return LocalGitTagDict(branch)
126
class GitBranch(ForeignBranch):
127
"""An adapter to git repositories for bzr Branch objects."""
129
def __init__(self, bzrdir, repository, name, lockfiles):
130
self.repository = repository
131
self._format = GitBranchFormat()
132
self.control_files = lockfiles
134
super(GitBranch, self).__init__(repository.get_mapping())
137
self.base = bzrdir.transport.base
139
def _get_nick(self, local=False, possible_master_transports=None):
140
"""Find the nick name for this branch.
146
def _set_nick(self, nick):
147
raise NotImplementedError
149
nick = property(_get_nick, _set_nick)
152
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
154
def dpull(self, source, stop_revision=None):
155
return branch.InterBranch.get(source, self).lossy_push()
157
def generate_revision_history(self, revid, old_revid=None):
158
# FIXME: Check that old_revid is in the ancestry of revid
159
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
160
self._set_head(newhead)
162
def lock_write(self):
163
self.control_files.lock_write()
165
def get_stacked_on_url(self):
166
# Git doesn't do stacking (yet...)
169
def get_parent(self):
170
"""See Branch.get_parent()."""
171
# FIXME: Set "origin" url from .git/config ?
174
def set_parent(self, url):
175
# FIXME: Set "origin" url in .git/config ?
179
self.control_files.lock_read()
182
return self.control_files.is_locked()
185
self.control_files.unlock()
187
def get_physical_lock_status(self):
191
def last_revision(self):
192
# perhaps should escape this ?
193
if self.head is None:
194
return revision.NULL_REVISION
195
return self.mapping.revision_id_foreign_to_bzr(self.head)
198
class LocalGitBranch(GitBranch):
199
"""A local Git branch."""
201
def _get_checkout_format(self):
202
"""Return the most suitable metadir for a checkout of this branch.
203
Weaves are used if this branch's repository uses weaves.
205
format = self.repository.bzrdir.checkout_metadir()
206
format.set_branch_format(self._format)
209
def create_checkout(self, to_location, revision_id=None, lightweight=False,
210
accelerator_tree=None, hardlink=False):
212
t = transport.get_transport(to_location)
214
format = self._get_checkout_format()
215
checkout = format.initialize_on_transport(t)
216
from_branch = branch.BranchReferenceFormat().initialize(checkout,
218
tree = checkout.create_workingtree(revision_id,
219
from_branch=from_branch, hardlink=hardlink)
222
return self._create_heavyweight_checkout(to_location, revision_id,
225
def _create_heavyweight_checkout(self, to_location, revision_id=None,
227
"""Create a new heavyweight checkout of this branch.
229
:param to_location: URL of location to create the new checkout in.
230
:param revision_id: Revision that should be the tip of the checkout.
231
:param hardlink: Whether to hardlink
232
:return: WorkingTree object of checkout.
234
checkout_branch = BzrDir.create_branch_convenience(
235
to_location, force_new_tree=False, format=get_rich_root_format())
236
checkout = checkout_branch.bzrdir
237
checkout_branch.bind(self)
238
# pull up to the specified revision_id to set the initial
239
# branch tip correctly, and seed it with history.
240
checkout_branch.pull(self, stop_revision=revision_id)
241
return checkout.create_workingtree(revision_id, hardlink=hardlink)
243
def _gen_revision_history(self):
244
if self.head is None:
246
ret = list(self.repository.iter_reverse_revision_history(
247
self.last_revision()))
252
return self.repository._git.ref(self.name)
254
def _set_head(self, value):
256
self.repository._git.set_ref(self.name, self._head)
257
self._clear_cached_state()
259
head = property(_get_head, _set_head)
261
def get_config(self):
262
return GitBranchConfig(self)
264
def get_push_location(self):
265
"""See Branch.get_push_location."""
266
push_loc = self.get_config().get_user_option('push_location')
269
def set_push_location(self, location):
270
"""See Branch.set_push_location."""
271
self.get_config().set_user_option('push_location', location,
272
store=config.STORE_LOCATION)
274
def supports_tags(self):
278
class GitBranchPullResult(branch.PullResult):
280
def report(self, to_file):
282
if self.old_revid == self.new_revid:
283
to_file.write('No revisions to pull.\n')
285
to_file.write('Now on revision %d (git sha: %s).\n' %
286
(self.new_revno, self.new_git_head))
287
self._show_tag_conficts(to_file)
290
class InterFromGitBranch(branch.InterBranch):
291
"""InterBranch implementation that pulls from Git into bzr."""
294
def is_compatible(self, source, target):
295
return (isinstance(source, GitBranch) and
296
not isinstance(target, GitBranch))
298
def update_revisions(self, stop_revision=None, overwrite=False,
300
"""See InterBranch.update_revisions()."""
301
interrepo = repository.InterRepository.get(self.source.repository,
302
self.target.repository)
304
self._last_revid = None
305
def determine_wants(heads):
306
if not self.source.name in heads:
307
raise NoSuchRef(self.source.name, heads.keys())
308
if stop_revision is not None:
309
self._last_revid = stop_revision
310
self._head, mapping = self.source.repository.lookup_git_revid(
313
self._head = heads[self.source.name]
315
self.source.mapping.revision_id_foreign_to_bzr(self._head)
316
if self.target.repository.has_revision(self._last_revid):
319
interrepo.fetch_objects(determine_wants, self.source.mapping)
321
prev_last_revid = None
323
prev_last_revid = self.target.last_revision()
324
self.target.generate_revision_history(self._last_revid, prev_last_revid)
326
def pull(self, overwrite=False, stop_revision=None,
327
possible_transports=None, _hook_master=None, run_hooks=True,
328
_override_hook_target=None, local=False):
331
:param _hook_master: Private parameter - set the branch to
332
be supplied as the master to pull hooks.
333
:param run_hooks: Private parameter - if false, this branch
334
is being called because it's the master of the primary branch,
335
so it should not run its hooks.
336
:param _override_hook_target: Private parameter - set the branch to be
337
supplied as the target_branch to pull hooks.
339
# This type of branch can't be bound.
341
raise errors.LocalRequiresBoundBranch()
342
result = GitBranchPullResult()
343
result.source_branch = self.source
344
if _override_hook_target is None:
345
result.target_branch = self.target
347
result.target_branch = _override_hook_target
348
self.source.lock_read()
350
# We assume that during 'pull' the target repository is closer than
352
graph = self.target.repository.get_graph(self.source.repository)
353
result.old_revno, result.old_revid = \
354
self.target.last_revision_info()
355
self.update_revisions(stop_revision, overwrite=overwrite,
357
result.new_git_head = self._head
358
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
360
result.new_revno, result.new_revid = self.target.last_revision_info()
362
result.master_branch = _hook_master
363
result.local_branch = result.target_branch
365
result.master_branch = result.target_branch
366
result.local_branch = None
368
for hook in branch.Branch.hooks['post_pull']:
375
class InterGitRemoteLocalBranch(branch.InterBranch):
376
"""InterBranch implementation that pulls between Git branches."""
379
def is_compatible(self, source, target):
380
from bzrlib.plugins.git.remote import RemoteGitBranch
381
return (isinstance(source, RemoteGitBranch) and
382
isinstance(target, LocalGitBranch))
384
def pull(self, stop_revision=None, overwrite=False,
385
possible_transports=None, local=False):
386
# This type of branch can't be bound.
388
raise errors.LocalRequiresBoundBranch()
389
result = GitPullResult()
390
result.source_branch = self.source
391
result.target_branch = self.target
392
interrepo = repository.InterRepository.get(self.source.repository,
393
self.target.repository)
394
result.old_revid = self.target.last_revision()
395
if stop_revision is None:
396
refs = interrepo.fetch_refs(branches=["HEAD"])
397
stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
399
refs = interrepo.fetch_refs(revision_id=stop_revision)
400
self.target.generate_revision_history(stop_revision, result.old_revid)
401
for name, revid in extract_tags(refs, self.target.mapping).iteritems():
402
self.target.tags.set_tag(name, revid)
403
result.new_revid = self.target.last_revision()
407
class InterToGitBranch(branch.InterBranch):
408
"""InterBranch implementation that pulls from Git into bzr."""
411
def is_compatible(self, source, target):
412
return (not isinstance(source, GitBranch) and
413
isinstance(target, GitBranch))
415
def lossy_push(self, stop_revision=None):
416
if stop_revision is None:
417
stop_revision = self.source.last_revision()
418
# FIXME: Check for diverged branches
419
refs = { "refs/heads/master": stop_revision }
420
for name, revid in self.source.tags.get_tag_dict().iteritems():
421
if self.source.repository.has_revision(revid):
422
refs["refs/tags/%s" % name] = revid
423
revidmap, new_refs = self.target.repository.dfetch_refs(
424
self.source.repository, refs)
426
self.target.generate_revision_history(revidmap[stop_revision])
430
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
431
branch.InterBranch.register_optimiser(InterFromGitBranch)
432
branch.InterBranch.register_optimiser(InterToGitBranch)
added
removed
branch.py
