git-cvsserver: detect/diagnose write failure, etc.
[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#
c8cbbee9
SH
5# Author: Simon Hausmann <simon@lst.de>
6# Copyright: 2007 Simon Hausmann <simon@lst.de>
83dce55a 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
ce6f33c8 13import re
8b41a97f 14
b984733c 15from sets import Set;
4f5cf76a 16
4addad22 17verbose = False
86949eef 18
86dff6b6
HWN
19def die(msg):
20 if verbose:
21 raise Exception(msg)
22 else:
23 sys.stderr.write(msg + "\n")
24 sys.exit(1)
25
bce4c5fc 26def write_pipe(c, str):
4addad22 27 if verbose:
86dff6b6 28 sys.stderr.write('Writing pipe: %s\n' % c)
b016d397 29
bce4c5fc 30 pipe = os.popen(c, 'w')
b016d397 31 val = pipe.write(str)
bce4c5fc 32 if pipe.close():
86dff6b6 33 die('Command failed: %s' % c)
b016d397
HWN
34
35 return val
36
4addad22
HWN
37def read_pipe(c, ignore_error=False):
38 if verbose:
86dff6b6 39 sys.stderr.write('Reading pipe: %s\n' % c)
8b41a97f 40
bce4c5fc 41 pipe = os.popen(c, 'rb')
b016d397 42 val = pipe.read()
4addad22 43 if pipe.close() and not ignore_error:
86dff6b6 44 die('Command failed: %s' % c)
b016d397
HWN
45
46 return val
47
48
bce4c5fc 49def read_pipe_lines(c):
4addad22 50 if verbose:
86dff6b6 51 sys.stderr.write('Reading pipe: %s\n' % c)
b016d397 52 ## todo: check return status
bce4c5fc 53 pipe = os.popen(c, 'rb')
b016d397 54 val = pipe.readlines()
bce4c5fc 55 if pipe.close():
86dff6b6 56 die('Command failed: %s' % c)
b016d397
HWN
57
58 return val
caace111 59
6754a299 60def system(cmd):
4addad22 61 if verbose:
bb6e09b2 62 sys.stderr.write("executing %s\n" % cmd)
6754a299
HWN
63 if os.system(cmd) != 0:
64 die("command failed: %s" % cmd)
65
86949eef
SH
66def p4CmdList(cmd):
67 cmd = "p4 -G %s" % cmd
6a49f8e2
HWN
68 if verbose:
69 sys.stderr.write("Opening pipe: %s\n" % cmd)
86949eef
SH
70 pipe = os.popen(cmd, "rb")
71
72 result = []
73 try:
74 while True:
75 entry = marshal.load(pipe)
76 result.append(entry)
77 except EOFError:
78 pass
a6d5da36
SH
79 exitCode = pipe.close()
80 if exitCode != None:
ac3e0d79
SH
81 entry = {}
82 entry["p4ExitCode"] = exitCode
83 result.append(entry)
86949eef
SH
84
85 return result
86
87def p4Cmd(cmd):
88 list = p4CmdList(cmd)
89 result = {}
90 for entry in list:
91 result.update(entry)
92 return result;
93
cb2c9db5
SH
94def p4Where(depotPath):
95 if not depotPath.endswith("/"):
96 depotPath += "/"
97 output = p4Cmd("where %s..." % depotPath)
dc524036
SH
98 if output["code"] == "error":
99 return ""
cb2c9db5
SH
100 clientPath = ""
101 if "path" in output:
102 clientPath = output.get("path")
103 elif "data" in output:
104 data = output.get("data")
105 lastSpace = data.rfind(" ")
106 clientPath = data[lastSpace + 1:]
107
108 if clientPath.endswith("..."):
109 clientPath = clientPath[:-3]
110 return clientPath
111
86949eef 112def currentGitBranch():
b25b2065 113 return read_pipe("git name-rev HEAD").split(" ")[1].strip()
86949eef 114
4f5cf76a 115def isValidGitDir(path):
bb6e09b2
HWN
116 if (os.path.exists(path + "/HEAD")
117 and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
4f5cf76a
SH
118 return True;
119 return False
120
463e8af6 121def parseRevision(ref):
b25b2065 122 return read_pipe("git rev-parse %s" % ref).strip()
463e8af6 123
6ae8de88
SH
124def extractLogMessageFromGitCommit(commit):
125 logMessage = ""
b016d397
HWN
126
127 ## fixme: title is first line of commit, not 1st paragraph.
6ae8de88 128 foundTitle = False
b016d397 129 for log in read_pipe_lines("git cat-file commit %s" % commit):
6ae8de88
SH
130 if not foundTitle:
131 if len(log) == 1:
1c094184 132 foundTitle = True
6ae8de88
SH
133 continue
134
135 logMessage += log
136 return logMessage
137
bb6e09b2 138def extractSettingsGitLog(log):
6ae8de88
SH
139 values = {}
140 for line in log.split("\n"):
141 line = line.strip()
6326aa58
HWN
142 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
143 if not m:
144 continue
145
146 assignments = m.group(1).split (':')
147 for a in assignments:
148 vals = a.split ('=')
149 key = vals[0].strip()
150 val = ('='.join (vals[1:])).strip()
151 if val.endswith ('\"') and val.startswith('"'):
152 val = val[1:-1]
153
154 values[key] = val
155
845b42cb
SH
156 paths = values.get("depot-paths")
157 if not paths:
158 paths = values.get("depot-path")
a3fdd579
SH
159 if paths:
160 values['depot-paths'] = paths.split(',')
bb6e09b2 161 return values
6ae8de88 162
8136a639 163def gitBranchExists(branch):
bb6e09b2
HWN
164 proc = subprocess.Popen(["git", "rev-parse", branch],
165 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
caace111 166 return proc.wait() == 0;
8136a639 167
01265103 168def gitConfig(key):
4addad22 169 return read_pipe("git config %s" % key, ignore_error=True).strip()
01265103 170
9ceab363 171def findUpstreamBranchPoint(head = "HEAD"):
27d2d811
SH
172 settings = None
173 branchPoint = ""
174 parent = 0
175 while parent < 65535:
9ceab363 176 commit = head + "~%s" % parent
27d2d811
SH
177 log = extractLogMessageFromGitCommit(commit)
178 settings = extractSettingsGitLog(log)
179 if not settings.has_key("depot-paths"):
180 parent = parent + 1
181 continue
182
cbae7080 183 names = read_pipe_lines("git name-rev \"--refs=refs/remotes/p4/*\" \"%s\"" % commit)
27d2d811
SH
184 if len(names) <= 0:
185 continue
186
187 # strip away the beginning of 'HEAD~42 refs/remotes/p4/foo'
188 branchPoint = names[0].strip()[len(commit) + 1:]
189 break
190
191 return [branchPoint, settings]
192
b984733c
SH
193class Command:
194 def __init__(self):
195 self.usage = "usage: %prog [options]"
8910ac0e 196 self.needsGit = True
b984733c
SH
197
198class P4Debug(Command):
86949eef 199 def __init__(self):
6ae8de88 200 Command.__init__(self)
86949eef 201 self.options = [
b1ce9447
HWN
202 optparse.make_option("--verbose", dest="verbose", action="store_true",
203 default=False),
4addad22 204 ]
c8c39116 205 self.description = "A tool to debug the output of p4 -G."
8910ac0e 206 self.needsGit = False
b1ce9447 207 self.verbose = False
86949eef
SH
208
209 def run(self, args):
b1ce9447 210 j = 0
86949eef 211 for output in p4CmdList(" ".join(args)):
b1ce9447
HWN
212 print 'Element: %d' % j
213 j += 1
86949eef 214 print output
b984733c 215 return True
86949eef 216
5834684d
SH
217class P4RollBack(Command):
218 def __init__(self):
219 Command.__init__(self)
220 self.options = [
0c66a783
SH
221 optparse.make_option("--verbose", dest="verbose", action="store_true"),
222 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
5834684d
SH
223 ]
224 self.description = "A tool to debug the multi-branch import. Don't use :)"
52102d47 225 self.verbose = False
0c66a783 226 self.rollbackLocalBranches = False
5834684d
SH
227
228 def run(self, args):
229 if len(args) != 1:
230 return False
231 maxChange = int(args[0])
0c66a783 232
ad192f28 233 if "p4ExitCode" in p4Cmd("changes -m 1"):
66a2f523
SH
234 die("Problems executing p4");
235
0c66a783
SH
236 if self.rollbackLocalBranches:
237 refPrefix = "refs/heads/"
b016d397 238 lines = read_pipe_lines("git rev-parse --symbolic --branches")
0c66a783
SH
239 else:
240 refPrefix = "refs/remotes/"
b016d397 241 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
0c66a783
SH
242
243 for line in lines:
244 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
b25b2065
HWN
245 line = line.strip()
246 ref = refPrefix + line
5834684d 247 log = extractLogMessageFromGitCommit(ref)
bb6e09b2
HWN
248 settings = extractSettingsGitLog(log)
249
250 depotPaths = settings['depot-paths']
251 change = settings['change']
252
5834684d 253 changed = False
52102d47 254
6326aa58
HWN
255 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
256 for p in depotPaths]))) == 0:
52102d47
SH
257 print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
258 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
259 continue
260
bb6e09b2 261 while change and int(change) > maxChange:
5834684d 262 changed = True
52102d47
SH
263 if self.verbose:
264 print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
5834684d
SH
265 system("git update-ref %s \"%s^\"" % (ref, ref))
266 log = extractLogMessageFromGitCommit(ref)
bb6e09b2
HWN
267 settings = extractSettingsGitLog(log)
268
269
270 depotPaths = settings['depot-paths']
271 change = settings['change']
5834684d
SH
272
273 if changed:
52102d47 274 print "%s rewound to %s" % (ref, change)
5834684d
SH
275
276 return True
277
711544b0 278class P4Submit(Command):
4f5cf76a 279 def __init__(self):
b984733c 280 Command.__init__(self)
4f5cf76a
SH
281 self.options = [
282 optparse.make_option("--continue", action="store_false", dest="firstTime"),
4addad22 283 optparse.make_option("--verbose", dest="verbose", action="store_true"),
4f5cf76a
SH
284 optparse.make_option("--origin", dest="origin"),
285 optparse.make_option("--reset", action="store_true", dest="reset"),
4f5cf76a 286 optparse.make_option("--log-substitutions", dest="substFile"),
04219c04 287 optparse.make_option("--dry-run", action="store_true"),
c1b296b9 288 optparse.make_option("--direct", dest="directSubmit", action="store_true"),
cb4f1280 289 optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
4f5cf76a
SH
290 ]
291 self.description = "Submit changes from git to the perforce depot."
c9b50e63 292 self.usage += " [name of git branch to submit into perforce depot]"
4f5cf76a
SH
293 self.firstTime = True
294 self.reset = False
295 self.interactive = True
296 self.dryRun = False
297 self.substFile = ""
298 self.firstTime = True
9512497b 299 self.origin = ""
c1b296b9 300 self.directSubmit = False
cb4f1280 301 self.trustMeLikeAFool = False
b0d10df7 302 self.verbose = False
f7baba8b 303 self.isWindows = (platform.system() == "Windows")
4f5cf76a
SH
304
305 self.logSubstitutions = {}
306 self.logSubstitutions["<enter description here>"] = "%log%"
307 self.logSubstitutions["\tDetails:"] = "\tDetails: %log%"
308
309 def check(self):
310 if len(p4CmdList("opened ...")) > 0:
311 die("You have files opened with perforce! Close them before starting the sync.")
312
313 def start(self):
314 if len(self.config) > 0 and not self.reset:
cebdf5af
HWN
315 die("Cannot start sync. Previous sync config found at %s\n"
316 "If you want to start submitting again from scratch "
317 "maybe you want to call git-p4 submit --reset" % self.configFile)
4f5cf76a
SH
318
319 commits = []
c1b296b9
SH
320 if self.directSubmit:
321 commits.append("0")
322 else:
b016d397 323 for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
b25b2065 324 commits.append(line.strip())
c1b296b9 325 commits.reverse()
4f5cf76a
SH
326
327 self.config["commits"] = commits
328
4f5cf76a
SH
329 def prepareLogMessage(self, template, message):
330 result = ""
331
332 for line in template.split("\n"):
333 if line.startswith("#"):
334 result += line + "\n"
335 continue
336
337 substituted = False
338 for key in self.logSubstitutions.keys():
339 if line.find(key) != -1:
340 value = self.logSubstitutions[key]
341 value = value.replace("%log%", message)
342 if value != "@remove@":
343 result += line.replace(key, value) + "\n"
344 substituted = True
345 break
346
347 if not substituted:
348 result += line + "\n"
349
350 return result
351
7cb5cbef 352 def applyCommit(self, id):
c1b296b9
SH
353 if self.directSubmit:
354 print "Applying local change in working directory/index"
355 diff = self.diffStatus
356 else:
b016d397
HWN
357 print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
358 diff = read_pipe_lines("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id))
4f5cf76a
SH
359 filesToAdd = set()
360 filesToDelete = set()
d336c158 361 editedFiles = set()
4f5cf76a
SH
362 for line in diff:
363 modifier = line[0]
364 path = line[1:].strip()
365 if modifier == "M":
d336c158
SH
366 system("p4 edit \"%s\"" % path)
367 editedFiles.add(path)
4f5cf76a
SH
368 elif modifier == "A":
369 filesToAdd.add(path)
370 if path in filesToDelete:
371 filesToDelete.remove(path)
372 elif modifier == "D":
373 filesToDelete.add(path)
374 if path in filesToAdd:
375 filesToAdd.remove(path)
376 else:
377 die("unknown modifier %s for %s" % (modifier, path))
378
c1b296b9
SH
379 if self.directSubmit:
380 diffcmd = "cat \"%s\"" % self.diffFile
381 else:
382 diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
47a130b7 383 patchcmd = diffcmd + " | git apply "
c1b296b9
SH
384 tryPatchCmd = patchcmd + "--check -"
385 applyPatchCmd = patchcmd + "--check --apply -"
51a2640a 386
47a130b7 387 if os.system(tryPatchCmd) != 0:
51a2640a
SH
388 print "Unfortunately applying the change failed!"
389 print "What do you want to do?"
390 response = "x"
391 while response != "s" and response != "a" and response != "w":
cebdf5af
HWN
392 response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
393 "and with .rej files / [w]rite the patch to a file (patch.txt) ")
51a2640a
SH
394 if response == "s":
395 print "Skipping! Good luck with the next patches..."
396 return
397 elif response == "a":
47a130b7 398 os.system(applyPatchCmd)
51a2640a
SH
399 if len(filesToAdd) > 0:
400 print "You may also want to call p4 add on the following files:"
401 print " ".join(filesToAdd)
402 if len(filesToDelete):
403 print "The following files should be scheduled for deletion with p4 delete:"
404 print " ".join(filesToDelete)
cebdf5af
HWN
405 die("Please resolve and submit the conflict manually and "
406 + "continue afterwards with git-p4 submit --continue")
51a2640a
SH
407 elif response == "w":
408 system(diffcmd + " > patch.txt")
409 print "Patch saved to patch.txt in %s !" % self.clientPath
cebdf5af
HWN
410 die("Please resolve and submit the conflict manually and "
411 "continue afterwards with git-p4 submit --continue")
51a2640a 412
47a130b7 413 system(applyPatchCmd)
4f5cf76a
SH
414
415 for f in filesToAdd:
e6b711f0 416 system("p4 add \"%s\"" % f)
4f5cf76a 417 for f in filesToDelete:
e6b711f0
SH
418 system("p4 revert \"%s\"" % f)
419 system("p4 delete \"%s\"" % f)
4f5cf76a 420
c1b296b9
SH
421 logMessage = ""
422 if not self.directSubmit:
423 logMessage = extractLogMessageFromGitCommit(id)
424 logMessage = logMessage.replace("\n", "\n\t")
f7baba8b
MSO
425 if self.isWindows:
426 logMessage = logMessage.replace("\n", "\r\n")
b25b2065 427 logMessage = logMessage.strip()
4f5cf76a 428
b016d397 429 template = read_pipe("p4 change -o")
4f5cf76a
SH
430
431 if self.interactive:
432 submitTemplate = self.prepareLogMessage(template, logMessage)
b016d397 433 diff = read_pipe("p4 diff -du ...")
4f5cf76a
SH
434
435 for newFile in filesToAdd:
436 diff += "==== new file ====\n"
437 diff += "--- /dev/null\n"
438 diff += "+++ %s\n" % newFile
439 f = open(newFile, "r")
440 for line in f.readlines():
441 diff += "+" + line
442 f.close()
443
25df95cc
SH
444 separatorLine = "######## everything below this line is just the diff #######"
445 if platform.system() == "Windows":
446 separatorLine += "\r"
447 separatorLine += "\n"
4f5cf76a
SH
448
449 response = "e"
cb4f1280
SH
450 if self.trustMeLikeAFool:
451 response = "y"
452
53150250 453 firstIteration = True
4f5cf76a 454 while response == "e":
53150250 455 if not firstIteration:
d336c158 456 response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
53150250 457 firstIteration = False
4f5cf76a
SH
458 if response == "e":
459 [handle, fileName] = tempfile.mkstemp()
460 tmpFile = os.fdopen(handle, "w+")
53150250 461 tmpFile.write(submitTemplate + separatorLine + diff)
4f5cf76a 462 tmpFile.close()
25df95cc
SH
463 defaultEditor = "vi"
464 if platform.system() == "Windows":
465 defaultEditor = "notepad"
466 editor = os.environ.get("EDITOR", defaultEditor);
4f5cf76a 467 system(editor + " " + fileName)
25df95cc 468 tmpFile = open(fileName, "rb")
53150250 469 message = tmpFile.read()
4f5cf76a
SH
470 tmpFile.close()
471 os.remove(fileName)
53150250 472 submitTemplate = message[:message.index(separatorLine)]
f7baba8b
MSO
473 if self.isWindows:
474 submitTemplate = submitTemplate.replace("\r\n", "\n")
4f5cf76a
SH
475
476 if response == "y" or response == "yes":
477 if self.dryRun:
478 print submitTemplate
479 raw_input("Press return to continue...")
480 else:
7944f142
SH
481 if self.directSubmit:
482 print "Submitting to git first"
483 os.chdir(self.oldWorkingDirectory)
b016d397 484 write_pipe("git commit -a -F -", submitTemplate)
7944f142
SH
485 os.chdir(self.clientPath)
486
b016d397 487 write_pipe("p4 submit -i", submitTemplate)
d336c158
SH
488 elif response == "s":
489 for f in editedFiles:
490 system("p4 revert \"%s\"" % f);
491 for f in filesToAdd:
492 system("p4 revert \"%s\"" % f);
493 system("rm %s" %f)
494 for f in filesToDelete:
495 system("p4 delete \"%s\"" % f);
496 return
4f5cf76a
SH
497 else:
498 print "Not submitting!"
499 self.interactive = False
500 else:
501 fileName = "submit.txt"
502 file = open(fileName, "w+")
503 file.write(self.prepareLogMessage(template, logMessage))
504 file.close()
cebdf5af
HWN
505 print ("Perforce submit template written as %s. "
506 + "Please review/edit and then use p4 submit -i < %s to submit directly!"
507 % (fileName, fileName))
4f5cf76a
SH
508
509 def run(self, args):
c9b50e63
SH
510 if len(args) == 0:
511 self.master = currentGitBranch()
4280e533 512 if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
c9b50e63
SH
513 die("Detecting current git branch failed!")
514 elif len(args) == 1:
515 self.master = args[0]
516 else:
517 return False
518
27d2d811
SH
519 [upstream, settings] = findUpstreamBranchPoint()
520 depotPath = settings['depot-paths'][0]
521 if len(self.origin) == 0:
522 self.origin = upstream
a3fdd579
SH
523
524 if self.verbose:
525 print "Origin branch is " + self.origin
9512497b
SH
526
527 if len(depotPath) == 0:
528 print "Internal error: cannot locate perforce depot path from existing branches"
529 sys.exit(128)
530
51a2640a 531 self.clientPath = p4Where(depotPath)
9512497b 532
51a2640a 533 if len(self.clientPath) == 0:
9512497b
SH
534 print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
535 sys.exit(128)
536
51a2640a 537 print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
7944f142 538 self.oldWorkingDirectory = os.getcwd()
c1b296b9
SH
539
540 if self.directSubmit:
b016d397 541 self.diffStatus = read_pipe_lines("git diff -r --name-status HEAD")
cbf5efa6
SH
542 if len(self.diffStatus) == 0:
543 print "No changes in working directory to submit."
544 return True
b016d397 545 patch = read_pipe("git diff -p --binary --diff-filter=ACMRTUXB HEAD")
b86f7378 546 self.diffFile = self.gitdir + "/p4-git-diff"
c1b296b9
SH
547 f = open(self.diffFile, "wb")
548 f.write(patch)
549 f.close();
550
51a2640a
SH
551 os.chdir(self.clientPath)
552 response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
9512497b
SH
553 if response == "y" or response == "yes":
554 system("p4 sync ...")
555
4f5cf76a
SH
556 if self.reset:
557 self.firstTime = True
558
559 if len(self.substFile) > 0:
560 for line in open(self.substFile, "r").readlines():
b25b2065 561 tokens = line.strip().split("=")
4f5cf76a
SH
562 self.logSubstitutions[tokens[0]] = tokens[1]
563
4f5cf76a 564 self.check()
b86f7378 565 self.configFile = self.gitdir + "/p4-git-sync.cfg"
4f5cf76a
SH
566 self.config = shelve.open(self.configFile, writeback=True)
567
568 if self.firstTime:
569 self.start()
570
571 commits = self.config.get("commits", [])
572
573 while len(commits) > 0:
574 self.firstTime = False
575 commit = commits[0]
576 commits = commits[1:]
577 self.config["commits"] = commits
7cb5cbef 578 self.applyCommit(commit)
4f5cf76a
SH
579 if not self.interactive:
580 break
581
582 self.config.close()
583
c1b296b9
SH
584 if self.directSubmit:
585 os.remove(self.diffFile)
586
4f5cf76a
SH
587 if len(commits) == 0:
588 if self.firstTime:
589 print "No changes found to apply between %s and current HEAD" % self.origin
590 else:
591 print "All changes applied!"
7944f142
SH
592 os.chdir(self.oldWorkingDirectory)
593 response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
80b5910f 594 if response == "y" or response == "yes":
80b5910f
SH
595 rebase = P4Rebase()
596 rebase.run([])
4f5cf76a
SH
597 os.remove(self.configFile)
598
b984733c
SH
599 return True
600
711544b0 601class P4Sync(Command):
b984733c
SH
602 def __init__(self):
603 Command.__init__(self)
604 self.options = [
605 optparse.make_option("--branch", dest="branch"),
606 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
607 optparse.make_option("--changesfile", dest="changesFile"),
608 optparse.make_option("--silent", dest="silent", action="store_true"),
ef48f909 609 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
a028a98e 610 optparse.make_option("--verbose", dest="verbose", action="store_true"),
d2c6dd30
HWN
611 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
612 help="Import into refs/heads/ , not refs/remotes"),
8b41a97f 613 optparse.make_option("--max-changes", dest="maxChanges"),
86dff6b6
HWN
614 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
615 help="Keep entire BRANCH/DIR/SUBDIR prefix during import")
b984733c
SH
616 ]
617 self.description = """Imports from Perforce into a git repository.\n
618 example:
619 //depot/my/project/ -- to import the current head
620 //depot/my/project/@all -- to import everything
621 //depot/my/project/@1,6 -- to import only from revision 1 to 6
622
623 (a ... is not needed in the path p4 specification, it's added implicitly)"""
624
625 self.usage += " //depot/path[@revRange]"
b984733c 626 self.silent = False
b984733c
SH
627 self.createdBranches = Set()
628 self.committedChanges = Set()
569d1bd4 629 self.branch = ""
b984733c 630 self.detectBranches = False
cb53e1f8 631 self.detectLabels = False
b984733c 632 self.changesFile = ""
01265103 633 self.syncWithOrigin = True
4b97ffb1 634 self.verbose = False
a028a98e 635 self.importIntoRemotes = True
01a9c9c5 636 self.maxChanges = ""
c1f9197f 637 self.isWindows = (platform.system() == "Windows")
8b41a97f 638 self.keepRepoPath = False
6326aa58 639 self.depotPaths = None
3c699645 640 self.p4BranchesInGit = []
b984733c 641
01265103
SH
642 if gitConfig("git-p4.syncFromOrigin") == "false":
643 self.syncWithOrigin = False
644
b984733c
SH
645 def extractFilesFromCommit(self, commit):
646 files = []
647 fnum = 0
648 while commit.has_key("depotFile%s" % fnum):
649 path = commit["depotFile%s" % fnum]
6326aa58
HWN
650
651 found = [p for p in self.depotPaths
652 if path.startswith (p)]
653 if not found:
b984733c
SH
654 fnum = fnum + 1
655 continue
656
657 file = {}
658 file["path"] = path
659 file["rev"] = commit["rev%s" % fnum]
660 file["action"] = commit["action%s" % fnum]
661 file["type"] = commit["type%s" % fnum]
662 files.append(file)
663 fnum = fnum + 1
664 return files
665
6326aa58 666 def stripRepoPath(self, path, prefixes):
8b41a97f 667 if self.keepRepoPath:
6326aa58
HWN
668 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]
669
670 for p in prefixes:
671 if path.startswith(p):
672 path = path[len(p):]
8b41a97f 673
6326aa58 674 return path
6754a299 675
71b112d4 676 def splitFilesIntoBranches(self, commit):
d5904674 677 branches = {}
71b112d4
SH
678 fnum = 0
679 while commit.has_key("depotFile%s" % fnum):
680 path = commit["depotFile%s" % fnum]
6326aa58
HWN
681 found = [p for p in self.depotPaths
682 if path.startswith (p)]
683 if not found:
71b112d4
SH
684 fnum = fnum + 1
685 continue
686
687 file = {}
688 file["path"] = path
689 file["rev"] = commit["rev%s" % fnum]
690 file["action"] = commit["action%s" % fnum]
691 file["type"] = commit["type%s" % fnum]
692 fnum = fnum + 1
693
6326aa58 694 relPath = self.stripRepoPath(path, self.depotPaths)
b984733c 695
4b97ffb1 696 for branch in self.knownBranches.keys():
6754a299
HWN
697
698 # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
699 if relPath.startswith(branch + "/"):
d5904674
SH
700 if branch not in branches:
701 branches[branch] = []
71b112d4 702 branches[branch].append(file)
6555b2cc 703 break
b984733c
SH
704
705 return branches
706
6a49f8e2
HWN
707 ## Should move this out, doesn't use SELF.
708 def readP4Files(self, files):
b1ce9447 709 files = [f for f in files
982bb8a3 710 if f['action'] != 'delete']
6a49f8e2 711
b1ce9447 712 if not files:
f2eda79f
HWN
713 return
714
da4a6601
BS
715 # We cannot put all the files on the command line
716 # OS have limitations on the max lenght of arguments
717 # POSIX says it's 4096 bytes, default for Linux seems to be 130 K.
718 # and all OS from the table below seems to be higher than POSIX.
719 # See http://www.in-ulm.de/~mascheck/various/argmax/
48b4c3d5
MSO
720 if (self.isWindows):
721 argmax = 2000
722 else:
723 argmax = min(4000, os.sysconf('SC_ARG_MAX'))
724
da4a6601
BS
725 chunk = ''
726 filedata = []
727 for i in xrange(len(files)):
728 f = files[i]
729 chunk += '"%s#%s" ' % (f['path'], f['rev'])
730 if len(chunk) > argmax or i == len(files)-1:
731 data = p4CmdList('print %s' % chunk)
732 if "p4ExitCode" in data[0]:
733 die("Problems executing p4. Error: [%d]." % (data[0]['p4ExitCode']));
734 filedata.extend(data)
735 chunk = ''
6a49f8e2 736
d2c6dd30
HWN
737 j = 0;
738 contents = {}
b1ce9447 739 while j < len(filedata):
d2c6dd30 740 stat = filedata[j]
b1ce9447
HWN
741 j += 1
742 text = ''
7530a40c
HWN
743 while j < len(filedata) and filedata[j]['code'] in ('text',
744 'binary'):
b1ce9447
HWN
745 text += filedata[j]['data']
746 j += 1
6a49f8e2 747
1b9a4684
HWN
748
749 if not stat.has_key('depotFile'):
750 sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
751 continue
752
b1ce9447 753 contents[stat['depotFile']] = text
6a49f8e2 754
d2c6dd30
HWN
755 for f in files:
756 assert not f.has_key('data')
757 f['data'] = contents[f['path']]
6a49f8e2 758
6326aa58 759 def commit(self, details, files, branch, branchPrefixes, parent = ""):
b984733c
SH
760 epoch = details["time"]
761 author = details["user"]
762
4b97ffb1
SH
763 if self.verbose:
764 print "commit into %s" % branch
765
96e07dd2
HWN
766 # start with reading files; if that fails, we should not
767 # create a commit.
768 new_files = []
769 for f in files:
770 if [p for p in branchPrefixes if f['path'].startswith(p)]:
771 new_files.append (f)
772 else:
773 sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
774 files = new_files
775 self.readP4Files(files)
776
777
778
779
b984733c 780 self.gitStream.write("commit %s\n" % branch)
6a49f8e2 781# gitStream.write("mark :%s\n" % details["change"])
b984733c
SH
782 self.committedChanges.add(int(details["change"]))
783 committer = ""
b607e71e
SH
784 if author not in self.users:
785 self.getUserMapFromPerforceServer()
b984733c 786 if author in self.users:
0828ab14 787 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
b984733c 788 else:
0828ab14 789 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
b984733c
SH
790
791 self.gitStream.write("committer %s\n" % committer)
792
793 self.gitStream.write("data <<EOT\n")
794 self.gitStream.write(details["desc"])
6581de09
SH
795 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s"
796 % (','.join (branchPrefixes), details["change"]))
797 if len(details['options']) > 0:
798 self.gitStream.write(": options = %s" % details['options'])
799 self.gitStream.write("]\nEOT\n\n")
b984733c
SH
800
801 if len(parent) > 0:
4b97ffb1
SH
802 if self.verbose:
803 print "parent %s" % parent
b984733c
SH
804 self.gitStream.write("from %s\n" % parent)
805
6a49f8e2 806 for file in files:
b984733c 807 if file["type"] == "apple":
6a49f8e2 808 print "\nfile %s is a strange apple file that forks. Ignoring!" % file['path']
b984733c
SH
809 continue
810
6a49f8e2
HWN
811 relPath = self.stripRepoPath(file['path'], branchPrefixes)
812 if file["action"] == "delete":
b984733c
SH
813 self.gitStream.write("D %s\n" % relPath)
814 else:
815 mode = 644
816 if file["type"].startswith("x"):
817 mode = 755
818
6a49f8e2 819 data = file['data']
b984733c 820
c1f9197f
MSO
821 if self.isWindows and file["type"].endswith("text"):
822 data = data.replace("\r\n", "\n")
823
7530a40c 824 self.gitStream.write("M %d inline %s\n" % (mode, relPath))
b984733c
SH
825 self.gitStream.write("data %s\n" % len(data))
826 self.gitStream.write(data)
827 self.gitStream.write("\n")
828
829 self.gitStream.write("\n")
830
1f4ba1cb
SH
831 change = int(details["change"])
832
9bda3a85 833 if self.labels.has_key(change):
1f4ba1cb
SH
834 label = self.labels[change]
835 labelDetails = label[0]
836 labelRevisions = label[1]
71b112d4
SH
837 if self.verbose:
838 print "Change %s is labelled %s" % (change, labelDetails)
1f4ba1cb 839
6326aa58
HWN
840 files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
841 for p in branchPrefixes]))
1f4ba1cb
SH
842
843 if len(files) == len(labelRevisions):
844
845 cleanedFiles = {}
846 for info in files:
847 if info["action"] == "delete":
848 continue
849 cleanedFiles[info["depotFile"]] = info["rev"]
850
851 if cleanedFiles == labelRevisions:
852 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
853 self.gitStream.write("from %s\n" % branch)
854
855 owner = labelDetails["Owner"]
856 tagger = ""
857 if author in self.users:
858 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
859 else:
860 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
861 self.gitStream.write("tagger %s\n" % tagger)
862 self.gitStream.write("data <<EOT\n")
863 self.gitStream.write(labelDetails["Description"])
864 self.gitStream.write("EOT\n\n")
865
866 else:
a46668fa 867 if not self.silent:
cebdf5af
HWN
868 print ("Tag %s does not match with change %s: files do not match."
869 % (labelDetails["label"], change))
1f4ba1cb
SH
870
871 else:
a46668fa 872 if not self.silent:
cebdf5af
HWN
873 print ("Tag %s does not match with change %s: file count is different."
874 % (labelDetails["label"], change))
b984733c 875
183b8ef8 876 def getUserCacheFilename(self):
a3287be5 877 return os.environ["HOME"] + "/.gitp4-usercache.txt"
183b8ef8 878
b607e71e 879 def getUserMapFromPerforceServer(self):
ebd81168
SH
880 if self.userMapFromPerforceServer:
881 return
b984733c
SH
882 self.users = {}
883
884 for output in p4CmdList("users"):
885 if not output.has_key("User"):
886 continue
887 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
888
183b8ef8
HWN
889
890 s = ''
891 for (key, val) in self.users.items():
892 s += "%s\t%s\n" % (key, val)
893
894 open(self.getUserCacheFilename(), "wb").write(s)
ebd81168 895 self.userMapFromPerforceServer = True
b607e71e
SH
896
897 def loadUserMapFromCache(self):
898 self.users = {}
ebd81168 899 self.userMapFromPerforceServer = False
b607e71e 900 try:
183b8ef8 901 cache = open(self.getUserCacheFilename(), "rb")
b607e71e
SH
902 lines = cache.readlines()
903 cache.close()
904 for line in lines:
b25b2065 905 entry = line.strip().split("\t")
b607e71e
SH
906 self.users[entry[0]] = entry[1]
907 except IOError:
908 self.getUserMapFromPerforceServer()
909
1f4ba1cb
SH
910 def getLabels(self):
911 self.labels = {}
912
6326aa58 913 l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
10c3211b 914 if len(l) > 0 and not self.silent:
6326aa58 915 print "Finding files belonging to labels in %s" % `self.depotPath`
01ce1fe9
SH
916
917 for output in l:
1f4ba1cb
SH
918 label = output["label"]
919 revisions = {}
920 newestChange = 0
71b112d4
SH
921 if self.verbose:
922 print "Querying files for label %s" % label
6326aa58
HWN
923 for file in p4CmdList("files "
924 + ' '.join (["%s...@%s" % (p, label)
925 for p in self.depotPaths])):
1f4ba1cb
SH
926 revisions[file["depotFile"]] = file["rev"]
927 change = int(file["change"])
928 if change > newestChange:
929 newestChange = change
930
9bda3a85
SH
931 self.labels[newestChange] = [output, revisions]
932
933 if self.verbose:
934 print "Label changes: %s" % self.labels.keys()
1f4ba1cb 935
86dff6b6
HWN
936 def guessProjectName(self):
937 for p in self.depotPaths:
6e5295c4
SH
938 if p.endswith("/"):
939 p = p[:-1]
940 p = p[p.strip().rfind("/") + 1:]
941 if not p.endswith("/"):
942 p += "/"
943 return p
86dff6b6 944
4b97ffb1 945 def getBranchMapping(self):
6555b2cc
SH
946 lostAndFoundBranches = set()
947
4b97ffb1
SH
948 for info in p4CmdList("branches"):
949 details = p4Cmd("branch -o %s" % info["branch"])
950 viewIdx = 0
951 while details.has_key("View%s" % viewIdx):
952 paths = details["View%s" % viewIdx].split(" ")
953 viewIdx = viewIdx + 1
954 # require standard //depot/foo/... //depot/bar/... mapping
955 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
956 continue
957 source = paths[0]
958 destination = paths[1]
6509e19c
SH
959 ## HACK
960 if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]):
961 source = source[len(self.depotPaths[0]):-4]
962 destination = destination[len(self.depotPaths[0]):-4]
6555b2cc 963
1a2edf4e
SH
964 if destination in self.knownBranches:
965 if not self.silent:
966 print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
967 print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
968 continue
969
6555b2cc
SH
970 self.knownBranches[destination] = source
971
972 lostAndFoundBranches.discard(destination)
973
29bdbac1 974 if source not in self.knownBranches:
6555b2cc
SH
975 lostAndFoundBranches.add(source)
976
977
978 for branch in lostAndFoundBranches:
979 self.knownBranches[branch] = branch
29bdbac1
SH
980
981 def listExistingP4GitBranches(self):
982 self.p4BranchesInGit = []
983
a028a98e
SH
984 cmdline = "git rev-parse --symbolic "
985 if self.importIntoRemotes:
986 cmdline += " --remotes"
987 else:
988 cmdline += " --branches"
989
b016d397 990 for line in read_pipe_lines(cmdline):
cfeb59be 991 line = line.strip()
b25b2065 992
86dff6b6 993 ## only import to p4/
c4b33253 994 if not line.startswith('p4/') or line == "p4/HEAD":
86dff6b6
HWN
995 continue
996 branch = line
5265bfcb
HWN
997
998 # strip off p4
999 branch = re.sub ("^p4/", "", line)
b76f0565 1000
57284050 1001 self.p4BranchesInGit.append(branch)
b76f0565 1002 self.initialParents[self.refPrefix + branch] = parseRevision(line)
4b97ffb1 1003
abcd790f 1004 def createOrUpdateBranchesFromOrigin(self):
d1874ed3 1005 if not self.silent:
86dff6b6
HWN
1006 print ("Creating/updating branch(es) in %s based on origin branch(es)"
1007 % self.refPrefix)
d1874ed3 1008
cae7b732
SH
1009 originPrefix = "origin/p4/"
1010
4addad22
HWN
1011 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
1012 line = line.strip()
cae7b732 1013 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
d1874ed3 1014 continue
65c5f3e3 1015
cae7b732 1016 headName = line[len(originPrefix):]
d1874ed3 1017 remoteHead = self.refPrefix + headName
cae7b732 1018 originHead = line
abcd790f 1019
bb6e09b2
HWN
1020 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
1021 if (not original.has_key('depot-paths')
1022 or not original.has_key('change')):
65c5f3e3
SH
1023 continue
1024
abcd790f 1025 update = False
4280e533 1026 if not gitBranchExists(remoteHead):
d1874ed3
SH
1027 if self.verbose:
1028 print "creating %s" % remoteHead
abcd790f
SH
1029 update = True
1030 else:
a3fdd579 1031 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
bb6e09b2
HWN
1032 if settings.has_key('change') > 0:
1033 if settings['depot-paths'] == original['depot-paths']:
1034 originP4Change = int(original['change'])
1035 p4Change = int(settings['change'])
abcd790f 1036 if originP4Change > p4Change:
bb6e09b2
HWN
1037 print ("%s (%s) is newer than %s (%s). "
1038 "Updating p4 branch from origin."
1039 % (originHead, originP4Change,
1040 remoteHead, p4Change))
abcd790f
SH
1041 update = True
1042 else:
bb6e09b2
HWN
1043 print ("Ignoring: %s was imported from %s while "
1044 "%s was imported from %s"
1045 % (originHead, ','.join(original['depot-paths']),
1046 remoteHead, ','.join(settings['depot-paths'])))
abcd790f
SH
1047
1048 if update:
1049 system("git update-ref %s %s" % (remoteHead, originHead))
d1874ed3 1050
bb6e09b2
HWN
1051 def updateOptionDict(self, d):
1052 option_keys = {}
1053 if self.keepRepoPath:
1054 option_keys['keepRepoPath'] = 1
1055
1056 d["options"] = ' '.join(sorted(option_keys.keys()))
1057
1058 def readOptions(self, d):
1059 self.keepRepoPath = (d.has_key('options')
1060 and ('keepRepoPath' in d['options']))
6326aa58 1061
b984733c 1062 def run(self, args):
6326aa58 1063 self.depotPaths = []
179caebf
SH
1064 self.changeRange = ""
1065 self.initialParent = ""
6326aa58 1066 self.previousDepotPaths = []
ce6f33c8 1067
29bdbac1
SH
1068 # map from branch depot path to parent branch
1069 self.knownBranches = {}
1070 self.initialParents = {}
cae7b732 1071 self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
a43ff00c
SH
1072 if not self.syncWithOrigin:
1073 self.hasOrigin = False
29bdbac1 1074
a028a98e
SH
1075 if self.importIntoRemotes:
1076 self.refPrefix = "refs/remotes/p4/"
1077 else:
db775559 1078 self.refPrefix = "refs/heads/p4/"
a028a98e 1079
cebdf5af
HWN
1080 if self.syncWithOrigin and self.hasOrigin:
1081 if not self.silent:
1082 print "Syncing with origin first by calling git fetch origin"
1083 system("git fetch origin")
10f880f8 1084
569d1bd4 1085 if len(self.branch) == 0:
db775559 1086 self.branch = self.refPrefix + "master"
a028a98e 1087 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
48df6fd8 1088 system("git update-ref %s refs/heads/p4" % self.branch)
48df6fd8 1089 system("git branch -D p4");
faf1bd20 1090 # create it /after/ importing, when master exists
a028a98e 1091 if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
a3c55c09 1092 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
967f72e2 1093
6a49f8e2
HWN
1094 # TODO: should always look at previous commits,
1095 # merge with previous imports, if possible.
1096 if args == []:
d414c74a
SH
1097 if self.hasOrigin:
1098 self.createOrUpdateBranchesFromOrigin()
abcd790f
SH
1099 self.listExistingP4GitBranches()
1100
1101 if len(self.p4BranchesInGit) > 1:
1102 if not self.silent:
1103 print "Importing from/into multiple branches"
1104 self.detectBranches = True
967f72e2 1105
29bdbac1
SH
1106 if self.verbose:
1107 print "branches: %s" % self.p4BranchesInGit
1108
1109 p4Change = 0
1110 for branch in self.p4BranchesInGit:
cebdf5af 1111 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
bb6e09b2
HWN
1112
1113 settings = extractSettingsGitLog(logMsg)
29bdbac1 1114
bb6e09b2
HWN
1115 self.readOptions(settings)
1116 if (settings.has_key('depot-paths')
1117 and settings.has_key ('change')):
1118 change = int(settings['change']) + 1
29bdbac1
SH
1119 p4Change = max(p4Change, change)
1120
bb6e09b2
HWN
1121 depotPaths = sorted(settings['depot-paths'])
1122 if self.previousDepotPaths == []:
6326aa58 1123 self.previousDepotPaths = depotPaths
29bdbac1 1124 else:
6326aa58
HWN
1125 paths = []
1126 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
583e1707 1127 for i in range(0, min(len(cur), len(prev))):
6326aa58 1128 if cur[i] <> prev[i]:
583e1707 1129 i = i - 1
6326aa58
HWN
1130 break
1131
583e1707 1132 paths.append (cur[:i + 1])
6326aa58
HWN
1133
1134 self.previousDepotPaths = paths
29bdbac1
SH
1135
1136 if p4Change > 0:
bb6e09b2 1137 self.depotPaths = sorted(self.previousDepotPaths)
d5904674 1138 self.changeRange = "@%s,#head" % p4Change
330f53b8
SH
1139 if not self.detectBranches:
1140 self.initialParent = parseRevision(self.branch)
341dc1c1 1141 if not self.silent and not self.detectBranches:
967f72e2 1142 print "Performing incremental import into %s git branch" % self.branch
569d1bd4 1143
f9162f6a
SH
1144 if not self.branch.startswith("refs/"):
1145 self.branch = "refs/heads/" + self.branch
179caebf 1146
6326aa58 1147 if len(args) == 0 and self.depotPaths:
b984733c 1148 if not self.silent:
6326aa58 1149 print "Depot paths: %s" % ' '.join(self.depotPaths)
b984733c 1150 else:
6326aa58 1151 if self.depotPaths and self.depotPaths != args:
cebdf5af 1152 print ("previous import used depot path %s and now %s was specified. "
6326aa58
HWN
1153 "This doesn't work!" % (' '.join (self.depotPaths),
1154 ' '.join (args)))
b984733c 1155 sys.exit(1)
6326aa58 1156
bb6e09b2 1157 self.depotPaths = sorted(args)
b984733c 1158
b984733c
SH
1159 self.revision = ""
1160 self.users = {}
b984733c 1161
6326aa58
HWN
1162 newPaths = []
1163 for p in self.depotPaths:
1164 if p.find("@") != -1:
1165 atIdx = p.index("@")
1166 self.changeRange = p[atIdx:]
1167 if self.changeRange == "@all":
1168 self.changeRange = ""
6a49f8e2 1169 elif ',' not in self.changeRange:
6326aa58
HWN
1170 self.revision = self.changeRange
1171 self.changeRange = ""
1172 p = p[0:atIdx]
1173 elif p.find("#") != -1:
1174 hashIdx = p.index("#")
1175 self.revision = p[hashIdx:]
1176 p = p[0:hashIdx]
1177 elif self.previousDepotPaths == []:
1178 self.revision = "#head"
1179
1180 p = re.sub ("\.\.\.$", "", p)
1181 if not p.endswith("/"):
1182 p += "/"
1183
1184 newPaths.append(p)
1185
1186 self.depotPaths = newPaths
1187
b984733c 1188
b607e71e 1189 self.loadUserMapFromCache()
cb53e1f8
SH
1190 self.labels = {}
1191 if self.detectLabels:
1192 self.getLabels();
b984733c 1193
4b97ffb1 1194 if self.detectBranches:
df450923
SH
1195 ## FIXME - what's a P4 projectName ?
1196 self.projectName = self.guessProjectName()
1197
1198 if not self.hasOrigin:
1199 self.getBranchMapping();
29bdbac1
SH
1200 if self.verbose:
1201 print "p4-git branches: %s" % self.p4BranchesInGit
1202 print "initial parents: %s" % self.initialParents
1203 for b in self.p4BranchesInGit:
1204 if b != "master":
6326aa58
HWN
1205
1206 ## FIXME
29bdbac1
SH
1207 b = b[len(self.projectName):]
1208 self.createdBranches.add(b)
4b97ffb1 1209
f291b4e3 1210 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
b984733c 1211
cebdf5af 1212 importProcess = subprocess.Popen(["git", "fast-import"],
6326aa58
HWN
1213 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1214 stderr=subprocess.PIPE);
08483580
SH
1215 self.gitOutput = importProcess.stdout
1216 self.gitStream = importProcess.stdin
1217 self.gitError = importProcess.stderr
b984733c 1218
86dff6b6 1219 if self.revision:
a9d1a27a 1220 print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), self.revision, self.branch)
b984733c
SH
1221
1222 details = { "user" : "git perforce import user", "time" : int(time.time()) }
cebdf5af 1223 details["desc"] = ("Initial import of %s from the state at revision %s"
6326aa58 1224 % (' '.join(self.depotPaths), self.revision))
b984733c
SH
1225 details["change"] = self.revision
1226 newestRevision = 0
1227
1228 fileCnt = 0
6326aa58
HWN
1229 for info in p4CmdList("files "
1230 + ' '.join(["%s...%s"
1231 % (p, self.revision)
1232 for p in self.depotPaths])):
96e07dd2 1233
d2c6dd30
HWN
1234 if info['code'] == 'error':
1235 sys.stderr.write("p4 returned an error: %s\n"
1236 % info['data'])
1237 sys.exit(1)
1238
1239
b984733c
SH
1240 change = int(info["change"])
1241 if change > newestRevision:
1242 newestRevision = change
1243
1244 if info["action"] == "delete":
c45b1cfe
SH
1245 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1246 #fileCnt = fileCnt + 1
b984733c
SH
1247 continue
1248
96e07dd2 1249 for prop in ["depotFile", "rev", "action", "type" ]:
b984733c
SH
1250 details["%s%s" % (prop, fileCnt)] = info[prop]
1251
1252 fileCnt = fileCnt + 1
1253
1254 details["change"] = newestRevision
bb6e09b2 1255 self.updateOptionDict(details)
b984733c 1256 try:
6326aa58 1257 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
c715706b 1258 except IOError:
fd4ca86a 1259 print "IO error with git fast-import. Is your git version recent enough?"
b984733c
SH
1260 print self.gitError.read()
1261
1262 else:
1263 changes = []
1264
0828ab14 1265 if len(self.changesFile) > 0:
b984733c
SH
1266 output = open(self.changesFile).readlines()
1267 changeSet = Set()
1268 for line in output:
1269 changeSet.add(int(line))
1270
1271 for change in changeSet:
1272 changes.append(change)
1273
1274 changes.sort()
1275 else:
29bdbac1 1276 if self.verbose:
86dff6b6 1277 print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
6326aa58
HWN
1278 self.changeRange)
1279 assert self.depotPaths
1280 output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, self.changeRange)
1281 for p in self.depotPaths]))
b984733c
SH
1282
1283 for line in output:
1284 changeNum = line.split(" ")[1]
1285 changes.append(changeNum)
1286
1287 changes.reverse()
1288
01a9c9c5
SH
1289 if len(self.maxChanges) > 0:
1290 changes = changes[0:min(int(self.maxChanges), len(changes))]
1291
b984733c 1292 if len(changes) == 0:
0828ab14 1293 if not self.silent:
341dc1c1 1294 print "No changes to import!"
1f52af6c 1295 return True
b984733c 1296
a9d1a27a
SH
1297 if not self.silent and not self.detectBranches:
1298 print "Import destination: %s" % self.branch
1299
341dc1c1
SH
1300 self.updatedBranches = set()
1301
b984733c
SH
1302 cnt = 1
1303 for change in changes:
1304 description = p4Cmd("describe %s" % change)
bb6e09b2 1305 self.updateOptionDict(description)
b984733c 1306
0828ab14 1307 if not self.silent:
341dc1c1 1308 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
b984733c
SH
1309 sys.stdout.flush()
1310 cnt = cnt + 1
1311
1312 try:
b984733c 1313 if self.detectBranches:
71b112d4 1314 branches = self.splitFilesIntoBranches(description)
d5904674 1315 for branch in branches.keys():
6326aa58
HWN
1316 ## HACK --hwn
1317 branchPrefix = self.depotPaths[0] + branch + "/"
b984733c 1318
b984733c 1319 parent = ""
4b97ffb1 1320
d5904674 1321 filesForCommit = branches[branch]
4b97ffb1 1322
29bdbac1
SH
1323 if self.verbose:
1324 print "branch is %s" % branch
1325
341dc1c1
SH
1326 self.updatedBranches.add(branch)
1327
8f9b2e08 1328 if branch not in self.createdBranches:
b984733c 1329 self.createdBranches.add(branch)
4b97ffb1 1330 parent = self.knownBranches[branch]
b984733c
SH
1331 if parent == branch:
1332 parent = ""
29bdbac1
SH
1333 elif self.verbose:
1334 print "parent determined through known branches: %s" % parent
b984733c 1335
8f9b2e08
SH
1336 # main branch? use master
1337 if branch == "main":
1338 branch = "master"
1339 else:
6326aa58
HWN
1340
1341 ## FIXME
29bdbac1 1342 branch = self.projectName + branch
8f9b2e08
SH
1343
1344 if parent == "main":
1345 parent = "master"
1346 elif len(parent) > 0:
6326aa58 1347 ## FIXME
29bdbac1 1348 parent = self.projectName + parent
8f9b2e08 1349
a028a98e 1350 branch = self.refPrefix + branch
b984733c 1351 if len(parent) > 0:
a028a98e 1352 parent = self.refPrefix + parent
29bdbac1
SH
1353
1354 if self.verbose:
1355 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1356
1357 if len(parent) == 0 and branch in self.initialParents:
1358 parent = self.initialParents[branch]
1359 del self.initialParents[branch]
1360
86fda6a3 1361 self.commit(description, filesForCommit, branch, [branchPrefix], parent)
b984733c 1362 else:
71b112d4 1363 files = self.extractFilesFromCommit(description)
6326aa58
HWN
1364 self.commit(description, files, self.branch, self.depotPaths,
1365 self.initialParent)
b984733c
SH
1366 self.initialParent = ""
1367 except IOError:
1368 print self.gitError.read()
1369 sys.exit(1)
1370
341dc1c1
SH
1371 if not self.silent:
1372 print ""
1373 if len(self.updatedBranches) > 0:
1374 sys.stdout.write("Updated branches: ")
1375 for b in self.updatedBranches:
1376 sys.stdout.write("%s " % b)
1377 sys.stdout.write("\n")
b984733c 1378
b984733c
SH
1379
1380 self.gitStream.close()
29bdbac1
SH
1381 if importProcess.wait() != 0:
1382 die("fast-import failed: %s" % self.gitError.read())
b984733c
SH
1383 self.gitOutput.close()
1384 self.gitError.close()
1385
b984733c
SH
1386 return True
1387
01ce1fe9
SH
1388class P4Rebase(Command):
1389 def __init__(self):
1390 Command.__init__(self)
01265103 1391 self.options = [ ]
cebdf5af
HWN
1392 self.description = ("Fetches the latest revision from perforce and "
1393 + "rebases the current work (branch) against it")
68c42153 1394 self.verbose = False
01ce1fe9
SH
1395
1396 def run(self, args):
1397 sync = P4Sync()
1398 sync.run([])
d7e3868c
SH
1399
1400 [upstream, settings] = findUpstreamBranchPoint()
1401 if len(upstream) == 0:
1402 die("Cannot find upstream branchpoint for rebase")
1403
1404 # the branchpoint may be p4/foo~3, so strip off the parent
1405 upstream = re.sub("~[0-9]+$", "", upstream)
1406
1407 print "Rebasing the current branch onto %s" % upstream
b25b2065 1408 oldHead = read_pipe("git rev-parse HEAD").strip()
d7e3868c 1409 system("git rebase %s" % upstream)
1f52af6c 1410 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
01ce1fe9
SH
1411 return True
1412
f9a3a4f7
SH
1413class P4Clone(P4Sync):
1414 def __init__(self):
1415 P4Sync.__init__(self)
1416 self.description = "Creates a new git repository and imports from Perforce into it"
bb6e09b2
HWN
1417 self.usage = "usage: %prog [options] //depot/path[@revRange]"
1418 self.options.append(
1419 optparse.make_option("--destination", dest="cloneDestination",
1420 action='store', default=None,
1421 help="where to leave result of the clone"))
1422 self.cloneDestination = None
f9a3a4f7 1423 self.needsGit = False
f9a3a4f7 1424
6a49f8e2
HWN
1425 def defaultDestination(self, args):
1426 ## TODO: use common prefix of args?
1427 depotPath = args[0]
1428 depotDir = re.sub("(@[^@]*)$", "", depotPath)
1429 depotDir = re.sub("(#[^#]*)$", "", depotDir)
1430 depotDir = re.sub(r"\.\.\.$,", "", depotDir)
1431 depotDir = re.sub(r"/$", "", depotDir)
1432 return os.path.split(depotDir)[1]
1433
f9a3a4f7
SH
1434 def run(self, args):
1435 if len(args) < 1:
1436 return False
bb6e09b2
HWN
1437
1438 if self.keepRepoPath and not self.cloneDestination:
1439 sys.stderr.write("Must specify destination for --keep-path\n")
1440 sys.exit(1)
f9a3a4f7 1441
6326aa58 1442 depotPaths = args
5e100b5c
SH
1443
1444 if not self.cloneDestination and len(depotPaths) > 1:
1445 self.cloneDestination = depotPaths[-1]
1446 depotPaths = depotPaths[:-1]
1447
6326aa58
HWN
1448 for p in depotPaths:
1449 if not p.startswith("//"):
1450 return False
f9a3a4f7 1451
bb6e09b2 1452 if not self.cloneDestination:
98ad4faf 1453 self.cloneDestination = self.defaultDestination(args)
f9a3a4f7 1454
86dff6b6 1455 print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
c3bf3f13
KG
1456 if not os.path.exists(self.cloneDestination):
1457 os.makedirs(self.cloneDestination)
bb6e09b2 1458 os.chdir(self.cloneDestination)
f9a3a4f7 1459 system("git init")
b86f7378 1460 self.gitdir = os.getcwd() + "/.git"
6326aa58 1461 if not P4Sync.run(self, depotPaths):
f9a3a4f7 1462 return False
f9a3a4f7 1463 if self.branch != "master":
8f9b2e08
SH
1464 if gitBranchExists("refs/remotes/p4/master"):
1465 system("git branch master refs/remotes/p4/master")
1466 system("git checkout -f")
1467 else:
1468 print "Could not detect main branch. No checkout/master branch created."
86dff6b6 1469
f9a3a4f7
SH
1470 return True
1471
09d89de2
SH
1472class P4Branches(Command):
1473 def __init__(self):
1474 Command.__init__(self)
1475 self.options = [ ]
1476 self.description = ("Shows the git branches that hold imports and their "
1477 + "corresponding perforce depot paths")
1478 self.verbose = False
1479
1480 def run(self, args):
1481 cmdline = "git rev-parse --symbolic "
1482 cmdline += " --remotes"
1483
1484 for line in read_pipe_lines(cmdline):
1485 line = line.strip()
1486
1487 if not line.startswith('p4/') or line == "p4/HEAD":
1488 continue
1489 branch = line
1490
1491 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
1492 settings = extractSettingsGitLog(log)
1493
1494 print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])
1495 return True
1496
b984733c
SH
1497class HelpFormatter(optparse.IndentedHelpFormatter):
1498 def __init__(self):
1499 optparse.IndentedHelpFormatter.__init__(self)
1500
1501 def format_description(self, description):
1502 if description:
1503 return description + "\n"
1504 else:
1505 return ""
4f5cf76a 1506
86949eef
SH
1507def printUsage(commands):
1508 print "usage: %s <command> [options]" % sys.argv[0]
1509 print ""
1510 print "valid commands: %s" % ", ".join(commands)
1511 print ""
1512 print "Try %s <command> --help for command specific help." % sys.argv[0]
1513 print ""
1514
1515commands = {
b86f7378
HWN
1516 "debug" : P4Debug,
1517 "submit" : P4Submit,
1518 "sync" : P4Sync,
1519 "rebase" : P4Rebase,
1520 "clone" : P4Clone,
09d89de2
SH
1521 "rollback" : P4RollBack,
1522 "branches" : P4Branches
86949eef
SH
1523}
1524
86949eef 1525
bb6e09b2
HWN
1526def main():
1527 if len(sys.argv[1:]) == 0:
1528 printUsage(commands.keys())
1529 sys.exit(2)
4f5cf76a 1530
bb6e09b2
HWN
1531 cmd = ""
1532 cmdName = sys.argv[1]
1533 try:
b86f7378
HWN
1534 klass = commands[cmdName]
1535 cmd = klass()
bb6e09b2
HWN
1536 except KeyError:
1537 print "unknown command %s" % cmdName
1538 print ""
1539 printUsage(commands.keys())
1540 sys.exit(2)
1541
1542 options = cmd.options
b86f7378 1543 cmd.gitdir = os.environ.get("GIT_DIR", None)
bb6e09b2
HWN
1544
1545 args = sys.argv[2:]
1546
1547 if len(options) > 0:
1548 options.append(optparse.make_option("--git-dir", dest="gitdir"))
1549
1550 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1551 options,
1552 description = cmd.description,
1553 formatter = HelpFormatter())
1554
1555 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1556 global verbose
1557 verbose = cmd.verbose
1558 if cmd.needsGit:
b86f7378
HWN
1559 if cmd.gitdir == None:
1560 cmd.gitdir = os.path.abspath(".git")
1561 if not isValidGitDir(cmd.gitdir):
1562 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
1563 if os.path.exists(cmd.gitdir):
bb6e09b2
HWN
1564 cdup = read_pipe("git rev-parse --show-cdup").strip()
1565 if len(cdup) > 0:
1566 os.chdir(cdup);
e20a9e53 1567
b86f7378
HWN
1568 if not isValidGitDir(cmd.gitdir):
1569 if isValidGitDir(cmd.gitdir + "/.git"):
1570 cmd.gitdir += "/.git"
bb6e09b2 1571 else:
b86f7378 1572 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
e20a9e53 1573
b86f7378 1574 os.environ["GIT_DIR"] = cmd.gitdir
86949eef 1575
bb6e09b2
HWN
1576 if not cmd.run(args):
1577 parser.print_help()
4f5cf76a 1578
4f5cf76a 1579
bb6e09b2
HWN
1580if __name__ == '__main__':
1581 main()