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 (
42
from bzrlib.plugins.git.config import (
45
from bzrlib.plugins.git.errors import (
50
from bzrlib.foreign import ForeignBranch
52
class ForeignBranch(branch.Branch):
53
def __init__(self, mapping):
54
self.mapping = mapping
55
super(ForeignBranch, self).__init__()
58
class GitPullResult(branch.PullResult):
60
def _lookup_revno(self, revid):
61
assert isinstance(revid, str), "was %r" % revid
62
# Try in source branch first, it'll be faster
63
return self.target_branch.revision_id_to_revno(revid)
67
return self._lookup_revno(self.old_revid)
71
return self._lookup_revno(self.new_revid)
74
class LocalGitTagDict(tag.BasicTags):
75
"""Dictionary with tags in a local repository."""
77
def __init__(self, branch):
79
self.repository = branch.repository
81
def get_tag_dict(self):
83
for k,v in self.repository._git.tags.iteritems():
84
obj = self.repository._git.get_object(v)
85
while isinstance(obj, Tag):
87
obj = self.repository._git.get_object(v)
88
if not isinstance(obj, Commit):
89
mutter("Tag %s points at object %r that is not a commit, "
92
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
95
def set_tag(self, name, revid):
96
self.repository._git.tags[name] = revid
99
class GitBranchFormat(branch.BranchFormat):
101
def get_format_description(self):
104
def supports_tags(self):
107
def make_tags(self, branch):
108
if getattr(branch.repository, "get_refs", None) is not None:
109
from bzrlib.plugins.git.remote import RemoteGitTagDict
110
return RemoteGitTagDict(branch)
112
return LocalGitTagDict(branch)
115
class GitBranch(ForeignBranch):
116
"""An adapter to git repositories for bzr Branch objects."""
118
def __init__(self, bzrdir, repository, name, head, lockfiles):
119
self.repository = repository
120
self._format = GitBranchFormat()
121
self.control_files = lockfiles
123
super(GitBranch, self).__init__(repository.get_mapping())
126
self.base = bzrdir.transport.base
128
def _get_nick(self, local=False, possible_master_transports=None):
129
"""Find the nick name for this branch.
135
def _set_nick(self, nick):
136
raise NotImplementedError
138
nick = property(_get_nick, _set_nick)
141
return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
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
refs = { "refs/heads/master": stop_revision }
148
for name, revid in source.tags.get_tag_dict().iteritems():
149
if source.repository.has_revision(revid):
150
refs["refs/tags/%s" % name] = revid
151
revidmap, new_refs = self.repository.dfetch_refs(source.repository,
154
self.generate_revision_history(revidmap[stop_revision])
157
def generate_revision_history(self, revid, old_revid=None):
158
# FIXME: Check that old_revid is in the ancestry of revid
159
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
160
self._set_head(newhead)
162
def _set_head(self, head):
164
self.repository._git.set_ref(self.name, self.head)
166
def lock_write(self):
167
self.control_files.lock_write()
169
def get_stacked_on_url(self):
170
# Git doesn't do stacking (yet...)
173
def get_parent(self):
174
"""See Branch.get_parent()."""
175
# FIXME: Set "origin" url from .git/config ?
178
def set_parent(self, url):
179
# FIXME: Set "origin" url in .git/config ?
183
self.control_files.lock_read()
186
return self.control_files.is_locked()
189
self.control_files.unlock()
191
def get_physical_lock_status(self):
195
class LocalGitBranch(GitBranch):
196
"""A local Git branch."""
199
def last_revision(self):
200
# perhaps should escape this ?
201
if self.head is None:
202
return revision.NULL_REVISION
203
return self.mapping.revision_id_foreign_to_bzr(self.head)
205
def _get_checkout_format(self):
206
"""Return the most suitable metadir for a checkout of this branch.
207
Weaves are used if this branch's repository uses weaves.
209
format = self.repository.bzrdir.checkout_metadir()
210
format.set_branch_format(self._format)
213
def create_checkout(self, to_location, revision_id=None, lightweight=False,
214
accelerator_tree=None, hardlink=False):
216
t = transport.get_transport(to_location)
218
format = self._get_checkout_format()
219
checkout = format.initialize_on_transport(t)
220
from_branch = branch.BranchReferenceFormat().initialize(checkout,
222
tree = checkout.create_workingtree(revision_id,
223
from_branch=from_branch, hardlink=hardlink)
226
return self._create_heavyweight_checkout(to_location, revision_id,
229
def _create_heavyweight_checkout(self, to_location, revision_id=None,
231
"""Create a new heavyweight checkout of this branch.
233
:param to_location: URL of location to create the new checkout in.
234
:param revision_id: Revision that should be the tip of the checkout.
235
:param hardlink: Whether to hardlink
236
:return: WorkingTree object of checkout.
238
checkout_branch = BzrDir.create_branch_convenience(
239
to_location, force_new_tree=False, format=get_rich_root_format())
240
checkout = checkout_branch.bzrdir
241
checkout_branch.bind(self)
242
# pull up to the specified revision_id to set the initial
243
# branch tip correctly, and seed it with history.
244
checkout_branch.pull(self, stop_revision=revision_id)
245
return checkout.create_workingtree(revision_id, hardlink=hardlink)
247
def _gen_revision_history(self):
248
if self.head is None:
250
ret = list(self.repository.iter_reverse_revision_history(
251
self.last_revision()))
255
def get_config(self):
256
return GitBranchConfig(self)
258
def get_push_location(self):
259
"""See Branch.get_push_location."""
260
push_loc = self.get_config().get_user_option('push_location')
263
def set_push_location(self, location):
264
"""See Branch.set_push_location."""
265
self.get_config().set_user_option('push_location', location,
266
store=config.STORE_LOCATION)
268
def supports_tags(self):
272
class GitBranchPullResult(branch.PullResult):
274
def report(self, to_file):
276
if self.old_revid == self.new_revid:
277
to_file.write('No revisions to pull.\n')
279
to_file.write('Now on revision %d (git sha: %s).\n' %
280
(self.new_revno, self.new_git_head))
281
self._show_tag_conficts(to_file)
284
class InterGitGenericBranch(branch.InterBranch):
285
"""InterBranch implementation that pulls from Git into bzr."""
288
def is_compatible(self, source, target):
289
return (isinstance(source, GitBranch) and
290
not isinstance(target, GitBranch))
292
def update_revisions(self, stop_revision=None, overwrite=False,
294
"""See InterBranch.update_revisions()."""
295
interrepo = repository.InterRepository.get(self.source.repository,
296
self.target.repository)
298
self._last_revid = None
299
def determine_wants(heads):
300
if not self.source.name in heads:
301
raise NoSuchRef(self.source.name, heads.keys())
302
if stop_revision is not None:
303
self._last_revid = stop_revision
304
self._head, mapping = self.source.repository.lookup_git_revid(
307
self._head = heads[self.source.name]
309
self.source.mapping.revision_id_foreign_to_bzr(self._head)
310
if self.target.repository.has_revision(self._last_revid):
313
interrepo.fetch_objects(determine_wants, self.source.mapping)
315
prev_last_revid = None
317
prev_last_revid = self.target.last_revision()
318
self.target.generate_revision_history(self._last_revid, prev_last_revid)
320
def pull(self, overwrite=False, stop_revision=None,
321
possible_transports=None, _hook_master=None, run_hooks=True,
322
_override_hook_target=None):
325
:param _hook_master: Private parameter - set the branch to
326
be supplied as the master to pull hooks.
327
:param run_hooks: Private parameter - if false, this branch
328
is being called because it's the master of the primary branch,
329
so it should not run its hooks.
330
:param _override_hook_target: Private parameter - set the branch to be
331
supplied as the target_branch to pull hooks.
333
result = GitBranchPullResult()
334
result.source_branch = self.source
335
if _override_hook_target is None:
336
result.target_branch = self.target
338
result.target_branch = _override_hook_target
339
self.source.lock_read()
341
# We assume that during 'pull' the target repository is closer than
343
graph = self.target.repository.get_graph(self.source.repository)
344
result.old_revno, result.old_revid = \
345
self.target.last_revision_info()
346
self.update_revisions(stop_revision, overwrite=overwrite,
348
result.new_git_head = self._head
349
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
351
result.new_revno, result.new_revid = self.target.last_revision_info()
353
result.master_branch = _hook_master
354
result.local_branch = result.target_branch
356
result.master_branch = result.target_branch
357
result.local_branch = None
359
for hook in branch.Branch.hooks['post_pull']:
368
branch.InterBranch.register_optimiser(InterGitGenericBranch)
371
class InterGitRemoteLocalBranch(branch.InterBranch):
372
"""InterBranch implementation that pulls between Git branches."""
375
def is_compatible(self, source, target):
376
from bzrlib.plugins.git.remote import RemoteGitBranch
377
return (isinstance(source, RemoteGitBranch) and
378
isinstance(target, LocalGitBranch))
380
def pull(self, stop_revision=None, overwrite=False,
381
possible_transports=None):
382
result = GitPullResult()
383
result.source_branch = self.source
384
result.target_branch = self.target
385
interrepo = repository.InterRepository.get(self.source.repository,
386
self.target.repository)
387
result.old_revid = self.target.last_revision()
388
if stop_revision is None:
389
stop_revision = self.source.last_revision()
390
interrepo.fetch(revision_id=stop_revision)
391
self.target.generate_revision_history(stop_revision, result.old_revid)
392
result.new_revid = self.target.last_revision()
396
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
added
removed
branch.py
