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
class BzrGitMapping(foreign.VcsMapping):
53
"""Class that maps between Git and Bazaar semantics."""
57
super(BzrGitMapping, self).__init__(foreign_git)
59
def __eq__(self, other):
60
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
63
def revision_id_foreign_to_bzr(cls, git_rev_id):
64
"""Convert a git revision id handle to a Bazaar revision id."""
65
return "%s:%s" % (cls.revid_prefix, git_rev_id)
68
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
69
"""Convert a Bazaar revision id to a git revision id handle."""
70
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
71
raise errors.InvalidRevisionId(bzr_rev_id, cls)
72
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
74
def generate_file_id(self, path):
75
# Git paths are just bytestrings
76
# We must just hope they are valid UTF-8..
77
assert isinstance(path, str)
80
return escape_file_id(path)
82
def parse_file_id(self, file_id):
83
if file_id == ROOT_ID:
85
return unescape_file_id(file_id)
87
def import_commit(self, commit):
88
"""Convert a git commit to a bzr revision.
90
:return: a `bzrlib.revision.Revision` object.
93
raise AssertionError("Commit object can't be None")
94
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
95
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
96
rev.message = escape_invalid_chars(commit.message.decode("utf-8", "replace"))[0]
97
rev.committer = escape_invalid_chars(str(commit.committer).decode("utf-8", "replace"))[0]
98
if commit.committer != commit.author:
99
rev.properties['author'] = escape_invalid_chars(str(commit.author).decode("utf-8", "replace"))[0]
101
if commit.commit_time != commit.author_time:
102
rev.properties['author-timestamp'] = str(commit.author_time)
103
if commit.commit_timezone != commit.author_timezone:
104
rev.properties['author-timezone'] = "%f" % (commit.author_timezone * .6)
105
rev.timestamp = commit.commit_time
106
rev.timezone = int(commit.commit_timezone * .6)
107
if rev.timezone / .6 != commit.commit_timezone:
108
rev.properties['commit-timezone'] = "%f" % (commit.commit_timezone * .6)
112
class BzrGitMappingv1(BzrGitMapping):
113
revid_prefix = 'git-v1'
117
class BzrGitMappingExperimental(BzrGitMappingv1):
118
revid_prefix = 'git-experimental'
122
class GitMappingRegistry(VcsMappingRegistry):
124
def revision_id_bzr_to_foreign(self, bzr_revid):
125
if not bzr_revid.startswith("git-"):
126
raise errors.InvalidRevisionId(bzr_revid, None)
127
(mapping_version, git_sha) = bzr_revid.split(":", 1)
128
mapping = self.get(mapping_version)
129
return mapping.revision_id_bzr_to_foreign(bzr_revid)
131
parse_revision_id = revision_id_bzr_to_foreign
134
mapping_registry = GitMappingRegistry()
135
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
137
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
138
"BzrGitMappingExperimental")
141
class ForeignGit(ForeignVcs):
145
super(ForeignGit, self).__init__(mapping_registry)
148
def show_foreign_revid(cls, foreign_revid):
149
return { "git commit": foreign_revid }
152
foreign_git = ForeignGit()
153
default_mapping = BzrGitMappingv1()
156
def text_to_blob(texts, entry):
157
from dulwich.objects import Blob
158
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
164
def symlink_to_blob(entry):
165
from dulwich.objects import Blob
167
blob._text = entry.symlink_target
171
def entry_mode(entry):
172
if entry.kind == 'directory':
174
elif entry.kind == 'symlink':
176
elif entry.kind == 'file':
177
mode = stat.S_IFREG | 0644
185
def directory_to_tree(entry, lookup_ie_sha1):
186
from dulwich.objects import Tree
188
for name in sorted(entry.children.keys()):
189
ie = entry.children[name]
190
tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
195
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
196
"""Convert a Bazaar tree to a Git tree.
198
:return: Yields tuples with object sha1, object and path
200
from dulwich.objects import Tree
207
# stack contains the set of trees that we haven't
208
# finished constructing
209
for path, entry in inventory.iter_entries():
210
while stack and not path.startswith(osutils.pathjoin(cur, "")):
211
# We've hit a file that's not a child of the previous path
214
yield sha, tree, cur.encode("utf-8")
215
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
216
cur, tree = stack.pop()
219
if entry.kind == "directory":
220
stack.append((cur, tree))
224
if entry.kind == "file":
225
blob = text_to_blob(texts, entry)
226
elif entry.kind == "symlink":
227
blob = symlink_to_blob(entry)
229
raise AssertionError("Unknown kind %s" % entry.kind)
231
yield sha, blob, path.encode("utf-8")
232
name = urlutils.basename(path).encode("utf-8")
233
tree.add(entry_mode(entry), name, sha)
235
while len(stack) > 1:
238
yield sha, tree, cur.encode("utf-8")
239
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
240
cur, tree = stack.pop()
244
yield tree.id, tree, cur.encode("utf-8")
247
def revision_to_commit(rev, tree_sha, parent_lookup):
248
"""Turn a Bazaar revision in to a Git commit
250
:param tree_sha: Tree sha for the commit
251
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
252
:return dulwich.objects.Commit represent the revision:
254
from dulwich.objects import Commit
256
commit._tree = tree_sha
257
for p in rev.parent_ids:
258
git_p = parent_lookup(p)
259
if git_p is not None:
260
assert len(git_p) == 40, "unexpected length for %r" % git_p
261
commit._parents.append(git_p)
262
commit._message = rev.message.encode("utf-8")
263
commit._committer = rev.committer.encode("utf-8")
264
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
265
commit._commit_time = long(rev.timestamp)
266
if 'author-timestamp' in rev.properties:
267
commit._author_time = long(rev.properties['author-timestamp'])
269
commit._author_time = commit._commit_time
270
if 'committer-timezone' in rev.properties:
271
commit._commit_timezone = int(float(rev.properties['commit-timezone']) / .6)
273
commit._commit_timezone = int(rev.timezone / .6)
274
if 'author-timezone' in rev.properties:
275
commit._author_timezone = int(float(rev.properties['author-timezone']) / .6)
277
commit._author_timezone = commit._commit_timezone
added
removed
mapping.py
