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 | # |
Joel Holdsworth | 794bb28 | 2022-04-01 15:24:49 +0100 | [diff] [blame] | 10 | # pylint: disable=bad-whitespace |
| 11 | # pylint: disable=broad-except |
| 12 | # pylint: disable=consider-iterating-dictionary |
| 13 | # pylint: disable=disable |
| 14 | # pylint: disable=fixme |
| 15 | # pylint: disable=invalid-name |
| 16 | # pylint: disable=line-too-long |
| 17 | # pylint: disable=missing-docstring |
| 18 | # pylint: disable=no-self-use |
| 19 | # pylint: disable=superfluous-parens |
| 20 | # pylint: disable=too-few-public-methods |
| 21 | # pylint: disable=too-many-arguments |
| 22 | # pylint: disable=too-many-branches |
| 23 | # pylint: disable=too-many-instance-attributes |
| 24 | # pylint: disable=too-many-lines |
| 25 | # pylint: disable=too-many-locals |
| 26 | # pylint: disable=too-many-nested-blocks |
| 27 | # pylint: disable=too-many-statements |
| 28 | # pylint: disable=ungrouped-imports |
| 29 | # pylint: disable=unused-import |
| 30 | # pylint: disable=wrong-import-order |
| 31 | # pylint: disable=wrong-import-position |
Luke Diamand | 4c1d586 | 2020-01-29 11:12:43 +0000 | [diff] [blame] | 32 | # |
Joel Holdsworth | 4ff0108 | 2022-04-01 15:25:04 +0100 | [diff] [blame] | 33 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 34 | import struct |
Eric S. Raymond | a33faf2 | 2012-12-28 11:40:59 -0500 | [diff] [blame] | 35 | import sys |
Yang Zhao | 0b4396f | 2019-12-13 15:52:35 -0800 | [diff] [blame] | 36 | if sys.version_info.major < 3 and sys.version_info.minor < 7: |
| 37 | sys.stderr.write("git-p4: requires Python 2.7 or later.\n") |
Eric S. Raymond | a33faf2 | 2012-12-28 11:40:59 -0500 | [diff] [blame] | 38 | sys.exit(1) |
Joel Holdsworth | 4ff0108 | 2022-04-01 15:25:04 +0100 | [diff] [blame] | 39 | |
| 40 | import ctypes |
| 41 | import errno |
Yang Zhao | a6b1306 | 2019-12-13 15:52:44 -0800 | [diff] [blame] | 42 | import functools |
Joel Holdsworth | 4ff0108 | 2022-04-01 15:25:04 +0100 | [diff] [blame] | 43 | import glob |
Pete Wyckoff | f629fa5 | 2013-01-26 22:11:05 -0500 | [diff] [blame] | 44 | import marshal |
Joel Holdsworth | 4ff0108 | 2022-04-01 15:25:04 +0100 | [diff] [blame] | 45 | import optparse |
| 46 | import os |
Pete Wyckoff | f629fa5 | 2013-01-26 22:11:05 -0500 | [diff] [blame] | 47 | import platform |
| 48 | import re |
| 49 | import shutil |
Pete Wyckoff | d20f0f8 | 2013-01-26 22:11:19 -0500 | [diff] [blame] | 50 | import stat |
Joel Holdsworth | 4ff0108 | 2022-04-01 15:25:04 +0100 | [diff] [blame] | 51 | import subprocess |
| 52 | import tempfile |
| 53 | import time |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 54 | import zipfile |
| 55 | import zlib |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 56 | |
Yang Zhao | 7575f4f | 2019-12-13 15:52:47 -0800 | [diff] [blame] | 57 | # On python2.7 where raw_input() and input() are both availble, |
| 58 | # we want raw_input's semantics, but aliased to input for python3 |
| 59 | # compatibility |
Luke Diamand | efdcc99 | 2018-06-19 09:04:09 +0100 | [diff] [blame] | 60 | # support basestring in python3 |
| 61 | try: |
Yang Zhao | 7575f4f | 2019-12-13 15:52:47 -0800 | [diff] [blame] | 62 | if raw_input and input: |
| 63 | input = raw_input |
| 64 | except: |
| 65 | pass |
Brandon Casey | a235e85 | 2013-01-26 11:14:33 -0800 | [diff] [blame] | 66 | |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 67 | verbose = False |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 68 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 69 | # Only labels/tags matching this will be imported/exported |
Luke Diamand | c8942a2 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 70 | defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 71 | |
Luke Diamand | 3deed5e | 2018-06-08 21:32:48 +0100 | [diff] [blame] | 72 | # The block size is reduced automatically if required |
Joel Holdsworth | 6febb9f | 2022-04-01 15:24:58 +0100 | [diff] [blame] | 73 | defaultBlockSize = 1 << 20 |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 74 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 75 | defaultMetadataDecodingStrategy = 'passthrough' if sys.version_info.major == 2 else 'fallback' |
| 76 | defaultFallbackMetadataEncoding = 'cp1252' |
| 77 | |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 78 | p4_access_checked = False |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 79 | |
Joel Holdsworth | 70c0d55 | 2021-12-16 13:46:19 +0000 | [diff] [blame] | 80 | re_ko_keywords = re.compile(br'\$(Id|Header)(:[^$\n]+)?\$') |
| 81 | re_k_keywords = re.compile(br'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)(:[^$\n]+)?\$') |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 82 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 83 | |
Joel Holdsworth | ae9b950 | 2021-12-19 15:40:27 +0000 | [diff] [blame] | 84 | def format_size_human_readable(num): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 85 | """Returns a number of units (typically bytes) formatted as a |
| 86 | human-readable string. |
| 87 | """ |
Joel Holdsworth | ae9b950 | 2021-12-19 15:40:27 +0000 | [diff] [blame] | 88 | if num < 1024: |
| 89 | return '{:d} B'.format(num) |
| 90 | for unit in ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]: |
| 91 | num /= 1024.0 |
| 92 | if num < 1024.0: |
| 93 | return "{:3.1f} {}B".format(num, unit) |
| 94 | return "{:.1f} YiB".format(num) |
| 95 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 96 | |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 97 | def p4_build_cmd(cmd): |
| 98 | """Build a suitable p4 command line. |
| 99 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 100 | This consolidates building and returning a p4 command line into one |
| 101 | location. It means that hooking into the environment, or other |
| 102 | configuration can be done more easily. |
| 103 | """ |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 104 | real_cmd = ["p4"] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 105 | |
| 106 | user = gitConfig("git-p4.user") |
| 107 | if len(user) > 0: |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 108 | real_cmd += ["-u", user] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 109 | |
| 110 | password = gitConfig("git-p4.password") |
| 111 | if len(password) > 0: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 112 | real_cmd += ["-P", password] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 113 | |
| 114 | port = gitConfig("git-p4.port") |
| 115 | if len(port) > 0: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 116 | real_cmd += ["-p", port] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 117 | |
| 118 | host = gitConfig("git-p4.host") |
| 119 | if len(host) > 0: |
Russell Myers | 41799aa | 2012-02-22 11:16:05 -0800 | [diff] [blame] | 120 | real_cmd += ["-H", host] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 121 | |
| 122 | client = gitConfig("git-p4.client") |
| 123 | if len(client) > 0: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 124 | real_cmd += ["-c", client] |
Anand Kumria | abcaf07 | 2008-08-10 19:26:31 +0100 | [diff] [blame] | 125 | |
Lars Schneider | 89a6ecc | 2016-12-04 15:03:11 +0100 | [diff] [blame] | 126 | retries = gitConfigInt("git-p4.retries") |
| 127 | if retries is None: |
| 128 | # Perform 3 retries by default |
| 129 | retries = 3 |
Igor Kushnir | bc23352 | 2016-12-29 12:22:23 +0200 | [diff] [blame] | 130 | if retries > 0: |
| 131 | # Provide a way to not pass this option by setting git-p4.retries to 0 |
| 132 | real_cmd += ["-r", str(retries)] |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 133 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 134 | real_cmd += cmd |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 135 | |
| 136 | # now check that we can actually talk to the server |
| 137 | global p4_access_checked |
| 138 | if not p4_access_checked: |
| 139 | p4_access_checked = True # suppress access checks in p4_check_access itself |
| 140 | p4_check_access() |
| 141 | |
Anand Kumria | 21a5075 | 2008-08-10 19:26:28 +0100 | [diff] [blame] | 142 | return real_cmd |
| 143 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 144 | |
Luke Diamand | 378f7be | 2016-12-13 21:51:28 +0000 | [diff] [blame] | 145 | def git_dir(path): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 146 | """Return TRUE if the given path is a git directory (/path/to/dir/.git). |
| 147 | This won't automatically add ".git" to a directory. |
| 148 | """ |
Luke Diamand | 378f7be | 2016-12-13 21:51:28 +0000 | [diff] [blame] | 149 | d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip() |
| 150 | if not d or len(d) == 0: |
| 151 | return None |
| 152 | else: |
| 153 | return d |
| 154 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 155 | |
Miklós Fazekas | bbd8486 | 2013-03-11 17:45:29 -0400 | [diff] [blame] | 156 | def chdir(path, is_client_path=False): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 157 | """Do chdir to the given path, and set the PWD environment variable for use |
| 158 | by P4. It does not look at getcwd() output. Since we're not using the |
| 159 | shell, it is necessary to set the PWD environment variable explicitly. |
Miklós Fazekas | bbd8486 | 2013-03-11 17:45:29 -0400 | [diff] [blame] | 160 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 161 | Normally, expand the path to force it to be absolute. This addresses |
| 162 | the use of relative path names inside P4 settings, e.g. |
| 163 | P4CONFIG=.p4config. P4 does not simply open the filename as given; it |
| 164 | looks for .p4config using PWD. |
Miklós Fazekas | bbd8486 | 2013-03-11 17:45:29 -0400 | [diff] [blame] | 165 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 166 | If is_client_path, the path was handed to us directly by p4, and may be |
| 167 | a symbolic link. Do not call os.getcwd() in this case, because it will |
| 168 | cause p4 to think that PWD is not inside the client path. |
Miklós Fazekas | bbd8486 | 2013-03-11 17:45:29 -0400 | [diff] [blame] | 169 | """ |
| 170 | |
| 171 | os.chdir(path) |
| 172 | if not is_client_path: |
| 173 | path = os.getcwd() |
| 174 | os.environ['PWD'] = path |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 175 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 176 | |
Lars Schneider | 4d25dc4 | 2015-09-26 09:55:02 +0200 | [diff] [blame] | 177 | def calcDiskFree(): |
| 178 | """Return free space in bytes on the disk of the given dirname.""" |
| 179 | if platform.system() == 'Windows': |
| 180 | free_bytes = ctypes.c_ulonglong(0) |
| 181 | ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()), None, None, ctypes.pointer(free_bytes)) |
| 182 | return free_bytes.value |
| 183 | else: |
| 184 | st = os.statvfs(os.getcwd()) |
| 185 | return st.f_bavail * st.f_frsize |
| 186 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 187 | |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 188 | def die(msg): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 189 | """Terminate execution. Make sure that any running child processes have |
| 190 | been wait()ed for before calling this. |
| 191 | """ |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 192 | if verbose: |
| 193 | raise Exception(msg) |
| 194 | else: |
| 195 | sys.stderr.write(msg + "\n") |
| 196 | sys.exit(1) |
| 197 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 198 | |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 199 | def prompt(prompt_text): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 200 | """Prompt the user to choose one of the choices. |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 201 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 202 | Choices are identified in the prompt_text by square brackets around a |
| 203 | single letter option. |
| 204 | """ |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 205 | choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)) |
| 206 | while True: |
Ben Keene | 6b602a2 | 2020-02-11 18:57:58 +0000 | [diff] [blame] | 207 | sys.stderr.flush() |
| 208 | sys.stdout.write(prompt_text) |
| 209 | sys.stdout.flush() |
Joel Holdsworth | 6febb9f | 2022-04-01 15:24:58 +0100 | [diff] [blame] | 210 | response = sys.stdin.readline().strip().lower() |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 211 | if not response: |
| 212 | continue |
| 213 | response = response[0] |
| 214 | if response in choices: |
| 215 | return response |
| 216 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 217 | |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 218 | # We need different encoding/decoding strategies for text data being passed |
| 219 | # around in pipes depending on python version |
| 220 | if bytes is not str: |
| 221 | # For python3, always encode and decode as appropriate |
| 222 | def decode_text_stream(s): |
| 223 | return s.decode() if isinstance(s, bytes) else s |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 224 | |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 225 | def encode_text_stream(s): |
| 226 | return s.encode() if isinstance(s, str) else s |
| 227 | else: |
| 228 | # For python2.7, pass read strings as-is, but also allow writing unicode |
| 229 | def decode_text_stream(s): |
| 230 | return s |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 231 | |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 232 | def encode_text_stream(s): |
| 233 | return s.encode('utf_8') if isinstance(s, unicode) else s |
| 234 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 235 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 236 | class MetadataDecodingException(Exception): |
| 237 | def __init__(self, input_string): |
| 238 | self.input_string = input_string |
| 239 | |
| 240 | def __str__(self): |
| 241 | return """Decoding perforce metadata failed! |
| 242 | The failing string was: |
| 243 | --- |
| 244 | {} |
| 245 | --- |
| 246 | Consider setting the git-p4.metadataDecodingStrategy config option to |
| 247 | 'fallback', to allow metadata to be decoded using a fallback encoding, |
| 248 | defaulting to cp1252.""".format(self.input_string) |
| 249 | |
| 250 | |
| 251 | encoding_fallback_warning_issued = False |
| 252 | encoding_escape_warning_issued = False |
| 253 | def metadata_stream_to_writable_bytes(s): |
| 254 | encodingStrategy = gitConfig('git-p4.metadataDecodingStrategy') or defaultMetadataDecodingStrategy |
| 255 | fallbackEncoding = gitConfig('git-p4.metadataFallbackEncoding') or defaultFallbackMetadataEncoding |
| 256 | if not isinstance(s, bytes): |
| 257 | return s.encode('utf_8') |
| 258 | if encodingStrategy == 'passthrough': |
| 259 | return s |
| 260 | try: |
| 261 | s.decode('utf_8') |
| 262 | return s |
| 263 | except UnicodeDecodeError: |
| 264 | if encodingStrategy == 'fallback' and fallbackEncoding: |
| 265 | global encoding_fallback_warning_issued |
| 266 | global encoding_escape_warning_issued |
| 267 | try: |
| 268 | if not encoding_fallback_warning_issued: |
| 269 | print("\nCould not decode value as utf-8; using configured fallback encoding %s: %s" % (fallbackEncoding, s)) |
| 270 | print("\n(this warning is only displayed once during an import)") |
| 271 | encoding_fallback_warning_issued = True |
| 272 | return s.decode(fallbackEncoding).encode('utf_8') |
| 273 | except Exception as exc: |
| 274 | if not encoding_escape_warning_issued: |
| 275 | print("\nCould not decode value with configured fallback encoding %s; escaping bytes over 127: %s" % (fallbackEncoding, s)) |
| 276 | print("\n(this warning is only displayed once during an import)") |
| 277 | encoding_escape_warning_issued = True |
| 278 | escaped_bytes = b'' |
| 279 | # bytes and strings work very differently in python2 vs python3... |
| 280 | if str is bytes: |
| 281 | for byte in s: |
| 282 | byte_number = struct.unpack('>B', byte)[0] |
| 283 | if byte_number > 127: |
| 284 | escaped_bytes += b'%' |
| 285 | escaped_bytes += hex(byte_number)[2:].upper() |
| 286 | else: |
| 287 | escaped_bytes += byte |
| 288 | else: |
| 289 | for byte_number in s: |
| 290 | if byte_number > 127: |
| 291 | escaped_bytes += b'%' |
| 292 | escaped_bytes += hex(byte_number).upper().encode()[2:] |
| 293 | else: |
| 294 | escaped_bytes += bytes([byte_number]) |
| 295 | return escaped_bytes |
| 296 | |
| 297 | raise MetadataDecodingException(s) |
| 298 | |
Junio C Hamano | 3af1df0 | 2022-05-20 15:27:00 -0700 | [diff] [blame] | 299 | |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 300 | def decode_path(path): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 301 | """Decode a given string (bytes or otherwise) using configured path |
| 302 | encoding options. |
| 303 | """ |
| 304 | |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 305 | encoding = gitConfig('git-p4.pathEncoding') or 'utf_8' |
| 306 | if bytes is not str: |
| 307 | return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path |
| 308 | else: |
| 309 | try: |
| 310 | path.decode('ascii') |
| 311 | except: |
| 312 | path = path.decode(encoding, errors='replace') |
| 313 | if verbose: |
| 314 | print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path)) |
| 315 | return path |
| 316 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 317 | |
Ben Keene | 9f59ca4 | 2020-02-11 18:57:59 +0000 | [diff] [blame] | 318 | def run_git_hook(cmd, param=[]): |
| 319 | """Execute a hook if the hook exists.""" |
Emily Shaffer | 0c8ac06 | 2021-12-22 04:59:39 +0100 | [diff] [blame] | 320 | args = ['git', 'hook', 'run', '--ignore-missing', cmd] |
| 321 | if param: |
| 322 | args.append("--") |
| 323 | for p in param: |
| 324 | args.append(p) |
| 325 | return subprocess.call(args) == 0 |
Ben Keene | 9f59ca4 | 2020-02-11 18:57:59 +0000 | [diff] [blame] | 326 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 327 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 328 | def write_pipe(c, stdin, *k, **kw): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 329 | if verbose: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 330 | sys.stderr.write('Writing pipe: {}\n'.format(' '.join(c))) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 331 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 332 | p = subprocess.Popen(c, stdin=subprocess.PIPE, *k, **kw) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 333 | pipe = p.stdin |
| 334 | val = pipe.write(stdin) |
| 335 | pipe.close() |
| 336 | if p.wait(): |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 337 | die('Command failed: {}'.format(' '.join(c))) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 338 | |
| 339 | return val |
| 340 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 341 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 342 | def p4_write_pipe(c, stdin, *k, **kw): |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 343 | real_cmd = p4_build_cmd(c) |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 344 | if bytes is not str and isinstance(stdin, str): |
| 345 | stdin = encode_text_stream(stdin) |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 346 | return write_pipe(real_cmd, stdin, *k, **kw) |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 347 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 348 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 349 | def read_pipe_full(c, *k, **kw): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 350 | """Read output from command. Returns a tuple of the return status, stdout |
| 351 | text and stderr text. |
| 352 | """ |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 353 | if verbose: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 354 | sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c))) |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 355 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 356 | p = subprocess.Popen( |
| 357 | c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw) |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 358 | out, err = p.communicate() |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 359 | return (p.returncode, out, decode_text_stream(err)) |
Luke Diamand | 78871bf | 2017-04-15 11:36:08 +0100 | [diff] [blame] | 360 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 361 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 362 | def read_pipe(c, ignore_error=False, raw=False, *k, **kw): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 363 | """Read output from command. Returns the output text on success. On |
| 364 | failure, terminates execution, unless ignore_error is True, when it |
| 365 | returns an empty string. |
Yang Zhao | 86dca24 | 2019-12-13 15:52:39 -0800 | [diff] [blame] | 366 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 367 | If raw is True, do not attempt to decode output text. |
| 368 | """ |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 369 | retcode, out, err = read_pipe_full(c, *k, **kw) |
Luke Diamand | 78871bf | 2017-04-15 11:36:08 +0100 | [diff] [blame] | 370 | if retcode != 0: |
| 371 | if ignore_error: |
| 372 | out = "" |
| 373 | else: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 374 | die('Command failed: {}\nError: {}'.format(' '.join(c), err)) |
Yang Zhao | 86dca24 | 2019-12-13 15:52:39 -0800 | [diff] [blame] | 375 | if not raw: |
| 376 | out = decode_text_stream(out) |
Lars Schneider | 1f5f390 | 2015-09-21 12:01:41 +0200 | [diff] [blame] | 377 | return out |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 378 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 379 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 380 | def read_pipe_text(c, *k, **kw): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 381 | """Read output from a command with trailing whitespace stripped. On error, |
| 382 | returns None. |
| 383 | """ |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 384 | retcode, out, err = read_pipe_full(c, *k, **kw) |
Luke Diamand | 78871bf | 2017-04-15 11:36:08 +0100 | [diff] [blame] | 385 | if retcode != 0: |
| 386 | return None |
| 387 | else: |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 388 | return decode_text_stream(out).rstrip() |
Luke Diamand | 78871bf | 2017-04-15 11:36:08 +0100 | [diff] [blame] | 389 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 390 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 391 | def p4_read_pipe(c, ignore_error=False, raw=False, *k, **kw): |
Anand Kumria | d942919 | 2008-08-14 23:40:38 +0100 | [diff] [blame] | 392 | real_cmd = p4_build_cmd(c) |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 393 | return read_pipe(real_cmd, ignore_error, raw=raw, *k, **kw) |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 394 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 395 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 396 | def read_pipe_lines(c, raw=False, *k, **kw): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 397 | if verbose: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 398 | sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c))) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 399 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 400 | p = subprocess.Popen(c, stdout=subprocess.PIPE, *k, **kw) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 401 | pipe = p.stdout |
Joel Holdsworth | 9732e22 | 2021-12-16 13:46:17 +0000 | [diff] [blame] | 402 | lines = pipe.readlines() |
| 403 | if not raw: |
| 404 | lines = [decode_text_stream(line) for line in lines] |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 405 | if pipe.close() or p.wait(): |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 406 | die('Command failed: {}'.format(' '.join(c))) |
Joel Holdsworth | 9732e22 | 2021-12-16 13:46:17 +0000 | [diff] [blame] | 407 | return lines |
Simon Hausmann | caace11 | 2007-05-15 14:57:57 +0200 | [diff] [blame] | 408 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 409 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 410 | def p4_read_pipe_lines(c, *k, **kw): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 411 | """Specifically invoke p4 on the command supplied.""" |
Anand Kumria | 155af83 | 2008-08-10 19:26:30 +0100 | [diff] [blame] | 412 | real_cmd = p4_build_cmd(c) |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 413 | return read_pipe_lines(real_cmd, *k, **kw) |
Anand Kumria | 2318121 | 2008-08-10 19:26:24 +0100 | [diff] [blame] | 414 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 415 | |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 416 | def p4_has_command(cmd): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 417 | """Ask p4 for help on this command. If it returns an error, the command |
| 418 | does not exist in this version of p4. |
| 419 | """ |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 420 | real_cmd = p4_build_cmd(["help", cmd]) |
| 421 | p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, |
| 422 | stderr=subprocess.PIPE) |
| 423 | p.communicate() |
| 424 | return p.returncode == 0 |
| 425 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 426 | |
Pete Wyckoff | 249da4c | 2012-11-23 17:35:35 -0500 | [diff] [blame] | 427 | def p4_has_move_command(): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 428 | """See if the move command exists, that it supports -k, and that it has not |
| 429 | been administratively disabled. The arguments must be correct, but the |
| 430 | filenames do not have to exist. Use ones with wildcards so even if they |
| 431 | exist, it will fail. |
| 432 | """ |
Pete Wyckoff | 249da4c | 2012-11-23 17:35:35 -0500 | [diff] [blame] | 433 | |
| 434 | if not p4_has_command("move"): |
| 435 | return False |
| 436 | cmd = p4_build_cmd(["move", "-k", "@from", "@to"]) |
| 437 | p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 438 | out, err = p.communicate() |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 439 | err = decode_text_stream(err) |
Pete Wyckoff | 249da4c | 2012-11-23 17:35:35 -0500 | [diff] [blame] | 440 | # return code will be 1 in either case |
| 441 | if err.find("Invalid option") >= 0: |
| 442 | return False |
| 443 | if err.find("disabled") >= 0: |
| 444 | return False |
| 445 | # assume it failed because @... was invalid changelist |
| 446 | return True |
| 447 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 448 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 449 | def system(cmd, ignore_error=False, *k, **kw): |
Han-Wen Nienhuys | 4addad2 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 450 | if verbose: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 451 | sys.stderr.write("executing {}\n".format( |
| 452 | ' '.join(cmd) if isinstance(cmd, list) else cmd)) |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 453 | retcode = subprocess.call(cmd, *k, **kw) |
Luke Diamand | cbff4b2 | 2015-11-21 09:54:40 +0000 | [diff] [blame] | 454 | if retcode and not ignore_error: |
Joel Holdsworth | 40e7cfd | 2022-01-06 21:41:56 +0000 | [diff] [blame] | 455 | raise subprocess.CalledProcessError(retcode, cmd) |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 456 | |
Luke Diamand | cbff4b2 | 2015-11-21 09:54:40 +0000 | [diff] [blame] | 457 | return retcode |
| 458 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 459 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 460 | def p4_system(cmd, *k, **kw): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 461 | """Specifically invoke p4 as the system command.""" |
Anand Kumria | 155af83 | 2008-08-10 19:26:30 +0100 | [diff] [blame] | 462 | real_cmd = p4_build_cmd(cmd) |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 463 | retcode = subprocess.call(real_cmd, *k, **kw) |
Brandon Casey | a235e85 | 2013-01-26 11:14:33 -0800 | [diff] [blame] | 464 | if retcode: |
Joel Holdsworth | 40e7cfd | 2022-01-06 21:41:56 +0000 | [diff] [blame] | 465 | raise subprocess.CalledProcessError(retcode, real_cmd) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 466 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 467 | |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 468 | def die_bad_access(s): |
| 469 | die("failure accessing depot: {0}".format(s.rstrip())) |
| 470 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 471 | |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 472 | def p4_check_access(min_expiration=1): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 473 | """Check if we can access Perforce - account still logged in.""" |
| 474 | |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 475 | results = p4CmdList(["login", "-s"]) |
| 476 | |
| 477 | if len(results) == 0: |
| 478 | # should never get here: always get either some results, or a p4ExitCode |
| 479 | assert("could not parse response from perforce") |
| 480 | |
| 481 | result = results[0] |
| 482 | |
| 483 | if 'p4ExitCode' in result: |
| 484 | # p4 returned non-zero status, e.g. P4PORT invalid, or p4 not in path |
| 485 | die_bad_access("could not run p4") |
| 486 | |
| 487 | code = result.get("code") |
| 488 | if not code: |
| 489 | # we get here if we couldn't connect and there was nothing to unmarshal |
| 490 | die_bad_access("could not connect") |
| 491 | |
| 492 | elif code == "stat": |
| 493 | expiry = result.get("TicketExpiration") |
| 494 | if expiry: |
| 495 | expiry = int(expiry) |
| 496 | if expiry > min_expiration: |
| 497 | # ok to carry on |
| 498 | return |
| 499 | else: |
| 500 | die_bad_access("perforce ticket expires in {0} seconds".format(expiry)) |
| 501 | |
| 502 | else: |
| 503 | # account without a timeout - all ok |
| 504 | return |
| 505 | |
| 506 | elif code == "error": |
| 507 | data = result.get("data") |
| 508 | if data: |
| 509 | die_bad_access("p4 error: {0}".format(data)) |
| 510 | else: |
| 511 | die_bad_access("unknown error") |
Peter Osterlund | d4990d5 | 2019-01-07 21:51:38 +0100 | [diff] [blame] | 512 | elif code == "info": |
| 513 | return |
Luke Diamand | 0ef67ac | 2018-06-08 21:32:45 +0100 | [diff] [blame] | 514 | else: |
| 515 | die_bad_access("unknown error code {0}".format(code)) |
| 516 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 517 | |
Pete Wyckoff | 7f0e596 | 2013-01-26 22:11:13 -0500 | [diff] [blame] | 518 | _p4_version_string = None |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 519 | |
| 520 | |
Pete Wyckoff | 7f0e596 | 2013-01-26 22:11:13 -0500 | [diff] [blame] | 521 | def p4_version_string(): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 522 | """Read the version string, showing just the last line, which hopefully is |
| 523 | the interesting version bit. |
Pete Wyckoff | 7f0e596 | 2013-01-26 22:11:13 -0500 | [diff] [blame] | 524 | |
| 525 | $ p4 -V |
| 526 | Perforce - The Fast Software Configuration Management System. |
| 527 | Copyright 1995-2011 Perforce Software. All rights reserved. |
| 528 | Rev. P4/NTX86/2011.1/393975 (2011/12/16). |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 529 | """ |
Pete Wyckoff | 7f0e596 | 2013-01-26 22:11:13 -0500 | [diff] [blame] | 530 | global _p4_version_string |
| 531 | if not _p4_version_string: |
| 532 | a = p4_read_pipe_lines(["-V"]) |
| 533 | _p4_version_string = a[-1].rstrip() |
| 534 | return _p4_version_string |
| 535 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 536 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 537 | def p4_integrate(src, dest): |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 538 | p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 539 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 540 | |
Pete Wyckoff | 8d7ec36 | 2012-04-29 20:57:14 -0400 | [diff] [blame] | 541 | def p4_sync(f, *options): |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 542 | p4_system(["sync"] + list(options) + [wildcard_encode(f)]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 543 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 544 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 545 | def p4_add(f): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 546 | """Forcibly add file names with wildcards.""" |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 547 | if wildcard_present(f): |
| 548 | p4_system(["add", "-f", f]) |
| 549 | else: |
| 550 | p4_system(["add", f]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 551 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 552 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 553 | def p4_delete(f): |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 554 | p4_system(["delete", wildcard_encode(f)]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 555 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 556 | |
Romain Picard | a02b8bc | 2016-01-12 13:43:47 +0100 | [diff] [blame] | 557 | def p4_edit(f, *options): |
| 558 | p4_system(["edit"] + list(options) + [wildcard_encode(f)]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 559 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 560 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 561 | def p4_revert(f): |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 562 | p4_system(["revert", wildcard_encode(f)]) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 563 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 564 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 565 | def p4_reopen(type, f): |
| 566 | p4_system(["reopen", "-t", type, wildcard_encode(f)]) |
Anand Kumria | bf9320f | 2008-08-10 19:26:26 +0100 | [diff] [blame] | 567 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 568 | |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 569 | def p4_reopen_in_change(changelist, files): |
| 570 | cmd = ["reopen", "-c", str(changelist)] + files |
| 571 | p4_system(cmd) |
| 572 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 573 | |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 574 | def p4_move(src, dest): |
| 575 | p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)]) |
| 576 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 577 | |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 578 | def p4_last_change(): |
Miguel Torroja | 1997e91 | 2017-07-13 09:00:35 +0200 | [diff] [blame] | 579 | results = p4CmdList(["changes", "-m", "1"], skip_info=True) |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 580 | return int(results[0]['change']) |
| 581 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 582 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 583 | def p4_describe(change, shelved=False): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 584 | """Make sure it returns a valid result by checking for the presence of |
| 585 | field "time". |
| 586 | |
| 587 | Return a dict of the results. |
| 588 | """ |
Pete Wyckoff | 18fa13d | 2012-11-23 17:35:34 -0500 | [diff] [blame] | 589 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 590 | cmd = ["describe", "-s"] |
| 591 | if shelved: |
| 592 | cmd += ["-S"] |
| 593 | cmd += [str(change)] |
| 594 | |
| 595 | ds = p4CmdList(cmd, skip_info=True) |
Pete Wyckoff | 18fa13d | 2012-11-23 17:35:34 -0500 | [diff] [blame] | 596 | if len(ds) != 1: |
| 597 | die("p4 describe -s %d did not return 1 result: %s" % (change, str(ds))) |
| 598 | |
| 599 | d = ds[0] |
| 600 | |
| 601 | if "p4ExitCode" in d: |
| 602 | die("p4 describe -s %d exited with %d: %s" % (change, d["p4ExitCode"], |
| 603 | str(d))) |
| 604 | if "code" in d: |
| 605 | if d["code"] == "error": |
| 606 | die("p4 describe -s %d returned error code: %s" % (change, str(d))) |
| 607 | |
| 608 | if "time" not in d: |
| 609 | die("p4 describe -s %d returned no \"time\": %s" % (change, str(d))) |
| 610 | |
| 611 | return d |
| 612 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 613 | |
Pete Wyckoff | 9cffb8c | 2011-10-16 10:45:01 -0400 | [diff] [blame] | 614 | def split_p4_type(p4type): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 615 | """Canonicalize the p4 type and return a tuple of the base type, plus any |
| 616 | modifiers. See "p4 help filetypes" for a list and explanation. |
| 617 | """ |
David Brown | b9fc6ea | 2007-09-19 13:12:48 -0700 | [diff] [blame] | 618 | |
Pete Wyckoff | 9cffb8c | 2011-10-16 10:45:01 -0400 | [diff] [blame] | 619 | p4_filetypes_historical = { |
| 620 | "ctempobj": "binary+Sw", |
| 621 | "ctext": "text+C", |
| 622 | "cxtext": "text+Cx", |
| 623 | "ktext": "text+k", |
| 624 | "kxtext": "text+kx", |
| 625 | "ltext": "text+F", |
| 626 | "tempobj": "binary+FSw", |
| 627 | "ubinary": "binary+F", |
| 628 | "uresource": "resource+F", |
| 629 | "uxbinary": "binary+Fx", |
| 630 | "xbinary": "binary+x", |
| 631 | "xltext": "text+Fx", |
| 632 | "xtempobj": "binary+Swx", |
| 633 | "xtext": "text+x", |
| 634 | "xunicode": "unicode+x", |
| 635 | "xutf16": "utf16+x", |
| 636 | } |
| 637 | if p4type in p4_filetypes_historical: |
| 638 | p4type = p4_filetypes_historical[p4type] |
| 639 | mods = "" |
| 640 | s = p4type.split("+") |
| 641 | base = s[0] |
| 642 | mods = "" |
| 643 | if len(s) > 1: |
| 644 | mods = s[1] |
| 645 | return (base, mods) |
| 646 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 647 | |
Pete Wyckoff | 79467e6 | 2014-01-21 18:16:45 -0500 | [diff] [blame] | 648 | def p4_type(f): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 649 | """Return the raw p4 type of a file (text, text+ko, etc).""" |
| 650 | |
Pete Wyckoff | 79467e6 | 2014-01-21 18:16:45 -0500 | [diff] [blame] | 651 | results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)]) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 652 | return results[0]['headType'] |
| 653 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 654 | |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 655 | def p4_keywords_regexp_for_type(base, type_mods): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 656 | """Given a type base and modifier, return a regexp matching the keywords |
| 657 | that can be expanded in the file. |
| 658 | """ |
| 659 | |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 660 | if base in ("text", "unicode", "binary"): |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 661 | if "ko" in type_mods: |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 662 | return re_ko_keywords |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 663 | elif "k" in type_mods: |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 664 | return re_k_keywords |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 665 | else: |
| 666 | return None |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 667 | else: |
| 668 | return None |
| 669 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 670 | |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 671 | def p4_keywords_regexp_for_file(file): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 672 | """Given a file, return a regexp matching the possible RCS keywords that |
| 673 | will be expanded, or None for files with kw expansion turned off. |
| 674 | """ |
| 675 | |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 676 | if not os.path.exists(file): |
| 677 | return None |
| 678 | else: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 679 | type_base, type_mods = split_p4_type(p4_type(file)) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 680 | return p4_keywords_regexp_for_type(type_base, type_mods) |
David Brown | b9fc6ea | 2007-09-19 13:12:48 -0700 | [diff] [blame] | 681 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 682 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 683 | def setP4ExecBit(file, mode): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 684 | """Reopens an already open file and changes the execute bit to match the |
| 685 | execute bit setting in the passed in mode. |
| 686 | """ |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 687 | |
| 688 | p4Type = "+x" |
| 689 | |
| 690 | if not isModeExec(mode): |
| 691 | p4Type = getP4OpenedType(file) |
| 692 | p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type) |
| 693 | p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type) |
| 694 | if p4Type[-1] == "+": |
| 695 | p4Type = p4Type[0:-1] |
| 696 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 697 | p4_reopen(p4Type, file) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 698 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 699 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 700 | def getP4OpenedType(file): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 701 | """Returns the perforce file type for the given file.""" |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 702 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 703 | result = p4_read_pipe(["opened", wildcard_encode(file)]) |
Blair Holloway | 34a0dbf | 2015-04-04 09:46:03 +0100 | [diff] [blame] | 704 | match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 705 | if match: |
| 706 | return match.group(1) |
| 707 | else: |
Marius Storm-Olsen | f3e5ae4 | 2008-03-28 15:40:40 +0100 | [diff] [blame] | 708 | die("Could not determine file type for %s (result: '%s')" % (file, result)) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 709 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 710 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 711 | def getP4Labels(depotPaths): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 712 | """Return the set of all p4 labels.""" |
| 713 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 714 | labels = set() |
Ben Keene | 484d09c | 2019-12-13 15:52:36 -0800 | [diff] [blame] | 715 | if not isinstance(depotPaths, list): |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 716 | depotPaths = [depotPaths] |
| 717 | |
| 718 | for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]): |
| 719 | label = l['label'] |
| 720 | labels.add(label) |
| 721 | |
| 722 | return labels |
| 723 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 724 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 725 | def getGitTags(): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 726 | """Return the set of all git tags.""" |
| 727 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 728 | gitTags = set() |
| 729 | for line in read_pipe_lines(["git", "tag"]): |
| 730 | tag = line.strip() |
| 731 | gitTags.add(tag) |
| 732 | return gitTags |
| 733 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 734 | |
Yang Zhao | ce425eb | 2019-12-13 15:52:46 -0800 | [diff] [blame] | 735 | _diff_tree_pattern = None |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 736 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 737 | |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 738 | def parseDiffTreeEntry(entry): |
| 739 | """Parses a single diff tree entry into its component elements. |
| 740 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 741 | See git-diff-tree(1) manpage for details about the format of the diff |
| 742 | output. This method returns a dictionary with the following elements: |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 743 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 744 | src_mode - The mode of the source file |
| 745 | dst_mode - The mode of the destination file |
| 746 | src_sha1 - The sha1 for the source file |
| 747 | dst_sha1 - The sha1 fr the destination file |
| 748 | status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) |
| 749 | status_score - The score for the status (applicable for 'C' and 'R' |
| 750 | statuses). This is None if there is no score. |
| 751 | src - The path for the source file. |
| 752 | dst - The path for the destination file. This is only present for |
| 753 | copy or renames. If it is not present, this is None. |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 754 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 755 | If the pattern is not matched, None is returned. |
| 756 | """ |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 757 | |
Yang Zhao | ce425eb | 2019-12-13 15:52:46 -0800 | [diff] [blame] | 758 | global _diff_tree_pattern |
| 759 | if not _diff_tree_pattern: |
| 760 | _diff_tree_pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') |
| 761 | |
| 762 | match = _diff_tree_pattern.match(entry) |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 763 | if match: |
| 764 | return { |
| 765 | 'src_mode': match.group(1), |
| 766 | 'dst_mode': match.group(2), |
| 767 | 'src_sha1': match.group(3), |
| 768 | 'dst_sha1': match.group(4), |
| 769 | 'status': match.group(5), |
| 770 | 'status_score': match.group(6), |
| 771 | 'src': match.group(7), |
| 772 | 'dst': match.group(10) |
| 773 | } |
| 774 | return None |
| 775 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 776 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 777 | def isModeExec(mode): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 778 | """Returns True if the given git mode represents an executable file, |
| 779 | otherwise False. |
| 780 | """ |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 781 | return mode[-3:] == "755" |
| 782 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 783 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 784 | class P4Exception(Exception): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 785 | """Base class for exceptions from the p4 client.""" |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 786 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 787 | def __init__(self, exit_code): |
| 788 | self.p4ExitCode = exit_code |
| 789 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 790 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 791 | class P4ServerException(P4Exception): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 792 | """Base class for exceptions where we get some kind of marshalled up result |
| 793 | from the server. |
| 794 | """ |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 795 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 796 | def __init__(self, exit_code, p4_result): |
| 797 | super(P4ServerException, self).__init__(exit_code) |
| 798 | self.p4_result = p4_result |
| 799 | self.code = p4_result[0]['code'] |
| 800 | self.data = p4_result[0]['data'] |
| 801 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 802 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 803 | class P4RequestSizeException(P4ServerException): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 804 | """One of the maxresults or maxscanrows errors.""" |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 805 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 806 | def __init__(self, exit_code, p4_result, limit): |
| 807 | super(P4RequestSizeException, self).__init__(exit_code, p4_result) |
| 808 | self.limit = limit |
| 809 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 810 | |
Luke Diamand | 5c3d502 | 2020-01-29 11:12:42 +0000 | [diff] [blame] | 811 | class P4CommandException(P4Exception): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 812 | """Something went wrong calling p4 which means we have to give up.""" |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 813 | |
Luke Diamand | 5c3d502 | 2020-01-29 11:12:42 +0000 | [diff] [blame] | 814 | def __init__(self, msg): |
| 815 | self.msg = msg |
| 816 | |
| 817 | def __str__(self): |
| 818 | return self.msg |
| 819 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 820 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 821 | def isModeExecChanged(src_mode, dst_mode): |
| 822 | return isModeExec(src_mode) != isModeExec(dst_mode) |
| 823 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 824 | |
Kilian Kilger | d205483 | 2022-07-21 09:07:20 +0000 | [diff] [blame] | 825 | def p4KeysContainingNonUtf8Chars(): |
| 826 | """Returns all keys which may contain non UTF-8 encoded strings |
| 827 | for which a fallback strategy has to be applied. |
| 828 | """ |
| 829 | return ['desc', 'client', 'FullName'] |
| 830 | |
| 831 | |
| 832 | def p4KeysContainingBinaryData(): |
| 833 | """Returns all keys which may contain arbitrary binary data |
| 834 | """ |
| 835 | return ['data'] |
| 836 | |
| 837 | |
| 838 | def p4KeyContainsFilePaths(key): |
| 839 | """Returns True if the key contains file paths. These are handled by decode_path(). |
| 840 | Otherwise False. |
| 841 | """ |
| 842 | return key.startswith('depotFile') or key in ['path', 'clientFile'] |
| 843 | |
| 844 | |
| 845 | def p4KeyWhichCanBeDirectlyDecoded(key): |
| 846 | """Returns True if the key can be directly decoded as UTF-8 string |
| 847 | Otherwise False. |
| 848 | |
| 849 | Keys which can not be encoded directly: |
| 850 | - `data` which may contain arbitrary binary data |
| 851 | - `desc` or `client` or `FullName` which may contain non-UTF8 encoded text |
| 852 | - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path() |
| 853 | """ |
| 854 | if key in p4KeysContainingNonUtf8Chars() or \ |
| 855 | key in p4KeysContainingBinaryData() or \ |
| 856 | p4KeyContainsFilePaths(key): |
| 857 | return False |
| 858 | return True |
| 859 | |
| 860 | |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 861 | def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False, |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 862 | errors_as_exceptions=False, *k, **kw): |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 863 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 864 | cmd = p4_build_cmd(["-G"] + cmd) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 865 | if verbose: |
Joel Holdsworth | 727e6ea | 2022-01-06 21:40:35 +0000 | [diff] [blame] | 866 | sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd))) |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 867 | |
| 868 | # Use a temporary file to avoid deadlocks without |
| 869 | # subprocess.communicate(), which would put another copy |
| 870 | # of stdout into memory. |
| 871 | stdin_file = None |
| 872 | if stdin is not None: |
| 873 | stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) |
Ben Keene | 484d09c | 2019-12-13 15:52:36 -0800 | [diff] [blame] | 874 | if not isinstance(stdin, list): |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 875 | stdin_file.write(stdin) |
| 876 | else: |
| 877 | for i in stdin: |
Yang Zhao | 86dca24 | 2019-12-13 15:52:39 -0800 | [diff] [blame] | 878 | stdin_file.write(encode_text_stream(i)) |
| 879 | stdin_file.write(b'\n') |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 880 | stdin_file.flush() |
| 881 | stdin_file.seek(0) |
| 882 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 883 | p4 = subprocess.Popen( |
| 884 | cmd, stdin=stdin_file, stdout=subprocess.PIPE, *k, **kw) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 885 | |
| 886 | result = [] |
| 887 | try: |
| 888 | while True: |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 889 | entry = marshal.load(p4.stdout) |
Kilian Kilger | d205483 | 2022-07-21 09:07:20 +0000 | [diff] [blame] | 890 | |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 891 | if bytes is not str: |
Kilian Kilger | d205483 | 2022-07-21 09:07:20 +0000 | [diff] [blame] | 892 | # Decode unmarshalled dict to use str keys and values. Special cases are handled below. |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 893 | decoded_entry = {} |
| 894 | for key, value in entry.items(): |
| 895 | key = key.decode() |
Kilian Kilger | d205483 | 2022-07-21 09:07:20 +0000 | [diff] [blame] | 896 | if isinstance(value, bytes) and p4KeyWhichCanBeDirectlyDecoded(key): |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 897 | value = value.decode() |
| 898 | decoded_entry[key] = value |
| 899 | # Parse out data if it's an error response |
| 900 | if decoded_entry.get('code') == 'error' and 'data' in decoded_entry: |
| 901 | decoded_entry['data'] = decoded_entry['data'].decode() |
| 902 | entry = decoded_entry |
Miguel Torroja | 1997e91 | 2017-07-13 09:00:35 +0200 | [diff] [blame] | 903 | if skip_info: |
| 904 | if 'code' in entry and entry['code'] == 'info': |
| 905 | continue |
Kilian Kilger | d205483 | 2022-07-21 09:07:20 +0000 | [diff] [blame] | 906 | for key in p4KeysContainingNonUtf8Chars(): |
| 907 | if key in entry: |
| 908 | entry[key] = metadata_stream_to_writable_bytes(entry[key]) |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 909 | if cb is not None: |
| 910 | cb(entry) |
| 911 | else: |
| 912 | result.append(entry) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 913 | except EOFError: |
| 914 | pass |
Scott Lamb | 9f90c73 | 2007-07-15 20:58:10 -0700 | [diff] [blame] | 915 | exitCode = p4.wait() |
| 916 | if exitCode != 0: |
Luke Diamand | 55bb3e3 | 2018-06-08 21:32:46 +0100 | [diff] [blame] | 917 | if errors_as_exceptions: |
| 918 | if len(result) > 0: |
| 919 | data = result[0].get('data') |
| 920 | if data: |
| 921 | m = re.search('Too many rows scanned \(over (\d+)\)', data) |
| 922 | if not m: |
| 923 | m = re.search('Request too large \(over (\d+)\)', data) |
| 924 | |
| 925 | if m: |
| 926 | limit = int(m.group(1)) |
| 927 | raise P4RequestSizeException(exitCode, result, limit) |
| 928 | |
| 929 | raise P4ServerException(exitCode, result) |
| 930 | else: |
| 931 | raise P4Exception(exitCode) |
| 932 | else: |
| 933 | entry = {} |
| 934 | entry["p4ExitCode"] = exitCode |
| 935 | result.append(entry) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 936 | |
| 937 | return result |
| 938 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 939 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 940 | def p4Cmd(cmd, *k, **kw): |
| 941 | list = p4CmdList(cmd, *k, **kw) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 942 | result = {} |
| 943 | for entry in list: |
| 944 | result.update(entry) |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 945 | return result |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 946 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 947 | |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 948 | def p4Where(depotPath): |
| 949 | if not depotPath.endswith("/"): |
| 950 | depotPath += "/" |
Vitor Antunes | cd88410 | 2015-04-21 23:49:30 +0100 | [diff] [blame] | 951 | depotPathLong = depotPath + "..." |
| 952 | outputList = p4CmdList(["where", depotPathLong]) |
Tor Arvid Lund | 7f705dc | 2008-12-04 14:37:33 +0100 | [diff] [blame] | 953 | output = None |
| 954 | for entry in outputList: |
Tor Arvid Lund | 75bc957 | 2008-12-09 16:41:50 +0100 | [diff] [blame] | 955 | if "depotFile" in entry: |
Vitor Antunes | cd88410 | 2015-04-21 23:49:30 +0100 | [diff] [blame] | 956 | # Search for the base client side depot path, as long as it starts with the branch's P4 path. |
| 957 | # The base path always ends with "/...". |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 958 | entry_path = decode_path(entry['depotFile']) |
| 959 | if entry_path.find(depotPath) == 0 and entry_path[-4:] == "/...": |
Tor Arvid Lund | 75bc957 | 2008-12-09 16:41:50 +0100 | [diff] [blame] | 960 | output = entry |
| 961 | break |
| 962 | elif "data" in entry: |
| 963 | data = entry.get("data") |
| 964 | space = data.find(" ") |
| 965 | if data[:space] == depotPath: |
| 966 | output = entry |
| 967 | break |
Joel Holdsworth | da0134f | 2022-04-01 15:25:00 +0100 | [diff] [blame] | 968 | if output is None: |
Tor Arvid Lund | 7f705dc | 2008-12-04 14:37:33 +0100 | [diff] [blame] | 969 | return "" |
Simon Hausmann | dc52403 | 2007-05-21 09:34:56 +0200 | [diff] [blame] | 970 | if output["code"] == "error": |
| 971 | return "" |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 972 | clientPath = "" |
| 973 | if "path" in output: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 974 | clientPath = decode_path(output['path']) |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 975 | elif "data" in output: |
| 976 | data = output.get("data") |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 977 | lastSpace = data.rfind(b" ") |
| 978 | clientPath = decode_path(data[lastSpace + 1:]) |
Simon Hausmann | cb2c9db | 2007-03-24 09:15:11 +0100 | [diff] [blame] | 979 | |
| 980 | if clientPath.endswith("..."): |
| 981 | clientPath = clientPath[:-3] |
| 982 | return clientPath |
| 983 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 984 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 985 | def currentGitBranch(): |
Luke Diamand | eff4511 | 2017-04-15 11:36:09 +0100 | [diff] [blame] | 986 | return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"]) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 987 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 988 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 989 | def isValidGitDir(path): |
Joel Holdsworth | da0134f | 2022-04-01 15:25:00 +0100 | [diff] [blame] | 990 | return git_dir(path) is not None |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 991 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 992 | |
Simon Hausmann | 463e8af | 2007-05-17 09:13:54 +0200 | [diff] [blame] | 993 | def parseRevision(ref): |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 994 | return read_pipe(["git", "rev-parse", ref]).strip() |
Simon Hausmann | 463e8af | 2007-05-17 09:13:54 +0200 | [diff] [blame] | 995 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 996 | |
Pete Wyckoff | 28755db | 2011-12-24 21:07:40 -0500 | [diff] [blame] | 997 | def branchExists(ref): |
| 998 | rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref], |
| 999 | ignore_error=True) |
| 1000 | return len(rev) > 0 |
| 1001 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1002 | |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1003 | def extractLogMessageFromGitCommit(commit): |
| 1004 | logMessage = "" |
Han-Wen Nienhuys | b016d39 | 2007-05-23 17:10:46 -0300 | [diff] [blame] | 1005 | |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 1006 | # fixme: title is first line of commit, not 1st paragraph. |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1007 | foundTitle = False |
Mike Mueller | c3f2358 | 2019-05-28 11:15:46 -0700 | [diff] [blame] | 1008 | for log in read_pipe_lines(["git", "cat-file", "commit", commit]): |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 1009 | if not foundTitle: |
| 1010 | if len(log) == 1: |
| 1011 | foundTitle = True |
| 1012 | continue |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1013 | |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 1014 | logMessage += log |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1015 | return logMessage |
| 1016 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1017 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1018 | def extractSettingsGitLog(log): |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1019 | values = {} |
| 1020 | for line in log.split("\n"): |
| 1021 | line = line.strip() |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 1022 | m = re.search(r"^ *\[git-p4: (.*)\]$", line) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1023 | if not m: |
| 1024 | continue |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1025 | |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 1026 | assignments = m.group(1).split(':') |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1027 | for a in assignments: |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 1028 | vals = a.split('=') |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1029 | key = vals[0].strip() |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 1030 | val = ('='.join(vals[1:])).strip() |
| 1031 | if val.endswith('\"') and val.startswith('"'): |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1032 | val = val[1:-1] |
| 1033 | |
| 1034 | values[key] = val |
| 1035 | |
Simon Hausmann | 845b42c | 2007-06-07 09:19:34 +0200 | [diff] [blame] | 1036 | paths = values.get("depot-paths") |
| 1037 | if not paths: |
| 1038 | paths = values.get("depot-path") |
Simon Hausmann | a3fdd57 | 2007-06-07 22:54:32 +0200 | [diff] [blame] | 1039 | if paths: |
| 1040 | values['depot-paths'] = paths.split(',') |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1041 | return values |
Simon Hausmann | 6ae8de8 | 2007-03-22 21:10:25 +0100 | [diff] [blame] | 1042 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1043 | |
Simon Hausmann | 8136a63 | 2007-03-22 21:27:14 +0100 | [diff] [blame] | 1044 | def gitBranchExists(branch): |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 1045 | proc = subprocess.Popen(["git", "rev-parse", branch], |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 1046 | stderr=subprocess.PIPE, stdout=subprocess.PIPE) |
| 1047 | return proc.wait() == 0 |
Simon Hausmann | 8136a63 | 2007-03-22 21:27:14 +0100 | [diff] [blame] | 1048 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1049 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 1050 | def gitUpdateRef(ref, newvalue): |
| 1051 | subprocess.check_call(["git", "update-ref", ref, newvalue]) |
| 1052 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1053 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 1054 | def gitDeleteRef(ref): |
| 1055 | subprocess.check_call(["git", "update-ref", "-d", ref]) |
| 1056 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1057 | |
John Chapman | 36bd844 | 2008-11-08 14:22:49 +1100 | [diff] [blame] | 1058 | _gitConfig = {} |
Pete Wyckoff | b345d6c | 2013-01-26 22:11:23 -0500 | [diff] [blame] | 1059 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1060 | |
Lars Schneider | 692e179 | 2015-09-26 09:54:58 +0200 | [diff] [blame] | 1061 | def gitConfig(key, typeSpecifier=None): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1062 | if key not in _gitConfig: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1063 | cmd = ["git", "config"] |
Lars Schneider | 692e179 | 2015-09-26 09:54:58 +0200 | [diff] [blame] | 1064 | if typeSpecifier: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1065 | cmd += [typeSpecifier] |
| 1066 | cmd += [key] |
Pete Wyckoff | b345d6c | 2013-01-26 22:11:23 -0500 | [diff] [blame] | 1067 | s = read_pipe(cmd, ignore_error=True) |
| 1068 | _gitConfig[key] = s.strip() |
John Chapman | 36bd844 | 2008-11-08 14:22:49 +1100 | [diff] [blame] | 1069 | return _gitConfig[key] |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 1070 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1071 | |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 1072 | def gitConfigBool(key): |
| 1073 | """Return a bool, using git config --bool. It is True only if the |
| 1074 | variable is set to true, and False if set to false or not present |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1075 | in the config. |
| 1076 | """ |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 1077 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1078 | if key not in _gitConfig: |
Lars Schneider | 692e179 | 2015-09-26 09:54:58 +0200 | [diff] [blame] | 1079 | _gitConfig[key] = gitConfig(key, '--bool') == "true" |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1080 | return _gitConfig[key] |
| 1081 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1082 | |
Lars Schneider | cb1dafd | 2015-09-26 09:54:59 +0200 | [diff] [blame] | 1083 | def gitConfigInt(key): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1084 | if key not in _gitConfig: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1085 | cmd = ["git", "config", "--int", key] |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1086 | s = read_pipe(cmd, ignore_error=True) |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1087 | v = s.strip() |
Lars Schneider | cb1dafd | 2015-09-26 09:54:59 +0200 | [diff] [blame] | 1088 | try: |
| 1089 | _gitConfig[key] = int(gitConfig(key, '--int')) |
| 1090 | except ValueError: |
| 1091 | _gitConfig[key] = None |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1092 | return _gitConfig[key] |
| 1093 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1094 | |
Vitor Antunes | 7199cf1 | 2011-08-19 00:44:05 +0100 | [diff] [blame] | 1095 | def gitConfigList(key): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1096 | if key not in _gitConfig: |
Pete Wyckoff | 2abba30 | 2013-01-26 22:11:22 -0500 | [diff] [blame] | 1097 | s = read_pipe(["git", "config", "--get-all", key], ignore_error=True) |
George Vanburgh | c3c2b05 | 2017-01-25 09:17:29 +0000 | [diff] [blame] | 1098 | _gitConfig[key] = s.strip().splitlines() |
Lars Schneider | 7960e70 | 2015-09-26 09:55:00 +0200 | [diff] [blame] | 1099 | if _gitConfig[key] == ['']: |
| 1100 | _gitConfig[key] = [] |
Vitor Antunes | 7199cf1 | 2011-08-19 00:44:05 +0100 | [diff] [blame] | 1101 | return _gitConfig[key] |
| 1102 | |
Tao Klerks | 17f273f | 2022-04-04 05:10:54 +0000 | [diff] [blame] | 1103 | def fullP4Ref(incomingRef, importIntoRemotes=True): |
| 1104 | """Standardize a given provided p4 ref value to a full git ref: |
| 1105 | refs/foo/bar/branch -> use it exactly |
| 1106 | p4/branch -> prepend refs/remotes/ or refs/heads/ |
| 1107 | branch -> prepend refs/remotes/p4/ or refs/heads/p4/""" |
| 1108 | if incomingRef.startswith("refs/"): |
| 1109 | return incomingRef |
| 1110 | if importIntoRemotes: |
| 1111 | prepend = "refs/remotes/" |
| 1112 | else: |
| 1113 | prepend = "refs/heads/" |
| 1114 | if not incomingRef.startswith("p4/"): |
| 1115 | prepend += "p4/" |
| 1116 | return prepend + incomingRef |
| 1117 | |
| 1118 | def shortP4Ref(incomingRef, importIntoRemotes=True): |
| 1119 | """Standardize to a "short ref" if possible: |
| 1120 | refs/foo/bar/branch -> ignore |
| 1121 | refs/remotes/p4/branch or refs/heads/p4/branch -> shorten |
| 1122 | p4/branch -> shorten""" |
| 1123 | if importIntoRemotes: |
| 1124 | longprefix = "refs/remotes/p4/" |
| 1125 | else: |
| 1126 | longprefix = "refs/heads/p4/" |
| 1127 | if incomingRef.startswith(longprefix): |
| 1128 | return incomingRef[len(longprefix):] |
| 1129 | if incomingRef.startswith("p4/"): |
| 1130 | return incomingRef[3:] |
| 1131 | return incomingRef |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1132 | |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1133 | def p4BranchesInGit(branchesAreInRemotes=True): |
| 1134 | """Find all the branches whose names start with "p4/", looking |
| 1135 | in remotes or heads as specified by the argument. Return |
| 1136 | a dictionary of { branch: revision } for each one found. |
| 1137 | The branch names are the short names, without any |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1138 | "p4/" prefix. |
| 1139 | """ |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1140 | |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1141 | branches = {} |
| 1142 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1143 | cmdline = ["git", "rev-parse", "--symbolic"] |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1144 | if branchesAreInRemotes: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1145 | cmdline.append("--remotes") |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1146 | else: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1147 | cmdline.append("--branches") |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1148 | |
| 1149 | for line in read_pipe_lines(cmdline): |
| 1150 | line = line.strip() |
| 1151 | |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1152 | # only import to p4/ |
| 1153 | if not line.startswith('p4/'): |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1154 | continue |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1155 | # special symbolic ref to p4/master |
| 1156 | if line == "p4/HEAD": |
| 1157 | continue |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1158 | |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1159 | # strip off p4/ prefix |
| 1160 | branch = line[len("p4/"):] |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1161 | |
| 1162 | branches[branch] = parseRevision(line) |
Pete Wyckoff | 2c8037e | 2013-01-14 19:46:57 -0500 | [diff] [blame] | 1163 | |
Simon Hausmann | 062410b | 2007-07-18 10:56:31 +0200 | [diff] [blame] | 1164 | return branches |
| 1165 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1166 | |
Pete Wyckoff | 5a8e84c | 2013-01-14 19:47:05 -0500 | [diff] [blame] | 1167 | def branch_exists(branch): |
| 1168 | """Make sure that the given ref name really exists.""" |
| 1169 | |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1170 | cmd = ["git", "rev-parse", "--symbolic", "--verify", branch] |
Pete Wyckoff | 5a8e84c | 2013-01-14 19:47:05 -0500 | [diff] [blame] | 1171 | p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
| 1172 | out, _ = p.communicate() |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 1173 | out = decode_text_stream(out) |
Pete Wyckoff | 5a8e84c | 2013-01-14 19:47:05 -0500 | [diff] [blame] | 1174 | if p.returncode: |
| 1175 | return False |
| 1176 | # expect exactly one line of output: the branch name |
| 1177 | return out.rstrip() == branch |
| 1178 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1179 | |
Joel Holdsworth | 57fe2ce | 2022-04-01 15:24:51 +0100 | [diff] [blame] | 1180 | def findUpstreamBranchPoint(head="HEAD"): |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1181 | branches = p4BranchesInGit() |
| 1182 | # map from depot-path to branch name |
| 1183 | branchByDepotPath = {} |
| 1184 | for branch in branches.keys(): |
| 1185 | tip = branches[branch] |
| 1186 | log = extractLogMessageFromGitCommit(tip) |
| 1187 | settings = extractSettingsGitLog(log) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1188 | if "depot-paths" in settings: |
Kirill Frolov | 944db25 | 2022-03-21 12:43:22 +0000 | [diff] [blame] | 1189 | git_branch = "remotes/p4/" + branch |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1190 | paths = ",".join(settings["depot-paths"]) |
Kirill Frolov | 944db25 | 2022-03-21 12:43:22 +0000 | [diff] [blame] | 1191 | branchByDepotPath[paths] = git_branch |
| 1192 | if "change" in settings: |
| 1193 | paths = paths + ";" + settings["change"] |
| 1194 | branchByDepotPath[paths] = git_branch |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1195 | |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1196 | settings = None |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1197 | parent = 0 |
| 1198 | while parent < 65535: |
Simon Hausmann | 9ceab36 | 2007-06-22 00:01:57 +0200 | [diff] [blame] | 1199 | commit = head + "~%s" % parent |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1200 | log = extractLogMessageFromGitCommit(commit) |
| 1201 | settings = extractSettingsGitLog(log) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1202 | if "depot-paths" in settings: |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1203 | paths = ",".join(settings["depot-paths"]) |
Kirill Frolov | 944db25 | 2022-03-21 12:43:22 +0000 | [diff] [blame] | 1204 | if "change" in settings: |
| 1205 | expaths = paths + ";" + settings["change"] |
| 1206 | if expaths in branchByDepotPath: |
| 1207 | return [branchByDepotPath[expaths], settings] |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1208 | if paths in branchByDepotPath: |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1209 | return [branchByDepotPath[paths], settings] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1210 | |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1211 | parent = parent + 1 |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1212 | |
Simon Hausmann | 86506fe | 2007-07-18 12:40:12 +0200 | [diff] [blame] | 1213 | return ["", settings] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 1214 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1215 | |
Joel Holdsworth | 57fe2ce | 2022-04-01 15:24:51 +0100 | [diff] [blame] | 1216 | def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=True): |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1217 | if not silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1218 | print("Creating/updating branch(es) in %s based on origin branch(es)" |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1219 | % localRefPrefix) |
| 1220 | |
| 1221 | originPrefix = "origin/p4/" |
| 1222 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1223 | for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]): |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1224 | line = line.strip() |
| 1225 | if (not line.startswith(originPrefix)) or line.endswith("HEAD"): |
| 1226 | continue |
| 1227 | |
| 1228 | headName = line[len(originPrefix):] |
| 1229 | remoteHead = localRefPrefix + headName |
| 1230 | originHead = line |
| 1231 | |
| 1232 | original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) |
Joel Holdsworth | 7a3e83d | 2022-04-01 15:24:59 +0100 | [diff] [blame] | 1233 | if 'depot-paths' not in original or 'change' not in original: |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1234 | continue |
| 1235 | |
| 1236 | update = False |
| 1237 | if not gitBranchExists(remoteHead): |
| 1238 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1239 | print("creating %s" % remoteHead) |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1240 | update = True |
| 1241 | else: |
| 1242 | settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1243 | if 'change' in settings: |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1244 | if settings['depot-paths'] == original['depot-paths']: |
| 1245 | originP4Change = int(original['change']) |
| 1246 | p4Change = int(settings['change']) |
| 1247 | if originP4Change > p4Change: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1248 | print("%s (%s) is newer than %s (%s). " |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1249 | "Updating p4 branch from origin." |
| 1250 | % (originHead, originP4Change, |
| 1251 | remoteHead, p4Change)) |
| 1252 | update = True |
| 1253 | else: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1254 | print("Ignoring: %s was imported from %s while " |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1255 | "%s was imported from %s" |
| 1256 | % (originHead, ','.join(original['depot-paths']), |
| 1257 | remoteHead, ','.join(settings['depot-paths']))) |
| 1258 | |
| 1259 | if update: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1260 | system(["git", "update-ref", remoteHead, originHead]) |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1261 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1262 | |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1263 | def originP4BranchesExist(): |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 1264 | return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master") |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 1265 | |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 1266 | |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1267 | def p4ParseNumericChangeRange(parts): |
| 1268 | changeStart = int(parts[0][1:]) |
| 1269 | if parts[1] == '#head': |
| 1270 | changeEnd = p4_last_change() |
| 1271 | else: |
| 1272 | changeEnd = int(parts[1]) |
| 1273 | |
| 1274 | return (changeStart, changeEnd) |
| 1275 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1276 | |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1277 | def chooseBlockSize(blockSize): |
| 1278 | if blockSize: |
| 1279 | return blockSize |
| 1280 | else: |
| 1281 | return defaultBlockSize |
| 1282 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1283 | |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1284 | def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize): |
| 1285 | assert depotPaths |
| 1286 | |
| 1287 | # Parse the change range into start and end. Try to find integer |
| 1288 | # revision ranges as these can be broken up into blocks to avoid |
| 1289 | # hitting server-side limits (maxrows, maxscanresults). But if |
| 1290 | # that doesn't work, fall back to using the raw revision specifier |
| 1291 | # strings, without using block mode. |
| 1292 | |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 1293 | if changeRange is None or changeRange == '': |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1294 | changeStart = 1 |
| 1295 | changeEnd = p4_last_change() |
| 1296 | block_size = chooseBlockSize(requestedBlockSize) |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 1297 | else: |
| 1298 | parts = changeRange.split(',') |
| 1299 | assert len(parts) == 2 |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1300 | try: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 1301 | changeStart, changeEnd = p4ParseNumericChangeRange(parts) |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1302 | block_size = chooseBlockSize(requestedBlockSize) |
Luke Diamand | 8fa0abf | 2018-06-08 21:32:47 +0100 | [diff] [blame] | 1303 | except ValueError: |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1304 | changeStart = parts[0][1:] |
| 1305 | changeEnd = parts[1] |
| 1306 | if requestedBlockSize: |
| 1307 | die("cannot use --changes-block-size with non-numeric revisions") |
| 1308 | block_size = None |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 1309 | |
George Vanburgh | 9943e5b | 2016-12-17 22:11:23 +0000 | [diff] [blame] | 1310 | changes = set() |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 1311 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1312 | # Retrieve changes a block at a time, to prevent running |
Luke Diamand | 3deed5e | 2018-06-08 21:32:48 +0100 | [diff] [blame] | 1313 | # into a MaxResults/MaxScanRows error from the server. If |
| 1314 | # we _do_ hit one of those errors, turn down the block size |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1315 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1316 | while True: |
| 1317 | cmd = ['changes'] |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1318 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1319 | if block_size: |
| 1320 | end = min(changeEnd, changeStart + block_size) |
| 1321 | revisionRange = "%d,%d" % (changeStart, end) |
| 1322 | else: |
| 1323 | revisionRange = "%s,%s" % (changeStart, changeEnd) |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1324 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1325 | for p in depotPaths: |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1326 | cmd += ["%s...@%s" % (p, revisionRange)] |
| 1327 | |
Luke Diamand | 3deed5e | 2018-06-08 21:32:48 +0100 | [diff] [blame] | 1328 | # fetch the changes |
| 1329 | try: |
| 1330 | result = p4CmdList(cmd, errors_as_exceptions=True) |
| 1331 | except P4RequestSizeException as e: |
| 1332 | if not block_size: |
| 1333 | block_size = e.limit |
| 1334 | elif block_size > e.limit: |
| 1335 | block_size = e.limit |
| 1336 | else: |
| 1337 | block_size = max(2, block_size // 2) |
| 1338 | |
Joel Holdsworth | e8f8b3b | 2022-04-01 15:25:03 +0100 | [diff] [blame] | 1339 | if verbose: |
| 1340 | print("block size error, retrying with block size {0}".format(block_size)) |
Luke Diamand | 3deed5e | 2018-06-08 21:32:48 +0100 | [diff] [blame] | 1341 | continue |
| 1342 | except P4Exception as e: |
| 1343 | die('Error retrieving changes description ({0})'.format(e.p4ExitCode)) |
| 1344 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1345 | # Insert changes in chronological order |
Luke Diamand | 3deed5e | 2018-06-08 21:32:48 +0100 | [diff] [blame] | 1346 | for entry in reversed(result): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1347 | if 'change' not in entry: |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 1348 | continue |
| 1349 | changes.add(int(entry['change'])) |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1350 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1351 | if not block_size: |
| 1352 | break |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1353 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1354 | if end >= changeEnd: |
| 1355 | break |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 1356 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1357 | changeStart = end + 1 |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 1358 | |
Sam Hocevar | 1f90a64 | 2015-12-19 09:39:40 +0000 | [diff] [blame] | 1359 | changes = sorted(changes) |
| 1360 | return changes |
Simon Hausmann | 4f6432d | 2007-08-26 15:56:36 +0200 | [diff] [blame] | 1361 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1362 | |
Tor Arvid Lund | d53de8b | 2011-03-15 13:08:02 +0100 | [diff] [blame] | 1363 | def p4PathStartsWith(path, prefix): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1364 | """This method tries to remedy a potential mixed-case issue: |
| 1365 | |
| 1366 | If UserA adds //depot/DirA/file1 |
| 1367 | and UserB adds //depot/dira/file2 |
| 1368 | |
| 1369 | we may or may not have a problem. If you have core.ignorecase=true, |
| 1370 | we treat DirA and dira as the same directory. |
| 1371 | """ |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 1372 | if gitConfigBool("core.ignorecase"): |
Tor Arvid Lund | d53de8b | 2011-03-15 13:08:02 +0100 | [diff] [blame] | 1373 | return path.lower().startswith(prefix.lower()) |
| 1374 | return path.startswith(prefix) |
| 1375 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1376 | |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1377 | def getClientSpec(): |
| 1378 | """Look at the p4 client spec, create a View() object that contains |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1379 | all the mappings, and return it. |
| 1380 | """ |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1381 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1382 | specList = p4CmdList(["client", "-o"]) |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1383 | if len(specList) != 1: |
| 1384 | die('Output from "client -o" is %d lines, expecting 1' % |
| 1385 | len(specList)) |
| 1386 | |
| 1387 | # dictionary of all client parameters |
| 1388 | entry = specList[0] |
| 1389 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 1390 | # the //client/ name |
| 1391 | client_name = entry["Client"] |
| 1392 | |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1393 | # just the keys that start with "View" |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1394 | view_keys = [k for k in entry.keys() if k.startswith("View")] |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1395 | |
| 1396 | # hold this new View |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 1397 | view = View(client_name) |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1398 | |
| 1399 | # append the lines, in order, to the view |
| 1400 | for view_num in range(len(view_keys)): |
| 1401 | k = "View%d" % view_num |
| 1402 | if k not in view_keys: |
| 1403 | die("Expected view key %s missing" % k) |
| 1404 | view.append(entry[k]) |
| 1405 | |
| 1406 | return view |
| 1407 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1408 | |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1409 | def getClientRoot(): |
| 1410 | """Grab the client directory.""" |
| 1411 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1412 | output = p4CmdList(["client", "-o"]) |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 1413 | if len(output) != 1: |
| 1414 | die('Output from "client -o" is %d lines, expecting 1' % len(output)) |
| 1415 | |
| 1416 | entry = output[0] |
| 1417 | if "Root" not in entry: |
| 1418 | die('Client has no "Root"') |
| 1419 | |
| 1420 | return entry["Root"] |
| 1421 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1422 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1423 | def wildcard_decode(path): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1424 | """Decode P4 wildcards into %xx encoding |
| 1425 | |
| 1426 | P4 wildcards are not allowed in filenames. P4 complains if you simply |
| 1427 | add them, but you can force it with "-f", in which case it translates |
| 1428 | them into %xx encoding internally. |
| 1429 | """ |
| 1430 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1431 | # Search for and fix just these four characters. Do % last so |
| 1432 | # that fixing it does not inadvertently create new %-escapes. |
| 1433 | # Cannot have * in a filename in windows; untested as to |
| 1434 | # what p4 would do in such a case. |
| 1435 | if not platform.system() == "Windows": |
| 1436 | path = path.replace("%2A", "*") |
| 1437 | path = path.replace("%23", "#") \ |
| 1438 | .replace("%40", "@") \ |
| 1439 | .replace("%25", "%") |
| 1440 | return path |
| 1441 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1442 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1443 | def wildcard_encode(path): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1444 | """Encode %xx coded wildcards into P4 coding.""" |
| 1445 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1446 | # do % first to avoid double-encoding the %s introduced here |
| 1447 | path = path.replace("%", "%25") \ |
| 1448 | .replace("*", "%2A") \ |
| 1449 | .replace("#", "%23") \ |
| 1450 | .replace("@", "%40") |
| 1451 | return path |
| 1452 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1453 | |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1454 | def wildcard_present(path): |
Brandon Casey | 598354c | 2013-01-26 11:14:32 -0800 | [diff] [blame] | 1455 | m = re.search("[*#@%]", path) |
| 1456 | return m is not None |
Pete Wyckoff | 9d7d446 | 2012-04-29 20:57:17 -0400 | [diff] [blame] | 1457 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1458 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1459 | class LargeFileSystem(object): |
| 1460 | """Base class for large file system support.""" |
| 1461 | |
| 1462 | def __init__(self, writeToGitStream): |
| 1463 | self.largeFiles = set() |
| 1464 | self.writeToGitStream = writeToGitStream |
| 1465 | |
| 1466 | def generatePointer(self, cloneDestination, contentFile): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1467 | """Return the content of a pointer file that is stored in Git instead |
| 1468 | of the actual content. |
| 1469 | """ |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1470 | assert False, "Method 'generatePointer' required in " + self.__class__.__name__ |
| 1471 | |
| 1472 | def pushFile(self, localLargeFile): |
| 1473 | """Push the actual content which is not stored in the Git repository to |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1474 | a server. |
| 1475 | """ |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1476 | assert False, "Method 'pushFile' required in " + self.__class__.__name__ |
| 1477 | |
| 1478 | def hasLargeFileExtension(self, relPath): |
Yang Zhao | a6b1306 | 2019-12-13 15:52:44 -0800 | [diff] [blame] | 1479 | return functools.reduce( |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1480 | lambda a, b: a or b, |
| 1481 | [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')], |
| 1482 | False |
| 1483 | ) |
| 1484 | |
| 1485 | def generateTempFile(self, contents): |
| 1486 | contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False) |
| 1487 | for d in contents: |
| 1488 | contentFile.write(d) |
| 1489 | contentFile.close() |
| 1490 | return contentFile.name |
| 1491 | |
| 1492 | def exceedsLargeFileThreshold(self, relPath, contents): |
| 1493 | if gitConfigInt('git-p4.largeFileThreshold'): |
| 1494 | contentsSize = sum(len(d) for d in contents) |
| 1495 | if contentsSize > gitConfigInt('git-p4.largeFileThreshold'): |
| 1496 | return True |
| 1497 | if gitConfigInt('git-p4.largeFileCompressedThreshold'): |
| 1498 | contentsSize = sum(len(d) for d in contents) |
| 1499 | if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'): |
| 1500 | return False |
| 1501 | contentTempFile = self.generateTempFile(contents) |
Philip.McGraw | de5abb5 | 2019-08-27 06:43:58 +0300 | [diff] [blame] | 1502 | compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=True) |
| 1503 | with zipfile.ZipFile(compressedContentFile, mode='w') as zf: |
| 1504 | zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) |
| 1505 | compressedContentsSize = zf.infolist()[0].compress_size |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1506 | os.remove(contentTempFile) |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1507 | if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'): |
| 1508 | return True |
| 1509 | return False |
| 1510 | |
| 1511 | def addLargeFile(self, relPath): |
| 1512 | self.largeFiles.add(relPath) |
| 1513 | |
| 1514 | def removeLargeFile(self, relPath): |
| 1515 | self.largeFiles.remove(relPath) |
| 1516 | |
| 1517 | def isLargeFile(self, relPath): |
| 1518 | return relPath in self.largeFiles |
| 1519 | |
| 1520 | def processContent(self, git_mode, relPath, contents): |
| 1521 | """Processes the content of git fast import. This method decides if a |
| 1522 | file is stored in the large file system and handles all necessary |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1523 | steps. |
| 1524 | """ |
Matthew McClain | 10c89a0 | 2023-10-18 19:25:58 -0500 | [diff] [blame] | 1525 | # symlinks aren't processed by smudge/clean filters |
| 1526 | if git_mode == "120000": |
| 1527 | return (git_mode, contents) |
| 1528 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1529 | if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath): |
| 1530 | contentTempFile = self.generateTempFile(contents) |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 1531 | pointer_git_mode, contents, localLargeFile = self.generatePointer(contentTempFile) |
Lars Schneider | d5eb3cf | 2016-12-04 17:03:37 +0100 | [diff] [blame] | 1532 | if pointer_git_mode: |
| 1533 | git_mode = pointer_git_mode |
| 1534 | if localLargeFile: |
| 1535 | # Move temp file to final location in large file system |
| 1536 | largeFileDir = os.path.dirname(localLargeFile) |
| 1537 | if not os.path.isdir(largeFileDir): |
| 1538 | os.makedirs(largeFileDir) |
| 1539 | shutil.move(contentTempFile, localLargeFile) |
| 1540 | self.addLargeFile(relPath) |
| 1541 | if gitConfigBool('git-p4.largeFilePush'): |
| 1542 | self.pushFile(localLargeFile) |
| 1543 | if verbose: |
| 1544 | sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile)) |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1545 | return (git_mode, contents) |
| 1546 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1547 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1548 | class MockLFS(LargeFileSystem): |
| 1549 | """Mock large file system for testing.""" |
| 1550 | |
| 1551 | def generatePointer(self, contentFile): |
| 1552 | """The pointer content is the original content prefixed with "pointer-". |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1553 | The local filename of the large file storage is derived from the |
| 1554 | file content. |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1555 | """ |
| 1556 | with open(contentFile, 'r') as f: |
| 1557 | content = next(f) |
| 1558 | gitMode = '100644' |
| 1559 | pointerContents = 'pointer-' + content |
| 1560 | localLargeFile = os.path.join(os.getcwd(), '.git', 'mock-storage', 'local', content[:-1]) |
| 1561 | return (gitMode, pointerContents, localLargeFile) |
| 1562 | |
| 1563 | def pushFile(self, localLargeFile): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1564 | """The remote filename of the large file storage is the same as the |
| 1565 | local one but in a different directory. |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1566 | """ |
| 1567 | remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote') |
| 1568 | if not os.path.exists(remotePath): |
| 1569 | os.makedirs(remotePath) |
| 1570 | shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile))) |
| 1571 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1572 | |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1573 | class GitLFS(LargeFileSystem): |
| 1574 | """Git LFS as backend for the git-p4 large file system. |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1575 | See https://git-lfs.github.com/ for details. |
| 1576 | """ |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1577 | |
| 1578 | def __init__(self, *args): |
| 1579 | LargeFileSystem.__init__(self, *args) |
| 1580 | self.baseGitAttributes = [] |
| 1581 | |
| 1582 | def generatePointer(self, contentFile): |
| 1583 | """Generate a Git LFS pointer for the content. Return LFS Pointer file |
| 1584 | mode and content which is stored in the Git repository instead of |
| 1585 | the actual content. Return also the new location of the actual |
| 1586 | content. |
| 1587 | """ |
Lars Schneider | d5eb3cf | 2016-12-04 17:03:37 +0100 | [diff] [blame] | 1588 | if os.path.getsize(contentFile) == 0: |
| 1589 | return (None, '', None) |
| 1590 | |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1591 | pointerProcess = subprocess.Popen( |
| 1592 | ['git', 'lfs', 'pointer', '--file=' + contentFile], |
| 1593 | stdout=subprocess.PIPE |
| 1594 | ) |
Yang Zhao | 86dca24 | 2019-12-13 15:52:39 -0800 | [diff] [blame] | 1595 | pointerFile = decode_text_stream(pointerProcess.stdout.read()) |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1596 | if pointerProcess.wait(): |
| 1597 | os.remove(contentFile) |
| 1598 | die('git-lfs pointer command failed. Did you install the extension?') |
Lars Schneider | 82f2567 | 2016-04-28 08:26:33 +0200 | [diff] [blame] | 1599 | |
| 1600 | # Git LFS removed the preamble in the output of the 'pointer' command |
| 1601 | # starting from version 1.2.0. Check for the preamble here to support |
| 1602 | # earlier versions. |
| 1603 | # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43 |
| 1604 | if pointerFile.startswith('Git LFS pointer for'): |
| 1605 | pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile) |
| 1606 | |
| 1607 | oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1) |
r.burenkov | ea94b16 | 2019-12-11 09:47:23 -0800 | [diff] [blame] | 1608 | # if someone use external lfs.storage ( not in local repo git ) |
| 1609 | lfs_path = gitConfig('lfs.storage') |
| 1610 | if not lfs_path: |
| 1611 | lfs_path = 'lfs' |
| 1612 | if not os.path.isabs(lfs_path): |
| 1613 | lfs_path = os.path.join(os.getcwd(), '.git', lfs_path) |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1614 | localLargeFile = os.path.join( |
r.burenkov | ea94b16 | 2019-12-11 09:47:23 -0800 | [diff] [blame] | 1615 | lfs_path, |
| 1616 | 'objects', oid[:2], oid[2:4], |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1617 | oid, |
| 1618 | ) |
| 1619 | # LFS Spec states that pointer files should not have the executable bit set. |
| 1620 | gitMode = '100644' |
Lars Schneider | 82f2567 | 2016-04-28 08:26:33 +0200 | [diff] [blame] | 1621 | return (gitMode, pointerFile, localLargeFile) |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1622 | |
| 1623 | def pushFile(self, localLargeFile): |
| 1624 | uploadProcess = subprocess.Popen( |
| 1625 | ['git', 'lfs', 'push', '--object-id', 'origin', os.path.basename(localLargeFile)] |
| 1626 | ) |
| 1627 | if uploadProcess.wait(): |
| 1628 | die('git-lfs push command failed. Did you define a remote?') |
| 1629 | |
| 1630 | def generateGitAttributes(self): |
| 1631 | return ( |
| 1632 | self.baseGitAttributes + |
| 1633 | [ |
| 1634 | '\n', |
| 1635 | '#\n', |
| 1636 | '# Git LFS (see https://git-lfs.github.com/)\n', |
| 1637 | '#\n', |
| 1638 | ] + |
Lars Schneider | 862f931 | 2016-12-18 20:01:40 +0100 | [diff] [blame] | 1639 | ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n' |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1640 | for f in sorted(gitConfigList('git-p4.largeFileExtensions')) |
| 1641 | ] + |
Lars Schneider | 862f931 | 2016-12-18 20:01:40 +0100 | [diff] [blame] | 1642 | ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n' |
Lars Schneider | b47d807 | 2015-09-26 09:55:04 +0200 | [diff] [blame] | 1643 | for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f) |
| 1644 | ] |
| 1645 | ) |
| 1646 | |
| 1647 | def addLargeFile(self, relPath): |
| 1648 | LargeFileSystem.addLargeFile(self, relPath) |
| 1649 | self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes()) |
| 1650 | |
| 1651 | def removeLargeFile(self, relPath): |
| 1652 | LargeFileSystem.removeLargeFile(self, relPath) |
| 1653 | self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes()) |
| 1654 | |
| 1655 | def processContent(self, git_mode, relPath, contents): |
| 1656 | if relPath == '.gitattributes': |
| 1657 | self.baseGitAttributes = contents |
| 1658 | return (git_mode, self.generateGitAttributes()) |
| 1659 | else: |
| 1660 | return LargeFileSystem.processContent(self, git_mode, relPath, contents) |
| 1661 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1662 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1663 | class Command: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 1664 | delete_actions = ("delete", "move/delete", "purge") |
| 1665 | add_actions = ("add", "branch", "move/add") |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 1666 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1667 | def __init__(self): |
| 1668 | self.usage = "usage: %prog [options]" |
Simon Hausmann | 8910ac0 | 2007-03-26 08:18:55 +0200 | [diff] [blame] | 1669 | self.needsGit = True |
Luke Diamand | 6a10b6a | 2012-04-24 09:33:23 +0100 | [diff] [blame] | 1670 | self.verbose = False |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1671 | |
Mazo, Andrey | ff8c50e | 2019-04-01 18:02:26 +0000 | [diff] [blame] | 1672 | # This is required for the "append" update_shelve action |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 1673 | def ensure_value(self, attr, value): |
| 1674 | if not hasattr(self, attr) or getattr(self, attr) is None: |
| 1675 | setattr(self, attr, value) |
| 1676 | return getattr(self, attr) |
| 1677 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1678 | |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1679 | class P4UserMap: |
| 1680 | def __init__(self): |
| 1681 | self.userMapFromPerforceServer = False |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 1682 | self.myP4UserId = None |
| 1683 | |
| 1684 | def p4UserId(self): |
| 1685 | if self.myP4UserId: |
| 1686 | return self.myP4UserId |
| 1687 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1688 | results = p4CmdList(["user", "-o"]) |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 1689 | for r in results: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1690 | if 'User' in r: |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 1691 | self.myP4UserId = r['User'] |
| 1692 | return r['User'] |
| 1693 | die("Could not find your p4 user id") |
| 1694 | |
| 1695 | def p4UserIsMe(self, p4User): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1696 | """Return True if the given p4 user is actually me.""" |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 1697 | me = self.p4UserId() |
| 1698 | if not p4User or p4User != me: |
| 1699 | return False |
| 1700 | else: |
| 1701 | return True |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1702 | |
| 1703 | def getUserCacheFilename(self): |
| 1704 | home = os.environ.get("HOME", os.environ.get("USERPROFILE")) |
| 1705 | return home + "/.gitp4-usercache.txt" |
| 1706 | |
| 1707 | def getUserMapFromPerforceServer(self): |
| 1708 | if self.userMapFromPerforceServer: |
| 1709 | return |
| 1710 | self.users = {} |
| 1711 | self.emails = {} |
| 1712 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1713 | for output in p4CmdList(["users"]): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1714 | if "User" not in output: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1715 | continue |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1716 | # "FullName" is bytes. "Email" on the other hand might be bytes |
| 1717 | # or unicode string depending on whether we are running under |
| 1718 | # python2 or python3. To support |
| 1719 | # git-p4.metadataDecodingStrategy=fallback, self.users dict values |
| 1720 | # are always bytes, ready to be written to git. |
| 1721 | emailbytes = metadata_stream_to_writable_bytes(output["Email"]) |
| 1722 | self.users[output["User"]] = output["FullName"] + b" <" + emailbytes + b">" |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1723 | self.emails[output["Email"]] = output["User"] |
| 1724 | |
Lars Schneider | 10d08a1 | 2016-03-01 11:49:56 +0100 | [diff] [blame] | 1725 | mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE) |
| 1726 | for mapUserConfig in gitConfigList("git-p4.mapUser"): |
| 1727 | mapUser = mapUserConfigRegex.findall(mapUserConfig) |
| 1728 | if mapUser and len(mapUser[0]) == 3: |
| 1729 | user = mapUser[0][0] |
| 1730 | fullname = mapUser[0][1] |
| 1731 | email = mapUser[0][2] |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1732 | fulluser = fullname + " <" + email + ">" |
| 1733 | self.users[user] = metadata_stream_to_writable_bytes(fulluser) |
Lars Schneider | 10d08a1 | 2016-03-01 11:49:56 +0100 | [diff] [blame] | 1734 | self.emails[email] = user |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1735 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1736 | s = b'' |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1737 | for (key, val) in self.users.items(): |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1738 | keybytes = metadata_stream_to_writable_bytes(key) |
| 1739 | s += b"%s\t%s\n" % (keybytes.expandtabs(1), val.expandtabs(1)) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1740 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1741 | open(self.getUserCacheFilename(), 'wb').write(s) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1742 | self.userMapFromPerforceServer = True |
| 1743 | |
| 1744 | def loadUserMapFromCache(self): |
| 1745 | self.users = {} |
| 1746 | self.userMapFromPerforceServer = False |
| 1747 | try: |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1748 | cache = open(self.getUserCacheFilename(), 'rb') |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1749 | lines = cache.readlines() |
| 1750 | cache.close() |
| 1751 | for line in lines: |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 1752 | entry = line.strip().split(b"\t") |
| 1753 | self.users[entry[0].decode('utf_8')] = entry[1] |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1754 | except IOError: |
| 1755 | self.getUserMapFromPerforceServer() |
| 1756 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 1757 | |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1758 | class P4Submit(Command, P4UserMap): |
Pete Wyckoff | 6bbfd13 | 2012-09-09 16:16:13 -0400 | [diff] [blame] | 1759 | |
| 1760 | conflict_behavior_choices = ("ask", "skip", "quit") |
| 1761 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1762 | def __init__(self): |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 1763 | Command.__init__(self) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1764 | P4UserMap.__init__(self) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1765 | self.options = [ |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1766 | optparse.make_option("--origin", dest="origin"), |
Vitor Antunes | ae90109 | 2011-02-20 01:18:24 +0000 | [diff] [blame] | 1767 | optparse.make_option("-M", dest="detectRenames", action="store_true"), |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1768 | # preserve the user, requires relevant p4 permissions |
| 1769 | optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 1770 | optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 1771 | optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"), |
Pete Wyckoff | 728b7ad | 2012-09-09 16:16:12 -0400 | [diff] [blame] | 1772 | optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"), |
Pete Wyckoff | 6bbfd13 | 2012-09-09 16:16:13 -0400 | [diff] [blame] | 1773 | optparse.make_option("--conflict", dest="conflict_behavior", |
Pete Wyckoff | 44e8d26 | 2013-01-14 19:47:08 -0500 | [diff] [blame] | 1774 | choices=self.conflict_behavior_choices), |
| 1775 | optparse.make_option("--branch", dest="branch"), |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 1776 | optparse.make_option("--shelve", dest="shelve", action="store_true", |
| 1777 | help="Shelve instead of submit. Shelved files are reverted, " |
| 1778 | "restoring the workspace to the state before the shelve"), |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 1779 | optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int", |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 1780 | metavar="CHANGELIST", |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 1781 | help="update an existing shelved changelist, implies --shelve, " |
Romain Merland | f55b87c | 2018-06-01 09:46:14 +0200 | [diff] [blame] | 1782 | "repeat in-order for multiple shelved changelists"), |
| 1783 | optparse.make_option("--commit", dest="commit", metavar="COMMIT", |
| 1784 | help="submit only the specified commit(s), one commit or xxx..xxx"), |
| 1785 | optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true", |
| 1786 | help="Disable rebase after submit is completed. Can be useful if you " |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 1787 | "work from a local git branch that is not master"), |
| 1788 | optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true", |
| 1789 | help="Skip Perforce sync of p4/master after submit or shelve"), |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 1790 | optparse.make_option("--no-verify", dest="no_verify", action="store_true", |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 1791 | help="Bypass p4-pre-submit and p4-changelist hooks"), |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1792 | ] |
Chen Bin | 251c8c5 | 2018-07-27 21:22:22 +1000 | [diff] [blame] | 1793 | self.description = """Submit changes from git to the perforce depot.\n |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 1794 | The `p4-pre-submit` hook is executed if it exists and is executable. It |
| 1795 | can be bypassed with the `--no-verify` command line option. The hook takes |
| 1796 | no parameters and nothing from standard input. Exiting with a non-zero status |
| 1797 | from this script prevents `git-p4 submit` from launching. |
Chen Bin | 251c8c5 | 2018-07-27 21:22:22 +1000 | [diff] [blame] | 1798 | |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 1799 | One usage scenario is to run unit tests in the hook. |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 1800 | |
| 1801 | The `p4-prepare-changelist` hook is executed right after preparing the default |
| 1802 | changelist message and before the editor is started. It takes one parameter, |
| 1803 | the name of the file that contains the changelist text. Exiting with a non-zero |
| 1804 | status from the script will abort the process. |
| 1805 | |
| 1806 | The purpose of the hook is to edit the message file in place, and it is not |
| 1807 | supressed by the `--no-verify` option. This hook is called even if |
| 1808 | `--prepare-p4-only` is set. |
| 1809 | |
| 1810 | The `p4-changelist` hook is executed after the changelist message has been |
| 1811 | edited by the user. It can be bypassed with the `--no-verify` option. It |
| 1812 | takes a single parameter, the name of the file that holds the proposed |
| 1813 | changelist text. Exiting with a non-zero status causes the command to abort. |
| 1814 | |
| 1815 | The hook is allowed to edit the changelist file and can be used to normalize |
| 1816 | the text into some project standard format. It can also be used to refuse the |
| 1817 | Submit after inspect the message file. |
| 1818 | |
| 1819 | The `p4-post-changelist` hook is invoked after the submit has successfully |
Marlon Rac Cambasis | b7e20b4 | 2020-11-05 12:48:14 -0800 | [diff] [blame] | 1820 | occurred in P4. It takes no parameters and is meant primarily for notification |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 1821 | and cannot affect the outcome of the git p4 submit action. |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 1822 | """ |
Chen Bin | 251c8c5 | 2018-07-27 21:22:22 +1000 | [diff] [blame] | 1823 | |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 1824 | self.usage += " [name of git branch to submit into perforce depot]" |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 1825 | self.origin = "" |
Vitor Antunes | ae90109 | 2011-02-20 01:18:24 +0000 | [diff] [blame] | 1826 | self.detectRenames = False |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 1827 | self.preserveUser = gitConfigBool("git-p4.preserveUser") |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 1828 | self.dry_run = False |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 1829 | self.shelve = False |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 1830 | self.update_shelve = list() |
Romain Merland | f55b87c | 2018-06-01 09:46:14 +0200 | [diff] [blame] | 1831 | self.commit = "" |
Luke Diamand | 3b3477e | 2018-06-08 21:32:43 +0100 | [diff] [blame] | 1832 | self.disable_rebase = gitConfigBool("git-p4.disableRebase") |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 1833 | self.disable_p4sync = gitConfigBool("git-p4.disableP4Sync") |
Pete Wyckoff | 728b7ad | 2012-09-09 16:16:12 -0400 | [diff] [blame] | 1834 | self.prepare_p4_only = False |
Pete Wyckoff | 6bbfd13 | 2012-09-09 16:16:13 -0400 | [diff] [blame] | 1835 | self.conflict_behavior = None |
Marius Storm-Olsen | f7baba8 | 2007-06-07 14:07:01 +0200 | [diff] [blame] | 1836 | self.isWindows = (platform.system() == "Windows") |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 1837 | self.exportLabels = False |
Pete Wyckoff | 249da4c | 2012-11-23 17:35:35 -0500 | [diff] [blame] | 1838 | self.p4HasMoveCommand = p4_has_move_command() |
Pete Wyckoff | 44e8d26 | 2013-01-14 19:47:08 -0500 | [diff] [blame] | 1839 | self.branch = None |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 1840 | self.no_verify = False |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1841 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 1842 | if gitConfig('git-p4.largeFileSystem'): |
| 1843 | die("Large file system not supported for git-p4 submit command. Please remove it from config.") |
| 1844 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1845 | def check(self): |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1846 | if len(p4CmdList(["opened", "..."])) > 0: |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1847 | die("You have files opened with perforce! Close them before starting the sync.") |
| 1848 | |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1849 | def separate_jobs_from_description(self, message): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1850 | """Extract and return a possible Jobs field in the commit message. It |
| 1851 | goes into a separate section in the p4 change specification. |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1852 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1853 | A jobs line starts with "Jobs:" and looks like a new field in a |
| 1854 | form. Values are white-space separated on the same line or on |
| 1855 | following lines that start with a tab. |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1856 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1857 | This does not parse and extract the full git commit message like a |
| 1858 | p4 form. It just sees the Jobs: line as a marker to pass everything |
| 1859 | from then on directly into the p4 form, but outside the description |
| 1860 | section. |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1861 | |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1862 | Return a tuple (stripped log message, jobs string). |
| 1863 | """ |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1864 | |
| 1865 | m = re.search(r'^Jobs:', message, re.MULTILINE) |
| 1866 | if m is None: |
| 1867 | return (message, None) |
| 1868 | |
| 1869 | jobtext = message[m.start():] |
| 1870 | stripped_message = message[:m.start()].rstrip() |
| 1871 | return (stripped_message, jobtext) |
| 1872 | |
| 1873 | def prepareLogMessage(self, template, message, jobs): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 1874 | """Edits the template returned from "p4 change -o" to insert the |
| 1875 | message in the Description field, and the jobs text in the Jobs |
| 1876 | field. |
| 1877 | """ |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1878 | result = "" |
| 1879 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 1880 | inDescriptionSection = False |
| 1881 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1882 | for line in template.split("\n"): |
| 1883 | if line.startswith("#"): |
| 1884 | result += line + "\n" |
| 1885 | continue |
| 1886 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 1887 | if inDescriptionSection: |
Michael Horowitz | c9dbab0 | 2011-02-25 21:31:13 -0500 | [diff] [blame] | 1888 | if line.startswith("Files:") or line.startswith("Jobs:"): |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 1889 | inDescriptionSection = False |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 1890 | # insert Jobs section |
| 1891 | if jobs: |
| 1892 | result += jobs + "\n" |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 1893 | else: |
| 1894 | continue |
| 1895 | else: |
| 1896 | if line.startswith("Description:"): |
| 1897 | inDescriptionSection = True |
| 1898 | line += "\n" |
| 1899 | for messageLine in message.split("\n"): |
| 1900 | line += "\t" + messageLine + "\n" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1901 | |
Simon Hausmann | edae1e2 | 2008-02-19 09:29:06 +0100 | [diff] [blame] | 1902 | result += line + "\n" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 1903 | |
| 1904 | return result |
| 1905 | |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 1906 | def patchRCSKeywords(self, file, regexp): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1907 | """Attempt to zap the RCS keywords in a p4 controlled file matching the |
| 1908 | given regex. |
| 1909 | """ |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 1910 | handle, outFileName = tempfile.mkstemp(dir='.') |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 1911 | try: |
Joel Holdsworth | 70c0d55 | 2021-12-16 13:46:19 +0000 | [diff] [blame] | 1912 | with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile: |
Joel Holdsworth | 8618d32 | 2021-12-16 13:46:15 +0000 | [diff] [blame] | 1913 | for line in inFile.readlines(): |
Joel Holdsworth | 70c0d55 | 2021-12-16 13:46:19 +0000 | [diff] [blame] | 1914 | outFile.write(regexp.sub(br'$\1$', line)) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 1915 | # Forcibly overwrite the original file |
| 1916 | os.unlink(file) |
| 1917 | shutil.move(outFileName, file) |
| 1918 | except: |
| 1919 | # cleanup our temporary file |
| 1920 | os.unlink(outFileName) |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1921 | print("Failed to strip RCS keywords in %s" % file) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 1922 | raise |
| 1923 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1924 | print("Patched up RCS keywords in %s" % file) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 1925 | |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 1926 | def p4UserForCommit(self, id): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1927 | """Return the tuple (perforce user,git email) for a given git commit |
| 1928 | id. |
| 1929 | """ |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1930 | self.getUserMapFromPerforceServer() |
Pete Wyckoff | 9bf2885 | 2013-01-26 22:11:20 -0500 | [diff] [blame] | 1931 | gitEmail = read_pipe(["git", "log", "--max-count=1", |
| 1932 | "--format=%ae", id]) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1933 | gitEmail = gitEmail.strip() |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1934 | if gitEmail not in self.emails: |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 1935 | return (None, gitEmail) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1936 | else: |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 1937 | return (self.emails[gitEmail], gitEmail) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1938 | |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 1939 | def checkValidP4Users(self, commits): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1940 | """Check if any git authors cannot be mapped to p4 users.""" |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1941 | for id in commits: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 1942 | user, email = self.p4UserForCommit(id) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1943 | if not user: |
| 1944 | msg = "Cannot find p4 user for email %s in commit %s." % (email, id) |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 1945 | if gitConfigBool("git-p4.allowMissingP4Users"): |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 1946 | print("%s" % msg) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1947 | else: |
| 1948 | die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg) |
| 1949 | |
| 1950 | def lastP4Changelist(self): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1951 | """Get back the last changelist number submitted in this client spec. |
| 1952 | |
| 1953 | This then gets used to patch up the username in the change. If the |
| 1954 | same client spec is being used by multiple processes then this might |
| 1955 | go wrong. |
| 1956 | """ |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1957 | results = p4CmdList(["client", "-o"]) # find the current client |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1958 | client = None |
| 1959 | for r in results: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1960 | if 'Client' in r: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1961 | client = r['Client'] |
| 1962 | break |
| 1963 | if not client: |
| 1964 | die("could not get client spec") |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 1965 | results = p4CmdList(["changes", "-c", client, "-m", "1"]) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1966 | for r in results: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1967 | if 'change' in r: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1968 | return r['change'] |
| 1969 | die("Could not get changelist number for last submit - cannot patch up user details") |
| 1970 | |
| 1971 | def modifyChangelistUser(self, changelist, newUser): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1972 | """Fixup the user field of a changelist after it has been submitted.""" |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1973 | changes = p4CmdList(["change", "-o", changelist]) |
Luke Diamand | ecdba36 | 2011-05-07 11:19:43 +0100 | [diff] [blame] | 1974 | if len(changes) != 1: |
| 1975 | die("Bad output from p4 change modifying %s to user %s" % |
| 1976 | (changelist, newUser)) |
| 1977 | |
| 1978 | c = changes[0] |
Joel Holdsworth | e8f8b3b | 2022-04-01 15:25:03 +0100 | [diff] [blame] | 1979 | if c['User'] == newUser: |
| 1980 | # Nothing to do |
| 1981 | return |
Luke Diamand | ecdba36 | 2011-05-07 11:19:43 +0100 | [diff] [blame] | 1982 | c['User'] = newUser |
Yang Zhao | 50da1e7 | 2019-12-13 15:52:42 -0800 | [diff] [blame] | 1983 | # p4 does not understand format version 3 and above |
| 1984 | input = marshal.dumps(c, 2) |
Luke Diamand | ecdba36 | 2011-05-07 11:19:43 +0100 | [diff] [blame] | 1985 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 1986 | result = p4CmdList(["change", "-f", "-i"], stdin=input) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1987 | for r in result: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1988 | if 'code' in r: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1989 | if r['code'] == 'error': |
| 1990 | die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data'])) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 1991 | if 'data' in r: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 1992 | print("Updated user field for changelist %s to %s" % (changelist, newUser)) |
| 1993 | return |
| 1994 | die("Could not modify user field of changelist %s to %s" % (changelist, newUser)) |
| 1995 | |
| 1996 | def canChangeChangelists(self): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 1997 | """Check to see if we have p4 admin or super-user permissions, either |
| 1998 | of which are required to modify changelists. |
| 1999 | """ |
Luke Diamand | 52a4880 | 2012-01-19 09:52:25 +0000 | [diff] [blame] | 2000 | results = p4CmdList(["protects", self.depotPath]) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2001 | for r in results: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2002 | if 'perm' in r: |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2003 | if r['perm'] == 'admin': |
| 2004 | return 1 |
| 2005 | if r['perm'] == 'super': |
| 2006 | return 1 |
| 2007 | return 0 |
| 2008 | |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2009 | def prepareSubmitTemplate(self, changelist=None): |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 2010 | """Run "p4 change -o" to grab a change specification template. |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2011 | |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 2012 | This does not use "p4 -G", as it is nice to keep the submission |
| 2013 | template in original order, since a human might edit it. |
| 2014 | |
| 2015 | Remove lines in the Files section that show changes to files |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2016 | outside the depot path we're committing into. |
| 2017 | """ |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 2018 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 2019 | upstream, settings = findUpstreamBranchPoint() |
Sam Hocevar | cbc6924 | 2015-12-19 09:39:39 +0000 | [diff] [blame] | 2020 | |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2021 | template = """\ |
| 2022 | # A Perforce Change Specification. |
| 2023 | # |
| 2024 | # Change: The change number. 'new' on a new changelist. |
| 2025 | # Date: The date this specification was last modified. |
| 2026 | # Client: The client on which the changelist was created. Read-only. |
| 2027 | # User: The user who created the changelist. |
| 2028 | # Status: Either 'pending' or 'submitted'. Read-only. |
| 2029 | # Type: Either 'public' or 'restricted'. Default is 'public'. |
| 2030 | # Description: Comments about the changelist. Required. |
| 2031 | # Jobs: What opened jobs are to be closed by this changelist. |
| 2032 | # You may delete jobs from this list. (New changelists only.) |
| 2033 | # Files: What opened files from the default changelist are to be added |
| 2034 | # to this changelist. You may delete files from this list. |
| 2035 | # (New changelists only.) |
| 2036 | """ |
| 2037 | files_list = [] |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 2038 | inFilesSection = False |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2039 | change_entry = None |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2040 | args = ['change', '-o'] |
| 2041 | if changelist: |
| 2042 | args.append(str(changelist)) |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2043 | for entry in p4CmdList(args): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2044 | if 'code' not in entry: |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2045 | continue |
| 2046 | if entry['code'] == 'stat': |
| 2047 | change_entry = entry |
| 2048 | break |
| 2049 | if not change_entry: |
| 2050 | die('Failed to decode output of p4 change -o') |
Yang Zhao | 2e2aa8d | 2019-12-13 15:52:45 -0800 | [diff] [blame] | 2051 | for key, value in change_entry.items(): |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2052 | if key.startswith('File'): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2053 | if 'depot-paths' in settings: |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2054 | if not [p for p in settings['depot-paths'] |
| 2055 | if p4PathStartsWith(value, p)]: |
| 2056 | continue |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 2057 | else: |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2058 | if not p4PathStartsWith(value, self.depotPath): |
| 2059 | continue |
| 2060 | files_list.append(value) |
| 2061 | continue |
| 2062 | # Output in the order expected by prepareLogMessage |
| 2063 | for key in ['Change', 'Client', 'User', 'Status', 'Description', 'Jobs']: |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2064 | if key not in change_entry: |
Miguel Torroja | b596b3b | 2017-07-13 09:00:34 +0200 | [diff] [blame] | 2065 | continue |
| 2066 | template += '\n' |
| 2067 | template += key + ':' |
| 2068 | if key == 'Description': |
| 2069 | template += '\n' |
| 2070 | for field_line in change_entry[key].splitlines(): |
| 2071 | template += '\t'+field_line+'\n' |
| 2072 | if len(files_list) > 0: |
| 2073 | template += '\n' |
| 2074 | template += 'Files:\n' |
| 2075 | for path in files_list: |
| 2076 | template += '\t'+path+'\n' |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 2077 | return template |
| 2078 | |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2079 | def edit_template(self, template_file): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2080 | """Invoke the editor to let the user change the submission message. |
| 2081 | |
| 2082 | Return true if okay to continue with the submit. |
| 2083 | """ |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2084 | |
| 2085 | # if configured to skip the editing part, just submit |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2086 | if gitConfigBool("git-p4.skipSubmitEdit"): |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2087 | return True |
| 2088 | |
| 2089 | # look at the modification time, to check later if the user saved |
| 2090 | # the file |
| 2091 | mtime = os.stat(template_file).st_mtime |
| 2092 | |
| 2093 | # invoke the editor |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2094 | if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""): |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2095 | editor = os.environ.get("P4EDITOR") |
| 2096 | else: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2097 | editor = read_pipe(["git", "var", "GIT_EDITOR"]).strip() |
Luke Diamand | 2dade7a | 2015-05-19 23:23:17 +0100 | [diff] [blame] | 2098 | system(["sh", "-c", ('%s "$@"' % editor), editor, template_file]) |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2099 | |
| 2100 | # If the file was not saved, prompt to see if this patch should |
| 2101 | # be skipped. But skip this verification step if configured so. |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2102 | if gitConfigBool("git-p4.skipSubmitEditCheck"): |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2103 | return True |
| 2104 | |
Pete Wyckoff | d165204 | 2011-12-17 12:39:03 -0500 | [diff] [blame] | 2105 | # modification time updated means user saved the file |
| 2106 | if os.stat(template_file).st_mtime > mtime: |
| 2107 | return True |
| 2108 | |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 2109 | response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") |
| 2110 | if response == 'y': |
| 2111 | return True |
| 2112 | if response == 'n': |
| 2113 | return False |
Pete Wyckoff | 7c766e5 | 2011-12-04 19:22:45 -0500 | [diff] [blame] | 2114 | |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2115 | def get_diff_description(self, editedFiles, filesToAdd, symlinks): |
Maxime Coste | b4073bb | 2014-05-24 18:40:35 +0100 | [diff] [blame] | 2116 | # diff |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2117 | if "P4DIFF" in os.environ: |
Maxime Coste | b4073bb | 2014-05-24 18:40:35 +0100 | [diff] [blame] | 2118 | del(os.environ["P4DIFF"]) |
| 2119 | diff = "" |
| 2120 | for editedFile in editedFiles: |
| 2121 | diff += p4_read_pipe(['diff', '-du', |
| 2122 | wildcard_encode(editedFile)]) |
| 2123 | |
| 2124 | # new file diff |
| 2125 | newdiff = "" |
| 2126 | for newFile in filesToAdd: |
| 2127 | newdiff += "==== new file ====\n" |
| 2128 | newdiff += "--- /dev/null\n" |
| 2129 | newdiff += "+++ %s\n" % newFile |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2130 | |
| 2131 | is_link = os.path.islink(newFile) |
| 2132 | expect_link = newFile in symlinks |
| 2133 | |
| 2134 | if is_link and expect_link: |
| 2135 | newdiff += "+%s\n" % os.readlink(newFile) |
| 2136 | else: |
| 2137 | f = open(newFile, "r") |
dorgon.chang | 54662d5 | 2021-06-21 05:16:13 +0000 | [diff] [blame] | 2138 | try: |
| 2139 | for line in f.readlines(): |
| 2140 | newdiff += "+" + line |
| 2141 | except UnicodeDecodeError: |
Joel Holdsworth | 4768af2 | 2022-04-01 15:25:02 +0100 | [diff] [blame] | 2142 | # Found non-text data and skip, since diff description |
| 2143 | # should only include text |
| 2144 | pass |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2145 | f.close() |
Maxime Coste | b4073bb | 2014-05-24 18:40:35 +0100 | [diff] [blame] | 2146 | |
Maxime Coste | e2a892e | 2014-06-11 14:09:59 +0100 | [diff] [blame] | 2147 | return (diff + newdiff).replace('\r\n', '\n') |
Maxime Coste | b4073bb | 2014-05-24 18:40:35 +0100 | [diff] [blame] | 2148 | |
Han-Wen Nienhuys | 7cb5cbe | 2007-05-23 16:55:48 -0300 | [diff] [blame] | 2149 | def applyCommit(self, id): |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2150 | """Apply one commit, return True if it succeeded.""" |
| 2151 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2152 | print("Applying", read_pipe(["git", "show", "-s", |
| 2153 | "--format=format:%h %s", id])) |
Vitor Antunes | ae90109 | 2011-02-20 01:18:24 +0000 | [diff] [blame] | 2154 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 2155 | p4User, gitEmail = self.p4UserForCommit(id) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2156 | |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 2157 | diff = read_pipe_lines( |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2158 | ["git", "diff-tree", "-r"] + self.diffOpts + ["{}^".format(id), id]) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2159 | filesToAdd = set() |
Romain Picard | a02b8bc | 2016-01-12 13:43:47 +0100 | [diff] [blame] | 2160 | filesToChangeType = set() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2161 | filesToDelete = set() |
Simon Hausmann | d336c15 | 2007-05-16 09:41:26 +0200 | [diff] [blame] | 2162 | editedFiles = set() |
Pete Wyckoff | b6ad6dc | 2012-04-29 20:57:16 -0400 | [diff] [blame] | 2163 | pureRenameCopy = set() |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2164 | symlinks = set() |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2165 | filesToChangeExecBit = {} |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2166 | all_files = list() |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2167 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2168 | for line in diff: |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 2169 | diff = parseDiffTreeEntry(line) |
| 2170 | modifier = diff['status'] |
| 2171 | path = diff['src'] |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2172 | all_files.append(path) |
| 2173 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2174 | if modifier == "M": |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2175 | p4_edit(path) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2176 | if isModeExecChanged(diff['src_mode'], diff['dst_mode']): |
| 2177 | filesToChangeExecBit[path] = diff['dst_mode'] |
Simon Hausmann | d336c15 | 2007-05-16 09:41:26 +0200 | [diff] [blame] | 2178 | editedFiles.add(path) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2179 | elif modifier == "A": |
| 2180 | filesToAdd.add(path) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2181 | filesToChangeExecBit[path] = diff['dst_mode'] |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2182 | if path in filesToDelete: |
| 2183 | filesToDelete.remove(path) |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2184 | |
| 2185 | dst_mode = int(diff['dst_mode'], 8) |
Luke Diamand | db2d997 | 2018-06-19 09:04:11 +0100 | [diff] [blame] | 2186 | if dst_mode == 0o120000: |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2187 | symlinks.add(path) |
| 2188 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2189 | elif modifier == "D": |
| 2190 | filesToDelete.add(path) |
| 2191 | if path in filesToAdd: |
| 2192 | filesToAdd.remove(path) |
Vitor Antunes | 4fddb41 | 2011-02-20 01:18:25 +0000 | [diff] [blame] | 2193 | elif modifier == "C": |
| 2194 | src, dest = diff['src'], diff['dst'] |
Luke Diamand | 7a10946 | 2019-01-18 09:36:56 +0000 | [diff] [blame] | 2195 | all_files.append(dest) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2196 | p4_integrate(src, dest) |
Pete Wyckoff | b6ad6dc | 2012-04-29 20:57:16 -0400 | [diff] [blame] | 2197 | pureRenameCopy.add(dest) |
Vitor Antunes | 4fddb41 | 2011-02-20 01:18:25 +0000 | [diff] [blame] | 2198 | if diff['src_sha1'] != diff['dst_sha1']: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2199 | p4_edit(dest) |
Pete Wyckoff | b6ad6dc | 2012-04-29 20:57:16 -0400 | [diff] [blame] | 2200 | pureRenameCopy.discard(dest) |
Vitor Antunes | 4fddb41 | 2011-02-20 01:18:25 +0000 | [diff] [blame] | 2201 | if isModeExecChanged(diff['src_mode'], diff['dst_mode']): |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2202 | p4_edit(dest) |
Pete Wyckoff | b6ad6dc | 2012-04-29 20:57:16 -0400 | [diff] [blame] | 2203 | pureRenameCopy.discard(dest) |
Vitor Antunes | 4fddb41 | 2011-02-20 01:18:25 +0000 | [diff] [blame] | 2204 | filesToChangeExecBit[dest] = diff['dst_mode'] |
Pete Wyckoff | d20f0f8 | 2013-01-26 22:11:19 -0500 | [diff] [blame] | 2205 | if self.isWindows: |
| 2206 | # turn off read-only attribute |
| 2207 | os.chmod(dest, stat.S_IWRITE) |
Vitor Antunes | 4fddb41 | 2011-02-20 01:18:25 +0000 | [diff] [blame] | 2208 | os.unlink(dest) |
| 2209 | editedFiles.add(dest) |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 2210 | elif modifier == "R": |
Chris Pettitt | b43b0a3 | 2007-11-01 20:43:13 -0700 | [diff] [blame] | 2211 | src, dest = diff['src'], diff['dst'] |
Luke Diamand | 7a10946 | 2019-01-18 09:36:56 +0000 | [diff] [blame] | 2212 | all_files.append(dest) |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 2213 | if self.p4HasMoveCommand: |
| 2214 | p4_edit(src) # src must be open before move |
| 2215 | p4_move(src, dest) # opens for (move/delete, move/add) |
Pete Wyckoff | b6ad6dc | 2012-04-29 20:57:16 -0400 | [diff] [blame] | 2216 | else: |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 2217 | p4_integrate(src, dest) |
| 2218 | if diff['src_sha1'] != diff['dst_sha1']: |
| 2219 | p4_edit(dest) |
| 2220 | else: |
| 2221 | pureRenameCopy.add(dest) |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2222 | if isModeExecChanged(diff['src_mode'], diff['dst_mode']): |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 2223 | if not self.p4HasMoveCommand: |
| 2224 | p4_edit(dest) # with move: already open, writable |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2225 | filesToChangeExecBit[dest] = diff['dst_mode'] |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 2226 | if not self.p4HasMoveCommand: |
Pete Wyckoff | d20f0f8 | 2013-01-26 22:11:19 -0500 | [diff] [blame] | 2227 | if self.isWindows: |
| 2228 | os.chmod(dest, stat.S_IWRITE) |
Gary Gibbons | 8e9497c | 2012-07-12 19:29:00 -0400 | [diff] [blame] | 2229 | os.unlink(dest) |
| 2230 | filesToDelete.add(src) |
Chris Pettitt | d9a5f25 | 2007-10-15 22:15:06 -0700 | [diff] [blame] | 2231 | editedFiles.add(dest) |
Romain Picard | a02b8bc | 2016-01-12 13:43:47 +0100 | [diff] [blame] | 2232 | elif modifier == "T": |
| 2233 | filesToChangeType.add(path) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2234 | else: |
| 2235 | die("unknown modifier %s for %s" % (modifier, path)) |
| 2236 | |
Tolga Ceylan | 749b668 | 2014-05-06 22:48:54 -0700 | [diff] [blame] | 2237 | diffcmd = "git diff-tree --full-index -p \"%s\"" % (id) |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 2238 | patchcmd = diffcmd + " | git apply " |
Simon Hausmann | c1b296b | 2007-05-20 16:55:05 +0200 | [diff] [blame] | 2239 | tryPatchCmd = patchcmd + "--check -" |
| 2240 | applyPatchCmd = patchcmd + "--check --apply -" |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2241 | patch_succeeded = True |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 2242 | |
Ben Keene | 1ec4a0a | 2020-02-14 14:44:46 +0000 | [diff] [blame] | 2243 | if verbose: |
| 2244 | print("TryPatch: %s" % tryPatchCmd) |
| 2245 | |
Simon Hausmann | 47a130b | 2007-05-20 16:33:21 +0200 | [diff] [blame] | 2246 | if os.system(tryPatchCmd) != 0: |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2247 | fixed_rcs_keywords = False |
| 2248 | patch_succeeded = False |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2249 | print("Unfortunately applying the change failed!") |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2250 | |
| 2251 | # Patch failed, maybe it's just RCS keyword woes. Look through |
| 2252 | # the patch to see if that's possible. |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2253 | if gitConfigBool("git-p4.attemptRCSCleanup"): |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2254 | file = None |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2255 | kwfiles = {} |
| 2256 | for file in editedFiles | filesToDelete: |
| 2257 | # did this file's delta contain RCS keywords? |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 2258 | regexp = p4_keywords_regexp_for_file(file) |
| 2259 | if regexp: |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2260 | # this file is a possibility...look for RCS keywords. |
Joel Holdsworth | 70c0d55 | 2021-12-16 13:46:19 +0000 | [diff] [blame] | 2261 | for line in read_pipe_lines( |
Joel Holdsworth | 7a3e83d | 2022-04-01 15:24:59 +0100 | [diff] [blame] | 2262 | ["git", "diff", "%s^..%s" % (id, id), file], |
| 2263 | raw=True): |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2264 | if regexp.search(line): |
| 2265 | if verbose: |
Moritz Baumann | c0d2b07 | 2022-07-20 18:55:29 +0000 | [diff] [blame] | 2266 | print("got keyword match on %s in %s in %s" % (regexp.pattern, line, file)) |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 2267 | kwfiles[file] = regexp |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2268 | break |
| 2269 | |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 2270 | for file, regexp in kwfiles.items(): |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2271 | if verbose: |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 2272 | print("zapping %s with %s" % (line, regexp.pattern)) |
Pete Wyckoff | d20f0f8 | 2013-01-26 22:11:19 -0500 | [diff] [blame] | 2273 | # File is being deleted, so not open in p4. Must |
| 2274 | # disable the read-only bit on windows. |
| 2275 | if self.isWindows and file not in editedFiles: |
| 2276 | os.chmod(file, stat.S_IWRITE) |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2277 | self.patchRCSKeywords(file, kwfiles[file]) |
| 2278 | fixed_rcs_keywords = True |
| 2279 | |
| 2280 | if fixed_rcs_keywords: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2281 | print("Retrying the patch with RCS keywords cleaned up") |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2282 | if os.system(tryPatchCmd) == 0: |
| 2283 | patch_succeeded = True |
Ben Keene | 1ec4a0a | 2020-02-14 14:44:46 +0000 | [diff] [blame] | 2284 | print("Patch succeesed this time with RCS keywords cleaned") |
Luke Diamand | 60df071 | 2012-02-23 07:51:30 +0000 | [diff] [blame] | 2285 | |
| 2286 | if not patch_succeeded: |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2287 | for f in editedFiles: |
| 2288 | p4_revert(f) |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2289 | return False |
Simon Hausmann | 51a2640 | 2007-04-15 09:59:56 +0200 | [diff] [blame] | 2290 | |
Pete Wyckoff | 55ac2ed | 2012-09-09 16:16:08 -0400 | [diff] [blame] | 2291 | # |
| 2292 | # Apply the patch for real, and do add/delete/+x handling. |
| 2293 | # |
Joel Holdsworth | 3d8a303 | 2022-01-06 21:40:33 +0000 | [diff] [blame] | 2294 | system(applyPatchCmd, shell=True) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2295 | |
Romain Picard | a02b8bc | 2016-01-12 13:43:47 +0100 | [diff] [blame] | 2296 | for f in filesToChangeType: |
| 2297 | p4_edit(f, "-t", "auto") |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2298 | for f in filesToAdd: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2299 | p4_add(f) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2300 | for f in filesToDelete: |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 2301 | p4_revert(f) |
| 2302 | p4_delete(f) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2303 | |
Chris Pettitt | c65b670 | 2007-11-01 20:43:14 -0700 | [diff] [blame] | 2304 | # Set/clear executable bits |
| 2305 | for f in filesToChangeExecBit.keys(): |
| 2306 | mode = filesToChangeExecBit[f] |
| 2307 | setP4ExecBit(f, mode) |
| 2308 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2309 | update_shelve = 0 |
| 2310 | if len(self.update_shelve) > 0: |
| 2311 | update_shelve = self.update_shelve.pop(0) |
| 2312 | p4_reopen_in_change(update_shelve, all_files) |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2313 | |
Pete Wyckoff | 55ac2ed | 2012-09-09 16:16:08 -0400 | [diff] [blame] | 2314 | # |
| 2315 | # Build p4 change description, starting with the contents |
| 2316 | # of the git commit message. |
| 2317 | # |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 2318 | logMessage = extractLogMessageFromGitCommit(id) |
Simon Hausmann | 0e36f2d | 2008-02-19 09:33:08 +0100 | [diff] [blame] | 2319 | logMessage = logMessage.strip() |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 2320 | logMessage, jobs = self.separate_jobs_from_description(logMessage) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2321 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2322 | template = self.prepareSubmitTemplate(update_shelve) |
Pete Wyckoff | f19cb0a | 2012-07-04 09:34:20 -0400 | [diff] [blame] | 2323 | submitTemplate = self.prepareLogMessage(template, logMessage, jobs) |
Pete Wyckoff | c47178d | 2012-07-04 09:34:18 -0400 | [diff] [blame] | 2324 | |
| 2325 | if self.preserveUser: |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 2326 | submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User |
Pete Wyckoff | c47178d | 2012-07-04 09:34:18 -0400 | [diff] [blame] | 2327 | |
Pete Wyckoff | 55ac2ed | 2012-09-09 16:16:08 -0400 | [diff] [blame] | 2328 | if self.checkAuthorship and not self.p4UserIsMe(p4User): |
| 2329 | submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail |
| 2330 | submitTemplate += "######## Use option --preserve-user to modify authorship.\n" |
| 2331 | submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n" |
| 2332 | |
| 2333 | separatorLine = "######## everything below this line is just the diff #######\n" |
Maxime Coste | b4073bb | 2014-05-24 18:40:35 +0100 | [diff] [blame] | 2334 | if not self.prepare_p4_only: |
| 2335 | submitTemplate += separatorLine |
Luke Diamand | df8a9e8 | 2016-12-17 01:00:40 +0000 | [diff] [blame] | 2336 | submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks) |
Pete Wyckoff | 55ac2ed | 2012-09-09 16:16:08 -0400 | [diff] [blame] | 2337 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 2338 | handle, fileName = tempfile.mkstemp() |
Maxime Coste | e2a892e | 2014-06-11 14:09:59 +0100 | [diff] [blame] | 2339 | tmpFile = os.fdopen(handle, "w+b") |
Pete Wyckoff | c47178d | 2012-07-04 09:34:18 -0400 | [diff] [blame] | 2340 | if self.isWindows: |
| 2341 | submitTemplate = submitTemplate.replace("\n", "\r\n") |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 2342 | tmpFile.write(encode_text_stream(submitTemplate)) |
Pete Wyckoff | c47178d | 2012-07-04 09:34:18 -0400 | [diff] [blame] | 2343 | tmpFile.close() |
| 2344 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2345 | submitted = False |
Luke Diamand | ecdba36 | 2011-05-07 11:19:43 +0100 | [diff] [blame] | 2346 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2347 | try: |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 2348 | # Allow the hook to edit the changelist text before presenting it |
| 2349 | # to the user. |
| 2350 | if not run_git_hook("p4-prepare-changelist", [fileName]): |
| 2351 | return False |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2352 | |
| 2353 | if self.prepare_p4_only: |
| 2354 | # |
| 2355 | # Leave the p4 tree prepared, and the submit template around |
| 2356 | # and let the user decide what to do next |
| 2357 | # |
| 2358 | submitted = True |
| 2359 | print("") |
| 2360 | print("P4 workspace prepared for submission.") |
| 2361 | print("To submit or revert, go to client workspace") |
| 2362 | print(" " + self.clientPath) |
| 2363 | print("") |
| 2364 | print("To submit, use \"p4 submit\" to write a new description,") |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2365 | print("or \"p4 submit -i <%s\" to use the one prepared by" |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2366 | " \"git p4\"." % fileName) |
| 2367 | print("You can delete the file \"%s\" when finished." % fileName) |
| 2368 | |
| 2369 | if self.preserveUser and p4User and not self.p4UserIsMe(p4User): |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2370 | print("To preserve change ownership by user %s, you must\n" |
| 2371 | "do \"p4 change -f <change>\" after submitting and\n" |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2372 | "edit the User field.") |
| 2373 | if pureRenameCopy: |
| 2374 | print("After submitting, renamed files must be re-synced.") |
| 2375 | print("Invoke \"p4 sync -f\" on each of these files:") |
| 2376 | for f in pureRenameCopy: |
| 2377 | print(" " + f) |
| 2378 | |
| 2379 | print("") |
| 2380 | print("To revert the changes, use \"p4 revert ...\", and delete") |
| 2381 | print("the submit template file \"%s\"" % fileName) |
| 2382 | if filesToAdd: |
| 2383 | print("Since the commit adds new files, they must be deleted:") |
| 2384 | for f in filesToAdd: |
| 2385 | print(" " + f) |
| 2386 | print("") |
| 2387 | sys.stdout.flush() |
| 2388 | return True |
| 2389 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2390 | if self.edit_template(fileName): |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 2391 | if not self.no_verify: |
| 2392 | if not run_git_hook("p4-changelist", [fileName]): |
| 2393 | print("The p4-changelist hook failed.") |
| 2394 | sys.stdout.flush() |
| 2395 | return False |
| 2396 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2397 | # read the edited message and submit |
| 2398 | tmpFile = open(fileName, "rb") |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 2399 | message = decode_text_stream(tmpFile.read()) |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2400 | tmpFile.close() |
| 2401 | if self.isWindows: |
| 2402 | message = message.replace("\r\n", "\n") |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2403 | if message.find(separatorLine) != -1: |
| 2404 | submitTemplate = message[:message.index(separatorLine)] |
| 2405 | else: |
| 2406 | submitTemplate = message |
| 2407 | |
| 2408 | if len(submitTemplate.strip()) == 0: |
| 2409 | print("Changelist is empty, aborting this changelist.") |
| 2410 | sys.stdout.flush() |
| 2411 | return False |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2412 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2413 | if update_shelve: |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2414 | p4_write_pipe(['shelve', '-r', '-i'], submitTemplate) |
| 2415 | elif self.shelve: |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 2416 | p4_write_pipe(['shelve', '-i'], submitTemplate) |
| 2417 | else: |
| 2418 | p4_write_pipe(['submit', '-i'], submitTemplate) |
| 2419 | # The rename/copy happened by applying a patch that created a |
| 2420 | # new file. This leaves it writable, which confuses p4. |
| 2421 | for f in pureRenameCopy: |
| 2422 | p4_sync(f, "-f") |
Luke Diamand | ecdba36 | 2011-05-07 11:19:43 +0100 | [diff] [blame] | 2423 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2424 | if self.preserveUser: |
| 2425 | if p4User: |
| 2426 | # Get last changelist number. Cannot easily get it from |
| 2427 | # the submit command output as the output is |
| 2428 | # unmarshalled. |
| 2429 | changelist = self.lastP4Changelist() |
| 2430 | self.modifyChangelistUser(changelist, p4User) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2431 | |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2432 | submitted = True |
| 2433 | |
Ben Keene | 38ecf75 | 2020-02-14 14:44:45 +0000 | [diff] [blame] | 2434 | run_git_hook("p4-post-changelist") |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2435 | finally: |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2436 | # Revert changes if we skip this patch |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 2437 | if not submitted or self.shelve: |
| 2438 | if self.shelve: |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 2439 | print("Reverting shelved files.") |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 2440 | else: |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 2441 | print("Submission cancelled, undoing p4 changes.") |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2442 | sys.stdout.flush() |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 2443 | for f in editedFiles | filesToDelete: |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2444 | p4_revert(f) |
| 2445 | for f in filesToAdd: |
| 2446 | p4_revert(f) |
| 2447 | os.remove(f) |
Pete Wyckoff | c47178d | 2012-07-04 09:34:18 -0400 | [diff] [blame] | 2448 | |
Ben Keene | cd1e0dc | 2020-02-14 14:44:44 +0000 | [diff] [blame] | 2449 | if not self.prepare_p4_only: |
| 2450 | os.remove(fileName) |
GIRARD Etienne | b7638fe | 2015-11-24 07:43:59 +0000 | [diff] [blame] | 2451 | return submitted |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2452 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2453 | def exportGitTags(self, gitTags): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 2454 | """Export git tags as p4 labels. Create a p4 label and then tag with |
| 2455 | that. |
| 2456 | """ |
| 2457 | |
Luke Diamand | c8942a2 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2458 | validLabelRegexp = gitConfig("git-p4.labelExportRegexp") |
| 2459 | if len(validLabelRegexp) == 0: |
| 2460 | validLabelRegexp = defaultLabelRegexp |
| 2461 | m = re.compile(validLabelRegexp) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2462 | |
| 2463 | for name in gitTags: |
| 2464 | |
| 2465 | if not m.match(name): |
| 2466 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2467 | print("tag %s does not match regexp %s" % (name, validLabelRegexp)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2468 | continue |
| 2469 | |
| 2470 | # Get the p4 commit this corresponds to |
Luke Diamand | c8942a2 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2471 | logMessage = extractLogMessageFromGitCommit(name) |
| 2472 | values = extractSettingsGitLog(logMessage) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2473 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 2474 | if 'change' not in values: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2475 | # a tag pointing to something not sent to p4; ignore |
| 2476 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2477 | print("git tag %s does not give a p4 commit" % name) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2478 | continue |
Luke Diamand | c8942a2 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2479 | else: |
| 2480 | changelist = values['change'] |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2481 | |
| 2482 | # Get the tag details. |
| 2483 | inHeader = True |
| 2484 | isAnnotated = False |
| 2485 | body = [] |
| 2486 | for l in read_pipe_lines(["git", "cat-file", "-p", name]): |
| 2487 | l = l.strip() |
| 2488 | if inHeader: |
| 2489 | if re.match(r'tag\s+', l): |
| 2490 | isAnnotated = True |
| 2491 | elif re.match(r'\s*$', l): |
| 2492 | inHeader = False |
| 2493 | continue |
| 2494 | else: |
| 2495 | body.append(l) |
| 2496 | |
| 2497 | if not isAnnotated: |
| 2498 | body = ["lightweight tag imported by git p4\n"] |
| 2499 | |
| 2500 | # Create the label - use the same view as the client spec we are using |
| 2501 | clientSpec = getClientSpec() |
| 2502 | |
Joel Holdsworth | 6febb9f | 2022-04-01 15:24:58 +0100 | [diff] [blame] | 2503 | labelTemplate = "Label: %s\n" % name |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2504 | labelTemplate += "Description:\n" |
| 2505 | for b in body: |
| 2506 | labelTemplate += "\t" + b + "\n" |
| 2507 | labelTemplate += "View:\n" |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2508 | for depot_side in clientSpec.mappings: |
| 2509 | labelTemplate += "\t%s\n" % depot_side |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2510 | |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2511 | if self.dry_run: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2512 | print("Would create p4 label %s for tag" % name) |
Pete Wyckoff | 728b7ad | 2012-09-09 16:16:12 -0400 | [diff] [blame] | 2513 | elif self.prepare_p4_only: |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2514 | print("Not creating p4 label %s for tag due to option" |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2515 | " --prepare-p4-only" % name) |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2516 | else: |
| 2517 | p4_write_pipe(["label", "-i"], labelTemplate) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2518 | |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2519 | # Use the label |
| 2520 | p4_system(["tag", "-l", name] + |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2521 | ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings]) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2522 | |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2523 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2524 | print("created p4 label for tag %s" % name) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2525 | |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2526 | def run(self, args): |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 2527 | if len(args) == 0: |
| 2528 | self.master = currentGitBranch() |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 2529 | elif len(args) == 1: |
| 2530 | self.master = args[0] |
Pete Wyckoff | 28755db | 2011-12-24 21:07:40 -0500 | [diff] [blame] | 2531 | if not branchExists(self.master): |
| 2532 | die("Branch %s does not exist" % self.master) |
Simon Hausmann | c9b50e6 | 2007-03-29 19:15:24 +0200 | [diff] [blame] | 2533 | else: |
| 2534 | return False |
| 2535 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2536 | for i in self.update_shelve: |
| 2537 | if i <= 0: |
| 2538 | sys.exit("invalid changelist %d" % i) |
| 2539 | |
Luke Diamand | 00ad6e3 | 2015-11-21 09:54:41 +0000 | [diff] [blame] | 2540 | if self.master: |
| 2541 | allowSubmit = gitConfig("git-p4.allowSubmit") |
| 2542 | if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","): |
| 2543 | die("%s is not in git-p4.allowSubmit" % self.master) |
Jing Xue | 4c2d5d7 | 2008-06-22 14:12:39 -0400 | [diff] [blame] | 2544 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 2545 | upstream, settings = findUpstreamBranchPoint() |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 2546 | self.depotPath = settings['depot-paths'][0] |
Simon Hausmann | 27d2d81 | 2007-06-12 14:31:59 +0200 | [diff] [blame] | 2547 | if len(self.origin) == 0: |
| 2548 | self.origin = upstream |
Simon Hausmann | a3fdd57 | 2007-06-07 22:54:32 +0200 | [diff] [blame] | 2549 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2550 | if len(self.update_shelve) > 0: |
Luke Diamand | 46c609e | 2016-12-02 22:43:19 +0000 | [diff] [blame] | 2551 | self.shelve = True |
| 2552 | |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2553 | if self.preserveUser: |
| 2554 | if not self.canChangeChangelists(): |
| 2555 | die("Cannot preserve user names without p4 super-user or admin permissions") |
| 2556 | |
Pete Wyckoff | 6bbfd13 | 2012-09-09 16:16:13 -0400 | [diff] [blame] | 2557 | # if not set from the command line, try the config file |
| 2558 | if self.conflict_behavior is None: |
| 2559 | val = gitConfig("git-p4.conflict") |
| 2560 | if val: |
| 2561 | if val not in self.conflict_behavior_choices: |
| 2562 | die("Invalid value '%s' for config git-p4.conflict" % val) |
| 2563 | else: |
| 2564 | val = "ask" |
| 2565 | self.conflict_behavior = val |
| 2566 | |
Simon Hausmann | a3fdd57 | 2007-06-07 22:54:32 +0200 | [diff] [blame] | 2567 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2568 | print("Origin branch is " + self.origin) |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 2569 | |
Simon Hausmann | ea99c3a | 2007-08-08 17:06:55 +0200 | [diff] [blame] | 2570 | if len(self.depotPath) == 0: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2571 | print("Internal error: cannot locate perforce depot path from existing branches") |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 2572 | sys.exit(128) |
| 2573 | |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 2574 | self.useClientSpec = False |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2575 | if gitConfigBool("git-p4.useclientspec"): |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 2576 | self.useClientSpec = True |
| 2577 | if self.useClientSpec: |
| 2578 | self.clientSpecDirs = getClientSpec() |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 2579 | |
Ville Skyttä | 2e3a16b | 2016-08-09 11:53:38 +0300 | [diff] [blame] | 2580 | # Check for the existence of P4 branches |
Vitor Antunes | cd88410 | 2015-04-21 23:49:30 +0100 | [diff] [blame] | 2581 | branchesDetected = (len(p4BranchesInGit().keys()) > 1) |
| 2582 | |
| 2583 | if self.useClientSpec and not branchesDetected: |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 2584 | # all files are relative to the client spec |
| 2585 | self.clientPath = getClientRoot() |
| 2586 | else: |
| 2587 | self.clientPath = p4Where(self.depotPath) |
| 2588 | |
| 2589 | if self.clientPath == "": |
| 2590 | die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath) |
Simon Hausmann | 9512497 | 2007-03-23 09:16:07 +0100 | [diff] [blame] | 2591 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2592 | print("Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)) |
Simon Hausmann | 7944f14 | 2007-05-21 11:04:26 +0200 | [diff] [blame] | 2593 | self.oldWorkingDirectory = os.getcwd() |
Simon Hausmann | c1b296b | 2007-05-20 16:55:05 +0200 | [diff] [blame] | 2594 | |
Gary Gibbons | 0591cfa | 2011-12-09 18:48:14 -0500 | [diff] [blame] | 2595 | # ensure the clientPath exists |
Pete Wyckoff | 8d7ec36 | 2012-04-29 20:57:14 -0400 | [diff] [blame] | 2596 | new_client_dir = False |
Gary Gibbons | 0591cfa | 2011-12-09 18:48:14 -0500 | [diff] [blame] | 2597 | if not os.path.exists(self.clientPath): |
Pete Wyckoff | 8d7ec36 | 2012-04-29 20:57:14 -0400 | [diff] [blame] | 2598 | new_client_dir = True |
Gary Gibbons | 0591cfa | 2011-12-09 18:48:14 -0500 | [diff] [blame] | 2599 | os.makedirs(self.clientPath) |
| 2600 | |
Miklós Fazekas | bbd8486 | 2013-03-11 17:45:29 -0400 | [diff] [blame] | 2601 | chdir(self.clientPath, is_client_path=True) |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2602 | if self.dry_run: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2603 | print("Would synchronize p4 checkout in %s" % self.clientPath) |
Pete Wyckoff | 8d7ec36 | 2012-04-29 20:57:14 -0400 | [diff] [blame] | 2604 | else: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2605 | print("Synchronizing p4 checkout...") |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2606 | if new_client_dir: |
| 2607 | # old one was destroyed, and maybe nobody told p4 |
| 2608 | p4_sync("...", "-f") |
| 2609 | else: |
| 2610 | p4_sync("...") |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2611 | self.check() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2612 | |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 2613 | commits = [] |
Luke Diamand | 00ad6e3 | 2015-11-21 09:54:41 +0000 | [diff] [blame] | 2614 | if self.master: |
Ævar Arnfjörð Bjarmason | 89f32a9 | 2018-05-10 12:43:00 +0000 | [diff] [blame] | 2615 | committish = self.master |
Luke Diamand | 00ad6e3 | 2015-11-21 09:54:41 +0000 | [diff] [blame] | 2616 | else: |
Ævar Arnfjörð Bjarmason | 89f32a9 | 2018-05-10 12:43:00 +0000 | [diff] [blame] | 2617 | committish = 'HEAD' |
Luke Diamand | 00ad6e3 | 2015-11-21 09:54:41 +0000 | [diff] [blame] | 2618 | |
Romain Merland | f55b87c | 2018-06-01 09:46:14 +0200 | [diff] [blame] | 2619 | if self.commit != "": |
| 2620 | if self.commit.find("..") != -1: |
| 2621 | limits_ish = self.commit.split("..") |
| 2622 | for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (limits_ish[0], limits_ish[1])]): |
| 2623 | commits.append(line.strip()) |
| 2624 | commits.reverse() |
| 2625 | else: |
| 2626 | commits.append(self.commit) |
| 2627 | else: |
Junio C Hamano | e638899 | 2018-06-18 10:18:41 -0700 | [diff] [blame] | 2628 | for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, committish)]): |
Romain Merland | f55b87c | 2018-06-01 09:46:14 +0200 | [diff] [blame] | 2629 | commits.append(line.strip()) |
| 2630 | commits.reverse() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2631 | |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2632 | if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"): |
Luke Diamand | 848de9c | 2011-05-13 20:46:00 +0100 | [diff] [blame] | 2633 | self.checkAuthorship = False |
| 2634 | else: |
| 2635 | self.checkAuthorship = True |
| 2636 | |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2637 | if self.preserveUser: |
| 2638 | self.checkValidP4Users(commits) |
| 2639 | |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2640 | # |
| 2641 | # Build up a set of options to be passed to diff when |
| 2642 | # submitting each commit to p4. |
| 2643 | # |
| 2644 | if self.detectRenames: |
| 2645 | # command-line -M arg |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2646 | self.diffOpts = ["-M"] |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2647 | else: |
| 2648 | # If not explicitly set check the config variable |
| 2649 | detectRenames = gitConfig("git-p4.detectRenames") |
| 2650 | |
| 2651 | if detectRenames.lower() == "false" or detectRenames == "": |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2652 | self.diffOpts = [] |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2653 | elif detectRenames.lower() == "true": |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2654 | self.diffOpts = ["-M"] |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2655 | else: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2656 | self.diffOpts = ["-M{}".format(detectRenames)] |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2657 | |
| 2658 | # no command-line arg for -C or --find-copies-harder, just |
| 2659 | # config variables |
| 2660 | detectCopies = gitConfig("git-p4.detectCopies") |
| 2661 | if detectCopies.lower() == "false" or detectCopies == "": |
| 2662 | pass |
| 2663 | elif detectCopies.lower() == "true": |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2664 | self.diffOpts.append("-C") |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2665 | else: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2666 | self.diffOpts.append("-C{}".format(detectCopies)) |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2667 | |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2668 | if gitConfigBool("git-p4.detectCopiesHarder"): |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 2669 | self.diffOpts.append("--find-copies-harder") |
Gary Gibbons | 84cb000 | 2012-07-04 09:40:19 -0400 | [diff] [blame] | 2670 | |
Luke Diamand | 8cf422d | 2017-12-21 11:06:14 +0000 | [diff] [blame] | 2671 | num_shelves = len(self.update_shelve) |
| 2672 | if num_shelves > 0 and num_shelves != len(commits): |
| 2673 | sys.exit("number of commits (%d) must match number of shelved changelist (%d)" % |
| 2674 | (len(commits), num_shelves)) |
| 2675 | |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 2676 | if not self.no_verify: |
| 2677 | try: |
| 2678 | if not run_git_hook("p4-pre-submit"): |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2679 | print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " |
| 2680 | "this pre-submission check by adding\nthe command line option '--no-verify', " |
Ben Keene | 4935c45 | 2020-02-11 18:58:01 +0000 | [diff] [blame] | 2681 | "however,\nthis will also skip the p4-changelist hook as well.") |
| 2682 | sys.exit(1) |
| 2683 | except Exception as e: |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2684 | print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed " |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 2685 | "with the error '{0}'".format(e.message)) |
Ben Keene | aa8b766 | 2020-02-11 18:58:00 +0000 | [diff] [blame] | 2686 | sys.exit(1) |
Chen Bin | 251c8c5 | 2018-07-27 21:22:22 +1000 | [diff] [blame] | 2687 | |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2688 | # |
| 2689 | # Apply the commits, one at a time. On failure, ask if should |
| 2690 | # continue to try the rest of the patches, or quit. |
| 2691 | # |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2692 | if self.dry_run: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2693 | print("Would apply") |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2694 | applied = [] |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2695 | last = len(commits) - 1 |
| 2696 | for i, commit in enumerate(commits): |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2697 | if self.dry_run: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2698 | print(" ", read_pipe(["git", "show", "-s", |
| 2699 | "--format=format:%h %s", commit])) |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2700 | ok = True |
| 2701 | else: |
| 2702 | ok = self.applyCommit(commit) |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2703 | if ok: |
| 2704 | applied.append(commit) |
Ben Keene | 2dfdd70 | 2020-05-12 13:15:59 +0000 | [diff] [blame] | 2705 | if self.prepare_p4_only: |
| 2706 | if i < last: |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 2707 | print("Processing only the first commit due to option" |
Ben Keene | 2dfdd70 | 2020-05-12 13:15:59 +0000 | [diff] [blame] | 2708 | " --prepare-p4-only") |
Pete Wyckoff | 728b7ad | 2012-09-09 16:16:12 -0400 | [diff] [blame] | 2709 | break |
Ben Keene | 2dfdd70 | 2020-05-12 13:15:59 +0000 | [diff] [blame] | 2710 | else: |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2711 | if i < last: |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 2712 | # prompt for what to do, or use the option/variable |
| 2713 | if self.conflict_behavior == "ask": |
| 2714 | print("What do you want to do?") |
| 2715 | response = prompt("[s]kip this commit but apply the rest, or [q]uit? ") |
| 2716 | elif self.conflict_behavior == "skip": |
| 2717 | response = "s" |
| 2718 | elif self.conflict_behavior == "quit": |
| 2719 | response = "q" |
| 2720 | else: |
| 2721 | die("Unknown conflict_behavior '%s'" % |
| 2722 | self.conflict_behavior) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2723 | |
Ben Keene | e2aed5f | 2019-12-16 14:02:19 +0000 | [diff] [blame] | 2724 | if response == "s": |
| 2725 | print("Skipping this commit, but applying the rest") |
| 2726 | if response == "q": |
| 2727 | print("Quitting") |
Pete Wyckoff | 7e5dd9f | 2012-09-09 16:16:05 -0400 | [diff] [blame] | 2728 | break |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2729 | |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2730 | chdir(self.oldWorkingDirectory) |
Vinicius Kursancew | b34fa57 | 2016-11-28 09:33:18 +0000 | [diff] [blame] | 2731 | shelved_applied = "shelved" if self.shelve else "applied" |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2732 | if self.dry_run: |
| 2733 | pass |
Pete Wyckoff | 728b7ad | 2012-09-09 16:16:12 -0400 | [diff] [blame] | 2734 | elif self.prepare_p4_only: |
| 2735 | pass |
Pete Wyckoff | ef739f0 | 2012-09-09 16:16:11 -0400 | [diff] [blame] | 2736 | elif len(commits) == len(applied): |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2737 | print("All commits {0}!".format(shelved_applied)) |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 2738 | |
Simon Hausmann | 4c750c0 | 2008-02-19 09:37:16 +0100 | [diff] [blame] | 2739 | sync = P4Sync() |
Pete Wyckoff | 44e8d26 | 2013-01-14 19:47:08 -0500 | [diff] [blame] | 2740 | if self.branch: |
| 2741 | sync.branch = self.branch |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 2742 | if self.disable_p4sync: |
| 2743 | sync.sync_origin_only() |
| 2744 | else: |
| 2745 | sync.run([]) |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 2746 | |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 2747 | if not self.disable_rebase: |
| 2748 | rebase = P4Rebase() |
| 2749 | rebase.rebase() |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 2750 | |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2751 | else: |
| 2752 | if len(applied) == 0: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2753 | print("No commits {0}.".format(shelved_applied)) |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2754 | else: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2755 | print("{0} only the commits marked with '*':".format(shelved_applied.capitalize())) |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2756 | for c in commits: |
| 2757 | if c in applied: |
| 2758 | star = "*" |
| 2759 | else: |
| 2760 | star = " " |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2761 | print(star, read_pipe(["git", "show", "-s", |
| 2762 | "--format=format:%h %s", c])) |
| 2763 | print("You will have to do 'git p4 sync' and rebase.") |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2764 | |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 2765 | if gitConfigBool("git-p4.exportLabels"): |
Luke Diamand | 06dcd15 | 2012-05-11 07:25:18 +0100 | [diff] [blame] | 2766 | self.exportLabels = True |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2767 | |
| 2768 | if self.exportLabels: |
| 2769 | p4Labels = getP4Labels(self.depotPath) |
| 2770 | gitTags = getGitTags() |
| 2771 | |
| 2772 | missingGitTags = gitTags - p4Labels |
| 2773 | self.exportGitTags(missingGitTags) |
| 2774 | |
OndÅ™ej BÃlka | 98e023d | 2013-07-29 10:18:21 +0200 | [diff] [blame] | 2775 | # exit with error unless everything applied perfectly |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2776 | if len(commits) != len(applied): |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 2777 | sys.exit(1) |
Pete Wyckoff | 67b0fe2 | 2012-09-09 16:16:03 -0400 | [diff] [blame] | 2778 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2779 | return True |
| 2780 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 2781 | |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2782 | class View(object): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2783 | """Represent a p4 view ("p4 help views"), and map files in a repo according |
| 2784 | to the view. |
| 2785 | """ |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2786 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2787 | def __init__(self, client_name): |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2788 | self.mappings = [] |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2789 | self.client_prefix = "//%s/" % client_name |
| 2790 | # cache results of "p4 where" to lookup client file locations |
| 2791 | self.client_spec_path_cache = {} |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2792 | |
| 2793 | def append(self, view_line): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2794 | """Parse a view line, splitting it into depot and client sides. Append |
| 2795 | to self.mappings, preserving order. This is only needed for tag |
| 2796 | creation. |
| 2797 | """ |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2798 | |
| 2799 | # Split the view line into exactly two words. P4 enforces |
| 2800 | # structure on these lines that simplifies this quite a bit. |
| 2801 | # |
| 2802 | # Either or both words may be double-quoted. |
| 2803 | # Single quotes do not matter. |
| 2804 | # Double-quote marks cannot occur inside the words. |
| 2805 | # A + or - prefix is also inside the quotes. |
| 2806 | # There are no quotes unless they contain a space. |
| 2807 | # The line is already white-space stripped. |
| 2808 | # The two words are separated by a single space. |
| 2809 | # |
| 2810 | if view_line[0] == '"': |
| 2811 | # First word is double quoted. Find its end. |
| 2812 | close_quote_index = view_line.find('"', 1) |
| 2813 | if close_quote_index <= 0: |
| 2814 | die("No first-word closing quote found: %s" % view_line) |
| 2815 | depot_side = view_line[1:close_quote_index] |
| 2816 | # skip closing quote and space |
| 2817 | rhs_index = close_quote_index + 1 + 1 |
| 2818 | else: |
| 2819 | space_index = view_line.find(" ") |
| 2820 | if space_index <= 0: |
| 2821 | die("No word-splitting space found: %s" % view_line) |
| 2822 | depot_side = view_line[0:space_index] |
| 2823 | rhs_index = space_index + 1 |
| 2824 | |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2825 | # prefix + means overlay on previous mapping |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2826 | if depot_side.startswith("+"): |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2827 | depot_side = depot_side[1:] |
| 2828 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2829 | # prefix - means exclude this path, leave out of mappings |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2830 | exclude = False |
| 2831 | if depot_side.startswith("-"): |
| 2832 | exclude = True |
| 2833 | depot_side = depot_side[1:] |
| 2834 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2835 | if not exclude: |
| 2836 | self.mappings.append(depot_side) |
| 2837 | |
| 2838 | def convert_client_path(self, clientFile): |
| 2839 | # chop off //client/ part to make it relative |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2840 | if not decode_path(clientFile).startswith(self.client_prefix): |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2841 | die("No prefix '%s' on clientFile '%s'" % |
| 2842 | (self.client_prefix, clientFile)) |
| 2843 | return clientFile[len(self.client_prefix):] |
| 2844 | |
| 2845 | def update_client_spec_path_cache(self, files): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2846 | """Caching file paths by "p4 where" batch query.""" |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2847 | |
| 2848 | # List depot file paths exclude that already cached |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2849 | fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache] |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2850 | |
| 2851 | if len(fileArgs) == 0: |
| 2852 | return # All files in cache |
| 2853 | |
| 2854 | where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs) |
| 2855 | for res in where_result: |
| 2856 | if "code" in res and res["code"] == "error": |
| 2857 | # assume error is "... file(s) not in client view" |
| 2858 | continue |
| 2859 | if "clientFile" not in res: |
Pete Wyckoff | 2000544 | 2014-01-21 18:16:46 -0500 | [diff] [blame] | 2860 | die("No clientFile in 'p4 where' output") |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2861 | if "unmap" in res: |
| 2862 | # it will list all of them, but only one not unmap-ped |
| 2863 | continue |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2864 | depot_path = decode_path(res['depotFile']) |
Lars Schneider | a0a50d8 | 2015-08-28 14:00:34 +0200 | [diff] [blame] | 2865 | if gitConfigBool("core.ignorecase"): |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2866 | depot_path = depot_path.lower() |
| 2867 | self.client_spec_path_cache[depot_path] = self.convert_client_path(res["clientFile"]) |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2868 | |
| 2869 | # not found files or unmap files set to "" |
| 2870 | for depotFile in fileArgs: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2871 | depotFile = decode_path(depotFile) |
Lars Schneider | a0a50d8 | 2015-08-28 14:00:34 +0200 | [diff] [blame] | 2872 | if gitConfigBool("core.ignorecase"): |
| 2873 | depotFile = depotFile.lower() |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2874 | if depotFile not in self.client_spec_path_cache: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2875 | self.client_spec_path_cache[depotFile] = b'' |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2876 | |
| 2877 | def map_in_client(self, depot_path): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 2878 | """Return the relative location in the client where this depot file |
| 2879 | should live. |
| 2880 | |
| 2881 | Returns "" if the file should not be mapped in the client. |
| 2882 | """ |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2883 | |
Lars Schneider | a0a50d8 | 2015-08-28 14:00:34 +0200 | [diff] [blame] | 2884 | if gitConfigBool("core.ignorecase"): |
| 2885 | depot_path = depot_path.lower() |
| 2886 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2887 | if depot_path in self.client_spec_path_cache: |
| 2888 | return self.client_spec_path_cache[depot_path] |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2889 | |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 2890 | die("Error: %s is not found in client spec path" % depot_path) |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 2891 | return "" |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2892 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 2893 | |
Mazo, Andrey | ff8c50e | 2019-04-01 18:02:26 +0000 | [diff] [blame] | 2894 | def cloneExcludeCallback(option, opt_str, value, parser): |
| 2895 | # prepend "/" because the first "/" was consumed as part of the option itself. |
| 2896 | # ("-//depot/A/..." becomes "/depot/A/..." after option parsing) |
| 2897 | parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)] |
| 2898 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 2899 | |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2900 | class P4Sync(Command, P4UserMap): |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 2901 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2902 | def __init__(self): |
| 2903 | Command.__init__(self) |
Luke Diamand | 3ea2cfd | 2011-04-21 20:50:23 +0100 | [diff] [blame] | 2904 | P4UserMap.__init__(self) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2905 | self.options = [ |
| 2906 | optparse.make_option("--branch", dest="branch"), |
| 2907 | optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"), |
| 2908 | optparse.make_option("--changesfile", dest="changesFile"), |
| 2909 | optparse.make_option("--silent", dest="silent", action="store_true"), |
Simon Hausmann | ef48f90 | 2007-05-17 22:17:49 +0200 | [diff] [blame] | 2910 | optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"), |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2911 | optparse.make_option("--import-labels", dest="importLabels", action="store_true"), |
Han-Wen Nienhuys | d2c6dd3 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 2912 | optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false", |
| 2913 | help="Import into refs/heads/ , not refs/remotes"), |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 2914 | optparse.make_option("--max-changes", dest="maxChanges", |
| 2915 | help="Maximum number of changes to import"), |
| 2916 | optparse.make_option("--changes-block-size", dest="changes_block_size", type="int", |
| 2917 | help="Internal block size to use when iteratively calling p4 changes"), |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 2918 | optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true', |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 2919 | help="Keep entire BRANCH/DIR/SUBDIR prefix during import"), |
| 2920 | optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true', |
Luke Diamand | 51334bb | 2015-01-17 20:56:38 +0000 | [diff] [blame] | 2921 | help="Only sync files that are included in the Perforce Client Spec"), |
| 2922 | optparse.make_option("-/", dest="cloneExclude", |
Mazo, Andrey | ff8c50e | 2019-04-01 18:02:26 +0000 | [diff] [blame] | 2923 | action="callback", callback=cloneExcludeCallback, type="string", |
Luke Diamand | 51334bb | 2015-01-17 20:56:38 +0000 | [diff] [blame] | 2924 | help="exclude depot path"), |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2925 | ] |
| 2926 | self.description = """Imports from Perforce into a git repository.\n |
| 2927 | example: |
| 2928 | //depot/my/project/ -- to import the current head |
| 2929 | //depot/my/project/@all -- to import everything |
| 2930 | //depot/my/project/@1,6 -- to import only from revision 1 to 6 |
| 2931 | |
| 2932 | (a ... is not needed in the path p4 specification, it's added implicitly)""" |
| 2933 | |
| 2934 | self.usage += " //depot/path[@revRange]" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2935 | self.silent = False |
Reilly Grant | 1d7367d | 2009-09-10 00:02:38 -0700 | [diff] [blame] | 2936 | self.createdBranches = set() |
| 2937 | self.committedChanges = set() |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 2938 | self.branch = "" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2939 | self.detectBranches = False |
Simon Hausmann | cb53e1f | 2007-04-08 00:12:02 +0200 | [diff] [blame] | 2940 | self.detectLabels = False |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 2941 | self.importLabels = False |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2942 | self.changesFile = "" |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 2943 | self.syncWithOrigin = True |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 2944 | self.importIntoRemotes = True |
Simon Hausmann | 01a9c9c | 2007-05-23 00:07:35 +0200 | [diff] [blame] | 2945 | self.maxChanges = "" |
Luke Diamand | 1051ef0 | 2015-06-10 08:30:59 +0100 | [diff] [blame] | 2946 | self.changes_block_size = None |
Han-Wen Nienhuys | 8b41a97 | 2007-05-23 18:20:53 -0300 | [diff] [blame] | 2947 | self.keepRepoPath = False |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 2948 | self.depotPaths = None |
Simon Hausmann | 3c69964 | 2007-06-16 13:09:21 +0200 | [diff] [blame] | 2949 | self.p4BranchesInGit = [] |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 2950 | self.cloneExclude = [] |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 2951 | self.useClientSpec = False |
Pete Wyckoff | a93d33e | 2012-02-25 20:06:24 -0500 | [diff] [blame] | 2952 | self.useClientSpec_from_options = False |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 2953 | self.clientSpecDirs = None |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 2954 | self.tempBranches = [] |
Lars Schneider | d604176 | 2016-06-29 09:35:27 +0200 | [diff] [blame] | 2955 | self.tempBranchLocation = "refs/git-p4-tmp" |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 2956 | self.largeFileSystem = None |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 2957 | self.suppress_meta_comment = False |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 2958 | |
| 2959 | if gitConfig('git-p4.largeFileSystem'): |
| 2960 | largeFileSystemConstructor = globals()[gitConfig('git-p4.largeFileSystem')] |
| 2961 | self.largeFileSystem = largeFileSystemConstructor( |
| 2962 | lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents) |
| 2963 | ) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 2964 | |
Simon Hausmann | 0126510 | 2007-05-25 10:36:10 +0200 | [diff] [blame] | 2965 | if gitConfig("git-p4.syncFromOrigin") == "false": |
| 2966 | self.syncWithOrigin = False |
| 2967 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 2968 | self.depotPaths = [] |
| 2969 | self.changeRange = "" |
| 2970 | self.previousDepotPaths = [] |
| 2971 | self.hasOrigin = False |
| 2972 | |
| 2973 | # map from branch depot path to parent branch |
| 2974 | self.knownBranches = {} |
| 2975 | self.initialParents = {} |
| 2976 | |
| 2977 | self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60)) |
| 2978 | self.labels = {} |
| 2979 | |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 2980 | def checkpoint(self): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 2981 | """Force a checkpoint in fast-import and wait for it to finish.""" |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 2982 | self.gitStream.write("checkpoint\n\n") |
| 2983 | self.gitStream.write("progress checkpoint\n\n") |
Yang Zhao | 4294d74 | 2019-12-13 15:52:43 -0800 | [diff] [blame] | 2984 | self.gitStream.flush() |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 2985 | out = self.gitOutput.readline() |
| 2986 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 2987 | print("checkpoint finished: " + out) |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 2988 | |
Mazo, Andrey | a2bee10 | 2019-04-01 18:02:32 +0000 | [diff] [blame] | 2989 | def isPathWanted(self, path): |
| 2990 | for p in self.cloneExclude: |
| 2991 | if p.endswith("/"): |
| 2992 | if p4PathStartsWith(path, p): |
| 2993 | return False |
| 2994 | # "-//depot/file1" without a trailing "/" should only exclude "file1", but not "file111" or "file1_dir/file2" |
| 2995 | elif path.lower() == p.lower(): |
| 2996 | return False |
| 2997 | for p in self.depotPaths: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 2998 | if p4PathStartsWith(path, decode_path(p)): |
Mazo, Andrey | a2bee10 | 2019-04-01 18:02:32 +0000 | [diff] [blame] | 2999 | return True |
| 3000 | return False |
| 3001 | |
Joel Holdsworth | 57fe2ce | 2022-04-01 15:24:51 +0100 | [diff] [blame] | 3002 | def extractFilesFromCommit(self, commit, shelved=False, shelved_cl=0): |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3003 | files = [] |
| 3004 | fnum = 0 |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3005 | while "depotFile%s" % fnum in commit: |
Joel Holdsworth | 6febb9f | 2022-04-01 15:24:58 +0100 | [diff] [blame] | 3006 | path = commit["depotFile%s" % fnum] |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3007 | found = self.isPathWanted(decode_path(path)) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3008 | if not found: |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3009 | fnum = fnum + 1 |
| 3010 | continue |
| 3011 | |
| 3012 | file = {} |
| 3013 | file["path"] = path |
| 3014 | file["rev"] = commit["rev%s" % fnum] |
| 3015 | file["action"] = commit["action%s" % fnum] |
| 3016 | file["type"] = commit["type%s" % fnum] |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 3017 | if shelved: |
| 3018 | file["shelved_cl"] = int(shelved_cl) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3019 | files.append(file) |
| 3020 | fnum = fnum + 1 |
| 3021 | return files |
| 3022 | |
Jan Durovec | 26e6a27 | 2016-04-19 19:49:41 +0000 | [diff] [blame] | 3023 | def extractJobsFromCommit(self, commit): |
| 3024 | jobs = [] |
| 3025 | jnum = 0 |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3026 | while "job%s" % jnum in commit: |
Jan Durovec | 26e6a27 | 2016-04-19 19:49:41 +0000 | [diff] [blame] | 3027 | job = commit["job%s" % jnum] |
| 3028 | jobs.append(job) |
| 3029 | jnum = jnum + 1 |
| 3030 | return jobs |
| 3031 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3032 | def stripRepoPath(self, path, prefixes): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 3033 | """When streaming files, this is called to map a p4 depot path to where |
| 3034 | it should go in git. The prefixes are either self.depotPaths, or |
| 3035 | self.branchPrefixes in the case of branch detection. |
| 3036 | """ |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3037 | |
Ian Wienand | 3952710 | 2011-02-11 16:33:48 -0800 | [diff] [blame] | 3038 | if self.useClientSpec: |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3039 | # branch detection moves files up a level (the branch name) |
| 3040 | # from what client spec interpretation gives |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3041 | path = decode_path(self.clientSpecDirs.map_in_client(path)) |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3042 | if self.detectBranches: |
| 3043 | for b in self.knownBranches: |
Mazo, Andrey | f2768cb | 2019-04-01 18:02:24 +0000 | [diff] [blame] | 3044 | if p4PathStartsWith(path, b + "/"): |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3045 | path = path[len(b)+1:] |
| 3046 | |
| 3047 | elif self.keepRepoPath: |
| 3048 | # Preserve everything in relative path name except leading |
| 3049 | # //depot/; just look at first prefix as they all should |
| 3050 | # be in the same depot. |
| 3051 | depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0]) |
| 3052 | if p4PathStartsWith(path, depot): |
| 3053 | path = path[len(depot):] |
Ian Wienand | 3952710 | 2011-02-11 16:33:48 -0800 | [diff] [blame] | 3054 | |
Pete Wyckoff | 0d1696e | 2012-08-11 12:55:03 -0400 | [diff] [blame] | 3055 | else: |
Pete Wyckoff | 0d1696e | 2012-08-11 12:55:03 -0400 | [diff] [blame] | 3056 | for p in prefixes: |
| 3057 | if p4PathStartsWith(path, p): |
| 3058 | path = path[len(p):] |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3059 | break |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3060 | |
Pete Wyckoff | 0d1696e | 2012-08-11 12:55:03 -0400 | [diff] [blame] | 3061 | path = wildcard_decode(path) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3062 | return path |
Han-Wen Nienhuys | 6754a29 | 2007-05-23 17:41:50 -0300 | [diff] [blame] | 3063 | |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3064 | def splitFilesIntoBranches(self, commit): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 3065 | """Look at each depotFile in the commit to figure out to what branch it |
| 3066 | belongs. |
| 3067 | """ |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3068 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 3069 | if self.clientSpecDirs: |
| 3070 | files = self.extractFilesFromCommit(commit) |
| 3071 | self.clientSpecDirs.update_client_spec_path_cache(files) |
| 3072 | |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 3073 | branches = {} |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3074 | fnum = 0 |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3075 | while "depotFile%s" % fnum in commit: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3076 | raw_path = commit["depotFile%s" % fnum] |
| 3077 | path = decode_path(raw_path) |
Mazo, Andrey | d15068a | 2019-04-01 18:02:38 +0000 | [diff] [blame] | 3078 | found = self.isPathWanted(path) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3079 | if not found: |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3080 | fnum = fnum + 1 |
| 3081 | continue |
| 3082 | |
| 3083 | file = {} |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3084 | file["path"] = raw_path |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3085 | file["rev"] = commit["rev%s" % fnum] |
| 3086 | file["action"] = commit["action%s" % fnum] |
| 3087 | file["type"] = commit["type%s" % fnum] |
| 3088 | fnum = fnum + 1 |
| 3089 | |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3090 | # start with the full relative path where this file would |
| 3091 | # go in a p4 client |
| 3092 | if self.useClientSpec: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3093 | relPath = decode_path(self.clientSpecDirs.map_in_client(path)) |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3094 | else: |
| 3095 | relPath = self.stripRepoPath(path, self.depotPaths) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3096 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3097 | for branch in self.knownBranches.keys(): |
Pete Wyckoff | 21ef5df | 2012-08-11 12:55:04 -0400 | [diff] [blame] | 3098 | # add a trailing slash so that a commit into qt/4.2foo |
| 3099 | # doesn't end up in qt/4.2, e.g. |
Mazo, Andrey | f2768cb | 2019-04-01 18:02:24 +0000 | [diff] [blame] | 3100 | if p4PathStartsWith(relPath, branch + "/"): |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 3101 | if branch not in branches: |
| 3102 | branches[branch] = [] |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3103 | branches[branch].append(file) |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3104 | break |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3105 | |
| 3106 | return branches |
| 3107 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 3108 | def writeToGitStream(self, gitMode, relPath, contents): |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 3109 | self.gitStream.write(encode_text_stream(u'M {} inline {}\n'.format(gitMode, relPath))) |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 3110 | self.gitStream.write('data %d\n' % sum(len(d) for d in contents)) |
| 3111 | for d in contents: |
| 3112 | self.gitStream.write(d) |
| 3113 | self.gitStream.write('\n') |
| 3114 | |
Lars Schneider | a8b0516 | 2017-02-09 16:06:56 +0100 | [diff] [blame] | 3115 | def encodeWithUTF8(self, path): |
| 3116 | try: |
| 3117 | path.decode('ascii') |
| 3118 | except: |
| 3119 | encoding = 'utf8' |
| 3120 | if gitConfig('git-p4.pathEncoding'): |
| 3121 | encoding = gitConfig('git-p4.pathEncoding') |
| 3122 | path = path.decode(encoding, 'replace').encode('utf8', 'replace') |
| 3123 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3124 | print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path)) |
Lars Schneider | a8b0516 | 2017-02-09 16:06:56 +0100 | [diff] [blame] | 3125 | return path |
| 3126 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3127 | def streamOneP4File(self, file, contents): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3128 | """Output one file from the P4 stream. |
| 3129 | |
| 3130 | This is a helper for streamP4Files(). |
| 3131 | """ |
| 3132 | |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3133 | file_path = file['depotFile'] |
| 3134 | relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes) |
| 3135 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3136 | if verbose: |
Luke Diamand | 0742b7c | 2018-10-12 06:28:31 +0100 | [diff] [blame] | 3137 | if 'fileSize' in self.stream_file: |
| 3138 | size = int(self.stream_file['fileSize']) |
| 3139 | else: |
Joel Holdsworth | 4768af2 | 2022-04-01 15:25:02 +0100 | [diff] [blame] | 3140 | # Deleted files don't get a fileSize apparently |
| 3141 | size = 0 |
Joel Holdsworth | ae9b950 | 2021-12-19 15:40:27 +0000 | [diff] [blame] | 3142 | sys.stdout.write('\r%s --> %s (%s)\n' % ( |
| 3143 | file_path, relPath, format_size_human_readable(size))) |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3144 | sys.stdout.flush() |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3145 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 3146 | type_base, type_mods = split_p4_type(file["type"]) |
Pete Wyckoff | 9cffb8c | 2011-10-16 10:45:01 -0400 | [diff] [blame] | 3147 | |
| 3148 | git_mode = "100644" |
| 3149 | if "x" in type_mods: |
| 3150 | git_mode = "100755" |
| 3151 | if type_base == "symlink": |
| 3152 | git_mode = "120000" |
Alexandru Juncu | 1292df1 | 2013-08-08 16:17:38 +0300 | [diff] [blame] | 3153 | # p4 print on a symlink sometimes contains "target\n"; |
| 3154 | # if it does, remove the newline |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 3155 | data = ''.join(decode_text_stream(c) for c in contents) |
Pete Wyckoff | 40f846c | 2014-01-21 18:16:40 -0500 | [diff] [blame] | 3156 | if not data: |
| 3157 | # Some version of p4 allowed creating a symlink that pointed |
| 3158 | # to nothing. This causes p4 errors when checking out such |
| 3159 | # a change, and errors here too. Work around it by ignoring |
| 3160 | # the bad symlink; hopefully a future change fixes it. |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3161 | print("\nIgnoring empty symlink in %s" % file_path) |
Pete Wyckoff | 40f846c | 2014-01-21 18:16:40 -0500 | [diff] [blame] | 3162 | return |
| 3163 | elif data[-1] == '\n': |
Alexandru Juncu | 1292df1 | 2013-08-08 16:17:38 +0300 | [diff] [blame] | 3164 | contents = [data[:-1]] |
| 3165 | else: |
| 3166 | contents = [data] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3167 | |
Pete Wyckoff | 9cffb8c | 2011-10-16 10:45:01 -0400 | [diff] [blame] | 3168 | if type_base == "utf16": |
Pete Wyckoff | 55aa571 | 2011-09-17 19:16:14 -0400 | [diff] [blame] | 3169 | # p4 delivers different text in the python output to -G |
| 3170 | # than it does when using "print -o", or normal p4 client |
| 3171 | # operations. utf16 is converted to ascii or utf8, perhaps. |
| 3172 | # But ascii text saved as -t utf16 is completely mangled. |
| 3173 | # Invoke print -o to get the real contents. |
Pete Wyckoff | 7f0e596 | 2013-01-26 22:11:13 -0500 | [diff] [blame] | 3174 | # |
| 3175 | # On windows, the newlines will always be mangled by print, so put |
| 3176 | # them back too. This is not needed to the cygwin windows version, |
| 3177 | # just the native "NT" type. |
| 3178 | # |
Lars Schneider | 1f5f390 | 2015-09-21 12:01:41 +0200 | [diff] [blame] | 3179 | try: |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3180 | text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (decode_path(file['depotFile']), file['change'])], raw=True) |
Lars Schneider | 1f5f390 | 2015-09-21 12:01:41 +0200 | [diff] [blame] | 3181 | except Exception as e: |
| 3182 | if 'Translation of file content failed' in str(e): |
| 3183 | type_base = 'binary' |
| 3184 | else: |
| 3185 | raise e |
| 3186 | else: |
| 3187 | if p4_version_string().find('/NT') >= 0: |
Moritz Baumann | 4d35f74 | 2022-07-20 18:17:45 +0000 | [diff] [blame] | 3188 | text = text.replace(b'\x0d\x00\x0a\x00', b'\x0a\x00') |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 3189 | contents = [text] |
Pete Wyckoff | 55aa571 | 2011-09-17 19:16:14 -0400 | [diff] [blame] | 3190 | |
Pete Wyckoff | 9f7ef0e | 2011-11-05 13:36:07 -0400 | [diff] [blame] | 3191 | if type_base == "apple": |
| 3192 | # Apple filetype files will be streamed as a concatenation of |
| 3193 | # its appledouble header and the contents. This is useless |
| 3194 | # on both macs and non-macs. If using "print -q -o xx", it |
| 3195 | # will create "xx" with the data, and "%xx" with the header. |
| 3196 | # This is also not very useful. |
| 3197 | # |
| 3198 | # Ideally, someday, this script can learn how to generate |
| 3199 | # appledouble files directly and import those to git, but |
| 3200 | # non-mac machines can never find a use for apple filetype. |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3201 | print("\nIgnoring apple filetype file %s" % file['depotFile']) |
Pete Wyckoff | 9f7ef0e | 2011-11-05 13:36:07 -0400 | [diff] [blame] | 3202 | return |
| 3203 | |
Tao Klerks | fbe5f6b | 2022-04-04 05:50:36 +0000 | [diff] [blame] | 3204 | if type_base == "utf8": |
| 3205 | # The type utf8 explicitly means utf8 *with BOM*. These are |
| 3206 | # streamed just like regular text files, however, without |
| 3207 | # the BOM in the stream. |
| 3208 | # Therefore, to accurately import these files into git, we |
| 3209 | # need to explicitly re-add the BOM before writing. |
| 3210 | # 'contents' is a set of bytes in this case, so create the |
| 3211 | # BOM prefix as a b'' literal. |
| 3212 | contents = [b'\xef\xbb\xbf' + contents[0]] + contents[1:] |
| 3213 | |
Pete Wyckoff | 55aa571 | 2011-09-17 19:16:14 -0400 | [diff] [blame] | 3214 | # Note that we do not try to de-mangle keywords on utf16 files, |
| 3215 | # even though in theory somebody may want that. |
Joel Holdsworth | e665e98 | 2021-12-16 13:46:16 +0000 | [diff] [blame] | 3216 | regexp = p4_keywords_regexp_for_type(type_base, type_mods) |
| 3217 | if regexp: |
Joel Holdsworth | 70c0d55 | 2021-12-16 13:46:19 +0000 | [diff] [blame] | 3218 | contents = [regexp.sub(br'$\1$', c) for c in contents] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3219 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 3220 | if self.largeFileSystem: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 3221 | git_mode, contents = self.largeFileSystem.processContent(git_mode, relPath, contents) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3222 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 3223 | self.writeToGitStream(git_mode, relPath, contents) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3224 | |
| 3225 | def streamOneP4Deletion(self, file): |
Yang Zhao | d38208a | 2019-12-13 15:52:40 -0800 | [diff] [blame] | 3226 | relPath = self.stripRepoPath(decode_path(file['path']), self.branchPrefixes) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3227 | if verbose: |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3228 | sys.stdout.write("delete %s\n" % relPath) |
| 3229 | sys.stdout.flush() |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 3230 | self.gitStream.write(encode_text_stream(u'D {}\n'.format(relPath))) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3231 | |
Lars Schneider | a5db4b1 | 2015-09-26 09:55:03 +0200 | [diff] [blame] | 3232 | if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath): |
| 3233 | self.largeFileSystem.removeLargeFile(relPath) |
| 3234 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3235 | def streamP4FilesCb(self, marshalled): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3236 | """Handle another chunk of streaming data.""" |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3237 | |
Pete Wyckoff | 78189be | 2012-11-23 17:35:36 -0500 | [diff] [blame] | 3238 | # catch p4 errors and complain |
| 3239 | err = None |
| 3240 | if "code" in marshalled: |
| 3241 | if marshalled["code"] == "error": |
| 3242 | if "data" in marshalled: |
| 3243 | err = marshalled["data"].rstrip() |
Lars Schneider | 4d25dc4 | 2015-09-26 09:55:02 +0200 | [diff] [blame] | 3244 | |
| 3245 | if not err and 'fileSize' in self.stream_file: |
| 3246 | required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree()) |
| 3247 | if required_bytes > 0: |
Joel Holdsworth | ae9b950 | 2021-12-19 15:40:27 +0000 | [diff] [blame] | 3248 | err = 'Not enough space left on %s! Free at least %s.' % ( |
| 3249 | os.getcwd(), format_size_human_readable(required_bytes)) |
Lars Schneider | 4d25dc4 | 2015-09-26 09:55:02 +0200 | [diff] [blame] | 3250 | |
Pete Wyckoff | 78189be | 2012-11-23 17:35:36 -0500 | [diff] [blame] | 3251 | if err: |
| 3252 | f = None |
| 3253 | if self.stream_have_file_info: |
| 3254 | if "depotFile" in self.stream_file: |
| 3255 | f = self.stream_file["depotFile"] |
| 3256 | # force a failure in fast-import, else an empty |
| 3257 | # commit will be made |
| 3258 | self.gitStream.write("\n") |
| 3259 | self.gitStream.write("die-now\n") |
| 3260 | self.gitStream.close() |
| 3261 | # ignore errors, but make sure it exits first |
| 3262 | self.importProcess.wait() |
| 3263 | if f: |
| 3264 | die("Error from p4 print for %s: %s" % (f, err)) |
| 3265 | else: |
| 3266 | die("Error from p4 print: %s" % err) |
| 3267 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3268 | if 'depotFile' in marshalled and self.stream_have_file_info: |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 3269 | # start of a new file - output the old one first |
| 3270 | self.streamOneP4File(self.stream_file, self.stream_contents) |
| 3271 | self.stream_file = {} |
| 3272 | self.stream_contents = [] |
| 3273 | self.stream_have_file_info = False |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3274 | |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 3275 | # pick up the new file information... for the |
| 3276 | # 'data' field we need to append to our array |
| 3277 | for k in marshalled.keys(): |
| 3278 | if k == 'data': |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3279 | if 'streamContentSize' not in self.stream_file: |
| 3280 | self.stream_file['streamContentSize'] = 0 |
| 3281 | self.stream_file['streamContentSize'] += len(marshalled['data']) |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 3282 | self.stream_contents.append(marshalled['data']) |
| 3283 | else: |
| 3284 | self.stream_file[k] = marshalled[k] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3285 | |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3286 | if (verbose and |
Joel Holdsworth | 7a3e83d | 2022-04-01 15:24:59 +0100 | [diff] [blame] | 3287 | 'streamContentSize' in self.stream_file and |
| 3288 | 'fileSize' in self.stream_file and |
| 3289 | 'depotFile' in self.stream_file): |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3290 | size = int(self.stream_file["fileSize"]) |
| 3291 | if size > 0: |
| 3292 | progress = 100*self.stream_file['streamContentSize']/size |
Joel Holdsworth | ae9b950 | 2021-12-19 15:40:27 +0000 | [diff] [blame] | 3293 | sys.stdout.write('\r%s %d%% (%s)' % ( |
| 3294 | self.stream_file['depotFile'], progress, |
| 3295 | format_size_human_readable(size))) |
Lars Schneider | d2176a5 | 2015-09-26 09:55:01 +0200 | [diff] [blame] | 3296 | sys.stdout.flush() |
| 3297 | |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 3298 | self.stream_have_file_info = True |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3299 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3300 | def streamP4Files(self, files): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3301 | """Stream directly from "p4 files" into "git fast-import.""" |
| 3302 | |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 3303 | filesForCommit = [] |
| 3304 | filesToRead = [] |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3305 | filesToDelete = [] |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 3306 | |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 3307 | for f in files: |
Pete Wyckoff | ecb7cf9 | 2012-01-02 18:05:53 -0500 | [diff] [blame] | 3308 | filesForCommit.append(f) |
| 3309 | if f['action'] in self.delete_actions: |
| 3310 | filesToDelete.append(f) |
| 3311 | else: |
| 3312 | filesToRead.append(f) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3313 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3314 | # deleted files... |
| 3315 | for f in filesToDelete: |
| 3316 | self.streamOneP4Deletion(f) |
| 3317 | |
Simon Hausmann | 30b5940 | 2008-03-03 11:55:48 +0100 | [diff] [blame] | 3318 | if len(filesToRead) > 0: |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3319 | self.stream_file = {} |
| 3320 | self.stream_contents = [] |
| 3321 | self.stream_have_file_info = False |
| 3322 | |
Andrew Garber | c3f6163 | 2011-04-07 02:01:21 -0400 | [diff] [blame] | 3323 | # curry self argument |
| 3324 | def streamP4FilesCbSelf(entry): |
| 3325 | self.streamP4FilesCb(entry) |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3326 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 3327 | fileArgs = [] |
| 3328 | for f in filesToRead: |
| 3329 | if 'shelved_cl' in f: |
| 3330 | # Handle shelved CLs using the "p4 print file@=N" syntax to print |
| 3331 | # the contents |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 3332 | fileArg = f['path'] + encode_text_stream('@={}'.format(f['shelved_cl'])) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 3333 | else: |
Yang Zhao | 6cec21a | 2019-12-13 15:52:38 -0800 | [diff] [blame] | 3334 | fileArg = f['path'] + encode_text_stream('#{}'.format(f['rev'])) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 3335 | |
| 3336 | fileArgs.append(fileArg) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 3337 | |
| 3338 | p4CmdList(["-x", "-", "print"], |
| 3339 | stdin=fileArgs, |
| 3340 | cb=streamP4FilesCbSelf) |
Han-Wen Nienhuys | f2eda79 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3341 | |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3342 | # do the last chunk |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3343 | if 'depotFile' in self.stream_file: |
Luke Diamand | b932705 | 2009-07-30 00:13:46 +0100 | [diff] [blame] | 3344 | self.streamOneP4File(self.stream_file, self.stream_contents) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3345 | |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 3346 | def make_email(self, userid): |
| 3347 | if userid in self.users: |
| 3348 | return self.users[userid] |
| 3349 | else: |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 3350 | userid_bytes = metadata_stream_to_writable_bytes(userid) |
| 3351 | return b"%s <a@b>" % userid_bytes |
Luke Diamand | affb474 | 2012-01-19 09:52:27 +0000 | [diff] [blame] | 3352 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3353 | def streamTag(self, gitStream, labelName, labelDetails, commit, epoch): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 3354 | """Stream a p4 tag. |
| 3355 | |
| 3356 | Commit is either a git commit, or a fast-import mark, ":<p4commit>". |
| 3357 | """ |
Luke Diamand | b43702a | 2015-08-27 08:18:58 +0100 | [diff] [blame] | 3358 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3359 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3360 | print("writing tag %s for commit %s" % (labelName, commit)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3361 | gitStream.write("tag %s\n" % labelName) |
| 3362 | gitStream.write("from %s\n" % commit) |
| 3363 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3364 | if 'Owner' in labelDetails: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3365 | owner = labelDetails["Owner"] |
| 3366 | else: |
| 3367 | owner = None |
| 3368 | |
| 3369 | # Try to use the owner of the p4 label, or failing that, |
| 3370 | # the current p4 user id. |
| 3371 | if owner: |
| 3372 | email = self.make_email(owner) |
| 3373 | else: |
| 3374 | email = self.make_email(self.p4UserId()) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3375 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 3376 | gitStream.write("tagger ") |
| 3377 | gitStream.write(email) |
| 3378 | gitStream.write(" %s %s\n" % (epoch, self.tz)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3379 | |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 3380 | print("labelDetails=", labelDetails) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3381 | if 'Description' in labelDetails: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3382 | description = labelDetails['Description'] |
| 3383 | else: |
| 3384 | description = 'Label from git p4' |
| 3385 | |
| 3386 | gitStream.write("data %d\n" % len(description)) |
| 3387 | gitStream.write(description) |
| 3388 | gitStream.write("\n") |
| 3389 | |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3390 | def inClientSpec(self, path): |
| 3391 | if not self.clientSpecDirs: |
| 3392 | return True |
| 3393 | inClientSpec = self.clientSpecDirs.map_in_client(path) |
| 3394 | if not inClientSpec and self.verbose: |
| 3395 | print('Ignoring file outside of client spec: {0}'.format(path)) |
| 3396 | return inClientSpec |
| 3397 | |
| 3398 | def hasBranchPrefix(self, path): |
| 3399 | if not self.branchPrefixes: |
| 3400 | return True |
| 3401 | hasPrefix = [p for p in self.branchPrefixes |
| 3402 | if p4PathStartsWith(path, p)] |
Andrew Oakley | 09667d0 | 2016-06-22 10:26:11 +0100 | [diff] [blame] | 3403 | if not hasPrefix and self.verbose: |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3404 | print('Ignoring file outside of prefix: {0}'.format(path)) |
| 3405 | return hasPrefix |
| 3406 | |
Andrew Oakley | 82e46d6 | 2020-05-10 11:16:50 +0100 | [diff] [blame] | 3407 | def findShadowedFiles(self, files, change): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3408 | """Perforce allows you commit files and directories with the same name, |
| 3409 | so you could have files //depot/foo and //depot/foo/bar both checked |
| 3410 | in. A p4 sync of a repository in this state fails. Deleting one of |
| 3411 | the files recovers the repository. |
| 3412 | |
| 3413 | Git will not allow the broken state to exist and only the most |
| 3414 | recent of the conflicting names is left in the repository. When one |
| 3415 | of the conflicting files is deleted we need to re-add the other one |
| 3416 | to make sure the git repository recovers in the same way as |
| 3417 | perforce. |
| 3418 | """ |
| 3419 | |
Andrew Oakley | 82e46d6 | 2020-05-10 11:16:50 +0100 | [diff] [blame] | 3420 | deleted = [f for f in files if f['action'] in self.delete_actions] |
| 3421 | to_check = set() |
| 3422 | for f in deleted: |
| 3423 | path = decode_path(f['path']) |
| 3424 | to_check.add(path + '/...') |
| 3425 | while True: |
| 3426 | path = path.rsplit("/", 1)[0] |
| 3427 | if path == "/" or path in to_check: |
| 3428 | break |
| 3429 | to_check.add(path) |
| 3430 | to_check = ['%s@%s' % (wildcard_encode(p), change) for p in to_check |
| 3431 | if self.hasBranchPrefix(p)] |
| 3432 | if to_check: |
| 3433 | stat_result = p4CmdList(["-x", "-", "fstat", "-T", |
| 3434 | "depotFile,headAction,headRev,headType"], stdin=to_check) |
| 3435 | for record in stat_result: |
| 3436 | if record['code'] != 'stat': |
| 3437 | continue |
| 3438 | if record['headAction'] in self.delete_actions: |
| 3439 | continue |
| 3440 | files.append({ |
| 3441 | 'action': 'add', |
| 3442 | 'path': record['depotFile'], |
| 3443 | 'rev': record['headRev'], |
| 3444 | 'type': record['headType']}) |
| 3445 | |
Joel Holdsworth | 57fe2ce | 2022-04-01 15:24:51 +0100 | [diff] [blame] | 3446 | def commit(self, details, files, branch, parent="", allow_empty=False): |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3447 | epoch = details["time"] |
| 3448 | author = details["user"] |
Jan Durovec | 26e6a27 | 2016-04-19 19:49:41 +0000 | [diff] [blame] | 3449 | jobs = self.extractJobsFromCommit(details) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3450 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3451 | if self.verbose: |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3452 | print('commit into {0}'.format(branch)) |
Han-Wen Nienhuys | 96e07dd | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3453 | |
Andrew Oakley | 82e46d6 | 2020-05-10 11:16:50 +0100 | [diff] [blame] | 3454 | files = [f for f in files |
| 3455 | if self.hasBranchPrefix(decode_path(f['path']))] |
| 3456 | self.findShadowedFiles(files, details['change']) |
| 3457 | |
Kazuki Saitoh | 9d57c4a | 2013-08-30 19:02:06 +0900 | [diff] [blame] | 3458 | if self.clientSpecDirs: |
| 3459 | self.clientSpecDirs.update_client_spec_path_cache(files) |
| 3460 | |
Andrew Oakley | 82e46d6 | 2020-05-10 11:16:50 +0100 | [diff] [blame] | 3461 | files = [f for f in files if self.inClientSpec(decode_path(f['path']))] |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3462 | |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 3463 | if gitConfigBool('git-p4.keepEmptyCommits'): |
| 3464 | allow_empty = True |
| 3465 | |
| 3466 | if not files and not allow_empty: |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3467 | print('Ignoring revision {0} as it would produce an empty commit.' |
| 3468 | .format(details['change'])) |
| 3469 | return |
| 3470 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3471 | self.gitStream.write("commit %s\n" % branch) |
Luke Diamand | b43702a | 2015-08-27 08:18:58 +0100 | [diff] [blame] | 3472 | self.gitStream.write("mark :%s\n" % details["change"]) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3473 | self.committedChanges.add(int(details["change"])) |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 3474 | if author not in self.users: |
| 3475 | self.getUserMapFromPerforceServer() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3476 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 3477 | self.gitStream.write("committer ") |
| 3478 | self.gitStream.write(self.make_email(author)) |
| 3479 | self.gitStream.write(" %s %s\n" % (epoch, self.tz)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3480 | |
| 3481 | self.gitStream.write("data <<EOT\n") |
| 3482 | self.gitStream.write(details["desc"]) |
Jan Durovec | 26e6a27 | 2016-04-19 19:49:41 +0000 | [diff] [blame] | 3483 | if len(jobs) > 0: |
| 3484 | self.gitStream.write("\nJobs: %s" % (' '.join(jobs))) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 3485 | |
| 3486 | if not self.suppress_meta_comment: |
| 3487 | self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" % |
| 3488 | (','.join(self.branchPrefixes), details["change"])) |
| 3489 | if len(details['options']) > 0: |
| 3490 | self.gitStream.write(": options = %s" % details['options']) |
| 3491 | self.gitStream.write("]\n") |
| 3492 | |
| 3493 | self.gitStream.write("EOT\n\n") |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3494 | |
| 3495 | if len(parent) > 0: |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3496 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3497 | print("parent %s" % parent) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3498 | self.gitStream.write("from %s\n" % parent) |
| 3499 | |
Lars Schneider | 4ae048e | 2015-12-08 10:36:22 +0100 | [diff] [blame] | 3500 | self.streamP4Files(files) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3501 | self.gitStream.write("\n") |
| 3502 | |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3503 | change = int(details["change"]) |
| 3504 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3505 | if change in self.labels: |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3506 | label = self.labels[change] |
| 3507 | labelDetails = label[0] |
| 3508 | labelRevisions = label[1] |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3509 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3510 | print("Change %s is labelled %s" % (change, labelDetails)) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3511 | |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 3512 | files = p4CmdList(["files"] + ["%s...@%s" % (p, change) |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3513 | for p in self.branchPrefixes]) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3514 | |
| 3515 | if len(files) == len(labelRevisions): |
| 3516 | |
| 3517 | cleanedFiles = {} |
| 3518 | for info in files: |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 3519 | if info["action"] in self.delete_actions: |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3520 | continue |
| 3521 | cleanedFiles[info["depotFile"]] = info["rev"] |
| 3522 | |
| 3523 | if cleanedFiles == labelRevisions: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3524 | self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3525 | |
| 3526 | else: |
Simon Hausmann | a46668f | 2007-03-28 17:05:38 +0200 | [diff] [blame] | 3527 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3528 | print("Tag %s does not match with change %s: files do not match." |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 3529 | % (labelDetails["label"], change)) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3530 | |
| 3531 | else: |
Simon Hausmann | a46668f | 2007-03-28 17:05:38 +0200 | [diff] [blame] | 3532 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3533 | print("Tag %s does not match with change %s: file count is different." |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 3534 | % (labelDetails["label"], change)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 3535 | |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3536 | def getLabels(self): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3537 | """Build a dictionary of changelists and labels, for "detect-labels" |
| 3538 | option. |
| 3539 | """ |
| 3540 | |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3541 | self.labels = {} |
| 3542 | |
Luke Diamand | 52a4880 | 2012-01-19 09:52:25 +0000 | [diff] [blame] | 3543 | l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths]) |
Simon Hausmann | 10c3211 | 2007-04-08 10:15:47 +0200 | [diff] [blame] | 3544 | if len(l) > 0 and not self.silent: |
Luke Diamand | 4d88519 | 2018-06-19 09:04:08 +0100 | [diff] [blame] | 3545 | print("Finding files belonging to labels in %s" % self.depotPaths) |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 3546 | |
| 3547 | for output in l: |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3548 | label = output["label"] |
| 3549 | revisions = {} |
| 3550 | newestChange = 0 |
Simon Hausmann | 71b112d | 2007-05-19 11:54:11 +0200 | [diff] [blame] | 3551 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3552 | print("Querying files for label %s" % label) |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 3553 | for file in p4CmdList(["files"] + |
| 3554 | ["%s...@%s" % (p, label) |
| 3555 | for p in self.depotPaths]): |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3556 | revisions[file["depotFile"]] = file["rev"] |
| 3557 | change = int(file["change"]) |
| 3558 | if change > newestChange: |
| 3559 | newestChange = change |
| 3560 | |
Simon Hausmann | 9bda3a8 | 2007-05-19 12:05:40 +0200 | [diff] [blame] | 3561 | self.labels[newestChange] = [output, revisions] |
| 3562 | |
| 3563 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3564 | print("Label changes: %s" % self.labels.keys()) |
Simon Hausmann | 1f4ba1c | 2007-03-26 22:34:34 +0200 | [diff] [blame] | 3565 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3566 | def importP4Labels(self, stream, p4Labels): |
Joel Holdsworth | 522e914 | 2022-04-01 15:24:47 +0100 | [diff] [blame] | 3567 | """Import p4 labels as git tags. A direct mapping does not exist, so |
| 3568 | assume that if all the files are at the same revision then we can |
| 3569 | use that, or it's something more complicated we should just ignore. |
| 3570 | """ |
| 3571 | |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3572 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3573 | print("import p4 labels: " + ' '.join(p4Labels)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3574 | |
| 3575 | ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels") |
Luke Diamand | c8942a2 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3576 | validLabelRegexp = gitConfig("git-p4.labelImportRegexp") |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3577 | if len(validLabelRegexp) == 0: |
| 3578 | validLabelRegexp = defaultLabelRegexp |
| 3579 | m = re.compile(validLabelRegexp) |
| 3580 | |
| 3581 | for name in p4Labels: |
| 3582 | commitFound = False |
| 3583 | |
| 3584 | if not m.match(name): |
| 3585 | if verbose: |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 3586 | print("label %s does not match regexp %s" % (name, validLabelRegexp)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3587 | continue |
| 3588 | |
| 3589 | if name in ignoredP4Labels: |
| 3590 | continue |
| 3591 | |
| 3592 | labelDetails = p4CmdList(['label', "-o", name])[0] |
| 3593 | |
| 3594 | # get the most recent changelist for each file in this label |
| 3595 | change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name) |
| 3596 | for p in self.depotPaths]) |
| 3597 | |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3598 | if 'change' in change: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3599 | # find the corresponding git commit; take the oldest commit |
| 3600 | changelist = int(change['change']) |
Luke Diamand | b43702a | 2015-08-27 08:18:58 +0100 | [diff] [blame] | 3601 | if changelist in self.committedChanges: |
| 3602 | gitCommit = ":%d" % changelist # use a fast-import mark |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3603 | commitFound = True |
Luke Diamand | b43702a | 2015-08-27 08:18:58 +0100 | [diff] [blame] | 3604 | else: |
| 3605 | gitCommit = read_pipe(["git", "rev-list", "--max-count=1", |
| 3606 | "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True) |
| 3607 | if len(gitCommit) == 0: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3608 | print("importing label %s: could not find git commit for changelist %d" % (name, changelist)) |
Luke Diamand | b43702a | 2015-08-27 08:18:58 +0100 | [diff] [blame] | 3609 | else: |
| 3610 | commitFound = True |
| 3611 | gitCommit = gitCommit.strip() |
| 3612 | |
| 3613 | if commitFound: |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3614 | # Convert from p4 time format |
| 3615 | try: |
| 3616 | tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S") |
| 3617 | except ValueError: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3618 | print("Could not convert label time %s" % labelDetails['Update']) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3619 | tmwhen = 1 |
| 3620 | |
| 3621 | when = int(time.mktime(tmwhen)) |
| 3622 | self.streamTag(stream, name, labelDetails, gitCommit, when) |
| 3623 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3624 | print("p4 label %s mapped to git commit %s" % (name, gitCommit)) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3625 | else: |
| 3626 | if verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3627 | print("Label %s has no changelists - possibly deleted?" % name) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 3628 | |
| 3629 | if not commitFound: |
| 3630 | # We can't import this label; don't try again as it will get very |
| 3631 | # expensive repeatedly fetching all the files for labels that will |
| 3632 | # never be imported. If the label is moved in the future, the |
| 3633 | # ignore will need to be removed manually. |
| 3634 | system(["git", "config", "--add", "git-p4.ignoredP4Labels", name]) |
| 3635 | |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3636 | def guessProjectName(self): |
| 3637 | for p in self.depotPaths: |
Simon Hausmann | 6e5295c | 2007-06-11 08:50:57 +0200 | [diff] [blame] | 3638 | if p.endswith("/"): |
| 3639 | p = p[:-1] |
| 3640 | p = p[p.strip().rfind("/") + 1:] |
| 3641 | if not p.endswith("/"): |
Joel Holdsworth | 812ee74 | 2022-04-01 15:24:45 +0100 | [diff] [blame] | 3642 | p += "/" |
Simon Hausmann | 6e5295c | 2007-06-11 08:50:57 +0200 | [diff] [blame] | 3643 | return p |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3644 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3645 | def getBranchMapping(self): |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3646 | lostAndFoundBranches = set() |
| 3647 | |
Vitor Antunes | 8ace74c | 2011-08-19 00:44:04 +0100 | [diff] [blame] | 3648 | user = gitConfig("git-p4.branchUser") |
Vitor Antunes | 8ace74c | 2011-08-19 00:44:04 +0100 | [diff] [blame] | 3649 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 3650 | for info in p4CmdList( |
| 3651 | ["branches"] + (["-u", user] if len(user) > 0 else [])): |
Luke Diamand | 52a4880 | 2012-01-19 09:52:25 +0000 | [diff] [blame] | 3652 | details = p4Cmd(["branch", "-o", info["branch"]]) |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3653 | viewIdx = 0 |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3654 | while "View%s" % viewIdx in details: |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 3655 | paths = details["View%s" % viewIdx].split(" ") |
| 3656 | viewIdx = viewIdx + 1 |
| 3657 | # require standard //depot/foo/... //depot/bar/... mapping |
| 3658 | if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."): |
| 3659 | continue |
| 3660 | source = paths[0] |
| 3661 | destination = paths[1] |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 3662 | # HACK |
Tor Arvid Lund | d53de8b | 2011-03-15 13:08:02 +0100 | [diff] [blame] | 3663 | if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]): |
Simon Hausmann | 6509e19 | 2007-06-07 09:41:53 +0200 | [diff] [blame] | 3664 | source = source[len(self.depotPaths[0]):-4] |
| 3665 | destination = destination[len(self.depotPaths[0]):-4] |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3666 | |
Simon Hausmann | 1a2edf4 | 2007-06-17 15:10:24 +0200 | [diff] [blame] | 3667 | if destination in self.knownBranches: |
| 3668 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3669 | print("p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)) |
| 3670 | print("but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)) |
Simon Hausmann | 1a2edf4 | 2007-06-17 15:10:24 +0200 | [diff] [blame] | 3671 | continue |
| 3672 | |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3673 | self.knownBranches[destination] = source |
| 3674 | |
| 3675 | lostAndFoundBranches.discard(destination) |
| 3676 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 3677 | if source not in self.knownBranches: |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3678 | lostAndFoundBranches.add(source) |
| 3679 | |
Vitor Antunes | 7199cf1 | 2011-08-19 00:44:05 +0100 | [diff] [blame] | 3680 | # Perforce does not strictly require branches to be defined, so we also |
| 3681 | # check git config for a branch list. |
| 3682 | # |
| 3683 | # Example of branch definition in git config file: |
| 3684 | # [git-p4] |
| 3685 | # branchList=main:branchA |
| 3686 | # branchList=main:branchB |
| 3687 | # branchList=branchA:branchC |
| 3688 | configBranches = gitConfigList("git-p4.branchList") |
| 3689 | for branch in configBranches: |
| 3690 | if branch: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 3691 | source, destination = branch.split(":") |
Vitor Antunes | 7199cf1 | 2011-08-19 00:44:05 +0100 | [diff] [blame] | 3692 | self.knownBranches[destination] = source |
| 3693 | |
| 3694 | lostAndFoundBranches.discard(destination) |
| 3695 | |
| 3696 | if source not in self.knownBranches: |
| 3697 | lostAndFoundBranches.add(source) |
| 3698 | |
Simon Hausmann | 6555b2c | 2007-06-17 11:25:34 +0200 | [diff] [blame] | 3699 | for branch in lostAndFoundBranches: |
| 3700 | self.knownBranches[branch] = branch |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 3701 | |
Simon Hausmann | 38f9f5e | 2007-11-15 10:38:45 +0100 | [diff] [blame] | 3702 | def getBranchMappingFromGitBranches(self): |
| 3703 | branches = p4BranchesInGit(self.importIntoRemotes) |
| 3704 | for branch in branches.keys(): |
| 3705 | if branch == "master": |
| 3706 | branch = "main" |
| 3707 | else: |
| 3708 | branch = branch[len(self.projectName):] |
| 3709 | self.knownBranches[branch] = branch |
| 3710 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3711 | def updateOptionDict(self, d): |
| 3712 | option_keys = {} |
| 3713 | if self.keepRepoPath: |
| 3714 | option_keys['keepRepoPath'] = 1 |
| 3715 | |
| 3716 | d["options"] = ' '.join(sorted(option_keys.keys())) |
| 3717 | |
| 3718 | def readOptions(self, d): |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 3719 | self.keepRepoPath = ('options' in d |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3720 | and ('keepRepoPath' in d['options'])) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 3721 | |
Simon Hausmann | 8134f69 | 2007-08-26 16:44:55 +0200 | [diff] [blame] | 3722 | def gitRefForBranch(self, branch): |
| 3723 | if branch == "main": |
| 3724 | return self.refPrefix + "master" |
| 3725 | |
| 3726 | if len(branch) <= 0: |
| 3727 | return branch |
| 3728 | |
| 3729 | return self.refPrefix + self.projectName + branch |
| 3730 | |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3731 | def gitCommitByP4Change(self, ref, change): |
| 3732 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3733 | print("looking in ref " + ref + " for change %s using bisect..." % change) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3734 | |
| 3735 | earliestCommit = "" |
| 3736 | latestCommit = parseRevision(ref) |
| 3737 | |
| 3738 | while True: |
| 3739 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3740 | print("trying: earliest %s latest %s" % (earliestCommit, latestCommit)) |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 3741 | next = read_pipe(["git", "rev-list", "--bisect", |
| 3742 | latestCommit, earliestCommit]).strip() |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3743 | if len(next) == 0: |
| 3744 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3745 | print("argh") |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3746 | return "" |
| 3747 | log = extractLogMessageFromGitCommit(next) |
| 3748 | settings = extractSettingsGitLog(log) |
| 3749 | currentChange = int(settings['change']) |
| 3750 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3751 | print("current change %s" % currentChange) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3752 | |
| 3753 | if currentChange == change: |
| 3754 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3755 | print("found %s" % next) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3756 | return next |
| 3757 | |
| 3758 | if currentChange < change: |
| 3759 | earliestCommit = "^%s" % next |
| 3760 | else: |
Mazo, Andrey | 2dda741 | 2019-04-01 18:02:17 +0000 | [diff] [blame] | 3761 | if next == latestCommit: |
| 3762 | die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change)) |
| 3763 | latestCommit = "%s^@" % next |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3764 | |
| 3765 | return "" |
| 3766 | |
| 3767 | def importNewBranch(self, branch, maxChange): |
| 3768 | # make fast-import flush all changes to disk and update the refs using the checkpoint |
| 3769 | # command so that we can try to find the branch parent in the git history |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 3770 | self.gitStream.write("checkpoint\n\n") |
| 3771 | self.gitStream.flush() |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3772 | branchPrefix = self.depotPaths[0] + branch + "/" |
| 3773 | range = "@1,%s" % maxChange |
Lex Spoon | 96b2d54 | 2015-04-20 11:00:20 -0400 | [diff] [blame] | 3774 | changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3775 | if len(changes) <= 0: |
| 3776 | return False |
| 3777 | firstChange = changes[0] |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3778 | sourceBranch = self.knownBranches[branch] |
| 3779 | sourceDepotPath = self.depotPaths[0] + sourceBranch |
| 3780 | sourceRef = self.gitRefForBranch(sourceBranch) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3781 | |
Luke Diamand | 52a4880 | 2012-01-19 09:52:25 +0000 | [diff] [blame] | 3782 | branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"]) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3783 | gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange) |
| 3784 | if len(gitParent) > 0: |
| 3785 | self.initialParents[self.gitRefForBranch(branch)] = gitParent |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3786 | |
| 3787 | self.importChanges(changes) |
| 3788 | return True |
| 3789 | |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3790 | def searchParent(self, parent, branch, target): |
Joachim Kuebart | 6b79818 | 2021-05-05 11:56:26 +0000 | [diff] [blame] | 3791 | targetTree = read_pipe(["git", "rev-parse", |
| 3792 | "{}^{{tree}}".format(target)]).strip() |
| 3793 | for line in read_pipe_lines(["git", "rev-list", "--format=%H %T", |
Pete Wyckoff | c7d3488 | 2013-01-26 22:11:21 -0500 | [diff] [blame] | 3794 | "--no-merges", parent]): |
Joachim Kuebart | 6b79818 | 2021-05-05 11:56:26 +0000 | [diff] [blame] | 3795 | if line.startswith("commit "): |
| 3796 | continue |
| 3797 | commit, tree = line.strip().split(" ") |
| 3798 | if tree == targetTree: |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3799 | if self.verbose: |
Joachim Kuebart | 6b79818 | 2021-05-05 11:56:26 +0000 | [diff] [blame] | 3800 | print("Found parent of %s in commit %s" % (branch, commit)) |
| 3801 | return commit |
| 3802 | return None |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3803 | |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 3804 | def importChanges(self, changes, origin_revision=0): |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3805 | cnt = 1 |
| 3806 | for change in changes: |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 3807 | description = p4_describe(change) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3808 | self.updateOptionDict(description) |
| 3809 | |
| 3810 | if not self.silent: |
Joel Holdsworth | 0f82962 | 2021-12-19 15:40:28 +0000 | [diff] [blame] | 3811 | sys.stdout.write("\rImporting revision %s (%d%%)" % ( |
| 3812 | change, (cnt * 100) // len(changes))) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3813 | sys.stdout.flush() |
| 3814 | cnt = cnt + 1 |
| 3815 | |
| 3816 | try: |
| 3817 | if self.detectBranches: |
| 3818 | branches = self.splitFilesIntoBranches(description) |
| 3819 | for branch in branches.keys(): |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 3820 | # HACK --hwn |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3821 | branchPrefix = self.depotPaths[0] + branch + "/" |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 3822 | self.branchPrefixes = [branchPrefix] |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3823 | |
| 3824 | parent = "" |
| 3825 | |
| 3826 | filesForCommit = branches[branch] |
| 3827 | |
| 3828 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3829 | print("branch is %s" % branch) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3830 | |
| 3831 | self.updatedBranches.add(branch) |
| 3832 | |
| 3833 | if branch not in self.createdBranches: |
| 3834 | self.createdBranches.add(branch) |
| 3835 | parent = self.knownBranches[branch] |
| 3836 | if parent == branch: |
| 3837 | parent = "" |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3838 | else: |
| 3839 | fullBranch = self.projectName + branch |
| 3840 | if fullBranch not in self.p4BranchesInGit: |
| 3841 | if not self.silent: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 3842 | print("\n Importing new branch %s" % fullBranch) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3843 | if self.importNewBranch(branch, change - 1): |
| 3844 | parent = "" |
| 3845 | self.p4BranchesInGit.append(fullBranch) |
| 3846 | if not self.silent: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 3847 | print("\n Resuming with change %s" % change) |
Simon Hausmann | 1ca3d71 | 2007-08-26 17:36:55 +0200 | [diff] [blame] | 3848 | |
| 3849 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3850 | print("parent determined through known branches: %s" % parent) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3851 | |
Simon Hausmann | 8134f69 | 2007-08-26 16:44:55 +0200 | [diff] [blame] | 3852 | branch = self.gitRefForBranch(branch) |
| 3853 | parent = self.gitRefForBranch(parent) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3854 | |
| 3855 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3856 | print("looking for initial parent for %s; current parent is %s" % (branch, parent)) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3857 | |
| 3858 | if len(parent) == 0 and branch in self.initialParents: |
| 3859 | parent = self.initialParents[branch] |
| 3860 | del self.initialParents[branch] |
| 3861 | |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3862 | blob = None |
| 3863 | if len(parent) > 0: |
Pete Wyckoff | 4f9273d | 2013-01-26 22:11:04 -0500 | [diff] [blame] | 3864 | tempBranch = "%s/%d" % (self.tempBranchLocation, change) |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3865 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3866 | print("Creating temporary branch: " + tempBranch) |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3867 | self.commit(description, filesForCommit, tempBranch) |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3868 | self.tempBranches.append(tempBranch) |
| 3869 | self.checkpoint() |
| 3870 | blob = self.searchParent(parent, branch, tempBranch) |
| 3871 | if blob: |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3872 | self.commit(description, filesForCommit, branch, blob) |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 3873 | else: |
| 3874 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3875 | print("Parent of %s not found. Committing into head of %s" % (branch, parent)) |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3876 | self.commit(description, filesForCommit, branch, parent) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3877 | else: |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 3878 | files = self.extractFilesFromCommit(description) |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3879 | self.commit(description, files, self.branch, |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3880 | self.initialParent) |
Pete Wyckoff | 4749784 | 2013-01-14 19:47:04 -0500 | [diff] [blame] | 3881 | # only needed once, to connect to the previous commit |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3882 | self.initialParent = "" |
| 3883 | except IOError: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3884 | print(self.gitError.read()) |
Simon Hausmann | e87f37a | 2007-08-26 16:00:52 +0200 | [diff] [blame] | 3885 | sys.exit(1) |
| 3886 | |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 3887 | def sync_origin_only(self): |
| 3888 | if self.syncWithOrigin: |
| 3889 | self.hasOrigin = originP4BranchesExist() |
| 3890 | if self.hasOrigin: |
| 3891 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3892 | print('Syncing with origin first, using "git fetch origin"') |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 3893 | system(["git", "fetch", "origin"]) |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 3894 | |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3895 | def importHeadRevision(self, revision): |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3896 | print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3897 | |
Pete Wyckoff | 4e2e6ce | 2011-07-31 09:45:55 -0400 | [diff] [blame] | 3898 | details = {} |
| 3899 | details["user"] = "git perforce import user" |
Pete Wyckoff | 1494fcb | 2011-02-19 08:17:56 -0500 | [diff] [blame] | 3900 | details["desc"] = ("Initial import of %s from the state at revision %s\n" |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3901 | % (' '.join(self.depotPaths), revision)) |
| 3902 | details["change"] = revision |
| 3903 | newestRevision = 0 |
| 3904 | |
| 3905 | fileCnt = 0 |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 3906 | fileArgs = ["%s...%s" % (p, revision) for p in self.depotPaths] |
Luke Diamand | 6de040d | 2011-10-16 10:47:52 -0400 | [diff] [blame] | 3907 | |
| 3908 | for info in p4CmdList(["files"] + fileArgs): |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3909 | |
Pete Wyckoff | 68b2859 | 2011-02-19 08:17:55 -0500 | [diff] [blame] | 3910 | if 'code' in info and info['code'] == 'error': |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3911 | sys.stderr.write("p4 returned an error: %s\n" |
| 3912 | % info['data']) |
Pete Wyckoff | d88e707 | 2011-02-19 08:17:58 -0500 | [diff] [blame] | 3913 | if info['data'].find("must refer to client") >= 0: |
| 3914 | sys.stderr.write("This particular p4 error is misleading.\n") |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 3915 | sys.stderr.write("Perhaps the depot path was misspelled.\n") |
Pete Wyckoff | d88e707 | 2011-02-19 08:17:58 -0500 | [diff] [blame] | 3916 | sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths)) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3917 | sys.exit(1) |
Pete Wyckoff | 68b2859 | 2011-02-19 08:17:55 -0500 | [diff] [blame] | 3918 | if 'p4ExitCode' in info: |
| 3919 | sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode']) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3920 | sys.exit(1) |
| 3921 | |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3922 | change = int(info["change"]) |
| 3923 | if change > newestRevision: |
| 3924 | newestRevision = change |
| 3925 | |
Pete Wyckoff | 56c0934 | 2011-02-19 08:17:57 -0500 | [diff] [blame] | 3926 | if info["action"] in self.delete_actions: |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3927 | continue |
| 3928 | |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 3929 | for prop in ["depotFile", "rev", "action", "type"]: |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3930 | details["%s%s" % (prop, fileCnt)] = info[prop] |
| 3931 | |
| 3932 | fileCnt = fileCnt + 1 |
| 3933 | |
| 3934 | details["change"] = newestRevision |
Pete Wyckoff | 4e2e6ce | 2011-07-31 09:45:55 -0400 | [diff] [blame] | 3935 | |
Pete Wyckoff | 9dcb9f2 | 2012-04-08 20:18:01 -0400 | [diff] [blame] | 3936 | # Use time from top-most change so that all git p4 clones of |
Pete Wyckoff | 4e2e6ce | 2011-07-31 09:45:55 -0400 | [diff] [blame] | 3937 | # the same p4 repo have the same commit SHA1s. |
Pete Wyckoff | 18fa13d | 2012-11-23 17:35:34 -0500 | [diff] [blame] | 3938 | res = p4_describe(newestRevision) |
| 3939 | details["time"] = res["time"] |
Pete Wyckoff | 4e2e6ce | 2011-07-31 09:45:55 -0400 | [diff] [blame] | 3940 | |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3941 | self.updateOptionDict(details) |
| 3942 | try: |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 3943 | self.commit(details, self.extractFilesFromCommit(details), self.branch) |
Philip.McGraw | de5abb5 | 2019-08-27 06:43:58 +0300 | [diff] [blame] | 3944 | except IOError as err: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3945 | print("IO error with git fast-import. Is your git version recent enough?") |
Philip.McGraw | de5abb5 | 2019-08-27 06:43:58 +0300 | [diff] [blame] | 3946 | print("IO error details: {}".format(err)) |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 3947 | print(self.gitError.read()) |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 3948 | |
Luke Diamand | ca5b5cc | 2020-01-29 11:12:44 +0000 | [diff] [blame] | 3949 | def importRevisions(self, args, branch_arg_given): |
| 3950 | changes = [] |
| 3951 | |
| 3952 | if len(self.changesFile) > 0: |
Luke Diamand | 43f33e4 | 2020-01-30 11:50:34 +0000 | [diff] [blame] | 3953 | with open(self.changesFile) as f: |
| 3954 | output = f.readlines() |
Luke Diamand | ca5b5cc | 2020-01-29 11:12:44 +0000 | [diff] [blame] | 3955 | changeSet = set() |
| 3956 | for line in output: |
| 3957 | changeSet.add(int(line)) |
| 3958 | |
| 3959 | for change in changeSet: |
| 3960 | changes.append(change) |
| 3961 | |
| 3962 | changes.sort() |
| 3963 | else: |
| 3964 | # catch "git p4 sync" with no new branches, in a repo that |
| 3965 | # does not have any existing p4 branches |
| 3966 | if len(args) == 0: |
| 3967 | if not self.p4BranchesInGit: |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 3968 | raise P4CommandException("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.") |
Luke Diamand | ca5b5cc | 2020-01-29 11:12:44 +0000 | [diff] [blame] | 3969 | |
| 3970 | # The default branch is master, unless --branch is used to |
| 3971 | # specify something else. Make sure it exists, or complain |
| 3972 | # nicely about how to use --branch. |
| 3973 | if not self.detectBranches: |
| 3974 | if not branch_exists(self.branch): |
| 3975 | if branch_arg_given: |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 3976 | raise P4CommandException("Error: branch %s does not exist." % self.branch) |
Luke Diamand | ca5b5cc | 2020-01-29 11:12:44 +0000 | [diff] [blame] | 3977 | else: |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 3978 | raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." % |
Luke Diamand | ca5b5cc | 2020-01-29 11:12:44 +0000 | [diff] [blame] | 3979 | self.branch) |
| 3980 | |
| 3981 | if self.verbose: |
| 3982 | print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), |
| 3983 | self.changeRange)) |
| 3984 | changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size) |
| 3985 | |
| 3986 | if len(self.maxChanges) > 0: |
| 3987 | changes = changes[:min(int(self.maxChanges), len(changes))] |
| 3988 | |
| 3989 | if len(changes) == 0: |
| 3990 | if not self.silent: |
| 3991 | print("No changes to import!") |
| 3992 | else: |
| 3993 | if not self.silent and not self.detectBranches: |
| 3994 | print("Import destination: %s" % self.branch) |
| 3995 | |
| 3996 | self.updatedBranches = set() |
| 3997 | |
| 3998 | if not self.detectBranches: |
| 3999 | if args: |
| 4000 | # start a new branch |
| 4001 | self.initialParent = "" |
| 4002 | else: |
| 4003 | # build on a previous revision |
| 4004 | self.initialParent = parseRevision(self.branch) |
| 4005 | |
| 4006 | self.importChanges(changes) |
| 4007 | |
| 4008 | if not self.silent: |
| 4009 | print("") |
| 4010 | if len(self.updatedBranches) > 0: |
| 4011 | sys.stdout.write("Updated branches: ") |
| 4012 | for b in self.updatedBranches: |
| 4013 | sys.stdout.write("%s " % b) |
| 4014 | sys.stdout.write("\n") |
| 4015 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4016 | def openStreams(self): |
| 4017 | self.importProcess = subprocess.Popen(["git", "fast-import"], |
| 4018 | stdin=subprocess.PIPE, |
| 4019 | stdout=subprocess.PIPE, |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 4020 | stderr=subprocess.PIPE) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4021 | self.gitOutput = self.importProcess.stdout |
| 4022 | self.gitStream = self.importProcess.stdin |
| 4023 | self.gitError = self.importProcess.stderr |
| 4024 | |
Yang Zhao | 86dca24 | 2019-12-13 15:52:39 -0800 | [diff] [blame] | 4025 | if bytes is not str: |
| 4026 | # Wrap gitStream.write() so that it can be called using `str` arguments |
| 4027 | def make_encoded_write(write): |
| 4028 | def encoded_write(s): |
| 4029 | return write(s.encode() if isinstance(s, str) else s) |
| 4030 | return encoded_write |
| 4031 | |
| 4032 | self.gitStream.write = make_encoded_write(self.gitStream.write) |
| 4033 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4034 | def closeStreams(self): |
Luke Diamand | 837b3a6 | 2020-01-29 11:12:41 +0000 | [diff] [blame] | 4035 | if self.gitStream is None: |
| 4036 | return |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4037 | self.gitStream.close() |
| 4038 | if self.importProcess.wait() != 0: |
| 4039 | die("fast-import failed: %s" % self.gitError.read()) |
| 4040 | self.gitOutput.close() |
| 4041 | self.gitError.close() |
Luke Diamand | 837b3a6 | 2020-01-29 11:12:41 +0000 | [diff] [blame] | 4042 | self.gitStream = None |
Simon Hausmann | c208a24 | 2007-08-26 16:07:18 +0200 | [diff] [blame] | 4043 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4044 | def run(self, args): |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 4045 | if self.importIntoRemotes: |
| 4046 | self.refPrefix = "refs/remotes/p4/" |
| 4047 | else: |
Marius Storm-Olsen | db77555 | 2007-06-07 15:13:59 +0200 | [diff] [blame] | 4048 | self.refPrefix = "refs/heads/p4/" |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 4049 | |
Luke Diamand | b9d34db | 2018-06-08 21:32:44 +0100 | [diff] [blame] | 4050 | self.sync_origin_only() |
Simon Hausmann | 10f880f | 2007-05-24 22:28:28 +0200 | [diff] [blame] | 4051 | |
Pete Wyckoff | 5a8e84c | 2013-01-14 19:47:05 -0500 | [diff] [blame] | 4052 | branch_arg_given = bool(self.branch) |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 4053 | if len(self.branch) == 0: |
Marius Storm-Olsen | db77555 | 2007-06-07 15:13:59 +0200 | [diff] [blame] | 4054 | self.branch = self.refPrefix + "master" |
Simon Hausmann | a028a98 | 2007-05-23 00:03:08 +0200 | [diff] [blame] | 4055 | if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4056 | system(["git", "update-ref", self.branch, "refs/heads/p4"]) |
| 4057 | system(["git", "branch", "-D", "p4"]) |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 4058 | |
Pete Wyckoff | a93d33e | 2012-02-25 20:06:24 -0500 | [diff] [blame] | 4059 | # accept either the command-line option, or the configuration variable |
| 4060 | if self.useClientSpec: |
| 4061 | # will use this after clone to set the variable |
| 4062 | self.useClientSpec_from_options = True |
| 4063 | else: |
Pete Wyckoff | 0d60903 | 2013-01-26 22:11:24 -0500 | [diff] [blame] | 4064 | if gitConfigBool("git-p4.useclientspec"): |
Pete Wyckoff | 09fca77 | 2011-12-24 21:07:39 -0500 | [diff] [blame] | 4065 | self.useClientSpec = True |
| 4066 | if self.useClientSpec: |
Pete Wyckoff | 543987b | 2012-02-25 20:06:25 -0500 | [diff] [blame] | 4067 | self.clientSpecDirs = getClientSpec() |
Tor Arvid Lund | 3a70cdf | 2008-02-18 15:22:08 +0100 | [diff] [blame] | 4068 | |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4069 | # TODO: should always look at previous commits, |
| 4070 | # merge with previous imports, if possible. |
| 4071 | if args == []: |
Simon Hausmann | d414c74 | 2007-05-25 11:36:42 +0200 | [diff] [blame] | 4072 | if self.hasOrigin: |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 4073 | createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent) |
Pete Wyckoff | 3b650fc | 2013-01-14 19:46:58 -0500 | [diff] [blame] | 4074 | |
| 4075 | # branches holds mapping from branch name to sha1 |
| 4076 | branches = p4BranchesInGit(self.importIntoRemotes) |
Pete Wyckoff | 8c9e8b6 | 2013-01-14 19:47:06 -0500 | [diff] [blame] | 4077 | |
| 4078 | # restrict to just this one, disabling detect-branches |
| 4079 | if branch_arg_given: |
Tao Klerks | 17f273f | 2022-04-04 05:10:54 +0000 | [diff] [blame] | 4080 | short = shortP4Ref(self.branch, self.importIntoRemotes) |
Pete Wyckoff | 8c9e8b6 | 2013-01-14 19:47:06 -0500 | [diff] [blame] | 4081 | if short in branches: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 4082 | self.p4BranchesInGit = [short] |
Tao Klerks | 17f273f | 2022-04-04 05:10:54 +0000 | [diff] [blame] | 4083 | elif self.branch.startswith('refs/') and \ |
| 4084 | branchExists(self.branch) and \ |
| 4085 | '[git-p4:' in extractLogMessageFromGitCommit(self.branch): |
Junio C Hamano | af3a320 | 2022-05-20 15:26:55 -0700 | [diff] [blame] | 4086 | self.p4BranchesInGit = [self.branch] |
Pete Wyckoff | 8c9e8b6 | 2013-01-14 19:47:06 -0500 | [diff] [blame] | 4087 | else: |
| 4088 | self.p4BranchesInGit = branches.keys() |
Simon Hausmann | abcd790 | 2007-05-24 22:25:36 +0200 | [diff] [blame] | 4089 | |
| 4090 | if len(self.p4BranchesInGit) > 1: |
| 4091 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4092 | print("Importing from/into multiple branches") |
Simon Hausmann | abcd790 | 2007-05-24 22:25:36 +0200 | [diff] [blame] | 4093 | self.detectBranches = True |
Pete Wyckoff | 8c9e8b6 | 2013-01-14 19:47:06 -0500 | [diff] [blame] | 4094 | for branch in branches.keys(): |
| 4095 | self.initialParents[self.refPrefix + branch] = \ |
| 4096 | branches[branch] |
Simon Hausmann | 967f72e | 2007-03-23 09:30:41 +0100 | [diff] [blame] | 4097 | |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4098 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4099 | print("branches: %s" % self.p4BranchesInGit) |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4100 | |
| 4101 | p4Change = 0 |
| 4102 | for branch in self.p4BranchesInGit: |
Tao Klerks | 17f273f | 2022-04-04 05:10:54 +0000 | [diff] [blame] | 4103 | logMsg = extractLogMessageFromGitCommit(fullP4Ref(branch, |
| 4104 | self.importIntoRemotes)) |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4105 | |
| 4106 | settings = extractSettingsGitLog(logMsg) |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4107 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4108 | self.readOptions(settings) |
Joel Holdsworth | 7a3e83d | 2022-04-01 15:24:59 +0100 | [diff] [blame] | 4109 | if 'depot-paths' in settings and 'change' in settings: |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4110 | change = int(settings['change']) + 1 |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4111 | p4Change = max(p4Change, change) |
| 4112 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4113 | depotPaths = sorted(settings['depot-paths']) |
| 4114 | if self.previousDepotPaths == []: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4115 | self.previousDepotPaths = depotPaths |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4116 | else: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4117 | paths = [] |
| 4118 | for (prev, cur) in zip(self.previousDepotPaths, depotPaths): |
Vitor Antunes | 04d277b | 2011-08-19 00:44:03 +0100 | [diff] [blame] | 4119 | prev_list = prev.split("/") |
| 4120 | cur_list = cur.split("/") |
| 4121 | for i in range(0, min(len(cur_list), len(prev_list))): |
Luke Diamand | fc35c9d | 2018-06-19 09:04:06 +0100 | [diff] [blame] | 4122 | if cur_list[i] != prev_list[i]: |
Simon Hausmann | 583e170 | 2007-06-07 09:37:13 +0200 | [diff] [blame] | 4123 | i = i - 1 |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4124 | break |
| 4125 | |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 4126 | paths.append("/".join(cur_list[:i + 1])) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4127 | |
| 4128 | self.previousDepotPaths = paths |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4129 | |
| 4130 | if p4Change > 0: |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4131 | self.depotPaths = sorted(self.previousDepotPaths) |
Simon Hausmann | d590467 | 2007-05-19 11:07:32 +0200 | [diff] [blame] | 4132 | self.changeRange = "@%s,#head" % p4Change |
Simon Hausmann | 341dc1c | 2007-05-21 00:39:16 +0200 | [diff] [blame] | 4133 | if not self.silent and not self.detectBranches: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4134 | print("Performing incremental import into %s git branch" % self.branch) |
Simon Hausmann | 569d1bd | 2007-03-22 21:34:16 +0100 | [diff] [blame] | 4135 | |
Tao Klerks | 17f273f | 2022-04-04 05:10:54 +0000 | [diff] [blame] | 4136 | self.branch = fullP4Ref(self.branch, self.importIntoRemotes) |
Simon Hausmann | 179caeb | 2007-03-22 22:17:42 +0100 | [diff] [blame] | 4137 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4138 | if len(args) == 0 and self.depotPaths: |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4139 | if not self.silent: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4140 | print("Depot paths: %s" % ' '.join(self.depotPaths)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4141 | else: |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4142 | if self.depotPaths and self.depotPaths != args: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4143 | print("previous import used depot path %s and now %s was specified. " |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 4144 | "This doesn't work!" % (' '.join(self.depotPaths), |
| 4145 | ' '.join(args))) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4146 | sys.exit(1) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4147 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4148 | self.depotPaths = sorted(args) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4149 | |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 4150 | revision = "" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4151 | self.users = {} |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4152 | |
Pete Wyckoff | 58c8bc7 | 2011-12-24 21:07:35 -0500 | [diff] [blame] | 4153 | # Make sure no revision specifiers are used when --changesfile |
| 4154 | # is specified. |
| 4155 | bad_changesfile = False |
| 4156 | if len(self.changesFile) > 0: |
| 4157 | for p in self.depotPaths: |
| 4158 | if p.find("@") >= 0 or p.find("#") >= 0: |
| 4159 | bad_changesfile = True |
| 4160 | break |
| 4161 | if bad_changesfile: |
| 4162 | die("Option --changesfile is incompatible with revision specifiers") |
| 4163 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4164 | newPaths = [] |
| 4165 | for p in self.depotPaths: |
| 4166 | if p.find("@") != -1: |
| 4167 | atIdx = p.index("@") |
| 4168 | self.changeRange = p[atIdx:] |
| 4169 | if self.changeRange == "@all": |
| 4170 | self.changeRange = "" |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4171 | elif ',' not in self.changeRange: |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 4172 | revision = self.changeRange |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4173 | self.changeRange = "" |
Han-Wen Nienhuys | 7fcff9d | 2007-07-23 15:56:37 -0700 | [diff] [blame] | 4174 | p = p[:atIdx] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4175 | elif p.find("#") != -1: |
| 4176 | hashIdx = p.index("#") |
Simon Hausmann | 1c49fc1 | 2007-08-26 16:04:34 +0200 | [diff] [blame] | 4177 | revision = p[hashIdx:] |
Han-Wen Nienhuys | 7fcff9d | 2007-07-23 15:56:37 -0700 | [diff] [blame] | 4178 | p = p[:hashIdx] |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4179 | elif self.previousDepotPaths == []: |
Pete Wyckoff | 58c8bc7 | 2011-12-24 21:07:35 -0500 | [diff] [blame] | 4180 | # pay attention to changesfile, if given, else import |
| 4181 | # the entire p4 tree at the head revision |
| 4182 | if len(self.changesFile) == 0: |
| 4183 | revision = "#head" |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4184 | |
Joel Holdsworth | 843d847 | 2022-04-01 15:24:54 +0100 | [diff] [blame] | 4185 | p = re.sub("\.\.\.$", "", p) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4186 | if not p.endswith("/"): |
| 4187 | p += "/" |
| 4188 | |
| 4189 | newPaths.append(p) |
| 4190 | |
| 4191 | self.depotPaths = newPaths |
| 4192 | |
Pete Wyckoff | e63231e | 2012-08-11 12:55:02 -0400 | [diff] [blame] | 4193 | # --detect-branches may change this for each branch |
| 4194 | self.branchPrefixes = self.depotPaths |
| 4195 | |
Simon Hausmann | b607e71 | 2007-05-20 10:55:54 +0200 | [diff] [blame] | 4196 | self.loadUserMapFromCache() |
Simon Hausmann | cb53e1f | 2007-04-08 00:12:02 +0200 | [diff] [blame] | 4197 | self.labels = {} |
| 4198 | if self.detectLabels: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 4199 | self.getLabels() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4200 | |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 4201 | if self.detectBranches: |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 4202 | # FIXME - what's a P4 projectName ? |
Simon Hausmann | df45092 | 2007-06-08 08:49:22 +0200 | [diff] [blame] | 4203 | self.projectName = self.guessProjectName() |
| 4204 | |
Simon Hausmann | 38f9f5e | 2007-11-15 10:38:45 +0100 | [diff] [blame] | 4205 | if self.hasOrigin: |
| 4206 | self.getBranchMappingFromGitBranches() |
| 4207 | else: |
| 4208 | self.getBranchMapping() |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4209 | if self.verbose: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4210 | print("p4-git branches: %s" % self.p4BranchesInGit) |
| 4211 | print("initial parents: %s" % self.initialParents) |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4212 | for b in self.p4BranchesInGit: |
| 4213 | if b != "master": |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4214 | |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 4215 | # FIXME |
Simon Hausmann | 29bdbac | 2007-05-19 10:23:12 +0200 | [diff] [blame] | 4216 | b = b[len(self.projectName):] |
| 4217 | self.createdBranches.add(b) |
Simon Hausmann | 4b97ffb | 2007-05-18 21:45:23 +0200 | [diff] [blame] | 4218 | |
Luke Diamand | 19fa5ac | 2020-01-29 11:12:46 +0000 | [diff] [blame] | 4219 | p4_check_access() |
| 4220 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4221 | self.openStreams() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4222 | |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 4223 | err = None |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4224 | |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 4225 | try: |
| 4226 | if revision: |
| 4227 | self.importHeadRevision(revision) |
| 4228 | else: |
| 4229 | self.importRevisions(args, branch_arg_given) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4230 | |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 4231 | if gitConfigBool("git-p4.importLabels"): |
| 4232 | self.importLabels = True |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4233 | |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 4234 | if self.importLabels: |
| 4235 | p4Labels = getP4Labels(self.depotPaths) |
| 4236 | gitTags = getGitTags() |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4237 | |
Luke Diamand | 6026aff | 2020-01-29 11:12:45 +0000 | [diff] [blame] | 4238 | missingP4Labels = p4Labels - gitTags |
| 4239 | self.importP4Labels(self.gitStream, missingP4Labels) |
| 4240 | |
| 4241 | except P4CommandException as e: |
| 4242 | err = e |
| 4243 | |
| 4244 | finally: |
| 4245 | self.closeStreams() |
| 4246 | |
| 4247 | if err: |
| 4248 | die(str(err)) |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4249 | |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 4250 | # Cleanup temporary branches created during import |
| 4251 | if self.tempBranches != []: |
| 4252 | for branch in self.tempBranches: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4253 | read_pipe(["git", "update-ref", "-d", branch]) |
Vitor Antunes | fed2369 | 2012-01-25 23:48:22 +0000 | [diff] [blame] | 4254 | os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation)) |
| 4255 | |
Pete Wyckoff | 55d1243 | 2013-01-14 19:46:59 -0500 | [diff] [blame] | 4256 | # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow |
| 4257 | # a convenient shortcut refname "p4". |
| 4258 | if self.importIntoRemotes: |
| 4259 | head_ref = self.refPrefix + "HEAD" |
| 4260 | if not gitBranchExists(head_ref) and gitBranchExists(self.branch): |
| 4261 | system(["git", "symbolic-ref", head_ref, self.branch]) |
| 4262 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4263 | return True |
| 4264 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4265 | |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 4266 | class P4Rebase(Command): |
| 4267 | def __init__(self): |
| 4268 | Command.__init__(self) |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4269 | self.options = [ |
| 4270 | optparse.make_option("--import-labels", dest="importLabels", action="store_true"), |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4271 | ] |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4272 | self.importLabels = False |
Han-Wen Nienhuys | cebdf5a | 2007-05-23 16:53:11 -0300 | [diff] [blame] | 4273 | self.description = ("Fetches the latest revision from perforce and " |
| 4274 | + "rebases the current work (branch) against it") |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 4275 | |
| 4276 | def run(self, args): |
| 4277 | sync = P4Sync() |
Luke Diamand | 06804c7 | 2012-04-11 17:21:24 +0200 | [diff] [blame] | 4278 | sync.importLabels = self.importLabels |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 4279 | sync.run([]) |
Simon Hausmann | d7e3868 | 2007-06-12 14:34:46 +0200 | [diff] [blame] | 4280 | |
Simon Hausmann | 14594f4 | 2007-08-22 09:07:15 +0200 | [diff] [blame] | 4281 | return self.rebase() |
| 4282 | |
| 4283 | def rebase(self): |
Simon Hausmann | 36ee4ee | 2008-01-07 14:21:45 +0100 | [diff] [blame] | 4284 | if os.system("git update-index --refresh") != 0: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 4285 | die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.") |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4286 | if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 4287 | die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.") |
Simon Hausmann | 36ee4ee | 2008-01-07 14:21:45 +0100 | [diff] [blame] | 4288 | |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 4289 | upstream, settings = findUpstreamBranchPoint() |
Simon Hausmann | d7e3868 | 2007-06-12 14:34:46 +0200 | [diff] [blame] | 4290 | if len(upstream) == 0: |
| 4291 | die("Cannot find upstream branchpoint for rebase") |
| 4292 | |
| 4293 | # the branchpoint may be p4/foo~3, so strip off the parent |
| 4294 | upstream = re.sub("~[0-9]+$", "", upstream) |
| 4295 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4296 | print("Rebasing the current branch onto %s" % upstream) |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4297 | oldHead = read_pipe(["git", "rev-parse", "HEAD"]).strip() |
| 4298 | system(["git", "rebase", upstream]) |
| 4299 | system(["git", "diff-tree", "--stat", "--summary", "-M", oldHead, |
| 4300 | "HEAD", "--"]) |
Simon Hausmann | 01ce1fe | 2007-04-07 23:46:50 +0200 | [diff] [blame] | 4301 | return True |
| 4302 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4303 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4304 | class P4Clone(P4Sync): |
| 4305 | def __init__(self): |
| 4306 | P4Sync.__init__(self) |
| 4307 | 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] | 4308 | self.usage = "usage: %prog [options] //depot/path[@revRange]" |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 4309 | self.options += [ |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4310 | optparse.make_option("--destination", dest="cloneDestination", |
| 4311 | action='store', default=None, |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 4312 | help="where to leave result of the clone"), |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4313 | optparse.make_option("--bare", dest="cloneBare", |
| 4314 | action="store_true", default=False), |
Tommy Thorn | 354081d | 2008-02-03 10:38:51 -0800 | [diff] [blame] | 4315 | ] |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4316 | self.cloneDestination = None |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4317 | self.needsGit = False |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4318 | self.cloneBare = False |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4319 | |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4320 | def defaultDestination(self, args): |
Joel Holdsworth | c785e20 | 2022-04-01 15:24:57 +0100 | [diff] [blame] | 4321 | # TODO: use common prefix of args? |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4322 | depotPath = args[0] |
| 4323 | depotDir = re.sub("(@[^@]*)$", "", depotPath) |
| 4324 | depotDir = re.sub("(#[^#]*)$", "", depotDir) |
Toby Allsopp | 053d9e4 | 2008-02-05 09:41:43 +1300 | [diff] [blame] | 4325 | depotDir = re.sub(r"\.\.\.$", "", depotDir) |
Han-Wen Nienhuys | 6a49f8e | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4326 | depotDir = re.sub(r"/$", "", depotDir) |
| 4327 | return os.path.split(depotDir)[1] |
| 4328 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4329 | def run(self, args): |
| 4330 | if len(args) < 1: |
| 4331 | return False |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4332 | |
| 4333 | if self.keepRepoPath and not self.cloneDestination: |
| 4334 | sys.stderr.write("Must specify destination for --keep-path\n") |
| 4335 | sys.exit(1) |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4336 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4337 | depotPaths = args |
Simon Hausmann | 5e100b5 | 2007-06-07 21:12:25 +0200 | [diff] [blame] | 4338 | |
| 4339 | if not self.cloneDestination and len(depotPaths) > 1: |
| 4340 | self.cloneDestination = depotPaths[-1] |
| 4341 | depotPaths = depotPaths[:-1] |
| 4342 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4343 | for p in depotPaths: |
| 4344 | if not p.startswith("//"): |
Pete Wyckoff | 0f487d3 | 2013-01-26 22:11:06 -0500 | [diff] [blame] | 4345 | sys.stderr.write('Depot paths must start with "//": %s\n' % p) |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4346 | return False |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4347 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4348 | if not self.cloneDestination: |
Marius Storm-Olsen | 98ad4fa | 2007-06-07 15:08:33 +0200 | [diff] [blame] | 4349 | self.cloneDestination = self.defaultDestination(args) |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4350 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4351 | print("Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)) |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4352 | |
Kevin Green | c3bf3f1 | 2007-06-11 16:48:07 -0400 | [diff] [blame] | 4353 | if not os.path.exists(self.cloneDestination): |
| 4354 | os.makedirs(self.cloneDestination) |
Robert Blum | 053fd0c | 2008-08-01 12:50:03 -0700 | [diff] [blame] | 4355 | chdir(self.cloneDestination) |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4356 | |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 4357 | init_cmd = ["git", "init"] |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4358 | if self.cloneBare: |
| 4359 | init_cmd.append("--bare") |
Brandon Casey | a235e85 | 2013-01-26 11:14:33 -0800 | [diff] [blame] | 4360 | retcode = subprocess.call(init_cmd) |
| 4361 | if retcode: |
Joel Holdsworth | 40e7cfd | 2022-01-06 21:41:56 +0000 | [diff] [blame] | 4362 | raise subprocess.CalledProcessError(retcode, init_cmd) |
Pete Wyckoff | 3820007 | 2011-02-19 08:18:01 -0500 | [diff] [blame] | 4363 | |
Han-Wen Nienhuys | 6326aa5 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4364 | if not P4Sync.run(self, depotPaths): |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4365 | return False |
Pete Wyckoff | c595956 | 2013-01-14 19:47:01 -0500 | [diff] [blame] | 4366 | |
| 4367 | # create a master branch and check out a work tree |
| 4368 | if gitBranchExists(self.branch): |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 4369 | system(["git", "branch", currentGitBranch(), self.branch]) |
Pete Wyckoff | c595956 | 2013-01-14 19:47:01 -0500 | [diff] [blame] | 4370 | if not self.cloneBare: |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 4371 | system(["git", "checkout", "-f"]) |
Pete Wyckoff | c595956 | 2013-01-14 19:47:01 -0500 | [diff] [blame] | 4372 | else: |
Joel Holdsworth | 968e29e | 2022-04-01 15:24:55 +0100 | [diff] [blame] | 4373 | print('Not checking out any branch, use ' |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4374 | '"git checkout -q -b master <branch>"') |
Han-Wen Nienhuys | 86dff6b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4375 | |
Pete Wyckoff | a93d33e | 2012-02-25 20:06:24 -0500 | [diff] [blame] | 4376 | # auto-set this variable if invoked with --use-client-spec |
| 4377 | if self.useClientSpec_from_options: |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4378 | system(["git", "config", "--bool", "git-p4.useclientspec", "true"]) |
Pete Wyckoff | a93d33e | 2012-02-25 20:06:24 -0500 | [diff] [blame] | 4379 | |
Tao Klerks | f7b5ff6 | 2022-04-30 19:26:52 +0000 | [diff] [blame] | 4380 | # persist any git-p4 encoding-handling config options passed in for clone: |
| 4381 | if gitConfig('git-p4.metadataDecodingStrategy'): |
| 4382 | system(["git", "config", "git-p4.metadataDecodingStrategy", gitConfig('git-p4.metadataDecodingStrategy')]) |
| 4383 | if gitConfig('git-p4.metadataFallbackEncoding'): |
| 4384 | system(["git", "config", "git-p4.metadataFallbackEncoding", gitConfig('git-p4.metadataFallbackEncoding')]) |
| 4385 | if gitConfig('git-p4.pathEncoding'): |
| 4386 | system(["git", "config", "git-p4.pathEncoding", gitConfig('git-p4.pathEncoding')]) |
| 4387 | |
Simon Hausmann | f9a3a4f | 2007-04-08 10:08:26 +0200 | [diff] [blame] | 4388 | return True |
| 4389 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4390 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4391 | class P4Unshelve(Command): |
| 4392 | def __init__(self): |
| 4393 | Command.__init__(self) |
| 4394 | self.options = [] |
| 4395 | self.origin = "HEAD" |
| 4396 | self.description = "Unshelve a P4 changelist into a git commit" |
| 4397 | self.usage = "usage: %prog [options] changelist" |
| 4398 | self.options += [ |
| 4399 | optparse.make_option("--origin", dest="origin", |
| 4400 | help="Use this base revision instead of the default (%s)" % self.origin), |
| 4401 | ] |
| 4402 | self.verbose = False |
| 4403 | self.noCommit = False |
Luke Diamand | 0881312 | 2018-10-15 12:14:07 +0100 | [diff] [blame] | 4404 | self.destbranch = "refs/remotes/p4-unshelved" |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4405 | |
| 4406 | def renameBranch(self, branch_name): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 4407 | """Rename the existing branch to branch_name.N .""" |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4408 | |
Joel Holdsworth | 12a77f5 | 2022-04-01 15:24:53 +0100 | [diff] [blame] | 4409 | for i in range(0, 1000): |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4410 | backup_branch_name = "{0}.{1}".format(branch_name, i) |
| 4411 | if not gitBranchExists(backup_branch_name): |
Joel Holdsworth | 4768af2 | 2022-04-01 15:25:02 +0100 | [diff] [blame] | 4412 | # Copy ref to backup |
| 4413 | gitUpdateRef(backup_branch_name, branch_name) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4414 | gitDeleteRef(branch_name) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4415 | print("renamed old unshelve branch to {0}".format(backup_branch_name)) |
| 4416 | break |
Moritz Baumann | 198551c | 2022-07-20 18:55:30 +0000 | [diff] [blame] | 4417 | else: |
| 4418 | sys.exit("gave up trying to rename existing branch {0}".format(branch_name)) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4419 | |
| 4420 | def findLastP4Revision(self, starting_point): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 4421 | """Look back from starting_point for the first commit created by git-p4 |
| 4422 | to find the P4 commit we are based on, and the depot-paths. |
| 4423 | """ |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4424 | |
| 4425 | for parent in (range(65535)): |
Luke Diamand | 0acbf59 | 2020-09-19 09:54:41 +0100 | [diff] [blame] | 4426 | log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent)) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4427 | settings = extractSettingsGitLog(log) |
Luke Diamand | dba1c9d | 2018-06-19 09:04:07 +0100 | [diff] [blame] | 4428 | if 'change' in settings: |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4429 | return settings |
| 4430 | |
| 4431 | sys.exit("could not find git-p4 commits in {0}".format(self.origin)) |
| 4432 | |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 4433 | def createShelveParent(self, change, branch_name, sync, origin): |
Joel Holdsworth | 59ef3fc | 2022-04-01 15:24:46 +0100 | [diff] [blame] | 4434 | """Create a commit matching the parent of the shelved changelist |
| 4435 | 'change'. |
| 4436 | """ |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 4437 | parent_description = p4_describe(change, shelved=True) |
| 4438 | parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change) |
| 4439 | files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change) |
| 4440 | |
| 4441 | parent_files = [] |
| 4442 | for f in files: |
| 4443 | # if it was added in the shelved changelist, it won't exist in the parent |
| 4444 | if f['action'] in self.add_actions: |
| 4445 | continue |
| 4446 | |
| 4447 | # if it was deleted in the shelved changelist it must not be deleted |
| 4448 | # in the parent - we might even need to create it if the origin branch |
| 4449 | # does not have it |
| 4450 | if f['action'] in self.delete_actions: |
| 4451 | f['action'] = 'add' |
| 4452 | |
| 4453 | parent_files.append(f) |
| 4454 | |
| 4455 | sync.commit(parent_description, parent_files, branch_name, |
| 4456 | parent=origin, allow_empty=True) |
| 4457 | print("created parent commit for {0} based on {1} in {2}".format( |
| 4458 | change, self.origin, branch_name)) |
| 4459 | |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4460 | def run(self, args): |
| 4461 | if len(args) != 1: |
| 4462 | return False |
| 4463 | |
| 4464 | if not gitBranchExists(self.origin): |
| 4465 | sys.exit("origin branch {0} does not exist".format(self.origin)) |
| 4466 | |
| 4467 | sync = P4Sync() |
| 4468 | changes = args |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4469 | |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 4470 | # only one change at a time |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4471 | change = changes[0] |
| 4472 | |
| 4473 | # if the target branch already exists, rename it |
| 4474 | branch_name = "{0}/{1}".format(self.destbranch, change) |
| 4475 | if gitBranchExists(branch_name): |
| 4476 | self.renameBranch(branch_name) |
| 4477 | sync.branch = branch_name |
| 4478 | |
| 4479 | sync.verbose = self.verbose |
| 4480 | sync.suppress_meta_comment = True |
| 4481 | |
| 4482 | settings = self.findLastP4Revision(self.origin) |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4483 | sync.depotPaths = settings['depot-paths'] |
| 4484 | sync.branchPrefixes = sync.depotPaths |
| 4485 | |
| 4486 | sync.openStreams() |
| 4487 | sync.loadUserMapFromCache() |
| 4488 | sync.silent = True |
Luke Diamand | 89143ac | 2018-10-15 12:14:08 +0100 | [diff] [blame] | 4489 | |
| 4490 | # create a commit for the parent of the shelved changelist |
| 4491 | self.createShelveParent(change, branch_name, sync, self.origin) |
| 4492 | |
| 4493 | # create the commit for the shelved changelist itself |
| 4494 | description = p4_describe(change, True) |
| 4495 | files = sync.extractFilesFromCommit(description, True, change) |
| 4496 | |
| 4497 | sync.commit(description, files, branch_name, "") |
Luke Diamand | 123f631 | 2018-05-23 23:20:26 +0100 | [diff] [blame] | 4498 | sync.closeStreams() |
| 4499 | |
| 4500 | print("unshelved changelist {0} into {1}".format(change, branch_name)) |
| 4501 | |
| 4502 | return True |
| 4503 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4504 | |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 4505 | class P4Branches(Command): |
| 4506 | def __init__(self): |
| 4507 | Command.__init__(self) |
Joel Holdsworth | 84af8b8 | 2022-04-01 15:24:50 +0100 | [diff] [blame] | 4508 | self.options = [] |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 4509 | self.description = ("Shows the git branches that hold imports and their " |
| 4510 | + "corresponding perforce depot paths") |
| 4511 | self.verbose = False |
| 4512 | |
| 4513 | def run(self, args): |
Simon Hausmann | 5ca4461 | 2007-08-24 17:44:16 +0200 | [diff] [blame] | 4514 | if originP4BranchesExist(): |
| 4515 | createOrUpdateBranchesFromOrigin() |
| 4516 | |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4517 | for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]): |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 4518 | line = line.strip() |
| 4519 | |
| 4520 | if not line.startswith('p4/') or line == "p4/HEAD": |
| 4521 | continue |
| 4522 | branch = line |
| 4523 | |
| 4524 | log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch) |
| 4525 | settings = extractSettingsGitLog(log) |
| 4526 | |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4527 | print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])) |
Simon Hausmann | 09d89de | 2007-06-20 23:10:28 +0200 | [diff] [blame] | 4528 | return True |
| 4529 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4530 | |
Simon Hausmann | b984733 | 2007-03-20 20:54:23 +0100 | [diff] [blame] | 4531 | class HelpFormatter(optparse.IndentedHelpFormatter): |
| 4532 | def __init__(self): |
| 4533 | optparse.IndentedHelpFormatter.__init__(self) |
| 4534 | |
| 4535 | def format_description(self, description): |
| 4536 | if description: |
| 4537 | return description + "\n" |
| 4538 | else: |
| 4539 | return "" |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 4540 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4541 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4542 | def printUsage(commands): |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4543 | print("usage: %s <command> [options]" % sys.argv[0]) |
| 4544 | print("") |
| 4545 | print("valid commands: %s" % ", ".join(commands)) |
| 4546 | print("") |
| 4547 | print("Try %s <command> --help for command specific help." % sys.argv[0]) |
| 4548 | print("") |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4549 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4550 | |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4551 | commands = { |
Joel Holdsworth | 2bcf611 | 2022-04-01 15:24:56 +0100 | [diff] [blame] | 4552 | "submit": P4Submit, |
| 4553 | "commit": P4Submit, |
| 4554 | "sync": P4Sync, |
| 4555 | "rebase": P4Rebase, |
| 4556 | "clone": P4Clone, |
| 4557 | "branches": P4Branches, |
| 4558 | "unshelve": P4Unshelve, |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4559 | } |
| 4560 | |
Joel Holdsworth | adf159b | 2022-04-01 15:24:43 +0100 | [diff] [blame] | 4561 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4562 | def main(): |
| 4563 | if len(sys.argv[1:]) == 0: |
| 4564 | printUsage(commands.keys()) |
| 4565 | sys.exit(2) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4566 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4567 | cmdName = sys.argv[1] |
| 4568 | try: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4569 | klass = commands[cmdName] |
| 4570 | cmd = klass() |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4571 | except KeyError: |
Luke Diamand | f2606b1 | 2018-06-19 09:04:10 +0100 | [diff] [blame] | 4572 | print("unknown command %s" % cmdName) |
| 4573 | print("") |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4574 | printUsage(commands.keys()) |
| 4575 | sys.exit(2) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 4576 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4577 | options = cmd.options |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4578 | cmd.gitdir = os.environ.get("GIT_DIR", None) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4579 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4580 | args = sys.argv[2:] |
Simon Hausmann | e20a9e5 | 2007-03-26 00:13:51 +0200 | [diff] [blame] | 4581 | |
Pete Wyckoff | b0ccc80 | 2012-09-09 16:16:10 -0400 | [diff] [blame] | 4582 | options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true")) |
Luke Diamand | 6a10b6a | 2012-04-24 09:33:23 +0100 | [diff] [blame] | 4583 | if cmd.needsGit: |
| 4584 | options.append(optparse.make_option("--git-dir", dest="gitdir")) |
Simon Hausmann | e20a9e5 | 2007-03-26 00:13:51 +0200 | [diff] [blame] | 4585 | |
Luke Diamand | 6a10b6a | 2012-04-24 09:33:23 +0100 | [diff] [blame] | 4586 | parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), |
| 4587 | options, |
Joel Holdsworth | 57fe2ce | 2022-04-01 15:24:51 +0100 | [diff] [blame] | 4588 | description=cmd.description, |
| 4589 | formatter=HelpFormatter()) |
Simon Hausmann | 86949ee | 2007-03-19 20:59:12 +0100 | [diff] [blame] | 4590 | |
Ben Keene | 608e380 | 2019-12-16 14:02:20 +0000 | [diff] [blame] | 4591 | try: |
Joel Holdsworth | 0874bb0 | 2022-04-01 15:24:52 +0100 | [diff] [blame] | 4592 | cmd, args = parser.parse_args(sys.argv[2:], cmd) |
Ben Keene | 608e380 | 2019-12-16 14:02:20 +0000 | [diff] [blame] | 4593 | except: |
| 4594 | parser.print_help() |
| 4595 | raise |
| 4596 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4597 | global verbose |
| 4598 | verbose = cmd.verbose |
| 4599 | if cmd.needsGit: |
Joel Holdsworth | da0134f | 2022-04-01 15:25:00 +0100 | [diff] [blame] | 4600 | if cmd.gitdir is None: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4601 | cmd.gitdir = os.path.abspath(".git") |
| 4602 | if not isValidGitDir(cmd.gitdir): |
Luke Diamand | 378f7be | 2016-12-13 21:51:28 +0000 | [diff] [blame] | 4603 | # "rev-parse --git-dir" without arguments will try $PWD/.git |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4604 | cmd.gitdir = read_pipe(["git", "rev-parse", "--git-dir"]).strip() |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4605 | if os.path.exists(cmd.gitdir): |
Joel Holdsworth | 8a47059 | 2022-01-06 21:40:34 +0000 | [diff] [blame] | 4606 | cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip() |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4607 | if len(cdup) > 0: |
Joel Holdsworth | 990547a | 2022-04-01 15:24:44 +0100 | [diff] [blame] | 4608 | chdir(cdup) |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4609 | |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4610 | if not isValidGitDir(cmd.gitdir): |
| 4611 | if isValidGitDir(cmd.gitdir + "/.git"): |
| 4612 | cmd.gitdir += "/.git" |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4613 | else: |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4614 | die("fatal: cannot locate git repository at %s" % cmd.gitdir) |
Simon Hausmann | 8910ac0 | 2007-03-26 08:18:55 +0200 | [diff] [blame] | 4615 | |
Luke Diamand | 378f7be | 2016-12-13 21:51:28 +0000 | [diff] [blame] | 4616 | # so git commands invoked from the P4 workspace will succeed |
Han-Wen Nienhuys | b86f737 | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4617 | os.environ["GIT_DIR"] = cmd.gitdir |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 4618 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4619 | if not cmd.run(args): |
| 4620 | parser.print_help() |
Pete Wyckoff | 09fca77 | 2011-12-24 21:07:39 -0500 | [diff] [blame] | 4621 | sys.exit(2) |
Simon Hausmann | 4f5cf76 | 2007-03-19 22:25:17 +0100 | [diff] [blame] | 4622 | |
Han-Wen Nienhuys | bb6e09b | 2007-05-23 18:49:35 -0300 | [diff] [blame] | 4623 | |
| 4624 | if __name__ == '__main__': |
| 4625 | main() |