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