/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.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
39
    def run(self, src_location, dest_location=None):
0.200.247 by Jelmer Vernooij
Fix git-import.
40
        import os
41
        from bzrlib import (
42
            ui,
43
            urlutils,
44
            )
45
        from bzrlib.bzrdir import (
46
            BzrDir,
47
            )
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
48
        from bzrlib.errors import (
49
            BzrCommandError,
50
            NoRepositoryPresent,
51
            NotBranchError,
52
            )
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
53
        from bzrlib.repository import (
54
            InterRepository,
55
            Repository,
56
            )
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
57
        from bzrlib.plugins.git.branch import (
58
            GitBranch,
59
            extract_tags,
60
            )
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
61
        from bzrlib.plugins.git.repository import GitRepository
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
62
63
        if dest_location is None:
64
            dest_location = os.path.basename(src_location.rstrip("/\\"))
65
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
66
        source_repo = Repository.open(src_location)
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
67
        if not isinstance(source_repo, GitRepository):
68
            raise BzrCommandError("%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.
69
        try:
70
            target_bzrdir = BzrDir.open(dest_location)
71
        except NotBranchError:
0.200.927 by Jelmer Vernooij
Remove explicit use of rich root formats.
72
            target_bzrdir = BzrDir.create(dest_location)
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
73
        try:
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
74
            target_repo = target_bzrdir.find_repository()
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
75
        except NoRepositoryPresent:
76
            target_repo = target_bzrdir.create_repository(shared=True)
77
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
78
        if not target_repo.supports_rich_root():
79
            raise BzrCommandError("Target repository doesn't support rich roots")
80
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
81
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.247 by Jelmer Vernooij
Fix git-import.
82
        mapping = source_repo.get_mapping()
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
83
        refs = interrepo.fetch()
0.200.648 by Jelmer Vernooij
Fix tag handling when encountering packed refs.
84
        tags = {}
85
        for k, v in extract_tags(refs).iteritems():
86
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
0.200.247 by Jelmer Vernooij
Fix git-import.
87
        pb = ui.ui_factory.nested_progress_bar()
88
        try:
89
            for i, (name, ref) in enumerate(refs.iteritems()):
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
90
                if name.startswith("refs/tags/"):
91
                    continue
0.200.247 by Jelmer Vernooij
Fix git-import.
92
                pb.update("creating branches", i, len(refs))
93
                head_loc = os.path.join(dest_location, name)
94
                try:
95
                    head_bzrdir = BzrDir.open(head_loc)
96
                except NotBranchError:
97
                    parent_path = urlutils.dirname(head_loc)
98
                    if not os.path.isdir(parent_path):
99
                        os.makedirs(parent_path)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
100
                    head_bzrdir = BzrDir.create(head_loc)
0.200.247 by Jelmer Vernooij
Fix git-import.
101
                try:
102
                    head_branch = head_bzrdir.open_branch()
103
                except NotBranchError:
104
                    head_branch = head_bzrdir.create_branch()
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
105
                revid = mapping.revision_id_foreign_to_bzr(ref)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
106
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
107
                    name, None, tags)
0.200.488 by Jelmer Vernooij
Fix git-import.
108
                source_branch.head = ref
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
109
                if head_branch.last_revision() != revid:
110
                    head_branch.generate_revision_history(revid)
0.200.273 by Jelmer Vernooij
Fix import of tags in git-import.
111
                source_branch.tags.merge_to(head_branch.tags)
0.200.247 by Jelmer Vernooij
Fix git-import.
112
        finally:
113
            pb.finished()
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
114
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
115
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
116
class cmd_git_object(Command):
117
    """List or display Git objects by SHA.
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
118
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
119
    Cat a particular object's Git representation if a SHA is specified.
120
    List all available SHAs otherwise.
121
    """
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
122
123
    hidden = True
124
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
125
    aliases = ["git-objects", "git-cat"]
126
    takes_args = ["sha1?"]
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
127
    takes_options = [Option('directory',
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
128
        short_name='d',
0.200.424 by Jelmer Vernooij
Fix formatting.
129
        help='Location of repository.', type=unicode),
130
        Option('pretty', help='Pretty-print objects.')]
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
131
    encoding_type = 'exact'
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
132
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
133
    @display_command
