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