1
# Copyright (C) 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""An adapter between a Git Branch and a Bazaar Branch"""
24
from bzrlib.decorators import needs_read_lock
26
from bzrlib.plugins.git import ids
29
class GitBranchConfig(config.BranchConfig):
30
"""BranchConfig that uses locations.conf in place of branch.conf"""
32
def __init__(self, branch):
33
config.BranchConfig.__init__(self, branch)
34
# do not provide a BranchDataConfig
35
self.option_sources = self.option_sources[0], self.option_sources[2]
37
def set_user_option(self, name, value, local=False):
38
"""Force local to True"""
39
config.BranchConfig.set_user_option(self, name, value, local=True)
42
class GitBranchFormat(branch.BranchFormat):
44
def get_format_description(self):
48
class GitBranch(branch.Branch):
49
"""An adapter to git repositories for bzr Branch objects."""
51
def __init__(self, bzrdir, repository, head, base, lockfiles):
52
super(GitBranch, self).__init__()
53
self.control_files = lockfiles
55
self.repository = repository
58
self._format = GitBranchFormat()
61
self.control_files.lock_write()
64
def last_revision(self):
65
# perhaps should escape this ?
67
return revision.NULL_REVISION
68
return ids.convert_revision_id_git_to_bzr(self.head)
71
"""See Branch.get_parent()."""
74
def get_stacked_on_url(self):
77
def _gen_revision_history(self):
86
cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
90
ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
94
nextid = cm.parents[0].id
99
return GitBranchConfig(self)
102
self.control_files.lock_read()
105
self.control_files.unlock()
107
def get_physical_lock_status(self):
110
def get_push_location(self):
111
"""See Branch.get_push_location."""
112
push_loc = self.get_config().get_user_option('push_location')
115
def set_push_location(self, location):
116
"""See Branch.set_push_location."""
117
self.get_config().set_user_option('push_location', location,
120
def supports_tags(self):
added
removed
git_branch.py
