/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
28
28
    Option,
29
29
    )
30
30
 
31
 
from bzrlib.plugins.git import (
32
 
    get_rich_root_format,
33
 
    )
34
31
 
35
32
class cmd_git_import(Command):
36
33
    """Import all branches from a git repository.
69
66
        source_repo = Repository.open(src_location)
70
67
        if not isinstance(source_repo, GitRepository):
71
68
            raise BzrCommandError("%r is not a git repository" % src_location)
72
 
        format = get_rich_root_format()
73
69
        try:
74
70
            target_bzrdir = BzrDir.open(dest_location)
75
71
        except NotBranchError:
76
 
            target_bzrdir = BzrDir.create(dest_location, format=format)
 
72
            target_bzrdir = BzrDir.create(dest_location)
77
73
        try:
78
74
            target_repo = target_bzrdir.find_repository()
79
75
        except NoRepositoryPresent:
84
80
 
85
81
        interrepo = InterRepository.get(source_repo, target_repo)
86
82
        mapping = source_repo.get_mapping()
87
 
        refs = interrepo.fetch_refs()
 
83
        refs = interrepo.fetch()
88
84
        tags = {}
89
85
        for k, v in extract_tags(refs).iteritems():
90
86
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
101
97
                    parent_path = urlutils.dirname(head_loc)
102
98
                    if not os.path.isdir(parent_path):
103
99
                        os.makedirs(parent_path)
104
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
 
100
                    head_bzrdir = BzrDir.create(head_loc)
105
101
                try:
106
102
                    head_branch = head_bzrdir.open_branch()
107
103
                except NotBranchError:
108
104
                    head_branch = head_bzrdir.create_branch()
109
105
                revid = mapping.revision_id_foreign_to_bzr(ref)
110
 
                source_branch = GitBranch(source_repo.bzrdir, source_repo, 
 
106
                source_branch = GitBranch(source_repo.bzrdir, source_repo,
111
107
                    name, None, tags)
112
108
                source_branch.head = ref
113
109
                if head_branch.last_revision() != revid:
119
115
 
120
116
class cmd_git_object(Command):
121
117
    """List or display Git objects by SHA.
122
 
    
 
118
 
123
119
    Cat a particular object's Git representation if a SHA is specified.
124
120
    List all available SHAs otherwise.
125
121
    """
128
124
 
129
125
    aliases = ["git-objects", "git-cat"]
130
126
    takes_args = ["sha1?"]
131
 
    takes_options = [Option('directory', 
 
127
    takes_options = [Option('directory',
132
128
        short_name='d',
133
129
        help='Location of repository.', type=unicode),
134
130
        Option('pretty', help='Pretty-print objects.')]
165
161
                    self.outf.write("%s\n" % sha1)
166
162
        finally:
167
163
            repo.unlock()
 
164
 
 
165
 
 
166
class cmd_git_refs(Command):
 
167
    """Output all of the virtual refs for a repository.
 
168
 
 
169
    """
 
170
 
 
171
    hidden = True
 
172
 
 
173
    takes_options = [Option('directory',
 
174
        short_name='d',
 
175
        help='Location of repository.', type=unicode)]
 
176
 
 
177
    @display_command
 
178
    def run(self, directory="."):
 
179
        from bzrlib.bzrdir import (
 
180
            BzrDir,
 
181
            )
 
182
        from bzrlib.plugins.git.refs import (
 
183
            BazaarRefsContainer,
 
184
            )
 
185
        from bzrlib.plugins.git.object_store import (
 
186
            get_object_store,
 
187
            )
 
188
        bzrdir, _ = BzrDir.open_containing(directory)
 
189
        repo = bzrdir.find_repository()
 
190
        repo.lock_read()
 
191
        try:
 
192
            object_store = get_object_store(repo)
 
193
            refs = BazaarRefsContainer(bzrdir, object_store)
 
194
            for k, v in refs.as_dict().iteritems():
 
195
                self.outf.write("%s -> %s\n" % (k, v))
 
196
        finally:
 
197
            repo.unlock()
 
198
 
 
199
 
 
200
class cmd_git_apply(Command):
 
201
    """Apply a series of git-am style patches.
 
202
 
 
203
    This command will in the future probably be integrated into 
 
204
    "bzr pull".
 
205
    """
 
206
 
 
207
    takes_args = ["patches*"]
 
208
 
 
209
    def _apply_patch(self, wt, f):
 
210
        from dulwich.patch import git_am_patch_split
 
211
        (c, diff, version) = git_am_patch_split(f)
 
212
        # FIXME: Process diff
 
213
        wt.commit(committer=c.committer,
 
214
                  message=c.message)
 
215
 
 
216
    def run(self, patches_list=None):
 
217
        from bzrlib.workingtree import WorkingTree
 
218
        if patches_list is None:
 
219
            patches_list = []
 
220
        
 
221
        tree, _ = WorkingTree.open_containing(".")
 
222
        tree.lock_write()
 
223
        try:
 
224
            for patch in patches_list:
 
225
                f = open(patch, 'r')
 
226
                try:
 
227
                    self._apply_patch(tree, f)
 
228
                finally:
 
229
                    f.close()
 
230
        finally:
 
231
            tree.unlock()