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."""
27
from bzrlib.inventory import (
30
from bzrlib.foreign import (
35
from bzrlib.xml_serializer import (
39
DEFAULT_TREE_MODE = 0040000
40
DEFAULT_FILE_MODE = 0100644
41
DEFAULT_SYMLINK_MODE = 0120000
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
rev.timestamp = commit.commit_time
108
class BzrGitMappingv1(BzrGitMapping):
109
revid_prefix = 'git-v1'
113
class BzrGitMappingExperimental(BzrGitMappingv1):
114
revid_prefix = 'git-experimental'
118
class GitMappingRegistry(VcsMappingRegistry):
120
def revision_id_bzr_to_foreign(self, bzr_revid):
121
if not bzr_revid.startswith("git-"):
122
raise errors.InvalidRevisionId(bzr_revid, None)
123
(mapping_version, git_sha) = bzr_revid.split(":", 1)
124
mapping = self.get(mapping_version)
125
return mapping.revision_id_bzr_to_foreign(bzr_revid)
127
parse_revision_id = revision_id_bzr_to_foreign
130
mapping_registry = GitMappingRegistry()
131
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
133
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
134
"BzrGitMappingExperimental")
137
class ForeignGit(ForeignVcs):
141
super(ForeignGit, self).__init__(mapping_registry)
144
def show_foreign_revid(cls, foreign_revid):
145
return { "git commit": foreign_revid }
148
foreign_git = ForeignGit()
149
default_mapping = BzrGitMappingv1()
152
def text_to_blob(text):
153
from dulwich.objects import Blob
159
def symlink_to_blob(entry):
160
from dulwich.objects import Blob
162
blob._text = entry.symlink_target
166
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
167
"""Convert a Bazaar tree to a Git tree.
169
:return: Yields tuples with object sha1, object and path
171
from dulwich.objects import Tree
172
from bzrlib.inventory import InventoryDirectory, InventoryFile
179
# stack contains the set of trees that we haven't
180
# finished constructing
181
for path, entry in inventory.iter_entries():
182
while stack and not path.startswith(osutils.pathjoin(cur, "")):
183
# We've hit a file that's not a child of the previous path
187
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
188
cur, tree = stack.pop()
191
if entry.kind == "directory":
192
stack.append((cur, tree))
195
elif entry.kind == "file":
196
#FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
197
# and having all these objects in memory at once
198
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
199
blob = text_to_blob(text)
201
yield sha, blob, path
203
name = urlutils.basename(path).encode("utf-8")
204
mode = stat.S_IFREG | 0644
207
tree.add(mode, name, sha)
208
elif entry.kind == "symlink":
209
blob = symlink_to_blob(entry)
211
yield sha, blob, path
212
name = urlutils.basename(path).encode("utf-8")
213
tree.add(stat.S_IFLNK, name, sha)
215
raise AssertionError("Unknown kind %s" % entry.kind)
217
while len(stack) > 1:
221
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
222
cur, tree = stack.pop()
226
yield tree.id, tree, cur
229
def revision_to_commit(rev, tree_sha, parent_lookup):
230
"""Turn a Bazaar revision in to a Git commit
232
:param tree_sha: Tree sha for the commit
233
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
234
:return dulwich.objects.Commit represent the revision:
236
from dulwich.objects import Commit
238
commit._tree = tree_sha
239
for p in rev.parent_ids:
240
git_p = parent_lookup(p)
241
if git_p is not None:
242
assert len(git_p) == 40, "unexpected length for %r" % git_p
243
commit._parents.append(git_p)
244
commit._message = rev.message.encode("utf-8")
245
commit._committer = rev.committer.encode("utf-8")
246
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
247
commit._commit_time = long(rev.timestamp)
248
if 'author-timestamp' in rev.properties:
249
commit._author_time = long(rev.properties['author-timestamp'])
251
commit._author_time = commit._commit_time
added
removed
mapping.py
