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