Fix initial multi-branch import.
[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
27d2d811
SH
171def findUpstreamBranchPoint():
172 settings = None
173 branchPoint = ""
174 parent = 0
175 while parent < 65535:
176 commit = "HEAD~%s" % parent
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)
b984733c
SH
703
704 return branches
705
6a49f8e2
HWN
706 ## Should move this out, doesn't use SELF.
707 def readP4Files(self, files):
b1ce9447 708 files = [f for f in files
982bb8a3 709 if f['action'] != 'delete']
6a49f8e2 710
b1ce9447 711 if not files:
f2eda79f
HWN
712 return
713
b1ce9447
HWN
714 filedata = p4CmdList('print %s' % ' '.join(['"%s#%s"' % (f['path'],
715 f['rev'])
716 for f in files]))
6a49f8e2 717
d2c6dd30
HWN
718 j = 0;
719 contents = {}
b1ce9447 720 while j < len(filedata):
d2c6dd30 721 stat = filedata[j]
b1ce9447
HWN
722 j += 1
723 text = ''
7530a40c
HWN
724 while j < len(filedata) and filedata[j]['code'] in ('text',
725 'binary'):
b1ce9447
HWN
726 text += filedata[j]['data']
727 j += 1
6a49f8e2 728
1b9a4684
HWN
729
730 if not stat.has_key('depotFile'):
731 sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
732 continue
733
b1ce9447 734 contents[stat['depotFile']] = text
6a49f8e2 735
d2c6dd30
HWN
736 for f in files:
737 assert not f.has_key('data')
738 f['data'] = contents[f['path']]
6a49f8e2 739
6326aa58 740 def commit(self, details, files, branch, branchPrefixes, parent = ""):
b984733c
SH
741 epoch = details["time"]
742 author = details["user"]
743
4b97ffb1
SH
744 if self.verbose:
745 print "commit into %s" % branch
746
96e07dd2
HWN
747 # start with reading files; if that fails, we should not
748 # create a commit.
749 new_files = []
750 for f in files:
751 if [p for p in branchPrefixes if f['path'].startswith(p)]:
752 new_files.append (f)
753 else:
754 sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
755 files = new_files
756 self.readP4Files(files)
757
758
759
760
b984733c 761 self.gitStream.write("commit %s\n" % branch)
6a49f8e2 762# gitStream.write("mark :%s\n" % details["change"])
b984733c
SH
763 self.committedChanges.add(int(details["change"]))
764 committer = ""
b607e71e
SH
765 if author not in self.users:
766 self.getUserMapFromPerforceServer()
b984733c 767 if author in self.users:
0828ab14 768 committer = "%s %s %s" % (self.users[author], epoch, self.tz)
b984733c 769 else:
0828ab14 770 committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
b984733c
SH
771
772 self.gitStream.write("committer %s\n" % committer)
773
774 self.gitStream.write("data <<EOT\n")
775 self.gitStream.write(details["desc"])
6581de09
SH
776 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s"
777 % (','.join (branchPrefixes), details["change"]))
778 if len(details['options']) > 0:
779 self.gitStream.write(": options = %s" % details['options'])
780 self.gitStream.write("]\nEOT\n\n")
b984733c
SH
781
782 if len(parent) > 0:
4b97ffb1
SH
783 if self.verbose:
784 print "parent %s" % parent
b984733c
SH
785 self.gitStream.write("from %s\n" % parent)
786
6a49f8e2 787 for file in files:
b984733c 788 if file["type"] == "apple":
6a49f8e2 789 print "\nfile %s is a strange apple file that forks. Ignoring!" % file['path']
b984733c
SH
790 continue
791
6a49f8e2
HWN
792 relPath = self.stripRepoPath(file['path'], branchPrefixes)
793 if file["action"] == "delete":
b984733c
SH
794 self.gitStream.write("D %s\n" % relPath)
795 else:
796 mode = 644
797 if file["type"].startswith("x"):
798 mode = 755
799
6a49f8e2 800 data = file['data']
b984733c 801
c1f9197f
MSO
802 if self.isWindows and file["type"].endswith("text"):
803 data = data.replace("\r\n", "\n")
804
7530a40c 805 self.gitStream.write("M %d inline %s\n" % (mode, relPath))
b984733c
SH
806 self.gitStream.write("data %s\n" % len(data))
807 self.gitStream.write(data)
808 self.gitStream.write("\n")
809
810 self.gitStream.write("\n")
811
1f4ba1cb
SH
812 change = int(details["change"])
813
9bda3a85 814 if self.labels.has_key(change):
1f4ba1cb
SH
815 label = self.labels[change]
816 labelDetails = label[0]
817 labelRevisions = label[1]
71b112d4
SH
818 if self.verbose:
819 print "Change %s is labelled %s" % (change, labelDetails)
1f4ba1cb 820
6326aa58
HWN
821 files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
822 for p in branchPrefixes]))
1f4ba1cb
SH
823
824 if len(files) == len(labelRevisions):
825
826 cleanedFiles = {}
827 for info in files:
828 if info["action"] == "delete":
829 continue
830 cleanedFiles[info["depotFile"]] = info["rev"]
831
832 if cleanedFiles == labelRevisions:
833 self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
834 self.gitStream.write("from %s\n" % branch)
835
836 owner = labelDetails["Owner"]
837 tagger = ""
838 if author in self.users:
839 tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
840 else:
841 tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
842 self.gitStream.write("tagger %s\n" % tagger)
843 self.gitStream.write("data <<EOT\n")
844 self.gitStream.write(labelDetails["Description"])
845 self.gitStream.write("EOT\n\n")
846
847 else:
a46668fa 848 if not self.silent:
cebdf5af
HWN
849 print ("Tag %s does not match with change %s: files do not match."
850 % (labelDetails["label"], change))
1f4ba1cb
SH
851
852 else:
a46668fa 853 if not self.silent:
cebdf5af
HWN
854 print ("Tag %s does not match with change %s: file count is different."
855 % (labelDetails["label"], change))
b984733c 856
183b8ef8 857 def getUserCacheFilename(self):
a3287be5 858 return os.environ["HOME"] + "/.gitp4-usercache.txt"
183b8ef8 859
b607e71e 860 def getUserMapFromPerforceServer(self):
ebd81168
SH
861 if self.userMapFromPerforceServer:
862 return
b984733c
SH
863 self.users = {}
864
865 for output in p4CmdList("users"):
866 if not output.has_key("User"):
867 continue
868 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
869
183b8ef8
HWN
870
871 s = ''
872 for (key, val) in self.users.items():
873 s += "%s\t%s\n" % (key, val)
874
875 open(self.getUserCacheFilename(), "wb").write(s)
ebd81168 876 self.userMapFromPerforceServer = True
b607e71e
SH
877
878 def loadUserMapFromCache(self):
879 self.users = {}
ebd81168 880 self.userMapFromPerforceServer = False
b607e71e 881 try:
183b8ef8 882 cache = open(self.getUserCacheFilename(), "rb")
b607e71e
SH
883 lines = cache.readlines()
884 cache.close()
885 for line in lines:
b25b2065 886 entry = line.strip().split("\t")
b607e71e
SH
887 self.users[entry[0]] = entry[1]
888 except IOError:
889 self.getUserMapFromPerforceServer()
890
1f4ba1cb
SH
891 def getLabels(self):
892 self.labels = {}
893
6326aa58 894 l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
10c3211b 895 if len(l) > 0 and not self.silent:
6326aa58 896 print "Finding files belonging to labels in %s" % `self.depotPath`
01ce1fe9
SH
897
898 for output in l:
1f4ba1cb
SH
899 label = output["label"]
900 revisions = {}
901 newestChange = 0
71b112d4
SH
902 if self.verbose:
903 print "Querying files for label %s" % label
6326aa58
HWN
904 for file in p4CmdList("files "
905 + ' '.join (["%s...@%s" % (p, label)
906 for p in self.depotPaths])):
1f4ba1cb
SH
907 revisions[file["depotFile"]] = file["rev"]
908 change = int(file["change"])
909 if change > newestChange:
910 newestChange = change
911
9bda3a85
SH
912 self.labels[newestChange] = [output, revisions]
913
914 if self.verbose:
915 print "Label changes: %s" % self.labels.keys()
1f4ba1cb 916
86dff6b6
HWN
917 def guessProjectName(self):
918 for p in self.depotPaths:
6e5295c4
SH
919 if p.endswith("/"):
920 p = p[:-1]
921 p = p[p.strip().rfind("/") + 1:]
922 if not p.endswith("/"):
923 p += "/"
924 return p
86dff6b6 925
4b97ffb1 926 def getBranchMapping(self):
4b97ffb1
SH
927 for info in p4CmdList("branches"):
928 details = p4Cmd("branch -o %s" % info["branch"])
929 viewIdx = 0
930 while details.has_key("View%s" % viewIdx):
931 paths = details["View%s" % viewIdx].split(" ")
932 viewIdx = viewIdx + 1
933 # require standard //depot/foo/... //depot/bar/... mapping
934 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
935 continue
936 source = paths[0]
937 destination = paths[1]
6509e19c
SH
938 ## HACK
939 if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]):
940 source = source[len(self.depotPaths[0]):-4]
941 destination = destination[len(self.depotPaths[0]):-4]
29bdbac1
SH
942 if destination not in self.knownBranches:
943 self.knownBranches[destination] = source
944 if source not in self.knownBranches:
945 self.knownBranches[source] = source
946
947 def listExistingP4GitBranches(self):
948 self.p4BranchesInGit = []
949
a028a98e
SH
950 cmdline = "git rev-parse --symbolic "
951 if self.importIntoRemotes:
952 cmdline += " --remotes"
953 else:
954 cmdline += " --branches"
955
b016d397 956 for line in read_pipe_lines(cmdline):
cfeb59be 957 line = line.strip()
b25b2065 958
86dff6b6 959 ## only import to p4/
c4b33253 960 if not line.startswith('p4/') or line == "p4/HEAD":
86dff6b6
HWN
961 continue
962 branch = line
5265bfcb
HWN
963
964 # strip off p4
965 branch = re.sub ("^p4/", "", line)
b76f0565 966
57284050 967 self.p4BranchesInGit.append(branch)
b76f0565 968 self.initialParents[self.refPrefix + branch] = parseRevision(line)
4b97ffb1 969
abcd790f 970 def createOrUpdateBranchesFromOrigin(self):
d1874ed3 971 if not self.silent:
86dff6b6
HWN
972 print ("Creating/updating branch(es) in %s based on origin branch(es)"
973 % self.refPrefix)
d1874ed3 974
cae7b732
SH
975 originPrefix = "origin/p4/"
976
4addad22
HWN
977 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
978 line = line.strip()
cae7b732 979 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
d1874ed3 980 continue
65c5f3e3 981
cae7b732 982 headName = line[len(originPrefix):]
d1874ed3 983 remoteHead = self.refPrefix + headName
cae7b732 984 originHead = line
abcd790f 985
bb6e09b2
HWN
986 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
987 if (not original.has_key('depot-paths')
988 or not original.has_key('change')):
65c5f3e3
SH
989 continue
990
abcd790f 991 update = False
4280e533 992 if not gitBranchExists(remoteHead):
d1874ed3
SH
993 if self.verbose:
994 print "creating %s" % remoteHead
abcd790f
SH
995 update = True
996 else:
a3fdd579 997 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
bb6e09b2
HWN
998 if settings.has_key('change') > 0:
999 if settings['depot-paths'] == original['depot-paths']:
1000 originP4Change = int(original['change'])
1001 p4Change = int(settings['change'])
abcd790f 1002 if originP4Change > p4Change:
bb6e09b2
HWN
1003 print ("%s (%s) is newer than %s (%s). "
1004 "Updating p4 branch from origin."
1005 % (originHead, originP4Change,
1006 remoteHead, p4Change))
abcd790f
SH
1007 update = True
1008 else:
bb6e09b2
HWN
1009 print ("Ignoring: %s was imported from %s while "
1010 "%s was imported from %s"
1011 % (originHead, ','.join(original['depot-paths']),
1012 remoteHead, ','.join(settings['depot-paths'])))
abcd790f
SH
1013
1014 if update:
1015 system("git update-ref %s %s" % (remoteHead, originHead))
d1874ed3 1016
bb6e09b2
HWN
1017 def updateOptionDict(self, d):
1018 option_keys = {}
1019 if self.keepRepoPath:
1020 option_keys['keepRepoPath'] = 1
1021
1022 d["options"] = ' '.join(sorted(option_keys.keys()))
1023
1024 def readOptions(self, d):
1025 self.keepRepoPath = (d.has_key('options')
1026 and ('keepRepoPath' in d['options']))
6326aa58 1027
b984733c 1028 def run(self, args):
6326aa58 1029 self.depotPaths = []
179caebf
SH
1030 self.changeRange = ""
1031 self.initialParent = ""
6326aa58 1032 self.previousDepotPaths = []
ce6f33c8 1033
29bdbac1
SH
1034 # map from branch depot path to parent branch
1035 self.knownBranches = {}
1036 self.initialParents = {}
cae7b732 1037 self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
a43ff00c
SH
1038 if not self.syncWithOrigin:
1039 self.hasOrigin = False
29bdbac1 1040
a028a98e
SH
1041 if self.importIntoRemotes:
1042 self.refPrefix = "refs/remotes/p4/"
1043 else:
db775559 1044 self.refPrefix = "refs/heads/p4/"
a028a98e 1045
cebdf5af
HWN
1046 if self.syncWithOrigin and self.hasOrigin:
1047 if not self.silent:
1048 print "Syncing with origin first by calling git fetch origin"
1049 system("git fetch origin")
10f880f8 1050
569d1bd4 1051 if len(self.branch) == 0:
db775559 1052 self.branch = self.refPrefix + "master"
a028a98e 1053 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
48df6fd8 1054 system("git update-ref %s refs/heads/p4" % self.branch)
48df6fd8 1055 system("git branch -D p4");
faf1bd20 1056 # create it /after/ importing, when master exists
a028a98e 1057 if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
a3c55c09 1058 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
967f72e2 1059
6a49f8e2
HWN
1060 # TODO: should always look at previous commits,
1061 # merge with previous imports, if possible.
1062 if args == []:
d414c74a
SH
1063 if self.hasOrigin:
1064 self.createOrUpdateBranchesFromOrigin()
abcd790f
SH
1065 self.listExistingP4GitBranches()
1066
1067 if len(self.p4BranchesInGit) > 1:
1068 if not self.silent:
1069 print "Importing from/into multiple branches"
1070 self.detectBranches = True
967f72e2 1071
29bdbac1
SH
1072 if self.verbose:
1073 print "branches: %s" % self.p4BranchesInGit
1074
1075 p4Change = 0
1076 for branch in self.p4BranchesInGit:
cebdf5af 1077 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
bb6e09b2
HWN
1078
1079 settings = extractSettingsGitLog(logMsg)
29bdbac1 1080
bb6e09b2
HWN
1081 self.readOptions(settings)
1082 if (settings.has_key('depot-paths')
1083 and settings.has_key ('change')):
1084 change = int(settings['change']) + 1
29bdbac1
SH
1085 p4Change = max(p4Change, change)
1086
bb6e09b2
HWN
1087 depotPaths = sorted(settings['depot-paths'])
1088 if self.previousDepotPaths == []:
6326aa58 1089 self.previousDepotPaths = depotPaths
29bdbac1 1090 else:
6326aa58
HWN
1091 paths = []
1092 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
583e1707 1093 for i in range(0, min(len(cur), len(prev))):
6326aa58 1094 if cur[i] <> prev[i]:
583e1707 1095 i = i - 1
6326aa58
HWN
1096 break
1097
583e1707 1098 paths.append (cur[:i + 1])
6326aa58
HWN
1099
1100 self.previousDepotPaths = paths
29bdbac1
SH
1101
1102 if p4Change > 0:
bb6e09b2 1103 self.depotPaths = sorted(self.previousDepotPaths)
d5904674 1104 self.changeRange = "@%s,#head" % p4Change
330f53b8
SH
1105 if not self.detectBranches:
1106 self.initialParent = parseRevision(self.branch)
341dc1c1 1107 if not self.silent and not self.detectBranches:
967f72e2 1108 print "Performing incremental import into %s git branch" % self.branch
569d1bd4 1109
f9162f6a
SH
1110 if not self.branch.startswith("refs/"):
1111 self.branch = "refs/heads/" + self.branch
179caebf 1112
6326aa58 1113 if len(args) == 0 and self.depotPaths:
b984733c 1114 if not self.silent:
6326aa58 1115 print "Depot paths: %s" % ' '.join(self.depotPaths)
b984733c 1116 else:
6326aa58 1117 if self.depotPaths and self.depotPaths != args:
cebdf5af 1118 print ("previous import used depot path %s and now %s was specified. "
6326aa58
HWN
1119 "This doesn't work!" % (' '.join (self.depotPaths),
1120 ' '.join (args)))
b984733c 1121 sys.exit(1)
6326aa58 1122
bb6e09b2 1123 self.depotPaths = sorted(args)
b984733c 1124
b984733c
SH
1125 self.revision = ""
1126 self.users = {}
b984733c 1127
6326aa58
HWN
1128 newPaths = []
1129 for p in self.depotPaths:
1130 if p.find("@") != -1:
1131 atIdx = p.index("@")
1132 self.changeRange = p[atIdx:]
1133 if self.changeRange == "@all":
1134 self.changeRange = ""
6a49f8e2 1135 elif ',' not in self.changeRange:
6326aa58
HWN
1136 self.revision = self.changeRange
1137 self.changeRange = ""
1138 p = p[0:atIdx]
1139 elif p.find("#") != -1:
1140 hashIdx = p.index("#")
1141 self.revision = p[hashIdx:]
1142 p = p[0:hashIdx]
1143 elif self.previousDepotPaths == []:
1144 self.revision = "#head"
1145
1146 p = re.sub ("\.\.\.$", "", p)
1147 if not p.endswith("/"):
1148 p += "/"
1149
1150 newPaths.append(p)
1151
1152 self.depotPaths = newPaths
1153
b984733c 1154
b607e71e 1155 self.loadUserMapFromCache()
cb53e1f8
SH
1156 self.labels = {}
1157 if self.detectLabels:
1158 self.getLabels();
b984733c 1159
4b97ffb1 1160 if self.detectBranches:
df450923
SH
1161 ## FIXME - what's a P4 projectName ?
1162 self.projectName = self.guessProjectName()
1163
1164 if not self.hasOrigin:
1165 self.getBranchMapping();
29bdbac1
SH
1166 if self.verbose:
1167 print "p4-git branches: %s" % self.p4BranchesInGit
1168 print "initial parents: %s" % self.initialParents
1169 for b in self.p4BranchesInGit:
1170 if b != "master":
6326aa58
HWN
1171
1172 ## FIXME
29bdbac1
SH
1173 b = b[len(self.projectName):]
1174 self.createdBranches.add(b)
4b97ffb1 1175
f291b4e3 1176 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
b984733c 1177
cebdf5af 1178 importProcess = subprocess.Popen(["git", "fast-import"],
6326aa58
HWN
1179 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1180 stderr=subprocess.PIPE);
08483580
SH
1181 self.gitOutput = importProcess.stdout
1182 self.gitStream = importProcess.stdin
1183 self.gitError = importProcess.stderr
b984733c 1184
86dff6b6 1185 if self.revision:
a9d1a27a 1186 print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), self.revision, self.branch)
b984733c
SH
1187
1188 details = { "user" : "git perforce import user", "time" : int(time.time()) }
cebdf5af 1189 details["desc"] = ("Initial import of %s from the state at revision %s"
6326aa58 1190 % (' '.join(self.depotPaths), self.revision))
b984733c
SH
1191 details["change"] = self.revision
1192 newestRevision = 0
1193
1194 fileCnt = 0
6326aa58
HWN
1195 for info in p4CmdList("files "
1196 + ' '.join(["%s...%s"
1197 % (p, self.revision)
1198 for p in self.depotPaths])):
96e07dd2 1199
d2c6dd30
HWN
1200 if info['code'] == 'error':
1201 sys.stderr.write("p4 returned an error: %s\n"
1202 % info['data'])
1203 sys.exit(1)
1204
1205
b984733c
SH
1206 change = int(info["change"])
1207 if change > newestRevision:
1208 newestRevision = change
1209
1210 if info["action"] == "delete":
c45b1cfe
SH
1211 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1212 #fileCnt = fileCnt + 1
b984733c
SH
1213 continue
1214
96e07dd2 1215 for prop in ["depotFile", "rev", "action", "type" ]:
b984733c
SH
1216 details["%s%s" % (prop, fileCnt)] = info[prop]
1217
1218 fileCnt = fileCnt + 1
1219
1220 details["change"] = newestRevision
bb6e09b2 1221 self.updateOptionDict(details)
b984733c 1222 try:
6326aa58 1223 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
c715706b 1224 except IOError:
fd4ca86a 1225 print "IO error with git fast-import. Is your git version recent enough?"
b984733c
SH
1226 print self.gitError.read()
1227
1228 else:
1229 changes = []
1230
0828ab14 1231 if len(self.changesFile) > 0:
b984733c
SH
1232 output = open(self.changesFile).readlines()
1233 changeSet = Set()
1234 for line in output:
1235 changeSet.add(int(line))
1236
1237 for change in changeSet:
1238 changes.append(change)
1239
1240 changes.sort()
1241 else:
29bdbac1 1242 if self.verbose:
86dff6b6 1243 print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
6326aa58
HWN
1244 self.changeRange)
1245 assert self.depotPaths
1246 output = read_pipe_lines("p4 changes " + ' '.join (["%s...%s" % (p, self.changeRange)
1247 for p in self.depotPaths]))
b984733c
SH
1248
1249 for line in output:
1250 changeNum = line.split(" ")[1]
1251 changes.append(changeNum)
1252
1253 changes.reverse()
1254
01a9c9c5
SH
1255 if len(self.maxChanges) > 0:
1256 changes = changes[0:min(int(self.maxChanges), len(changes))]
1257
b984733c 1258 if len(changes) == 0:
0828ab14 1259 if not self.silent:
341dc1c1 1260 print "No changes to import!"
1f52af6c 1261 return True
b984733c 1262
a9d1a27a
SH
1263 if not self.silent and not self.detectBranches:
1264 print "Import destination: %s" % self.branch
1265
341dc1c1
SH
1266 self.updatedBranches = set()
1267
b984733c
SH
1268 cnt = 1
1269 for change in changes:
1270 description = p4Cmd("describe %s" % change)
bb6e09b2 1271 self.updateOptionDict(description)
b984733c 1272
0828ab14 1273 if not self.silent:
341dc1c1 1274 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
b984733c
SH
1275 sys.stdout.flush()
1276 cnt = cnt + 1
1277
1278 try:
b984733c 1279 if self.detectBranches:
71b112d4 1280 branches = self.splitFilesIntoBranches(description)
d5904674 1281 for branch in branches.keys():
6326aa58
HWN
1282 ## HACK --hwn
1283 branchPrefix = self.depotPaths[0] + branch + "/"
b984733c 1284
b984733c 1285 parent = ""
4b97ffb1 1286
d5904674 1287 filesForCommit = branches[branch]
4b97ffb1 1288
29bdbac1
SH
1289 if self.verbose:
1290 print "branch is %s" % branch
1291
341dc1c1
SH
1292 self.updatedBranches.add(branch)
1293
8f9b2e08 1294 if branch not in self.createdBranches:
b984733c 1295 self.createdBranches.add(branch)
4b97ffb1 1296 parent = self.knownBranches[branch]
b984733c
SH
1297 if parent == branch:
1298 parent = ""
29bdbac1
SH
1299 elif self.verbose:
1300 print "parent determined through known branches: %s" % parent
b984733c 1301
8f9b2e08
SH
1302 # main branch? use master
1303 if branch == "main":
1304 branch = "master"
1305 else:
6326aa58
HWN
1306
1307 ## FIXME
29bdbac1 1308 branch = self.projectName + branch
8f9b2e08
SH
1309
1310 if parent == "main":
1311 parent = "master"
1312 elif len(parent) > 0:
6326aa58 1313 ## FIXME
29bdbac1 1314 parent = self.projectName + parent
8f9b2e08 1315
a028a98e 1316 branch = self.refPrefix + branch
b984733c 1317 if len(parent) > 0:
a028a98e 1318 parent = self.refPrefix + parent
29bdbac1
SH
1319
1320 if self.verbose:
1321 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1322
1323 if len(parent) == 0 and branch in self.initialParents:
1324 parent = self.initialParents[branch]
1325 del self.initialParents[branch]
1326
86fda6a3 1327 self.commit(description, filesForCommit, branch, [branchPrefix], parent)
b984733c 1328 else:
71b112d4 1329 files = self.extractFilesFromCommit(description)
6326aa58
HWN
1330 self.commit(description, files, self.branch, self.depotPaths,
1331 self.initialParent)
b984733c
SH
1332 self.initialParent = ""
1333 except IOError:
1334 print self.gitError.read()
1335 sys.exit(1)
1336
341dc1c1
SH
1337 if not self.silent:
1338 print ""
1339 if len(self.updatedBranches) > 0:
1340 sys.stdout.write("Updated branches: ")
1341 for b in self.updatedBranches:
1342 sys.stdout.write("%s " % b)
1343 sys.stdout.write("\n")
b984733c 1344
b984733c
SH
1345
1346 self.gitStream.close()
29bdbac1
SH
1347 if importProcess.wait() != 0:
1348 die("fast-import failed: %s" % self.gitError.read())
b984733c
SH
1349 self.gitOutput.close()
1350 self.gitError.close()
1351
b984733c
SH
1352 return True
1353
01ce1fe9
SH
1354class P4Rebase(Command):
1355 def __init__(self):
1356 Command.__init__(self)
01265103 1357 self.options = [ ]
cebdf5af
HWN
1358 self.description = ("Fetches the latest revision from perforce and "
1359 + "rebases the current work (branch) against it")
68c42153 1360 self.verbose = False
01ce1fe9
SH
1361
1362 def run(self, args):
1363 sync = P4Sync()
1364 sync.run([])
d7e3868c
SH
1365
1366 [upstream, settings] = findUpstreamBranchPoint()
1367 if len(upstream) == 0:
1368 die("Cannot find upstream branchpoint for rebase")
1369
1370 # the branchpoint may be p4/foo~3, so strip off the parent
1371 upstream = re.sub("~[0-9]+$", "", upstream)
1372
1373 print "Rebasing the current branch onto %s" % upstream
b25b2065 1374 oldHead = read_pipe("git rev-parse HEAD").strip()
d7e3868c 1375 system("git rebase %s" % upstream)
1f52af6c 1376 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
01ce1fe9
SH
1377 return True
1378
f9a3a4f7
SH
1379class P4Clone(P4Sync):
1380 def __init__(self):
1381 P4Sync.__init__(self)
1382 self.description = "Creates a new git repository and imports from Perforce into it"
bb6e09b2
HWN
1383 self.usage = "usage: %prog [options] //depot/path[@revRange]"
1384 self.options.append(
1385 optparse.make_option("--destination", dest="cloneDestination",
1386 action='store', default=None,
1387 help="where to leave result of the clone"))
1388 self.cloneDestination = None
f9a3a4f7 1389 self.needsGit = False
f9a3a4f7 1390
6a49f8e2
HWN
1391 def defaultDestination(self, args):
1392 ## TODO: use common prefix of args?
1393 depotPath = args[0]
1394 depotDir = re.sub("(@[^@]*)$", "", depotPath)
1395 depotDir = re.sub("(#[^#]*)$", "", depotDir)
1396 depotDir = re.sub(r"\.\.\.$,", "", depotDir)
1397 depotDir = re.sub(r"/$", "", depotDir)
1398 return os.path.split(depotDir)[1]
1399
f9a3a4f7
SH
1400 def run(self, args):
1401 if len(args) < 1:
1402 return False
bb6e09b2
HWN
1403
1404 if self.keepRepoPath and not self.cloneDestination:
1405 sys.stderr.write("Must specify destination for --keep-path\n")
1406 sys.exit(1)
f9a3a4f7 1407
6326aa58 1408 depotPaths = args
5e100b5c
SH
1409
1410 if not self.cloneDestination and len(depotPaths) > 1:
1411 self.cloneDestination = depotPaths[-1]
1412 depotPaths = depotPaths[:-1]
1413
6326aa58
HWN
1414 for p in depotPaths:
1415 if not p.startswith("//"):
1416 return False
f9a3a4f7 1417
bb6e09b2 1418 if not self.cloneDestination:
98ad4faf 1419 self.cloneDestination = self.defaultDestination(args)
f9a3a4f7 1420
86dff6b6 1421 print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
c3bf3f13
KG
1422 if not os.path.exists(self.cloneDestination):
1423 os.makedirs(self.cloneDestination)
bb6e09b2 1424 os.chdir(self.cloneDestination)
f9a3a4f7 1425 system("git init")
b86f7378 1426 self.gitdir = os.getcwd() + "/.git"
6326aa58 1427 if not P4Sync.run(self, depotPaths):
f9a3a4f7 1428 return False
f9a3a4f7 1429 if self.branch != "master":
8f9b2e08
SH
1430 if gitBranchExists("refs/remotes/p4/master"):
1431 system("git branch master refs/remotes/p4/master")
1432 system("git checkout -f")
1433 else:
1434 print "Could not detect main branch. No checkout/master branch created."
86dff6b6 1435
f9a3a4f7
SH
1436 return True
1437
b984733c
SH
1438class HelpFormatter(optparse.IndentedHelpFormatter):
1439 def __init__(self):
1440 optparse.IndentedHelpFormatter.__init__(self)
1441
1442 def format_description(self, description):
1443 if description:
1444 return description + "\n"
1445 else:
1446 return ""
4f5cf76a 1447
86949eef
SH
1448def printUsage(commands):
1449 print "usage: %s <command> [options]" % sys.argv[0]
1450 print ""
1451 print "valid commands: %s" % ", ".join(commands)
1452 print ""
1453 print "Try %s <command> --help for command specific help." % sys.argv[0]
1454 print ""
1455
1456commands = {
b86f7378
HWN
1457 "debug" : P4Debug,
1458 "submit" : P4Submit,
1459 "sync" : P4Sync,
1460 "rebase" : P4Rebase,
1461 "clone" : P4Clone,
1462 "rollback" : P4RollBack
86949eef
SH
1463}
1464
86949eef 1465
bb6e09b2
HWN
1466def main():
1467 if len(sys.argv[1:]) == 0:
1468 printUsage(commands.keys())
1469 sys.exit(2)
4f5cf76a 1470
bb6e09b2
HWN
1471 cmd = ""
1472 cmdName = sys.argv[1]
1473 try:
b86f7378
HWN
1474 klass = commands[cmdName]
1475 cmd = klass()
bb6e09b2
HWN
1476 except KeyError:
1477 print "unknown command %s" % cmdName
1478 print ""
1479 printUsage(commands.keys())
1480 sys.exit(2)
1481
1482 options = cmd.options
b86f7378 1483 cmd.gitdir = os.environ.get("GIT_DIR", None)
bb6e09b2
HWN
1484
1485 args = sys.argv[2:]
1486
1487 if len(options) > 0:
1488 options.append(optparse.make_option("--git-dir", dest="gitdir"))
1489
1490 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1491 options,
1492 description = cmd.description,
1493 formatter = HelpFormatter())
1494
1495 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1496 global verbose
1497 verbose = cmd.verbose
1498 if cmd.needsGit:
b86f7378
HWN
1499 if cmd.gitdir == None:
1500 cmd.gitdir = os.path.abspath(".git")
1501 if not isValidGitDir(cmd.gitdir):
1502 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
1503 if os.path.exists(cmd.gitdir):
bb6e09b2
HWN
1504 cdup = read_pipe("git rev-parse --show-cdup").strip()
1505 if len(cdup) > 0:
1506 os.chdir(cdup);
e20a9e53 1507
b86f7378
HWN
1508 if not isValidGitDir(cmd.gitdir):
1509 if isValidGitDir(cmd.gitdir + "/.git"):
1510 cmd.gitdir += "/.git"
bb6e09b2 1511 else:
b86f7378 1512 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
e20a9e53 1513
b86f7378 1514 os.environ["GIT_DIR"] = cmd.gitdir
86949eef 1515
bb6e09b2
HWN
1516 if not cmd.run(args):
1517 parser.print_help()
4f5cf76a 1518
4f5cf76a 1519
bb6e09b2
HWN
1520if __name__ == '__main__':
1521 main()