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