/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
2
3
# Authors: Robert Collins <robert.collins@canonical.com>
4
#          Jelmer Vernooij <jelmer@samba.org>
5
#          John Carr <john.carr@unrouted.co.uk>
6
#
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.
11
#
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.
16
#
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
20
21
"""Git-specific subcommands for Bazaar."""
22
0.200.292 by Jelmer Vernooij
Fix formatting.
23
from bzrlib.commands import (
24
    Command,
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
25
    display_command,
0.200.292 by Jelmer Vernooij
Fix formatting.
26
    )
27
from bzrlib.option import (
28
    Option,
29
    )
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
30
0.228.1 by Jelmer Vernooij
Add basic tests for local fetch.
31
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
32
class cmd_git_import(Command):
33
    """Import all branches from a git repository.
34
35
    """
36
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
37
    takes_args = ["src_location", "dest_location?"]
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
38
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
39
    def _get_colocated_branch(self, target_bzrdir, name):
40
        from bzrlib.errors import NotBranchError
41
        try:
42
            return target_bzrdir.open_branch(name=name)
43
        except NotBranchError:
44
            return target_bzrdir.create_branch(name=name)
45
46
    def _get_nested_branch(self, dest_transport, dest_format, name):
47
        from bzrlib.bzrdir import BzrDir
48
        from bzrlib.errors import NotBranchError
49
        head_transport = dest_transport.clone(name)
50
        try:
51
            head_bzrdir = BzrDir.open_from_transport(head_transport)
52
        except NotBranchError:
53
            head_bzrdir = dest_format.initialize_on_transport_ex(
54
                head_transport, create_prefix=True)[1]
55
        try:
56
            return head_bzrdir.open_branch()
57
        except NotBranchError:
58
            return head_bzrdir.create_branch()
59
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
60
    def run(self, src_location, dest_location=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
61
        import os
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
62
        import urllib
0.200.247 by Jelmer Vernooij
Fix git-import.
63
        from bzrlib import (
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
64
            controldir,
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
65
            trace,
0.200.247 by Jelmer Vernooij
Fix git-import.
66
            ui,
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
67
            urlutils,
0.200.247 by Jelmer Vernooij
Fix git-import.
68
            )
69
        from bzrlib.bzrdir import (
70
            BzrDir,
71
            )
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
72
        from bzrlib.errors import (
73
            BzrCommandError,
74
            NoRepositoryPresent,
75
            NotBranchError,
76
            )
0.200.1470 by Jelmer Vernooij
Import gettext from plugin.
77
        from bzrlib.plugins.git import gettext
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
78
        from bzrlib.repository import (
79
            InterRepository,
80
            Repository,
81
            )
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
82
        from bzrlib.transport import get_transport
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
83
        from bzrlib.plugins.git.branch import (
84
            GitBranch,
0.200.1487 by Jelmer Vernooij
Use peeling.
85
            )
86
        from bzrlib.plugins.git.refs import (
87
            ref_to_branch_name,
88
            ref_to_tag_name,
89
            )
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
90
        from bzrlib.plugins.git.repository import GitRepository
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
91
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
92
        dest_format = controldir.ControlDirFormat.get_default_format()
93
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
94
        if dest_location is None:
95
            dest_location = os.path.basename(src_location.rstrip("/\\"))
96
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
97
        dest_transport = get_transport(dest_location)
98
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
99
        source_repo = Repository.open(src_location)
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
100
        if not isinstance(source_repo, GitRepository):
0.200.1483 by Jelmer Vernooij
Translate more strings.
101
            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.
102
        try:
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
103
            target_bzrdir = BzrDir.open_from_transport(dest_transport)
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
104
        except NotBranchError:
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
105
            target_bzrdir = dest_format.initialize_on_transport_ex(
0.200.1142 by Jelmer Vernooij
Fix use of initialize_on_transport_ex.
106
                dest_transport, shared_repo=True)[1]
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
107
        try:
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
108
            target_repo = target_bzrdir.find_repository()
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
109
        except NoRepositoryPresent:
110
            target_repo = target_bzrdir.create_repository(shared=True)
111
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
112
        if not target_repo.supports_rich_root():
0.200.1483 by Jelmer Vernooij
Translate more strings.
113
            raise BzrCommandError(gettext("Target repository doesn't support rich roots"))
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
114
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
115
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.247 by Jelmer Vernooij
Fix git-import.
116
        mapping = source_repo.get_mapping()
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
117
        refs = interrepo.fetch()
0.200.1487 by Jelmer Vernooij
Use peeling.
118
        refs_dict = refs.as_dict()
0.200.247 by Jelmer Vernooij
Fix git-import.
119
        pb = ui.ui_factory.nested_progress_bar()
120
        try:
0.200.1487 by Jelmer Vernooij
Use peeling.
121
            for i, (name, sha) in enumerate(refs_dict.iteritems()):
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
122
                try:
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
123
                    branch_name = ref_to_branch_name(name)
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
124
                except ValueError:
125
                    # Not a branch, ignore
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
126
                    continue
0.200.1487 by Jelmer Vernooij
Use peeling.
127
                pb.update(gettext("creating branches"), i, len(refs_dict))
0.200.1455 by Jelmer Vernooij
Cope with .colocated_branches not being available.
128
                if getattr(target_bzrdir._format, "colocated_branches", False):
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
129
                    if name == "HEAD":
130
                        branch_name = None
131
                    head_branch = self._get_colocated_branch(target_bzrdir, branch_name)
132
                else:
133
                    head_branch = self._get_nested_branch(dest_transport, dest_format, branch_name)
0.200.1487 by Jelmer Vernooij
Use peeling.
134
                revid = mapping.revision_id_foreign_to_bzr(sha)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
135
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
0.200.1487 by Jelmer Vernooij
Use peeling.
136
                    sha)
