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):
51
while i < len(file_id):
53
ret.append(file_id[i])
55
if file_id[i+1] == '_':
57
elif file_id[i+1] == 's':
60
raise AssertionError("unknown escape character %s" % file_id[i+1])
66
def fix_person_identifier(text):
67
if "<" in text and ">" in text:
69
return "%s <%s>" % (text, text)
72
class BzrGitMapping(foreign.VcsMapping):
73
"""Class that maps between Git and Bazaar semantics."""
77
super(BzrGitMapping, self).__init__(foreign_git)
79
def __eq__(self, other):
80
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
83
def revision_id_foreign_to_bzr(cls, git_rev_id):
84
"""Convert a git revision id handle to a Bazaar revision id."""
85
return "%s:%s" % (cls.revid_prefix, git_rev_id)
88
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
89
"""Convert a Bazaar revision id to a git revision id handle."""
90
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
91
raise errors.InvalidRevisionId(bzr_rev_id, cls)
92
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
94
def generate_file_id(self, path):
95
# Git paths are just bytestrings
96
# We must just hope they are valid UTF-8..
97
assert isinstance(path, str)
100
return escape_file_id(path)
102
def parse_file_id(self, file_id):
103
if file_id == ROOT_ID:
105
return unescape_file_id(file_id)
107
def import_commit(self, commit):
108
"""Convert a git commit to a bzr revision.
110
:return: a `bzrlib.revision.Revision` object.
113
raise AssertionError("Commit object can't be None")
114
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
115
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
116
rev.message = escape_invalid_chars(commit.message.decode("utf-8", "replace"))[0]
117
rev.committer = escape_invalid_chars(str(commit.committer).decode("utf-8", "replace"))[0]
118
if commit.committer != commit.author:
119
rev.properties['author'] = escape_invalid_chars(str(commit.author).decode("utf-8", "replace"))[0]
121
if commit.commit_time != commit.author_time:
122
rev.properties['author-timestamp'] = str(commit.author_time)
123
if commit.commit_timezone != commit.author_timezone:
124
rev.properties['author-timezone'] = "%f" % (commit.author_timezone * .6)
125
rev.timestamp = commit.commit_time
126
rev.timezone = int(commit.commit_timezone * .6)
127
if rev.timezone / .6 != commit.commit_timezone:
128
rev.properties['commit-timezone'] = "%f" % (commit.commit_timezone * .6)
132
class BzrGitMappingv1(BzrGitMapping):
133
revid_prefix = 'git-v1'
137
return self.revid_prefix
140
class BzrGitMappingExperimental(BzrGitMappingv1):
141
revid_prefix = 'git-experimental'
145
class GitMappingRegistry(VcsMappingRegistry):
147
def revision_id_bzr_to_foreign(self, bzr_revid):
148
if not bzr_revid.startswith("git-"):
149
raise errors.InvalidRevisionId(bzr_revid, None)
150
(mapping_version, git_sha) = bzr_revid.split(":", 1)
151
mapping = self.get(mapping_version)
152
return mapping.revision_id_bzr_to_foreign(bzr_revid)
154
parse_revision_id = revision_id_bzr_to_foreign
157
mapping_registry = GitMappingRegistry()
158
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
160
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
161
"BzrGitMappingExperimental")
164
class ForeignGit(ForeignVcs):
165
"""The Git Stupid Content Tracker"""
168
super(ForeignGit, self).__init__(mapping_registry)
171
def show_foreign_revid(cls, foreign_revid):
172
return { "git commit": foreign_revid }
175
foreign_git = ForeignGit()
176
default_mapping = BzrGitMappingv1()
179
def text_to_blob(texts, entry):
180
from dulwich.objects import Blob
181
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
187
def symlink_to_blob(entry):
188
from dulwich.objects import Blob
190
blob._text = entry.symlink_target
194
def entry_mode(entry):
195
if entry.kind == 'directory':
197
elif entry.kind == 'symlink':
199
elif entry.kind == 'file':
200
mode = stat.S_IFREG | 0644
208
def directory_to_tree(entry, lookup_ie_sha1):
209
from dulwich.objects import Tree
211
for name in sorted(entry.children.keys()):
212
ie = entry.children[name]
213
tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
218
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
219
"""Convert a Bazaar tree to a Git tree.
221
:return: Yields tuples with object sha1, object and path
223
from dulwich.objects import Tree
230
# stack contains the set of trees that we haven't
231
# finished constructing
232
for path, entry in inventory.iter_entries():
233
while stack and not path.startswith(osutils.pathjoin(cur, "")):
234
# We've hit a file that's not a child of the previous path
237
yield sha, tree, cur.encode("utf-8")
238
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
239
cur, tree = stack.pop()
242
if entry.kind == "directory":
243
stack.append((cur, tree))
247
if entry.kind == "file":
248
blob = text_to_blob(texts, entry)
249
elif entry.kind == "symlink":
250
blob = symlink_to_blob(entry)
252
raise AssertionError("Unknown kind %s" % entry.kind)
254
yield sha, blob, path.encode("utf-8")
255
name = urlutils.basename(path).encode("utf-8")
256
tree.add(entry_mode(entry), name, sha)
258
while len(stack) > 1:
261
yield sha, tree, cur.encode("utf-8")
262
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
263
cur, tree = stack.pop()
267
yield tree.id, tree, cur.encode("utf-8")
270
def revision_to_commit(rev, tree_sha, parent_lookup):
271
"""Turn a Bazaar revision in to a Git commit
273
:param tree_sha: Tree sha for the commit
274
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
275
:return dulwich.objects.Commit represent the revision:
277
from dulwich.objects import Commit
279
commit._tree = tree_sha
280
for p in rev.parent_ids:
281
git_p = parent_lookup(p)
282
if git_p is not None:
283
assert len(git_p) == 40, "unexpected length for %r" % git_p
284
commit._parents.append(git_p)
285
commit._message = rev.message.encode("utf-8")
286
commit._committer = fix_person_identifier(rev.committer.encode("utf-8"))
287
commit._author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
288
commit._commit_time = long(rev.timestamp)
289
if 'author-timestamp' in rev.properties:
290
commit._author_time = long(rev.properties['author-timestamp'])
292
commit._author_time = commit._commit_time
293
if 'committer-timezone' in rev.properties:
294
commit._commit_timezone = int(float(rev.properties['commit-timezone']) / .6)
296
commit._commit_timezone = int(rev.timezone / .6)
297
if 'author-timezone' in rev.properties:
298
commit._author_timezone = int(float(rev.properties['author-timezone']) / .6)
300
commit._author_timezone = commit._commit_timezone
added
removed
mapping.py
