/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

add basic test for tree_to_objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
22
22
 
23
23
from bzrlib.commands import (
24
24
    Command,
 
25
    display_command,
25
26
    )
26
27
from bzrlib.option import (
27
28
    Option,
28
29
    )
29
30
 
30
 
from bzrlib.plugins.git import (
31
 
    get_rich_root_format,
32
 
    )
33
 
 
34
 
class cmd_git_serve(Command):
35
 
    """Provide access to a Bazaar branch using the git protocol.
36
 
 
37
 
    This command is experimental and doesn't do much yet.
38
 
    """
39
 
    takes_options = [
40
 
        Option('directory',
41
 
               help='serve contents of directory',
42
 
               type=unicode)
43
 
    ]
44
 
 
45
 
    def run(self, directory=None):
46
 
        lazy_check_versions()
47
 
        from dulwich.server import TCPGitServer
48
 
        from bzrlib.plugins.git.server import BzrBackend
49
 
        from bzrlib.trace import warning
50
 
        import os
51
 
 
52
 
        warning("server support in bzr-git is experimental.")
53
 
 
54
 
        if directory is None:
55
 
            directory = os.getcwd()
56
 
 
57
 
        backend = BzrBackend(directory)
58
 
 
59
 
        server = TCPGitServer(backend, 'localhost')
60
 
        server.serve_forever()
61
 
 
62
31
 
63
32
class cmd_git_import(Command):
64
33
    """Import all branches from a git repository.
75
44
            )
76
45
        from bzrlib.bzrdir import (
77
46
            BzrDir,
78
 
            format_registry,
79
47
            )
80
48
        from bzrlib.errors import (
81
49
            BzrCommandError,
86
54
            InterRepository,
87
55
            Repository,
88
56
            )
89
 
        from bzrlib.plugins.git.branch import GitBranch
 
57
        from bzrlib.plugins.git.branch import (
 
58
            GitBranch,
 
59
            extract_tags,
 
60
            )
90
61
        from bzrlib.plugins.git.repository import GitRepository
91
62
 
92
63
        if dest_location is None:
95
66
        source_repo = Repository.open(src_location)
96
67
        if not isinstance(source_repo, GitRepository):
97
68
            raise BzrCommandError("%r is not a git repository" % src_location)
98
 
        format = get_rich_root_format()
99
69
        try:
100
70
            target_bzrdir = BzrDir.open(dest_location)
101
71
        except NotBranchError:
102
 
            target_bzrdir = BzrDir.create(dest_location, format=format)
 
72
            target_bzrdir = BzrDir.create(dest_location)
103
73
        try:
104
 
            target_repo = target_bzrdir.open_repository()
 
74
            target_repo = target_bzrdir.find_repository()
105
75
        except NoRepositoryPresent:
106
76
            target_repo = target_bzrdir.create_repository(shared=True)
107
77
 
 
78
        if not target_repo.supports_rich_root():
 
79
            raise BzrCommandError("Target repository doesn't support rich roots")
 
80
 
108
81
        interrepo = InterRepository.get(source_repo, target_repo)
109
82
        mapping = source_repo.get_mapping()
110
 
        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)
111
87
        pb = ui.ui_factory.nested_progress_bar()
112
88
        try:
113
89
            for i, (name, ref) in enumerate(refs.iteritems()):
121
97
                    parent_path = urlutils.dirname(head_loc)
122
98
                    if not os.path.isdir(parent_path):
123
99
                        os.makedirs(parent_path)
124
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
 
100
                    head_bzrdir = BzrDir.create(head_loc)
125
101
                try:
126
102
                    head_branch = head_bzrdir.open_branch()
127
103
                except NotBranchError:
128
104
                    head_branch = head_bzrdir.create_branch()
129
105
                revid = mapping.revision_id_foreign_to_bzr(ref)
130
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
131
 
                    name, ref, None)
132
 
                head_branch.generate_revision_history(revid)
 
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)
133
111
                source_branch.tags.merge_to(head_branch.tags)
134
112
        finally:
135
113
            pb.finished()
136
114
 
 
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()