137
                source_branch.head = sha
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
138
                if head_branch.last_revision() != revid:
139
                    head_branch.generate_revision_history(revid)
0.200.273 by Jelmer Vernooij
Fix import of tags in git-import.
140
                source_branch.tags.merge_to(head_branch.tags)
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
141
                if not head_branch.get_parent():
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
142
                    url = urlutils.join_segment_parameters(
143
                        source_branch.base, {"ref": urllib.quote(name, '')})
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
144
                    head_branch.set_parent(url)
0.200.247 by Jelmer Vernooij
Fix git-import.
145
        finally:
146
            pb.finished()
0.200.1469 by Jelmer Vernooij
Add more strings.
147
        trace.note(gettext(
148
            "Use 'bzr checkout' to create a working tree in "
149
            "the newly created branches."))
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
150
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
151
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
152
class cmd_git_object(Command):
153
    """List or display Git objects by SHA.
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
154
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
155
    Cat a particular object's Git representation if a SHA is specified.
156
    List all available SHAs otherwise.
157
    """
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
158
159
    hidden = True
160
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
161
    aliases = ["git-objects", "git-cat"]
162
    takes_args = ["sha1?"]
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
163
    takes_options = [Option('directory',
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
164
        short_name='d',
0.200.424 by Jelmer Vernooij
Fix formatting.
165
        help='Location of repository.', type=unicode),
166
        Option('pretty', help='Pretty-print objects.')]
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
167
    encoding_type = 'exact'
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
168
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
169
    @display_command
170
    def run(self, sha1=None, directory=".", pretty=False):
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
171
        from bzrlib.errors import (
172
            BzrCommandError,
173
            )
174
        from bzrlib.bzrdir import (
175
            BzrDir,
176
            )
0.200.1484 by Jelmer Vernooij
Fix import.
177
        from bzrlib.plugins.git.object_store import (
178
            get_object_store,
179
            )
180
        from bzrlib.plugins.git import gettext
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
181
        bzrdir, _ = BzrDir.open_containing(directory)
182
        repo = bzrdir.find_repository()
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
183
        object_store = get_object_store(repo)
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
184
        object_store.lock_read()
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
185
        try:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
186
            if sha1 is not None:
187
                try:
