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."""
26
from bzrlib.inventory import (
29
from bzrlib.foreign import (
35
def escape_file_id(file_id):
36
return file_id.replace('_', '__').replace(' ', '_s')
39
def unescape_file_id(file_id):
40
return file_id.replace("_s", " ").replace("__", "_")
43
class BzrGitMapping(foreign.VcsMapping):
44
"""Class that maps between Git and Bazaar semantics."""
48
super(BzrGitMapping, self).__init__(foreign_git)
50
def __eq__(self, other):
51
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
54
def revision_id_foreign_to_bzr(cls, git_rev_id):
55
"""Convert a git revision id handle to a Bazaar revision id."""
56
return "%s:%s" % (cls.revid_prefix, git_rev_id)
59
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
60
"""Convert a Bazaar revision id to a git revision id handle."""
61
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
62
raise errors.InvalidRevisionId(bzr_rev_id, cls)
63
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
65
def generate_file_id(self, path):
66
# Git paths are just bytestrings
67
# We must just hope they are valid UTF-8..
68
assert isinstance(path, str)
71
return escape_file_id(path)
73
def import_commit(self, commit):
74
"""Convert a git commit to a bzr revision.
76
:return: a `bzrlib.revision.Revision` object.
79
raise AssertionError("Commit object can't be None")
80
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
81
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
82
rev.message = commit.message.decode("utf-8", "replace")
83
rev.committer = str(commit.committer).decode("utf-8", "replace")
84
if commit.committer != commit.author:
85
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
86
rev.timestamp = commit.commit_time
91
class BzrGitMappingv1(BzrGitMapping):
92
revid_prefix = 'git-v1'
96
class BzrGitMappingExperimental(BzrGitMappingv1):
97
revid_prefix = 'git-experimental'
101
class GitMappingRegistry(VcsMappingRegistry):
103
def revision_id_bzr_to_foreign(self, bzr_revid):
104
if not bzr_revid.startswith("git-"):
105
raise errors.InvalidRevisionId(bzr_revid, None)
106
(mapping_version, git_sha) = bzr_revid.split(":", 1)
107
mapping = self.get(mapping_version)
108
return mapping.revision_id_bzr_to_foreign(bzr_revid)
110
parse_revision_id = revision_id_bzr_to_foreign
113
mapping_registry = GitMappingRegistry()
114
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
116
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
117
"BzrGitMappingExperimental")
120
class ForeignGit(ForeignVcs):
124
super(ForeignGit, self).__init__(mapping_registry)
127
def show_foreign_revid(cls, foreign_revid):
128
return { "git commit": foreign_revid }
131
foreign_git = ForeignGit()
132
default_mapping = BzrGitMappingv1()
135
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
136
from dulwich.objects import Tree, Blob
137
from bzrlib.inventory import InventoryDirectory, InventoryFile
143
inv = repo.get_inventory(revision_id)
145
# stack contains the set of trees that we haven't
146
# finished constructing
147
for path, entry in inv.iter_entries():
148
while stack and not path.startswith(cur):
150
sha = tree.sha().hexdigest()
152
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
153
cur, tree = stack.pop()
156
if type(entry) == InventoryDirectory:
157
stack.append((cur, tree))
161
if type(entry) == InventoryFile:
162
#FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
163
# and having all these objects in memory at once
165
_, blob._text = repo.iter_files_bytes([(entry.file_id, entry.revision, path)]).next()
166
sha = blob.sha().hexdigest()
167
yield sha, blob, path
169
name = urlutils.basename(path).encode("utf-8")
170
mode = stat.S_IFREG | 0644
173
tree.add(mode, name, sha)
175
while len(stack) > 1:
177
sha = tree.sha().hexdigest()
179
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
180
cur, tree = stack.pop()
184
yield tree.sha().hexdigest(), tree, cur
187
def revision_to_commit(rev, tree_sha, parent_lookup):
188
"""Turn a Bazaar revision in to a Git commit
190
:param tree_sha: Tree sha for the commit
191
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
192
:return dulwich.objects.Commit represent the revision:
194
from dulwich.objects import Commit
196
commit._tree = tree_sha
197
for p in rev.parent_ids:
198
git_p = parent_lookup(p)
199
if git_p is not None:
200
assert len(git_p) == 40, "unexpected length for %r" % git_p
201
commit._parents.append(git_p)
202
commit._message = rev.message.encode("utf-8")
203
commit._committer = rev.committer.encode("utf-8")
204
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
205
commit._commit_time = long(rev.timestamp)
added
removed
mapping.py
