1
# Copyright (C) 2006-2009 Canonical Ltd
2
# Copyright (C) 2012-2018 Jelmer Vernooij <jelmer@jelmer.uk>
4
# Authors: Robert Collins <robert.collins@canonical.com>
5
# Jelmer Vernooij <jelmer@samba.org>
6
# John Carr <john.carr@unrouted.co.uk>
8
# This program is free software; you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation; either version 2 of the License, or
11
# (at your option) any later version.
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
# GNU General Public License for more details.
18
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22
"""Git-specific subcommands for Bazaar."""
24
from __future__ import absolute_import
26
import breezy.bzr.bzrdir
27
from ...commands import (
31
from ...option import (
36
class cmd_git_import(Command):
37
"""Import all branches from a git repository.
41
takes_args = ["src_location", "dest_location?"]
44
Option('colocated', help='Create colocated branches.'),
47
def _get_colocated_branch(self, target_controldir, name):
48
from ...errors import NotBranchError
50
return target_controldir.open_branch(name=name)
51
except NotBranchError:
52
return target_controldir.create_branch(name=name)
54
def _get_nested_branch(self, dest_transport, dest_format, name):
55
from ...controldir import ControlDir
56
from ...errors import NotBranchError
57
head_transport = dest_transport.clone(name)
59
head_controldir = ControlDir.open_from_transport(head_transport)
60
except NotBranchError:
61
head_controldir = dest_format.initialize_on_transport_ex(
62
head_transport, create_prefix=True)[1]
64
return head_controldir.open_branch()
65
except NotBranchError:
66
return head_controldir.create_branch()
68
def run(self, src_location, dest_location=None, colocated=False):
77
from ...controldir import (
80
from ...errors import (
86
from ...repository import (
90
from ...transport import get_transport
97
from .repository import GitRepository
99
dest_format = controldir.ControlDirFormat.get_default_format()
100
if dest_format is None:
101
raise errors.BzrError('no default format')
103
if dest_location is None:
104
dest_location = os.path.basename(src_location.rstrip("/\\"))
106
dest_transport = get_transport(dest_location)
108
source_repo = Repository.open(src_location)
109
if not isinstance(source_repo, GitRepository):
110
raise BzrCommandError(gettext("%r is not a git repository") % src_location)
112
target_controldir = ControlDir.open_from_transport(dest_transport)
113
except NotBranchError:
114
target_controldir = dest_format.initialize_on_transport_ex(
115
dest_transport, shared_repo=True)[1]
117
target_repo = target_controldir.find_repository()
118
except NoRepositoryPresent:
119
target_repo = target_controldir.create_repository(shared=True)
121
if not target_repo.supports_rich_root():
122
raise BzrCommandError(gettext("Target repository doesn't support rich roots"))
124
interrepo = InterRepository.get(source_repo, target_repo)
125
mapping = source_repo.get_mapping()
126
refs = interrepo.fetch()
127
pb = ui.ui_factory.nested_progress_bar()
129
for i, (name, sha) in enumerate(refs.iteritems()):
131
branch_name = ref_to_branch_name(name)
133
# Not a branch, ignore
135
pb.update(gettext("creating branches"), i, len(refs))
136
if getattr(target_controldir._format, "colocated_branches", False) and colocated:
139
head_branch = self._get_colocated_branch(target_controldir, branch_name)
141
head_branch = self._get_nested_branch(dest_transport, dest_format, branch_name)
142
revid = mapping.revision_id_foreign_to_bzr(sha)
143
source_branch = LocalGitBranch(source_repo.controldir, source_repo,
145
if head_branch.last_revision() != revid:
146
head_branch.generate_revision_history(revid)
147
source_branch.tags.merge_to(head_branch.tags)
148
if not head_branch.get_parent():
149
url = urlutils.join_segment_parameters(
150
source_branch.base, {"ref": urllib.quote(name, '')})
151
head_branch.set_parent(url)
155
"Use 'bzr checkout' to create a working tree in "
156
"the newly created branches."))
159
class cmd_git_object(Command):
160
"""List or display Git objects by SHA.
162
Cat a particular object's Git representation if a SHA is specified.
163
List all available SHAs otherwise.
168
aliases = ["git-objects", "git-cat"]
169
takes_args = ["sha1?"]
170
takes_options = [Option('directory',
172
help='Location of repository.', type=unicode),
173
Option('pretty', help='Pretty-print objects.')]
174
encoding_type = 'exact'
177
def run(self, sha1=None, directory=".", pretty=False):
178
from ...errors import (
181
from ...controldir import (
184
from .object_store import (
187
from . import gettext
188
controldir, _ = ControlDir.open_containing(directory)
189
repo = controldir.find_repository()
190
object_store = get_object_store(repo)
191
with object_store.lock_read():
194
obj = object_store[str(sha1)]
196
raise BzrCommandError(gettext("Object not found: %s") % sha1)
198
text = obj.as_pretty_string()
200
text = obj.as_raw_string()
201
self.outf.write(text)
203
for sha1 in object_store:
204
self.outf.write("%s\n" % sha1)
207
class cmd_git_refs(Command):
208
"""Output all of the virtual refs for a repository.
214
takes_args = ["location?"]
217
def run(self, location="."):
218
from ...controldir import (
224
from .object_store import (
227
controldir, _ = ControlDir.open_containing(location)
228
repo = controldir.find_repository()
229
object_store = get_object_store(repo)
230
with object_store.lock_read():
231
refs = get_refs_container(controldir, object_store)
232
for k, v in refs.as_dict().iteritems():
233
self.outf.write("%s -> %s\n" % (k, v))
236
class cmd_git_apply(Command):
237
"""Apply a series of git-am style patches.
239
This command will in the future probably be integrated into
244
Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
246
help='Apply patches even if tree has uncommitted changes.')
248
takes_args = ["patches*"]
250
def _apply_patch(self, wt, f, signoff):
253
:param wt: A Bazaar working tree object.
254
:param f: Patch file to read.
255
:param signoff: Add Signed-Off-By flag.
257
from . import gettext
258
from ...errors import BzrCommandError
259
from dulwich.patch import git_am_patch_split
261
(c, diff, version) = git_am_patch_split(f)
262
# FIXME: Cope with git-specific bits in patch
263
# FIXME: Add new files to working tree
264
p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE,
269
raise BzrCommandError(gettext("error running patch"))
272
signed_off_by = wt.branch.get_config().username()
273
message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
274
wt.commit(authors=[c.author], message=message)
276
def run(self, patches_list=None, signoff=False, force=False):
277
from ...errors import UncommittedChanges
278
from ...workingtree import WorkingTree
279
if patches_list is None:
282
tree, _ = WorkingTree.open_containing(".")
283
if tree.basis_tree().changes_from(tree).has_changed() and not force:
284
raise UncommittedChanges(tree)
285
with tree.lock_write():
286
for patch in patches_list:
287
with open(patch, 'r') as f:
288
self._apply_patch(tree, f, signoff=signoff)
291
class cmd_git_push_pristine_tar_deltas(Command):
292
"""Push pristine tar deltas to a git repository."""
294
takes_options = [Option('directory',
296
help='Location of repository.', type=unicode)]
297
takes_args = ['target', 'package']
299
def run(self, target, package, directory='.'):
300
from ...branch import Branch
301
from ...errors import (
305
from ...trace import warning
306
from ...repository import Repository
307
from .object_store import get_object_store
308
from .pristine_tar import (
309
revision_pristine_tar_data,
310
store_git_pristine_tar_data,
312
source = Branch.open_containing(directory)[0]
313
target_bzr = Repository.open(target)
314
target = getattr(target_bzr, '_git', None)
316
raise BzrCommandError("Target not a git repository")
317
git_store = get_object_store(source.repository)
318
with git_store.lock_read():
319
tag_dict = source.tags.get_tag_dict()
320
for name, revid in tag_dict.iteritems():
322
rev = source.repository.get_revision(revid)
323
except NoSuchRevision:
326
delta, kind = revision_pristine_tar_data(rev)
329
gitid = git_store._lookup_revision_sha1(revid)
330
if not (name.startswith('upstream/') or name.startswith('upstream-')):
331
warning("Unexpected pristine tar revision tagged %s. Ignoring.",
334
upstream_version = name[len("upstream/"):]
335
filename = '%s_%s.orig.tar.%s' % (package, upstream_version, kind)
336
if not gitid in target:
337
warning("base git id %s for %s missing in target repository",
339
store_git_pristine_tar_data(target, filename.encode('utf-8'),
added
removed
commands.py
