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