/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
 
    )
30
 
 
31
 
from bzrlib.plugins.git import (
32
 
    get_rich_root_format,
33
 
    )
 
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()
 
53
 
34
54
 
35
55
class cmd_git_import(Command):
36
56
    """Import all branches from a git repository.
47
67
            )
48
68
        from bzrlib.bzrdir import (
49
69
            BzrDir,
 
70
            format_registry,
50
71
            )
51
72
        from bzrlib.errors import (
52
73
            BzrCommandError,
53
74
            NoRepositoryPresent,
54
75
            NotBranchError,
55
76
            )
56
 
        from bzrlib.repository import (
57
 
            InterRepository,
58
 
            Repository,
59
 
            )
60
 
        from bzrlib.plugins.git.branch import (
61
 
            GitBranch,
62
 
            extract_tags,
63
 
            )
 
77
        from bzrlib.repository import Repository
 
78
        from bzrlib.plugins.git.fetch import InterGitNonGitRepository
64
79
        from bzrlib.plugins.git.repository import GitRepository
65
80
 
66
81
        if dest_location is None:
69
84
        source_repo = Repository.open(src_location)
70
85
        if not isinstance(source_repo, GitRepository):
71
86
            raise BzrCommandError("%r is not a git repository" % src_location)
72
 
        format = get_rich_root_format()
 
87
        format = format_registry.make_bzrdir("1.9-rich-root")
73
88
        try:
74
89
            target_bzrdir = BzrDir.open(dest_location)
75
90
        except NotBranchError:
76
91
            target_bzrdir = BzrDir.create(dest_location, format=format)
77
92
        try:
78
 
            target_repo = target_bzrdir.find_repository()
 
93
            target_repo = target_bzrdir.open_repository()
79
94
        except NoRepositoryPresent:
80
95
            target_repo = target_bzrdir.create_repository(shared=True)
81
96
 
82
 
        if not target_repo.supports_rich_root():
83
 
            raise BzrCommandError("Target repository doesn't support rich roots")
84
 
 
85
 
        interrepo = InterRepository.get(source_repo, target_repo)
 
97
        interrepo = InterGitNonGitRepository(source_repo, target_repo)
86
98
        mapping = source_repo.get_mapping()
87
99
        refs = interrepo.fetch_refs()
88
 
        tags = {}
89
 
        for k, v in extract_tags(refs).iteritems():
90
 
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
91
100
        pb = ui.ui_factory.nested_progress_bar()
92
101
        try:
93
102
            for i, (name, ref) in enumerate(refs.iteritems()):
94
 
                if name.startswith("refs/tags/"):
 
103
                pb.update("creating branches", i, len(refs))
 
104
                if name.endswith("^{}"):
95
105
                    continue
96
 
                pb.update("creating branches", i, len(refs))
97
106
                head_loc = os.path.join(dest_location, name)
98
107
                try:
99
108
                    head_bzrdir = BzrDir.open(head_loc)
106
115
                    head_branch = head_bzrdir.open_branch()
107
116
                except NotBranchError:
108
117
                    head_branch = head_bzrdir.create_branch()
109
 
                revid = mapping.revision_id_foreign_to_bzr(ref)
110
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
111
 
                    name, None, tags)
112
 
                source_branch.head = ref
113
 
                if head_branch.last_revision() != revid:
114
 
                    head_branch.generate_revision_history(revid)
115
 
                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)
116
123
        finally:
117
124
            pb.finished()
118
125
 
119
 
 
120
 
class cmd_git_object(Command):
121
 
    """List or display Git objects by SHA.
122
 
 
123
 
    Cat a particular object's Git representation if a SHA is specified.
124
 
    List all available SHAs otherwise.
125
 
    """
126
 
 
127
 
    hidden = True
128
 
 
129
 
    aliases = ["git-objects", "git-cat"]
130
 
    takes_args = ["sha1?"]
131
 
    takes_options = [Option('directory',
132
 
        short_name='d',
133
 
        help='Location of repository.', type=unicode),
134
 
        Option('pretty', help='Pretty-print objects.')]
135
 
    encoding_type = 'exact'
136
 
 
137
 
    @display_command
138
 
    def run(self, sha1=None, directory=".", pretty=False):
139
 
        from bzrlib.errors import (
140
 
            BzrCommandError,
141
 
            )
142
 
        from bzrlib.bzrdir import (
143
 
            BzrDir,
144
 
            )
145
 
        bzrdir, _ = BzrDir.open_containing(directory)
146
 
        repo = bzrdir.find_repository()
147
 
        from bzrlib.plugins.git.object_store import (
148
 
            get_object_store,
149
 
            )
150
 
        object_store = get_object_store(repo)
151
 
        repo.lock_read()
152
 
        try:
153
 
            if sha1 is not None:
154
 
                try:
155
 
                    obj = object_store[str(sha1)]
156
 
                except KeyError:
157
 
                    raise BzrCommandError("Object not found: %s" % sha1)
158
 
                if pretty:
159
 
                    text = obj.as_pretty_string()
160
 
                else:
161
 
                    text = obj.as_raw_string()
162
 
                self.outf.write(text)
163
 
            else:
164
 
                for sha1 in object_store:
165
 
                    self.outf.write("%s\n" % sha1)
166
 
        finally:
167
 
            repo.unlock()