]> git.ipfire.org Git - thirdparty/git.git/blame - git-p4.py
Merge branch 'js/t1450-making-it-writable-does-not-need-full-posixperm'
[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
3ea2cfd4 1544class P4Submit(Command, P4UserMap):
6bbfd137
PW
1545
1546 conflict_behavior_choices = ("ask", "skip", "quit")
1547
4f5cf76a 1548 def __init__(self):
b984733c 1549 Command.__init__(self)
3ea2cfd4 1550 P4UserMap.__init__(self)
4f5cf76a 1551 self.options = [
4f5cf76a 1552 optparse.make_option("--origin", dest="origin"),
ae901090 1553 optparse.make_option("-M", dest="detectRenames", action="store_true"),
3ea2cfd4
LD
1554 # preserve the user, requires relevant p4 permissions
1555 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
06804c76 1556 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
ef739f08 1557 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
728b7ad8 1558 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
6bbfd137 1559 optparse.make_option("--conflict", dest="conflict_behavior",
44e8d26c
PW
1560 choices=self.conflict_behavior_choices),
1561 optparse.make_option("--branch", dest="branch"),
b34fa577
VK
1562 optparse.make_option("--shelve", dest="shelve", action="store_true",
1563 help="Shelve instead of submit. Shelved files are reverted, "
1564 "restoring the workspace to the state before the shelve"),
8cf422db 1565 optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int",
46c609e9 1566 metavar="CHANGELIST",
8cf422db 1567 help="update an existing shelved changelist, implies --shelve, "
f55b87c1
RM
1568 "repeat in-order for multiple shelved changelists"),
1569 optparse.make_option("--commit", dest="commit", metavar="COMMIT",
1570 help="submit only the specified commit(s), one commit or xxx..xxx"),
1571 optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true",
1572 help="Disable rebase after submit is completed. Can be useful if you "
b9d34db9
LD
1573 "work from a local git branch that is not master"),
1574 optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true",
1575 help="Skip Perforce sync of p4/master after submit or shelve"),
4935c458 1576 optparse.make_option("--no-verify", dest="no_verify", action="store_true",
38ecf752 1577 help="Bypass p4-pre-submit and p4-changelist hooks"),
4f5cf76a 1578 ]
251c8c50 1579 self.description = """Submit changes from git to the perforce depot.\n
4935c458
BK
1580 The `p4-pre-submit` hook is executed if it exists and is executable. It
1581 can be bypassed with the `--no-verify` command line option. The hook takes
1582 no parameters and nothing from standard input. Exiting with a non-zero status
1583 from this script prevents `git-p4 submit` from launching.
251c8c50 1584
4935c458 1585 One usage scenario is to run unit tests in the hook.
38ecf752
BK
1586
1587 The `p4-prepare-changelist` hook is executed right after preparing the default
1588 changelist message and before the editor is started. It takes one parameter,
1589 the name of the file that contains the changelist text. Exiting with a non-zero
1590 status from the script will abort the process.
1591
1592 The purpose of the hook is to edit the message file in place, and it is not
1593 supressed by the `--no-verify` option. This hook is called even if
1594 `--prepare-p4-only` is set.
1595
1596 The `p4-changelist` hook is executed after the changelist message has been
1597 edited by the user. It can be bypassed with the `--no-verify` option. It
1598 takes a single parameter, the name of the file that holds the proposed
1599 changelist text. Exiting with a non-zero status causes the command to abort.
1600
1601 The hook is allowed to edit the changelist file and can be used to normalize
1602 the text into some project standard format. It can also be used to refuse the
1603 Submit after inspect the message file.
1604
1605 The `p4-post-changelist` hook is invoked after the submit has successfully
b7e20b43 1606 occurred in P4. It takes no parameters and is meant primarily for notification
38ecf752 1607 and cannot affect the outcome of the git p4 submit action.
4935c458 1608 """
251c8c50 1609
c9b50e63 1610 self.usage += " [name of git branch to submit into perforce depot]"
9512497b 1611 self.origin = ""
ae901090 1612 self.detectRenames = False
0d609032 1613 self.preserveUser = gitConfigBool("git-p4.preserveUser")
ef739f08 1614 self.dry_run = False
b34fa577 1615 self.shelve = False
8cf422db 1616 self.update_shelve = list()
f55b87c1 1617 self.commit = ""
3b3477ea 1618 self.disable_rebase = gitConfigBool("git-p4.disableRebase")
b9d34db9 1619 self.disable_p4sync = gitConfigBool("git-p4.disableP4Sync")
728b7ad8 1620 self.prepare_p4_only = False
6bbfd137 1621 self.conflict_behavior = None
f7baba8b 1622 self.isWindows = (platform.system() == "Windows")
06804c76 1623 self.exportLabels = False
249da4c0 1624 self.p4HasMoveCommand = p4_has_move_command()
44e8d26c 1625 self.branch = None
4935c458 1626 self.no_verify = False
4f5cf76a 1627
a5db4b12
LS
1628 if gitConfig('git-p4.largeFileSystem'):
1629 die("Large file system not supported for git-p4 submit command. Please remove it from config.")
1630
4f5cf76a
SH
1631 def check(self):
1632 if len(p4CmdList("opened ...")) > 0:
1633 die("You have files opened with perforce! Close them before starting the sync.")
1634
f19cb0a0
PW
1635 def separate_jobs_from_description(self, message):
1636 """Extract and return a possible Jobs field in the commit
1637 message. It goes into a separate section in the p4 change
1638 specification.
1639
1640 A jobs line starts with "Jobs:" and looks like a new field
1641 in a form. Values are white-space separated on the same
1642 line or on following lines that start with a tab.
1643
1644 This does not parse and extract the full git commit message
1645 like a p4 form. It just sees the Jobs: line as a marker
1646 to pass everything from then on directly into the p4 form,
1647 but outside the description section.
1648
1649 Return a tuple (stripped log message, jobs string)."""
1650
1651 m = re.search(r'^Jobs:', message, re.MULTILINE)
1652 if m is None:
1653 return (message, None)
1654
1655 jobtext = message[m.start():]
1656 stripped_message = message[:m.start()].rstrip()
1657 return (stripped_message, jobtext)
1658
1659 def prepareLogMessage(self, template, message, jobs):
1660 """Edits the template returned from "p4 change -o" to insert
1661 the message in the Description field, and the jobs text in
1662 the Jobs field."""
4f5cf76a
SH
1663 result = ""
1664
edae1e2f
SH
1665 inDescriptionSection = False
1666
4f5cf76a
SH
1667 for line in template.split("\n"):
1668 if line.startswith("#"):
1669 result += line + "\n"
1670 continue
1671
edae1e2f 1672 if inDescriptionSection:
c9dbab04 1673 if line.startswith("Files:") or line.startswith("Jobs:"):
edae1e2f 1674 inDescriptionSection = False
f19cb0a0
PW
1675 # insert Jobs section
1676 if jobs:
1677 result += jobs + "\n"
edae1e2f
SH
1678 else:
1679 continue
1680 else:
1681 if line.startswith("Description:"):
1682 inDescriptionSection = True
1683 line += "\n"
1684 for messageLine in message.split("\n"):
1685 line += "\t" + messageLine + "\n"
1686
1687 result += line + "\n"
4f5cf76a
SH
1688
1689 return result
1690
e665e98e
JH
1691 def patchRCSKeywords(self, file, regexp):
1692 # Attempt to zap the RCS keywords in a p4 controlled file matching the given regex
60df071c
LD
1693 (handle, outFileName) = tempfile.mkstemp(dir='.')
1694 try:
70c0d553 1695 with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
8618d322 1696 for line in inFile.readlines():
70c0d553 1697 outFile.write(regexp.sub(br'$\1$', line))
60df071c
LD
1698 # Forcibly overwrite the original file
1699 os.unlink(file)
1700 shutil.move(outFileName, file)
1701 except:
1702 # cleanup our temporary file
1703 os.unlink(outFileName)
f2606b17 1704 print("Failed to strip RCS keywords in %s" % file)
60df071c
LD
1705 raise
1706
f2606b17 1707 print("Patched up RCS keywords in %s" % file)
60df071c 1708
3ea2cfd4
LD
1709 def p4UserForCommit(self,id):
1710 # Return the tuple (perforce user,git email) for a given git commit id
1711 self.getUserMapFromPerforceServer()
9bf28855
PW
1712 gitEmail = read_pipe(["git", "log", "--max-count=1",
1713 "--format=%ae", id])
3ea2cfd4 1714 gitEmail = gitEmail.strip()
dba1c9d9 1715 if gitEmail not in self.emails:
3ea2cfd4
LD
1716 return (None,gitEmail)
1717 else:
1718 return (self.emails[gitEmail],gitEmail)
1719
1720 def checkValidP4Users(self,commits):
1721 # check if any git authors cannot be mapped to p4 users
1722 for id in commits:
1723 (user,email) = self.p4UserForCommit(id)
1724 if not user:
1725 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
0d609032 1726 if gitConfigBool("git-p4.allowMissingP4Users"):
f2606b17 1727 print("%s" % msg)
3ea2cfd4
LD
1728 else:
1729 die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
1730
1731 def lastP4Changelist(self):
1732 # Get back the last changelist number submitted in this client spec. This
1733 # then gets used to patch up the username in the change. If the same
1734 # client spec is being used by multiple processes then this might go
1735 # wrong.
1736 results = p4CmdList("client -o") # find the current client
1737 client = None
1738 for r in results:
dba1c9d9 1739 if 'Client' in r:
3ea2cfd4
LD
1740 client = r['Client']
1741 break
1742 if not client:
1743 die("could not get client spec")
6de040df 1744 results = p4CmdList(["changes", "-c", client, "-m", "1"])
3ea2cfd4 1745 for r in results:
dba1c9d9 1746 if 'change' in r:
3ea2cfd4
LD
1747 return r['change']
1748 die("Could not get changelist number for last submit - cannot patch up user details")
1749
1750 def modifyChangelistUser(self, changelist, newUser):
1751 # fixup the user field of a changelist after it has been submitted.
1752 changes = p4CmdList("change -o %s" % changelist)
ecdba36d
LD
1753 if len(changes) != 1:
1754 die("Bad output from p4 change modifying %s to user %s" %
1755 (changelist, newUser))
1756
1757 c = changes[0]
1758 if c['User'] == newUser: return # nothing to do
1759 c['User'] = newUser
50da1e73
YZ
1760 # p4 does not understand format version 3 and above
1761 input = marshal.dumps(c, 2)
ecdba36d 1762
3ea2cfd4
LD
1763 result = p4CmdList("change -f -i", stdin=input)
1764 for r in result:
dba1c9d9 1765 if 'code' in r:
3ea2cfd4
LD
1766 if r['code'] == 'error':
1767 die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
dba1c9d9 1768 if 'data' in r:
3ea2cfd4
LD
1769 print("Updated user field for changelist %s to %s" % (changelist, newUser))
1770 return
1771 die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
1772
1773 def canChangeChangelists(self):
1774 # check to see if we have p4 admin or super-user permissions, either of
1775 # which are required to modify changelists.
52a4880b 1776 results = p4CmdList(["protects", self.depotPath])
3ea2cfd4 1777 for r in results:
dba1c9d9 1778 if 'perm' in r:
3ea2cfd4
LD
1779 if r['perm'] == 'admin':
1780 return 1
1781 if r['perm'] == 'super':
1782 return 1
1783 return 0
1784
46c609e9 1785 def prepareSubmitTemplate(self, changelist=None):
f19cb0a0
PW
1786 """Run "p4 change -o" to grab a change specification template.
1787 This does not use "p4 -G", as it is nice to keep the submission
1788 template in original order, since a human might edit it.
1789
1790 Remove lines in the Files section that show changes to files
1791 outside the depot path we're committing into."""
1792
cbc69242
SH
1793 [upstream, settings] = findUpstreamBranchPoint()
1794
b596b3b9
MT
1795 template = """\
1796# A Perforce Change Specification.
1797#
1798# Change: The change number. 'new' on a new changelist.
1799# Date: The date this specification was last modified.
1800# Client: The client on which the changelist was created. Read-only.
1801# User: The user who created the changelist.
1802# Status: Either 'pending' or 'submitted'. Read-only.
1803# Type: Either 'public' or 'restricted'. Default is 'public'.
1804# Description: Comments about the changelist. Required.
1805# Jobs: What opened jobs are to be closed by this changelist.
1806# You may delete jobs from this list. (New changelists only.)
1807# Files: What opened files from the default changelist are to be added
1808# to this changelist. You may delete files from this list.
1809# (New changelists only.)
1810"""
1811 files_list = []
ea99c3ae 1812 inFilesSection = False
b596b3b9 1813 change_entry = None
46c609e9
LD
1814 args = ['change', '-o']
1815 if changelist:
1816 args.append(str(changelist))
b596b3b9 1817 for entry in p4CmdList(args):
dba1c9d9 1818 if 'code' not in entry:
b596b3b9
MT
1819 continue
1820 if entry['code'] == 'stat':
1821 change_entry = entry
1822 break
1823 if not change_entry:
1824 die('Failed to decode output of p4 change -o')
2e2aa8d9 1825 for key, value in change_entry.items():
b596b3b9 1826 if key.startswith('File'):
dba1c9d9 1827 if 'depot-paths' in settings:
b596b3b9
MT
1828 if not [p for p in settings['depot-paths']
1829 if p4PathStartsWith(value, p)]:
1830 continue
ea99c3ae 1831 else:
b596b3b9
MT
1832 if not p4PathStartsWith(value, self.depotPath):
1833 continue
1834 files_list.append(value)
1835 continue
1836 # Output in the order expected by prepareLogMessage
1837 for key in ['Change', 'Client', 'User', 'Status', 'Description', 'Jobs']:
dba1c9d9 1838 if key not in change_entry:
b596b3b9
MT
1839 continue
1840 template += '\n'
1841 template += key + ':'
1842 if key == 'Description':
1843 template += '\n'
1844 for field_line in change_entry[key].splitlines():
1845 template += '\t'+field_line+'\n'
1846 if len(files_list) > 0:
1847 template += '\n'
1848 template += 'Files:\n'
1849 for path in files_list:
1850 template += '\t'+path+'\n'
ea99c3ae
SH
1851 return template
1852
7c766e57
PW
1853 def edit_template(self, template_file):
1854 """Invoke the editor to let the user change the submission
1855 message. Return true if okay to continue with the submit."""
1856
1857 # if configured to skip the editing part, just submit
0d609032 1858 if gitConfigBool("git-p4.skipSubmitEdit"):
7c766e57
PW
1859 return True
1860
1861 # look at the modification time, to check later if the user saved
1862 # the file
1863 mtime = os.stat(template_file).st_mtime
1864
1865 # invoke the editor
dba1c9d9 1866 if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""):
7c766e57
PW
1867 editor = os.environ.get("P4EDITOR")
1868 else:
1869 editor = read_pipe("git var GIT_EDITOR").strip()
2dade7a7 1870 system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
7c766e57
PW
1871
1872 # If the file was not saved, prompt to see if this patch should
1873 # be skipped. But skip this verification step if configured so.
0d609032 1874 if gitConfigBool("git-p4.skipSubmitEditCheck"):
7c766e57
PW
1875 return True
1876
d1652049
PW
1877 # modification time updated means user saved the file
1878 if os.stat(template_file).st_mtime > mtime:
1879 return True
1880
e2aed5fd
BK
1881 response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
1882 if response == 'y':
1883 return True
1884 if response == 'n':
1885 return False
7c766e57 1886
df8a9e86 1887 def get_diff_description(self, editedFiles, filesToAdd, symlinks):
b4073bb3 1888 # diff
dba1c9d9 1889 if "P4DIFF" in os.environ:
b4073bb3
MC
1890 del(os.environ["P4DIFF"])
1891 diff = ""
1892 for editedFile in editedFiles:
1893 diff += p4_read_pipe(['diff', '-du',
1894 wildcard_encode(editedFile)])
1895
1896 # new file diff
1897 newdiff = ""
1898 for newFile in filesToAdd:
1899 newdiff += "==== new file ====\n"
1900 newdiff += "--- /dev/null\n"
1901 newdiff += "+++ %s\n" % newFile
df8a9e86
LD
1902
1903 is_link = os.path.islink(newFile)
1904 expect_link = newFile in symlinks
1905
1906 if is_link and expect_link:
1907 newdiff += "+%s\n" % os.readlink(newFile)
1908 else:
1909 f = open(newFile, "r")
54662d59 1910 try:
1911 for line in f.readlines():
1912 newdiff += "+" + line
1913 except UnicodeDecodeError:
1914 pass # Found non-text data and skip, since diff description should only include text
df8a9e86 1915 f.close()
b4073bb3 1916
e2a892ee 1917 return (diff + newdiff).replace('\r\n', '\n')
b4073bb3 1918
7cb5cbef 1919 def applyCommit(self, id):
67b0fe2e
PW
1920 """Apply one commit, return True if it succeeded."""
1921
f2606b17
LD
1922 print("Applying", read_pipe(["git", "show", "-s",
1923 "--format=format:%h %s", id]))
ae901090 1924
848de9c3 1925 (p4User, gitEmail) = self.p4UserForCommit(id)
3ea2cfd4 1926
84cb0003 1927 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
4f5cf76a 1928 filesToAdd = set()
a02b8bc4 1929 filesToChangeType = set()
4f5cf76a 1930 filesToDelete = set()
d336c158 1931 editedFiles = set()
b6ad6dcc 1932 pureRenameCopy = set()
df8a9e86 1933 symlinks = set()
c65b670e 1934 filesToChangeExecBit = {}
46c609e9 1935 all_files = list()
60df071c 1936
4f5cf76a 1937 for line in diff:
b43b0a3c
CP
1938 diff = parseDiffTreeEntry(line)
1939 modifier = diff['status']
1940 path = diff['src']
46c609e9
LD
1941 all_files.append(path)
1942
4f5cf76a 1943 if modifier == "M":
6de040df 1944 p4_edit(path)
c65b670e
CP
1945 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1946 filesToChangeExecBit[path] = diff['dst_mode']
d336c158 1947 editedFiles.add(path)
4f5cf76a
SH
1948 elif modifier == "A":
1949 filesToAdd.add(path)
c65b670e 1950 filesToChangeExecBit[path] = diff['dst_mode']
4f5cf76a
SH
1951 if path in filesToDelete:
1952 filesToDelete.remove(path)
df8a9e86
LD
1953
1954 dst_mode = int(diff['dst_mode'], 8)
db2d997e 1955 if dst_mode == 0o120000:
df8a9e86
LD
1956 symlinks.add(path)
1957
4f5cf76a
SH
1958 elif modifier == "D":
1959 filesToDelete.add(path)
1960 if path in filesToAdd:
1961 filesToAdd.remove(path)
4fddb41b
VA
1962 elif modifier == "C":
1963 src, dest = diff['src'], diff['dst']
7a10946a 1964 all_files.append(dest)
6de040df 1965 p4_integrate(src, dest)
b6ad6dcc 1966 pureRenameCopy.add(dest)
4fddb41b 1967 if diff['src_sha1'] != diff['dst_sha1']:
6de040df 1968 p4_edit(dest)
b6ad6dcc 1969 pureRenameCopy.discard(dest)
4fddb41b 1970 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
6de040df 1971 p4_edit(dest)
b6ad6dcc 1972 pureRenameCopy.discard(dest)
4fddb41b 1973 filesToChangeExecBit[dest] = diff['dst_mode']
d20f0f8e
PW
1974 if self.isWindows:
1975 # turn off read-only attribute
1976 os.chmod(dest, stat.S_IWRITE)
4fddb41b
VA
1977 os.unlink(dest)
1978 editedFiles.add(dest)
d9a5f25b 1979 elif modifier == "R":
b43b0a3c 1980 src, dest = diff['src'], diff['dst']
7a10946a 1981 all_files.append(dest)
8e9497c2
GG
1982 if self.p4HasMoveCommand:
1983 p4_edit(src) # src must be open before move
1984 p4_move(src, dest) # opens for (move/delete, move/add)
b6ad6dcc 1985 else:
8e9497c2
GG
1986 p4_integrate(src, dest)
1987 if diff['src_sha1'] != diff['dst_sha1']:
1988 p4_edit(dest)
1989 else:
1990 pureRenameCopy.add(dest)
c65b670e 1991 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
8e9497c2
GG
1992 if not self.p4HasMoveCommand:
1993 p4_edit(dest) # with move: already open, writable
c65b670e 1994 filesToChangeExecBit[dest] = diff['dst_mode']
8e9497c2 1995 if not self.p4HasMoveCommand:
d20f0f8e
PW
1996 if self.isWindows:
1997 os.chmod(dest, stat.S_IWRITE)
8e9497c2
GG
1998 os.unlink(dest)
1999 filesToDelete.add(src)
d9a5f25b 2000 editedFiles.add(dest)
a02b8bc4
RP
2001 elif modifier == "T":
2002 filesToChangeType.add(path)
4f5cf76a
SH
2003 else:
2004 die("unknown modifier %s for %s" % (modifier, path))
2005
749b668c 2006 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
47a130b7 2007 patchcmd = diffcmd + " | git apply "
c1b296b9
SH
2008 tryPatchCmd = patchcmd + "--check -"
2009 applyPatchCmd = patchcmd + "--check --apply -"
60df071c 2010 patch_succeeded = True
51a2640a 2011
1ec4a0a3
BK
2012 if verbose:
2013 print("TryPatch: %s" % tryPatchCmd)
2014
47a130b7 2015 if os.system(tryPatchCmd) != 0:
60df071c
LD
2016 fixed_rcs_keywords = False
2017 patch_succeeded = False
f2606b17 2018 print("Unfortunately applying the change failed!")
60df071c
LD
2019
2020 # Patch failed, maybe it's just RCS keyword woes. Look through
2021 # the patch to see if that's possible.
0d609032 2022 if gitConfigBool("git-p4.attemptRCSCleanup"):
60df071c 2023 file = None
60df071c
LD
2024 kwfiles = {}
2025 for file in editedFiles | filesToDelete:
2026 # did this file's delta contain RCS keywords?
e665e98e
JH
2027 regexp = p4_keywords_regexp_for_file(file)
2028 if regexp:
60df071c 2029 # this file is a possibility...look for RCS keywords.
70c0d553
JH
2030 for line in read_pipe_lines(
2031 ["git", "diff", "%s^..%s" % (id, id), file],
2032 raw=True):
60df071c
LD
2033 if regexp.search(line):
2034 if verbose:
e665e98e
JH
2035 print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
2036 kwfiles[file] = regexp
60df071c
LD
2037 break
2038
e665e98e 2039 for file, regexp in kwfiles.items():
60df071c 2040 if verbose:
e665e98e 2041 print("zapping %s with %s" % (line, regexp.pattern))
d20f0f8e
PW
2042 # File is being deleted, so not open in p4. Must
2043 # disable the read-only bit on windows.
2044 if self.isWindows and file not in editedFiles:
2045 os.chmod(file, stat.S_IWRITE)
60df071c
LD
2046 self.patchRCSKeywords(file, kwfiles[file])
2047 fixed_rcs_keywords = True
2048
2049 if fixed_rcs_keywords:
f2606b17 2050 print("Retrying the patch with RCS keywords cleaned up")
60df071c
LD
2051 if os.system(tryPatchCmd) == 0:
2052 patch_succeeded = True
1ec4a0a3 2053 print("Patch succeesed this time with RCS keywords cleaned")
60df071c
LD
2054
2055 if not patch_succeeded:
7e5dd9f2
PW
2056 for f in editedFiles:
2057 p4_revert(f)
7e5dd9f2 2058 return False
51a2640a 2059
55ac2ed6
PW
2060 #
2061 # Apply the patch for real, and do add/delete/+x handling.
2062 #
47a130b7 2063 system(applyPatchCmd)
4f5cf76a 2064
a02b8bc4
RP
2065 for f in filesToChangeType:
2066 p4_edit(f, "-t", "auto")
4f5cf76a 2067 for f in filesToAdd:
6de040df 2068 p4_add(f)
4f5cf76a 2069 for f in filesToDelete:
6de040df
LD
2070 p4_revert(f)
2071 p4_delete(f)
4f5cf76a 2072
c65b670e
CP
2073 # Set/clear executable bits
2074 for f in filesToChangeExecBit.keys():
2075 mode = filesToChangeExecBit[f]
2076 setP4ExecBit(f, mode)
2077
8cf422db
LD
2078 update_shelve = 0
2079 if len(self.update_shelve) > 0:
2080 update_shelve = self.update_shelve.pop(0)
2081 p4_reopen_in_change(update_shelve, all_files)
46c609e9 2082
55ac2ed6
PW
2083 #
2084 # Build p4 change description, starting with the contents
2085 # of the git commit message.
2086 #
0e36f2d7 2087 logMessage = extractLogMessageFromGitCommit(id)
0e36f2d7 2088 logMessage = logMessage.strip()
f19cb0a0 2089 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
4f5cf76a 2090
8cf422db 2091 template = self.prepareSubmitTemplate(update_shelve)
f19cb0a0 2092 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
ecdba36d 2093
c47178d4 2094 if self.preserveUser:
55ac2ed6 2095 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
c47178d4 2096
55ac2ed6
PW
2097 if self.checkAuthorship and not self.p4UserIsMe(p4User):
2098 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
2099 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
2100 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
c47178d4 2101
55ac2ed6 2102 separatorLine = "######## everything below this line is just the diff #######\n"
b4073bb3
MC
2103 if not self.prepare_p4_only:
2104 submitTemplate += separatorLine
df8a9e86 2105 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
55ac2ed6 2106
c47178d4 2107 (handle, fileName) = tempfile.mkstemp()
e2a892ee 2108 tmpFile = os.fdopen(handle, "w+b")
c47178d4
PW
2109 if self.isWindows:
2110 submitTemplate = submitTemplate.replace("\n", "\r\n")
6cec21a8 2111 tmpFile.write(encode_text_stream(submitTemplate))
c47178d4
PW
2112 tmpFile.close()
2113
b7638fed 2114 submitted = False
cdc7e388 2115
b7638fed 2116 try:
38ecf752
BK
2117 # Allow the hook to edit the changelist text before presenting it
2118 # to the user.
2119 if not run_git_hook("p4-prepare-changelist", [fileName]):
2120 return False
cd1e0dc4
BK
2121
2122 if self.prepare_p4_only:
2123 #
2124 # Leave the p4 tree prepared, and the submit template around
2125 # and let the user decide what to do next
2126 #
2127 submitted = True
2128 print("")
2129 print("P4 workspace prepared for submission.")
2130 print("To submit or revert, go to client workspace")
2131 print(" " + self.clientPath)
2132 print("")
2133 print("To submit, use \"p4 submit\" to write a new description,")
2134 print("or \"p4 submit -i <%s\" to use the one prepared by" \
2135 " \"git p4\"." % fileName)
2136 print("You can delete the file \"%s\" when finished." % fileName)
2137
2138 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
2139 print("To preserve change ownership by user %s, you must\n" \
2140 "do \"p4 change -f <change>\" after submitting and\n" \
2141 "edit the User field.")
2142 if pureRenameCopy:
2143 print("After submitting, renamed files must be re-synced.")
2144 print("Invoke \"p4 sync -f\" on each of these files:")
2145 for f in pureRenameCopy:
2146 print(" " + f)
2147
2148 print("")
2149 print("To revert the changes, use \"p4 revert ...\", and delete")
2150 print("the submit template file \"%s\"" % fileName)
2151 if filesToAdd:
2152 print("Since the commit adds new files, they must be deleted:")
2153 for f in filesToAdd:
2154 print(" " + f)
2155 print("")
2156 sys.stdout.flush()
2157 return True
2158
b7638fed 2159 if self.edit_template(fileName):
38ecf752
BK
2160 if not self.no_verify:
2161 if not run_git_hook("p4-changelist", [fileName]):
2162 print("The p4-changelist hook failed.")
2163 sys.stdout.flush()
2164 return False
2165
b7638fed
GE
2166 # read the edited message and submit
2167 tmpFile = open(fileName, "rb")
6cec21a8 2168 message = decode_text_stream(tmpFile.read())
b7638fed
GE
2169 tmpFile.close()
2170 if self.isWindows:
2171 message = message.replace("\r\n", "\n")
cd1e0dc4
BK
2172 if message.find(separatorLine) != -1:
2173 submitTemplate = message[:message.index(separatorLine)]
2174 else:
2175 submitTemplate = message
2176
2177 if len(submitTemplate.strip()) == 0:
2178 print("Changelist is empty, aborting this changelist.")
2179 sys.stdout.flush()
2180 return False
46c609e9 2181
8cf422db 2182 if update_shelve:
46c609e9
LD
2183 p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
2184 elif self.shelve:
b34fa577
VK
2185 p4_write_pipe(['shelve', '-i'], submitTemplate)
2186 else:
2187 p4_write_pipe(['submit', '-i'], submitTemplate)
2188 # The rename/copy happened by applying a patch that created a
2189 # new file. This leaves it writable, which confuses p4.
2190 for f in pureRenameCopy:
2191 p4_sync(f, "-f")
b7638fed
GE
2192
2193 if self.preserveUser:
2194 if p4User:
2195 # Get last changelist number. Cannot easily get it from
2196 # the submit command output as the output is
2197 # unmarshalled.
2198 changelist = self.lastP4Changelist()
2199 self.modifyChangelistUser(changelist, p4User)
2200
b7638fed
GE
2201 submitted = True
2202
38ecf752 2203 run_git_hook("p4-post-changelist")
b7638fed 2204 finally:
cd1e0dc4 2205 # Revert changes if we skip this patch
b34fa577
VK
2206 if not submitted or self.shelve:
2207 if self.shelve:
2208 print ("Reverting shelved files.")
2209 else:
2210 print ("Submission cancelled, undoing p4 changes.")
cd1e0dc4 2211 sys.stdout.flush()
b34fa577 2212 for f in editedFiles | filesToDelete:
b7638fed
GE
2213 p4_revert(f)
2214 for f in filesToAdd:
2215 p4_revert(f)
2216 os.remove(f)
c47178d4 2217
cd1e0dc4
BK
2218 if not self.prepare_p4_only:
2219 os.remove(fileName)
b7638fed 2220 return submitted
4f5cf76a 2221
06804c76
LD
2222 # Export git tags as p4 labels. Create a p4 label and then tag
2223 # with that.
2224 def exportGitTags(self, gitTags):
c8942a22
LD
2225 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
2226 if len(validLabelRegexp) == 0:
2227 validLabelRegexp = defaultLabelRegexp
2228 m = re.compile(validLabelRegexp)
06804c76
LD
2229
2230 for name in gitTags:
2231
2232 if not m.match(name):
2233 if verbose:
f2606b17 2234 print("tag %s does not match regexp %s" % (name, validLabelRegexp))
06804c76
LD
2235 continue
2236
2237 # Get the p4 commit this corresponds to
c8942a22
LD
2238 logMessage = extractLogMessageFromGitCommit(name)
2239 values = extractSettingsGitLog(logMessage)
06804c76 2240
dba1c9d9 2241 if 'change' not in values:
06804c76
LD
2242 # a tag pointing to something not sent to p4; ignore
2243 if verbose:
f2606b17 2244 print("git tag %s does not give a p4 commit" % name)
06804c76 2245 continue
c8942a22
LD
2246 else:
2247 changelist = values['change']
06804c76
LD
2248
2249 # Get the tag details.
2250 inHeader = True
2251 isAnnotated = False
2252 body = []
2253 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
2254 l = l.strip()
2255 if inHeader:
2256 if re.match(r'tag\s+', l):
2257 isAnnotated = True
2258 elif re.match(r'\s*$', l):
2259 inHeader = False
2260 continue
2261 else:
2262 body.append(l)
2263
2264 if not isAnnotated:
2265 body = ["lightweight tag imported by git p4\n"]
2266
2267 # Create the label - use the same view as the client spec we are using
2268 clientSpec = getClientSpec()
2269
2270 labelTemplate = "Label: %s\n" % name
2271 labelTemplate += "Description:\n"
2272 for b in body:
2273 labelTemplate += "\t" + b + "\n"
2274 labelTemplate += "View:\n"
9d57c4a6
KS
2275 for depot_side in clientSpec.mappings:
2276 labelTemplate += "\t%s\n" % depot_side
06804c76 2277
ef739f08 2278 if self.dry_run:
f2606b17 2279 print("Would create p4 label %s for tag" % name)
728b7ad8 2280 elif self.prepare_p4_only:
f2606b17
LD
2281 print("Not creating p4 label %s for tag due to option" \
2282 " --prepare-p4-only" % name)
ef739f08
PW
2283 else:
2284 p4_write_pipe(["label", "-i"], labelTemplate)
06804c76 2285
ef739f08
PW
2286 # Use the label
2287 p4_system(["tag", "-l", name] +
9d57c4a6 2288 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
06804c76 2289
ef739f08 2290 if verbose:
f2606b17 2291 print("created p4 label for tag %s" % name)
06804c76 2292
4f5cf76a 2293 def run(self, args):
c9b50e63
SH
2294 if len(args) == 0:
2295 self.master = currentGitBranch()
c9b50e63
SH
2296 elif len(args) == 1:
2297 self.master = args[0]
28755dba
PW
2298 if not branchExists(self.master):
2299 die("Branch %s does not exist" % self.master)
c9b50e63
SH
2300 else:
2301 return False
2302
8cf422db
LD
2303 for i in self.update_shelve:
2304 if i <= 0:
2305 sys.exit("invalid changelist %d" % i)
2306
00ad6e31
LD
2307 if self.master:
2308 allowSubmit = gitConfig("git-p4.allowSubmit")
2309 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
2310 die("%s is not in git-p4.allowSubmit" % self.master)
4c2d5d72 2311
27d2d811 2312 [upstream, settings] = findUpstreamBranchPoint()
ea99c3ae 2313 self.depotPath = settings['depot-paths'][0]
27d2d811
SH
2314 if len(self.origin) == 0:
2315 self.origin = upstream
a3fdd579 2316
8cf422db 2317 if len(self.update_shelve) > 0:
46c609e9
LD
2318 self.shelve = True
2319
3ea2cfd4
LD
2320 if self.preserveUser:
2321 if not self.canChangeChangelists():
2322 die("Cannot preserve user names without p4 super-user or admin permissions")
2323
6bbfd137
PW
2324 # if not set from the command line, try the config file
2325 if self.conflict_behavior is None:
2326 val = gitConfig("git-p4.conflict")
2327 if val:
2328 if val not in self.conflict_behavior_choices:
2329 die("Invalid value '%s' for config git-p4.conflict" % val)
2330 else:
2331 val = "ask"
2332 self.conflict_behavior = val
2333
a3fdd579 2334 if self.verbose:
f2606b17 2335 print("Origin branch is " + self.origin)
9512497b 2336
ea99c3ae 2337 if len(self.depotPath) == 0:
f2606b17 2338 print("Internal error: cannot locate perforce depot path from existing branches")
9512497b
SH
2339 sys.exit(128)
2340
543987bd 2341 self.useClientSpec = False
0d609032 2342 if gitConfigBool("git-p4.useclientspec"):
543987bd
PW
2343 self.useClientSpec = True
2344 if self.useClientSpec:
2345 self.clientSpecDirs = getClientSpec()
9512497b 2346
2e3a16b2 2347 # Check for the existence of P4 branches
cd884106
VA
2348 branchesDetected = (len(p4BranchesInGit().keys()) > 1)
2349
2350 if self.useClientSpec and not branchesDetected:
543987bd
PW
2351 # all files are relative to the client spec
2352 self.clientPath = getClientRoot()
2353 else:
2354 self.clientPath = p4Where(self.depotPath)
9512497b 2355
543987bd
PW
2356 if self.clientPath == "":
2357 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
9512497b 2358
f2606b17 2359 print("Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath))
7944f142 2360 self.oldWorkingDirectory = os.getcwd()
c1b296b9 2361
0591cfa8 2362 # ensure the clientPath exists
8d7ec362 2363 new_client_dir = False
0591cfa8 2364 if not os.path.exists(self.clientPath):
8d7ec362 2365 new_client_dir = True
0591cfa8
GG
2366 os.makedirs(self.clientPath)
2367
bbd84863 2368 chdir(self.clientPath, is_client_path=True)
ef739f08 2369 if self.dry_run:
f2606b17 2370 print("Would synchronize p4 checkout in %s" % self.clientPath)
8d7ec362 2371 else:
f2606b17 2372 print("Synchronizing p4 checkout...")
ef739f08
PW
2373 if new_client_dir:
2374 # old one was destroyed, and maybe nobody told p4
2375 p4_sync("...", "-f")
2376 else:
2377 p4_sync("...")
4f5cf76a 2378 self.check()
4f5cf76a 2379
4c750c0d 2380 commits = []
00ad6e31 2381 if self.master:
89f32a92 2382 committish = self.master
00ad6e31 2383 else:
89f32a92 2384 committish = 'HEAD'
00ad6e31 2385
f55b87c1
RM
2386 if self.commit != "":
2387 if self.commit.find("..") != -1:
2388 limits_ish = self.commit.split("..")
2389 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (limits_ish[0], limits_ish[1])]):
2390 commits.append(line.strip())
2391 commits.reverse()
2392 else:
2393 commits.append(self.commit)
2394 else:
e6388994 2395 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, committish)]):
f55b87c1
RM
2396 commits.append(line.strip())
2397 commits.reverse()
4f5cf76a 2398
0d609032 2399 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
848de9c3
LD
2400 self.checkAuthorship = False
2401 else:
2402 self.checkAuthorship = True
2403
3ea2cfd4
LD
2404 if self.preserveUser:
2405 self.checkValidP4Users(commits)
2406
84cb0003
GG
2407 #
2408 # Build up a set of options to be passed to diff when
2409 # submitting each commit to p4.
2410 #
2411 if self.detectRenames:
2412 # command-line -M arg
2413 self.diffOpts = "-M"
2414 else:
2415 # If not explicitly set check the config variable
2416 detectRenames = gitConfig("git-p4.detectRenames")
2417
2418 if detectRenames.lower() == "false" or detectRenames == "":
2419 self.diffOpts = ""
2420 elif detectRenames.lower() == "true":
2421 self.diffOpts = "-M"
2422 else:
2423 self.diffOpts = "-M%s" % detectRenames
2424
2425 # no command-line arg for -C or --find-copies-harder, just
2426 # config variables
2427 detectCopies = gitConfig("git-p4.detectCopies")
2428 if detectCopies.lower() == "false" or detectCopies == "":
2429 pass
2430 elif detectCopies.lower() == "true":
2431 self.diffOpts += " -C"
2432 else:
2433 self.diffOpts += " -C%s" % detectCopies
2434
0d609032 2435 if gitConfigBool("git-p4.detectCopiesHarder"):
84cb0003
GG
2436 self.diffOpts += " --find-copies-harder"
2437
8cf422db
LD
2438 num_shelves = len(self.update_shelve)
2439 if num_shelves > 0 and num_shelves != len(commits):
2440 sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
2441 (len(commits), num_shelves))
2442
4935c458
BK
2443 if not self.no_verify:
2444 try:
2445 if not run_git_hook("p4-pre-submit"):
2446 print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
2447 "this pre-submission check by adding\nthe command line option '--no-verify', " \
2448 "however,\nthis will also skip the p4-changelist hook as well.")
2449 sys.exit(1)
2450 except Exception as e:
2451 print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
2452 "with the error '{0}'".format(e.message) )
aa8b766a 2453 sys.exit(1)
251c8c50 2454
7e5dd9f2
PW
2455 #
2456 # Apply the commits, one at a time. On failure, ask if should
2457 # continue to try the rest of the patches, or quit.
2458 #
ef739f08 2459 if self.dry_run:
f2606b17 2460 print("Would apply")
67b0fe2e 2461 applied = []
7e5dd9f2
PW
2462 last = len(commits) - 1
2463 for i, commit in enumerate(commits):
ef739f08 2464 if self.dry_run:
f2606b17
LD
2465 print(" ", read_pipe(["git", "show", "-s",
2466 "--format=format:%h %s", commit]))
ef739f08
PW
2467 ok = True
2468 else:
2469 ok = self.applyCommit(commit)
67b0fe2e
PW
2470 if ok:
2471 applied.append(commit)
2dfdd705
BK
2472 if self.prepare_p4_only:
2473 if i < last:
2474 print("Processing only the first commit due to option" \
2475 " --prepare-p4-only")
728b7ad8 2476 break
2dfdd705 2477 else:
7e5dd9f2 2478 if i < last:
e2aed5fd
BK
2479 # prompt for what to do, or use the option/variable
2480 if self.conflict_behavior == "ask":
2481 print("What do you want to do?")
2482 response = prompt("[s]kip this commit but apply the rest, or [q]uit? ")
2483 elif self.conflict_behavior == "skip":
2484 response = "s"
2485 elif self.conflict_behavior == "quit":
2486 response = "q"
2487 else:
2488 die("Unknown conflict_behavior '%s'" %
2489 self.conflict_behavior)
2490
2491 if response == "s":
2492 print("Skipping this commit, but applying the rest")
2493 if response == "q":
2494 print("Quitting")
7e5dd9f2 2495 break
4f5cf76a 2496
67b0fe2e 2497 chdir(self.oldWorkingDirectory)
b34fa577 2498 shelved_applied = "shelved" if self.shelve else "applied"
ef739f08
PW
2499 if self.dry_run:
2500 pass
728b7ad8
PW
2501 elif self.prepare_p4_only:
2502 pass
ef739f08 2503 elif len(commits) == len(applied):
f2606b17 2504 print("All commits {0}!".format(shelved_applied))
14594f4b 2505
4c750c0d 2506 sync = P4Sync()
44e8d26c
PW
2507 if self.branch:
2508 sync.branch = self.branch
b9d34db9
LD
2509 if self.disable_p4sync:
2510 sync.sync_origin_only()
2511 else:
2512 sync.run([])
14594f4b 2513
b9d34db9
LD
2514 if not self.disable_rebase:
2515 rebase = P4Rebase()
2516 rebase.rebase()
4f5cf76a 2517
67b0fe2e
PW
2518 else:
2519 if len(applied) == 0:
f2606b17 2520 print("No commits {0}.".format(shelved_applied))
67b0fe2e 2521 else:
f2606b17 2522 print("{0} only the commits marked with '*':".format(shelved_applied.capitalize()))
67b0fe2e
PW
2523 for c in commits:
2524 if c in applied:
2525 star = "*"
2526 else:
2527 star = " "
f2606b17
LD
2528 print(star, read_pipe(["git", "show", "-s",
2529 "--format=format:%h %s", c]))
2530 print("You will have to do 'git p4 sync' and rebase.")
67b0fe2e 2531
0d609032 2532 if gitConfigBool("git-p4.exportLabels"):
06dcd152 2533 self.exportLabels = True
06804c76
LD
2534
2535 if self.exportLabels:
2536 p4Labels = getP4Labels(self.depotPath)
2537 gitTags = getGitTags()
2538
2539 missingGitTags = gitTags - p4Labels
2540 self.exportGitTags(missingGitTags)
2541
98e023de 2542 # exit with error unless everything applied perfectly
67b0fe2e
PW
2543 if len(commits) != len(applied):
2544 sys.exit(1)
2545
b984733c
SH
2546 return True
2547
ecb7cf98
PW
2548class View(object):
2549 """Represent a p4 view ("p4 help views"), and map files in a
2550 repo according to the view."""
2551
9d57c4a6 2552 def __init__(self, client_name):
ecb7cf98 2553 self.mappings = []
9d57c4a6
KS
2554 self.client_prefix = "//%s/" % client_name
2555 # cache results of "p4 where" to lookup client file locations
2556 self.client_spec_path_cache = {}
ecb7cf98
PW
2557
2558 def append(self, view_line):
2559 """Parse a view line, splitting it into depot and client
9d57c4a6
KS
2560 sides. Append to self.mappings, preserving order. This
2561 is only needed for tag creation."""
ecb7cf98
PW
2562
2563 # Split the view line into exactly two words. P4 enforces
2564 # structure on these lines that simplifies this quite a bit.
2565 #
2566 # Either or both words may be double-quoted.
2567 # Single quotes do not matter.
2568 # Double-quote marks cannot occur inside the words.
2569 # A + or - prefix is also inside the quotes.
2570 # There are no quotes unless they contain a space.
2571 # The line is already white-space stripped.
2572 # The two words are separated by a single space.
2573 #
2574 if view_line[0] == '"':
2575 # First word is double quoted. Find its end.
2576 close_quote_index = view_line.find('"', 1)
2577 if close_quote_index <= 0:
2578 die("No first-word closing quote found: %s" % view_line)
2579 depot_side = view_line[1:close_quote_index]
2580 # skip closing quote and space
2581 rhs_index = close_quote_index + 1 + 1
2582 else:
2583 space_index = view_line.find(" ")
2584 if space_index <= 0:
2585 die("No word-splitting space found: %s" % view_line)
2586 depot_side = view_line[0:space_index]
2587 rhs_index = space_index + 1
2588
ecb7cf98 2589 # prefix + means overlay on previous mapping
ecb7cf98 2590 if depot_side.startswith("+"):
ecb7cf98
PW
2591 depot_side = depot_side[1:]
2592
9d57c4a6 2593 # prefix - means exclude this path, leave out of mappings
ecb7cf98
PW
2594 exclude = False
2595 if depot_side.startswith("-"):
2596 exclude = True
2597 depot_side = depot_side[1:]
2598
9d57c4a6
KS
2599 if not exclude:
2600 self.mappings.append(depot_side)
ecb7cf98 2601
9d57c4a6
KS
2602 def convert_client_path(self, clientFile):
2603 # chop off //client/ part to make it relative
d38208a2 2604 if not decode_path(clientFile).startswith(self.client_prefix):
9d57c4a6
KS
2605 die("No prefix '%s' on clientFile '%s'" %
2606 (self.client_prefix, clientFile))
2607 return clientFile[len(self.client_prefix):]
ecb7cf98 2608
9d57c4a6
KS
2609 def update_client_spec_path_cache(self, files):
2610 """ Caching file paths by "p4 where" batch query """
ecb7cf98 2611
9d57c4a6 2612 # List depot file paths exclude that already cached
d38208a2 2613 fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache]
ecb7cf98 2614
9d57c4a6
KS
2615 if len(fileArgs) == 0:
2616 return # All files in cache
ecb7cf98 2617
9d57c4a6
KS
2618 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
2619 for res in where_result:
2620 if "code" in res and res["code"] == "error":
2621 # assume error is "... file(s) not in client view"
2622 continue
2623 if "clientFile" not in res:
20005443 2624 die("No clientFile in 'p4 where' output")
9d57c4a6
KS
2625 if "unmap" in res:
2626 # it will list all of them, but only one not unmap-ped
2627 continue
d38208a2 2628 depot_path = decode_path(res['depotFile'])
a0a50d87 2629 if gitConfigBool("core.ignorecase"):
d38208a2
YZ
2630 depot_path = depot_path.lower()
2631 self.client_spec_path_cache[depot_path] = self.convert_client_path(res["clientFile"])
ecb7cf98 2632
9d57c4a6
KS
2633 # not found files or unmap files set to ""
2634 for depotFile in fileArgs:
d38208a2 2635 depotFile = decode_path(depotFile)
a0a50d87
LS
2636 if gitConfigBool("core.ignorecase"):
2637 depotFile = depotFile.lower()
9d57c4a6 2638 if depotFile not in self.client_spec_path_cache:
d38208a2 2639 self.client_spec_path_cache[depotFile] = b''
ecb7cf98 2640
9d57c4a6
KS
2641 def map_in_client(self, depot_path):
2642 """Return the relative location in the client where this
2643 depot file should live. Returns "" if the file should
2644 not be mapped in the client."""
ecb7cf98 2645
a0a50d87
LS
2646 if gitConfigBool("core.ignorecase"):
2647 depot_path = depot_path.lower()
2648
9d57c4a6
KS
2649 if depot_path in self.client_spec_path_cache:
2650 return self.client_spec_path_cache[depot_path]
2651
2652 die( "Error: %s is not found in client spec path" % depot_path )
2653 return ""
ecb7cf98 2654
ff8c50ed
AM
2655def cloneExcludeCallback(option, opt_str, value, parser):
2656 # prepend "/" because the first "/" was consumed as part of the option itself.
2657 # ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
2658 parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
2659
3ea2cfd4 2660class P4Sync(Command, P4UserMap):
56c09345 2661
b984733c
SH
2662 def __init__(self):
2663 Command.__init__(self)
3ea2cfd4 2664 P4UserMap.__init__(self)
b984733c
SH
2665 self.options = [
2666 optparse.make_option("--branch", dest="branch"),
2667 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
2668 optparse.make_option("--changesfile", dest="changesFile"),
2669 optparse.make_option("--silent", dest="silent", action="store_true"),
ef48f909 2670 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
06804c76 2671 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
d2c6dd30
HWN
2672 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
2673 help="Import into refs/heads/ , not refs/remotes"),
96b2d54a
LS
2674 optparse.make_option("--max-changes", dest="maxChanges",
2675 help="Maximum number of changes to import"),
2676 optparse.make_option("--changes-block-size", dest="changes_block_size", type="int",
2677 help="Internal block size to use when iteratively calling p4 changes"),
86dff6b6 2678 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
3a70cdfa
TAL
2679 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
2680 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
51334bb0
LD
2681 help="Only sync files that are included in the Perforce Client Spec"),
2682 optparse.make_option("-/", dest="cloneExclude",
ff8c50ed 2683 action="callback", callback=cloneExcludeCallback, type="string",
51334bb0 2684 help="exclude depot path"),
b984733c
SH
2685 ]
2686 self.description = """Imports from Perforce into a git repository.\n
2687 example:
2688 //depot/my/project/ -- to import the current head
2689 //depot/my/project/@all -- to import everything
2690 //depot/my/project/@1,6 -- to import only from revision 1 to 6
2691
2692 (a ... is not needed in the path p4 specification, it's added implicitly)"""
2693
2694 self.usage += " //depot/path[@revRange]"
b984733c 2695 self.silent = False
1d7367dc
RG
2696 self.createdBranches = set()
2697 self.committedChanges = set()
569d1bd4 2698 self.branch = ""
b984733c 2699 self.detectBranches = False
cb53e1f8 2700 self.detectLabels = False
06804c76 2701 self.importLabels = False
b984733c 2702 self.changesFile = ""
01265103 2703 self.syncWithOrigin = True
a028a98e 2704 self.importIntoRemotes = True
01a9c9c5 2705 self.maxChanges = ""
1051ef00 2706 self.changes_block_size = None
8b41a97f 2707 self.keepRepoPath = False
6326aa58 2708 self.depotPaths = None
3c699645 2709 self.p4BranchesInGit = []
354081d5 2710 self.cloneExclude = []
3a70cdfa 2711 self.useClientSpec = False
a93d33ee 2712 self.useClientSpec_from_options = False
ecb7cf98 2713 self.clientSpecDirs = None
fed23693 2714 self.tempBranches = []
d604176d 2715 self.tempBranchLocation = "refs/git-p4-tmp"
a5db4b12 2716 self.largeFileSystem = None
123f6317 2717 self.suppress_meta_comment = False
a5db4b12
LS
2718
2719 if gitConfig('git-p4.largeFileSystem'):
2720 largeFileSystemConstructor = globals()[gitConfig('git-p4.largeFileSystem')]
2721 self.largeFileSystem = largeFileSystemConstructor(
2722 lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)
2723 )
b984733c 2724
01265103
SH
2725 if gitConfig("git-p4.syncFromOrigin") == "false":
2726 self.syncWithOrigin = False
2727
123f6317
LD
2728 self.depotPaths = []
2729 self.changeRange = ""
2730 self.previousDepotPaths = []
2731 self.hasOrigin = False
2732
2733 # map from branch depot path to parent branch
2734 self.knownBranches = {}
2735 self.initialParents = {}
2736
2737 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
2738 self.labels = {}
2739
fed23693
VA
2740 # Force a checkpoint in fast-import and wait for it to finish
2741 def checkpoint(self):
2742 self.gitStream.write("checkpoint\n\n")
2743 self.gitStream.write("progress checkpoint\n\n")
4294d741 2744 self.gitStream.flush()
fed23693
VA
2745 out = self.gitOutput.readline()
2746 if self.verbose:
f2606b17 2747 print("checkpoint finished: " + out)
fed23693 2748
a2bee10a
AM
2749 def isPathWanted(self, path):
2750 for p in self.cloneExclude:
2751 if p.endswith("/"):
2752 if p4PathStartsWith(path, p):
2753 return False
2754 # "-//depot/file1" without a trailing "/" should only exclude "file1", but not "file111" or "file1_dir/file2"
2755 elif path.lower() == p.lower():
2756 return False
2757 for p in self.depotPaths:
d38208a2 2758 if p4PathStartsWith(path, decode_path(p)):
a2bee10a
AM
2759 return True
2760 return False
2761
89143ac2 2762 def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
b984733c
SH
2763 files = []
2764 fnum = 0
dba1c9d9 2765 while "depotFile%s" % fnum in commit:
b984733c 2766 path = commit["depotFile%s" % fnum]
d38208a2 2767 found = self.isPathWanted(decode_path(path))
6326aa58 2768 if not found:
b984733c
SH
2769 fnum = fnum + 1
2770 continue
2771
2772 file = {}
2773 file["path"] = path
2774 file["rev"] = commit["rev%s" % fnum]
2775 file["action"] = commit["action%s" % fnum]
2776 file["type"] = commit["type%s" % fnum]
123f6317
LD
2777 if shelved:
2778 file["shelved_cl"] = int(shelved_cl)
b984733c
SH
2779 files.append(file)
2780 fnum = fnum + 1
2781 return files
2782
26e6a27d
JD
2783 def extractJobsFromCommit(self, commit):
2784 jobs = []
2785 jnum = 0
dba1c9d9 2786 while "job%s" % jnum in commit:
26e6a27d
JD
2787 job = commit["job%s" % jnum]
2788 jobs.append(job)
2789 jnum = jnum + 1
2790 return jobs
2791
6326aa58 2792 def stripRepoPath(self, path, prefixes):
21ef5df4
PW
2793 """When streaming files, this is called to map a p4 depot path
2794 to where it should go in git. The prefixes are either
2795 self.depotPaths, or self.branchPrefixes in the case of
2796 branch detection."""
2797
3952710b 2798 if self.useClientSpec:
21ef5df4
PW
2799 # branch detection moves files up a level (the branch name)
2800 # from what client spec interpretation gives
d38208a2 2801 path = decode_path(self.clientSpecDirs.map_in_client(path))
21ef5df4
PW
2802 if self.detectBranches:
2803 for b in self.knownBranches:
f2768cb3 2804 if p4PathStartsWith(path, b + "/"):
21ef5df4
PW
2805 path = path[len(b)+1:]
2806
2807 elif self.keepRepoPath:
2808 # Preserve everything in relative path name except leading
2809 # //depot/; just look at first prefix as they all should
2810 # be in the same depot.
2811 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2812 if p4PathStartsWith(path, depot):
2813 path = path[len(depot):]
3952710b 2814
0d1696ef 2815 else:
0d1696ef
PW
2816 for p in prefixes:
2817 if p4PathStartsWith(path, p):
2818 path = path[len(p):]
21ef5df4 2819 break
8b41a97f 2820
0d1696ef 2821 path = wildcard_decode(path)
6326aa58 2822 return path
6754a299 2823
71b112d4 2824 def splitFilesIntoBranches(self, commit):
21ef5df4
PW
2825 """Look at each depotFile in the commit to figure out to what
2826 branch it belongs."""
2827
9d57c4a6
KS
2828 if self.clientSpecDirs:
2829 files = self.extractFilesFromCommit(commit)
2830 self.clientSpecDirs.update_client_spec_path_cache(files)
2831
d5904674 2832 branches = {}
71b112d4 2833 fnum = 0
dba1c9d9 2834 while "depotFile%s" % fnum in commit:
d38208a2
YZ
2835 raw_path = commit["depotFile%s" % fnum]
2836 path = decode_path(raw_path)
d15068a6 2837 found = self.isPathWanted(path)
6326aa58 2838 if not found:
71b112d4
SH
2839 fnum = fnum + 1
2840 continue
2841
2842 file = {}
d38208a2 2843 file["path"] = raw_path
71b112d4
SH
2844 file["rev"] = commit["rev%s" % fnum]
2845 file["action"] = commit["action%s" % fnum]
2846 file["type"] = commit["type%s" % fnum]
2847 fnum = fnum + 1
2848
21ef5df4
PW
2849 # start with the full relative path where this file would
2850 # go in a p4 client
2851 if self.useClientSpec:
d38208a2 2852 relPath = decode_path(self.clientSpecDirs.map_in_client(path))
21ef5df4
PW
2853 else:
2854 relPath = self.stripRepoPath(path, self.depotPaths)
b984733c 2855
4b97ffb1 2856 for branch in self.knownBranches.keys():
21ef5df4
PW
2857 # add a trailing slash so that a commit into qt/4.2foo
2858 # doesn't end up in qt/4.2, e.g.
f2768cb3 2859 if p4PathStartsWith(relPath, branch + "/"):
d5904674
SH
2860 if branch not in branches:
2861 branches[branch] = []
71b112d4 2862 branches[branch].append(file)
6555b2cc 2863 break
b984733c
SH
2864
2865 return branches
2866
a5db4b12 2867 def writeToGitStream(self, gitMode, relPath, contents):
6cec21a8 2868 self.gitStream.write(encode_text_stream(u'M {} inline {}\n'.format(gitMode, relPath)))
a5db4b12
LS
2869 self.gitStream.write('data %d\n' % sum(len(d) for d in contents))
2870 for d in contents:
2871 self.gitStream.write(d)
2872 self.gitStream.write('\n')
2873
a8b05162
LS
2874 def encodeWithUTF8(self, path):
2875 try:
2876 path.decode('ascii')
2877 except:
2878 encoding = 'utf8'
2879 if gitConfig('git-p4.pathEncoding'):
2880 encoding = gitConfig('git-p4.pathEncoding')
2881 path = path.decode(encoding, 'replace').encode('utf8', 'replace')
2882 if self.verbose:
f2606b17 2883 print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
a8b05162
LS
2884 return path
2885
b932705b
LD
2886 # output one file from the P4 stream
2887 # - helper for streamP4Files
2888
2889 def streamOneP4File(self, file, contents):
d38208a2
YZ
2890 file_path = file['depotFile']
2891 relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes)
2892
b932705b 2893 if verbose:
0742b7c8
LD
2894 if 'fileSize' in self.stream_file:
2895 size = int(self.stream_file['fileSize'])
2896 else:
2897 size = 0 # deleted files don't get a fileSize apparently
ae9b9509
JH
2898 sys.stdout.write('\r%s --> %s (%s)\n' % (
2899 file_path, relPath, format_size_human_readable(size)))
d2176a50 2900 sys.stdout.flush()
b932705b 2901
9cffb8c8
PW
2902 (type_base, type_mods) = split_p4_type(file["type"])
2903
2904 git_mode = "100644"
2905 if "x" in type_mods:
2906 git_mode = "100755"
2907 if type_base == "symlink":
2908 git_mode = "120000"
1292df11
AJ
2909 # p4 print on a symlink sometimes contains "target\n";
2910 # if it does, remove the newline
6cec21a8 2911 data = ''.join(decode_text_stream(c) for c in contents)
40f846c3
PW
2912 if not data:
2913 # Some version of p4 allowed creating a symlink that pointed
2914 # to nothing. This causes p4 errors when checking out such
2915 # a change, and errors here too. Work around it by ignoring
2916 # the bad symlink; hopefully a future change fixes it.
d38208a2 2917 print("\nIgnoring empty symlink in %s" % file_path)
40f846c3
PW
2918 return
2919 elif data[-1] == '\n':
1292df11
AJ
2920 contents = [data[:-1]]
2921 else:
2922 contents = [data]
b932705b 2923
9cffb8c8 2924 if type_base == "utf16":
55aa5714
PW
2925 # p4 delivers different text in the python output to -G
2926 # than it does when using "print -o", or normal p4 client
2927 # operations. utf16 is converted to ascii or utf8, perhaps.
2928 # But ascii text saved as -t utf16 is completely mangled.
2929 # Invoke print -o to get the real contents.
7f0e5962
PW
2930 #
2931 # On windows, the newlines will always be mangled by print, so put
2932 # them back too. This is not needed to the cygwin windows version,
2933 # just the native "NT" type.
2934 #
1f5f3907 2935 try:
d38208a2 2936 text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (decode_path(file['depotFile']), file['change'])], raw=True)
1f5f3907
LS
2937 except Exception as e:
2938 if 'Translation of file content failed' in str(e):
2939 type_base = 'binary'
2940 else:
2941 raise e
2942 else:
2943 if p4_version_string().find('/NT') >= 0:
d38208a2 2944 text = text.replace(b'\r\n', b'\n')
1f5f3907 2945 contents = [ text ]
55aa5714 2946
9f7ef0ea
PW
2947 if type_base == "apple":
2948 # Apple filetype files will be streamed as a concatenation of
2949 # its appledouble header and the contents. This is useless
2950 # on both macs and non-macs. If using "print -q -o xx", it
2951 # will create "xx" with the data, and "%xx" with the header.
2952 # This is also not very useful.
2953 #
2954 # Ideally, someday, this script can learn how to generate
2955 # appledouble files directly and import those to git, but
2956 # non-mac machines can never find a use for apple filetype.
f2606b17 2957 print("\nIgnoring apple filetype file %s" % file['depotFile'])
9f7ef0ea
PW
2958 return
2959
55aa5714
PW
2960 # Note that we do not try to de-mangle keywords on utf16 files,
2961 # even though in theory somebody may want that.
e665e98e
JH
2962 regexp = p4_keywords_regexp_for_type(type_base, type_mods)
2963 if regexp:
70c0d553 2964 contents = [regexp.sub(br'$\1$', c) for c in contents]
b932705b 2965
a5db4b12
LS
2966 if self.largeFileSystem:
2967 (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
b932705b 2968
a5db4b12 2969 self.writeToGitStream(git_mode, relPath, contents)
b932705b
LD
2970
2971 def streamOneP4Deletion(self, file):
d38208a2 2972 relPath = self.stripRepoPath(decode_path(file['path']), self.branchPrefixes)
b932705b 2973 if verbose:
d2176a50
LS
2974 sys.stdout.write("delete %s\n" % relPath)
2975 sys.stdout.flush()
6cec21a8 2976 self.gitStream.write(encode_text_stream(u'D {}\n'.format(relPath)))
b932705b 2977
a5db4b12
LS
2978 if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
2979 self.largeFileSystem.removeLargeFile(relPath)
2980
b932705b
LD
2981 # handle another chunk of streaming data
2982 def streamP4FilesCb(self, marshalled):
2983
78189bea
PW
2984 # catch p4 errors and complain
2985 err = None
2986 if "code" in marshalled:
2987 if marshalled["code"] == "error":
2988 if "data" in marshalled:
2989 err = marshalled["data"].rstrip()
4d25dc44
LS
2990
2991 if not err and 'fileSize' in self.stream_file:
2992 required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
2993 if required_bytes > 0:
ae9b9509
JH
2994 err = 'Not enough space left on %s! Free at least %s.' % (
2995 os.getcwd(), format_size_human_readable(required_bytes))
4d25dc44 2996
78189bea
PW
2997 if err:
2998 f = None
2999 if self.stream_have_file_info:
3000 if "depotFile" in self.stream_file:
3001 f = self.stream_file["depotFile"]
3002 # force a failure in fast-import, else an empty
3003 # commit will be made
3004 self.gitStream.write("\n")
3005 self.gitStream.write("die-now\n")
3006 self.gitStream.close()
3007 # ignore errors, but make sure it exits first
3008 self.importProcess.wait()
3009 if f:
3010 die("Error from p4 print for %s: %s" % (f, err))
3011 else:
3012 die("Error from p4 print: %s" % err)
3013
dba1c9d9 3014 if 'depotFile' in marshalled and self.stream_have_file_info:
c3f6163b
AG
3015 # start of a new file - output the old one first
3016 self.streamOneP4File(self.stream_file, self.stream_contents)
3017 self.stream_file = {}
3018 self.stream_contents = []
3019 self.stream_have_file_info = False
b932705b 3020
c3f6163b
AG
3021 # pick up the new file information... for the
3022 # 'data' field we need to append to our array
3023 for k in marshalled.keys():
3024 if k == 'data':
d2176a50
LS
3025 if 'streamContentSize' not in self.stream_file:
3026 self.stream_file['streamContentSize'] = 0
3027 self.stream_file['streamContentSize'] += len(marshalled['data'])
c3f6163b
AG
3028 self.stream_contents.append(marshalled['data'])
3029 else:
3030 self.stream_file[k] = marshalled[k]
b932705b 3031
d2176a50
LS
3032 if (verbose and
3033 'streamContentSize' in self.stream_file and
3034 'fileSize' in self.stream_file and
3035 'depotFile' in self.stream_file):
3036 size = int(self.stream_file["fileSize"])
3037 if size > 0:
3038 progress = 100*self.stream_file['streamContentSize']/size
ae9b9509
JH
3039 sys.stdout.write('\r%s %d%% (%s)' % (
3040 self.stream_file['depotFile'], progress,
3041 format_size_human_readable(size)))
d2176a50
LS
3042 sys.stdout.flush()
3043
c3f6163b 3044 self.stream_have_file_info = True
b932705b
LD
3045
3046 # Stream directly from "p4 files" into "git fast-import"
3047 def streamP4Files(self, files):
30b5940b
SH
3048 filesForCommit = []
3049 filesToRead = []
b932705b 3050 filesToDelete = []
30b5940b 3051
3a70cdfa 3052 for f in files:
ecb7cf98
PW
3053 filesForCommit.append(f)
3054 if f['action'] in self.delete_actions:
3055 filesToDelete.append(f)
3056 else:
3057 filesToRead.append(f)
6a49f8e2 3058
b932705b
LD
3059 # deleted files...
3060 for f in filesToDelete:
3061 self.streamOneP4Deletion(f)
1b9a4684 3062
b932705b
LD
3063 if len(filesToRead) > 0:
3064 self.stream_file = {}
3065 self.stream_contents = []
3066 self.stream_have_file_info = False
8ff45f2a 3067
c3f6163b
AG
3068 # curry self argument
3069 def streamP4FilesCbSelf(entry):
3070 self.streamP4FilesCb(entry)
6a49f8e2 3071
123f6317
LD
3072 fileArgs = []
3073 for f in filesToRead:
3074 if 'shelved_cl' in f:
3075 # Handle shelved CLs using the "p4 print file@=N" syntax to print
3076 # the contents
6cec21a8 3077 fileArg = f['path'] + encode_text_stream('@={}'.format(f['shelved_cl']))
123f6317 3078 else:
6cec21a8 3079 fileArg = f['path'] + encode_text_stream('#{}'.format(f['rev']))
123f6317
LD
3080
3081 fileArgs.append(fileArg)
6de040df
LD
3082
3083 p4CmdList(["-x", "-", "print"],
3084 stdin=fileArgs,
3085 cb=streamP4FilesCbSelf)
30b5940b 3086
b932705b 3087 # do the last chunk
dba1c9d9 3088 if 'depotFile' in self.stream_file:
b932705b 3089 self.streamOneP4File(self.stream_file, self.stream_contents)
6a49f8e2 3090
affb474f
LD
3091 def make_email(self, userid):
3092 if userid in self.users:
3093 return self.users[userid]
3094 else:
3095 return "%s <a@b>" % userid
3096
06804c76 3097 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
b43702ac
LD
3098 """ Stream a p4 tag.
3099 commit is either a git commit, or a fast-import mark, ":<p4commit>"
3100 """
3101
06804c76 3102 if verbose:
f2606b17 3103 print("writing tag %s for commit %s" % (labelName, commit))
06804c76
LD
3104 gitStream.write("tag %s\n" % labelName)
3105 gitStream.write("from %s\n" % commit)
3106
dba1c9d9 3107 if 'Owner' in labelDetails:
06804c76
LD
3108 owner = labelDetails["Owner"]
3109 else:
3110 owner = None
3111
3112 # Try to use the owner of the p4 label, or failing that,
3113 # the current p4 user id.
3114 if owner:
3115 email = self.make_email(owner)
3116 else:
3117 email = self.make_email(self.p4UserId())
3118 tagger = "%s %s %s" % (email, epoch, self.tz)
3119
3120 gitStream.write("tagger %s\n" % tagger)
3121
f2606b17 3122 print("labelDetails=",labelDetails)
dba1c9d9 3123 if 'Description' in labelDetails:
06804c76
LD
3124 description = labelDetails['Description']
3125 else:
3126 description = 'Label from git p4'
3127
3128 gitStream.write("data %d\n" % len(description))
3129 gitStream.write(description)
3130 gitStream.write("\n")
3131
4ae048e6
LS
3132 def inClientSpec(self, path):
3133 if not self.clientSpecDirs:
3134 return True
3135 inClientSpec = self.clientSpecDirs.map_in_client(path)
3136 if not inClientSpec and self.verbose:
3137 print('Ignoring file outside of client spec: {0}'.format(path))
3138 return inClientSpec
3139
3140 def hasBranchPrefix(self, path):
3141 if not self.branchPrefixes:
3142 return True
3143 hasPrefix = [p for p in self.branchPrefixes
3144 if p4PathStartsWith(path, p)]
09667d01 3145 if not hasPrefix and self.verbose:
4ae048e6
LS
3146 print('Ignoring file outside of prefix: {0}'.format(path))
3147 return hasPrefix
3148
82e46d6b
AO
3149 def findShadowedFiles(self, files, change):
3150 # Perforce allows you commit files and directories with the same name,
3151 # so you could have files //depot/foo and //depot/foo/bar both checked
3152 # in. A p4 sync of a repository in this state fails. Deleting one of
3153 # the files recovers the repository.
3154 #
3155 # Git will not allow the broken state to exist and only the most recent
3156 # of the conflicting names is left in the repository. When one of the
3157 # conflicting files is deleted we need to re-add the other one to make
3158 # sure the git repository recovers in the same way as perforce.
3159 deleted = [f for f in files if f['action'] in self.delete_actions]
3160 to_check = set()
3161 for f in deleted:
3162 path = decode_path(f['path'])
3163 to_check.add(path + '/...')
3164 while True:
3165 path = path.rsplit("/", 1)[0]
3166 if path == "/" or path in to_check:
3167 break
3168 to_check.add(path)
3169 to_check = ['%s@%s' % (wildcard_encode(p), change) for p in to_check
3170 if self.hasBranchPrefix(p)]
3171 if to_check:
3172 stat_result = p4CmdList(["-x", "-", "fstat", "-T",
3173 "depotFile,headAction,headRev,headType"], stdin=to_check)
3174 for record in stat_result:
3175 if record['code'] != 'stat':
3176 continue
3177 if record['headAction'] in self.delete_actions:
3178 continue
3179 files.append({
3180 'action': 'add',
3181 'path': record['depotFile'],
3182 'rev': record['headRev'],
3183 'type': record['headType']})
3184
89143ac2 3185 def commit(self, details, files, branch, parent = "", allow_empty=False):
b984733c
SH
3186 epoch = details["time"]
3187 author = details["user"]
26e6a27d 3188 jobs = self.extractJobsFromCommit(details)
b984733c 3189
4b97ffb1 3190 if self.verbose:
4ae048e6 3191 print('commit into {0}'.format(branch))
96e07dd2 3192
82e46d6b
AO
3193 files = [f for f in files
3194 if self.hasBranchPrefix(decode_path(f['path']))]
3195 self.findShadowedFiles(files, details['change'])
3196
9d57c4a6
KS
3197 if self.clientSpecDirs:
3198 self.clientSpecDirs.update_client_spec_path_cache(files)
3199
82e46d6b 3200 files = [f for f in files if self.inClientSpec(decode_path(f['path']))]
4ae048e6 3201
89143ac2
LD
3202 if gitConfigBool('git-p4.keepEmptyCommits'):
3203 allow_empty = True
3204
3205 if not files and not allow_empty:
4ae048e6
LS
3206 print('Ignoring revision {0} as it would produce an empty commit.'
3207 .format(details['change']))
3208 return
3209
b984733c 3210 self.gitStream.write("commit %s\n" % branch)
b43702ac 3211 self.gitStream.write("mark :%s\n" % details["change"])
b984733c
SH
3212 self.committedChanges.add(int(details["change"]))
3213 committer = ""
b607e71e
SH
3214 if author not in self.users:
3215 self.getUserMapFromPerforceServer()
affb474f 3216 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
b984733c
SH
3217
3218 self.gitStream.write("committer %s\n" % committer)
3219
3220 self.gitStream.write("data <<EOT\n")
3221 self.gitStream.write(details["desc"])
26e6a27d
JD
3222 if len(jobs) > 0:
3223 self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
123f6317
LD
3224
3225 if not self.suppress_meta_comment:
3226 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
3227 (','.join(self.branchPrefixes), details["change"]))
3228 if len(details['options']) > 0:
3229 self.gitStream.write(": options = %s" % details['options'])
3230 self.gitStream.write("]\n")
3231
3232 self.gitStream.write("EOT\n\n")
b984733c
SH
3233
3234 if len(parent) > 0:
4b97ffb1 3235 if self.verbose:
f2606b17 3236 print("parent %s" % parent)
b984733c
SH
3237 self.gitStream.write("from %s\n" % parent)
3238
4ae048e6 3239 self.streamP4Files(files)
b984733c
SH
3240 self.gitStream.write("\n")
3241
1f4ba1cb
SH
3242 change = int(details["change"])
3243
dba1c9d9 3244 if change in self.labels:
1f4ba1cb
SH
3245 label = self.labels[change]
3246 labelDetails = label[0]
3247 labelRevisions = label[1]
71b112d4 3248 if self.verbose:
f2606b17 3249 print("Change %s is labelled %s" % (change, labelDetails))
1f4ba1cb 3250
6de040df 3251 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
e63231e5 3252 for p in self.branchPrefixes])
1f4ba1cb
SH
3253
3254 if len(files) == len(labelRevisions):
3255
3256 cleanedFiles = {}
3257 for info in files:
56c09345 3258 if info["action"] in self.delete_actions:
1f4ba1cb
SH
3259 continue
3260 cleanedFiles[info["depotFile"]] = info["rev"]
3261
3262 if cleanedFiles == labelRevisions:
06804c76 3263 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
1f4ba1cb
SH
3264
3265 else:
a46668fa 3266 if not self.silent:
f2606b17 3267 print("Tag %s does not match with change %s: files do not match."
cebdf5af 3268 % (labelDetails["label"], change))
1f4ba1cb
SH
3269
3270 else:
a46668fa 3271 if not self.silent:
f2606b17 3272 print("Tag %s does not match with change %s: file count is different."
cebdf5af 3273 % (labelDetails["label"], change))
b984733c 3274
06804c76 3275 # Build a dictionary of changelists and labels, for "detect-labels" option.
1f4ba1cb
SH
3276 def getLabels(self):
3277 self.labels = {}
3278
52a4880b 3279 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
10c3211b 3280 if len(l) > 0 and not self.silent:
4d88519f 3281 print("Finding files belonging to labels in %s" % self.depotPaths)
01ce1fe9
SH
3282
3283 for output in l:
1f4ba1cb
SH
3284 label = output["label"]
3285 revisions = {}
3286 newestChange = 0
71b112d4 3287 if self.verbose:
f2606b17 3288 print("Querying files for label %s" % label)
6de040df
LD
3289 for file in p4CmdList(["files"] +
3290 ["%s...@%s" % (p, label)
3291 for p in self.depotPaths]):
1f4ba1cb
SH
3292 revisions[file["depotFile"]] = file["rev"]
3293 change = int(file["change"])
3294 if change > newestChange:
3295 newestChange = change
3296
9bda3a85
SH
3297 self.labels[newestChange] = [output, revisions]
3298
3299 if self.verbose:
f2606b17 3300 print("Label changes: %s" % self.labels.keys())
1f4ba1cb 3301
06804c76
LD
3302 # Import p4 labels as git tags. A direct mapping does not
3303 # exist, so assume that if all the files are at the same revision
3304 # then we can use that, or it's something more complicated we should
3305 # just ignore.
3306 def importP4Labels(self, stream, p4Labels):
3307 if verbose:
f2606b17 3308 print("import p4 labels: " + ' '.join(p4Labels))
06804c76
LD
3309
3310 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
c8942a22 3311 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
06804c76
LD
3312 if len(validLabelRegexp) == 0:
3313 validLabelRegexp = defaultLabelRegexp
3314 m = re.compile(validLabelRegexp)
3315
3316 for name in p4Labels:
3317 commitFound = False
3318
3319 if not m.match(name):
3320 if verbose:
f2606b17 3321 print("label %s does not match regexp %s" % (name,validLabelRegexp))
06804c76
LD
3322 continue
3323
3324 if name in ignoredP4Labels:
3325 continue
3326
3327 labelDetails = p4CmdList(['label', "-o", name])[0]
3328
3329 # get the most recent changelist for each file in this label
3330 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
3331 for p in self.depotPaths])
3332
dba1c9d9 3333 if 'change' in change:
06804c76
LD
3334 # find the corresponding git commit; take the oldest commit
3335 changelist = int(change['change'])
b43702ac
LD
3336 if changelist in self.committedChanges:
3337 gitCommit = ":%d" % changelist # use a fast-import mark
06804c76 3338 commitFound = True
b43702ac
LD
3339 else:
3340 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
3341 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True)
3342 if len(gitCommit) == 0:
f2606b17 3343 print("importing label %s: could not find git commit for changelist %d" % (name, changelist))
b43702ac
LD
3344 else:
3345 commitFound = True
3346 gitCommit = gitCommit.strip()
3347
3348 if commitFound:
06804c76
LD
3349 # Convert from p4 time format
3350 try:
3351 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
3352 except ValueError:
f2606b17 3353 print("Could not convert label time %s" % labelDetails['Update'])
06804c76
LD
3354 tmwhen = 1
3355
3356 when = int(time.mktime(tmwhen))
3357 self.streamTag(stream, name, labelDetails, gitCommit, when)
3358 if verbose:
f2606b17 3359 print("p4 label %s mapped to git commit %s" % (name, gitCommit))
06804c76
LD
3360 else:
3361 if verbose:
f2606b17 3362 print("Label %s has no changelists - possibly deleted?" % name)
06804c76
LD
3363
3364 if not commitFound:
3365 # We can't import this label; don't try again as it will get very
3366 # expensive repeatedly fetching all the files for labels that will
3367 # never be imported. If the label is moved in the future, the
3368 # ignore will need to be removed manually.
3369 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
3370
86dff6b6
HWN
3371 def guessProjectName(self):
3372 for p in self.depotPaths:
6e5295c4
SH
3373 if p.endswith("/"):
3374 p = p[:-1]
3375 p = p[p.strip().rfind("/") + 1:]
3376 if not p.endswith("/"):
3377 p += "/"
3378 return p
86dff6b6 3379
4b97ffb1 3380 def getBranchMapping(self):
6555b2cc
SH
3381 lostAndFoundBranches = set()
3382
8ace74c0
VA
3383 user = gitConfig("git-p4.branchUser")
3384 if len(user) > 0:
3385 command = "branches -u %s" % user
3386 else:
3387 command = "branches"
3388
3389 for info in p4CmdList(command):
52a4880b 3390 details = p4Cmd(["branch", "-o", info["branch"]])
4b97ffb1 3391 viewIdx = 0
dba1c9d9 3392 while "View%s" % viewIdx in details:
4b97ffb1
SH
3393 paths = details["View%s" % viewIdx].split(" ")
3394 viewIdx = viewIdx + 1
3395 # require standard //depot/foo/... //depot/bar/... mapping
3396 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
3397 continue
3398 source = paths[0]
3399 destination = paths[1]
6509e19c 3400 ## HACK
d53de8b9 3401 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
6509e19c
SH
3402 source = source[len(self.depotPaths[0]):-4]
3403 destination = destination[len(self.depotPaths[0]):-4]
6555b2cc 3404
1a2edf4e
SH
3405 if destination in self.knownBranches:
3406 if not self.silent:
f2606b17
LD
3407 print("p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination))
3408 print("but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination))
1a2edf4e
SH
3409 continue
3410
6555b2cc
SH
3411 self.knownBranches[destination] = source
3412
3413 lostAndFoundBranches.discard(destination)
3414
29bdbac1 3415 if source not in self.knownBranches:
6555b2cc
SH
3416 lostAndFoundBranches.add(source)
3417
7199cf13
VA
3418 # Perforce does not strictly require branches to be defined, so we also
3419 # check git config for a branch list.
3420 #
3421 # Example of branch definition in git config file:
3422 # [git-p4]
3423 # branchList=main:branchA
3424 # branchList=main:branchB
3425 # branchList=branchA:branchC
3426 configBranches = gitConfigList("git-p4.branchList")
3427 for branch in configBranches:
3428 if branch:
3429 (source, destination) = branch.split(":")
3430 self.knownBranches[destination] = source
3431
3432 lostAndFoundBranches.discard(destination)
3433
3434 if source not in self.knownBranches:
3435 lostAndFoundBranches.add(source)
3436
6555b2cc
SH
3437
3438 for branch in lostAndFoundBranches:
3439 self.knownBranches[branch] = branch
29bdbac1 3440
38f9f5ec
SH
3441 def getBranchMappingFromGitBranches(self):
3442 branches = p4BranchesInGit(self.importIntoRemotes)
3443 for branch in branches.keys():
3444 if branch == "master":
3445 branch = "main"
3446 else:
3447 branch = branch[len(self.projectName):]
3448 self.knownBranches[branch] = branch
3449
bb6e09b2
HWN
3450 def updateOptionDict(self, d):
3451 option_keys = {}
3452 if self.keepRepoPath:
3453 option_keys['keepRepoPath'] = 1
3454
3455 d["options"] = ' '.join(sorted(option_keys.keys()))
3456
3457 def readOptions(self, d):
dba1c9d9 3458 self.keepRepoPath = ('options' in d
bb6e09b2 3459 and ('keepRepoPath' in d['options']))
6326aa58 3460
8134f69c
SH
3461 def gitRefForBranch(self, branch):
3462 if branch == "main":
3463 return self.refPrefix + "master"
3464
3465 if len(branch) <= 0:
3466 return branch
3467
3468 return self.refPrefix + self.projectName + branch
3469
1ca3d710
SH
3470 def gitCommitByP4Change(self, ref, change):
3471 if self.verbose:
f2606b17 3472 print("looking in ref " + ref + " for change %s using bisect..." % change)
1ca3d710
SH
3473
3474 earliestCommit = ""
3475 latestCommit = parseRevision(ref)
3476
3477 while True:
3478 if self.verbose:
f2606b17 3479 print("trying: earliest %s latest %s" % (earliestCommit, latestCommit))
1ca3d710
SH
3480 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
3481 if len(next) == 0:
3482 if self.verbose:
f2606b17 3483 print("argh")
1ca3d710
SH
3484 return ""
3485 log = extractLogMessageFromGitCommit(next)
3486 settings = extractSettingsGitLog(log)
3487 currentChange = int(settings['change'])
3488 if self.verbose:
f2606b17 3489 print("current change %s" % currentChange)
1ca3d710
SH
3490
3491 if currentChange == change:
3492 if self.verbose:
f2606b17 3493 print("found %s" % next)
1ca3d710
SH
3494 return next
3495
3496 if currentChange < change:
3497 earliestCommit = "^%s" % next
3498 else:
2dda7412
AM
3499 if next == latestCommit:
3500 die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change))
3501 latestCommit = "%s^@" % next
1ca3d710
SH
3502
3503 return ""
3504
3505 def importNewBranch(self, branch, maxChange):
3506 # make fast-import flush all changes to disk and update the refs using the checkpoint
3507 # command so that we can try to find the branch parent in the git history
3508 self.gitStream.write("checkpoint\n\n");
3509 self.gitStream.flush();
3510 branchPrefix = self.depotPaths[0] + branch + "/"
3511 range = "@1,%s" % maxChange
3512 #print "prefix" + branchPrefix
96b2d54a 3513 changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
1ca3d710
SH
3514 if len(changes) <= 0:
3515 return False
3516 firstChange = changes[0]
3517 #print "first change in branch: %s" % firstChange
3518 sourceBranch = self.knownBranches[branch]
3519 sourceDepotPath = self.depotPaths[0] + sourceBranch
3520 sourceRef = self.gitRefForBranch(sourceBranch)
3521 #print "source " + sourceBranch
3522
52a4880b 3523 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
1ca3d710
SH
3524 #print "branch parent: %s" % branchParentChange
3525 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
3526 if len(gitParent) > 0:
3527 self.initialParents[self.gitRefForBranch(branch)] = gitParent
3528 #print "parent git commit: %s" % gitParent
3529
3530 self.importChanges(changes)
3531 return True
3532
fed23693 3533 def searchParent(self, parent, branch, target):
6b79818b
JK
3534 targetTree = read_pipe(["git", "rev-parse",
3535 "{}^{{tree}}".format(target)]).strip()
3536 for line in read_pipe_lines(["git", "rev-list", "--format=%H %T",
c7d34884 3537 "--no-merges", parent]):
6b79818b
JK
3538 if line.startswith("commit "):
3539 continue
3540 commit, tree = line.strip().split(" ")
3541 if tree == targetTree:
fed23693 3542 if self.verbose:
6b79818b
JK
3543 print("Found parent of %s in commit %s" % (branch, commit))
3544 return commit
3545 return None
fed23693 3546
89143ac2 3547 def importChanges(self, changes, origin_revision=0):
e87f37ae
SH
3548 cnt = 1
3549 for change in changes:
89143ac2 3550 description = p4_describe(change)
e87f37ae
SH
3551 self.updateOptionDict(description)
3552
3553 if not self.silent:
0f829620
JH
3554 sys.stdout.write("\rImporting revision %s (%d%%)" % (
3555 change, (cnt * 100) // len(changes)))
e87f37ae
SH
3556 sys.stdout.flush()
3557 cnt = cnt + 1
3558
3559 try:
3560 if self.detectBranches:
3561 branches = self.splitFilesIntoBranches(description)
3562 for branch in branches.keys():
3563 ## HACK --hwn
3564 branchPrefix = self.depotPaths[0] + branch + "/"
e63231e5 3565 self.branchPrefixes = [ branchPrefix ]
e87f37ae
SH
3566
3567 parent = ""
3568
3569 filesForCommit = branches[branch]
3570
3571 if self.verbose:
f2606b17 3572 print("branch is %s" % branch)
e87f37ae
SH
3573
3574 self.updatedBranches.add(branch)
3575
3576 if branch not in self.createdBranches:
3577 self.createdBranches.add(branch)
3578 parent = self.knownBranches[branch]
3579 if parent == branch:
3580 parent = ""
1ca3d710
SH
3581 else:
3582 fullBranch = self.projectName + branch
3583 if fullBranch not in self.p4BranchesInGit:
3584 if not self.silent:
3585 print("\n Importing new branch %s" % fullBranch);
3586 if self.importNewBranch(branch, change - 1):
3587 parent = ""
3588 self.p4BranchesInGit.append(fullBranch)
3589 if not self.silent:
3590 print("\n Resuming with change %s" % change);
3591
3592 if self.verbose:
f2606b17 3593 print("parent determined through known branches: %s" % parent)
e87f37ae 3594
8134f69c
SH
3595 branch = self.gitRefForBranch(branch)
3596 parent = self.gitRefForBranch(parent)
e87f37ae
SH
3597
3598 if self.verbose:
f2606b17 3599 print("looking for initial parent for %s; current parent is %s" % (branch, parent))
e87f37ae
SH
3600
3601 if len(parent) == 0 and branch in self.initialParents:
3602 parent = self.initialParents[branch]
3603 del self.initialParents[branch]
3604
fed23693
VA
3605 blob = None
3606 if len(parent) > 0:
4f9273d2 3607 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
fed23693 3608 if self.verbose:
f2606b17 3609 print("Creating temporary branch: " + tempBranch)
e63231e5 3610 self.commit(description, filesForCommit, tempBranch)
fed23693
VA
3611 self.tempBranches.append(tempBranch)
3612 self.checkpoint()
3613 blob = self.searchParent(parent, branch, tempBranch)
3614 if blob:
e63231e5 3615 self.commit(description, filesForCommit, branch, blob)
fed23693
VA
3616 else:
3617 if self.verbose:
f2606b17 3618 print("Parent of %s not found. Committing into head of %s" % (branch, parent))
e63231e5 3619 self.commit(description, filesForCommit, branch, parent)
e87f37ae 3620 else:
89143ac2 3621 files = self.extractFilesFromCommit(description)
e63231e5 3622 self.commit(description, files, self.branch,
e87f37ae 3623 self.initialParent)
47497844 3624 # only needed once, to connect to the previous commit
e87f37ae
SH
3625 self.initialParent = ""
3626 except IOError:
f2606b17 3627 print(self.gitError.read())
e87f37ae
SH
3628 sys.exit(1)
3629
b9d34db9
LD
3630 def sync_origin_only(self):
3631 if self.syncWithOrigin:
3632 self.hasOrigin = originP4BranchesExist()
3633 if self.hasOrigin:
3634 if not self.silent:
f2606b17 3635 print('Syncing with origin first, using "git fetch origin"')
b9d34db9
LD
3636 system("git fetch origin")
3637
c208a243 3638 def importHeadRevision(self, revision):
f2606b17 3639 print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch))
c208a243 3640
4e2e6ce4
PW
3641 details = {}
3642 details["user"] = "git perforce import user"
1494fcbb 3643 details["desc"] = ("Initial import of %s from the state at revision %s\n"
c208a243
SH
3644 % (' '.join(self.depotPaths), revision))
3645 details["change"] = revision
3646 newestRevision = 0
3647
3648 fileCnt = 0
6de040df
LD
3649 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
3650
3651 for info in p4CmdList(["files"] + fileArgs):
c208a243 3652
68b28593 3653 if 'code' in info and info['code'] == 'error':
c208a243
SH
3654 sys.stderr.write("p4 returned an error: %s\n"
3655 % info['data'])
d88e707f
PW
3656 if info['data'].find("must refer to client") >= 0:
3657 sys.stderr.write("This particular p4 error is misleading.\n")
3658 sys.stderr.write("Perhaps the depot path was misspelled.\n");
3659 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
c208a243 3660 sys.exit(1)
68b28593
PW
3661 if 'p4ExitCode' in info:
3662 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
c208a243
SH
3663 sys.exit(1)
3664
3665
3666 change = int(info["change"])
3667 if change > newestRevision:
3668 newestRevision = change
3669
56c09345 3670 if info["action"] in self.delete_actions:
c208a243
SH
3671 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
3672 #fileCnt = fileCnt + 1
3673 continue
3674
3675 for prop in ["depotFile", "rev", "action", "type" ]:
3676 details["%s%s" % (prop, fileCnt)] = info[prop]
3677
3678 fileCnt = fileCnt + 1
3679
3680 details["change"] = newestRevision
4e2e6ce4 3681
9dcb9f24 3682 # Use time from top-most change so that all git p4 clones of
4e2e6ce4 3683 # the same p4 repo have the same commit SHA1s.
18fa13d0
PW
3684 res = p4_describe(newestRevision)
3685 details["time"] = res["time"]
4e2e6ce4 3686
c208a243
SH
3687 self.updateOptionDict(details)
3688 try:
e63231e5 3689 self.commit(details, self.extractFilesFromCommit(details), self.branch)
de5abb5f 3690 except IOError as err:
f2606b17 3691 print("IO error with git fast-import. Is your git version recent enough?")
de5abb5f 3692 print("IO error details: {}".format(err))
f2606b17 3693 print(self.gitError.read())
c208a243 3694
ca5b5cce
LD
3695
3696 def importRevisions(self, args, branch_arg_given):
3697 changes = []
3698
3699 if len(self.changesFile) > 0:
43f33e49
LD
3700 with open(self.changesFile) as f:
3701 output = f.readlines()
ca5b5cce
LD
3702 changeSet = set()
3703 for line in output:
3704 changeSet.add(int(line))
3705
3706 for change in changeSet:
3707 changes.append(change)
3708
3709 changes.sort()
3710 else:
3711 # catch "git p4 sync" with no new branches, in a repo that
3712 # does not have any existing p4 branches
3713 if len(args) == 0:
3714 if not self.p4BranchesInGit:
6026aff5 3715 raise P4CommandException("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
ca5b5cce
LD
3716
3717 # The default branch is master, unless --branch is used to
3718 # specify something else. Make sure it exists, or complain
3719 # nicely about how to use --branch.
3720 if not self.detectBranches:
3721 if not branch_exists(self.branch):
3722 if branch_arg_given:
6026aff5 3723 raise P4CommandException("Error: branch %s does not exist." % self.branch)
ca5b5cce 3724 else:
6026aff5 3725 raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." %
ca5b5cce
LD
3726 self.branch)
3727
3728 if self.verbose:
3729 print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
3730 self.changeRange))
3731 changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
3732
3733 if len(self.maxChanges) > 0:
3734 changes = changes[:min(int(self.maxChanges), len(changes))]
3735
3736 if len(changes) == 0:
3737 if not self.silent:
3738 print("No changes to import!")
3739 else:
3740 if not self.silent and not self.detectBranches:
3741 print("Import destination: %s" % self.branch)
3742
3743 self.updatedBranches = set()
3744
3745 if not self.detectBranches:
3746 if args:
3747 # start a new branch
3748 self.initialParent = ""
3749 else:
3750 # build on a previous revision
3751 self.initialParent = parseRevision(self.branch)
3752
3753 self.importChanges(changes)
3754
3755 if not self.silent:
3756 print("")
3757 if len(self.updatedBranches) > 0:
3758 sys.stdout.write("Updated branches: ")
3759 for b in self.updatedBranches:
3760 sys.stdout.write("%s " % b)
3761 sys.stdout.write("\n")
3762
123f6317
LD
3763 def openStreams(self):
3764 self.importProcess = subprocess.Popen(["git", "fast-import"],
3765 stdin=subprocess.PIPE,
3766 stdout=subprocess.PIPE,
3767 stderr=subprocess.PIPE);
3768 self.gitOutput = self.importProcess.stdout
3769 self.gitStream = self.importProcess.stdin
3770 self.gitError = self.importProcess.stderr
c208a243 3771
86dca24b
YZ
3772 if bytes is not str:
3773 # Wrap gitStream.write() so that it can be called using `str` arguments
3774 def make_encoded_write(write):
3775 def encoded_write(s):
3776 return write(s.encode() if isinstance(s, str) else s)
3777 return encoded_write
3778
3779 self.gitStream.write = make_encoded_write(self.gitStream.write)
3780
123f6317 3781 def closeStreams(self):
837b3a63
LD
3782 if self.gitStream is None:
3783 return
123f6317
LD
3784 self.gitStream.close()
3785 if self.importProcess.wait() != 0:
3786 die("fast-import failed: %s" % self.gitError.read())
3787 self.gitOutput.close()
3788 self.gitError.close()
837b3a63 3789 self.gitStream = None
29bdbac1 3790
123f6317 3791 def run(self, args):
a028a98e
SH
3792 if self.importIntoRemotes:
3793 self.refPrefix = "refs/remotes/p4/"
3794 else:
db775559 3795 self.refPrefix = "refs/heads/p4/"
a028a98e 3796
b9d34db9 3797 self.sync_origin_only()
10f880f8 3798
5a8e84cd 3799 branch_arg_given = bool(self.branch)
569d1bd4 3800 if len(self.branch) == 0:
db775559 3801 self.branch = self.refPrefix + "master"
a028a98e 3802 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
48df6fd8 3803 system("git update-ref %s refs/heads/p4" % self.branch)
55d12437 3804 system("git branch -D p4")
967f72e2 3805
a93d33ee
PW
3806 # accept either the command-line option, or the configuration variable
3807 if self.useClientSpec:
3808 # will use this after clone to set the variable
3809 self.useClientSpec_from_options = True
3810 else:
0d609032 3811 if gitConfigBool("git-p4.useclientspec"):
09fca77b
PW
3812 self.useClientSpec = True
3813 if self.useClientSpec:
543987bd 3814 self.clientSpecDirs = getClientSpec()
3a70cdfa 3815
6a49f8e2
HWN
3816 # TODO: should always look at previous commits,
3817 # merge with previous imports, if possible.
3818 if args == []:
d414c74a 3819 if self.hasOrigin:
5ca44617 3820 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
3b650fc9
PW
3821
3822 # branches holds mapping from branch name to sha1
3823 branches = p4BranchesInGit(self.importIntoRemotes)
8c9e8b6e
PW
3824
3825 # restrict to just this one, disabling detect-branches
3826 if branch_arg_given:
3827 short = self.branch.split("/")[-1]
3828 if short in branches:
3829 self.p4BranchesInGit = [ short ]
3830 else:
3831 self.p4BranchesInGit = branches.keys()
abcd790f
SH
3832
3833 if len(self.p4BranchesInGit) > 1:
3834 if not self.silent:
f2606b17 3835 print("Importing from/into multiple branches")
abcd790f 3836 self.detectBranches = True
8c9e8b6e
PW
3837 for branch in branches.keys():
3838 self.initialParents[self.refPrefix + branch] = \
3839 branches[branch]
967f72e2 3840
29bdbac1 3841 if self.verbose:
f2606b17 3842 print("branches: %s" % self.p4BranchesInGit)
29bdbac1
SH
3843
3844 p4Change = 0
3845 for branch in self.p4BranchesInGit:
cebdf5af 3846 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
bb6e09b2
HWN
3847
3848 settings = extractSettingsGitLog(logMsg)
29bdbac1 3849
bb6e09b2 3850 self.readOptions(settings)
dba1c9d9
LD
3851 if ('depot-paths' in settings
3852 and 'change' in settings):
bb6e09b2 3853 change = int(settings['change']) + 1
29bdbac1
SH
3854 p4Change = max(p4Change, change)
3855
bb6e09b2
HWN
3856 depotPaths = sorted(settings['depot-paths'])
3857 if self.previousDepotPaths == []:
6326aa58 3858 self.previousDepotPaths = depotPaths
29bdbac1 3859 else:
6326aa58
HWN
3860 paths = []
3861 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
04d277b3
VA
3862 prev_list = prev.split("/")
3863 cur_list = cur.split("/")
3864 for i in range(0, min(len(cur_list), len(prev_list))):
fc35c9d5 3865 if cur_list[i] != prev_list[i]:
583e1707 3866 i = i - 1
6326aa58
HWN
3867 break
3868
04d277b3 3869 paths.append ("/".join(cur_list[:i + 1]))
6326aa58
HWN
3870
3871 self.previousDepotPaths = paths
29bdbac1
SH
3872
3873 if p4Change > 0:
bb6e09b2 3874 self.depotPaths = sorted(self.previousDepotPaths)
d5904674 3875 self.changeRange = "@%s,#head" % p4Change
341dc1c1 3876 if not self.silent and not self.detectBranches:
f2606b17 3877 print("Performing incremental import into %s git branch" % self.branch)
569d1bd4 3878
40d69ac3
PW
3879 # accept multiple ref name abbreviations:
3880 # refs/foo/bar/branch -> use it exactly
3881 # p4/branch -> prepend refs/remotes/ or refs/heads/
3882 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
f9162f6a 3883 if not self.branch.startswith("refs/"):
40d69ac3
PW
3884 if self.importIntoRemotes:
3885 prepend = "refs/remotes/"
3886 else:
3887 prepend = "refs/heads/"
3888 if not self.branch.startswith("p4/"):
3889 prepend += "p4/"
3890 self.branch = prepend + self.branch
179caebf 3891
6326aa58 3892 if len(args) == 0 and self.depotPaths:
b984733c 3893 if not self.silent:
f2606b17 3894 print("Depot paths: %s" % ' '.join(self.depotPaths))
b984733c 3895 else:
6326aa58 3896 if self.depotPaths and self.depotPaths != args:
f2606b17 3897 print("previous import used depot path %s and now %s was specified. "
6326aa58
HWN
3898 "This doesn't work!" % (' '.join (self.depotPaths),
3899 ' '.join (args)))
b984733c 3900 sys.exit(1)
6326aa58 3901
bb6e09b2 3902 self.depotPaths = sorted(args)
b984733c 3903
1c49fc19 3904 revision = ""
b984733c 3905 self.users = {}
b984733c 3906
58c8bc7c
PW
3907 # Make sure no revision specifiers are used when --changesfile
3908 # is specified.
3909 bad_changesfile = False
3910 if len(self.changesFile) > 0:
3911 for p in self.depotPaths:
3912 if p.find("@") >= 0 or p.find("#") >= 0:
3913 bad_changesfile = True
3914 break
3915 if bad_changesfile:
3916 die("Option --changesfile is incompatible with revision specifiers")
3917
6326aa58
HWN
3918 newPaths = []
3919 for p in self.depotPaths:
3920 if p.find("@") != -1:
3921 atIdx = p.index("@")
3922 self.changeRange = p[atIdx:]
3923 if self.changeRange == "@all":
3924 self.changeRange = ""
6a49f8e2 3925 elif ',' not in self.changeRange:
1c49fc19 3926 revision = self.changeRange
6326aa58 3927 self.changeRange = ""
7fcff9de 3928 p = p[:atIdx]
6326aa58
HWN
3929 elif p.find("#") != -1:
3930 hashIdx = p.index("#")
1c49fc19 3931 revision = p[hashIdx:]
7fcff9de 3932 p = p[:hashIdx]
6326aa58 3933 elif self.previousDepotPaths == []:
58c8bc7c
PW
3934 # pay attention to changesfile, if given, else import
3935 # the entire p4 tree at the head revision
3936 if len(self.changesFile) == 0:
3937 revision = "#head"
6326aa58
HWN
3938
3939 p = re.sub ("\.\.\.$", "", p)
3940 if not p.endswith("/"):
3941 p += "/"
3942
3943 newPaths.append(p)
3944
3945 self.depotPaths = newPaths
3946
e63231e5
PW
3947 # --detect-branches may change this for each branch
3948 self.branchPrefixes = self.depotPaths
3949
b607e71e 3950 self.loadUserMapFromCache()
cb53e1f8
SH
3951 self.labels = {}
3952 if self.detectLabels:
3953 self.getLabels();
b984733c 3954
4b97ffb1 3955 if self.detectBranches:
df450923
SH
3956 ## FIXME - what's a P4 projectName ?
3957 self.projectName = self.guessProjectName()
3958
38f9f5ec
SH
3959 if self.hasOrigin:
3960 self.getBranchMappingFromGitBranches()
3961 else:
3962 self.getBranchMapping()
29bdbac1 3963 if self.verbose:
f2606b17
LD
3964 print("p4-git branches: %s" % self.p4BranchesInGit)
3965 print("initial parents: %s" % self.initialParents)
29bdbac1
SH
3966 for b in self.p4BranchesInGit:
3967 if b != "master":
6326aa58
HWN
3968
3969 ## FIXME
29bdbac1
SH
3970 b = b[len(self.projectName):]
3971 self.createdBranches.add(b)
4b97ffb1 3972
19fa5ac3
LD
3973 p4_check_access()
3974
123f6317 3975 self.openStreams()
b984733c 3976
6026aff5 3977 err = None
341dc1c1 3978
6026aff5
LD
3979 try:
3980 if revision:
3981 self.importHeadRevision(revision)
3982 else:
3983 self.importRevisions(args, branch_arg_given)
b984733c 3984
6026aff5
LD
3985 if gitConfigBool("git-p4.importLabels"):
3986 self.importLabels = True
06804c76 3987
6026aff5
LD
3988 if self.importLabels:
3989 p4Labels = getP4Labels(self.depotPaths)
3990 gitTags = getGitTags()
b984733c 3991
6026aff5
LD
3992 missingP4Labels = p4Labels - gitTags
3993 self.importP4Labels(self.gitStream, missingP4Labels)
3994
3995 except P4CommandException as e:
3996 err = e
3997
3998 finally:
3999 self.closeStreams()
4000
4001 if err:
4002 die(str(err))
b984733c 4003
fed23693
VA
4004 # Cleanup temporary branches created during import
4005 if self.tempBranches != []:
4006 for branch in self.tempBranches:
4007 read_pipe("git update-ref -d %s" % branch)
4008 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
4009
55d12437
PW
4010 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
4011 # a convenient shortcut refname "p4".
4012 if self.importIntoRemotes:
4013 head_ref = self.refPrefix + "HEAD"
4014 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
4015 system(["git", "symbolic-ref", head_ref, self.branch])
4016
b984733c
SH
4017 return True
4018
01ce1fe9
SH
4019class P4Rebase(Command):
4020 def __init__(self):
4021 Command.__init__(self)
06804c76
LD
4022 self.options = [
4023 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
06804c76 4024 ]
06804c76 4025 self.importLabels = False
cebdf5af
HWN
4026 self.description = ("Fetches the latest revision from perforce and "
4027 + "rebases the current work (branch) against it")
01ce1fe9
SH
4028
4029 def run(self, args):
4030 sync = P4Sync()
06804c76 4031 sync.importLabels = self.importLabels
01ce1fe9 4032 sync.run([])
d7e3868c 4033
14594f4b
SH
4034 return self.rebase()
4035
4036 def rebase(self):
36ee4ee4 4037 if os.system("git update-index --refresh") != 0:
7560f547 4038 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 4039 if len(read_pipe("git diff-index HEAD --")) > 0:
f7e604ed 4040 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
36ee4ee4 4041
d7e3868c
SH
4042 [upstream, settings] = findUpstreamBranchPoint()
4043 if len(upstream) == 0:
4044 die("Cannot find upstream branchpoint for rebase")
4045
4046 # the branchpoint may be p4/foo~3, so strip off the parent
4047 upstream = re.sub("~[0-9]+$", "", upstream)
4048
f2606b17 4049 print("Rebasing the current branch onto %s" % upstream)
b25b2065 4050 oldHead = read_pipe("git rev-parse HEAD").strip()
d7e3868c 4051 system("git rebase %s" % upstream)
4e49d95e 4052 system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
01ce1fe9
SH
4053 return True
4054
f9a3a4f7
SH
4055class P4Clone(P4Sync):
4056 def __init__(self):
4057 P4Sync.__init__(self)
4058 self.description = "Creates a new git repository and imports from Perforce into it"
bb6e09b2 4059 self.usage = "usage: %prog [options] //depot/path[@revRange]"
354081d5 4060 self.options += [
bb6e09b2
HWN
4061 optparse.make_option("--destination", dest="cloneDestination",
4062 action='store', default=None,
354081d5 4063 help="where to leave result of the clone"),
38200076
PW
4064 optparse.make_option("--bare", dest="cloneBare",
4065 action="store_true", default=False),
354081d5 4066 ]
bb6e09b2 4067 self.cloneDestination = None
f9a3a4f7 4068 self.needsGit = False
38200076 4069 self.cloneBare = False
f9a3a4f7 4070
6a49f8e2
HWN
4071 def defaultDestination(self, args):
4072 ## TODO: use common prefix of args?
4073 depotPath = args[0]
4074 depotDir = re.sub("(@[^@]*)$", "", depotPath)
4075 depotDir = re.sub("(#[^#]*)$", "", depotDir)
053d9e43 4076 depotDir = re.sub(r"\.\.\.$", "", depotDir)
6a49f8e2
HWN
4077 depotDir = re.sub(r"/$", "", depotDir)
4078 return os.path.split(depotDir)[1]
4079
f9a3a4f7
SH
4080 def run(self, args):
4081 if len(args) < 1:
4082 return False
bb6e09b2
HWN
4083
4084 if self.keepRepoPath and not self.cloneDestination:
4085 sys.stderr.write("Must specify destination for --keep-path\n")
4086 sys.exit(1)
f9a3a4f7 4087
6326aa58 4088 depotPaths = args
5e100b5c
SH
4089
4090 if not self.cloneDestination and len(depotPaths) > 1:
4091 self.cloneDestination = depotPaths[-1]
4092 depotPaths = depotPaths[:-1]
4093
6326aa58
HWN
4094 for p in depotPaths:
4095 if not p.startswith("//"):
0f487d30 4096 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
6326aa58 4097 return False
f9a3a4f7 4098
bb6e09b2 4099 if not self.cloneDestination:
98ad4faf 4100 self.cloneDestination = self.defaultDestination(args)
f9a3a4f7 4101
f2606b17 4102 print("Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination))
38200076 4103
c3bf3f13
KG
4104 if not os.path.exists(self.cloneDestination):
4105 os.makedirs(self.cloneDestination)
053fd0c1 4106 chdir(self.cloneDestination)
38200076
PW
4107
4108 init_cmd = [ "git", "init" ]
4109 if self.cloneBare:
4110 init_cmd.append("--bare")
a235e85c
BC
4111 retcode = subprocess.call(init_cmd)
4112 if retcode:
4113 raise CalledProcessError(retcode, init_cmd)
38200076 4114
6326aa58 4115 if not P4Sync.run(self, depotPaths):
f9a3a4f7 4116 return False
c595956d
PW
4117
4118 # create a master branch and check out a work tree
4119 if gitBranchExists(self.branch):
1b09d191 4120 system([ "git", "branch", currentGitBranch(), self.branch ])
c595956d
PW
4121 if not self.cloneBare:
4122 system([ "git", "checkout", "-f" ])
4123 else:
f2606b17
LD
4124 print('Not checking out any branch, use ' \
4125 '"git checkout -q -b master <branch>"')
86dff6b6 4126
a93d33ee
PW
4127 # auto-set this variable if invoked with --use-client-spec
4128 if self.useClientSpec_from_options:
4129 system("git config --bool git-p4.useclientspec true")
4130
f9a3a4f7
SH
4131 return True
4132
123f6317
LD
4133class P4Unshelve(Command):
4134 def __init__(self):
4135 Command.__init__(self)
4136 self.options = []
4137 self.origin = "HEAD"
4138 self.description = "Unshelve a P4 changelist into a git commit"
4139 self.usage = "usage: %prog [options] changelist"
4140 self.options += [
4141 optparse.make_option("--origin", dest="origin",
4142 help="Use this base revision instead of the default (%s)" % self.origin),
4143 ]
4144 self.verbose = False
4145 self.noCommit = False
08813127 4146 self.destbranch = "refs/remotes/p4-unshelved"
123f6317
LD
4147
4148 def renameBranch(self, branch_name):
4149 """ Rename the existing branch to branch_name.N
4150 """
4151
4152 found = True
4153 for i in range(0,1000):
4154 backup_branch_name = "{0}.{1}".format(branch_name, i)
4155 if not gitBranchExists(backup_branch_name):
4156 gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
4157 gitDeleteRef(branch_name)
4158 found = True
4159 print("renamed old unshelve branch to {0}".format(backup_branch_name))
4160 break
4161
4162 if not found:
4163 sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
4164
4165 def findLastP4Revision(self, starting_point):
4166 """ Look back from starting_point for the first commit created by git-p4
4167 to find the P4 commit we are based on, and the depot-paths.
4168 """
4169
4170 for parent in (range(65535)):
0acbf599 4171 log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
123f6317 4172 settings = extractSettingsGitLog(log)
dba1c9d9 4173 if 'change' in settings:
123f6317
LD
4174 return settings
4175
4176 sys.exit("could not find git-p4 commits in {0}".format(self.origin))
4177
89143ac2
LD
4178 def createShelveParent(self, change, branch_name, sync, origin):
4179 """ Create a commit matching the parent of the shelved changelist 'change'
4180 """
4181 parent_description = p4_describe(change, shelved=True)
4182 parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change)
4183 files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change)
4184
4185 parent_files = []
4186 for f in files:
4187 # if it was added in the shelved changelist, it won't exist in the parent
4188 if f['action'] in self.add_actions:
4189 continue
4190
4191 # if it was deleted in the shelved changelist it must not be deleted
4192 # in the parent - we might even need to create it if the origin branch
4193 # does not have it
4194 if f['action'] in self.delete_actions:
4195 f['action'] = 'add'
4196
4197 parent_files.append(f)
4198
4199 sync.commit(parent_description, parent_files, branch_name,
4200 parent=origin, allow_empty=True)
4201 print("created parent commit for {0} based on {1} in {2}".format(
4202 change, self.origin, branch_name))
4203
123f6317
LD
4204 def run(self, args):
4205 if len(args) != 1:
4206 return False
4207
4208 if not gitBranchExists(self.origin):
4209 sys.exit("origin branch {0} does not exist".format(self.origin))
4210
4211 sync = P4Sync()
4212 changes = args
123f6317 4213
89143ac2 4214 # only one change at a time
123f6317
LD
4215 change = changes[0]
4216
4217 # if the target branch already exists, rename it
4218 branch_name = "{0}/{1}".format(self.destbranch, change)
4219 if gitBranchExists(branch_name):
4220 self.renameBranch(branch_name)
4221 sync.branch = branch_name
4222
4223 sync.verbose = self.verbose
4224 sync.suppress_meta_comment = True
4225
4226 settings = self.findLastP4Revision(self.origin)
123f6317
LD
4227 sync.depotPaths = settings['depot-paths']
4228 sync.branchPrefixes = sync.depotPaths
4229
4230 sync.openStreams()
4231 sync.loadUserMapFromCache()
4232 sync.silent = True
89143ac2
LD
4233
4234 # create a commit for the parent of the shelved changelist
4235 self.createShelveParent(change, branch_name, sync, self.origin)
4236
4237 # create the commit for the shelved changelist itself
4238 description = p4_describe(change, True)
4239 files = sync.extractFilesFromCommit(description, True, change)
4240
4241 sync.commit(description, files, branch_name, "")
123f6317
LD
4242 sync.closeStreams()
4243
4244 print("unshelved changelist {0} into {1}".format(change, branch_name))
4245
4246 return True
4247
09d89de2
SH
4248class P4Branches(Command):
4249 def __init__(self):
4250 Command.__init__(self)
4251 self.options = [ ]
4252 self.description = ("Shows the git branches that hold imports and their "
4253 + "corresponding perforce depot paths")
4254 self.verbose = False
4255
4256 def run(self, args):
5ca44617
SH
4257 if originP4BranchesExist():
4258 createOrUpdateBranchesFromOrigin()
4259
09d89de2
SH
4260 cmdline = "git rev-parse --symbolic "
4261 cmdline += " --remotes"
4262
4263 for line in read_pipe_lines(cmdline):
4264 line = line.strip()
4265
4266 if not line.startswith('p4/') or line == "p4/HEAD":
4267 continue
4268 branch = line
4269
4270 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
4271 settings = extractSettingsGitLog(log)
4272
f2606b17 4273 print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]))
09d89de2
SH
4274 return True
4275
b984733c
SH
4276class HelpFormatter(optparse.IndentedHelpFormatter):
4277 def __init__(self):
4278 optparse.IndentedHelpFormatter.__init__(self)
4279
4280 def format_description(self, description):
4281 if description:
4282 return description + "\n"
4283 else:
4284 return ""
4f5cf76a 4285
86949eef 4286def printUsage(commands):
f2606b17
LD
4287 print("usage: %s <command> [options]" % sys.argv[0])
4288 print("")
4289 print("valid commands: %s" % ", ".join(commands))
4290 print("")
4291 print("Try %s <command> --help for command specific help." % sys.argv[0])
4292 print("")
86949eef
SH
4293
4294commands = {
b86f7378 4295 "submit" : P4Submit,
a9834f58 4296 "commit" : P4Submit,
b86f7378
HWN
4297 "sync" : P4Sync,
4298 "rebase" : P4Rebase,
4299 "clone" : P4Clone,
123f6317
LD
4300 "branches" : P4Branches,
4301 "unshelve" : P4Unshelve,
86949eef
SH
4302}
4303
bb6e09b2
HWN
4304def main():
4305 if len(sys.argv[1:]) == 0:
4306 printUsage(commands.keys())
4307 sys.exit(2)
4f5cf76a 4308
bb6e09b2
HWN
4309 cmdName = sys.argv[1]
4310 try:
b86f7378
HWN
4311 klass = commands[cmdName]
4312 cmd = klass()
bb6e09b2 4313 except KeyError:
f2606b17
LD
4314 print("unknown command %s" % cmdName)
4315 print("")
bb6e09b2
HWN
4316 printUsage(commands.keys())
4317 sys.exit(2)
4318
4319 options = cmd.options
b86f7378 4320 cmd.gitdir = os.environ.get("GIT_DIR", None)
bb6e09b2
HWN
4321
4322 args = sys.argv[2:]
4323
b0ccc80d 4324 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
6a10b6aa
LD
4325 if cmd.needsGit:
4326 options.append(optparse.make_option("--git-dir", dest="gitdir"))
bb6e09b2 4327
6a10b6aa
LD
4328 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
4329 options,
4330 description = cmd.description,
4331 formatter = HelpFormatter())
bb6e09b2 4332
608e3805
BK
4333 try:
4334 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
4335 except:
4336 parser.print_help()
4337 raise
4338
bb6e09b2
HWN
4339 global verbose
4340 verbose = cmd.verbose
4341 if cmd.needsGit:
b86f7378
HWN
4342 if cmd.gitdir == None:
4343 cmd.gitdir = os.path.abspath(".git")
4344 if not isValidGitDir(cmd.gitdir):
378f7be1 4345 # "rev-parse --git-dir" without arguments will try $PWD/.git
b86f7378
HWN
4346 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
4347 if os.path.exists(cmd.gitdir):
bb6e09b2
HWN
4348 cdup = read_pipe("git rev-parse --show-cdup").strip()
4349 if len(cdup) > 0:
053fd0c1 4350 chdir(cdup);
e20a9e53 4351
b86f7378
HWN
4352 if not isValidGitDir(cmd.gitdir):
4353 if isValidGitDir(cmd.gitdir + "/.git"):
4354 cmd.gitdir += "/.git"
bb6e09b2 4355 else:
b86f7378 4356 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
e20a9e53 4357
378f7be1 4358 # so git commands invoked from the P4 workspace will succeed
b86f7378 4359 os.environ["GIT_DIR"] = cmd.gitdir
86949eef 4360
bb6e09b2
HWN
4361 if not cmd.run(args):
4362 parser.print_help()
09fca77b 4363 sys.exit(2)
4f5cf76a 4364
4f5cf76a 4365
bb6e09b2
HWN
4366if __name__ == '__main__':
4367 main()