0.200.532 by Jelmer Vernooij
The object store requires plain strings.
188
                    obj = object_store[str(sha1)]
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
189
                except KeyError:
0.200.1483 by Jelmer Vernooij
Translate more strings.
190
                    raise BzrCommandError(gettext("Object not found: %s") % sha1)
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
191
                if pretty:
192
                    text = obj.as_pretty_string()
193
                else:
194
                    text = obj.as_raw_string()
195
                self.outf.write(text)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
196
            else:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
197
                for sha1 in object_store:
198
                    self.outf.write("%s\n" % sha1)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
199
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
200
            object_store.unlock()
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
201
202
203
class cmd_git_refs(Command):
204
    """Output all of the virtual refs for a repository.
205
206
    """
207
208
    hidden = True
209
210
    takes_options = [Option('directory',
211
        short_name='d',
212
        help='Location of repository.', type=unicode)]
213
214
    @display_command
215
    def run(self, directory="."):
216
        from bzrlib.bzrdir import (
217
            BzrDir,
218
            )
219
        from bzrlib.plugins.git.refs import (
0.200.1487 by Jelmer Vernooij
Use peeling.
220
            get_refs_container,
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
221
            )
222
        from bzrlib.plugins.git.object_store import (
223
            get_object_store,
224
            )
225
        bzrdir, _ = BzrDir.open_containing(directory)
226
        repo = bzrdir.find_repository()
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
227
        object_store = get_object_store(repo)
228
        object_store.lock_read()
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
229
        try:
0.200.1487 by Jelmer Vernooij
Use peeling.
230
            refs = get_refs_container(bzrdir)
231
            for k, v in refs.as_dict().iteritems():
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
232
                self.outf.write("%s -> %s\n" % (k, v))
233
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
234
            object_store.unlock()
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
235
236
237
class cmd_git_apply(Command):
238
    """Apply a series of git-am style patches.
239
240
    This command will in the future probably be integrated into 
241
    "bzr pull".
242
    """
243
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
244
    takes_options = [
245
        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
246
        Option('force',
247
            help='Apply patches even if tree has uncommitted changes.')
248
        ]
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
249
    takes_args = ["patches*"]
250
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
251
    def _apply_patch(self, wt, f, signoff):
252
        """Apply a patch.
253
254
        :param wt: A Bazaar working tree object.
255
        :param f: Patch file to read.
256
        :param signoff: Add Signed-Off-By flag.
257
        """
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
258
        from bzrlib.errors import BzrCommandError
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
259
        from dulwich.patch import git_am_patch_split
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
260
        import subprocess
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
261
        (c, diff, version) = git_am_patch_split(f)
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
262
        # FIXME: Cope with git-specific bits in patch
0.200.1298 by Jelmer Vernooij
Fix compatibility with newer versions of dulwich.
263
        # FIXME: Add new files to working tree
264
        p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE,
265
            cwd=wt.basedir)
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
266
        p.communicate(diff)
267
        exitcode = p.wait()
268
        if exitcode != 0:
0.200.1483 by Jelmer Vernooij
Translate more strings.
269
            raise BzrCommandError(gettext("error running patch"))
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
270
        message = c.message
271
        if signoff:
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)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
275
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
276
    def run(self, patches_list=None, signoff=False, force=False):
0.200.1040 by Jelmer Vernooij
Error out about applying to a tree with changes.
277
        from bzrlib.errors import UncommittedChanges
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
278
        from bzrlib.workingtree import WorkingTree
279
        if patches_list is None:
280
            patches_list = []
0.200.1040 by Jelmer Vernooij
Error out about applying to a tree with changes.
281
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
282
        tree, _ = WorkingTree.open_containing(".")
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
283
        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.
284
            raise UncommittedChanges(tree)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
285
        tree.lock_write()
286
        try:
287
            for patch in patches_list:
288
                f = open(patch, 'r')
289
                try:
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
290
                    self._apply_patch(tree, f, signoff=signoff)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
291
                finally:
292
                    f.close()
293
        finally:
294
            tree.unlock()