-
Notifications
You must be signed in to change notification settings - Fork 1
/
mapping.py
1189 lines (943 loc) · 39.6 KB
/
mapping.py
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
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
# Copyright (C) 2005-2009 Jelmer Vernooij <jelmer@samba.org>
# 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, see <http://www.gnu.org/licenses/>.
"""Maps between Subversion and Bazaar semantics."""
from __future__ import absolute_import
import calendar
from io import BytesIO
from subvertpy import properties
import time
from breezy import (
foreign,
osutils,
urlutils,
)
from breezy.errors import (
InvalidRevisionId,
)
from breezy.revision import (
NULL_REVISION,
Revision,
)
from six import (
text_type,
)
from breezy.trace import mutter
from . import (
changes,
errors,
get_client_string,
version_info,
)
SVN_PROP_BZR_PREFIX = 'bzr:'
SVN_PROP_BZR_ANCESTRY = 'bzr:ancestry:'
SVN_PROP_BZR_FILEIDS = 'bzr:file-ids'
SVN_PROP_BZR_REVISION_INFO = 'bzr:revision-info'
SVN_PROP_BZR_REVISION_ID = 'bzr:revision-id:'
SVN_PROP_BZR_TEXT_REVISIONS = 'bzr:text-revisions'
SVN_PROP_BZR_TEXT_PARENTS = 'bzr:text-parents'
SVN_PROP_BZR_LOG = 'bzr:log'
SVN_PROP_BZR_REQUIRED_FEATURES = 'bzr:required-features'
SVN_PROP_BZR_HIDDEN = 'bzr:hidden'
SVN_PROP_BZR_REVPROP_REDIRECT = 'bzr:see-revprops'
SVN_REVPROP_BZR_COMMITTER = 'bzr:committer'
SVN_REVPROP_BZR_FILEIDS = 'bzr:file-ids'
SVN_REVPROP_BZR_MAPPING_VERSION = 'bzr:mapping-version'
SVN_REVPROP_BZR_USER_AGENT = 'bzr:user-agent'
SVN_REVPROP_BZR_MERGE = 'bzr:merge'
SVN_REVPROP_BZR_REVISION_ID = 'bzr:revision-id'
SVN_REVPROP_BZR_REVNO = 'bzr:revno'
SVN_REVPROP_BZR_REVPROP_PREFIX = 'bzr:revprop:'
SVN_REVPROP_BZR_ROOT = 'bzr:root'
SVN_REVPROP_BZR_SIGNATURE = 'bzr:gpg-signature'
SVN_REVPROP_BZR_TIMESTAMP = 'bzr:timestamp'
SVN_REVPROP_BZR_LOG = 'bzr:log'
SVN_REVPROP_BZR_TEXT_PARENTS = 'bzr:text-parents'
SVN_REVPROP_BZR_TEXT_REVISIONS = 'bzr:text-revisions'
SVN_REVPROP_BZR_REQUIRED_FEATURES = 'bzr:required-features'
SVN_REVPROP_BZR_BASE_REVISION = 'bzr:base-revision'
SVN_REVPROP_BZR_SKIP = 'bzr:skip'
SVN_REVPROP_BZR_HIDDEN = 'bzr:hidden'
SVN_REVPROP_BZR_REPOS_UUID = 'bzr:repository-uuid'
SVN_REVPROP_BZR_TESTAMENT = 'bzr:testament'
def find_new_lines(oldvalue, newvalue):
"""Find any new lines that have been added to a string.
:param oldvalue: Previous contents
:param newvalue: Newcontents
:raises ValueError: If the existing contents were changed
"""
if oldvalue is None:
oldvalue = ""
if not newvalue.startswith(oldvalue):
raise ValueError("Existing contents were changed")
appended = newvalue[len(oldvalue):]
return appended.splitlines()
def escape_svn_path(x):
"""Escape a Subversion path for use in a revision identifier.
:param x: Path
:return: Escaped path
"""
return urlutils.quote(x, "").encode('utf-8')
def unescape_svn_path(x):
"""Unescape a path for use by Subversion.
:param x: Escaped path
:return: Unescaped path
"""
return urlutils.unquote(x.decode('utf-8'))
# The following two functions don't use day names (which can vary by
# locale) unlike the alternatives in breezy.timestamp
def format_highres_date(t, offset=0):
"""Format a date, such that it includes higher precision in the
seconds field.
:param t: The local time in fractional seconds since the epoch
:type t: float
:param offset: The timezone offset in integer seconds
:type offset: int
"""
assert isinstance(t, float) or isinstance(t, int)
# This has to be formatted for "original" date, so that the
# revision XML entry will be reproduced faithfully.
if offset is None:
offset = 0
tt = time.gmtime(t + offset)
return (time.strftime("%Y-%m-%d %H:%M:%S", tt)
# Get the high-res seconds, but ignore the 0
+ ('%.9f' % (t - int(t)))[1:]
+ ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
def unpack_highres_date(date):
"""This takes the high-resolution date stamp, and
converts it back into the tuple (timestamp, timezone)
Where timestamp is in real UTC since epoch seconds, and timezone is an
integer number of seconds offset.
:param date: A date formated by format_highres_date
:type date: string
"""
# skip day if applicable
if not date[0].isdigit():
space_loc = date.find(' ')
if space_loc == -1:
raise ValueError("No valid date: %r" % date)
date = date[space_loc+1:]
# Up until the first period is a datestamp that is generated
# as normal from time.strftime, so use time.strptime to
# parse it
dot_loc = date.find('.')
if dot_loc == -1:
raise ValueError(
'Date string does not contain high-precision seconds: %r' % date)
base_time = time.strptime(date[:dot_loc], "%Y-%m-%d %H:%M:%S")
fract_seconds, offset = date[dot_loc:].split()
fract_seconds = float(fract_seconds)
offset = int(offset)
hours = int(offset / 100)
minutes = (offset % 100)
seconds_offset = (hours * 3600) + (minutes * 60)
# time.mktime returns localtime, but calendar.timegm returns UTC time
timestamp = calendar.timegm(base_time)
timestamp -= seconds_offset
# Add back in the fractional seconds
timestamp += fract_seconds
return (timestamp, seconds_offset)
def parse_merge_property(line):
"""Parse a bzr:merge property value.
:param line: Line to parse
:return: List of revisions merged
"""
if ' ' in line:
mutter('invalid revision id %r in merged property, skipping', line)
return ()
return tuple(filter(lambda x: x != "", line.split("\t")))
def parse_svn_dateprop(date):
"""Parse a Subversion date property and return a unix timestamp.
:param date: A string containing a Subversion date string
:return: Unix timestamp
"""
assert isinstance(date, str)
return (properties.time_from_cstring(date) / 1000000.0, 0)
def parse_svn_log(log):
"""Parse a Subversion commit ("svn:log") message.
:param log: Log message as bytestring or None
:return: Unicode string with log message
"""
if log is None:
return u""
return log.decode("utf-8", "replace")
def parse_svn_revprops(svn_revprops, rev):
"""Fill in a Revision object from a set of svn properties.
:param svn_revprops: Subversion revision properties
:param rev: Revision object
"""
rev.committer = svn_revprops.get(properties.PROP_REVISION_AUTHOR, "")
if rev.committer is None:
rev.committer = u""
else:
rev.committer = rev.committer.decode("utf-8")
rev.message = parse_svn_log(svn_revprops.get(properties.PROP_REVISION_LOG))
if not isinstance(rev.message, text_type):
raise TypeError(rev.message)
assert properties.PROP_REVISION_DATE in svn_revprops
(rev.timestamp, rev.timezone) = parse_svn_dateprop(
svn_revprops[properties.PROP_REVISION_DATE])
rev.properties = {}
def parse_revision_metadata(text, rev):
"""Parse a revision info text (as set in bzr:revision-info).
:param text: text to parse
:param rev: Revision object to apply read parameters to
"""
in_properties = False
for l in text.splitlines():
if ": " not in l:
raise errors.InvalidPropertyValue(
SVN_PROP_BZR_REVISION_INFO,
"Missing : in revision metadata in %r" % l)
key, value = l.split(": ", 1)
if key == "committer":
rev.committer = value.decode("utf-8")
elif key == "timestamp":
(rev.timestamp, rev.timezone) = unpack_highres_date(value)
elif key == "properties":
in_properties = True
elif key[0] == "\t" and in_properties:
name = key[1:].encode('utf-8')
if name not in rev.properties:
rev.properties[name] = value.decode("utf-8")
else:
rev.properties[name] += "\n" + value.decode("utf-8")
else:
raise errors.InvalidPropertyValue(
SVN_PROP_BZR_REVISION_INFO, "Invalid key %r" % key)
def parse_revid_property(line):
"""Parse a (revnum, revid) tuple as set in revision id properties.
:param line: line to parse
:return: tuple with (bzr_revno, revid)
"""
if '\n' in line:
raise errors.InvalidPropertyValue(
SVN_PROP_BZR_REVISION_ID, "newline in revision id property line")
try:
(revno, revid) = line.split(' ', 1)
except ValueError:
raise errors.InvalidPropertyValue(
SVN_PROP_BZR_REVISION_ID, "missing space")
if revid == "":
raise errors.InvalidPropertyValue(
SVN_PROP_BZR_REVISION_ID, "empty revision id")
return (int(revno), revid)
def generate_revision_metadata(timestamp, timezone, committer, revprops):
"""Generate revision metadata text for the specified revision
properties.
:param timestamp: timestamp of the revision, in seconds since epoch
:param timezone: timezone, specified by offset from GMT in seconds
:param committer: name/email of the committer
:param revprops: dictionary with custom revision properties
:return: text with data to set bzr:revision-info to.
"""
assert timestamp is None or isinstance(timestamp, float)
text = ""
if timestamp is not None:
text += "timestamp: %s\n" % format_highres_date(timestamp, timezone)
if committer is not None:
if "\n" in committer:
raise AssertionError("Invalid committer: contains newline")
text += "committer: %s\n" % committer.encode("utf-8")
if revprops is not None and revprops != {}:
text += "properties: \n"
for k, v in sorted(revprops.items()):
if "\n" in k:
raise AssertionError("Invalid property name: %s" % k)
for vline in v.encode("utf-8").split("\n"):
text += "\t%s: %s\n" % (k.encode("utf-8"), vline)
assert isinstance(text, str)
return text
def parse_bzr_svn_revprops(props, rev):
"""Update a Revision object from a set of Subversion revision properties.
:param props: Dictionary with Subversion revision properties.
:param rev: Revision object
"""
changed = False
if SVN_REVPROP_BZR_TIMESTAMP in props:
(rev.timestamp, rev.timezone) = unpack_highres_date(
props[SVN_REVPROP_BZR_TIMESTAMP])
changed = True
if SVN_REVPROP_BZR_COMMITTER in props:
rev.committer = props[SVN_REVPROP_BZR_COMMITTER].decode("utf-8")
changed = True
if SVN_REVPROP_BZR_LOG in props:
rev.message = props[SVN_REVPROP_BZR_LOG].decode("utf-8")
if not isinstance(rev.message, text_type):
raise TypeError(rev.message)
changed = True
for name, value in props.items():
if name.startswith(SVN_REVPROP_BZR_REVPROP_PREFIX):
bzrname = name[len(SVN_REVPROP_BZR_REVPROP_PREFIX):].encode(
'utf-8')
rev.properties[bzrname] = value.decode("utf-8")
changed = True
return changed
def parse_required_features_property(text):
return set(text.split(","))
class BzrSvnMapping(foreign.VcsMapping):
"""Class that maps between Subversion and Bazaar semantics."""
experimental = False
_warned_experimental = False
roundtripping = False
can_use_revprops = False
can_use_fileprops = False
must_use_fileprops = False
supports_hidden = False
restricts_branch_paths = False
parseable_file_ids = False
def __init__(self):
super(BzrSvnMapping, self).__init__(foreign_vcs_svn)
if ((version_info[3] == 'exp' or self.experimental) and
not BzrSvnMapping._warned_experimental):
from breezy.trace import warning
warning("using experimental bzr-svn mappings; may break existing "
"branches in the most horrible ways")
BzrSvnMapping._warned_experimental = True
@classmethod
def from_repository(cls, repository, _hinted_branch_path=None):
return cls()
@classmethod
def from_revprops(cls, revprops):
raise NotImplementedError
def check_layout(self, repository, layout):
"""Check whether a layout can be used with this mapping."""
pass
def get_mandated_layout(self, repository):
"""Return the repository layout if any is mandated by this mapping,
None otherwise."""
return None
def get_guessed_layout(self, repository):
"""Return the repository layout guessed by this mapping or None.
"""
return None
def revision_id_bzr_to_foreign(self, revid):
"""Parse an existing Subversion-based revision id.
:param revid: The revision id.
:raises: InvalidRevisionId
:return: Tuple with (uuid, branch path, revision number) and mapping.
"""
raise NotImplementedError(self.revision_id_bzr_to_foreign)
def revision_id_foreign_to_bzr(self, foreign_revid):
"""Generate a unambiguous revision id.
:param foreign_revid: tuple of (uuid, path, revnum)
:return: New revision id.
"""
raise NotImplementedError(self.revision_id_foreign_to_bzr)
def is_branch(self, branch_path):
raise NotImplementedError(self.is_branch)
def get_branch_root(self, revprops):
"""Determine the branch root set in the revision properties.
:note: Return None if no branch root is set.
"""
return None
def get_repository_uuid(self, revprops):
"""Determine the uuid of the repository in which this
round-tripped revision was originally committed.
:note: Return None if no uuid is set.
"""
return None
def is_tag(self, tag_path):
raise NotImplementedError(self.is_tag)
def is_branch_or_tag(self, path):
return self.is_branch(path) or self.is_tag(path)
@staticmethod
def generate_file_id(foreign_revid, inv_path):
"""Create a file id identifying a Subversion file.
:param foreign_revid: Tuple of (uuid, branch, revnum)
:param inv_pat: Original path of the file within the inventory
"""
raise NotImplementedError
@staticmethod
def parse_file_id(fileid):
"""Parse a file id created by bzr-svn.
:param fileid: The file id to parse
:return: Tuple with (uuid, revnum, path)
"""
raise NotImplementedError
def import_revision_revprops(self, revprops, rev):
"""Update a Revision object from Subversion revision and branch
properties.
:param revprops: Dictionary with Subversion revision properties.
:param rev: Revision object to import data into.
:return: Whether or not any metadata was found
"""
raise NotImplementedError(self.import_revision_revprops)
def import_revision_fileprops(self, fileprops, rev):
"""Update a Revision object from Subversion revision and branch
properties.
:param fileprops: Dictionary with Subversion file properties on the
branch root.
:param rev: Revision object to import data into.
:return: Whether or not any metadata was found
"""
raise NotImplementedError(self.import_revision_fileprops)
def get_lhs_parent_revprops(self, revprops):
"""Determine the left hand side parent, if it was explicitly recorded.
If not explicitly recorded, returns None. Returns NULL_REVISION if
there is no lhs parent.
"""
return None
def get_lhs_parent_fileprops(self, fileprops):
"""Determine the left hand side parent, if it was explicitly recorded.
If not explicitly recorded, returns None. Returns NULL_REVISION if
there is no lhs parent.
"""
return None
def get_rhs_parents_fileprops(self, fileprops):
"""Obtain the right-hand side parents for a revision.
"""
raise NotImplementedError(self.get_rhs_parents_fileprops)
def get_rhs_parents_revprops(self, revprops):
"""Obtain the right-hand side parents for a revision.
"""
raise NotImplementedError(self.get_rhs_parents_revprops)
def get_rhs_ancestors(self, fileprops):
"""Obtain the right-hand side ancestors for a revision.
"""
raise NotImplementedError(self.get_rhs_ancestors)
def import_fileid_map_fileprops(self, fileprops):
"""Obtain the file id map for a revision from the properties.
"""
raise NotImplementedError(self.import_fileid_map_fileprops)
def import_fileid_map_revprops(self, revprops):
"""Obtain the file id map for a revision from the properties.
"""
raise NotImplementedError(self.import_fileid_map_revprops)
def export_fileid_map_revprops(self, fileids, revprops):
"""Adjust the properties for a file id map.
:param fileids: Dictionary
:param revprops: Subversion revision properties
"""
raise NotImplementedError(self.export_fileid_map_revprops)
def export_fileid_map_fileprops(self, fileids, fileprops):
"""Adjust the properties for a file id map.
:param fileids: Dictionary
:param fileprops: File properties
"""
raise NotImplementedError(self.export_fileid_map_fileprops)
def import_text_parents_revprops(self, revprops):
"""Obtain a text parent map from properties.
:param revprops: Subversion revision properties.
"""
raise NotImplementedError(self.import_text_parents_revprops)
def import_text_parents_fileprops(self, fileprops):
"""Obtain a text parent map from properties.
:param fileprops: File properties.
"""
raise NotImplementedError(self.import_text_parents_fileprops)
def export_text_parents_revprops(self, text_parents, revprops):
"""Store a text parent map.
:param text_parents: Text parent map
:param revprops: Revision properties
"""
raise NotImplementedError(self.export_text_parents_revprops)
def export_text_parents_fileprops(self, text_parents, fileprops):
"""Store a text parent map.
:param text_parents: Text parent map
:param fileprops: File properties
"""
raise NotImplementedError(self.export_text_parents_fileprops)
def export_text_revisions_revprops(self, text_revisions, revprops):
"""Store a text revisions map.
:param text_revisions: Text revision map
:param revprops: Revision properties
"""
raise NotImplementedError(self.export_text_revisions_revprops)
def export_text_revisions_fileprops(self, text_revisions, fileprops):
"""Store a text revisions map.
:param text_revisions: Text revision map
:param fileprops: File properties
"""
raise NotImplementedError(self.export_text_revisions_fileprops)
def import_text_revisions_revprops(self, revprops):
raise NotImplementedError(self.import_text_revisions_revprops)
def import_text_revisions_fileprops(self, fileprops):
raise NotImplementedError(self.import_text_revisions_fileprops)
def export_revision_revprops(
self, svn_revprops, uuid, branch_root,
timestamp, timezone, committer, revprops, revision_id, revno,
parent_ids, testament):
"""Determines the revision properties.
"""
raise NotImplementedError(self.export_revision_revprops)
def export_revision_fileprops(
self, svn_fileprops, timestamp, timezone,
committer, revprops, revision_id, revno, parent_ids, testament):
"""Determines the branch root file properties.
"""
raise NotImplementedError(self.export_revision_fileprops)
def export_message_revprops(self, log, revprops):
raise NotImplementedError(self.export_message_revprops)
def export_message_fileprops(self, log, fileprops):
raise NotImplementedError(self.export_message_fileprops)
def get_revision_id_revprops(self, revprops):
raise NotImplementedError(self.get_revision_id_revprops)
def get_revision_id_fileprops(self, fileprops):
raise NotImplementedError(self.get_revision_id_fileprops)
def supports_tags(self):
raise NotImplementedError(self.supports_tags)
@classmethod
def get_test_instance(cls):
return cls()
def is_bzr_revision_hidden_revprops(self, revprops):
return False
def is_bzr_revision_hidden_fileprops(self, changed_fileprops):
return False
def export_hidden_revprops(self, branch_root, revprops):
raise NotImplementedError(self.export_hidden_revprops)
def export_hidden_fileprops(self, fileprops):
raise NotImplementedError(self.export_hidden_fileprops)
def export_revprop_redirect(self, revnum, fileprops):
raise NotImplementedError(self.export_revprop_redirect)
def check_revprops(self, revprops, checkresult):
pass
def check_fileprops(self, changed_fileprops, checkresult):
pass
def newer_than(self, other_mapping):
"""Check whether other_mapping precedes this mapping, and that
revisions mapped with other_mapping can exist in the ancestry of
revisions mapped with this mapping.
"""
return False
def parse_fileid_property(text):
"""Pares a fileid file or revision property.
:param text: Property value
:return: Map of path -> fileid
"""
ret = {}
for line in text.splitlines():
(path, key) = line.split("\t", 1)
ret[urlutils.unquote(path).decode("utf-8")] = str(key)
return ret
def generate_fileid_property(fileids):
"""Marshall a dictionary with file ids.
:param fileids: Map of path -> fileid
:return: Property value
"""
return "".join(
["%s\t%s\n" % (
urlutils.quote(path.encode("utf-8")),
fileids[path]) for path in sorted(fileids.keys())])
def parse_text_parents_property(text):
ret = {}
for line in text.splitlines():
parts = line.split("\t")
entry = parts[0]
ret[urlutils.unquote(entry).decode("utf-8")] = filter(
lambda x: x != "",
[osutils.safe_revision_id(parent_revid)
for parent_revid in parts[1:]])
return ret
def parse_text_revisions_property(text):
ret = {}
for line in text.splitlines():
(entry, revid) = line.split("\t", 1)
ret[urlutils.unquote(entry).decode("utf-8")] = osutils.safe_revision_id(
revid)
return ret
def generate_text_parents_property(text_parents):
return "".join(["%s\t%s\n" % (
urlutils.quote(path.encode("utf-8")), "\t".join(text_parents[path]))
for path in sorted(text_parents.keys())
if text_parents[path] is not None])
def generate_text_revisions_property(text_revisions):
return "".join([
"%s\t%s\n" % (urlutils.quote(path.encode("utf-8")), text_revisions[path])
for path in sorted(text_revisions.keys())
if text_revisions[path] is not None
])
class BzrSvnMappingFileProps(object):
def __init__(self, name):
self.name = name
def import_revision_fileprops(self, fileprops, rev):
if SVN_PROP_BZR_LOG in fileprops:
rev.message = fileprops[SVN_PROP_BZR_LOG][1].decode("utf-8")
if not isinstance(rev.message, text_type):
raise TypeError(rev.message)
metadata = fileprops.get(SVN_PROP_BZR_REVISION_INFO)
if metadata is not None:
assert isinstance(metadata, tuple)
parse_revision_metadata(metadata[1], rev)
return True
return False
def import_text_parents_fileprops(self, fileprops):
metadata = fileprops.get(SVN_PROP_BZR_TEXT_PARENTS)
if metadata is None:
return {}
assert isinstance(metadata, tuple)
return parse_text_parents_property(metadata[1])
def import_text_revisions_fileprops(self, fileprops):
metadata = fileprops.get(SVN_PROP_BZR_TEXT_REVISIONS)
if metadata is None:
return {}
assert isinstance(metadata, tuple)
return parse_text_revisions_property(metadata[1])
def export_text_parents_fileprops(self, text_parents, fileprops):
if text_parents != {}:
fileprops[SVN_PROP_BZR_TEXT_PARENTS] = (
generate_text_parents_property(text_parents))
elif SVN_PROP_BZR_TEXT_PARENTS in fileprops:
fileprops[SVN_PROP_BZR_TEXT_PARENTS] = ""
def export_text_revisions_fileprops(self, text_revisions, fileprops):
if text_revisions != {}:
fileprops[SVN_PROP_BZR_TEXT_REVISIONS] = (
generate_text_revisions_property(text_revisions))
elif SVN_PROP_BZR_TEXT_REVISIONS in fileprops:
fileprops[SVN_PROP_BZR_TEXT_REVISIONS] = ""
def get_rhs_parents_fileprops(self, fileprops):
bzr_merges = fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name, None)
if bzr_merges is not None:
try:
new_lines = find_new_lines(*bzr_merges)
except ValueError as e:
mutter(str(e))
return ()
if len(new_lines) != 1:
mutter(
"unexpected number of lines in bzr merge property: %r",
new_lines)
return ()
return parse_merge_property(new_lines[0])
return ()
def get_rhs_ancestors(self, fileprops):
change = fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name)
if change is None:
return []
assert isinstance(change, tuple)
ancestry = []
for l in change[1].splitlines():
ancestry.extend(l.split("\n"))
return ancestry
def import_fileid_map_fileprops(self, fileprops):
fileids = fileprops.get(SVN_PROP_BZR_FILEIDS, None)
if fileids is None:
return {}
assert isinstance(fileids, tuple)
return parse_fileid_property(fileids[1])
def _record_merges(self, merges, fileprops):
"""Store the extra merges (non-LHS parents) in a file property.
:param merges: List of parents.
"""
# Bazaar Parents
old = fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name, "")
svnprops = {
SVN_PROP_BZR_ANCESTRY+self.name: old + "\t".join(merges) + "\n"
}
return svnprops
def export_revision_fileprops(
self, svn_fileprops, timestamp, timezone,
committer, revprops, revision_id, revno, parent_ids, testament):
# Keep track of what Subversion properties to set later on
svn_fileprops[SVN_PROP_BZR_REVISION_INFO] = generate_revision_metadata(
timestamp, timezone, committer, revprops)
if len(parent_ids) > 1:
svn_fileprops.update(self._record_merges(
parent_ids[1:], svn_fileprops))
# Set appropriate property if revision id was specified by
# caller
if revision_id is not None:
old = svn_fileprops.get(SVN_PROP_BZR_REVISION_ID+self.name, "")
svn_fileprops[SVN_PROP_BZR_REVISION_ID+self.name] = (
old + "%d %s\n" % (revno, revision_id))
def export_message_fileprops(self, message, fileprops):
fileprops[SVN_PROP_BZR_LOG] = message.encode("utf-8")
def get_revision_id_fileprops(self, fileprops):
# Lookup the revision from the bzr:revision-id-vX property
text = fileprops.get(SVN_PROP_BZR_REVISION_ID+self.name, None)
if text is None:
return (None, None,
self.is_bzr_revision_hidden_fileprops(fileprops))
try:
new_lines = find_new_lines(*text)
except ValueError as e:
mutter(str(e))
return (None, None,
self.is_bzr_revision_hidden_fileprops(fileprops))
if len(new_lines) != 1:
mutter("unexpected number of lines: %r" % new_lines)
return (None, None,
self.is_bzr_revision_hidden_fileprops(fileprops))
try:
(revno, revid) = parse_revid_property(new_lines[0])
return (revno, revid,
self.is_bzr_revision_hidden_fileprops(fileprops))
except errors.InvalidPropertyValue as e:
mutter(str(e))
return (None, None,
self.is_bzr_revision_hidden_fileprops(fileprops))
def export_fileid_map_fileprops(self, fileids, fileprops):
if fileids != {}:
file_id_text = generate_fileid_property(fileids)
fileprops[SVN_PROP_BZR_FILEIDS] = file_id_text
elif SVN_PROP_BZR_FILEIDS in fileprops:
fileprops[SVN_PROP_BZR_FILEIDS] = ""
def check_fileprops(self, changed_fileprops, checkresult):
# bzr:revision-id:*
text = changed_fileprops.get(
SVN_PROP_BZR_REVISION_ID+self.name, ("", ""))
try:
new_lines = find_new_lines(*text)
except ValueError:
checkresult.invalid_fileprop_cnt += 1
else:
if len(new_lines) > 1:
checkresult.invalid_fileprop_cnt += 1
if new_lines == []:
return
try:
revid = parse_revid_property(new_lines[0])
except errors.InvalidPropertyValue:
self.invalid_fileprop_cnt += 1
return
text = changed_fileprops.get(SVN_PROP_BZR_REVISION_INFO, ("", ""))
try:
parse_revision_metadata(text[1], Revision(revid))
except errors.InvalidPropertyValue:
checkresult.invalid_fileprop_cnt += 1
class BzrSvnMappingRevProps(object):
def import_revision_revprops(self, svn_revprops, rev):
return parse_bzr_svn_revprops(svn_revprops, rev)
def import_fileid_map_revprops(self, svn_revprops):
if SVN_REVPROP_BZR_FILEIDS not in svn_revprops:
return {}
return parse_fileid_property(svn_revprops[SVN_REVPROP_BZR_FILEIDS])
def import_text_parents_revprops(self, svn_revprops):
if SVN_REVPROP_BZR_TEXT_PARENTS not in svn_revprops:
return {}
return parse_text_parents_property(
svn_revprops[SVN_REVPROP_BZR_TEXT_PARENTS])
def export_text_parents_revprops(self, text_parents, svn_revprops):
if text_parents != {}:
svn_revprops[SVN_REVPROP_BZR_TEXT_PARENTS] = (
generate_text_parents_property(text_parents))
def import_text_revisions_revprops(self, svn_revprops):
if SVN_REVPROP_BZR_TEXT_REVISIONS not in svn_revprops:
return {}
return parse_text_revisions_property(
svn_revprops[SVN_REVPROP_BZR_TEXT_REVISIONS])
def export_text_revisions_revprops(self, text_revisions, svn_revprops):
if text_revisions != {}:
value = generate_text_revisions_property(text_revisions)
svn_revprops[SVN_REVPROP_BZR_TEXT_REVISIONS] = value
def get_lhs_parent_revprops(self, svn_revprops):
return svn_revprops.get(SVN_REVPROP_BZR_BASE_REVISION)
def get_rhs_parents_revprops(self, svn_revprops):
return tuple(svn_revprops.get(SVN_REVPROP_BZR_MERGE, "").splitlines())
def get_branch_root(self, revprops):
path = revprops.get(SVN_REVPROP_BZR_ROOT)
if path is None:
return None
return path
def get_repository_uuid(self, revprops):
return revprops.get(SVN_REVPROP_BZR_REPOS_UUID)
def get_revision_id_revprops(self, revprops):
if (not is_bzr_revision_revprops(revprops) or
SVN_REVPROP_BZR_REVISION_ID not in revprops):
return (None, None, self.is_bzr_revision_hidden_revprops(revprops))
revid = revprops[SVN_REVPROP_BZR_REVISION_ID]
revno = int(revprops[SVN_REVPROP_BZR_REVNO])
return (revno, revid, self.is_bzr_revision_hidden_revprops(revprops))
def export_message_revprops(self, message, revprops):
revprops[SVN_REVPROP_BZR_LOG] = message.encode("utf-8")
def export_revision_revprops(
self, svn_revprops, uuid, branch_root,
timestamp, timezone, committer, revprops, revision_id, revno,
parent_ids, testament):
svn_revprops[SVN_REVPROP_BZR_MAPPING_VERSION] = self.name
if timestamp is not None:
svn_revprops[SVN_REVPROP_BZR_TIMESTAMP] = format_highres_date(
timestamp, timezone)
if committer is not None:
svn_revprops[SVN_REVPROP_BZR_COMMITTER] = committer.encode("utf-8")
if revprops is not None:
for name, value in revprops.items():
svn_name = SVN_REVPROP_BZR_REVPROP_PREFIX+name
svn_revprops[svn_name] = value.encode("utf-8")
svn_revprops[SVN_REVPROP_BZR_ROOT] = branch_root
svn_revprops[SVN_REVPROP_BZR_REPOS_UUID] = uuid
if revision_id is not None:
svn_revprops[SVN_REVPROP_BZR_REVISION_ID] = revision_id
if len(parent_ids) > 1:
svn_revprops[SVN_REVPROP_BZR_MERGE] = "".join(
[x+"\n" for x in parent_ids[1:]])
if len(parent_ids) == 0:
svn_revprops[SVN_REVPROP_BZR_BASE_REVISION] = NULL_REVISION
else:
svn_revprops[SVN_REVPROP_BZR_BASE_REVISION] = parent_ids[0]
svn_revprops[SVN_REVPROP_BZR_REVNO] = str(revno)
svn_revprops[SVN_REVPROP_BZR_USER_AGENT] = get_client_string()
if testament is not None:
svn_revprops[SVN_REVPROP_BZR_TESTAMENT] = testament.as_short_text()
def export_fileid_map_revprops(self, fileids, revprops):
if fileids != {}:
revprops[SVN_REVPROP_BZR_FILEIDS] = generate_fileid_property(
fileids)
def check_revprops(self, revprops, check_result):
pass
class SubversionMappingRegistry(foreign.VcsMappingRegistry):
def parse_mapping_name(self, name):
assert name.startswith("svn-")