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'] = str(commit.author_timezone)
105
rev.timestamp = commit.commit_time
106
rev.timezone = commit.commit_timezone
110
class BzrGitMappingv1(BzrGitMapping):
111
revid_prefix = 'git-v1'
115
class BzrGitMappingExperimental(BzrGitMappingv1):
116
revid_prefix = 'git-experimental'
120
class GitMappingRegistry(VcsMappingRegistry):
122
def revision_id_bzr_to_foreign(self, bzr_revid):
123
if not bzr_revid.startswith("git-"):
124
raise errors.InvalidRevisionId(bzr_revid, None)
125
(mapping_version, git_sha) = bzr_revid.split(":", 1)
126
mapping = self.get(mapping_version)
127
return mapping.revision_id_bzr_to_foreign(bzr_revid)
129
parse_revision_id = revision_id_bzr_to_foreign
132
mapping_registry = GitMappingRegistry()
133
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
135
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
136
"BzrGitMappingExperimental")
139
class ForeignGit(ForeignVcs):
143
super(ForeignGit, self).__init__(mapping_registry)
146
def show_foreign_revid(cls, foreign_revid):
147
return { "git commit": foreign_revid }
150
foreign_git = ForeignGit()
151
default_mapping = BzrGitMappingv1()
154
def text_to_blob(texts, entry):
155
from dulwich.objects import Blob
156
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
162
def symlink_to_blob(entry):
163
from dulwich.objects import Blob
165
blob._text = entry.symlink_target
169
def entry_mode(entry):
170
if entry.kind == 'directory':
172
elif entry.kind == 'symlink':
174
elif entry.kind == 'file':
175
mode = stat.S_IFREG | 0644
183
def directory_to_tree(entry, lookup_ie_sha1):
184
from dulwich.objects import Tree
186
for name in sorted(entry.children.keys()):
187
ie = entry.children[name]
188
tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
193
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
194
"""Convert a Bazaar tree to a Git tree.
196
:return: Yields tuples with object sha1, object and path
198
from dulwich.objects import Tree
205
# stack contains the set of trees that we haven't
206
# finished constructing
207
for path, entry in inventory.iter_entries():
208
while stack and not path.startswith(osutils.pathjoin(cur, "")):
209
# We've hit a file that's not a child of the previous path
212
yield sha, tree, cur.encode("utf-8")
213
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
214
cur, tree = stack.pop()
217
if entry.kind == "directory":
218
stack.append((cur, tree))
222
if entry.kind == "file":
223
blob = text_to_blob(texts, entry)
224
elif entry.kind == "symlink":
225
blob = symlink_to_blob(entry)
227
raise AssertionError("Unknown kind %s" % entry.kind)
229
yield sha, blob, path.encode("utf-8")
230
name = urlutils.basename(path).encode("utf-8")
231
tree.add(entry_mode(entry), name, sha)
233
while len(stack) > 1:
236
yield sha, tree, cur.encode("utf-8")
237
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
238
cur, tree = stack.pop()
242
yield tree.id, tree, cur.encode("utf-8")
245
def revision_to_commit(rev, tree_sha, parent_lookup):
246
"""Turn a Bazaar revision in to a Git commit
248
:param tree_sha: Tree sha for the commit
249
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
250
:return dulwich.objects.Commit represent the revision:
252
from dulwich.objects import Commit
254
commit._tree = tree_sha
255
for p in rev.parent_ids:
256
git_p = parent_lookup(p)
257
if git_p is not None:
258
assert len(git_p) == 40, "unexpected length for %r" % git_p
259
commit._parents.append(git_p)
260
commit._message = rev.message.encode("utf-8")
261
commit._committer = rev.committer.encode("utf-8")
262
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
263
commit._commit_time = long(rev.timestamp)
264
if 'author-timestamp' in rev.properties:
265
commit._author_time = long(rev.properties['author-timestamp'])
267
commit._author_time = commit._commit_time
268
commit._commit_timezone = rev.timezone
269
if 'author-timezone' in rev.properties:
270
commit._author_timezone = int(rev.properties['author-timezone'])
272
commit._author_timezone = commit._commit_timezone
added
removed
mapping.py
