/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 mapping.py

  • Committer: Jelmer Vernooij
  • Date: 2009-09-10 13:13:15 UTC
  • mto: (0.200.602 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090910131315-6890xg58pl2jseml
Allow serving remote URLs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapping.py
18
18
 
19
19
"""Converters, etc for going between Bazaar and Git ids."""
20
20
 
21
 
import base64
22
21
import stat
23
22
 
24
23
from bzrlib import (
36
35
    ROOT_ID,
37
36
    )
38
37
from bzrlib.foreign import (
39
 
    ForeignVcs,
40
 
    VcsMappingRegistry,
 
38
    ForeignVcs, 
 
39
    VcsMappingRegistry, 
41
40
    ForeignRevision,
42
41
    )
43
 
from bzrlib.revision import (
44
 
    NULL_REVISION,
45
 
    )
46
 
from bzrlib.plugins.git.hg import (
47
 
    format_hg_metadata,
48
 
    extract_hg_metadata,
49
 
    )
50
42
 
51
43
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
52
44
 
91
83
 
92
84
def squash_revision(target_repo, rev):
93
85
    """Remove characters that can't be stored from a revision, if necessary.
94
 
 
 
86
    
95
87
    :param target_repo: Repository in which the revision will be stored
96
88
    :param rev: Revision object, will be modified in-place
97
89
    """
152
144
 
153
145
    def export_unusual_file_modes(self, rev):
154
146
        try:
155
 
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'].encode("utf-8"))])
 
147
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'])])
156
148
        except KeyError:
157
149
            return {}
158
150
 
159
 
    def _generate_git_svn_metadata(self, rev):
160
 
        try:
161
 
            return "\ngit-svn-id: %s\n" % rev.properties["git-svn-id"].encode("utf-8")
162
 
        except KeyError:
163
 
            return ""
164
 
 
165
 
    def _generate_hg_message_tail(self, rev):
166
 
        extra = {}
167
 
        renames = []
168
 
        branch = 'default'
169
 
        for name in rev.properties:
170
 
            if name == 'hg:extra:branch':
171
 
                branch = rev.properties['hg:extra:branch']
172
 
            elif name.startswith('hg:extra'):
173
 
                extra[name[len('hg:extra:'):]] = base64.b64decode(rev.properties[name])
174
 
            elif name == 'hg:renames':
175
 
                renames = bencode.bdecode(base64.b64decode(rev.properties['hg:renames']))
176
 
            # TODO: Export other properties as 'bzr:' extras?
177
 
        ret = format_hg_metadata(renames, branch, extra)
178
 
        assert isinstance(ret, str)
179
 
        return ret
180
 
 
181
 
    def _extract_git_svn_metadata(self, rev, message):
182
 
        lines = message.split("\n")
183
 
        if not (lines[-1] == "" and lines[-2].startswith("git-svn-id:")):
184
 
            return message
185
 
        git_svn_id = lines[-2].split(": ", 1)[1]
186
 
        rev.properties['git-svn-id'] = git_svn_id
187
 
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
188
 
        # FIXME: Convert this to converted-from property somehow..
189
 
        ret = "\n".join(lines[:-2])
190
 
        assert isinstance(ret, str)
191
 
        return ret
192
 
 
193
 
    def _extract_hg_metadata(self, rev, message):
194
 
        (message, renames, branch, extra) = extract_hg_metadata(message)
195
 
        if branch is not None:
196
 
            rev.properties['hg:extra:branch'] = branch
197
 
        for name, value in extra.iteritems():
198
 
            rev.properties['hg:extra:' + name] = base64.b64encode(value)
199
 
        if renames:
200
 
            rev.properties['hg:renames'] = base64.b64encode(bencode.bencode([(new, old) for (old, new) in renames.iteritems()]))
201
 
        return message
202
 
 
203
 
    def _decode_commit_message(self, rev, message):
204
 
        return message.decode("utf-8", "replace")
205
 
 
206
 
    def _encode_commit_message(self, rev, message):
207
 
        return message.encode("utf-8")
208
 
 
209
 
    def export_commit(self, rev, tree_sha, parent_lookup):
210
 
        """Turn a Bazaar revision in to a Git commit
211
 
 
212
 
        :param tree_sha: Tree sha for the commit
213
 
        :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
214
 
        :return dulwich.objects.Commit represent the revision:
215
 
        """
216
 
        from dulwich.objects import Commit
217
 
        commit = Commit()
218
 
        commit.tree = tree_sha
219
 
        for p in rev.parent_ids:
220
 
            try:
221
 
                git_p = parent_lookup(p)
222
 
            except KeyError:
223
 
                git_p = None
224
 
            if git_p is not None:
225
 
                assert len(git_p) == 40, "unexpected length for %r" % git_p
226
 
                commit.parents.append(git_p)
227
 
        commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
228
 
        commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
229
 
        commit.commit_time = long(rev.timestamp)
230
 
        if 'author-timestamp' in rev.properties:
231
 
            commit.author_time = long(rev.properties['author-timestamp'])
232
 
        else:
233
 
            commit.author_time = commit.commit_time
234
 
        commit.commit_timezone = rev.timezone
235
 
        if 'author-timezone' in rev.properties:
236
 
            commit.author_timezone = int(rev.properties['author-timezone'])
237
 
        else:
238
 
            commit.author_timezone = commit.commit_timezone
239
 
        commit.message = self._encode_commit_message(rev, rev.message)
240
 
        return commit
241
 
 
242
151
    def import_commit(self, commit):
243
152
        """Convert a git commit to a bzr revision.
244
153
 
248
157
            raise AssertionError("Commit object can't be None")
249
158
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
250
159
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
160
        rev.message = commit.message.decode("utf-8", "replace")
251
161
        rev.committer = str(commit.committer).decode("utf-8", "replace")
252
162
        if commit.committer != commit.author:
253
163
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
258
168
            rev.properties['author-timezone'] = "%d" % (commit.author_timezone, )
259
169
        rev.timestamp = commit.commit_time
260
170
        rev.timezone = commit.commit_timezone
261
 
        rev.message = self._decode_commit_message(rev, commit.message)
262
171
        return rev
263
172
 
264
173
 
274
183
    revid_prefix = 'git-experimental'
275
184
    experimental = True
276
185
 
277
 
    def _decode_commit_message(self, rev, message):
278
 
        message = self._extract_hg_metadata(rev, message)
279
 
        message = self._extract_git_svn_metadata(rev, message)
280
 
        return message.decode("utf-8", "replace")
281
 
 
282
 
    def _encode_commit_message(self, rev, message):
283
 
        ret = message.encode("utf-8")
284
 
        ret += self._generate_hg_message_tail(rev)
285
 
        ret += self._generate_git_svn_metadata(rev)
286
 
        return ret
287
 
 
288
 
    def import_commit(self, commit):
289
 
        rev = super(BzrGitMappingExperimental, self).import_commit(commit)
290
 
        rev.properties['converted_revision'] = "git %s\n" % commit.id
291
 
        return rev
292
 
 
293
186
 
294
187
class GitMappingRegistry(VcsMappingRegistry):
295
188
    """Registry with available git mappings."""
296
189
 
297
190
    def revision_id_bzr_to_foreign(self, bzr_revid):
298
 
        if bzr_revid == NULL_REVISION:
299
 
            return "0" * 20, None
300
191
        if not bzr_revid.startswith("git-"):
301
192
            raise errors.InvalidRevisionId(bzr_revid, None)
302
193
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
311
202
                                   "BzrGitMappingv1")
312
203
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
313
204
                                   "BzrGitMappingExperimental")
314
 
mapping_registry.set_default('git-v1')
315
205
 
316
206
 
317
207
class ForeignGit(ForeignVcs):
318
208
    """The Git Stupid Content Tracker"""
319
209
 
320
 
    @property
321
 
    def branch_format(self):
322
 
        from bzrlib.plugins.git.branch import GitBranchFormat
323
 
        return GitBranchFormat()
324
 
 
325
 
    @property
326
 
    def repository_format(self):
327
 
        from bzrlib.plugins.git.repository import GitRepositoryFormat
328
 
        return GitRepositoryFormat()
329
 
 
330
210
    def __init__(self):
331
211
        super(ForeignGit, self).__init__(mapping_registry)
332
 
        self.abbreviation = "git"
333
 
 
334
 
    @classmethod
335
 
    def serialize_foreign_revid(self, foreign_revid):
336
 
        return foreign_revid
337
212
 
338
213
    @classmethod
339
214
    def show_foreign_revid(cls, foreign_revid):
341
216
 
342
217
 
343
218
foreign_git = ForeignGit()
344
 
default_mapping = mapping_registry.get_default()()
 
219
default_mapping = BzrGitMappingv1()
345
220
 
346
221
 
347
222
def text_to_blob(texts, entry):
389
264
    if kind == 'directory':
390
265
        return stat.S_IFDIR
391
266
    elif kind == 'symlink':
392
 
        mode = stat.S_IFLNK
393
 
        if executable:
394
 
            mode |= 0111
395
 
        return mode
 
267
        return stat.S_IFLNK
396
268
    elif kind == 'file':
397
269
        mode = stat.S_IFREG | 0644
398
270
        if executable:
399
271
            mode |= 0111
400
272
        return mode
401
 
    elif kind == 'tree-reference':
402
 
        from dulwich.objects import S_IFGITLINK
403
 
        return S_IFGITLINK
404
273
    else:
405
274
        raise AssertionError
406
275
 
450
319
        cur = ""
451
320
    tree = Tree()
452
321
 
453
 
    # stack contains the set of trees that we haven't
 
322
    # stack contains the set of trees that we haven't 
454
323
    # finished constructing
455
324
    for path, entry in inventory.iter_entries():
456
325
        while stack and not path.startswith(osutils.pathjoin(cur, "")):
493
362
    yield tree.id, tree, cur.encode("utf-8")
494
363
 
495
364
 
496
 
def parse_git_svn_id(text):
497
 
    (head, uuid) = text.rsplit(" ", 1)
498
 
    (full_url, rev) = head.rsplit("@", 1)
499
 
    return (full_url, int(rev), uuid)
 
365
def revision_to_commit(rev, tree_sha, parent_lookup):
 
366
    """Turn a Bazaar revision in to a Git commit
 
367
 
 
368
    :param tree_sha: Tree sha for the commit
 
369
    :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
 
370
    :return dulwich.objects.Commit represent the revision:
 
371
    """
 
372
    from dulwich.objects import Commit
 
373
    commit = Commit()
 
374
    commit.tree = tree_sha
 
375
    for p in rev.parent_ids:
 
376
        git_p = parent_lookup(p)
 
377
        if git_p is not None:
 
378
            assert len(git_p) == 40, "unexpected length for %r" % git_p
 
379
            commit.parents.append(git_p)
 
380
    commit.message = rev.message.encode("utf-8")
 
381
    commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
 
382
    commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
 
383
    commit.commit_time = long(rev.timestamp)
 
384
    if 'author-timestamp' in rev.properties:
 
385
        commit.author_time = long(rev.properties['author-timestamp'])
 
386
    else:
 
387
        commit.author_time = commit.commit_time
 
388
    commit.commit_timezone = rev.timezone
 
389
    if 'author-timezone' in rev.properties:
 
390
        commit.author_timezone = int(rev.properties['author-timezone'])
 
391
    else:
 
392
        commit.author_timezone = commit.commit_timezone 
 
393
    return commit