/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.1061 by Jelmer Vernooij
Add support for using unpeel map.
61
        from collections import defaultdict
0.200.247 by Jelmer Vernooij
Fix git-import.
62
        import os
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
63
        import urllib
0.200.247 by Jelmer Vernooij
Fix git-import.
64
        from bzrlib import (
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
65
            controldir,
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
66
            trace,
0.200.247 by Jelmer Vernooij
Fix git-import.
67
            ui,
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
68
            urlutils,
0.200.247 by Jelmer Vernooij
Fix git-import.
69
            )
70
        from bzrlib.bzrdir import (
71
            BzrDir,
72
            )
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
73
        from bzrlib.errors import (
74
            BzrCommandError,
75
            NoRepositoryPresent,
76
            NotBranchError,
77
            )
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,
85
            extract_tags,
86
            )
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
87
        from bzrlib.plugins.git.refs import ref_to_branch_name
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
88
        from bzrlib.plugins.git.repository import GitRepository
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
89
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
90
        dest_format = controldir.ControlDirFormat.get_default_format()
91
0.200.234 by Jelmer Vernooij
Derive to_location from from_location, simialr to bzr branch.
92
        if dest_location is None:
93
            dest_location = os.path.basename(src_location.rstrip("/\\"))
94
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
95
        dest_transport = get_transport(dest_location)
96
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
97
        source_repo = Repository.open(src_location)
0.200.243 by Jelmer Vernooij
Error out on non-git repositories.
98
        if not isinstance(source_repo, GitRepository):
99
            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.
100
        try:
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
101
            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.
102
        except NotBranchError:
0.200.1141 by Jelmer Vernooij
Use transports in git-import.
103
            target_bzrdir = dest_format.initialize_on_transport_ex(
0.200.1142 by Jelmer Vernooij
Fix use of initialize_on_transport_ex.
104
                dest_transport, shared_repo=True)[1]
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
105
        try:
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
106
            target_repo = target_bzrdir.find_repository()
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
107
        except NoRepositoryPresent:
108
            target_repo = target_bzrdir.create_repository(shared=True)
109
0.200.569 by Jelmer Vernooij
Check for rich root target repository.
110
        if not target_repo.supports_rich_root():
111
            raise BzrCommandError("Target repository doesn't support rich roots")
112
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
113
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.247 by Jelmer Vernooij
Fix git-import.
114
        mapping = source_repo.get_mapping()
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
115
        refs = interrepo.fetch()
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
116
        unpeeled_tags = defaultdict(set)
0.200.648 by Jelmer Vernooij
Fix tag handling when encountering packed refs.
117
        tags = {}
0.200.1060 by Jelmer Vernooij
Return unpeeled tags in extract_tags.
118
        for k, (peeled, unpeeled) in extract_tags(refs).iteritems():
119
            tags[k] = mapping.revision_id_foreign_to_bzr(peeled)
120
            if unpeeled is not None:
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
121
                unpeeled_tags[peeled].add(unpeeled)
122
        # FIXME: Store unpeeled tag map
0.200.247 by Jelmer Vernooij
Fix git-import.
123
        pb = ui.ui_factory.nested_progress_bar()
124
        try:
125
            for i, (name, ref) in enumerate(refs.iteritems()):
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
126
                try:
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
127
                    branch_name = ref_to_branch_name(name)
0.200.1055 by Jelmer Vernooij
Cope with unknown refs.
128
                except ValueError:
129
                    # Not a branch, ignore
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
130
                    continue
0.200.247 by Jelmer Vernooij
Fix git-import.
131
                pb.update("creating branches", i, len(refs))
0.200.1455 by Jelmer Vernooij
Cope with .colocated_branches not being available.
132
                if getattr(target_bzrdir._format, "colocated_branches", False):
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
133
                    if name == "HEAD":
134
                        branch_name = None
135
                    head_branch = self._get_colocated_branch(target_bzrdir, branch_name)
136
                else:
137
                    head_branch = self._get_nested_branch(dest_transport, dest_format, branch_name)
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
138
                revid = mapping.revision_id_foreign_to_bzr(ref)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
139
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
0.200.1450 by Jelmer Vernooij
Fix git-import after branch refactoring.
140
                    ref, tags)
0.200.488 by Jelmer Vernooij
Fix git-import.
141
                source_branch.head = ref
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
142
                if head_branch.last_revision() != revid:
143
                    head_branch.generate_revision_history(revid)