134
    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.
135
        from bzrlib.errors import (
136
            BzrCommandError,
137
            )
138
        from bzrlib.bzrdir import (
139
            BzrDir,
140
            )
141
        bzrdir, _ = BzrDir.open_containing(directory)
142
        repo = bzrdir.find_repository()
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
143
        from bzrlib.plugins.git.object_store import (
144
            get_object_store,
145
            )
146
        object_store = get_object_store(repo)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
147
        repo.lock_read()
148
        try:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
149
            if sha1 is not None:
150
                try:
0.200.532 by Jelmer Vernooij
The object store requires plain strings.
151
                    obj = object_store[str(sha1)]
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
152
                except KeyError:
153
                    raise BzrCommandError("Object not found: %s" % sha1)
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
154
                if pretty:
155
                    text = obj.as_pretty_string()
156
                else:
157
                    text = obj.as_raw_string()
158
                self.outf.write(text)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
159
            else:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
160
                for sha1 in object_store:
161
                    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.
162
        finally:
163
            repo.unlock()
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
164
165
166
class cmd_git_refs(Command):
167
    """Output all of the virtual refs for a repository.
168
169
    """
170
171
    hidden = True
172
173
    takes_options = [Option('directory',
174
        short_name='d',
175
        help='Location of repository.', type=unicode)]
176
177
    @display_command
178
    def run(self, directory="."):
179
        from bzrlib.bzrdir import (
180
            BzrDir,
181
            )
182
        from bzrlib.plugins.git.refs import (
183
            BazaarRefsContainer,
184
            )
185
        from bzrlib.plugins.git.object_store import (
186
            get_object_store,
187
            )
188
        bzrdir, _ = BzrDir.open_containing(directory)
189
        repo = bzrdir.find_repository()
190
        repo.lock_read()
191
        try:
192
            object_store = get_object_store(repo)
193
            refs = BazaarRefsContainer(bzrdir, object_store)
194
            for k, v in refs.as_dict().iteritems():
195
                self.outf.write("%s -> %s\n" % (k, v))
196
        finally:
197
            repo.unlock()
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
198
199
200
class cmd_git_apply(Command):
201
    """Apply a series of git-am style patches.
202
203
    This command will in the future probably be integrated into 
204
    "bzr pull".
205
    """
206
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
207
    takes_options = [
208
        Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
209
        'force']
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
210
    takes_args = ["patches*"]
211
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
212
    def _apply_patch(self, wt, f, signoff):
213
        """Apply a patch.
214
215
        :param wt: A Bazaar working tree object.
216
        :param f: Patch file to read.
217
        :param signoff: Add Signed-Off-By flag.
218
        """
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
219
        from bzrlib.errors import BzrCommandError
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
220
        from dulwich.patch import git_am_patch_split
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
221
        import subprocess
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
222
        (c, diff, version) = git_am_patch_split(f)
0.200.1043 by Jelmer Vernooij
Finish git-apply command.
223
        # FIXME: Cope with git-specific bits in patch
224
        p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE, cwd=wt.basedir)
225
        p.communicate(diff)
226
        exitcode = p.wait()
227
        if exitcode != 0:
228
            raise BzrCommandError("error running patch")
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
229
        message = c.message
230
        if signoff:
231
            signed_off_by = wt.branch.get_config().username()
232
            message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
233
        wt.commit(authors=[c.author], message=message)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
234
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
235
    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.
236
        from bzrlib.errors import UncommittedChanges
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
237
        from bzrlib.workingtree import WorkingTree
238
        if patches_list is None:
239
            patches_list = []
0.200.1040 by Jelmer Vernooij
Error out about applying to a tree with changes.
240
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
241
        tree, _ = WorkingTree.open_containing(".")
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
242
        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.
243
            raise UncommittedChanges(tree)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
244
        tree.lock_write()
245
        try:
246
            for patch in patches_list:
247
                f = open(patch, 'r')
248
                try:
0.200.1049 by Jelmer Vernooij
Add --signoff option to 'bzr git-apply'.
249
                    self._apply_patch(tree, f, signoff=signoff)
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
250
                finally:
251
                    f.close()
252
        finally:
253
            tree.unlock()