/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
1
# Copyright (C) 2006-2009 Canonical Ltd
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
2
# Copyright (C) 2012-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
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
0.358.1 by Jelmer Vernooij
Fix FSF address.
20
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
21
22
"""Git-specific subcommands for Bazaar."""
23
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
24
from __future__ import absolute_import
25
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
26
import breezy.bzr  # noqa: F401
7371.2.1 by Jelmer Vernooij
Fix importing from remote git repositories.
27
from breezy import controldir
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
28
from ..commands import (
0.200.292 by Jelmer Vernooij
Fix formatting.
29
    Command,
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
30
    display_command,
0.200.292 by Jelmer Vernooij
Fix formatting.
31
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
32
from ..option import (
0.200.292 by Jelmer Vernooij
Fix formatting.
33
    Option,
7371.2.1 by Jelmer Vernooij
Fix importing from remote git repositories.
34
    RegistryOption,
0.200.292 by Jelmer Vernooij
Fix formatting.
35
    )
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
36
0.228.1 by Jelmer Vernooij
Add basic tests for local fetch.
37
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
38
class cmd_git_import(Command):
39
    """Import all branches from a git repository.
40
41
    """
42
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
43
    takes_args = ["src_location", "dest_location?"]
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
44
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
45
    takes_options = [
7143.15.2 by Jelmer Vernooij
Run autopep8.
46
        Option('colocated', help='Create colocated branches.'),
7371.2.1 by Jelmer Vernooij
Fix importing from remote git repositories.
47
        RegistryOption('dest-format',
48
                       help='Specify a format for this branch. '
49
                       'See "help formats" for a full list.',
50
                       lazy_registry=('breezy.controldir', 'format_registry'),
51
                       converter=lambda name: controldir.format_registry.make_controldir(
52
                            name),
53
                       value_switches=True,
54
                       title="Branch format",
55
                       ),
7143.15.2 by Jelmer Vernooij
Run autopep8.
56
        ]
0.200.1609 by Jelmer Vernooij
Only create colocated branches in git-import if the --colocated option is specified.
57
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
58
    def _get_colocated_branch(self, target_controldir, name):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
59
        from ..errors import NotBranchError
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
60
        try:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
61
            return target_controldir.open_branch(name=name)
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
62
        except NotBranchError:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
63
            return target_controldir.create_branch(name=name)
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
64
65
    def _get_nested_branch(self, dest_transport, dest_format, name):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
66
        from ..controldir import ControlDir
67
        from ..errors import NotBranchError
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
68
        head_transport = dest_transport.clone(name)
69
        try:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
70
            head_controldir = ControlDir.open_from_transport(head_transport)
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
71
        except NotBranchError:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
72
            head_controldir = dest_format.initialize_on_transport_ex(
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
73
                head_transport, create_prefix=True)[1]
74
        try:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
75
            return head_controldir.open_branch()
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
76
        except NotBranchError:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
77
            return head_controldir.create_branch()
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
78
7371.2.1 by Jelmer Vernooij
Fix importing from remote git repositories.
79
    def run(self, src_location, dest_location=None, colocated=False, dest_format=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
80
        import os
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
81
        from .. import (
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
82
            controldir,
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
83
            trace,
0.200.247 by Jelmer Vernooij
Fix git-import.
84
            ui,
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
85
            urlutils,
0.200.247 by Jelmer Vernooij
Fix git-import.
86
            )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
87
        from ..controldir import (
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
88
            ControlDir,
0.200.247 by Jelmer Vernooij
Fix git-import.
89
            )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
90
        from ..errors import (
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
91
            BzrError,
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
92
            BzrCommandError,
93
            NoRepositoryPresent,
94
            NotBranchError,
95
            )
7143.11.5 by Jelmer Vernooij
Fix an import.
96
        from ..i18n import gettext
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
97
        from ..repository import (
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
98
            InterRepository,
99
            Repository,
100
            )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
101
        from ..transport import get_transport
0.200.1644 by Jelmer Vernooij
More relative imports.
102
        from .branch import (
0.295.1 by Jelmer Vernooij
Split up branch formats.
103
            LocalGitBranch,
0.200.1487 by Jelmer Vernooij
Use peeling.
104
            )
0.200.1644 by Jelmer Vernooij
More relative imports.
105
        from .refs import (
0.200.1487 by Jelmer Vernooij
Use peeling.
106
            ref_to_branch_name,
107
            )
0.200.1644 by Jelmer Vernooij
More relative imports.
108
        from .repository import GitRepository
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
109
0.361.1 by Jelmer Vernooij
Don't use assert.
110
        if dest_format is None:
7371.2.1 by Jelmer Vernooij
Fix importing from remote git repositories.
111
            dest_format = controldir.format_registry.make_controldir('default')
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
112
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
113
        if dest_location is None:
114
            dest_location = os.path.basename(src_location.rstrip("/\\"))
115
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
116
        dest_transport = get_transport(dest_location)
117
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
118
        source_repo = Repository.open(src_location)
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
119
        if not isinstance(source_repo, GitRepository):
7143.15.2 by Jelmer Vernooij
Run autopep8.
120
            raise BzrCommandError(
121
                gettext("%r is not a git repository") % src_location)
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
122
        try:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
123
            target_controldir = ControlDir.open_from_transport(dest_transport)
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
124
        except NotBranchError:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
125
            target_controldir = dest_format.initialize_on_transport_ex(
0.200.1142 by Jelmer Vernooij
Fix use of initialize_on_transport_ex.
126
                dest_transport, shared_repo=True)[1]
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
127
        try:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
128
            target_repo = target_controldir.find_repository()
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
129
        except NoRepositoryPresent:
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
130
            target_repo = target_controldir.create_repository(shared=True)
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
131
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
132
        if not target_repo.supports_rich_root():
7143.15.2 by Jelmer Vernooij
Run autopep8.
133
            raise BzrCommandError(
134
                gettext("Target repository doesn't support rich roots"))
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
135
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
136
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.247 by Jelmer Vernooij
Fix git-import.
137
        mapping = source_repo.get_mapping()
7455.2.3 by Jelmer Vernooij
Fix remaining tests.
138
        result = interrepo.fetch()
7143.22.2 by Jelmer Vernooij
use more context libs for progress bars.
139
        with ui.ui_factory.nested_progress_bar() as pb:
7479.2.1 by Jelmer Vernooij
Drop python2 support.
140
            for i, (name, sha) in enumerate(result.refs.items()):
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
141
                try:
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
142
                    branch_name = ref_to_branch_name(name)
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
143
                except ValueError:
144
                    # Not a branch, ignore
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
145
                    continue
7455.2.3 by Jelmer Vernooij
Fix remaining tests.
146
                pb.update(gettext("creating branches"), i, len(result.refs))
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
147
                if (getattr(target_controldir._format, "colocated_branches",
148
                            False) and colocated):
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
149
                    if name == "HEAD":
150
                        branch_name = None
7143.15.2 by Jelmer Vernooij
Run autopep8.
151
                    head_branch = self._get_colocated_branch(
152
                        target_controldir, branch_name)
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
153
                else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
154
                    head_branch = self._get_nested_branch(
155
                        dest_transport, dest_format, branch_name)
0.200.1487 by Jelmer Vernooij
Use peeling.
156
                revid = mapping.revision_id_foreign_to_bzr(sha)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
157
                source_branch = LocalGitBranch(
158
                    source_repo.controldir, source_repo, sha)
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
159
                if head_branch.last_revision() != revid:
160
                    head_branch.generate_revision_history(revid)
0.200.273 by Jelmer Vernooij
Fix import of tags in git-import.
161
                source_branch.tags.merge_to(head_branch.tags)
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
162
                if not head_branch.get_parent():
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
163
                    url = urlutils.join_segment_parameters(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
164
                        source_branch.base,
165
                        {"branch": urlutils.escape(branch_name)})
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
166
                    head_branch.set_parent(url)
0.200.1469 by Jelmer Vernooij
Add more strings.
167
        trace.note(gettext(
168
            "Use 'bzr checkout' to create a working tree in "
169
            "the newly created branches."))
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
170
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
171
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
172
class cmd_git_object(Command):
173
    """List or display Git objects by SHA.
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
174
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
175
    Cat a particular object's Git representation if a SHA is specified.
176
    List all available SHAs otherwise.
177
    """
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
178
179
    hidden = True
180
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
181
    aliases = ["git-objects", "git-cat"]
182
    takes_args = ["sha1?"]
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
183
    takes_options = [Option('directory',
7143.15.2 by Jelmer Vernooij
Run autopep8.
184
                            short_name='d',
7479.2.1 by Jelmer Vernooij
Drop python2 support.
185
                            help='Location of repository.', type=str),
7143.15.2 by Jelmer Vernooij
Run autopep8.
186
                     Option('pretty', help='Pretty-print objects.')]
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
187
    encoding_type = 'exact'
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
188
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
189
    @display_command
190
    def run(self, sha1=None, directory=".", pretty=False):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
191
        from ..errors import (
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
192
            BzrCommandError,
193
            )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
194
        from ..controldir import (
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
195
            ControlDir,
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
196
            )
0.200.1644 by Jelmer Vernooij
More relative imports.
197
        from .object_store import (
0.200.1484 by Jelmer Vernooij
Fix import.
198
            get_object_store,
199
            )
7233.2.1 by Jelmer Vernooij
Fix import for git-objects.
200
        from ..i18n import gettext
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
201
        controldir, _ = ControlDir.open_containing(directory)
202
        repo = controldir.find_repository()
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
203
        object_store = get_object_store(repo)
0.200.1788 by Jelmer Vernooij
Use context managers.
204
        with object_store.lock_read():
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
205
            if sha1 is not None:
206
                try:
7233.2.2 by Jelmer Vernooij
Fix python3 compat.
207
                    obj = object_store[sha1.encode('ascii')]
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
208
                except KeyError:
7143.15.2 by Jelmer Vernooij
Run autopep8.
209
                    raise BzrCommandError(
210
                        gettext("Object not found: %s") % sha1)
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
211
                if pretty:
212
                    text = obj.as_pretty_string()
213
                else:
214
                    text = obj.as_raw_string()
215
                self.outf.write(text)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
216
            else:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
217
                for sha1 in object_store:
7233.2.2 by Jelmer Vernooij
Fix python3 compat.
218
                    self.outf.write("%s\n" % sha1.decode('ascii'))
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
219
220
221
class cmd_git_refs(Command):
222
    """Output all of the virtual refs for a repository.
223
224
    """
225
226
    hidden = True
227
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
228
    takes_args = ["location?"]
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
229
230
    @display_command
0.200.1521 by Jelmer Vernooij
Fix git-refs command.
231
    def run(self, location="."):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
232
        from ..controldir import (
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
233
            ControlDir,
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
234
            )
0.200.1644 by Jelmer Vernooij
More relative imports.
235
        from .refs import (
0.200.1487 by Jelmer Vernooij
Use peeling.
236
            get_refs_container,
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
237
            )
0.200.1644 by Jelmer Vernooij
More relative imports.
238
        from .object_store import (
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
239
            get_object_store,
240
            )
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
241
        controldir, _ = ControlDir.open_containing(location)
242
        repo = controldir.find_repository()
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
243
        object_store = get_object_store(repo)
0.200.1788 by Jelmer Vernooij
Use context managers.
244
        with object_store.lock_read():
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
245
            refs = get_refs_container(controldir, object_store)
7479.2.1 by Jelmer Vernooij
Drop python2 support.
246
            for k, v in sorted(refs.as_dict().items()):
7143.15.2 by Jelmer Vernooij
Run autopep8.
247
                self.outf.write("%s -> %s\n" %
248
                                (k.decode('utf-8'), v.decode('utf-8')))
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
249
250
251
class cmd_git_apply(Command):
252
    """Apply a series of git-am style patches.
253
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
254
    This command will in the future probably be integrated into "bzr pull".
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
255
    """
256
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
257
    takes_options = [
258
        Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
0.272.1 by Martin Packman
Add help for git-apply --force option
259
        Option('force',
7143.15.2 by Jelmer Vernooij
Run autopep8.
260
               help='Apply patches even if tree has uncommitted changes.')
0.272.1 by Martin Packman
Add help for git-apply --force option
261
        ]
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
262
    takes_args = ["patches*"]
263
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
264
    def _apply_patch(self, wt, f, signoff):
265
        """Apply a patch.
266
267
        :param wt: A Bazaar working tree object.
268
        :param f: Patch file to read.
269
        :param signoff: Add Signed-Off-By flag.
270
        """
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
271
        from dulwich.patch import git_am_patch_split
7296.6.1 by Jelmer Vernooij
use standard patch functions.
272
        from breezy.patch import patch_tree
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
273
        (c, diff, version) = git_am_patch_split(f)
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
274
        # FIXME: Cope with git-specific bits in patch
0.200.1298 by Jelmer Vernooij
Fix compatibility with newer versions of dulwich.
275
        # FIXME: Add new files to working tree
7296.6.1 by Jelmer Vernooij
use standard patch functions.
276
        patch_tree(wt, [diff], strip=1, out=self.outf)
7268.7.1 by Jelmer Vernooij
Fix git-apply.
277
        message = c.message.decode('utf-8')
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
278
        if signoff:
279
            signed_off_by = wt.branch.get_config().username()
7268.7.1 by Jelmer Vernooij
Fix git-apply.
280
            message += "Signed-off-by: %s\n" % (signed_off_by, )
281
        wt.commit(authors=[c.author.decode('utf-8')], message=message)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
282
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
283
    def run(self, patches_list=None, signoff=False, force=False):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
284
        from ..errors import UncommittedChanges
285
        from ..workingtree import WorkingTree
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
286
        if patches_list is None:
287
            patches_list = []
0.200.1040 by Jelmer Vernooij
Error out about applying to a tree with changes.
288
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
289
        tree, _ = WorkingTree.open_containing(".")
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
290
        if tree.basis_tree().changes_from(tree).has_changed() and not force:
0.200.1040 by Jelmer Vernooij
Error out about applying to a tree with changes.
291
            raise UncommittedChanges(tree)
0.200.1788 by Jelmer Vernooij
Use context managers.
292
        with tree.lock_write():
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
293
            for patch in patches_list:
0.200.1788 by Jelmer Vernooij
Use context managers.
294
                with open(patch, 'r') as f:
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
295
                    self._apply_patch(tree, f, signoff=signoff)
0.277.6 by Jelmer Vernooij
Add 'bzr git-push-pristine-tar' command.
296
297
298
class cmd_git_push_pristine_tar_deltas(Command):
299
    """Push pristine tar deltas to a git repository."""
300
301
    takes_options = [Option('directory',
7143.15.2 by Jelmer Vernooij
Run autopep8.
302
                            short_name='d',
7479.2.1 by Jelmer Vernooij
Drop python2 support.
303
                            help='Location of repository.', type=str)]
0.277.6 by Jelmer Vernooij
Add 'bzr git-push-pristine-tar' command.
304
    takes_args = ['target', 'package']
305
306
    def run(self, target, package, directory='.'):
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
307
        from ..branch import Branch
308
        from ..errors import (
0.277.6 by Jelmer Vernooij
Add 'bzr git-push-pristine-tar' command.
309
            BzrCommandError,
310
            NoSuchRevision,
311
            )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
312
        from ..trace import warning
313
        from ..repository import Repository
0.200.1644 by Jelmer Vernooij
More relative imports.
314
        from .object_store import get_object_store
315
        from .pristine_tar import (
0.277.6 by Jelmer Vernooij
Add 'bzr git-push-pristine-tar' command.
316
            revision_pristine_tar_data,
317
            store_git_pristine_tar_data,
318
            )
319
        source = Branch.open_containing(directory)[0]
320
        target_bzr = Repository.open(target)
321
        target = getattr(target_bzr, '_git', None)
322
        if target is None:
323
            raise BzrCommandError("Target not a git repository")
0.200.1788 by Jelmer Vernooij
Use context managers.
324
        git_store = get_object_store(source.repository)
325
        with git_store.lock_read():
326
            tag_dict = source.tags.get_tag_dict()
327
            for name, revid in tag_dict.iteritems():
328
                try:
329
                    rev = source.repository.get_revision(revid)
330
                except NoSuchRevision:
331
                    continue
332
                try:
333
                    delta, kind = revision_pristine_tar_data(rev)
334
                except KeyError:
335
                    continue
336
                gitid = git_store._lookup_revision_sha1(revid)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
337
                if (not (name.startswith('upstream/') or
338
                         name.startswith('upstream-'))):
339
                    warning(
340
                        "Unexpected pristine tar revision tagged %s. "
341
                        "Ignoring.", name)
0.200.1788 by Jelmer Vernooij
Use context managers.
342
                    continue
343
                upstream_version = name[len("upstream/"):]
7143.15.2 by Jelmer Vernooij
Run autopep8.
344
                filename = '%s_%s.orig.tar.%s' % (
345
                    package, upstream_version, kind)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
346
                if gitid not in target:
347
                    warning(
348
                        "base git id %s for %s missing in target repository",
349
                        gitid, filename)
0.200.1788 by Jelmer Vernooij
Use context managers.
350
                store_git_pristine_tar_data(target, filename.encode('utf-8'),
7143.15.2 by Jelmer Vernooij
Run autopep8.
351
                                            delta, gitid)