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