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
class GitPullResult(branch.PullResult):
61
def _lookup_revno(self, revid):
62
assert isinstance(revid, str), "was %r" % revid
63
# Try in source branch first, it'll be faster
64
return self.target_branch.revision_id_to_revno(revid)
68
return self._lookup_revno(self.old_revid)
72
return self._lookup_revno(self.new_revid)
75
class LocalGitTagDict(tag.BasicTags):
76
"""Dictionary with tags in a local repository."""
78
def __init__(self, branch):
80
self.repository = branch.repository
82
def get_tag_dict(self):
84
for k,v in self.repository._git.tags.iteritems():
85
obj = self.repository._git.get_object(v)
86
while isinstance(obj, Tag):
88
obj = self.repository._git.get_object(v)
89
if not isinstance(obj, Commit):
90
mutter("Tag %s points at object %r that is not a commit, "
93
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
96
def set_tag(self, name, revid):
97
self.repository._git.tags[name] = revid
100
class GitBranchFormat(branch.BranchFormat):
102
def get_format_description(self):
105
def supports_tags(self):
108
def make_tags(self, branch):
109
if getattr(branch.repository, "get_refs", None) is not None:
110
from bzrlib.plugins.git.remote import RemoteGitTagDict
111
return RemoteGitTagDict(branch)
113
return LocalGitTagDict(branch)
116
class GitBranch(ForeignBranch):
117
"""An adapter to git repositories for bzr Branch objects."""
119
def __init__(self, bzrdir, repository, name, head, lockfiles):
120
self.repository = repository
121
self._format = GitBranchFormat()
122
self.control_files = lockfiles
124
super(GitBranch, self).__init__(repository.get_mapping())
127
self.base = bzrdir.transport.base
129
def _get_nick(self, local=False, possible_master_transports=None):
130
"""Find the nick name for this branch.
136
def _set_nick(self, nick):
137
raise NotImplementedError
139
nick = property(_get_nick, _set_nick)
142
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
144
def dpull(self, source, stop_revision=None):
145
if stop_revision is None:
146
stop_revision = source.last_revision()
147
# FIXME: Check for diverged branches
148
refs = { "refs/heads/master": stop_revision }
149
for name, revid in source.tags.get_tag_dict().iteritems():
150
if source.repository.has_revision(revid):
151
refs["refs/tags/%s" % name] = revid
152
revidmap, new_refs = self.repository.dfetch_refs(source.repository,
155
self.generate_revision_history(revidmap[stop_revision])
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 _set_head(self, head):
165
self.repository._git.set_ref(self.name, self.head)
167
def lock_write(self):
168
self.control_files.lock_write()
170
def get_stacked_on_url(self):
171
# Git doesn't do stacking (yet...)
174
def get_parent(self):
175
"""See Branch.get_parent()."""
176
# FIXME: Set "origin" url from .git/config ?
179
def set_parent(self, url):
180
# FIXME: Set "origin" url in .git/config ?
184
self.control_files.lock_read()
187
return self.control_files.is_locked()
190
self.control_files.unlock()
192
def get_physical_lock_status(self):
196
class LocalGitBranch(GitBranch):
197
"""A local Git branch."""
200
def last_revision(self):
201
# perhaps should escape this ?
202
if self.head is None:
203
return revision.NULL_REVISION
204
return self.mapping.revision_id_foreign_to_bzr(self.head)
206
def _get_checkout_format(self):
207
"""Return the most suitable metadir for a checkout of this branch.
208
Weaves are used if this branch's repository uses weaves.
210
format = self.repository.bzrdir.checkout_metadir()
211
format.set_branch_format(self._format)
214
def create_checkout(self, to_location, revision_id=None, lightweight=False,
215
accelerator_tree=None, hardlink=False):
217
t = transport.get_transport(to_location)
219
format = self._get_checkout_format()
220
checkout = format.initialize_on_transport(t)
221
from_branch = branch.BranchReferenceFormat().initialize(checkout,
223
tree = checkout.create_workingtree(revision_id,
224
from_branch=from_branch, hardlink=hardlink)
227
return self._create_heavyweight_checkout(to_location, revision_id,
230
def _create_heavyweight_checkout(self, to_location, revision_id=None,
232
"""Create a new heavyweight checkout of this branch.
234
:param to_location: URL of location to create the new checkout in.
235
:param revision_id: Revision that should be the tip of the checkout.
236
:param hardlink: Whether to hardlink
237
:return: WorkingTree object of checkout.
239
checkout_branch = BzrDir.create_branch_convenience(
240
to_location, force_new_tree=False, format=get_rich_root_format())
241
checkout = checkout_branch.bzrdir
242
checkout_branch.bind(self)
243
# pull up to the specified revision_id to set the initial
244
# branch tip correctly, and seed it with history.
245
checkout_branch.pull(self, stop_revision=revision_id)
246
return checkout.create_workingtree(revision_id, hardlink=hardlink)
248
def _gen_revision_history(self):
249
if self.head is None:
251
ret = list(self.repository.iter_reverse_revision_history(
252
self.last_revision()))
256
def get_config(self):
257
return GitBranchConfig(self)
259
def get_push_location(self):
260
"""See Branch.get_push_location."""
261
push_loc = self.get_config().get_user_option('push_location')
264
def set_push_location(self, location):
265
"""See Branch.set_push_location."""
266
self.get_config().set_user_option('push_location', location,
267
store=config.STORE_LOCATION)
269
def supports_tags(self):
273
class GitBranchPullResult(branch.PullResult):
275
def report(self, to_file):
277
if self.old_revid == self.new_revid:
278
to_file.write('No revisions to pull.\n')
280
to_file.write('Now on revision %d (git sha: %s).\n' %
281
(self.new_revno, self.new_git_head))
282
self._show_tag_conficts(to_file)
285
class InterGitGenericBranch(branch.InterBranch):
286
"""InterBranch implementation that pulls from Git into bzr."""
289
def is_compatible(self, source, target):
290
return (isinstance(source, GitBranch) and
291
not isinstance(target, GitBranch))
293
def update_revisions(self, stop_revision=None, overwrite=False,
295
"""See InterBranch.update_revisions()."""
296
interrepo = repository.InterRepository.get(self.source.repository,
297
self.target.repository)
299
self._last_revid = None
300
def determine_wants(heads):
301
if not self.source.name in heads:
302
raise NoSuchRef(self.source.name, heads.keys())
303
if stop_revision is not None:
304
self._last_revid = stop_revision
305
self._head, mapping = self.source.repository.lookup_git_revid(
308
self._head = heads[self.source.name]
310
self.source.mapping.revision_id_foreign_to_bzr(self._head)
311
if self.target.repository.has_revision(self._last_revid):
314
interrepo.fetch_objects(determine_wants, self.source.mapping)
316
prev_last_revid = None
318
prev_last_revid = self.target.last_revision()
319
self.target.generate_revision_history(self._last_revid, prev_last_revid)
321
def pull(self, overwrite=False, stop_revision=None,
322
possible_transports=None, _hook_master=None, run_hooks=True,
323
_override_hook_target=None, local=False):
326
:param _hook_master: Private parameter - set the branch to
327
be supplied as the master to pull hooks.
328
:param run_hooks: Private parameter - if false, this branch
329
is being called because it's the master of the primary branch,
330
so it should not run its hooks.
331
:param _override_hook_target: Private parameter - set the branch to be
332
supplied as the target_branch to pull hooks.
334
# This type of branch can't be bound.
336
raise errors.LocalRequiresBoundBranch()
337
result = GitBranchPullResult()
338
result.source_branch = self.source
339
if _override_hook_target is None:
340
result.target_branch = self.target
342
result.target_branch = _override_hook_target
343
self.source.lock_read()
345
# We assume that during 'pull' the target repository is closer than
347
graph = self.target.repository.get_graph(self.source.repository)
348
result.old_revno, result.old_revid = \
349
self.target.last_revision_info()
350
self.update_revisions(stop_revision, overwrite=overwrite,
352
result.new_git_head = self._head
353
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
355
result.new_revno, result.new_revid = self.target.last_revision_info()
357
result.master_branch = _hook_master
358
result.local_branch = result.target_branch
360
result.master_branch = result.target_branch
361
result.local_branch = None
363
for hook in branch.Branch.hooks['post_pull']:
372
branch.InterBranch.register_optimiser(InterGitGenericBranch)
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
stop_revision = self.source.last_revision()
397
interrepo.fetch(revision_id=stop_revision)
398
self.target.generate_revision_history(stop_revision, result.old_revid)
399
result.new_revid = self.target.last_revision()
403
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
added
removed
branch.py
