/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2019-02-04 01:01:24 UTC
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190204010124-ni0i4qc6f5tnbvux
Fix source tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commands.py
 
1
# Copyright (C) 2006-2009 Canonical Ltd
 
2
# Copyright (C) 2012-2018 Jelmer Vernooij <jelmer@jelmer.uk>
 
3
 
 
4
# Authors: Robert Collins <robert.collins@canonical.com>
 
5
#          Jelmer Vernooij <jelmer@samba.org>
 
6
#          John Carr <john.carr@unrouted.co.uk>
 
7
#
 
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.
 
12
#
 
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.
 
17
#
 
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
 
21
 
 
22
"""Git-specific subcommands for Bazaar."""
 
23
 
 
24
from __future__ import absolute_import
 
25
 
 
26
import breezy.bzr  # noqa: F401
 
27
from ..commands import (
 
28
    Command,
 
29
    display_command,
 
30
    )
 
31
from ..option import (
 
32
    Option,
 
33
    )
 
34
from ..sixish import (
 
35
    text_type,
 
36
    viewitems,
 
37
    )
 
38
 
 
39
 
 
40
class cmd_git_import(Command):
 
41
    """Import all branches from a git repository.
 
42
 
 
43
    """
 
44
 
 
45
    takes_args = ["src_location", "dest_location?"]
 
46
 
 
47
    takes_options = [
 
48
        Option('colocated', help='Create colocated branches.'),
 
49
        ]
 
50
 
 
51
    def _get_colocated_branch(self, target_controldir, name):
 
52
        from ..errors import NotBranchError
 
53
        try:
 
54
            return target_controldir.open_branch(name=name)
 
55
        except NotBranchError:
 
56
            return target_controldir.create_branch(name=name)
 
57
 
 
58
    def _get_nested_branch(self, dest_transport, dest_format, name):
 
59
        from ..controldir import ControlDir
 
60
        from ..errors import NotBranchError
 
61
        head_transport = dest_transport.clone(name)
 
62
        try:
 
63
            head_controldir = ControlDir.open_from_transport(head_transport)
 
64
        except NotBranchError:
 
65
            head_controldir = dest_format.initialize_on_transport_ex(
 
66
                head_transport, create_prefix=True)[1]
 
67
        try:
 
68
            return head_controldir.open_branch()
 
69
        except NotBranchError:
 
70
            return head_controldir.create_branch()
 
71
 
 
72
    def run(self, src_location, dest_location=None, colocated=False):
 
73
        import os
 
74
        from .. import (
 
75
            controldir,
 
76
            trace,
 
77
            ui,
 
78
            urlutils,
 
79
            )
 
80
        from ..controldir import (
 
81
            ControlDir,
 
82
            )
 
83
        from ..errors import (
 
84
            BzrError,
 
85
            BzrCommandError,
 
86
            NoRepositoryPresent,
 
87
            NotBranchError,
 
88
            )
 
89
        from ..i18n import gettext
 
90
        from ..repository import (
 
91
            InterRepository,
 
92
            Repository,
 
93
            )
 
94
        from ..transport import get_transport
 
95
        from .branch import (
 
96
            LocalGitBranch,
 
97
            )
 
98
        from .refs import (
 
99
            ref_to_branch_name,
 
100
            )
 
101
        from .repository import GitRepository
 
102
 
 
103
        dest_format = controldir.ControlDirFormat.get_default_format()
 
104
        if dest_format is None:
 
105
            raise BzrError('no default format')
 
106
 
 
107
        if dest_location is None:
 
108
            dest_location = os.path.basename(src_location.rstrip("/\\"))
 
109
 
 
110
        dest_transport = get_transport(dest_location)
 
111
 
 
112
        source_repo = Repository.open(src_location)
 
113
        if not isinstance(source_repo, GitRepository):
 
114
            raise BzrCommandError(
 
115
                gettext("%r is not a git repository") % src_location)
 
116
        try:
 
117
            target_controldir = ControlDir.open_from_transport(dest_transport)
 
118
        except NotBranchError:
 
119
            target_controldir = dest_format.initialize_on_transport_ex(
 
120
                dest_transport, shared_repo=True)[1]
 
121
        try:
 
122
            target_repo = target_controldir.find_repository()
 
123
        except NoRepositoryPresent:
 
124
            target_repo = target_controldir.create_repository(shared=True)
 
125
 
 
126
        if not target_repo.supports_rich_root():
 
127
            raise BzrCommandError(
 
128
                gettext("Target repository doesn't support rich roots"))
 
129
 
 
130
        interrepo = InterRepository.get(source_repo, target_repo)
 
