17
17
"""Converters, etc for going between Bazaar and Git ids."""
19
19
from bzrlib import errors, foreign
20
from bzrlib.inventory import ROOT_ID
21
from bzrlib.foreign import (
26
def escape_file_id(file_id):
27
return file_id.replace('_', '__').replace(' ', '_s')
30
def unescape_file_id(file_id):
31
return file_id.replace("_s", " ").replace("__", "_")
22
34
class BzrGitMapping(foreign.VcsMapping):
36
48
def show_foreign_revid(self, foreign_revid):
37
49
return { "git commit": foreign_revid }
40
class BzrGitMappingExperimental(BzrGitMapping):
51
def generate_file_id(self, path):
54
return escape_file_id(path.encode('utf-8'))
56
def import_commit(self, commit):
57
"""Convert a git commit to a bzr revision.
59
:return: a `bzrlib.revision.Revision` object.
62
raise AssertionError("Commit object can't be None")
63
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
64
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
65
rev.message = commit.message.decode("utf-8", "replace")
66
rev.committer = str(commit.committer).decode("utf-8", "replace")
67
if commit.committer != commit.author:
68
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
69
rev.timestamp = commit.commit_time
74
class BzrGitMappingv1(BzrGitMapping):
75
revid_prefix = 'git-v1'
79
class BzrGitMappingExperimental(BzrGitMappingv1):
41
80
revid_prefix = 'git-experimental'
42
81
experimental = True
45
default_mapping = BzrGitMappingExperimental()
84
default_mapping = BzrGitMappingv1()
added
removed
mapping.py
