Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
[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
71b112d4 464 def splitFilesIntoBranches(self, commit):
d5904674 465 branches = {}
b984733c 466
71b112d4
SH
467 fnum = 0
468 while commit.has_key("depotFile%s" % fnum):
469 path = commit["depotFile%s" % fnum]
470 if not path.startswith(self.depotPath):
471 # if not self.silent:
472 # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
473 fnum = fnum + 1
474 continue
475
476 file = {}
477 file["path"] = path
478 file["rev"] = commit["rev%s" % fnum]
479 file["action"] = commit["action%s" % fnum]
480 file["type"] = commit["type%s" % fnum]
481 fnum = fnum + 1
482
483 relPath = path[len(self.depotPath):]
b984733c 484
4b97ffb1 485 for branch in self.knownBranches.keys():
71b112d4 486 if relPath.startswith(branch):
d5904674
SH
487 if branch not in branches:
488 branches[branch] = []
71b112d4 489 branches[branch].append(file)
b984733c
SH
490
491 return branches
492
4b97ffb1 493 def commit(self, details, files, branch, branchPrefix, parent = ""):
b984733c
SH
494 epoch = details["time"]
495 author = details["user"]
496
4b97ffb1
SH
497 if self.verbose:
498 print "commit into %s" % branch
499
b984733c
SH
500 self.gitStream.write("commit %s\n" % branch)
501 # gitStream.write("mark :%s\n" % details["change"])
502 self.committedChanges.add(int(details["change"]))
503 committer = ""
b607e71e
SH
504 if author not in self.users:
505 self.getUserMapFromPerforceServer()
b984733c 506 if author in self.users:
0828ab14 507 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
b984733c 508 else:
0828ab14 509 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
b984733c
SH
510
511 self.gitStream.write("committer %s\n" % committer)
512
513 self.gitStream.write("data <<EOT\n")
514 self.gitStream.write(details["desc"])
6ae8de88 515 self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"]))
b984733c
SH
516 self.gitStream.write("EOT\n\n")
517
518 if len(parent) > 0:
4b97ffb1
SH
519 if self.verbose:
520 print "parent %s" % parent
b984733c
SH
521 self.gitStream.write("from %s\n" % parent)
522
b984733c
SH
523 for file in files:
524 path = file["path"]
525 if not path.startswith(branchPrefix):
526 # if not silent:
527 # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
528 continue
529 rev = file["rev"]
530 depotPath = path + "#" + rev
531 relPath = path[len(branchPrefix):]
532 action = file["action"]
533
534 if file["type"] == "apple":
535 print "\nfile %s is a strange apple file that forks. Ignoring!" % path
536 continue
537
538 if action == "delete":
539 self.gitStream.write("D %s\n" % relPath)
540 else:
541 mode = 644
542 if file["type"].startswith("x"):
543 mode = 755
544
545 data = self.p4File(depotPath)
546
547 self.gitStream.write("M %s inline %s\n" % (mode, relPath))
548 self.gitStream.write("data %s\n" % len(data))
549 self.gitStream.write(data)
550 self.gitStream.write("\n")
551
552 self.gitStream.write("\n")
553
1f4ba1cb
SH
554 change = int(details["change"])
555
9bda3a85 556 if self.labels.has_key(change):
1f4ba1cb
SH
557 label = self.labels[change]
558 labelDetails = label[0]
559 labelRevisions = label[1]
71b112d4
SH
560 if self.verbose:
561 print "Change %s is labelled %s" % (change, labelDetails)
1f4ba1cb
SH
562
563 files = p4CmdList("files %s...@%s" % (branchPrefix, change))
564
565 if len(files) == len(labelRevisions):
566
567 cleanedFiles = {}
568 for info in files:
569 if info["action"] == "delete":
570 continue
571 cleanedFiles[info["depotFile"]] = info["rev"]
572
573 if cleanedFiles == labelRevisions:
574 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
575 self.gitStream.write("from %s\n" % branch)
576
577 owner = labelDetails["Owner"]
578 tagger = ""
579 if author in self.users:
580 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
581 else:
582 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
583 self.gitStream.write("tagger %s\n" % tagger)
584 self.gitStream.write("data <<EOT\n")
585 self.gitStream.write(labelDetails["Description"])
586 self.gitStream.write("EOT\n\n")
587
588 else:
a46668fa 589 if not self.silent:
1f4ba1cb
SH
590 print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
591
592 else:
a46668fa 593 if not self.silent:
1f4ba1cb 594 print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
b984733c 595
b607e71e 596 def getUserMapFromPerforceServer(self):
b984733c
SH
597 self.users = {}
598
599 for output in p4CmdList("users"):
600 if not output.has_key("User"):
601 continue
602 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
603
b607e71e
SH
604 cache = open(gitdir + "/p4-usercache.txt", "wb")
605 for user in self.users.keys():
606 cache.write("%s\t%s\n" % (user, self.users[user]))
607 cache.close();
608
609 def loadUserMapFromCache(self):
610 self.users = {}
611 try:
612 cache = open(gitdir + "/p4-usercache.txt", "rb")
613 lines = cache.readlines()
614 cache.close()
615 for line in lines:
616 entry = line[:-1].split("\t")
617 self.users[entry[0]] = entry[1]
618 except IOError:
619 self.getUserMapFromPerforceServer()
620
1f4ba1cb
SH
621 def getLabels(self):
622 self.labels = {}
623
8f872531 624 l = p4CmdList("labels %s..." % self.depotPath)
10c3211b 625 if len(l) > 0 and not self.silent:
8f872531 626 print "Finding files belonging to labels in %s" % self.depotPath
01ce1fe9
SH
627
628 for output in l:
1f4ba1cb
SH
629 label = output["label"]
630 revisions = {}
631 newestChange = 0
71b112d4
SH
632 if self.verbose:
633 print "Querying files for label %s" % label
634 for file in p4CmdList("files %s...@%s" % (self.depotPath, label)):
1f4ba1cb
SH
635 revisions[file["depotFile"]] = file["rev"]
636 change = int(file["change"])
637 if change > newestChange:
638 newestChange = change
639
9bda3a85
SH
640 self.labels[newestChange] = [output, revisions]
641
642 if self.verbose:
643 print "Label changes: %s" % self.labels.keys()
1f4ba1cb 644
4b97ffb1 645 def getBranchMapping(self):
29bdbac1 646 self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]
4b97ffb1
SH
647
648 for info in p4CmdList("branches"):
649 details = p4Cmd("branch -o %s" % info["branch"])
650 viewIdx = 0
651 while details.has_key("View%s" % viewIdx):
652 paths = details["View%s" % viewIdx].split(" ")
653 viewIdx = viewIdx + 1
654 # require standard //depot/foo/... //depot/bar/... mapping
655 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
656 continue
657 source = paths[0]
658 destination = paths[1]
659 if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
660 source = source[len(self.depotPath):-4]
661 destination = destination[len(self.depotPath):-4]
29bdbac1
SH
662 if destination not in self.knownBranches:
663 self.knownBranches[destination] = source
664 if source not in self.knownBranches:
665 self.knownBranches[source] = source
666
667 def listExistingP4GitBranches(self):
668 self.p4BranchesInGit = []
669
670 for line in mypopen("git rev-parse --symbolic --remotes").readlines():
671 if line.startswith("p4/") and line != "p4/HEAD\n":
672 branch = line[3:-1]
673 self.p4BranchesInGit.append(branch)
674 self.initialParents["refs/remotes/p4/" + branch] = parseRevision(line[:-1])
4b97ffb1 675
b984733c 676 def run(self, args):
8f872531 677 self.depotPath = ""
179caebf
SH
678 self.changeRange = ""
679 self.initialParent = ""
cd6cc0d3 680 self.previousDepotPath = ""
29bdbac1
SH
681 # map from branch depot path to parent branch
682 self.knownBranches = {}
683 self.initialParents = {}
684
685 self.listExistingP4GitBranches()
686
687 if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
688 ### needs to be ported to multi branch import
179caebf 689
ef48f909
SH
690 print "Syncing with origin first as requested by calling git fetch origin"
691 system("git fetch origin")
692 [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
693 [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
694 if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
695 if originPreviousDepotPath == p4PreviousDepotPath:
696 originP4Change = int(originP4Change)
697 p4Change = int(p4Change)
698 if originP4Change > p4Change:
699 print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change, p4Change)
700 system("git update-ref refs/remotes/p4/master origin");
701 else:
702 print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
703
569d1bd4 704 if len(self.branch) == 0:
48df6fd8 705 self.branch = "refs/remotes/p4/master"
c6d44cb1 706 if gitBranchExists("refs/heads/p4"):
48df6fd8 707 system("git update-ref %s refs/heads/p4" % self.branch)
48df6fd8 708 system("git branch -D p4");
05094f98
SH
709 if not gitBranchExists("refs/remotes/p4/HEAD"):
710 system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
967f72e2
SH
711
712 if len(args) == 0:
29bdbac1
SH
713 if not gitBranchExists(self.branch) and gitBranchExists("origin") and not self.detectBranches:
714 ### needs to be ported to multi branch import
967f72e2
SH
715 if not self.silent:
716 print "Creating %s branch in git repository based on origin" % self.branch
8ead4fda
SH
717 branch = self.branch
718 if not branch.startswith("refs"):
719 branch = "refs/heads/" + branch
720 system("git update-ref %s origin" % branch)
967f72e2 721
29bdbac1
SH
722 if self.verbose:
723 print "branches: %s" % self.p4BranchesInGit
724
725 p4Change = 0
726 for branch in self.p4BranchesInGit:
727 depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("refs/remotes/p4/" + branch))
728
729 if self.verbose:
730 print "path %s change %s" % (depotPath, change)
731
732 if len(depotPath) > 0 and len(change) > 0:
733 change = int(change) + 1
734 p4Change = max(p4Change, change)
735
736 if len(self.previousDepotPath) == 0:
737 self.previousDepotPath = depotPath
738 else:
739 i = 0
740 l = min(len(self.previousDepotPath), len(depotPath))
741 while i < l and self.previousDepotPath[i] == depotPath[i]:
742 i = i + 1
743 self.previousDepotPath = self.previousDepotPath[:i]
744
745 if p4Change > 0:
8f872531 746 self.depotPath = self.previousDepotPath
d5904674 747 self.changeRange = "@%s,#head" % p4Change
463e8af6 748 self.initialParent = parseRevision(self.branch)
967f72e2
SH
749 if not self.silent:
750 print "Performing incremental import into %s git branch" % self.branch
569d1bd4 751
f9162f6a
SH
752 if not self.branch.startswith("refs/"):
753 self.branch = "refs/heads/" + self.branch
179caebf 754
8f872531
SH
755 if len(self.depotPath) != 0:
756 self.depotPath = self.depotPath[:-1]
b984733c 757
8f872531 758 if len(args) == 0 and len(self.depotPath) != 0:
b984733c 759 if not self.silent:
8f872531 760 print "Depot path: %s" % self.depotPath
b984733c
SH
761 elif len(args) != 1:
762 return False
763 else:
8f872531
SH
764 if len(self.depotPath) != 0 and self.depotPath != args[0]:
765 print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
b984733c 766 sys.exit(1)
8f872531 767 self.depotPath = args[0]
b984733c 768
b984733c
SH
769 self.revision = ""
770 self.users = {}
b984733c 771
8f872531
SH
772 if self.depotPath.find("@") != -1:
773 atIdx = self.depotPath.index("@")
774 self.changeRange = self.depotPath[atIdx:]
b984733c
SH
775 if self.changeRange == "@all":
776 self.changeRange = ""
777 elif self.changeRange.find(",") == -1:
778 self.revision = self.changeRange
779 self.changeRange = ""
8f872531
SH
780 self.depotPath = self.depotPath[0:atIdx]
781 elif self.depotPath.find("#") != -1:
782 hashIdx = self.depotPath.index("#")
783 self.revision = self.depotPath[hashIdx:]
784 self.depotPath = self.depotPath[0:hashIdx]
b984733c
SH
785 elif len(self.previousDepotPath) == 0:
786 self.revision = "#head"
787
8f872531
SH
788 if self.depotPath.endswith("..."):
789 self.depotPath = self.depotPath[:-3]
b984733c 790
8f872531
SH
791 if not self.depotPath.endswith("/"):
792 self.depotPath += "/"
b984733c 793
b607e71e 794 self.loadUserMapFromCache()
cb53e1f8
SH
795 self.labels = {}
796 if self.detectLabels:
797 self.getLabels();
b984733c 798
4b97ffb1
SH
799 if self.detectBranches:
800 self.getBranchMapping();
29bdbac1
SH
801 if self.verbose:
802 print "p4-git branches: %s" % self.p4BranchesInGit
803 print "initial parents: %s" % self.initialParents
804 for b in self.p4BranchesInGit:
805 if b != "master":
806 b = b[len(self.projectName):]
807 self.createdBranches.add(b)
4b97ffb1 808
f291b4e3 809 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
b984733c 810
08483580
SH
811 importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
812 self.gitOutput = importProcess.stdout
813 self.gitStream = importProcess.stdin
814 self.gitError = importProcess.stderr
b984733c
SH
815
816 if len(self.revision) > 0:
8f872531 817 print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
b984733c
SH
818
819 details = { "user" : "git perforce import user", "time" : int(time.time()) }
8f872531 820 details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
b984733c
SH
821 details["change"] = self.revision
822 newestRevision = 0
823
824 fileCnt = 0
8f872531 825 for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
b984733c
SH
826 change = int(info["change"])
827 if change > newestRevision:
828 newestRevision = change
829
830 if info["action"] == "delete":
c45b1cfe
SH
831 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
832 #fileCnt = fileCnt + 1
b984733c
SH
833 continue
834
835 for prop in [ "depotFile", "rev", "action", "type" ]:
836 details["%s%s" % (prop, fileCnt)] = info[prop]
837
838 fileCnt = fileCnt + 1
839
840 details["change"] = newestRevision
841
842 try:
8f872531 843 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
c715706b 844 except IOError:
fd4ca86a 845 print "IO error with git fast-import. Is your git version recent enough?"
b984733c
SH
846 print self.gitError.read()
847
848 else:
849 changes = []
850
0828ab14 851 if len(self.changesFile) > 0:
b984733c
SH
852 output = open(self.changesFile).readlines()
853 changeSet = Set()
854 for line in output:
855 changeSet.add(int(line))
856
857 for change in changeSet:
858 changes.append(change)
859
860 changes.sort()
861 else:
29bdbac1
SH
862 if self.verbose:
863 print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange)
caace111 864 output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
b984733c
SH
865
866 for line in output:
867 changeNum = line.split(" ")[1]
868 changes.append(changeNum)
869
870 changes.reverse()
871
872 if len(changes) == 0:
0828ab14 873 if not self.silent:
b984733c 874 print "no changes to import!"
1f52af6c 875 return True
b984733c
SH
876
877 cnt = 1
878 for change in changes:
879 description = p4Cmd("describe %s" % change)
880
0828ab14 881 if not self.silent:
b984733c
SH
882 sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
883 sys.stdout.flush()
884 cnt = cnt + 1
885
886 try:
b984733c 887 if self.detectBranches:
71b112d4 888 branches = self.splitFilesIntoBranches(description)
d5904674 889 for branch in branches.keys():
8f872531 890 branchPrefix = self.depotPath + branch + "/"
b984733c 891
b984733c 892 parent = ""
4b97ffb1 893
d5904674 894 filesForCommit = branches[branch]
4b97ffb1 895
29bdbac1
SH
896 if self.verbose:
897 print "branch is %s" % branch
898
8f9b2e08 899 if branch not in self.createdBranches:
b984733c 900 self.createdBranches.add(branch)
4b97ffb1 901 parent = self.knownBranches[branch]
b984733c
SH
902 if parent == branch:
903 parent = ""
29bdbac1
SH
904 elif self.verbose:
905 print "parent determined through known branches: %s" % parent
b984733c 906
8f9b2e08
SH
907 # main branch? use master
908 if branch == "main":
909 branch = "master"
910 else:
29bdbac1 911 branch = self.projectName + branch
8f9b2e08
SH
912
913 if parent == "main":
914 parent = "master"
915 elif len(parent) > 0:
29bdbac1 916 parent = self.projectName + parent
8f9b2e08 917
4b97ffb1 918 branch = "refs/remotes/p4/" + branch
b984733c 919 if len(parent) > 0:
4b97ffb1 920 parent = "refs/remotes/p4/" + parent
29bdbac1
SH
921
922 if self.verbose:
923 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
924
925 if len(parent) == 0 and branch in self.initialParents:
926 parent = self.initialParents[branch]
927 del self.initialParents[branch]
928
71b112d4 929 self.commit(description, filesForCommit, branch, branchPrefix, parent)
b984733c 930 else:
71b112d4 931 files = self.extractFilesFromCommit(description)
8f872531 932 self.commit(description, files, self.branch, self.depotPath, self.initialParent)
b984733c
SH
933 self.initialParent = ""
934 except IOError:
935 print self.gitError.read()
936 sys.exit(1)
937
938 if not self.silent:
939 print ""
940
b984733c
SH
941
942 self.gitStream.close()
29bdbac1
SH
943 if importProcess.wait() != 0:
944 die("fast-import failed: %s" % self.gitError.read())
b984733c
SH
945 self.gitOutput.close()
946 self.gitError.close()
947
b984733c
SH
948 return True
949
01ce1fe9
SH
950class P4Rebase(Command):
951 def __init__(self):
952 Command.__init__(self)
ef48f909 953 self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
01ce1fe9 954 self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
ef48f909 955 self.syncWithOrigin = False
01ce1fe9
SH
956
957 def run(self, args):
958 sync = P4Sync()
ef48f909 959 sync.syncWithOrigin = self.syncWithOrigin
01ce1fe9
SH
960 sync.run([])
961 print "Rebasing the current branch"
caace111 962 oldHead = mypopen("git rev-parse HEAD").read()[:-1]
01ce1fe9 963 system("git rebase p4")
1f52af6c 964 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
01ce1fe9
SH
965 return True
966
f9a3a4f7
SH
967class P4Clone(P4Sync):
968 def __init__(self):
969 P4Sync.__init__(self)
970 self.description = "Creates a new git repository and imports from Perforce into it"
971 self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
972 self.needsGit = False
f9a3a4f7
SH
973
974 def run(self, args):
59fa4171
SH
975 global gitdir
976
f9a3a4f7
SH
977 if len(args) < 1:
978 return False
979 depotPath = args[0]
980 dir = ""
981 if len(args) == 2:
982 dir = args[1]
983 elif len(args) > 2:
984 return False
985
986 if not depotPath.startswith("//"):
987 return False
988
989 if len(dir) == 0:
990 dir = depotPath
991 atPos = dir.rfind("@")
992 if atPos != -1:
993 dir = dir[0:atPos]
994 hashPos = dir.rfind("#")
995 if hashPos != -1:
996 dir = dir[0:hashPos]
997
998 if dir.endswith("..."):
999 dir = dir[:-3]
1000
1001 if dir.endswith("/"):
1002 dir = dir[:-1]
1003
1004 slashPos = dir.rfind("/")
1005 if slashPos != -1:
1006 dir = dir[slashPos + 1:]
1007
1008 print "Importing from %s into %s" % (depotPath, dir)
1009 os.makedirs(dir)
1010 os.chdir(dir)
1011 system("git init")
64ffb06a 1012 gitdir = os.getcwd() + "/.git"
f9a3a4f7
SH
1013 if not P4Sync.run(self, [depotPath]):
1014 return False
f9a3a4f7 1015 if self.branch != "master":
8f9b2e08
SH
1016 if gitBranchExists("refs/remotes/p4/master"):
1017 system("git branch master refs/remotes/p4/master")
1018 system("git checkout -f")
1019 else:
1020 print "Could not detect main branch. No checkout/master branch created."
f9a3a4f7
SH
1021 return True
1022
b984733c
SH
1023class HelpFormatter(optparse.IndentedHelpFormatter):
1024 def __init__(self):
1025 optparse.IndentedHelpFormatter.__init__(self)
1026
1027 def format_description(self, description):
1028 if description:
1029 return description + "\n"
1030 else:
1031 return ""
4f5cf76a 1032
86949eef
SH
1033def printUsage(commands):
1034 print "usage: %s <command> [options]" % sys.argv[0]
1035 print ""
1036 print "valid commands: %s" % ", ".join(commands)
1037 print ""
1038 print "Try %s <command> --help for command specific help." % sys.argv[0]
1039 print ""
1040
1041commands = {
1042 "debug" : P4Debug(),
711544b0 1043 "submit" : P4Submit(),
01ce1fe9 1044 "sync" : P4Sync(),
f9a3a4f7
SH
1045 "rebase" : P4Rebase(),
1046 "clone" : P4Clone()
86949eef
SH
1047}
1048
1049if len(sys.argv[1:]) == 0:
1050 printUsage(commands.keys())
1051 sys.exit(2)
1052
1053cmd = ""
1054cmdName = sys.argv[1]
1055try:
1056 cmd = commands[cmdName]
1057except KeyError:
1058 print "unknown command %s" % cmdName
1059 print ""
1060 printUsage(commands.keys())
1061 sys.exit(2)
1062
4f5cf76a
SH
1063options = cmd.options
1064cmd.gitdir = gitdir
4f5cf76a 1065
e20a9e53 1066args = sys.argv[2:]
86949eef 1067
e20a9e53
SH
1068if len(options) > 0:
1069 options.append(optparse.make_option("--git-dir", dest="gitdir"))
1070
1071 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1072 options,
1073 description = cmd.description,
1074 formatter = HelpFormatter())
1075
1076 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
86949eef 1077
8910ac0e
SH
1078if cmd.needsGit:
1079 gitdir = cmd.gitdir
1080 if len(gitdir) == 0:
1081 gitdir = ".git"
1082 if not isValidGitDir(gitdir):
81f2373f 1083 gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
dc1a93b6 1084 if os.path.exists(gitdir):
5c4153e4
SH
1085 cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
1086 if len(cdup) > 0:
1087 os.chdir(cdup);
4f5cf76a 1088
8910ac0e
SH
1089 if not isValidGitDir(gitdir):
1090 if isValidGitDir(gitdir + "/.git"):
1091 gitdir += "/.git"
1092 else:
1093 die("fatal: cannot locate git repository at %s" % gitdir)
4f5cf76a 1094
8910ac0e 1095 os.environ["GIT_DIR"] = gitdir
4f5cf76a 1096
b984733c
SH
1097if not cmd.run(args):
1098 parser.print_help()
1099