/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
28
28
    Option,
29
29
    )
30
30
 
31
 
from bzrlib.plugins.git import (
32
 
    get_rich_root_format,
33
 
    )
34
 
 
35
 
class cmd_git_serve(Command):
36
 
    """Provide access to a Bazaar branch using the git protocol.
37
 
 
38
 
    This command is experimental and doesn't do much yet.
39
 
    """
40
 
    takes_options = [
41
 
        Option('directory',
42
 
               short_name='d',
43
 
               help='serve contents of directory',
44
 
               type=unicode)
45
 
    ]
46
 
 
47
 
    def run(self, directory=None):
48
 
        lazy_check_versions()
49
 
        from dulwich.server import TCPGitServer
50
 
        from bzrlib.plugins.git.server import BzrBackend
51
 
        from bzrlib.trace import warning
52
 
        import os
53
 
 
54
 
        warning("server support in bzr-git is experimental.")
55
 
 
56
 
        if directory is None:
57
 
            directory = os.getcwd()
58
 
 
59
 
        backend = BzrBackend(directory)
60
 
 
61
 
        server = TCPGitServer(backend, 'localhost')
62
 
        server.serve_forever()
63
 
 
64
31
 
65
32
class cmd_git_import(Command):
66
33
    """Import all branches from a git repository.
77
44
            )
78
45
        from bzrlib.bzrdir import (
79
46
            BzrDir,
80
 
            format_registry,
81
47
            )
82
48
        from bzrlib.errors import (
83
49
            BzrCommandError,
88
54
            InterRepository,
89
55
            Repository,
90
56
            )
91
 
        from bzrlib.plugins.git.branch import GitBranch
 
57
        from bzrlib.plugins.git.branch import (
 
58
            GitBranch,
 
59
            extract_tags,
 
60
            )
92
61
        from bzrlib.plugins.git.repository import GitRepository
93
62
 
94
63
        if dest_location is None:
97
66
        source_repo = Repository.open(src_location)
98
67
        if not isinstance(source_repo, GitRepository):
99
68
            raise BzrCommandError("%r is not a git repository" % src_location)
100
 
        format = get_rich_root_format()
101
69
        try:
102
70
            target_bzrdir = BzrDir.open(dest_location)
103
71
        except NotBranchError:
104
 
            target_bzrdir = BzrDir.create(dest_location, format=format)
 
72
            target_bzrdir = BzrDir.create(dest_location)
105
73
        try:
106
 
            target_repo = target_bzrdir.open_repository()
 
74
            target_repo = target_bzrdir.find_repository()
107
75
        except NoRepositoryPresent:
108
76
            target_repo = target_bzrdir.create_repository(shared=True)
109
77
 
 
78
        if not target_repo.supports_rich_root():
 
79
            raise BzrCommandError("Target repository doesn't support rich roots")
 
80
 
110
81
        interrepo = InterRepository.get(source_repo, target_repo)
111
82
        mapping = source_repo.get_mapping()
112
 
        refs = interrepo.fetch_refs()
 
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)
113
87
        pb = ui.ui_factory.nested_progress_bar()
114
88
        try:
115
89
            for i, (name, ref) in enumerate(refs.iteritems()):
123
97
                    parent_path = urlutils.dirname(head_loc)
124
98
                    if not os.path.isdir(parent_path):
125
99
                        os.makedirs(parent_path)
126
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
 
100
                    head_bzrdir = BzrDir.create(head_loc)
127
101
                try:
128
102
                    head_branch = head_bzrdir.open_branch()
129
103
                except NotBranchError:
130
104
                    head_branch = head_bzrdir.create_branch()
131
105
                revid = mapping.revision_id_foreign_to_bzr(ref)
132
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
133
 
                    name, None)
 
106
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
 
107
                    name, None, tags)
134
108
                source_branch.head = ref
135
 
                head_branch.generate_revision_history(revid)
 
109
                if head_branch.last_revision() != revid:
 
110
                    head_branch.generate_revision_history(revid)
136
111
                source_branch.tags.merge_to(head_branch.tags)
137
112
        finally:
138
113
            pb.finished()
140
115
 
141
116
class cmd_git_object(Command):
142
117
    """List or display Git objects by SHA.
143
 
    
 
118
 
144
119
    Cat a particular object's Git representation if a SHA is specified.
145
120
    List all available SHAs otherwise.
146
121
    """
149
124
 
150
125
    aliases = ["git-objects", "git-cat"]
151
126
    takes_args = ["sha1?"]
152
 
    takes_options = [Option('directory', 
 
127
    takes_options = [Option('directory',
153
128
        short_name='d',
154
129
        help='Location of repository.', type=unicode),
155
130
        Option('pretty', help='Pretty-print objects.')]
173
148
        try:
174
149
            if sha1 is not None:
175
150
                try:
176
 
                    obj = object_store[sha1]
 
151
                    obj = object_store[str(sha1)]
177
152
                except KeyError:
178
153
                    raise BzrCommandError("Object not found: %s" % sha1)
179
154
                if pretty:
186
161
                    self.outf.write("%s\n" % sha1)
187
162
        finally:
188
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()