/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 infrastructure for dpush.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
18
18
# along with this program; if not, write to the Free Software
19
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
20
 
 
21
 
21
22
"""Git-specific subcommands for Bazaar."""
22
23
 
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
 
    )
 
24
from bzrlib.commands import Command
 
25
from bzrlib.option import Option
34
26
 
35
27
class cmd_git_serve(Command):
36
28
    """Provide access to a Bazaar branch using the git protocol.
39
31
    """
40
32
    takes_options = [
41
33
        Option('directory',
42
 
               short_name='d',
43
34
               help='serve contents of directory',
44
35
               type=unicode)
45
36
    ]
61
52
        server = TCPGitServer(backend, 'localhost')
62
53
        server.serve_forever()
63
54
 
64
 
 
65
55
class cmd_git_import(Command):
66
56
    """Import all branches from a git repository.
67
57
 
68
58
    """
69
59
 
70
 
    takes_args = ["src_location", "dest_location?"]
71
 
 
72
 
    def run(self, src_location, dest_location=None):
73
 
        import os
74
 
        from bzrlib import (
75
 
            ui,
76
 
            urlutils,
77
 
            )
78
 
        from bzrlib.bzrdir import (
79
 
            BzrDir,
80
 
            format_registry,
81
 
            )
82
 
        from bzrlib.errors import (
83
 
            BzrCommandError,
84
 
            NoRepositoryPresent,
85
 
            NotBranchError,
86
 
            )
87
 
        from bzrlib.repository import (
88
 
            InterRepository,
89
 
            Repository,
90
 
            )
91
 
        from bzrlib.plugins.git.branch import GitBranch
92
 
        from bzrlib.plugins.git.repository import GitRepository
93
 
 
94
 
        if dest_location is None:
95
 
            dest_location = os.path.basename(src_location.rstrip("/\\"))
96
 
 
 
60
    takes_args = ["src_location", "dest_location"]
 
61
 
 
62
    def run(self, src_location, dest_location):
 
63
        from bzrlib.bzrdir import BzrDir, format_registry
 
64
        from bzrlib.errors import NoRepositoryPresent, NotBranchError
 
65
        from bzrlib.repository import Repository
97
66
        source_repo = Repository.open(src_location)
98
 
        if not isinstance(source_repo, GitRepository):
99
 
            raise BzrCommandError("%r is not a git repository" % src_location)
100
 
        format = get_rich_root_format()
 
67
        format = format_registry.make_bzrdir('rich-root-pack')
101
68
        try:
102
69
            target_bzrdir = BzrDir.open(dest_location)
103
70
        except NotBranchError:
107
74
        except NoRepositoryPresent:
108
75
            target_repo = target_bzrdir.create_repository(shared=True)
109
76
 
110
 
        interrepo = InterRepository.get(source_repo, target_repo)
111
 
        mapping = source_repo.get_mapping()
112
 
        refs = interrepo.fetch_refs()
113
 
        pb = ui.ui_factory.nested_progress_bar()
114
 
        try:
115
 
            for i, (name, ref) in enumerate(refs.iteritems()):
116
 
                if name.startswith("refs/tags/"):
117
 
                    continue
118
 
                pb.update("creating branches", i, len(refs))
119
 
                head_loc = os.path.join(dest_location, name)
120
 
                try:
121
 
                    head_bzrdir = BzrDir.open(head_loc)
122
 
                except NotBranchError:
123
 
                    parent_path = urlutils.dirname(head_loc)
124
 
                    if not os.path.isdir(parent_path):
125
 
                        os.makedirs(parent_path)
126
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
127
 
                try:
128
 
                    head_branch = head_bzrdir.open_branch()
129
 
                except NotBranchError:
130
 
                    head_branch = head_bzrdir.create_branch()
131
 
                revid = mapping.revision_id_foreign_to_bzr(ref)
132
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
133
 
                    name, ref, None)
134
 
                head_branch.generate_revision_history(revid)
135
 
                source_branch.tags.merge_to(head_branch.tags)
136
 
        finally:
137
 
            pb.finished()
138
 
 
139
 
 
140
 
def repo_get_object_store(repo):
141
 
    from bzrlib.plugins.git.converter import (
142
 
        BazaarObjectStore,
143
 
        )
144
 
    from bzrlib.plugins.git.mapping import (
145
 
        default_mapping,
146
 
        )
147
 
    from bzrlib.plugins.git.repository import (
148
 
        GitRepository,
149
 
        )
150
 
    if isinstance(repo, GitRepository):
151
 
        return repo._git.object_store
152
 
    else:
153
 
        return BazaarObjectStore(repo, default_mapping)
154
 
 
155
 
 
156
 
class cmd_git_object(Command):
157
 
    """List or display Git objects by SHA.
158
 
    
159
 
    Cat a particular object's Git representation if a SHA is specified.
160
 
    List all available SHAs otherwise.
161
 
    """
162
 
 
163
 
    hidden = True
164
 
 
165
 
    aliases = ["git-objects", "git-cat"]
166
 
    takes_args = ["sha1?"]
167
 
    takes_options = [Option('directory', 
168
 
        short_name='d',
169
 
        help='Location of repository.', type=unicode),
170
 
        Option('pretty', help='Pretty-print objects.')]
171
 
    encoding_type = 'exact'
172
 
 
173
 
    @display_command
174
 
    def run(self, sha1=None, directory=".", pretty=False):
175
 
        from bzrlib.errors import (
176
 
            BzrCommandError,
177
 
            )
178
 
        from bzrlib.bzrdir import (
179
 
            BzrDir,
180
 
            )
181
 
        bzrdir, _ = BzrDir.open_containing(directory)
182
 
        repo = bzrdir.find_repository()
183
 
        object_store = repo_get_object_store(repo)
184
 
        repo.lock_read()
185
 
        try:
186
 
            if sha1 is not None:
187
 
                try:
188
 
                    obj = object_store[sha1]
189
 
                except KeyError:
190
 
                    raise BzrCommandError("Object not found: %s" % sha1)
191
 
                if pretty:
192
 
                    text = obj.as_pretty_string()
193
 
                else:
194
 
                    text = obj.as_raw_string()
195
 
                self.outf.write(text)
196
 
            else:
197
 
                for sha1 in object_store:
198
 
                    self.outf.write("%s\n" % sha1)
199
 
        finally:
200
 
            repo.unlock()
 
77
        target_repo.fetch(source_repo)
 
78
        for name, ref in source_repo._git.heads().iteritems():
 
79
            head_loc = os.path.join(dest_location, name)
 
80
            try:
 
81
                head_bzrdir = BzrDir.open(head_loc)
 
82
            except NotBranchError:
 
83
                head_bzrdir = BzrDir.create(head_loc, format=format)
 
84
            try:
 
85
                head_branch = head_bzrdir.open_branch()
 
86
            except NotBranchError:
 
87
                head_branch = head_bzrdir.create_branch()
 
88
            head_branch.generate_revision_history(source_repo.get_mapping().revision_id_foreign_to_bzr(ref))
 
89