/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 issues pointed out by pyflakes.

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