1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
# Copyright (C) 2008 John Carr
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Converters, etc for going between Bazaar and Git ids."""
29
from bzrlib.inventory import (
32
from bzrlib.foreign import (
37
from bzrlib.xml_serializer import (
41
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
44
def escape_file_id(file_id):
45
return file_id.replace('_', '__').replace(' ', '_s')
48
def unescape_file_id(file_id):
49
return file_id.replace("_s", " ").replace("__", "_")
52
def fix_person_identifier(text):
53
if "<" in text and ">" in text:
55
return "%s <%s>" % (text, text)
58
class BzrGitMapping(foreign.VcsMapping):
59
"""Class that maps between Git and Bazaar semantics."""
63
super(BzrGitMapping, self).__init__(foreign_git)
65
def __eq__(self, other):
66
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
69
def revision_id_foreign_to_bzr(cls, git_rev_id):
70
"""Convert a git revision id handle to a Bazaar revision id."""
71
return "%s:%s" % (cls.revid_prefix, git_rev_id)
74
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
75
"""Convert a Bazaar revision id to a git revision id handle."""
76
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
77
raise errors.InvalidRevisionId(bzr_rev_id, cls)
78
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
80
def generate_file_id(self, path):
81
# Git paths are just bytestrings
82
# We must just hope they are valid UTF-8..
83
assert isinstance(path, str)
86
return escape_file_id(path)
88
def parse_file_id(self, file_id):
89
if file_id == ROOT_ID:
91
return unescape_file_id(file_id)
93
def import_commit(self, commit):
94
"""Convert a git commit to a bzr revision.
96
:return: a `bzrlib.revision.Revision` object.
99
raise AssertionError("Commit object can't be None")
100
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
101
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
102
rev.message = escape_invalid_chars(commit.message.decode("utf-8", "replace"))[0]
103
rev.committer = escape_invalid_chars(str(commit.committer).decode("utf-8", "replace"))[0]
104
if commit.committer != commit.author:
105
rev.properties['author'] = escape_invalid_chars(str(commit.author).decode("utf-8", "replace"))[0]
107
if commit.commit_time != commit.author_time:
108
rev.properties['author-timestamp'] = str(commit.author_time)
109
if commit.commit_timezone != commit.author_timezone:
110
rev.properties['author-timezone'] = "%f" % (commit.author_timezone * .6)
111
rev.timestamp = commit.commit_time
112
rev.timezone = int(commit.commit_timezone * .6)
113
if rev.timezone / .6 != commit.commit_timezone:
114
rev.properties['commit-timezone'] = "%f" % (commit.commit_timezone * .6)
118
class BzrGitMappingv1(BzrGitMapping):
119
revid_prefix = 'git-v1'
123
class BzrGitMappingExperimental(BzrGitMappingv1):
124
revid_prefix = 'git-experimental'
128
class GitMappingRegistry(VcsMappingRegistry):
130
def revision_id_bzr_to_foreign(self, bzr_revid):
131
if not bzr_revid.startswith("git-"):
132
raise errors.InvalidRevisionId(bzr_revid, None)
133
(mapping_version, git_sha) = bzr_revid.split(":", 1)
134
mapping = self.get(mapping_version)
135
return mapping.revision_id_bzr_to_foreign(bzr_revid)
137
parse_revision_id = revision_id_bzr_to_foreign
140
mapping_registry = GitMappingRegistry()
141
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
143
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
144
"BzrGitMappingExperimental")
147
class ForeignGit(ForeignVcs):
151
super(ForeignGit, self).__init__(mapping_registry)
154
def show_foreign_revid(cls, foreign_revid):
155
return { "git commit": foreign_revid }
158
foreign_git = ForeignGit()
159
default_mapping = BzrGitMappingv1()
162
def text_to_blob(texts, entry):
163
from dulwich.objects import Blob
164
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
170
def symlink_to_blob(entry):
171
from dulwich.objects import Blob
173
blob._text = entry.symlink_target
177
def entry_mode(entry):
178
if entry.kind == 'directory':
180
elif entry.kind == 'symlink':
182
elif entry.kind == 'file':
183
mode = stat.S_IFREG | 0644
191
def directory_to_tree(entry, lookup_ie_sha1):
192
from dulwich.objects import Tree
194
for name in sorted(entry.children.keys()):
195
ie = entry.children[name]
196
tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
201
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
202
"""Convert a Bazaar tree to a Git tree.
204
:return: Yields tuples with object sha1, object and path
206
from dulwich.objects import Tree
213
# stack contains the set of trees that we haven't
214
# finished constructing
215
for path, entry in inventory.iter_entries():
216
while stack and not path.startswith(osutils.pathjoin(cur, "")):
217
# We've hit a file that's not a child of the previous path
220
yield sha, tree, cur.encode("utf-8")
221
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
222
cur, tree = stack.pop()
225
if entry.kind == "directory":
226
stack.append((cur, tree))
230
if entry.kind == "file":
231
blob = text_to_blob(texts, entry)
232
elif entry.kind == "symlink":
233
blob = symlink_to_blob(entry)
235
raise AssertionError("Unknown kind %s" % entry.kind)
237
yield sha, blob, path.encode("utf-8")
238
name = urlutils.basename(path).encode("utf-8")
239
tree.add(entry_mode(entry), name, sha)
241
while len(stack) > 1:
244
yield sha, tree, cur.encode("utf-8")
245
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
246
cur, tree = stack.pop()
250
yield tree.id, tree, cur.encode("utf-8")
253
def revision_to_commit(rev, tree_sha, parent_lookup):
254
"""Turn a Bazaar revision in to a Git commit
256
:param tree_sha: Tree sha for the commit
257
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
258
:return dulwich.objects.Commit represent the revision:
260
from dulwich.objects import Commit
262
commit._tree = tree_sha
263
for p in rev.parent_ids:
264
git_p = parent_lookup(p)
265
if git_p is not None:
266
assert len(git_p) == 40, "unexpected length for %r" % git_p
267
commit._parents.append(git_p)
268
commit._message = rev.message.encode("utf-8")
269
commit._committer = fix_person_identifier(rev.committer.encode("utf-8"))
270
commit._author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
271
commit._commit_time = long(rev.timestamp)
272
if 'author-timestamp' in rev.properties:
273
commit._author_time = long(rev.properties['author-timestamp'])
275
commit._author_time = commit._commit_time
276
if 'committer-timezone' in rev.properties:
277
commit._commit_timezone = int(float(rev.properties['commit-timezone']) / .6)
279
commit._commit_timezone = int(rev.timezone / .6)
280
if 'author-timezone' in rev.properties:
281
commit._author_timezone = int(float(rev.properties['author-timezone']) / .6)
283
commit._author_timezone = commit._commit_timezone
added
removed
mapping.py
