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"""
27
from bzrlib.decorators import needs_read_lock
28
from bzrlib.trace import mutter
30
from bzrlib.plugins.git.foreign import ForeignBranch
31
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
33
from dulwich.objects import (
38
class GitTagDict(tag.BasicTags):
40
def __init__(self, branch):
42
self.repository = branch.repository
44
def get_tag_dict(self):
46
for k,v in self.repository._git.tags.iteritems():
47
obj = self.repository._git.get_object(v)
48
while isinstance(obj, Tag):
50
obj = self.repository._git.get_object(v)
51
if not isinstance(obj, Commit):
52
mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
54
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
57
def set_tag(self, name, revid):
58
self.repository._git.tags[name] = revid
61
class GitBranchConfig(config.BranchConfig):
62
"""BranchConfig that uses locations.conf in place of branch.conf"""
64
def __init__(self, branch):
65
config.BranchConfig.__init__(self, branch)
66
# do not provide a BranchDataConfig
67
self.option_sources = self.option_sources[0], self.option_sources[2]
69
def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
70
"""Force local to True"""
71
config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
74
class GitBranchFormat(branch.BranchFormat):
76
def get_format_description(self):
79
def supports_tags(self):
82
def make_tags(self, branch):
83
if getattr(branch.repository, "get_refs", None) is not None:
84
from bzrlib.plugins.git.remote import RemoteGitTagDict
85
return RemoteGitTagDict(branch)
86
return GitTagDict(branch)
89
class GitBranch(ForeignBranch):
90
"""An adapter to git repositories for bzr Branch objects."""
92
def __init__(self, bzrdir, repository, name, head, lockfiles):
93
self.repository = repository
94
self._format = GitBranchFormat()
95
super(GitBranch, self).__init__(repository.get_mapping())
96
self.control_files = lockfiles
100
self.base = bzrdir.transport.base
102
def dpull(self, source, stop_revision=None):
103
if stop_revision is None:
104
stop_revision = source.last_revision()
105
# FIXME: Check for diverged branches
106
revidmap = self.repository.dfetch(source.repository, stop_revision)
107
self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
110
def lock_write(self):
111
self.control_files.lock_write()
113
def get_stacked_on_url(self):
114
# Git doesn't do stacking (yet...)
117
def get_parent(self):
118
"""See Branch.get_parent()."""
121
def set_parent(self, url):
125
self.control_files.lock_read()
128
self.control_files.unlock()
130
def get_physical_lock_status(self):
134
class LocalGitBranch(GitBranch):
137
def last_revision(self):
138
# perhaps should escape this ?
139
if self.head is None:
140
return revision.NULL_REVISION
141
return self.mapping.revision_id_foreign_to_bzr(self.head)
143
def create_checkout(self, to_location, revision_id=None,
144
lightweight=False, accelerator_tree=None, hardlink=False):
146
raise LightWeightCheckoutsNotSupported()
147
return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
149
def _create_heavyweight_checkout(self, to_location, revision_id=None,
151
"""Create a new heavyweight checkout of this branch.
153
:param to_location: URL of location to create the new checkout in.
154
:param revision_id: Revision that should be the tip of the checkout.
155
:param hardlink: Whether to hardlink
156
:return: WorkingTree object of checkout.
158
checkout_branch = BzrDir.create_branch_convenience(
159
to_location, force_new_tree=False, format=get_rich_root_format())
160
checkout = checkout_branch.bzrdir
161
checkout_branch.bind(self)
162
# pull up to the specified revision_id to set the initial
163
# branch tip correctly, and seed it with history.
164
checkout_branch.pull(self, stop_revision=revision_id)
165
return checkout.create_workingtree(revision_id, hardlink=hardlink)
167
def _gen_revision_history(self):
168
if self.head is None:
170
ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
174
def get_config(self):
175
return GitBranchConfig(self)
177
def get_push_location(self):
178
"""See Branch.get_push_location."""
179
push_loc = self.get_config().get_user_option('push_location')
182
def set_push_location(self, location):
183
"""See Branch.set_push_location."""
184
self.get_config().set_user_option('push_location', location,
185
store=config.STORE_LOCATION)
187
def supports_tags(self):
191
class InterGitGenericBranch(branch.InterBranch):
194
def is_compatible(self, source, target):
195
return isinstance(source, GitBranch)
197
def update_revisions(self, stop_revision=None, overwrite=False,
199
"""See InterBranch.update_revisions()."""
200
# TODO: stop_revision, overwrite
201
interrepo = repository.InterRepository.get(self.source.repository,
202
self.target.repository)
203
self._last_revid = None
204
def determine_wants(heads):
205
if not self.source.name in heads:
206
raise BzrError("No such remote branch '%s', found: %r" % (
207
self.source.name, heads.keys()))
208
head = heads[self.source.name]
209
self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
210
if self.target.repository.has_revision(self._last_revid):
213
interrepo.fetch_objects(determine_wants, self.source.mapping)
214
self.target.generate_revision_history(self._last_revid)
217
branch.InterBranch.register_optimiser(InterGitGenericBranch)
added
removed
branch.py
