]>
Commit | Line | Data |
---|---|---|
86949eef SH |
1 | #!/usr/bin/env python |
2 | # | |
3 | # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git. | |
4 | # | |
5 | # Author: Simon Hausmann <hausmann@kde.org> | |
83dce55a SH |
6 | # Copyright: 2007 Simon Hausmann <hausmann@kde.org> |
7 | # 2007 Trolltech ASA | |
86949eef SH |
8 | # License: MIT <http://www.opensource.org/licenses/mit-license.php> |
9 | # | |
10 | ||
4f5cf76a | 11 | import optparse, sys, os, marshal, popen2, shelve |
b984733c SH |
12 | import tempfile, getopt, sha, os.path, time |
13 | from sets import Set; | |
4f5cf76a SH |
14 | |
15 | gitdir = os.environ.get("GIT_DIR", "") | |
86949eef SH |
16 | |
17 | def p4CmdList(cmd): | |
18 | cmd = "p4 -G %s" % cmd | |
19 | pipe = os.popen(cmd, "rb") | |
20 | ||
21 | result = [] | |
22 | try: | |
23 | while True: | |
24 | entry = marshal.load(pipe) | |
25 | result.append(entry) | |
26 | except EOFError: | |
27 | pass | |
28 | pipe.close() | |
29 | ||
30 | return result | |
31 | ||
32 | def p4Cmd(cmd): | |
33 | list = p4CmdList(cmd) | |
34 | result = {} | |
35 | for entry in list: | |
36 | result.update(entry) | |
37 | return result; | |
38 | ||
cb2c9db5 SH |
39 | def p4Where(depotPath): |
40 | if not depotPath.endswith("/"): | |
41 | depotPath += "/" | |
42 | output = p4Cmd("where %s..." % depotPath) | |
43 | clientPath = "" | |
44 | if "path" in output: | |
45 | clientPath = output.get("path") | |
46 | elif "data" in output: | |
47 | data = output.get("data") | |
48 | lastSpace = data.rfind(" ") | |
49 | clientPath = data[lastSpace + 1:] | |
50 | ||
51 | if clientPath.endswith("..."): | |
52 | clientPath = clientPath[:-3] | |
53 | return clientPath | |
54 | ||
86949eef SH |
55 | def die(msg): |
56 | sys.stderr.write(msg + "\n") | |
57 | sys.exit(1) | |
58 | ||
59 | def currentGitBranch(): | |
9863f405 | 60 | return os.popen("git name-rev HEAD").read().split(" ")[1][:-1] |
86949eef | 61 | |
4f5cf76a SH |
62 | def isValidGitDir(path): |
63 | if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"): | |
64 | return True; | |
65 | return False | |
66 | ||
67 | def system(cmd): | |
68 | if os.system(cmd) != 0: | |
69 | die("command failed: %s" % cmd) | |
70 | ||
6ae8de88 SH |
71 | def extractLogMessageFromGitCommit(commit): |
72 | logMessage = "" | |
73 | foundTitle = False | |
9863f405 | 74 | for log in os.popen("git cat-file commit %s" % commit).readlines(): |
6ae8de88 SH |
75 | if not foundTitle: |
76 | if len(log) == 1: | |
77 | foundTitle = 1 | |
78 | continue | |
79 | ||
80 | logMessage += log | |
81 | return logMessage | |
82 | ||
83 | def extractDepotPathAndChangeFromGitLog(log): | |
84 | values = {} | |
85 | for line in log.split("\n"): | |
86 | line = line.strip() | |
87 | if line.startswith("[git-p4:") and line.endswith("]"): | |
88 | line = line[8:-1].strip() | |
89 | for assignment in line.split(":"): | |
90 | variable = assignment.strip() | |
91 | value = "" | |
92 | equalPos = assignment.find("=") | |
93 | if equalPos != -1: | |
94 | variable = assignment[:equalPos].strip() | |
95 | value = assignment[equalPos + 1:].strip() | |
96 | if value.startswith("\"") and value.endswith("\""): | |
97 | value = value[1:-1] | |
98 | values[variable] = value | |
99 | ||
100 | return values.get("depot-path"), values.get("change") | |
101 | ||
8136a639 | 102 | def gitBranchExists(branch): |
9863f405 | 103 | if os.system("git rev-parse %s 2>/dev/null >/dev/null" % branch) == 0: |
179caebf SH |
104 | return True |
105 | return False | |
8136a639 | 106 | |
b984733c SH |
107 | class Command: |
108 | def __init__(self): | |
109 | self.usage = "usage: %prog [options]" | |
8910ac0e | 110 | self.needsGit = True |
b984733c SH |
111 | |
112 | class P4Debug(Command): | |
86949eef | 113 | def __init__(self): |
6ae8de88 | 114 | Command.__init__(self) |
86949eef SH |
115 | self.options = [ |
116 | ] | |
c8c39116 | 117 | self.description = "A tool to debug the output of p4 -G." |
8910ac0e | 118 | self.needsGit = False |
86949eef SH |
119 | |
120 | def run(self, args): | |
121 | for output in p4CmdList(" ".join(args)): | |
122 | print output | |
b984733c | 123 | return True |
86949eef | 124 | |
b984733c | 125 | class P4CleanTags(Command): |
86949eef | 126 | def __init__(self): |
b984733c | 127 | Command.__init__(self) |
86949eef SH |
128 | self.options = [ |
129 | # optparse.make_option("--branch", dest="branch", default="refs/heads/master") | |
130 | ] | |
c8c39116 | 131 | self.description = "A tool to remove stale unused tags from incremental perforce imports." |
86949eef SH |
132 | def run(self, args): |
133 | branch = currentGitBranch() | |
134 | print "Cleaning out stale p4 import tags..." | |
9863f405 | 135 | sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % branch) |
86949eef SH |
136 | output = sout.read() |
137 | try: | |
138 | tagIdx = output.index(" tags/p4/") | |
139 | except: | |
140 | print "Cannot find any p4/* tag. Nothing to do." | |
141 | sys.exit(0) | |
142 | ||
143 | try: | |
144 | caretIdx = output.index("^") | |
145 | except: | |
146 | caretIdx = len(output) - 1 | |
147 | rev = int(output[tagIdx + 9 : caretIdx]) | |
148 | ||
149 | allTags = os.popen("git tag -l p4/").readlines() | |
150 | for i in range(len(allTags)): | |
151 | allTags[i] = int(allTags[i][3:-1]) | |
152 | ||
153 | allTags.sort() | |
154 | ||
155 | allTags.remove(rev) | |
156 | ||
157 | for rev in allTags: | |
158 | print os.popen("git tag -d p4/%s" % rev).read() | |
159 | ||
160 | print "%s tags removed." % len(allTags) | |
b984733c | 161 | return True |
86949eef | 162 | |
b984733c | 163 | class P4Sync(Command): |
4f5cf76a | 164 | def __init__(self): |
b984733c | 165 | Command.__init__(self) |
4f5cf76a SH |
166 | self.options = [ |
167 | optparse.make_option("--continue", action="store_false", dest="firstTime"), | |
168 | optparse.make_option("--origin", dest="origin"), | |
169 | optparse.make_option("--reset", action="store_true", dest="reset"), | |
170 | optparse.make_option("--master", dest="master"), | |
171 | optparse.make_option("--log-substitutions", dest="substFile"), | |
172 | optparse.make_option("--noninteractive", action="store_false"), | |
04219c04 SH |
173 | optparse.make_option("--dry-run", action="store_true"), |
174 | optparse.make_option("--apply-as-patch", action="store_true", dest="applyAsPatch") | |
4f5cf76a SH |
175 | ] |
176 | self.description = "Submit changes from git to the perforce depot." | |
177 | self.firstTime = True | |
178 | self.reset = False | |
179 | self.interactive = True | |
180 | self.dryRun = False | |
181 | self.substFile = "" | |
182 | self.firstTime = True | |
9512497b | 183 | self.origin = "" |
4f5cf76a | 184 | self.master = "" |
1932a6ac | 185 | self.applyAsPatch = True |
4f5cf76a SH |
186 | |
187 | self.logSubstitutions = {} | |
188 | self.logSubstitutions["<enter description here>"] = "%log%" | |
189 | self.logSubstitutions["\tDetails:"] = "\tDetails: %log%" | |
190 | ||
191 | def check(self): | |
192 | if len(p4CmdList("opened ...")) > 0: | |
193 | die("You have files opened with perforce! Close them before starting the sync.") | |
194 | ||
195 | def start(self): | |
196 | if len(self.config) > 0 and not self.reset: | |
197 | die("Cannot start sync. Previous sync config found at %s" % self.configFile) | |
198 | ||
199 | commits = [] | |
9863f405 | 200 | for line in os.popen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines(): |
4f5cf76a SH |
201 | commits.append(line[:-1]) |
202 | commits.reverse() | |
203 | ||
204 | self.config["commits"] = commits | |
205 | ||
04219c04 SH |
206 | if not self.applyAsPatch: |
207 | print "Creating temporary p4-sync branch from %s ..." % self.origin | |
208 | system("git checkout -f -b p4-sync %s" % self.origin) | |
4f5cf76a SH |
209 | |
210 | def prepareLogMessage(self, template, message): | |
211 | result = "" | |
212 | ||
213 | for line in template.split("\n"): | |
214 | if line.startswith("#"): | |
215 | result += line + "\n" | |
216 | continue | |
217 | ||
218 | substituted = False | |
219 | for key in self.logSubstitutions.keys(): | |
220 | if line.find(key) != -1: | |
221 | value = self.logSubstitutions[key] | |
222 | value = value.replace("%log%", message) | |
223 | if value != "@remove@": | |
224 | result += line.replace(key, value) + "\n" | |
225 | substituted = True | |
226 | break | |
227 | ||
228 | if not substituted: | |
229 | result += line + "\n" | |
230 | ||
231 | return result | |
232 | ||
233 | def apply(self, id): | |
9863f405 | 234 | print "Applying %s" % (os.popen("git log --max-count=1 --pretty=oneline %s" % id).read()) |
4f5cf76a SH |
235 | diff = os.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines() |
236 | filesToAdd = set() | |
237 | filesToDelete = set() | |
238 | for line in diff: | |
239 | modifier = line[0] | |
240 | path = line[1:].strip() | |
241 | if modifier == "M": | |
242 | system("p4 edit %s" % path) | |
243 | elif modifier == "A": | |
244 | filesToAdd.add(path) | |
245 | if path in filesToDelete: | |
246 | filesToDelete.remove(path) | |
247 | elif modifier == "D": | |
248 | filesToDelete.add(path) | |
249 | if path in filesToAdd: | |
250 | filesToAdd.remove(path) | |
251 | else: | |
252 | die("unknown modifier %s for %s" % (modifier, path)) | |
253 | ||
04219c04 | 254 | if self.applyAsPatch: |
9863f405 | 255 | system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id)) |
04219c04 | 256 | else: |
9863f405 | 257 | system("git diff-files --name-only -z | git update-index --remove -z --stdin") |
04219c04 | 258 | system("git cherry-pick --no-commit \"%s\"" % id) |
4f5cf76a SH |
259 | |
260 | for f in filesToAdd: | |
261 | system("p4 add %s" % f) | |
262 | for f in filesToDelete: | |
263 | system("p4 revert %s" % f) | |
264 | system("p4 delete %s" % f) | |
265 | ||
6ae8de88 SH |
266 | logMessage = extractLogMessageFromGitCommit(id) |
267 | logMessage = logMessage.replace("\n", "\n\t") | |
268 | logMessage = logMessage[:-1] | |
4f5cf76a SH |
269 | |
270 | template = os.popen("p4 change -o").read() | |
271 | ||
272 | if self.interactive: | |
273 | submitTemplate = self.prepareLogMessage(template, logMessage) | |
274 | diff = os.popen("p4 diff -du ...").read() | |
275 | ||
276 | for newFile in filesToAdd: | |
277 | diff += "==== new file ====\n" | |
278 | diff += "--- /dev/null\n" | |
279 | diff += "+++ %s\n" % newFile | |
280 | f = open(newFile, "r") | |
281 | for line in f.readlines(): | |
282 | diff += "+" + line | |
283 | f.close() | |
284 | ||
53150250 | 285 | separatorLine = "######## everything below this line is just the diff #######\n" |
4f5cf76a SH |
286 | |
287 | response = "e" | |
53150250 | 288 | firstIteration = True |
4f5cf76a | 289 | while response == "e": |
53150250 SH |
290 | if not firstIteration: |
291 | response = raw_input("Do you want to submit this change (y/e/n)? ") | |
292 | firstIteration = False | |
4f5cf76a SH |
293 | if response == "e": |
294 | [handle, fileName] = tempfile.mkstemp() | |
295 | tmpFile = os.fdopen(handle, "w+") | |
53150250 | 296 | tmpFile.write(submitTemplate + separatorLine + diff) |
4f5cf76a SH |
297 | tmpFile.close() |
298 | editor = os.environ.get("EDITOR", "vi") | |
299 | system(editor + " " + fileName) | |
300 | tmpFile = open(fileName, "r") | |
53150250 | 301 | message = tmpFile.read() |
4f5cf76a SH |
302 | tmpFile.close() |
303 | os.remove(fileName) | |
53150250 | 304 | submitTemplate = message[:message.index(separatorLine)] |
4f5cf76a SH |
305 | |
306 | if response == "y" or response == "yes": | |
307 | if self.dryRun: | |
308 | print submitTemplate | |
309 | raw_input("Press return to continue...") | |
310 | else: | |
311 | pipe = os.popen("p4 submit -i", "w") | |
312 | pipe.write(submitTemplate) | |
313 | pipe.close() | |
314 | else: | |
315 | print "Not submitting!" | |
316 | self.interactive = False | |
317 | else: | |
318 | fileName = "submit.txt" | |
319 | file = open(fileName, "w+") | |
320 | file.write(self.prepareLogMessage(template, logMessage)) | |
321 | file.close() | |
322 | print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName) | |
323 | ||
324 | def run(self, args): | |
9512497b SH |
325 | global gitdir |
326 | # make gitdir absolute so we can cd out into the perforce checkout | |
327 | gitdir = os.path.abspath(gitdir) | |
328 | os.environ["GIT_DIR"] = gitdir | |
329 | depotPath = "" | |
330 | if gitBranchExists("p4"): | |
331 | [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4")) | |
332 | if len(depotPath) == 0 and gitBranchExists("origin"): | |
333 | [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin")) | |
334 | ||
335 | if len(depotPath) == 0: | |
336 | print "Internal error: cannot locate perforce depot path from existing branches" | |
337 | sys.exit(128) | |
338 | ||
cb2c9db5 | 339 | clientPath = p4Where(depotPath) |
9512497b SH |
340 | |
341 | if len(clientPath) == 0: | |
342 | print "Error: Cannot locate perforce checkout of %s in client view" % depotPath | |
343 | sys.exit(128) | |
344 | ||
345 | print "Perforce checkout for depot path %s located at %s" % (depotPath, clientPath) | |
346 | os.chdir(clientPath) | |
274917a3 | 347 | response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath) |
9512497b SH |
348 | if response == "y" or response == "yes": |
349 | system("p4 sync ...") | |
350 | ||
351 | if len(self.origin) == 0: | |
352 | if gitBranchExists("p4"): | |
353 | self.origin = "p4" | |
354 | else: | |
355 | self.origin = "origin" | |
356 | ||
4f5cf76a SH |
357 | if self.reset: |
358 | self.firstTime = True | |
359 | ||
360 | if len(self.substFile) > 0: | |
361 | for line in open(self.substFile, "r").readlines(): | |
362 | tokens = line[:-1].split("=") | |
363 | self.logSubstitutions[tokens[0]] = tokens[1] | |
364 | ||
365 | if len(self.master) == 0: | |
366 | self.master = currentGitBranch() | |
367 | if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)): | |
368 | die("Detecting current git branch failed!") | |
369 | ||
370 | self.check() | |
371 | self.configFile = gitdir + "/p4-git-sync.cfg" | |
372 | self.config = shelve.open(self.configFile, writeback=True) | |
373 | ||
374 | if self.firstTime: | |
375 | self.start() | |
376 | ||
377 | commits = self.config.get("commits", []) | |
378 | ||
379 | while len(commits) > 0: | |
380 | self.firstTime = False | |
381 | commit = commits[0] | |
382 | commits = commits[1:] | |
383 | self.config["commits"] = commits | |
384 | self.apply(commit) | |
385 | if not self.interactive: | |
386 | break | |
387 | ||
388 | self.config.close() | |
389 | ||
390 | if len(commits) == 0: | |
391 | if self.firstTime: | |
392 | print "No changes found to apply between %s and current HEAD" % self.origin | |
393 | else: | |
394 | print "All changes applied!" | |
04219c04 SH |
395 | if not self.applyAsPatch: |
396 | print "Deleting temporary p4-sync branch and going back to %s" % self.master | |
397 | system("git checkout %s" % self.master) | |
398 | system("git branch -D p4-sync") | |
399 | print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..." | |
400 | system("p4 edit ... >/dev/null") | |
401 | system("p4 revert ... >/dev/null") | |
4f5cf76a SH |
402 | os.remove(self.configFile) |
403 | ||
b984733c SH |
404 | return True |
405 | ||
406 | class GitSync(Command): | |
407 | def __init__(self): | |
408 | Command.__init__(self) | |
409 | self.options = [ | |
410 | optparse.make_option("--branch", dest="branch"), | |
411 | optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"), | |
412 | optparse.make_option("--changesfile", dest="changesFile"), | |
413 | optparse.make_option("--silent", dest="silent", action="store_true"), | |
414 | optparse.make_option("--known-branches", dest="knownBranches"), | |
415 | optparse.make_option("--cache", dest="doCache", action="store_true"), | |
416 | optparse.make_option("--command-cache", dest="commandCache", action="store_true") | |
417 | ] | |
418 | self.description = """Imports from Perforce into a git repository.\n | |
419 | example: | |
420 | //depot/my/project/ -- to import the current head | |
421 | //depot/my/project/@all -- to import everything | |
422 | //depot/my/project/@1,6 -- to import only from revision 1 to 6 | |
423 | ||
424 | (a ... is not needed in the path p4 specification, it's added implicitly)""" | |
425 | ||
426 | self.usage += " //depot/path[@revRange]" | |
427 | ||
428 | self.dataCache = False | |
429 | self.commandCache = False | |
430 | self.silent = False | |
431 | self.knownBranches = Set() | |
432 | self.createdBranches = Set() | |
433 | self.committedChanges = Set() | |
569d1bd4 | 434 | self.branch = "" |
b984733c SH |
435 | self.detectBranches = False |
436 | self.changesFile = "" | |
437 | ||
438 | def p4File(self, depotPath): | |
439 | return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read() | |
440 | ||
441 | def extractFilesFromCommit(self, commit): | |
442 | files = [] | |
443 | fnum = 0 | |
444 | while commit.has_key("depotFile%s" % fnum): | |
445 | path = commit["depotFile%s" % fnum] | |
446 | if not path.startswith(self.globalPrefix): | |
447 | # if not self.silent: | |
448 | # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change) | |
449 | fnum = fnum + 1 | |
450 | continue | |
451 | ||
452 | file = {} | |
453 | file["path"] = path | |
454 | file["rev"] = commit["rev%s" % fnum] | |
455 | file["action"] = commit["action%s" % fnum] | |
456 | file["type"] = commit["type%s" % fnum] | |
457 | files.append(file) | |
458 | fnum = fnum + 1 | |
459 | return files | |
460 | ||
461 | def isSubPathOf(self, first, second): | |
462 | if not first.startswith(second): | |
463 | return False | |
464 | if first == second: | |
465 | return True | |
466 | return first[len(second)] == "/" | |
467 | ||
468 | def branchesForCommit(self, files): | |
469 | branches = Set() | |
470 | ||
471 | for file in files: | |
472 | relativePath = file["path"][len(self.globalPrefix):] | |
473 | # strip off the filename | |
474 | relativePath = relativePath[0:relativePath.rfind("/")] | |
475 | ||
476 | # if len(branches) == 0: | |
477 | # branches.add(relativePath) | |
478 | # knownBranches.add(relativePath) | |
479 | # continue | |
480 | ||
481 | ###### this needs more testing :) | |
482 | knownBranch = False | |
483 | for branch in branches: | |
484 | if relativePath == branch: | |
485 | knownBranch = True | |
486 | break | |
487 | # if relativePath.startswith(branch): | |
488 | if self.isSubPathOf(relativePath, branch): | |
489 | knownBranch = True | |
490 | break | |
491 | # if branch.startswith(relativePath): | |
492 | if self.isSubPathOf(branch, relativePath): | |
493 | branches.remove(branch) | |
494 | break | |
495 | ||
496 | if knownBranch: | |
497 | continue | |
498 | ||
499 | for branch in knownBranches: | |
500 | #if relativePath.startswith(branch): | |
501 | if self.isSubPathOf(relativePath, branch): | |
502 | if len(branches) == 0: | |
503 | relativePath = branch | |
504 | else: | |
505 | knownBranch = True | |
506 | break | |
507 | ||
508 | if knownBranch: | |
509 | continue | |
510 | ||
511 | branches.add(relativePath) | |
512 | self.knownBranches.add(relativePath) | |
513 | ||
514 | return branches | |
515 | ||
516 | def findBranchParent(self, branchPrefix, files): | |
517 | for file in files: | |
518 | path = file["path"] | |
519 | if not path.startswith(branchPrefix): | |
520 | continue | |
521 | action = file["action"] | |
522 | if action != "integrate" and action != "branch": | |
523 | continue | |
524 | rev = file["rev"] | |
525 | depotPath = path + "#" + rev | |
526 | ||
527 | log = p4CmdList("filelog \"%s\"" % depotPath) | |
528 | if len(log) != 1: | |
529 | print "eek! I got confused by the filelog of %s" % depotPath | |
530 | sys.exit(1); | |
531 | ||
532 | log = log[0] | |
533 | if log["action0"] != action: | |
534 | print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action) | |
535 | sys.exit(1); | |
536 | ||
537 | branchAction = log["how0,0"] | |
538 | # if branchAction == "branch into" or branchAction == "ignored": | |
539 | # continue # ignore for branching | |
540 | ||
541 | if not branchAction.endswith(" from"): | |
542 | continue # ignore for branching | |
543 | # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction) | |
544 | # sys.exit(1); | |
545 | ||
546 | source = log["file0,0"] | |
547 | if source.startswith(branchPrefix): | |
548 | continue | |
549 | ||
550 | lastSourceRev = log["erev0,0"] | |
551 | ||
552 | sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev)) | |
553 | if len(sourceLog) != 1: | |
554 | print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev) | |
555 | sys.exit(1); | |
556 | sourceLog = sourceLog[0] | |
557 | ||
558 | relPath = source[len(self.globalPrefix):] | |
559 | # strip off the filename | |
560 | relPath = relPath[0:relPath.rfind("/")] | |
561 | ||
562 | for branch in self.knownBranches: | |
563 | if self.isSubPathOf(relPath, branch): | |
564 | # print "determined parent branch branch %s due to change in file %s" % (branch, source) | |
565 | return branch | |
566 | # else: | |
567 | # print "%s is not a subpath of branch %s" % (relPath, branch) | |
568 | ||
569 | return "" | |
570 | ||
c715706b | 571 | def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""): |
b984733c SH |
572 | epoch = details["time"] |
573 | author = details["user"] | |
574 | ||
575 | self.gitStream.write("commit %s\n" % branch) | |
576 | # gitStream.write("mark :%s\n" % details["change"]) | |
577 | self.committedChanges.add(int(details["change"])) | |
578 | committer = "" | |
579 | if author in self.users: | |
0828ab14 | 580 | committer = "%s %s %s" % (self.users[author], epoch, self.tz) |
b984733c | 581 | else: |
0828ab14 | 582 | committer = "%s <a@b> %s %s" % (author, epoch, self.tz) |
b984733c SH |
583 | |
584 | self.gitStream.write("committer %s\n" % committer) | |
585 | ||
586 | self.gitStream.write("data <<EOT\n") | |
587 | self.gitStream.write(details["desc"]) | |
6ae8de88 | 588 | self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"])) |
b984733c SH |
589 | self.gitStream.write("EOT\n\n") |
590 | ||
591 | if len(parent) > 0: | |
592 | self.gitStream.write("from %s\n" % parent) | |
593 | ||
594 | if len(merged) > 0: | |
595 | self.gitStream.write("merge %s\n" % merged) | |
596 | ||
597 | for file in files: | |
598 | path = file["path"] | |
599 | if not path.startswith(branchPrefix): | |
600 | # if not silent: | |
601 | # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"]) | |
602 | continue | |
603 | rev = file["rev"] | |
604 | depotPath = path + "#" + rev | |
605 | relPath = path[len(branchPrefix):] | |
606 | action = file["action"] | |
607 | ||
608 | if file["type"] == "apple": | |
609 | print "\nfile %s is a strange apple file that forks. Ignoring!" % path | |
610 | continue | |
611 | ||
612 | if action == "delete": | |
613 | self.gitStream.write("D %s\n" % relPath) | |
614 | else: | |
615 | mode = 644 | |
616 | if file["type"].startswith("x"): | |
617 | mode = 755 | |
618 | ||
619 | data = self.p4File(depotPath) | |
620 | ||
621 | self.gitStream.write("M %s inline %s\n" % (mode, relPath)) | |
622 | self.gitStream.write("data %s\n" % len(data)) | |
623 | self.gitStream.write(data) | |
624 | self.gitStream.write("\n") | |
625 | ||
626 | self.gitStream.write("\n") | |
627 | ||
628 | self.lastChange = int(details["change"]) | |
629 | ||
630 | def extractFilesInCommitToBranch(self, files, branchPrefix): | |
631 | newFiles = [] | |
632 | ||
633 | for file in files: | |
634 | path = file["path"] | |
635 | if path.startswith(branchPrefix): | |
636 | newFiles.append(file) | |
637 | ||
638 | return newFiles | |
639 | ||
640 | def findBranchSourceHeuristic(self, files, branch, branchPrefix): | |
641 | for file in files: | |
642 | action = file["action"] | |
643 | if action != "integrate" and action != "branch": | |
644 | continue | |
645 | path = file["path"] | |
646 | rev = file["rev"] | |
647 | depotPath = path + "#" + rev | |
648 | ||
649 | log = p4CmdList("filelog \"%s\"" % depotPath) | |
650 | if len(log) != 1: | |
651 | print "eek! I got confused by the filelog of %s" % depotPath | |
652 | sys.exit(1); | |
653 | ||
654 | log = log[0] | |
655 | if log["action0"] != action: | |
656 | print "eek! wrong action in filelog for %s : found %s, expected %s" % (depotPath, log["action0"], action) | |
657 | sys.exit(1); | |
658 | ||
659 | branchAction = log["how0,0"] | |
660 | ||
661 | if not branchAction.endswith(" from"): | |
662 | continue # ignore for branching | |
663 | # print "eek! file %s was not branched from but instead: %s" % (depotPath, branchAction) | |
664 | # sys.exit(1); | |
665 | ||
666 | source = log["file0,0"] | |
667 | if source.startswith(branchPrefix): | |
668 | continue | |
669 | ||
670 | lastSourceRev = log["erev0,0"] | |
671 | ||
672 | sourceLog = p4CmdList("filelog -m 1 \"%s%s\"" % (source, lastSourceRev)) | |
673 | if len(sourceLog) != 1: | |
674 | print "eek! I got confused by the source filelog of %s%s" % (source, lastSourceRev) | |
675 | sys.exit(1); | |
676 | sourceLog = sourceLog[0] | |
677 | ||
678 | relPath = source[len(self.globalPrefix):] | |
679 | # strip off the filename | |
680 | relPath = relPath[0:relPath.rfind("/")] | |
681 | ||
682 | for candidate in self.knownBranches: | |
683 | if self.isSubPathOf(relPath, candidate) and candidate != branch: | |
684 | return candidate | |
685 | ||
686 | return "" | |
687 | ||
688 | def changeIsBranchMerge(self, sourceBranch, destinationBranch, change): | |
689 | sourceFiles = {} | |
690 | for file in p4CmdList("files %s...@%s" % (self.globalPrefix + sourceBranch + "/", change)): | |
691 | if file["action"] == "delete": | |
692 | continue | |
693 | sourceFiles[file["depotFile"]] = file | |
694 | ||
695 | destinationFiles = {} | |
696 | for file in p4CmdList("files %s...@%s" % (self.globalPrefix + destinationBranch + "/", change)): | |
697 | destinationFiles[file["depotFile"]] = file | |
698 | ||
699 | for fileName in sourceFiles.keys(): | |
700 | integrations = [] | |
701 | deleted = False | |
702 | integrationCount = 0 | |
703 | for integration in p4CmdList("integrated \"%s\"" % fileName): | |
704 | toFile = integration["fromFile"] # yes, it's true, it's fromFile | |
705 | if not toFile in destinationFiles: | |
706 | continue | |
707 | destFile = destinationFiles[toFile] | |
708 | if destFile["action"] == "delete": | |
709 | # print "file %s has been deleted in %s" % (fileName, toFile) | |
710 | deleted = True | |
711 | break | |
712 | integrationCount += 1 | |
713 | if integration["how"] == "branch from": | |
714 | continue | |
715 | ||
716 | if int(integration["change"]) == change: | |
717 | integrations.append(integration) | |
718 | continue | |
719 | if int(integration["change"]) > change: | |
720 | continue | |
721 | ||
722 | destRev = int(destFile["rev"]) | |
723 | ||
724 | startRev = integration["startFromRev"][1:] | |
725 | if startRev == "none": | |
726 | startRev = 0 | |
727 | else: | |
728 | startRev = int(startRev) | |
729 | ||
730 | endRev = integration["endFromRev"][1:] | |
731 | if endRev == "none": | |
732 | endRev = 0 | |
733 | else: | |
734 | endRev = int(endRev) | |
735 | ||
736 | initialBranch = (destRev == 1 and integration["how"] != "branch into") | |
737 | inRange = (destRev >= startRev and destRev <= endRev) | |
738 | newer = (destRev > startRev and destRev > endRev) | |
739 | ||
740 | if initialBranch or inRange or newer: | |
741 | integrations.append(integration) | |
742 | ||
743 | if deleted: | |
744 | continue | |
745 | ||
746 | if len(integrations) == 0 and integrationCount > 1: | |
747 | print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch) | |
748 | return False | |
749 | ||
750 | return True | |
751 | ||
752 | def getUserMap(self): | |
753 | self.users = {} | |
754 | ||
755 | for output in p4CmdList("users"): | |
756 | if not output.has_key("User"): | |
757 | continue | |
758 | self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">" | |
759 | ||
760 | def run(self, args): | |
179caebf SH |
761 | self.globalPrefix = "" |
762 | self.changeRange = "" | |
763 | self.initialParent = "" | |
764 | self.tagLastChange = True | |
765 | ||
569d1bd4 SH |
766 | if len(self.branch) == 0: |
767 | self.branch = "p4" | |
967f72e2 SH |
768 | |
769 | if len(args) == 0: | |
770 | if not gitBranchExists(self.branch) and gitBranchExists("origin"): | |
771 | if not self.silent: | |
772 | print "Creating %s branch in git repository based on origin" % self.branch | |
773 | system("git branch %s origin" % self.branch) | |
774 | ||
775 | [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch)) | |
776 | if len(self.previousDepotPath) > 0 and len(p4Change) > 0: | |
777 | p4Change = int(p4Change) + 1 | |
778 | self.globalPrefix = self.previousDepotPath | |
779 | self.changeRange = "@%s,#head" % p4Change | |
780 | self.initialParent = self.branch | |
781 | self.tagLastChange = False | |
782 | if not self.silent: | |
783 | print "Performing incremental import into %s git branch" % self.branch | |
569d1bd4 | 784 | |
b984733c | 785 | self.branch = "refs/heads/" + self.branch |
179caebf SH |
786 | |
787 | if len(self.globalPrefix) == 0: | |
9863f405 | 788 | self.globalPrefix = self.previousDepotPath = os.popen("git repo-config --get p4.depotpath").read() |
179caebf | 789 | |
b984733c SH |
790 | if len(self.globalPrefix) != 0: |
791 | self.globalPrefix = self.globalPrefix[:-1] | |
792 | ||
793 | if len(args) == 0 and len(self.globalPrefix) != 0: | |
794 | if not self.silent: | |
179caebf | 795 | print "Depot path: %s" % self.globalPrefix |
b984733c SH |
796 | elif len(args) != 1: |
797 | return False | |
798 | else: | |
799 | if len(self.globalPrefix) != 0 and self.globalPrefix != args[0]: | |
800 | print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.globalPrefix, args[0]) | |
801 | sys.exit(1) | |
802 | self.globalPrefix = args[0] | |
803 | ||
b984733c SH |
804 | self.revision = "" |
805 | self.users = {} | |
b984733c SH |
806 | self.lastChange = 0 |
807 | self.initialTag = "" | |
808 | ||
809 | if self.globalPrefix.find("@") != -1: | |
810 | atIdx = self.globalPrefix.index("@") | |
811 | self.changeRange = self.globalPrefix[atIdx:] | |
812 | if self.changeRange == "@all": | |
813 | self.changeRange = "" | |
814 | elif self.changeRange.find(",") == -1: | |
815 | self.revision = self.changeRange | |
816 | self.changeRange = "" | |
817 | self.globalPrefix = self.globalPrefix[0:atIdx] | |
818 | elif self.globalPrefix.find("#") != -1: | |
819 | hashIdx = self.globalPrefix.index("#") | |
820 | self.revision = self.globalPrefix[hashIdx:] | |
821 | self.globalPrefix = self.globalPrefix[0:hashIdx] | |
822 | elif len(self.previousDepotPath) == 0: | |
823 | self.revision = "#head" | |
824 | ||
825 | if self.globalPrefix.endswith("..."): | |
826 | self.globalPrefix = self.globalPrefix[:-3] | |
827 | ||
828 | if not self.globalPrefix.endswith("/"): | |
829 | self.globalPrefix += "/" | |
830 | ||
831 | self.getUserMap() | |
832 | ||
833 | if len(self.changeRange) == 0: | |
834 | try: | |
9863f405 | 835 | sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % self.branch) |
b984733c SH |
836 | output = sout.read() |
837 | if output.endswith("\n"): | |
838 | output = output[:-1] | |
839 | tagIdx = output.index(" tags/p4/") | |
840 | caretIdx = output.find("^") | |
841 | endPos = len(output) | |
842 | if caretIdx != -1: | |
843 | endPos = caretIdx | |
844 | self.rev = int(output[tagIdx + 9 : endPos]) + 1 | |
845 | self.changeRange = "@%s,#head" % self.rev | |
9863f405 | 846 | self.initialParent = os.popen("git rev-parse %s" % self.branch).read()[:-1] |
b984733c SH |
847 | self.initialTag = "p4/%s" % (int(self.rev) - 1) |
848 | except: | |
849 | pass | |
850 | ||
0828ab14 SH |
851 | self.tz = - time.timezone / 36 |
852 | tzsign = ("%s" % self.tz)[0] | |
b984733c | 853 | if tzsign != '+' and tzsign != '-': |
0828ab14 | 854 | self.tz = "+" + ("%s" % self.tz) |
b984733c | 855 | |
9863f405 | 856 | self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import") |
b984733c SH |
857 | |
858 | if len(self.revision) > 0: | |
859 | print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision) | |
860 | ||
861 | details = { "user" : "git perforce import user", "time" : int(time.time()) } | |
862 | details["desc"] = "Initial import of %s from the state at revision %s" % (self.globalPrefix, self.revision) | |
863 | details["change"] = self.revision | |
864 | newestRevision = 0 | |
865 | ||
866 | fileCnt = 0 | |
867 | for info in p4CmdList("files %s...%s" % (self.globalPrefix, self.revision)): | |
868 | change = int(info["change"]) | |
869 | if change > newestRevision: | |
870 | newestRevision = change | |
871 | ||
872 | if info["action"] == "delete": | |
c715706b | 873 | fileCnt = fileCnt + 1 |
b984733c SH |
874 | continue |
875 | ||
876 | for prop in [ "depotFile", "rev", "action", "type" ]: | |
877 | details["%s%s" % (prop, fileCnt)] = info[prop] | |
878 | ||
879 | fileCnt = fileCnt + 1 | |
880 | ||
881 | details["change"] = newestRevision | |
882 | ||
883 | try: | |
884 | self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix) | |
c715706b | 885 | except IOError: |
b984733c SH |
886 | print self.gitError.read() |
887 | ||
888 | else: | |
889 | changes = [] | |
890 | ||
0828ab14 | 891 | if len(self.changesFile) > 0: |
b984733c SH |
892 | output = open(self.changesFile).readlines() |
893 | changeSet = Set() | |
894 | for line in output: | |
895 | changeSet.add(int(line)) | |
896 | ||
897 | for change in changeSet: | |
898 | changes.append(change) | |
899 | ||
900 | changes.sort() | |
901 | else: | |
902 | output = os.popen("p4 changes %s...%s" % (self.globalPrefix, self.changeRange)).readlines() | |
903 | ||
904 | for line in output: | |
905 | changeNum = line.split(" ")[1] | |
906 | changes.append(changeNum) | |
907 | ||
908 | changes.reverse() | |
909 | ||
910 | if len(changes) == 0: | |
0828ab14 | 911 | if not self.silent: |
b984733c SH |
912 | print "no changes to import!" |
913 | sys.exit(1) | |
914 | ||
915 | cnt = 1 | |
916 | for change in changes: | |
917 | description = p4Cmd("describe %s" % change) | |
918 | ||
0828ab14 | 919 | if not self.silent: |
b984733c SH |
920 | sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes))) |
921 | sys.stdout.flush() | |
922 | cnt = cnt + 1 | |
923 | ||
924 | try: | |
925 | files = self.extractFilesFromCommit(description) | |
926 | if self.detectBranches: | |
927 | for branch in self.branchesForCommit(files): | |
928 | self.knownBranches.add(branch) | |
929 | branchPrefix = self.globalPrefix + branch + "/" | |
930 | ||
931 | filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix) | |
932 | ||
933 | merged = "" | |
934 | parent = "" | |
935 | ########### remove cnt!!! | |
936 | if branch not in self.createdBranches and cnt > 2: | |
937 | self.createdBranches.add(branch) | |
938 | parent = self.findBranchParent(branchPrefix, files) | |
939 | if parent == branch: | |
940 | parent = "" | |
941 | # elif len(parent) > 0: | |
942 | # print "%s branched off of %s" % (branch, parent) | |
943 | ||
944 | if len(parent) == 0: | |
945 | merged = self.findBranchSourceHeuristic(filesForCommit, branch, branchPrefix) | |
946 | if len(merged) > 0: | |
947 | print "change %s could be a merge from %s into %s" % (description["change"], merged, branch) | |
948 | if not self.changeIsBranchMerge(merged, branch, int(description["change"])): | |
949 | merged = "" | |
950 | ||
951 | branch = "refs/heads/" + branch | |
952 | if len(parent) > 0: | |
953 | parent = "refs/heads/" + parent | |
954 | if len(merged) > 0: | |
955 | merged = "refs/heads/" + merged | |
956 | self.commit(description, files, branch, branchPrefix, parent, merged) | |
957 | else: | |
0828ab14 | 958 | self.commit(description, files, self.branch, self.globalPrefix, self.initialParent) |
b984733c SH |
959 | self.initialParent = "" |
960 | except IOError: | |
961 | print self.gitError.read() | |
962 | sys.exit(1) | |
963 | ||
964 | if not self.silent: | |
965 | print "" | |
966 | ||
179caebf SH |
967 | if self.tagLastChange: |
968 | self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange) | |
969 | self.gitStream.write("from %s\n\n" % self.branch); | |
b984733c SH |
970 | |
971 | ||
972 | self.gitStream.close() | |
973 | self.gitOutput.close() | |
974 | self.gitError.close() | |
975 | ||
9863f405 | 976 | os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read() |
b984733c SH |
977 | if len(self.initialTag) > 0: |
978 | os.popen("git tag -d %s" % self.initialTag).read() | |
979 | ||
980 | return True | |
981 | ||
982 | class HelpFormatter(optparse.IndentedHelpFormatter): | |
983 | def __init__(self): | |
984 | optparse.IndentedHelpFormatter.__init__(self) | |
985 | ||
986 | def format_description(self, description): | |
987 | if description: | |
988 | return description + "\n" | |
989 | else: | |
990 | return "" | |
4f5cf76a | 991 | |
86949eef SH |
992 | def printUsage(commands): |
993 | print "usage: %s <command> [options]" % sys.argv[0] | |
994 | print "" | |
995 | print "valid commands: %s" % ", ".join(commands) | |
996 | print "" | |
997 | print "Try %s <command> --help for command specific help." % sys.argv[0] | |
998 | print "" | |
999 | ||
1000 | commands = { | |
1001 | "debug" : P4Debug(), | |
4f5cf76a | 1002 | "clean-tags" : P4CleanTags(), |
b984733c SH |
1003 | "submit" : P4Sync(), |
1004 | "sync" : GitSync() | |
86949eef SH |
1005 | } |
1006 | ||
1007 | if len(sys.argv[1:]) == 0: | |
1008 | printUsage(commands.keys()) | |
1009 | sys.exit(2) | |
1010 | ||
1011 | cmd = "" | |
1012 | cmdName = sys.argv[1] | |
1013 | try: | |
1014 | cmd = commands[cmdName] | |
1015 | except KeyError: | |
1016 | print "unknown command %s" % cmdName | |
1017 | print "" | |
1018 | printUsage(commands.keys()) | |
1019 | sys.exit(2) | |
1020 | ||
4f5cf76a SH |
1021 | options = cmd.options |
1022 | cmd.gitdir = gitdir | |
4f5cf76a | 1023 | |
e20a9e53 | 1024 | args = sys.argv[2:] |
86949eef | 1025 | |
e20a9e53 SH |
1026 | if len(options) > 0: |
1027 | options.append(optparse.make_option("--git-dir", dest="gitdir")) | |
1028 | ||
1029 | parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), | |
1030 | options, | |
1031 | description = cmd.description, | |
1032 | formatter = HelpFormatter()) | |
1033 | ||
1034 | (cmd, args) = parser.parse_args(sys.argv[2:], cmd); | |
86949eef | 1035 | |
8910ac0e SH |
1036 | if cmd.needsGit: |
1037 | gitdir = cmd.gitdir | |
1038 | if len(gitdir) == 0: | |
1039 | gitdir = ".git" | |
1040 | if not isValidGitDir(gitdir): | |
1041 | cdup = os.popen("git rev-parse --show-cdup").read()[:-1] | |
1042 | if isValidGitDir(cdup + "/" + gitdir): | |
1043 | os.chdir(cdup) | |
4f5cf76a | 1044 | |
8910ac0e SH |
1045 | if not isValidGitDir(gitdir): |
1046 | if isValidGitDir(gitdir + "/.git"): | |
1047 | gitdir += "/.git" | |
1048 | else: | |
1049 | die("fatal: cannot locate git repository at %s" % gitdir) | |
4f5cf76a | 1050 | |
8910ac0e | 1051 | os.environ["GIT_DIR"] = gitdir |
4f5cf76a | 1052 | |
b984733c SH |
1053 | if not cmd.run(args): |
1054 | parser.print_help() | |
1055 |