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 (
32
from bzrlib.decorators import (
35
from bzrlib.trace import (
39
from bzrlib.plugins.git.foreign import (
42
from bzrlib.plugins.git.errors import (
43
LightWeightCheckoutsNotSupported,
47
class LocalGitTagDict(tag.BasicTags):
48
"""Dictionary with tags in a local repository."""
50
def __init__(self, branch):
52
self.repository = branch.repository
54
def get_tag_dict(self):
56
for k,v in self.repository._git.tags.iteritems():
57
obj = self.repository._git.get_object(v)
58
while isinstance(obj, Tag):
60
obj = self.repository._git.get_object(v)
61
if not isinstance(obj, Commit):
62
mutter("Tag %s points at object %r that is not a commit, "
65
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
68
def set_tag(self, name, revid):
69
self.repository._git.tags[name] = revid
72
class GitBranchConfig(config.BranchConfig):
73
"""BranchConfig that uses locations.conf in place of branch.conf"""
75
def __init__(self, branch):
76
config.BranchConfig.__init__(self, branch)
77
# do not provide a BranchDataConfig
78
self.option_sources = self.option_sources[0], self.option_sources[2]
80
def set_user_option(self, name, value, store=config.STORE_BRANCH,
82
"""Force local to True"""
83
config.BranchConfig.set_user_option(self, name, value,
84
store=config.STORE_LOCATION, warn_masked=warn_masked)
87
class GitBranchFormat(branch.BranchFormat):
89
def get_format_description(self):
92
def supports_tags(self):
95
def make_tags(self, branch):
96
if getattr(branch.repository, "get_refs", None) is not None:
97
from bzrlib.plugins.git.remote import RemoteGitTagDict
98
return RemoteGitTagDict(branch)
100
return LocalGitTagDict(branch)
103
class GitBranch(ForeignBranch):
104
"""An adapter to git repositories for bzr Branch objects."""
106
def __init__(self, bzrdir, repository, name, head, lockfiles):
107
self.repository = repository
108
self._format = GitBranchFormat()
109
super(GitBranch, self).__init__(repository.get_mapping())
110
self.control_files = lockfiles
114
self.base = bzrdir.transport.base
116
def dpull(self, source, stop_revision=None):
117
if stop_revision is None:
118
stop_revision = source.last_revision()
119
# FIXME: Check for diverged branches
120
revidmap = self.repository.dfetch(source.repository, stop_revision)
121
self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
122
revidmap[stop_revision])
125
def lock_write(self):
126
self.control_files.lock_write()
128
def get_stacked_on_url(self):
129
# Git doesn't do stacking (yet...)
132
def get_parent(self):
133
"""See Branch.get_parent()."""
136
def set_parent(self, url):
140
self.control_files.lock_read()
143
self.control_files.unlock()
145
def get_physical_lock_status(self):
149
class LocalGitBranch(GitBranch):
150
"""A local Git branch."""
153
def last_revision(self):
154
# perhaps should escape this ?
155
if self.head is None:
156
return revision.NULL_REVISION
157
return self.mapping.revision_id_foreign_to_bzr(self.head)
159
def create_checkout(self, to_location, revision_id=None, lightweight=False,
160
accelerator_tree=None, hardlink=False):
162
raise LightWeightCheckoutsNotSupported()
163
return self._create_heavyweight_checkout(to_location, revision_id,
166
def _create_heavyweight_checkout(self, to_location, revision_id=None,
168
"""Create a new heavyweight checkout of this branch.
170
:param to_location: URL of location to create the new checkout in.
171
:param revision_id: Revision that should be the tip of the checkout.
172
:param hardlink: Whether to hardlink
173
:return: WorkingTree object of checkout.
175
checkout_branch = BzrDir.create_branch_convenience(
176
to_location, force_new_tree=False, format=get_rich_root_format())
177
checkout = checkout_branch.bzrdir
178
checkout_branch.bind(self)
179
# pull up to the specified revision_id to set the initial
180
# branch tip correctly, and seed it with history.
181
checkout_branch.pull(self, stop_revision=revision_id)
182
return checkout.create_workingtree(revision_id, hardlink=hardlink)
184
def _gen_revision_history(self):
185
if self.head is None:
187
ret = list(self.repository.iter_reverse_revision_history(
188
self.last_revision()))
192
def get_config(self):
193
return GitBranchConfig(self)
195
def get_push_location(self):
196
"""See Branch.get_push_location."""
197
push_loc = self.get_config().get_user_option('push_location')
200
def set_push_location(self, location):
201
"""See Branch.set_push_location."""
202
self.get_config().set_user_option('push_location', location,
203
store=config.STORE_LOCATION)
205
def supports_tags(self):
209
class InterGitGenericBranch(branch.InterBranch):
210
"""InterBranch implementation that pulls from Git into bzr."""
213
def is_compatible(self, source, target):
214
return isinstance(source, GitBranch)
216
def update_revisions(self, stop_revision=None, overwrite=False,
218
"""See InterBranch.update_revisions()."""
219
# TODO: stop_revision, overwrite
220
interrepo = repository.InterRepository.get(self.source.repository,
221
self.target.repository)
222
self._last_revid = None
223
def determine_wants(heads):
224
if not self.source.name in heads:
225
raise BzrError("No such remote branch '%s', found: %r" % (
226
self.source.name, heads.keys()))
227
head = heads[self.source.name]
228
self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
230
if self.target.repository.has_revision(self._last_revid):
233
interrepo.fetch_objects(determine_wants, self.source.mapping)
234
self.target.generate_revision_history(self._last_revid)
237
branch.InterBranch.register_optimiser(InterGitGenericBranch)
added
removed
branch.py
