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 (
52
from bzrlib.foreign import ForeignBranch
54
class ForeignBranch(branch.Branch):
55
def __init__(self, mapping):
56
self.mapping = mapping
57
super(ForeignBranch, self).__init__()
60
def extract_tags(refs, mapping):
62
for k,v in refs.iteritems():
63
if k.startswith("refs/tags/") and not k.endswith("^{}"):
64
v = refs.get(k+"^{}", v)
65
ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
69
class GitPullResult(branch.PullResult):
71
def _lookup_revno(self, revid):
72
assert isinstance(revid, str), "was %r" % revid
73
# Try in source branch first, it'll be faster
74
return self.target_branch.revision_id_to_revno(revid)
78
return self._lookup_revno(self.old_revid)
82
return self._lookup_revno(self.new_revid)
85
class LocalGitTagDict(tag.BasicTags):
86
"""Dictionary with tags in a local repository."""
88
def __init__(self, branch):
90
self.repository = branch.repository
92
def get_tag_dict(self):
94
for k,v in self.repository._git.tags.iteritems():
95
obj = self.repository._git.get_object(v)
96
while isinstance(obj, Tag):
98
obj = self.repository._git.get_object(v)
99
if not isinstance(obj, Commit):
100
mutter("Tag %s points at object %r that is not a commit, "
103
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
106
def set_tag(self, name, revid):
107
self.repository._git.tags[name], _ = \
108
self.branch.mapping.revision_id_bzr_to_foreign(revid)
111
class GitBranchFormat(branch.BranchFormat):
113
def get_format_description(self):
116
def supports_tags(self):
119
def make_tags(self, branch):
120
if getattr(branch.repository, "get_refs", None) is not None:
121
from bzrlib.plugins.git.remote import RemoteGitTagDict
122
return RemoteGitTagDict(branch)
124
return LocalGitTagDict(branch)
127
class GitBranch(ForeignBranch):
128
"""An adapter to git repositories for bzr Branch objects."""
130
def __init__(self, bzrdir, repository, name, lockfiles):
131
self.repository = repository
132
self._format = GitBranchFormat()
133
self.control_files = lockfiles
135
super(GitBranch, self).__init__(repository.get_mapping())
138
self.base = bzrdir.transport.base
140
def _get_nick(self, local=False, possible_master_transports=None):
141
"""Find the nick name for this branch.
147
def _set_nick(self, nick):
148
raise NotImplementedError
150
nick = property(_get_nick, _set_nick)
153
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
155
def dpull(self, source, stop_revision=None):
156
return branch.InterBranch.get(source, self).lossy_push()
158
def generate_revision_history(self, revid, old_revid=None):
159
# FIXME: Check that old_revid is in the ancestry of revid
160
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
161
self._set_head(newhead)
163
def lock_write(self):
164
self.control_files.lock_write()
166
def get_stacked_on_url(self):
167
# Git doesn't do stacking (yet...)
170
def get_parent(self):
171
"""See Branch.get_parent()."""
172
# FIXME: Set "origin" url from .git/config ?
175
def set_parent(self, url):
176
# FIXME: Set "origin" url in .git/config ?
180
self.control_files.lock_read()
183
return self.control_files.is_locked()
186
self.control_files.unlock()
188
def get_physical_lock_status(self):
192
def last_revision(self):
193
# perhaps should escape this ?
194
if self.head is None:
195
return revision.NULL_REVISION
196
return self.mapping.revision_id_foreign_to_bzr(self.head)
199
class LocalGitBranch(GitBranch):
200
"""A local Git branch."""
202
def _get_checkout_format(self):
203
"""Return the most suitable metadir for a checkout of this branch.
204
Weaves are used if this branch's repository uses weaves.
206
format = self.repository.bzrdir.checkout_metadir()
207
format.set_branch_format(self._format)
210
def create_checkout(self, to_location, revision_id=None, lightweight=False,
211
accelerator_tree=None, hardlink=False):
213
t = transport.get_transport(to_location)
215
format = self._get_checkout_format()
216
checkout = format.initialize_on_transport(t)
217
from_branch = branch.BranchReferenceFormat().initialize(checkout,
219
tree = checkout.create_workingtree(revision_id,
220
from_branch=from_branch, hardlink=hardlink)
223
return self._create_heavyweight_checkout(to_location, revision_id,
226
def _create_heavyweight_checkout(self, to_location, revision_id=None,
228
"""Create a new heavyweight checkout of this branch.
230
:param to_location: URL of location to create the new checkout in.
231
:param revision_id: Revision that should be the tip of the checkout.
232
:param hardlink: Whether to hardlink
233
:return: WorkingTree object of checkout.
235
checkout_branch = BzrDir.create_branch_convenience(
236
to_location, force_new_tree=False, format=get_rich_root_format())
237
checkout = checkout_branch.bzrdir
238
checkout_branch.bind(self)
239
# pull up to the specified revision_id to set the initial
240
# branch tip correctly, and seed it with history.
241
checkout_branch.pull(self, stop_revision=revision_id)
242
return checkout.create_workingtree(revision_id, hardlink=hardlink)
244
def _gen_revision_history(self):
245
if self.head is None:
247
ret = list(self.repository.iter_reverse_revision_history(
248
self.last_revision()))
253
return self.repository._git.ref(self.name)
255
def _set_head(self, value):
257
self.repository._git.set_ref(self.name, self._head)
258
self._clear_cached_state()
260
head = property(_get_head, _set_head)
262
def get_config(self):
263
return GitBranchConfig(self)
265
def get_push_location(self):
266
"""See Branch.get_push_location."""
267
push_loc = self.get_config().get_user_option('push_location')
270
def set_push_location(self, location):
271
"""See Branch.set_push_location."""
272
self.get_config().set_user_option('push_location', location,
273
store=config.STORE_LOCATION)
275
def supports_tags(self):
279
class GitBranchPullResult(branch.PullResult):
281
def report(self, to_file):
283
if self.old_revid == self.new_revid:
284
to_file.write('No revisions to pull.\n')
286
to_file.write('Now on revision %d (git sha: %s).\n' %
287
(self.new_revno, self.new_git_head))
288
self._show_tag_conficts(to_file)
291
class InterFromGitBranch(branch.InterBranch):
292
"""InterBranch implementation that pulls from Git into bzr."""
295
def is_compatible(self, source, target):
296
return (isinstance(source, GitBranch) and
297
not isinstance(target, GitBranch))
299
def update_revisions(self, stop_revision=None, overwrite=False,
301
"""See InterBranch.update_revisions()."""
302
interrepo = repository.InterRepository.get(self.source.repository,
303
self.target.repository)
305
self._last_revid = None
306
def determine_wants(heads):
307
if not self.source.name in heads:
308
raise NoSuchRef(self.source.name, heads.keys())
309
if stop_revision is not None:
310
self._last_revid = stop_revision
311
self._head, mapping = self.source.repository.lookup_git_revid(
314
self._head = heads[self.source.name]
316
self.source.mapping.revision_id_foreign_to_bzr(self._head)
317
if self.target.repository.has_revision(self._last_revid):
320
interrepo.fetch_objects(determine_wants, self.source.mapping)
322
prev_last_revid = None
324
prev_last_revid = self.target.last_revision()
325
self.target.generate_revision_history(self._last_revid, prev_last_revid)
327
def pull(self, overwrite=False, stop_revision=None,
328
possible_transports=None, _hook_master=None, run_hooks=True,
329
_override_hook_target=None, local=False):
332
:param _hook_master: Private parameter - set the branch to
333
be supplied as the master to pull hooks.
334
:param run_hooks: Private parameter - if false, this branch
335
is being called because it's the master of the primary branch,
336
so it should not run its hooks.
337
:param _override_hook_target: Private parameter - set the branch to be
338
supplied as the target_branch to pull hooks.
340
# This type of branch can't be bound.
342
raise errors.LocalRequiresBoundBranch()
343
result = GitBranchPullResult()
344
result.source_branch = self.source
345
if _override_hook_target is None:
346
result.target_branch = self.target
348
result.target_branch = _override_hook_target
349
self.source.lock_read()
351
# We assume that during 'pull' the target repository is closer than
353
graph = self.target.repository.get_graph(self.source.repository)
354
result.old_revno, result.old_revid = \
355
self.target.last_revision_info()
356
self.update_revisions(stop_revision, overwrite=overwrite,
358
result.new_git_head = self._head
359
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
361
result.new_revno, result.new_revid = self.target.last_revision_info()
363
result.master_branch = _hook_master
364
result.local_branch = result.target_branch
366
result.master_branch = result.target_branch
367
result.local_branch = None
369
for hook in branch.Branch.hooks['post_pull']:
376
class InterGitRemoteLocalBranch(branch.InterBranch):
377
"""InterBranch implementation that pulls between Git branches."""
380
def is_compatible(self, source, target):
381
from bzrlib.plugins.git.remote import RemoteGitBranch
382
return (isinstance(source, RemoteGitBranch) and
383
isinstance(target, LocalGitBranch))
385
def pull(self, stop_revision=None, overwrite=False,
386
possible_transports=None, local=False):
387
# This type of branch can't be bound.
389
raise errors.LocalRequiresBoundBranch()
390
result = GitPullResult()
391
result.source_branch = self.source
392
result.target_branch = self.target
393
interrepo = repository.InterRepository.get(self.source.repository,
394
self.target.repository)
395
result.old_revid = self.target.last_revision()
396
if stop_revision is None:
397
refs = interrepo.fetch_refs(branches=["HEAD"])
398
stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
400
refs = interrepo.fetch_refs(revision_id=stop_revision)
401
self.target.generate_revision_history(stop_revision, result.old_revid)
402
for name, revid in extract_tags(refs, self.target.mapping).iteritems():
403
self.target.tags.set_tag(name, revid)
404
result.new_revid = self.target.last_revision()
408
class InterToGitBranch(branch.InterBranch):
409
"""InterBranch implementation that pulls from Git into bzr."""
412
def is_compatible(self, source, target):
413
return (not isinstance(source, GitBranch) and
414
isinstance(target, GitBranch))
416
def push(self, overwrite=True, stop_revision=None,
417
_override_hook_source_branch=None):
418
raise NoPushSupport()
420
def lossy_push(self, stop_revision=None):
421
if stop_revision is None:
422
stop_revision = self.source.last_revision()
423
# FIXME: Check for diverged branches
424
refs = { "refs/heads/master": stop_revision }
425
for name, revid in self.source.tags.get_tag_dict().iteritems():
426
if self.source.repository.has_revision(revid):
427
refs["refs/tags/%s" % name] = revid
428
revidmap, new_refs = self.target.repository.dfetch_refs(
429
self.source.repository, refs)
431
self.target.generate_revision_history(revidmap[stop_revision])
435
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
436
branch.InterBranch.register_optimiser(InterFromGitBranch)
437
branch.InterBranch.register_optimiser(InterToGitBranch)
added
removed
branch.py
