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 (
34
from bzrlib.decorators import (
37
from bzrlib.trace import (
41
from bzrlib.plugins.git.errors import (
46
class GitPullResult(branch.PullResult):
48
def _lookup_revno(self, revid):
49
assert isinstance(revid, str), "was %r" % revid
50
# Try in source branch first, it'll be faster
51
return self.target_branch.revision_id_to_revno(revid)
55
return self._lookup_revno(self.old_revid)
59
return self._lookup_revno(self.new_revid)
62
class LocalGitTagDict(tag.BasicTags):
63
"""Dictionary with tags in a local repository."""
65
def __init__(self, branch):
67
self.repository = branch.repository
69
def get_tag_dict(self):
71
for k,v in self.repository._git.tags.iteritems():
72
obj = self.repository._git.get_object(v)
73
while isinstance(obj, Tag):
75
obj = self.repository._git.get_object(v)
76
if not isinstance(obj, Commit):
77
mutter("Tag %s points at object %r that is not a commit, "
80
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
83
def set_tag(self, name, revid):
84
self.repository._git.tags[name] = revid
87
class GitBranchConfig(config.BranchConfig):
88
"""BranchConfig that uses locations.conf in place of branch.conf"""
90
def __init__(self, branch):
91
config.BranchConfig.__init__(self, branch)
92
# do not provide a BranchDataConfig
93
self.option_sources = self.option_sources[0], self.option_sources[2]
95
def set_user_option(self, name, value, store=config.STORE_BRANCH,
97
"""Force local to True"""
98
config.BranchConfig.set_user_option(self, name, value,
99
store=config.STORE_LOCATION, warn_masked=warn_masked)
102
class GitBranchFormat(branch.BranchFormat):
104
def get_format_description(self):
107
def supports_tags(self):
110
def make_tags(self, branch):
111
if getattr(branch.repository, "get_refs", None) is not None:
112
from bzrlib.plugins.git.remote import RemoteGitTagDict
113
return RemoteGitTagDict(branch)
115
return LocalGitTagDict(branch)
118
class GitBranch(foreign.ForeignBranch):
119
"""An adapter to git repositories for bzr Branch objects."""
121
def __init__(self, bzrdir, repository, name, head, lockfiles):
122
self.repository = repository
123
self._format = GitBranchFormat()
124
self.control_files = lockfiles
126
super(GitBranch, self).__init__(repository.get_mapping())
129
self.base = bzrdir.transport.base
131
def _get_nick(self, local=False, possible_master_transports=None):
132
"""Find the nick name for this branch.
138
def _set_nick(self, nick):
139
raise NotImplementedError
141
nick = property(_get_nick, _set_nick)
143
def dpull(self, source, stop_revision=None):
144
if stop_revision is None:
145
stop_revision = source.last_revision()
146
# FIXME: Check for diverged branches
147
revidmap = self.repository.dfetch(source.repository, stop_revision)
148
self.generate_revision_history(revidmap[stop_revision])
151
def generate_revision_history(self, revid, old_revid=None):
152
# FIXME: Check that old_revid is in the ancestry of revid
153
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
154
self._set_head(newhead)
156
def _set_head(self, head):
157
self.repository._git.set_ref(self.name, self.head)
160
def lock_write(self):
161
self.control_files.lock_write()
163
def get_stacked_on_url(self):
164
# Git doesn't do stacking (yet...)
167
def get_parent(self):
168
"""See Branch.get_parent()."""
169
# FIXME: Set "origin" url from .git/config ?
172
def set_parent(self, url):
173
# FIXME: Set "origin" url in .git/config ?
177
self.control_files.lock_read()
180
self.control_files.unlock()
182
def get_physical_lock_status(self):
186
class LocalGitBranch(GitBranch):
187
"""A local Git branch."""
190
def last_revision(self):
191
# perhaps should escape this ?
192
if self.head is None:
193
return revision.NULL_REVISION
194
return self.mapping.revision_id_foreign_to_bzr(self.head)
196
def _get_checkout_format(self):
197
"""Return the most suitable metadir for a checkout of this branch.
198
Weaves are used if this branch's repository uses weaves.
200
format = self.repository.bzrdir.checkout_metadir()
201
format.set_branch_format(self._format)
204
def create_checkout(self, to_location, revision_id=None, lightweight=False,
205
accelerator_tree=None, hardlink=False):
207
t = transport.get_transport(to_location)
209
format = self._get_checkout_format()
210
checkout = format.initialize_on_transport(t)
211
from_branch = branch.BranchReferenceFormat().initialize(checkout,
213
tree = checkout.create_workingtree(revision_id,
214
from_branch=from_branch, hardlink=hardlink)
217
return self._create_heavyweight_checkout(to_location, revision_id,
220
def _create_heavyweight_checkout(self, to_location, revision_id=None,
222
"""Create a new heavyweight checkout of this branch.
224
:param to_location: URL of location to create the new checkout in.
225
:param revision_id: Revision that should be the tip of the checkout.
226
:param hardlink: Whether to hardlink
227
:return: WorkingTree object of checkout.
229
checkout_branch = BzrDir.create_branch_convenience(
230
to_location, force_new_tree=False, format=get_rich_root_format())
231
checkout = checkout_branch.bzrdir
232
checkout_branch.bind(self)
233
# pull up to the specified revision_id to set the initial
234
# branch tip correctly, and seed it with history.
235
checkout_branch.pull(self, stop_revision=revision_id)
236
return checkout.create_workingtree(revision_id, hardlink=hardlink)
238
def _gen_revision_history(self):
239
if self.head is None:
241
ret = list(self.repository.iter_reverse_revision_history(
242
self.last_revision()))
246
def get_config(self):
247
return GitBranchConfig(self)
249
def get_push_location(self):
250
"""See Branch.get_push_location."""
251
push_loc = self.get_config().get_user_option('push_location')
254
def set_push_location(self, location):
255
"""See Branch.set_push_location."""
256
self.get_config().set_user_option('push_location', location,
257
store=config.STORE_LOCATION)
259
def supports_tags(self):
263
class InterGitGenericBranch(branch.InterBranch):
264
"""InterBranch implementation that pulls from Git into bzr."""
267
def is_compatible(self, source, target):
268
return (isinstance(source, GitBranch) and
269
not isinstance(target, GitBranch))
271
def update_revisions(self, stop_revision=None, overwrite=False,
273
"""See InterBranch.update_revisions()."""
274
interrepo = repository.InterRepository.get(self.source.repository,
275
self.target.repository)
276
self._last_revid = None
277
def determine_wants(heads):
278
if not self.source.name in heads:
279
raise NoSuchRef(self.source.name, heads.keys())
280
if stop_revision is not None:
281
self._last_revid = stop_revision
282
head, mapping = self.source.repository.lookup_git_revid(
285
head = heads[self.source.name]
287
self.source.mapping.revision_id_foreign_to_bzr(head)
288
if self.target.repository.has_revision(self._last_revid):
291
interrepo.fetch_objects(determine_wants, self.source.mapping)
293
prev_last_revid = None
295
prev_last_revid = self.target.last_revision()
296
self.target.generate_revision_history(self._last_revid, prev_last_revid)
299
branch.InterBranch.register_optimiser(InterGitGenericBranch)
302
class InterGitRemoteLocalBranch(branch.InterBranch):
303
"""InterBranch implementation that pulls between Git branches."""
306
def is_compatible(self, source, target):
307
from bzrlib.plugins.git.remote import RemoteGitBranch
308
return (isinstance(source, RemoteGitBranch) and
309
isinstance(target, LocalGitBranch))
311
def pull(self, stop_revision=None, overwrite=False,
312
possible_transports=None):
313
result = GitPullResult()
314
result.source_branch = self.source
315
result.target_branch = self.target
316
interrepo = repository.InterRepository.get(self.source.repository,
317
self.target.repository)
318
result.old_revid = self.target.last_revision()
319
if stop_revision is None:
320
stop_revision = self.source.last_revision()
321
interrepo.fetch(revision_id=stop_revision)
322
self.target.generate_revision_history(stop_revision, result.old_revid)
323
result.new_revid = self.target.last_revision()
327
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
added
removed
branch.py
