/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to commands.py

Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
20
20
 
21
21
"""Git-specific subcommands for Bazaar."""
22
22
 
23
 
from bzrlib.commands import (
24
 
    Command,
25
 
    display_command,
26
 
    )
27
 
from bzrlib.option import (
28
 
    Option,
29
 
    )
 
23
from bzrlib.commands import Command
 
24
from bzrlib.option import Option
 
25
 
 
26
class cmd_git_serve(Command):
 
27
    """Provide access to a Bazaar branch using the git protocol.
 
28
 
 
29
    This command is experimental and doesn't do much yet.
 
30
    """
 
31
    takes_options = [
 
32
        Option('directory',
 
33
               help='serve contents of directory',
 
34
               type=unicode)
 
35
    ]
 
36
 
 
37
    def run(self, directory=None):
 
38
        lazy_check_versions()
 
39
        from dulwich.server import TCPGitServer
 
40
        from bzrlib.plugins.git.server import BzrBackend
 
41
        from bzrlib.trace import warning
 
42
        import os
 
43
 
 
44
        warning("server support in bzr-git is experimental.")
 
45
 
 
46
        if directory is None:
 
47
            directory = os.getcwd()
 
48
 
 
49
        backend = BzrBackend(directory)
 
50
 
 
51
        server = TCPGitServer(backend, 'localhost')
 
52
        server.serve_forever()
30
53
 
31
54
 
32
55
class cmd_git_import(Command):
44
67
            )
45
68
        from bzrlib.bzrdir import (
46
69
            BzrDir,
 
70
            format_registry,
47
71
            )
48
72
        from bzrlib.errors import (
49
73
            BzrCommandError,
50
74
            NoRepositoryPresent,
51
75
            NotBranchError,
52
76
            )
53
 
        from bzrlib.repository import (
54
 
            InterRepository,
55
 
            Repository,
56
 
            )
57
 
        from bzrlib.plugins.git.branch import (
58
 
            GitBranch,
59
 
            extract_tags,
60
 
            )
 
77
        from bzrlib.repository import Repository
 
78
        from bzrlib.plugins.git.fetch import InterGitNonGitRepository
61
79
        from bzrlib.plugins.git.repository import GitRepository
62
80
 
63
81
        if dest_location is None:
66
84
        source_repo = Repository.open(src_location)
67
85
        if not isinstance(source_repo, GitRepository):
68
86
            raise BzrCommandError("%r is not a git repository" % src_location)
 
87
        format = format_registry.make_bzrdir("1.9-rich-root")
69
88
        try:
70
89
            target_bzrdir = BzrDir.open(dest_location)
71
90
        except NotBranchError:
72
 
            target_bzrdir = BzrDir.create(dest_location)
 
91
            target_bzrdir = BzrDir.create(dest_location, format=format)
73
92
        try:
74
 
            target_repo = target_bzrdir.find_repository()
 
93
            target_repo = target_bzrdir.open_repository()
75
94
        except NoRepositoryPresent:
76
95
            target_repo = target_bzrdir.create_repository(shared=True)
77
96
 
78
 
        if not target_repo.supports_rich_root():
79
 
            raise BzrCommandError("Target repository doesn't support rich roots")
80
 
 
81
 
        interrepo = InterRepository.get(source_repo, target_repo)
 
97
        interrepo = InterGitNonGitRepository(source_repo, target_repo)
82
98
        mapping = source_repo.get_mapping()
83
 
        refs = interrepo.fetch()
84
 
        tags = {}
85
 
        for k, v in extract_tags(refs).iteritems():
86
 
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
 
99
        refs = interrepo.fetch_refs()
87
100
        pb = ui.ui_factory.nested_progress_bar()
88
101
        try:
89
102
            for i, (name, ref) in enumerate(refs.iteritems()):
90
 
                if name.startswith("refs/tags/"):
 
103
                pb.update("creating branches", i, len(refs))
 
104
                if name.endswith("^{}"):
91
105
                    continue
