/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

merge new bzr-foreign.

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
               help='serve contents of directory',
 
43
               type=unicode)
 
44
    ]
 
45
 
 
46
    def run(self, directory=None):
 
47
        lazy_check_versions()
 
48
        from dulwich.server import TCPGitServer
 
49
        from bzrlib.plugins.git.server import BzrBackend
 
50
        from bzrlib.trace import warning
 
51
        import os
 
52
 
 
53
        warning("server support in bzr-git is experimental.")
 
54
 
 
55
        if directory is None:
 
56
            directory = os.getcwd()
 
57
 
 
58
        backend = BzrBackend(directory)
 
59
 
 
60
        server = TCPGitServer(backend, 'localhost')
 
61
        server.serve_forever()
 
62
 
31
63
 
32
64
class cmd_git_import(Command):
33
65
    """Import all branches from a git repository.
44
76
            )
45
77
        from bzrlib.bzrdir import (
46
78
            BzrDir,
 
79
            format_registry,
47
80
            )
48
81
        from bzrlib.errors import (
49
82
            BzrCommandError,
54
87
            InterRepository,
55
88
            Repository,
56
89
            )
57
 
        from bzrlib.plugins.git.branch import (
58
 
            GitBranch,
59
 
            extract_tags,
60
 
            )
 
90
        from bzrlib.plugins.git.branch import GitBranch
61
91
        from bzrlib.plugins.git.repository import GitRepository
62
92
 
63
93
        if dest_location is None:
66
96
        source_repo = Repository.open(src_location)
67
97
        if not isinstance(source_repo, GitRepository):
68
98
            raise BzrCommandError("%r is not a git repository" % src_location)
 
99
        format = get_rich_root_format()
69
100
        try:
70
101
            target_bzrdir = BzrDir.open(dest_location)
71
102
        except NotBranchError:
72
 
            target_bzrdir = BzrDir.create(dest_location)
 
103
            target_bzrdir = BzrDir.create(dest_location, format=format)
73
104
        try:
74
 
            target_repo = target_bzrdir.find_repository()
 
105
            target_repo = target_bzrdir.open_repository()
75
106
        except NoRepositoryPresent:
76
107
            target_repo = target_bzrdir.create_repository(shared=True)
77
108
 
78
 
        if not target_repo.supports_rich_root():
79
 
            raise BzrCommandError("Target repository doesn't support rich roots")
80
 
 
81
109
        interrepo = InterRepository.get(source_repo, target_repo)
82
110
        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)
 
111
        refs = interrepo.fetch_refs()
87
112
        pb = ui.ui_factory.nested_progress_bar()
88
113
        try:
89
114
            for i, (name, ref) in enumerate(refs.iteritems()):
97
122
                    parent_path = urlutils.dirname(head_loc)
98
123
                    if not os.path.isdir(parent_path):
99
124
                        os.makedirs(parent_path)
100
 
                    head_bzrdir = BzrDir.create(head_loc)
 
125
                    head_bzrdir = BzrDir.create(head_loc, format=format)
101
126
                try:
102
127
                    head_branch = head_bzrdir.open_branch()
103
128
                except NotBranchError:
104
129
                    head_branch = head_bzrdir.create_branch()
105
130
                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)
 
131
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
 
132
                    name, ref, None)
 
133
                head_branch.generate_revision_history(revid)
111
134
                source_branch.tags.merge_to(head_branch.tags)
112
135
        finally:
113
136
            pb.finished()
114
137
 
115
138
 
 
139
def repo_get_object_store(repo):
 
140
    from bzrlib.plugins.git.converter import (
 
141
        BazaarObjectStore,
 
142
        )
 
143
    from bzrlib.plugins.git.mapping import (
 
144
        default_mapping,
 
145
        )
 
146
    from bzrlib.plugins.git.repository import (
 
147
        GitRepository,
 
148
        )
 
149
    if isinstance(repo, GitRepository):
 
150
        return repo._git.object_store
 
151
    else:
 
152
        return BazaarObjectStore(repo, default_mapping)
 
153
 
 
154
 
116
155
class cmd_git_object(Command):
117
156
    """List or display Git objects by SHA.
118
 
 
 
157
    
119
158
    Cat a particular object's Git representation if a SHA is specified.
120
159
    List all available SHAs otherwise.
121
160
    """
124
163
 
125
164
    aliases = ["git-objects", "git-cat"]
126
165
    takes_args = ["sha1?"]
127
 
    takes_options = [Option('directory',
128
 
        short_name='d',
 
166
    takes_options = [Option('directory', 
129
167
        help='Location of repository.', type=unicode),
130
168
        Option('pretty', help='Pretty-print objects.')]
131
169
    encoding_type = 'exact'
140
178
            )
141
179
        bzrdir, _ = BzrDir.open_containing(directory)
142
180
        repo = bzrdir.find_repository()
143
 
        from bzrlib.plugins.git.object_store import (
144
 
            get_object_store,
145
 
            )
146
 
        object_store = get_object_store(repo)
 
181
        object_store = repo_get_object_store(repo)
147
182
        repo.lock_read()
148
183
        try:
149
184
            if sha1 is not None:
150
185
                try:
151
 
                    obj = object_store[str(sha1)]
 
186
                    obj = object_store[sha1]
152
187
                except KeyError:
153
188
                    raise BzrCommandError("Object not found: %s" % sha1)
154
189
                if pretty:
161
196
                    self.outf.write("%s\n" % sha1)
162
197
        finally:
163
198
            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()