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