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