/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

Default to using global user id rather than making one up.

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
 
 
22
21
"""Git-specific subcommands for Bazaar."""
23
22
 
24
 
from bzrlib.commands import Command
25
 
from bzrlib.option import Option
 
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
    )
26
34
 
27
35
class cmd_git_serve(Command):
28
36
    """Provide access to a Bazaar branch using the git protocol.
31
39
    """
32
40
    takes_options = [
33
41
        Option('directory',
 
42
               short_name='d',
34
43
               help='serve contents of directory',
35
44
               type=unicode)
36
45
    ]
52
61
        server = TCPGitServer(backend, 'localhost')
53
62
        server.serve_forever()
54
63
 
 
64
 
55
65
class cmd_git_import(Command):
56
66
    """Import all branches from a git repository.
57
67
 
58
68
    """
59
69
 
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
 
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
 
66
97
        source_repo = Repository.open(src_location)
67
 
        format = format_registry.make_bzrdir('rich-root-pack')
 
98
        if not isinstance(source_repo, GitRepository):
 
99
            raise BzrCommandError("%r is not a git repository" % src_location)
 
100
        format = get_rich_root_format()
68
101
        try:
69
102
            target_bzrdir = BzrDir.open(dest_location)
70
103
        except NotBranchError:
74
107
        except NoRepositoryPresent:
75
108
            target_repo = target_bzrdir.create_repository(shared=True)
76
109
 
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
 
 
 
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, None)
 
134
                source_branch.head = ref
 
135
                head_branch.generate_revision_history(revid)
 
136
                source_branch.tags.merge_to(head_branch.tags)
 
137
        finally:
 
138
            pb.finished()
 
139
 
 
140
 
 
141
class cmd_git_object(Command):
 
142
    """List or display Git objects by SHA.
 
143
    
 
144
    Cat a particular object's Git representation if a SHA is specified.
 
145
    List all available SHAs otherwise.
 
146
    """
 
147
 
 
148
    hidden = True
 
149
 
 
150
    aliases = ["git-objects", "git-cat"]
 
151
    takes_args = ["sha1?"]
 
152
    takes_options = [Option('directory', 
 
153
        short_name='d',
 
154
        help='Location of repository.', type=unicode),
 
155
        Option('pretty', help='Pretty-print objects.')]
 
156
    encoding_type = 'exact'
 
157
 
 
158
    @display_command
 
159
    def run(self, sha1=None, directory=".", pretty=False):
 
160
        from bzrlib.errors import (
 
161
            BzrCommandError,
 
162
            )
 
163
        from bzrlib.bzrdir import (
 
164
            BzrDir,
 
165
            )
 
166
        bzrdir, _ = BzrDir.open_containing(directory)
 
167
        repo = bzrdir.find_repository()
 
168
        from bzrlib.plugins.git.object_store import (
 
169
            get_object_store,
 
170
            )
 
171
        object_store = get_object_store(repo)
 
172
        repo.lock_read()
 
173
        try:
 
174
            if sha1 is not None:
 
175
                try:
 
176
                    obj = object_store[sha1]
 
177
                except KeyError:
 
178
                    raise BzrCommandError("Object not found: %s" % sha1)
 
179
                if pretty:
 
180
                    text = obj.as_pretty_string()
 
181
                else:
 
182
                    text = obj.as_raw_string()
 
183
                self.outf.write(text)
 
184
            else:
 
185
                for sha1 in object_store:
 
186
                    self.outf.write("%s\n" % sha1)
 
187
        finally:
 
188
            repo.unlock()