1
# Copyright (C) 2006-2009 Canonical Ltd
3
# Authors: Robert Collins <robert.collins@canonical.com>
4
# Jelmer Vernooij <jelmer@samba.org>
5
# John Carr <john.carr@unrouted.co.uk>
7
# This program is free software; you can redistribute it and/or modify
8
# it under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 2 of the License, or
10
# (at your option) any later version.
12
# This program is distributed in the hope that it will be useful,
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
17
# You should have received a copy of the GNU General Public License
18
# along with this program; if not, write to the Free Software
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
"""Git-specific subcommands for Bazaar."""
23
from bzrlib.commands import (
27
from bzrlib.option import (
32
class cmd_git_import(Command):
33
"""Import all branches from a git repository.
37
takes_args = ["src_location", "dest_location?"]
39
def run(self, src_location, dest_location=None):
40
from collections import defaultdict
47
from bzrlib.bzrdir import (
50
from bzrlib.errors import (
55
from bzrlib.repository import (
59
from bzrlib.transport import get_transport
60
from bzrlib.plugins.git.branch import (
64
from bzrlib.plugins.git.refs import ref_to_branch_name
65
from bzrlib.plugins.git.repository import GitRepository
67
dest_format = controldir.ControlDirFormat.get_default_format()
69
if dest_location is None:
70
dest_location = os.path.basename(src_location.rstrip("/\\"))
72
dest_transport = get_transport(dest_location)
74
source_repo = Repository.open(src_location)
75
if not isinstance(source_repo, GitRepository):
76
raise BzrCommandError("%r is not a git repository" % src_location)
78
target_bzrdir = BzrDir.open_from_transport(dest_transport)
79
except NotBranchError:
80
target_bzrdir = dest_format.initialize_on_transport_ex(
81
dest_transport, shared_repo=True)[1]
83
target_repo = target_bzrdir.find_repository()
84
except NoRepositoryPresent:
85
target_repo = target_bzrdir.create_repository(shared=True)
87
if not target_repo.supports_rich_root():
88
raise BzrCommandError("Target repository doesn't support rich roots")
90
interrepo = InterRepository.get(source_repo, target_repo)
91
mapping = source_repo.get_mapping()
92
refs = interrepo.fetch()
93
unpeeled_tags = defaultdict(set)
95
for k, (peeled, unpeeled) in extract_tags(refs).iteritems():
96
tags[k] = mapping.revision_id_foreign_to_bzr(peeled)
97
if unpeeled is not None:
98
unpeeled_tags[peeled].add(unpeeled)
99
# FIXME: Store unpeeled tag map
100
pb = ui.ui_factory.nested_progress_bar()
102
for i, (name, ref) in enumerate(refs.iteritems()):
104
ref_to_branch_name(name)
106
# Not a branch, ignore
108
pb.update("creating branches", i, len(refs))
109
head_transport = dest_transport.clone(name)
111
head_bzrdir = BzrDir.open_from_transport(head_transport)
112
except NotBranchError:
113
head_bzrdir = dest_format.initialize_on_transport_ex(
114
head_transport, create_prefix=True)[1]
116
head_branch = head_bzrdir.open_branch()
117
except NotBranchError:
118
head_branch = head_bzrdir.create_branch()
119
revid = mapping.revision_id_foreign_to_bzr(ref)
120
source_branch = GitBranch(source_repo.bzrdir, source_repo,
122
source_branch.head = ref
123
if head_branch.last_revision() != revid:
124
head_branch.generate_revision_history(revid)
125
source_branch.tags.merge_to(head_branch.tags)
128
trace.note("Use 'bzr checkout' to create a working tree in "
129
"the newly created branches.")
133
class cmd_git_object(Command):
134
"""List or display Git objects by SHA.
136
Cat a particular object's Git representation if a SHA is specified.
137
List all available SHAs otherwise.
142
aliases = ["git-objects", "git-cat"]
143
takes_args = ["sha1?"]
144
takes_options = [Option('directory',
146
help='Location of repository.', type=unicode),
147
Option('pretty', help='Pretty-print objects.')]
148
encoding_type = 'exact'
151
def run(self, sha1=None, directory=".", pretty=False):
152
from bzrlib.errors import (
155
from bzrlib.bzrdir import (
158
bzrdir, _ = BzrDir.open_containing(directory)
159
repo = bzrdir.find_repository()
160
from bzrlib.plugins.git.object_store import (
163
object_store = get_object_store(repo)
164
object_store.lock_read()
168
obj = object_store[str(sha1)]
170
raise BzrCommandError("Object not found: %s" % sha1)
172
text = obj.as_pretty_string()
174
text = obj.as_raw_string()
175
self.outf.write(text)
177
for sha1 in object_store:
178
self.outf.write("%s\n" % sha1)
180
object_store.unlock()
183
class cmd_git_refs(Command):
184
"""Output all of the virtual refs for a repository.
190
takes_options = [Option('directory',
192
help='Location of repository.', type=unicode)]
195
def run(self, directory="."):
196
from bzrlib.bzrdir import (
199
from bzrlib.plugins.git.refs import (
202
from bzrlib.plugins.git.object_store import (
205
bzrdir, _ = BzrDir.open_containing(directory)
206
repo = bzrdir.find_repository()
207
object_store = get_object_store(repo)
208
object_store.lock_read()
210
refs = BazaarRefsContainer(bzrdir, object_store)
211
for k, v in refs.as_dict().iteritems():
212
self.outf.write("%s -> %s\n" % (k, v))
214
object_store.unlock()
217
class cmd_git_apply(Command):
218
"""Apply a series of git-am style patches.
220
This command will in the future probably be integrated into
225
Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
227
takes_args = ["patches*"]
229
def _apply_patch(self, wt, f, signoff):
232
:param wt: A Bazaar working tree object.
233
:param f: Patch file to read.
234
:param signoff: Add Signed-Off-By flag.
236
from bzrlib.errors import BzrCommandError
237
from dulwich.patch import git_am_patch_split
239
(c, diff, version) = git_am_patch_split(f)
240
# FIXME: Cope with git-specific bits in patch
241
# FIXME: Add new files to working tree
242
p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE,
247
raise BzrCommandError("error running patch")
250
signed_off_by = wt.branch.get_config().username()
251
message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
252
wt.commit(authors=[c.author], message=message)
254
def run(self, patches_list=None, signoff=False, force=False):
255
from bzrlib.errors import UncommittedChanges
256
from bzrlib.workingtree import WorkingTree
257
if patches_list is None:
260
tree, _ = WorkingTree.open_containing(".")
261
if tree.basis_tree().changes_from(tree).has_changed() and not force:
262
raise UncommittedChanges(tree)
265
for patch in patches_list:
268
self._apply_patch(tree, f, signoff=signoff)
added
removed
commands.py