92
 
                pb.update("creating branches", i, len(refs))
93
106
                head_loc = os.path.join(dest_location, name)
94
107
                try:
95
108
                    head_bzrdir = BzrDir.open(head_loc)
97
110
                    parent_path = urlutils.dirname(head_loc)
98
111
                    if not os.path.isdir(parent_path):
99
112
                        os.makedirs(parent_path)
100
 
                    head_bzrdir = BzrDir.create(head_loc)
 
113
                    head_bzrdir = BzrDir.create(head_loc, format=format)
101
114
                try:
102
115
                    head_branch = head_bzrdir.open_branch()
103
116
                except NotBranchError:
104
117
                    head_branch = head_bzrdir.create_branch()
105
 
                revid = mapping.revision_id_foreign_to_bzr(ref)
106
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
107
 
                    name, None, tags)
108
 
                source_branch.head = ref
109
 
                if head_branch.last_revision() != revid:
110
 
                    head_branch.generate_revision_history(revid)
111
 
                source_branch.tags.merge_to(head_branch.tags)
 
118
                if ("%s^{}" % name) in refs:
 
119
                    revid = mapping.revision_id_foreign_to_bzr(refs["%s^{}" % name])
 
120
                else:
 
121
                    revid = mapping.revision_id_foreign_to_bzr(ref)
 
122
                head_branch.generate_revision_history(revid)
112
123
        finally:
113
124
            pb.finished()
114
125
 
115
 
 
116
 
class cmd_git_object(Command):
117
 
    """List or display Git objects by SHA.
118
 
 
119
 
    Cat a particular object's Git representation if a SHA is specified.
120
 
    List all available SHAs otherwise.
121
 
    """
122
 
 
123
 
    hidden = True
124
 
 
125
 
    aliases = ["git-objects", "git-cat"]
126
 
    takes_args = ["sha1?"]
127
 
    takes_options = [Option('directory',
128
 
        short_name='d',
129
 
        help='Location of repository.', type=unicode),
130
 
        Option('pretty', help='Pretty-print objects.')]
131
 
    encoding_type = 'exact'
132
 
 
133
 
    @display_command
134
 
    def run(self, sha1=None, directory=".", pretty=False):
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()
143
 
        from bzrlib.plugins.git.object_store import (
144
 
            get_object_store,
145
 
            )
146
 
        object_store = get_object_store(repo)
147
 
        repo.lock_read()
148
 
        try:
149
 
            if sha1 is not None:
150
 
                try:
151
 
                    obj = object_store[str(sha1)]
152
 
                except KeyError:
153
 
                    raise BzrCommandError("Object not found: %s" % sha1)
154
 
                if pretty:
155
 
                    text = obj.as_pretty_string()
156
 
                else:
157
 
                    text = obj.as_raw_string()
158
 
                self.outf.write(text)
159
 
            else:
160
 
                for sha1 in object_store:
161
 
                    self.outf.write("%s\n" % sha1)
162
 
        finally:
163
 
            repo.unlock()
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()
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
 
 
207
 
    takes_args = ["patches*"]
208
 
 
209
 
    def _apply_patch(self, wt, f):
210
 
        from dulwich.patch import git_am_patch_split
211
 
        (c, diff, version) = git_am_patch_split(f)
212
 
        # FIXME: Process diff
213
 
        wt.commit(committer=c.committer,
214
 
                  message=c.message)
215
 
 
216
 
    def run(self, patches_list=None):
217
 
        from bzrlib.workingtree import WorkingTree
218
 
        if patches_list is None:
219
 
            patches_list = []
220
 
        
221
 
        tree, _ = WorkingTree.open_containing(".")
222
 
        tree.lock_write()
223
 
        try:
224
 
            for patch in patches_list:
225
 
                f = open(patch, 'r')
226
 
                try:
227
 
                    self._apply_patch(tree, f)
228
 
                finally:
229
 
                    f.close()
230
 
        finally:
231
 
            tree.unlock()