Changed the default branch for imports from "master" to "p4"
[git/git.git] / contrib / fast-import / git-p4
CommitLineData
86949eef
SH
1#!/usr/bin/env python
2#
3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
4#
5# Author: Simon Hausmann <hausmann@kde.org>
83dce55a
SH
6# Copyright: 2007 Simon Hausmann <hausmann@kde.org>
7# 2007 Trolltech ASA
86949eef
SH
8# License: MIT <http://www.opensource.org/licenses/mit-license.php>
9#
10
4f5cf76a 11import optparse, sys, os, marshal, popen2, shelve
b984733c
SH
12import tempfile, getopt, sha, os.path, time
13from sets import Set;
4f5cf76a
SH
14
15gitdir = os.environ.get("GIT_DIR", "")
86949eef
SH
16
17def p4CmdList(cmd):
18 cmd = "p4 -G %s" % cmd
19 pipe = os.popen(cmd, "rb")
20
21 result = []
22 try:
23 while True:
24 entry = marshal.load(pipe)
25 result.append(entry)
26 except EOFError:
27 pass
28 pipe.close()
29
30 return result
31
32def p4Cmd(cmd):
33 list = p4CmdList(cmd)
34 result = {}
35 for entry in list:
36 result.update(entry)
37 return result;
38
39def die(msg):
40 sys.stderr.write(msg + "\n")
41 sys.exit(1)
42
43def currentGitBranch():
44 return os.popen("git-name-rev HEAD").read().split(" ")[1][:-1]
45
4f5cf76a
SH
46def isValidGitDir(path):
47 if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
48 return True;
49 return False
50
51def system(cmd):
52 if os.system(cmd) != 0:
53 die("command failed: %s" % cmd)
54
b984733c
SH
55class Command:
56 def __init__(self):
57 self.usage = "usage: %prog [options]"
58
59class P4Debug(Command):
86949eef
SH
60 def __init__(self):
61 self.options = [
62 ]
c8c39116 63 self.description = "A tool to debug the output of p4 -G."
86949eef
SH
64
65 def run(self, args):
66 for output in p4CmdList(" ".join(args)):
67 print output
b984733c 68 return True
86949eef 69
b984733c 70class P4CleanTags(Command):
86949eef 71 def __init__(self):
b984733c 72 Command.__init__(self)
86949eef
SH
73 self.options = [
74# optparse.make_option("--branch", dest="branch", default="refs/heads/master")
75 ]
c8c39116 76 self.description = "A tool to remove stale unused tags from incremental perforce imports."
86949eef
SH
77 def run(self, args):
78 branch = currentGitBranch()
79 print "Cleaning out stale p4 import tags..."
80 sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
81 output = sout.read()
82 try:
83 tagIdx = output.index(" tags/p4/")
84 except:
85 print "Cannot find any p4/* tag. Nothing to do."
86 sys.exit(0)
87
88 try:
89 caretIdx = output.index("^")
90 except:
91 caretIdx = len(output) - 1
92 rev = int(output[tagIdx + 9 : caretIdx])
93
94 allTags = os.popen("git tag -l p4/").readlines()
95 for i in range(len(allTags)):
96 allTags[i] = int(allTags[i][3:-1])
97
98 allTags.sort()
99
100 allTags.remove(rev)
101
102 for rev in allTags:
103 print os.popen("git tag -d p4/%s" % rev).read()
104
105 print "%s tags removed." % len(allTags)
b984733c 106 return True
86949eef 107
b984733c 108class P4Sync(Command):
4f5cf76a 109 def __init__(self):
b984733c 110 Command.__init__(self)
4f5cf76a
SH
111 self.options = [
112 optparse.make_option("--continue", action="store_false", dest="firstTime"),
113 optparse.make_option("--origin", dest="origin"),
114 optparse.make_option("--reset", action="store_true", dest="reset"),
115 optparse.make_option("--master", dest="master"),
116 optparse.make_option("--log-substitutions", dest="substFile"),
117 optparse.make_option("--noninteractive", action="store_false"),
04219c04
SH
118 optparse.make_option("--dry-run", action="store_true"),
119 optparse.make_option("--apply-as-patch", action="store_true", dest="applyAsPatch")
4f5cf76a
SH
120 ]
121 self.description = "Submit changes from git to the perforce depot."
122 self.firstTime = True
123 self.reset = False
124 self.interactive = True
125 self.dryRun = False
126 self.substFile = ""
127 self.firstTime = True
128 self.origin = "origin"
129 self.master = ""
1932a6ac 130 self.applyAsPatch = True
4f5cf76a
SH
131
132 self.logSubstitutions = {}
133 self.logSubstitutions["<enter description here>"] = "%log%"
134 self.logSubstitutions["\tDetails:"] = "\tDetails: %log%"
135
136 def check(self):
137 if len(p4CmdList("opened ...")) > 0:
138 die("You have files opened with perforce! Close them before starting the sync.")
139
140 def start(self):
141 if len(self.config) > 0 and not self.reset:
142 die("Cannot start sync. Previous sync config found at %s" % self.configFile)
143
144 commits = []
145 for line in os.popen("git-rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
146 commits.append(line[:-1])
147 commits.reverse()
148
149 self.config["commits"] = commits
150
04219c04
SH
151 if not self.applyAsPatch:
152 print "Creating temporary p4-sync branch from %s ..." % self.origin
153 system("git checkout -f -b p4-sync %s" % self.origin)
4f5cf76a
SH
154
155 def prepareLogMessage(self, template, message):
156 result = ""
157
158 for line in template.split("\n"):
159 if line.startswith("#"):
160 result += line + "\n"
161 continue
162
163 substituted = False
164 for key in self.logSubstitutions.keys():
165 if line.find(key) != -1:
166 value = self.logSubstitutions[key]
167 value = value.replace("%log%", message)
168 if value != "@remove@":
169 result += line.replace(key, value) + "\n"
170 substituted = True
171 break
172
173 if not substituted:
174 result += line + "\n"
175
176 return result
177
178 def apply(self, id):
179 print "Applying %s" % (os.popen("git-log --max-count=1 --pretty=oneline %s" % id).read())
180 diff = os.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
181 filesToAdd = set()
182 filesToDelete = set()
183 for line in diff:
184 modifier = line[0]
185 path = line[1:].strip()
186 if modifier == "M":
187 system("p4 edit %s" % path)
188 elif modifier == "A":
189 filesToAdd.add(path)
190 if path in filesToDelete:
191 filesToDelete.remove(path)
192 elif modifier == "D":
193 filesToDelete.add(path)
194 if path in filesToAdd:
195 filesToAdd.remove(path)
196 else:
197 die("unknown modifier %s for %s" % (modifier, path))
198
04219c04 199 if self.applyAsPatch:
5d0b6042 200 system("git-diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
04219c04
SH
201 else:
202 system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
203 system("git cherry-pick --no-commit \"%s\"" % id)
4f5cf76a
SH
204
205 for f in filesToAdd:
206 system("p4 add %s" % f)
207 for f in filesToDelete:
208 system("p4 revert %s" % f)
209 system("p4 delete %s" % f)
210
211 logMessage = ""
212 foundTitle = False
213 for log in os.popen("git-cat-file commit %s" % id).readlines():
214 if not foundTitle:
215 if len(log) == 1:
216 foundTitle = 1
217 continue
218
219 if len(logMessage) > 0:
220 logMessage += "\t"
221 logMessage += log
222
223 template = os.popen("p4 change -o").read()
224
225 if self.interactive:
226 submitTemplate = self.prepareLogMessage(template, logMessage)
227 diff = os.popen("p4 diff -du ...").read()
228
229 for newFile in filesToAdd:
230 diff += "==== new file ====\n"
231 diff += "--- /dev/null\n"
232 diff += "+++ %s\n" % newFile
233 f = open(newFile, "r")
234 for line in f.readlines():
235 diff += "+" + line
236 f.close()
237
53150250 238 separatorLine = "######## everything below this line is just the diff #######\n"
4f5cf76a
SH
239
240 response = "e"
53150250 241 firstIteration = True
4f5cf76a 242 while response == "e":
53150250
SH
243 if not firstIteration:
244 response = raw_input("Do you want to submit this change (y/e/n)? ")
245 firstIteration = False
4f5cf76a
SH
246 if response == "e":
247 [handle, fileName] = tempfile.mkstemp()
248 tmpFile = os.fdopen(handle, "w+")
53150250 249 tmpFile.write(submitTemplate + separatorLine + diff)
4f5cf76a
SH
250 tmpFile.close()
251 editor = os.environ.get("EDITOR", "vi")
252 system(editor + " " + fileName)
253 tmpFile = open(fileName, "r")
53150250 254 message = tmpFile.read()
4f5cf76a
SH
255 tmpFile.close()
256 os.remove(fileName)
53150250 257 submitTemplate = message[:message.index(separatorLine)]
4f5cf76a
SH
258
259 if response == "y" or response == "yes":
260 if self.dryRun:
261 print submitTemplate
262 raw_input("Press return to continue...")
263 else:
264 pipe = os.popen("p4 submit -i", "w")
265 pipe.write(submitTemplate)
266 pipe.close()
267 else:
268 print "Not submitting!"
269 self.interactive = False
270 else:
271 fileName = "submit.txt"
272 file = open(fileName, "w+")
273 file.write(self.prepareLogMessage(template, logMessage))
274 file.close()
275 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
276
277 def run(self, args):
278 if self.reset:
279 self.firstTime = True
280
281 if len(self.substFile) > 0:
282 for line in open(self.substFile, "r").readlines():
283 tokens = line[:-1].split("=")
284 self.logSubstitutions[tokens[0]] = tokens[1]
285
286 if len(self.master) == 0:
287 self.master = currentGitBranch()
288 if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
289 die("Detecting current git branch failed!")
290
291 self.check()
292 self.configFile = gitdir + "/p4-git-sync.cfg"
293 self.config = shelve.open(self.configFile, writeback=True)
294
295 if self.firstTime:
296 self.start()
297
298 commits = self.config.get("commits", [])
299
300 while len(commits) > 0:
301 self.firstTime = False
302 commit = commits[0]
303 commits = commits[1:]
304 self.config["commits"] = commits
305 self.apply(commit)
306 if not self.interactive:
307 break
308
309 self.config.close()
310
311 if len(commits) == 0:
312 if self.firstTime:
313 print "No changes found to apply between %s and current HEAD" % self.origin
314 else:
315 print "All changes applied!"
04219c04
SH
316 if not self.applyAsPatch:
317 print "Deleting temporary p4-sync branch and going back to %s" % self.master
318 system("git checkout %s" % self.master)
319 system("git branch -D p4-sync")
320 print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
321 system("p4 edit ... >/dev/null")
322 system("p4 revert ... >/dev/null")
4f5cf76a
SH
323 os.remove(self.configFile)
324
b984733c
SH
325 return True
326
327class GitSync(Command):
328 def __init__(self):
329 Command.__init__(self)
330 self.options = [
331 optparse.make_option("--branch", dest="branch"),
332 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
333 optparse.make_option("--changesfile", dest="changesFile"),
334 optparse.make_option("--silent", dest="silent", action="store_true"),
335 optparse.make_option("--known-branches", dest="knownBranches"),
336 optparse.make_option("--cache", dest="doCache", action="store_true"),
337 optparse.make_option("--command-cache", dest="commandCache", action="store_true")
338 ]
339 self.description = """Imports from Perforce into a git repository.\n
340 example:
341 //depot/my/project/ -- to import the current head
342 //depot/my/project/@all -- to import everything
343 //depot/my/project/@1,6 -- to import only from revision 1 to 6
344
345 (a ... is not needed in the path p4 specification, it's added implicitly)"""
346
347 self.usage += " //depot/path[@revRange]"
348
349 self.dataCache = False
350 self.commandCache = False
351 self.silent = False
352 self.knownBranches = Set()
353 self.createdBranches = Set()
354 self.committedChanges = Set()
f5816a55 355 self.branch = "p4"
b984733c
SH
356 self.detectBranches = False
357 self.changesFile = ""
358
359 def p4File(self, depotPath):
360 return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
361
362 def extractFilesFromCommit(self, commit):
363 files = []
364 fnum = 0
365 while commit.has_key("depotFile%s" % fnum):
366 path = commit["depotFile%s" % fnum]
367 if not path.startswith(self.globalPrefix):
368 # if not self.silent:
369 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
370 fnum = fnum + 1
371 continue
372
373 file = {}
374 file["path"] = path
375 file["rev"] = commit["rev%s" % fnum]
376 file["action"] = commit["action%s" % fnum]
377 file["type"] = commit["type%s" % fnum]
378 files.append(file)
379 fnum = fnum + 1
380 return files
381
382 def isSubPathOf(self, first, second):
383 if not first.startswith(second):
384 return False
385 if first == second:
386 return True
387 return first[len(second)] == "/"
388
389 def branchesForCommit(self, files):
390 branches = Set()
391
392 for file in files:
393 relativePath = file["path"][len(self.globalPrefix):]
394 # strip off the filename
395 relativePath = relativePath[0:relativePath.rfind("/")]
396
397 # if len(branches) == 0:
398 # branches.add(relativePath)
399 # knownBranches.add(relativePath)
400 # continue
401
402 ###### this needs more testing :)
403 knownBranch = False
404 for branch in branches:
405 if relativePath == branch:
406 knownBranch = True
407 break
408 # if relativePath.startswith(branch):
409 if self.isSubPathOf(relativePath, branch):
410 knownBranch = True
411 break
412 # if branch.startswith(relativePath):
413 if self.isSubPathOf(branch, relativePath):
414 branches.remove(branch)
415 break
416
417 if knownBranch:
418 continue
419
420 for branch in knownBranches:
421 #if relativePath.startswith(branch):
422 if self.isSubPathOf(relativePath, branch):
423 if len(branches) == 0:
424 relativePath = branch
425 else:
426 knownBranch = True
427 break
428
429 if knownBranch:
430 continue
431
432 branches.add(relativePath)
433 self.knownBranches.add(relativePath)
434
435 return branches
436
437 def findBranchParent(self, branchPrefix, files):
438 for file in files:
439 path = file["path"]
440 if not path.startswith(branchPrefix):
441 continue
442 action = file["action"]
443 if action != "integrate" and action != "branch":
444 continue
445 rev = file["rev"]
446 depotPath = path + "#" + rev
447
448 log = p4CmdList("filelog \"%s\"" % depotPath)
449 if len(log) != 1:
450 print "eek! I got confused by the filelog of %s" % depotPath
451 sys.exit(1);
452
453 log = log[0]
454 if log["action0"] != action:
455 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
456 sys.exit(1);
457
458 branchAction = log["how0,0"]
459 # if branchAction == "branch into" or branchAction == "ignored":
460 # continue # ignore for branching
461
462 if not branchAction.endswith(" from"):
463 continue # ignore for branching
464 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
465 # sys.exit(1);
466
467 source = log["file0,0"]
468 if source.startswith(branchPrefix):
469 continue
470
471 lastSourceRev = log["erev0,0"]
472
473 sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
474 if len(sourceLog) != 1:
475 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
476 sys.exit(1);
477 sourceLog = sourceLog[0]
478
479 relPath = source[len(self.globalPrefix):]
480 # strip off the filename
481 relPath = relPath[0:relPath.rfind("/")]
482
483 for branch in self.knownBranches:
484 if self.isSubPathOf(relPath, branch):
485 # print "determined parent branch branch %s due to change in file %s" % (branch, source)
486 return branch
487 # else:
488 # print "%s is not a subpath of branch %s" % (relPath, branch)
489
490 return ""
491
c715706b 492 def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
b984733c
SH
493 epoch = details["time"]
494 author = details["user"]
495
496 self.gitStream.write("commit %s\n" % branch)
497 # gitStream.write("mark :%s\n" % details["change"])
498 self.committedChanges.add(int(details["change"]))
499 committer = ""
500 if author in self.users:
0828ab14 501 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
b984733c 502 else:
0828ab14 503 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
b984733c
SH
504
505 self.gitStream.write("committer %s\n" % committer)
506
507 self.gitStream.write("data <<EOT\n")
508 self.gitStream.write(details["desc"])
a559b289 509 self.gitStream.write("\n[git-p4: depot-path: \"%s\"; change: %s]\n" % (branchPrefix, details["change"]))
b984733c
SH
510 self.gitStream.write("EOT\n\n")
511
512 if len(parent) > 0:
513 self.gitStream.write("from %s\n" % parent)
514
515 if len(merged) > 0:
516 self.gitStream.write("merge %s\n" % merged)
517
518 for file in files:
519 path = file["path"]
520 if not path.startswith(branchPrefix):
521 # if not silent:
522 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
523 continue
524 rev = file["rev"]
525 depotPath = path + "#" + rev
526 relPath = path[len(branchPrefix):]
527 action = file["action"]
528
529 if file["type"] == "apple":
530 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
531 continue
532
533 if action == "delete":
534 self.gitStream.write("D %s\n" % relPath)
535 else:
536 mode = 644
537 if file["type"].startswith("x"):
538 mode = 755
539
540 data = self.p4File(depotPath)
541
542 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
543 self.gitStream.write("data %s\n" % len(data))
544 self.gitStream.write(data)
545 self.gitStream.write("\n")
546
547 self.gitStream.write("\n")
548
549 self.lastChange = int(details["change"])
550
551 def extractFilesInCommitToBranch(self, files, branchPrefix):
552 newFiles = []
553
554 for file in files:
555 path = file["path"]
556 if path.startswith(branchPrefix):
557 newFiles.append(file)
558
559 return newFiles
560
561 def findBranchSourceHeuristic(self, files, branch, branchPrefix):
562 for file in files:
563 action = file["action"]
564 if action != "integrate" and action != "branch":
565 continue
566 path = file["path"]
567 rev = file["rev"]
568 depotPath = path + "#" + rev
569
570 log = p4CmdList("filelog \"%s\"" % depotPath)
571 if len(log) != 1:
572 print "eek! I got confused by the filelog of %s" % depotPath
573 sys.exit(1);
574
575 log = log[0]
576 if log["action0"] != action:
577 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
578 sys.exit(1);
579
580 branchAction = log["how0,0"]
581
582 if not branchAction.endswith(" from"):
583 continue # ignore for branching
584 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
585 # sys.exit(1);
586
587 source = log["file0,0"]
588 if source.startswith(branchPrefix):
589 continue
590
591 lastSourceRev = log["erev0,0"]
592
593 sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
594 if len(sourceLog) != 1:
595 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
596 sys.exit(1);
597 sourceLog = sourceLog[0]
598
599 relPath = source[len(self.globalPrefix):]
600 # strip off the filename
601 relPath = relPath[0:relPath.rfind("/")]
602
603 for candidate in self.knownBranches:
604 if self.isSubPathOf(relPath, candidate) and candidate != branch:
605 return candidate
606
607 return ""
608
609 def changeIsBranchMerge(self, sourceBranch, destinationBranch, change):
610 sourceFiles = {}
611 for file in p4CmdList("files %s...@%s" % (self.globalPrefix + sourceBranch + "/", change)):
612 if file["action"] == "delete":
613 continue
614 sourceFiles[file["depotFile"]] = file
615
616 destinationFiles = {}
617 for file in p4CmdList("files %s...@%s" % (self.globalPrefix + destinationBranch + "/", change)):
618 destinationFiles[file["depotFile"]] = file
619
620 for fileName in sourceFiles.keys():
621 integrations = []
622 deleted = False
623 integrationCount = 0
624 for integration in p4CmdList("integrated \"%s\"" % fileName):
625 toFile = integration["fromFile"] # yes, it's true, it's fromFile
626 if not toFile in destinationFiles:
627 continue
628 destFile = destinationFiles[toFile]
629 if destFile["action"] == "delete":
630 # print "file %s has been deleted in %s" % (fileName, toFile)
631 deleted = True
632 break
633 integrationCount += 1
634 if integration["how"] == "branch from":
635 continue
636
637 if int(integration["change"]) == change:
638 integrations.append(integration)
639 continue
640 if int(integration["change"]) > change:
641 continue
642
643 destRev = int(destFile["rev"])
644
645 startRev = integration["startFromRev"][1:]
646 if startRev == "none":
647 startRev = 0
648 else:
649 startRev = int(startRev)
650
651 endRev = integration["endFromRev"][1:]
652 if endRev == "none":
653 endRev = 0
654 else:
655 endRev = int(endRev)
656
657 initialBranch = (destRev == 1 and integration["how"] != "branch into")
658 inRange = (destRev >= startRev and destRev <= endRev)
659 newer = (destRev > startRev and destRev > endRev)
660
661 if initialBranch or inRange or newer:
662 integrations.append(integration)
663
664 if deleted:
665 continue
666
667 if len(integrations) == 0 and integrationCount > 1:
668 print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
669 return False
670
671 return True
672
673 def getUserMap(self):
674 self.users = {}
675
676 for output in p4CmdList("users"):
677 if not output.has_key("User"):
678 continue
679 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
680
681 def run(self, args):
682 self.branch = "refs/heads/" + self.branch
683 self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
684 if len(self.globalPrefix) != 0:
685 self.globalPrefix = self.globalPrefix[:-1]
686
687 if len(args) == 0 and len(self.globalPrefix) != 0:
688 if not self.silent:
689 print "[using previously specified depot path %s]" % self.globalPrefix
690 elif len(args) != 1:
691 return False
692 else:
693 if len(self.globalPrefix) != 0 and self.globalPrefix != args[0]:
694 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.globalPrefix, args[0])
695 sys.exit(1)
696 self.globalPrefix = args[0]
697
698 self.changeRange = ""
699 self.revision = ""
700 self.users = {}
701 self.initialParent = ""
702 self.lastChange = 0
703 self.initialTag = ""
704
705 if self.globalPrefix.find("@") != -1:
706 atIdx = self.globalPrefix.index("@")
707 self.changeRange = self.globalPrefix[atIdx:]
708 if self.changeRange == "@all":
709 self.changeRange = ""
710 elif self.changeRange.find(",") == -1:
711 self.revision = self.changeRange
712 self.changeRange = ""
713 self.globalPrefix = self.globalPrefix[0:atIdx]
714 elif self.globalPrefix.find("#") != -1:
715 hashIdx = self.globalPrefix.index("#")
716 self.revision = self.globalPrefix[hashIdx:]
717 self.globalPrefix = self.globalPrefix[0:hashIdx]
718 elif len(self.previousDepotPath) == 0:
719 self.revision = "#head"
720
721 if self.globalPrefix.endswith("..."):
722 self.globalPrefix = self.globalPrefix[:-3]
723
724 if not self.globalPrefix.endswith("/"):
725 self.globalPrefix += "/"
726
727 self.getUserMap()
728
729 if len(self.changeRange) == 0:
730 try:
731 sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % self.branch)
732 output = sout.read()
733 if output.endswith("\n"):
734 output = output[:-1]
735 tagIdx = output.index(" tags/p4/")
736 caretIdx = output.find("^")
737 endPos = len(output)
738 if caretIdx != -1:
739 endPos = caretIdx
740 self.rev = int(output[tagIdx + 9 : endPos]) + 1
741 self.changeRange = "@%s,#head" % self.rev
742 self.initialParent = os.popen("git-rev-parse %s" % self.branch).read()[:-1]
743 self.initialTag = "p4/%s" % (int(self.rev) - 1)
744 except:
745 pass
746
0828ab14
SH
747 self.tz = - time.timezone / 36
748 tzsign = ("%s" % self.tz)[0]
b984733c 749 if tzsign != '+' and tzsign != '-':
0828ab14 750 self.tz = "+" + ("%s" % self.tz)
b984733c
SH
751
752 self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git-fast-import")
753
754 if len(self.revision) > 0:
755 print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
756
757 details = { "user" : "git perforce import user", "time" : int(time.time()) }
758 details["desc"] = "Initial import of %s from the state at revision %s" % (self.globalPrefix, self.revision)
759 details["change"] = self.revision
760 newestRevision = 0
761
762 fileCnt = 0
763 for info in p4CmdList("files %s...%s" % (self.globalPrefix, self.revision)):
764 change = int(info["change"])
765 if change > newestRevision:
766 newestRevision = change
767
768 if info["action"] == "delete":
c715706b 769 fileCnt = fileCnt + 1
b984733c
SH
770 continue
771
772 for prop in [ "depotFile", "rev", "action", "type" ]:
773 details["%s%s" % (prop, fileCnt)] = info[prop]
774
775 fileCnt = fileCnt + 1
776
777 details["change"] = newestRevision
778
779 try:
780 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
c715706b 781 except IOError:
b984733c
SH
782 print self.gitError.read()
783
784 else:
785 changes = []
786
0828ab14 787 if len(self.changesFile) > 0:
b984733c
SH
788 output = open(self.changesFile).readlines()
789 changeSet = Set()
790 for line in output:
791 changeSet.add(int(line))
792
793 for change in changeSet:
794 changes.append(change)
795
796 changes.sort()
797 else:
798 output = os.popen("p4 changes %s...%s" % (self.globalPrefix, self.changeRange)).readlines()
799
800 for line in output:
801 changeNum = line.split(" ")[1]
802 changes.append(changeNum)
803
804 changes.reverse()
805
806 if len(changes) == 0:
0828ab14 807 if not self.silent:
b984733c
SH
808 print "no changes to import!"
809 sys.exit(1)
810
811 cnt = 1
812 for change in changes:
813 description = p4Cmd("describe %s" % change)
814
0828ab14 815 if not self.silent:
b984733c
SH
816 sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
817 sys.stdout.flush()
818 cnt = cnt + 1
819
820 try:
821 files = self.extractFilesFromCommit(description)
822 if self.detectBranches:
823 for branch in self.branchesForCommit(files):
824 self.knownBranches.add(branch)
825 branchPrefix = self.globalPrefix + branch + "/"
826
827 filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix)
828
829 merged = ""
830 parent = ""
831 ########### remove cnt!!!
832 if branch not in self.createdBranches and cnt > 2:
833 self.createdBranches.add(branch)
834 parent = self.findBranchParent(branchPrefix, files)
835 if parent == branch:
836 parent = ""
837 # elif len(parent) > 0:
838 # print "%s branched off of %s" % (branch, parent)
839
840 if len(parent) == 0:
841 merged = self.findBranchSourceHeuristic(filesForCommit, branch, branchPrefix)
842 if len(merged) > 0:
843 print "change %s could be a merge from %s into %s" % (description["change"], merged, branch)
844 if not self.changeIsBranchMerge(merged, branch, int(description["change"])):
845 merged = ""
846
847 branch = "refs/heads/" + branch
848 if len(parent) > 0:
849 parent = "refs/heads/" + parent
850 if len(merged) > 0:
851 merged = "refs/heads/" + merged
852 self.commit(description, files, branch, branchPrefix, parent, merged)
853 else:
0828ab14 854 self.commit(description, files, self.branch, self.globalPrefix, self.initialParent)
b984733c
SH
855 self.initialParent = ""
856 except IOError:
857 print self.gitError.read()
858 sys.exit(1)
859
860 if not self.silent:
861 print ""
862
863 self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange)
864 self.gitStream.write("from %s\n\n" % self.branch);
865
866
867 self.gitStream.close()
868 self.gitOutput.close()
869 self.gitError.close()
870
871 os.popen("git-repo-config p4.depotpath %s" % self.globalPrefix).read()
872 if len(self.initialTag) > 0:
873 os.popen("git tag -d %s" % self.initialTag).read()
874
875 return True
876
877class HelpFormatter(optparse.IndentedHelpFormatter):
878 def __init__(self):
879 optparse.IndentedHelpFormatter.__init__(self)
880
881 def format_description(self, description):
882 if description:
883 return description + "\n"
884 else:
885 return ""
4f5cf76a 886
86949eef
SH
887def printUsage(commands):
888 print "usage: %s <command> [options]" % sys.argv[0]
889 print ""
890 print "valid commands: %s" % ", ".join(commands)
891 print ""
892 print "Try %s <command> --help for command specific help." % sys.argv[0]
893 print ""
894
895commands = {
896 "debug" : P4Debug(),
4f5cf76a 897 "clean-tags" : P4CleanTags(),
b984733c
SH
898 "submit" : P4Sync(),
899 "sync" : GitSync()
86949eef
SH
900}
901
902if len(sys.argv[1:]) == 0:
903 printUsage(commands.keys())
904 sys.exit(2)
905
906cmd = ""
907cmdName = sys.argv[1]
908try:
909 cmd = commands[cmdName]
910except KeyError:
911 print "unknown command %s" % cmdName
912 print ""
913 printUsage(commands.keys())
914 sys.exit(2)
915
4f5cf76a
SH
916options = cmd.options
917cmd.gitdir = gitdir
918options.append(optparse.make_option("--git-dir", dest="gitdir"))
919
b984733c
SH
920parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
921 options,
922 description = cmd.description,
923 formatter = HelpFormatter())
86949eef
SH
924
925(cmd, args) = parser.parse_args(sys.argv[2:], cmd);
926
4f5cf76a
SH
927gitdir = cmd.gitdir
928if len(gitdir) == 0:
929 gitdir = ".git"
20618650
SH
930 if not isValidGitDir(gitdir):
931 cdup = os.popen("git-rev-parse --show-cdup").read()[:-1]
932 if isValidGitDir(cdup + "/" + gitdir):
933 os.chdir(cdup)
4f5cf76a
SH
934
935if not isValidGitDir(gitdir):
936 if isValidGitDir(gitdir + "/.git"):
937 gitdir += "/.git"
938 else:
05140f34 939 die("fatal: cannot locate git repository at %s" % gitdir)
4f5cf76a
SH
940
941os.environ["GIT_DIR"] = gitdir
942
b984733c
SH
943if not cmd.run(args):
944 parser.print_help()
945