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 (
34
from bzrlib.plugins.git.foreign import (
35
escape_commit_message,
39
def escape_file_id(file_id):
40
return file_id.replace('_', '__').replace(' ', '_s')
43
def unescape_file_id(file_id):
44
return file_id.replace("_s", " ").replace("__", "_")
47
class BzrGitMapping(foreign.VcsMapping):
48
"""Class that maps between Git and Bazaar semantics."""
52
super(BzrGitMapping, self).__init__(foreign_git)
54
def __eq__(self, other):
55
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
58
def revision_id_foreign_to_bzr(cls, git_rev_id):
59
"""Convert a git revision id handle to a Bazaar revision id."""
60
return "%s:%s" % (cls.revid_prefix, git_rev_id)
63
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
64
"""Convert a Bazaar revision id to a git revision id handle."""
65
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
66
raise errors.InvalidRevisionId(bzr_rev_id, cls)
67
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
69
def generate_file_id(self, path):
70
# Git paths are just bytestrings
71
# We must just hope they are valid UTF-8..
72
assert isinstance(path, str)
75
return escape_file_id(path)
77
def parse_file_id(self, file_id):
78
if file_id == ROOT_ID:
80
return unescape_file_id(file_id)
82
def import_commit(self, commit):
83
"""Convert a git commit to a bzr revision.
85
:return: a `bzrlib.revision.Revision` object.
88
raise AssertionError("Commit object can't be None")
89
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
90
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
91
rev.message = escape_commit_message(commit.message.decode("utf-8", "replace"))
92
rev.committer = escape_commit_message(str(commit.committer).decode("utf-8", "replace"))
93
if commit.committer != commit.author:
94
rev.properties['author'] = escape_commit_message(str(commit.author).decode("utf-8", "replace"))
95
rev.timestamp = commit.commit_time
100
class BzrGitMappingv1(BzrGitMapping):
101
revid_prefix = 'git-v1'
105
class BzrGitMappingExperimental(BzrGitMappingv1):
106
revid_prefix = 'git-experimental'
110
class GitMappingRegistry(VcsMappingRegistry):
112
def revision_id_bzr_to_foreign(self, bzr_revid):
113
if not bzr_revid.startswith("git-"):
114
raise errors.InvalidRevisionId(bzr_revid, None)
115
(mapping_version, git_sha) = bzr_revid.split(":", 1)
116
mapping = self.get(mapping_version)
117
return mapping.revision_id_bzr_to_foreign(bzr_revid)
119
parse_revision_id = revision_id_bzr_to_foreign
122
mapping_registry = GitMappingRegistry()
123
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
125
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
126
"BzrGitMappingExperimental")
129
class ForeignGit(ForeignVcs):
133
super(ForeignGit, self).__init__(mapping_registry)
136
def show_foreign_revid(cls, foreign_revid):
137
return { "git commit": foreign_revid }
140
foreign_git = ForeignGit()
141
default_mapping = BzrGitMappingv1()
144
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
145
from dulwich.objects import Tree, Blob
146
from bzrlib.inventory import InventoryDirectory, InventoryFile
152
inv = repo.get_inventory(revision_id)
154
# stack contains the set of trees that we haven't
155
# finished constructing
156
for path, entry in inv.iter_entries():
157
while stack and not path.startswith(cur):
161
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
162
cur, tree = stack.pop()
165
if type(entry) == InventoryDirectory:
166
stack.append((cur, tree))
170
if type(entry) == InventoryFile:
171
#FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
172
# and having all these objects in memory at once
174
blob._text = repo.texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
176
yield sha, blob, path
178
name = urlutils.basename(path).encode("utf-8")
179
mode = stat.S_IFREG | 0644
182
tree.add(mode, name, sha)
184
while len(stack) > 1:
188
t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
189
cur, tree = stack.pop()
193
yield tree.id, tree, cur
196
def revision_to_commit(rev, tree_sha, parent_lookup):
197
"""Turn a Bazaar revision in to a Git commit
199
:param tree_sha: Tree sha for the commit
200
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
201
:return dulwich.objects.Commit represent the revision:
203
from dulwich.objects import Commit
205
commit._tree = tree_sha
206
for p in rev.parent_ids:
207
git_p = parent_lookup(p)
208
if git_p is not None:
209
assert len(git_p) == 40, "unexpected length for %r" % git_p
210
commit._parents.append(git_p)
211
commit._message = rev.message.encode("utf-8")
212
commit._committer = rev.committer.encode("utf-8")
213
commit._author = rev.get_apparent_authors()[0].encode("utf-8")
214
commit._commit_time = long(rev.timestamp)
added
removed
mapping.py