131
        mapping = source_repo.get_mapping()
 
132
        refs = interrepo.fetch()
 
133
        pb = ui.ui_factory.nested_progress_bar()
 
134
        try:
 
135
            for i, (name, sha) in enumerate(viewitems(refs)):
 
136
                try:
 
137
                    branch_name = ref_to_branch_name(name)
 
138
                except ValueError:
 
139
                    # Not a branch, ignore
 
140
                    continue
 
141
                pb.update(gettext("creating branches"), i, len(refs))
 
142
                if (getattr(target_controldir._format, "colocated_branches",
 
143
                            False) and colocated):
 
144
                    if name == "HEAD":
 
145
                        branch_name = None
 
146
                    head_branch = self._get_colocated_branch(
 
147
                        target_controldir, branch_name)
 
148
                else:
 
149
                    head_branch = self._get_nested_branch(
 
150
                        dest_transport, dest_format, branch_name)
 
151
                revid = mapping.revision_id_foreign_to_bzr(sha)
 
152
                source_branch = LocalGitBranch(
 
153
                    source_repo.controldir, source_repo, sha)
 
154
                if head_branch.last_revision() != revid:
 
155
                    head_branch.generate_revision_history(revid)
 
156
                source_branch.tags.merge_to(head_branch.tags)
 
157
                if not head_branch.get_parent():
 
158
                    url = urlutils.join_segment_parameters(
 
159
                        source_branch.base,
 
160
                        {"branch": urlutils.escape(branch_name)})
 
161
                    head_branch.set_parent(url)
 
162
        finally:
 
163
            pb.finished()
 
164
        trace.note(gettext(
 
165
            "Use 'bzr checkout' to create a working tree in "
 
166
            "the newly created branches."))
 
167
 
 
168
 
 
169
class cmd_git_object(Command):
 
170
    """List or display Git objects by SHA.
 
171
 
 
172
    Cat a particular object's Git representation if a SHA is specified.
 
173
    List all available SHAs otherwise.
 
174
    """
 
175
 
 
176
    hidden = True
 
177
 
 
178
    aliases = ["git-objects", "git-cat"]
 
179
    takes_args = ["sha1?"]
 
180
    takes_options = [Option('directory',
 
181
                            short_name='d',
 
182
                            help='Location of repository.', type=text_type),
 
183
                     Option('pretty', help='Pretty-print objects.')]
 
184
    encoding_type = 'exact'
 
185
 
 
186
    @display_command
 
187
    def run(self, sha1=None, directory=".", pretty=False):
 
188
        from ..errors import (
 
189
            BzrCommandError,
 
190
            )
 
191
        from ..controldir import (
 
192
            ControlDir,
 
193
            )
 
194
        from .object_store import (
 
195
            get_object_store,
 
196
            )
 
197
        from ..i18n import gettext
 
198
        controldir, _ = ControlDir.open_containing(directory)
 
199
        repo = controldir.find_repository()
 
200
        object_store = get_object_store(repo)
 
201
        with object_store.lock_read():
 
202
            if sha1 is not None:
 
203
                try:
 
204
                    obj = object_store[sha1.encode('ascii')]
 
205
                except KeyError:
 
206
                    raise BzrCommandError(
 
207
                        gettext("Object not found: %s") % sha1)
 
208
                if pretty:
 
209
                    text = obj.as_pretty_string()
 
210
                else:
 
211
                    text = obj.as_raw_string()
 
212
                self.outf.write(text)
 
213
            else:
 
214
                for sha1 in object_store:
 
215
                    self.outf.write("%s\n" % sha1.decode('ascii'))
 
216
 
 
217
 
 
218
class cmd_git_refs(Command):
 
219
    """Output all of the virtual refs for a repository.
 
220
 
 
221
    """
 
222
 
 
223
    hidden = True
 
224
 
 
225
    takes_args = ["location?"]
 
226
 
 
227
    @display_command
 
228
    def run(self, location="."):
 
229
        from ..controldir import (
 
230
            ControlDir,
 
231
            )
 
232
        from .refs import (
 
233
            get_refs_container,
 
234
            )
 
235
        from .object_store import (
 
236
            get_object_store,
 
237
            )
 
238
        controldir, _ = ControlDir.open_containing(location)
 
239
        repo = controldir.find_repository()
 
240
        object_store = get_object_store(repo)
 
241
        with object_store.lock_read():
 
242
            refs = get_refs_container(controldir, object_store)
 
243
            for k, v in sorted(viewitems(refs.as_dict())):
 
244
                self.outf.write("%s -> %s\n" %
 
245
                                (k.decode('utf-8'), v.decode('utf-8')))
 
