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 parse_file_id(self, file_id):
74
if file_id == ROOT_ID:
76
return unescape_file_id(file_id)
78
def import_commit(self, commit):
79
"""Convert a git commit to a bzr revision.
81
:return: a `bzrlib.revision.Revision` object.
84
raise AssertionError("Commit object can't be None")
85
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
86
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
87
rev.message = commit.message.decode("utf-8", "replace")
88
rev.committer = str(commit.committer).decode("utf-8", "replace")
89
if commit.committer != commit.author:
90
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
91
rev.timestamp = commit.commit_time
96
class BzrGitMappingv1(BzrGitMapping):
97
revid_prefix = 'git-v1'
101
class BzrGitMappingExperimental(BzrGitMappingv1):
102
revid_prefix = 'git-experimental'
106
class GitMappingRegistry(VcsMappingRegistry):
108
def revision_id_bzr_to_foreign(self, bzr_revid):
109
if not bzr_revid.startswith("git-"):
110
raise errors.InvalidRevisionId(bzr_revid, None)
111
(mapping_version, git_sha) = bzr_revid.split(":", 1)
112
mapping = self.get(mapping_version)
113
return mapping.revision_id_bzr_to_foreign(bzr_revid)
115
parse_revision_id = revision_id_bzr_to_foreign
118
mapping_registry = GitMappingRegistry()
119
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
121
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
122
"BzrGitMappingExperimental")
125
class ForeignGit(ForeignVcs):
129
super(ForeignGit, self).__init__(mapping_registry)
132
def show_foreign_revid(cls, foreign_revid):
133
return { "git commit": foreign_revid }
136
foreign_git = ForeignGit()
137
default_mapping = BzrGitMappingv1()
140
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
141
from dulwich.objects import Tree, Blob
142
from bzrlib.inventory import InventoryDirectory, InventoryFile
148
inv = repo.get_inventory(revision_id)
150
# stack contains the set of trees that we haven't
151
# finished constructing
152
for path, entry in inv.iter_entries():
153
while stack and not path.startswith(cur):
155
sha = tree.sha().hexdigest()
157
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
158
cur, tree = stack.pop()
161
if type(entry) == InventoryDirectory:
162
stack.append((cur, tree))
166
if type(entry) == InventoryFile:
167
#FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
168
# and having all these objects in memory at once
170
_, blob._text = repo.iter_files_bytes([(entry.file_id, entry.revision, path)]).next()
171
sha = blob.sha().hexdigest()
172
yield sha, blob, path
174
name = urlutils.basename(path).encode("utf-8")
175
mode = stat.S_IFREG | 0644
178
tree.add(mode, name, sha)
180
while len(stack) > 1:
182
sha = tree.sha().hexdigest()
184
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
185
cur, tree = stack.pop()
189
yield tree.sha().hexdigest(), tree, cur
192
def revision_to_commit(rev, tree_sha, parent_lookup):
193
"""Turn a Bazaar revision in to a Git commit
195
:param tree_sha: Tree sha for the commit
196
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
197
:return dulwich.objects.Commit represent the revision:
199
from dulwich.objects import Commit
201
commit._tree = tree_sha
202
for p in rev.parent_ids:
203
git_p = parent_lookup(p)
204
if git_p is not None:
205
assert len(git_p) == 40, "unexpected length for %r" % git_p
206
commit._parents.append(git_p)
207
commit._message = rev.message.encode("utf-8")
208
commit._committer = rev.committer.encode("utf-8")
209
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
210
commit._commit_time = long(rev.timestamp)
added
removed
mapping.py
