forked from gold2718/svn_select_to_git
-
Notifications
You must be signed in to change notification settings - Fork 0
/
svn_select_to_git.py
executable file
·1567 lines (1375 loc) · 53.2 KB
/
svn_select_to_git.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
#!/usr/bin/env python
from __future__ import print_function
import sys
import os
import os.path
import subprocess
import inspect
import re
import shutil
import argparse
import filecmp
## Important paths
thisFile = os.path.realpath(inspect.getfile(inspect.currentframe()))
currDir = os.path.dirname(thisFile)
## Regular expression for source files
cby_str="Committed by"
reRevis = re.compile(r"^r(\d+)\s+\|\s+([^|]+)\|\s+([^|]+)\|\s+(\d+)\s+lines?$")
reCommit = re.compile(r"^commit ([0-9a-f]+)$")
reImport = re.compile(r"^\s*Imported from .*@([\d]+)$")
reAuthor = re.compile(r"^\s*{} (.+)\s+at\s+([0-9][0-9\s:+-]+)$".format(cby_str))
reLastChange = re.compile(r"^Last Changed Rev:\s+(\d+)$")
reGitHash = re.compile("\A([a-fA-F0-9]+)\Z")
reRemoteBranch = re.compile("\s*origin/(\S+)")
##############################
###
### Helper Functions
###
##############################
def perr(errmsg, retcode=1):
"Utility to print an error message and exit"
print(errmsg, file=sys.stderr)
exit(retcode)
# End perr
def quitOnFail(retcode, caller, command=None):
"Utility to quit execution on a non-zero return code"
if retcode != 0:
errmsg = "{} failed with return code {}".format(caller, retcode)
if command is not None:
errmsg = errmsg + os.linesep + " ".join(command)
# End if
perr(errmsg, retcode)
# End if
# End quitOnFail
def checkOutput(commands, verbose=False):
"Try a command line and return the output on success (None on failure)"
try:
outstr = subprocess.check_output(commands, stderr=open("/dev/null", mode='w'))
except OSError as e:
print("Execution of '{}' failed:".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
exit(1)
except ValueError as e:
if (verbose):
print("ValueError in '{}':".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
# End if
outstr = None
except subprocess.CalledProcessError as e:
if (verbose):
print("CalledProcessError in '{}':".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
# End if
outstr = None
# End of try
return outstr
# End of checkOutput
def scall(commands):
"Try a command line and return the return value (-1 on failure)"
try:
retcode = subprocess.check_call(commands)
except OSError as e:
print("Execution of '{}' failed".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
retcode = -1
except ValueError as e:
print("ValueError in '{}'".format(' '.join(commands)), file=sys.stderr)
print("{}".format(e), file=sys.stderr)
retcode = -1
except subprocess.CalledProcessError as e:
print("CalledProcessError in '{}'".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
retcode = -1
# End of try
return retcode
# End of scall
def retcall(commands):
"Try a command line and return the return value. Suppress normal output"
FNULL = open(os.devnull, 'w')
try:
retcode = subprocess.call(commands, stdout=FNULL, stderr=subprocess.STDOUT)
except OSError as e:
print("Execution of '{}' failed".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
except ValueError as e:
print("ValueError in '{}'".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
except subprocess.CalledProcessError as e:
print("CalledProcessError in '{}'".format(' '.join(commands)),
file=sys.stderr)
print("{}".format(e), file=sys.stderr)
# End of try
return retcode
# End of retcall
def file_diff(file1, file2):
"""Return True if there is some difference between file1 and file2"""
diff = not os.path.exists(file2)
if not diff:
# Check for permission or file size changes
stat1 = os.stat(file1)
stat2 = os.stat(file2)
diff = stat1.st_mode != stat2.st_mode
diff = diff or (stat1.st_size != stat2.st_size)
diff = diff or (stat1.st_uid != stat2.st_uid)
diff = diff or (stat1.st_gid != stat2.st_gid)
# End if
# Make sure the file is really the same
diff = diff or (not filecmp.cmp(file1, file2, shallow=False))
return diff
# End def file_diff
##############################
###
### Classes
###
##############################
class SvnRevRange(object):
"""A class to represent a range of SVN revisions
Instance variables:
start = -1 # -1 means BASE, 0 means absent
end = -1 # -1 means most recent (HEAD), 0 means absent
"""
def __init__(self, revstr):
self.start = -1
self.end = -1
if (revstr is not None):
revs = revstr.split(":")
if (len(revs) > 2):
quitOnFail(1, "Illegal revision string, '{}'".format(revstr))
elif (len(revs) == 2):
if (len(revs[0]) > 0):
self.start = int(revs[0])
# No else, argument was left off, implied BASE
# End if
if (len(revs[1]) > 0):
self.end = int(revs[1])
# No else, argument was left off, implied HEAD
# End if
elif (revstr == "HEAD"):
self.start = 0
self.end = -1
elif (revstr == "BASE"):
self.start = -1
self.end = 0
elif (len(revs) == 1):
if (len(revs[0]) > 0):
if (not isinstance(revs[0], int)):
self.start = int(revs[0])
else:
self.start = revs[0]
# end if
self.end = 0
else:
quitOnFail(1, "Badly formatted revision string, {}".format(revstr))
# End if
# no else, blank string uses defaults
# End if
# end def __init__
def revString(self):
if (self.start < 0):
sstr = "1" # svn log doesn't allow BASE
elif (self.start == 0):
sstr = ''
else:
sstr = str(self.start)
# End if
if (self.end < 0):
estr = "HEAD"
elif (self.end == 0):
estr=""
else:
estr = str(self.end)
# End if
if ((len(sstr) > 0) and (len(estr) > 0)):
revstr = "{}:{}".format(sstr, estr)
else:
revstr = sstr+estr
# End if
return revstr
# end def revString
def revStart(self):
return self.start
# end def revStart
def revEnd(self):
return self.end
# end def revEnd
# End class SvnRevRange
class LogEntry(object):
"""A class to hold a single svn log entry
Instance variables
revstr = 0 # Revision number (as string)
committer = '' # Who made the commit
commitDate = '' # Date and time of commit
URL = '' # URL of the repo (including any subdirectory) for revision
"""
def __init__(self, rev, who, when, url):
self.revstr = rev
self.committer = who
self.commit_date = when
self.URL = url
# End def __init__
def revision(self):
return str(self.revstr)
# End def revision
def revNum(self):
return int(self.revstr)
# End def revNum
def who(self):
return self.committer
# End def who
def when(self):
return self.commit_date
# End def when
def url(self):
return self.URL
# End def url
# End class LogEntry
class SvnLogEntry(LogEntry):
"""A class to hold a single svn log entry
Instance variables
message = None # Commit message
revTag = None # Optional tag string if this entry is from a tag
"""
def __init__(self, rev, who, when, url, lines, tag=None):
super(self.__class__, self).__init__(rev, who, when, url)
self.message = list(lines)
self.revTag = tag
# End def __init__
def formatLogMessage(self):
# First, create a short first line
if (len(self.message[0]) > 72):
logm = self.message[0][0:68] + ' ...'
else:
logm = self.message[0]
# End if
logm = logm + os.linesep + os.linesep
# Include some import information
logm = logm + 'Imported from ' + self.url() + "@{}".format(self.revNum())
logm = logm + os.linesep + cby_str + ' ' + str(self.committer)
logm = logm + ' at ' + str(self.commit_date) + os.linesep
logm = logm + 'Original svn commit message:' + os.linesep
# Now, include full original log message
for line in self.message:
logm = logm + os.linesep + line
# End for
return logm
# End def formatLogMessage
def tag(self):
if (self.revTag is None):
return None
else:
return str(self.revTag)
# End if
# End def revision
# End class SvnLogEntry
class Git2svnLogEntry(LogEntry):
"""A class to hold information from an svn2git log entry
Instance variables
commit = '' # The git commit hash
NB: The super class holds the original SVN information, not git info
This allows sorting by SVN revision number
"""
def __init__(self, gcommit, svnRev, svnWho, svnWhen, svnURL):
super(self.__class__, self).__init__(svnRev, svnWho, svnWhen, svnURL)
self.gitCommit = gcommit
# End def __init__
def commit(self):
return str(self.gitCommit)
# End revision
# End class Git2svnLogEntry
## Enumerate git ref types
class gitRef(object):
unknown = 0
localBranch = 1
remoteBranch = 2
tag = 3
sha1 = 4
# End class gitRef
##############################
###
### svn Functions
###
##############################
def svnExport(exportDir, repoURL, revstr=None):
"""Export a subversion commit, with optional revision
NB: If the destination directory, exportDir, exists it is first removed
"""
if (os.path.exists(exportDir)):
shutil.rmtree(exportDir)
# End if
if (revstr is None):
caller = "svnExport {} {}".format(exportDir, repoURL)
retcode = scall(["svn", "export", "--ignore-externals", repoURL, exportDir])
else:
caller = "svnExport -r{} {} {}".format(revstr, repoURL, exportDir)
retcode = retcall(["svn", "export", "--ignore-externals", "-r{}".format(revstr), repoURL, exportDir])
# End if
quitOnFail(retcode, caller)
# End def svnExport
def svnList(url):
"""Call svn list on a url"""
caller = "svnList {}".format(url)
slist = checkOutput(["svn", "list", url])
entries = []
if (slist is not None):
for line in slist.splitlines():
entries.append(line.rstrip("/"))
# End for
# End if
return entries
# End def svnList
def svnLastChangedRev(url):
"""Find the last commit to url"""
caller = "svnLastChangedRev {}".format(url)
lines = checkOutput(["svn", "info", url])
rev = ''
if (lines is not None):
for line in lines.splitlines():
match = reLastChange.match(line)
if (match is not None):
rev = match.group(1)
break
# End if
# End for
# End if
return rev
# End def svnLastChangedRev
def svnCaptureLog(repoURL, revstr, auth_table, svn_auth, keep_dates, tag=None, default_author=None, \
tag_rev_list=None, tag_str_list=None):
logs = []
caller = "svnCaptureLog {} {}".format(repoURL, revstr)
log = checkOutput(["svn", "log", "--stop-on-copy", "-r{}".format(revstr), repoURL])
nlines = 0
lines = []
skip = False
if (log is not None):
line_cnt = 0 #initalize counter
log_lines = log.splitlines() #create list of log lines
for line in log_lines:
line_cnt = line_cnt + 1 #add one to counter
match = reRevis.match(line)
if ((not skip) and (nlines > 0)):
lines.append(line)
nlines = nlines - 1
if (nlines == 0):
#Does tag list exist?
#---------------------
if tag_rev_list is not None:
#If so, then search for tag nearest to revision:
rev_idx = tag_rev_search(rev, rev_next, tag_rev_list)
#Does a tag revision match current revision?
if rev_idx != -1:
#If so, then set tag string:
tag_str = tag_str_list[rev_idx]
else:
#If not, set tag string to None:
tag_str = None
else:
#If no tag list is present, set tag labels to None:
tag_str = None
#---------------------
logs.append(SvnLogEntry(rev, who, when, repoURL, lines, tag=tag_str))
del(lines[:])
lines = []
# End if
elif (match is not None):
rev = match.group(1).strip()
who = match.group(2).strip()
#Look ahead for next revision:
#----------------------------
if line_cnt < len(log_lines)-1:
#If not at end of log, search ahead:
rev_next = next_revision_val(log_lines[line_cnt:])
else:
#If at end of log, set next revision to gigantic number:
rev_next = sys.maxsize
#----------------------------
if auth_table is not None:
if who in auth_table:
who = auth_table[who]
elif default_author is not None:
print("WARNING: Author, '{}', not found in author table, substituting '{}'".format(who,default_author))
auth_table[who] = default_author
who = default_author
else:
print("WARNING: Author, '{}', not found in author table, guessing author info".format(who))
#Is svn author an email? Search for "@" to find out:
#--------------------------------------------------
at_idx = who.find("@")
if at_idx != -1:
#If an email, set start of email as "name":
who_name = who[:at_idx]
who_new = "{} : <{}>".format(who_name,who)
#re-name variable:
who = who_new
else:
#If not an email, add a fake one to keep git happy:
who_new = "{} : <[email protected]>".format(who)
#re-name variable:
who = who_new
#--------------------------------------------------
elif not svn_auth:
who = None
# No else, just keep svn who
# End if
if keep_dates:
when = match.group(3).split('(')[0].strip()
else:
when = None
# End if
nlines = int(match.group(4))
skip = True # Skip the blank line after a match
else:
# just discard this line
skip = False
# End if
# End for
# End if
return logs
# End def svnCaptureLog
def parseAuthorTable(filename):
if not os.path.exists(filename):
perr("Author table, '{}', does not exist".format(filename))
auth_table = {}
try:
with open(filename) as f:
for line in f:
entry = line.split(':')
if len(entry) == 2:
auth_table[entry[0].strip()] = entry[1].strip()
elif len(entry) != 1:
raise ValueError("Bad author table entry, '{}'".format(line))
else:
print("Ignoring incorrectly formatted author entry, '{}'".format(line.strip()))
except ValueError as e:
perr(e)
except Exception as e:
perr(e)
return auth_table
# End parseAuthorTable
def tag_rev_search(rev, rev_next, tag_rev_list):
"""This function is designed to search for the tag
revision closest to, but after, the current trunk
or branch revision, while also checking that no revisions
are between the current revision and the tag revision"""
#Convert tag revisions to integers:
tag_rev_ints = map(int,tag_rev_list)
#Convert current revision to integer
curr_rev_int = int(rev)
#Convert next revision to integer:
rev_next_int = int(rev_next)
#Ignore all tag revisions less than current revision:
tag_abv_list = [rev for rev in tag_rev_ints if rev >= curr_rev_int]
#Find revision closest to current revision:
tag_rev_close = min(tag_abv_list, key=lambda x: x-curr_rev_int)
#Determine if closest tag revision is in-between current revision and
#next trunk/branch revision:
if tag_rev_close < rev_next_int:
#If so, then find list index of tag:
rev_idx = tag_rev_ints.index(tag_rev_close)
else:
#If not, then set rev_idx to "-1", which indicates tag doesn't exist for this revision:
rev_idx = -1
#return tag revision index:
return rev_idx
def next_revision_val(log_lines):
"""This function searches for the next revision
in the subversion logs inside a loop of the
logs themselves, which is needed to assign
tags properly."""
#Initalize next revision:
rev_next = sys.maxsize
#Loop over log lines:
for line in log_lines:
#Search for match:
match = reRevis.match(line)
if match is not None:
#If match is present, pull out revision
rev_next = match.group(1).strip()
#break out of loop:
break
#Send next revision back:
return rev_next
##############################
###
### git Functions
###
##############################
# Return the (current branch, sha1 hash) of working copy in wdir
def gitCurrentBranch(wdir):
caller = "gitCurrentBranch {}".format(wdir)
currdir = os.getcwd()
os.chdir(wdir)
branch = checkOutput(["git", "symbolic-ref", "--short", "HEAD"])
if ((branch is None) or (len(branch) == 0)):
hash = None
else:
branch = branch.rstrip()
hash = checkOutput(["git", "rev-parse", "HEAD"])
# End if
if (hash is not None):
hash = hash.rstrip()
# End if
os.chdir(currdir)
return (branch, hash)
# End gitCurrentBranch
def gitRefType(chkdir, ref):
"""Determine if 'ref' is a local branch, a remote branch, a tag, or a commit
Should probably use this command instead"""
# git show-ref --verify --quiet refs/heads/<branch-name>
caller = "gitRefType {} {}".format(chkdir, ref)
currdir = os.getcwd()
os.chdir(chkdir)
refType = gitRef.unknown
# First check for local branch
gitout = checkOutput(["git", "branch"])
if gitout is not None:
branches = [ x.lstrip('* ') for x in gitout.splitlines() ]
for branch in branches:
if branch == ref:
refType = gitRef.localBranch
break
# End if
# End for
# End if
# Next, check for remote branch
if refType == gitRef.unknown:
gitout = checkOutput(["git", "branch", "-r"])
if gitout is not None:
for branch in gitout.splitlines():
match = reRemoteBranch.match(branch)
if (match is not None) and (match.group(1) == ref):
refType = gitRef.remoteBranch
break
# End if
# End for
# End if
# End if
# Next, check for a tag
if refType == gitRef.unknown:
gitout = checkOutput(["git", "tag"])
if gitout is not None:
for tag in gitout.splitlines():
if tag == ref:
refType = gitRef.tag
break
# End if
# End for
# End if
# End if
# Finally, see if it just looks like a commit hash
if (refType == gitRef.unknown) and reGitHash.match(ref):
refType = gitRef.sha1
# End if
os.chdir(currdir)
# Return what we've come up with
return refType
# End gitRefType
def gitCheckDir(chkdir, ref=None):
"""Check to see if directory (chkdir) exists and is the correct version (ref)
returns True (correct), False (incorrect) or None (chkdir not found)"""
caller = "gitCheckDir {} {}".format(chkdir, ref)
currdir = os.getcwd()
if (os.path.exists(chkdir)):
if (os.path.exists(os.path.join(chkdir, ".git"))):
os.chdir(chkdir)
head = checkOutput(["git", "rev-parse", "HEAD"])
else:
head = None
# End if
if (ref is None):
refchk = None
else:
os.chdir(chkdir)
refchk = checkOutput(["git", "rev-parse", ref])
# End if
if (ref is None):
retVal = head is not None
elif (refchk is None):
retVal = None
else:
retVal = (head == refchk)
# End if
else:
retVal = None
# End if
os.chdir(currdir)
return retVal
# End gitCheckDir
def gitWdirClean(wdir):
caller = "getWdirClean {}".format(wdir)
currdir = os.getcwd()
os.chdir(wdir)
retcode = retcall(["git", "diff", "--quiet", "--exit-code"])
os.chdir(currdir)
return (retcode == 0)
# End def gitWdirClean
def gitNewRepo(repo):
caller = "gitNewRepo {}".format(repo)
currdir = os.getcwd()
os.chdir(repo)
status = checkOutput(["git", "status"])
newrepo = False
for line in status.splitlines():
if (line.rstrip(os.linesep) == "Initial commit"):
newrepo = True
break
elif (line.rstrip(os.linesep) == "No commits yet"):
newrepo = True
break
# End if
# End for
os.chdir(currdir)
return newrepo
# End def gitNewRepo
def gitCheckout(checkoutDir, ref=None):
caller = "gitCheckout {}".format(checkoutDir)
currdir = os.getcwd()
os.chdir(checkoutDir)
retcode = 0
if (gitCheckDir(checkoutDir) is None):
perr("gitCheckout: Checkout dir ({}) not found".format(checkoutDir))
# End if
if ref is not None:
(branch, chash) = gitCurrentBranch(checkoutDir)
refType = gitRefType(checkoutDir, ref)
if (refType == gitRef.remoteBranch):
retcode = scall(["git", "checkout", "--track", "origin/"+ref])
elif (refType == gitRef.localBranch):
if ((branch != ref) and (not gitWdirClean(checkoutDir))):
perr("Working directory ({}) not clean, aborting".format(checkoutDir))
else:
retcode = scall(["git", "checkout", ref])
# End if
else:
# For now, do a hail mary and hope ref can be checked out
retcode = scall(["git", "checkout", ref])
# End if
quitOnFail(retcode, caller)
# End if
os.chdir(currdir)
# End def gitCheckout
def gitRmFile(repo, filename):
caller = "gitRmFile {} {}".format(repo, filename)
currdir = os.getcwd()
os.chdir(repo)
retcode = retcall(["git", "rm", filename])
os.chdir(currdir)
quitOnFail(retcode, caller)
# End def gitRmFile
def gitAddFile(repo, filename):
caller = "gitAddFile {} {}".format(repo, filename)
currdir = os.getcwd()
os.chdir(repo)
# Since we may have declined to copy a new file (eg., bad symlink)
# Make sure the file exists before trying to add it
if os.path.exists(filename):
retcode = retcall(["git", "add", filename])
os.chdir(currdir)
quitOnFail(retcode, caller)
# End if
# End def gitAddFile
def gitCommitAll(repo, message, author=None, date=None):
caller = "gitCommitAll {}".format(repo)
currdir = os.getcwd()
os.chdir(repo)
gitcmd = ["git", "commit", "-a"]
if author is not None:
gitcmd.append("--author='{}'".format(author))
if date is not None:
gitcmd.append("--date='{}'".format(date))
#Need to add quotes to message string, to
#avoid git error when "/" is present in the message:
full_message = "'"+message+"'"
gitcmd.append("--message={}".format(full_message))
retcode = retcall(gitcmd)
os.chdir(currdir)
quitOnFail(retcode, caller, gitcmd)
# End def gitCommitAll
def gitApplyTag(repo, tag, message):
caller = "gitApplyTag {} {}".format(repo, tag)
currdir = os.getcwd()
os.chdir(repo)
retcode = scall(["git", "tag", "-a", tag, "-m", message])
os.chdir(currdir)
quitOnFail(retcode, caller)
# End def gitApplyTag
def gitCaptureLog(repo):
logs = []
caller = "gitCaptureLog {}".format(repo)
currdir = os.getcwd()
os.chdir(repo)
log = checkOutput(["git", "log"])
status = 0
if (log is not None):
for line in log.splitlines():
match = reCommit.match(line)
if (match is not None):
# A commit line should be the first in a new message
if (status != 0):
# We are going to just ignore bad or non-svn commits for now
status = 0
# End if
commit = match.group(1)
status = status + 8
# End if
match = reImport.match(line)
if (match is not None):
rev = match.group(1)
status = status + 4
# End if
match = reAuthor.match(line)
if (match is not None):
who = match.group(1)
when = match.group(2)
status = status + 3
# End if
# See if we have a complete commit to flush
if (status == 15):
logs.append(Git2svnLogEntry(commit, rev, who, when, repo))
status = 0
# End if
# End for
# End if
os.chdir(currdir)
return logs
# End gitCaptureLog
def findParentCommit(gitLog, svnRev):
"Find the commit with the closest (but not larger) svn revision"
rnum = int(svnRev)
commit = None
# The log should be in inverse order so stop at first hit
for log in gitLog:
gnum = log.revNum()
if (gnum < rnum):
commit = log.commit()
break
# End if
# End for
return commit
# End def findParentCommit
def gitSetupDir(chkdir, repo, branch, rev, repoURL, auth_table, svn_author, preserve_dates, default_author):
"""
Check to see if directory (chkdir) exists and is okay to use
Create chkdir (if necessary) and set current branch to master
returns True unless directory exists but is not correct"""
caller = "gitSetupDir {}".format(chkdir)
dirOK = True
currdir = os.getcwd()
if (branch != "master"):
if ((not os.path.exists(chkdir)) or
(not os.path.exists(os.path.join(chkdir, ".git")))):
perr("ERROR: git repo must exist to create branch {}".format(branch))
else:
os.chdir(chkdir)
dirOK = (retcall(["git", "checkout", branch]) == 0)
if (not dirOK):
# We don't have a branch, better create it
dirOK = (retcall(["git", "checkout", "master"]) == 0)
if (dirOK):
# We have to figure out where to start this branch
gitLog = gitCaptureLog(chkdir)
logs = list()
revstart = rev.revStart()
while len(logs) < 1:
logs = svnCaptureLog(repoURL, revstart, auth_table, svn_author, preserve_dates, default_author=default_author)
if len(logs) < 1:
revstart = revstart + 1
if revstart > rev.revEnd():
perr("No commits in range {} to {}".format(rev.revStart(), rev.revEnd()))
# End if
# End if
# End while
branchRev = logs[len(logs) - 1].revision()
commit = findParentCommit(gitLog, revstart)
if commit is None:
perr("No appropriate master commit to start branch {}".format(branch))
else:
dirOK = (retcall(["git", "branch", branch, str(commit)]) == 0)
# End if
else:
perr("ERROR: master must exist to create branch {}".format(branch))
# End if
# End if
os.chdir(currdir)
# End if
# End if (branch != master)
if (os.path.exists(chkdir)):
if (os.path.exists(os.path.join(chkdir, ".git"))):
os.chdir(chkdir)
dirOK = (retcall(["git", "checkout", branch]) == 0)
# XXgoldyXX: v debug only
# Should not have to do this
# if (not dirOK):
# dirOK = (retcall(["git", "checkout", "-b", branch]) == 0)
# # End if
# XXgoldyXX: ^ debug only
else:
dirOK = False
# End if
else:
# We need to make sure chkdir's parent exists
parent = os.path.realpath(os.path.join(chkdir, ".."))
if (not os.path.exists(parent)):
os.mkdirs(parent)
# End if
os.chdir(parent)
dirOK = (retcall(["git", "init", "--quiet", chkdir]) == 0)
if (dirOK):
os.chdir(chkdir)
dirOK = (retcall(["git", "checkout", "-b", "master"]) == 0)
# End if
# End if
os.chdir(currdir)
return dirOK
# End def gitSetupDir
##############################
###
### svn2git Functions
###
##############################
def FindTreeOrphans(dir1, dir2):
"Provide lists of files which show up in one directory but not the other"
groot = os.path.join(".", ".git")
orphans = []
currdir = os.getcwd()
os.chdir(dir1)
for root, dirs, files in os.walk("."):
if (root[0:len(groot)] != groot):
for file in files:
fname = os.path.join(root, file).lstrip("./")
if (not os.path.exists(os.path.join(dir2, fname))):
orphans.append(fname)
# End if
# End for
# End if
# End for
os.chdir(currdir)
return orphans
# End FindTreeOrphans
def copySvn2Git(svnDir, gitDir):
"Copy the files in svnDir to gitDir"
currdir = os.getcwd()
os.chdir(svnDir)
num_copies = 0
for root, dirs, files in os.walk("."):
parent = os.path.join(gitDir, root)
if (not os.path.exists(parent)):
os.makedirs(parent)
# End if
for file in files:
file1 = os.path.join(root, file)
file2 = os.path.join(parent, file)
if file_diff(file1, file2):
if os.path.islink(file1):
pdir = os.path.dirname(file1)
# SVN symlinks cannot (correctly) be absolute pathnames
plink = os.path.join(pdir, os.readlink(file1))
if not os.path.exists(plink):
# Do not try to copy a bad symlink
print("WARNING: Not copying bad symlink, {}".format(plink))
continue
# End if
# End if
num_copies = num_copies + 1
shutil.copy2(file1, file2)
# End if
# End if
# End for
# End for
os.chdir(currdir)
return num_copies
# End def copySvn2Git
def processRevision(exportDir, gitDir, log, external, cam_move):
rnum = log.revision()
tag = log.tag()
num_changes = 0
print("Processing revision {}, tag = {}".format(int(rnum), tag))
svnExport(exportDir, log.url(), rnum)
#-----------------------------
#Create Externals_CAM.cfg file
#-----------------------------
if external:
#Determine CAM SVN Externals:
svn_ext_list = read_svn_externals_cam(exportDir)
#Create new 'manage_externals' cfg file for CAM:
external_cam_cfg_create(svn_ext_list)
#-----------------------------------------
#Move "components/cam" to head of svn repo
#-----------------------------------------
if cam_move:
svn_cam_dir_top_move(exportDir)
#-----------------------------------------
orphans1 = FindTreeOrphans(exportDir, gitDir)
orphans2 = FindTreeOrphans(gitDir, exportDir)