Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}
[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#
ca0affe7
SH
10# TODO: Add an option to sync/rebase to fetch and rebase from origin first.
11#
86949eef 12
08483580 13import optparse, sys, os, marshal, popen2, subprocess, shelve
25df95cc 14import tempfile, getopt, sha, os.path, time, platform
b984733c 15from sets import Set;
4f5cf76a
SH
16
17gitdir = os.environ.get("GIT_DIR", "")
86949eef 18
caace111
SH
19def mypopen(command):
20 return os.popen(command, "rb");
21
86949eef
SH
22def p4CmdList(cmd):
23 cmd = "p4 -G %s" % cmd
24 pipe = os.popen(cmd, "rb")
25
26 result = []
27 try:
28 while True:
29 entry = marshal.load(pipe)
30 result.append(entry)
31 except EOFError:
32 pass
33 pipe.close()
34
35 return result
36
37def p4Cmd(cmd):
38 list = p4CmdList(cmd)
39 result = {}
40 for entry in list:
41 result.update(entry)
42 return result;
43
cb2c9db5
SH
44def p4Where(depotPath):
45 if not depotPath.endswith("/"):
46 depotPath += "/"
47 output = p4Cmd("where %s..." % depotPath)
48 clientPath = ""
49 if "path" in output:
50 clientPath = output.get("path")
51 elif "data" in output:
52 data = output.get("data")
53 lastSpace = data.rfind(" ")
54 clientPath = data[lastSpace + 1:]
55
56 if clientPath.endswith("..."):
57 clientPath = clientPath[:-3]
58 return clientPath
59
86949eef
SH
60def die(msg):
61 sys.stderr.write(msg + "\n")
62 sys.exit(1)
63
64def currentGitBranch():
caace111 65 return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
86949eef 66
4f5cf76a
SH
67def isValidGitDir(path):
68 if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
69 return True;
70 return False
71
463e8af6
SH
72def parseRevision(ref):
73 return mypopen("git rev-parse %s" % ref).read()[:-1]
74
4f5cf76a
SH
75def system(cmd):
76 if os.system(cmd) != 0:
77 die("command failed: %s" % cmd)
78
6ae8de88
SH
79def extractLogMessageFromGitCommit(commit):
80 logMessage = ""
81 foundTitle = False
caace111 82 for log in mypopen("git cat-file commit %s" % commit).readlines():
6ae8de88
SH
83 if not foundTitle:
84 if len(log) == 1:
1c094184 85 foundTitle = True
6ae8de88
SH
86 continue
87
88 logMessage += log
89 return logMessage
90
91def extractDepotPathAndChangeFromGitLog(log):
92 values = {}
93 for line in log.split("\n"):
94 line = line.strip()
95 if line.startswith("[git-p4:") and line.endswith("]"):
96 line = line[8:-1].strip()
97 for assignment in line.split(":"):
98 variable = assignment.strip()
99 value = ""
100 equalPos = assignment.find("=")
101 if equalPos != -1:
102 variable = assignment[:equalPos].strip()
103 value = assignment[equalPos + 1:].strip()
104 if value.startswith("\"") and value.endswith("\""):
105 value = value[1:-1]
106 values[variable] = value
107
108 return values.get("depot-path"), values.get("change")
109
8136a639 110def gitBranchExists(branch):
caace111
SH
111 proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
112 return proc.wait() == 0;
8136a639 113
b984733c
SH
114class Command:
115 def __init__(self):
116 self.usage = "usage: %prog [options]"
8910ac0e 117 self.needsGit = True
b984733c
SH
118
119class P4Debug(Command):
86949eef 120 def __init__(self):
6ae8de88 121 Command.__init__(self)
86949eef
SH
122 self.options = [
123 ]
c8c39116 124 self.description = "A tool to debug the output of p4 -G."
8910ac0e 125 self.needsGit = False
86949eef
SH
126
127 def run(self, args):
128 for output in p4CmdList(" ".join(args)):
129 print output
b984733c 130 return True
86949eef 131
711544b0 132class P4Submit(Command):
4f5cf76a 133 def __init__(self):
b984733c 134 Command.__init__(self)
4f5cf76a
SH
135 self.options = [
136 optparse.make_option("--continue", action="store_false", dest="firstTime"),
137 optparse.make_option("--origin", dest="origin"),
138 optparse.make_option("--reset", action="store_true", dest="reset"),
4f5cf76a
SH
139 optparse.make_option("--log-substitutions", dest="substFile"),
140 optparse.make_option("--noninteractive", action="store_false"),
04219c04 141 optparse.make_option("--dry-run", action="store_true"),
4f5cf76a
SH
142 ]
143 self.description = "Submit changes from git to the perforce depot."
c9b50e63 144 self.usage += " [name of git branch to submit into perforce depot]"
4f5cf76a
SH
145 self.firstTime = True
146 self.reset = False
147 self.interactive = True
148 self.dryRun = False
149 self.substFile = ""
150 self.firstTime = True
9512497b 151 self.origin = ""
4f5cf76a
SH
152
153 self.logSubstitutions = {}
154 self.logSubstitutions["<enter description here>"] = "%log%"
155 self.logSubstitutions["\tDetails:"] = "\tDetails: %log%"
156
157 def check(self):
158 if len(p4CmdList("opened ...")) > 0:
159 die("You have files opened with perforce! Close them before starting the sync.")
160
161 def start(self):
162 if len(self.config) > 0 and not self.reset:
c3c46244 163 die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self.configFile)
4f5cf76a
SH
164
165 commits = []
caace111 166 for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
4f5cf76a
SH
167 commits.append(line[:-1])
168 commits.reverse()
169
170 self.config["commits"] = commits
171
4f5cf76a
SH
172 def prepareLogMessage(self, template, message):
173 result = ""
174
175 for line in template.split("\n"):
176 if line.startswith("#"):
177 result += line + "\n"
178 continue
179
180 substituted = False
181 for key in self.logSubstitutions.keys():
182 if line.find(key) != -1:
183 value = self.logSubstitutions[key]
184 value = value.replace("%log%", message)
185 if value != "@remove@":
186 result += line.replace(key, value) + "\n"
187 substituted = True
188 break
189
190 if not substituted:
191 result += line + "\n"
192
193 return result
194
195 def apply(self, id):
caace111
SH
196 print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read())
197 diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
4f5cf76a
SH
198 filesToAdd = set()
199 filesToDelete = set()
d336c158 200 editedFiles = set()
4f5cf76a
SH
201 for line in diff:
202 modifier = line[0]
203 path = line[1:].strip()
204 if modifier == "M":
d336c158
SH
205 system("p4 edit \"%s\"" % path)
206 editedFiles.add(path)
4f5cf76a
SH
207 elif modifier == "A":
208 filesToAdd.add(path)
209 if path in filesToDelete:
210 filesToDelete.remove(path)
211 elif modifier == "D":
212 filesToDelete.add(path)
213 if path in filesToAdd:
214 filesToAdd.remove(path)
215 else:
216 die("unknown modifier %s for %s" % (modifier, path))
217
51a2640a
SH
218 diffcmd = "git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\"" % (id, id)
219 patchcmd = diffcmd + " | patch -p1"
220
221 if os.system(patchcmd + " --dry-run --silent") != 0:
222 print "Unfortunately applying the change failed!"
223 print "What do you want to do?"
224 response = "x"
225 while response != "s" and response != "a" and response != "w":
226 response = raw_input("[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) ")
227 if response == "s":
228 print "Skipping! Good luck with the next patches..."
229 return
230 elif response == "a":
231 os.system(patchcmd)
232 if len(filesToAdd) > 0:
233 print "You may also want to call p4 add on the following files:"
234 print " ".join(filesToAdd)
235 if len(filesToDelete):
236 print "The following files should be scheduled for deletion with p4 delete:"
237 print " ".join(filesToDelete)
238 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
239 elif response == "w":
240 system(diffcmd + " > patch.txt")
241 print "Patch saved to patch.txt in %s !" % self.clientPath
242 die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
243
244 system(patchcmd)
4f5cf76a
SH
245
246 for f in filesToAdd:
247 system("p4 add %s" % f)
248 for f in filesToDelete:
249 system("p4 revert %s" % f)
250 system("p4 delete %s" % f)
251
6ae8de88
SH
252 logMessage = extractLogMessageFromGitCommit(id)
253 logMessage = logMessage.replace("\n", "\n\t")
254 logMessage = logMessage[:-1]
4f5cf76a 255
caace111 256 template = mypopen("p4 change -o").read()
4f5cf76a
SH
257
258 if self.interactive:
259 submitTemplate = self.prepareLogMessage(template, logMessage)
caace111 260 diff = mypopen("p4 diff -du ...").read()
4f5cf76a
SH
261
262 for newFile in filesToAdd:
263 diff += "==== new file ====\n"
264 diff += "--- /dev/null\n"
265 diff += "+++ %s\n" % newFile
266 f = open(newFile, "r")
267 for line in f.readlines():
268 diff += "+" + line
269 f.close()
270
25df95cc
SH
271 separatorLine = "######## everything below this line is just the diff #######"
272 if platform.system() == "Windows":
273 separatorLine += "\r"
274 separatorLine += "\n"
4f5cf76a
SH
275
276 response = "e"
53150250 277 firstIteration = True
4f5cf76a 278 while response == "e":
53150250 279 if not firstIteration:
d336c158 280 response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
53150250 281 firstIteration = False
4f5cf76a
SH
282 if response == "e":
283 [handle, fileName] = tempfile.mkstemp()
284 tmpFile = os.fdopen(handle, "w+")
53150250 285 tmpFile.write(submitTemplate + separatorLine + diff)
4f5cf76a 286 tmpFile.close()
25df95cc
SH
287 defaultEditor = "vi"
288 if platform.system() == "Windows":
289 defaultEditor = "notepad"
290 editor = os.environ.get("EDITOR", defaultEditor);
4f5cf76a 291 system(editor + " " + fileName)
25df95cc 292 tmpFile = open(fileName, "rb")
53150250 293 message = tmpFile.read()
4f5cf76a
SH
294 tmpFile.close()
295 os.remove(fileName)
53150250 296 submitTemplate = message[:message.index(separatorLine)]
4f5cf76a
SH
297
298 if response == "y" or response == "yes":
299 if self.dryRun:
300 print submitTemplate
301 raw_input("Press return to continue...")
302 else:
25df95cc 303 pipe = os.popen("p4 submit -i", "wb")
4f5cf76a
SH
304 pipe.write(submitTemplate)
305 pipe.close()
d336c158
SH
306 elif response == "s":
307 for f in editedFiles:
308 system("p4 revert \"%s\"" % f);
309 for f in filesToAdd:
310 system("p4 revert \"%s\"" % f);
311 system("rm %s" %f)
312 for f in filesToDelete:
313 system("p4 delete \"%s\"" % f);
314 return
4f5cf76a
SH
315 else:
316 print "Not submitting!"
317 self.interactive = False
318 else:
319 fileName = "submit.txt"
320 file = open(fileName, "w+")
321 file.write(self.prepareLogMessage(template, logMessage))
322 file.close()
323 print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
324
325 def run(self, args):
9512497b
SH
326 global gitdir
327 # make gitdir absolute so we can cd out into the perforce checkout
328 gitdir = os.path.abspath(gitdir)
329 os.environ["GIT_DIR"] = gitdir
c9b50e63
SH
330
331 if len(args) == 0:
332 self.master = currentGitBranch()
333 if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
334 die("Detecting current git branch failed!")
335 elif len(args) == 1:
336 self.master = args[0]
337 else:
338 return False
339
9512497b
SH
340 depotPath = ""
341 if gitBranchExists("p4"):
342 [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
343 if len(depotPath) == 0 and gitBranchExists("origin"):
344 [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
345
346 if len(depotPath) == 0:
347 print "Internal error: cannot locate perforce depot path from existing branches"
348 sys.exit(128)
349
51a2640a 350 self.clientPath = p4Where(depotPath)
9512497b 351
51a2640a 352 if len(self.clientPath) == 0:
9512497b
SH
353 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
354 sys.exit(128)
355
51a2640a 356 print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
80b5910f 357 oldWorkingDirectory = os.getcwd()
51a2640a
SH
358 os.chdir(self.clientPath)
359 response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
9512497b
SH
360 if response == "y" or response == "yes":
361 system("p4 sync ...")
362
363 if len(self.origin) == 0:
364 if gitBranchExists("p4"):
365 self.origin = "p4"
366 else:
367 self.origin = "origin"
368
4f5cf76a
SH
369 if self.reset:
370 self.firstTime = True
371
372 if len(self.substFile) > 0:
373 for line in open(self.substFile, "r").readlines():
374 tokens = line[:-1].split("=")
375 self.logSubstitutions[tokens[0]] = tokens[1]
376
4f5cf76a
SH
377 self.check()
378 self.configFile = gitdir + "/p4-git-sync.cfg"
379 self.config = shelve.open(self.configFile, writeback=True)
380
381 if self.firstTime:
382 self.start()
383
384 commits = self.config.get("commits", [])
385
386 while len(commits) > 0:
387 self.firstTime = False
388 commit = commits[0]
389 commits = commits[1:]
390 self.config["commits"] = commits
391 self.apply(commit)
392 if not self.interactive:
393 break
394
395 self.config.close()
396
397 if len(commits) == 0:
398 if self.firstTime:
399 print "No changes found to apply between %s and current HEAD" % self.origin
400 else:
401 print "All changes applied!"
5e80dd4d 402 response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
80b5910f
SH
403 if response == "y" or response == "yes":
404 os.chdir(oldWorkingDirectory)
405 rebase = P4Rebase()
406 rebase.run([])
4f5cf76a
SH
407 os.remove(self.configFile)
408
b984733c
SH
409 return True
410
711544b0 411class P4Sync(Command):
b984733c
SH
412 def __init__(self):
413 Command.__init__(self)
414 self.options = [
415 optparse.make_option("--branch", dest="branch"),
416 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
417 optparse.make_option("--changesfile", dest="changesFile"),
418 optparse.make_option("--silent", dest="silent", action="store_true"),
419 optparse.make_option("--known-branches", dest="knownBranches"),
2a9489c0 420 optparse.make_option("--data-cache", dest="dataCache", action="store_true"),
cb53e1f8
SH
421 optparse.make_option("--command-cache", dest="commandCache", action="store_true"),
422 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true")
b984733c
SH
423 ]
424 self.description = """Imports from Perforce into a git repository.\n
425 example:
426 //depot/my/project/ -- to import the current head
427 //depot/my/project/@all -- to import everything
428 //depot/my/project/@1,6 -- to import only from revision 1 to 6
429
430 (a ... is not needed in the path p4 specification, it's added implicitly)"""
431
432 self.usage += " //depot/path[@revRange]"
433
434 self.dataCache = False
435 self.commandCache = False
436 self.silent = False
437 self.knownBranches = Set()
438 self.createdBranches = Set()
439 self.committedChanges = Set()
569d1bd4 440 self.branch = ""
b984733c 441 self.detectBranches = False
cb53e1f8 442 self.detectLabels = False
b984733c
SH
443 self.changesFile = ""
444
445 def p4File(self, depotPath):
446 return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
447
448 def extractFilesFromCommit(self, commit):
449 files = []
450 fnum = 0
451 while commit.has_key("depotFile%s" % fnum):
452 path = commit["depotFile%s" % fnum]
8f872531 453 if not path.startswith(self.depotPath):
b984733c 454 # if not self.silent:
8f872531 455 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
b984733c
SH
456 fnum = fnum + 1
457 continue
458
459 file = {}
460 file["path"] = path
461 file["rev"] = commit["rev%s" % fnum]
462 file["action"] = commit["action%s" % fnum]
463 file["type"] = commit["type%s" % fnum]
464 files.append(file)
465 fnum = fnum + 1
466 return files
467
468 def isSubPathOf(self, first, second):
469 if not first.startswith(second):
470 return False
471 if first == second:
472 return True
473 return first[len(second)] == "/"
474
475 def branchesForCommit(self, files):
476 branches = Set()
477
478 for file in files:
8f872531 479 relativePath = file["path"][len(self.depotPath):]
b984733c
SH
480 # strip off the filename
481 relativePath = relativePath[0:relativePath.rfind("/")]
482
483 # if len(branches) == 0:
484 # branches.add(relativePath)
485 # knownBranches.add(relativePath)
486 # continue
487
488 ###### this needs more testing :)
489 knownBranch = False
490 for branch in branches:
491 if relativePath == branch:
492 knownBranch = True
493 break
494 # if relativePath.startswith(branch):
495 if self.isSubPathOf(relativePath, branch):
496 knownBranch = True
497 break
498 # if branch.startswith(relativePath):
499 if self.isSubPathOf(branch, relativePath):
500 branches.remove(branch)
501 break
502
503 if knownBranch:
504 continue
505
2a9489c0 506 for branch in self.knownBranches:
b984733c
SH
507 #if relativePath.startswith(branch):
508 if self.isSubPathOf(relativePath, branch):
509 if len(branches) == 0:
510 relativePath = branch
511 else:
512 knownBranch = True
513 break
514
515 if knownBranch:
516 continue
517
518 branches.add(relativePath)
519 self.knownBranches.add(relativePath)
520
521 return branches
522
523 def findBranchParent(self, branchPrefix, files):
524 for file in files:
525 path = file["path"]
526 if not path.startswith(branchPrefix):
527 continue
528 action = file["action"]
529 if action != "integrate" and action != "branch":
530 continue
531 rev = file["rev"]
532 depotPath = path + "#" + rev
533
534 log = p4CmdList("filelog \"%s\"" % depotPath)
535 if len(log) != 1:
536 print "eek! I got confused by the filelog of %s" % depotPath
537 sys.exit(1);
538
539 log = log[0]
540 if log["action0"] != action:
541 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
542 sys.exit(1);
543
544 branchAction = log["how0,0"]
545 # if branchAction == "branch into" or branchAction == "ignored":
546 # continue # ignore for branching
547
548 if not branchAction.endswith(" from"):
549 continue # ignore for branching
550 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
551 # sys.exit(1);
552
553 source = log["file0,0"]
554 if source.startswith(branchPrefix):
555 continue
556
557 lastSourceRev = log["erev0,0"]
558
559 sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
560 if len(sourceLog) != 1:
561 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
562 sys.exit(1);
563 sourceLog = sourceLog[0]
564
8f872531 565 relPath = source[len(self.depotPath):]
b984733c
SH
566 # strip off the filename
567 relPath = relPath[0:relPath.rfind("/")]
568
569 for branch in self.knownBranches:
570 if self.isSubPathOf(relPath, branch):
571 # print "determined parent branch branch %s due to change in file %s" % (branch, source)
572 return branch
573 # else:
574 # print "%s is not a subpath of branch %s" % (relPath, branch)
575
576 return ""
577
c715706b 578 def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
b984733c
SH
579 epoch = details["time"]
580 author = details["user"]
581
582 self.gitStream.write("commit %s\n" % branch)
583 # gitStream.write("mark :%s\n" % details["change"])
584 self.committedChanges.add(int(details["change"]))
585 committer = ""
586 if author in self.users:
0828ab14 587 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
b984733c 588 else:
0828ab14 589 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
b984733c
SH
590
591 self.gitStream.write("committer %s\n" % committer)
592
593 self.gitStream.write("data <<EOT\n")
594 self.gitStream.write(details["desc"])
6ae8de88 595 self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
b984733c
SH
596 self.gitStream.write("EOT\n\n")
597
598 if len(parent) > 0:
599 self.gitStream.write("from %s\n" % parent)
600
601 if len(merged) > 0:
602 self.gitStream.write("merge %s\n" % merged)
603
604 for file in files:
605 path = file["path"]
606 if not path.startswith(branchPrefix):
607 # if not silent:
608 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
609 continue
610 rev = file["rev"]
611 depotPath = path + "#" + rev
612 relPath = path[len(branchPrefix):]
613 action = file["action"]
614
615 if file["type"] == "apple":
616 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
617 continue
618
619 if action == "delete":
620 self.gitStream.write("D %s\n" % relPath)
621 else:
622 mode = 644
623 if file["type"].startswith("x"):
624 mode = 755
625
626 data = self.p4File(depotPath)
627
628 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
629 self.gitStream.write("data %s\n" % len(data))
630 self.gitStream.write(data)
631 self.gitStream.write("\n")
632
633 self.gitStream.write("\n")
634
1f4ba1cb
SH
635 change = int(details["change"])
636
637 self.lastChange = change
638
639 if change in self.labels:
640 label = self.labels[change]
641 labelDetails = label[0]
642 labelRevisions = label[1]
643
644 files = p4CmdList("files %s...@%s" % (branchPrefix, change))
645
646 if len(files) == len(labelRevisions):
647
648 cleanedFiles = {}
649 for info in files:
650 if info["action"] == "delete":
651 continue
652 cleanedFiles[info["depotFile"]] = info["rev"]
653
654 if cleanedFiles == labelRevisions:
655 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
656 self.gitStream.write("from %s\n" % branch)
657
658 owner = labelDetails["Owner"]
659 tagger = ""
660 if author in self.users:
661 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
662 else:
663 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
664 self.gitStream.write("tagger %s\n" % tagger)
665 self.gitStream.write("data <<EOT\n")
666 self.gitStream.write(labelDetails["Description"])
667 self.gitStream.write("EOT\n\n")
668
669 else:
a46668fa 670 if not self.silent:
1f4ba1cb
SH
671 print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
672
673 else:
a46668fa 674 if not self.silent:
1f4ba1cb 675 print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
b984733c
SH
676
677 def extractFilesInCommitToBranch(self, files, branchPrefix):
678 newFiles = []
679
680 for file in files:
681 path = file["path"]
682 if path.startswith(branchPrefix):
683 newFiles.append(file)
684
685 return newFiles
686
687 def findBranchSourceHeuristic(self, files, branch, branchPrefix):
688 for file in files:
689 action = file["action"]
690 if action != "integrate" and action != "branch":
691 continue
692 path = file["path"]
693 rev = file["rev"]
694 depotPath = path + "#" + rev
695
696 log = p4CmdList("filelog \"%s\"" % depotPath)
697 if len(log) != 1:
698 print "eek! I got confused by the filelog of %s" % depotPath
699 sys.exit(1);
700
701 log = log[0]
702 if log["action0"] != action:
703 print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action)
704 sys.exit(1);
705
706 branchAction = log["how0,0"]
707
708 if not branchAction.endswith(" from"):
709 continue # ignore for branching
710 # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction)
711 # sys.exit(1);
712
713 source = log["file0,0"]
714 if source.startswith(branchPrefix):
715 continue
716
717 lastSourceRev = log["erev0,0"]
718
719 sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev))
720 if len(sourceLog) != 1:
721 print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev)
722 sys.exit(1);
723 sourceLog = sourceLog[0]
724
8f872531 725 relPath = source[len(self.depotPath):]
b984733c
SH
726 # strip off the filename
727 relPath = relPath[0:relPath.rfind("/")]
728
729 for candidate in self.knownBranches:
730 if self.isSubPathOf(relPath, candidate) and candidate != branch:
731 return candidate
732
733 return ""
734
735 def changeIsBranchMerge(self, sourceBranch, destinationBranch, change):
736 sourceFiles = {}
8f872531 737 for file in p4CmdList("files %s...@%s" % (self.depotPath + sourceBranch + "/", change)):
b984733c
SH
738 if file["action"] == "delete":
739 continue
740 sourceFiles[file["depotFile"]] = file
741
742 destinationFiles = {}
8f872531 743 for file in p4CmdList("files %s...@%s" % (self.depotPath + destinationBranch + "/", change)):
b984733c
SH
744 destinationFiles[file["depotFile"]] = file
745
746 for fileName in sourceFiles.keys():
747 integrations = []
748 deleted = False
749 integrationCount = 0
750 for integration in p4CmdList("integrated \"%s\"" % fileName):
751 toFile = integration["fromFile"] # yes, it's true, it's fromFile
752 if not toFile in destinationFiles:
753 continue
754 destFile = destinationFiles[toFile]
755 if destFile["action"] == "delete":
756 # print "file %s has been deleted in %s" % (fileName, toFile)
757 deleted = True
758 break
759 integrationCount += 1
760 if integration["how"] == "branch from":
761 continue
762
763 if int(integration["change"]) == change:
764 integrations.append(integration)
765 continue
766 if int(integration["change"]) > change:
767 continue
768
769 destRev = int(destFile["rev"])
770
771 startRev = integration["startFromRev"][1:]
772 if startRev == "none":
773 startRev = 0
774 else:
775 startRev = int(startRev)
776
777 endRev = integration["endFromRev"][1:]
778 if endRev == "none":
779 endRev = 0
780 else:
781 endRev = int(endRev)
782
783 initialBranch = (destRev == 1 and integration["how"] != "branch into")
784 inRange = (destRev >= startRev and destRev <= endRev)
785 newer = (destRev > startRev and destRev > endRev)
786
787 if initialBranch or inRange or newer:
788 integrations.append(integration)
789
790 if deleted:
791 continue
792
793 if len(integrations) == 0 and integrationCount > 1:
794 print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
795 return False
796
797 return True
798
799 def getUserMap(self):
800 self.users = {}
801
802 for output in p4CmdList("users"):
803 if not output.has_key("User"):
804 continue
805 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
806
1f4ba1cb
SH
807 def getLabels(self):
808 self.labels = {}
809
8f872531 810 l = p4CmdList("labels %s..." % self.depotPath)
10c3211b 811 if len(l) > 0 and not self.silent:
8f872531 812 print "Finding files belonging to labels in %s" % self.depotPath
01ce1fe9
SH
813
814 for output in l:
1f4ba1cb
SH
815 label = output["label"]
816 revisions = {}
817 newestChange = 0
818 for file in p4CmdList("files //...@%s" % label):
819 revisions[file["depotFile"]] = file["rev"]
820 change = int(file["change"])
821 if change > newestChange:
822 newestChange = change
823
824 self.labels[newestChange] = [output, revisions]
825
b984733c 826 def run(self, args):
8f872531 827 self.depotPath = ""
179caebf
SH
828 self.changeRange = ""
829 self.initialParent = ""
cd6cc0d3 830 self.previousDepotPath = ""
c6d44cb1
SH
831 # importing into default remotes/p4/* layout?
832 defaultImport = False
179caebf 833
569d1bd4 834 if len(self.branch) == 0:
c6d44cb1
SH
835 if gitBranchExists("refs/heads/p4"):
836 self.branch = "p4"
837 else:
838 self.branch = "refs/remotes/p4/master"
839 defaultImport = True
967f72e2
SH
840
841 if len(args) == 0:
842 if not gitBranchExists(self.branch) and gitBranchExists("origin"):
843 if not self.silent:
844 print "Creating %s branch in git repository based on origin" % self.branch
8ead4fda
SH
845 branch = self.branch
846 if not branch.startswith("refs"):
847 branch = "refs/heads/" + branch
848 system("git update-ref %s origin" % branch)
c6d44cb1
SH
849 if defaultImport:
850 system("git symbolic-ref refs/remotes/p4/HEAD %s" % branch)
967f72e2
SH
851
852 [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
853 if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
854 p4Change = int(p4Change) + 1
8f872531 855 self.depotPath = self.previousDepotPath
967f72e2 856 self.changeRange = "@%s,#head" % p4Change
463e8af6 857 self.initialParent = parseRevision(self.branch)
967f72e2
SH
858 if not self.silent:
859 print "Performing incremental import into %s git branch" % self.branch
569d1bd4 860
f9162f6a
SH
861 if not self.branch.startswith("refs/"):
862 self.branch = "refs/heads/" + self.branch
179caebf 863
8f872531
SH
864 if len(self.depotPath) != 0:
865 self.depotPath = self.depotPath[:-1]
b984733c 866
8f872531 867 if len(args) == 0 and len(self.depotPath) != 0:
b984733c 868 if not self.silent:
8f872531 869 print "Depot path: %s" % self.depotPath
b984733c
SH
870 elif len(args) != 1:
871 return False
872 else:
8f872531
SH
873 if len(self.depotPath) != 0 and self.depotPath != args[0]:
874 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
b984733c 875 sys.exit(1)
8f872531 876 self.depotPath = args[0]
b984733c 877
b984733c
SH
878 self.revision = ""
879 self.users = {}
b984733c 880 self.lastChange = 0
b984733c 881
8f872531
SH
882 if self.depotPath.find("@") != -1:
883 atIdx = self.depotPath.index("@")
884 self.changeRange = self.depotPath[atIdx:]
b984733c
SH
885 if self.changeRange == "@all":
886 self.changeRange = ""
887 elif self.changeRange.find(",") == -1:
888 self.revision = self.changeRange
889 self.changeRange = ""
8f872531
SH
890 self.depotPath = self.depotPath[0:atIdx]
891 elif self.depotPath.find("#") != -1:
892 hashIdx = self.depotPath.index("#")
893 self.revision = self.depotPath[hashIdx:]
894 self.depotPath = self.depotPath[0:hashIdx]
b984733c
SH
895 elif len(self.previousDepotPath) == 0:
896 self.revision = "#head"
897
8f872531
SH
898 if self.depotPath.endswith("..."):
899 self.depotPath = self.depotPath[:-3]
b984733c 900
8f872531
SH
901 if not self.depotPath.endswith("/"):
902 self.depotPath += "/"
b984733c
SH
903
904 self.getUserMap()
cb53e1f8
SH
905 self.labels = {}
906 if self.detectLabels:
907 self.getLabels();
b984733c 908
f291b4e3 909 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
b984733c 910
08483580
SH
911 importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
912 self.gitOutput = importProcess.stdout
913 self.gitStream = importProcess.stdin
914 self.gitError = importProcess.stderr
b984733c
SH
915
916 if len(self.revision) > 0:
8f872531 917 print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
b984733c
SH
918
919 details = { "user" : "git perforce import user", "time" : int(time.time()) }
8f872531 920 details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
b984733c
SH
921 details["change"] = self.revision
922 newestRevision = 0
923
924 fileCnt = 0
8f872531 925 for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
b984733c
SH
926 change = int(info["change"])
927 if change > newestRevision:
928 newestRevision = change
929
930 if info["action"] == "delete":
c45b1cfe
SH
931 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
932 #fileCnt = fileCnt + 1
b984733c
SH
933 continue
934
935 for prop in [ "depotFile", "rev", "action", "type" ]:
936 details["%s%s" % (prop, fileCnt)] = info[prop]
937
938 fileCnt = fileCnt + 1
939
940 details["change"] = newestRevision
941
942 try:
8f872531 943 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
c715706b 944 except IOError:
fd4ca86a 945 print "IO error with git fast-import. Is your git version recent enough?"
b984733c
SH
946 print self.gitError.read()
947
948 else:
949 changes = []
950
0828ab14 951 if len(self.changesFile) > 0:
b984733c
SH
952 output = open(self.changesFile).readlines()
953 changeSet = Set()
954 for line in output:
955 changeSet.add(int(line))
956
957 for change in changeSet:
958 changes.append(change)
959
960 changes.sort()
961 else:
caace111 962 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
b984733c
SH
963
964 for line in output:
965 changeNum = line.split(" ")[1]
966 changes.append(changeNum)
967
968 changes.reverse()
969
970 if len(changes) == 0:
0828ab14 971 if not self.silent:
b984733c 972 print "no changes to import!"
1f52af6c 973 return True
b984733c
SH
974
975 cnt = 1
976 for change in changes:
977 description = p4Cmd("describe %s" % change)
978
0828ab14 979 if not self.silent:
b984733c
SH
980 sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
981 sys.stdout.flush()
982 cnt = cnt + 1
983
984 try:
985 files = self.extractFilesFromCommit(description)
986 if self.detectBranches:
987 for branch in self.branchesForCommit(files):
988 self.knownBranches.add(branch)
8f872531 989 branchPrefix = self.depotPath + branch + "/"
b984733c
SH
990
991 filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix)
992
993 merged = ""
994 parent = ""
995 ########### remove cnt!!!
996 if branch not in self.createdBranches and cnt > 2:
997 self.createdBranches.add(branch)
998 parent = self.findBranchParent(branchPrefix, files)
999 if parent == branch:
1000 parent = ""
1001 # elif len(parent) > 0:
1002 # print "%s branched off of %s" % (branch, parent)
1003
1004 if len(parent) == 0:
1005 merged = self.findBranchSourceHeuristic(filesForCommit, branch, branchPrefix)
1006 if len(merged) > 0:
1007 print "change %s could be a merge from %s into %s" % (description["change"], merged, branch)
1008 if not self.changeIsBranchMerge(merged, branch, int(description["change"])):
1009 merged = ""
1010
1011 branch = "refs/heads/" + branch
1012 if len(parent) > 0:
1013 parent = "refs/heads/" + parent
1014 if len(merged) > 0:
1015 merged = "refs/heads/" + merged
1016 self.commit(description, files, branch, branchPrefix, parent, merged)
1017 else:
8f872531 1018 self.commit(description, files, self.branch, self.depotPath, self.initialParent)
b984733c
SH
1019 self.initialParent = ""
1020 except IOError:
1021 print self.gitError.read()
1022 sys.exit(1)
1023
1024 if not self.silent:
1025 print ""
1026
b984733c
SH
1027
1028 self.gitStream.close()
1029 self.gitOutput.close()
1030 self.gitError.close()
90865adc 1031 importProcess.wait()
b984733c 1032
b984733c
SH
1033 return True
1034
01ce1fe9
SH
1035class P4Rebase(Command):
1036 def __init__(self):
1037 Command.__init__(self)
1038 self.options = [ ]
1039 self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
1040
1041 def run(self, args):
1042 sync = P4Sync()
1043 sync.run([])
1044 print "Rebasing the current branch"
caace111 1045 oldHead = mypopen("git rev-parse HEAD").read()[:-1]
01ce1fe9 1046 system("git rebase p4")
1f52af6c 1047 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
01ce1fe9
SH
1048 return True
1049
f9a3a4f7
SH
1050class P4Clone(P4Sync):
1051 def __init__(self):
1052 P4Sync.__init__(self)
1053 self.description = "Creates a new git repository and imports from Perforce into it"
1054 self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
1055 self.needsGit = False
f9a3a4f7
SH
1056
1057 def run(self, args):
1058 if len(args) < 1:
1059 return False
1060 depotPath = args[0]
1061 dir = ""
1062 if len(args) == 2:
1063 dir = args[1]
1064 elif len(args) > 2:
1065 return False
1066
1067 if not depotPath.startswith("//"):
1068 return False
1069
1070 if len(dir) == 0:
1071 dir = depotPath
1072 atPos = dir.rfind("@")
1073 if atPos != -1:
1074 dir = dir[0:atPos]
1075 hashPos = dir.rfind("#")
1076 if hashPos != -1:
1077 dir = dir[0:hashPos]
1078
1079 if dir.endswith("..."):
1080 dir = dir[:-3]
1081
1082 if dir.endswith("/"):
1083 dir = dir[:-1]
1084
1085 slashPos = dir.rfind("/")
1086 if slashPos != -1:
1087 dir = dir[slashPos + 1:]
1088
1089 print "Importing from %s into %s" % (depotPath, dir)
1090 os.makedirs(dir)
1091 os.chdir(dir)
1092 system("git init")
1093 if not P4Sync.run(self, [depotPath]):
1094 return False
f9a3a4f7
SH
1095 if self.branch != "master":
1096 system("git branch master p4")
1097 system("git checkout -f")
1098 return True
1099
b984733c
SH
1100class HelpFormatter(optparse.IndentedHelpFormatter):
1101 def __init__(self):
1102 optparse.IndentedHelpFormatter.__init__(self)
1103
1104 def format_description(self, description):
1105 if description:
1106 return description + "\n"
1107 else:
1108 return ""
4f5cf76a 1109
86949eef
SH
1110def printUsage(commands):
1111 print "usage: %s <command> [options]" % sys.argv[0]
1112 print ""
1113 print "valid commands: %s" % ", ".join(commands)
1114 print ""
1115 print "Try %s <command> --help for command specific help." % sys.argv[0]
1116 print ""
1117
1118commands = {
1119 "debug" : P4Debug(),
711544b0 1120 "submit" : P4Submit(),
01ce1fe9 1121 "sync" : P4Sync(),
f9a3a4f7
SH
1122 "rebase" : P4Rebase(),
1123 "clone" : P4Clone()
86949eef
SH
1124}
1125
1126if len(sys.argv[1:]) == 0:
1127 printUsage(commands.keys())
1128 sys.exit(2)
1129
1130cmd = ""
1131cmdName = sys.argv[1]
1132try:
1133 cmd = commands[cmdName]
1134except KeyError:
1135 print "unknown command %s" % cmdName
1136 print ""
1137 printUsage(commands.keys())
1138 sys.exit(2)
1139
4f5cf76a
SH
1140options = cmd.options
1141cmd.gitdir = gitdir
4f5cf76a 1142
e20a9e53 1143args = sys.argv[2:]
86949eef 1144
e20a9e53
SH
1145if len(options) > 0:
1146 options.append(optparse.make_option("--git-dir", dest="gitdir"))
1147
1148 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1149 options,
1150 description = cmd.description,
1151 formatter = HelpFormatter())
1152
1153 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
86949eef 1154
8910ac0e
SH
1155if cmd.needsGit:
1156 gitdir = cmd.gitdir
1157 if len(gitdir) == 0:
1158 gitdir = ".git"
1159 if not isValidGitDir(gitdir):
81f2373f 1160 gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
dc1a93b6 1161 if os.path.exists(gitdir):
5c4153e4
SH
1162 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
1163 if len(cdup) > 0:
1164 os.chdir(cdup);
4f5cf76a 1165
8910ac0e
SH
1166 if not isValidGitDir(gitdir):
1167 if isValidGitDir(gitdir + "/.git"):
1168 gitdir += "/.git"
1169 else:
1170 die("fatal: cannot locate git repository at %s" % gitdir)
4f5cf76a 1171
8910ac0e 1172 os.environ["GIT_DIR"] = gitdir
4f5cf76a 1173
b984733c
SH
1174if not cmd.run(args):
1175 parser.print_help()
1176