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 (
33
from bzrlib.decorators import (
36
from bzrlib.trace import (
40
from bzrlib.plugins.git.errors import (
43
from bzrlib.plugins.git.foreign import (
48
class LocalGitTagDict(tag.BasicTags):
49
"""Dictionary with tags in a local repository."""
51
def __init__(self, branch):
53
self.repository = branch.repository
55
def get_tag_dict(self):
57
for k,v in self.repository._git.tags.iteritems():
58
obj = self.repository._git.get_object(v)
59
while isinstance(obj, Tag):
61
obj = self.repository._git.get_object(v)
62
if not isinstance(obj, Commit):
63
mutter("Tag %s points at object %r that is not a commit, "
66
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
69
def set_tag(self, name, revid):
70
self.repository._git.tags[name] = revid
73
class GitBranchConfig(config.BranchConfig):
74
"""BranchConfig that uses locations.conf in place of branch.conf"""
76
def __init__(self, branch):
77
config.BranchConfig.__init__(self, branch)
78
# do not provide a BranchDataConfig
79
self.option_sources = self.option_sources[0], self.option_sources[2]
81
def set_user_option(self, name, value, store=config.STORE_BRANCH,
83
"""Force local to True"""
84
config.BranchConfig.set_user_option(self, name, value,
85
store=config.STORE_LOCATION, warn_masked=warn_masked)
88
class GitBranchFormat(branch.BranchFormat):
90
def get_format_description(self):
93
def supports_tags(self):
96
def make_tags(self, branch):
97
if getattr(branch.repository, "get_refs", None) is not None:
98
from bzrlib.plugins.git.remote import RemoteGitTagDict
99
return RemoteGitTagDict(branch)
101
return LocalGitTagDict(branch)
104
class GitBranch(ForeignBranch):
105
"""An adapter to git repositories for bzr Branch objects."""
107
def __init__(self, bzrdir, repository, name, head, lockfiles):
108
self.repository = repository
109
self._format = GitBranchFormat()
110
super(GitBranch, self).__init__(repository.get_mapping())
111
self.control_files = lockfiles
115
self.base = bzrdir.transport.base
117
def _get_nick(self, local=False, possible_master_transports=None):
118
"""Find the nick name for this branch.
124
nick = property(_get_nick)
126
def dpull(self, source, stop_revision=None):
127
if stop_revision is None:
128
stop_revision = source.last_revision()
129
# FIXME: Check for diverged branches
130
revidmap = self.repository.dfetch(source.repository, stop_revision)
131
self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
132
revidmap[stop_revision])
133
self.repository._git.set_ref(self.name, self.head)
136
def lock_write(self):
137
self.control_files.lock_write()
139
def get_stacked_on_url(self):
140
# Git doesn't do stacking (yet...)
143
def get_parent(self):
144
"""See Branch.get_parent()."""
145
# FIXME: Set "origin" url from .git/config ?
148
def set_parent(self, url):
149
# FIXME: Set "origin" url in .git/config ?
153
self.control_files.lock_read()
156
self.control_files.unlock()
158
def get_physical_lock_status(self):
162
class LocalGitBranch(GitBranch):
163
"""A local Git branch."""
166
def last_revision(self):
167
# perhaps should escape this ?
168
if self.head is None:
169
return revision.NULL_REVISION
170
return self.mapping.revision_id_foreign_to_bzr(self.head)
172
def _get_checkout_format(self):
173
"""Return the most suitable metadir for a checkout of this branch.
174
Weaves are used if this branch's repository uses weaves.
176
format = self.repository.bzrdir.checkout_metadir()
177
format.set_branch_format(self._format)
180
def create_checkout(self, to_location, revision_id=None, lightweight=False,
181
accelerator_tree=None, hardlink=False):
183
t = transport.get_transport(to_location)
185
format = self._get_checkout_format()
186
checkout = format.initialize_on_transport(t)
187
from_branch = branch.BranchReferenceFormat().initialize(checkout,
189
tree = checkout.create_workingtree(revision_id,
190
from_branch=from_branch, hardlink=hardlink)
193
return self._create_heavyweight_checkout(to_location, revision_id,
196
def _create_heavyweight_checkout(self, to_location, revision_id=None,
198
"""Create a new heavyweight checkout of this branch.
200
:param to_location: URL of location to create the new checkout in.
201
:param revision_id: Revision that should be the tip of the checkout.
202
:param hardlink: Whether to hardlink
203
:return: WorkingTree object of checkout.
205
checkout_branch = BzrDir.create_branch_convenience(
206
to_location, force_new_tree=False, format=get_rich_root_format())
207
checkout = checkout_branch.bzrdir
208
checkout_branch.bind(self)
209
# pull up to the specified revision_id to set the initial
210
# branch tip correctly, and seed it with history.
211
checkout_branch.pull(self, stop_revision=revision_id)
212
return checkout.create_workingtree(revision_id, hardlink=hardlink)
214
def _gen_revision_history(self):
215
if self.head is None:
217
ret = list(self.repository.iter_reverse_revision_history(
218
self.last_revision()))
222
def get_config(self):
223
return GitBranchConfig(self)
225
def get_push_location(self):
226
"""See Branch.get_push_location."""
227
push_loc = self.get_config().get_user_option('push_location')
230
def set_push_location(self, location):
231
"""See Branch.set_push_location."""
232
self.get_config().set_user_option('push_location', location,
233
store=config.STORE_LOCATION)
235
def supports_tags(self):
239
class InterGitGenericBranch(branch.InterBranch):
240
"""InterBranch implementation that pulls from Git into bzr."""
243
def is_compatible(self, source, target):
244
return isinstance(source, GitBranch)
246
def update_revisions(self, stop_revision=None, overwrite=False,
248
"""See InterBranch.update_revisions()."""
249
interrepo = repository.InterRepository.get(self.source.repository,
250
self.target.repository)
251
self._last_revid = None
252
def determine_wants(heads):
253
if not self.source.name in heads:
254
raise NoSuchRef(self.source.name, heads.keys())
255
if stop_revision is not None:
256
self._last_revid = stop_revision
257
head, mapping = self.source.repository.lookup_git_revid(
260
head = heads[self.source.name]
262
self.source.mapping.revision_id_foreign_to_bzr(head)
263
if self.target.repository.has_revision(self._last_revid):
266
interrepo.fetch_objects(determine_wants, self.source.mapping)
268
prev_last_revid = None
270
prev_last_revid = self.target.last_revision()
271
self.target.generate_revision_history(self._last_revid, prev_last_revid)
274
branch.InterBranch.register_optimiser(InterGitGenericBranch)
added
removed
branch.py