246
 
 
247
 
 
248
class cmd_git_apply(Command):
 
249
    """Apply a series of git-am style patches.
 
250
 
 
251
    This command will in the future probably be integrated into "bzr pull".
 
252
    """
 
253
 
 
254
    takes_options = [
 
255
        Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
 
256
        Option('force',
 
257
               help='Apply patches even if tree has uncommitted changes.')
 
258
        ]
 
259
    takes_args = ["patches*"]
 
260
 
 
261
    def _apply_patch(self, wt, f, signoff):
 
262
        """Apply a patch.
 
263
 
 
264
        :param wt: A Bazaar working tree object.
 
265
        :param f: Patch file to read.
 
266
        :param signoff: Add Signed-Off-By flag.
 
267
        """
 
268
        from ..i18n import gettext
 
269
        from ..errors import BzrCommandError
 
270
        from dulwich.patch import git_am_patch_split
 
271
        import subprocess
 
272
        (c, diff, version) = git_am_patch_split(f)
 
273
        # FIXME: Cope with git-specific bits in patch
 
274
        # FIXME: Add new files to working tree
 
275
        p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE,
 
276
                             cwd=wt.basedir)
 
277
        p.communicate(diff)
 
278
        exitcode = p.wait()
 
279
        if exitcode != 0:
 
280
            raise BzrCommandError(gettext("error running patch"))
 
281
        message = c.message
 
282
        if signoff:
 
283
            signed_off_by = wt.branch.get_config().username()
 
284
            message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
 
285
        wt.commit(authors=[c.author], message=message)
 
286
 
 
287
    def run(self, patches_list=None, signoff=False, force=False):
 
288
        from ..errors import UncommittedChanges
 
289
        from ..workingtree import WorkingTree
 
290
        if patches_list is None:
 
291
            patches_list = []
 
292
 
 
293
        tree, _ = WorkingTree.open_containing(".")
 
294
        if tree.basis_tree().changes_from(tree).has_changed() and not force:
 
295
            raise UncommittedChanges(tree)
 
296
        with tree.lock_write():
 
297
            for patch in patches_list:
 
298
                with open(patch, 'r') as f:
 
299
                    self._apply_patch(tree, f, signoff=signoff)
 
300
 
 
301
 
 
302
class cmd_git_push_pristine_tar_deltas(Command):
 
303
    """Push pristine tar deltas to a git repository."""
 
304
 
 
305
    takes_options = [Option('directory',
 
306
                            short_name='d',
 
307
                            help='Location of repository.', type=text_type)]
 
308
    takes_args = ['target', 'package']
 
309
 
 
310
    def run(self, target, package, directory='.'):
 
311
        from ..branch import Branch
 
312
        from ..errors import (
 
313
            BzrCommandError,
 
314
            NoSuchRevision,
 
315
            )
 
316
        from ..trace import warning
 
317
        from ..repository import Repository
 
318
        from .object_store import get_object_store
 
319
        from .pristine_tar import (
 
320
            revision_pristine_tar_data,
 
321
            store_git_pristine_tar_data,
 
322
            )
 
323
        source = Branch.open_containing(directory)[0]
 
324
        target_bzr = Repository.open(target)
 
325
        target = getattr(target_bzr, '_git', None)
 
326
        if target is None:
 
327
            raise BzrCommandError("Target not a git repository")
 
328
        git_store = get_object_store(source.repository)
 
329
        with git_store.lock_read():
 
330
            tag_dict = source.tags.get_tag_dict()
 
331
            for name, revid in tag_dict.iteritems():
 
332
                try:
 
333
                    rev = source.repository.get_revision(revid)
 
334
                except NoSuchRevision:
 
335
                    continue
 
336
                try:
 
337
                    delta, kind = revision_pristine_tar_data(rev)
 
338
                except KeyError:
 
339
                    continue
 
340
                gitid = git_store._lookup_revision_sha1(revid)
 
341
                if (not (name.startswith('upstream/') or
 
342
                         name.startswith('upstream-'))):
 
343
                    warning(
 
344
                        "Unexpected pristine tar revision tagged %s. "
 
345
                        "Ignoring.", name)
 
346
                    continue
 
347
                upstream_version = name[len("upstream/"):]
 
348
                filename = '%s_%s.orig.tar.%s' % (
 
349
                    package, upstream_version, kind)
 
350
                if gitid not in target:
 
351
                    warning(
 
352
                        "base git id %s for %s missing in target repository",
 
353
                        gitid, filename)
 
354
                store_git_pristine_tar_data(target, filename.encode('utf-8'),
 
355
                                            delta, gitid)