29
58
def unescape_file_id(file_id):
30
return file_id.replace("_s", " ").replace("__", "_")
61
while i < len(file_id):
63
ret.append(file_id[i])
65
if file_id[i+1] == '_':
67
elif file_id[i+1] == 's':
70
raise AssertionError("unknown escape character %s" % file_id[i+1])
76
def fix_person_identifier(text):
77
if "<" in text and ">" in text:
79
return "%s <%s>" % (text, text)
82
def warn_escaped(commit, num_escaped):
83
trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
84
"to regenerate the SHA map.", num_escaped, commit)
87
def warn_unusual_mode(commit, path, mode):
88
trace.mutter("Unusual file mode %o for %s in %s. Storing as revision property. ",
92
def squash_revision(target_repo, rev):
93
"""Remove characters that can't be stored from a revision, if necessary.
95
:param target_repo: Repository in which the revision will be stored
96
:param rev: Revision object, will be modified in-place
98
if not getattr(target_repo._serializer, "squashes_xml_invalid_characters", True):
100
from bzrlib.xml_serializer import escape_invalid_chars
101
rev.message, num_escaped = escape_invalid_chars(rev.message)
103
warn_escaped(rev.foreign_revid, num_escaped)
104
if 'author' in rev.properties:
105
rev.properties['author'], num_escaped = escape_invalid_chars(
106
rev.properties['author'])
108
warn_escaped(rev.foreign_revid, num_escaped)
109
rev.committer, num_escaped = escape_invalid_chars(rev.committer)
111
warn_escaped(rev.foreign_revid, num_escaped)
33
114
class BzrGitMapping(foreign.VcsMapping):
34
115
"""Class that maps between Git and Bazaar semantics."""
35
116
experimental = False
37
def revision_id_foreign_to_bzr(self, git_rev_id):
119
super(BzrGitMapping, self).__init__(foreign_git)
121
def __eq__(self, other):
122
return type(self) == type(other) and self.revid_prefix == other.revid_prefix
125
def revision_id_foreign_to_bzr(cls, git_rev_id):
38
126
"""Convert a git revision id handle to a Bazaar revision id."""
39
return "%s:%s" % (self.revid_prefix, git_rev_id)
127
return "%s:%s" % (cls.revid_prefix, git_rev_id)
41
def revision_id_bzr_to_foreign(self, bzr_rev_id):
130
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
42
131
"""Convert a Bazaar revision id to a git revision id handle."""
43
if not bzr_rev_id.startswith("%s:" % self.revid_prefix):
44
raise errors.InvalidRevisionId(bzr_rev_id, self)
45
return bzr_rev_id[len(self.revid_prefix)+1:]
47
def show_foreign_revid(self, foreign_revid):
48
return { "git commit": foreign_revid }
132
if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
133
raise errors.InvalidRevisionId(bzr_rev_id, cls)
134
return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
50
136
def generate_file_id(self, path):
51
return escape_file_id(path.encode('utf-8'))
137
# Git paths are just bytestrings
138
# We must just hope they are valid UTF-8..
141
return escape_file_id(path)
143
def parse_file_id(self, file_id):
144
if file_id == ROOT_ID:
146
return unescape_file_id(file_id)
148
def import_unusual_file_modes(self, rev, unusual_file_modes):
149
if unusual_file_modes:
150
ret = [(name, unusual_file_modes[name]) for name in sorted(unusual_file_modes.keys())]
151
rev.properties['file-modes'] = bencode.bencode(ret)
153
def export_unusual_file_modes(self, rev):
155
return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'].encode("utf-8"))])
159
def _generate_git_svn_metadata(self, rev):
161
return "\ngit-svn-id: %s\n" % rev.properties["git-svn-id"].encode("utf-8")
165
def _generate_hg_message_tail(self, rev):
169
for name in rev.properties:
170
if name == 'hg:extra:branch':
171
branch = rev.properties['hg:extra:branch']
172
elif name.startswith('hg:extra'):
173
extra[name[len('hg:extra:'):]] = base64.b64decode(rev.properties[name])
174
elif name == 'hg:renames':
175
renames = bencode.bdecode(base64.b64decode(rev.properties['hg:renames']))
176
# TODO: Export other properties as 'bzr:' extras?
177
ret = format_hg_metadata(renames, branch, extra)
178
assert isinstance(ret, str)
181
def _extract_git_svn_metadata(self, rev, message):
182
lines = message.split("\n")
183
if not (lines[-1] == "" and lines[-2].startswith("git-svn-id:")):
185
git_svn_id = lines[-2].split(": ", 1)[1]
186
rev.properties['git-svn-id'] = git_svn_id
187
(url, rev, uuid) = parse_git_svn_id(git_svn_id)
188
# FIXME: Convert this to converted-from property somehow..
189
ret = "\n".join(lines[:-2])
190
assert isinstance(ret, str)
193
def _extract_hg_metadata(self, rev, message):
194
(message, renames, branch, extra) = extract_hg_metadata(message)
195
if branch is not None:
196
rev.properties['hg:extra:branch'] = branch
197
for name, value in extra.iteritems():
198
rev.properties['hg:extra:' + name] = base64.b64encode(value)
200
rev.properties['hg:renames'] = base64.b64encode(bencode.bencode([(new, old) for (old, new) in renames.iteritems()]))
203
def _decode_commit_message(self, rev, message):
204
return message.decode("utf-8", "replace")
206
def _encode_commit_message(self, rev, message):
207
return message.encode("utf-8")
209
def export_commit(self, rev, tree_sha, parent_lookup):
210
"""Turn a Bazaar revision in to a Git commit
212
:param tree_sha: Tree sha for the commit
213
:param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
214
:return dulwich.objects.Commit represent the revision:
216
from dulwich.objects import Commit
218
commit.tree = tree_sha
219
for p in rev.parent_ids:
221
git_p = parent_lookup(p)
224
if git_p is not None:
225
assert len(git_p) == 40, "unexpected length for %r" % git_p
226
commit.parents.append(git_p)
227
commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
228
commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
229
commit.commit_time = long(rev.timestamp)
230
if 'author-timestamp' in rev.properties:
231
commit.author_time = long(rev.properties['author-timestamp'])
233
commit.author_time = commit.commit_time
234
commit.commit_timezone = rev.timezone
235
if 'author-timezone' in rev.properties:
236
commit.author_timezone = int(rev.properties['author-timezone'])
238
commit.author_timezone = commit.commit_timezone
239
commit.message = self._encode_commit_message(rev, rev.message)
53
242
def import_commit(self, commit):
54
243
"""Convert a git commit to a bzr revision.
59
248
raise AssertionError("Commit object can't be None")
60
249
rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
61
250
rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
62
rev.message = commit.message.decode("utf-8", "replace")
63
251
rev.committer = str(commit.committer).decode("utf-8", "replace")
64
252
if commit.committer != commit.author:
65
253
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
255
if commit.commit_time != commit.author_time:
256
rev.properties['author-timestamp'] = str(commit.author_time)
257
if commit.commit_timezone != commit.author_timezone:
258
rev.properties['author-timezone'] = "%d" % (commit.author_timezone, )
66
259
rev.timestamp = commit.commit_time
260
rev.timezone = commit.commit_timezone
261
rev.message = self._decode_commit_message(rev, commit.message)
71
class BzrGitMappingExperimental(BzrGitMapping):
265
class BzrGitMappingv1(BzrGitMapping):
266
revid_prefix = 'git-v1'
270
return self.revid_prefix
273
class BzrGitMappingExperimental(BzrGitMappingv1):
72
274
revid_prefix = 'git-experimental'
73
275
experimental = True
76
default_mapping = BzrGitMappingExperimental()
277
def _decode_commit_message(self, rev, message):
278
message = self._extract_hg_metadata(rev, message)
279
message = self._extract_git_svn_metadata(rev, message)
280
return message.decode("utf-8", "replace")
282
def _encode_commit_message(self, rev, message):
283
ret = message.encode("utf-8")
284
ret += self._generate_hg_message_tail(rev)
285
ret += self._generate_git_svn_metadata(rev)
288
def import_commit(self, commit):
289
rev = super(BzrGitMappingExperimental, self).import_commit(commit)
290
rev.properties['converted_revision'] = "git %s\n" % commit.id
294
class GitMappingRegistry(VcsMappingRegistry):
295
"""Registry with available git mappings."""
297
def revision_id_bzr_to_foreign(self, bzr_revid):
298
if bzr_revid == NULL_REVISION:
299
return "0" * 20, None
300
if not bzr_revid.startswith("git-"):
301
raise errors.InvalidRevisionId(bzr_revid, None)
302
(mapping_version, git_sha) = bzr_revid.split(":", 1)
303
mapping = self.get(mapping_version)
304
return mapping.revision_id_bzr_to_foreign(bzr_revid)
306
parse_revision_id = revision_id_bzr_to_foreign
309
mapping_registry = GitMappingRegistry()
310
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
312
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
313
"BzrGitMappingExperimental")
314
mapping_registry.set_default('git-v1')
317
class ForeignGit(ForeignVcs):
318
"""The Git Stupid Content Tracker"""
321
def branch_format(self):
322
from bzrlib.plugins.git.branch import GitBranchFormat
323
return GitBranchFormat()
326
def repository_format(self):
327
from bzrlib.plugins.git.repository import GitRepositoryFormat
328
return GitRepositoryFormat()
331
super(ForeignGit, self).__init__(mapping_registry)
332
self.abbreviation = "git"
335
def serialize_foreign_revid(self, foreign_revid):
339
def show_foreign_revid(cls, foreign_revid):
340
return { "git commit": foreign_revid }
343
foreign_git = ForeignGit()
344
default_mapping = mapping_registry.get_default()()
347
def text_to_blob(texts, entry):
348
from dulwich.objects import Blob
349
text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
355
def symlink_to_blob(entry):
356
from dulwich.objects import Blob
358
blob._text = entry.symlink_target
362
def mode_is_executable(mode):
363
"""Check if mode should be considered executable."""
364
return bool(mode & 0111)
368
"""Determine the Bazaar inventory kind based on Unix file mode."""
369
entry_kind = (mode & 0700000) / 0100000
372
elif entry_kind == 1:
373
file_kind = (mode & 070000) / 010000
379
return 'tree-reference'
381
raise AssertionError(
382
"Unknown file kind %d, perms=%o." % (file_kind, mode,))
384
raise AssertionError(
385
"Unknown kind, perms=%r." % (mode,))
388
def object_mode(kind, executable):
389
if kind == 'directory':
391
elif kind == 'symlink':
397
mode = stat.S_IFREG | 0644
401
elif kind == 'tree-reference':
402
from dulwich.objects import S_IFGITLINK
408
def entry_mode(entry):
409
"""Determine the git file mode for an inventory entry."""
410
return object_mode(entry.kind, entry.executable)
413
def directory_to_tree(entry, lookup_ie_sha1, unusual_modes):
414
from dulwich.objects import Tree
416
for name in sorted(entry.children.keys()):
417
ie = entry.children[name]
419
mode = unusual_modes[ie.file_id]
421
mode = entry_mode(ie)
422
hexsha = lookup_ie_sha1(ie)
423
if hexsha is not None:
424
tree.add(mode, name.encode("utf-8"), hexsha)
425
if entry.parent_id is not None and len(tree) == 0:
426
# Only the root can be an empty tree
432
def extract_unusual_modes(rev):
434
foreign_revid, mapping = mapping_registry.parse_revision_id(rev.revision_id)
435
except errors.InvalidRevisionId:
438
return mapping.export_unusual_file_modes(rev)
441
def inventory_to_tree_and_blobs(inventory, texts, mapping, unusual_modes, cur=None):
442
"""Convert a Bazaar tree to a Git tree.
444
:return: Yields tuples with object sha1, object and path
446
from dulwich.objects import Tree
453
# stack contains the set of trees that we haven't
454
# finished constructing
455
for path, entry in inventory.iter_entries():
456
while stack and not path.startswith(osutils.pathjoin(cur, "")):
457
# We've hit a file that's not a child of the previous path
460
yield sha, tree, cur.encode("utf-8")
461
mode = unusual_modes.get(cur.encode("utf-8"), stat.S_IFDIR)
462
t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
463
cur, tree = stack.pop()
466
if entry.kind == "directory":
467
stack.append((cur, tree))
471
if entry.kind == "file":
472
blob = text_to_blob(texts, entry)
473
elif entry.kind == "symlink":
474
blob = symlink_to_blob(entry)
476
raise AssertionError("Unknown kind %s" % entry.kind)
478
yield sha, blob, path.encode("utf-8")
479
name = urlutils.basename(path).encode("utf-8")
480
mode = unusual_modes.get(path.encode("utf-8"), entry_mode(entry))
481
tree.add(mode, name, sha)
483
while len(stack) > 1:
486
yield sha, tree, cur.encode("utf-8")
487
mode = unusual_modes.get(cur.encode('utf-8'), stat.S_IFDIR)
488
t = (mode, urlutils.basename(cur).encode('UTF-8'), sha)
489
cur, tree = stack.pop()
493
yield tree.id, tree, cur.encode("utf-8")
496
def parse_git_svn_id(text):
497
(head, uuid) = text.rsplit(" ", 1)
498
(full_url, rev) = head.rsplit("@", 1)
499
return (full_url, int(rev), uuid)
added
removed
mapping.py
