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