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