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