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)
140
def dpull(self, source, stop_revision=None):
141
if stop_revision is None:
142
stop_revision = source.last_revision()
143
# FIXME: Check for diverged branches
144
revidmap = self.repository.dfetch(source.repository, stop_revision)
146
self.generate_revision_history(revidmap[stop_revision])
149
def generate_revision_history(self, revid, old_revid=None):
150
# FIXME: Check that old_revid is in the ancestry of revid
151
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
152
self._set_head(newhead)
154
def _set_head(self, head):
156
self.repository._git.set_ref(self.name, self.head)
158
def lock_write(self):
159
self.control_files.lock_write()
161
def get_stacked_on_url(self):
162
# Git doesn't do stacking (yet...)
165
def get_parent(self):
166
"""See Branch.get_parent()."""
167
# FIXME: Set "origin" url from .git/config ?
170
def set_parent(self, url):
171
# FIXME: Set "origin" url in .git/config ?
175
self.control_files.lock_read()
178
self.control_files.unlock()
180
def get_physical_lock_status(self):
184
class LocalGitBranch(GitBranch):
185
"""A local Git branch."""
188
def last_revision(self):
189
# perhaps should escape this ?
190
if self.head is None:
191
return revision.NULL_REVISION
192
return self.mapping.revision_id_foreign_to_bzr(self.head)
194
def _get_checkout_format(self):
195
"""Return the most suitable metadir for a checkout of this branch.
196
Weaves are used if this branch's repository uses weaves.
198
format = self.repository.bzrdir.checkout_metadir()
199
format.set_branch_format(self._format)
202
def create_checkout(self, to_location, revision_id=None, lightweight=False,
203
accelerator_tree=None, hardlink=False):
205
t = transport.get_transport(to_location)
207
format = self._get_checkout_format()
208
checkout = format.initialize_on_transport(t)
209
from_branch = branch.BranchReferenceFormat().initialize(checkout,
211
tree = checkout.create_workingtree(revision_id,
212
from_branch=from_branch, hardlink=hardlink)
215
return self._create_heavyweight_checkout(to_location, revision_id,
218
def _create_heavyweight_checkout(self, to_location, revision_id=None,
220
"""Create a new heavyweight checkout of this branch.
222
:param to_location: URL of location to create the new checkout in.
223
:param revision_id: Revision that should be the tip of the checkout.
224
:param hardlink: Whether to hardlink
225
:return: WorkingTree object of checkout.
227
checkout_branch = BzrDir.create_branch_convenience(
228
to_location, force_new_tree=False, format=get_rich_root_format())
229
checkout = checkout_branch.bzrdir
230
checkout_branch.bind(self)
231
# pull up to the specified revision_id to set the initial
232
# branch tip correctly, and seed it with history.
233
checkout_branch.pull(self, stop_revision=revision_id)
234
return checkout.create_workingtree(revision_id, hardlink=hardlink)
236
def _gen_revision_history(self):
237
if self.head is None:
239
ret = list(self.repository.iter_reverse_revision_history(
240
self.last_revision()))
244
def get_config(self):
245
return GitBranchConfig(self)
247
def get_push_location(self):
248
"""See Branch.get_push_location."""
249
push_loc = self.get_config().get_user_option('push_location')
252
def set_push_location(self, location):
253
"""See Branch.set_push_location."""
254
self.get_config().set_user_option('push_location', location,
255
store=config.STORE_LOCATION)
257
def supports_tags(self):
261
class GitBranchPullResult(branch.PullResult):
263
def report(self, to_file):
265
if self.old_revid == self.new_revid:
266
to_file.write('No revisions to pull.\n')
268
to_file.write('Now on revision %d (git sha: %s).\n' %
269
(self.new_revno, self.new_git_head))
270
self._show_tag_conficts(to_file)
273
class InterGitGenericBranch(branch.InterBranch):
274
"""InterBranch implementation that pulls from Git into bzr."""
277
def is_compatible(self, source, target):
278
return (isinstance(source, GitBranch) and
279
not isinstance(target, GitBranch))
281
def update_revisions(self, stop_revision=None, overwrite=False,
283
"""See InterBranch.update_revisions()."""
284
interrepo = repository.InterRepository.get(self.source.repository,
285
self.target.repository)
287
self._last_revid = None
288
def determine_wants(heads):
289
if not self.source.name in heads:
290
raise NoSuchRef(self.source.name, heads.keys())
291
if stop_revision is not None:
292
self._last_revid = stop_revision
293
self._head, mapping = self.source.repository.lookup_git_revid(
296
self._head = heads[self.source.name]
298
self.source.mapping.revision_id_foreign_to_bzr(self._head)
299
if self.target.repository.has_revision(self._last_revid):
302
interrepo.fetch_objects(determine_wants, self.source.mapping)
304
prev_last_revid = None
306
prev_last_revid = self.target.last_revision()
307
self.target.generate_revision_history(self._last_revid, prev_last_revid)
309
def pull(self, overwrite=False, stop_revision=None,
310
possible_transports=None, _hook_master=None, run_hooks=True,
311
_override_hook_target=None):
314
:param _hook_master: Private parameter - set the branch to
315
be supplied as the master to pull hooks.
316
:param run_hooks: Private parameter - if false, this branch
317
is being called because it's the master of the primary branch,
318
so it should not run its hooks.
319
:param _override_hook_target: Private parameter - set the branch to be
320
supplied as the target_branch to pull hooks.
322
result = GitBranchPullResult()
323
result.source_branch = self.source
324
if _override_hook_target is None:
325
result.target_branch = self.target
327
result.target_branch = _override_hook_target
328
self.source.lock_read()
330
# We assume that during 'pull' the target repository is closer than
332
graph = self.target.repository.get_graph(self.source.repository)
333
result.old_revno, result.old_revid = \
334
self.target.last_revision_info()
335
self.update_revisions(stop_revision, overwrite=overwrite,
337
result.new_git_head = self._head
338
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
340
result.new_revno, result.new_revid = self.target.last_revision_info()
342
result.master_branch = _hook_master
343
result.local_branch = result.target_branch
345
result.master_branch = result.target_branch
346
result.local_branch = None
348
for hook in branch.Branch.hooks['post_pull']:
357
branch.InterBranch.register_optimiser(InterGitGenericBranch)
360
class InterGitRemoteLocalBranch(branch.InterBranch):
361
"""InterBranch implementation that pulls between Git branches."""
364
def is_compatible(self, source, target):
365
from bzrlib.plugins.git.remote import RemoteGitBranch
366
return (isinstance(source, RemoteGitBranch) and
367
isinstance(target, LocalGitBranch))
369
def pull(self, stop_revision=None, overwrite=False,
370
possible_transports=None):
371
result = GitPullResult()
372
result.source_branch = self.source
373
result.target_branch = self.target
374
interrepo = repository.InterRepository.get(self.source.repository,
375
self.target.repository)
376
result.old_revid = self.target.last_revision()
377
if stop_revision is None:
378
stop_revision = self.source.last_revision()
379
interrepo.fetch(revision_id=stop_revision)
380
self.target.generate_revision_history(stop_revision, result.old_revid)
381
result.new_revid = self.target.last_revision()
385
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
added
removed
branch.py
