30
55
def unescape_file_id(file_id):
31
return file_id.replace("_s", " ").replace("__", "_")
58
while i < len(file_id):
60
ret.append(file_id[i])
62
if file_id[i+1] == '_':
64
elif file_id[i+1] == 's':
67
raise AssertionError("unknown escape character %s" % file_id[i+1])
73
def fix_person_identifier(text):
74
if "<" in text and ">" in text:
76
return "%s <%s>" % (text, text)
79
def warn_escaped(commit, num_escaped):
80
trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
81
"to regenerate the SHA map.", num_escaped, commit)
84
def warn_unusual_mode(commit, path, mode):
85
trace.mutter("Unusual file mode %o for %s in %s. Storing as revision property. ",
89
def squash_revision(target_repo, rev):
90
"""Remove characters that can't be stored from a revision, if necessary.
92
:param target_repo: Repository in which the revision will be stored
93
:param rev: Revision object, will be modified in-place
95
if not getattr(target_repo._serializer, "squashes_xml_invalid_characters", True):
97
from bzrlib.xml_serializer import escape_invalid_chars
98
rev.message, num_escaped = escape_invalid_chars(rev.message)
100
warn_escaped(rev.foreign_revid, num_escaped)
101
if 'author' in rev.properties:
102
rev.properties['author'], num_escaped = escape_invalid_chars(
103
rev.properties['author'])
105
warn_escaped(rev.foreign_revid, num_escaped)
106
rev.committer, num_escaped = escape_invalid_chars(rev.committer)
108
warn_escaped(rev.foreign_revid, num_escaped)
34
111
class BzrGitMapping(foreign.VcsMapping):
35
112
"""Class that maps between Git and Bazaar semantics."""
36
113
experimental = False
38
def revision_id_foreign_to_bzr(self, git_rev_id):
116
super(BzrGitMapping, self).__init__(foreign_git)
118
def __eq__(self, other):
119
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
122
def revision_id_foreign_to_bzr(cls, git_rev_id):
39
123
"""Convert a git revision id handle to a Bazaar revision id."""
40
return "%s:%s" % (self.revid_prefix, git_rev_id)
124
return "%s:%s" % (cls.revid_prefix, git_rev_id)
42
def revision_id_bzr_to_foreign(self, bzr_rev_id):
127
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
43
128
"""Convert a Bazaar revision id to a git revision id handle."""
44
if not bzr_rev_id.startswith("%s:" % self.revid_prefix):
45
raise errors.InvalidRevisionId(bzr_rev_id, self)
46
return bzr_rev_id[len(self.revid_prefix)+1:]
48
def show_foreign_revid(self, foreign_revid):
49
return { "git commit": foreign_revid }
129
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
130
raise errors.InvalidRevisionId(bzr_rev_id, cls)
131
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
51
133
def generate_file_id(self, path):
134
# Git paths are just bytestrings
135
# We must just hope they are valid UTF-8..
54
return escape_file_id(path.encode('utf-8'))
138
return escape_file_id(path)
140
def parse_file_id(self, file_id):
141
if file_id == ROOT_ID:
143
return unescape_file_id(file_id)
145
def import_unusual_file_modes(self, rev, unusual_file_modes):
146
if unusual_file_modes:
147
ret = [(name, unusual_file_modes[name]) for name in sorted(unusual_file_modes.keys())]
148
rev.properties['file-modes'] = bencode.bencode(ret)
150
def export_unusual_file_modes(self, rev):
152
return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'])])
156
def _generate_git_svn_metadata(self, rev):
158
return "\ngit-svn-id: %s\n" % rev.properties["git-svn-id"]
162
def _generate_hg_message_tail(self, rev):
166
for name in rev.properties:
167
if name == 'hg:extra:branch':
168
branch = rev.properties['hg:extra:branch']
169
elif name.startswith('hg:extra'):
170
extra[name[len('hg:extra:'):]] = base64.b64decode(rev.properties[name])
171
elif name == 'hg:renames':
172
renames = bencode.bdecode(base64.b64decode(rev.properties['hg:renames']))
173
# TODO: Export other properties as 'bzr:' extras?
174
return format_hg_metadata(renames, branch, extra)
176
def _extract_git_svn_metadata(self, rev, message):
177
lines = message.split("\n")
178
if not (lines[-1] == "" and lines[-2].startswith("git-svn-id:")):
180
git_svn_id = lines[-2].split(": ", 1)[1]
181
rev.properties['git-svn-id'] = git_svn_id
182
(url, rev, uuid) = parse_git_svn_id(git_svn_id)
183
# FIXME: Convert this to converted-from property somehow..
184
return "\n".join(lines[:-2])
186
def _extract_hg_metadata(self, rev, message):
187
(message, renames, branch, extra) = extract_hg_metadata(message)
188
if branch is not None:
189
rev.properties['hg:extra:branch'] = branch
190
for name, value in extra.iteritems():
191
rev.properties['hg:extra:' + name] = base64.b64encode(value)
193
rev.properties['hg:renames'] = base64.b64encode(bencode.bencode([(new, old) for (old, new) in renames.iteritems()]))
196
def _decode_commit_message(self, rev, message):
197
return message.decode("utf-8", "replace")
199
def _encode_commit_message(self, rev, message):
200
return message.encode("utf-8")
202
def export_commit(self, rev, tree_sha, parent_lookup):
203
"""Turn a Bazaar revision in to a Git commit
205
:param tree_sha: Tree sha for the commit
206
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
207
:return dulwich.objects.Commit represent the revision:
209
from dulwich.objects import Commit
211
commit.tree = tree_sha
212
for p in rev.parent_ids:
213
git_p = parent_lookup(p)
214
if git_p is not None:
215
assert len(git_p) == 40, "unexpected length for %r" % git_p
216
commit.parents.append(git_p)
217
commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
218
commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
219
commit.commit_time = long(rev.timestamp)
220
if 'author-timestamp' in rev.properties:
221
commit.author_time = long(rev.properties['author-timestamp'])
223
commit.author_time = commit.commit_time
224
commit.commit_timezone = rev.timezone
225
if 'author-timezone' in rev.properties:
226
commit.author_timezone = int(rev.properties['author-timezone'])
228
commit.author_timezone = commit.commit_timezone
229
commit.message = self._encode_commit_message(rev, rev.message)
56
232
def import_commit(self, commit):
57
233
"""Convert a git commit to a bzr revision.
62
238
raise AssertionError("Commit object can't be None")
63
239
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
64
240
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
65
rev.message = commit.message.decode("utf-8", "replace")
66
241
rev.committer = str(commit.committer).decode("utf-8", "replace")
67
242
if commit.committer != commit.author:
68
243
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
245
if commit.commit_time != commit.author_time:
246
rev.properties['author-timestamp'] = str(commit.author_time)
247
if commit.commit_timezone != commit.author_timezone:
248
rev.properties['author-timezone'] = "%d" % (commit.author_timezone, )
69
249
rev.timestamp = commit.commit_time
250
rev.timezone = commit.commit_timezone
251
rev.message = self._decode_commit_message(rev, commit.message)
74
class BzrGitMappingExperimental(BzrGitMapping):
255
class BzrGitMappingv1(BzrGitMapping):
256
revid_prefix = 'git-v1'
260
return self.revid_prefix
263
class BzrGitMappingExperimental(BzrGitMappingv1):
75
264
revid_prefix = 'git-experimental'
76
265
experimental = True
79
default_mapping = BzrGitMappingExperimental()
267
def _decode_commit_message(self, rev, message):
268
message = self._extract_hg_metadata(rev, message)
269
message = self._extract_git_svn_metadata(rev, message)
270
return message.decode("utf-8", "replace")
272
def _encode_commit_message(self, rev, message):
273
ret = message.encode("utf-8")
274
ret += self._generate_hg_message_tail(rev)
275
ret += self._generate_git_svn_metadata(rev)
278
def import_commit(self, commit):
279
rev = super(BzrGitMappingExperimental, self).import_commit(commit)
280
rev.properties['converted_revision'] = "git %s\n" % commit.id
284
class GitMappingRegistry(VcsMappingRegistry):
285
"""Registry with available git mappings."""
287
def revision_id_bzr_to_foreign(self, bzr_revid):
288
if not bzr_revid.startswith("git-"):
289
raise errors.InvalidRevisionId(bzr_revid, None)
290
(mapping_version, git_sha) = bzr_revid.split(":", 1)
291
mapping = self.get(mapping_version)
292
return mapping.revision_id_bzr_to_foreign(bzr_revid)
294
parse_revision_id = revision_id_bzr_to_foreign
297
mapping_registry = GitMappingRegistry()
298
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
300
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
301
"BzrGitMappingExperimental")
302
mapping_registry.set_default('git-experimental')
305
class ForeignGit(ForeignVcs):
306
"""The Git Stupid Content Tracker"""
309
def branch_format(self):
310
from bzrlib.plugins.git.branch import GitBranchFormat
311
return GitBranchFormat()
314
def repository_format(self):
315
from bzrlib.plugins.git.repository import GitRepositoryFormat
316
return GitRepositoryFormat()
319
super(ForeignGit, self).__init__(mapping_registry)
320
self.abbreviation = "git"
323
def serialize_foreign_revid(self, foreign_revid):
327
def show_foreign_revid(cls, foreign_revid):
328
return { "git commit": foreign_revid }
331
foreign_git = ForeignGit()
332
default_mapping = mapping_registry.get_default()()
335
def text_to_blob(texts, entry):
336
from dulwich.objects import Blob
337
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
343
def symlink_to_blob(entry):
344
from dulwich.objects import Blob
346
blob._text = entry.symlink_target
350
def mode_is_executable(mode):
351
"""Check if mode should be considered executable."""
352
return bool(mode & 0111)
356
"""Determine the Bazaar inventory kind based on Unix file mode."""
357
entry_kind = (mode & 0700000) / 0100000
360
elif entry_kind == 1:
361
file_kind = (mode & 070000) / 010000
367
return 'tree-reference'
369
raise AssertionError(
370
"Unknown file kind %d, perms=%o." % (file_kind, mode,))
372
raise AssertionError(
373
"Unknown kind, perms=%r." % (mode,))
376
def object_mode(kind, executable):
377
if kind == 'directory':
379
elif kind == 'symlink':
382
mode = stat.S_IFREG | 0644
390
def entry_mode(entry):
391
"""Determine the git file mode for an inventory entry."""
392
return object_mode(entry.kind, entry.executable)
395
def directory_to_tree(entry, lookup_ie_sha1, unusual_modes):
396
from dulwich.objects import Tree
398
for name in sorted(entry.children.keys()):
399
ie = entry.children[name]
401
mode = unusual_modes[ie.file_id]
403
mode = entry_mode(ie)
404
hexsha = lookup_ie_sha1(ie)
405
if hexsha is not None:
406
tree.add(mode, name.encode("utf-8"), hexsha)
407
if entry.parent_id is not None and len(tree) == 0:
408
# Only the root can be an empty tree
414
def extract_unusual_modes(rev):
416
foreign_revid, mapping = mapping_registry.parse_revision_id(rev.revision_id)
417
except errors.InvalidRevisionId:
420
return mapping.export_unusual_file_modes(rev)
423
def inventory_to_tree_and_blobs(inventory, texts, mapping, unusual_modes, cur=None):
424
"""Convert a Bazaar tree to a Git tree.
426
:return: Yields tuples with object sha1, object and path
428
from dulwich.objects import Tree
435
# stack contains the set of trees that we haven't
436
# finished constructing
437
for path, entry in inventory.iter_entries():
438
while stack and not path.startswith(osutils.pathjoin(cur, "")):
439
# We've hit a file that's not a child of the previous path
442
yield sha, tree, cur.encode("utf-8")
443
mode = unusual_modes.get(cur.encode("utf-8"), stat.S_IFDIR)
444
t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
445
cur, tree = stack.pop()
448
if entry.kind == "directory":
449
stack.append((cur, tree))
453
if entry.kind == "file":
454
blob = text_to_blob(texts, entry)
455
elif entry.kind == "symlink":
456
blob = symlink_to_blob(entry)
458
raise AssertionError("Unknown kind %s" % entry.kind)
460
yield sha, blob, path.encode("utf-8")
461
name = urlutils.basename(path).encode("utf-8")
462
mode = unusual_modes.get(path.encode("utf-8"), entry_mode(entry))
463
tree.add(mode, name, sha)
465
while len(stack) > 1:
468
yield sha, tree, cur.encode("utf-8")
469
mode = unusual_modes.get(cur.encode('utf-8'), stat.S_IFDIR)
470
t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
471
cur, tree = stack.pop()
475
yield tree.id, tree, cur.encode("utf-8")
478
def parse_git_svn_id(text):
479
(head, uuid) = text.rsplit(" ", 1)
480
(full_url, rev) = head.rsplit("@", 1)
481
return (full_url, int(rev), uuid)
added
removed
mapping.py
