Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1 | #!/usr/bin/env python |
| 2 | # |
| 3 | # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git. |
| 4 | # |
Simon Hausmann | c8cbbee | 2007-05-28 14:43:25 +0200 | [diff] [blame] | 5 | # Author: Simon Hausmann <simon@lst.de> |
| 6 | # Copyright: 2007 Simon Hausmann <simon@lst.de> |
Simon Hausmann | 83dce55 | 2007-03-19 22:26:36 +0100 | [diff] [blame] | 7 | # 2007 Trolltech ASA |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 8 | # License: MIT <http://www.opensource.org/licenses/mit-license.php> |
| 9 | # |
| 10 | |
Reilly Grant | 1d7367d | 2009-09-10 00:02:38 -0700 | [diff] [blame] | 11 | import optparse, sys, os, marshal, subprocess, shelve |
| 12 | import tempfile, getopt, os.path, time, platform |
Han-Wen Nienhuys | ce6f33c | 2007-05-23 16:46:29 -0300 | [diff] [blame] | 13 | import re |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 14 | |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 15 | verbose = False |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 16 | |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 17 | |
| 18 | def p4_build_cmd(cmd): |
| 19 | """Build a suitable p4 command line. |
| 20 | |
| 21 | This consolidates building and returning a p4 command line into one |
| 22 | location. It means that hooking into the environment, or other configuration |
| 23 | can be done more easily. |
| 24 | """ |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 25 | real_cmd = "%s " % "p4" |
| 26 | |
| 27 | user = gitConfig("git-p4.user") |
| 28 | if len(user) > 0: |
| 29 | real_cmd += "-u %s " % user |
| 30 | |
| 31 | password = gitConfig("git-p4.password") |
| 32 | if len(password) > 0: |
| 33 | real_cmd += "-P %s " % password |
| 34 | |
| 35 | port = gitConfig("git-p4.port") |
| 36 | if len(port) > 0: |
| 37 | real_cmd += "-p %s " % port |
| 38 | |
| 39 | host = gitConfig("git-p4.host") |
| 40 | if len(host) > 0: |
| 41 | real_cmd += "-h %s " % host |
| 42 | |
| 43 | client = gitConfig("git-p4.client") |
| 44 | if len(client) > 0: |
| 45 | real_cmd += "-c %s " % client |
| 46 | |
| 47 | real_cmd += "%s" % (cmd) |
Anand Kumria | ee06427 | 2008-08-10 19:26:29 +0100 | [diff] [blame] | 48 | if verbose: |
| 49 | print real_cmd |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 50 | return real_cmd |
| 51 | |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 52 | def chdir(dir): |
| 53 | if os.name == 'nt': |
| 54 | os.environ['PWD']=dir |
| 55 | os.chdir(dir) |
| 56 | |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 57 | def die(msg): |
| 58 | if verbose: |
| 59 | raise Exception(msg) |
| 60 | else: |
| 61 | sys.stderr.write(msg + "\n") |
| 62 | sys.exit(1) |
| 63 | |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 64 | def write_pipe(c, str): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 65 | if verbose: |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 66 | sys.stderr.write('Writing pipe: %s\n' % c) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 67 | |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 68 | pipe = os.popen(c, 'w') |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 69 | val = pipe.write(str) |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 70 | if pipe.close(): |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 71 | die('Command failed: %s' % c) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 72 | |
| 73 | return val |
| 74 | |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 75 | def p4_write_pipe(c, str): |
| 76 | real_cmd = p4_build_cmd(c) |
Tor Arvid Lund | 893d340 | 2008-08-21 23:11:40 +0200 | [diff] [blame] | 77 | return write_pipe(real_cmd, str) |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 78 | |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 79 | def read_pipe(c, ignore_error=False): |
| 80 | if verbose: |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 81 | sys.stderr.write('Reading pipe: %s\n' % c) |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 82 | |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 83 | pipe = os.popen(c, 'rb') |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 84 | val = pipe.read() |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 85 | if pipe.close() and not ignore_error: |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 86 | die('Command failed: %s' % c) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 87 | |
| 88 | return val |
| 89 | |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 90 | def p4_read_pipe(c, ignore_error=False): |
| 91 | real_cmd = p4_build_cmd(c) |
| 92 | return read_pipe(real_cmd, ignore_error) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 93 | |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 94 | def read_pipe_lines(c): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 95 | if verbose: |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 96 | sys.stderr.write('Reading pipe: %s\n' % c) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 97 | ## todo: check return status |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 98 | pipe = os.popen(c, 'rb') |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 99 | val = pipe.readlines() |
Han-Wen Nienhuys | bce4c5f | 2007-05-23 17:14:33 -0300 | [diff] [blame] | 100 | if pipe.close(): |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 101 | die('Command failed: %s' % c) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 102 | |
| 103 | return val |
Simon Hausmann | caace11 | 2007-05-15 14:57:57 +0200 | [diff] [blame] | 104 | |
Anand Kumria | 2318121 | 2008-08-10 19:26:24 +0100 | [diff] [blame] | 105 | def p4_read_pipe_lines(c): |
| 106 | """Specifically invoke p4 on the command supplied. """ |
Anand Kumria | 155af83 | 2008-08-10 19:26:30 +0100 | [diff] [blame] | 107 | real_cmd = p4_build_cmd(c) |
Anand Kumria | 2318121 | 2008-08-10 19:26:24 +0100 | [diff] [blame] | 108 | return read_pipe_lines(real_cmd) |
| 109 | |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 110 | def system(cmd): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 111 | if verbose: |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 112 | sys.stderr.write("executing %s\n" % cmd) |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 113 | if os.system(cmd) != 0: |
| 114 | die("command failed: %s" % cmd) |
| 115 | |
Anand Kumria | bf9320f | 2008-08-10 19:26:26 +0100 | [diff] [blame] | 116 | def p4_system(cmd): |
| 117 | """Specifically invoke p4 as the system command. """ |
Anand Kumria | 155af83 | 2008-08-10 19:26:30 +0100 | [diff] [blame] | 118 | real_cmd = p4_build_cmd(cmd) |
Anand Kumria | bf9320f | 2008-08-10 19:26:26 +0100 | [diff] [blame] | 119 | return system(real_cmd) |
| 120 | |
David Brown | b9fc6ea | 2007-09-19 13:12:48 -0700 | [diff] [blame] | 121 | def isP4Exec(kind): |
| 122 | """Determine if a Perforce 'kind' should have execute permission |
| 123 | |
| 124 | 'p4 help filetypes' gives a list of the types. If it starts with 'x', |
| 125 | or x follows one of a few letters. Otherwise, if there is an 'x' after |
| 126 | a plus sign, it is also executable""" |
| 127 | return (re.search(r"(^[cku]?x)|\+.*x", kind) != None) |
| 128 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 129 | def setP4ExecBit(file, mode): |
| 130 | # Reopens an already open file and changes the execute bit to match |
| 131 | # the execute bit setting in the passed in mode. |
| 132 | |
| 133 | p4Type = "+x" |
| 134 | |
| 135 | if not isModeExec(mode): |
| 136 | p4Type = getP4OpenedType(file) |
| 137 | p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type) |
| 138 | p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type) |
| 139 | if p4Type[-1] == "+": |
| 140 | p4Type = p4Type[0:-1] |
| 141 | |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 142 | p4_system("reopen -t %s %s" % (p4Type, file)) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 143 | |
| 144 | def getP4OpenedType(file): |
| 145 | # Returns the perforce file type for the given file. |
| 146 | |
Anand Kumria | a7d3ef9 | 2008-08-14 23:40:39 +0100 | [diff] [blame] | 147 | result = p4_read_pipe("opened %s" % file) |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 148 | match = re.match(".*\((.+)\)\r?$", result) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 149 | if match: |
| 150 | return match.group(1) |
| 151 | else: |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 152 | die("Could not determine file type for %s (result: '%s')" % (file, result)) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 153 | |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 154 | def diffTreePattern(): |
| 155 | # This is a simple generator for the diff tree regex pattern. This could be |
| 156 | # a class variable if this and parseDiffTreeEntry were a part of a class. |
| 157 | pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') |
| 158 | while True: |
| 159 | yield pattern |
| 160 | |
| 161 | def parseDiffTreeEntry(entry): |
| 162 | """Parses a single diff tree entry into its component elements. |
| 163 | |
| 164 | See git-diff-tree(1) manpage for details about the format of the diff |
| 165 | output. This method returns a dictionary with the following elements: |
| 166 | |
| 167 | src_mode - The mode of the source file |
| 168 | dst_mode - The mode of the destination file |
| 169 | src_sha1 - The sha1 for the source file |
| 170 | dst_sha1 - The sha1 fr the destination file |
| 171 | status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) |
| 172 | status_score - The score for the status (applicable for 'C' and 'R' |
| 173 | statuses). This is None if there is no score. |
| 174 | src - The path for the source file. |
| 175 | dst - The path for the destination file. This is only present for |
| 176 | copy or renames. If it is not present, this is None. |
| 177 | |
| 178 | If the pattern is not matched, None is returned.""" |
| 179 | |
| 180 | match = diffTreePattern().next().match(entry) |
| 181 | if match: |
| 182 | return { |
| 183 | 'src_mode': match.group(1), |
| 184 | 'dst_mode': match.group(2), |
| 185 | 'src_sha1': match.group(3), |
| 186 | 'dst_sha1': match.group(4), |
| 187 | 'status': match.group(5), |
| 188 | 'status_score': match.group(6), |
| 189 | 'src': match.group(7), |
| 190 | 'dst': match.group(10) |
| 191 | } |
| 192 | return None |
| 193 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 194 | def isModeExec(mode): |
| 195 | # Returns True if the given git mode represents an executable file, |
| 196 | # otherwise False. |
| 197 | return mode[-3:] == "755" |
| 198 | |
| 199 | def isModeExecChanged(src_mode, dst_mode): |
| 200 | return isModeExec(src_mode) != isModeExec(dst_mode) |
| 201 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 202 | def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): |
Anand Kumria | 155af83 | 2008-08-10 19:26:30 +0100 | [diff] [blame] | 203 | cmd = p4_build_cmd("-G %s" % (cmd)) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 204 | if verbose: |
| 205 | sys.stderr.write("Opening pipe: %s\n" % cmd) |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 206 | |
| 207 | # Use a temporary file to avoid deadlocks without |
| 208 | # subprocess.communicate(), which would put another copy |
| 209 | # of stdout into memory. |
| 210 | stdin_file = None |
| 211 | if stdin is not None: |
| 212 | stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) |
| 213 | stdin_file.write(stdin) |
| 214 | stdin_file.flush() |
| 215 | stdin_file.seek(0) |
| 216 | |
| 217 | p4 = subprocess.Popen(cmd, shell=True, |
| 218 | stdin=stdin_file, |
| 219 | stdout=subprocess.PIPE) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 220 | |
| 221 | result = [] |
| 222 | try: |
| 223 | while True: |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 224 | entry = marshal.load(p4.stdout) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 225 | if cb is not None: |
| 226 | cb(entry) |
| 227 | else: |
| 228 | result.append(entry) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 229 | except EOFError: |
| 230 | pass |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 231 | exitCode = p4.wait() |
| 232 | if exitCode != 0: |
Simon Hausmann | ac3e0d7 | 2007-05-23 23:32:32 +0200 | [diff] [blame] | 233 | entry = {} |
| 234 | entry["p4ExitCode"] = exitCode |
| 235 | result.append(entry) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 236 | |
| 237 | return result |
| 238 | |
| 239 | def p4Cmd(cmd): |
| 240 | list = p4CmdList(cmd) |
| 241 | result = {} |
| 242 | for entry in list: |
| 243 | result.update(entry) |
| 244 | return result; |
| 245 | |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 246 | def p4Where(depotPath): |
| 247 | if not depotPath.endswith("/"): |
| 248 | depotPath += "/" |
Tor Arvid Lund | 7f705dc | 2008-12-04 14:37:33 +0100 | [diff] [blame] | 249 | depotPath = depotPath + "..." |
| 250 | outputList = p4CmdList("where %s" % depotPath) |
| 251 | output = None |
| 252 | for entry in outputList: |
Tor Arvid Lund | 75bc957 | 2008-12-09 16:41:50 +0100 | [diff] [blame] | 253 | if "depotFile" in entry: |
| 254 | if entry["depotFile"] == depotPath: |
| 255 | output = entry |
| 256 | break |
| 257 | elif "data" in entry: |
| 258 | data = entry.get("data") |
| 259 | space = data.find(" ") |
| 260 | if data[:space] == depotPath: |
| 261 | output = entry |
| 262 | break |
Tor Arvid Lund | 7f705dc | 2008-12-04 14:37:33 +0100 | [diff] [blame] | 263 | if output == None: |
| 264 | return "" |
Simon Hausmann | dc52403 | 2007-05-21 09:34:56 +0200 | [diff] [blame] | 265 | if output["code"] == "error": |
| 266 | return "" |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 267 | clientPath = "" |
| 268 | if "path" in output: |
| 269 | clientPath = output.get("path") |
| 270 | elif "data" in output: |
| 271 | data = output.get("data") |
| 272 | lastSpace = data.rfind(" ") |
| 273 | clientPath = data[lastSpace + 1:] |
| 274 | |
| 275 | if clientPath.endswith("..."): |
| 276 | clientPath = clientPath[:-3] |
| 277 | return clientPath |
| 278 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 279 | def currentGitBranch(): |
Han-Wen Nienhuys | b25b206 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 280 | return read_pipe("git name-rev HEAD").split(" ")[1].strip() |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 281 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 282 | def isValidGitDir(path): |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 283 | if (os.path.exists(path + "/HEAD") |
| 284 | and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")): |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 285 | return True; |
| 286 | return False |
| 287 | |
Simon Hausmann | 463e8af | 2007-05-17 09:13:54 +0200 | [diff] [blame] | 288 | def parseRevision(ref): |
Han-Wen Nienhuys | b25b206 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 289 | return read_pipe("git rev-parse %s" % ref).strip() |
Simon Hausmann | 463e8af | 2007-05-17 09:13:54 +0200 | [diff] [blame] | 290 | |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 291 | def extractLogMessageFromGitCommit(commit): |
| 292 | logMessage = "" |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 293 | |
| 294 | ## fixme: title is first line of commit, not 1st paragraph. |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 295 | foundTitle = False |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 296 | for log in read_pipe_lines("git cat-file commit %s" % commit): |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 297 | if not foundTitle: |
| 298 | if len(log) == 1: |
Simon Hausmann | 1c09418 | 2007-05-01 23:15:48 +0200 | [diff] [blame] | 299 | foundTitle = True |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 300 | continue |
| 301 | |
| 302 | logMessage += log |
| 303 | return logMessage |
| 304 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 305 | def extractSettingsGitLog(log): |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 306 | values = {} |
| 307 | for line in log.split("\n"): |
| 308 | line = line.strip() |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 309 | m = re.search (r"^ *\[git-p4: (.*)\]$", line) |
| 310 | if not m: |
| 311 | continue |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 312 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 313 | assignments = m.group(1).split (':') |
| 314 | for a in assignments: |
| 315 | vals = a.split ('=') |
| 316 | key = vals[0].strip() |
| 317 | val = ('='.join (vals[1:])).strip() |
| 318 | if val.endswith ('\"') and val.startswith('"'): |
| 319 | val = val[1:-1] |
| 320 | |
| 321 | values[key] = val |
| 322 | |
Simon Hausmann | 845b42c | 2007-06-07 09:19:34 +0200 | [diff] [blame] | 323 | paths = values.get("depot-paths") |
| 324 | if not paths: |
| 325 | paths = values.get("depot-path") |
Simon Hausmann | a3fdd57 | 2007-06-07 22:54:32 +0200 | [diff] [blame] | 326 | if paths: |
| 327 | values['depot-paths'] = paths.split(',') |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 328 | return values |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 329 | |
Simon Hausmann | 8136a63 | 2007-03-22 21:27:14 +0100 | [diff] [blame] | 330 | def gitBranchExists(branch): |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 331 | proc = subprocess.Popen(["git", "rev-parse", branch], |
| 332 | stderr=subprocess.PIPE, stdout=subprocess.PIPE); |
Simon Hausmann | caace11 | 2007-05-15 14:57:57 +0200 | [diff] [blame] | 333 | return proc.wait() == 0; |
Simon Hausmann | 8136a63 | 2007-03-22 21:27:14 +0100 | [diff] [blame] | 334 | |
John Chapman | 36bd844 | 2008-11-08 14:22:49 +1100 | [diff] [blame] | 335 | _gitConfig = {} |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 336 | def gitConfig(key): |
John Chapman | 36bd844 | 2008-11-08 14:22:49 +1100 | [diff] [blame] | 337 | if not _gitConfig.has_key(key): |
| 338 | _gitConfig[key] = read_pipe("git config %s" % key, ignore_error=True).strip() |
| 339 | return _gitConfig[key] |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 340 | |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 341 | def p4BranchesInGit(branchesAreInRemotes = True): |
| 342 | branches = {} |
| 343 | |
| 344 | cmdline = "git rev-parse --symbolic " |
| 345 | if branchesAreInRemotes: |
| 346 | cmdline += " --remotes" |
| 347 | else: |
| 348 | cmdline += " --branches" |
| 349 | |
| 350 | for line in read_pipe_lines(cmdline): |
| 351 | line = line.strip() |
| 352 | |
| 353 | ## only import to p4/ |
| 354 | if not line.startswith('p4/') or line == "p4/HEAD": |
| 355 | continue |
| 356 | branch = line |
| 357 | |
| 358 | # strip off p4 |
| 359 | branch = re.sub ("^p4/", "", line) |
| 360 | |
| 361 | branches[branch] = parseRevision(line) |
| 362 | return branches |
| 363 | |
Simon Hausmann | 9ceab36 | 2007-06-22 00:01:57 +0200 | [diff] [blame] | 364 | def findUpstreamBranchPoint(head = "HEAD"): |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 365 | branches = p4BranchesInGit() |
| 366 | # map from depot-path to branch name |
| 367 | branchByDepotPath = {} |
| 368 | for branch in branches.keys(): |
| 369 | tip = branches[branch] |
| 370 | log = extractLogMessageFromGitCommit(tip) |
| 371 | settings = extractSettingsGitLog(log) |
| 372 | if settings.has_key("depot-paths"): |
| 373 | paths = ",".join(settings["depot-paths"]) |
| 374 | branchByDepotPath[paths] = "remotes/p4/" + branch |
| 375 | |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 376 | settings = None |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 377 | parent = 0 |
| 378 | while parent < 65535: |
Simon Hausmann | 9ceab36 | 2007-06-22 00:01:57 +0200 | [diff] [blame] | 379 | commit = head + "~%s" % parent |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 380 | log = extractLogMessageFromGitCommit(commit) |
| 381 | settings = extractSettingsGitLog(log) |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 382 | if settings.has_key("depot-paths"): |
| 383 | paths = ",".join(settings["depot-paths"]) |
| 384 | if branchByDepotPath.has_key(paths): |
| 385 | return [branchByDepotPath[paths], settings] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 386 | |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 387 | parent = parent + 1 |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 388 | |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 389 | return ["", settings] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 390 | |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 391 | def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True): |
| 392 | if not silent: |
| 393 | print ("Creating/updating branch(es) in %s based on origin branch(es)" |
| 394 | % localRefPrefix) |
| 395 | |
| 396 | originPrefix = "origin/p4/" |
| 397 | |
| 398 | for line in read_pipe_lines("git rev-parse --symbolic --remotes"): |
| 399 | line = line.strip() |
| 400 | if (not line.startswith(originPrefix)) or line.endswith("HEAD"): |
| 401 | continue |
| 402 | |
| 403 | headName = line[len(originPrefix):] |
| 404 | remoteHead = localRefPrefix + headName |
| 405 | originHead = line |
| 406 | |
| 407 | original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) |
| 408 | if (not original.has_key('depot-paths') |
| 409 | or not original.has_key('change')): |
| 410 | continue |
| 411 | |
| 412 | update = False |
| 413 | if not gitBranchExists(remoteHead): |
| 414 | if verbose: |
| 415 | print "creating %s" % remoteHead |
| 416 | update = True |
| 417 | else: |
| 418 | settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) |
| 419 | if settings.has_key('change') > 0: |
| 420 | if settings['depot-paths'] == original['depot-paths']: |
| 421 | originP4Change = int(original['change']) |
| 422 | p4Change = int(settings['change']) |
| 423 | if originP4Change > p4Change: |
| 424 | print ("%s (%s) is newer than %s (%s). " |
| 425 | "Updating p4 branch from origin." |
| 426 | % (originHead, originP4Change, |
| 427 | remoteHead, p4Change)) |
| 428 | update = True |
| 429 | else: |
| 430 | print ("Ignoring: %s was imported from %s while " |
| 431 | "%s was imported from %s" |
| 432 | % (originHead, ','.join(original['depot-paths']), |
| 433 | remoteHead, ','.join(settings['depot-paths']))) |
| 434 | |
| 435 | if update: |
| 436 | system("git update-ref %s %s" % (remoteHead, originHead)) |
| 437 | |
| 438 | def originP4BranchesExist(): |
| 439 | return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master") |
| 440 | |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 441 | def p4ChangesForPaths(depotPaths, changeRange): |
| 442 | assert depotPaths |
Anand Kumria | b340fa4 | 2008-08-10 19:26:25 +0100 | [diff] [blame] | 443 | output = p4_read_pipe_lines("changes " + ' '.join (["%s...%s" % (p, changeRange) |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 444 | for p in depotPaths])) |
| 445 | |
Pete Wyckoff | b4b0ba0 | 2009-02-18 13:12:14 -0500 | [diff] [blame] | 446 | changes = {} |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 447 | for line in output: |
Pete Wyckoff | b4b0ba0 | 2009-02-18 13:12:14 -0500 | [diff] [blame] | 448 | changeNum = int(line.split(" ")[1]) |
| 449 | changes[changeNum] = True |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 450 | |
Pete Wyckoff | b4b0ba0 | 2009-02-18 13:12:14 -0500 | [diff] [blame] | 451 | changelist = changes.keys() |
| 452 | changelist.sort() |
| 453 | return changelist |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 454 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 455 | class Command: |
| 456 | def __init__(self): |
| 457 | self.usage = "usage: %prog [options]" |
Simon Hausmann | 8910ac0 | 2007-03-26 08:18:55 +0200 | [diff] [blame] | 458 | self.needsGit = True |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 459 | |
| 460 | class P4Debug(Command): |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 461 | def __init__(self): |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 462 | Command.__init__(self) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 463 | self.options = [ |
Han-Wen Nienhuys | b1ce944 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 464 | optparse.make_option("--verbose", dest="verbose", action="store_true", |
| 465 | default=False), |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 466 | ] |
Simon Hausmann | c8c3911 | 2007-03-19 21:02:30 +0100 | [diff] [blame] | 467 | self.description = "A tool to debug the output of p4 -G." |
Simon Hausmann | 8910ac0 | 2007-03-26 08:18:55 +0200 | [diff] [blame] | 468 | self.needsGit = False |
Han-Wen Nienhuys | b1ce944 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 469 | self.verbose = False |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 470 | |
| 471 | def run(self, args): |
Han-Wen Nienhuys | b1ce944 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 472 | j = 0 |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 473 | for output in p4CmdList(" ".join(args)): |
Han-Wen Nienhuys | b1ce944 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 474 | print 'Element: %d' % j |
| 475 | j += 1 |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 476 | print output |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 477 | return True |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 478 | |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 479 | class P4RollBack(Command): |
| 480 | def __init__(self): |
| 481 | Command.__init__(self) |
| 482 | self.options = [ |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 483 | optparse.make_option("--verbose", dest="verbose", action="store_true"), |
| 484 | optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 485 | ] |
| 486 | self.description = "A tool to debug the multi-branch import. Don't use :)" |
Simon Hausmann | 52102d4 | 2007-05-21 23:44:24 +0200 | [diff] [blame] | 487 | self.verbose = False |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 488 | self.rollbackLocalBranches = False |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 489 | |
| 490 | def run(self, args): |
| 491 | if len(args) != 1: |
| 492 | return False |
| 493 | maxChange = int(args[0]) |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 494 | |
Simon Hausmann | ad192f2 | 2007-05-23 23:44:19 +0200 | [diff] [blame] | 495 | if "p4ExitCode" in p4Cmd("changes -m 1"): |
Simon Hausmann | 66a2f52 | 2007-05-23 23:40:48 +0200 | [diff] [blame] | 496 | die("Problems executing p4"); |
| 497 | |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 498 | if self.rollbackLocalBranches: |
| 499 | refPrefix = "refs/heads/" |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 500 | lines = read_pipe_lines("git rev-parse --symbolic --branches") |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 501 | else: |
| 502 | refPrefix = "refs/remotes/" |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 503 | lines = read_pipe_lines("git rev-parse --symbolic --remotes") |
Simon Hausmann | 0c66a78 | 2007-05-23 20:07:57 +0200 | [diff] [blame] | 504 | |
| 505 | for line in lines: |
| 506 | if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"): |
Han-Wen Nienhuys | b25b206 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 507 | line = line.strip() |
| 508 | ref = refPrefix + line |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 509 | log = extractLogMessageFromGitCommit(ref) |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 510 | settings = extractSettingsGitLog(log) |
| 511 | |
| 512 | depotPaths = settings['depot-paths'] |
| 513 | change = settings['change'] |
| 514 | |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 515 | changed = False |
Simon Hausmann | 52102d4 | 2007-05-21 23:44:24 +0200 | [diff] [blame] | 516 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 517 | if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange) |
| 518 | for p in depotPaths]))) == 0: |
Simon Hausmann | 52102d4 | 2007-05-21 23:44:24 +0200 | [diff] [blame] | 519 | print "Branch %s did not exist at change %s, deleting." % (ref, maxChange) |
| 520 | system("git update-ref -d %s `git rev-parse %s`" % (ref, ref)) |
| 521 | continue |
| 522 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 523 | while change and int(change) > maxChange: |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 524 | changed = True |
Simon Hausmann | 52102d4 | 2007-05-21 23:44:24 +0200 | [diff] [blame] | 525 | if self.verbose: |
| 526 | print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange) |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 527 | system("git update-ref %s \"%s^\"" % (ref, ref)) |
| 528 | log = extractLogMessageFromGitCommit(ref) |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 529 | settings = extractSettingsGitLog(log) |
| 530 | |
| 531 | |
| 532 | depotPaths = settings['depot-paths'] |
| 533 | change = settings['change'] |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 534 | |
| 535 | if changed: |
Simon Hausmann | 52102d4 | 2007-05-21 23:44:24 +0200 | [diff] [blame] | 536 | print "%s rewound to %s" % (ref, change) |
Simon Hausmann | 5834684 | 2007-05-21 22:57:06 +0200 | [diff] [blame] | 537 | |
| 538 | return True |
| 539 | |
Simon Hausmann | 711544b | 2007-04-01 15:40:46 +0200 | [diff] [blame] | 540 | class P4Submit(Command): |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 541 | def __init__(self): |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 542 | Command.__init__(self) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 543 | self.options = [ |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 544 | optparse.make_option("--verbose", dest="verbose", action="store_true"), |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 545 | optparse.make_option("--origin", dest="origin"), |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 546 | optparse.make_option("-M", dest="detectRename", action="store_true"), |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 547 | ] |
| 548 | self.description = "Submit changes from git to the perforce depot." |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 549 | self.usage += " [name of git branch to submit into perforce depot]" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 550 | self.interactive = True |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 551 | self.origin = "" |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 552 | self.detectRename = False |
Simon Hausmann | b0d10df | 2007-06-07 13:09:14 +0200 | [diff] [blame] | 553 | self.verbose = False |
Marius Storm-Olsen | f7baba8 | 2007-06-07 14:07:01 +0200 | [diff] [blame] | 554 | self.isWindows = (platform.system() == "Windows") |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 555 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 556 | def check(self): |
| 557 | if len(p4CmdList("opened ...")) > 0: |
| 558 | die("You have files opened with perforce! Close them before starting the sync.") |
| 559 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 560 | # replaces everything between 'Description:' and the next P4 submit template field with the |
| 561 | # commit message |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 562 | def prepareLogMessage(self, template, message): |
| 563 | result = "" |
| 564 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 565 | inDescriptionSection = False |
| 566 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 567 | for line in template.split("\n"): |
| 568 | if line.startswith("#"): |
| 569 | result += line + "\n" |
| 570 | continue |
| 571 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 572 | if inDescriptionSection: |
| 573 | if line.startswith("Files:"): |
| 574 | inDescriptionSection = False |
| 575 | else: |
| 576 | continue |
| 577 | else: |
| 578 | if line.startswith("Description:"): |
| 579 | inDescriptionSection = True |
| 580 | line += "\n" |
| 581 | for messageLine in message.split("\n"): |
| 582 | line += "\t" + messageLine + "\n" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 583 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 584 | result += line + "\n" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 585 | |
| 586 | return result |
| 587 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 588 | def prepareSubmitTemplate(self): |
| 589 | # remove lines in the Files section that show changes to files outside the depot path we're committing into |
| 590 | template = "" |
| 591 | inFilesSection = False |
Anand Kumria | b340fa4 | 2008-08-10 19:26:25 +0100 | [diff] [blame] | 592 | for line in p4_read_pipe_lines("change -o"): |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 593 | if line.endswith("\r\n"): |
| 594 | line = line[:-2] + "\n" |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 595 | if inFilesSection: |
| 596 | if line.startswith("\t"): |
| 597 | # path starts and ends with a tab |
| 598 | path = line[1:] |
| 599 | lastTab = path.rfind("\t") |
| 600 | if lastTab != -1: |
| 601 | path = path[:lastTab] |
| 602 | if not path.startswith(self.depotPath): |
| 603 | continue |
| 604 | else: |
| 605 | inFilesSection = False |
| 606 | else: |
| 607 | if line.startswith("Files:"): |
| 608 | inFilesSection = True |
| 609 | |
| 610 | template += line |
| 611 | |
| 612 | return template |
| 613 | |
Han-Wen Nienhuys | 7cb5cbe | 2007-05-23 16:55:48 -0300 | [diff] [blame] | 614 | def applyCommit(self, id): |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 615 | print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id)) |
| 616 | diffOpts = ("", "-M")[self.detectRename] |
| 617 | diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (diffOpts, id, id)) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 618 | filesToAdd = set() |
| 619 | filesToDelete = set() |
Simon Hausmann | d336c15 | 2007-05-16 09:41:26 +0200 | [diff] [blame] | 620 | editedFiles = set() |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 621 | filesToChangeExecBit = {} |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 622 | for line in diff: |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 623 | diff = parseDiffTreeEntry(line) |
| 624 | modifier = diff['status'] |
| 625 | path = diff['src'] |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 626 | if modifier == "M": |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 627 | p4_system("edit \"%s\"" % path) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 628 | if isModeExecChanged(diff['src_mode'], diff['dst_mode']): |
| 629 | filesToChangeExecBit[path] = diff['dst_mode'] |
Simon Hausmann | d336c15 | 2007-05-16 09:41:26 +0200 | [diff] [blame] | 630 | editedFiles.add(path) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 631 | elif modifier == "A": |
| 632 | filesToAdd.add(path) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 633 | filesToChangeExecBit[path] = diff['dst_mode'] |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 634 | if path in filesToDelete: |
| 635 | filesToDelete.remove(path) |
| 636 | elif modifier == "D": |
| 637 | filesToDelete.add(path) |
| 638 | if path in filesToAdd: |
| 639 | filesToAdd.remove(path) |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 640 | elif modifier == "R": |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 641 | src, dest = diff['src'], diff['dst'] |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 642 | p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest)) |
| 643 | p4_system("edit \"%s\"" % (dest)) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 644 | if isModeExecChanged(diff['src_mode'], diff['dst_mode']): |
| 645 | filesToChangeExecBit[dest] = diff['dst_mode'] |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 646 | os.unlink(dest) |
| 647 | editedFiles.add(dest) |
| 648 | filesToDelete.add(src) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 649 | else: |
| 650 | die("unknown modifier %s for %s" % (modifier, path)) |
| 651 | |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 652 | diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id) |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 653 | patchcmd = diffcmd + " | git apply " |
Simon Hausmann | c1b296b | 2007-05-20 16:55:05 +0200 | [diff] [blame] | 654 | tryPatchCmd = patchcmd + "--check -" |
| 655 | applyPatchCmd = patchcmd + "--check --apply -" |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 656 | |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 657 | if os.system(tryPatchCmd) != 0: |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 658 | print "Unfortunately applying the change failed!" |
| 659 | print "What do you want to do?" |
| 660 | response = "x" |
| 661 | while response != "s" and response != "a" and response != "w": |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 662 | response = raw_input("[s]kip this patch / [a]pply the patch forcibly " |
| 663 | "and with .rej files / [w]rite the patch to a file (patch.txt) ") |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 664 | if response == "s": |
| 665 | print "Skipping! Good luck with the next patches..." |
Simon Hausmann | 2094714 | 2007-09-13 22:10:18 +0200 | [diff] [blame] | 666 | for f in editedFiles: |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 667 | p4_system("revert \"%s\"" % f); |
Simon Hausmann | 2094714 | 2007-09-13 22:10:18 +0200 | [diff] [blame] | 668 | for f in filesToAdd: |
| 669 | system("rm %s" %f) |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 670 | return |
| 671 | elif response == "a": |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 672 | os.system(applyPatchCmd) |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 673 | if len(filesToAdd) > 0: |
| 674 | print "You may also want to call p4 add on the following files:" |
| 675 | print " ".join(filesToAdd) |
| 676 | if len(filesToDelete): |
| 677 | print "The following files should be scheduled for deletion with p4 delete:" |
| 678 | print " ".join(filesToDelete) |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 679 | die("Please resolve and submit the conflict manually and " |
| 680 | + "continue afterwards with git-p4 submit --continue") |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 681 | elif response == "w": |
| 682 | system(diffcmd + " > patch.txt") |
| 683 | print "Patch saved to patch.txt in %s !" % self.clientPath |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 684 | die("Please resolve and submit the conflict manually and " |
| 685 | "continue afterwards with git-p4 submit --continue") |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 686 | |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 687 | system(applyPatchCmd) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 688 | |
| 689 | for f in filesToAdd: |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 690 | p4_system("add \"%s\"" % f) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 691 | for f in filesToDelete: |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 692 | p4_system("revert \"%s\"" % f) |
| 693 | p4_system("delete \"%s\"" % f) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 694 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 695 | # Set/clear executable bits |
| 696 | for f in filesToChangeExecBit.keys(): |
| 697 | mode = filesToChangeExecBit[f] |
| 698 | setP4ExecBit(f, mode) |
| 699 | |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 700 | logMessage = extractLogMessageFromGitCommit(id) |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 701 | logMessage = logMessage.strip() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 702 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 703 | template = self.prepareSubmitTemplate() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 704 | |
| 705 | if self.interactive: |
| 706 | submitTemplate = self.prepareLogMessage(template, logMessage) |
Shawn Bohrer | 67abd41 | 2008-03-12 19:03:23 -0500 | [diff] [blame] | 707 | if os.environ.has_key("P4DIFF"): |
| 708 | del(os.environ["P4DIFF"]) |
Andrew Waters | 8b13026 | 2010-10-22 13:26:02 +0100 | [diff] [blame] | 709 | diff = "" |
| 710 | for editedFile in editedFiles: |
| 711 | diff += p4_read_pipe("diff -du %r" % editedFile) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 712 | |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 713 | newdiff = "" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 714 | for newFile in filesToAdd: |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 715 | newdiff += "==== new file ====\n" |
| 716 | newdiff += "--- /dev/null\n" |
| 717 | newdiff += "+++ %s\n" % newFile |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 718 | f = open(newFile, "r") |
| 719 | for line in f.readlines(): |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 720 | newdiff += "+" + line |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 721 | f.close() |
| 722 | |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 723 | separatorLine = "######## everything below this line is just the diff #######\n" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 724 | |
Simon Hausmann | e96e400 | 2008-01-04 14:27:55 +0100 | [diff] [blame] | 725 | [handle, fileName] = tempfile.mkstemp() |
| 726 | tmpFile = os.fdopen(handle, "w+") |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 727 | if self.isWindows: |
| 728 | submitTemplate = submitTemplate.replace("\n", "\r\n") |
| 729 | separatorLine = separatorLine.replace("\n", "\r\n") |
| 730 | newdiff = newdiff.replace("\n", "\r\n") |
| 731 | tmpFile.write(submitTemplate + separatorLine + diff + newdiff) |
Simon Hausmann | e96e400 | 2008-01-04 14:27:55 +0100 | [diff] [blame] | 732 | tmpFile.close() |
Simon Hausmann | cdc7e38 | 2008-08-27 09:30:29 +0200 | [diff] [blame] | 733 | mtime = os.stat(fileName).st_mtime |
Shawn Bohrer | 82cea9f | 2008-03-12 19:03:24 -0500 | [diff] [blame] | 734 | if os.environ.has_key("P4EDITOR"): |
| 735 | editor = os.environ.get("P4EDITOR") |
| 736 | else: |
Nicolas Pitre | 8b187e6 | 2010-01-22 00:55:15 -0500 | [diff] [blame] | 737 | editor = read_pipe("git var GIT_EDITOR").strip() |
Simon Hausmann | e96e400 | 2008-01-04 14:27:55 +0100 | [diff] [blame] | 738 | system(editor + " " + fileName) |
Simon Hausmann | cb4f128 | 2007-05-25 22:34:30 +0200 | [diff] [blame] | 739 | |
Simon Hausmann | cdc7e38 | 2008-08-27 09:30:29 +0200 | [diff] [blame] | 740 | response = "y" |
| 741 | if os.stat(fileName).st_mtime <= mtime: |
| 742 | response = "x" |
| 743 | while response != "y" and response != "n": |
| 744 | response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") |
| 745 | |
| 746 | if response == "y": |
| 747 | tmpFile = open(fileName, "rb") |
| 748 | message = tmpFile.read() |
| 749 | tmpFile.close() |
| 750 | submitTemplate = message[:message.index(separatorLine)] |
| 751 | if self.isWindows: |
| 752 | submitTemplate = submitTemplate.replace("\r\n", "\n") |
| 753 | p4_write_pipe("submit -i", submitTemplate) |
| 754 | else: |
| 755 | for f in editedFiles: |
| 756 | p4_system("revert \"%s\"" % f); |
| 757 | for f in filesToAdd: |
| 758 | p4_system("revert \"%s\"" % f); |
| 759 | system("rm %s" %f) |
| 760 | |
| 761 | os.remove(fileName) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 762 | else: |
| 763 | fileName = "submit.txt" |
| 764 | file = open(fileName, "w+") |
| 765 | file.write(self.prepareLogMessage(template, logMessage)) |
| 766 | file.close() |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 767 | print ("Perforce submit template written as %s. " |
| 768 | + "Please review/edit and then use p4 submit -i < %s to submit directly!" |
| 769 | % (fileName, fileName)) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 770 | |
| 771 | def run(self, args): |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 772 | if len(args) == 0: |
| 773 | self.master = currentGitBranch() |
Simon Hausmann | 4280e53 | 2007-05-25 08:49:18 +0200 | [diff] [blame] | 774 | if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master): |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 775 | die("Detecting current git branch failed!") |
| 776 | elif len(args) == 1: |
| 777 | self.master = args[0] |
| 778 | else: |
| 779 | return False |
| 780 | |
Jing Xue | 4c2d5d7 | 2008-06-22 14:12:39 -0400 | [diff] [blame] | 781 | allowSubmit = gitConfig("git-p4.allowSubmit") |
| 782 | if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","): |
| 783 | die("%s is not in git-p4.allowSubmit" % self.master) |
| 784 | |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 785 | [upstream, settings] = findUpstreamBranchPoint() |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 786 | self.depotPath = settings['depot-paths'][0] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 787 | if len(self.origin) == 0: |
| 788 | self.origin = upstream |
Simon Hausmann | a3fdd57 | 2007-06-07 22:54:32 +0200 | [diff] [blame] | 789 | |
| 790 | if self.verbose: |
| 791 | print "Origin branch is " + self.origin |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 792 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 793 | if len(self.depotPath) == 0: |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 794 | print "Internal error: cannot locate perforce depot path from existing branches" |
| 795 | sys.exit(128) |
| 796 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 797 | self.clientPath = p4Where(self.depotPath) |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 798 | |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 799 | if len(self.clientPath) == 0: |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 800 | print "Error: Cannot locate perforce checkout of %s in client view" % self.depotPath |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 801 | sys.exit(128) |
| 802 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 803 | print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath) |
Simon Hausmann | 7944f14 | 2007-05-21 11:04:26 +0200 | [diff] [blame] | 804 | self.oldWorkingDirectory = os.getcwd() |
Simon Hausmann | c1b296b | 2007-05-20 16:55:05 +0200 | [diff] [blame] | 805 | |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 806 | chdir(self.clientPath) |
Benjamin C Meyer | 6a01298 | 2010-03-19 00:39:10 -0400 | [diff] [blame] | 807 | print "Synchronizing p4 checkout..." |
Anand Kumria | 87b611d | 2008-08-10 19:26:27 +0100 | [diff] [blame] | 808 | p4_system("sync ...") |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 809 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 810 | self.check() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 811 | |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 812 | commits = [] |
| 813 | for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)): |
| 814 | commits.append(line.strip()) |
| 815 | commits.reverse() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 816 | |
| 817 | while len(commits) > 0: |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 818 | commit = commits[0] |
| 819 | commits = commits[1:] |
Han-Wen Nienhuys | 7cb5cbe | 2007-05-23 16:55:48 -0300 | [diff] [blame] | 820 | self.applyCommit(commit) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 821 | if not self.interactive: |
| 822 | break |
| 823 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 824 | if len(commits) == 0: |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 825 | print "All changes applied!" |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 826 | chdir(self.oldWorkingDirectory) |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 827 | |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 828 | sync = P4Sync() |
| 829 | sync.run([]) |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 830 | |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 831 | rebase = P4Rebase() |
| 832 | rebase.rebase() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 833 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 834 | return True |
| 835 | |
Simon Hausmann | 711544b | 2007-04-01 15:40:46 +0200 | [diff] [blame] | 836 | class P4Sync(Command): |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 837 | delete_actions = ( "delete", "move/delete", "purge" ) |
| 838 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 839 | def __init__(self): |
| 840 | Command.__init__(self) |
| 841 | self.options = [ |
| 842 | optparse.make_option("--branch", dest="branch"), |
| 843 | optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"), |
| 844 | optparse.make_option("--changesfile", dest="changesFile"), |
| 845 | optparse.make_option("--silent", dest="silent", action="store_true"), |
Simon Hausmann | ef48f90 | 2007-05-17 22:17:49 +0200 | [diff] [blame] | 846 | optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"), |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 847 | optparse.make_option("--verbose", dest="verbose", action="store_true"), |
Han-Wen Nienhuys | d2c6dd3 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 848 | optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false", |
| 849 | help="Import into refs/heads/ , not refs/remotes"), |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 850 | optparse.make_option("--max-changes", dest="maxChanges"), |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 851 | optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true', |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 852 | help="Keep entire BRANCH/DIR/SUBDIR prefix during import"), |
| 853 | optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true', |
| 854 | help="Only sync files that are included in the Perforce Client Spec") |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 855 | ] |
| 856 | self.description = """Imports from Perforce into a git repository.\n |
| 857 | example: |
| 858 | //depot/my/project/ -- to import the current head |
| 859 | //depot/my/project/@all -- to import everything |
| 860 | //depot/my/project/@1,6 -- to import only from revision 1 to 6 |
| 861 | |
| 862 | (a ... is not needed in the path p4 specification, it's added implicitly)""" |
| 863 | |
| 864 | self.usage += " //depot/path[@revRange]" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 865 | self.silent = False |
Reilly Grant | 1d7367d | 2009-09-10 00:02:38 -0700 | [diff] [blame] | 866 | self.createdBranches = set() |
| 867 | self.committedChanges = set() |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 868 | self.branch = "" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 869 | self.detectBranches = False |
Simon Hausmann | cb53e1f | 2007-04-08 00:12:02 +0200 | [diff] [blame] | 870 | self.detectLabels = False |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 871 | self.changesFile = "" |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 872 | self.syncWithOrigin = True |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 873 | self.verbose = False |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 874 | self.importIntoRemotes = True |
Simon Hausmann | 01a9c9c | 2007-05-23 00:07:35 +0200 | [diff] [blame] | 875 | self.maxChanges = "" |
Marius Storm-Olsen | c1f9197 | 2007-05-24 14:07:55 +0200 | [diff] [blame] | 876 | self.isWindows = (platform.system() == "Windows") |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 877 | self.keepRepoPath = False |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 878 | self.depotPaths = None |
Simon Hausmann | 3c69964 | 2007-06-16 13:09:21 +0200 | [diff] [blame] | 879 | self.p4BranchesInGit = [] |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 880 | self.cloneExclude = [] |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 881 | self.useClientSpec = False |
| 882 | self.clientSpecDirs = [] |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 883 | |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 884 | if gitConfig("git-p4.syncFromOrigin") == "false": |
| 885 | self.syncWithOrigin = False |
| 886 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 887 | def extractFilesFromCommit(self, commit): |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 888 | self.cloneExclude = [re.sub(r"\.\.\.$", "", path) |
| 889 | for path in self.cloneExclude] |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 890 | files = [] |
| 891 | fnum = 0 |
| 892 | while commit.has_key("depotFile%s" % fnum): |
| 893 | path = commit["depotFile%s" % fnum] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 894 | |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 895 | if [p for p in self.cloneExclude |
| 896 | if path.startswith (p)]: |
| 897 | found = False |
| 898 | else: |
| 899 | found = [p for p in self.depotPaths |
| 900 | if path.startswith (p)] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 901 | if not found: |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 902 | fnum = fnum + 1 |
| 903 | continue |
| 904 | |
| 905 | file = {} |
| 906 | file["path"] = path |
| 907 | file["rev"] = commit["rev%s" % fnum] |
| 908 | file["action"] = commit["action%s" % fnum] |
| 909 | file["type"] = commit["type%s" % fnum] |
| 910 | files.append(file) |
| 911 | fnum = fnum + 1 |
| 912 | return files |
| 913 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 914 | def stripRepoPath(self, path, prefixes): |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 915 | if self.keepRepoPath: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 916 | prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])] |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 917 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 918 | for p in prefixes: |
| 919 | if path.startswith(p): |
| 920 | path = path[len(p):] |
| 921 | |
| 922 | return path |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 923 | |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 924 | def splitFilesIntoBranches(self, commit): |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 925 | branches = {} |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 926 | fnum = 0 |
| 927 | while commit.has_key("depotFile%s" % fnum): |
| 928 | path = commit["depotFile%s" % fnum] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 929 | found = [p for p in self.depotPaths |
| 930 | if path.startswith (p)] |
| 931 | if not found: |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 932 | fnum = fnum + 1 |
| 933 | continue |
| 934 | |
| 935 | file = {} |
| 936 | file["path"] = path |
| 937 | file["rev"] = commit["rev%s" % fnum] |
| 938 | file["action"] = commit["action%s" % fnum] |
| 939 | file["type"] = commit["type%s" % fnum] |
| 940 | fnum = fnum + 1 |
| 941 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 942 | relPath = self.stripRepoPath(path, self.depotPaths) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 943 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 944 | for branch in self.knownBranches.keys(): |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 945 | |
| 946 | # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2 |
| 947 | if relPath.startswith(branch + "/"): |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 948 | if branch not in branches: |
| 949 | branches[branch] = [] |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 950 | branches[branch].append(file) |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 951 | break |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 952 | |
| 953 | return branches |
| 954 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 955 | # output one file from the P4 stream |
| 956 | # - helper for streamP4Files |
| 957 | |
| 958 | def streamOneP4File(self, file, contents): |
| 959 | if file["type"] == "apple": |
| 960 | print "\nfile %s is a strange apple file that forks. Ignoring" % \ |
| 961 | file['depotFile'] |
| 962 | return |
| 963 | |
| 964 | relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) |
| 965 | if verbose: |
| 966 | sys.stderr.write("%s\n" % relPath) |
| 967 | |
| 968 | mode = "644" |
| 969 | if isP4Exec(file["type"]): |
| 970 | mode = "755" |
| 971 | elif file["type"] == "symlink": |
| 972 | mode = "120000" |
| 973 | # p4 print on a symlink contains "target\n", so strip it off |
Evan Powers | b39c361 | 2010-02-16 00:44:08 -0800 | [diff] [blame] | 974 | data = ''.join(contents) |
| 975 | contents = [data[:-1]] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 976 | |
| 977 | if self.isWindows and file["type"].endswith("text"): |
| 978 | mangled = [] |
| 979 | for data in contents: |
| 980 | data = data.replace("\r\n", "\n") |
| 981 | mangled.append(data) |
| 982 | contents = mangled |
| 983 | |
| 984 | if file['type'] in ('text+ko', 'unicode+ko', 'binary+ko'): |
| 985 | contents = map(lambda text: re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text), contents) |
| 986 | elif file['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'): |
| 987 | contents = map(lambda text: re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\n]*\$',r'$\1$', text), contents) |
| 988 | |
| 989 | self.gitStream.write("M %s inline %s\n" % (mode, relPath)) |
| 990 | |
| 991 | # total length... |
| 992 | length = 0 |
| 993 | for d in contents: |
| 994 | length = length + len(d) |
| 995 | |
| 996 | self.gitStream.write("data %d\n" % length) |
| 997 | for d in contents: |
| 998 | self.gitStream.write(d) |
| 999 | self.gitStream.write("\n") |
| 1000 | |
| 1001 | def streamOneP4Deletion(self, file): |
| 1002 | relPath = self.stripRepoPath(file['path'], self.branchPrefixes) |
| 1003 | if verbose: |
| 1004 | sys.stderr.write("delete %s\n" % relPath) |
| 1005 | self.gitStream.write("D %s\n" % relPath) |
| 1006 | |
| 1007 | # handle another chunk of streaming data |
| 1008 | def streamP4FilesCb(self, marshalled): |
| 1009 | |
| 1010 | if marshalled.has_key('depotFile') and self.stream_have_file_info: |
| 1011 | # start of a new file - output the old one first |
| 1012 | self.streamOneP4File(self.stream_file, self.stream_contents) |
| 1013 | self.stream_file = {} |
| 1014 | self.stream_contents = [] |
| 1015 | self.stream_have_file_info = False |
| 1016 | |
| 1017 | # pick up the new file information... for the |
| 1018 | # 'data' field we need to append to our array |
| 1019 | for k in marshalled.keys(): |
| 1020 | if k == 'data': |
| 1021 | self.stream_contents.append(marshalled['data']) |
| 1022 | else: |
| 1023 | self.stream_file[k] = marshalled[k] |
| 1024 | |
| 1025 | self.stream_have_file_info = True |
| 1026 | |
| 1027 | # Stream directly from "p4 files" into "git fast-import" |
| 1028 | def streamP4Files(self, files): |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1029 | filesForCommit = [] |
| 1030 | filesToRead = [] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1031 | filesToDelete = [] |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1032 | |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 1033 | for f in files: |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1034 | includeFile = True |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 1035 | for val in self.clientSpecDirs: |
| 1036 | if f['path'].startswith(val[0]): |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1037 | if val[1] <= 0: |
| 1038 | includeFile = False |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 1039 | break |
| 1040 | |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1041 | if includeFile: |
| 1042 | filesForCommit.append(f) |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 1043 | if f['action'] in self.delete_actions: |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1044 | filesToDelete.append(f) |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 1045 | else: |
| 1046 | filesToRead.append(f) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1047 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1048 | # deleted files... |
| 1049 | for f in filesToDelete: |
| 1050 | self.streamOneP4Deletion(f) |
| 1051 | |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1052 | if len(filesToRead) > 0: |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1053 | self.stream_file = {} |
| 1054 | self.stream_contents = [] |
| 1055 | self.stream_have_file_info = False |
| 1056 | |
| 1057 | # curry self argument |
| 1058 | def streamP4FilesCbSelf(entry): |
| 1059 | self.streamP4FilesCb(entry) |
| 1060 | |
| 1061 | p4CmdList("-x - print", |
| 1062 | '\n'.join(['%s#%s' % (f['path'], f['rev']) |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 1063 | for f in filesToRead]), |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1064 | cb=streamP4FilesCbSelf) |
Han-Wen Nienhuys | f2eda79 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1065 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1066 | # do the last chunk |
| 1067 | if self.stream_file.has_key('depotFile'): |
| 1068 | self.streamOneP4File(self.stream_file, self.stream_contents) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1069 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1070 | def commit(self, details, files, branch, branchPrefixes, parent = ""): |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1071 | epoch = details["time"] |
| 1072 | author = details["user"] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1073 | self.branchPrefixes = branchPrefixes |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1074 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1075 | if self.verbose: |
| 1076 | print "commit into %s" % branch |
| 1077 | |
Han-Wen Nienhuys | 96e07dd | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1078 | # start with reading files; if that fails, we should not |
| 1079 | # create a commit. |
| 1080 | new_files = [] |
| 1081 | for f in files: |
| 1082 | if [p for p in branchPrefixes if f['path'].startswith(p)]: |
| 1083 | new_files.append (f) |
| 1084 | else: |
| 1085 | sys.stderr.write("Ignoring file outside of prefix: %s\n" % path) |
Han-Wen Nienhuys | 96e07dd | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1086 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1087 | self.gitStream.write("commit %s\n" % branch) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1088 | # gitStream.write("mark :%s\n" % details["change"]) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1089 | self.committedChanges.add(int(details["change"])) |
| 1090 | committer = "" |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1091 | if author not in self.users: |
| 1092 | self.getUserMapFromPerforceServer() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1093 | if author in self.users: |
Simon Hausmann | 0828ab1 | 2007-03-20 20:59:30 +0100 | [diff] [blame] | 1094 | committer = "%s %s %s" % (self.users[author], epoch, self.tz) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1095 | else: |
Simon Hausmann | 0828ab1 | 2007-03-20 20:59:30 +0100 | [diff] [blame] | 1096 | committer = "%s <a@b> %s %s" % (author, epoch, self.tz) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1097 | |
| 1098 | self.gitStream.write("committer %s\n" % committer) |
| 1099 | |
| 1100 | self.gitStream.write("data <<EOT\n") |
| 1101 | self.gitStream.write(details["desc"]) |
Simon Hausmann | 6581de0 | 2007-06-11 10:01:58 +0200 | [diff] [blame] | 1102 | self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" |
| 1103 | % (','.join (branchPrefixes), details["change"])) |
| 1104 | if len(details['options']) > 0: |
| 1105 | self.gitStream.write(": options = %s" % details['options']) |
| 1106 | self.gitStream.write("]\nEOT\n\n") |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1107 | |
| 1108 | if len(parent) > 0: |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1109 | if self.verbose: |
| 1110 | print "parent %s" % parent |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1111 | self.gitStream.write("from %s\n" % parent) |
| 1112 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 1113 | self.streamP4Files(new_files) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1114 | self.gitStream.write("\n") |
| 1115 | |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1116 | change = int(details["change"]) |
| 1117 | |
Simon Hausmann | 9bda3a8 | 2007-05-19 12:05:40 +0200 | [diff] [blame] | 1118 | if self.labels.has_key(change): |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1119 | label = self.labels[change] |
| 1120 | labelDetails = label[0] |
| 1121 | labelRevisions = label[1] |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 1122 | if self.verbose: |
| 1123 | print "Change %s is labelled %s" % (change, labelDetails) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1124 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1125 | files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change) |
| 1126 | for p in branchPrefixes])) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1127 | |
| 1128 | if len(files) == len(labelRevisions): |
| 1129 | |
| 1130 | cleanedFiles = {} |
| 1131 | for info in files: |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 1132 | if info["action"] in self.delete_actions: |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1133 | continue |
| 1134 | cleanedFiles[info["depotFile"]] = info["rev"] |
| 1135 | |
| 1136 | if cleanedFiles == labelRevisions: |
| 1137 | self.gitStream.write("tag tag_%s\n" % labelDetails["label"]) |
| 1138 | self.gitStream.write("from %s\n" % branch) |
| 1139 | |
| 1140 | owner = labelDetails["Owner"] |
| 1141 | tagger = "" |
| 1142 | if author in self.users: |
| 1143 | tagger = "%s %s %s" % (self.users[owner], epoch, self.tz) |
| 1144 | else: |
| 1145 | tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz) |
| 1146 | self.gitStream.write("tagger %s\n" % tagger) |
| 1147 | self.gitStream.write("data <<EOT\n") |
| 1148 | self.gitStream.write(labelDetails["Description"]) |
| 1149 | self.gitStream.write("EOT\n\n") |
| 1150 | |
| 1151 | else: |
Simon Hausmann | a46668f | 2007-03-28 17:05:38 +0200 | [diff] [blame] | 1152 | if not self.silent: |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1153 | print ("Tag %s does not match with change %s: files do not match." |
| 1154 | % (labelDetails["label"], change)) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1155 | |
| 1156 | else: |
Simon Hausmann | a46668f | 2007-03-28 17:05:38 +0200 | [diff] [blame] | 1157 | if not self.silent: |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1158 | print ("Tag %s does not match with change %s: file count is different." |
| 1159 | % (labelDetails["label"], change)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1160 | |
Han-Wen Nienhuys | 183b8ef | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1161 | def getUserCacheFilename(self): |
Simon Hausmann | b2d2d16 | 2007-07-25 09:31:38 +0200 | [diff] [blame] | 1162 | home = os.environ.get("HOME", os.environ.get("USERPROFILE")) |
| 1163 | return home + "/.gitp4-usercache.txt" |
Han-Wen Nienhuys | 183b8ef | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1164 | |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1165 | def getUserMapFromPerforceServer(self): |
Simon Hausmann | ebd8116 | 2007-05-24 00:24:52 +0200 | [diff] [blame] | 1166 | if self.userMapFromPerforceServer: |
| 1167 | return |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1168 | self.users = {} |
| 1169 | |
| 1170 | for output in p4CmdList("users"): |
| 1171 | if not output.has_key("User"): |
| 1172 | continue |
| 1173 | self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">" |
| 1174 | |
Han-Wen Nienhuys | 183b8ef | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1175 | |
| 1176 | s = '' |
| 1177 | for (key, val) in self.users.items(): |
Pete Wyckoff | 3b16739 | 2009-02-27 10:53:59 -0800 | [diff] [blame] | 1178 | s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) |
Han-Wen Nienhuys | 183b8ef | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1179 | |
| 1180 | open(self.getUserCacheFilename(), "wb").write(s) |
Simon Hausmann | ebd8116 | 2007-05-24 00:24:52 +0200 | [diff] [blame] | 1181 | self.userMapFromPerforceServer = True |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1182 | |
| 1183 | def loadUserMapFromCache(self): |
| 1184 | self.users = {} |
Simon Hausmann | ebd8116 | 2007-05-24 00:24:52 +0200 | [diff] [blame] | 1185 | self.userMapFromPerforceServer = False |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1186 | try: |
Han-Wen Nienhuys | 183b8ef | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1187 | cache = open(self.getUserCacheFilename(), "rb") |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1188 | lines = cache.readlines() |
| 1189 | cache.close() |
| 1190 | for line in lines: |
Han-Wen Nienhuys | b25b206 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1191 | entry = line.strip().split("\t") |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1192 | self.users[entry[0]] = entry[1] |
| 1193 | except IOError: |
| 1194 | self.getUserMapFromPerforceServer() |
| 1195 | |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1196 | def getLabels(self): |
| 1197 | self.labels = {} |
| 1198 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1199 | l = p4CmdList("labels %s..." % ' '.join (self.depotPaths)) |
Simon Hausmann | 10c3211 | 2007-04-08 10:15:47 +0200 | [diff] [blame] | 1200 | if len(l) > 0 and not self.silent: |
Shun Kei Leung | 183f843 | 2007-11-21 11:01:19 +0800 | [diff] [blame] | 1201 | print "Finding files belonging to labels in %s" % `self.depotPaths` |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 1202 | |
| 1203 | for output in l: |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1204 | label = output["label"] |
| 1205 | revisions = {} |
| 1206 | newestChange = 0 |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 1207 | if self.verbose: |
| 1208 | print "Querying files for label %s" % label |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1209 | for file in p4CmdList("files " |
| 1210 | + ' '.join (["%s...@%s" % (p, label) |
| 1211 | for p in self.depotPaths])): |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1212 | revisions[file["depotFile"]] = file["rev"] |
| 1213 | change = int(file["change"]) |
| 1214 | if change > newestChange: |
| 1215 | newestChange = change |
| 1216 | |
Simon Hausmann | 9bda3a8 | 2007-05-19 12:05:40 +0200 | [diff] [blame] | 1217 | self.labels[newestChange] = [output, revisions] |
| 1218 | |
| 1219 | if self.verbose: |
| 1220 | print "Label changes: %s" % self.labels.keys() |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 1221 | |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1222 | def guessProjectName(self): |
| 1223 | for p in self.depotPaths: |
Simon Hausmann | 6e5295c | 2007-06-11 08:50:57 +0200 | [diff] [blame] | 1224 | if p.endswith("/"): |
| 1225 | p = p[:-1] |
| 1226 | p = p[p.strip().rfind("/") + 1:] |
| 1227 | if not p.endswith("/"): |
| 1228 | p += "/" |
| 1229 | return p |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1230 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1231 | def getBranchMapping(self): |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 1232 | lostAndFoundBranches = set() |
| 1233 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1234 | for info in p4CmdList("branches"): |
| 1235 | details = p4Cmd("branch -o %s" % info["branch"]) |
| 1236 | viewIdx = 0 |
| 1237 | while details.has_key("View%s" % viewIdx): |
| 1238 | paths = details["View%s" % viewIdx].split(" ") |
| 1239 | viewIdx = viewIdx + 1 |
| 1240 | # require standard //depot/foo/... //depot/bar/... mapping |
| 1241 | if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."): |
| 1242 | continue |
| 1243 | source = paths[0] |
| 1244 | destination = paths[1] |
Simon Hausmann | 6509e19 | 2007-06-07 09:41:53 +0200 | [diff] [blame] | 1245 | ## HACK |
| 1246 | if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]): |
| 1247 | source = source[len(self.depotPaths[0]):-4] |
| 1248 | destination = destination[len(self.depotPaths[0]):-4] |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 1249 | |
Simon Hausmann | 1a2edf4 | 2007-06-17 15:10:24 +0200 | [diff] [blame] | 1250 | if destination in self.knownBranches: |
| 1251 | if not self.silent: |
| 1252 | print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination) |
| 1253 | print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination) |
| 1254 | continue |
| 1255 | |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 1256 | self.knownBranches[destination] = source |
| 1257 | |
| 1258 | lostAndFoundBranches.discard(destination) |
| 1259 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1260 | if source not in self.knownBranches: |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 1261 | lostAndFoundBranches.add(source) |
| 1262 | |
| 1263 | |
| 1264 | for branch in lostAndFoundBranches: |
| 1265 | self.knownBranches[branch] = branch |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1266 | |
Simon Hausmann | 38f9f5e | 2007-11-15 10:38:45 +0100 | [diff] [blame] | 1267 | def getBranchMappingFromGitBranches(self): |
| 1268 | branches = p4BranchesInGit(self.importIntoRemotes) |
| 1269 | for branch in branches.keys(): |
| 1270 | if branch == "master": |
| 1271 | branch = "main" |
| 1272 | else: |
| 1273 | branch = branch[len(self.projectName):] |
| 1274 | self.knownBranches[branch] = branch |
| 1275 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1276 | def listExistingP4GitBranches(self): |
Simon Hausmann | 144ff46 | 2007-07-18 17:27:50 +0200 | [diff] [blame] | 1277 | # branches holds mapping from name to commit |
| 1278 | branches = p4BranchesInGit(self.importIntoRemotes) |
| 1279 | self.p4BranchesInGit = branches.keys() |
| 1280 | for branch in branches.keys(): |
| 1281 | self.initialParents[self.refPrefix + branch] = branches[branch] |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1282 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1283 | def updateOptionDict(self, d): |
| 1284 | option_keys = {} |
| 1285 | if self.keepRepoPath: |
| 1286 | option_keys['keepRepoPath'] = 1 |
| 1287 | |
| 1288 | d["options"] = ' '.join(sorted(option_keys.keys())) |
| 1289 | |
| 1290 | def readOptions(self, d): |
| 1291 | self.keepRepoPath = (d.has_key('options') |
| 1292 | and ('keepRepoPath' in d['options'])) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1293 | |
Simon Hausmann | 8134f69 | 2007-08-26 16:44:55 +0200 | [diff] [blame] | 1294 | def gitRefForBranch(self, branch): |
| 1295 | if branch == "main": |
| 1296 | return self.refPrefix + "master" |
| 1297 | |
| 1298 | if len(branch) <= 0: |
| 1299 | return branch |
| 1300 | |
| 1301 | return self.refPrefix + self.projectName + branch |
| 1302 | |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 1303 | def gitCommitByP4Change(self, ref, change): |
| 1304 | if self.verbose: |
| 1305 | print "looking in ref " + ref + " for change %s using bisect..." % change |
| 1306 | |
| 1307 | earliestCommit = "" |
| 1308 | latestCommit = parseRevision(ref) |
| 1309 | |
| 1310 | while True: |
| 1311 | if self.verbose: |
| 1312 | print "trying: earliest %s latest %s" % (earliestCommit, latestCommit) |
| 1313 | next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip() |
| 1314 | if len(next) == 0: |
| 1315 | if self.verbose: |
| 1316 | print "argh" |
| 1317 | return "" |
| 1318 | log = extractLogMessageFromGitCommit(next) |
| 1319 | settings = extractSettingsGitLog(log) |
| 1320 | currentChange = int(settings['change']) |
| 1321 | if self.verbose: |
| 1322 | print "current change %s" % currentChange |
| 1323 | |
| 1324 | if currentChange == change: |
| 1325 | if self.verbose: |
| 1326 | print "found %s" % next |
| 1327 | return next |
| 1328 | |
| 1329 | if currentChange < change: |
| 1330 | earliestCommit = "^%s" % next |
| 1331 | else: |
| 1332 | latestCommit = "%s" % next |
| 1333 | |
| 1334 | return "" |
| 1335 | |
| 1336 | def importNewBranch(self, branch, maxChange): |
| 1337 | # make fast-import flush all changes to disk and update the refs using the checkpoint |
| 1338 | # command so that we can try to find the branch parent in the git history |
| 1339 | self.gitStream.write("checkpoint\n\n"); |
| 1340 | self.gitStream.flush(); |
| 1341 | branchPrefix = self.depotPaths[0] + branch + "/" |
| 1342 | range = "@1,%s" % maxChange |
| 1343 | #print "prefix" + branchPrefix |
| 1344 | changes = p4ChangesForPaths([branchPrefix], range) |
| 1345 | if len(changes) <= 0: |
| 1346 | return False |
| 1347 | firstChange = changes[0] |
| 1348 | #print "first change in branch: %s" % firstChange |
| 1349 | sourceBranch = self.knownBranches[branch] |
| 1350 | sourceDepotPath = self.depotPaths[0] + sourceBranch |
| 1351 | sourceRef = self.gitRefForBranch(sourceBranch) |
| 1352 | #print "source " + sourceBranch |
| 1353 | |
| 1354 | branchParentChange = int(p4Cmd("changes -m 1 %s...@1,%s" % (sourceDepotPath, firstChange))["change"]) |
| 1355 | #print "branch parent: %s" % branchParentChange |
| 1356 | gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange) |
| 1357 | if len(gitParent) > 0: |
| 1358 | self.initialParents[self.gitRefForBranch(branch)] = gitParent |
| 1359 | #print "parent git commit: %s" % gitParent |
| 1360 | |
| 1361 | self.importChanges(changes) |
| 1362 | return True |
| 1363 | |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 1364 | def importChanges(self, changes): |
| 1365 | cnt = 1 |
| 1366 | for change in changes: |
| 1367 | description = p4Cmd("describe %s" % change) |
| 1368 | self.updateOptionDict(description) |
| 1369 | |
| 1370 | if not self.silent: |
| 1371 | sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes))) |
| 1372 | sys.stdout.flush() |
| 1373 | cnt = cnt + 1 |
| 1374 | |
| 1375 | try: |
| 1376 | if self.detectBranches: |
| 1377 | branches = self.splitFilesIntoBranches(description) |
| 1378 | for branch in branches.keys(): |
| 1379 | ## HACK --hwn |
| 1380 | branchPrefix = self.depotPaths[0] + branch + "/" |
| 1381 | |
| 1382 | parent = "" |
| 1383 | |
| 1384 | filesForCommit = branches[branch] |
| 1385 | |
| 1386 | if self.verbose: |
| 1387 | print "branch is %s" % branch |
| 1388 | |
| 1389 | self.updatedBranches.add(branch) |
| 1390 | |
| 1391 | if branch not in self.createdBranches: |
| 1392 | self.createdBranches.add(branch) |
| 1393 | parent = self.knownBranches[branch] |
| 1394 | if parent == branch: |
| 1395 | parent = "" |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 1396 | else: |
| 1397 | fullBranch = self.projectName + branch |
| 1398 | if fullBranch not in self.p4BranchesInGit: |
| 1399 | if not self.silent: |
| 1400 | print("\n Importing new branch %s" % fullBranch); |
| 1401 | if self.importNewBranch(branch, change - 1): |
| 1402 | parent = "" |
| 1403 | self.p4BranchesInGit.append(fullBranch) |
| 1404 | if not self.silent: |
| 1405 | print("\n Resuming with change %s" % change); |
| 1406 | |
| 1407 | if self.verbose: |
| 1408 | print "parent determined through known branches: %s" % parent |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 1409 | |
Simon Hausmann | 8134f69 | 2007-08-26 16:44:55 +0200 | [diff] [blame] | 1410 | branch = self.gitRefForBranch(branch) |
| 1411 | parent = self.gitRefForBranch(parent) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 1412 | |
| 1413 | if self.verbose: |
| 1414 | print "looking for initial parent for %s; current parent is %s" % (branch, parent) |
| 1415 | |
| 1416 | if len(parent) == 0 and branch in self.initialParents: |
| 1417 | parent = self.initialParents[branch] |
| 1418 | del self.initialParents[branch] |
| 1419 | |
| 1420 | self.commit(description, filesForCommit, branch, [branchPrefix], parent) |
| 1421 | else: |
| 1422 | files = self.extractFilesFromCommit(description) |
| 1423 | self.commit(description, files, self.branch, self.depotPaths, |
| 1424 | self.initialParent) |
| 1425 | self.initialParent = "" |
| 1426 | except IOError: |
| 1427 | print self.gitError.read() |
| 1428 | sys.exit(1) |
| 1429 | |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1430 | def importHeadRevision(self, revision): |
| 1431 | print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch) |
| 1432 | |
| 1433 | details = { "user" : "git perforce import user", "time" : int(time.time()) } |
Pete Wyckoff | 1494fcb | 2011-02-19 08:17:56 -0500 | [diff] [blame] | 1434 | details["desc"] = ("Initial import of %s from the state at revision %s\n" |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1435 | % (' '.join(self.depotPaths), revision)) |
| 1436 | details["change"] = revision |
| 1437 | newestRevision = 0 |
| 1438 | |
| 1439 | fileCnt = 0 |
| 1440 | for info in p4CmdList("files " |
| 1441 | + ' '.join(["%s...%s" |
| 1442 | % (p, revision) |
| 1443 | for p in self.depotPaths])): |
| 1444 | |
Pete Wyckoff | 68b2859 | 2011-02-19 08:17:55 -0500 | [diff] [blame] | 1445 | if 'code' in info and info['code'] == 'error': |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1446 | sys.stderr.write("p4 returned an error: %s\n" |
| 1447 | % info['data']) |
Pete Wyckoff | d88e707 | 2011-02-19 08:17:58 -0500 | [diff] [blame^] | 1448 | if info['data'].find("must refer to client") >= 0: |
| 1449 | sys.stderr.write("This particular p4 error is misleading.\n") |
| 1450 | sys.stderr.write("Perhaps the depot path was misspelled.\n"); |
| 1451 | sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths)) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1452 | sys.exit(1) |
Pete Wyckoff | 68b2859 | 2011-02-19 08:17:55 -0500 | [diff] [blame] | 1453 | if 'p4ExitCode' in info: |
| 1454 | sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode']) |
| 1455 | sys.exit(1) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1456 | |
| 1457 | |
| 1458 | change = int(info["change"]) |
| 1459 | if change > newestRevision: |
| 1460 | newestRevision = change |
| 1461 | |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 1462 | if info["action"] in self.delete_actions: |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1463 | # don't increase the file cnt, otherwise details["depotFile123"] will have gaps! |
| 1464 | #fileCnt = fileCnt + 1 |
| 1465 | continue |
| 1466 | |
| 1467 | for prop in ["depotFile", "rev", "action", "type" ]: |
| 1468 | details["%s%s" % (prop, fileCnt)] = info[prop] |
| 1469 | |
| 1470 | fileCnt = fileCnt + 1 |
| 1471 | |
| 1472 | details["change"] = newestRevision |
| 1473 | self.updateOptionDict(details) |
| 1474 | try: |
| 1475 | self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths) |
| 1476 | except IOError: |
| 1477 | print "IO error with git fast-import. Is your git version recent enough?" |
| 1478 | print self.gitError.read() |
| 1479 | |
| 1480 | |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 1481 | def getClientSpec(self): |
| 1482 | specList = p4CmdList( "client -o" ) |
| 1483 | temp = {} |
| 1484 | for entry in specList: |
| 1485 | for k,v in entry.iteritems(): |
| 1486 | if k.startswith("View"): |
| 1487 | if v.startswith('"'): |
| 1488 | start = 1 |
| 1489 | else: |
| 1490 | start = 0 |
| 1491 | index = v.find("...") |
| 1492 | v = v[start:index] |
| 1493 | if v.startswith("-"): |
| 1494 | v = v[1:] |
| 1495 | temp[v] = -len(v) |
| 1496 | else: |
| 1497 | temp[v] = len(v) |
| 1498 | self.clientSpecDirs = temp.items() |
| 1499 | self.clientSpecDirs.sort( lambda x, y: abs( y[1] ) - abs( x[1] ) ) |
| 1500 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1501 | def run(self, args): |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1502 | self.depotPaths = [] |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 1503 | self.changeRange = "" |
| 1504 | self.initialParent = "" |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1505 | self.previousDepotPaths = [] |
Han-Wen Nienhuys | ce6f33c | 2007-05-23 16:46:29 -0300 | [diff] [blame] | 1506 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1507 | # map from branch depot path to parent branch |
| 1508 | self.knownBranches = {} |
| 1509 | self.initialParents = {} |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1510 | self.hasOrigin = originP4BranchesExist() |
Simon Hausmann | a43ff00 | 2007-06-11 09:59:27 +0200 | [diff] [blame] | 1511 | if not self.syncWithOrigin: |
| 1512 | self.hasOrigin = False |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 1513 | |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 1514 | if self.importIntoRemotes: |
| 1515 | self.refPrefix = "refs/remotes/p4/" |
| 1516 | else: |
Marius Storm-Olsen | db77555 | 2007-06-07 15:13:59 +0200 | [diff] [blame] | 1517 | self.refPrefix = "refs/heads/p4/" |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 1518 | |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1519 | if self.syncWithOrigin and self.hasOrigin: |
| 1520 | if not self.silent: |
| 1521 | print "Syncing with origin first by calling git fetch origin" |
| 1522 | system("git fetch origin") |
Simon Hausmann | 10f880f | 2007-05-24 22:28:28 +0200 | [diff] [blame] | 1523 | |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 1524 | if len(self.branch) == 0: |
Marius Storm-Olsen | db77555 | 2007-06-07 15:13:59 +0200 | [diff] [blame] | 1525 | self.branch = self.refPrefix + "master" |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 1526 | if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: |
Simon Hausmann | 48df6fd | 2007-05-17 21:18:53 +0200 | [diff] [blame] | 1527 | system("git update-ref %s refs/heads/p4" % self.branch) |
Simon Hausmann | 48df6fd | 2007-05-17 21:18:53 +0200 | [diff] [blame] | 1528 | system("git branch -D p4"); |
Simon Hausmann | faf1bd2 | 2007-05-21 10:05:30 +0200 | [diff] [blame] | 1529 | # create it /after/ importing, when master exists |
Simon Hausmann | 0058a33 | 2007-08-24 17:46:16 +0200 | [diff] [blame] | 1530 | if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch): |
Simon Hausmann | a3c55c0 | 2007-05-27 15:48:01 +0200 | [diff] [blame] | 1531 | system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch)) |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 1532 | |
Anand Kumria | 3cafb7d | 2008-08-10 19:26:32 +0100 | [diff] [blame] | 1533 | if self.useClientSpec or gitConfig("git-p4.useclientspec") == "true": |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 1534 | self.getClientSpec() |
| 1535 | |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1536 | # TODO: should always look at previous commits, |
| 1537 | # merge with previous imports, if possible. |
| 1538 | if args == []: |
Simon Hausmann | d414c74 | 2007-05-25 11:36:42 +0200 | [diff] [blame] | 1539 | if self.hasOrigin: |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1540 | createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent) |
Simon Hausmann | abcd790 | 2007-05-24 22:25:36 +0200 | [diff] [blame] | 1541 | self.listExistingP4GitBranches() |
| 1542 | |
| 1543 | if len(self.p4BranchesInGit) > 1: |
| 1544 | if not self.silent: |
| 1545 | print "Importing from/into multiple branches" |
| 1546 | self.detectBranches = True |
Simon Hausmann | 967f72e | 2007-03-23 09:30:41 +0100 | [diff] [blame] | 1547 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1548 | if self.verbose: |
| 1549 | print "branches: %s" % self.p4BranchesInGit |
| 1550 | |
| 1551 | p4Change = 0 |
| 1552 | for branch in self.p4BranchesInGit: |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1553 | logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch) |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1554 | |
| 1555 | settings = extractSettingsGitLog(logMsg) |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1556 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1557 | self.readOptions(settings) |
| 1558 | if (settings.has_key('depot-paths') |
| 1559 | and settings.has_key ('change')): |
| 1560 | change = int(settings['change']) + 1 |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1561 | p4Change = max(p4Change, change) |
| 1562 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1563 | depotPaths = sorted(settings['depot-paths']) |
| 1564 | if self.previousDepotPaths == []: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1565 | self.previousDepotPaths = depotPaths |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1566 | else: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1567 | paths = [] |
| 1568 | for (prev, cur) in zip(self.previousDepotPaths, depotPaths): |
Simon Hausmann | 583e170 | 2007-06-07 09:37:13 +0200 | [diff] [blame] | 1569 | for i in range(0, min(len(cur), len(prev))): |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1570 | if cur[i] <> prev[i]: |
Simon Hausmann | 583e170 | 2007-06-07 09:37:13 +0200 | [diff] [blame] | 1571 | i = i - 1 |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1572 | break |
| 1573 | |
Simon Hausmann | 583e170 | 2007-06-07 09:37:13 +0200 | [diff] [blame] | 1574 | paths.append (cur[:i + 1]) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1575 | |
| 1576 | self.previousDepotPaths = paths |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1577 | |
| 1578 | if p4Change > 0: |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1579 | self.depotPaths = sorted(self.previousDepotPaths) |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 1580 | self.changeRange = "@%s,#head" % p4Change |
Simon Hausmann | 330f53b | 2007-06-07 09:39:51 +0200 | [diff] [blame] | 1581 | if not self.detectBranches: |
| 1582 | self.initialParent = parseRevision(self.branch) |
Simon Hausmann | 341dc1c | 2007-05-21 00:39:16 +0200 | [diff] [blame] | 1583 | if not self.silent and not self.detectBranches: |
Simon Hausmann | 967f72e | 2007-03-23 09:30:41 +0100 | [diff] [blame] | 1584 | print "Performing incremental import into %s git branch" % self.branch |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 1585 | |
Simon Hausmann | f9162f6 | 2007-05-17 09:02:45 +0200 | [diff] [blame] | 1586 | if not self.branch.startswith("refs/"): |
| 1587 | self.branch = "refs/heads/" + self.branch |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 1588 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1589 | if len(args) == 0 and self.depotPaths: |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1590 | if not self.silent: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1591 | print "Depot paths: %s" % ' '.join(self.depotPaths) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1592 | else: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1593 | if self.depotPaths and self.depotPaths != args: |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1594 | print ("previous import used depot path %s and now %s was specified. " |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1595 | "This doesn't work!" % (' '.join (self.depotPaths), |
| 1596 | ' '.join (args))) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1597 | sys.exit(1) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1598 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1599 | self.depotPaths = sorted(args) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1600 | |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 1601 | revision = "" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1602 | self.users = {} |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1603 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1604 | newPaths = [] |
| 1605 | for p in self.depotPaths: |
| 1606 | if p.find("@") != -1: |
| 1607 | atIdx = p.index("@") |
| 1608 | self.changeRange = p[atIdx:] |
| 1609 | if self.changeRange == "@all": |
| 1610 | self.changeRange = "" |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1611 | elif ',' not in self.changeRange: |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 1612 | revision = self.changeRange |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1613 | self.changeRange = "" |
Han-Wen Nienhuys | 7fcff9d | 2007-07-23 15:56:37 -0700 | [diff] [blame] | 1614 | p = p[:atIdx] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1615 | elif p.find("#") != -1: |
| 1616 | hashIdx = p.index("#") |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 1617 | revision = p[hashIdx:] |
Han-Wen Nienhuys | 7fcff9d | 2007-07-23 15:56:37 -0700 | [diff] [blame] | 1618 | p = p[:hashIdx] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1619 | elif self.previousDepotPaths == []: |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 1620 | revision = "#head" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1621 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1622 | p = re.sub ("\.\.\.$", "", p) |
| 1623 | if not p.endswith("/"): |
| 1624 | p += "/" |
| 1625 | |
| 1626 | newPaths.append(p) |
| 1627 | |
| 1628 | self.depotPaths = newPaths |
| 1629 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1630 | |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 1631 | self.loadUserMapFromCache() |
Simon Hausmann | cb53e1f | 2007-04-08 00:12:02 +0200 | [diff] [blame] | 1632 | self.labels = {} |
| 1633 | if self.detectLabels: |
| 1634 | self.getLabels(); |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1635 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1636 | if self.detectBranches: |
Simon Hausmann | df45092 | 2007-06-08 08:49:22 +0200 | [diff] [blame] | 1637 | ## FIXME - what's a P4 projectName ? |
| 1638 | self.projectName = self.guessProjectName() |
| 1639 | |
Simon Hausmann | 38f9f5e | 2007-11-15 10:38:45 +0100 | [diff] [blame] | 1640 | if self.hasOrigin: |
| 1641 | self.getBranchMappingFromGitBranches() |
| 1642 | else: |
| 1643 | self.getBranchMapping() |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1644 | if self.verbose: |
| 1645 | print "p4-git branches: %s" % self.p4BranchesInGit |
| 1646 | print "initial parents: %s" % self.initialParents |
| 1647 | for b in self.p4BranchesInGit: |
| 1648 | if b != "master": |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1649 | |
| 1650 | ## FIXME |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1651 | b = b[len(self.projectName):] |
| 1652 | self.createdBranches.add(b) |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 1653 | |
Simon Hausmann | f291b4e | 2007-04-14 11:21:50 +0200 | [diff] [blame] | 1654 | self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1655 | |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1656 | importProcess = subprocess.Popen(["git", "fast-import"], |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1657 | stdin=subprocess.PIPE, stdout=subprocess.PIPE, |
| 1658 | stderr=subprocess.PIPE); |
Simon Hausmann | 0848358 | 2007-05-15 14:31:06 +0200 | [diff] [blame] | 1659 | self.gitOutput = importProcess.stdout |
| 1660 | self.gitStream = importProcess.stdin |
| 1661 | self.gitError = importProcess.stderr |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1662 | |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 1663 | if revision: |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 1664 | self.importHeadRevision(revision) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1665 | else: |
| 1666 | changes = [] |
| 1667 | |
Simon Hausmann | 0828ab1 | 2007-03-20 20:59:30 +0100 | [diff] [blame] | 1668 | if len(self.changesFile) > 0: |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1669 | output = open(self.changesFile).readlines() |
Reilly Grant | 1d7367d | 2009-09-10 00:02:38 -0700 | [diff] [blame] | 1670 | changeSet = set() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1671 | for line in output: |
| 1672 | changeSet.add(int(line)) |
| 1673 | |
| 1674 | for change in changeSet: |
| 1675 | changes.append(change) |
| 1676 | |
| 1677 | changes.sort() |
| 1678 | else: |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1679 | if self.verbose: |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1680 | print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1681 | self.changeRange) |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 1682 | changes = p4ChangesForPaths(self.depotPaths, self.changeRange) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1683 | |
Simon Hausmann | 01a9c9c | 2007-05-23 00:07:35 +0200 | [diff] [blame] | 1684 | if len(self.maxChanges) > 0: |
Han-Wen Nienhuys | 7fcff9d | 2007-07-23 15:56:37 -0700 | [diff] [blame] | 1685 | changes = changes[:min(int(self.maxChanges), len(changes))] |
Simon Hausmann | 01a9c9c | 2007-05-23 00:07:35 +0200 | [diff] [blame] | 1686 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1687 | if len(changes) == 0: |
Simon Hausmann | 0828ab1 | 2007-03-20 20:59:30 +0100 | [diff] [blame] | 1688 | if not self.silent: |
Simon Hausmann | 341dc1c | 2007-05-21 00:39:16 +0200 | [diff] [blame] | 1689 | print "No changes to import!" |
Simon Hausmann | 1f52af6 | 2007-04-08 00:07:02 +0200 | [diff] [blame] | 1690 | return True |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1691 | |
Simon Hausmann | a9d1a27 | 2007-06-11 23:28:03 +0200 | [diff] [blame] | 1692 | if not self.silent and not self.detectBranches: |
| 1693 | print "Import destination: %s" % self.branch |
| 1694 | |
Simon Hausmann | 341dc1c | 2007-05-21 00:39:16 +0200 | [diff] [blame] | 1695 | self.updatedBranches = set() |
| 1696 | |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 1697 | self.importChanges(changes) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1698 | |
Simon Hausmann | 341dc1c | 2007-05-21 00:39:16 +0200 | [diff] [blame] | 1699 | if not self.silent: |
| 1700 | print "" |
| 1701 | if len(self.updatedBranches) > 0: |
| 1702 | sys.stdout.write("Updated branches: ") |
| 1703 | for b in self.updatedBranches: |
| 1704 | sys.stdout.write("%s " % b) |
| 1705 | sys.stdout.write("\n") |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1706 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1707 | self.gitStream.close() |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 1708 | if importProcess.wait() != 0: |
| 1709 | die("fast-import failed: %s" % self.gitError.read()) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1710 | self.gitOutput.close() |
| 1711 | self.gitError.close() |
| 1712 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1713 | return True |
| 1714 | |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 1715 | class P4Rebase(Command): |
| 1716 | def __init__(self): |
| 1717 | Command.__init__(self) |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 1718 | self.options = [ ] |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 1719 | self.description = ("Fetches the latest revision from perforce and " |
| 1720 | + "rebases the current work (branch) against it") |
Simon Hausmann | 68c4215 | 2007-06-07 12:51:03 +0200 | [diff] [blame] | 1721 | self.verbose = False |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 1722 | |
| 1723 | def run(self, args): |
| 1724 | sync = P4Sync() |
| 1725 | sync.run([]) |
Simon Hausmann | d7e3868 | 2007-06-12 14:34:46 +0200 | [diff] [blame] | 1726 | |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 1727 | return self.rebase() |
| 1728 | |
| 1729 | def rebase(self): |
Simon Hausmann | 36ee4ee | 2008-01-07 14:21:45 +0100 | [diff] [blame] | 1730 | if os.system("git update-index --refresh") != 0: |
| 1731 | die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash."); |
| 1732 | if len(read_pipe("git diff-index HEAD --")) > 0: |
| 1733 | die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash."); |
| 1734 | |
Simon Hausmann | d7e3868 | 2007-06-12 14:34:46 +0200 | [diff] [blame] | 1735 | [upstream, settings] = findUpstreamBranchPoint() |
| 1736 | if len(upstream) == 0: |
| 1737 | die("Cannot find upstream branchpoint for rebase") |
| 1738 | |
| 1739 | # the branchpoint may be p4/foo~3, so strip off the parent |
| 1740 | upstream = re.sub("~[0-9]+$", "", upstream) |
| 1741 | |
| 1742 | print "Rebasing the current branch onto %s" % upstream |
Han-Wen Nienhuys | b25b206 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1743 | oldHead = read_pipe("git rev-parse HEAD").strip() |
Simon Hausmann | d7e3868 | 2007-06-12 14:34:46 +0200 | [diff] [blame] | 1744 | system("git rebase %s" % upstream) |
Simon Hausmann | 1f52af6 | 2007-04-08 00:07:02 +0200 | [diff] [blame] | 1745 | system("git diff-tree --stat --summary -M %s HEAD" % oldHead) |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 1746 | return True |
| 1747 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1748 | class P4Clone(P4Sync): |
| 1749 | def __init__(self): |
| 1750 | P4Sync.__init__(self) |
| 1751 | self.description = "Creates a new git repository and imports from Perforce into it" |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1752 | self.usage = "usage: %prog [options] //depot/path[@revRange]" |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 1753 | self.options += [ |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1754 | optparse.make_option("--destination", dest="cloneDestination", |
| 1755 | action='store', default=None, |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 1756 | help="where to leave result of the clone"), |
| 1757 | optparse.make_option("-/", dest="cloneExclude", |
| 1758 | action="append", type="string", |
| 1759 | help="exclude depot path") |
| 1760 | ] |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1761 | self.cloneDestination = None |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1762 | self.needsGit = False |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1763 | |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 1764 | # This is required for the "append" cloneExclude action |
| 1765 | def ensure_value(self, attr, value): |
| 1766 | if not hasattr(self, attr) or getattr(self, attr) is None: |
| 1767 | setattr(self, attr, value) |
| 1768 | return getattr(self, attr) |
| 1769 | |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1770 | def defaultDestination(self, args): |
| 1771 | ## TODO: use common prefix of args? |
| 1772 | depotPath = args[0] |
| 1773 | depotDir = re.sub("(@[^@]*)$", "", depotPath) |
| 1774 | depotDir = re.sub("(#[^#]*)$", "", depotDir) |
Toby Allsopp | 053d9e4 | 2008-02-05 09:41:43 +1300 | [diff] [blame] | 1775 | depotDir = re.sub(r"\.\.\.$", "", depotDir) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1776 | depotDir = re.sub(r"/$", "", depotDir) |
| 1777 | return os.path.split(depotDir)[1] |
| 1778 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1779 | def run(self, args): |
| 1780 | if len(args) < 1: |
| 1781 | return False |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1782 | |
| 1783 | if self.keepRepoPath and not self.cloneDestination: |
| 1784 | sys.stderr.write("Must specify destination for --keep-path\n") |
| 1785 | sys.exit(1) |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1786 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1787 | depotPaths = args |
Simon Hausmann | 5e100b5 | 2007-06-07 21:12:25 +0200 | [diff] [blame] | 1788 | |
| 1789 | if not self.cloneDestination and len(depotPaths) > 1: |
| 1790 | self.cloneDestination = depotPaths[-1] |
| 1791 | depotPaths = depotPaths[:-1] |
| 1792 | |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 1793 | self.cloneExclude = ["/"+p for p in self.cloneExclude] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1794 | for p in depotPaths: |
| 1795 | if not p.startswith("//"): |
| 1796 | return False |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1797 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1798 | if not self.cloneDestination: |
Marius Storm-Olsen | 98ad4fa | 2007-06-07 15:08:33 +0200 | [diff] [blame] | 1799 | self.cloneDestination = self.defaultDestination(args) |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1800 | |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1801 | print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination) |
Kevin Green | c3bf3f1 | 2007-06-11 16:48:07 -0400 | [diff] [blame] | 1802 | if not os.path.exists(self.cloneDestination): |
| 1803 | os.makedirs(self.cloneDestination) |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 1804 | chdir(self.cloneDestination) |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1805 | system("git init") |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1806 | self.gitdir = os.getcwd() + "/.git" |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1807 | if not P4Sync.run(self, depotPaths): |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1808 | return False |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1809 | if self.branch != "master": |
Tor Arvid Lund | e990501 | 2008-08-28 00:36:12 +0200 | [diff] [blame] | 1810 | if self.importIntoRemotes: |
| 1811 | masterbranch = "refs/remotes/p4/master" |
| 1812 | else: |
| 1813 | masterbranch = "refs/heads/p4/master" |
| 1814 | if gitBranchExists(masterbranch): |
| 1815 | system("git branch master %s" % masterbranch) |
Simon Hausmann | 8f9b2e0 | 2007-05-18 22:13:26 +0200 | [diff] [blame] | 1816 | system("git checkout -f") |
| 1817 | else: |
| 1818 | print "Could not detect main branch. No checkout/master branch created." |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1819 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 1820 | return True |
| 1821 | |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 1822 | class P4Branches(Command): |
| 1823 | def __init__(self): |
| 1824 | Command.__init__(self) |
| 1825 | self.options = [ ] |
| 1826 | self.description = ("Shows the git branches that hold imports and their " |
| 1827 | + "corresponding perforce depot paths") |
| 1828 | self.verbose = False |
| 1829 | |
| 1830 | def run(self, args): |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1831 | if originP4BranchesExist(): |
| 1832 | createOrUpdateBranchesFromOrigin() |
| 1833 | |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 1834 | cmdline = "git rev-parse --symbolic " |
| 1835 | cmdline += " --remotes" |
| 1836 | |
| 1837 | for line in read_pipe_lines(cmdline): |
| 1838 | line = line.strip() |
| 1839 | |
| 1840 | if not line.startswith('p4/') or line == "p4/HEAD": |
| 1841 | continue |
| 1842 | branch = line |
| 1843 | |
| 1844 | log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch) |
| 1845 | settings = extractSettingsGitLog(log) |
| 1846 | |
| 1847 | print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]) |
| 1848 | return True |
| 1849 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1850 | class HelpFormatter(optparse.IndentedHelpFormatter): |
| 1851 | def __init__(self): |
| 1852 | optparse.IndentedHelpFormatter.__init__(self) |
| 1853 | |
| 1854 | def format_description(self, description): |
| 1855 | if description: |
| 1856 | return description + "\n" |
| 1857 | else: |
| 1858 | return "" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1859 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1860 | def printUsage(commands): |
| 1861 | print "usage: %s <command> [options]" % sys.argv[0] |
| 1862 | print "" |
| 1863 | print "valid commands: %s" % ", ".join(commands) |
| 1864 | print "" |
| 1865 | print "Try %s <command> --help for command specific help." % sys.argv[0] |
| 1866 | print "" |
| 1867 | |
| 1868 | commands = { |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1869 | "debug" : P4Debug, |
| 1870 | "submit" : P4Submit, |
Marius Storm-Olsen | a9834f5 | 2007-10-09 16:16:09 +0200 | [diff] [blame] | 1871 | "commit" : P4Submit, |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1872 | "sync" : P4Sync, |
| 1873 | "rebase" : P4Rebase, |
| 1874 | "clone" : P4Clone, |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 1875 | "rollback" : P4RollBack, |
| 1876 | "branches" : P4Branches |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1877 | } |
| 1878 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1879 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1880 | def main(): |
| 1881 | if len(sys.argv[1:]) == 0: |
| 1882 | printUsage(commands.keys()) |
| 1883 | sys.exit(2) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1884 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1885 | cmd = "" |
| 1886 | cmdName = sys.argv[1] |
| 1887 | try: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1888 | klass = commands[cmdName] |
| 1889 | cmd = klass() |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1890 | except KeyError: |
| 1891 | print "unknown command %s" % cmdName |
| 1892 | print "" |
| 1893 | printUsage(commands.keys()) |
| 1894 | sys.exit(2) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1895 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1896 | options = cmd.options |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1897 | cmd.gitdir = os.environ.get("GIT_DIR", None) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1898 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1899 | args = sys.argv[2:] |
Simon Hausmann | e20a9e5 | 2007-03-26 00:13:51 +0200 | [diff] [blame] | 1900 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1901 | if len(options) > 0: |
| 1902 | options.append(optparse.make_option("--git-dir", dest="gitdir")) |
Simon Hausmann | e20a9e5 | 2007-03-26 00:13:51 +0200 | [diff] [blame] | 1903 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1904 | parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), |
| 1905 | options, |
| 1906 | description = cmd.description, |
| 1907 | formatter = HelpFormatter()) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 1908 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1909 | (cmd, args) = parser.parse_args(sys.argv[2:], cmd); |
| 1910 | global verbose |
| 1911 | verbose = cmd.verbose |
| 1912 | if cmd.needsGit: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1913 | if cmd.gitdir == None: |
| 1914 | cmd.gitdir = os.path.abspath(".git") |
| 1915 | if not isValidGitDir(cmd.gitdir): |
| 1916 | cmd.gitdir = read_pipe("git rev-parse --git-dir").strip() |
| 1917 | if os.path.exists(cmd.gitdir): |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1918 | cdup = read_pipe("git rev-parse --show-cdup").strip() |
| 1919 | if len(cdup) > 0: |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 1920 | chdir(cdup); |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1921 | |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1922 | if not isValidGitDir(cmd.gitdir): |
| 1923 | if isValidGitDir(cmd.gitdir + "/.git"): |
| 1924 | cmd.gitdir += "/.git" |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1925 | else: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1926 | die("fatal: cannot locate git repository at %s" % cmd.gitdir) |
Simon Hausmann | 8910ac0 | 2007-03-26 08:18:55 +0200 | [diff] [blame] | 1927 | |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1928 | os.environ["GIT_DIR"] = cmd.gitdir |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1929 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1930 | if not cmd.run(args): |
| 1931 | parser.print_help() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1932 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1933 | |
| 1934 | if __name__ == '__main__': |
| 1935 | main() |