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.errors import (
47
class GitPullResult(branch.PullResult):
49
def _lookup_revno(self, revid):
50
assert isinstance(revid, str), "was %r" % revid
51
# Try in source branch first, it'll be faster
52
return self.target_branch.revision_id_to_revno(revid)
56
return self._lookup_revno(self.old_revid)
60
return self._lookup_revno(self.new_revid)
63
class LocalGitTagDict(tag.BasicTags):
64
"""Dictionary with tags in a local repository."""
66
def __init__(self, branch):
68
self.repository = branch.repository
70
def get_tag_dict(self):
72
for k,v in self.repository._git.tags.iteritems():
73
obj = self.repository._git.get_object(v)
74
while isinstance(obj, Tag):
76
obj = self.repository._git.get_object(v)
77
if not isinstance(obj, Commit):
78
mutter("Tag %s points at object %r that is not a commit, "
81
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
84
def set_tag(self, name, revid):
85
self.repository._git.tags[name] = revid
88
class GitBranchConfig(config.BranchConfig):
89
"""BranchConfig that uses locations.conf in place of branch.conf"""
91
def __init__(self, branch):
92
config.BranchConfig.__init__(self, branch)
93
# do not provide a BranchDataConfig
94
self.option_sources = self.option_sources[0], self.option_sources[2]
96
def set_user_option(self, name, value, store=config.STORE_BRANCH,
98
"""Force local to True"""
99
config.BranchConfig.set_user_option(self, name, value,
100
store=config.STORE_LOCATION, warn_masked=warn_masked)
103
class GitBranchFormat(branch.BranchFormat):
105
def get_format_description(self):
108
def supports_tags(self):
111
def make_tags(self, branch):
112
if getattr(branch.repository, "get_refs", None) is not None:
113
from bzrlib.plugins.git.remote import RemoteGitTagDict
114
return RemoteGitTagDict(branch)
116
return LocalGitTagDict(branch)
119
class GitBranch(foreign.ForeignBranch):
120
"""An adapter to git repositories for bzr Branch objects."""
122
def __init__(self, bzrdir, repository, name, head, lockfiles):
123
self.repository = repository
124
self._format = GitBranchFormat()
125
self.control_files = lockfiles
127
super(GitBranch, self).__init__(repository.get_mapping())
130
self.base = bzrdir.transport.base
132
def _get_nick(self, local=False, possible_master_transports=None):
133
"""Find the nick name for this branch.
139
def _set_nick(self, nick):
140
raise NotImplementedError
142
nick = property(_get_nick, _set_nick)
144
def dpull(self, source, stop_revision=None):
145
if stop_revision is None:
146
stop_revision = source.last_revision()
147
# FIXME: Check for diverged branches
148
revidmap = self.repository.dfetch(source.repository, stop_revision)
150
self.generate_revision_history(revidmap[stop_revision])
153
def generate_revision_history(self, revid, old_revid=None):
154
# FIXME: Check that old_revid is in the ancestry of revid
155
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
156
self._set_head(newhead)
158
def _set_head(self, head):
160
self.repository._git.set_ref(self.name, self.head)
162
def lock_write(self):
163
self.control_files.lock_write()
165
def get_stacked_on_url(self):
166
# Git doesn't do stacking (yet...)
169
def get_parent(self):
170
"""See Branch.get_parent()."""
171
# FIXME: Set "origin" url from .git/config ?
174
def set_parent(self, url):
175
# FIXME: Set "origin" url in .git/config ?
179
self.control_files.lock_read()
182
self.control_files.unlock()
184
def get_physical_lock_status(self):
188
class LocalGitBranch(GitBranch):
189
"""A local Git branch."""
192
def last_revision(self):
193
# perhaps should escape this ?
194
if self.head is None:
195
return revision.NULL_REVISION
196
return self.mapping.revision_id_foreign_to_bzr(self.head)
198
def _get_checkout_format(self):
199
"""Return the most suitable metadir for a checkout of this branch.
200
Weaves are used if this branch's repository uses weaves.
202
format = self.repository.bzrdir.checkout_metadir()
203
format.set_branch_format(self._format)
206
def create_checkout(self, to_location, revision_id=None, lightweight=False,
207
accelerator_tree=None, hardlink=False):
209
t = transport.get_transport(to_location)
211
format = self._get_checkout_format()
212
checkout = format.initialize_on_transport(t)
213
from_branch = branch.BranchReferenceFormat().initialize(checkout,
215
tree = checkout.create_workingtree(revision_id,
216
from_branch=from_branch, hardlink=hardlink)
219
return self._create_heavyweight_checkout(to_location, revision_id,
222
def _create_heavyweight_checkout(self, to_location, revision_id=None,
224
"""Create a new heavyweight checkout of this branch.
226
:param to_location: URL of location to create the new checkout in.
227
:param revision_id: Revision that should be the tip of the checkout.
228
:param hardlink: Whether to hardlink
229
:return: WorkingTree object of checkout.
231
checkout_branch = BzrDir.create_branch_convenience(
232
to_location, force_new_tree=False, format=get_rich_root_format())
233
checkout = checkout_branch.bzrdir
234
checkout_branch.bind(self)
235
# pull up to the specified revision_id to set the initial
236
# branch tip correctly, and seed it with history.
237
checkout_branch.pull(self, stop_revision=revision_id)
238
return checkout.create_workingtree(revision_id, hardlink=hardlink)
240
def _gen_revision_history(self):
241
if self.head is None:
243
ret = list(self.repository.iter_reverse_revision_history(
244
self.last_revision()))
248
def get_config(self):
249
return GitBranchConfig(self)
251
def get_push_location(self):
252
"""See Branch.get_push_location."""
253
push_loc = self.get_config().get_user_option('push_location')
256
def set_push_location(self, location):
257
"""See Branch.set_push_location."""
258
self.get_config().set_user_option('push_location', location,
259
store=config.STORE_LOCATION)
261
def supports_tags(self):
265
class GitBranchPullResult(branch.PullResult):
267
def report(self, to_file):
269
if self.old_revid == self.new_revid:
270
to_file.write('No revisions to pull.\n')
272
to_file.write('Now on revision %d (git sha: %s).\n' %
273
(self.new_revno, self.new_git_head))
274
self._show_tag_conficts(to_file)
277
class InterGitGenericBranch(branch.InterBranch):
278
"""InterBranch implementation that pulls from Git into bzr."""
281
def is_compatible(self, source, target):
282
return (isinstance(source, GitBranch) and
283
not isinstance(target, GitBranch))
285
def update_revisions(self, stop_revision=None, overwrite=False,
287
"""See InterBranch.update_revisions()."""
288
interrepo = repository.InterRepository.get(self.source.repository,
289
self.target.repository)
291
self._last_revid = None
292
def determine_wants(heads):
293
if not self.source.name in heads:
294
raise NoSuchRef(self.source.name, heads.keys())
295
if stop_revision is not None:
296
self._last_revid = stop_revision
297
self._head, mapping = self.source.repository.lookup_git_revid(
300
self._head = heads[self.source.name]
302
self.source.mapping.revision_id_foreign_to_bzr(self._head)
303
if self.target.repository.has_revision(self._last_revid):
306
interrepo.fetch_objects(determine_wants, self.source.mapping)
308
prev_last_revid = None
310
prev_last_revid = self.target.last_revision()
311
self.target.generate_revision_history(self._last_revid, prev_last_revid)
313
def pull(self, overwrite=False, stop_revision=None,
314
possible_transports=None, _hook_master=None, run_hooks=True,
315
_override_hook_target=None):
318
:param _hook_master: Private parameter - set the branch to
319
be supplied as the master to pull hooks.
320
:param run_hooks: Private parameter - if false, this branch
321
is being called because it's the master of the primary branch,
322
so it should not run its hooks.
323
:param _override_hook_target: Private parameter - set the branch to be
324
supplied as the target_branch to pull hooks.
326
result = GitBranchPullResult()
327
result.source_branch = self.source
328
if _override_hook_target is None:
329
result.target_branch = self.target
331
result.target_branch = _override_hook_target
332
self.source.lock_read()
334
# We assume that during 'pull' the target repository is closer than
336
graph = self.target.repository.get_graph(self.source.repository)
337
result.old_revno, result.old_revid = \
338
self.target.last_revision_info()
339
self.update_revisions(stop_revision, overwrite=overwrite,
341
result.new_git_head = self._head
342
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
344
result.new_revno, result.new_revid = self.target.last_revision_info()
346
result.master_branch = _hook_master
347
result.local_branch = result.target_branch
349
result.master_branch = result.target_branch
350
result.local_branch = None
352
for hook in branch.Branch.hooks['post_pull']:
361
branch.InterBranch.register_optimiser(InterGitGenericBranch)
364
class InterGitRemoteLocalBranch(branch.InterBranch):
365
"""InterBranch implementation that pulls between Git branches."""
368
def is_compatible(self, source, target):
369
from bzrlib.plugins.git.remote import RemoteGitBranch
370
return (isinstance(source, RemoteGitBranch) and
371
isinstance(target, LocalGitBranch))
373
def pull(self, stop_revision=None, overwrite=False,
374
possible_transports=None):
375
result = GitPullResult()
376
result.source_branch = self.source
377
result.target_branch = self.target
378
interrepo = repository.InterRepository.get(self.source.repository,
379
self.target.repository)
380
result.old_revid = self.target.last_revision()
381
if stop_revision is None:
382
stop_revision = self.source.last_revision()
383
interrepo.fetch(revision_id=stop_revision)
384
self.target.generate_revision_history(stop_revision, result.old_revid)
385
result.new_revid = self.target.last_revision()
389
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
added
removed
branch.py
