]> git.ipfire.org Git - thirdparty/git.git/blame - git-p4.py
Merge branch 'hn/test-ref-store-show-hash-algo'
[thirdparty/git.git] / git-p4.py
CommitLineData
86949eef
SH
1#!/usr/bin/env python
2#
3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
4#
c8cbbee9
SH
5# Author: Simon Hausmann <simon@lst.de>
6# Copyright: 2007 Simon Hausmann <simon@lst.de>
83dce55a 7# 2007 Trolltech ASA
86949eef
SH
8# License: MIT <http://www.opensource.org/licenses/mit-license.php>
9#
4c1d5867
LD
10# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except
11# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary
12# pylint: disable=wrong-import-order,unused-import,too-few-public-methods
13# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals
14# pylint: disable=line-too-long,bad-whitespace,superfluous-parens
15# pylint: disable=too-many-statements,too-many-instance-attributes
16# pylint: disable=too-many-branches,too-many-nested-blocks
17#
a33faf28 18import sys
0b4396f0
YZ
19if sys.version_info.major < 3 and sys.version_info.minor < 7:
20 sys.stderr.write("git-p4: requires Python 2.7 or later.\n")
a33faf28 21 sys.exit(1)
f629fa59
PW
22import os
23import optparse
a6b13067 24import functools
f629fa59
PW
25import marshal
26import subprocess
27import tempfile
28import time
29import platform
30import re
31import shutil
d20f0f8e 32import stat
a5db4b12
LS
33import zipfile
34import zlib
4b07cd23 35import ctypes
df8a9e86 36import errno
9f59ca4d 37import glob
8b41a97f 38
7575f4fd
YZ
39# On python2.7 where raw_input() and input() are both availble,
40# we want raw_input's semantics, but aliased to input for python3
41# compatibility
efdcc992
LD
42# support basestring in python3
43try:
7575f4fd
YZ
44 if raw_input and input:
45 input = raw_input
46except:
47 pass
a235e85c 48
4addad22 49verbose = False
86949eef 50
06804c76 51# Only labels/tags matching this will be imported/exported
c8942a22 52defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
21a50753 53
3deed5e0
LD
54# The block size is reduced automatically if required
55defaultBlockSize = 1<<20
1051ef00 56
0ef67acd 57p4_access_checked = False
1051ef00 58
70c0d553
JH
59re_ko_keywords = re.compile(br'\$(Id|Header)(:[^$\n]+)?\$')
60re_k_keywords = re.compile(br'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)(:[^$\n]+)?\$')
e665e98e 61
ae9b9509
JH
62def format_size_human_readable(num):
63 """ Returns a number of units (typically bytes) formatted as a human-readable
64 string.
65 """
66 if num < 1024:
67 return '{:d} B'.format(num)
68 for unit in ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
69 num /= 1024.0
70 if num < 1024.0:
71 return "{:3.1f} {}B".format(num, unit)
72 return "{:.1f} YiB".format(num)
73
21a50753
AK
74def p4_build_cmd(cmd):
75 """Build a suitable p4 command line.
76
77 This consolidates building and returning a p4 command line into one
78 location. It means that hooking into the environment, or other configuration
79 can be done more easily.
80 """
6de040df 81 real_cmd = ["p4"]
abcaf073
AK
82
83 user = gitConfig("git-p4.user")
84 if len(user) > 0:
6de040df 85 real_cmd += ["-u",user]
abcaf073
AK
86
87 password = gitConfig("git-p4.password")
88 if len(password) > 0:
6de040df 89 real_cmd += ["-P", password]
abcaf073
AK
90
91 port = gitConfig("git-p4.port")
92 if len(port) > 0:
6de040df 93 real_cmd += ["-p", port]
abcaf073
AK
94
95 host = gitConfig("git-p4.host")
96 if len(host) > 0:
41799aa2 97 real_cmd += ["-H", host]
abcaf073
AK
98
99 client = gitConfig("git-p4.client")
100 if len(client) > 0:
6de040df 101 real_cmd += ["-c", client]
abcaf073 102
89a6ecc5
LS
103 retries = gitConfigInt("git-p4.retries")
104 if retries is None:
105 # Perform 3 retries by default
106 retries = 3
bc233524
IK
107 if retries > 0:
108 # Provide a way to not pass this option by setting git-p4.retries to 0
109 real_cmd += ["-r", str(retries)]
6de040df 110
484d09c3 111 if not isinstance(cmd, list):
6de040df
LD
112 real_cmd = ' '.join(real_cmd) + ' ' + cmd
113 else:
114 real_cmd += cmd
0ef67acd
LD
115
116 # now check that we can actually talk to the server
117 global p4_access_checked
118 if not p4_access_checked:
119 p4_access_checked = True # suppress access checks in p4_check_access itself
120 p4_check_access()
121
21a50753
AK
122 return real_cmd
123
378f7be1
LD
124def git_dir(path):
125 """ Return TRUE if the given path is a git directory (/path/to/dir/.git).
126 This won't automatically add ".git" to a directory.
127 """
128 d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip()
129 if not d or len(d) == 0:
130 return None
131 else:
132 return d
133
bbd84863
MF
134def chdir(path, is_client_path=False):
135 """Do chdir to the given path, and set the PWD environment
136 variable for use by P4. It does not look at getcwd() output.
137 Since we're not using the shell, it is necessary to set the
138 PWD environment variable explicitly.
139
140 Normally, expand the path to force it to be absolute. This
141 addresses the use of relative path names inside P4 settings,
142 e.g. P4CONFIG=.p4config. P4 does not simply open the filename
143 as given; it looks for .p4config using PWD.
144
145 If is_client_path, the path was handed to us directly by p4,
146 and may be a symbolic link. Do not call os.getcwd() in this
147 case, because it will cause p4 to think that PWD is not inside
148 the client path.
149 """
150
151 os.chdir(path)
152 if not is_client_path:
153 path = os.getcwd()
154 os.environ['PWD'] = path
053fd0c1 155
4d25dc44
LS
156def calcDiskFree():
157 """Return free space in bytes on the disk of the given dirname."""
158 if platform.system() == 'Windows':
159 free_bytes = ctypes.c_ulonglong(0)
160 ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()), None, None, ctypes.pointer(free_bytes))
161 return free_bytes.value
162 else:
163 st = os.statvfs(os.getcwd())
164 return st.f_bavail * st.f_frsize
165
86dff6b6 166def die(msg):
6026aff5
LD
167 """ Terminate execution. Make sure that any running child processes have been wait()ed for before
168 calling this.
169 """
86dff6b6
HWN
170 if verbose:
171 raise Exception(msg)
172 else:
173 sys.stderr.write(msg + "\n")
174 sys.exit(1)
175
e2aed5fd
BK
176def prompt(prompt_text):
177 """ Prompt the user to choose one of the choices
178
179 Choices are identified in the prompt_text by square brackets around
180 a single letter option.
181 """
182 choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
183 while True:
6b602a2f
BK
184 sys.stderr.flush()
185 sys.stdout.write(prompt_text)
186 sys.stdout.flush()
187 response=sys.stdin.readline().strip().lower()
e2aed5fd
BK
188 if not response:
189 continue
190 response = response[0]
191 if response in choices:
192 return response
193
6cec21a8
YZ
194# We need different encoding/decoding strategies for text data being passed
195# around in pipes depending on python version
196if bytes is not str:
197 # For python3, always encode and decode as appropriate
198 def decode_text_stream(s):
199 return s.decode() if isinstance(s, bytes) else s
200 def encode_text_stream(s):
201 return s.encode() if isinstance(s, str) else s
202else:
203 # For python2.7, pass read strings as-is, but also allow writing unicode
204 def decode_text_stream(s):
205 return s
206 def encode_text_stream(s):
207 return s.encode('utf_8') if isinstance(s, unicode) else s
208
d38208a2
YZ
209def decode_path(path):
210 """Decode a given string (bytes or otherwise) using configured path encoding options
211 """
212 encoding = gitConfig('git-p4.pathEncoding') or 'utf_8'
213 if bytes is not str:
214 return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
215 else:
216 try:
217 path.decode('ascii')
218 except:
219 path = path.decode(encoding, errors='replace')
220 if verbose:
221 print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path))
222 return path
223
9f59ca4d
BK
224def run_git_hook(cmd, param=[]):
225 """Execute a hook if the hook exists."""
226 if verbose:
227 sys.stderr.write("Looking for hook: %s\n" % cmd)
228 sys.stderr.flush()
229
230 hooks_path = gitConfig("core.hooksPath")
231 if len(hooks_path) <= 0:
232 hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks")
233
234 if not isinstance(param, list):
235 param=[param]
236
237 # resolve hook file name, OS depdenent
238 hook_file = os.path.join(hooks_path, cmd)
239 if platform.system() == 'Windows':
240 if not os.path.isfile(hook_file):
241 # look for the file with an extension
242 files = glob.glob(hook_file + ".*")
243 if not files:
244 return True
245 files.sort()
246 hook_file = files.pop()
247 while hook_file.upper().endswith(".SAMPLE"):
248 # The file is a sample hook. We don't want it
249 if len(files) > 0:
250 hook_file = files.pop()
251 else:
252 return True
253
254 if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK):
255 return True
256
257 return run_hook_command(hook_file, param) == 0
258
259def run_hook_command(cmd, param):
260 """Executes a git hook command
261 cmd = the command line file to be executed. This can be
262 a file that is run by OS association.
263
264 param = a list of parameters to pass to the cmd command
265
266 On windows, the extension is checked to see if it should
267 be run with the Git for Windows Bash shell. If there
268 is no file extension, the file is deemed a bash shell
269 and will be handed off to sh.exe. Otherwise, Windows
270 will be called with the shell to handle the file assocation.
271
272 For non Windows operating systems, the file is called
273 as an executable.
274 """
275 cli = [cmd] + param
276 use_shell = False
277 if platform.system() == 'Windows':
278 (root,ext) = os.path.splitext(cmd)
279 if ext == "":
280 exe_path = os.environ.get("EXEPATH")
281 if exe_path is None:
282 exe_path = ""
283 else:
284 exe_path = os.path.join(exe_path, "bin")
285 cli = [os.path.join(exe_path, "SH.EXE")] + cli
286 else:
287 use_shell = True
288 return subprocess.call(cli, shell=use_shell)
289
290
6de040df 291def write_pipe(c, stdin):
4addad22 292 if verbose:
6de040df 293 sys.stderr.write('Writing pipe: %s\n' % str(c))
b016d397 294
484d09c3 295 expand = not isinstance(c, list)
6de040df
LD
296 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
297 pipe = p.stdin
298 val = pipe.write(stdin)
299 pipe.close()
300 if p.wait():
301 die('Command failed: %s' % str(c))
b016d397
HWN
302
303 return val
304
6de040df 305def p4_write_pipe(c, stdin):
d9429194 306 real_cmd = p4_build_cmd(c)
6cec21a8
YZ
307 if bytes is not str and isinstance(stdin, str):
308 stdin = encode_text_stream(stdin)
6de040df 309 return write_pipe(real_cmd, stdin)
d9429194 310
78871bf4
LD
311def read_pipe_full(c):
312 """ Read output from command. Returns a tuple
313 of the return status, stdout text and stderr
314 text.
315 """
4addad22 316 if verbose:
6de040df 317 sys.stderr.write('Reading pipe: %s\n' % str(c))
8b41a97f 318
484d09c3 319 expand = not isinstance(c, list)
1f5f3907
LS
320 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
321 (out, err) = p.communicate()
6cec21a8 322 return (p.returncode, out, decode_text_stream(err))
78871bf4 323
86dca24b 324def read_pipe(c, ignore_error=False, raw=False):
78871bf4
LD
325 """ Read output from command. Returns the output text on
326 success. On failure, terminates execution, unless
327 ignore_error is True, when it returns an empty string.
86dca24b
YZ
328
329 If raw is True, do not attempt to decode output text.
78871bf4
LD
330 """
331 (retcode, out, err) = read_pipe_full(c)
332 if retcode != 0:
333 if ignore_error:
334 out = ""
335 else:
336 die('Command failed: %s\nError: %s' % (str(c), err))
86dca24b
YZ
337 if not raw:
338 out = decode_text_stream(out)
1f5f3907 339 return out
b016d397 340
78871bf4
LD
341def read_pipe_text(c):
342 """ Read output from a command with trailing whitespace stripped.
343 On error, returns None.
344 """
345 (retcode, out, err) = read_pipe_full(c)
346 if retcode != 0:
347 return None
348 else:
6cec21a8 349 return decode_text_stream(out).rstrip()
78871bf4 350
6cec21a8 351def p4_read_pipe(c, ignore_error=False, raw=False):
d9429194 352 real_cmd = p4_build_cmd(c)
6cec21a8 353 return read_pipe(real_cmd, ignore_error, raw=raw)
b016d397 354
9732e222 355def read_pipe_lines(c, raw=False):
4addad22 356 if verbose:
6de040df
LD
357 sys.stderr.write('Reading pipe: %s\n' % str(c))
358
484d09c3 359 expand = not isinstance(c, list)
6de040df
LD
360 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
361 pipe = p.stdout
9732e222
JH
362 lines = pipe.readlines()
363 if not raw:
364 lines = [decode_text_stream(line) for line in lines]
6de040df
LD
365 if pipe.close() or p.wait():
366 die('Command failed: %s' % str(c))
9732e222 367 return lines
caace111 368
2318121b
AK
369def p4_read_pipe_lines(c):
370 """Specifically invoke p4 on the command supplied. """
155af834 371 real_cmd = p4_build_cmd(c)
2318121b
AK
372 return read_pipe_lines(real_cmd)
373
8e9497c2
GG
374def p4_has_command(cmd):
375 """Ask p4 for help on this command. If it returns an error, the
376 command does not exist in this version of p4."""
377 real_cmd = p4_build_cmd(["help", cmd])
378 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
379 stderr=subprocess.PIPE)
380 p.communicate()
381 return p.returncode == 0
382
249da4c0
PW
383def p4_has_move_command():
384 """See if the move command exists, that it supports -k, and that
385 it has not been administratively disabled. The arguments
386 must be correct, but the filenames do not have to exist. Use
387 ones with wildcards so even if they exist, it will fail."""
388
389 if not p4_has_command("move"):
390 return False
391 cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
392 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
393 (out, err) = p.communicate()
6cec21a8 394 err = decode_text_stream(err)
249da4c0
PW
395 # return code will be 1 in either case
396 if err.find("Invalid option") >= 0:
397 return False
398 if err.find("disabled") >= 0:
399 return False
400 # assume it failed because @... was invalid changelist
401 return True
402
cbff4b25 403def system(cmd, ignore_error=False):
484d09c3 404 expand = not isinstance(cmd, list)
4addad22 405 if verbose:
6de040df 406 sys.stderr.write("executing %s\n" % str(cmd))
a235e85c 407 retcode = subprocess.call(cmd, shell=expand)
cbff4b25 408 if retcode and not ignore_error:
a235e85c 409 raise CalledProcessError(retcode, cmd)
6754a299 410
cbff4b25
LD
411 return retcode
412
bf9320f1
AK
413def p4_system(cmd):
414 """Specifically invoke p4 as the system command. """
155af834 415 real_cmd = p4_build_cmd(cmd)
484d09c3 416 expand = not isinstance(real_cmd, list)
a235e85c
BC
417 retcode = subprocess.call(real_cmd, shell=expand)
418 if retcode:
419 raise CalledProcessError(retcode, real_cmd)
6de040df 420
0ef67acd
LD
421def die_bad_access(s):
422 die("failure accessing depot: {0}".format(s.rstrip()))
423
424def p4_check_access(min_expiration=1):
425 """ Check if we can access Perforce - account still logged in
426 """
427 results = p4CmdList(["login", "-s"])
428
429 if len(results) == 0:
430 # should never get here: always get either some results, or a p4ExitCode
431 assert("could not parse response from perforce")
432
433 result = results[0]
434
435 if 'p4ExitCode' in result:
436 # p4 returned non-zero status, e.g. P4PORT invalid, or p4 not in path
437 die_bad_access("could not run p4")
438
439 code = result.get("code")
440 if not code:
441 # we get here if we couldn't connect and there was nothing to unmarshal
442 die_bad_access("could not connect")
443
444 elif code == "stat":
445 expiry = result.get("TicketExpiration")
446 if expiry:
447 expiry = int(expiry)
448 if expiry > min_expiration:
449 # ok to carry on
450 return
451 else:
452 die_bad_access("perforce ticket expires in {0} seconds".format(expiry))
453
454 else:
455 # account without a timeout - all ok
456 return
457
458 elif code == "error":
459 data = result.get("data")
460 if data:
461 die_bad_access("p4 error: {0}".format(data))
462 else:
463 die_bad_access("unknown error")
d4990d56
PO
464 elif code == "info":
465 return
0ef67acd
LD
466 else:
467 die_bad_access("unknown error code {0}".format(code))
468
7f0e5962
PW
469_p4_version_string = None
470def p4_version_string():
471 """Read the version string, showing just the last line, which
472 hopefully is the interesting version bit.
473
474 $ p4 -V
475 Perforce - The Fast Software Configuration Management System.
476 Copyright 1995-2011 Perforce Software. All rights reserved.
477 Rev. P4/NTX86/2011.1/393975 (2011/12/16).
478 """
479 global _p4_version_string
480 if not _p4_version_string:
481 a = p4_read_pipe_lines(["-V"])
482 _p4_version_string = a[-1].rstrip()
483 return _p4_version_string
484
6de040df 485def p4_integrate(src, dest):
9d7d446a 486 p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
6de040df 487
8d7ec362 488def p4_sync(f, *options):
9d7d446a 489 p4_system(["sync"] + list(options) + [wildcard_encode(f)])
6de040df
LD
490
491def p4_add(f):
9d7d446a
PW
492 # forcibly add file names with wildcards
493 if wildcard_present(f):
494 p4_system(["add", "-f", f])
495 else:
496 p4_system(["add", f])
6de040df
LD
497
498def p4_delete(f):
9d7d446a 499 p4_system(["delete", wildcard_encode(f)])
6de040df 500
a02b8bc4
RP
501def p4_edit(f, *options):
502 p4_system(["edit"] + list(options) + [wildcard_encode(f)])
6de040df
LD
503
504def p4_revert(f):
9d7d446a 505 p4_system(["revert", wildcard_encode(f)])
6de040df 506
9d7d446a
PW
507def p4_reopen(type, f):
508 p4_system(["reopen", "-t", type, wildcard_encode(f)])
bf9320f1 509
46c609e9
LD
510def p4_reopen_in_change(changelist, files):
511 cmd = ["reopen", "-c", str(changelist)] + files
512 p4_system(cmd)
513
8e9497c2
GG
514def p4_move(src, dest):
515 p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
516
1051ef00 517def p4_last_change():
1997e91f 518 results = p4CmdList(["changes", "-m", "1"], skip_info=True)
1051ef00
LD
519 return int(results[0]['change'])
520
123f6317 521def p4_describe(change, shelved=False):
18fa13d0
PW
522 """Make sure it returns a valid result by checking for
523 the presence of field "time". Return a dict of the
524 results."""
525
123f6317
LD
526 cmd = ["describe", "-s"]
527 if shelved:
528 cmd += ["-S"]
529 cmd += [str(change)]
530
531 ds = p4CmdList(cmd, skip_info=True)
18fa13d0
PW
532 if len(ds) != 1:
533 die("p4 describe -s %d did not return 1 result: %s" % (change, str(ds)))
534
535 d = ds[0]
536
537 if "p4ExitCode" in d:
538 die("p4 describe -s %d exited with %d: %s" % (change, d["p4ExitCode"],
539 str(d)))
540 if "code" in d:
541 if d["code"] == "error":
542 die("p4 describe -s %d returned error code: %s" % (change, str(d)))
543
544 if "time" not in d:
545 die("p4 describe -s %d returned no \"time\": %s" % (change, str(d)))
546
547 return d
548
9cffb8c8
PW
549#
550# Canonicalize the p4 type and return a tuple of the
551# base type, plus any modifiers. See "p4 help filetypes"
552# for a list and explanation.
553#
554def split_p4_type(p4type):
555
556 p4_filetypes_historical = {
557 "ctempobj": "binary+Sw",
558 "ctext": "text+C",
559 "cxtext": "text+Cx",
560 "ktext": "text+k",
561 "kxtext": "text+kx",
562 "ltext": "text+F",
563 "tempobj": "binary+FSw",
564 "ubinary": "binary+F",
565 "uresource": "resource+F",
566 "uxbinary": "binary+Fx",
567 "xbinary": "binary+x",
568 "xltext": "text+Fx",
569 "xtempobj": "binary+Swx",
570 "xtext": "text+x",
571 "xunicode": "unicode+x",
572 "xutf16": "utf16+x",
573 }
574 if p4type in p4_filetypes_historical:
575 p4type = p4_filetypes_historical[p4type]
576 mods = ""
577 s = p4type.split("+")
578 base = s[0]
579 mods = ""
580 if len(s) > 1:
581 mods = s[1]
582 return (base, mods)
b9fc6ea9 583
60df071c
LD
584#
585# return the raw p4 type of a file (text, text+ko, etc)
586#
79467e61
PW
587def p4_type(f):
588 results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
60df071c
LD
589 return results[0]['headType']
590
591#
592# Given a type base and modifier, return a regexp matching
593# the keywords that can be expanded in the file
594#
595def p4_keywords_regexp_for_type(base, type_mods):
596 if base in ("text", "unicode", "binary"):
60df071c 597 if "ko" in type_mods:
e665e98e 598 return re_ko_keywords
60df071c 599 elif "k" in type_mods:
e665e98e 600 return re_k_keywords
60df071c
LD
601 else:
602 return None
60df071c
LD
603 else:
604 return None
605
606#
607# Given a file, return a regexp matching the possible
608# RCS keywords that will be expanded, or None for files
609# with kw expansion turned off.
610#
611def p4_keywords_regexp_for_file(file):
612 if not os.path.exists(file):
613 return None
614 else:
615 (type_base, type_mods) = split_p4_type(p4_type(file))
616 return p4_keywords_regexp_for_type(type_base, type_mods)
b9fc6ea9 617
c65b670e
CP
618def setP4ExecBit(file, mode):
619 # Reopens an already open file and changes the execute bit to match
620 # the execute bit setting in the passed in mode.
621
622 p4Type = "+x"
623
624 if not isModeExec(mode):
625 p4Type = getP4OpenedType(file)
626 p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type)
627 p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type)
628 if p4Type[-1] == "+":
629 p4Type = p4Type[0:-1]
630
6de040df 631 p4_reopen(p4Type, file)
c65b670e
CP
632
633def getP4OpenedType(file):
634 # Returns the perforce file type for the given file.
635
9d7d446a 636 result = p4_read_pipe(["opened", wildcard_encode(file)])
34a0dbfc 637 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
c65b670e
CP
638 if match:
639 return match.group(1)
640 else:
f3e5ae4f 641 die("Could not determine file type for %s (result: '%s')" % (file, result))
c65b670e 642
06804c76
LD
643# Return the set of all p4 labels
644def getP4Labels(depotPaths):
645 labels = set()
484d09c3 646 if not isinstance(depotPaths, list):
06804c76
LD
647 depotPaths = [depotPaths]
648
649 for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
650 label = l['label']
651 labels.add(label)
652
653 return labels
654
655# Return the set of all git tags
656def getGitTags():
657 gitTags = set()
658 for line in read_pipe_lines(["git", "tag"]):
659 tag = line.strip()
660 gitTags.add(tag)
661 return gitTags
662
ce425eb4 663_diff_tree_pattern = None
b43b0a3c
CP
664
665def parseDiffTreeEntry(entry):
666 """Parses a single diff tree entry into its component elements.
667
668 See git-diff-tree(1) manpage for details about the format of the diff
669 output. This method returns a dictionary with the following elements:
670
671 src_mode - The mode of the source file
672 dst_mode - The mode of the destination file
673 src_sha1 - The sha1 for the source file
674 dst_sha1 - The sha1 fr the destination file
675 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
676 status_score - The score for the status (applicable for 'C' and 'R'
677 statuses). This is None if there is no score.
678 src - The path for the source file.
679 dst - The path for the destination file. This is only present for
680 copy or renames. If it is not present, this is None.
681
682 If the pattern is not matched, None is returned."""
683
ce425eb4
YZ
684 global _diff_tree_pattern
685 if not _diff_tree_pattern:
686 _diff_tree_pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
687
688 match = _diff_tree_pattern.match(entry)
b43b0a3c
CP
689 if match:
690 return {
691 'src_mode': match.group(1),
692 'dst_mode': match.group(2),
693 'src_sha1': match.group(3),
694 'dst_sha1': match.group(4),
695 'status': match.group(5),
696 'status_score': match.group(6),
697 'src': match.group(7),
698 'dst': match.group(10)
699 }
700 return None
701
c65b670e
CP
702def isModeExec(mode):
703 # Returns True if the given git mode represents an executable file,
704 # otherwise False.
705 return mode[-3:] == "755"
706
55bb3e36
LD
707class P4Exception(Exception):
708 """ Base class for exceptions from the p4 client """
709 def __init__(self, exit_code):
710 self.p4ExitCode = exit_code
711
712class P4ServerException(P4Exception):
713 """ Base class for exceptions where we get some kind of marshalled up result from the server """
714 def __init__(self, exit_code, p4_result):
715 super(P4ServerException, self).__init__(exit_code)
716 self.p4_result = p4_result
717 self.code = p4_result[0]['code']
718 self.data = p4_result[0]['data']
719
720class P4RequestSizeException(P4ServerException):
721 """ One of the maxresults or maxscanrows errors """
722 def __init__(self, exit_code, p4_result, limit):
723 super(P4RequestSizeException, self).__init__(exit_code, p4_result)
724 self.limit = limit
725
5c3d5020
LD
726class P4CommandException(P4Exception):
727 """ Something went wrong calling p4 which means we have to give up """
728 def __init__(self, msg):
729 self.msg = msg
730
731 def __str__(self):
732 return self.msg
733
c65b670e
CP
734def isModeExecChanged(src_mode, dst_mode):
735 return isModeExec(src_mode) != isModeExec(dst_mode)
736
55bb3e36
LD
737def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
738 errors_as_exceptions=False):
6de040df 739
484d09c3 740 if not isinstance(cmd, list):
6de040df
LD
741 cmd = "-G " + cmd
742 expand = True
743 else:
744 cmd = ["-G"] + cmd
745 expand = False
746
747 cmd = p4_build_cmd(cmd)
6a49f8e2 748 if verbose:
6de040df 749 sys.stderr.write("Opening pipe: %s\n" % str(cmd))
9f90c733
SL
750
751 # Use a temporary file to avoid deadlocks without
752 # subprocess.communicate(), which would put another copy
753 # of stdout into memory.
754 stdin_file = None
755 if stdin is not None:
756 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
484d09c3 757 if not isinstance(stdin, list):
6de040df
LD
758 stdin_file.write(stdin)
759 else:
760 for i in stdin:
86dca24b
YZ
761 stdin_file.write(encode_text_stream(i))
762 stdin_file.write(b'\n')
9f90c733
SL
763 stdin_file.flush()
764 stdin_file.seek(0)
765
6de040df
LD
766 p4 = subprocess.Popen(cmd,
767 shell=expand,
9f90c733
SL
768 stdin=stdin_file,
769 stdout=subprocess.PIPE)
86949eef
SH
770
771 result = []
772 try:
773 while True:
9f90c733 774 entry = marshal.load(p4.stdout)
6cec21a8
YZ
775 if bytes is not str:
776 # Decode unmarshalled dict to use str keys and values, except for:
777 # - `data` which may contain arbitrary binary data
778 # - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text
779 decoded_entry = {}
780 for key, value in entry.items():
781 key = key.decode()
782 if isinstance(value, bytes) and not (key in ('data', 'path', 'clientFile') or key.startswith('depotFile')):
783 value = value.decode()
784 decoded_entry[key] = value
785 # Parse out data if it's an error response
786 if decoded_entry.get('code') == 'error' and 'data' in decoded_entry:
787 decoded_entry['data'] = decoded_entry['data'].decode()
788 entry = decoded_entry
1997e91f
MT
789 if skip_info:
790 if 'code' in entry and entry['code'] == 'info':
791 continue
c3f6163b
AG
792 if cb is not None:
793 cb(entry)
794 else:
795 result.append(entry)
86949eef
SH
796 except EOFError:
797 pass
9f90c733
SL
798 exitCode = p4.wait()
799 if exitCode != 0:
55bb3e36
LD
800 if errors_as_exceptions:
801 if len(result) > 0:
802 data = result[0].get('data')
803 if data:
804 m = re.search('Too many rows scanned \(over (\d+)\)', data)
805 if not m:
806 m = re.search('Request too large \(over (\d+)\)', data)
807
808 if m:
809 limit = int(m.group(1))
810 raise P4RequestSizeException(exitCode, result, limit)
811
812 raise P4ServerException(exitCode, result)
813 else:
814 raise P4Exception(exitCode)
815 else:
816 entry = {}
817 entry["p4ExitCode"] = exitCode
818 result.append(entry)
86949eef
SH
819
820 return result
821
822def p4Cmd(cmd):
823 list = p4CmdList(cmd)
824 result = {}
825 for entry in list:
826 result.update(entry)
827 return result;
828
cb2c9db5
SH
829def p4Where(depotPath):
830 if not depotPath.endswith("/"):
831 depotPath += "/"
cd884106
VA
832 depotPathLong = depotPath + "..."
833 outputList = p4CmdList(["where", depotPathLong])
7f705dc3
TAL
834 output = None
835 for entry in outputList:
75bc9573 836 if "depotFile" in entry:
cd884106
VA
837 # Search for the base client side depot path, as long as it starts with the branch's P4 path.
838 # The base path always ends with "/...".
d38208a2
YZ
839 entry_path = decode_path(entry['depotFile'])
840 if entry_path.find(depotPath) == 0 and entry_path[-4:] == "/...":
75bc9573
TAL
841 output = entry
842 break
843 elif "data" in entry:
844 data = entry.get("data")
845 space = data.find(" ")
846 if data[:space] == depotPath:
847 output = entry
848 break
7f705dc3
TAL
849 if output == None:
850 return ""
dc524036
SH
851 if output["code"] == "error":
852 return ""
cb2c9db5
SH
853 clientPath = ""
854 if "path" in output:
d38208a2 855 clientPath = decode_path(output['path'])
cb2c9db5
SH
856 elif "data" in output:
857 data = output.get("data")
d38208a2
YZ
858 lastSpace = data.rfind(b" ")
859 clientPath = decode_path(data[lastSpace + 1:])
cb2c9db5
SH
860
861 if clientPath.endswith("..."):
862 clientPath = clientPath[:-3]
863 return clientPath
864
86949eef 865def currentGitBranch():
eff45110 866 return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"])
86949eef 867
4f5cf76a 868def isValidGitDir(path):
378f7be1 869 return git_dir(path) != None
4f5cf76a 870
463e8af6 871def parseRevision(ref):
b25b2065 872 return read_pipe("git rev-parse %s" % ref).strip()
463e8af6 873
28755dba
PW
874def branchExists(ref):
875 rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
876 ignore_error=True)
877 return len(rev) > 0
878
6ae8de88
SH
879def extractLogMessageFromGitCommit(commit):
880 logMessage = ""
b016d397
HWN
881
882 ## fixme: title is first line of commit, not 1st paragraph.
6ae8de88 883 foundTitle = False
c3f2358d 884 for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
6ae8de88
SH
885 if not foundTitle:
886 if len(log) == 1:
1c094184 887 foundTitle = True
6ae8de88
SH
888 continue
889
890 logMessage += log
891 return logMessage
892
bb6e09b2 893def extractSettingsGitLog(log):
6ae8de88
SH
894 values = {}
895 for line in log.split("\n"):
896 line = line.strip()
6326aa58
HWN
897 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
898 if not m:
899 continue
900
901 assignments = m.group(1).split (':')
902 for a in assignments:
903 vals = a.split ('=')
904 key = vals[0].strip()
905 val = ('='.join (vals[1:])).strip()
906 if val.endswith ('\"') and val.startswith('"'):
907 val = val[1:-1]
908
909 values[key] = val
910
845b42cb
SH
911 paths = values.get("depot-paths")
912 if not paths:
913 paths = values.get("depot-path")
a3fdd579
SH
914 if paths:
915 values['depot-paths'] = paths.split(',')
bb6e09b2 916 return values
6ae8de88 917
8136a639 918def gitBranchExists(branch):
bb6e09b2
HWN
919 proc = subprocess.Popen(["git", "rev-parse", branch],
920 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
caace111 921 return proc.wait() == 0;
8136a639 922
123f6317
LD
923def gitUpdateRef(ref, newvalue):
924 subprocess.check_call(["git", "update-ref", ref, newvalue])
925
926def gitDeleteRef(ref):
927 subprocess.check_call(["git", "update-ref", "-d", ref])
928
36bd8446 929_gitConfig = {}
b345d6c3 930
692e1796 931def gitConfig(key, typeSpecifier=None):
dba1c9d9 932 if key not in _gitConfig:
692e1796
LS
933 cmd = [ "git", "config" ]
934 if typeSpecifier:
935 cmd += [ typeSpecifier ]
936 cmd += [ key ]
b345d6c3
PW
937 s = read_pipe(cmd, ignore_error=True)
938 _gitConfig[key] = s.strip()
36bd8446 939 return _gitConfig[key]
01265103 940
0d609032
PW
941def gitConfigBool(key):
942 """Return a bool, using git config --bool. It is True only if the
943 variable is set to true, and False if set to false or not present
944 in the config."""
945
dba1c9d9 946 if key not in _gitConfig:
692e1796 947 _gitConfig[key] = gitConfig(key, '--bool') == "true"
36bd8446 948 return _gitConfig[key]
01265103 949
cb1dafdf 950def gitConfigInt(key):
dba1c9d9 951 if key not in _gitConfig:
cb1dafdf 952 cmd = [ "git", "config", "--int", key ]
0d609032
PW
953 s = read_pipe(cmd, ignore_error=True)
954 v = s.strip()
cb1dafdf
LS
955 try:
956 _gitConfig[key] = int(gitConfig(key, '--int'))
957 except ValueError:
958 _gitConfig[key] = None
36bd8446 959 return _gitConfig[key]
01265103 960
7199cf13 961def gitConfigList(key):
dba1c9d9 962 if key not in _gitConfig:
2abba301 963 s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
c3c2b057 964 _gitConfig[key] = s.strip().splitlines()
7960e707
LS
965 if _gitConfig[key] == ['']:
966 _gitConfig[key] = []
7199cf13
VA
967 return _gitConfig[key]
968
2c8037ed
PW
969def p4BranchesInGit(branchesAreInRemotes=True):
970 """Find all the branches whose names start with "p4/", looking
971 in remotes or heads as specified by the argument. Return
972 a dictionary of { branch: revision } for each one found.
973 The branch names are the short names, without any
974 "p4/" prefix."""
975
062410bb
SH
976 branches = {}
977
978 cmdline = "git rev-parse --symbolic "
979 if branchesAreInRemotes:
2c8037ed 980 cmdline += "--remotes"
062410bb 981 else:
2c8037ed 982 cmdline += "--branches"
062410bb
SH
983
984 for line in read_pipe_lines(cmdline):
985 line = line.strip()
986
2c8037ed
PW
987 # only import to p4/
988 if not line.startswith('p4/'):
989 continue
990 # special symbolic ref to p4/master
991 if line == "p4/HEAD":
062410bb 992 continue
062410bb 993
2c8037ed
PW
994 # strip off p4/ prefix
995 branch = line[len("p4/"):]
062410bb
SH
996
997 branches[branch] = parseRevision(line)
2c8037ed 998
062410bb
SH
999 return branches
1000
5a8e84cd
PW
1001def branch_exists(branch):
1002 """Make sure that the given ref name really exists."""
1003
1004 cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
1005 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
1006 out, _ = p.communicate()
6cec21a8 1007 out = decode_text_stream(out)
5a8e84cd
PW
1008 if p.returncode:
1009 return False
1010 # expect exactly one line of output: the branch name
1011 return out.rstrip() == branch
1012
9ceab363 1013def findUpstreamBranchPoint(head = "HEAD"):
86506fe5
SH
1014 branches = p4BranchesInGit()
1015 # map from depot-path to branch name
1016 branchByDepotPath = {}
1017 for branch in branches.keys():
1018 tip = branches[branch]
1019 log = extractLogMessageFromGitCommit(tip)
1020 settings = extractSettingsGitLog(log)
dba1c9d9 1021 if "depot-paths" in settings:
86506fe5
SH
1022 paths = ",".join(settings["depot-paths"])
1023 branchByDepotPath[paths] = "remotes/p4/" + branch
1024
27d2d811 1025 settings = None
27d2d811
SH
1026 parent = 0
1027 while parent < 65535:
9ceab363 1028 commit = head + "~%s" % parent
27d2d811
SH
1029 log = extractLogMessageFromGitCommit(commit)
1030 settings = extractSettingsGitLog(log)
dba1c9d9 1031 if "depot-paths" in settings:
86506fe5 1032 paths = ",".join(settings["depot-paths"])
dba1c9d9 1033 if paths in branchByDepotPath:
86506fe5 1034 return [branchByDepotPath[paths], settings]
27d2d811 1035
86506fe5 1036 parent = parent + 1
27d2d811 1037
86506fe5 1038 return ["", settings]
27d2d811 1039
5ca44617
SH
1040def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
1041 if not silent:
f2606b17 1042 print("Creating/updating branch(es) in %s based on origin branch(es)"
5ca44617
SH
1043 % localRefPrefix)
1044
1045 originPrefix = "origin/p4/"
1046
1047 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
1048 line = line.strip()
1049 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
1050 continue
1051
1052 headName = line[len(originPrefix):]
1053 remoteHead = localRefPrefix + headName
1054 originHead = line
1055
1056 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
dba1c9d9
LD
1057 if ('depot-paths' not in original
1058 or 'change' not in original):
5ca44617
SH
1059 continue
1060
1061 update = False
1062 if not gitBranchExists(remoteHead):
1063 if verbose:
f2606b17 1064 print("creating %s" % remoteHead)
5ca44617
SH
1065 update = True
1066 else:
1067 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
dba1c9d9 1068 if 'change' in settings:
5ca44617
SH
1069 if settings['depot-paths'] == original['depot-paths']:
1070 originP4Change = int(original['change'])
1071 p4Change = int(settings['change'])
1072 if originP4Change > p4Change:
f2606b17 1073 print("%s (%s) is newer than %s (%s). "
5ca44617
SH
1074 "Updating p4 branch from origin."
1075 % (originHead, originP4Change,
1076 remoteHead, p4Change))
1077 update = True
1078 else:
f2606b17 1079 print("Ignoring: %s was imported from %s while "
5ca44617
SH
1080 "%s was imported from %s"
1081 % (originHead, ','.join(original['depot-paths']),
1082 remoteHead, ','.join(settings['depot-paths'])))
1083
1084 if update:
1085 system("git update-ref %s %s" % (remoteHead, originHead))
1086
1087def originP4BranchesExist():
1088 return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
1089
1051ef00
LD
1090
1091def p4ParseNumericChangeRange(parts):
1092 changeStart = int(parts[0][1:])
1093 if parts[1] == '#head':
1094 changeEnd = p4_last_change()
1095 else:
1096 changeEnd = int(parts[1])
1097
1098 return (changeStart, changeEnd)
1099
1100def chooseBlockSize(blockSize):
1101 if blockSize:
1102 return blockSize
1103 else:
1104 return defaultBlockSize
1105
1106def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
4f6432d8 1107 assert depotPaths
96b2d54a 1108
1051ef00
LD
1109 # Parse the change range into start and end. Try to find integer
1110 # revision ranges as these can be broken up into blocks to avoid
1111 # hitting server-side limits (maxrows, maxscanresults). But if
1112 # that doesn't work, fall back to using the raw revision specifier
1113 # strings, without using block mode.
1114
96b2d54a 1115 if changeRange is None or changeRange == '':
1051ef00
LD
1116 changeStart = 1
1117 changeEnd = p4_last_change()
1118 block_size = chooseBlockSize(requestedBlockSize)
96b2d54a
LS
1119 else:
1120 parts = changeRange.split(',')
1121 assert len(parts) == 2
1051ef00
LD
1122 try:
1123 (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
1124 block_size = chooseBlockSize(requestedBlockSize)
8fa0abf8 1125 except ValueError:
1051ef00
LD
1126 changeStart = parts[0][1:]
1127 changeEnd = parts[1]
1128 if requestedBlockSize:
1129 die("cannot use --changes-block-size with non-numeric revisions")
1130 block_size = None
4f6432d8 1131
9943e5b9 1132 changes = set()
96b2d54a 1133
1f90a648 1134 # Retrieve changes a block at a time, to prevent running
3deed5e0
LD
1135 # into a MaxResults/MaxScanRows error from the server. If
1136 # we _do_ hit one of those errors, turn down the block size
1051ef00 1137
1f90a648
SH
1138 while True:
1139 cmd = ['changes']
1051ef00 1140
1f90a648
SH
1141 if block_size:
1142 end = min(changeEnd, changeStart + block_size)
1143 revisionRange = "%d,%d" % (changeStart, end)
1144 else:
1145 revisionRange = "%s,%s" % (changeStart, changeEnd)
1051ef00 1146
1f90a648 1147 for p in depotPaths:
1051ef00
LD
1148 cmd += ["%s...@%s" % (p, revisionRange)]
1149
3deed5e0
LD
1150 # fetch the changes
1151 try:
1152 result = p4CmdList(cmd, errors_as_exceptions=True)
1153 except P4RequestSizeException as e:
1154 if not block_size:
1155 block_size = e.limit
1156 elif block_size > e.limit:
1157 block_size = e.limit
1158 else:
1159 block_size = max(2, block_size // 2)
1160
1161 if verbose: print("block size error, retrying with block size {0}".format(block_size))
1162 continue
1163 except P4Exception as e:
1164 die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
1165
1f90a648 1166 # Insert changes in chronological order
3deed5e0 1167 for entry in reversed(result):
dba1c9d9 1168 if 'change' not in entry:
b596b3b9
MT
1169 continue
1170 changes.add(int(entry['change']))
1051ef00 1171
1f90a648
SH
1172 if not block_size:
1173 break
1051ef00 1174
1f90a648
SH
1175 if end >= changeEnd:
1176 break
1051ef00 1177
1f90a648 1178 changeStart = end + 1
4f6432d8 1179
1f90a648
SH
1180 changes = sorted(changes)
1181 return changes
4f6432d8 1182
d53de8b9
TAL
1183def p4PathStartsWith(path, prefix):
1184 # This method tries to remedy a potential mixed-case issue:
1185 #
1186 # If UserA adds //depot/DirA/file1
1187 # and UserB adds //depot/dira/file2
1188 #
1189 # we may or may not have a problem. If you have core.ignorecase=true,
1190 # we treat DirA and dira as the same directory
0d609032 1191 if gitConfigBool("core.ignorecase"):
d53de8b9
TAL
1192 return path.lower().startswith(prefix.lower())
1193 return path.startswith(prefix)
1194
543987bd
PW
1195def getClientSpec():
1196 """Look at the p4 client spec, create a View() object that contains
1197 all the mappings, and return it."""
1198
1199 specList = p4CmdList("client -o")
1200 if len(specList) != 1:
1201 die('Output from "client -o" is %d lines, expecting 1' %
1202 len(specList))
1203
1204 # dictionary of all client parameters
1205 entry = specList[0]
1206
9d57c4a6
KS
1207 # the //client/ name
1208 client_name = entry["Client"]
1209
543987bd
PW
1210 # just the keys that start with "View"
1211 view_keys = [ k for k in entry.keys() if k.startswith("View") ]
1212
1213 # hold this new View
9d57c4a6 1214 view = View(client_name)
543987bd
PW
1215
1216 # append the lines, in order, to the view
1217 for view_num in range(len(view_keys)):
1218 k = "View%d" % view_num
1219 if k not in view_keys:
1220 die("Expected view key %s missing" % k)
1221 view.append(entry[k])
1222
1223 return view
1224
1225def getClientRoot():
1226 """Grab the client directory."""
1227
1228 output = p4CmdList("client -o")
1229 if len(output) != 1:
1230 die('Output from "client -o" is %d lines, expecting 1' % len(output))
1231
1232 entry = output[0]
1233 if "Root" not in entry:
1234 die('Client has no "Root"')
1235
1236 return entry["Root"]
1237
9d7d446a
PW
1238#
1239# P4 wildcards are not allowed in filenames. P4 complains
1240# if you simply add them, but you can force it with "-f", in
1241# which case it translates them into %xx encoding internally.
1242#
1243def wildcard_decode(path):
1244 # Search for and fix just these four characters. Do % last so
1245 # that fixing it does not inadvertently create new %-escapes.
1246 # Cannot have * in a filename in windows; untested as to
1247 # what p4 would do in such a case.
1248 if not platform.system() == "Windows":
1249 path = path.replace("%2A", "*")
1250 path = path.replace("%23", "#") \
1251 .replace("%40", "@") \
1252 .replace("%25", "%")
1253 return path
1254
1255def wildcard_encode(path):
1256 # do % first to avoid double-encoding the %s introduced here
1257 path = path.replace("%", "%25") \
1258 .replace("*", "%2A") \
1259 .replace("#", "%23") \
1260 .replace("@", "%40")
1261 return path
1262
1263def wildcard_present(path):
598354c0
BC
1264 m = re.search("[*#@%]", path)
1265 return m is not None
9d7d446a 1266
a5db4b12
LS
1267class LargeFileSystem(object):
1268 """Base class for large file system support."""
1269
1270 def __init__(self, writeToGitStream):
1271 self.largeFiles = set()
1272 self.writeToGitStream = writeToGitStream
1273
1274 def generatePointer(self, cloneDestination, contentFile):
1275 """Return the content of a pointer file that is stored in Git instead of
1276 the actual content."""
1277 assert False, "Method 'generatePointer' required in " + self.__class__.__name__
1278
1279 def pushFile(self, localLargeFile):
1280 """Push the actual content which is not stored in the Git repository to
1281 a server."""
1282 assert False, "Method 'pushFile' required in " + self.__class__.__name__
1283
1284 def hasLargeFileExtension(self, relPath):
a6b13067 1285 return functools.reduce(
a5db4b12
LS
1286 lambda a, b: a or b,
1287 [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')],
1288 False
1289 )
1290
1291 def generateTempFile(self, contents):
1292 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
1293 for d in contents:
1294 contentFile.write(d)
1295 contentFile.close()
1296 return contentFile.name
1297
1298 def exceedsLargeFileThreshold(self, relPath, contents):
1299 if gitConfigInt('git-p4.largeFileThreshold'):
1300 contentsSize = sum(len(d) for d in contents)
1301 if contentsSize > gitConfigInt('git-p4.largeFileThreshold'):
1302 return True
1303 if gitConfigInt('git-p4.largeFileCompressedThreshold'):
1304 contentsSize = sum(len(d) for d in contents)
1305 if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'):
1306 return False
1307 contentTempFile = self.generateTempFile(contents)
de5abb5f
PM
1308 compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=True)
1309 with zipfile.ZipFile(compressedContentFile, mode='w') as zf:
1310 zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)
1311 compressedContentsSize = zf.infolist()[0].compress_size
a5db4b12 1312 os.remove(contentTempFile)
a5db4b12
LS
1313 if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'):
1314 return True
1315 return False
1316
1317 def addLargeFile(self, relPath):
1318 self.largeFiles.add(relPath)
1319
1320 def removeLargeFile(self, relPath):
1321 self.largeFiles.remove(relPath)
1322
1323 def isLargeFile(self, relPath):
1324 return relPath in self.largeFiles
1325
1326 def processContent(self, git_mode, relPath, contents):
1327 """Processes the content of git fast import. This method decides if a
1328 file is stored in the large file system and handles all necessary
1329 steps."""
1330 if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
1331 contentTempFile = self.generateTempFile(contents)
d5eb3cf5
LS
1332 (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
1333 if pointer_git_mode:
1334 git_mode = pointer_git_mode
1335 if localLargeFile:
1336 # Move temp file to final location in large file system
1337 largeFileDir = os.path.dirname(localLargeFile)
1338 if not os.path.isdir(largeFileDir):
1339 os.makedirs(largeFileDir)
1340 shutil.move(contentTempFile, localLargeFile)
1341 self.addLargeFile(relPath)
1342 if gitConfigBool('git-p4.largeFilePush'):
1343 self.pushFile(localLargeFile)
1344 if verbose:
1345 sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
a5db4b12
LS
1346 return (git_mode, contents)
1347
1348class MockLFS(LargeFileSystem):
1349 """Mock large file system for testing."""
1350
1351 def generatePointer(self, contentFile):
1352 """The pointer content is the original content prefixed with "pointer-".
1353 The local filename of the large file storage is derived from the file content.
1354 """
1355 with open(contentFile, 'r') as f:
1356 content = next(f)
1357 gitMode = '100644'
1358 pointerContents = 'pointer-' + content
1359 localLargeFile = os.path.join(os.getcwd(), '.git', 'mock-storage', 'local', content[:-1])
1360 return (gitMode, pointerContents, localLargeFile)
1361
1362 def pushFile(self, localLargeFile):
1363 """The remote filename of the large file storage is the same as the local
1364 one but in a different directory.
1365 """
1366 remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote')
1367 if not os.path.exists(remotePath):
1368 os.makedirs(remotePath)
1369 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))
1370
b47d807d
LS
1371class GitLFS(LargeFileSystem):
1372 """Git LFS as backend for the git-p4 large file system.
1373 See https://git-lfs.github.com/ for details."""
1374
1375 def __init__(self, *args):
1376 LargeFileSystem.__init__(self, *args)
1377 self.baseGitAttributes = []
1378
1379 def generatePointer(self, contentFile):
1380 """Generate a Git LFS pointer for the content. Return LFS Pointer file
1381 mode and content which is stored in the Git repository instead of
1382 the actual content. Return also the new location of the actual
1383 content.
1384 """
d5eb3cf5
LS
1385 if os.path.getsize(contentFile) == 0:
1386 return (None, '', None)
1387
b47d807d
LS
1388 pointerProcess = subprocess.Popen(
1389 ['git', 'lfs', 'pointer', '--file=' + contentFile],
1390 stdout=subprocess.PIPE
1391 )
86dca24b 1392 pointerFile = decode_text_stream(pointerProcess.stdout.read())
b47d807d
LS
1393 if pointerProcess.wait():
1394 os.remove(contentFile)
1395 die('git-lfs pointer command failed. Did you install the extension?')
82f2567e
LS
1396
1397 # Git LFS removed the preamble in the output of the 'pointer' command
1398 # starting from version 1.2.0. Check for the preamble here to support
1399 # earlier versions.
1400 # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
1401 if pointerFile.startswith('Git LFS pointer for'):
1402 pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
1403
1404 oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
ea94b16f 1405 # if someone use external lfs.storage ( not in local repo git )
1406 lfs_path = gitConfig('lfs.storage')
1407 if not lfs_path:
1408 lfs_path = 'lfs'
1409 if not os.path.isabs(lfs_path):
1410 lfs_path = os.path.join(os.getcwd(), '.git', lfs_path)
b47d807d 1411 localLargeFile = os.path.join(
ea94b16f 1412 lfs_path,
1413 'objects', oid[:2], oid[2:4],
b47d807d
LS
1414 oid,
1415 )
1416 # LFS Spec states that pointer files should not have the executable bit set.
1417 gitMode = '100644'
82f2567e 1418 return (gitMode, pointerFile, localLargeFile)
b47d807d
LS
1419
1420 def pushFile(self, localLargeFile):
1421 uploadProcess = subprocess.Popen(
1422 ['git', 'lfs', 'push', '--object-id', 'origin', os.path.basename(localLargeFile)]
1423 )
1424 if uploadProcess.wait():
1425 die('git-lfs push command failed. Did you define a remote?')
1426
1427 def generateGitAttributes(self):
1428 return (
1429 self.baseGitAttributes +
1430 [
1431 '\n',
1432 '#\n',
1433 '# Git LFS (see https://git-lfs.github.com/)\n',
1434 '#\n',
1435 ] +
862f9312 1436 ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
b47d807d
LS
1437 for f in sorted(gitConfigList('git-p4.largeFileExtensions'))
1438 ] +
862f9312 1439 ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
b47d807d
LS
1440 for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)
1441 ]
1442 )
1443
1444 def addLargeFile(self, relPath):
1445 LargeFileSystem.addLargeFile(self, relPath)
1446 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1447
1448 def removeLargeFile(self, relPath):
1449 LargeFileSystem.removeLargeFile(self, relPath)
1450 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1451
1452 def processContent(self, git_mode, relPath, contents):
1453 if relPath == '.gitattributes':
1454 self.baseGitAttributes = contents
1455 return (git_mode, self.generateGitAttributes())
1456 else:
1457 return LargeFileSystem.processContent(self, git_mode, relPath, contents)
1458
b984733c 1459class Command:
89143ac2 1460 delete_actions = ( "delete", "move/delete", "purge" )
0108f47e 1461 add_actions = ( "add", "branch", "move/add" )
89143ac2 1462
b984733c
SH
1463 def __init__(self):
1464 self.usage = "usage: %prog [options]"
8910ac0e 1465 self.needsGit = True
6a10b6aa 1466 self.verbose = False
b984733c 1467
ff8c50ed 1468 # This is required for the "append" update_shelve action
8cf422db
LD
1469 def ensure_value(self, attr, value):
1470 if not hasattr(self, attr) or getattr(self, attr) is None:
1471 setattr(self, attr, value)
1472 return getattr(self, attr)
1473
3ea2cfd4
LD
1474class P4UserMap:
1475 def __init__(self):
1476 self.userMapFromPerforceServer = False
affb474f
LD
1477 self.myP4UserId = None
1478
1479 def p4UserId(self):
1480 if self.myP4UserId:
1481 return self.myP4UserId
1482
1483 results = p4CmdList("user -o")
1484 for r in results:
dba1c9d9 1485 if 'User' in r:
affb474f
LD
1486 self.myP4UserId = r['User']
1487 return r['User']
1488 die("Could not find your p4 user id")
1489
1490 def p4UserIsMe(self, p4User):
1491 # return True if the given p4 user is actually me
1492 me = self.p4UserId()
1493 if not p4User or p4User != me:
1494 return False
1495 else:
1496 return True
3ea2cfd4
LD
1497
1498 def getUserCacheFilename(self):
1499 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))
1500 return home + "/.gitp4-usercache.txt"
1501
1502 def getUserMapFromPerforceServer(self):
1503 if self.userMapFromPerforceServer:
1504 return
1505 self.users = {}
1506 self.emails = {}
1507
1508 for output in p4CmdList("users"):
dba1c9d9 1509 if "User" not in output:
3ea2cfd4
LD
1510 continue
1511 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
1512 self.emails[output["Email"]] = output["User"]
1513
10d08a14
LS
1514 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
1515 for mapUserConfig in gitConfigList("git-p4.mapUser"):
1516 mapUser = mapUserConfigRegex.findall(mapUserConfig)
1517 if mapUser and len(mapUser[0]) == 3:
1518 user = mapUser[0][0]
1519 fullname = mapUser[0][1]
1520 email = mapUser[0][2]
1521 self.users[user] = fullname + " <" + email + ">"
1522 self.emails[email] = user
3ea2cfd4
LD
1523
1524 s = ''
1525 for (key, val) in self.users.items():
1526 s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
1527
5a5577d8 1528 open(self.getUserCacheFilename(), 'w').write(s)
3ea2cfd4
LD
1529 self.userMapFromPerforceServer = True
1530
1531 def loadUserMapFromCache(self):
1532 self.users = {}
1533 self.userMapFromPerforceServer = False
1534 try:
5a5577d8 1535 cache = open(self.getUserCacheFilename(), 'r')
3ea2cfd4
LD
1536 lines = cache.readlines()
1537 cache.close()
1538 for line in lines:
1539 entry = line.strip().split("\t")
1540 self.users[entry[0]] = entry[1]
1541 except IOError:
1542 self.getUserMapFromPerforceServer()
1543
b984733c 1544class P4Debug(Command):
86949eef 1545 def __init__(self):
6ae8de88 1546 Command.__init__(self)
6a10b6aa 1547 self.options = []
c8c39116 1548 self.description = "A tool to debug the output of p4 -G."
8910ac0e 1549 self.needsGit = False
86949eef
SH
1550
1551 def run(self, args):
b1ce9447 1552 j = 0
6de040df 1553 for output in p4CmdList(args):
f2606b17 1554 print('Element: %d' % j)
b1ce9447 1555 j += 1
f2606b17 1556 print(output)
b984733c 1557 return True
86949eef 1558
5834684d
SH
1559class P4RollBack(Command):
1560 def __init__(self):
1561 Command.__init__(self)
1562 self.options = [
0c66a783 1563 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
5834684d
SH
1564 ]
1565 self.description = "A tool to debug the multi-branch import. Don't use :)"
0c66a783 1566 self.rollbackLocalBranches = False
5834684d
SH
1567
1568 def run(self, args):
1569 if len(args) != 1:
1570 return False
1571 maxChange = int(args[0])
0c66a783 1572
ad192f28 1573 if "p4ExitCode" in p4Cmd("changes -m 1"):
66a2f523
SH
1574 die("Problems executing p4");
1575
0c66a783
SH
1576 if self.rollbackLocalBranches:
1577 refPrefix = "refs/heads/"
b016d397 1578 lines = read_pipe_lines("git rev-parse --symbolic --branches")
0c66a783
SH
1579 else:
1580 refPrefix = "refs/remotes/"
b016d397 1581 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
0c66a783
SH
1582
1583 for line in lines:
1584 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
b25b2065
HWN
1585 line = line.strip()
1586 ref = refPrefix + line
5834684d 1587 log = extractLogMessageFromGitCommit(ref)
bb6e09b2
HWN
1588 settings = extractSettingsGitLog(log)
1589
1590 depotPaths = settings['depot-paths']
1591 change = settings['change']
1592
5834684d 1593 changed = False
52102d47 1594
6326aa58
HWN
1595 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
1596 for p in depotPaths]))) == 0:
f2606b17 1597 print("Branch %s did not exist at change %s, deleting." % (ref, maxChange))
52102d47
SH
1598 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
1599 continue
1600
bb6e09b2 1601 while change and int(change) > maxChange:
5834684d 1602 changed = True
52102d47 1603 if self.verbose:
f2606b17 1604 print("%s is at %s ; rewinding towards %s" % (ref, change, maxChange))
5834684d
SH
1605 system("git update-ref %s \"%s^\"" % (ref, ref))
1606 log = extractLogMessageFromGitCommit(ref)
bb6e09b2
HWN
1607 settings = extractSettingsGitLog(log)
1608
1609
1610 depotPaths = settings['depot-paths']
1611 change = settings['change']
5834684d
SH
1612
1613 if changed:
f2606b17 1614 print("%s rewound to %s" % (ref, change))
5834684d
SH
1615
1616 return True
1617
3ea2cfd4 1618class P4Submit(Command, P4UserMap):
6bbfd137
PW
1619
1620 conflict_behavior_choices = ("ask", "skip", "quit")
1621
4f5cf76a 1622 def __init__(self):
b984733c 1623 Command.__init__(self)
3ea2cfd4 1624 P4UserMap.__init__(self)
4f5cf76a 1625 self.options = [
4f5cf76a 1626 optparse.make_option("--origin", dest="origin"),
ae901090 1627 optparse.make_option("-M", dest="detectRenames", action="store_true"),
3ea2cfd4
LD
1628 # preserve the user, requires relevant p4 permissions
1629 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
06804c76 1630 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
ef739f08 1631 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
728b7ad8 1632 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
6bbfd137 1633 optparse.make_option("--conflict", dest="conflict_behavior",
44e8d26c
PW
1634 choices=self.conflict_behavior_choices),
1635 optparse.make_option("--branch", dest="branch"),
b34fa577
VK
1636 optparse.make_option("--shelve", dest="shelve", action="store_true",
1637 help="Shelve instead of submit. Shelved files are reverted, "
1638 "restoring the workspace to the state before the shelve"),
8cf422db 1639 optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int",
46c609e9 1640 metavar="CHANGELIST",
8cf422db 1641 help="update an existing shelved changelist, implies --shelve, "
f55b87c1
RM
1642 "repeat in-order for multiple shelved changelists"),
1643 optparse.make_option("--commit", dest="commit", metavar="COMMIT",
1644 help="submit only the specified commit(s), one commit or xxx..xxx"),
1645 optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true",
1646 help="Disable rebase after submit is completed. Can be useful if you "
b9d34db9
LD
1647 "work from a local git branch that is not master"),
1648 optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true",
1649 help="Skip Perforce sync of p4/master after submit or shelve"),
4935c458 1650 optparse.make_option("--no-verify", dest="no_verify", action="store_true",
38ecf752 1651 help="Bypass p4-pre-submit and p4-changelist hooks"),
4f5cf76a 1652 ]
251c8c50 1653 self.description = """Submit changes from git to the perforce depot.\n
4935c458
BK
1654 The `p4-pre-submit` hook is executed if it exists and is executable. It
1655 can be bypassed with the `--no-verify` command line option. The hook takes
1656 no parameters and nothing from standard input. Exiting with a non-zero status
1657 from this script prevents `git-p4 submit` from launching.
251c8c50 1658
4935c458 1659 One usage scenario is to run unit tests in the hook.
38ecf752
BK
1660
1661 The `p4-prepare-changelist` hook is executed right after preparing the default
1662 changelist message and before the editor is started. It takes one parameter,
1663 the name of the file that contains the changelist text. Exiting with a non-zero
1664 status from the script will abort the process.
1665
1666 The purpose of the hook is to edit the message file in place, and it is not
1667 supressed by the `--no-verify` option. This hook is called even if
1668 `--prepare-p4-only` is set.
1669
1670 The `p4-changelist` hook is executed after the changelist message has been
1671 edited by the user. It can be bypassed with the `--no-verify` option. It
1672 takes a single parameter, the name of the file that holds the proposed
1673 changelist text. Exiting with a non-zero status causes the command to abort.
1674
1675 The hook is allowed to edit the changelist file and can be used to normalize
1676 the text into some project standard format. It can also be used to refuse the
1677 Submit after inspect the message file.
1678
1679 The `p4-post-changelist` hook is invoked after the submit has successfully
b7e20b43 1680 occurred in P4. It takes no parameters and is meant primarily for notification
38ecf752 1681 and cannot affect the outcome of the git p4 submit action.
4935c458 1682 """
251c8c50 1683
c9b50e63 1684 self.usage += " [name of git branch to submit into perforce depot]"
9512497b 1685 self.origin = ""
ae901090 1686 self.detectRenames = False
0d609032 1687 self.preserveUser = gitConfigBool("git-p4.preserveUser")
ef739f08 1688 self.dry_run = False
b34fa577 1689 self.shelve = False
8cf422db 1690 self.update_shelve = list()
f55b87c1 1691 self.commit = ""
3b3477ea 1692 self.disable_rebase = gitConfigBool("git-p4.disableRebase")
b9d34db9 1693 self.disable_p4sync = gitConfigBool("git-p4.disableP4Sync")
728b7ad8 1694 self.prepare_p4_only = False
6bbfd137 1695 self.conflict_behavior = None
f7baba8b 1696 self.isWindows = (platform.system() == "Windows")
06804c76 1697 self.exportLabels = False
249da4c0 1698 self.p4HasMoveCommand = p4_has_move_command()
44e8d26c 1699 self.branch = None
4935c458 1700 self.no_verify = False
4f5cf76a 1701
a5db4b12
LS
1702 if gitConfig('git-p4.largeFileSystem'):
1703 die("Large file system not supported for git-p4 submit command. Please remove it from config.")
1704
4f5cf76a
SH
1705 def check(self):
1706 if len(p4CmdList("opened ...")) > 0:
1707 die("You have files opened with perforce! Close them before starting the sync.")
1708
f19cb0a0
PW
1709 def separate_jobs_from_description(self, message):
1710 """Extract and return a possible Jobs field in the commit
1711 message. It goes into a separate section in the p4 change
1712 specification.
1713
1714 A jobs line starts with "Jobs:" and looks like a new field
1715 in a form. Values are white-space separated on the same
1716 line or on following lines that start with a tab.
1717
1718 This does not parse and extract the full git commit message
1719 like a p4 form. It just sees the Jobs: line as a marker
1720 to pass everything from then on directly into the p4 form,
1721 but outside the description section.
1722
1723 Return a tuple (stripped log message, jobs string)."""
1724
1725 m = re.search(r'^Jobs:', message, re.MULTILINE)
1726 if m is None:
1727 return (message, None)
1728
1729 jobtext = message[m.start():]
1730 stripped_message = message[:m.start()].rstrip()
1731 return (stripped_message, jobtext)
1732
1733 def prepareLogMessage(self, template, message, jobs):
1734 """Edits the template returned from "p4 change -o" to insert
1735 the message in the Description field, and the jobs text in
1736 the Jobs field."""
4f5cf76a
SH
1737 result = ""
1738
edae1e2f
SH
1739 inDescriptionSection = False
1740
4f5cf76a
SH
1741 for line in template.split("\n"):
1742 if line.startswith("#"):
1743 result += line + "\n"
1744 continue
1745
edae1e2f 1746 if inDescriptionSection:
c9dbab04 1747 if line.startswith("Files:") or line.startswith("Jobs:"):
edae1e2f 1748 inDescriptionSection = False
f19cb0a0
PW
1749 # insert Jobs section
1750 if jobs:
1751 result += jobs + "\n"
edae1e2f
SH
1752 else:
1753 continue
1754 else:
1755 if line.startswith("Description:"):
1756 inDescriptionSection = True
1757 line += "\n"
1758 for messageLine in message.split("\n"):
1759 line += "\t" + messageLine + "\n"
1760
1761 result += line + "\n"
4f5cf76a
SH
1762
1763 return result
1764
e665e98e
JH
1765 def patchRCSKeywords(self, file, regexp):
1766 # Attempt to zap the RCS keywords in a p4 controlled file matching the given regex
60df071c
LD
1767 (handle, outFileName) = tempfile.mkstemp(dir='.')
1768 try:
70c0d553 1769 with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
8618d322 1770 for line in inFile.readlines():
70c0d553 1771 outFile.write(regexp.sub(br'$\1$', line))
60df071c
LD
1772 # Forcibly overwrite the original file
1773 os.unlink(file)
1774 shutil.move(outFileName, file)
1775 except:
1776 # cleanup our temporary file
1777 os.unlink(outFileName)
f2606b17 1778 print("Failed to strip RCS keywords in %s" % file)
60df071c
LD
1779 raise
1780
f2606b17 1781 print("Patched up RCS keywords in %s" % file)
60df071c 1782
3ea2cfd4
LD
1783 def p4UserForCommit(self,id):
1784 # Return the tuple (perforce user,git email) for a given git commit id
1785 self.getUserMapFromPerforceServer()
9bf28855
PW
1786 gitEmail = read_pipe(["git", "log", "--max-count=1",
1787 "--format=%ae", id])
3ea2cfd4 1788 gitEmail = gitEmail.strip()
dba1c9d9 1789 if gitEmail not in self.emails:
3ea2cfd4
LD
1790 return (None,gitEmail)
1791 else:
1792 return (self.emails[gitEmail],gitEmail)
1793
1794 def checkValidP4Users(self,commits):
1795 # check if any git authors cannot be mapped to p4 users
1796 for id in commits:
1797 (user,email) = self.p4UserForCommit(id)
1798 if not user:
1799 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
0d609032 1800 if gitConfigBool("git-p4.allowMissingP4Users"):
f2606b17 1801 print("%s" % msg)
3ea2cfd4
LD
1802 else:
1803 die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
1804
1805 def lastP4Changelist(self):
1806 # Get back the last changelist number submitted in this client spec. This
1807 # then gets used to patch up the username in the change. If the same
1808 # client spec is being used by multiple processes then this might go
1809 # wrong.
1810 results = p4CmdList("client -o") # find the current client
1811 client = None
1812 for r in results:
dba1c9d9 1813 if 'Client' in r:
3ea2cfd4
LD
1814 client = r['Client']
1815 break
1816 if not client:
1817 die("could not get client spec")
6de040df 1818 results = p4CmdList(["changes", "-c", client, "-m", "1"])
3ea2cfd4 1819 for r in results:
dba1c9d9 1820 if 'change' in r:
3ea2cfd4
LD
1821 return r['change']
1822 die("Could not get changelist number for last submit - cannot patch up user details")
1823
1824 def modifyChangelistUser(self, changelist, newUser):
1825 # fixup the user field of a changelist after it has been submitted.
1826 changes = p4CmdList("change -o %s" % changelist)
ecdba36d
LD
1827 if len(changes) != 1:
1828 die("Bad output from p4 change modifying %s to user %s" %
1829 (changelist, newUser))
1830
1831 c = changes[0]
1832 if c['User'] == newUser: return # nothing to do
1833 c['User'] = newUser
50da1e73
YZ
1834 # p4 does not understand format version 3 and above
1835 input = marshal.dumps(c, 2)
ecdba36d 1836
3ea2cfd4
LD
1837 result = p4CmdList("change -f -i", stdin=input)
1838 for r in result:
dba1c9d9 1839 if 'code' in r:
3ea2cfd4
LD
1840 if r['code'] == 'error':
1841 die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
dba1c9d9 1842 if 'data' in r:
3ea2cfd4
LD
1843 print("Updated user field for changelist %s to %s" % (changelist, newUser))
1844 return
1845 die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
1846
1847 def canChangeChangelists(self):
1848 # check to see if we have p4 admin or super-user permissions, either of
1849 # which are required to modify changelists.
52a4880b 1850 results = p4CmdList(["protects", self.depotPath])
3ea2cfd4 1851 for r in results:
dba1c9d9 1852 if 'perm' in r:
3ea2cfd4
LD
1853 if r['perm'] == 'admin':
1854 return 1
1855 if r['perm'] == 'super':
1856 return 1
1857 return 0
1858
46c609e9 1859 def prepareSubmitTemplate(self, changelist=None):
f19cb0a0
PW
1860 """Run "p4 change -o" to grab a change specification template.
1861 This does not use "p4 -G", as it is nice to keep the submission
1862 template in original order, since a human might edit it.
1863
1864 Remove lines in the Files section that show changes to files
1865 outside the depot path we're committing into."""
1866
cbc69242
SH
1867 [upstream, settings] = findUpstreamBranchPoint()
1868
b596b3b9
MT
1869 template = """\
1870# A Perforce Change Specification.
1871#
1872# Change: The change number. 'new' on a new changelist.
1873# Date: The date this specification was last modified.
1874# Client: The client on which the changelist was created. Read-only.
1875# User: The user who created the changelist.
1876# Status: Either 'pending' or 'submitted'. Read-only.
1877# Type: Either 'public' or 'restricted'. Default is 'public'.
1878# Description: Comments about the changelist. Required.
1879# Jobs: What opened jobs are to be closed by this changelist.
1880# You may delete jobs from this list. (New changelists only.)
1881# Files: What opened files from the default changelist are to be added
1882# to this changelist. You may delete files from this list.
1883# (New changelists only.)
1884"""
1885 files_list = []
ea99c3ae 1886 inFilesSection = False
b596b3b9 1887 change_entry = None
46c609e9
LD
1888 args = ['change', '-o']
1889 if changelist:
1890 args.append(str(changelist))
b596b3b9 1891 for entry in p4CmdList(args):
dba1c9d9 1892 if 'code' not in entry:
b596b3b9
MT
1893 continue
1894 if entry['code'] == 'stat':
1895 change_entry = entry
1896 break
1897 if not change_entry:
1898 die('Failed to decode output of p4 change -o')
2e2aa8d9 1899 for key, value in change_entry.items():
b596b3b9 1900 if key.startswith('File'):
dba1c9d9 1901 if 'depot-paths' in settings:
b596b3b9
MT
1902 if not [p for p in settings['depot-paths']
1903 if p4PathStartsWith(value, p)]:
1904 continue
ea99c3ae 1905 else:
b596b3b9
MT
1906 if not p4PathStartsWith(value, self.depotPath):
1907 continue
1908 files_list.append(value)
1909 continue
1910 # Output in the order expected by prepareLogMessage
1911 for key in ['Change', 'Client', 'User', 'Status', 'Description', 'Jobs']:
dba1c9d9 1912 if key not in change_entry:
b596b3b9
MT
1913 continue
1914 template += '\n'
1915 template += key + ':'
1916 if key == 'Description':
1917 template += '\n'
1918 for field_line in change_entry[key].splitlines():
1919 template += '\t'+field_line+'\n'
1920 if len(files_list) > 0:
1921 template += '\n'
1922 template += 'Files:\n'
1923 for path in files_list:
1924 template += '\t'+path+'\n'
ea99c3ae
SH
1925 return template
1926
7c766e57
PW
1927 def edit_template(self, template_file):
1928 """Invoke the editor to let the user change the submission
1929 message. Return true if okay to continue with the submit."""
1930
1931 # if configured to skip the editing part, just submit
0d609032 1932 if gitConfigBool("git-p4.skipSubmitEdit"):
7c766e57
PW
1933 return True
1934
1935 # look at the modification time, to check later if the user saved
1936 # the file
1937 mtime = os.stat(template_file).st_mtime
1938
1939 # invoke the editor
dba1c9d9 1940 if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""):
7c766e57
PW
1941 editor = os.environ.get("P4EDITOR")
1942 else:
1943 editor = read_pipe("git var GIT_EDITOR").strip()
2dade7a7 1944 system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
7c766e57
PW
1945
1946 # If the file was not saved, prompt to see if this patch should
1947 # be skipped. But skip this verification step if configured so.
0d609032 1948 if gitConfigBool("git-p4.skipSubmitEditCheck"):
7c766e57
PW
1949 return True
1950
d1652049
PW
1951 # modification time updated means user saved the file
1952 if os.stat(template_file).st_mtime > mtime:
1953 return True
1954
e2aed5fd
BK
1955 response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
1956 if response == 'y':
1957 return True
1958 if response == 'n':
1959 return False
7c766e57 1960
df8a9e86 1961 def get_diff_description(self, editedFiles, filesToAdd, symlinks):
b4073bb3 1962 # diff
dba1c9d9 1963 if "P4DIFF" in os.environ:
b4073bb3
MC
1964 del(os.environ["P4DIFF"])
1965 diff = ""
1966 for editedFile in editedFiles:
1967 diff += p4_read_pipe(['diff', '-du',
1968 wildcard_encode(editedFile)])
1969
1970 # new file diff
1971 newdiff = ""
1972 for newFile in filesToAdd:
1973 newdiff += "==== new file ====\n"
1974 newdiff += "--- /dev/null\n"
1975 newdiff += "+++ %s\n" % newFile
df8a9e86
LD
1976
1977 is_link = os.path.islink(newFile)
1978 expect_link = newFile in symlinks
1979
1980 if is_link and expect_link:
1981 newdiff += "+%s\n" % os.readlink(newFile)
1982 else:
1983 f = open(newFile, "r")
54662d59 1984 try:
1985 for line in f.readlines():
1986 newdiff += "+" + line
1987 except UnicodeDecodeError:
1988 pass # Found non-text data and skip, since diff description should only include text
df8a9e86 1989 f.close()
b4073bb3 1990
e2a892ee 1991 return (diff + newdiff).replace('\r\n', '\n')
b4073bb3 1992
7cb5cbef 1993 def applyCommit(self, id):
67b0fe2e
PW
1994 """Apply one commit, return True if it succeeded."""
1995
f2606b17
LD
1996 print("Applying", read_pipe(["git", "show", "-s",
1997 "--format=format:%h %s", id]))
ae901090 1998
848de9c3 1999 (p4User, gitEmail) = self.p4UserForCommit(id)
3ea2cfd4 2000
84cb0003 2001 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
4f5cf76a 2002 filesToAdd = set()
a02b8bc4 2003 filesToChangeType = set()
4f5cf76a 2004 filesToDelete = set()
d336c158 2005 editedFiles = set()
b6ad6dcc 2006 pureRenameCopy = set()
df8a9e86 2007 symlinks = set()
c65b670e 2008 filesToChangeExecBit = {}
46c609e9 2009 all_files = list()
60df071c 2010
4f5cf76a 2011 for line in diff:
b43b0a3c
CP
2012 diff = parseDiffTreeEntry(line)
2013 modifier = diff['status']
2014 path = diff['src']
46c609e9
LD
2015 all_files.append(path)
2016
4f5cf76a 2017 if modifier == "M":
6de040df 2018 p4_edit(path)
c65b670e
CP
2019 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
2020 filesToChangeExecBit[path] = diff['dst_mode']
d336c158 2021 editedFiles.add(path)
4f5cf76a
SH
2022 elif modifier == "A":
2023 filesToAdd.add(path)
c65b670e 2024 filesToChangeExecBit[path] = diff['dst_mode']
4f5cf76a
SH
2025 if path in filesToDelete:
2026 filesToDelete.remove(path)
df8a9e86
LD
2027
2028 dst_mode = int(diff['dst_mode'], 8)
db2d997e 2029 if dst_mode == 0o120000:
df8a9e86
LD
2030 symlinks.add(path)
2031
4f5cf76a
SH
2032 elif modifier == "D":
2033 filesToDelete.add(path)
2034 if path in filesToAdd:
2035 filesToAdd.remove(path)
4fddb41b
VA
2036 elif modifier == "C":
2037 src, dest = diff['src'], diff['dst']
7a10946a 2038 all_files.append(dest)
6de040df 2039 p4_integrate(src, dest)
b6ad6dcc 2040 pureRenameCopy.add(dest)
4fddb41b 2041 if diff['src_sha1'] != diff['dst_sha1']:
6de040df 2042 p4_edit(dest)
b6ad6dcc 2043 pureRenameCopy.discard(dest)
4fddb41b 2044 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
6de040df 2045 p4_edit(dest)
b6ad6dcc 2046 pureRenameCopy.discard(dest)
4fddb41b 2047 filesToChangeExecBit[dest] = diff['dst_mode']
d20f0f8e
PW
2048 if self.isWindows:
2049 # turn off read-only attribute
2050 os.chmod(dest, stat.S_IWRITE)
4fddb41b
VA
2051 os.unlink(dest)
2052 editedFiles.add(dest)
d9a5f25b 2053 elif modifier == "R":
b43b0a3c 2054 src, dest = diff['src'], diff['dst']
7a10946a 2055 all_files.append(dest)
8e9497c2
GG
2056 if self.p4HasMoveCommand:
2057 p4_edit(src) # src must be open before move
2058 p4_move(src, dest) # opens for (move/delete, move/add)
b6ad6dcc 2059 else:
8e9497c2
GG
2060 p4_integrate(src, dest)
2061 if diff['src_sha1'] != diff['dst_sha1']:
2062 p4_edit(dest)
2063 else:
2064 pureRenameCopy.add(dest)
c65b670e 2065 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
8e9497c2
GG
2066 if not self.p4HasMoveCommand:
2067 p4_edit(dest) # with move: already open, writable
c65b670e 2068 filesToChangeExecBit[dest] = diff['dst_mode']
8e9497c2 2069 if not self.p4HasMoveCommand:
d20f0f8e
PW
2070 if self.isWindows:
2071 os.chmod(dest, stat.S_IWRITE)
8e9497c2
GG
2072 os.unlink(dest)
2073 filesToDelete.add(src)
d9a5f25b 2074 editedFiles.add(dest)
a02b8bc4
RP
2075 elif modifier == "T":
2076 filesToChangeType.add(path)
4f5cf76a
SH
2077 else:
2078 die("unknown modifier %s for %s" % (modifier, path))
2079
749b668c 2080 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
47a130b7 2081 patchcmd = diffcmd + " | git apply "
c1b296b9
SH
2082 tryPatchCmd = patchcmd + "--check -"
2083 applyPatchCmd = patchcmd + "--check --apply -"
60df071c 2084 patch_succeeded = True
51a2640a 2085
1ec4a0a3
BK
2086 if verbose:
2087 print("TryPatch: %s" % tryPatchCmd)
2088
47a130b7 2089 if os.system(tryPatchCmd) != 0:
60df071c
LD
2090 fixed_rcs_keywords = False
2091 patch_succeeded = False
f2606b17 2092 print("Unfortunately applying the change failed!")
60df071c
LD
2093
2094 # Patch failed, maybe it's just RCS keyword woes. Look through
2095 # the patch to see if that's possible.
0d609032 2096 if gitConfigBool("git-p4.attemptRCSCleanup"):
60df071c 2097 file = None
60df071c
LD
2098 kwfiles = {}
2099 for file in editedFiles | filesToDelete:
2100 # did this file's delta contain RCS keywords?
e665e98e
JH
2101 regexp = p4_keywords_regexp_for_file(file)
2102 if regexp:
60df071c 2103 # this file is a possibility...look for RCS keywords.
70c0d553
JH
2104 for line in read_pipe_lines(
2105 ["git", "diff", "%s^..%s" % (id, id), file],
2106 raw=True):
60df071c
LD
2107 if regexp.search(line):
2108 if verbose:
e665e98e
JH
2109 print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
2110 kwfiles[file] = regexp
60df071c
LD
2111 break
2112
e665e98e 2113 for file, regexp in kwfiles.items():
60df071c 2114 if verbose:
e665e98e 2115 print("zapping %s with %s" % (line, regexp.pattern))
d20f0f8e
PW
2116 # File is being deleted, so not open in p4. Must
2117 # disable the read-only bit on windows.
2118 if self.isWindows and file not in editedFiles:
2119 os.chmod(file, stat.S_IWRITE)
60df071c
LD
2120 self.patchRCSKeywords(file, kwfiles[file])
2121 fixed_rcs_keywords = True
2122
2123 if fixed_rcs_keywords:
f2606b17 2124 print("Retrying the patch with RCS keywords cleaned up")
60df071c
LD
2125 if os.system(tryPatchCmd) == 0:
2126 patch_succeeded = True
1ec4a0a3 2127 print("Patch succeesed this time with RCS keywords cleaned")
60df071c
LD
2128
2129 if not patch_succeeded:
7e5dd9f2
PW
2130 for f in editedFiles:
2131 p4_revert(f)
7e5dd9f2 2132 return False
51a2640a 2133
55ac2ed6
PW
2134 #
2135 # Apply the patch for real, and do add/delete/+x handling.
2136 #
47a130b7 2137 system(applyPatchCmd)
4f5cf76a 2138
a02b8bc4
RP
2139 for f in filesToChangeType:
2140 p4_edit(f, "-t", "auto")
4f5cf76a 2141 for f in filesToAdd:
6de040df 2142 p4_add(f)
4f5cf76a 2143 for f in filesToDelete:
6de040df
LD
2144 p4_revert(f)
2145 p4_delete(f)
4f5cf76a 2146
c65b670e
CP
2147 # Set/clear executable bits
2148 for f in filesToChangeExecBit.keys():
2149 mode = filesToChangeExecBit[f]
2150 setP4ExecBit(f, mode)
2151
8cf422db
LD
2152 update_shelve = 0
2153 if len(self.update_shelve) > 0:
2154 update_shelve = self.update_shelve.pop(0)
2155 p4_reopen_in_change(update_shelve, all_files)
46c609e9 2156
55ac2ed6
PW
2157 #
2158 # Build p4 change description, starting with the contents
2159 # of the git commit message.
2160 #
0e36f2d7 2161 logMessage = extractLogMessageFromGitCommit(id)
0e36f2d7 2162 logMessage = logMessage.strip()
f19cb0a0 2163 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
4f5cf76a 2164
8cf422db 2165 template = self.prepareSubmitTemplate(update_shelve)
f19cb0a0 2166 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
ecdba36d 2167
c47178d4 2168 if self.preserveUser:
55ac2ed6 2169 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
c47178d4 2170
55ac2ed6
PW
2171 if self.checkAuthorship and not self.p4UserIsMe(p4User):
2172 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
2173 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
2174 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
c47178d4 2175
55ac2ed6 2176 separatorLine = "######## everything below this line is just the diff #######\n"
b4073bb3
MC
2177 if not self.prepare_p4_only:
2178 submitTemplate += separatorLine
df8a9e86 2179 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
55ac2ed6 2180
c47178d4 2181 (handle, fileName) = tempfile.mkstemp()
e2a892ee 2182 tmpFile = os.fdopen(handle, "w+b")
c47178d4
PW
2183 if self.isWindows:
2184 submitTemplate = submitTemplate.replace("\n", "\r\n")
6cec21a8 2185 tmpFile.write(encode_text_stream(submitTemplate))
c47178d4
PW
2186 tmpFile.close()
2187
b7638fed 2188 submitted = False
cdc7e388 2189
b7638fed 2190 try:
38ecf752
BK
2191 # Allow the hook to edit the changelist text before presenting it
2192 # to the user.
2193 if not run_git_hook("p4-prepare-changelist", [fileName]):
2194 return False
cd1e0dc4
BK
2195
2196 if self.prepare_p4_only:
2197 #
2198 # Leave the p4 tree prepared, and the submit template around
2199 # and let the user decide what to do next
2200 #
2201 submitted = True
2202 print("")
2203 print("P4 workspace prepared for submission.")
2204 print("To submit or revert, go to client workspace")
2205 print(" " + self.clientPath)
2206 print("")
2207 print("To submit, use \"p4 submit\" to write a new description,")
2208 print("or \"p4 submit -i <%s\" to use the one prepared by" \
2209 " \"git p4\"." % fileName)
2210 print("You can delete the file \"%s\" when finished." % fileName)
2211
2212 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
2213 print("To preserve change ownership by user %s, you must\n" \
2214 "do \"p4 change -f <change>\" after submitting and\n" \
2215 "edit the User field.")
2216 if pureRenameCopy:
2217 print("After submitting, renamed files must be re-synced.")
2218 print("Invoke \"p4 sync -f\" on each of these files:")
2219 for f in pureRenameCopy:
2220 print(" " + f)
2221
2222 print("")
2223 print("To revert the changes, use \"p4 revert ...\", and delete")
2224 print("the submit template file \"%s\"" % fileName)
2225 if filesToAdd:
2226 print("Since the commit adds new files, they must be deleted:")
2227 for f in filesToAdd:
2228 print(" " + f)
2229 print("")
2230 sys.stdout.flush()
2231 return True
2232
b7638fed 2233 if self.edit_template(fileName):
38ecf752
BK
2234 if not self.no_verify:
2235 if not run_git_hook("p4-changelist", [fileName]):
2236 print("The p4-changelist hook failed.")
2237 sys.stdout.flush()
2238 return False
2239
b7638fed
GE
2240 # read the edited message and submit
2241 tmpFile = open(fileName, "rb")
6cec21a8 2242 message = decode_text_stream(tmpFile.read())
b7638fed
GE
2243 tmpFile.close()
2244 if self.isWindows:
2245 message = message.replace("\r\n", "\n")
cd1e0dc4
BK
2246 if message.find(separatorLine) != -1:
2247 submitTemplate = message[:message.index(separatorLine)]
2248 else:
2249 submitTemplate = message
2250
2251 if len(submitTemplate.strip()) == 0:
2252 print("Changelist is empty, aborting this changelist.")
2253 sys.stdout.flush()
2254 return False
46c609e9 2255
8cf422db 2256 if update_shelve:
46c609e9
LD
2257 p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
2258 elif self.shelve:
b34fa577
VK
2259 p4_write_pipe(['shelve', '-i'], submitTemplate)
2260 else:
2261 p4_write_pipe(['submit', '-i'], submitTemplate)
2262 # The rename/copy happened by applying a patch that created a
2263 # new file. This leaves it writable, which confuses p4.
2264 for f in pureRenameCopy:
2265 p4_sync(f, "-f")
b7638fed
GE
2266
2267 if self.preserveUser:
2268 if p4User:
2269 # Get last changelist number. Cannot easily get it from
2270 # the submit command output as the output is
2271 # unmarshalled.
2272 changelist = self.lastP4Changelist()
2273 self.modifyChangelistUser(changelist, p4User)
2274
b7638fed
GE
2275 submitted = True
2276
38ecf752 2277 run_git_hook("p4-post-changelist")
b7638fed 2278 finally:
cd1e0dc4 2279 # Revert changes if we skip this patch
b34fa577
VK
2280 if not submitted or self.shelve:
2281 if self.shelve:
2282 print ("Reverting shelved files.")
2283 else:
2284 print ("Submission cancelled, undoing p4 changes.")
cd1e0dc4 2285 sys.stdout.flush()
b34fa577 2286 for f in editedFiles | filesToDelete:
b7638fed
GE
2287 p4_revert(f)
2288 for f in filesToAdd:
2289 p4_revert(f)
2290 os.remove(f)
c47178d4 2291
cd1e0dc4
BK
2292 if not self.prepare_p4_only:
2293 os.remove(fileName)
b7638fed 2294 return submitted
4f5cf76a 2295
06804c76
LD
2296 # Export git tags as p4 labels. Create a p4 label and then tag
2297 # with that.
2298 def exportGitTags(self, gitTags):
c8942a22
LD
2299 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
2300 if len(validLabelRegexp) == 0:
2301 validLabelRegexp = defaultLabelRegexp
2302 m = re.compile(validLabelRegexp)
06804c76
LD
2303
2304 for name in gitTags:
2305
2306 if not m.match(name):
2307 if verbose:
f2606b17 2308 print("tag %s does not match regexp %s" % (name, validLabelRegexp))
06804c76
LD
2309 continue
2310
2311 # Get the p4 commit this corresponds to
c8942a22
LD
2312 logMessage = extractLogMessageFromGitCommit(name)
2313 values = extractSettingsGitLog(logMessage)
06804c76 2314
dba1c9d9 2315 if 'change' not in values:
06804c76
LD
2316 # a tag pointing to something not sent to p4; ignore
2317 if verbose:
f2606b17 2318 print("git tag %s does not give a p4 commit" % name)
06804c76 2319 continue
c8942a22
LD
2320 else:
2321 changelist = values['change']
06804c76
LD
2322
2323 # Get the tag details.
2324 inHeader = True
2325 isAnnotated = False
2326 body = []
2327 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
2328 l = l.strip()
2329 if inHeader:
2330 if re.match(r'tag\s+', l):
2331 isAnnotated = True
2332 elif re.match(r'\s*$', l):
2333 inHeader = False
2334 continue
2335 else:
2336 body.append(l)
2337
2338 if not isAnnotated:
2339 body = ["lightweight tag imported by git p4\n"]
2340
2341 # Create the label - use the same view as the client spec we are using
2342 clientSpec = getClientSpec()
2343
2344 labelTemplate = "Label: %s\n" % name
2345 labelTemplate += "Description:\n"
2346 for b in body:
2347 labelTemplate += "\t" + b + "\n"
2348 labelTemplate += "View:\n"
9d57c4a6
KS
2349 for depot_side in clientSpec.mappings:
2350 labelTemplate += "\t%s\n" % depot_side
06804c76 2351
ef739f08 2352 if self.dry_run:
f2606b17 2353 print("Would create p4 label %s for tag" % name)
728b7ad8 2354 elif self.prepare_p4_only:
f2606b17
LD
2355 print("Not creating p4 label %s for tag due to option" \
2356 " --prepare-p4-only" % name)
ef739f08
PW
2357 else:
2358 p4_write_pipe(["label", "-i"], labelTemplate)
06804c76 2359
ef739f08
PW
2360 # Use the label
2361 p4_system(["tag", "-l", name] +
9d57c4a6 2362 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
06804c76 2363
ef739f08 2364 if verbose:
f2606b17 2365 print("created p4 label for tag %s" % name)
06804c76 2366
4f5cf76a 2367 def run(self, args):
c9b50e63
SH
2368 if len(args) == 0:
2369 self.master = currentGitBranch()
c9b50e63
SH
2370 elif len(args) == 1:
2371 self.master = args[0]
28755dba
PW
2372 if not branchExists(self.master):
2373 die("Branch %s does not exist" % self.master)
c9b50e63
SH
2374 else:
2375 return False
2376
8cf422db
LD
2377 for i in self.update_shelve:
2378 if i <= 0:
2379 sys.exit("invalid changelist %d" % i)
2380
00ad6e31
LD
2381 if self.master:
2382 allowSubmit = gitConfig("git-p4.allowSubmit")
2383 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
2384 die("%s is not in git-p4.allowSubmit" % self.master)
4c2d5d72 2385
27d2d811 2386 [upstream, settings] = findUpstreamBranchPoint()
ea99c3ae 2387 self.depotPath = settings['depot-paths'][0]
27d2d811
SH
2388 if len(self.origin) == 0:
2389 self.origin = upstream
a3fdd579 2390
8cf422db 2391 if len(self.update_shelve) > 0:
46c609e9
LD
2392 self.shelve = True
2393
3ea2cfd4
LD
2394 if self.preserveUser:
2395 if not self.canChangeChangelists():
2396 die("Cannot preserve user names without p4 super-user or admin permissions")
2397
6bbfd137
PW
2398 # if not set from the command line, try the config file
2399 if self.conflict_behavior is None:
2400 val = gitConfig("git-p4.conflict")
2401 if val:
2402 if val not in self.conflict_behavior_choices:
2403 die("Invalid value '%s' for config git-p4.conflict" % val)
2404 else:
2405 val = "ask"
2406 self.conflict_behavior = val
2407
a3fdd579 2408 if self.verbose:
f2606b17 2409 print("Origin branch is " + self.origin)
9512497b 2410
ea99c3ae 2411 if len(self.depotPath) == 0:
f2606b17 2412 print("Internal error: cannot locate perforce depot path from existing branches")
9512497b
SH
2413 sys.exit(128)
2414
543987bd 2415 self.useClientSpec = False
0d609032 2416 if gitConfigBool("git-p4.useclientspec"):
543987bd
PW
2417 self.useClientSpec = True
2418 if self.useClientSpec:
2419 self.clientSpecDirs = getClientSpec()
9512497b 2420
2e3a16b2 2421 # Check for the existence of P4 branches
cd884106
VA
2422 branchesDetected = (len(p4BranchesInGit().keys()) > 1)
2423
2424 if self.useClientSpec and not branchesDetected:
543987bd
PW
2425 # all files are relative to the client spec
2426 self.clientPath = getClientRoot()
2427 else:
2428 self.clientPath = p4Where(self.depotPath)
9512497b 2429
543987bd
PW
2430 if self.clientPath == "":
2431 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
9512497b 2432
f2606b17 2433 print("Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath))
7944f142 2434 self.oldWorkingDirectory = os.getcwd()
c1b296b9 2435
0591cfa8 2436 # ensure the clientPath exists
8d7ec362 2437 new_client_dir = False
0591cfa8 2438 if not os.path.exists(self.clientPath):
8d7ec362 2439 new_client_dir = True
0591cfa8
GG
2440 os.makedirs(self.clientPath)
2441
bbd84863 2442 chdir(self.clientPath, is_client_path=True)
ef739f08 2443 if self.dry_run:
f2606b17 2444 print("Would synchronize p4 checkout in %s" % self.clientPath)
8d7ec362 2445 else:
f2606b17 2446 print("Synchronizing p4 checkout...")
ef739f08
PW
2447 if new_client_dir:
2448 # old one was destroyed, and maybe nobody told p4
2449 p4_sync("...", "-f")
2450 else:
2451 p4_sync("...")
4f5cf76a 2452 self.check()
4f5cf76a 2453
4c750c0d 2454 commits = []
00ad6e31 2455 if self.master:
89f32a92 2456 committish = self.master
00ad6e31 2457 else:
89f32a92 2458 committish = 'HEAD'
00ad6e31 2459
f55b87c1
RM
2460 if self.commit != "":
2461 if self.commit.find("..") != -1:
2462 limits_ish = self.commit.split("..")
2463 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (limits_ish[0], limits_ish[1])]):
2464 commits.append(line.strip())
2465 commits.reverse()
2466 else:
2467 commits.append(self.commit)
2468 else:
e6388994 2469 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, committish)]):
f55b87c1
RM
2470 commits.append(line.strip())
2471 commits.reverse()
4f5cf76a 2472
0d609032 2473 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
848de9c3
LD
2474 self.checkAuthorship = False
2475 else:
2476 self.checkAuthorship = True
2477
3ea2cfd4
LD
2478 if self.preserveUser:
2479 self.checkValidP4Users(commits)
2480
84cb0003
GG
2481 #
2482 # Build up a set of options to be passed to diff when
2483 # submitting each commit to p4.
2484 #
2485 if self.detectRenames:
2486 # command-line -M arg
2487 self.diffOpts = "-M"
2488 else:
2489 # If not explicitly set check the config variable
2490 detectRenames = gitConfig("git-p4.detectRenames")
2491
2492 if detectRenames.lower() == "false" or detectRenames == "":
2493 self.diffOpts = ""
2494 elif detectRenames.lower() == "true":
2495 self.diffOpts = "-M"
2496 else:
2497 self.diffOpts = "-M%s" % detectRenames
2498
2499 # no command-line arg for -C or --find-copies-harder, just
2500 # config variables
2501 detectCopies = gitConfig("git-p4.detectCopies")
2502 if detectCopies.lower() == "false" or detectCopies == "":
2503 pass
2504 elif detectCopies.lower() == "true":
2505 self.diffOpts += " -C"
2506 else:
2507 self.diffOpts += " -C%s" % detectCopies
2508
0d609032 2509 if gitConfigBool("git-p4.detectCopiesHarder"):
84cb0003
GG
2510 self.diffOpts += " --find-copies-harder"
2511
8cf422db
LD
2512 num_shelves = len(self.update_shelve)
2513 if num_shelves > 0 and num_shelves != len(commits):
2514 sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
2515 (len(commits), num_shelves))
2516
4935c458
BK
2517 if not self.no_verify:
2518 try:
2519 if not run_git_hook("p4-pre-submit"):
2520 print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
2521 "this pre-submission check by adding\nthe command line option '--no-verify', " \
2522 "however,\nthis will also skip the p4-changelist hook as well.")
2523 sys.exit(1)
2524 except Exception as e:
2525 print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
2526 "with the error '{0}'".format(e.message) )
aa8b766a 2527 sys.exit(1)
251c8c50 2528
7e5dd9f2
PW
2529 #
2530 # Apply the commits, one at a time. On failure, ask if should
2531 # continue to try the rest of the patches, or quit.
2532 #
ef739f08 2533 if self.dry_run:
f2606b17 2534 print("Would apply")
67b0fe2e 2535 applied = []
7e5dd9f2
PW
2536 last = len(commits) - 1
2537 for i, commit in enumerate(commits):
ef739f08 2538 if self.dry_run:
f2606b17
LD
2539 print(" ", read_pipe(["git", "show", "-s",
2540 "--format=format:%h %s", commit]))
ef739f08
PW
2541 ok = True
2542 else:
2543 ok = self.applyCommit(commit)
67b0fe2e
PW
2544 if ok:
2545 applied.append(commit)
2dfdd705
BK
2546 if self.prepare_p4_only:
2547 if i < last:
2548 print("Processing only the first commit due to option" \
2549 " --prepare-p4-only")
728b7ad8 2550 break
2dfdd705 2551 else:
7e5dd9f2 2552 if i < last:
e2aed5fd
BK
2553 # prompt for what to do, or use the option/variable
2554 if self.conflict_behavior == "ask":
2555 print("What do you want to do?")
2556 response = prompt("[s]kip this commit but apply the rest, or [q]uit? ")
2557 elif self.conflict_behavior == "skip":
2558 response = "s"
2559 elif self.conflict_behavior == "quit":
2560 response = "q"
2561 else:
2562 die("Unknown conflict_behavior '%s'" %
2563 self.conflict_behavior)
2564
2565 if response == "s":
2566 print("Skipping this commit, but applying the rest")
2567 if response == "q":
2568 print("Quitting")
7e5dd9f2 2569 break
4f5cf76a 2570
67b0fe2e 2571 chdir(self.oldWorkingDirectory)
b34fa577 2572 shelved_applied = "shelved" if self.shelve else "applied"
ef739f08
PW
2573 if self.dry_run:
2574 pass
728b7ad8
PW
2575 elif self.prepare_p4_only:
2576 pass
ef739f08 2577 elif len(commits) == len(applied):
f2606b17 2578 print("All commits {0}!".format(shelved_applied))
14594f4b 2579
4c750c0d 2580 sync = P4Sync()
44e8d26c
PW
2581 if self.branch:
2582 sync.branch = self.branch
b9d34db9
LD
2583 if self.disable_p4sync:
2584 sync.sync_origin_only()
2585 else:
2586 sync.run([])
14594f4b 2587
b9d34db9
LD
2588 if not self.disable_rebase:
2589 rebase = P4Rebase()
2590 rebase.rebase()
4f5cf76a 2591
67b0fe2e
PW
2592 else:
2593 if len(applied) == 0:
f2606b17 2594 print("No commits {0}.".format(shelved_applied))
67b0fe2e 2595 else:
f2606b17 2596 print("{0} only the commits marked with '*':".format(shelved_applied.capitalize()))
67b0fe2e
PW
2597 for c in commits:
2598 if c in applied:
2599 star = "*"
2600 else:
2601 star = " "
f2606b17
LD
2602 print(star, read_pipe(["git", "show", "-s",
2603 "--format=format:%h %s", c]))
2604 print("You will have to do 'git p4 sync' and rebase.")
67b0fe2e 2605
0d609032 2606 if gitConfigBool("git-p4.exportLabels"):
06dcd152 2607 self.exportLabels = True
06804c76
LD
2608
2609 if self.exportLabels:
2610 p4Labels = getP4Labels(self.depotPath)
2611 gitTags = getGitTags()
2612
2613 missingGitTags = gitTags - p4Labels
2614 self.exportGitTags(missingGitTags)
2615
98e023de 2616 # exit with error unless everything applied perfectly
67b0fe2e
PW
2617 if len(commits) != len(applied):
2618 sys.exit(1)
2619
b984733c
SH
2620 return True
2621
ecb7cf98
PW
2622class View(object):
2623 """Represent a p4 view ("p4 help views"), and map files in a
2624 repo according to the view."""
2625
9d57c4a6 2626 def __init__(self, client_name):
ecb7cf98 2627 self.mappings = []
9d57c4a6
KS
2628 self.client_prefix = "//%s/" % client_name
2629 # cache results of "p4 where" to lookup client file locations
2630 self.client_spec_path_cache = {}
ecb7cf98
PW
2631
2632 def append(self, view_line):
2633 """Parse a view line, splitting it into depot and client
9d57c4a6
KS
2634 sides. Append to self.mappings, preserving order. This
2635 is only needed for tag creation."""
ecb7cf98
PW
2636
2637 # Split the view line into exactly two words. P4 enforces
2638 # structure on these lines that simplifies this quite a bit.
2639 #
2640 # Either or both words may be double-quoted.
2641 # Single quotes do not matter.
2642 # Double-quote marks cannot occur inside the words.
2643 # A + or - prefix is also inside the quotes.
2644 # There are no quotes unless they contain a space.
2645 # The line is already white-space stripped.
2646 # The two words are separated by a single space.
2647 #
2648 if view_line[0] == '"':
2649 # First word is double quoted. Find its end.
2650 close_quote_index = view_line.find('"', 1)
2651 if close_quote_index <= 0:
2652 die("No first-word closing quote found: %s" % view_line)
2653 depot_side = view_line[1:close_quote_index]
2654 # skip closing quote and space
2655 rhs_index = close_quote_index + 1 + 1
2656 else:
2657 space_index = view_line.find(" ")
2658 if space_index <= 0:
2659 die("No word-splitting space found: %s" % view_line)
2660 depot_side = view_line[0:space_index]
2661 rhs_index = space_index + 1
2662
ecb7cf98 2663 # prefix + means overlay on previous mapping
ecb7cf98 2664 if depot_side.startswith("+"):
ecb7cf98
PW
2665 depot_side = depot_side[1:]
2666
9d57c4a6 2667 # prefix - means exclude this path, leave out of mappings
ecb7cf98
PW
2668 exclude = False
2669 if depot_side.startswith("-"):
2670 exclude = True
2671 depot_side = depot_side[1:]
2672
9d57c4a6
KS
2673 if not exclude:
2674 self.mappings.append(depot_side)
ecb7cf98 2675
9d57c4a6
KS
2676 def convert_client_path(self, clientFile):
2677 # chop off //client/ part to make it relative
d38208a2 2678 if not decode_path(clientFile).startswith(self.client_prefix):
9d57c4a6
KS
2679 die("No prefix '%s' on clientFile '%s'" %
2680 (self.client_prefix, clientFile))
2681 return clientFile[len(self.client_prefix):]
ecb7cf98 2682
9d57c4a6
KS
2683 def update_client_spec_path_cache(self, files):
2684 """ Caching file paths by "p4 where" batch query """
ecb7cf98 2685
9d57c4a6 2686 # List depot file paths exclude that already cached
d38208a2 2687 fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache]
ecb7cf98 2688
9d57c4a6
KS
2689 if len(fileArgs) == 0:
2690 return # All files in cache
ecb7cf98 2691
9d57c4a6
KS
2692 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
2693 for res in where_result:
2694 if "code" in res and res["code"] == "error":
2695 # assume error is "... file(s) not in client view"
2696 continue
2697 if "clientFile" not in res:
20005443 2698 die("No clientFile in 'p4 where' output")
9d57c4a6
KS
2699 if "unmap" in res:
2700 # it will list all of them, but only one not unmap-ped
2701 continue
d38208a2 2702 depot_path = decode_path(res['depotFile'])
a0a50d87 2703 if gitConfigBool("core.ignorecase"):
d38208a2
YZ
2704 depot_path = depot_path.lower()
2705 self.client_spec_path_cache[depot_path] = self.convert_client_path(res["clientFile"])
ecb7cf98 2706
9d57c4a6
KS
2707 # not found files or unmap files set to ""
2708 for depotFile in fileArgs:
d38208a2 2709 depotFile = decode_path(depotFile)
a0a50d87
LS
2710 if gitConfigBool("core.ignorecase"):
2711 depotFile = depotFile.lower()
9d57c4a6 2712 if depotFile not in self.client_spec_path_cache:
d38208a2 2713 self.client_spec_path_cache[depotFile] = b''
ecb7cf98 2714
9d57c4a6
KS
2715 def map_in_client(self, depot_path):
2716 """Return the relative location in the client where this
2717 depot file should live. Returns "" if the file should
2718 not be mapped in the client."""
ecb7cf98 2719
a0a50d87
LS
2720 if gitConfigBool("core.ignorecase"):
2721 depot_path = depot_path.lower()
2722
9d57c4a6
KS
2723 if depot_path in self.client_spec_path_cache:
2724 return self.client_spec_path_cache[depot_path]
2725
2726 die( "Error: %s is not found in client spec path" % depot_path )
2727 return ""
ecb7cf98 2728
ff8c50ed
AM
2729def cloneExcludeCallback(option, opt_str, value, parser):
2730 # prepend "/" because the first "/" was consumed as part of the option itself.
2731 # ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
2732 parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
2733
3ea2cfd4 2734class P4Sync(Command, P4UserMap):
56c09345 2735
b984733c
SH
2736 def __init__(self):
2737 Command.__init__(self)
3ea2cfd4 2738 P4UserMap.__init__(self)
b984733c
SH
2739 self.options = [
2740 optparse.make_option("--branch", dest="branch"),
2741 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
2742 optparse.make_option("--changesfile", dest="changesFile"),
2743 optparse.make_option("--silent", dest="silent", action="store_true"),
ef48f909 2744 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
06804c76 2745 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
d2c6dd30
HWN
2746 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
2747 help="Import into refs/heads/ , not refs/remotes"),
96b2d54a
LS
2748 optparse.make_option("--max-changes", dest="maxChanges",
2749 help="Maximum number of changes to import"),
2750 optparse.make_option("--changes-block-size", dest="changes_block_size", type="int",
2751 help="Internal block size to use when iteratively calling p4 changes"),
86dff6b6 2752 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
3a70cdfa
TAL
2753 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
2754 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
51334bb0
LD
2755 help="Only sync files that are included in the Perforce Client Spec"),
2756 optparse.make_option("-/", dest="cloneExclude",
ff8c50ed 2757 action="callback", callback=cloneExcludeCallback, type="string",
51334bb0 2758 help="exclude depot path"),
b984733c
SH
2759 ]
2760 self.description = """Imports from Perforce into a git repository.\n
2761 example:
2762 //depot/my/project/ -- to import the current head
2763 //depot/my/project/@all -- to import everything
2764 //depot/my/project/@1,6 -- to import only from revision 1 to 6
2765
2766 (a ... is not needed in the path p4 specification, it's added implicitly)"""
2767
2768 self.usage += " //depot/path[@revRange]"
b984733c 2769 self.silent = False
1d7367dc
RG
2770 self.createdBranches = set()
2771 self.committedChanges = set()
569d1bd4 2772 self.branch = ""
b984733c 2773 self.detectBranches = False
cb53e1f8 2774 self.detectLabels = False
06804c76 2775 self.importLabels = False
b984733c 2776 self.changesFile = ""
01265103 2777 self.syncWithOrigin = True
a028a98e 2778 self.importIntoRemotes = True
01a9c9c5 2779 self.maxChanges = ""
1051ef00 2780 self.changes_block_size = None
8b41a97f 2781 self.keepRepoPath = False
6326aa58 2782 self.depotPaths = None
3c699645 2783 self.p4BranchesInGit = []
354081d5 2784 self.cloneExclude = []
3a70cdfa 2785 self.useClientSpec = False
a93d33ee 2786 self.useClientSpec_from_options = False
ecb7cf98 2787 self.clientSpecDirs = None
fed23693 2788 self.tempBranches = []
d604176d 2789 self.tempBranchLocation = "refs/git-p4-tmp"
a5db4b12 2790 self.largeFileSystem = None
123f6317 2791 self.suppress_meta_comment = False
a5db4b12
LS
2792
2793 if gitConfig('git-p4.largeFileSystem'):
2794 largeFileSystemConstructor = globals()[gitConfig('git-p4.largeFileSystem')]
2795 self.largeFileSystem = largeFileSystemConstructor(
2796 lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)
2797 )
b984733c 2798
01265103
SH
2799 if gitConfig("git-p4.syncFromOrigin") == "false":
2800 self.syncWithOrigin = False
2801
123f6317
LD
2802 self.depotPaths = []
2803 self.changeRange = ""
2804 self.previousDepotPaths = []
2805 self.hasOrigin = False
2806
2807 # map from branch depot path to parent branch
2808 self.knownBranches = {}
2809 self.initialParents = {}
2810
2811 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
2812 self.labels = {}
2813
fed23693
VA
2814 # Force a checkpoint in fast-import and wait for it to finish
2815 def checkpoint(self):
2816 self.gitStream.write("checkpoint\n\n")
2817 self.gitStream.write("progress checkpoint\n\n")
4294d741 2818 self.gitStream.flush()
fed23693
VA
2819 out = self.gitOutput.readline()
2820 if self.verbose:
f2606b17 2821 print("checkpoint finished: " + out)
fed23693 2822
a2bee10a
AM
2823 def isPathWanted(self, path):
2824 for p in self.cloneExclude:
2825 if p.endswith("/"):
2826 if p4PathStartsWith(path, p):
2827 return False
2828 # "-//depot/file1" without a trailing "/" should only exclude "file1", but not "file111" or "file1_dir/file2"
2829 elif path.lower() == p.lower():
2830 return False
2831 for p in self.depotPaths:
d38208a2 2832 if p4PathStartsWith(path, decode_path(p)):
a2bee10a
AM
2833 return True
2834 return False
2835
89143ac2 2836 def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
b984733c
SH
2837 files = []
2838 fnum = 0
dba1c9d9 2839 while "depotFile%s" % fnum in commit:
b984733c 2840 path = commit["depotFile%s" % fnum]
d38208a2 2841 found = self.isPathWanted(decode_path(path))
6326aa58 2842 if not found:
b984733c
SH
2843 fnum = fnum + 1
2844 continue
2845
2846 file = {}
2847 file["path"] = path
2848 file["rev"] = commit["rev%s" % fnum]
2849 file["action"] = commit["action%s" % fnum]
2850 file["type"] = commit["type%s" % fnum]
123f6317
LD
2851 if shelved:
2852 file["shelved_cl"] = int(shelved_cl)
b984733c
SH
2853 files.append(file)
2854 fnum = fnum + 1
2855 return files
2856
26e6a27d
JD
2857 def extractJobsFromCommit(self, commit):
2858 jobs = []
2859 jnum = 0
dba1c9d9 2860 while "job%s" % jnum in commit:
26e6a27d
JD
2861 job = commit["job%s" % jnum]
2862 jobs.append(job)
2863 jnum = jnum + 1
2864 return jobs
2865
6326aa58 2866 def stripRepoPath(self, path, prefixes):
21ef5df4
PW
2867 """When streaming files, this is called to map a p4 depot path
2868 to where it should go in git. The prefixes are either
2869 self.depotPaths, or self.branchPrefixes in the case of
2870 branch detection."""
2871
3952710b 2872 if self.useClientSpec:
21ef5df4
PW
2873 # branch detection moves files up a level (the branch name)
2874 # from what client spec interpretation gives
d38208a2 2875 path = decode_path(self.clientSpecDirs.map_in_client(path))
21ef5df4
PW
2876 if self.detectBranches:
2877 for b in self.knownBranches:
f2768cb3 2878 if p4PathStartsWith(path, b + "/"):
21ef5df4
PW
2879 path = path[len(b)+1:]
2880
2881 elif self.keepRepoPath:
2882 # Preserve everything in relative path name except leading
2883 # //depot/; just look at first prefix as they all should
2884 # be in the same depot.
2885 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2886 if p4PathStartsWith(path, depot):
2887 path = path[len(depot):]
3952710b 2888
0d1696ef 2889 else:
0d1696ef
PW
2890 for p in prefixes:
2891 if p4PathStartsWith(path, p):
2892 path = path[len(p):]
21ef5df4 2893 break
8b41a97f 2894
0d1696ef 2895 path = wildcard_decode(path)
6326aa58 2896 return path
6754a299 2897
71b112d4 2898 def splitFilesIntoBranches(self, commit):
21ef5df4
PW
2899 """Look at each depotFile in the commit to figure out to what
2900 branch it belongs."""
2901
9d57c4a6
KS
2902 if self.clientSpecDirs:
2903 files = self.extractFilesFromCommit(commit)
2904 self.clientSpecDirs.update_client_spec_path_cache(files)
2905
d5904674 2906 branches = {}
71b112d4 2907 fnum = 0
dba1c9d9 2908 while "depotFile%s" % fnum in commit:
d38208a2
YZ
2909 raw_path = commit["depotFile%s" % fnum]
2910 path = decode_path(raw_path)
d15068a6 2911 found = self.isPathWanted(path)
6326aa58 2912 if not found:
71b112d4
SH
2913 fnum = fnum + 1
2914 continue
2915
2916 file = {}
d38208a2 2917 file["path"] = raw_path
71b112d4
SH
2918 file["rev"] = commit["rev%s" % fnum]
2919 file["action"] = commit["action%s" % fnum]
2920 file["type"] = commit["type%s" % fnum]
2921 fnum = fnum + 1
2922
21ef5df4
PW
2923 # start with the full relative path where this file would
2924 # go in a p4 client
2925 if self.useClientSpec:
d38208a2 2926 relPath = decode_path(self.clientSpecDirs.map_in_client(path))
21ef5df4
PW
2927 else:
2928 relPath = self.stripRepoPath(path, self.depotPaths)
b984733c 2929
4b97ffb1 2930 for branch in self.knownBranches.keys():
21ef5df4
PW
2931 # add a trailing slash so that a commit into qt/4.2foo
2932 # doesn't end up in qt/4.2, e.g.
f2768cb3 2933 if p4PathStartsWith(relPath, branch + "/"):
d5904674
SH
2934 if branch not in branches:
2935 branches[branch] = []
71b112d4 2936 branches[branch].append(file)
6555b2cc 2937 break
b984733c
SH
2938
2939 return branches
2940
a5db4b12 2941 def writeToGitStream(self, gitMode, relPath, contents):
6cec21a8 2942 self.gitStream.write(encode_text_stream(u'M {} inline {}\n'.format(gitMode, relPath)))
a5db4b12
LS
2943 self.gitStream.write('data %d\n' % sum(len(d) for d in contents))
2944 for d in contents:
2945 self.gitStream.write(d)
2946 self.gitStream.write('\n')
2947
a8b05162
LS
2948 def encodeWithUTF8(self, path):
2949 try:
2950 path.decode('ascii')
2951 except:
2952 encoding = 'utf8'
2953 if gitConfig('git-p4.pathEncoding'):
2954 encoding = gitConfig('git-p4.pathEncoding')
2955 path = path.decode(encoding, 'replace').encode('utf8', 'replace')
2956 if self.verbose:
f2606b17 2957 print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
a8b05162
LS
2958 return path
2959
b932705b
LD
2960 # output one file from the P4 stream
2961 # - helper for streamP4Files
2962
2963 def streamOneP4File(self, file, contents):
d38208a2
YZ
2964 file_path = file['depotFile']
2965 relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes)
2966
b932705b 2967 if verbose:
0742b7c8
LD
2968 if 'fileSize' in self.stream_file:
2969 size = int(self.stream_file['fileSize'])
2970 else:
2971 size = 0 # deleted files don't get a fileSize apparently
ae9b9509
JH
2972 sys.stdout.write('\r%s --> %s (%s)\n' % (
2973 file_path, relPath, format_size_human_readable(size)))
d2176a50 2974 sys.stdout.flush()
b932705b 2975
9cffb8c8
PW
2976 (type_base, type_mods) = split_p4_type(file["type"])
2977
2978 git_mode = "100644"
2979 if "x" in type_mods:
2980 git_mode = "100755"
2981 if type_base == "symlink":
2982 git_mode = "120000"
1292df11
AJ
2983 # p4 print on a symlink sometimes contains "target\n";
2984 # if it does, remove the newline
6cec21a8 2985 data = ''.join(decode_text_stream(c) for c in contents)
40f846c3
PW
2986 if not data:
2987 # Some version of p4 allowed creating a symlink that pointed
2988 # to nothing. This causes p4 errors when checking out such
2989 # a change, and errors here too. Work around it by ignoring
2990 # the bad symlink; hopefully a future change fixes it.
d38208a2 2991 print("\nIgnoring empty symlink in %s" % file_path)
40f846c3
PW
2992 return
2993 elif data[-1] == '\n':
1292df11
AJ
2994 contents = [data[:-1]]
2995 else:
2996 contents = [data]
b932705b 2997
9cffb8c8 2998 if type_base == "utf16":
55aa5714
PW
2999 # p4 delivers different text in the python output to -G
3000 # than it does when using "print -o", or normal p4 client
3001 # operations. utf16 is converted to ascii or utf8, perhaps.
3002 # But ascii text saved as -t utf16 is completely mangled.
3003 # Invoke print -o to get the real contents.
7f0e5962
PW
3004 #
3005 # On windows, the newlines will always be mangled by print, so put
3006 # them back too. This is not needed to the cygwin windows version,
3007 # just the native "NT" type.
3008 #
1f5f3907 3009 try:
d38208a2 3010 text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (decode_path(file['depotFile']), file['change'])], raw=True)
1f5f3907
LS
3011 except Exception as e:
3012 if 'Translation of file content failed' in str(e):
3013 type_base = 'binary'
3014 else:
3015 raise e
3016 else:
3017 if p4_version_string().find('/NT') >= 0:
d38208a2 3018 text = text.replace(b'\r\n', b'\n')
1f5f3907 3019 contents = [ text ]
55aa5714 3020
9f7ef0ea
PW
3021 if type_base == "apple":
3022 # Apple filetype files will be streamed as a concatenation of
3023 # its appledouble header and the contents. This is useless
3024 # on both macs and non-macs. If using "print -q -o xx", it
3025 # will create "xx" with the data, and "%xx" with the header.
3026 # This is also not very useful.
3027 #
3028 # Ideally, someday, this script can learn how to generate
3029 # appledouble files directly and import those to git, but
3030 # non-mac machines can never find a use for apple filetype.
f2606b17 3031 print("\nIgnoring apple filetype file %s" % file['depotFile'])
9f7ef0ea
PW
3032 return
3033
55aa5714
PW
3034 # Note that we do not try to de-mangle keywords on utf16 files,
3035 # even though in theory somebody may want that.
e665e98e
JH
3036 regexp = p4_keywords_regexp_for_type(type_base, type_mods)
3037 if regexp:
70c0d553 3038 contents = [regexp.sub(br'$\1$', c) for c in contents]
b932705b 3039
a5db4b12
LS
3040 if self.largeFileSystem:
3041 (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
b932705b 3042
a5db4b12 3043 self.writeToGitStream(git_mode, relPath, contents)
b932705b
LD
3044
3045 def streamOneP4Deletion(self, file):
d38208a2 3046 relPath = self.stripRepoPath(decode_path(file['path']), self.branchPrefixes)
b932705b 3047 if verbose:
d2176a50
LS
3048 sys.stdout.write("delete %s\n" % relPath)
3049 sys.stdout.flush()
6cec21a8 3050 self.gitStream.write(encode_text_stream(u'D {}\n'.format(relPath)))
b932705b 3051
a5db4b12
LS
3052 if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
3053 self.largeFileSystem.removeLargeFile(relPath)
3054
b932705b
LD
3055 # handle another chunk of streaming data
3056 def streamP4FilesCb(self, marshalled):
3057
78189bea
PW
3058 # catch p4 errors and complain
3059 err = None
3060 if "code" in marshalled:
3061 if marshalled["code"] == "error":
3062 if "data" in marshalled:
3063 err = marshalled["data"].rstrip()
4d25dc44
LS
3064
3065 if not err and 'fileSize' in self.stream_file:
3066 required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
3067 if required_bytes > 0:
ae9b9509
JH
3068 err = 'Not enough space left on %s! Free at least %s.' % (
3069 os.getcwd(), format_size_human_readable(required_bytes))
4d25dc44 3070
78189bea
PW
3071 if err:
3072 f = None
3073 if self.stream_have_file_info:
3074 if "depotFile" in self.stream_file:
3075 f = self.stream_file["depotFile"]
3076 # force a failure in fast-import, else an empty
3077 # commit will be made
3078 self.gitStream.write("\n")
3079 self.gitStream.write("die-now\n")
3080 self.gitStream.close()
3081 # ignore errors, but make sure it exits first
3082 self.importProcess.wait()
3083 if f:
3084 die("Error from p4 print for %s: %s" % (f, err))
3085 else:
3086 die("Error from p4 print: %s" % err)
3087
dba1c9d9 3088 if 'depotFile' in marshalled and self.stream_have_file_info:
c3f6163b
AG
3089 # start of a new file - output the old one first
3090 self.streamOneP4File(self.stream_file, self.stream_contents)
3091 self.stream_file = {}
3092 self.stream_contents = []
3093 self.stream_have_file_info = False
b932705b 3094
c3f6163b
AG
3095 # pick up the new file information... for the
3096 # 'data' field we need to append to our array
3097 for k in marshalled.keys():
3098 if k == 'data':
d2176a50
LS
3099 if 'streamContentSize' not in self.stream_file:
3100 self.stream_file['streamContentSize'] = 0
3101 self.stream_file['streamContentSize'] += len(marshalled['data'])
c3f6163b
AG
3102 self.stream_contents.append(marshalled['data'])
3103 else:
3104 self.stream_file[k] = marshalled[k]
b932705b 3105
d2176a50
LS
3106 if (verbose and
3107 'streamContentSize' in self.stream_file and
3108 'fileSize' in self.stream_file and
3109 'depotFile' in self.stream_file):
3110 size = int(self.stream_file["fileSize"])
3111 if size > 0:
3112 progress = 100*self.stream_file['streamContentSize']/size
ae9b9509
JH
3113 sys.stdout.write('\r%s %d%% (%s)' % (
3114 self.stream_file['depotFile'], progress,
3115 format_size_human_readable(size)))
d2176a50
LS
3116 sys.stdout.flush()
3117
c3f6163b 3118 self.stream_have_file_info = True
b932705b
LD
3119
3120 # Stream directly from "p4 files" into "git fast-import"
3121 def streamP4Files(self, files):
30b5940b
SH
3122 filesForCommit = []
3123 filesToRead = []
b932705b 3124 filesToDelete = []
30b5940b 3125
3a70cdfa 3126 for f in files:
ecb7cf98
PW
3127 filesForCommit.append(f)
3128 if f['action'] in self.delete_actions:
3129 filesToDelete.append(f)
3130 else:
3131 filesToRead.append(f)
6a49f8e2 3132
b932705b
LD
3133 # deleted files...
3134 for f in filesToDelete:
3135 self.streamOneP4Deletion(f)
1b9a4684 3136
b932705b
LD
3137 if len(filesToRead) > 0:
3138 self.stream_file = {}
3139 self.stream_contents = []
3140 self.stream_have_file_info = False
8ff45f2a 3141
c3f6163b
AG
3142 # curry self argument
3143 def streamP4FilesCbSelf(entry):
3144 self.streamP4FilesCb(entry)
6a49f8e2 3145
123f6317
LD
3146 fileArgs = []
3147 for f in filesToRead:
3148 if 'shelved_cl' in f:
3149 # Handle shelved CLs using the "p4 print file@=N" syntax to print
3150 # the contents
6cec21a8 3151 fileArg = f['path'] + encode_text_stream('@={}'.format(f['shelved_cl']))
123f6317 3152 else:
6cec21a8 3153 fileArg = f['path'] + encode_text_stream('#{}'.format(f['rev']))
123f6317
LD
3154
3155 fileArgs.append(fileArg)
6de040df
LD
3156
3157 p4CmdList(["-x", "-", "print"],
3158 stdin=fileArgs,
3159 cb=streamP4FilesCbSelf)
30b5940b 3160
b932705b 3161 # do the last chunk
dba1c9d9 3162 if 'depotFile' in self.stream_file:
b932705b 3163 self.streamOneP4File(self.stream_file, self.stream_contents)
6a49f8e2 3164
affb474f
LD
3165 def make_email(self, userid):
3166 if userid in self.users:
3167 return self.users[userid]
3168 else:
3169 return "%s <a@b>" % userid
3170
06804c76 3171 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
b43702ac
LD
3172 """ Stream a p4 tag.
3173 commit is either a git commit, or a fast-import mark, ":<p4commit>"
3174 """
3175
06804c76 3176 if verbose:
f2606b17 3177 print("writing tag %s for commit %s" % (labelName, commit))
06804c76
LD
3178 gitStream.write("tag %s\n" % labelName)
3179 gitStream.write("from %s\n" % commit)
3180
dba1c9d9 3181 if 'Owner' in labelDetails:
06804c76
LD
3182 owner = labelDetails["Owner"]
3183 else:
3184 owner = None
3185
3186 # Try to use the owner of the p4 label, or failing that,
3187 # the current p4 user id.
3188 if owner:
3189 email = self.make_email(owner)
3190 else:
3191 email = self.make_email(self.p4UserId())
3192 tagger = "%s %s %s" % (email, epoch, self.tz)
3193
3194 gitStream.write("tagger %s\n" % tagger)
3195
f2606b17 3196 print("labelDetails=",labelDetails)
dba1c9d9 3197 if 'Description' in labelDetails:
06804c76
LD
3198 description = labelDetails['Description']
3199 else:
3200 description = 'Label from git p4'
3201
3202 gitStream.write("data %d\n" % len(description))
3203 gitStream.write(description)
3204 gitStream.write("\n")
3205
4ae048e6
LS
3206 def inClientSpec(self, path):
3207 if not self.clientSpecDirs:
3208 return True
3209 inClientSpec = self.clientSpecDirs.map_in_client(path)
3210 if not inClientSpec and self.verbose:
3211 print('Ignoring file outside of client spec: {0}'.format(path))
3212 return inClientSpec
3213
3214 def hasBranchPrefix(self, path):
3215 if not self.branchPrefixes:
3216 return True
3217 hasPrefix = [p for p in self.branchPrefixes
3218 if p4PathStartsWith(path, p)]
09667d01 3219 if not hasPrefix and self.verbose:
4ae048e6
LS
3220 print('Ignoring file outside of prefix: {0}'.format(path))
3221 return hasPrefix
3222
82e46d6b
AO
3223 def findShadowedFiles(self, files, change):
3224 # Perforce allows you commit files and directories with the same name,
3225 # so you could have files //depot/foo and //depot/foo/bar both checked
3226 # in. A p4 sync of a repository in this state fails. Deleting one of
3227 # the files recovers the repository.
3228 #
3229 # Git will not allow the broken state to exist and only the most recent
3230 # of the conflicting names is left in the repository. When one of the
3231 # conflicting files is deleted we need to re-add the other one to make
3232 # sure the git repository recovers in the same way as perforce.
3233 deleted = [f for f in files if f['action'] in self.delete_actions]
3234 to_check = set()
3235 for f in deleted:
3236 path = decode_path(f['path'])
3237 to_check.add(path + '/...')
3238 while True:
3239 path = path.rsplit("/", 1)[0]
3240 if path == "/" or path in to_check:
3241 break
3242 to_check.add(path)
3243 to_check = ['%s@%s' % (wildcard_encode(p), change) for p in to_check
3244 if self.hasBranchPrefix(p)]
3245 if to_check:
3246 stat_result = p4CmdList(["-x", "-", "fstat", "-T",
3247 "depotFile,headAction,headRev,headType"], stdin=to_check)
3248 for record in stat_result:
3249 if record['code'] != 'stat':
3250 continue
3251 if record['headAction'] in self.delete_actions:
3252 continue
3253 files.append({
3254 'action': 'add',
3255 'path': record['depotFile'],
3256 'rev': record['headRev'],
3257 'type': record['headType']})
3258
89143ac2 3259 def commit(self, details, files, branch, parent = "", allow_empty=False):
b984733c
SH
3260 epoch = details["time"]
3261 author = details["user"]
26e6a27d 3262 jobs = self.extractJobsFromCommit(details)
b984733c 3263
4b97ffb1 3264 if self.verbose:
4ae048e6 3265 print('commit into {0}'.format(branch))
96e07dd2 3266
82e46d6b
AO
3267 files = [f for f in files
3268 if self.hasBranchPrefix(decode_path(f['path']))]
3269 self.findShadowedFiles(files, details['change'])
3270
9d57c4a6
KS
3271 if self.clientSpecDirs:
3272 self.clientSpecDirs.update_client_spec_path_cache(files)
3273
82e46d6b 3274 files = [f for f in files if self.inClientSpec(decode_path(f['path']))]
4ae048e6 3275
89143ac2
LD
3276 if gitConfigBool('git-p4.keepEmptyCommits'):
3277 allow_empty = True
3278
3279 if not files and not allow_empty:
4ae048e6
LS
3280 print('Ignoring revision {0} as it would produce an empty commit.'
3281 .format(details['change']))
3282 return
3283
b984733c 3284 self.gitStream.write("commit %s\n" % branch)
b43702ac 3285 self.gitStream.write("mark :%s\n" % details["change"])
b984733c
SH
3286 self.committedChanges.add(int(details["change"]))
3287 committer = ""
b607e71e
SH
3288 if author not in self.users:
3289 self.getUserMapFromPerforceServer()
affb474f 3290 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
b984733c
SH
3291
3292 self.gitStream.write("committer %s\n" % committer)
3293
3294 self.gitStream.write("data <<EOT\n")
3295 self.gitStream.write(details["desc"])
26e6a27d
JD
3296 if len(jobs) > 0:
3297 self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
123f6317
LD
3298
3299 if not self.suppress_meta_comment:
3300 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
3301 (','.join(self.branchPrefixes), details["change"]))
3302 if len(details['options']) > 0:
3303 self.gitStream.write(": options = %s" % details['options'])
3304 self.gitStream.write("]\n")
3305
3306 self.gitStream.write("EOT\n\n")
b984733c
SH
3307
3308 if len(parent) > 0:
4b97ffb1 3309 if self.verbose:
f2606b17 3310 print("parent %s" % parent)
b984733c
SH
3311 self.gitStream.write("from %s\n" % parent)
3312
4ae048e6 3313 self.streamP4Files(files)
b984733c
SH
3314 self.gitStream.write("\n")
3315
1f4ba1cb
SH
3316 change = int(details["change"])
3317
dba1c9d9 3318 if change in self.labels:
1f4ba1cb
SH
3319 label = self.labels[change]
3320 labelDetails = label[0]
3321 labelRevisions = label[1]
71b112d4 3322 if self.verbose:
f2606b17 3323 print("Change %s is labelled %s" % (change, labelDetails))
1f4ba1cb 3324
6de040df 3325 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
e63231e5 3326 for p in self.branchPrefixes])
1f4ba1cb
SH
3327
3328 if len(files) == len(labelRevisions):
3329
3330 cleanedFiles = {}
3331 for info in files:
56c09345 3332 if info["action"] in self.delete_actions:
1f4ba1cb
SH
3333 continue
3334 cleanedFiles[info["depotFile"]] = info["rev"]
3335
3336 if cleanedFiles == labelRevisions:
06804c76 3337 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
1f4ba1cb
SH
3338
3339 else:
a46668fa 3340 if not self.silent:
f2606b17 3341 print("Tag %s does not match with change %s: files do not match."
cebdf5af 3342 % (labelDetails["label"], change))
1f4ba1cb
SH
3343
3344 else:
a46668fa 3345 if not self.silent:
f2606b17 3346 print("Tag %s does not match with change %s: file count is different."
cebdf5af 3347 % (labelDetails["label"], change))
b984733c 3348
06804c76 3349 # Build a dictionary of changelists and labels, for "detect-labels" option.
1f4ba1cb
SH
3350 def getLabels(self):
3351 self.labels = {}
3352
52a4880b 3353 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
10c3211b 3354 if len(l) > 0 and not self.silent:
4d88519f 3355 print("Finding files belonging to labels in %s" % self.depotPaths)
01ce1fe9
SH
3356
3357 for output in l:
1f4ba1cb
SH
3358 label = output["label"]
3359 revisions = {}
3360 newestChange = 0
71b112d4 3361 if self.verbose:
f2606b17 3362 print("Querying files for label %s" % label)
6de040df
LD
3363 for file in p4CmdList(["files"] +
3364 ["%s...@%s" % (p, label)
3365 for p in self.depotPaths]):
1f4ba1cb
SH
3366 revisions[file["depotFile"]] = file["rev"]
3367 change = int(file["change"])
3368 if change > newestChange:
3369 newestChange = change
3370
9bda3a85
SH
3371 self.labels[newestChange] = [output, revisions]
3372
3373 if self.verbose:
f2606b17 3374 print("Label changes: %s" % self.labels.keys())
1f4ba1cb 3375
06804c76
LD
3376 # Import p4 labels as git tags. A direct mapping does not
3377 # exist, so assume that if all the files are at the same revision
3378 # then we can use that, or it's something more complicated we should
3379 # just ignore.
3380 def importP4Labels(self, stream, p4Labels):
3381 if verbose:
f2606b17 3382 print("import p4 labels: " + ' '.join(p4Labels))
06804c76
LD
3383
3384 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
c8942a22 3385 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
06804c76
LD
3386 if len(validLabelRegexp) == 0:
3387 validLabelRegexp = defaultLabelRegexp
3388 m = re.compile(validLabelRegexp)
3389
3390 for name in p4Labels:
3391 commitFound = False
3392
3393 if not m.match(name):
3394 if verbose:
f2606b17 3395 print("label %s does not match regexp %s" % (name,validLabelRegexp))
06804c76
LD
3396 continue
3397
3398 if name in ignoredP4Labels:
3399 continue
3400
3401 labelDetails = p4CmdList(['label', "-o", name])[0]
3402
3403 # get the most recent changelist for each file in this label
3404 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
3405 for p in self.depotPaths])
3406
dba1c9d9 3407 if 'change' in change:
06804c76
LD
3408 # find the corresponding git commit; take the oldest commit
3409 changelist = int(change['change'])
b43702ac
LD
3410 if changelist in self.committedChanges:
3411 gitCommit = ":%d" % changelist # use a fast-import mark
06804c76 3412 commitFound = True
b43702ac
LD
3413 else:
3414 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
3415 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True)
3416 if len(gitCommit) == 0:
f2606b17 3417 print("importing label %s: could not find git commit for changelist %d" % (name, changelist))
b43702ac
LD
3418 else:
3419 commitFound = True
3420 gitCommit = gitCommit.strip()
3421
3422 if commitFound:
06804c76
LD
3423 # Convert from p4 time format
3424 try:
3425 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
3426 except ValueError:
f2606b17 3427 print("Could not convert label time %s" % labelDetails['Update'])
06804c76
LD
3428 tmwhen = 1
3429
3430 when = int(time.mktime(tmwhen))
3431 self.streamTag(stream, name, labelDetails, gitCommit, when)
3432 if verbose:
f2606b17 3433 print("p4 label %s mapped to git commit %s" % (name, gitCommit))
06804c76
LD
3434 else:
3435 if verbose:
f2606b17 3436 print("Label %s has no changelists - possibly deleted?" % name)
06804c76
LD
3437
3438 if not commitFound:
3439 # We can't import this label; don't try again as it will get very
3440 # expensive repeatedly fetching all the files for labels that will
3441 # never be imported. If the label is moved in the future, the
3442 # ignore will need to be removed manually.
3443 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
3444
86dff6b6
HWN
3445 def guessProjectName(self):
3446 for p in self.depotPaths:
6e5295c4
SH
3447 if p.endswith("/"):
3448 p = p[:-1]
3449 p = p[p.strip().rfind("/") + 1:]
3450 if not p.endswith("/"):
3451 p += "/"
3452 return p
86dff6b6 3453
4b97ffb1 3454 def getBranchMapping(self):
6555b2cc
SH
3455 lostAndFoundBranches = set()
3456
8ace74c0
VA
3457 user = gitConfig("git-p4.branchUser")
3458 if len(user) > 0:
3459 command = "branches -u %s" % user
3460 else:
3461 command = "branches"
3462
3463 for info in p4CmdList(command):
52a4880b 3464 details = p4Cmd(["branch", "-o", info["branch"]])
4b97ffb1 3465 viewIdx = 0
dba1c9d9 3466 while "View%s" % viewIdx in details:
4b97ffb1
SH
3467 paths = details["View%s" % viewIdx].split(" ")
3468 viewIdx = viewIdx + 1
3469 # require standard //depot/foo/... //depot/bar/... mapping
3470 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
3471 continue
3472 source = paths[0]
3473 destination = paths[1]
6509e19c 3474 ## HACK
d53de8b9 3475 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
6509e19c
SH
3476 source = source[len(self.depotPaths[0]):-4]
3477 destination = destination[len(self.depotPaths[0]):-4]
6555b2cc 3478
1a2edf4e
SH
3479 if destination in self.knownBranches:
3480 if not self.silent:
f2606b17
LD
3481 print("p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination))
3482 print("but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination))
1a2edf4e
SH
3483 continue
3484
6555b2cc
SH
3485 self.knownBranches[destination] = source
3486
3487 lostAndFoundBranches.discard(destination)
3488
29bdbac1 3489 if source not in self.knownBranches:
6555b2cc
SH
3490 lostAndFoundBranches.add(source)
3491
7199cf13
VA
3492 # Perforce does not strictly require branches to be defined, so we also
3493 # check git config for a branch list.
3494 #
3495 # Example of branch definition in git config file:
3496 # [git-p4]
3497 # branchList=main:branchA
3498 # branchList=main:branchB
3499 # branchList=branchA:branchC
3500 configBranches = gitConfigList("git-p4.branchList")
3501 for branch in configBranches:
3502 if branch:
3503 (source, destination) = branch.split(":")
3504 self.knownBranches[destination] = source
3505
3506 lostAndFoundBranches.discard(destination)
3507
3508 if source not in self.knownBranches:
3509 lostAndFoundBranches.add(source)
3510
6555b2cc
SH
3511
3512 for branch in lostAndFoundBranches:
3513 self.knownBranches[branch] = branch
29bdbac1 3514
38f9f5ec
SH
3515 def getBranchMappingFromGitBranches(self):
3516 branches = p4BranchesInGit(self.importIntoRemotes)
3517 for branch in branches.keys():
3518 if branch == "master":
3519 branch = "main"
3520 else:
3521 branch = branch[len(self.projectName):]
3522 self.knownBranches[branch] = branch
3523
bb6e09b2
HWN
3524 def updateOptionDict(self, d):
3525 option_keys = {}
3526 if self.keepRepoPath:
3527 option_keys['keepRepoPath'] = 1
3528
3529 d["options"] = ' '.join(sorted(option_keys.keys()))
3530
3531 def readOptions(self, d):
dba1c9d9 3532 self.keepRepoPath = ('options' in d
bb6e09b2 3533 and ('keepRepoPath' in d['options']))
6326aa58 3534
8134f69c
SH
3535 def gitRefForBranch(self, branch):
3536 if branch == "main":
3537 return self.refPrefix + "master"
3538
3539 if len(branch) <= 0:
3540 return branch
3541
3542 return self.refPrefix + self.projectName + branch
3543
1ca3d710
SH
3544 def gitCommitByP4Change(self, ref, change):
3545 if self.verbose:
f2606b17 3546 print("looking in ref " + ref + " for change %s using bisect..." % change)
1ca3d710
SH
3547
3548 earliestCommit = ""
3549 latestCommit = parseRevision(ref)
3550
3551 while True:
3552 if self.verbose:
f2606b17 3553 print("trying: earliest %s latest %s" % (earliestCommit, latestCommit))
1ca3d710
SH
3554 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
3555 if len(next) == 0:
3556 if self.verbose:
f2606b17 3557 print("argh")
1ca3d710
SH
3558 return ""
3559 log = extractLogMessageFromGitCommit(next)
3560 settings = extractSettingsGitLog(log)
3561 currentChange = int(settings['change'])
3562 if self.verbose:
f2606b17 3563 print("current change %s" % currentChange)
1ca3d710
SH
3564
3565 if currentChange == change:
3566 if self.verbose:
f2606b17 3567 print("found %s" % next)
1ca3d710
SH
3568 return next
3569
3570 if currentChange < change:
3571 earliestCommit = "^%s" % next
3572 else:
2dda7412
AM
3573 if next == latestCommit:
3574 die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change))
3575 latestCommit = "%s^@" % next
1ca3d710
SH
3576
3577 return ""
3578
3579 def importNewBranch(self, branch, maxChange):
3580 # make fast-import flush all changes to disk and update the refs using the checkpoint
3581 # command so that we can try to find the branch parent in the git history
3582 self.gitStream.write("checkpoint\n\n");
3583 self.gitStream.flush();
3584 branchPrefix = self.depotPaths[0] + branch + "/"
3585 range = "@1,%s" % maxChange
3586 #print "prefix" + branchPrefix
96b2d54a 3587 changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
1ca3d710
SH
3588 if len(changes) <= 0:
3589 return False
3590 firstChange = changes[0]
3591 #print "first change in branch: %s" % firstChange
3592 sourceBranch = self.knownBranches[branch]
3593 sourceDepotPath = self.depotPaths[0] + sourceBranch
3594 sourceRef = self.gitRefForBranch(sourceBranch)
3595 #print "source " + sourceBranch
3596
52a4880b 3597 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
1ca3d710
SH
3598 #print "branch parent: %s" % branchParentChange
3599 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
3600 if len(gitParent) > 0:
3601 self.initialParents[self.gitRefForBranch(branch)] = gitParent
3602 #print "parent git commit: %s" % gitParent
3603
3604 self.importChanges(changes)
3605 return True
3606
fed23693 3607 def searchParent(self, parent, branch, target):
6b79818b
JK
3608 targetTree = read_pipe(["git", "rev-parse",
3609 "{}^{{tree}}".format(target)]).strip()
3610 for line in read_pipe_lines(["git", "rev-list", "--format=%H %T",
c7d34884 3611 "--no-merges", parent]):
6b79818b
JK
3612 if line.startswith("commit "):
3613 continue
3614 commit, tree = line.strip().split(" ")
3615 if tree == targetTree:
fed23693 3616 if self.verbose:
6b79818b
JK
3617 print("Found parent of %s in commit %s" % (branch, commit))
3618 return commit
3619 return None
fed23693 3620
89143ac2 3621 def importChanges(self, changes, origin_revision=0):
e87f37ae
SH
3622 cnt = 1
3623 for change in changes:
89143ac2 3624 description = p4_describe(change)
e87f37ae
SH
3625 self.updateOptionDict(description)
3626
3627 if not self.silent:
0f829620
JH
3628 sys.stdout.write("\rImporting revision %s (%d%%)" % (
3629 change, (cnt * 100) // len(changes)))
e87f37ae
SH
3630 sys.stdout.flush()
3631 cnt = cnt + 1
3632
3633 try:
3634 if self.detectBranches:
3635 branches = self.splitFilesIntoBranches(description)
3636 for branch in branches.keys():
3637 ## HACK --hwn
3638 branchPrefix = self.depotPaths[0] + branch + "/"
e63231e5 3639 self.branchPrefixes = [ branchPrefix ]
e87f37ae
SH
3640
3641 parent = ""
3642
3643 filesForCommit = branches[branch]
3644
3645 if self.verbose:
f2606b17 3646 print("branch is %s" % branch)
e87f37ae
SH
3647
3648 self.updatedBranches.add(branch)
3649
3650 if branch not in self.createdBranches:
3651 self.createdBranches.add(branch)
3652 parent = self.knownBranches[branch]
3653 if parent == branch:
3654 parent = ""
1ca3d710
SH
3655 else:
3656 fullBranch = self.projectName + branch
3657 if fullBranch not in self.p4BranchesInGit:
3658 if not self.silent:
3659 print("\n Importing new branch %s" % fullBranch);
3660 if self.importNewBranch(branch, change - 1):
3661 parent = ""
3662 self.p4BranchesInGit.append(fullBranch)
3663 if not self.silent:
3664 print("\n Resuming with change %s" % change);
3665
3666 if self.verbose:
f2606b17 3667 print("parent determined through known branches: %s" % parent)
e87f37ae 3668
8134f69c
SH
3669 branch = self.gitRefForBranch(branch)
3670 parent = self.gitRefForBranch(parent)
e87f37ae
SH
3671
3672 if self.verbose:
f2606b17 3673 print("looking for initial parent for %s; current parent is %s" % (branch, parent))
e87f37ae
SH
3674
3675 if len(parent) == 0 and branch in self.initialParents:
3676 parent = self.initialParents[branch]
3677 del self.initialParents[branch]
3678
fed23693
VA
3679 blob = None
3680 if len(parent) > 0:
4f9273d2 3681 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
fed23693 3682 if self.verbose:
f2606b17 3683 print("Creating temporary branch: " + tempBranch)
e63231e5 3684 self.commit(description, filesForCommit, tempBranch)
fed23693
VA
3685 self.tempBranches.append(tempBranch)
3686 self.checkpoint()
3687 blob = self.searchParent(parent, branch, tempBranch)
3688 if blob:
e63231e5 3689 self.commit(description, filesForCommit, branch, blob)
fed23693
VA
3690 else:
3691 if self.verbose:
f2606b17 3692 print("Parent of %s not found. Committing into head of %s" % (branch, parent))
e63231e5 3693 self.commit(description, filesForCommit, branch, parent)
e87f37ae 3694 else:
89143ac2 3695 files = self.extractFilesFromCommit(description)
e63231e5 3696 self.commit(description, files, self.branch,
e87f37ae 3697 self.initialParent)
47497844 3698 # only needed once, to connect to the previous commit
e87f37ae
SH
3699 self.initialParent = ""
3700 except IOError:
f2606b17 3701 print(self.gitError.read())
e87f37ae
SH
3702 sys.exit(1)
3703
b9d34db9
LD
3704 def sync_origin_only(self):
3705 if self.syncWithOrigin:
3706 self.hasOrigin = originP4BranchesExist()
3707 if self.hasOrigin:
3708 if not self.silent:
f2606b17 3709 print('Syncing with origin first, using "git fetch origin"')
b9d34db9
LD
3710 system("git fetch origin")
3711
c208a243 3712 def importHeadRevision(self, revision):
f2606b17 3713 print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch))
c208a243 3714
4e2e6ce4
PW
3715 details = {}
3716 details["user"] = "git perforce import user"
1494fcbb 3717 details["desc"] = ("Initial import of %s from the state at revision %s\n"
c208a243
SH
3718 % (' '.join(self.depotPaths), revision))
3719 details["change"] = revision
3720 newestRevision = 0
3721
3722 fileCnt = 0
6de040df
LD
3723 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
3724
3725 for info in p4CmdList(["files"] + fileArgs):
c208a243 3726
68b28593 3727 if 'code' in info and info['code'] == 'error':
c208a243
SH
3728 sys.stderr.write("p4 returned an error: %s\n"
3729 % info['data'])
d88e707f
PW
3730 if info['data'].find("must refer to client") >= 0:
3731 sys.stderr.write("This particular p4 error is misleading.\n")
3732 sys.stderr.write("Perhaps the depot path was misspelled.\n");
3733 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
c208a243 3734 sys.exit(1)
68b28593
PW
3735 if 'p4ExitCode' in info:
3736 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
c208a243
SH
3737 sys.exit(1)
3738
3739
3740 change = int(info["change"])
3741 if change > newestRevision:
3742 newestRevision = change
3743
56c09345 3744 if info["action"] in self.delete_actions:
c208a243
SH
3745 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
3746 #fileCnt = fileCnt + 1
3747 continue
3748
3749 for prop in ["depotFile", "rev", "action", "type" ]:
3750 details["%s%s" % (prop, fileCnt)] = info[prop]
3751
3752 fileCnt = fileCnt + 1
3753
3754 details["change"] = newestRevision
4e2e6ce4 3755
9dcb9f24 3756 # Use time from top-most change so that all git p4 clones of
4e2e6ce4 3757 # the same p4 repo have the same commit SHA1s.
18fa13d0
PW
3758 res = p4_describe(newestRevision)
3759 details["time"] = res["time"]
4e2e6ce4 3760
c208a243
SH
3761 self.updateOptionDict(details)
3762 try:
e63231e5 3763 self.commit(details, self.extractFilesFromCommit(details), self.branch)
de5abb5f 3764 except IOError as err:
f2606b17 3765 print("IO error with git fast-import. Is your git version recent enough?")
de5abb5f 3766 print("IO error details: {}".format(err))
f2606b17 3767 print(self.gitError.read())
c208a243 3768
ca5b5cce
LD
3769
3770 def importRevisions(self, args, branch_arg_given):
3771 changes = []
3772
3773 if len(self.changesFile) > 0:
43f33e49
LD
3774 with open(self.changesFile) as f:
3775 output = f.readlines()
ca5b5cce
LD
3776 changeSet = set()
3777 for line in output:
3778 changeSet.add(int(line))
3779
3780 for change in changeSet:
3781 changes.append(change)
3782
3783 changes.sort()
3784 else:
3785 # catch "git p4 sync" with no new branches, in a repo that
3786 # does not have any existing p4 branches
3787 if len(args) == 0:
3788 if not self.p4BranchesInGit:
6026aff5 3789 raise P4CommandException("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
ca5b5cce
LD
3790
3791 # The default branch is master, unless --branch is used to
3792 # specify something else. Make sure it exists, or complain
3793 # nicely about how to use --branch.
3794 if not self.detectBranches:
3795 if not branch_exists(self.branch):
3796 if branch_arg_given:
6026aff5 3797 raise P4CommandException("Error: branch %s does not exist." % self.branch)
ca5b5cce 3798 else:
6026aff5 3799 raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." %
ca5b5cce
LD
3800 self.branch)
3801
3802 if self.verbose:
3803 print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
3804 self.changeRange))
3805 changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
3806
3807 if len(self.maxChanges) > 0:
3808 changes = changes[:min(int(self.maxChanges), len(changes))]
3809
3810 if len(changes) == 0:
3811 if not self.silent:
3812 print("No changes to import!")
3813 else:
3814 if not self.silent and not self.detectBranches:
3815 print("Import destination: %s" % self.branch)
3816
3817 self.updatedBranches = set()
3818
3819 if not self.detectBranches:
3820 if args:
3821 # start a new branch
3822 self.initialParent = ""
3823 else:
3824 # build on a previous revision
3825 self.initialParent = parseRevision(self.branch)
3826
3827 self.importChanges(changes)
3828
3829 if not self.silent:
3830 print("")
3831 if len(self.updatedBranches) > 0:
3832 sys.stdout.write("Updated branches: ")
3833 for b in self.updatedBranches:
3834 sys.stdout.write("%s " % b)
3835 sys.stdout.write("\n")
3836
123f6317
LD
3837 def openStreams(self):
3838 self.importProcess = subprocess.Popen(["git", "fast-import"],
3839 stdin=subprocess.PIPE,
3840 stdout=subprocess.PIPE,
3841 stderr=subprocess.PIPE);
3842 self.gitOutput = self.importProcess.stdout
3843 self.gitStream = self.importProcess.stdin
3844 self.gitError = self.importProcess.stderr
c208a243 3845
86dca24b
YZ
3846 if bytes is not str:
3847 # Wrap gitStream.write() so that it can be called using `str` arguments
3848 def make_encoded_write(write):
3849 def encoded_write(s):
3850 return write(s.encode() if isinstance(s, str) else s)
3851 return encoded_write
3852
3853 self.gitStream.write = make_encoded_write(self.gitStream.write)
3854
123f6317 3855 def closeStreams(self):
837b3a63
LD
3856 if self.gitStream is None:
3857 return
123f6317
LD
3858 self.gitStream.close()
3859 if self.importProcess.wait() != 0:
3860 die("fast-import failed: %s" % self.gitError.read())
3861 self.gitOutput.close()
3862 self.gitError.close()
837b3a63 3863 self.gitStream = None
29bdbac1 3864
123f6317 3865 def run(self, args):
a028a98e
SH
3866 if self.importIntoRemotes:
3867 self.refPrefix = "refs/remotes/p4/"
3868 else:
db775559 3869 self.refPrefix = "refs/heads/p4/"
a028a98e 3870
b9d34db9 3871 self.sync_origin_only()
10f880f8 3872
5a8e84cd 3873 branch_arg_given = bool(self.branch)
569d1bd4 3874 if len(self.branch) == 0:
db775559 3875 self.branch = self.refPrefix + "master"
a028a98e 3876 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
48df6fd8 3877 system("git update-ref %s refs/heads/p4" % self.branch)
55d12437 3878 system("git branch -D p4")
967f72e2 3879
a93d33ee
PW
3880 # accept either the command-line option, or the configuration variable
3881 if self.useClientSpec:
3882 # will use this after clone to set the variable
3883 self.useClientSpec_from_options = True
3884 else:
0d609032 3885 if gitConfigBool("git-p4.useclientspec"):
09fca77b
PW
3886 self.useClientSpec = True
3887 if self.useClientSpec:
543987bd 3888 self.clientSpecDirs = getClientSpec()
3a70cdfa 3889
6a49f8e2
HWN
3890 # TODO: should always look at previous commits,
3891 # merge with previous imports, if possible.
3892 if args == []:
d414c74a 3893 if self.hasOrigin:
5ca44617 3894 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
3b650fc9
PW
3895
3896 # branches holds mapping from branch name to sha1
3897 branches = p4BranchesInGit(self.importIntoRemotes)
8c9e8b6e
PW
3898
3899 # restrict to just this one, disabling detect-branches
3900 if branch_arg_given:
3901 short = self.branch.split("/")[-1]
3902 if short in branches:
3903 self.p4BranchesInGit = [ short ]
3904 else:
3905 self.p4BranchesInGit = branches.keys()
abcd790f
SH
3906
3907 if len(self.p4BranchesInGit) > 1:
3908 if not self.silent:
f2606b17 3909 print("Importing from/into multiple branches")
abcd790f 3910 self.detectBranches = True
8c9e8b6e
PW
3911 for branch in branches.keys():
3912 self.initialParents[self.refPrefix + branch] = \
3913 branches[branch]
967f72e2 3914
29bdbac1 3915 if self.verbose:
f2606b17 3916 print("branches: %s" % self.p4BranchesInGit)
29bdbac1
SH
3917
3918 p4Change = 0
3919 for branch in self.p4BranchesInGit:
cebdf5af 3920 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
bb6e09b2
HWN
3921
3922 settings = extractSettingsGitLog(logMsg)
29bdbac1 3923
bb6e09b2 3924 self.readOptions(settings)
dba1c9d9
LD
3925 if ('depot-paths' in settings
3926 and 'change' in settings):
bb6e09b2 3927 change = int(settings['change']) + 1
29bdbac1
SH
3928 p4Change = max(p4Change, change)
3929
bb6e09b2
HWN
3930 depotPaths = sorted(settings['depot-paths'])
3931 if self.previousDepotPaths == []:
6326aa58 3932 self.previousDepotPaths = depotPaths
29bdbac1 3933 else:
6326aa58
HWN
3934 paths = []
3935 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
04d277b3
VA
3936 prev_list = prev.split("/")
3937 cur_list = cur.split("/")
3938 for i in range(0, min(len(cur_list), len(prev_list))):
fc35c9d5 3939 if cur_list[i] != prev_list[i]:
583e1707 3940 i = i - 1
6326aa58
HWN
3941 break
3942
04d277b3 3943 paths.append ("/".join(cur_list[:i + 1]))
6326aa58
HWN
3944
3945 self.previousDepotPaths = paths
29bdbac1
SH
3946
3947 if p4Change > 0:
bb6e09b2 3948 self.depotPaths = sorted(self.previousDepotPaths)
d5904674 3949 self.changeRange = "@%s,#head" % p4Change
341dc1c1 3950 if not self.silent and not self.detectBranches:
f2606b17 3951 print("Performing incremental import into %s git branch" % self.branch)
569d1bd4 3952
40d69ac3
PW
3953 # accept multiple ref name abbreviations:
3954 # refs/foo/bar/branch -> use it exactly
3955 # p4/branch -> prepend refs/remotes/ or refs/heads/
3956 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
f9162f6a 3957 if not self.branch.startswith("refs/"):
40d69ac3
PW
3958 if self.importIntoRemotes:
3959 prepend = "refs/remotes/"
3960 else:
3961 prepend = "refs/heads/"
3962 if not self.branch.startswith("p4/"):
3963 prepend += "p4/"
3964 self.branch = prepend + self.branch
179caebf 3965
6326aa58 3966 if len(args) == 0 and self.depotPaths:
b984733c 3967 if not self.silent:
f2606b17 3968 print("Depot paths: %s" % ' '.join(self.depotPaths))
b984733c 3969 else:
6326aa58 3970 if self.depotPaths and self.depotPaths != args:
f2606b17 3971 print("previous import used depot path %s and now %s was specified. "
6326aa58
HWN
3972 "This doesn't work!" % (' '.join (self.depotPaths),
3973 ' '.join (args)))
b984733c 3974 sys.exit(1)
6326aa58 3975
bb6e09b2 3976 self.depotPaths = sorted(args)
b984733c 3977
1c49fc19 3978 revision = ""
b984733c 3979 self.users = {}
b984733c 3980
58c8bc7c
PW
3981 # Make sure no revision specifiers are used when --changesfile
3982 # is specified.
3983 bad_changesfile = False
3984 if len(self.changesFile) > 0:
3985 for p in self.depotPaths:
3986 if p.find("@") >= 0 or p.find("#") >= 0:
3987 bad_changesfile = True
3988 break
3989 if bad_changesfile:
3990 die("Option --changesfile is incompatible with revision specifiers")
3991
6326aa58
HWN
3992 newPaths = []
3993 for p in self.depotPaths:
3994 if p.find("@") != -1:
3995 atIdx = p.index("@")
3996 self.changeRange = p[atIdx:]
3997 if self.changeRange == "@all":
3998 self.changeRange = ""
6a49f8e2 3999 elif ',' not in self.changeRange:
1c49fc19 4000 revision = self.changeRange
6326aa58 4001 self.changeRange = ""
7fcff9de 4002 p = p[:atIdx]
6326aa58
HWN
4003 elif p.find("#") != -1:
4004 hashIdx = p.index("#")
1c49fc19 4005 revision = p[hashIdx:]
7fcff9de 4006 p = p[:hashIdx]
6326aa58 4007 elif self.previousDepotPaths == []:
58c8bc7c
PW
4008 # pay attention to changesfile, if given, else import
4009 # the entire p4 tree at the head revision
4010 if len(self.changesFile) == 0:
4011 revision = "#head"
6326aa58
HWN
4012
4013 p = re.sub ("\.\.\.$", "", p)
4014 if not p.endswith("/"):
4015 p += "/"
4016
4017 newPaths.append(p)
4018
4019 self.depotPaths = newPaths
4020
e63231e5
PW
4021 # --detect-branches may change this for each branch
4022 self.branchPrefixes = self.depotPaths
4023
b607e71e 4024 self.loadUserMapFromCache()
cb53e1f8
SH
4025 self.labels = {}
4026 if self.detectLabels:
4027 self.getLabels();
b984733c 4028
4b97ffb1 4029 if self.detectBranches:
df450923
SH
4030 ## FIXME - what's a P4 projectName ?
4031 self.projectName = self.guessProjectName()
4032
38f9f5ec
SH
4033 if self.hasOrigin:
4034 self.getBranchMappingFromGitBranches()
4035 else:
4036 self.getBranchMapping()
29bdbac1 4037 if self.verbose:
f2606b17
LD
4038 print("p4-git branches: %s" % self.p4BranchesInGit)
4039 print("initial parents: %s" % self.initialParents)
29bdbac1
SH
4040 for b in self.p4BranchesInGit:
4041 if b != "master":
6326aa58
HWN
4042
4043 ## FIXME
29bdbac1
SH
4044 b = b[len(self.projectName):]
4045 self.createdBranches.add(b)
4b97ffb1 4046
19fa5ac3
LD
4047 p4_check_access()
4048
123f6317 4049 self.openStreams()
b984733c 4050
6026aff5 4051 err = None
341dc1c1 4052
6026aff5
LD
4053 try:
4054 if revision:
4055 self.importHeadRevision(revision)
4056 else:
4057 self.importRevisions(args, branch_arg_given)
b984733c 4058
6026aff5
LD
4059 if gitConfigBool("git-p4.importLabels"):
4060 self.importLabels = True
06804c76 4061
6026aff5
LD
4062 if self.importLabels:
4063 p4Labels = getP4Labels(self.depotPaths)
4064 gitTags = getGitTags()
b984733c 4065
6026aff5
LD
4066 missingP4Labels = p4Labels - gitTags
4067 self.importP4Labels(self.gitStream, missingP4Labels)
4068
4069 except P4CommandException as e:
4070 err = e
4071
4072 finally:
4073 self.closeStreams()
4074
4075 if err:
4076 die(str(err))
b984733c 4077
fed23693
VA
4078 # Cleanup temporary branches created during import
4079 if self.tempBranches != []:
4080 for branch in self.tempBranches:
4081 read_pipe("git update-ref -d %s" % branch)
4082 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
4083
55d12437
PW
4084 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
4085 # a convenient shortcut refname "p4".
4086 if self.importIntoRemotes:
4087 head_ref = self.refPrefix + "HEAD"
4088 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
4089 system(["git", "symbolic-ref", head_ref, self.branch])
4090
b984733c
SH
4091 return True
4092
01ce1fe9
SH
4093class P4Rebase(Command):
4094 def __init__(self):
4095 Command.__init__(self)
06804c76
LD
4096 self.options = [
4097 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
06804c76 4098 ]
06804c76 4099 self.importLabels = False
cebdf5af
HWN
4100 self.description = ("Fetches the latest revision from perforce and "
4101 + "rebases the current work (branch) against it")
01ce1fe9
SH
4102
4103 def run(self, args):
4104 sync = P4Sync()
06804c76 4105 sync.importLabels = self.importLabels
01ce1fe9 4106 sync.run([])
d7e3868c 4107
14594f4b
SH
4108 return self.rebase()
4109
4110 def rebase(self):
36ee4ee4 4111 if os.system("git update-index --refresh") != 0:
7560f547 4112 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.");
36ee4ee4 4113 if len(read_pipe("git diff-index HEAD --")) > 0:
f7e604ed 4114 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
36ee4ee4 4115
d7e3868c
SH
4116 [upstream, settings] = findUpstreamBranchPoint()
4117 if len(upstream) == 0:
4118 die("Cannot find upstream branchpoint for rebase")
4119
4120 # the branchpoint may be p4/foo~3, so strip off the parent
4121 upstream = re.sub("~[0-9]+$", "", upstream)
4122
f2606b17 4123 print("Rebasing the current branch onto %s" % upstream)
b25b2065 4124 oldHead = read_pipe("git rev-parse HEAD").strip()
d7e3868c 4125 system("git rebase %s" % upstream)
4e49d95e 4126 system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
01ce1fe9
SH
4127 return True
4128
f9a3a4f7
SH
4129class P4Clone(P4Sync):
4130 def __init__(self):
4131 P4Sync.__init__(self)
4132 self.description = "Creates a new git repository and imports from Perforce into it"
bb6e09b2 4133 self.usage = "usage: %prog [options] //depot/path[@revRange]"
354081d5 4134 self.options += [
bb6e09b2
HWN
4135 optparse.make_option("--destination", dest="cloneDestination",
4136 action='store', default=None,
354081d5 4137 help="where to leave result of the clone"),
38200076
PW
4138 optparse.make_option("--bare", dest="cloneBare",
4139 action="store_true", default=False),
354081d5 4140 ]
bb6e09b2 4141 self.cloneDestination = None
f9a3a4f7 4142 self.needsGit = False
38200076 4143 self.cloneBare = False
f9a3a4f7 4144
6a49f8e2
HWN
4145 def defaultDestination(self, args):
4146 ## TODO: use common prefix of args?
4147 depotPath = args[0]
4148 depotDir = re.sub("(@[^@]*)$", "", depotPath)
4149 depotDir = re.sub("(#[^#]*)$", "", depotDir)
053d9e43 4150 depotDir = re.sub(r"\.\.\.$", "", depotDir)
6a49f8e2
HWN
4151 depotDir = re.sub(r"/$", "", depotDir)
4152 return os.path.split(depotDir)[1]
4153
f9a3a4f7
SH
4154 def run(self, args):
4155 if len(args) < 1:
4156 return False
bb6e09b2
HWN
4157
4158 if self.keepRepoPath and not self.cloneDestination:
4159 sys.stderr.write("Must specify destination for --keep-path\n")
4160 sys.exit(1)
f9a3a4f7 4161
6326aa58 4162 depotPaths = args
5e100b5c
SH
4163
4164 if not self.cloneDestination and len(depotPaths) > 1:
4165 self.cloneDestination = depotPaths[-1]
4166 depotPaths = depotPaths[:-1]
4167
6326aa58
HWN
4168 for p in depotPaths:
4169 if not p.startswith("//"):
0f487d30 4170 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
6326aa58 4171 return False
f9a3a4f7 4172
bb6e09b2 4173 if not self.cloneDestination:
98ad4faf 4174 self.cloneDestination = self.defaultDestination(args)
f9a3a4f7 4175
f2606b17 4176 print("Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination))
38200076 4177
c3bf3f13
KG
4178 if not os.path.exists(self.cloneDestination):
4179 os.makedirs(self.cloneDestination)
053fd0c1 4180 chdir(self.cloneDestination)
38200076
PW
4181
4182 init_cmd = [ "git", "init" ]
4183 if self.cloneBare:
4184 init_cmd.append("--bare")
a235e85c
BC
4185 retcode = subprocess.call(init_cmd)
4186 if retcode:
4187 raise CalledProcessError(retcode, init_cmd)
38200076 4188
6326aa58 4189 if not P4Sync.run(self, depotPaths):
f9a3a4f7 4190 return False
c595956d
PW
4191
4192 # create a master branch and check out a work tree
4193 if gitBranchExists(self.branch):
1b09d191 4194 system([ "git", "branch", currentGitBranch(), self.branch ])
c595956d
PW
4195 if not self.cloneBare:
4196 system([ "git", "checkout", "-f" ])
4197 else:
f2606b17
LD
4198 print('Not checking out any branch, use ' \
4199 '"git checkout -q -b master <branch>"')
86dff6b6 4200
a93d33ee
PW
4201 # auto-set this variable if invoked with --use-client-spec
4202 if self.useClientSpec_from_options:
4203 system("git config --bool git-p4.useclientspec true")
4204
f9a3a4f7
SH
4205 return True
4206
123f6317
LD
4207class P4Unshelve(Command):
4208 def __init__(self):
4209 Command.__init__(self)
4210 self.options = []
4211 self.origin = "HEAD"
4212 self.description = "Unshelve a P4 changelist into a git commit"
4213 self.usage = "usage: %prog [options] changelist"
4214 self.options += [
4215 optparse.make_option("--origin", dest="origin",
4216 help="Use this base revision instead of the default (%s)" % self.origin),
4217 ]
4218 self.verbose = False
4219 self.noCommit = False
08813127 4220 self.destbranch = "refs/remotes/p4-unshelved"
123f6317
LD
4221
4222 def renameBranch(self, branch_name):
4223 """ Rename the existing branch to branch_name.N
4224 """
4225
4226 found = True
4227 for i in range(0,1000):
4228 backup_branch_name = "{0}.{1}".format(branch_name, i)
4229 if not gitBranchExists(backup_branch_name):
4230 gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
4231 gitDeleteRef(branch_name)
4232 found = True
4233 print("renamed old unshelve branch to {0}".format(backup_branch_name))
4234 break
4235
4236 if not found:
4237 sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
4238
4239 def findLastP4Revision(self, starting_point):
4240 """ Look back from starting_point for the first commit created by git-p4
4241 to find the P4 commit we are based on, and the depot-paths.
4242 """
4243
4244 for parent in (range(65535)):
0acbf599 4245 log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
123f6317 4246 settings = extractSettingsGitLog(log)
dba1c9d9 4247 if 'change' in settings:
123f6317
LD
4248 return settings
4249
4250 sys.exit("could not find git-p4 commits in {0}".format(self.origin))
4251
89143ac2
LD
4252 def createShelveParent(self, change, branch_name, sync, origin):
4253 """ Create a commit matching the parent of the shelved changelist 'change'
4254 """
4255 parent_description = p4_describe(change, shelved=True)
4256 parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change)
4257 files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change)
4258
4259 parent_files = []
4260 for f in files:
4261 # if it was added in the shelved changelist, it won't exist in the parent
4262 if f['action'] in self.add_actions:
4263 continue
4264
4265 # if it was deleted in the shelved changelist it must not be deleted
4266 # in the parent - we might even need to create it if the origin branch
4267 # does not have it
4268 if f['action'] in self.delete_actions:
4269 f['action'] = 'add'
4270
4271 parent_files.append(f)
4272
4273 sync.commit(parent_description, parent_files, branch_name,
4274 parent=origin, allow_empty=True)
4275 print("created parent commit for {0} based on {1} in {2}".format(
4276 change, self.origin, branch_name))
4277
123f6317
LD
4278 def run(self, args):
4279 if len(args) != 1:
4280 return False
4281
4282 if not gitBranchExists(self.origin):
4283 sys.exit("origin branch {0} does not exist".format(self.origin))
4284
4285 sync = P4Sync()
4286 changes = args
123f6317 4287
89143ac2 4288 # only one change at a time
123f6317
LD
4289 change = changes[0]
4290
4291 # if the target branch already exists, rename it
4292 branch_name = "{0}/{1}".format(self.destbranch, change)
4293 if gitBranchExists(branch_name):
4294 self.renameBranch(branch_name)
4295 sync.branch = branch_name
4296
4297 sync.verbose = self.verbose
4298 sync.suppress_meta_comment = True
4299
4300 settings = self.findLastP4Revision(self.origin)
123f6317
LD
4301 sync.depotPaths = settings['depot-paths']
4302 sync.branchPrefixes = sync.depotPaths
4303
4304 sync.openStreams()
4305 sync.loadUserMapFromCache()
4306 sync.silent = True
89143ac2
LD
4307
4308 # create a commit for the parent of the shelved changelist
4309 self.createShelveParent(change, branch_name, sync, self.origin)
4310
4311 # create the commit for the shelved changelist itself
4312 description = p4_describe(change, True)
4313 files = sync.extractFilesFromCommit(description, True, change)
4314
4315 sync.commit(description, files, branch_name, "")
123f6317
LD
4316 sync.closeStreams()
4317
4318 print("unshelved changelist {0} into {1}".format(change, branch_name))
4319
4320 return True
4321
09d89de2
SH
4322class P4Branches(Command):
4323 def __init__(self):
4324 Command.__init__(self)
4325 self.options = [ ]
4326 self.description = ("Shows the git branches that hold imports and their "
4327 + "corresponding perforce depot paths")
4328 self.verbose = False
4329
4330 def run(self, args):
5ca44617
SH
4331 if originP4BranchesExist():
4332 createOrUpdateBranchesFromOrigin()
4333
09d89de2
SH
4334 cmdline = "git rev-parse --symbolic "
4335 cmdline += " --remotes"
4336
4337 for line in read_pipe_lines(cmdline):
4338 line = line.strip()
4339
4340 if not line.startswith('p4/') or line == "p4/HEAD":
4341 continue
4342 branch = line
4343
4344 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
4345 settings = extractSettingsGitLog(log)
4346
f2606b17 4347 print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]))
09d89de2
SH
4348 return True
4349
b984733c
SH
4350class HelpFormatter(optparse.IndentedHelpFormatter):
4351 def __init__(self):
4352 optparse.IndentedHelpFormatter.__init__(self)
4353
4354 def format_description(self, description):
4355 if description:
4356 return description + "\n"
4357 else:
4358 return ""
4f5cf76a 4359
86949eef 4360def printUsage(commands):
f2606b17
LD
4361 print("usage: %s <command> [options]" % sys.argv[0])
4362 print("")
4363 print("valid commands: %s" % ", ".join(commands))
4364 print("")
4365 print("Try %s <command> --help for command specific help." % sys.argv[0])
4366 print("")
86949eef
SH
4367
4368commands = {
b86f7378
HWN
4369 "debug" : P4Debug,
4370 "submit" : P4Submit,
a9834f58 4371 "commit" : P4Submit,
b86f7378
HWN
4372 "sync" : P4Sync,
4373 "rebase" : P4Rebase,
4374 "clone" : P4Clone,
09d89de2 4375 "rollback" : P4RollBack,
123f6317
LD
4376 "branches" : P4Branches,
4377 "unshelve" : P4Unshelve,
86949eef
SH
4378}
4379
bb6e09b2
HWN
4380def main():
4381 if len(sys.argv[1:]) == 0:
4382 printUsage(commands.keys())
4383 sys.exit(2)
4f5cf76a 4384
bb6e09b2
HWN
4385 cmdName = sys.argv[1]
4386 try:
b86f7378
HWN
4387 klass = commands[cmdName]
4388 cmd = klass()
bb6e09b2 4389 except KeyError:
f2606b17
LD
4390 print("unknown command %s" % cmdName)
4391 print("")
bb6e09b2
HWN
4392 printUsage(commands.keys())
4393 sys.exit(2)
4394
4395 options = cmd.options
b86f7378 4396 cmd.gitdir = os.environ.get("GIT_DIR", None)
bb6e09b2
HWN
4397
4398 args = sys.argv[2:]
4399
b0ccc80d 4400 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
6a10b6aa
LD
4401 if cmd.needsGit:
4402 options.append(optparse.make_option("--git-dir", dest="gitdir"))
bb6e09b2 4403
6a10b6aa
LD
4404 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
4405 options,
4406 description = cmd.description,
4407 formatter = HelpFormatter())
bb6e09b2 4408
608e3805
BK
4409 try:
4410 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
4411 except:
4412 parser.print_help()
4413 raise
4414
bb6e09b2
HWN
4415 global verbose
4416 verbose = cmd.verbose
4417 if cmd.needsGit:
b86f7378
HWN
4418 if cmd.gitdir == None:
4419 cmd.gitdir = os.path.abspath(".git")
4420 if not isValidGitDir(cmd.gitdir):
378f7be1 4421 # "rev-parse --git-dir" without arguments will try $PWD/.git
b86f7378
HWN
4422 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
4423 if os.path.exists(cmd.gitdir):
bb6e09b2
HWN
4424 cdup = read_pipe("git rev-parse --show-cdup").strip()
4425 if len(cdup) > 0:
053fd0c1 4426 chdir(cdup);
e20a9e53 4427
b86f7378
HWN
4428 if not isValidGitDir(cmd.gitdir):
4429 if isValidGitDir(cmd.gitdir + "/.git"):
4430 cmd.gitdir += "/.git"
bb6e09b2 4431 else:
b86f7378 4432 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
e20a9e53 4433
378f7be1 4434 # so git commands invoked from the P4 workspace will succeed
b86f7378 4435 os.environ["GIT_DIR"] = cmd.gitdir
86949eef 4436
bb6e09b2
HWN
4437 if not cmd.run(args):
4438 parser.print_help()
09fca77b 4439 sys.exit(2)
4f5cf76a 4440
4f5cf76a 4441
bb6e09b2
HWN
4442if __name__ == '__main__':
4443 main()