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