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