]>
Commit | Line | Data |
---|---|---|
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> | |
6 | # Copyright: 2007 Simon Hausmann <hausmann@kde.org> | |
7 | # 2007 Trolltech ASA | |
8 | # License: MIT <http://www.opensource.org/licenses/mit-license.php> | |
9 | # | |
10 | # TODO: * Consider making --with-origin the default, assuming that the git | |
11 | # protocol is always more efficient. (needs manual testing first :) | |
12 | # | |
13 | ||
14 | import optparse, sys, os, marshal, popen2, subprocess, shelve | |
15 | import tempfile, getopt, sha, os.path, time, platform | |
16 | from sets import Set; | |
17 | ||
18 | gitdir = os.environ.get("GIT_DIR", "") | |
19 | ||
20 | def mypopen(command): | |
21 | return os.popen(command, "rb"); | |
22 | ||
23 | def p4CmdList(cmd): | |
24 | cmd = "p4 -G %s" % cmd | |
25 | pipe = os.popen(cmd, "rb") | |
26 | ||
27 | result = [] | |
28 | try: | |
29 | while True: | |
30 | entry = marshal.load(pipe) | |
31 | result.append(entry) | |
32 | except EOFError: | |
33 | pass | |
34 | exitCode = pipe.close() | |
35 | if exitCode != None: | |
36 | entry = {} | |
37 | entry["p4ExitCode"] = exitCode | |
38 | result.append(entry) | |
39 | ||
40 | return result | |
41 | ||
42 | def p4Cmd(cmd): | |
43 | list = p4CmdList(cmd) | |
44 | result = {} | |
45 | for entry in list: | |
46 | result.update(entry) | |
47 | return result; | |
48 | ||
49 | def p4Where(depotPath): | |
50 | if not depotPath.endswith("/"): | |
51 | depotPath += "/" | |
52 | output = p4Cmd("where %s..." % depotPath) | |
53 | if output["code"] == "error": | |
54 | return "" | |
55 | clientPath = "" | |
56 | if "path" in output: | |
57 | clientPath = output.get("path") | |
58 | elif "data" in output: | |
59 | data = output.get("data") | |
60 | lastSpace = data.rfind(" ") | |
61 | clientPath = data[lastSpace + 1:] | |
62 | ||
63 | if clientPath.endswith("..."): | |
64 | clientPath = clientPath[:-3] | |
65 | return clientPath | |
66 | ||
67 | def die(msg): | |
68 | sys.stderr.write(msg + "\n") | |
69 | sys.exit(1) | |
70 | ||
71 | def currentGitBranch(): | |
72 | return mypopen("git name-rev HEAD").read().split(" ")[1][:-1] | |
73 | ||
74 | def isValidGitDir(path): | |
75 | if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"): | |
76 | return True; | |
77 | return False | |
78 | ||
79 | def parseRevision(ref): | |
80 | return mypopen("git rev-parse %s" % ref).read()[:-1] | |
81 | ||
82 | def system(cmd): | |
83 | if os.system(cmd) != 0: | |
84 | die("command failed: %s" % cmd) | |
85 | ||
86 | def extractLogMessageFromGitCommit(commit): | |
87 | logMessage = "" | |
88 | foundTitle = False | |
89 | for log in mypopen("git cat-file commit %s" % commit).readlines(): | |
90 | if not foundTitle: | |
91 | if len(log) == 1: | |
92 | foundTitle = True | |
93 | continue | |
94 | ||
95 | logMessage += log | |
96 | return logMessage | |
97 | ||
98 | def extractDepotPathAndChangeFromGitLog(log): | |
99 | values = {} | |
100 | for line in log.split("\n"): | |
101 | line = line.strip() | |
102 | if line.startswith("[git-p4:") and line.endswith("]"): | |
103 | line = line[8:-1].strip() | |
104 | for assignment in line.split(":"): | |
105 | variable = assignment.strip() | |
106 | value = "" | |
107 | equalPos = assignment.find("=") | |
108 | if equalPos != -1: | |
109 | variable = assignment[:equalPos].strip() | |
110 | value = assignment[equalPos + 1:].strip() | |
111 | if value.startswith("\"") and value.endswith("\""): | |
112 | value = value[1:-1] | |
113 | values[variable] = value | |
114 | ||
115 | return values.get("depot-path"), values.get("change") | |
116 | ||
117 | def gitBranchExists(branch): | |
118 | proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE); | |
119 | return proc.wait() == 0; | |
120 | ||
121 | class Command: | |
122 | def __init__(self): | |
123 | self.usage = "usage: %prog [options]" | |
124 | self.needsGit = True | |
125 | ||
126 | class P4Debug(Command): | |
127 | def __init__(self): | |
128 | Command.__init__(self) | |
129 | self.options = [ | |
130 | ] | |
131 | self.description = "A tool to debug the output of p4 -G." | |
132 | self.needsGit = False | |
133 | ||
134 | def run(self, args): | |
135 | for output in p4CmdList(" ".join(args)): | |
136 | print output | |
137 | return True | |
138 | ||
139 | class P4RollBack(Command): | |
140 | def __init__(self): | |
141 | Command.__init__(self) | |
142 | self.options = [ | |
143 | optparse.make_option("--verbose", dest="verbose", action="store_true"), | |
144 | optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") | |
145 | ] | |
146 | self.description = "A tool to debug the multi-branch import. Don't use :)" | |
147 | self.verbose = False | |
148 | self.rollbackLocalBranches = False | |
149 | ||
150 | def run(self, args): | |
151 | if len(args) != 1: | |
152 | return False | |
153 | maxChange = int(args[0]) | |
154 | ||
155 | if "p4ExitCode" in p4Cmd("changes -m 1"): | |
156 | die("Problems executing p4"); | |
157 | ||
158 | if self.rollbackLocalBranches: | |
159 | refPrefix = "refs/heads/" | |
160 | lines = mypopen("git rev-parse --symbolic --branches").readlines() | |
161 | else: | |
162 | refPrefix = "refs/remotes/" | |
163 | lines = mypopen("git rev-parse --symbolic --remotes").readlines() | |
164 | ||
165 | for line in lines: | |
166 | if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"): | |
167 | ref = refPrefix + line[:-1] | |
168 | log = extractLogMessageFromGitCommit(ref) | |
169 | depotPath, change = extractDepotPathAndChangeFromGitLog(log) | |
170 | changed = False | |
171 | ||
172 | if len(p4Cmd("changes -m 1 %s...@%s" % (depotPath, maxChange))) == 0: | |
173 | print "Branch %s did not exist at change %s, deleting." % (ref, maxChange) | |
174 | system("git update-ref -d %s `git rev-parse %s`" % (ref, ref)) | |
175 | continue | |
176 | ||
177 | while len(change) > 0 and int(change) > maxChange: | |
178 | changed = True | |
179 | if self.verbose: | |
180 | print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange) | |
181 | system("git update-ref %s \"%s^\"" % (ref, ref)) | |
182 | log = extractLogMessageFromGitCommit(ref) | |
183 | depotPath, change = extractDepotPathAndChangeFromGitLog(log) | |
184 | ||
185 | if changed: | |
186 | print "%s rewound to %s" % (ref, change) | |
187 | ||
188 | return True | |
189 | ||
190 | class P4Submit(Command): | |
191 | def __init__(self): | |
192 | Command.__init__(self) | |
193 | self.options = [ | |
194 | optparse.make_option("--continue", action="store_false", dest="firstTime"), | |
195 | optparse.make_option("--origin", dest="origin"), | |
196 | optparse.make_option("--reset", action="store_true", dest="reset"), | |
197 | optparse.make_option("--log-substitutions", dest="substFile"), | |
198 | optparse.make_option("--noninteractive", action="store_false"), | |
199 | optparse.make_option("--dry-run", action="store_true"), | |
200 | optparse.make_option("--direct", dest="directSubmit", action="store_true"), | |
201 | ] | |
202 | self.description = "Submit changes from git to the perforce depot." | |
203 | self.usage += " [name of git branch to submit into perforce depot]" | |
204 | self.firstTime = True | |
205 | self.reset = False | |
206 | self.interactive = True | |
207 | self.dryRun = False | |
208 | self.substFile = "" | |
209 | self.firstTime = True | |
210 | self.origin = "" | |
211 | self.directSubmit = False | |
212 | ||
213 | self.logSubstitutions = {} | |
214 | self.logSubstitutions["<enter description here>"] = "%log%" | |
215 | self.logSubstitutions["\tDetails:"] = "\tDetails: %log%" | |
216 | ||
217 | def check(self): | |
218 | if len(p4CmdList("opened ...")) > 0: | |
219 | die("You have files opened with perforce! Close them before starting the sync.") | |
220 | ||
221 | def start(self): | |
222 | if len(self.config) > 0 and not self.reset: | |
223 | die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self.configFile) | |
224 | ||
225 | commits = [] | |
226 | if self.directSubmit: | |
227 | commits.append("0") | |
228 | else: | |
229 | for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines(): | |
230 | commits.append(line[:-1]) | |
231 | commits.reverse() | |
232 | ||
233 | self.config["commits"] = commits | |
234 | ||
235 | def prepareLogMessage(self, template, message): | |
236 | result = "" | |
237 | ||
238 | for line in template.split("\n"): | |
239 | if line.startswith("#"): | |
240 | result += line + "\n" | |
241 | continue | |
242 | ||
243 | substituted = False | |
244 | for key in self.logSubstitutions.keys(): | |
245 | if line.find(key) != -1: | |
246 | value = self.logSubstitutions[key] | |
247 | value = value.replace("%log%", message) | |
248 | if value != "@remove@": | |
249 | result += line.replace(key, value) + "\n" | |
250 | substituted = True | |
251 | break | |
252 | ||
253 | if not substituted: | |
254 | result += line + "\n" | |
255 | ||
256 | return result | |
257 | ||
258 | def apply(self, id): | |
259 | if self.directSubmit: | |
260 | print "Applying local change in working directory/index" | |
261 | diff = self.diffStatus | |
262 | else: | |
263 | print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read()) | |
264 | diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines() | |
265 | filesToAdd = set() | |
266 | filesToDelete = set() | |
267 | editedFiles = set() | |
268 | for line in diff: | |
269 | modifier = line[0] | |
270 | path = line[1:].strip() | |
271 | if modifier == "M": | |
272 | system("p4 edit \"%s\"" % path) | |
273 | editedFiles.add(path) | |
274 | elif modifier == "A": | |
275 | filesToAdd.add(path) | |
276 | if path in filesToDelete: | |
277 | filesToDelete.remove(path) | |
278 | elif modifier == "D": | |
279 | filesToDelete.add(path) | |
280 | if path in filesToAdd: | |
281 | filesToAdd.remove(path) | |
282 | else: | |
283 | die("unknown modifier %s for %s" % (modifier, path)) | |
284 | ||
285 | if self.directSubmit: | |
286 | diffcmd = "cat \"%s\"" % self.diffFile | |
287 | else: | |
288 | diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id) | |
289 | patchcmd = diffcmd + " | git apply " | |
290 | tryPatchCmd = patchcmd + "--check -" | |
291 | applyPatchCmd = patchcmd + "--check --apply -" | |
292 | ||
293 | if os.system(tryPatchCmd) != 0: | |
294 | print "Unfortunately applying the change failed!" | |
295 | print "What do you want to do?" | |
296 | response = "x" | |
297 | while response != "s" and response != "a" and response != "w": | |
298 | response = raw_input("[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) ") | |
299 | if response == "s": | |
300 | print "Skipping! Good luck with the next patches..." | |
301 | return | |
302 | elif response == "a": | |
303 | os.system(applyPatchCmd) | |
304 | if len(filesToAdd) > 0: | |
305 | print "You may also want to call p4 add on the following files:" | |
306 | print " ".join(filesToAdd) | |
307 | if len(filesToDelete): | |
308 | print "The following files should be scheduled for deletion with p4 delete:" | |
309 | print " ".join(filesToDelete) | |
310 | die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue") | |
311 | elif response == "w": | |
312 | system(diffcmd + " > patch.txt") | |
313 | print "Patch saved to patch.txt in %s !" % self.clientPath | |
314 | die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue") | |
315 | ||
316 | system(applyPatchCmd) | |
317 | ||
318 | for f in filesToAdd: | |
319 | system("p4 add %s" % f) | |
320 | for f in filesToDelete: | |
321 | system("p4 revert %s" % f) | |
322 | system("p4 delete %s" % f) | |
323 | ||
324 | logMessage = "" | |
325 | if not self.directSubmit: | |
326 | logMessage = extractLogMessageFromGitCommit(id) | |
327 | logMessage = logMessage.replace("\n", "\n\t") | |
328 | logMessage = logMessage[:-1] | |
329 | ||
330 | template = mypopen("p4 change -o").read() | |
331 | ||
332 | if self.interactive: | |
333 | submitTemplate = self.prepareLogMessage(template, logMessage) | |
334 | diff = mypopen("p4 diff -du ...").read() | |
335 | ||
336 | for newFile in filesToAdd: | |
337 | diff += "==== new file ====\n" | |
338 | diff += "--- /dev/null\n" | |
339 | diff += "+++ %s\n" % newFile | |
340 | f = open(newFile, "r") | |
341 | for line in f.readlines(): | |
342 | diff += "+" + line | |
343 | f.close() | |
344 | ||
345 | separatorLine = "######## everything below this line is just the diff #######" | |
346 | if platform.system() == "Windows": | |
347 | separatorLine += "\r" | |
348 | separatorLine += "\n" | |
349 | ||
350 | response = "e" | |
351 | firstIteration = True | |
352 | while response == "e": | |
353 | if not firstIteration: | |
354 | response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ") | |
355 | firstIteration = False | |
356 | if response == "e": | |
357 | [handle, fileName] = tempfile.mkstemp() | |
358 | tmpFile = os.fdopen(handle, "w+") | |
359 | tmpFile.write(submitTemplate + separatorLine + diff) | |
360 | tmpFile.close() | |
361 | defaultEditor = "vi" | |
362 | if platform.system() == "Windows": | |
363 | defaultEditor = "notepad" | |
364 | editor = os.environ.get("EDITOR", defaultEditor); | |
365 | system(editor + " " + fileName) | |
366 | tmpFile = open(fileName, "rb") | |
367 | message = tmpFile.read() | |
368 | tmpFile.close() | |
369 | os.remove(fileName) | |
370 | submitTemplate = message[:message.index(separatorLine)] | |
371 | ||
372 | if response == "y" or response == "yes": | |
373 | if self.dryRun: | |
374 | print submitTemplate | |
375 | raw_input("Press return to continue...") | |
376 | else: | |
377 | if self.directSubmit: | |
378 | print "Submitting to git first" | |
379 | os.chdir(self.oldWorkingDirectory) | |
380 | pipe = os.popen("git commit -a -F -", "wb") | |
381 | pipe.write(submitTemplate) | |
382 | pipe.close() | |
383 | os.chdir(self.clientPath) | |
384 | ||
385 | pipe = os.popen("p4 submit -i", "wb") | |
386 | pipe.write(submitTemplate) | |
387 | pipe.close() | |
388 | elif response == "s": | |
389 | for f in editedFiles: | |
390 | system("p4 revert \"%s\"" % f); | |
391 | for f in filesToAdd: | |
392 | system("p4 revert \"%s\"" % f); | |
393 | system("rm %s" %f) | |
394 | for f in filesToDelete: | |
395 | system("p4 delete \"%s\"" % f); | |
396 | return | |
397 | else: | |
398 | print "Not submitting!" | |
399 | self.interactive = False | |
400 | else: | |
401 | fileName = "submit.txt" | |
402 | file = open(fileName, "w+") | |
403 | file.write(self.prepareLogMessage(template, logMessage)) | |
404 | file.close() | |
405 | print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName) | |
406 | ||
407 | def run(self, args): | |
408 | global gitdir | |
409 | # make gitdir absolute so we can cd out into the perforce checkout | |
410 | gitdir = os.path.abspath(gitdir) | |
411 | os.environ["GIT_DIR"] = gitdir | |
412 | ||
413 | if len(args) == 0: | |
414 | self.master = currentGitBranch() | |
415 | if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)): | |
416 | die("Detecting current git branch failed!") | |
417 | elif len(args) == 1: | |
418 | self.master = args[0] | |
419 | else: | |
420 | return False | |
421 | ||
422 | depotPath = "" | |
423 | if gitBranchExists("p4"): | |
424 | [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4")) | |
425 | if len(depotPath) == 0 and gitBranchExists("origin"): | |
426 | [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin")) | |
427 | ||
428 | if len(depotPath) == 0: | |
429 | print "Internal error: cannot locate perforce depot path from existing branches" | |
430 | sys.exit(128) | |
431 | ||
432 | self.clientPath = p4Where(depotPath) | |
433 | ||
434 | if len(self.clientPath) == 0: | |
435 | print "Error: Cannot locate perforce checkout of %s in client view" % depotPath | |
436 | sys.exit(128) | |
437 | ||
438 | print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath) | |
439 | self.oldWorkingDirectory = os.getcwd() | |
440 | ||
441 | if self.directSubmit: | |
442 | self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines() | |
443 | if len(self.diffStatus) == 0: | |
444 | print "No changes in working directory to submit." | |
445 | return True | |
446 | patch = mypopen("git diff -p --binary --diff-filter=ACMRTUXB HEAD").read() | |
447 | self.diffFile = gitdir + "/p4-git-diff" | |
448 | f = open(self.diffFile, "wb") | |
449 | f.write(patch) | |
450 | f.close(); | |
451 | ||
452 | os.chdir(self.clientPath) | |
453 | response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath) | |
454 | if response == "y" or response == "yes": | |
455 | system("p4 sync ...") | |
456 | ||
457 | if len(self.origin) == 0: | |
458 | if gitBranchExists("p4"): | |
459 | self.origin = "p4" | |
460 | else: | |
461 | self.origin = "origin" | |
462 | ||
463 | if self.reset: | |
464 | self.firstTime = True | |
465 | ||
466 | if len(self.substFile) > 0: | |
467 | for line in open(self.substFile, "r").readlines(): | |
468 | tokens = line[:-1].split("=") | |
469 | self.logSubstitutions[tokens[0]] = tokens[1] | |
470 | ||
471 | self.check() | |
472 | self.configFile = gitdir + "/p4-git-sync.cfg" | |
473 | self.config = shelve.open(self.configFile, writeback=True) | |
474 | ||
475 | if self.firstTime: | |
476 | self.start() | |
477 | ||
478 | commits = self.config.get("commits", []) | |
479 | ||
480 | while len(commits) > 0: | |
481 | self.firstTime = False | |
482 | commit = commits[0] | |
483 | commits = commits[1:] | |
484 | self.config["commits"] = commits | |
485 | self.apply(commit) | |
486 | if not self.interactive: | |
487 | break | |
488 | ||
489 | self.config.close() | |
490 | ||
491 | if self.directSubmit: | |
492 | os.remove(self.diffFile) | |
493 | ||
494 | if len(commits) == 0: | |
495 | if self.firstTime: | |
496 | print "No changes found to apply between %s and current HEAD" % self.origin | |
497 | else: | |
498 | print "All changes applied!" | |
499 | os.chdir(self.oldWorkingDirectory) | |
500 | response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ") | |
501 | if response == "y" or response == "yes": | |
502 | rebase = P4Rebase() | |
503 | rebase.run([]) | |
504 | os.remove(self.configFile) | |
505 | ||
506 | return True | |
507 | ||
508 | class P4Sync(Command): | |
509 | def __init__(self): | |
510 | Command.__init__(self) | |
511 | self.options = [ | |
512 | optparse.make_option("--branch", dest="branch"), | |
513 | optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"), | |
514 | optparse.make_option("--changesfile", dest="changesFile"), | |
515 | optparse.make_option("--silent", dest="silent", action="store_true"), | |
516 | optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"), | |
517 | optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true"), | |
518 | optparse.make_option("--verbose", dest="verbose", action="store_true"), | |
519 | optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false"), | |
520 | optparse.make_option("--max-changes", dest="maxChanges") | |
521 | ] | |
522 | self.description = """Imports from Perforce into a git repository.\n | |
523 | example: | |
524 | //depot/my/project/ -- to import the current head | |
525 | //depot/my/project/@all -- to import everything | |
526 | //depot/my/project/@1,6 -- to import only from revision 1 to 6 | |
527 | ||
528 | (a ... is not needed in the path p4 specification, it's added implicitly)""" | |
529 | ||
530 | self.usage += " //depot/path[@revRange]" | |
531 | ||
532 | self.silent = False | |
533 | self.createdBranches = Set() | |
534 | self.committedChanges = Set() | |
535 | self.branch = "" | |
536 | self.detectBranches = False | |
537 | self.detectLabels = False | |
538 | self.changesFile = "" | |
539 | self.syncWithOrigin = False | |
540 | self.verbose = False | |
541 | self.importIntoRemotes = True | |
542 | self.maxChanges = "" | |
543 | self.isWindows = (platform.system() == "Windows") | |
544 | ||
545 | def p4File(self, depotPath): | |
546 | return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read() | |
547 | ||
548 | def extractFilesFromCommit(self, commit): | |
549 | files = [] | |
550 | fnum = 0 | |
551 | while commit.has_key("depotFile%s" % fnum): | |
552 | path = commit["depotFile%s" % fnum] | |
553 | if not path.startswith(self.depotPath): | |
554 | # if not self.silent: | |
555 | # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change) | |
556 | fnum = fnum + 1 | |
557 | continue | |
558 | ||
559 | file = {} | |
560 | file["path"] = path | |
561 | file["rev"] = commit["rev%s" % fnum] | |
562 | file["action"] = commit["action%s" % fnum] | |
563 | file["type"] = commit["type%s" % fnum] | |
564 | files.append(file) | |
565 | fnum = fnum + 1 | |
566 | return files | |
567 | ||
568 | def splitFilesIntoBranches(self, commit): | |
569 | branches = {} | |
570 | ||
571 | fnum = 0 | |
572 | while commit.has_key("depotFile%s" % fnum): | |
573 | path = commit["depotFile%s" % fnum] | |
574 | if not path.startswith(self.depotPath): | |
575 | # if not self.silent: | |
576 | # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change) | |
577 | fnum = fnum + 1 | |
578 | continue | |
579 | ||
580 | file = {} | |
581 | file["path"] = path | |
582 | file["rev"] = commit["rev%s" % fnum] | |
583 | file["action"] = commit["action%s" % fnum] | |
584 | file["type"] = commit["type%s" % fnum] | |
585 | fnum = fnum + 1 | |
586 | ||
587 | relPath = path[len(self.depotPath):] | |
588 | ||
589 | for branch in self.knownBranches.keys(): | |
590 | if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2 | |
591 | if branch not in branches: | |
592 | branches[branch] = [] | |
593 | branches[branch].append(file) | |
594 | ||
595 | return branches | |
596 | ||
597 | def commit(self, details, files, branch, branchPrefix, parent = ""): | |
598 | epoch = details["time"] | |
599 | author = details["user"] | |
600 | ||
601 | if self.verbose: | |
602 | print "commit into %s" % branch | |
603 | ||
604 | self.gitStream.write("commit %s\n" % branch) | |
605 | # gitStream.write("mark :%s\n" % details["change"]) | |
606 | self.committedChanges.add(int(details["change"])) | |
607 | committer = "" | |
608 | if author not in self.users: | |
609 | self.getUserMapFromPerforceServer() | |
610 | if author in self.users: | |
611 | committer = "%s %s %s" % (self.users[author], epoch, self.tz) | |
612 | else: | |
613 | committer = "%s <a@b> %s %s" % (author, epoch, self.tz) | |
614 | ||
615 | self.gitStream.write("committer %s\n" % committer) | |
616 | ||
617 | self.gitStream.write("data <<EOT\n") | |
618 | self.gitStream.write(details["desc"]) | |
619 | self.gitStream.write("\n[git-p4: depot-path = \"%s\": change = %s]\n" % (branchPrefix, details["change"])) | |
620 | self.gitStream.write("EOT\n\n") | |
621 | ||
622 | if len(parent) > 0: | |
623 | if self.verbose: | |
624 | print "parent %s" % parent | |
625 | self.gitStream.write("from %s\n" % parent) | |
626 | ||
627 | for file in files: | |
628 | path = file["path"] | |
629 | if not path.startswith(branchPrefix): | |
630 | # if not silent: | |
631 | # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"]) | |
632 | continue | |
633 | rev = file["rev"] | |
634 | depotPath = path + "#" + rev | |
635 | relPath = path[len(branchPrefix):] | |
636 | action = file["action"] | |
637 | ||
638 | if file["type"] == "apple": | |
639 | print "\nfile %s is a strange apple file that forks. Ignoring!" % path | |
640 | continue | |
641 | ||
642 | if action == "delete": | |
643 | self.gitStream.write("D %s\n" % relPath) | |
644 | else: | |
645 | mode = 644 | |
646 | if file["type"].startswith("x"): | |
647 | mode = 755 | |
648 | ||
649 | data = self.p4File(depotPath) | |
650 | ||
651 | if self.isWindows and file["type"].endswith("text"): | |
652 | data = data.replace("\r\n", "\n") | |
653 | ||
654 | self.gitStream.write("M %s inline %s\n" % (mode, relPath)) | |
655 | self.gitStream.write("data %s\n" % len(data)) | |
656 | self.gitStream.write(data) | |
657 | self.gitStream.write("\n") | |
658 | ||
659 | self.gitStream.write("\n") | |
660 | ||
661 | change = int(details["change"]) | |
662 | ||
663 | if self.labels.has_key(change): | |
664 | label = self.labels[change] | |
665 | labelDetails = label[0] | |
666 | labelRevisions = label[1] | |
667 | if self.verbose: | |
668 | print "Change %s is labelled %s" % (change, labelDetails) | |
669 | ||
670 | files = p4CmdList("files %s...@%s" % (branchPrefix, change)) | |
671 | ||
672 | if len(files) == len(labelRevisions): | |
673 | ||
674 | cleanedFiles = {} | |
675 | for info in files: | |
676 | if info["action"] == "delete": | |
677 | continue | |
678 | cleanedFiles[info["depotFile"]] = info["rev"] | |
679 | ||
680 | if cleanedFiles == labelRevisions: | |
681 | self.gitStream.write("tag tag_%s\n" % labelDetails["label"]) | |
682 | self.gitStream.write("from %s\n" % branch) | |
683 | ||
684 | owner = labelDetails["Owner"] | |
685 | tagger = "" | |
686 | if author in self.users: | |
687 | tagger = "%s %s %s" % (self.users[owner], epoch, self.tz) | |
688 | else: | |
689 | tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz) | |
690 | self.gitStream.write("tagger %s\n" % tagger) | |
691 | self.gitStream.write("data <<EOT\n") | |
692 | self.gitStream.write(labelDetails["Description"]) | |
693 | self.gitStream.write("EOT\n\n") | |
694 | ||
695 | else: | |
696 | if not self.silent: | |
697 | print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change) | |
698 | ||
699 | else: | |
700 | if not self.silent: | |
701 | print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change) | |
702 | ||
703 | def getUserMapFromPerforceServer(self): | |
704 | if self.userMapFromPerforceServer: | |
705 | return | |
706 | self.users = {} | |
707 | ||
708 | for output in p4CmdList("users"): | |
709 | if not output.has_key("User"): | |
710 | continue | |
711 | self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">" | |
712 | ||
713 | cache = open(gitdir + "/p4-usercache.txt", "wb") | |
714 | for user in self.users.keys(): | |
715 | cache.write("%s\t%s\n" % (user, self.users[user])) | |
716 | cache.close(); | |
717 | self.userMapFromPerforceServer = True | |
718 | ||
719 | def loadUserMapFromCache(self): | |
720 | self.users = {} | |
721 | self.userMapFromPerforceServer = False | |
722 | try: | |
723 | cache = open(gitdir + "/p4-usercache.txt", "rb") | |
724 | lines = cache.readlines() | |
725 | cache.close() | |
726 | for line in lines: | |
727 | entry = line[:-1].split("\t") | |
728 | self.users[entry[0]] = entry[1] | |
729 | except IOError: | |
730 | self.getUserMapFromPerforceServer() | |
731 | ||
732 | def getLabels(self): | |
733 | self.labels = {} | |
734 | ||
735 | l = p4CmdList("labels %s..." % self.depotPath) | |
736 | if len(l) > 0 and not self.silent: | |
737 | print "Finding files belonging to labels in %s" % self.depotPath | |
738 | ||
739 | for output in l: | |
740 | label = output["label"] | |
741 | revisions = {} | |
742 | newestChange = 0 | |
743 | if self.verbose: | |
744 | print "Querying files for label %s" % label | |
745 | for file in p4CmdList("files %s...@%s" % (self.depotPath, label)): | |
746 | revisions[file["depotFile"]] = file["rev"] | |
747 | change = int(file["change"]) | |
748 | if change > newestChange: | |
749 | newestChange = change | |
750 | ||
751 | self.labels[newestChange] = [output, revisions] | |
752 | ||
753 | if self.verbose: | |
754 | print "Label changes: %s" % self.labels.keys() | |
755 | ||
756 | def getBranchMapping(self): | |
757 | self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:] | |
758 | ||
759 | for info in p4CmdList("branches"): | |
760 | details = p4Cmd("branch -o %s" % info["branch"]) | |
761 | viewIdx = 0 | |
762 | while details.has_key("View%s" % viewIdx): | |
763 | paths = details["View%s" % viewIdx].split(" ") | |
764 | viewIdx = viewIdx + 1 | |
765 | # require standard //depot/foo/... //depot/bar/... mapping | |
766 | if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."): | |
767 | continue | |
768 | source = paths[0] | |
769 | destination = paths[1] | |
770 | if source.startswith(self.depotPath) and destination.startswith(self.depotPath): | |
771 | source = source[len(self.depotPath):-4] | |
772 | destination = destination[len(self.depotPath):-4] | |
773 | if destination not in self.knownBranches: | |
774 | self.knownBranches[destination] = source | |
775 | if source not in self.knownBranches: | |
776 | self.knownBranches[source] = source | |
777 | ||
778 | def listExistingP4GitBranches(self): | |
779 | self.p4BranchesInGit = [] | |
780 | ||
781 | cmdline = "git rev-parse --symbolic " | |
782 | if self.importIntoRemotes: | |
783 | cmdline += " --remotes" | |
784 | else: | |
785 | cmdline += " --branches" | |
786 | ||
787 | for line in mypopen(cmdline).readlines(): | |
788 | if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"): | |
789 | continue | |
790 | if self.importIntoRemotes: | |
791 | # strip off p4 | |
792 | branch = line[3:-1] | |
793 | else: | |
794 | branch = line[:-1] | |
795 | self.p4BranchesInGit.append(branch) | |
796 | self.initialParents[self.refPrefix + branch] = parseRevision(line[:-1]) | |
797 | ||
798 | def createOrUpdateBranchesFromOrigin(self): | |
799 | if not self.silent: | |
800 | print "Creating/updating branch(es) in %s based on origin branch(es)" % self.refPrefix | |
801 | ||
802 | for line in mypopen("git rev-parse --symbolic --remotes"): | |
803 | if (not line.startswith("origin/")) or line.endswith("HEAD\n"): | |
804 | continue | |
805 | headName = line[len("origin/"):-1] | |
806 | remoteHead = self.refPrefix + headName | |
807 | originHead = "origin/" + headName | |
808 | ||
809 | update = False | |
810 | if not os.path.exists(gitdir + "/" + remoteHead): | |
811 | if self.verbose: | |
812 | print "creating %s" % remoteHead | |
813 | update = True | |
814 | else: | |
815 | [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead)) | |
816 | [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(remoteHead)) | |
817 | if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0: | |
818 | if originPreviousDepotPath == p4PreviousDepotPath: | |
819 | originP4Change = int(originP4Change) | |
820 | p4Change = int(p4Change) | |
821 | if originP4Change > p4Change: | |
822 | print "%s (%s) is newer than %s (%s). Updating p4 branch from origin." % (originHead, originP4Change, remoteHead, p4Change) | |
823 | update = True | |
824 | else: | |
825 | print "Ignoring: %s was imported from %s while %s was imported from %s" % (originHead, originPreviousDepotPath, remoteHead, p4PreviousDepotPath) | |
826 | ||
827 | if update: | |
828 | system("git update-ref %s %s" % (remoteHead, originHead)) | |
829 | ||
830 | def run(self, args): | |
831 | self.depotPath = "" | |
832 | self.changeRange = "" | |
833 | self.initialParent = "" | |
834 | self.previousDepotPath = "" | |
835 | # map from branch depot path to parent branch | |
836 | self.knownBranches = {} | |
837 | self.initialParents = {} | |
838 | ||
839 | if self.importIntoRemotes: | |
840 | self.refPrefix = "refs/remotes/p4/" | |
841 | else: | |
842 | self.refPrefix = "refs/heads/" | |
843 | ||
844 | createP4HeadRef = False; | |
845 | ||
846 | if len(self.branch) == 0: | |
847 | self.branch = self.refPrefix + "master" | |
848 | if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: | |
849 | system("git update-ref %s refs/heads/p4" % self.branch) | |
850 | system("git branch -D p4"); | |
851 | # create it /after/ importing, when master exists | |
852 | if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes: | |
853 | createP4HeadRef = True | |
854 | ||
855 | if len(args) == 0: | |
856 | self.createOrUpdateBranchesFromOrigin() | |
857 | self.listExistingP4GitBranches() | |
858 | ||
859 | if len(self.p4BranchesInGit) > 1: | |
860 | if not self.silent: | |
861 | print "Importing from/into multiple branches" | |
862 | self.detectBranches = True | |
863 | ||
864 | if self.verbose: | |
865 | print "branches: %s" % self.p4BranchesInGit | |
866 | ||
867 | p4Change = 0 | |
868 | for branch in self.p4BranchesInGit: | |
869 | depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.refPrefix + branch)) | |
870 | ||
871 | if self.verbose: | |
872 | print "path %s change %s" % (depotPath, change) | |
873 | ||
874 | if len(depotPath) > 0 and len(change) > 0: | |
875 | change = int(change) + 1 | |
876 | p4Change = max(p4Change, change) | |
877 | ||
878 | if len(self.previousDepotPath) == 0: | |
879 | self.previousDepotPath = depotPath | |
880 | else: | |
881 | i = 0 | |
882 | l = min(len(self.previousDepotPath), len(depotPath)) | |
883 | while i < l and self.previousDepotPath[i] == depotPath[i]: | |
884 | i = i + 1 | |
885 | self.previousDepotPath = self.previousDepotPath[:i] | |
886 | ||
887 | if p4Change > 0: | |
888 | self.depotPath = self.previousDepotPath | |
889 | self.changeRange = "@%s,#head" % p4Change | |
890 | self.initialParent = parseRevision(self.branch) | |
891 | if not self.silent and not self.detectBranches: | |
892 | print "Performing incremental import into %s git branch" % self.branch | |
893 | ||
894 | if not self.branch.startswith("refs/"): | |
895 | self.branch = "refs/heads/" + self.branch | |
896 | ||
897 | if len(self.depotPath) != 0: | |
898 | self.depotPath = self.depotPath[:-1] | |
899 | ||
900 | if len(args) == 0 and len(self.depotPath) != 0: | |
901 | if not self.silent: | |
902 | print "Depot path: %s" % self.depotPath | |
903 | elif len(args) != 1: | |
904 | return False | |
905 | else: | |
906 | if len(self.depotPath) != 0 and self.depotPath != args[0]: | |
907 | print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0]) | |
908 | sys.exit(1) | |
909 | self.depotPath = args[0] | |
910 | ||
911 | self.revision = "" | |
912 | self.users = {} | |
913 | ||
914 | if self.depotPath.find("@") != -1: | |
915 | atIdx = self.depotPath.index("@") | |
916 | self.changeRange = self.depotPath[atIdx:] | |
917 | if self.changeRange == "@all": | |
918 | self.changeRange = "" | |
919 | elif self.changeRange.find(",") == -1: | |
920 | self.revision = self.changeRange | |
921 | self.changeRange = "" | |
922 | self.depotPath = self.depotPath[0:atIdx] | |
923 | elif self.depotPath.find("#") != -1: | |
924 | hashIdx = self.depotPath.index("#") | |
925 | self.revision = self.depotPath[hashIdx:] | |
926 | self.depotPath = self.depotPath[0:hashIdx] | |
927 | elif len(self.previousDepotPath) == 0: | |
928 | self.revision = "#head" | |
929 | ||
930 | if self.depotPath.endswith("..."): | |
931 | self.depotPath = self.depotPath[:-3] | |
932 | ||
933 | if not self.depotPath.endswith("/"): | |
934 | self.depotPath += "/" | |
935 | ||
936 | self.loadUserMapFromCache() | |
937 | self.labels = {} | |
938 | if self.detectLabels: | |
939 | self.getLabels(); | |
940 | ||
941 | if self.detectBranches: | |
942 | self.getBranchMapping(); | |
943 | if self.verbose: | |
944 | print "p4-git branches: %s" % self.p4BranchesInGit | |
945 | print "initial parents: %s" % self.initialParents | |
946 | for b in self.p4BranchesInGit: | |
947 | if b != "master": | |
948 | b = b[len(self.projectName):] | |
949 | self.createdBranches.add(b) | |
950 | ||
951 | self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60)) | |
952 | ||
953 | importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE); | |
954 | self.gitOutput = importProcess.stdout | |
955 | self.gitStream = importProcess.stdin | |
956 | self.gitError = importProcess.stderr | |
957 | ||
958 | if len(self.revision) > 0: | |
959 | print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision) | |
960 | ||
961 | details = { "user" : "git perforce import user", "time" : int(time.time()) } | |
962 | details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision) | |
963 | details["change"] = self.revision | |
964 | newestRevision = 0 | |
965 | ||
966 | fileCnt = 0 | |
967 | for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)): | |
968 | change = int(info["change"]) | |
969 | if change > newestRevision: | |
970 | newestRevision = change | |
971 | ||
972 | if info["action"] == "delete": | |
973 | # don't increase the file cnt, otherwise details["depotFile123"] will have gaps! | |
974 | #fileCnt = fileCnt + 1 | |
975 | continue | |
976 | ||
977 | for prop in [ "depotFile", "rev", "action", "type" ]: | |
978 | details["%s%s" % (prop, fileCnt)] = info[prop] | |
979 | ||
980 | fileCnt = fileCnt + 1 | |
981 | ||
982 | details["change"] = newestRevision | |
983 | ||
984 | try: | |
985 | self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath) | |
986 | except IOError: | |
987 | print "IO error with git fast-import. Is your git version recent enough?" | |
988 | print self.gitError.read() | |
989 | ||
990 | else: | |
991 | changes = [] | |
992 | ||
993 | if len(self.changesFile) > 0: | |
994 | output = open(self.changesFile).readlines() | |
995 | changeSet = Set() | |
996 | for line in output: | |
997 | changeSet.add(int(line)) | |
998 | ||
999 | for change in changeSet: | |
1000 | changes.append(change) | |
1001 | ||
1002 | changes.sort() | |
1003 | else: | |
1004 | if self.verbose: | |
1005 | print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange) | |
1006 | output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines() | |
1007 | ||
1008 | for line in output: | |
1009 | changeNum = line.split(" ")[1] | |
1010 | changes.append(changeNum) | |
1011 | ||
1012 | changes.reverse() | |
1013 | ||
1014 | if len(self.maxChanges) > 0: | |
1015 | changes = changes[0:min(int(self.maxChanges), len(changes))] | |
1016 | ||
1017 | if len(changes) == 0: | |
1018 | if not self.silent: | |
1019 | print "No changes to import!" | |
1020 | return True | |
1021 | ||
1022 | self.updatedBranches = set() | |
1023 | ||
1024 | cnt = 1 | |
1025 | for change in changes: | |
1026 | description = p4Cmd("describe %s" % change) | |
1027 | ||
1028 | if not self.silent: | |
1029 | sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes))) | |
1030 | sys.stdout.flush() | |
1031 | cnt = cnt + 1 | |
1032 | ||
1033 | try: | |
1034 | if self.detectBranches: | |
1035 | branches = self.splitFilesIntoBranches(description) | |
1036 | for branch in branches.keys(): | |
1037 | branchPrefix = self.depotPath + branch + "/" | |
1038 | ||
1039 | parent = "" | |
1040 | ||
1041 | filesForCommit = branches[branch] | |
1042 | ||
1043 | if self.verbose: | |
1044 | print "branch is %s" % branch | |
1045 | ||
1046 | self.updatedBranches.add(branch) | |
1047 | ||
1048 | if branch not in self.createdBranches: | |
1049 | self.createdBranches.add(branch) | |
1050 | parent = self.knownBranches[branch] | |
1051 | if parent == branch: | |
1052 | parent = "" | |
1053 | elif self.verbose: | |
1054 | print "parent determined through known branches: %s" % parent | |
1055 | ||
1056 | # main branch? use master | |
1057 | if branch == "main": | |
1058 | branch = "master" | |
1059 | else: | |
1060 | branch = self.projectName + branch | |
1061 | ||
1062 | if parent == "main": | |
1063 | parent = "master" | |
1064 | elif len(parent) > 0: | |
1065 | parent = self.projectName + parent | |
1066 | ||
1067 | branch = self.refPrefix + branch | |
1068 | if len(parent) > 0: | |
1069 | parent = self.refPrefix + parent | |
1070 | ||
1071 | if self.verbose: | |
1072 | print "looking for initial parent for %s; current parent is %s" % (branch, parent) | |
1073 | ||
1074 | if len(parent) == 0 and branch in self.initialParents: | |
1075 | parent = self.initialParents[branch] | |
1076 | del self.initialParents[branch] | |
1077 | ||
1078 | self.commit(description, filesForCommit, branch, branchPrefix, parent) | |
1079 | else: | |
1080 | files = self.extractFilesFromCommit(description) | |
1081 | self.commit(description, files, self.branch, self.depotPath, self.initialParent) | |
1082 | self.initialParent = "" | |
1083 | except IOError: | |
1084 | print self.gitError.read() | |
1085 | sys.exit(1) | |
1086 | ||
1087 | if not self.silent: | |
1088 | print "" | |
1089 | if len(self.updatedBranches) > 0: | |
1090 | sys.stdout.write("Updated branches: ") | |
1091 | for b in self.updatedBranches: | |
1092 | sys.stdout.write("%s " % b) | |
1093 | sys.stdout.write("\n") | |
1094 | ||
1095 | ||
1096 | self.gitStream.close() | |
1097 | if importProcess.wait() != 0: | |
1098 | die("fast-import failed: %s" % self.gitError.read()) | |
1099 | self.gitOutput.close() | |
1100 | self.gitError.close() | |
1101 | ||
1102 | if createP4HeadRef: | |
1103 | system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch)) | |
1104 | ||
1105 | return True | |
1106 | ||
1107 | class P4Rebase(Command): | |
1108 | def __init__(self): | |
1109 | Command.__init__(self) | |
1110 | self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ] | |
1111 | self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it" | |
1112 | self.syncWithOrigin = False | |
1113 | ||
1114 | def run(self, args): | |
1115 | sync = P4Sync() | |
1116 | sync.syncWithOrigin = self.syncWithOrigin | |
1117 | sync.run([]) | |
1118 | print "Rebasing the current branch" | |
1119 | oldHead = mypopen("git rev-parse HEAD").read()[:-1] | |
1120 | system("git rebase p4") | |
1121 | system("git diff-tree --stat --summary -M %s HEAD" % oldHead) | |
1122 | return True | |
1123 | ||
1124 | class P4Clone(P4Sync): | |
1125 | def __init__(self): | |
1126 | P4Sync.__init__(self) | |
1127 | self.description = "Creates a new git repository and imports from Perforce into it" | |
1128 | self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]" | |
1129 | self.needsGit = False | |
1130 | ||
1131 | def run(self, args): | |
1132 | global gitdir | |
1133 | ||
1134 | if len(args) < 1: | |
1135 | return False | |
1136 | depotPath = args[0] | |
1137 | dir = "" | |
1138 | if len(args) == 2: | |
1139 | dir = args[1] | |
1140 | elif len(args) > 2: | |
1141 | return False | |
1142 | ||
1143 | if not depotPath.startswith("//"): | |
1144 | return False | |
1145 | ||
1146 | if len(dir) == 0: | |
1147 | dir = depotPath | |
1148 | atPos = dir.rfind("@") | |
1149 | if atPos != -1: | |
1150 | dir = dir[0:atPos] | |
1151 | hashPos = dir.rfind("#") | |
1152 | if hashPos != -1: | |
1153 | dir = dir[0:hashPos] | |
1154 | ||
1155 | if dir.endswith("..."): | |
1156 | dir = dir[:-3] | |
1157 | ||
1158 | if dir.endswith("/"): | |
1159 | dir = dir[:-1] | |
1160 | ||
1161 | slashPos = dir.rfind("/") | |
1162 | if slashPos != -1: | |
1163 | dir = dir[slashPos + 1:] | |
1164 | ||
1165 | print "Importing from %s into %s" % (depotPath, dir) | |
1166 | os.makedirs(dir) | |
1167 | os.chdir(dir) | |
1168 | system("git init") | |
1169 | gitdir = os.getcwd() + "/.git" | |
1170 | if not P4Sync.run(self, [depotPath]): | |
1171 | return False | |
1172 | if self.branch != "master": | |
1173 | if gitBranchExists("refs/remotes/p4/master"): | |
1174 | system("git branch master refs/remotes/p4/master") | |
1175 | system("git checkout -f") | |
1176 | else: | |
1177 | print "Could not detect main branch. No checkout/master branch created." | |
1178 | return True | |
1179 | ||
1180 | class HelpFormatter(optparse.IndentedHelpFormatter): | |
1181 | def __init__(self): | |
1182 | optparse.IndentedHelpFormatter.__init__(self) | |
1183 | ||
1184 | def format_description(self, description): | |
1185 | if description: | |
1186 | return description + "\n" | |
1187 | else: | |
1188 | return "" | |
1189 | ||
1190 | def printUsage(commands): | |
1191 | print "usage: %s <command> [options]" % sys.argv[0] | |
1192 | print "" | |
1193 | print "valid commands: %s" % ", ".join(commands) | |
1194 | print "" | |
1195 | print "Try %s <command> --help for command specific help." % sys.argv[0] | |
1196 | print "" | |
1197 | ||
1198 | commands = { | |
1199 | "debug" : P4Debug(), | |
1200 | "submit" : P4Submit(), | |
1201 | "sync" : P4Sync(), | |
1202 | "rebase" : P4Rebase(), | |
1203 | "clone" : P4Clone(), | |
1204 | "rollback" : P4RollBack() | |
1205 | } | |
1206 | ||
1207 | if len(sys.argv[1:]) == 0: | |
1208 | printUsage(commands.keys()) | |
1209 | sys.exit(2) | |
1210 | ||
1211 | cmd = "" | |
1212 | cmdName = sys.argv[1] | |
1213 | try: | |
1214 | cmd = commands[cmdName] | |
1215 | except KeyError: | |
1216 | print "unknown command %s" % cmdName | |
1217 | print "" | |
1218 | printUsage(commands.keys()) | |
1219 | sys.exit(2) | |
1220 | ||
1221 | options = cmd.options | |
1222 | cmd.gitdir = gitdir | |
1223 | ||
1224 | args = sys.argv[2:] | |
1225 | ||
1226 | if len(options) > 0: | |
1227 | options.append(optparse.make_option("--git-dir", dest="gitdir")) | |
1228 | ||
1229 | parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), | |
1230 | options, | |
1231 | description = cmd.description, | |
1232 | formatter = HelpFormatter()) | |
1233 | ||
1234 | (cmd, args) = parser.parse_args(sys.argv[2:], cmd); | |
1235 | ||
1236 | if cmd.needsGit: | |
1237 | gitdir = cmd.gitdir | |
1238 | if len(gitdir) == 0: | |
1239 | gitdir = ".git" | |
1240 | if not isValidGitDir(gitdir): | |
1241 | gitdir = mypopen("git rev-parse --git-dir").read()[:-1] | |
1242 | if os.path.exists(gitdir): | |
1243 | cdup = mypopen("git rev-parse --show-cdup").read()[:-1]; | |
1244 | if len(cdup) > 0: | |
1245 | os.chdir(cdup); | |
1246 | ||
1247 | if not isValidGitDir(gitdir): | |
1248 | if isValidGitDir(gitdir + "/.git"): | |
1249 | gitdir += "/.git" | |
1250 | else: | |
1251 | die("fatal: cannot locate git repository at %s" % gitdir) | |
1252 | ||
1253 | os.environ["GIT_DIR"] = gitdir | |
1254 | ||
1255 | if not cmd.run(args): | |
1256 | parser.print_help() | |
1257 |