1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
|
# Copyright (C) 2008-2018 Jelmer Vernooij <jelmer@jelmer.uk>
# Copyright (C) 2007 Canonical Ltd
# Copyright (C) 2008 John Carr
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Converters, etc for going between Bazaar and Git ids."""
import base64
import stat
from .. import (
bencode,
errors,
foreign,
trace,
urlutils,
)
from ..foreign import (
ForeignVcs,
VcsMappingRegistry,
ForeignRevision,
)
from ..revision import (
NULL_REVISION,
Revision,
)
from .errors import (
NoPushSupport,
)
from .hg import (
format_hg_metadata,
extract_hg_metadata,
)
from .roundtrip import (
extract_bzr_metadata,
inject_bzr_metadata,
CommitSupplement,
)
DEFAULT_FILE_MODE = stat.S_IFREG | 0o644
HG_RENAME_SOURCE = b"HG:rename-source"
HG_EXTRA = b"HG:extra"
# This HG extra is used to indicate the commit that this commit was based on.
HG_EXTRA_AMEND_SOURCE = b"amend_source"
FILE_ID_PREFIX = b'git:'
# Always the same.
ROOT_ID = b"TREE_ROOT"
class UnknownCommitExtra(errors.BzrError):
_fmt = "Unknown extra fields in %(object)r: %(fields)r."
def __init__(self, object, fields):
errors.BzrError.__init__(self)
self.object = object
self.fields = ",".join(fields)
class UnknownMercurialCommitExtra(errors.BzrError):
_fmt = "Unknown mercurial extra fields in %(object)r: %(fields)r."
def __init__(self, object, fields):
errors.BzrError.__init__(self)
self.object = object
self.fields = b",".join(fields)
def escape_file_id(file_id):
file_id = file_id.replace(b'_', b'__')
file_id = file_id.replace(b' ', b'_s')
file_id = file_id.replace(b'\x0c', b'_c')
return file_id
def unescape_file_id(file_id):
ret = bytearray()
i = 0
while i < len(file_id):
if file_id[i:i + 1] != b'_':
ret.append(file_id[i])
else:
if file_id[i + 1:i + 2] == b'_':
ret.append(b"_"[0])
elif file_id[i + 1:i + 2] == b's':
ret.append(b" "[0])
elif file_id[i + 1:i + 2] == b'c':
ret.append(b"\x0c"[0])
else:
raise ValueError("unknown escape character %s" %
file_id[i + 1:i + 2])
i += 1
i += 1
return bytes(ret)
def fix_person_identifier(text):
if b"<" not in text and b">" not in text:
username = text
email = text
elif b">" not in text:
return text + b">"
else:
if text.rindex(b">") < text.rindex(b"<"):
raise ValueError(text)
username, email = text.split(b"<", 2)[-2:]
email = email.split(b">", 1)[0]
if username.endswith(b" "):
username = username[:-1]
return b"%s <%s>" % (username, email)
def decode_git_path(path):
"""Take a git path and decode it."""
try:
return path.decode('utf-8')
except UnicodeDecodeError:
if PY3:
return path.decode('utf-8', 'surrogateescape')
raise
def encode_git_path(path):
"""Take a regular path and encode it for git."""
try:
return path.encode('utf-8')
except UnicodeEncodeError:
if PY3:
return path.encode('utf-8', 'surrogateescape')
raise
def warn_escaped(commit, num_escaped):
trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
"to regenerate the SHA map.", num_escaped, commit)
def warn_unusual_mode(commit, path, mode):
trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
"property. ", mode, path, commit)
class BzrGitMapping(foreign.VcsMapping):
"""Class that maps between Git and Bazaar semantics."""
experimental = False
BZR_DUMMY_FILE = None # type: Optional[str]
def is_special_file(self, filename):
return (filename in (self.BZR_DUMMY_FILE, ))
def __init__(self):
super(BzrGitMapping, self).__init__(foreign_vcs_git)
def __eq__(self, other):
return (type(self) == type(other)
and self.revid_prefix == other.revid_prefix)
@classmethod
def revision_id_foreign_to_bzr(cls, git_rev_id):
"""Convert a git revision id handle to a Bazaar revision id."""
from dulwich.protocol import ZERO_SHA
if git_rev_id == ZERO_SHA:
return NULL_REVISION
return b"%s:%s" % (cls.revid_prefix, git_rev_id)
@classmethod
def revision_id_bzr_to_foreign(cls, bzr_rev_id):
"""Convert a Bazaar revision id to a git revision id handle."""
if not bzr_rev_id.startswith(b"%s:" % cls.revid_prefix):
raise errors.InvalidRevisionId(bzr_rev_id, cls)
return bzr_rev_id[len(cls.revid_prefix) + 1:], cls()
def generate_file_id(self, path):
# Git paths are just bytestrings
# We must just hope they are valid UTF-8..
if isinstance(path, str):
path = path.encode("utf-8")
if path == b"":
return ROOT_ID
return FILE_ID_PREFIX + escape_file_id(path)
def parse_file_id(self, file_id):
if file_id == ROOT_ID:
return u""
if not file_id.startswith(FILE_ID_PREFIX):
raise ValueError
return decode_git_path(unescape_file_id(file_id[len(FILE_ID_PREFIX):]))
def import_unusual_file_modes(self, rev, unusual_file_modes):
if unusual_file_modes:
ret = [(path, unusual_file_modes[path])
for path in sorted(unusual_file_modes.keys())]
rev.properties[u'file-modes'] = bencode.bencode(ret)
def export_unusual_file_modes(self, rev):
try:
file_modes = rev.properties[u'file-modes']
except KeyError:
return {}
else:
return dict(bencode.bdecode(file_modes.encode("utf-8")))
def _generate_git_svn_metadata(self, rev, encoding):
try:
git_svn_id = rev.properties[u"git-svn-id"]
except KeyError:
return ""
else:
return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
def _generate_hg_message_tail(self, rev):
extra = {}
renames = []
branch = 'default'
for name in rev.properties:
if name == u'hg:extra:branch':
branch = rev.properties[u'hg:extra:branch']
elif name.startswith(u'hg:extra'):
extra[name[len(u'hg:extra:'):]] = base64.b64decode(
rev.properties[name])
elif name == u'hg:renames':
renames = bencode.bdecode(base64.b64decode(
rev.properties[u'hg:renames']))
# TODO: Export other properties as 'bzr:' extras?
ret = format_hg_metadata(renames, branch, extra)
if not isinstance(ret, bytes):
raise TypeError(ret)
return ret
def _extract_git_svn_metadata(self, rev, message):
lines = message.split("\n")
if not (lines[-1] == "" and len(lines) >= 2 and
lines[-2].startswith("git-svn-id:")):
return message
git_svn_id = lines[-2].split(": ", 1)[1]
rev.properties[u'git-svn-id'] = git_svn_id
(url, rev, uuid) = parse_git_svn_id(git_svn_id)
# FIXME: Convert this to converted-from property somehow..
return "\n".join(lines[:-2])
def _extract_hg_metadata(self, rev, message):
(message, renames, branch, extra) = extract_hg_metadata(message)
if branch is not None:
rev.properties[u'hg:extra:branch'] = branch
for name, value in extra.items():
rev.properties[u'hg:extra:' + name] = base64.b64encode(value)
if renames:
rev.properties[u'hg:renames'] = base64.b64encode(bencode.bencode(
[(new, old) for (old, new) in renames.items()]))
return message
def _extract_bzr_metadata(self, rev, message):
(message, metadata) = extract_bzr_metadata(message)
return message, metadata
def _decode_commit_message(self, rev, message, encoding):
return message.decode(encoding), CommitSupplement()
def _encode_commit_message(self, rev, message, encoding):
return message.encode(encoding)
def export_commit(self, rev, tree_sha, parent_lookup, lossy,
verifiers):
"""Turn a Bazaar revision in to a Git commit
:param tree_sha: Tree sha for the commit
:param parent_lookup: Function for looking up the GIT sha equiv of a
bzr revision
:param lossy: Whether to store roundtripping information.
:param verifiers: Verifiers info
:return dulwich.objects.Commit represent the revision:
"""
from dulwich.objects import Commit, Tag
commit = Commit()
commit.tree = tree_sha
if not lossy:
metadata = CommitSupplement()
metadata.verifiers = verifiers
else:
metadata = None
parents = []
for p in rev.parent_ids:
try:
git_p = parent_lookup(p)
except KeyError:
git_p = None
if metadata is not None:
metadata.explicit_parent_ids = rev.parent_ids
if git_p is not None:
if len(git_p) != 40:
raise AssertionError("unexpected length for %r" % git_p)
parents.append(git_p)
commit.parents = parents
try:
encoding = rev.properties[u'git-explicit-encoding']
except KeyError:
encoding = rev.properties.get(u'git-implicit-encoding', 'utf-8')
try:
commit.encoding = rev.properties[u'git-explicit-encoding'].encode(
'ascii')
except KeyError:
pass
commit.committer = fix_person_identifier(rev.committer.encode(
encoding))
commit.author = fix_person_identifier(
rev.get_apparent_authors()[0].encode(encoding))
# TODO(jelmer): Don't use this hack.
long = getattr(__builtins__, 'long', int)
commit.commit_time = long(rev.timestamp)
if u'author-timestamp' in rev.properties:
commit.author_time = long(rev.properties[u'author-timestamp'])
else:
commit.author_time = commit.commit_time
commit._commit_timezone_neg_utc = (
u"commit-timezone-neg-utc" in rev.properties)
commit.commit_timezone = rev.timezone
commit._author_timezone_neg_utc = (
u"author-timezone-neg-utc" in rev.properties)
if u'author-timezone' in rev.properties:
commit.author_timezone = int(rev.properties[u'author-timezone'])
else:
commit.author_timezone = commit.commit_timezone
if u'git-gpg-signature' in rev.properties:
commit.gpgsig = rev.properties[u'git-gpg-signature'].encode(
'utf-8', 'surrogateescape')
commit.message = self._encode_commit_message(rev, rev.message,
encoding)
if not isinstance(commit.message, bytes):
raise TypeError(commit.message)
if metadata is not None:
try:
mapping_registry.parse_revision_id(rev.revision_id)
except errors.InvalidRevisionId:
metadata.revision_id = rev.revision_id
mapping_properties = set(
[u'author', u'author-timezone', u'author-timezone-neg-utc',
u'commit-timezone-neg-utc', u'git-implicit-encoding',
u'git-gpg-signature', u'git-explicit-encoding',
u'author-timestamp', u'file-modes'])
for k, v in rev.properties.items():
if k not in mapping_properties:
metadata.properties[k] = v
if not lossy and metadata:
if self.roundtripping:
commit.message = inject_bzr_metadata(commit.message, metadata,
encoding)
else:
raise NoPushSupport(
None, None, self, revision_id=rev.revision_id)
if not isinstance(commit.message, bytes):
raise TypeError(commit.message)
i = 0
propname = u'git-mergetag-0'
while propname in rev.properties:
commit.mergetag.append(Tag.from_string(rev.properties[propname]))
i += 1
propname = u'git-mergetag-%d' % i
if u'git-extra' in rev.properties:
commit.extra.extend(
[l.split(b' ', 1)
for l in rev.properties[u'git-extra'].splitlines()])
return commit
def get_revision_id(self, commit):
if commit.encoding:
encoding = commit.encoding.decode('ascii')
else:
encoding = 'utf-8'
try:
message, metadata = self._decode_commit_message(
None, commit.message, encoding)
except UnicodeDecodeError:
pass
else:
if metadata.revision_id:
return metadata.revision_id
return self.revision_id_foreign_to_bzr(commit.id)
def import_commit(self, commit, lookup_parent_revid, strict=True):
"""Convert a git commit to a bzr revision.
:return: a `breezy.revision.Revision` object, foreign revid and a
testament sha1
"""
if commit is None:
raise AssertionError("Commit object can't be None")
rev = ForeignRevision(commit.id, self,
self.revision_id_foreign_to_bzr(commit.id))
rev.git_metadata = None
def decode_using_encoding(rev, commit, encoding):
rev.committer = commit.committer.decode(encoding)
if commit.committer != commit.author:
rev.properties[u'author'] = commit.author.decode(encoding)
rev.message, rev.git_metadata = self._decode_commit_message(
rev, commit.message, encoding)
if commit.encoding is not None:
rev.properties[u'git-explicit-encoding'] = commit.encoding.decode(
'ascii')
decode_using_encoding(rev, commit, commit.encoding.decode('ascii'))
else:
for encoding in ('utf-8', 'latin1'):
try:
decode_using_encoding(rev, commit, encoding)
except UnicodeDecodeError:
pass
else:
if encoding != 'utf-8':
rev.properties[u'git-implicit-encoding'] = encoding
break
if commit.commit_time != commit.author_time:
rev.properties[u'author-timestamp'] = str(commit.author_time)
if commit.commit_timezone != commit.author_timezone:
rev.properties[u'author-timezone'] = "%d" % commit.author_timezone
if commit._author_timezone_neg_utc:
rev.properties[u'author-timezone-neg-utc'] = ""
if commit._commit_timezone_neg_utc:
rev.properties[u'commit-timezone-neg-utc'] = ""
if commit.gpgsig:
rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
'utf-8', 'surrogateescape')
if commit.mergetag:
for i, tag in enumerate(commit.mergetag):
rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()
rev.timestamp = commit.commit_time
rev.timezone = commit.commit_timezone
rev.parent_ids = None
if rev.git_metadata is not None:
md = rev.git_metadata
roundtrip_revid = md.revision_id
if md.explicit_parent_ids:
rev.parent_ids = md.explicit_parent_ids
rev.properties.update(md.properties)
verifiers = md.verifiers
else:
roundtrip_revid = None
verifiers = {}
if rev.parent_ids is None:
parents = []
for p in commit.parents:
try:
parents.append(lookup_parent_revid(p))
except KeyError:
parents.append(self.revision_id_foreign_to_bzr(p))
rev.parent_ids = list(parents)
unknown_extra_fields = []
extra_lines = []
for k, v in commit.extra:
if k == HG_RENAME_SOURCE:
extra_lines.append(k + b' ' + v + b'\n')
elif k == HG_EXTRA:
hgk, hgv = v.split(b':', 1)
if hgk not in (HG_EXTRA_AMEND_SOURCE, ) and strict:
raise UnknownMercurialCommitExtra(commit, [hgk])
extra_lines.append(k + b' ' + v + b'\n')
else:
unknown_extra_fields.append(k)
if unknown_extra_fields and strict:
raise UnknownCommitExtra(
commit,
[f.decode('ascii', 'replace') for f in unknown_extra_fields])
if extra_lines:
rev.properties[u'git-extra'] = b''.join(extra_lines)
return rev, roundtrip_revid, verifiers
class BzrGitMappingv1(BzrGitMapping):
revid_prefix = b'git-v1'
experimental = False
def __str__(self):
return self.revid_prefix
class BzrGitMappingExperimental(BzrGitMappingv1):
revid_prefix = b'git-experimental'
experimental = True
roundtripping = False
BZR_DUMMY_FILE = '.bzrdummy'
def _decode_commit_message(self, rev, message, encoding):
if rev is None:
rev = Revision()
message = self._extract_hg_metadata(rev, message)
message = self._extract_git_svn_metadata(rev, message)
message, metadata = self._extract_bzr_metadata(rev, message)
return message.decode(encoding), metadata
def _encode_commit_message(self, rev, message, encoding):
ret = message.encode(encoding)
ret += self._generate_hg_message_tail(rev)
ret += self._generate_git_svn_metadata(rev, encoding)
return ret
def import_commit(self, commit, lookup_parent_revid, strict=True):
rev, roundtrip_revid, verifiers = super(
BzrGitMappingExperimental, self).import_commit(
commit, lookup_parent_revid, strict)
rev.properties[u'converted_revision'] = "git %s\n" % commit.id
return rev, roundtrip_revid, verifiers
class GitMappingRegistry(VcsMappingRegistry):
"""Registry with available git mappings."""
def revision_id_bzr_to_foreign(self, bzr_revid):
if bzr_revid == NULL_REVISION:
from dulwich.protocol import ZERO_SHA
return ZERO_SHA, None
if not bzr_revid.startswith(b"git-"):
raise errors.InvalidRevisionId(bzr_revid, None)
(mapping_version, git_sha) = bzr_revid.split(b":", 1)
mapping = self.get(mapping_version)
return mapping.revision_id_bzr_to_foreign(bzr_revid)
parse_revision_id = revision_id_bzr_to_foreign
mapping_registry = GitMappingRegistry()
mapping_registry.register_lazy(b'git-v1', __name__,
"BzrGitMappingv1")
mapping_registry.register_lazy(b'git-experimental',
__name__, "BzrGitMappingExperimental")
# Uncomment the next line to enable the experimental bzr-git mappings.
# This will make sure all bzr metadata is pushed into git, allowing for
# full roundtripping later.
# NOTE: THIS IS EXPERIMENTAL. IT MAY EAT YOUR DATA OR CORRUPT
# YOUR BZR OR GIT REPOSITORIES. USE WITH CARE.
# mapping_registry.set_default('git-experimental')
mapping_registry.set_default(b'git-v1')
class ForeignGit(ForeignVcs):
"""The Git Stupid Content Tracker"""
@property
def branch_format(self):
from .branch import LocalGitBranchFormat
return LocalGitBranchFormat()
@property
def repository_format(self):
from .repository import GitRepositoryFormat
return GitRepositoryFormat()
def __init__(self):
super(ForeignGit, self).__init__(mapping_registry)
self.abbreviation = "git"
@classmethod
def serialize_foreign_revid(self, foreign_revid):
return foreign_revid
@classmethod
def show_foreign_revid(cls, foreign_revid):
return {"git commit": foreign_revid.decode('utf-8')}
foreign_vcs_git = ForeignGit()
default_mapping = mapping_registry.get_default()()
def symlink_to_blob(symlink_target):
from dulwich.objects import Blob
blob = Blob()
if isinstance(symlink_target, str):
symlink_target = encode_git_path(symlink_target)
blob.data = symlink_target
return blob
def mode_is_executable(mode):
"""Check if mode should be considered executable."""
return bool(mode & 0o111)
def mode_kind(mode):
"""Determine the Bazaar inventory kind based on Unix file mode."""
if mode is None:
return None
entry_kind = (mode & 0o700000) / 0o100000
if entry_kind == 0:
return 'directory'
elif entry_kind == 1:
file_kind = (mode & 0o70000) / 0o10000
if file_kind == 0:
return 'file'
elif file_kind == 2:
return 'symlink'
elif file_kind == 6:
return 'tree-reference'
else:
raise AssertionError(
"Unknown file kind %d, perms=%o." % (file_kind, mode,))
else:
raise AssertionError(
"Unknown kind, perms=%r." % (mode,))
def object_mode(kind, executable):
if kind == 'directory':
return stat.S_IFDIR
elif kind == 'symlink':
mode = stat.S_IFLNK
if executable:
mode |= 0o111
return mode
elif kind == 'file':
mode = stat.S_IFREG | 0o644
if executable:
mode |= 0o111
return mode
elif kind == 'tree-reference':
from dulwich.objects import S_IFGITLINK
return S_IFGITLINK
else:
raise AssertionError
def entry_mode(entry):
"""Determine the git file mode for an inventory entry."""
return object_mode(entry.kind, getattr(entry, 'executable', False))
def extract_unusual_modes(rev):
try:
foreign_revid, mapping = mapping_registry.parse_revision_id(
rev.revision_id)
except errors.InvalidRevisionId:
return {}
else:
return mapping.export_unusual_file_modes(rev)
def parse_git_svn_id(text):
(head, uuid) = text.rsplit(" ", 1)
(full_url, rev) = head.rsplit("@", 1)
return (full_url, int(rev), uuid)
def needs_roundtripping(repo, revid):
try:
mapping_registry.parse_revision_id(revid)
except errors.InvalidRevisionId:
return True
else:
return False
|