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."""
21
from bzrlib import errors, foreign, urlutils
22
from bzrlib.inventory import ROOT_ID
23
from bzrlib.foreign import (
29
def escape_file_id(file_id):
30
return file_id.replace('_', '__').replace(' ', '_s')
33
def unescape_file_id(file_id):
34
return file_id.replace("_s", " ").replace("__", "_")
37
class BzrGitMapping(foreign.VcsMapping):
38
"""Class that maps between Git and Bazaar semantics."""
42
super(BzrGitMapping, self).__init__(foreign_git)
44
def __eq__(self, other):
45
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
48
def revision_id_foreign_to_bzr(cls, git_rev_id):
49
"""Convert a git revision id handle to a Bazaar revision id."""
50
return "%s:%s" % (cls.revid_prefix, git_rev_id)
53
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
54
"""Convert a Bazaar revision id to a git revision id handle."""
55
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
56
raise errors.InvalidRevisionId(bzr_rev_id, cls)
57
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
59
def generate_file_id(self, path):
62
return escape_file_id(path.encode('utf-8'))
64
def import_commit(self, commit):
65
"""Convert a git commit to a bzr revision.
67
:return: a `bzrlib.revision.Revision` object.
70
raise AssertionError("Commit object can't be None")
71
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
72
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
73
rev.message = commit.message.decode("utf-8", "replace")
74
rev.committer = str(commit.committer).decode("utf-8", "replace")
75
if commit.committer != commit.author:
76
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
77
rev.timestamp = commit.commit_time
82
class BzrGitMappingv1(BzrGitMapping):
83
revid_prefix = 'git-v1'
87
class BzrGitMappingExperimental(BzrGitMappingv1):
88
revid_prefix = 'git-experimental'
92
class GitMappingRegistry(VcsMappingRegistry):
94
def revision_id_bzr_to_foreign(self, bzr_revid):
95
if not bzr_revid.startswith("git-"):
96
raise errors.InvalidRevisionId(bzr_revid, None)
97
(mapping_version, git_sha) = bzr_revid.split(":", 1)
98
mapping = self.get(mapping_version)
99
return mapping.revision_id_bzr_to_foreign(bzr_revid)
101
parse_revision_id = revision_id_bzr_to_foreign
104
mapping_registry = GitMappingRegistry()
105
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
107
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
108
"BzrGitMappingExperimental")
111
class ForeignGit(ForeignVcs):
115
super(ForeignGit, self).__init__(mapping_registry)
118
def show_foreign_revid(cls, foreign_revid):
119
return { "git commit": foreign_revid }
122
foreign_git = ForeignGit()
123
default_mapping = BzrGitMappingv1()
126
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
127
from dulwich.objects import Tree, Blob
128
from bzrlib.inventory import InventoryDirectory, InventoryFile
134
inv = repo.get_inventory(revision_id)
136
# stack contains the set of trees that we haven't
137
# finished constructing
139
for path, entry in inv.iter_entries():
140
while stack and not path.startswith(cur):
142
sha = tree.sha().hexdigest()
144
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
145
cur, tree = stack.pop()
148
if type(entry) == InventoryDirectory:
149
stack.append((cur, tree))
153
if type(entry) == InventoryFile:
154
#FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
155
# and having all these objects in memory at once
157
_, blob._text = repo.iter_files_bytes([(entry.file_id, entry.revision, path)]).next()
158
sha = blob.sha().hexdigest()
159
yield sha, blob, path
161
name = urlutils.basename(path).encode("utf-8")
162
mode = stat.S_IFREG | 0644
165
tree.add(mode, name, sha)
167
while len(stack) > 1:
169
sha = tree.sha().hexdigest()
171
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
172
cur, tree = stack.pop()
176
yield tree.sha().hexdigest(), tree, cur
179
def revision_to_commit(rev, tree_sha, parent_lookup):
180
"""Turn a Bazaar revision in to a Git commit
182
:param tree_sha: Tree sha for the commit
183
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
184
:return dulwich.objects.Commit represent the revision:
186
from dulwich.objects import Commit
188
commit._tree = tree_sha
189
for p in rev.parent_ids:
190
git_p = parent_lookup(p)
191
if git_p is not None:
192
commit._parents.append(git_p)
193
commit._message = rev.message.encode("utf-8")
194
commit._committer = rev.committer.encode("utf-8")
195
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
196
commit._commit_time = long(rev.timestamp)
added
removed
mapping.py