0.200.273 by Jelmer Vernooij
Fix import of tags in git-import.
144
                source_branch.tags.merge_to(head_branch.tags)
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
145
                if not head_branch.get_parent():
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
146
                    url = urlutils.join_segment_parameters(
147
                        source_branch.base, {"ref": urllib.quote(name, '')})
0.200.1390 by Jelmer Vernooij
Set parent path in git-import.
148
                    head_branch.set_parent(url)
0.200.247 by Jelmer Vernooij
Fix git-import.
149
        finally:
150
            pb.finished()
0.200.1143 by Jelmer Vernooij
Add note about creating working trees.
151
        trace.note("Use 'bzr checkout' to create a working tree in "
152
                   "the newly created branches.")
153
0.200.206 by Jelmer Vernooij
Move commands to a separate python module and register them lazily.
154
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
155
class cmd_git_object(Command):
156
    """List or display Git objects by SHA.
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
157
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
158
    Cat a particular object's Git representation if a SHA is specified.
159
    List all available SHAs otherwise.
160
    """
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
161
162
    hidden = True
163
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
164
    aliases = ["git-objects", "git-cat"]
165
    takes_args = ["sha1?"]
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
166
    takes_options = [Option('directory',
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
167
        short_name='d',
0.200.424 by Jelmer Vernooij
Fix formatting.
168
        help='Location of repository.', type=unicode),
169
        Option('pretty', help='Pretty-print objects.')]
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
170
    encoding_type = 'exact'
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
171
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
172
    @display_command
173
    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.
174
        from bzrlib.errors import (
175
            BzrCommandError,
176
            )
177
        from bzrlib.bzrdir import (
178
            BzrDir,
179
            )
180
        bzrdir, _ = BzrDir.open_containing(directory)
181
        repo = bzrdir.find_repository()
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
182
        from bzrlib.plugins.git.object_store import (
183
            get_object_store,
184
            )
185
        object_store = get_object_store(repo)
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
186
        object_store.lock_read()
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
187
        try:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
188
            if sha1 is not None:
189
                try:
0.200.532 by Jelmer Vernooij
The object store requires plain strings.
190
                    obj = object_store[str(sha1)]
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
191
                except KeyError:
192
                    raise BzrCommandError("Object not found: %s" % sha1)
0.200.423 by Jelmer Vernooij
Support pretty-printing git objects.
193
                if pretty:
194
                    text = obj.as_pretty_string()
195
                else:
196
                    text = obj.as_raw_string()
197
                self.outf.write(text)
0.200.419 by Jelmer Vernooij
Add hidden git-cat command that can cat git objects from Bazaar repositories.
198
            else:
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
199
                for sha1 in object_store:
200
                    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.
201
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
202
            object_store.unlock()
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
203
204
205
class cmd_git_refs(Command):
206
    """Output all of the virtual refs for a repository.
207
208
    """
209
210
    hidden = True
211
212
    takes_options = [Option('directory',
213
        short_name='d',
214
        help='Location of repository.', type=unicode)]
215
216
    @display_command
217
    def run(self, directory="."):
218
        from bzrlib.bzrdir import (
219
            BzrDir,
220
            )
221
        from bzrlib.plugins.git.refs import (
0.200.1433 by Jelmer Vernooij
Fix fetching between git repositories.
222
            get_refs,
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
223
            )
224
        from bzrlib.plugins.git.object_store import (
225
            get_object_store,
226
            )
227
        bzrdir, _ = BzrDir.open_containing(directory)
228
        repo = bzrdir.find_repository()
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
229
        object_store = get_object_store(repo)
230
        object_store.lock_read()
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
231
        try:
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
232
            refs = get_refs(bzrdir)
0.200.1433 by Jelmer Vernooij
Fix fetching between git repositories.
233
            for k, v in refs.iteritems():
0.200.873 by Jelmer Vernooij
Add convenience command for accessing virtual git refs.
234
                self.outf.write("%s -> %s\n" % (k, v))
235
        finally:
0.200.1212 by Jelmer Vernooij
Support read locking object stores.
236
            object_store.unlock()
0.200.895 by Jelmer Vernooij
Add initial work on git-apply.
237
238
239
class cmd_git_apply(Command):
240
    """Apply a series of git-am style patches.
241
242
    This command will in the future probably be integrated into 
243
    "bzr pull".
244
    """
245
0.200.1050 by Jelmer Vernooij
Add --force option to 'bzr git-apply'.
246
    takes_options = [
247
        Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
248
        'force']
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:
269
            raise BzrCommandError("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()