/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

Merge thin-pack work.

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
24
from bzrlib.commands import Command
24
25
from bzrlib.option import Option
25
26
 
26
 
from bzrlib.plugins.git import get_rich_root_format
27
 
 
28
27
class cmd_git_serve(Command):
29
28
    """Provide access to a Bazaar branch using the git protocol.
30
29
 
53
52
        server = TCPGitServer(backend, 'localhost')
54
53
        server.serve_forever()
55
54
 
56
 
 
57
55
class cmd_git_import(Command):
58
56
    """Import all branches from a git repository.
59
57
 
60
58
    """
61
59
 
62
 
    takes_args = ["src_location", "dest_location?"]
 
60
    takes_args = ["src_location", "dest_location"]
63
61
 
64
 
    def run(self, src_location, dest_location=None):
65
 
        import os
66
 
        from bzrlib import (
67
 
            ui,
68
 
            urlutils,
69
 
            )
70
 
        from bzrlib.bzrdir import (
71
 
            BzrDir,
72
 
            format_registry,
73
 
            )
74
 
        from bzrlib.errors import (
75
 
            BzrCommandError,
76
 
            NoRepositoryPresent,
77
 
            NotBranchError,
78
 
            )
 
62
    def run(self, src_location, dest_location):
 
63
        from bzrlib.bzrdir import BzrDir, format_registry
 
64
        from bzrlib.errors import NoRepositoryPresent, NotBranchError
79
65
        from bzrlib.repository import Repository
80
 
        from bzrlib.plugins.git.fetch import InterGitNonGitRepository
81
 
        from bzrlib.plugins.git.repository import GitRepository
82
 
 
83
 
        if dest_location is None:
84
 
            dest_location = os.path.basename(src_location.rstrip("/\\"))
85
 
 
86
66
        source_repo = Repository.open(src_location)
87
 
        if not isinstance(source_repo, GitRepository):
88
 
            raise BzrCommandError("%r is not a git repository" % src_location)
89
 
        format = get_rich_root_format()
 
67
        format = format_registry.make_bzrdir('rich-root-pack')
90
68
        try:
91
69
            target_bzrdir = BzrDir.open(dest_location)
92
70
        except NotBranchError:
96
74
        except NoRepositoryPresent:
97
75
            target_repo = target_bzrdir.create_repository(shared=True)
98
76
 
99
 
        interrepo = InterGitNonGitRepository(source_repo, target_repo)
100
 
        mapping = source_repo.get_mapping()
101
 
        refs = interrepo.fetch_refs()
102
 
        pb = ui.ui_factory.nested_progress_bar()
103
 
        try:
104
 
            for i, (name, ref) in enumerate(refs.iteritems()):
105
 
                pb.update("creating branches", i, len(refs))
106
 
                if name.endswith("^{}"):
107
 
                    continue
108
 
                head_loc = os.path.join(dest_location, name)
109
 
                try:
110
 
                    head_bzrdir = BzrDir.open(head_loc)
111
 
                except NotBranchError:
112
 
                    parent_path = urlutils.dirname(head_loc)
113
 
                    if not os.path.isdir(parent_path):
114
 
                        os.makedirs(parent_path)
115
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
116
 
                try:
117
 
                    head_branch = head_bzrdir.open_branch()
118
 
                except NotBranchError:
119
 
                    head_branch = head_bzrdir.create_branch()
120
 
                if ("%s^{}" % name) in refs:
121
 
                    revid = mapping.revision_id_foreign_to_bzr(
122
 
                        refs["%s^{}" % name])
123
 
                else:
124
 
                    revid = mapping.revision_id_foreign_to_bzr(ref)
125
 
                head_branch.generate_revision_history(revid)
126
 
        finally:
127
 
            pb.finished()
 
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))
128
89