blob: 7bb9cadc69738a4348bb54ccce50d6bd35a0753f [file] [log] [blame]
Simon Hausmann86949ee2007-03-19 20:59:12 +01001#!/usr/bin/env python
2#
3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
4#
Simon Hausmannc8cbbee2007-05-28 14:43:25 +02005# Author: Simon Hausmann <simon@lst.de>
6# Copyright: 2007 Simon Hausmann <simon@lst.de>
Simon Hausmann83dce552007-03-19 22:26:36 +01007# 2007 Trolltech ASA
Simon Hausmann86949ee2007-03-19 20:59:12 +01008# License: MIT <http://www.opensource.org/licenses/mit-license.php>
9#
Eric S. Raymonda33faf22012-12-28 11:40:59 -050010import sys
11if sys.hexversion < 0x02040000:
12 # The limiter is the subprocess module
13 sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
14 sys.exit(1)
Pete Wyckofff629fa52013-01-26 22:11:05 -050015import os
16import optparse
17import marshal
18import subprocess
19import tempfile
20import time
21import platform
22import re
23import shutil
Pete Wyckoffd20f0f82013-01-26 22:11:19 -050024import stat
Lars Schneidera5db4b12015-09-26 09:55:03 +020025import zipfile
26import zlib
Dennis Kaarsemaker4b07cd22015-10-20 21:31:46 +020027import ctypes
Luke Diamanddf8a9e82016-12-17 01:00:40 +000028import errno
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -030029
Brandon Caseya235e852013-01-26 11:14:33 -080030try:
31 from subprocess import CalledProcessError
32except ImportError:
33 # from python2.7:subprocess.py
34 # Exception classes used by this module.
35 class CalledProcessError(Exception):
36 """This exception is raised when a process run by check_call() returns
37 a non-zero exit status. The exit status will be stored in the
38 returncode attribute."""
39 def __init__(self, returncode, cmd):
40 self.returncode = returncode
41 self.cmd = cmd
42 def __str__(self):
43 return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
44
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -030045verbose = False
Simon Hausmann86949ee2007-03-19 20:59:12 +010046
Luke Diamand06804c72012-04-11 17:21:24 +020047# Only labels/tags matching this will be imported/exported
Luke Diamandc8942a22012-04-11 17:21:24 +020048defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
Anand Kumria21a50752008-08-10 19:26:28 +010049
Luke Diamand1051ef02015-06-10 08:30:59 +010050# Grab changes in blocks of this many revisions, unless otherwise requested
51defaultBlockSize = 512
52
Anand Kumria21a50752008-08-10 19:26:28 +010053def p4_build_cmd(cmd):
54 """Build a suitable p4 command line.
55
56 This consolidates building and returning a p4 command line into one
57 location. It means that hooking into the environment, or other configuration
58 can be done more easily.
59 """
Luke Diamand6de040d2011-10-16 10:47:52 -040060 real_cmd = ["p4"]
Anand Kumriaabcaf072008-08-10 19:26:31 +010061
62 user = gitConfig("git-p4.user")
63 if len(user) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040064 real_cmd += ["-u",user]
Anand Kumriaabcaf072008-08-10 19:26:31 +010065
66 password = gitConfig("git-p4.password")
67 if len(password) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040068 real_cmd += ["-P", password]
Anand Kumriaabcaf072008-08-10 19:26:31 +010069
70 port = gitConfig("git-p4.port")
71 if len(port) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040072 real_cmd += ["-p", port]
Anand Kumriaabcaf072008-08-10 19:26:31 +010073
74 host = gitConfig("git-p4.host")
75 if len(host) > 0:
Russell Myers41799aa2012-02-22 11:16:05 -080076 real_cmd += ["-H", host]
Anand Kumriaabcaf072008-08-10 19:26:31 +010077
78 client = gitConfig("git-p4.client")
79 if len(client) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040080 real_cmd += ["-c", client]
Anand Kumriaabcaf072008-08-10 19:26:31 +010081
Lars Schneider89a6ecc2016-12-04 15:03:11 +010082 retries = gitConfigInt("git-p4.retries")
83 if retries is None:
84 # Perform 3 retries by default
85 retries = 3
Igor Kushnirbc233522016-12-29 12:22:23 +020086 if retries > 0:
87 # Provide a way to not pass this option by setting git-p4.retries to 0
88 real_cmd += ["-r", str(retries)]
Luke Diamand6de040d2011-10-16 10:47:52 -040089
90 if isinstance(cmd,basestring):
91 real_cmd = ' '.join(real_cmd) + ' ' + cmd
92 else:
93 real_cmd += cmd
Anand Kumria21a50752008-08-10 19:26:28 +010094 return real_cmd
95
Luke Diamand378f7be2016-12-13 21:51:28 +000096def git_dir(path):
97 """ Return TRUE if the given path is a git directory (/path/to/dir/.git).
98 This won't automatically add ".git" to a directory.
99 """
100 d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip()
101 if not d or len(d) == 0:
102 return None
103 else:
104 return d
105
Miklós Fazekasbbd84862013-03-11 17:45:29 -0400106def chdir(path, is_client_path=False):
107 """Do chdir to the given path, and set the PWD environment
108 variable for use by P4. It does not look at getcwd() output.
109 Since we're not using the shell, it is necessary to set the
110 PWD environment variable explicitly.
111
112 Normally, expand the path to force it to be absolute. This
113 addresses the use of relative path names inside P4 settings,
114 e.g. P4CONFIG=.p4config. P4 does not simply open the filename
115 as given; it looks for .p4config using PWD.
116
117 If is_client_path, the path was handed to us directly by p4,
118 and may be a symbolic link. Do not call os.getcwd() in this
119 case, because it will cause p4 to think that PWD is not inside
120 the client path.
121 """
122
123 os.chdir(path)
124 if not is_client_path:
125 path = os.getcwd()
126 os.environ['PWD'] = path
Robert Blum053fd0c2008-08-01 12:50:03 -0700127
Lars Schneider4d25dc42015-09-26 09:55:02 +0200128def calcDiskFree():
129 """Return free space in bytes on the disk of the given dirname."""
130 if platform.system() == 'Windows':
131 free_bytes = ctypes.c_ulonglong(0)
132 ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()), None, None, ctypes.pointer(free_bytes))
133 return free_bytes.value
134 else:
135 st = os.statvfs(os.getcwd())
136 return st.f_bavail * st.f_frsize
137
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -0300138def die(msg):
139 if verbose:
140 raise Exception(msg)
141 else:
142 sys.stderr.write(msg + "\n")
143 sys.exit(1)
144
Luke Diamand6de040d2011-10-16 10:47:52 -0400145def write_pipe(c, stdin):
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300146 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400147 sys.stderr.write('Writing pipe: %s\n' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300148
Luke Diamand6de040d2011-10-16 10:47:52 -0400149 expand = isinstance(c,basestring)
150 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
151 pipe = p.stdin
152 val = pipe.write(stdin)
153 pipe.close()
154 if p.wait():
155 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300156
157 return val
158
Luke Diamand6de040d2011-10-16 10:47:52 -0400159def p4_write_pipe(c, stdin):
Anand Kumriad9429192008-08-14 23:40:38 +0100160 real_cmd = p4_build_cmd(c)
Luke Diamand6de040d2011-10-16 10:47:52 -0400161 return write_pipe(real_cmd, stdin)
Anand Kumriad9429192008-08-14 23:40:38 +0100162
Luke Diamand78871bf2017-04-15 11:36:08 +0100163def read_pipe_full(c):
164 """ Read output from command. Returns a tuple
165 of the return status, stdout text and stderr
166 text.
167 """
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300168 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400169 sys.stderr.write('Reading pipe: %s\n' % str(c))
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -0300170
Luke Diamand6de040d2011-10-16 10:47:52 -0400171 expand = isinstance(c,basestring)
Lars Schneider1f5f3902015-09-21 12:01:41 +0200172 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
173 (out, err) = p.communicate()
Luke Diamand78871bf2017-04-15 11:36:08 +0100174 return (p.returncode, out, err)
175
176def read_pipe(c, ignore_error=False):
177 """ Read output from command. Returns the output text on
178 success. On failure, terminates execution, unless
179 ignore_error is True, when it returns an empty string.
180 """
181 (retcode, out, err) = read_pipe_full(c)
182 if retcode != 0:
183 if ignore_error:
184 out = ""
185 else:
186 die('Command failed: %s\nError: %s' % (str(c), err))
Lars Schneider1f5f3902015-09-21 12:01:41 +0200187 return out
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300188
Luke Diamand78871bf2017-04-15 11:36:08 +0100189def read_pipe_text(c):
190 """ Read output from a command with trailing whitespace stripped.
191 On error, returns None.
192 """
193 (retcode, out, err) = read_pipe_full(c)
194 if retcode != 0:
195 return None
196 else:
197 return out.rstrip()
198
Anand Kumriad9429192008-08-14 23:40:38 +0100199def p4_read_pipe(c, ignore_error=False):
200 real_cmd = p4_build_cmd(c)
201 return read_pipe(real_cmd, ignore_error)
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300202
Han-Wen Nienhuysbce4c5f2007-05-23 17:14:33 -0300203def read_pipe_lines(c):
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300204 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400205 sys.stderr.write('Reading pipe: %s\n' % str(c))
206
207 expand = isinstance(c, basestring)
208 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
209 pipe = p.stdout
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300210 val = pipe.readlines()
Luke Diamand6de040d2011-10-16 10:47:52 -0400211 if pipe.close() or p.wait():
212 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300213
214 return val
Simon Hausmanncaace112007-05-15 14:57:57 +0200215
Anand Kumria23181212008-08-10 19:26:24 +0100216def p4_read_pipe_lines(c):
217 """Specifically invoke p4 on the command supplied. """
Anand Kumria155af832008-08-10 19:26:30 +0100218 real_cmd = p4_build_cmd(c)
Anand Kumria23181212008-08-10 19:26:24 +0100219 return read_pipe_lines(real_cmd)
220
Gary Gibbons8e9497c2012-07-12 19:29:00 -0400221def p4_has_command(cmd):
222 """Ask p4 for help on this command. If it returns an error, the
223 command does not exist in this version of p4."""
224 real_cmd = p4_build_cmd(["help", cmd])
225 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
226 stderr=subprocess.PIPE)
227 p.communicate()
228 return p.returncode == 0
229
Pete Wyckoff249da4c2012-11-23 17:35:35 -0500230def p4_has_move_command():
231 """See if the move command exists, that it supports -k, and that
232 it has not been administratively disabled. The arguments
233 must be correct, but the filenames do not have to exist. Use
234 ones with wildcards so even if they exist, it will fail."""
235
236 if not p4_has_command("move"):
237 return False
238 cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
239 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
240 (out, err) = p.communicate()
241 # return code will be 1 in either case
242 if err.find("Invalid option") >= 0:
243 return False
244 if err.find("disabled") >= 0:
245 return False
246 # assume it failed because @... was invalid changelist
247 return True
248
Luke Diamandcbff4b22015-11-21 09:54:40 +0000249def system(cmd, ignore_error=False):
Luke Diamand6de040d2011-10-16 10:47:52 -0400250 expand = isinstance(cmd,basestring)
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300251 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400252 sys.stderr.write("executing %s\n" % str(cmd))
Brandon Caseya235e852013-01-26 11:14:33 -0800253 retcode = subprocess.call(cmd, shell=expand)
Luke Diamandcbff4b22015-11-21 09:54:40 +0000254 if retcode and not ignore_error:
Brandon Caseya235e852013-01-26 11:14:33 -0800255 raise CalledProcessError(retcode, cmd)
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -0300256
Luke Diamandcbff4b22015-11-21 09:54:40 +0000257 return retcode
258
Anand Kumriabf9320f2008-08-10 19:26:26 +0100259def p4_system(cmd):
260 """Specifically invoke p4 as the system command. """
Anand Kumria155af832008-08-10 19:26:30 +0100261 real_cmd = p4_build_cmd(cmd)
Luke Diamand6de040d2011-10-16 10:47:52 -0400262 expand = isinstance(real_cmd, basestring)
Brandon Caseya235e852013-01-26 11:14:33 -0800263 retcode = subprocess.call(real_cmd, shell=expand)
264 if retcode:
265 raise CalledProcessError(retcode, real_cmd)
Luke Diamand6de040d2011-10-16 10:47:52 -0400266
Pete Wyckoff7f0e5962013-01-26 22:11:13 -0500267_p4_version_string = None
268def p4_version_string():
269 """Read the version string, showing just the last line, which
270 hopefully is the interesting version bit.
271
272 $ p4 -V
273 Perforce - The Fast Software Configuration Management System.
274 Copyright 1995-2011 Perforce Software. All rights reserved.
275 Rev. P4/NTX86/2011.1/393975 (2011/12/16).
276 """
277 global _p4_version_string
278 if not _p4_version_string:
279 a = p4_read_pipe_lines(["-V"])
280 _p4_version_string = a[-1].rstrip()
281 return _p4_version_string
282
Luke Diamand6de040d2011-10-16 10:47:52 -0400283def p4_integrate(src, dest):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400284 p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400285
Pete Wyckoff8d7ec362012-04-29 20:57:14 -0400286def p4_sync(f, *options):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400287 p4_system(["sync"] + list(options) + [wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400288
289def p4_add(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400290 # forcibly add file names with wildcards
291 if wildcard_present(f):
292 p4_system(["add", "-f", f])
293 else:
294 p4_system(["add", f])
Luke Diamand6de040d2011-10-16 10:47:52 -0400295
296def p4_delete(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400297 p4_system(["delete", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400298
Romain Picarda02b8bc2016-01-12 13:43:47 +0100299def p4_edit(f, *options):
300 p4_system(["edit"] + list(options) + [wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400301
302def p4_revert(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400303 p4_system(["revert", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400304
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400305def p4_reopen(type, f):
306 p4_system(["reopen", "-t", type, wildcard_encode(f)])
Anand Kumriabf9320f2008-08-10 19:26:26 +0100307
Luke Diamand46c609e2016-12-02 22:43:19 +0000308def p4_reopen_in_change(changelist, files):
309 cmd = ["reopen", "-c", str(changelist)] + files
310 p4_system(cmd)
311
Gary Gibbons8e9497c2012-07-12 19:29:00 -0400312def p4_move(src, dest):
313 p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
314
Luke Diamand1051ef02015-06-10 08:30:59 +0100315def p4_last_change():
Miguel Torroja1997e912017-07-13 09:00:35 +0200316 results = p4CmdList(["changes", "-m", "1"], skip_info=True)
Luke Diamand1051ef02015-06-10 08:30:59 +0100317 return int(results[0]['change'])
318
Pete Wyckoff18fa13d2012-11-23 17:35:34 -0500319def p4_describe(change):
320 """Make sure it returns a valid result by checking for
321 the presence of field "time". Return a dict of the
322 results."""
323
Miguel Torroja1997e912017-07-13 09:00:35 +0200324 ds = p4CmdList(["describe", "-s", str(change)], skip_info=True)
Pete Wyckoff18fa13d2012-11-23 17:35:34 -0500325 if len(ds) != 1:
326 die("p4 describe -s %d did not return 1 result: %s" % (change, str(ds)))
327
328 d = ds[0]
329
330 if "p4ExitCode" in d:
331 die("p4 describe -s %d exited with %d: %s" % (change, d["p4ExitCode"],
332 str(d)))
333 if "code" in d:
334 if d["code"] == "error":
335 die("p4 describe -s %d returned error code: %s" % (change, str(d)))
336
337 if "time" not in d:
338 die("p4 describe -s %d returned no \"time\": %s" % (change, str(d)))
339
340 return d
341
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -0400342#
343# Canonicalize the p4 type and return a tuple of the
344# base type, plus any modifiers. See "p4 help filetypes"
345# for a list and explanation.
346#
347def split_p4_type(p4type):
David Brownb9fc6ea2007-09-19 13:12:48 -0700348
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -0400349 p4_filetypes_historical = {
350 "ctempobj": "binary+Sw",
351 "ctext": "text+C",
352 "cxtext": "text+Cx",
353 "ktext": "text+k",
354 "kxtext": "text+kx",
355 "ltext": "text+F",
356 "tempobj": "binary+FSw",
357 "ubinary": "binary+F",
358 "uresource": "resource+F",
359 "uxbinary": "binary+Fx",
360 "xbinary": "binary+x",
361 "xltext": "text+Fx",
362 "xtempobj": "binary+Swx",
363 "xtext": "text+x",
364 "xunicode": "unicode+x",
365 "xutf16": "utf16+x",
366 }
367 if p4type in p4_filetypes_historical:
368 p4type = p4_filetypes_historical[p4type]
369 mods = ""
370 s = p4type.split("+")
371 base = s[0]
372 mods = ""
373 if len(s) > 1:
374 mods = s[1]
375 return (base, mods)
376
Luke Diamand60df0712012-02-23 07:51:30 +0000377#
378# return the raw p4 type of a file (text, text+ko, etc)
379#
Pete Wyckoff79467e62014-01-21 18:16:45 -0500380def p4_type(f):
381 results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
Luke Diamand60df0712012-02-23 07:51:30 +0000382 return results[0]['headType']
383
384#
385# Given a type base and modifier, return a regexp matching
386# the keywords that can be expanded in the file
387#
388def p4_keywords_regexp_for_type(base, type_mods):
389 if base in ("text", "unicode", "binary"):
390 kwords = None
391 if "ko" in type_mods:
392 kwords = 'Id|Header'
393 elif "k" in type_mods:
394 kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'
395 else:
396 return None
397 pattern = r"""
398 \$ # Starts with a dollar, followed by...
399 (%s) # one of the keywords, followed by...
Pete Wyckoff6b2bf412012-11-04 17:04:02 -0500400 (:[^$\n]+)? # possibly an old expansion, followed by...
Luke Diamand60df0712012-02-23 07:51:30 +0000401 \$ # another dollar
402 """ % kwords
403 return pattern
404 else:
405 return None
406
407#
408# Given a file, return a regexp matching the possible
409# RCS keywords that will be expanded, or None for files
410# with kw expansion turned off.
411#
412def p4_keywords_regexp_for_file(file):
413 if not os.path.exists(file):
414 return None
415 else:
416 (type_base, type_mods) = split_p4_type(p4_type(file))
417 return p4_keywords_regexp_for_type(type_base, type_mods)
David Brownb9fc6ea2007-09-19 13:12:48 -0700418
Chris Pettittc65b6702007-11-01 20:43:14 -0700419def setP4ExecBit(file, mode):
420 # Reopens an already open file and changes the execute bit to match
421 # the execute bit setting in the passed in mode.
422
423 p4Type = "+x"
424
425 if not isModeExec(mode):
426 p4Type = getP4OpenedType(file)
427 p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type)
428 p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type)
429 if p4Type[-1] == "+":
430 p4Type = p4Type[0:-1]
431
Luke Diamand6de040d2011-10-16 10:47:52 -0400432 p4_reopen(p4Type, file)
Chris Pettittc65b6702007-11-01 20:43:14 -0700433
434def getP4OpenedType(file):
435 # Returns the perforce file type for the given file.
436
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400437 result = p4_read_pipe(["opened", wildcard_encode(file)])
Blair Holloway34a0dbf2015-04-04 09:46:03 +0100438 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
Chris Pettittc65b6702007-11-01 20:43:14 -0700439 if match:
440 return match.group(1)
441 else:
Marius Storm-Olsenf3e5ae42008-03-28 15:40:40 +0100442 die("Could not determine file type for %s (result: '%s')" % (file, result))
Chris Pettittc65b6702007-11-01 20:43:14 -0700443
Luke Diamand06804c72012-04-11 17:21:24 +0200444# Return the set of all p4 labels
445def getP4Labels(depotPaths):
446 labels = set()
447 if isinstance(depotPaths,basestring):
448 depotPaths = [depotPaths]
449
450 for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
451 label = l['label']
452 labels.add(label)
453
454 return labels
455
456# Return the set of all git tags
457def getGitTags():
458 gitTags = set()
459 for line in read_pipe_lines(["git", "tag"]):
460 tag = line.strip()
461 gitTags.add(tag)
462 return gitTags
463
Chris Pettittb43b0a32007-11-01 20:43:13 -0700464def diffTreePattern():
465 # This is a simple generator for the diff tree regex pattern. This could be
466 # a class variable if this and parseDiffTreeEntry were a part of a class.
467 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
468 while True:
469 yield pattern
470
471def parseDiffTreeEntry(entry):
472 """Parses a single diff tree entry into its component elements.
473
474 See git-diff-tree(1) manpage for details about the format of the diff
475 output. This method returns a dictionary with the following elements:
476
477 src_mode - The mode of the source file
478 dst_mode - The mode of the destination file
479 src_sha1 - The sha1 for the source file
480 dst_sha1 - The sha1 fr the destination file
481 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
482 status_score - The score for the status (applicable for 'C' and 'R'
483 statuses). This is None if there is no score.
484 src - The path for the source file.
485 dst - The path for the destination file. This is only present for
486 copy or renames. If it is not present, this is None.
487
488 If the pattern is not matched, None is returned."""
489
490 match = diffTreePattern().next().match(entry)
491 if match:
492 return {
493 'src_mode': match.group(1),
494 'dst_mode': match.group(2),
495 'src_sha1': match.group(3),
496 'dst_sha1': match.group(4),
497 'status': match.group(5),
498 'status_score': match.group(6),
499 'src': match.group(7),
500 'dst': match.group(10)
501 }
502 return None
503
Chris Pettittc65b6702007-11-01 20:43:14 -0700504def isModeExec(mode):
505 # Returns True if the given git mode represents an executable file,
506 # otherwise False.
507 return mode[-3:] == "755"
508
509def isModeExecChanged(src_mode, dst_mode):
510 return isModeExec(src_mode) != isModeExec(dst_mode)
511
Miguel Torroja1997e912017-07-13 09:00:35 +0200512def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False):
Luke Diamand6de040d2011-10-16 10:47:52 -0400513
514 if isinstance(cmd,basestring):
515 cmd = "-G " + cmd
516 expand = True
517 else:
518 cmd = ["-G"] + cmd
519 expand = False
520
521 cmd = p4_build_cmd(cmd)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -0300522 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400523 sys.stderr.write("Opening pipe: %s\n" % str(cmd))
Scott Lamb9f90c732007-07-15 20:58:10 -0700524
525 # Use a temporary file to avoid deadlocks without
526 # subprocess.communicate(), which would put another copy
527 # of stdout into memory.
528 stdin_file = None
529 if stdin is not None:
530 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
Luke Diamand6de040d2011-10-16 10:47:52 -0400531 if isinstance(stdin,basestring):
532 stdin_file.write(stdin)
533 else:
534 for i in stdin:
535 stdin_file.write(i + '\n')
Scott Lamb9f90c732007-07-15 20:58:10 -0700536 stdin_file.flush()
537 stdin_file.seek(0)
538
Luke Diamand6de040d2011-10-16 10:47:52 -0400539 p4 = subprocess.Popen(cmd,
540 shell=expand,
Scott Lamb9f90c732007-07-15 20:58:10 -0700541 stdin=stdin_file,
542 stdout=subprocess.PIPE)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100543
544 result = []
545 try:
546 while True:
Scott Lamb9f90c732007-07-15 20:58:10 -0700547 entry = marshal.load(p4.stdout)
Miguel Torroja1997e912017-07-13 09:00:35 +0200548 if skip_info:
549 if 'code' in entry and entry['code'] == 'info':
550 continue
Andrew Garberc3f61632011-04-07 02:01:21 -0400551 if cb is not None:
552 cb(entry)
553 else:
554 result.append(entry)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100555 except EOFError:
556 pass
Scott Lamb9f90c732007-07-15 20:58:10 -0700557 exitCode = p4.wait()
558 if exitCode != 0:
Simon Hausmannac3e0d72007-05-23 23:32:32 +0200559 entry = {}
560 entry["p4ExitCode"] = exitCode
561 result.append(entry)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100562
563 return result
564
565def p4Cmd(cmd):
566 list = p4CmdList(cmd)
567 result = {}
568 for entry in list:
569 result.update(entry)
570 return result;
571
Simon Hausmanncb2c9db2007-03-24 09:15:11 +0100572def p4Where(depotPath):
573 if not depotPath.endswith("/"):
574 depotPath += "/"
Vitor Antunescd884102015-04-21 23:49:30 +0100575 depotPathLong = depotPath + "..."
576 outputList = p4CmdList(["where", depotPathLong])
Tor Arvid Lund7f705dc2008-12-04 14:37:33 +0100577 output = None
578 for entry in outputList:
Tor Arvid Lund75bc9572008-12-09 16:41:50 +0100579 if "depotFile" in entry:
Vitor Antunescd884102015-04-21 23:49:30 +0100580 # Search for the base client side depot path, as long as it starts with the branch's P4 path.
581 # The base path always ends with "/...".
582 if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...":
Tor Arvid Lund75bc9572008-12-09 16:41:50 +0100583 output = entry
584 break
585 elif "data" in entry:
586 data = entry.get("data")
587 space = data.find(" ")
588 if data[:space] == depotPath:
589 output = entry
590 break
Tor Arvid Lund7f705dc2008-12-04 14:37:33 +0100591 if output == None:
592 return ""
Simon Hausmanndc524032007-05-21 09:34:56 +0200593 if output["code"] == "error":
594 return ""
Simon Hausmanncb2c9db2007-03-24 09:15:11 +0100595 clientPath = ""
596 if "path" in output:
597 clientPath = output.get("path")
598 elif "data" in output:
599 data = output.get("data")
600 lastSpace = data.rfind(" ")
601 clientPath = data[lastSpace + 1:]
602
603 if clientPath.endswith("..."):
604 clientPath = clientPath[:-3]
605 return clientPath
606
Simon Hausmann86949ee2007-03-19 20:59:12 +0100607def currentGitBranch():
Luke Diamandeff45112017-04-15 11:36:09 +0100608 return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"])
Simon Hausmann86949ee2007-03-19 20:59:12 +0100609
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100610def isValidGitDir(path):
Luke Diamand378f7be2016-12-13 21:51:28 +0000611 return git_dir(path) != None
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100612
Simon Hausmann463e8af2007-05-17 09:13:54 +0200613def parseRevision(ref):
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -0300614 return read_pipe("git rev-parse %s" % ref).strip()
Simon Hausmann463e8af2007-05-17 09:13:54 +0200615
Pete Wyckoff28755db2011-12-24 21:07:40 -0500616def branchExists(ref):
617 rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
618 ignore_error=True)
619 return len(rev) > 0
620
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100621def extractLogMessageFromGitCommit(commit):
622 logMessage = ""
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300623
624 ## fixme: title is first line of commit, not 1st paragraph.
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100625 foundTitle = False
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300626 for log in read_pipe_lines("git cat-file commit %s" % commit):
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100627 if not foundTitle:
628 if len(log) == 1:
Simon Hausmann1c094182007-05-01 23:15:48 +0200629 foundTitle = True
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100630 continue
631
632 logMessage += log
633 return logMessage
634
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300635def extractSettingsGitLog(log):
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100636 values = {}
637 for line in log.split("\n"):
638 line = line.strip()
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -0300639 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
640 if not m:
641 continue
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100642
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -0300643 assignments = m.group(1).split (':')
644 for a in assignments:
645 vals = a.split ('=')
646 key = vals[0].strip()
647 val = ('='.join (vals[1:])).strip()
648 if val.endswith ('\"') and val.startswith('"'):
649 val = val[1:-1]
650
651 values[key] = val
652
Simon Hausmann845b42c2007-06-07 09:19:34 +0200653 paths = values.get("depot-paths")
654 if not paths:
655 paths = values.get("depot-path")
Simon Hausmanna3fdd572007-06-07 22:54:32 +0200656 if paths:
657 values['depot-paths'] = paths.split(',')
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300658 return values
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100659
Simon Hausmann8136a632007-03-22 21:27:14 +0100660def gitBranchExists(branch):
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300661 proc = subprocess.Popen(["git", "rev-parse", branch],
662 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
Simon Hausmanncaace112007-05-15 14:57:57 +0200663 return proc.wait() == 0;
Simon Hausmann8136a632007-03-22 21:27:14 +0100664
John Chapman36bd8442008-11-08 14:22:49 +1100665_gitConfig = {}
Pete Wyckoffb345d6c2013-01-26 22:11:23 -0500666
Lars Schneider692e1792015-09-26 09:54:58 +0200667def gitConfig(key, typeSpecifier=None):
John Chapman36bd8442008-11-08 14:22:49 +1100668 if not _gitConfig.has_key(key):
Lars Schneider692e1792015-09-26 09:54:58 +0200669 cmd = [ "git", "config" ]
670 if typeSpecifier:
671 cmd += [ typeSpecifier ]
672 cmd += [ key ]
Pete Wyckoffb345d6c2013-01-26 22:11:23 -0500673 s = read_pipe(cmd, ignore_error=True)
674 _gitConfig[key] = s.strip()
John Chapman36bd8442008-11-08 14:22:49 +1100675 return _gitConfig[key]
Simon Hausmann01265102007-05-25 10:36:10 +0200676
Pete Wyckoff0d609032013-01-26 22:11:24 -0500677def gitConfigBool(key):
678 """Return a bool, using git config --bool. It is True only if the
679 variable is set to true, and False if set to false or not present
680 in the config."""
681
682 if not _gitConfig.has_key(key):
Lars Schneider692e1792015-09-26 09:54:58 +0200683 _gitConfig[key] = gitConfig(key, '--bool') == "true"
Simon Hausmann062410b2007-07-18 10:56:31 +0200684 return _gitConfig[key]
685
Lars Schneidercb1dafd2015-09-26 09:54:59 +0200686def gitConfigInt(key):
687 if not _gitConfig.has_key(key):
688 cmd = [ "git", "config", "--int", key ]
Simon Hausmannb9847332007-03-20 20:54:23 +0100689 s = read_pipe(cmd, ignore_error=True)
Simon Hausmann062410b2007-07-18 10:56:31 +0200690 v = s.strip()
Lars Schneidercb1dafd2015-09-26 09:54:59 +0200691 try:
692 _gitConfig[key] = int(gitConfig(key, '--int'))
693 except ValueError:
694 _gitConfig[key] = None
Simon Hausmann062410b2007-07-18 10:56:31 +0200695 return _gitConfig[key]
696
Vitor Antunes7199cf12011-08-19 00:44:05 +0100697def gitConfigList(key):
698 if not _gitConfig.has_key(key):
Pete Wyckoff2abba302013-01-26 22:11:22 -0500699 s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
George Vanburghc3c2b052017-01-25 09:17:29 +0000700 _gitConfig[key] = s.strip().splitlines()
Lars Schneider7960e702015-09-26 09:55:00 +0200701 if _gitConfig[key] == ['']:
702 _gitConfig[key] = []
Vitor Antunes7199cf12011-08-19 00:44:05 +0100703 return _gitConfig[key]
704
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500705def p4BranchesInGit(branchesAreInRemotes=True):
706 """Find all the branches whose names start with "p4/", looking
707 in remotes or heads as specified by the argument. Return
708 a dictionary of { branch: revision } for each one found.
709 The branch names are the short names, without any
710 "p4/" prefix."""
711
Simon Hausmann062410b2007-07-18 10:56:31 +0200712 branches = {}
713
714 cmdline = "git rev-parse --symbolic "
715 if branchesAreInRemotes:
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500716 cmdline += "--remotes"
Simon Hausmann062410b2007-07-18 10:56:31 +0200717 else:
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500718 cmdline += "--branches"
Simon Hausmann062410b2007-07-18 10:56:31 +0200719
720 for line in read_pipe_lines(cmdline):
721 line = line.strip()
722
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500723 # only import to p4/
724 if not line.startswith('p4/'):
Simon Hausmann062410b2007-07-18 10:56:31 +0200725 continue
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500726 # special symbolic ref to p4/master
727 if line == "p4/HEAD":
728 continue
Simon Hausmann062410b2007-07-18 10:56:31 +0200729
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500730 # strip off p4/ prefix
731 branch = line[len("p4/"):]
Simon Hausmann062410b2007-07-18 10:56:31 +0200732
733 branches[branch] = parseRevision(line)
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500734
Simon Hausmann062410b2007-07-18 10:56:31 +0200735 return branches
736
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -0500737def branch_exists(branch):
738 """Make sure that the given ref name really exists."""
739
740 cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
741 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
742 out, _ = p.communicate()
743 if p.returncode:
744 return False
745 # expect exactly one line of output: the branch name
746 return out.rstrip() == branch
747
Simon Hausmann9ceab362007-06-22 00:01:57 +0200748def findUpstreamBranchPoint(head = "HEAD"):
Simon Hausmann86506fe2007-07-18 12:40:12 +0200749 branches = p4BranchesInGit()
750 # map from depot-path to branch name
751 branchByDepotPath = {}
752 for branch in branches.keys():
753 tip = branches[branch]
754 log = extractLogMessageFromGitCommit(tip)
755 settings = extractSettingsGitLog(log)
756 if settings.has_key("depot-paths"):
757 paths = ",".join(settings["depot-paths"])
758 branchByDepotPath[paths] = "remotes/p4/" + branch
759
Simon Hausmann27d2d812007-06-12 14:31:59 +0200760 settings = None
Simon Hausmann27d2d812007-06-12 14:31:59 +0200761 parent = 0
762 while parent < 65535:
Simon Hausmann9ceab362007-06-22 00:01:57 +0200763 commit = head + "~%s" % parent
Simon Hausmann27d2d812007-06-12 14:31:59 +0200764 log = extractLogMessageFromGitCommit(commit)
765 settings = extractSettingsGitLog(log)
Simon Hausmann86506fe2007-07-18 12:40:12 +0200766 if settings.has_key("depot-paths"):
767 paths = ",".join(settings["depot-paths"])
768 if branchByDepotPath.has_key(paths):
769 return [branchByDepotPath[paths], settings]
Simon Hausmann27d2d812007-06-12 14:31:59 +0200770
Simon Hausmann86506fe2007-07-18 12:40:12 +0200771 parent = parent + 1
Simon Hausmann27d2d812007-06-12 14:31:59 +0200772
Simon Hausmann86506fe2007-07-18 12:40:12 +0200773 return ["", settings]
Simon Hausmann27d2d812007-06-12 14:31:59 +0200774
Simon Hausmann5ca44612007-08-24 17:44:16 +0200775def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
776 if not silent:
777 print ("Creating/updating branch(es) in %s based on origin branch(es)"
778 % localRefPrefix)
779
780 originPrefix = "origin/p4/"
781
782 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
783 line = line.strip()
784 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
785 continue
786
787 headName = line[len(originPrefix):]
788 remoteHead = localRefPrefix + headName
789 originHead = line
790
791 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
792 if (not original.has_key('depot-paths')
793 or not original.has_key('change')):
794 continue
795
796 update = False
797 if not gitBranchExists(remoteHead):
798 if verbose:
799 print "creating %s" % remoteHead
800 update = True
801 else:
802 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
803 if settings.has_key('change') > 0:
804 if settings['depot-paths'] == original['depot-paths']:
805 originP4Change = int(original['change'])
806 p4Change = int(settings['change'])
807 if originP4Change > p4Change:
808 print ("%s (%s) is newer than %s (%s). "
809 "Updating p4 branch from origin."
810 % (originHead, originP4Change,
811 remoteHead, p4Change))
812 update = True
813 else:
814 print ("Ignoring: %s was imported from %s while "
815 "%s was imported from %s"
816 % (originHead, ','.join(original['depot-paths']),
817 remoteHead, ','.join(settings['depot-paths'])))
818
819 if update:
820 system("git update-ref %s %s" % (remoteHead, originHead))
821
822def originP4BranchesExist():
823 return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
824
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200825
Luke Diamand1051ef02015-06-10 08:30:59 +0100826def p4ParseNumericChangeRange(parts):
827 changeStart = int(parts[0][1:])
828 if parts[1] == '#head':
829 changeEnd = p4_last_change()
830 else:
831 changeEnd = int(parts[1])
832
833 return (changeStart, changeEnd)
834
835def chooseBlockSize(blockSize):
836 if blockSize:
837 return blockSize
838 else:
839 return defaultBlockSize
840
841def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
842 assert depotPaths
843
844 # Parse the change range into start and end. Try to find integer
845 # revision ranges as these can be broken up into blocks to avoid
846 # hitting server-side limits (maxrows, maxscanresults). But if
847 # that doesn't work, fall back to using the raw revision specifier
848 # strings, without using block mode.
849
Lex Spoon96b2d542015-04-20 11:00:20 -0400850 if changeRange is None or changeRange == '':
Luke Diamand1051ef02015-06-10 08:30:59 +0100851 changeStart = 1
852 changeEnd = p4_last_change()
853 block_size = chooseBlockSize(requestedBlockSize)
Lex Spoon96b2d542015-04-20 11:00:20 -0400854 else:
855 parts = changeRange.split(',')
856 assert len(parts) == 2
Luke Diamand1051ef02015-06-10 08:30:59 +0100857 try:
858 (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
859 block_size = chooseBlockSize(requestedBlockSize)
860 except:
861 changeStart = parts[0][1:]
862 changeEnd = parts[1]
863 if requestedBlockSize:
864 die("cannot use --changes-block-size with non-numeric revisions")
865 block_size = None
Lex Spoon96b2d542015-04-20 11:00:20 -0400866
George Vanburgh9943e5b2016-12-17 22:11:23 +0000867 changes = set()
Lex Spoon96b2d542015-04-20 11:00:20 -0400868
Sam Hocevar1f90a642015-12-19 09:39:40 +0000869 # Retrieve changes a block at a time, to prevent running
870 # into a MaxResults/MaxScanRows error from the server.
Luke Diamand1051ef02015-06-10 08:30:59 +0100871
Sam Hocevar1f90a642015-12-19 09:39:40 +0000872 while True:
873 cmd = ['changes']
Luke Diamand1051ef02015-06-10 08:30:59 +0100874
Sam Hocevar1f90a642015-12-19 09:39:40 +0000875 if block_size:
876 end = min(changeEnd, changeStart + block_size)
877 revisionRange = "%d,%d" % (changeStart, end)
878 else:
879 revisionRange = "%s,%s" % (changeStart, changeEnd)
Luke Diamand1051ef02015-06-10 08:30:59 +0100880
Sam Hocevar1f90a642015-12-19 09:39:40 +0000881 for p in depotPaths:
Luke Diamand1051ef02015-06-10 08:30:59 +0100882 cmd += ["%s...@%s" % (p, revisionRange)]
883
Sam Hocevar1f90a642015-12-19 09:39:40 +0000884 # Insert changes in chronological order
Miguel Torrojab596b3b2017-07-13 09:00:34 +0200885 for entry in reversed(p4CmdList(cmd)):
886 if entry.has_key('p4ExitCode'):
887 die('Error retrieving changes descriptions ({})'.format(entry['p4ExitCode']))
888 if not entry.has_key('change'):
889 continue
890 changes.add(int(entry['change']))
Luke Diamand1051ef02015-06-10 08:30:59 +0100891
Sam Hocevar1f90a642015-12-19 09:39:40 +0000892 if not block_size:
893 break
Luke Diamand1051ef02015-06-10 08:30:59 +0100894
Sam Hocevar1f90a642015-12-19 09:39:40 +0000895 if end >= changeEnd:
896 break
Luke Diamand1051ef02015-06-10 08:30:59 +0100897
Sam Hocevar1f90a642015-12-19 09:39:40 +0000898 changeStart = end + 1
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200899
Sam Hocevar1f90a642015-12-19 09:39:40 +0000900 changes = sorted(changes)
901 return changes
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200902
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +0100903def p4PathStartsWith(path, prefix):
904 # This method tries to remedy a potential mixed-case issue:
905 #
906 # If UserA adds //depot/DirA/file1
907 # and UserB adds //depot/dira/file2
908 #
909 # we may or may not have a problem. If you have core.ignorecase=true,
910 # we treat DirA and dira as the same directory
Pete Wyckoff0d609032013-01-26 22:11:24 -0500911 if gitConfigBool("core.ignorecase"):
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +0100912 return path.lower().startswith(prefix.lower())
913 return path.startswith(prefix)
914
Pete Wyckoff543987b2012-02-25 20:06:25 -0500915def getClientSpec():
916 """Look at the p4 client spec, create a View() object that contains
917 all the mappings, and return it."""
918
919 specList = p4CmdList("client -o")
920 if len(specList) != 1:
921 die('Output from "client -o" is %d lines, expecting 1' %
922 len(specList))
923
924 # dictionary of all client parameters
925 entry = specList[0]
926
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +0900927 # the //client/ name
928 client_name = entry["Client"]
929
Pete Wyckoff543987b2012-02-25 20:06:25 -0500930 # just the keys that start with "View"
931 view_keys = [ k for k in entry.keys() if k.startswith("View") ]
932
933 # hold this new View
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +0900934 view = View(client_name)
Pete Wyckoff543987b2012-02-25 20:06:25 -0500935
936 # append the lines, in order, to the view
937 for view_num in range(len(view_keys)):
938 k = "View%d" % view_num
939 if k not in view_keys:
940 die("Expected view key %s missing" % k)
941 view.append(entry[k])
942
943 return view
944
945def getClientRoot():
946 """Grab the client directory."""
947
948 output = p4CmdList("client -o")
949 if len(output) != 1:
950 die('Output from "client -o" is %d lines, expecting 1' % len(output))
951
952 entry = output[0]
953 if "Root" not in entry:
954 die('Client has no "Root"')
955
956 return entry["Root"]
957
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400958#
959# P4 wildcards are not allowed in filenames. P4 complains
960# if you simply add them, but you can force it with "-f", in
961# which case it translates them into %xx encoding internally.
962#
963def wildcard_decode(path):
964 # Search for and fix just these four characters. Do % last so
965 # that fixing it does not inadvertently create new %-escapes.
966 # Cannot have * in a filename in windows; untested as to
967 # what p4 would do in such a case.
968 if not platform.system() == "Windows":
969 path = path.replace("%2A", "*")
970 path = path.replace("%23", "#") \
971 .replace("%40", "@") \
972 .replace("%25", "%")
973 return path
974
975def wildcard_encode(path):
976 # do % first to avoid double-encoding the %s introduced here
977 path = path.replace("%", "%25") \
978 .replace("*", "%2A") \
979 .replace("#", "%23") \
980 .replace("@", "%40")
981 return path
982
983def wildcard_present(path):
Brandon Casey598354c2013-01-26 11:14:32 -0800984 m = re.search("[*#@%]", path)
985 return m is not None
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400986
Lars Schneidera5db4b12015-09-26 09:55:03 +0200987class LargeFileSystem(object):
988 """Base class for large file system support."""
989
990 def __init__(self, writeToGitStream):
991 self.largeFiles = set()
992 self.writeToGitStream = writeToGitStream
993
994 def generatePointer(self, cloneDestination, contentFile):
995 """Return the content of a pointer file that is stored in Git instead of
996 the actual content."""
997 assert False, "Method 'generatePointer' required in " + self.__class__.__name__
998
999 def pushFile(self, localLargeFile):
1000 """Push the actual content which is not stored in the Git repository to
1001 a server."""
1002 assert False, "Method 'pushFile' required in " + self.__class__.__name__
1003
1004 def hasLargeFileExtension(self, relPath):
1005 return reduce(
1006 lambda a, b: a or b,
1007 [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')],
1008 False
1009 )
1010
1011 def generateTempFile(self, contents):
1012 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
1013 for d in contents:
1014 contentFile.write(d)
1015 contentFile.close()
1016 return contentFile.name
1017
1018 def exceedsLargeFileThreshold(self, relPath, contents):
1019 if gitConfigInt('git-p4.largeFileThreshold'):
1020 contentsSize = sum(len(d) for d in contents)
1021 if contentsSize > gitConfigInt('git-p4.largeFileThreshold'):
1022 return True
1023 if gitConfigInt('git-p4.largeFileCompressedThreshold'):
1024 contentsSize = sum(len(d) for d in contents)
1025 if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'):
1026 return False
1027 contentTempFile = self.generateTempFile(contents)
1028 compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
1029 zf = zipfile.ZipFile(compressedContentFile.name, mode='w')
1030 zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)
1031 zf.close()
1032 compressedContentsSize = zf.infolist()[0].compress_size
1033 os.remove(contentTempFile)
1034 os.remove(compressedContentFile.name)
1035 if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'):
1036 return True
1037 return False
1038
1039 def addLargeFile(self, relPath):
1040 self.largeFiles.add(relPath)
1041
1042 def removeLargeFile(self, relPath):
1043 self.largeFiles.remove(relPath)
1044
1045 def isLargeFile(self, relPath):
1046 return relPath in self.largeFiles
1047
1048 def processContent(self, git_mode, relPath, contents):
1049 """Processes the content of git fast import. This method decides if a
1050 file is stored in the large file system and handles all necessary
1051 steps."""
1052 if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
1053 contentTempFile = self.generateTempFile(contents)
Lars Schneiderd5eb3cf2016-12-04 17:03:37 +01001054 (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
1055 if pointer_git_mode:
1056 git_mode = pointer_git_mode
1057 if localLargeFile:
1058 # Move temp file to final location in large file system
1059 largeFileDir = os.path.dirname(localLargeFile)
1060 if not os.path.isdir(largeFileDir):
1061 os.makedirs(largeFileDir)
1062 shutil.move(contentTempFile, localLargeFile)
1063 self.addLargeFile(relPath)
1064 if gitConfigBool('git-p4.largeFilePush'):
1065 self.pushFile(localLargeFile)
1066 if verbose:
1067 sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
Lars Schneidera5db4b12015-09-26 09:55:03 +02001068 return (git_mode, contents)
1069
1070class MockLFS(LargeFileSystem):
1071 """Mock large file system for testing."""
1072
1073 def generatePointer(self, contentFile):
1074 """The pointer content is the original content prefixed with "pointer-".
1075 The local filename of the large file storage is derived from the file content.
1076 """
1077 with open(contentFile, 'r') as f:
1078 content = next(f)
1079 gitMode = '100644'
1080 pointerContents = 'pointer-' + content
1081 localLargeFile = os.path.join(os.getcwd(), '.git', 'mock-storage', 'local', content[:-1])
1082 return (gitMode, pointerContents, localLargeFile)
1083
1084 def pushFile(self, localLargeFile):
1085 """The remote filename of the large file storage is the same as the local
1086 one but in a different directory.
1087 """
1088 remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote')
1089 if not os.path.exists(remotePath):
1090 os.makedirs(remotePath)
1091 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))
1092
Lars Schneiderb47d8072015-09-26 09:55:04 +02001093class GitLFS(LargeFileSystem):
1094 """Git LFS as backend for the git-p4 large file system.
1095 See https://git-lfs.github.com/ for details."""
1096
1097 def __init__(self, *args):
1098 LargeFileSystem.__init__(self, *args)
1099 self.baseGitAttributes = []
1100
1101 def generatePointer(self, contentFile):
1102 """Generate a Git LFS pointer for the content. Return LFS Pointer file
1103 mode and content which is stored in the Git repository instead of
1104 the actual content. Return also the new location of the actual
1105 content.
1106 """
Lars Schneiderd5eb3cf2016-12-04 17:03:37 +01001107 if os.path.getsize(contentFile) == 0:
1108 return (None, '', None)
1109
Lars Schneiderb47d8072015-09-26 09:55:04 +02001110 pointerProcess = subprocess.Popen(
1111 ['git', 'lfs', 'pointer', '--file=' + contentFile],
1112 stdout=subprocess.PIPE
1113 )
1114 pointerFile = pointerProcess.stdout.read()
1115 if pointerProcess.wait():
1116 os.remove(contentFile)
1117 die('git-lfs pointer command failed. Did you install the extension?')
Lars Schneider82f25672016-04-28 08:26:33 +02001118
1119 # Git LFS removed the preamble in the output of the 'pointer' command
1120 # starting from version 1.2.0. Check for the preamble here to support
1121 # earlier versions.
1122 # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
1123 if pointerFile.startswith('Git LFS pointer for'):
1124 pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
1125
1126 oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
Lars Schneiderb47d8072015-09-26 09:55:04 +02001127 localLargeFile = os.path.join(
1128 os.getcwd(),
1129 '.git', 'lfs', 'objects', oid[:2], oid[2:4],
1130 oid,
1131 )
1132 # LFS Spec states that pointer files should not have the executable bit set.
1133 gitMode = '100644'
Lars Schneider82f25672016-04-28 08:26:33 +02001134 return (gitMode, pointerFile, localLargeFile)
Lars Schneiderb47d8072015-09-26 09:55:04 +02001135
1136 def pushFile(self, localLargeFile):
1137 uploadProcess = subprocess.Popen(
1138 ['git', 'lfs', 'push', '--object-id', 'origin', os.path.basename(localLargeFile)]
1139 )
1140 if uploadProcess.wait():
1141 die('git-lfs push command failed. Did you define a remote?')
1142
1143 def generateGitAttributes(self):
1144 return (
1145 self.baseGitAttributes +
1146 [
1147 '\n',
1148 '#\n',
1149 '# Git LFS (see https://git-lfs.github.com/)\n',
1150 '#\n',
1151 ] +
Lars Schneider862f9312016-12-18 20:01:40 +01001152 ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
Lars Schneiderb47d8072015-09-26 09:55:04 +02001153 for f in sorted(gitConfigList('git-p4.largeFileExtensions'))
1154 ] +
Lars Schneider862f9312016-12-18 20:01:40 +01001155 ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
Lars Schneiderb47d8072015-09-26 09:55:04 +02001156 for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)
1157 ]
1158 )
1159
1160 def addLargeFile(self, relPath):
1161 LargeFileSystem.addLargeFile(self, relPath)
1162 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1163
1164 def removeLargeFile(self, relPath):
1165 LargeFileSystem.removeLargeFile(self, relPath)
1166 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1167
1168 def processContent(self, git_mode, relPath, contents):
1169 if relPath == '.gitattributes':
1170 self.baseGitAttributes = contents
1171 return (git_mode, self.generateGitAttributes())
1172 else:
1173 return LargeFileSystem.processContent(self, git_mode, relPath, contents)
1174
Simon Hausmannb9847332007-03-20 20:54:23 +01001175class Command:
1176 def __init__(self):
1177 self.usage = "usage: %prog [options]"
Simon Hausmann8910ac02007-03-26 08:18:55 +02001178 self.needsGit = True
Luke Diamand6a10b6a2012-04-24 09:33:23 +01001179 self.verbose = False
Simon Hausmannb9847332007-03-20 20:54:23 +01001180
Luke Diamand8cf422d2017-12-21 11:06:14 +00001181 # This is required for the "append" cloneExclude action
1182 def ensure_value(self, attr, value):
1183 if not hasattr(self, attr) or getattr(self, attr) is None:
1184 setattr(self, attr, value)
1185 return getattr(self, attr)
1186
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001187class P4UserMap:
1188 def __init__(self):
1189 self.userMapFromPerforceServer = False
Luke Diamandaffb4742012-01-19 09:52:27 +00001190 self.myP4UserId = None
1191
1192 def p4UserId(self):
1193 if self.myP4UserId:
1194 return self.myP4UserId
1195
1196 results = p4CmdList("user -o")
1197 for r in results:
1198 if r.has_key('User'):
1199 self.myP4UserId = r['User']
1200 return r['User']
1201 die("Could not find your p4 user id")
1202
1203 def p4UserIsMe(self, p4User):
1204 # return True if the given p4 user is actually me
1205 me = self.p4UserId()
1206 if not p4User or p4User != me:
1207 return False
1208 else:
1209 return True
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001210
1211 def getUserCacheFilename(self):
1212 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))
1213 return home + "/.gitp4-usercache.txt"
1214
1215 def getUserMapFromPerforceServer(self):
1216 if self.userMapFromPerforceServer:
1217 return
1218 self.users = {}
1219 self.emails = {}
1220
1221 for output in p4CmdList("users"):
1222 if not output.has_key("User"):
1223 continue
1224 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
1225 self.emails[output["Email"]] = output["User"]
1226
Lars Schneider10d08a12016-03-01 11:49:56 +01001227 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
1228 for mapUserConfig in gitConfigList("git-p4.mapUser"):
1229 mapUser = mapUserConfigRegex.findall(mapUserConfig)
1230 if mapUser and len(mapUser[0]) == 3:
1231 user = mapUser[0][0]
1232 fullname = mapUser[0][1]
1233 email = mapUser[0][2]
1234 self.users[user] = fullname + " <" + email + ">"
1235 self.emails[email] = user
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001236
1237 s = ''
1238 for (key, val) in self.users.items():
1239 s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
1240
1241 open(self.getUserCacheFilename(), "wb").write(s)
1242 self.userMapFromPerforceServer = True
1243
1244 def loadUserMapFromCache(self):
1245 self.users = {}
1246 self.userMapFromPerforceServer = False
1247 try:
1248 cache = open(self.getUserCacheFilename(), "rb")
1249 lines = cache.readlines()
1250 cache.close()
1251 for line in lines:
1252 entry = line.strip().split("\t")
1253 self.users[entry[0]] = entry[1]
1254 except IOError:
1255 self.getUserMapFromPerforceServer()
1256
Simon Hausmannb9847332007-03-20 20:54:23 +01001257class P4Debug(Command):
Simon Hausmann86949ee2007-03-19 20:59:12 +01001258 def __init__(self):
Simon Hausmann6ae8de82007-03-22 21:10:25 +01001259 Command.__init__(self)
Luke Diamand6a10b6a2012-04-24 09:33:23 +01001260 self.options = []
Simon Hausmannc8c39112007-03-19 21:02:30 +01001261 self.description = "A tool to debug the output of p4 -G."
Simon Hausmann8910ac02007-03-26 08:18:55 +02001262 self.needsGit = False
Simon Hausmann86949ee2007-03-19 20:59:12 +01001263
1264 def run(self, args):
Han-Wen Nienhuysb1ce9442007-05-23 18:49:35 -03001265 j = 0
Luke Diamand6de040d2011-10-16 10:47:52 -04001266 for output in p4CmdList(args):
Han-Wen Nienhuysb1ce9442007-05-23 18:49:35 -03001267 print 'Element: %d' % j
1268 j += 1
Simon Hausmann86949ee2007-03-19 20:59:12 +01001269 print output
Simon Hausmannb9847332007-03-20 20:54:23 +01001270 return True
Simon Hausmann86949ee2007-03-19 20:59:12 +01001271
Simon Hausmann58346842007-05-21 22:57:06 +02001272class P4RollBack(Command):
1273 def __init__(self):
1274 Command.__init__(self)
1275 self.options = [
Simon Hausmann0c66a782007-05-23 20:07:57 +02001276 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
Simon Hausmann58346842007-05-21 22:57:06 +02001277 ]
1278 self.description = "A tool to debug the multi-branch import. Don't use :)"
Simon Hausmann0c66a782007-05-23 20:07:57 +02001279 self.rollbackLocalBranches = False
Simon Hausmann58346842007-05-21 22:57:06 +02001280
1281 def run(self, args):
1282 if len(args) != 1:
1283 return False
1284 maxChange = int(args[0])
Simon Hausmann0c66a782007-05-23 20:07:57 +02001285
Simon Hausmannad192f22007-05-23 23:44:19 +02001286 if "p4ExitCode" in p4Cmd("changes -m 1"):
Simon Hausmann66a2f522007-05-23 23:40:48 +02001287 die("Problems executing p4");
1288
Simon Hausmann0c66a782007-05-23 20:07:57 +02001289 if self.rollbackLocalBranches:
1290 refPrefix = "refs/heads/"
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -03001291 lines = read_pipe_lines("git rev-parse --symbolic --branches")
Simon Hausmann0c66a782007-05-23 20:07:57 +02001292 else:
1293 refPrefix = "refs/remotes/"
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -03001294 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
Simon Hausmann0c66a782007-05-23 20:07:57 +02001295
1296 for line in lines:
1297 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -03001298 line = line.strip()
1299 ref = refPrefix + line
Simon Hausmann58346842007-05-21 22:57:06 +02001300 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03001301 settings = extractSettingsGitLog(log)
1302
1303 depotPaths = settings['depot-paths']
1304 change = settings['change']
1305
Simon Hausmann58346842007-05-21 22:57:06 +02001306 changed = False
Simon Hausmann52102d42007-05-21 23:44:24 +02001307
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03001308 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
1309 for p in depotPaths]))) == 0:
Simon Hausmann52102d42007-05-21 23:44:24 +02001310 print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
1311 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
1312 continue
1313
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03001314 while change and int(change) > maxChange:
Simon Hausmann58346842007-05-21 22:57:06 +02001315 changed = True
Simon Hausmann52102d42007-05-21 23:44:24 +02001316 if self.verbose:
1317 print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
Simon Hausmann58346842007-05-21 22:57:06 +02001318 system("git update-ref %s \"%s^\"" % (ref, ref))
1319 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03001320 settings = extractSettingsGitLog(log)
1321
1322
1323 depotPaths = settings['depot-paths']
1324 change = settings['change']
Simon Hausmann58346842007-05-21 22:57:06 +02001325
1326 if changed:
Simon Hausmann52102d42007-05-21 23:44:24 +02001327 print "%s rewound to %s" % (ref, change)
Simon Hausmann58346842007-05-21 22:57:06 +02001328
1329 return True
1330
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001331class P4Submit(Command, P4UserMap):
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001332
1333 conflict_behavior_choices = ("ask", "skip", "quit")
1334
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001335 def __init__(self):
Simon Hausmannb9847332007-03-20 20:54:23 +01001336 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001337 P4UserMap.__init__(self)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001338 self.options = [
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001339 optparse.make_option("--origin", dest="origin"),
Vitor Antunesae901092011-02-20 01:18:24 +00001340 optparse.make_option("-M", dest="detectRenames", action="store_true"),
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001341 # preserve the user, requires relevant p4 permissions
1342 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +02001343 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
Pete Wyckoffef739f02012-09-09 16:16:11 -04001344 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001345 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001346 optparse.make_option("--conflict", dest="conflict_behavior",
Pete Wyckoff44e8d262013-01-14 19:47:08 -05001347 choices=self.conflict_behavior_choices),
1348 optparse.make_option("--branch", dest="branch"),
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00001349 optparse.make_option("--shelve", dest="shelve", action="store_true",
1350 help="Shelve instead of submit. Shelved files are reverted, "
1351 "restoring the workspace to the state before the shelve"),
Luke Diamand8cf422d2017-12-21 11:06:14 +00001352 optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int",
Luke Diamand46c609e2016-12-02 22:43:19 +00001353 metavar="CHANGELIST",
Luke Diamand8cf422d2017-12-21 11:06:14 +00001354 help="update an existing shelved changelist, implies --shelve, "
1355 "repeat in-order for multiple shelved changelists")
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001356 ]
1357 self.description = "Submit changes from git to the perforce depot."
Simon Hausmannc9b50e62007-03-29 19:15:24 +02001358 self.usage += " [name of git branch to submit into perforce depot]"
Simon Hausmann95124972007-03-23 09:16:07 +01001359 self.origin = ""
Vitor Antunesae901092011-02-20 01:18:24 +00001360 self.detectRenames = False
Pete Wyckoff0d609032013-01-26 22:11:24 -05001361 self.preserveUser = gitConfigBool("git-p4.preserveUser")
Pete Wyckoffef739f02012-09-09 16:16:11 -04001362 self.dry_run = False
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00001363 self.shelve = False
Luke Diamand8cf422d2017-12-21 11:06:14 +00001364 self.update_shelve = list()
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001365 self.prepare_p4_only = False
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001366 self.conflict_behavior = None
Marius Storm-Olsenf7baba82007-06-07 14:07:01 +02001367 self.isWindows = (platform.system() == "Windows")
Luke Diamand06804c72012-04-11 17:21:24 +02001368 self.exportLabels = False
Pete Wyckoff249da4c2012-11-23 17:35:35 -05001369 self.p4HasMoveCommand = p4_has_move_command()
Pete Wyckoff44e8d262013-01-14 19:47:08 -05001370 self.branch = None
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001371
Lars Schneidera5db4b12015-09-26 09:55:03 +02001372 if gitConfig('git-p4.largeFileSystem'):
1373 die("Large file system not supported for git-p4 submit command. Please remove it from config.")
1374
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001375 def check(self):
1376 if len(p4CmdList("opened ...")) > 0:
1377 die("You have files opened with perforce! Close them before starting the sync.")
1378
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001379 def separate_jobs_from_description(self, message):
1380 """Extract and return a possible Jobs field in the commit
1381 message. It goes into a separate section in the p4 change
1382 specification.
1383
1384 A jobs line starts with "Jobs:" and looks like a new field
1385 in a form. Values are white-space separated on the same
1386 line or on following lines that start with a tab.
1387
1388 This does not parse and extract the full git commit message
1389 like a p4 form. It just sees the Jobs: line as a marker
1390 to pass everything from then on directly into the p4 form,
1391 but outside the description section.
1392
1393 Return a tuple (stripped log message, jobs string)."""
1394
1395 m = re.search(r'^Jobs:', message, re.MULTILINE)
1396 if m is None:
1397 return (message, None)
1398
1399 jobtext = message[m.start():]
1400 stripped_message = message[:m.start()].rstrip()
1401 return (stripped_message, jobtext)
1402
1403 def prepareLogMessage(self, template, message, jobs):
1404 """Edits the template returned from "p4 change -o" to insert
1405 the message in the Description field, and the jobs text in
1406 the Jobs field."""
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001407 result = ""
1408
Simon Hausmannedae1e22008-02-19 09:29:06 +01001409 inDescriptionSection = False
1410
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001411 for line in template.split("\n"):
1412 if line.startswith("#"):
1413 result += line + "\n"
1414 continue
1415
Simon Hausmannedae1e22008-02-19 09:29:06 +01001416 if inDescriptionSection:
Michael Horowitzc9dbab02011-02-25 21:31:13 -05001417 if line.startswith("Files:") or line.startswith("Jobs:"):
Simon Hausmannedae1e22008-02-19 09:29:06 +01001418 inDescriptionSection = False
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001419 # insert Jobs section
1420 if jobs:
1421 result += jobs + "\n"
Simon Hausmannedae1e22008-02-19 09:29:06 +01001422 else:
1423 continue
1424 else:
1425 if line.startswith("Description:"):
1426 inDescriptionSection = True
1427 line += "\n"
1428 for messageLine in message.split("\n"):
1429 line += "\t" + messageLine + "\n"
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001430
Simon Hausmannedae1e22008-02-19 09:29:06 +01001431 result += line + "\n"
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001432
1433 return result
1434
Luke Diamand60df0712012-02-23 07:51:30 +00001435 def patchRCSKeywords(self, file, pattern):
1436 # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern
1437 (handle, outFileName) = tempfile.mkstemp(dir='.')
1438 try:
1439 outFile = os.fdopen(handle, "w+")
1440 inFile = open(file, "r")
1441 regexp = re.compile(pattern, re.VERBOSE)
1442 for line in inFile.readlines():
1443 line = regexp.sub(r'$\1$', line)
1444 outFile.write(line)
1445 inFile.close()
1446 outFile.close()
1447 # Forcibly overwrite the original file
1448 os.unlink(file)
1449 shutil.move(outFileName, file)
1450 except:
1451 # cleanup our temporary file
1452 os.unlink(outFileName)
1453 print "Failed to strip RCS keywords in %s" % file
1454 raise
1455
1456 print "Patched up RCS keywords in %s" % file
1457
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001458 def p4UserForCommit(self,id):
1459 # Return the tuple (perforce user,git email) for a given git commit id
1460 self.getUserMapFromPerforceServer()
Pete Wyckoff9bf28852013-01-26 22:11:20 -05001461 gitEmail = read_pipe(["git", "log", "--max-count=1",
1462 "--format=%ae", id])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001463 gitEmail = gitEmail.strip()
1464 if not self.emails.has_key(gitEmail):
1465 return (None,gitEmail)
1466 else:
1467 return (self.emails[gitEmail],gitEmail)
1468
1469 def checkValidP4Users(self,commits):
1470 # check if any git authors cannot be mapped to p4 users
1471 for id in commits:
1472 (user,email) = self.p4UserForCommit(id)
1473 if not user:
1474 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
Pete Wyckoff0d609032013-01-26 22:11:24 -05001475 if gitConfigBool("git-p4.allowMissingP4Users"):
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001476 print "%s" % msg
1477 else:
1478 die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
1479
1480 def lastP4Changelist(self):
1481 # Get back the last changelist number submitted in this client spec. This
1482 # then gets used to patch up the username in the change. If the same
1483 # client spec is being used by multiple processes then this might go
1484 # wrong.
1485 results = p4CmdList("client -o") # find the current client
1486 client = None
1487 for r in results:
1488 if r.has_key('Client'):
1489 client = r['Client']
1490 break
1491 if not client:
1492 die("could not get client spec")
Luke Diamand6de040d2011-10-16 10:47:52 -04001493 results = p4CmdList(["changes", "-c", client, "-m", "1"])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001494 for r in results:
1495 if r.has_key('change'):
1496 return r['change']
1497 die("Could not get changelist number for last submit - cannot patch up user details")
1498
1499 def modifyChangelistUser(self, changelist, newUser):
1500 # fixup the user field of a changelist after it has been submitted.
1501 changes = p4CmdList("change -o %s" % changelist)
Luke Diamandecdba362011-05-07 11:19:43 +01001502 if len(changes) != 1:
1503 die("Bad output from p4 change modifying %s to user %s" %
1504 (changelist, newUser))
1505
1506 c = changes[0]
1507 if c['User'] == newUser: return # nothing to do
1508 c['User'] = newUser
1509 input = marshal.dumps(c)
1510
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001511 result = p4CmdList("change -f -i", stdin=input)
1512 for r in result:
1513 if r.has_key('code'):
1514 if r['code'] == 'error':
1515 die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
1516 if r.has_key('data'):
1517 print("Updated user field for changelist %s to %s" % (changelist, newUser))
1518 return
1519 die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
1520
1521 def canChangeChangelists(self):
1522 # check to see if we have p4 admin or super-user permissions, either of
1523 # which are required to modify changelists.
Luke Diamand52a48802012-01-19 09:52:25 +00001524 results = p4CmdList(["protects", self.depotPath])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001525 for r in results:
1526 if r.has_key('perm'):
1527 if r['perm'] == 'admin':
1528 return 1
1529 if r['perm'] == 'super':
1530 return 1
1531 return 0
1532
Luke Diamand46c609e2016-12-02 22:43:19 +00001533 def prepareSubmitTemplate(self, changelist=None):
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001534 """Run "p4 change -o" to grab a change specification template.
1535 This does not use "p4 -G", as it is nice to keep the submission
1536 template in original order, since a human might edit it.
1537
1538 Remove lines in the Files section that show changes to files
1539 outside the depot path we're committing into."""
1540
Sam Hocevarcbc69242015-12-19 09:39:39 +00001541 [upstream, settings] = findUpstreamBranchPoint()
1542
Miguel Torrojab596b3b2017-07-13 09:00:34 +02001543 template = """\
1544# A Perforce Change Specification.
1545#
1546# Change: The change number. 'new' on a new changelist.
1547# Date: The date this specification was last modified.
1548# Client: The client on which the changelist was created. Read-only.
1549# User: The user who created the changelist.
1550# Status: Either 'pending' or 'submitted'. Read-only.
1551# Type: Either 'public' or 'restricted'. Default is 'public'.
1552# Description: Comments about the changelist. Required.
1553# Jobs: What opened jobs are to be closed by this changelist.
1554# You may delete jobs from this list. (New changelists only.)
1555# Files: What opened files from the default changelist are to be added
1556# to this changelist. You may delete files from this list.
1557# (New changelists only.)
1558"""
1559 files_list = []
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001560 inFilesSection = False
Miguel Torrojab596b3b2017-07-13 09:00:34 +02001561 change_entry = None
Luke Diamand46c609e2016-12-02 22:43:19 +00001562 args = ['change', '-o']
1563 if changelist:
1564 args.append(str(changelist))
Miguel Torrojab596b3b2017-07-13 09:00:34 +02001565 for entry in p4CmdList(args):
1566 if not entry.has_key('code'):
1567 continue
1568 if entry['code'] == 'stat':
1569 change_entry = entry
1570 break
1571 if not change_entry:
1572 die('Failed to decode output of p4 change -o')
1573 for key, value in change_entry.iteritems():
1574 if key.startswith('File'):
1575 if settings.has_key('depot-paths'):
1576 if not [p for p in settings['depot-paths']
1577 if p4PathStartsWith(value, p)]:
1578 continue
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001579 else:
Miguel Torrojab596b3b2017-07-13 09:00:34 +02001580 if not p4PathStartsWith(value, self.depotPath):
1581 continue
1582 files_list.append(value)
1583 continue
1584 # Output in the order expected by prepareLogMessage
1585 for key in ['Change', 'Client', 'User', 'Status', 'Description', 'Jobs']:
1586 if not change_entry.has_key(key):
1587 continue
1588 template += '\n'
1589 template += key + ':'
1590 if key == 'Description':
1591 template += '\n'
1592 for field_line in change_entry[key].splitlines():
1593 template += '\t'+field_line+'\n'
1594 if len(files_list) > 0:
1595 template += '\n'
1596 template += 'Files:\n'
1597 for path in files_list:
1598 template += '\t'+path+'\n'
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001599 return template
1600
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001601 def edit_template(self, template_file):
1602 """Invoke the editor to let the user change the submission
1603 message. Return true if okay to continue with the submit."""
1604
1605 # if configured to skip the editing part, just submit
Pete Wyckoff0d609032013-01-26 22:11:24 -05001606 if gitConfigBool("git-p4.skipSubmitEdit"):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001607 return True
1608
1609 # look at the modification time, to check later if the user saved
1610 # the file
1611 mtime = os.stat(template_file).st_mtime
1612
1613 # invoke the editor
Luke Diamandf95ceaf2012-04-24 09:33:21 +01001614 if os.environ.has_key("P4EDITOR") and (os.environ.get("P4EDITOR") != ""):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001615 editor = os.environ.get("P4EDITOR")
1616 else:
1617 editor = read_pipe("git var GIT_EDITOR").strip()
Luke Diamand2dade7a2015-05-19 23:23:17 +01001618 system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001619
1620 # If the file was not saved, prompt to see if this patch should
1621 # be skipped. But skip this verification step if configured so.
Pete Wyckoff0d609032013-01-26 22:11:24 -05001622 if gitConfigBool("git-p4.skipSubmitEditCheck"):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001623 return True
1624
Pete Wyckoffd1652042011-12-17 12:39:03 -05001625 # modification time updated means user saved the file
1626 if os.stat(template_file).st_mtime > mtime:
1627 return True
1628
1629 while True:
1630 response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
1631 if response == 'y':
1632 return True
1633 if response == 'n':
1634 return False
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001635
Luke Diamanddf8a9e82016-12-17 01:00:40 +00001636 def get_diff_description(self, editedFiles, filesToAdd, symlinks):
Maxime Costeb4073bb2014-05-24 18:40:35 +01001637 # diff
1638 if os.environ.has_key("P4DIFF"):
1639 del(os.environ["P4DIFF"])
1640 diff = ""
1641 for editedFile in editedFiles:
1642 diff += p4_read_pipe(['diff', '-du',
1643 wildcard_encode(editedFile)])
1644
1645 # new file diff
1646 newdiff = ""
1647 for newFile in filesToAdd:
1648 newdiff += "==== new file ====\n"
1649 newdiff += "--- /dev/null\n"
1650 newdiff += "+++ %s\n" % newFile
Luke Diamanddf8a9e82016-12-17 01:00:40 +00001651
1652 is_link = os.path.islink(newFile)
1653 expect_link = newFile in symlinks
1654
1655 if is_link and expect_link:
1656 newdiff += "+%s\n" % os.readlink(newFile)
1657 else:
1658 f = open(newFile, "r")
1659 for line in f.readlines():
1660 newdiff += "+" + line
1661 f.close()
Maxime Costeb4073bb2014-05-24 18:40:35 +01001662
Maxime Costee2a892e2014-06-11 14:09:59 +01001663 return (diff + newdiff).replace('\r\n', '\n')
Maxime Costeb4073bb2014-05-24 18:40:35 +01001664
Han-Wen Nienhuys7cb5cbe2007-05-23 16:55:48 -03001665 def applyCommit(self, id):
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001666 """Apply one commit, return True if it succeeded."""
1667
1668 print "Applying", read_pipe(["git", "show", "-s",
1669 "--format=format:%h %s", id])
Vitor Antunesae901092011-02-20 01:18:24 +00001670
Luke Diamand848de9c2011-05-13 20:46:00 +01001671 (p4User, gitEmail) = self.p4UserForCommit(id)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001672
Gary Gibbons84cb0002012-07-04 09:40:19 -04001673 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001674 filesToAdd = set()
Romain Picarda02b8bc2016-01-12 13:43:47 +01001675 filesToChangeType = set()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001676 filesToDelete = set()
Simon Hausmannd336c152007-05-16 09:41:26 +02001677 editedFiles = set()
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001678 pureRenameCopy = set()
Luke Diamanddf8a9e82016-12-17 01:00:40 +00001679 symlinks = set()
Chris Pettittc65b6702007-11-01 20:43:14 -07001680 filesToChangeExecBit = {}
Luke Diamand46c609e2016-12-02 22:43:19 +00001681 all_files = list()
Luke Diamand60df0712012-02-23 07:51:30 +00001682
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001683 for line in diff:
Chris Pettittb43b0a32007-11-01 20:43:13 -07001684 diff = parseDiffTreeEntry(line)
1685 modifier = diff['status']
1686 path = diff['src']
Luke Diamand46c609e2016-12-02 22:43:19 +00001687 all_files.append(path)
1688
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001689 if modifier == "M":
Luke Diamand6de040d2011-10-16 10:47:52 -04001690 p4_edit(path)
Chris Pettittc65b6702007-11-01 20:43:14 -07001691 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1692 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmannd336c152007-05-16 09:41:26 +02001693 editedFiles.add(path)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001694 elif modifier == "A":
1695 filesToAdd.add(path)
Chris Pettittc65b6702007-11-01 20:43:14 -07001696 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001697 if path in filesToDelete:
1698 filesToDelete.remove(path)
Luke Diamanddf8a9e82016-12-17 01:00:40 +00001699
1700 dst_mode = int(diff['dst_mode'], 8)
1701 if dst_mode == 0120000:
1702 symlinks.add(path)
1703
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001704 elif modifier == "D":
1705 filesToDelete.add(path)
1706 if path in filesToAdd:
1707 filesToAdd.remove(path)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001708 elif modifier == "C":
1709 src, dest = diff['src'], diff['dst']
Luke Diamand6de040d2011-10-16 10:47:52 -04001710 p4_integrate(src, dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001711 pureRenameCopy.add(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001712 if diff['src_sha1'] != diff['dst_sha1']:
Luke Diamand6de040d2011-10-16 10:47:52 -04001713 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001714 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001715 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Luke Diamand6de040d2011-10-16 10:47:52 -04001716 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001717 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001718 filesToChangeExecBit[dest] = diff['dst_mode']
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001719 if self.isWindows:
1720 # turn off read-only attribute
1721 os.chmod(dest, stat.S_IWRITE)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001722 os.unlink(dest)
1723 editedFiles.add(dest)
Chris Pettittd9a5f252007-10-15 22:15:06 -07001724 elif modifier == "R":
Chris Pettittb43b0a32007-11-01 20:43:13 -07001725 src, dest = diff['src'], diff['dst']
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001726 if self.p4HasMoveCommand:
1727 p4_edit(src) # src must be open before move
1728 p4_move(src, dest) # opens for (move/delete, move/add)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001729 else:
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001730 p4_integrate(src, dest)
1731 if diff['src_sha1'] != diff['dst_sha1']:
1732 p4_edit(dest)
1733 else:
1734 pureRenameCopy.add(dest)
Chris Pettittc65b6702007-11-01 20:43:14 -07001735 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001736 if not self.p4HasMoveCommand:
1737 p4_edit(dest) # with move: already open, writable
Chris Pettittc65b6702007-11-01 20:43:14 -07001738 filesToChangeExecBit[dest] = diff['dst_mode']
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001739 if not self.p4HasMoveCommand:
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001740 if self.isWindows:
1741 os.chmod(dest, stat.S_IWRITE)
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001742 os.unlink(dest)
1743 filesToDelete.add(src)
Chris Pettittd9a5f252007-10-15 22:15:06 -07001744 editedFiles.add(dest)
Romain Picarda02b8bc2016-01-12 13:43:47 +01001745 elif modifier == "T":
1746 filesToChangeType.add(path)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001747 else:
1748 die("unknown modifier %s for %s" % (modifier, path))
1749
Tolga Ceylan749b6682014-05-06 22:48:54 -07001750 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
Simon Hausmann47a130b2007-05-20 16:33:21 +02001751 patchcmd = diffcmd + " | git apply "
Simon Hausmannc1b296b2007-05-20 16:55:05 +02001752 tryPatchCmd = patchcmd + "--check -"
1753 applyPatchCmd = patchcmd + "--check --apply -"
Luke Diamand60df0712012-02-23 07:51:30 +00001754 patch_succeeded = True
Simon Hausmann51a26402007-04-15 09:59:56 +02001755
Simon Hausmann47a130b2007-05-20 16:33:21 +02001756 if os.system(tryPatchCmd) != 0:
Luke Diamand60df0712012-02-23 07:51:30 +00001757 fixed_rcs_keywords = False
1758 patch_succeeded = False
Simon Hausmann51a26402007-04-15 09:59:56 +02001759 print "Unfortunately applying the change failed!"
Luke Diamand60df0712012-02-23 07:51:30 +00001760
1761 # Patch failed, maybe it's just RCS keyword woes. Look through
1762 # the patch to see if that's possible.
Pete Wyckoff0d609032013-01-26 22:11:24 -05001763 if gitConfigBool("git-p4.attemptRCSCleanup"):
Luke Diamand60df0712012-02-23 07:51:30 +00001764 file = None
1765 pattern = None
1766 kwfiles = {}
1767 for file in editedFiles | filesToDelete:
1768 # did this file's delta contain RCS keywords?
1769 pattern = p4_keywords_regexp_for_file(file)
1770
1771 if pattern:
1772 # this file is a possibility...look for RCS keywords.
1773 regexp = re.compile(pattern, re.VERBOSE)
1774 for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
1775 if regexp.search(line):
1776 if verbose:
1777 print "got keyword match on %s in %s in %s" % (pattern, line, file)
1778 kwfiles[file] = pattern
1779 break
1780
1781 for file in kwfiles:
1782 if verbose:
1783 print "zapping %s with %s" % (line,pattern)
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001784 # File is being deleted, so not open in p4. Must
1785 # disable the read-only bit on windows.
1786 if self.isWindows and file not in editedFiles:
1787 os.chmod(file, stat.S_IWRITE)
Luke Diamand60df0712012-02-23 07:51:30 +00001788 self.patchRCSKeywords(file, kwfiles[file])
1789 fixed_rcs_keywords = True
1790
1791 if fixed_rcs_keywords:
1792 print "Retrying the patch with RCS keywords cleaned up"
1793 if os.system(tryPatchCmd) == 0:
1794 patch_succeeded = True
1795
1796 if not patch_succeeded:
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001797 for f in editedFiles:
1798 p4_revert(f)
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001799 return False
Simon Hausmann51a26402007-04-15 09:59:56 +02001800
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001801 #
1802 # Apply the patch for real, and do add/delete/+x handling.
1803 #
Simon Hausmann47a130b2007-05-20 16:33:21 +02001804 system(applyPatchCmd)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001805
Romain Picarda02b8bc2016-01-12 13:43:47 +01001806 for f in filesToChangeType:
1807 p4_edit(f, "-t", "auto")
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001808 for f in filesToAdd:
Luke Diamand6de040d2011-10-16 10:47:52 -04001809 p4_add(f)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001810 for f in filesToDelete:
Luke Diamand6de040d2011-10-16 10:47:52 -04001811 p4_revert(f)
1812 p4_delete(f)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001813
Chris Pettittc65b6702007-11-01 20:43:14 -07001814 # Set/clear executable bits
1815 for f in filesToChangeExecBit.keys():
1816 mode = filesToChangeExecBit[f]
1817 setP4ExecBit(f, mode)
1818
Luke Diamand8cf422d2017-12-21 11:06:14 +00001819 update_shelve = 0
1820 if len(self.update_shelve) > 0:
1821 update_shelve = self.update_shelve.pop(0)
1822 p4_reopen_in_change(update_shelve, all_files)
Luke Diamand46c609e2016-12-02 22:43:19 +00001823
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001824 #
1825 # Build p4 change description, starting with the contents
1826 # of the git commit message.
1827 #
Simon Hausmann0e36f2d2008-02-19 09:33:08 +01001828 logMessage = extractLogMessageFromGitCommit(id)
Simon Hausmann0e36f2d2008-02-19 09:33:08 +01001829 logMessage = logMessage.strip()
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001830 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001831
Luke Diamand8cf422d2017-12-21 11:06:14 +00001832 template = self.prepareSubmitTemplate(update_shelve)
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001833 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001834
1835 if self.preserveUser:
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001836 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001837
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001838 if self.checkAuthorship and not self.p4UserIsMe(p4User):
1839 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
1840 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
1841 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
1842
1843 separatorLine = "######## everything below this line is just the diff #######\n"
Maxime Costeb4073bb2014-05-24 18:40:35 +01001844 if not self.prepare_p4_only:
1845 submitTemplate += separatorLine
Luke Diamanddf8a9e82016-12-17 01:00:40 +00001846 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001847
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001848 (handle, fileName) = tempfile.mkstemp()
Maxime Costee2a892e2014-06-11 14:09:59 +01001849 tmpFile = os.fdopen(handle, "w+b")
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001850 if self.isWindows:
1851 submitTemplate = submitTemplate.replace("\n", "\r\n")
Maxime Costeb4073bb2014-05-24 18:40:35 +01001852 tmpFile.write(submitTemplate)
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001853 tmpFile.close()
1854
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001855 if self.prepare_p4_only:
1856 #
1857 # Leave the p4 tree prepared, and the submit template around
1858 # and let the user decide what to do next
1859 #
1860 print
1861 print "P4 workspace prepared for submission."
1862 print "To submit or revert, go to client workspace"
1863 print " " + self.clientPath
1864 print
1865 print "To submit, use \"p4 submit\" to write a new description,"
Luke Diamand10de86d2015-01-23 09:15:12 +00001866 print "or \"p4 submit -i <%s\" to use the one prepared by" \
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001867 " \"git p4\"." % fileName
1868 print "You can delete the file \"%s\" when finished." % fileName
1869
1870 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
1871 print "To preserve change ownership by user %s, you must\n" \
1872 "do \"p4 change -f <change>\" after submitting and\n" \
1873 "edit the User field."
1874 if pureRenameCopy:
1875 print "After submitting, renamed files must be re-synced."
1876 print "Invoke \"p4 sync -f\" on each of these files:"
1877 for f in pureRenameCopy:
1878 print " " + f
1879
1880 print
1881 print "To revert the changes, use \"p4 revert ...\", and delete"
1882 print "the submit template file \"%s\"" % fileName
1883 if filesToAdd:
1884 print "Since the commit adds new files, they must be deleted:"
1885 for f in filesToAdd:
1886 print " " + f
1887 print
1888 return True
1889
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001890 #
1891 # Let the user edit the change description, then submit it.
1892 #
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001893 submitted = False
Luke Diamandecdba362011-05-07 11:19:43 +01001894
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001895 try:
1896 if self.edit_template(fileName):
1897 # read the edited message and submit
1898 tmpFile = open(fileName, "rb")
1899 message = tmpFile.read()
1900 tmpFile.close()
1901 if self.isWindows:
1902 message = message.replace("\r\n", "\n")
1903 submitTemplate = message[:message.index(separatorLine)]
Luke Diamand46c609e2016-12-02 22:43:19 +00001904
Luke Diamand8cf422d2017-12-21 11:06:14 +00001905 if update_shelve:
Luke Diamand46c609e2016-12-02 22:43:19 +00001906 p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
1907 elif self.shelve:
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00001908 p4_write_pipe(['shelve', '-i'], submitTemplate)
1909 else:
1910 p4_write_pipe(['submit', '-i'], submitTemplate)
1911 # The rename/copy happened by applying a patch that created a
1912 # new file. This leaves it writable, which confuses p4.
1913 for f in pureRenameCopy:
1914 p4_sync(f, "-f")
Luke Diamandecdba362011-05-07 11:19:43 +01001915
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001916 if self.preserveUser:
1917 if p4User:
1918 # Get last changelist number. Cannot easily get it from
1919 # the submit command output as the output is
1920 # unmarshalled.
1921 changelist = self.lastP4Changelist()
1922 self.modifyChangelistUser(changelist, p4User)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001923
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001924 submitted = True
1925
1926 finally:
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001927 # skip this patch
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00001928 if not submitted or self.shelve:
1929 if self.shelve:
1930 print ("Reverting shelved files.")
1931 else:
1932 print ("Submission cancelled, undoing p4 changes.")
1933 for f in editedFiles | filesToDelete:
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001934 p4_revert(f)
1935 for f in filesToAdd:
1936 p4_revert(f)
1937 os.remove(f)
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001938
1939 os.remove(fileName)
GIRARD Etienneb7638fe2015-11-24 07:43:59 +00001940 return submitted
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001941
Luke Diamand06804c72012-04-11 17:21:24 +02001942 # Export git tags as p4 labels. Create a p4 label and then tag
1943 # with that.
1944 def exportGitTags(self, gitTags):
Luke Diamandc8942a22012-04-11 17:21:24 +02001945 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
1946 if len(validLabelRegexp) == 0:
1947 validLabelRegexp = defaultLabelRegexp
1948 m = re.compile(validLabelRegexp)
Luke Diamand06804c72012-04-11 17:21:24 +02001949
1950 for name in gitTags:
1951
1952 if not m.match(name):
1953 if verbose:
Luke Diamand05a3cec2012-05-11 07:25:17 +01001954 print "tag %s does not match regexp %s" % (name, validLabelRegexp)
Luke Diamand06804c72012-04-11 17:21:24 +02001955 continue
1956
1957 # Get the p4 commit this corresponds to
Luke Diamandc8942a22012-04-11 17:21:24 +02001958 logMessage = extractLogMessageFromGitCommit(name)
1959 values = extractSettingsGitLog(logMessage)
Luke Diamand06804c72012-04-11 17:21:24 +02001960
Luke Diamandc8942a22012-04-11 17:21:24 +02001961 if not values.has_key('change'):
Luke Diamand06804c72012-04-11 17:21:24 +02001962 # a tag pointing to something not sent to p4; ignore
1963 if verbose:
1964 print "git tag %s does not give a p4 commit" % name
1965 continue
Luke Diamandc8942a22012-04-11 17:21:24 +02001966 else:
1967 changelist = values['change']
Luke Diamand06804c72012-04-11 17:21:24 +02001968
1969 # Get the tag details.
1970 inHeader = True
1971 isAnnotated = False
1972 body = []
1973 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
1974 l = l.strip()
1975 if inHeader:
1976 if re.match(r'tag\s+', l):
1977 isAnnotated = True
1978 elif re.match(r'\s*$', l):
1979 inHeader = False
1980 continue
1981 else:
1982 body.append(l)
1983
1984 if not isAnnotated:
1985 body = ["lightweight tag imported by git p4\n"]
1986
1987 # Create the label - use the same view as the client spec we are using
1988 clientSpec = getClientSpec()
1989
1990 labelTemplate = "Label: %s\n" % name
1991 labelTemplate += "Description:\n"
1992 for b in body:
1993 labelTemplate += "\t" + b + "\n"
1994 labelTemplate += "View:\n"
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001995 for depot_side in clientSpec.mappings:
1996 labelTemplate += "\t%s\n" % depot_side
Luke Diamand06804c72012-04-11 17:21:24 +02001997
Pete Wyckoffef739f02012-09-09 16:16:11 -04001998 if self.dry_run:
1999 print "Would create p4 label %s for tag" % name
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04002000 elif self.prepare_p4_only:
2001 print "Not creating p4 label %s for tag due to option" \
2002 " --prepare-p4-only" % name
Pete Wyckoffef739f02012-09-09 16:16:11 -04002003 else:
2004 p4_write_pipe(["label", "-i"], labelTemplate)
Luke Diamand06804c72012-04-11 17:21:24 +02002005
Pete Wyckoffef739f02012-09-09 16:16:11 -04002006 # Use the label
2007 p4_system(["tag", "-l", name] +
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002008 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
Luke Diamand06804c72012-04-11 17:21:24 +02002009
Pete Wyckoffef739f02012-09-09 16:16:11 -04002010 if verbose:
2011 print "created p4 label for tag %s" % name
Luke Diamand06804c72012-04-11 17:21:24 +02002012
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002013 def run(self, args):
Simon Hausmannc9b50e62007-03-29 19:15:24 +02002014 if len(args) == 0:
2015 self.master = currentGitBranch()
Simon Hausmannc9b50e62007-03-29 19:15:24 +02002016 elif len(args) == 1:
2017 self.master = args[0]
Pete Wyckoff28755db2011-12-24 21:07:40 -05002018 if not branchExists(self.master):
2019 die("Branch %s does not exist" % self.master)
Simon Hausmannc9b50e62007-03-29 19:15:24 +02002020 else:
2021 return False
2022
Luke Diamand8cf422d2017-12-21 11:06:14 +00002023 for i in self.update_shelve:
2024 if i <= 0:
2025 sys.exit("invalid changelist %d" % i)
2026
Luke Diamand00ad6e32015-11-21 09:54:41 +00002027 if self.master:
2028 allowSubmit = gitConfig("git-p4.allowSubmit")
2029 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
2030 die("%s is not in git-p4.allowSubmit" % self.master)
Jing Xue4c2d5d72008-06-22 14:12:39 -04002031
Simon Hausmann27d2d812007-06-12 14:31:59 +02002032 [upstream, settings] = findUpstreamBranchPoint()
Simon Hausmannea99c3a2007-08-08 17:06:55 +02002033 self.depotPath = settings['depot-paths'][0]
Simon Hausmann27d2d812007-06-12 14:31:59 +02002034 if len(self.origin) == 0:
2035 self.origin = upstream
Simon Hausmanna3fdd572007-06-07 22:54:32 +02002036
Luke Diamand8cf422d2017-12-21 11:06:14 +00002037 if len(self.update_shelve) > 0:
Luke Diamand46c609e2016-12-02 22:43:19 +00002038 self.shelve = True
2039
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01002040 if self.preserveUser:
2041 if not self.canChangeChangelists():
2042 die("Cannot preserve user names without p4 super-user or admin permissions")
2043
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04002044 # if not set from the command line, try the config file
2045 if self.conflict_behavior is None:
2046 val = gitConfig("git-p4.conflict")
2047 if val:
2048 if val not in self.conflict_behavior_choices:
2049 die("Invalid value '%s' for config git-p4.conflict" % val)
2050 else:
2051 val = "ask"
2052 self.conflict_behavior = val
2053
Simon Hausmanna3fdd572007-06-07 22:54:32 +02002054 if self.verbose:
2055 print "Origin branch is " + self.origin
Simon Hausmann95124972007-03-23 09:16:07 +01002056
Simon Hausmannea99c3a2007-08-08 17:06:55 +02002057 if len(self.depotPath) == 0:
Simon Hausmann95124972007-03-23 09:16:07 +01002058 print "Internal error: cannot locate perforce depot path from existing branches"
2059 sys.exit(128)
2060
Pete Wyckoff543987b2012-02-25 20:06:25 -05002061 self.useClientSpec = False
Pete Wyckoff0d609032013-01-26 22:11:24 -05002062 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff543987b2012-02-25 20:06:25 -05002063 self.useClientSpec = True
2064 if self.useClientSpec:
2065 self.clientSpecDirs = getClientSpec()
Simon Hausmann95124972007-03-23 09:16:07 +01002066
Ville Skyttä2e3a16b2016-08-09 11:53:38 +03002067 # Check for the existence of P4 branches
Vitor Antunescd884102015-04-21 23:49:30 +01002068 branchesDetected = (len(p4BranchesInGit().keys()) > 1)
2069
2070 if self.useClientSpec and not branchesDetected:
Pete Wyckoff543987b2012-02-25 20:06:25 -05002071 # all files are relative to the client spec
2072 self.clientPath = getClientRoot()
2073 else:
2074 self.clientPath = p4Where(self.depotPath)
2075
2076 if self.clientPath == "":
2077 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
Simon Hausmann95124972007-03-23 09:16:07 +01002078
Simon Hausmannea99c3a2007-08-08 17:06:55 +02002079 print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)
Simon Hausmann7944f142007-05-21 11:04:26 +02002080 self.oldWorkingDirectory = os.getcwd()
Simon Hausmannc1b296b2007-05-20 16:55:05 +02002081
Gary Gibbons0591cfa2011-12-09 18:48:14 -05002082 # ensure the clientPath exists
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04002083 new_client_dir = False
Gary Gibbons0591cfa2011-12-09 18:48:14 -05002084 if not os.path.exists(self.clientPath):
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04002085 new_client_dir = True
Gary Gibbons0591cfa2011-12-09 18:48:14 -05002086 os.makedirs(self.clientPath)
2087
Miklós Fazekasbbd84862013-03-11 17:45:29 -04002088 chdir(self.clientPath, is_client_path=True)
Pete Wyckoffef739f02012-09-09 16:16:11 -04002089 if self.dry_run:
2090 print "Would synchronize p4 checkout in %s" % self.clientPath
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04002091 else:
Pete Wyckoffef739f02012-09-09 16:16:11 -04002092 print "Synchronizing p4 checkout..."
2093 if new_client_dir:
2094 # old one was destroyed, and maybe nobody told p4
2095 p4_sync("...", "-f")
2096 else:
2097 p4_sync("...")
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002098 self.check()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002099
Simon Hausmann4c750c02008-02-19 09:37:16 +01002100 commits = []
Luke Diamand00ad6e32015-11-21 09:54:41 +00002101 if self.master:
2102 commitish = self.master
2103 else:
2104 commitish = 'HEAD'
2105
2106 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, commitish)]):
Simon Hausmann4c750c02008-02-19 09:37:16 +01002107 commits.append(line.strip())
2108 commits.reverse()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002109
Pete Wyckoff0d609032013-01-26 22:11:24 -05002110 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
Luke Diamand848de9c2011-05-13 20:46:00 +01002111 self.checkAuthorship = False
2112 else:
2113 self.checkAuthorship = True
2114
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01002115 if self.preserveUser:
2116 self.checkValidP4Users(commits)
2117
Gary Gibbons84cb0002012-07-04 09:40:19 -04002118 #
2119 # Build up a set of options to be passed to diff when
2120 # submitting each commit to p4.
2121 #
2122 if self.detectRenames:
2123 # command-line -M arg
2124 self.diffOpts = "-M"
2125 else:
2126 # If not explicitly set check the config variable
2127 detectRenames = gitConfig("git-p4.detectRenames")
2128
2129 if detectRenames.lower() == "false" or detectRenames == "":
2130 self.diffOpts = ""
2131 elif detectRenames.lower() == "true":
2132 self.diffOpts = "-M"
2133 else:
2134 self.diffOpts = "-M%s" % detectRenames
2135
2136 # no command-line arg for -C or --find-copies-harder, just
2137 # config variables
2138 detectCopies = gitConfig("git-p4.detectCopies")
2139 if detectCopies.lower() == "false" or detectCopies == "":
2140 pass
2141 elif detectCopies.lower() == "true":
2142 self.diffOpts += " -C"
2143 else:
2144 self.diffOpts += " -C%s" % detectCopies
2145
Pete Wyckoff0d609032013-01-26 22:11:24 -05002146 if gitConfigBool("git-p4.detectCopiesHarder"):
Gary Gibbons84cb0002012-07-04 09:40:19 -04002147 self.diffOpts += " --find-copies-harder"
2148
Luke Diamand8cf422d2017-12-21 11:06:14 +00002149 num_shelves = len(self.update_shelve)
2150 if num_shelves > 0 and num_shelves != len(commits):
2151 sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
2152 (len(commits), num_shelves))
2153
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04002154 #
2155 # Apply the commits, one at a time. On failure, ask if should
2156 # continue to try the rest of the patches, or quit.
2157 #
Pete Wyckoffef739f02012-09-09 16:16:11 -04002158 if self.dry_run:
2159 print "Would apply"
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002160 applied = []
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04002161 last = len(commits) - 1
2162 for i, commit in enumerate(commits):
Pete Wyckoffef739f02012-09-09 16:16:11 -04002163 if self.dry_run:
2164 print " ", read_pipe(["git", "show", "-s",
2165 "--format=format:%h %s", commit])
2166 ok = True
2167 else:
2168 ok = self.applyCommit(commit)
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002169 if ok:
2170 applied.append(commit)
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04002171 else:
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04002172 if self.prepare_p4_only and i < last:
2173 print "Processing only the first commit due to option" \
2174 " --prepare-p4-only"
2175 break
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04002176 if i < last:
2177 quit = False
2178 while True:
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04002179 # prompt for what to do, or use the option/variable
2180 if self.conflict_behavior == "ask":
2181 print "What do you want to do?"
2182 response = raw_input("[s]kip this commit but apply"
2183 " the rest, or [q]uit? ")
2184 if not response:
2185 continue
2186 elif self.conflict_behavior == "skip":
2187 response = "s"
2188 elif self.conflict_behavior == "quit":
2189 response = "q"
2190 else:
2191 die("Unknown conflict_behavior '%s'" %
2192 self.conflict_behavior)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002193
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04002194 if response[0] == "s":
2195 print "Skipping this commit, but applying the rest"
2196 break
2197 if response[0] == "q":
2198 print "Quitting"
2199 quit = True
2200 break
2201 if quit:
2202 break
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002203
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002204 chdir(self.oldWorkingDirectory)
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00002205 shelved_applied = "shelved" if self.shelve else "applied"
Pete Wyckoffef739f02012-09-09 16:16:11 -04002206 if self.dry_run:
2207 pass
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04002208 elif self.prepare_p4_only:
2209 pass
Pete Wyckoffef739f02012-09-09 16:16:11 -04002210 elif len(commits) == len(applied):
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00002211 print ("All commits {0}!".format(shelved_applied))
Simon Hausmann14594f42007-08-22 09:07:15 +02002212
Simon Hausmann4c750c02008-02-19 09:37:16 +01002213 sync = P4Sync()
Pete Wyckoff44e8d262013-01-14 19:47:08 -05002214 if self.branch:
2215 sync.branch = self.branch
Simon Hausmann4c750c02008-02-19 09:37:16 +01002216 sync.run([])
Simon Hausmann14594f42007-08-22 09:07:15 +02002217
Simon Hausmann4c750c02008-02-19 09:37:16 +01002218 rebase = P4Rebase()
2219 rebase.rebase()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01002220
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002221 else:
2222 if len(applied) == 0:
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00002223 print ("No commits {0}.".format(shelved_applied))
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002224 else:
Vinicius Kursancewb34fa572016-11-28 09:33:18 +00002225 print ("{0} only the commits marked with '*':".format(shelved_applied.capitalize()))
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002226 for c in commits:
2227 if c in applied:
2228 star = "*"
2229 else:
2230 star = " "
2231 print star, read_pipe(["git", "show", "-s",
2232 "--format=format:%h %s", c])
2233 print "You will have to do 'git p4 sync' and rebase."
2234
Pete Wyckoff0d609032013-01-26 22:11:24 -05002235 if gitConfigBool("git-p4.exportLabels"):
Luke Diamand06dcd152012-05-11 07:25:18 +01002236 self.exportLabels = True
Luke Diamand06804c72012-04-11 17:21:24 +02002237
2238 if self.exportLabels:
2239 p4Labels = getP4Labels(self.depotPath)
2240 gitTags = getGitTags()
2241
2242 missingGitTags = gitTags - p4Labels
2243 self.exportGitTags(missingGitTags)
2244
Ondřej Bílka98e023d2013-07-29 10:18:21 +02002245 # exit with error unless everything applied perfectly
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04002246 if len(commits) != len(applied):
2247 sys.exit(1)
2248
Simon Hausmannb9847332007-03-20 20:54:23 +01002249 return True
2250
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002251class View(object):
2252 """Represent a p4 view ("p4 help views"), and map files in a
2253 repo according to the view."""
2254
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002255 def __init__(self, client_name):
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002256 self.mappings = []
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002257 self.client_prefix = "//%s/" % client_name
2258 # cache results of "p4 where" to lookup client file locations
2259 self.client_spec_path_cache = {}
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002260
2261 def append(self, view_line):
2262 """Parse a view line, splitting it into depot and client
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002263 sides. Append to self.mappings, preserving order. This
2264 is only needed for tag creation."""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002265
2266 # Split the view line into exactly two words. P4 enforces
2267 # structure on these lines that simplifies this quite a bit.
2268 #
2269 # Either or both words may be double-quoted.
2270 # Single quotes do not matter.
2271 # Double-quote marks cannot occur inside the words.
2272 # A + or - prefix is also inside the quotes.
2273 # There are no quotes unless they contain a space.
2274 # The line is already white-space stripped.
2275 # The two words are separated by a single space.
2276 #
2277 if view_line[0] == '"':
2278 # First word is double quoted. Find its end.
2279 close_quote_index = view_line.find('"', 1)
2280 if close_quote_index <= 0:
2281 die("No first-word closing quote found: %s" % view_line)
2282 depot_side = view_line[1:close_quote_index]
2283 # skip closing quote and space
2284 rhs_index = close_quote_index + 1 + 1
2285 else:
2286 space_index = view_line.find(" ")
2287 if space_index <= 0:
2288 die("No word-splitting space found: %s" % view_line)
2289 depot_side = view_line[0:space_index]
2290 rhs_index = space_index + 1
2291
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002292 # prefix + means overlay on previous mapping
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002293 if depot_side.startswith("+"):
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002294 depot_side = depot_side[1:]
2295
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002296 # prefix - means exclude this path, leave out of mappings
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002297 exclude = False
2298 if depot_side.startswith("-"):
2299 exclude = True
2300 depot_side = depot_side[1:]
2301
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002302 if not exclude:
2303 self.mappings.append(depot_side)
2304
2305 def convert_client_path(self, clientFile):
2306 # chop off //client/ part to make it relative
2307 if not clientFile.startswith(self.client_prefix):
2308 die("No prefix '%s' on clientFile '%s'" %
2309 (self.client_prefix, clientFile))
2310 return clientFile[len(self.client_prefix):]
2311
2312 def update_client_spec_path_cache(self, files):
2313 """ Caching file paths by "p4 where" batch query """
2314
2315 # List depot file paths exclude that already cached
2316 fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache]
2317
2318 if len(fileArgs) == 0:
2319 return # All files in cache
2320
2321 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
2322 for res in where_result:
2323 if "code" in res and res["code"] == "error":
2324 # assume error is "... file(s) not in client view"
2325 continue
2326 if "clientFile" not in res:
Pete Wyckoff20005442014-01-21 18:16:46 -05002327 die("No clientFile in 'p4 where' output")
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002328 if "unmap" in res:
2329 # it will list all of them, but only one not unmap-ped
2330 continue
Lars Schneidera0a50d82015-08-28 14:00:34 +02002331 if gitConfigBool("core.ignorecase"):
2332 res['depotFile'] = res['depotFile'].lower()
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002333 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
2334
2335 # not found files or unmap files set to ""
2336 for depotFile in fileArgs:
Lars Schneidera0a50d82015-08-28 14:00:34 +02002337 if gitConfigBool("core.ignorecase"):
2338 depotFile = depotFile.lower()
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002339 if depotFile not in self.client_spec_path_cache:
2340 self.client_spec_path_cache[depotFile] = ""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002341
2342 def map_in_client(self, depot_path):
2343 """Return the relative location in the client where this
2344 depot file should live. Returns "" if the file should
2345 not be mapped in the client."""
2346
Lars Schneidera0a50d82015-08-28 14:00:34 +02002347 if gitConfigBool("core.ignorecase"):
2348 depot_path = depot_path.lower()
2349
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002350 if depot_path in self.client_spec_path_cache:
2351 return self.client_spec_path_cache[depot_path]
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002352
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002353 die( "Error: %s is not found in client spec path" % depot_path )
2354 return ""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002355
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01002356class P4Sync(Command, P4UserMap):
Pete Wyckoff56c09342011-02-19 08:17:57 -05002357 delete_actions = ( "delete", "move/delete", "purge" )
2358
Simon Hausmannb9847332007-03-20 20:54:23 +01002359 def __init__(self):
2360 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01002361 P4UserMap.__init__(self)
Simon Hausmannb9847332007-03-20 20:54:23 +01002362 self.options = [
2363 optparse.make_option("--branch", dest="branch"),
2364 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
2365 optparse.make_option("--changesfile", dest="changesFile"),
2366 optparse.make_option("--silent", dest="silent", action="store_true"),
Simon Hausmannef48f902007-05-17 22:17:49 +02002367 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +02002368 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Han-Wen Nienhuysd2c6dd32007-05-23 18:49:35 -03002369 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
2370 help="Import into refs/heads/ , not refs/remotes"),
Lex Spoon96b2d542015-04-20 11:00:20 -04002371 optparse.make_option("--max-changes", dest="maxChanges",
2372 help="Maximum number of changes to import"),
2373 optparse.make_option("--changes-block-size", dest="changes_block_size", type="int",
2374 help="Internal block size to use when iteratively calling p4 changes"),
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002375 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002376 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
2377 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
Luke Diamand51334bb2015-01-17 20:56:38 +00002378 help="Only sync files that are included in the Perforce Client Spec"),
2379 optparse.make_option("-/", dest="cloneExclude",
2380 action="append", type="string",
2381 help="exclude depot path"),
Simon Hausmannb9847332007-03-20 20:54:23 +01002382 ]
2383 self.description = """Imports from Perforce into a git repository.\n
2384 example:
2385 //depot/my/project/ -- to import the current head
2386 //depot/my/project/@all -- to import everything
2387 //depot/my/project/@1,6 -- to import only from revision 1 to 6
2388
2389 (a ... is not needed in the path p4 specification, it's added implicitly)"""
2390
2391 self.usage += " //depot/path[@revRange]"
Simon Hausmannb9847332007-03-20 20:54:23 +01002392 self.silent = False
Reilly Grant1d7367d2009-09-10 00:02:38 -07002393 self.createdBranches = set()
2394 self.committedChanges = set()
Simon Hausmann569d1bd2007-03-22 21:34:16 +01002395 self.branch = ""
Simon Hausmannb9847332007-03-20 20:54:23 +01002396 self.detectBranches = False
Simon Hausmanncb53e1f2007-04-08 00:12:02 +02002397 self.detectLabels = False
Luke Diamand06804c72012-04-11 17:21:24 +02002398 self.importLabels = False
Simon Hausmannb9847332007-03-20 20:54:23 +01002399 self.changesFile = ""
Simon Hausmann01265102007-05-25 10:36:10 +02002400 self.syncWithOrigin = True
Simon Hausmanna028a982007-05-23 00:03:08 +02002401 self.importIntoRemotes = True
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02002402 self.maxChanges = ""
Luke Diamand1051ef02015-06-10 08:30:59 +01002403 self.changes_block_size = None
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -03002404 self.keepRepoPath = False
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002405 self.depotPaths = None
Simon Hausmann3c699642007-06-16 13:09:21 +02002406 self.p4BranchesInGit = []
Tommy Thorn354081d2008-02-03 10:38:51 -08002407 self.cloneExclude = []
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002408 self.useClientSpec = False
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05002409 self.useClientSpec_from_options = False
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002410 self.clientSpecDirs = None
Vitor Antunesfed23692012-01-25 23:48:22 +00002411 self.tempBranches = []
Lars Schneiderd6041762016-06-29 09:35:27 +02002412 self.tempBranchLocation = "refs/git-p4-tmp"
Lars Schneidera5db4b12015-09-26 09:55:03 +02002413 self.largeFileSystem = None
2414
2415 if gitConfig('git-p4.largeFileSystem'):
2416 largeFileSystemConstructor = globals()[gitConfig('git-p4.largeFileSystem')]
2417 self.largeFileSystem = largeFileSystemConstructor(
2418 lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)
2419 )
Simon Hausmannb9847332007-03-20 20:54:23 +01002420
Simon Hausmann01265102007-05-25 10:36:10 +02002421 if gitConfig("git-p4.syncFromOrigin") == "false":
2422 self.syncWithOrigin = False
2423
Vitor Antunesfed23692012-01-25 23:48:22 +00002424 # Force a checkpoint in fast-import and wait for it to finish
2425 def checkpoint(self):
2426 self.gitStream.write("checkpoint\n\n")
2427 self.gitStream.write("progress checkpoint\n\n")
2428 out = self.gitOutput.readline()
2429 if self.verbose:
2430 print "checkpoint finished: " + out
2431
Simon Hausmannb9847332007-03-20 20:54:23 +01002432 def extractFilesFromCommit(self, commit):
Tommy Thorn354081d2008-02-03 10:38:51 -08002433 self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
2434 for path in self.cloneExclude]
Simon Hausmannb9847332007-03-20 20:54:23 +01002435 files = []
2436 fnum = 0
2437 while commit.has_key("depotFile%s" % fnum):
2438 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002439
Tommy Thorn354081d2008-02-03 10:38:51 -08002440 if [p for p in self.cloneExclude
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01002441 if p4PathStartsWith(path, p)]:
Tommy Thorn354081d2008-02-03 10:38:51 -08002442 found = False
2443 else:
2444 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01002445 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002446 if not found:
Simon Hausmannb9847332007-03-20 20:54:23 +01002447 fnum = fnum + 1
2448 continue
2449
2450 file = {}
2451 file["path"] = path
2452 file["rev"] = commit["rev%s" % fnum]
2453 file["action"] = commit["action%s" % fnum]
2454 file["type"] = commit["type%s" % fnum]
2455 files.append(file)
2456 fnum = fnum + 1
2457 return files
2458
Jan Durovec26e6a272016-04-19 19:49:41 +00002459 def extractJobsFromCommit(self, commit):
2460 jobs = []
2461 jnum = 0
2462 while commit.has_key("job%s" % jnum):
2463 job = commit["job%s" % jnum]
2464 jobs.append(job)
2465 jnum = jnum + 1
2466 return jobs
2467
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002468 def stripRepoPath(self, path, prefixes):
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002469 """When streaming files, this is called to map a p4 depot path
2470 to where it should go in git. The prefixes are either
2471 self.depotPaths, or self.branchPrefixes in the case of
2472 branch detection."""
2473
Ian Wienand39527102011-02-11 16:33:48 -08002474 if self.useClientSpec:
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002475 # branch detection moves files up a level (the branch name)
2476 # from what client spec interpretation gives
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002477 path = self.clientSpecDirs.map_in_client(path)
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002478 if self.detectBranches:
2479 for b in self.knownBranches:
2480 if path.startswith(b + "/"):
2481 path = path[len(b)+1:]
2482
2483 elif self.keepRepoPath:
2484 # Preserve everything in relative path name except leading
2485 # //depot/; just look at first prefix as they all should
2486 # be in the same depot.
2487 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2488 if p4PathStartsWith(path, depot):
2489 path = path[len(depot):]
Ian Wienand39527102011-02-11 16:33:48 -08002490
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002491 else:
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002492 for p in prefixes:
2493 if p4PathStartsWith(path, p):
2494 path = path[len(p):]
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002495 break
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002496
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002497 path = wildcard_decode(path)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002498 return path
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -03002499
Simon Hausmann71b112d2007-05-19 11:54:11 +02002500 def splitFilesIntoBranches(self, commit):
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002501 """Look at each depotFile in the commit to figure out to what
2502 branch it belongs."""
2503
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002504 if self.clientSpecDirs:
2505 files = self.extractFilesFromCommit(commit)
2506 self.clientSpecDirs.update_client_spec_path_cache(files)
2507
Simon Hausmannd5904672007-05-19 11:07:32 +02002508 branches = {}
Simon Hausmann71b112d2007-05-19 11:54:11 +02002509 fnum = 0
2510 while commit.has_key("depotFile%s" % fnum):
2511 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002512 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01002513 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002514 if not found:
Simon Hausmann71b112d2007-05-19 11:54:11 +02002515 fnum = fnum + 1
2516 continue
2517
2518 file = {}
2519 file["path"] = path
2520 file["rev"] = commit["rev%s" % fnum]
2521 file["action"] = commit["action%s" % fnum]
2522 file["type"] = commit["type%s" % fnum]
2523 fnum = fnum + 1
2524
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002525 # start with the full relative path where this file would
2526 # go in a p4 client
2527 if self.useClientSpec:
2528 relPath = self.clientSpecDirs.map_in_client(path)
2529 else:
2530 relPath = self.stripRepoPath(path, self.depotPaths)
Simon Hausmannb9847332007-03-20 20:54:23 +01002531
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002532 for branch in self.knownBranches.keys():
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002533 # add a trailing slash so that a commit into qt/4.2foo
2534 # doesn't end up in qt/4.2, e.g.
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -03002535 if relPath.startswith(branch + "/"):
Simon Hausmannd5904672007-05-19 11:07:32 +02002536 if branch not in branches:
2537 branches[branch] = []
Simon Hausmann71b112d2007-05-19 11:54:11 +02002538 branches[branch].append(file)
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002539 break
Simon Hausmannb9847332007-03-20 20:54:23 +01002540
2541 return branches
2542
Lars Schneidera5db4b12015-09-26 09:55:03 +02002543 def writeToGitStream(self, gitMode, relPath, contents):
2544 self.gitStream.write('M %s inline %s\n' % (gitMode, relPath))
2545 self.gitStream.write('data %d\n' % sum(len(d) for d in contents))
2546 for d in contents:
2547 self.gitStream.write(d)
2548 self.gitStream.write('\n')
2549
Lars Schneidera8b05162017-02-09 16:06:56 +01002550 def encodeWithUTF8(self, path):
2551 try:
2552 path.decode('ascii')
2553 except:
2554 encoding = 'utf8'
2555 if gitConfig('git-p4.pathEncoding'):
2556 encoding = gitConfig('git-p4.pathEncoding')
2557 path = path.decode(encoding, 'replace').encode('utf8', 'replace')
2558 if self.verbose:
2559 print 'Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path)
2560 return path
2561
Luke Diamandb9327052009-07-30 00:13:46 +01002562 # output one file from the P4 stream
2563 # - helper for streamP4Files
2564
2565 def streamOneP4File(self, file, contents):
Luke Diamandb9327052009-07-30 00:13:46 +01002566 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
Lars Schneidera8b05162017-02-09 16:06:56 +01002567 relPath = self.encodeWithUTF8(relPath)
Luke Diamandb9327052009-07-30 00:13:46 +01002568 if verbose:
Lars Schneiderd2176a52015-09-26 09:55:01 +02002569 size = int(self.stream_file['fileSize'])
2570 sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024))
2571 sys.stdout.flush()
Luke Diamandb9327052009-07-30 00:13:46 +01002572
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -04002573 (type_base, type_mods) = split_p4_type(file["type"])
2574
2575 git_mode = "100644"
2576 if "x" in type_mods:
2577 git_mode = "100755"
2578 if type_base == "symlink":
2579 git_mode = "120000"
Alexandru Juncu1292df12013-08-08 16:17:38 +03002580 # p4 print on a symlink sometimes contains "target\n";
2581 # if it does, remove the newline
Evan Powersb39c3612010-02-16 00:44:08 -08002582 data = ''.join(contents)
Pete Wyckoff40f846c2014-01-21 18:16:40 -05002583 if not data:
2584 # Some version of p4 allowed creating a symlink that pointed
2585 # to nothing. This causes p4 errors when checking out such
2586 # a change, and errors here too. Work around it by ignoring
2587 # the bad symlink; hopefully a future change fixes it.
2588 print "\nIgnoring empty symlink in %s" % file['depotFile']
2589 return
2590 elif data[-1] == '\n':
Alexandru Juncu1292df12013-08-08 16:17:38 +03002591 contents = [data[:-1]]
2592 else:
2593 contents = [data]
Luke Diamandb9327052009-07-30 00:13:46 +01002594
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -04002595 if type_base == "utf16":
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002596 # p4 delivers different text in the python output to -G
2597 # than it does when using "print -o", or normal p4 client
2598 # operations. utf16 is converted to ascii or utf8, perhaps.
2599 # But ascii text saved as -t utf16 is completely mangled.
2600 # Invoke print -o to get the real contents.
Pete Wyckoff7f0e5962013-01-26 22:11:13 -05002601 #
2602 # On windows, the newlines will always be mangled by print, so put
2603 # them back too. This is not needed to the cygwin windows version,
2604 # just the native "NT" type.
2605 #
Lars Schneider1f5f3902015-09-21 12:01:41 +02002606 try:
2607 text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (file['depotFile'], file['change'])])
2608 except Exception as e:
2609 if 'Translation of file content failed' in str(e):
2610 type_base = 'binary'
2611 else:
2612 raise e
2613 else:
2614 if p4_version_string().find('/NT') >= 0:
2615 text = text.replace('\r\n', '\n')
2616 contents = [ text ]
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002617
Pete Wyckoff9f7ef0e2011-11-05 13:36:07 -04002618 if type_base == "apple":
2619 # Apple filetype files will be streamed as a concatenation of
2620 # its appledouble header and the contents. This is useless
2621 # on both macs and non-macs. If using "print -q -o xx", it
2622 # will create "xx" with the data, and "%xx" with the header.
2623 # This is also not very useful.
2624 #
2625 # Ideally, someday, this script can learn how to generate
2626 # appledouble files directly and import those to git, but
2627 # non-mac machines can never find a use for apple filetype.
2628 print "\nIgnoring apple filetype file %s" % file['depotFile']
2629 return
2630
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002631 # Note that we do not try to de-mangle keywords on utf16 files,
2632 # even though in theory somebody may want that.
Luke Diamand60df0712012-02-23 07:51:30 +00002633 pattern = p4_keywords_regexp_for_type(type_base, type_mods)
2634 if pattern:
2635 regexp = re.compile(pattern, re.VERBOSE)
2636 text = ''.join(contents)
2637 text = regexp.sub(r'$\1$', text)
2638 contents = [ text ]
Luke Diamandb9327052009-07-30 00:13:46 +01002639
Lars Schneidera5db4b12015-09-26 09:55:03 +02002640 if self.largeFileSystem:
2641 (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
Luke Diamandb9327052009-07-30 00:13:46 +01002642
Lars Schneidera5db4b12015-09-26 09:55:03 +02002643 self.writeToGitStream(git_mode, relPath, contents)
Luke Diamandb9327052009-07-30 00:13:46 +01002644
2645 def streamOneP4Deletion(self, file):
2646 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
Lars Schneidera8b05162017-02-09 16:06:56 +01002647 relPath = self.encodeWithUTF8(relPath)
Luke Diamandb9327052009-07-30 00:13:46 +01002648 if verbose:
Lars Schneiderd2176a52015-09-26 09:55:01 +02002649 sys.stdout.write("delete %s\n" % relPath)
2650 sys.stdout.flush()
Luke Diamandb9327052009-07-30 00:13:46 +01002651 self.gitStream.write("D %s\n" % relPath)
2652
Lars Schneidera5db4b12015-09-26 09:55:03 +02002653 if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
2654 self.largeFileSystem.removeLargeFile(relPath)
2655
Luke Diamandb9327052009-07-30 00:13:46 +01002656 # handle another chunk of streaming data
2657 def streamP4FilesCb(self, marshalled):
2658
Pete Wyckoff78189be2012-11-23 17:35:36 -05002659 # catch p4 errors and complain
2660 err = None
2661 if "code" in marshalled:
2662 if marshalled["code"] == "error":
2663 if "data" in marshalled:
2664 err = marshalled["data"].rstrip()
Lars Schneider4d25dc42015-09-26 09:55:02 +02002665
2666 if not err and 'fileSize' in self.stream_file:
2667 required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
2668 if required_bytes > 0:
2669 err = 'Not enough space left on %s! Free at least %i MB.' % (
2670 os.getcwd(), required_bytes/1024/1024
2671 )
2672
Pete Wyckoff78189be2012-11-23 17:35:36 -05002673 if err:
2674 f = None
2675 if self.stream_have_file_info:
2676 if "depotFile" in self.stream_file:
2677 f = self.stream_file["depotFile"]
2678 # force a failure in fast-import, else an empty
2679 # commit will be made
2680 self.gitStream.write("\n")
2681 self.gitStream.write("die-now\n")
2682 self.gitStream.close()
2683 # ignore errors, but make sure it exits first
2684 self.importProcess.wait()
2685 if f:
2686 die("Error from p4 print for %s: %s" % (f, err))
2687 else:
2688 die("Error from p4 print: %s" % err)
2689
Andrew Garberc3f61632011-04-07 02:01:21 -04002690 if marshalled.has_key('depotFile') and self.stream_have_file_info:
2691 # start of a new file - output the old one first
2692 self.streamOneP4File(self.stream_file, self.stream_contents)
2693 self.stream_file = {}
2694 self.stream_contents = []
2695 self.stream_have_file_info = False
Luke Diamandb9327052009-07-30 00:13:46 +01002696
Andrew Garberc3f61632011-04-07 02:01:21 -04002697 # pick up the new file information... for the
2698 # 'data' field we need to append to our array
2699 for k in marshalled.keys():
2700 if k == 'data':
Lars Schneiderd2176a52015-09-26 09:55:01 +02002701 if 'streamContentSize' not in self.stream_file:
2702 self.stream_file['streamContentSize'] = 0
2703 self.stream_file['streamContentSize'] += len(marshalled['data'])
Andrew Garberc3f61632011-04-07 02:01:21 -04002704 self.stream_contents.append(marshalled['data'])
2705 else:
2706 self.stream_file[k] = marshalled[k]
Luke Diamandb9327052009-07-30 00:13:46 +01002707
Lars Schneiderd2176a52015-09-26 09:55:01 +02002708 if (verbose and
2709 'streamContentSize' in self.stream_file and
2710 'fileSize' in self.stream_file and
2711 'depotFile' in self.stream_file):
2712 size = int(self.stream_file["fileSize"])
2713 if size > 0:
2714 progress = 100*self.stream_file['streamContentSize']/size
2715 sys.stdout.write('\r%s %d%% (%i MB)' % (self.stream_file['depotFile'], progress, int(size/1024/1024)))
2716 sys.stdout.flush()
2717
Andrew Garberc3f61632011-04-07 02:01:21 -04002718 self.stream_have_file_info = True
Luke Diamandb9327052009-07-30 00:13:46 +01002719
2720 # Stream directly from "p4 files" into "git fast-import"
2721 def streamP4Files(self, files):
Simon Hausmann30b59402008-03-03 11:55:48 +01002722 filesForCommit = []
2723 filesToRead = []
Luke Diamandb9327052009-07-30 00:13:46 +01002724 filesToDelete = []
Simon Hausmann30b59402008-03-03 11:55:48 +01002725
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002726 for f in files:
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002727 filesForCommit.append(f)
2728 if f['action'] in self.delete_actions:
2729 filesToDelete.append(f)
2730 else:
2731 filesToRead.append(f)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002732
Luke Diamandb9327052009-07-30 00:13:46 +01002733 # deleted files...
2734 for f in filesToDelete:
2735 self.streamOneP4Deletion(f)
2736
Simon Hausmann30b59402008-03-03 11:55:48 +01002737 if len(filesToRead) > 0:
Luke Diamandb9327052009-07-30 00:13:46 +01002738 self.stream_file = {}
2739 self.stream_contents = []
2740 self.stream_have_file_info = False
2741
Andrew Garberc3f61632011-04-07 02:01:21 -04002742 # curry self argument
2743 def streamP4FilesCbSelf(entry):
2744 self.streamP4FilesCb(entry)
Luke Diamandb9327052009-07-30 00:13:46 +01002745
Luke Diamand6de040d2011-10-16 10:47:52 -04002746 fileArgs = ['%s#%s' % (f['path'], f['rev']) for f in filesToRead]
2747
2748 p4CmdList(["-x", "-", "print"],
2749 stdin=fileArgs,
2750 cb=streamP4FilesCbSelf)
Han-Wen Nienhuysf2eda792007-05-23 18:49:35 -03002751
Luke Diamandb9327052009-07-30 00:13:46 +01002752 # do the last chunk
2753 if self.stream_file.has_key('depotFile'):
2754 self.streamOneP4File(self.stream_file, self.stream_contents)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002755
Luke Diamandaffb4742012-01-19 09:52:27 +00002756 def make_email(self, userid):
2757 if userid in self.users:
2758 return self.users[userid]
2759 else:
2760 return "%s <a@b>" % userid
2761
Luke Diamand06804c72012-04-11 17:21:24 +02002762 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
Luke Diamandb43702a2015-08-27 08:18:58 +01002763 """ Stream a p4 tag.
2764 commit is either a git commit, or a fast-import mark, ":<p4commit>"
2765 """
2766
Luke Diamand06804c72012-04-11 17:21:24 +02002767 if verbose:
2768 print "writing tag %s for commit %s" % (labelName, commit)
2769 gitStream.write("tag %s\n" % labelName)
2770 gitStream.write("from %s\n" % commit)
2771
2772 if labelDetails.has_key('Owner'):
2773 owner = labelDetails["Owner"]
2774 else:
2775 owner = None
2776
2777 # Try to use the owner of the p4 label, or failing that,
2778 # the current p4 user id.
2779 if owner:
2780 email = self.make_email(owner)
2781 else:
2782 email = self.make_email(self.p4UserId())
2783 tagger = "%s %s %s" % (email, epoch, self.tz)
2784
2785 gitStream.write("tagger %s\n" % tagger)
2786
2787 print "labelDetails=",labelDetails
2788 if labelDetails.has_key('Description'):
2789 description = labelDetails['Description']
2790 else:
2791 description = 'Label from git p4'
2792
2793 gitStream.write("data %d\n" % len(description))
2794 gitStream.write(description)
2795 gitStream.write("\n")
2796
Lars Schneider4ae048e2015-12-08 10:36:22 +01002797 def inClientSpec(self, path):
2798 if not self.clientSpecDirs:
2799 return True
2800 inClientSpec = self.clientSpecDirs.map_in_client(path)
2801 if not inClientSpec and self.verbose:
2802 print('Ignoring file outside of client spec: {0}'.format(path))
2803 return inClientSpec
2804
2805 def hasBranchPrefix(self, path):
2806 if not self.branchPrefixes:
2807 return True
2808 hasPrefix = [p for p in self.branchPrefixes
2809 if p4PathStartsWith(path, p)]
Andrew Oakley09667d02016-06-22 10:26:11 +01002810 if not hasPrefix and self.verbose:
Lars Schneider4ae048e2015-12-08 10:36:22 +01002811 print('Ignoring file outside of prefix: {0}'.format(path))
2812 return hasPrefix
2813
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002814 def commit(self, details, files, branch, parent = ""):
Simon Hausmannb9847332007-03-20 20:54:23 +01002815 epoch = details["time"]
2816 author = details["user"]
Jan Durovec26e6a272016-04-19 19:49:41 +00002817 jobs = self.extractJobsFromCommit(details)
Simon Hausmannb9847332007-03-20 20:54:23 +01002818
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002819 if self.verbose:
Lars Schneider4ae048e2015-12-08 10:36:22 +01002820 print('commit into {0}'.format(branch))
Han-Wen Nienhuys96e07dd2007-05-23 18:49:35 -03002821
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002822 if self.clientSpecDirs:
2823 self.clientSpecDirs.update_client_spec_path_cache(files)
2824
Lars Schneider4ae048e2015-12-08 10:36:22 +01002825 files = [f for f in files
2826 if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])]
2827
2828 if not files and not gitConfigBool('git-p4.keepEmptyCommits'):
2829 print('Ignoring revision {0} as it would produce an empty commit.'
2830 .format(details['change']))
2831 return
2832
Simon Hausmannb9847332007-03-20 20:54:23 +01002833 self.gitStream.write("commit %s\n" % branch)
Luke Diamandb43702a2015-08-27 08:18:58 +01002834 self.gitStream.write("mark :%s\n" % details["change"])
Simon Hausmannb9847332007-03-20 20:54:23 +01002835 self.committedChanges.add(int(details["change"]))
2836 committer = ""
Simon Hausmannb607e712007-05-20 10:55:54 +02002837 if author not in self.users:
2838 self.getUserMapFromPerforceServer()
Luke Diamandaffb4742012-01-19 09:52:27 +00002839 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
Simon Hausmannb9847332007-03-20 20:54:23 +01002840
2841 self.gitStream.write("committer %s\n" % committer)
2842
2843 self.gitStream.write("data <<EOT\n")
2844 self.gitStream.write(details["desc"])
Jan Durovec26e6a272016-04-19 19:49:41 +00002845 if len(jobs) > 0:
2846 self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002847 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
2848 (','.join(self.branchPrefixes), details["change"]))
Simon Hausmann6581de02007-06-11 10:01:58 +02002849 if len(details['options']) > 0:
2850 self.gitStream.write(": options = %s" % details['options'])
2851 self.gitStream.write("]\nEOT\n\n")
Simon Hausmannb9847332007-03-20 20:54:23 +01002852
2853 if len(parent) > 0:
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002854 if self.verbose:
2855 print "parent %s" % parent
Simon Hausmannb9847332007-03-20 20:54:23 +01002856 self.gitStream.write("from %s\n" % parent)
2857
Lars Schneider4ae048e2015-12-08 10:36:22 +01002858 self.streamP4Files(files)
Simon Hausmannb9847332007-03-20 20:54:23 +01002859 self.gitStream.write("\n")
2860
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002861 change = int(details["change"])
2862
Simon Hausmann9bda3a82007-05-19 12:05:40 +02002863 if self.labels.has_key(change):
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002864 label = self.labels[change]
2865 labelDetails = label[0]
2866 labelRevisions = label[1]
Simon Hausmann71b112d2007-05-19 11:54:11 +02002867 if self.verbose:
2868 print "Change %s is labelled %s" % (change, labelDetails)
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002869
Luke Diamand6de040d2011-10-16 10:47:52 -04002870 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002871 for p in self.branchPrefixes])
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002872
2873 if len(files) == len(labelRevisions):
2874
2875 cleanedFiles = {}
2876 for info in files:
Pete Wyckoff56c09342011-02-19 08:17:57 -05002877 if info["action"] in self.delete_actions:
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002878 continue
2879 cleanedFiles[info["depotFile"]] = info["rev"]
2880
2881 if cleanedFiles == labelRevisions:
Luke Diamand06804c72012-04-11 17:21:24 +02002882 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002883
2884 else:
Simon Hausmanna46668f2007-03-28 17:05:38 +02002885 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002886 print ("Tag %s does not match with change %s: files do not match."
2887 % (labelDetails["label"], change))
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002888
2889 else:
Simon Hausmanna46668f2007-03-28 17:05:38 +02002890 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002891 print ("Tag %s does not match with change %s: file count is different."
2892 % (labelDetails["label"], change))
Simon Hausmannb9847332007-03-20 20:54:23 +01002893
Luke Diamand06804c72012-04-11 17:21:24 +02002894 # Build a dictionary of changelists and labels, for "detect-labels" option.
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002895 def getLabels(self):
2896 self.labels = {}
2897
Luke Diamand52a48802012-01-19 09:52:25 +00002898 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
Simon Hausmann10c32112007-04-08 10:15:47 +02002899 if len(l) > 0 and not self.silent:
Shun Kei Leung183f8432007-11-21 11:01:19 +08002900 print "Finding files belonging to labels in %s" % `self.depotPaths`
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02002901
2902 for output in l:
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002903 label = output["label"]
2904 revisions = {}
2905 newestChange = 0
Simon Hausmann71b112d2007-05-19 11:54:11 +02002906 if self.verbose:
2907 print "Querying files for label %s" % label
Luke Diamand6de040d2011-10-16 10:47:52 -04002908 for file in p4CmdList(["files"] +
2909 ["%s...@%s" % (p, label)
2910 for p in self.depotPaths]):
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002911 revisions[file["depotFile"]] = file["rev"]
2912 change = int(file["change"])
2913 if change > newestChange:
2914 newestChange = change
2915
Simon Hausmann9bda3a82007-05-19 12:05:40 +02002916 self.labels[newestChange] = [output, revisions]
2917
2918 if self.verbose:
2919 print "Label changes: %s" % self.labels.keys()
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002920
Luke Diamand06804c72012-04-11 17:21:24 +02002921 # Import p4 labels as git tags. A direct mapping does not
2922 # exist, so assume that if all the files are at the same revision
2923 # then we can use that, or it's something more complicated we should
2924 # just ignore.
2925 def importP4Labels(self, stream, p4Labels):
2926 if verbose:
2927 print "import p4 labels: " + ' '.join(p4Labels)
2928
2929 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
Luke Diamandc8942a22012-04-11 17:21:24 +02002930 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
Luke Diamand06804c72012-04-11 17:21:24 +02002931 if len(validLabelRegexp) == 0:
2932 validLabelRegexp = defaultLabelRegexp
2933 m = re.compile(validLabelRegexp)
2934
2935 for name in p4Labels:
2936 commitFound = False
2937
2938 if not m.match(name):
2939 if verbose:
2940 print "label %s does not match regexp %s" % (name,validLabelRegexp)
2941 continue
2942
2943 if name in ignoredP4Labels:
2944 continue
2945
2946 labelDetails = p4CmdList(['label', "-o", name])[0]
2947
2948 # get the most recent changelist for each file in this label
2949 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
2950 for p in self.depotPaths])
2951
2952 if change.has_key('change'):
2953 # find the corresponding git commit; take the oldest commit
2954 changelist = int(change['change'])
Luke Diamandb43702a2015-08-27 08:18:58 +01002955 if changelist in self.committedChanges:
2956 gitCommit = ":%d" % changelist # use a fast-import mark
Luke Diamand06804c72012-04-11 17:21:24 +02002957 commitFound = True
Luke Diamandb43702a2015-08-27 08:18:58 +01002958 else:
2959 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
2960 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True)
2961 if len(gitCommit) == 0:
2962 print "importing label %s: could not find git commit for changelist %d" % (name, changelist)
2963 else:
2964 commitFound = True
2965 gitCommit = gitCommit.strip()
2966
2967 if commitFound:
Luke Diamand06804c72012-04-11 17:21:24 +02002968 # Convert from p4 time format
2969 try:
2970 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
2971 except ValueError:
Pete Wyckoffa4e90542012-11-23 17:35:38 -05002972 print "Could not convert label time %s" % labelDetails['Update']
Luke Diamand06804c72012-04-11 17:21:24 +02002973 tmwhen = 1
2974
2975 when = int(time.mktime(tmwhen))
2976 self.streamTag(stream, name, labelDetails, gitCommit, when)
2977 if verbose:
2978 print "p4 label %s mapped to git commit %s" % (name, gitCommit)
2979 else:
2980 if verbose:
2981 print "Label %s has no changelists - possibly deleted?" % name
2982
2983 if not commitFound:
2984 # We can't import this label; don't try again as it will get very
2985 # expensive repeatedly fetching all the files for labels that will
2986 # never be imported. If the label is moved in the future, the
2987 # ignore will need to be removed manually.
2988 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
2989
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002990 def guessProjectName(self):
2991 for p in self.depotPaths:
Simon Hausmann6e5295c2007-06-11 08:50:57 +02002992 if p.endswith("/"):
2993 p = p[:-1]
2994 p = p[p.strip().rfind("/") + 1:]
2995 if not p.endswith("/"):
2996 p += "/"
2997 return p
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002998
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002999 def getBranchMapping(self):
Simon Hausmann6555b2c2007-06-17 11:25:34 +02003000 lostAndFoundBranches = set()
3001
Vitor Antunes8ace74c2011-08-19 00:44:04 +01003002 user = gitConfig("git-p4.branchUser")
3003 if len(user) > 0:
3004 command = "branches -u %s" % user
3005 else:
3006 command = "branches"
3007
3008 for info in p4CmdList(command):
Luke Diamand52a48802012-01-19 09:52:25 +00003009 details = p4Cmd(["branch", "-o", info["branch"]])
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02003010 viewIdx = 0
3011 while details.has_key("View%s" % viewIdx):
3012 paths = details["View%s" % viewIdx].split(" ")
3013 viewIdx = viewIdx + 1
3014 # require standard //depot/foo/... //depot/bar/... mapping
3015 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
3016 continue
3017 source = paths[0]
3018 destination = paths[1]
Simon Hausmann6509e192007-06-07 09:41:53 +02003019 ## HACK
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01003020 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
Simon Hausmann6509e192007-06-07 09:41:53 +02003021 source = source[len(self.depotPaths[0]):-4]
3022 destination = destination[len(self.depotPaths[0]):-4]
Simon Hausmann6555b2c2007-06-17 11:25:34 +02003023
Simon Hausmann1a2edf42007-06-17 15:10:24 +02003024 if destination in self.knownBranches:
3025 if not self.silent:
3026 print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
3027 print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
3028 continue
3029
Simon Hausmann6555b2c2007-06-17 11:25:34 +02003030 self.knownBranches[destination] = source
3031
3032 lostAndFoundBranches.discard(destination)
3033
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003034 if source not in self.knownBranches:
Simon Hausmann6555b2c2007-06-17 11:25:34 +02003035 lostAndFoundBranches.add(source)
3036
Vitor Antunes7199cf12011-08-19 00:44:05 +01003037 # Perforce does not strictly require branches to be defined, so we also
3038 # check git config for a branch list.
3039 #
3040 # Example of branch definition in git config file:
3041 # [git-p4]
3042 # branchList=main:branchA
3043 # branchList=main:branchB
3044 # branchList=branchA:branchC
3045 configBranches = gitConfigList("git-p4.branchList")
3046 for branch in configBranches:
3047 if branch:
3048 (source, destination) = branch.split(":")
3049 self.knownBranches[destination] = source
3050
3051 lostAndFoundBranches.discard(destination)
3052
3053 if source not in self.knownBranches:
3054 lostAndFoundBranches.add(source)
3055
Simon Hausmann6555b2c2007-06-17 11:25:34 +02003056
3057 for branch in lostAndFoundBranches:
3058 self.knownBranches[branch] = branch
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003059
Simon Hausmann38f9f5e2007-11-15 10:38:45 +01003060 def getBranchMappingFromGitBranches(self):
3061 branches = p4BranchesInGit(self.importIntoRemotes)
3062 for branch in branches.keys():
3063 if branch == "master":
3064 branch = "main"
3065 else:
3066 branch = branch[len(self.projectName):]
3067 self.knownBranches[branch] = branch
3068
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003069 def updateOptionDict(self, d):
3070 option_keys = {}
3071 if self.keepRepoPath:
3072 option_keys['keepRepoPath'] = 1
3073
3074 d["options"] = ' '.join(sorted(option_keys.keys()))
3075
3076 def readOptions(self, d):
3077 self.keepRepoPath = (d.has_key('options')
3078 and ('keepRepoPath' in d['options']))
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003079
Simon Hausmann8134f692007-08-26 16:44:55 +02003080 def gitRefForBranch(self, branch):
3081 if branch == "main":
3082 return self.refPrefix + "master"
3083
3084 if len(branch) <= 0:
3085 return branch
3086
3087 return self.refPrefix + self.projectName + branch
3088
Simon Hausmann1ca3d712007-08-26 17:36:55 +02003089 def gitCommitByP4Change(self, ref, change):
3090 if self.verbose:
3091 print "looking in ref " + ref + " for change %s using bisect..." % change
3092
3093 earliestCommit = ""
3094 latestCommit = parseRevision(ref)
3095
3096 while True:
3097 if self.verbose:
3098 print "trying: earliest %s latest %s" % (earliestCommit, latestCommit)
3099 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
3100 if len(next) == 0:
3101 if self.verbose:
3102 print "argh"
3103 return ""
3104 log = extractLogMessageFromGitCommit(next)
3105 settings = extractSettingsGitLog(log)
3106 currentChange = int(settings['change'])
3107 if self.verbose:
3108 print "current change %s" % currentChange
3109
3110 if currentChange == change:
3111 if self.verbose:
3112 print "found %s" % next
3113 return next
3114
3115 if currentChange < change:
3116 earliestCommit = "^%s" % next
3117 else:
3118 latestCommit = "%s" % next
3119
3120 return ""
3121
3122 def importNewBranch(self, branch, maxChange):
3123 # make fast-import flush all changes to disk and update the refs using the checkpoint
3124 # command so that we can try to find the branch parent in the git history
3125 self.gitStream.write("checkpoint\n\n");
3126 self.gitStream.flush();
3127 branchPrefix = self.depotPaths[0] + branch + "/"
3128 range = "@1,%s" % maxChange
3129 #print "prefix" + branchPrefix
Lex Spoon96b2d542015-04-20 11:00:20 -04003130 changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
Simon Hausmann1ca3d712007-08-26 17:36:55 +02003131 if len(changes) <= 0:
3132 return False
3133 firstChange = changes[0]
3134 #print "first change in branch: %s" % firstChange
3135 sourceBranch = self.knownBranches[branch]
3136 sourceDepotPath = self.depotPaths[0] + sourceBranch
3137 sourceRef = self.gitRefForBranch(sourceBranch)
3138 #print "source " + sourceBranch
3139
Luke Diamand52a48802012-01-19 09:52:25 +00003140 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
Simon Hausmann1ca3d712007-08-26 17:36:55 +02003141 #print "branch parent: %s" % branchParentChange
3142 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
3143 if len(gitParent) > 0:
3144 self.initialParents[self.gitRefForBranch(branch)] = gitParent
3145 #print "parent git commit: %s" % gitParent
3146
3147 self.importChanges(changes)
3148 return True
3149
Vitor Antunesfed23692012-01-25 23:48:22 +00003150 def searchParent(self, parent, branch, target):
3151 parentFound = False
Pete Wyckoffc7d34882013-01-26 22:11:21 -05003152 for blob in read_pipe_lines(["git", "rev-list", "--reverse",
3153 "--no-merges", parent]):
Vitor Antunesfed23692012-01-25 23:48:22 +00003154 blob = blob.strip()
3155 if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
3156 parentFound = True
3157 if self.verbose:
3158 print "Found parent of %s in commit %s" % (branch, blob)
3159 break
3160 if parentFound:
3161 return blob
3162 else:
3163 return None
3164
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003165 def importChanges(self, changes):
3166 cnt = 1
3167 for change in changes:
Pete Wyckoff18fa13d2012-11-23 17:35:34 -05003168 description = p4_describe(change)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003169 self.updateOptionDict(description)
3170
3171 if not self.silent:
3172 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
3173 sys.stdout.flush()
3174 cnt = cnt + 1
3175
3176 try:
3177 if self.detectBranches:
3178 branches = self.splitFilesIntoBranches(description)
3179 for branch in branches.keys():
3180 ## HACK --hwn
3181 branchPrefix = self.depotPaths[0] + branch + "/"
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003182 self.branchPrefixes = [ branchPrefix ]
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003183
3184 parent = ""
3185
3186 filesForCommit = branches[branch]
3187
3188 if self.verbose:
3189 print "branch is %s" % branch
3190
3191 self.updatedBranches.add(branch)
3192
3193 if branch not in self.createdBranches:
3194 self.createdBranches.add(branch)
3195 parent = self.knownBranches[branch]
3196 if parent == branch:
3197 parent = ""
Simon Hausmann1ca3d712007-08-26 17:36:55 +02003198 else:
3199 fullBranch = self.projectName + branch
3200 if fullBranch not in self.p4BranchesInGit:
3201 if not self.silent:
3202 print("\n Importing new branch %s" % fullBranch);
3203 if self.importNewBranch(branch, change - 1):
3204 parent = ""
3205 self.p4BranchesInGit.append(fullBranch)
3206 if not self.silent:
3207 print("\n Resuming with change %s" % change);
3208
3209 if self.verbose:
3210 print "parent determined through known branches: %s" % parent
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003211
Simon Hausmann8134f692007-08-26 16:44:55 +02003212 branch = self.gitRefForBranch(branch)
3213 parent = self.gitRefForBranch(parent)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003214
3215 if self.verbose:
3216 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
3217
3218 if len(parent) == 0 and branch in self.initialParents:
3219 parent = self.initialParents[branch]
3220 del self.initialParents[branch]
3221
Vitor Antunesfed23692012-01-25 23:48:22 +00003222 blob = None
3223 if len(parent) > 0:
Pete Wyckoff4f9273d2013-01-26 22:11:04 -05003224 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
Vitor Antunesfed23692012-01-25 23:48:22 +00003225 if self.verbose:
3226 print "Creating temporary branch: " + tempBranch
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003227 self.commit(description, filesForCommit, tempBranch)
Vitor Antunesfed23692012-01-25 23:48:22 +00003228 self.tempBranches.append(tempBranch)
3229 self.checkpoint()
3230 blob = self.searchParent(parent, branch, tempBranch)
3231 if blob:
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003232 self.commit(description, filesForCommit, branch, blob)
Vitor Antunesfed23692012-01-25 23:48:22 +00003233 else:
3234 if self.verbose:
3235 print "Parent of %s not found. Committing into head of %s" % (branch, parent)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003236 self.commit(description, filesForCommit, branch, parent)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003237 else:
3238 files = self.extractFilesFromCommit(description)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003239 self.commit(description, files, self.branch,
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003240 self.initialParent)
Pete Wyckoff47497842013-01-14 19:47:04 -05003241 # only needed once, to connect to the previous commit
Simon Hausmanne87f37a2007-08-26 16:00:52 +02003242 self.initialParent = ""
3243 except IOError:
3244 print self.gitError.read()
3245 sys.exit(1)
3246
Simon Hausmannc208a242007-08-26 16:07:18 +02003247 def importHeadRevision(self, revision):
3248 print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)
3249
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04003250 details = {}
3251 details["user"] = "git perforce import user"
Pete Wyckoff1494fcb2011-02-19 08:17:56 -05003252 details["desc"] = ("Initial import of %s from the state at revision %s\n"
Simon Hausmannc208a242007-08-26 16:07:18 +02003253 % (' '.join(self.depotPaths), revision))
3254 details["change"] = revision
3255 newestRevision = 0
3256
3257 fileCnt = 0
Luke Diamand6de040d2011-10-16 10:47:52 -04003258 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
3259
3260 for info in p4CmdList(["files"] + fileArgs):
Simon Hausmannc208a242007-08-26 16:07:18 +02003261
Pete Wyckoff68b28592011-02-19 08:17:55 -05003262 if 'code' in info and info['code'] == 'error':
Simon Hausmannc208a242007-08-26 16:07:18 +02003263 sys.stderr.write("p4 returned an error: %s\n"
3264 % info['data'])
Pete Wyckoffd88e7072011-02-19 08:17:58 -05003265 if info['data'].find("must refer to client") >= 0:
3266 sys.stderr.write("This particular p4 error is misleading.\n")
3267 sys.stderr.write("Perhaps the depot path was misspelled.\n");
3268 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
Simon Hausmannc208a242007-08-26 16:07:18 +02003269 sys.exit(1)
Pete Wyckoff68b28592011-02-19 08:17:55 -05003270 if 'p4ExitCode' in info:
3271 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
Simon Hausmannc208a242007-08-26 16:07:18 +02003272 sys.exit(1)
3273
3274
3275 change = int(info["change"])
3276 if change > newestRevision:
3277 newestRevision = change
3278
Pete Wyckoff56c09342011-02-19 08:17:57 -05003279 if info["action"] in self.delete_actions:
Simon Hausmannc208a242007-08-26 16:07:18 +02003280 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
3281 #fileCnt = fileCnt + 1
3282 continue
3283
3284 for prop in ["depotFile", "rev", "action", "type" ]:
3285 details["%s%s" % (prop, fileCnt)] = info[prop]
3286
3287 fileCnt = fileCnt + 1
3288
3289 details["change"] = newestRevision
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04003290
Pete Wyckoff9dcb9f22012-04-08 20:18:01 -04003291 # Use time from top-most change so that all git p4 clones of
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04003292 # the same p4 repo have the same commit SHA1s.
Pete Wyckoff18fa13d2012-11-23 17:35:34 -05003293 res = p4_describe(newestRevision)
3294 details["time"] = res["time"]
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04003295
Simon Hausmannc208a242007-08-26 16:07:18 +02003296 self.updateOptionDict(details)
3297 try:
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003298 self.commit(details, self.extractFilesFromCommit(details), self.branch)
Simon Hausmannc208a242007-08-26 16:07:18 +02003299 except IOError:
3300 print "IO error with git fast-import. Is your git version recent enough?"
3301 print self.gitError.read()
3302
3303
Simon Hausmannb9847332007-03-20 20:54:23 +01003304 def run(self, args):
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003305 self.depotPaths = []
Simon Hausmann179caeb2007-03-22 22:17:42 +01003306 self.changeRange = ""
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003307 self.previousDepotPaths = []
Pete Wyckoff991a2de2013-01-14 19:46:56 -05003308 self.hasOrigin = False
Han-Wen Nienhuysce6f33c2007-05-23 16:46:29 -03003309
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003310 # map from branch depot path to parent branch
3311 self.knownBranches = {}
3312 self.initialParents = {}
Simon Hausmann179caeb2007-03-22 22:17:42 +01003313
Simon Hausmanna028a982007-05-23 00:03:08 +02003314 if self.importIntoRemotes:
3315 self.refPrefix = "refs/remotes/p4/"
3316 else:
Marius Storm-Olsendb775552007-06-07 15:13:59 +02003317 self.refPrefix = "refs/heads/p4/"
Simon Hausmanna028a982007-05-23 00:03:08 +02003318
Pete Wyckoff991a2de2013-01-14 19:46:56 -05003319 if self.syncWithOrigin:
3320 self.hasOrigin = originP4BranchesExist()
3321 if self.hasOrigin:
3322 if not self.silent:
3323 print 'Syncing with origin first, using "git fetch origin"'
3324 system("git fetch origin")
Simon Hausmann10f880f2007-05-24 22:28:28 +02003325
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -05003326 branch_arg_given = bool(self.branch)
Simon Hausmann569d1bd2007-03-22 21:34:16 +01003327 if len(self.branch) == 0:
Marius Storm-Olsendb775552007-06-07 15:13:59 +02003328 self.branch = self.refPrefix + "master"
Simon Hausmanna028a982007-05-23 00:03:08 +02003329 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
Simon Hausmann48df6fd2007-05-17 21:18:53 +02003330 system("git update-ref %s refs/heads/p4" % self.branch)
Pete Wyckoff55d12432013-01-14 19:46:59 -05003331 system("git branch -D p4")
Simon Hausmann179caeb2007-03-22 22:17:42 +01003332
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05003333 # accept either the command-line option, or the configuration variable
3334 if self.useClientSpec:
3335 # will use this after clone to set the variable
3336 self.useClientSpec_from_options = True
3337 else:
Pete Wyckoff0d609032013-01-26 22:11:24 -05003338 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff09fca772011-12-24 21:07:39 -05003339 self.useClientSpec = True
3340 if self.useClientSpec:
Pete Wyckoff543987b2012-02-25 20:06:25 -05003341 self.clientSpecDirs = getClientSpec()
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01003342
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003343 # TODO: should always look at previous commits,
3344 # merge with previous imports, if possible.
3345 if args == []:
Simon Hausmannd414c742007-05-25 11:36:42 +02003346 if self.hasOrigin:
Simon Hausmann5ca44612007-08-24 17:44:16 +02003347 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
Pete Wyckoff3b650fc2013-01-14 19:46:58 -05003348
3349 # branches holds mapping from branch name to sha1
3350 branches = p4BranchesInGit(self.importIntoRemotes)
Pete Wyckoff8c9e8b62013-01-14 19:47:06 -05003351
3352 # restrict to just this one, disabling detect-branches
3353 if branch_arg_given:
3354 short = self.branch.split("/")[-1]
3355 if short in branches:
3356 self.p4BranchesInGit = [ short ]
3357 else:
3358 self.p4BranchesInGit = branches.keys()
Simon Hausmannabcd7902007-05-24 22:25:36 +02003359
3360 if len(self.p4BranchesInGit) > 1:
3361 if not self.silent:
3362 print "Importing from/into multiple branches"
3363 self.detectBranches = True
Pete Wyckoff8c9e8b62013-01-14 19:47:06 -05003364 for branch in branches.keys():
3365 self.initialParents[self.refPrefix + branch] = \
3366 branches[branch]
Simon Hausmann967f72e2007-03-23 09:30:41 +01003367
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003368 if self.verbose:
3369 print "branches: %s" % self.p4BranchesInGit
3370
3371 p4Change = 0
3372 for branch in self.p4BranchesInGit:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03003373 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003374
3375 settings = extractSettingsGitLog(logMsg)
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003376
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003377 self.readOptions(settings)
3378 if (settings.has_key('depot-paths')
3379 and settings.has_key ('change')):
3380 change = int(settings['change']) + 1
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003381 p4Change = max(p4Change, change)
3382
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003383 depotPaths = sorted(settings['depot-paths'])
3384 if self.previousDepotPaths == []:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003385 self.previousDepotPaths = depotPaths
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003386 else:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003387 paths = []
3388 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
Vitor Antunes04d277b2011-08-19 00:44:03 +01003389 prev_list = prev.split("/")
3390 cur_list = cur.split("/")
3391 for i in range(0, min(len(cur_list), len(prev_list))):
3392 if cur_list[i] <> prev_list[i]:
Simon Hausmann583e1702007-06-07 09:37:13 +02003393 i = i - 1
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003394 break
3395
Vitor Antunes04d277b2011-08-19 00:44:03 +01003396 paths.append ("/".join(cur_list[:i + 1]))
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003397
3398 self.previousDepotPaths = paths
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003399
3400 if p4Change > 0:
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003401 self.depotPaths = sorted(self.previousDepotPaths)
Simon Hausmannd5904672007-05-19 11:07:32 +02003402 self.changeRange = "@%s,#head" % p4Change
Simon Hausmann341dc1c2007-05-21 00:39:16 +02003403 if not self.silent and not self.detectBranches:
Simon Hausmann967f72e2007-03-23 09:30:41 +01003404 print "Performing incremental import into %s git branch" % self.branch
Simon Hausmann569d1bd2007-03-22 21:34:16 +01003405
Pete Wyckoff40d69ac2013-01-14 19:47:03 -05003406 # accept multiple ref name abbreviations:
3407 # refs/foo/bar/branch -> use it exactly
3408 # p4/branch -> prepend refs/remotes/ or refs/heads/
3409 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
Simon Hausmannf9162f62007-05-17 09:02:45 +02003410 if not self.branch.startswith("refs/"):
Pete Wyckoff40d69ac2013-01-14 19:47:03 -05003411 if self.importIntoRemotes:
3412 prepend = "refs/remotes/"
3413 else:
3414 prepend = "refs/heads/"
3415 if not self.branch.startswith("p4/"):
3416 prepend += "p4/"
3417 self.branch = prepend + self.branch
Simon Hausmann179caeb2007-03-22 22:17:42 +01003418
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003419 if len(args) == 0 and self.depotPaths:
Simon Hausmannb9847332007-03-20 20:54:23 +01003420 if not self.silent:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003421 print "Depot paths: %s" % ' '.join(self.depotPaths)
Simon Hausmannb9847332007-03-20 20:54:23 +01003422 else:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003423 if self.depotPaths and self.depotPaths != args:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03003424 print ("previous import used depot path %s and now %s was specified. "
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003425 "This doesn't work!" % (' '.join (self.depotPaths),
3426 ' '.join (args)))
Simon Hausmannb9847332007-03-20 20:54:23 +01003427 sys.exit(1)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003428
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003429 self.depotPaths = sorted(args)
Simon Hausmannb9847332007-03-20 20:54:23 +01003430
Simon Hausmann1c49fc12007-08-26 16:04:34 +02003431 revision = ""
Simon Hausmannb9847332007-03-20 20:54:23 +01003432 self.users = {}
Simon Hausmannb9847332007-03-20 20:54:23 +01003433
Pete Wyckoff58c8bc72011-12-24 21:07:35 -05003434 # Make sure no revision specifiers are used when --changesfile
3435 # is specified.
3436 bad_changesfile = False
3437 if len(self.changesFile) > 0:
3438 for p in self.depotPaths:
3439 if p.find("@") >= 0 or p.find("#") >= 0:
3440 bad_changesfile = True
3441 break
3442 if bad_changesfile:
3443 die("Option --changesfile is incompatible with revision specifiers")
3444
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003445 newPaths = []
3446 for p in self.depotPaths:
3447 if p.find("@") != -1:
3448 atIdx = p.index("@")
3449 self.changeRange = p[atIdx:]
3450 if self.changeRange == "@all":
3451 self.changeRange = ""
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003452 elif ',' not in self.changeRange:
Simon Hausmann1c49fc12007-08-26 16:04:34 +02003453 revision = self.changeRange
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003454 self.changeRange = ""
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07003455 p = p[:atIdx]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003456 elif p.find("#") != -1:
3457 hashIdx = p.index("#")
Simon Hausmann1c49fc12007-08-26 16:04:34 +02003458 revision = p[hashIdx:]
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07003459 p = p[:hashIdx]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003460 elif self.previousDepotPaths == []:
Pete Wyckoff58c8bc72011-12-24 21:07:35 -05003461 # pay attention to changesfile, if given, else import
3462 # the entire p4 tree at the head revision
3463 if len(self.changesFile) == 0:
3464 revision = "#head"
Simon Hausmannb9847332007-03-20 20:54:23 +01003465
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003466 p = re.sub ("\.\.\.$", "", p)
3467 if not p.endswith("/"):
3468 p += "/"
3469
3470 newPaths.append(p)
3471
3472 self.depotPaths = newPaths
3473
Pete Wyckoffe63231e2012-08-11 12:55:02 -04003474 # --detect-branches may change this for each branch
3475 self.branchPrefixes = self.depotPaths
3476
Simon Hausmannb607e712007-05-20 10:55:54 +02003477 self.loadUserMapFromCache()
Simon Hausmanncb53e1f2007-04-08 00:12:02 +02003478 self.labels = {}
3479 if self.detectLabels:
3480 self.getLabels();
Simon Hausmannb9847332007-03-20 20:54:23 +01003481
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02003482 if self.detectBranches:
Simon Hausmanndf450922007-06-08 08:49:22 +02003483 ## FIXME - what's a P4 projectName ?
3484 self.projectName = self.guessProjectName()
3485
Simon Hausmann38f9f5e2007-11-15 10:38:45 +01003486 if self.hasOrigin:
3487 self.getBranchMappingFromGitBranches()
3488 else:
3489 self.getBranchMapping()
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003490 if self.verbose:
3491 print "p4-git branches: %s" % self.p4BranchesInGit
3492 print "initial parents: %s" % self.initialParents
3493 for b in self.p4BranchesInGit:
3494 if b != "master":
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003495
3496 ## FIXME
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003497 b = b[len(self.projectName):]
3498 self.createdBranches.add(b)
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02003499
Simon Hausmannf291b4e2007-04-14 11:21:50 +02003500 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
Simon Hausmannb9847332007-03-20 20:54:23 +01003501
Pete Wyckoff78189be2012-11-23 17:35:36 -05003502 self.importProcess = subprocess.Popen(["git", "fast-import"],
3503 stdin=subprocess.PIPE,
3504 stdout=subprocess.PIPE,
3505 stderr=subprocess.PIPE);
3506 self.gitOutput = self.importProcess.stdout
3507 self.gitStream = self.importProcess.stdin
3508 self.gitError = self.importProcess.stderr
Simon Hausmannb9847332007-03-20 20:54:23 +01003509
Simon Hausmann1c49fc12007-08-26 16:04:34 +02003510 if revision:
Simon Hausmannc208a242007-08-26 16:07:18 +02003511 self.importHeadRevision(revision)
Simon Hausmannb9847332007-03-20 20:54:23 +01003512 else:
3513 changes = []
3514
Simon Hausmann0828ab12007-03-20 20:59:30 +01003515 if len(self.changesFile) > 0:
Simon Hausmannb9847332007-03-20 20:54:23 +01003516 output = open(self.changesFile).readlines()
Reilly Grant1d7367d2009-09-10 00:02:38 -07003517 changeSet = set()
Simon Hausmannb9847332007-03-20 20:54:23 +01003518 for line in output:
3519 changeSet.add(int(line))
3520
3521 for change in changeSet:
3522 changes.append(change)
3523
3524 changes.sort()
3525 else:
Pete Wyckoff9dcb9f22012-04-08 20:18:01 -04003526 # catch "git p4 sync" with no new branches, in a repo that
3527 # does not have any existing p4 branches
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -05003528 if len(args) == 0:
3529 if not self.p4BranchesInGit:
3530 die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
3531
3532 # The default branch is master, unless --branch is used to
3533 # specify something else. Make sure it exists, or complain
3534 # nicely about how to use --branch.
3535 if not self.detectBranches:
3536 if not branch_exists(self.branch):
3537 if branch_arg_given:
3538 die("Error: branch %s does not exist." % self.branch)
3539 else:
3540 die("Error: no branch %s; perhaps specify one with --branch." %
3541 self.branch)
3542
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003543 if self.verbose:
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03003544 print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003545 self.changeRange)
Lex Spoon96b2d542015-04-20 11:00:20 -04003546 changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
Simon Hausmannb9847332007-03-20 20:54:23 +01003547
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02003548 if len(self.maxChanges) > 0:
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07003549 changes = changes[:min(int(self.maxChanges), len(changes))]
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02003550
Simon Hausmannb9847332007-03-20 20:54:23 +01003551 if len(changes) == 0:
Simon Hausmann0828ab12007-03-20 20:59:30 +01003552 if not self.silent:
Simon Hausmann341dc1c2007-05-21 00:39:16 +02003553 print "No changes to import!"
Luke Diamand06804c72012-04-11 17:21:24 +02003554 else:
3555 if not self.silent and not self.detectBranches:
3556 print "Import destination: %s" % self.branch
Simon Hausmannb9847332007-03-20 20:54:23 +01003557
Luke Diamand06804c72012-04-11 17:21:24 +02003558 self.updatedBranches = set()
Simon Hausmanna9d1a272007-06-11 23:28:03 +02003559
Pete Wyckoff47497842013-01-14 19:47:04 -05003560 if not self.detectBranches:
3561 if args:
3562 # start a new branch
3563 self.initialParent = ""
3564 else:
3565 # build on a previous revision
3566 self.initialParent = parseRevision(self.branch)
3567
Luke Diamand06804c72012-04-11 17:21:24 +02003568 self.importChanges(changes)
Simon Hausmann341dc1c2007-05-21 00:39:16 +02003569
Luke Diamand06804c72012-04-11 17:21:24 +02003570 if not self.silent:
3571 print ""
3572 if len(self.updatedBranches) > 0:
3573 sys.stdout.write("Updated branches: ")
3574 for b in self.updatedBranches:
3575 sys.stdout.write("%s " % b)
3576 sys.stdout.write("\n")
Simon Hausmannb9847332007-03-20 20:54:23 +01003577
Pete Wyckoff0d609032013-01-26 22:11:24 -05003578 if gitConfigBool("git-p4.importLabels"):
Luke Diamand06dcd152012-05-11 07:25:18 +01003579 self.importLabels = True
Luke Diamand06804c72012-04-11 17:21:24 +02003580
3581 if self.importLabels:
3582 p4Labels = getP4Labels(self.depotPaths)
3583 gitTags = getGitTags()
3584
3585 missingP4Labels = p4Labels - gitTags
3586 self.importP4Labels(self.gitStream, missingP4Labels)
Simon Hausmannb9847332007-03-20 20:54:23 +01003587
Simon Hausmannb9847332007-03-20 20:54:23 +01003588 self.gitStream.close()
Pete Wyckoff78189be2012-11-23 17:35:36 -05003589 if self.importProcess.wait() != 0:
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003590 die("fast-import failed: %s" % self.gitError.read())
Simon Hausmannb9847332007-03-20 20:54:23 +01003591 self.gitOutput.close()
3592 self.gitError.close()
3593
Vitor Antunesfed23692012-01-25 23:48:22 +00003594 # Cleanup temporary branches created during import
3595 if self.tempBranches != []:
3596 for branch in self.tempBranches:
3597 read_pipe("git update-ref -d %s" % branch)
3598 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
3599
Pete Wyckoff55d12432013-01-14 19:46:59 -05003600 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
3601 # a convenient shortcut refname "p4".
3602 if self.importIntoRemotes:
3603 head_ref = self.refPrefix + "HEAD"
3604 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
3605 system(["git", "symbolic-ref", head_ref, self.branch])
3606
Simon Hausmannb9847332007-03-20 20:54:23 +01003607 return True
3608
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003609class P4Rebase(Command):
3610 def __init__(self):
3611 Command.__init__(self)
Luke Diamand06804c72012-04-11 17:21:24 +02003612 self.options = [
3613 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +02003614 ]
Luke Diamand06804c72012-04-11 17:21:24 +02003615 self.importLabels = False
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03003616 self.description = ("Fetches the latest revision from perforce and "
3617 + "rebases the current work (branch) against it")
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003618
3619 def run(self, args):
3620 sync = P4Sync()
Luke Diamand06804c72012-04-11 17:21:24 +02003621 sync.importLabels = self.importLabels
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003622 sync.run([])
Simon Hausmannd7e38682007-06-12 14:34:46 +02003623
Simon Hausmann14594f42007-08-22 09:07:15 +02003624 return self.rebase()
3625
3626 def rebase(self):
Simon Hausmann36ee4ee2008-01-07 14:21:45 +01003627 if os.system("git update-index --refresh") != 0:
Martin Ågren7560f542017-08-23 19:49:35 +02003628 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.");
Simon Hausmann36ee4ee2008-01-07 14:21:45 +01003629 if len(read_pipe("git diff-index HEAD --")) > 0:
Veres Lajosf7e604e2013-06-19 07:37:24 +02003630 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
Simon Hausmann36ee4ee2008-01-07 14:21:45 +01003631
Simon Hausmannd7e38682007-06-12 14:34:46 +02003632 [upstream, settings] = findUpstreamBranchPoint()
3633 if len(upstream) == 0:
3634 die("Cannot find upstream branchpoint for rebase")
3635
3636 # the branchpoint may be p4/foo~3, so strip off the parent
3637 upstream = re.sub("~[0-9]+$", "", upstream)
3638
3639 print "Rebasing the current branch onto %s" % upstream
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -03003640 oldHead = read_pipe("git rev-parse HEAD").strip()
Simon Hausmannd7e38682007-06-12 14:34:46 +02003641 system("git rebase %s" % upstream)
Vlad Dogaru4e49d952014-04-07 16:19:11 +03003642 system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003643 return True
3644
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003645class P4Clone(P4Sync):
3646 def __init__(self):
3647 P4Sync.__init__(self)
3648 self.description = "Creates a new git repository and imports from Perforce into it"
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003649 self.usage = "usage: %prog [options] //depot/path[@revRange]"
Tommy Thorn354081d2008-02-03 10:38:51 -08003650 self.options += [
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003651 optparse.make_option("--destination", dest="cloneDestination",
3652 action='store', default=None,
Tommy Thorn354081d2008-02-03 10:38:51 -08003653 help="where to leave result of the clone"),
Pete Wyckoff38200072011-02-19 08:18:01 -05003654 optparse.make_option("--bare", dest="cloneBare",
3655 action="store_true", default=False),
Tommy Thorn354081d2008-02-03 10:38:51 -08003656 ]
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003657 self.cloneDestination = None
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003658 self.needsGit = False
Pete Wyckoff38200072011-02-19 08:18:01 -05003659 self.cloneBare = False
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003660
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003661 def defaultDestination(self, args):
3662 ## TODO: use common prefix of args?
3663 depotPath = args[0]
3664 depotDir = re.sub("(@[^@]*)$", "", depotPath)
3665 depotDir = re.sub("(#[^#]*)$", "", depotDir)
Toby Allsopp053d9e42008-02-05 09:41:43 +13003666 depotDir = re.sub(r"\.\.\.$", "", depotDir)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003667 depotDir = re.sub(r"/$", "", depotDir)
3668 return os.path.split(depotDir)[1]
3669
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003670 def run(self, args):
3671 if len(args) < 1:
3672 return False
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003673
3674 if self.keepRepoPath and not self.cloneDestination:
3675 sys.stderr.write("Must specify destination for --keep-path\n")
3676 sys.exit(1)
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003677
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003678 depotPaths = args
Simon Hausmann5e100b52007-06-07 21:12:25 +02003679
3680 if not self.cloneDestination and len(depotPaths) > 1:
3681 self.cloneDestination = depotPaths[-1]
3682 depotPaths = depotPaths[:-1]
3683
Tommy Thorn354081d2008-02-03 10:38:51 -08003684 self.cloneExclude = ["/"+p for p in self.cloneExclude]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003685 for p in depotPaths:
3686 if not p.startswith("//"):
Pete Wyckoff0f487d32013-01-26 22:11:06 -05003687 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003688 return False
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003689
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003690 if not self.cloneDestination:
Marius Storm-Olsen98ad4fa2007-06-07 15:08:33 +02003691 self.cloneDestination = self.defaultDestination(args)
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003692
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03003693 print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
Pete Wyckoff38200072011-02-19 08:18:01 -05003694
Kevin Greenc3bf3f12007-06-11 16:48:07 -04003695 if not os.path.exists(self.cloneDestination):
3696 os.makedirs(self.cloneDestination)
Robert Blum053fd0c2008-08-01 12:50:03 -07003697 chdir(self.cloneDestination)
Pete Wyckoff38200072011-02-19 08:18:01 -05003698
3699 init_cmd = [ "git", "init" ]
3700 if self.cloneBare:
3701 init_cmd.append("--bare")
Brandon Caseya235e852013-01-26 11:14:33 -08003702 retcode = subprocess.call(init_cmd)
3703 if retcode:
3704 raise CalledProcessError(retcode, init_cmd)
Pete Wyckoff38200072011-02-19 08:18:01 -05003705
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003706 if not P4Sync.run(self, depotPaths):
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003707 return False
Pete Wyckoffc5959562013-01-14 19:47:01 -05003708
3709 # create a master branch and check out a work tree
3710 if gitBranchExists(self.branch):
3711 system([ "git", "branch", "master", self.branch ])
3712 if not self.cloneBare:
3713 system([ "git", "checkout", "-f" ])
3714 else:
3715 print 'Not checking out any branch, use ' \
3716 '"git checkout -q -b master <branch>"'
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03003717
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05003718 # auto-set this variable if invoked with --use-client-spec
3719 if self.useClientSpec_from_options:
3720 system("git config --bool git-p4.useclientspec true")
3721
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003722 return True
3723
Simon Hausmann09d89de2007-06-20 23:10:28 +02003724class P4Branches(Command):
3725 def __init__(self):
3726 Command.__init__(self)
3727 self.options = [ ]
3728 self.description = ("Shows the git branches that hold imports and their "
3729 + "corresponding perforce depot paths")
3730 self.verbose = False
3731
3732 def run(self, args):
Simon Hausmann5ca44612007-08-24 17:44:16 +02003733 if originP4BranchesExist():
3734 createOrUpdateBranchesFromOrigin()
3735
Simon Hausmann09d89de2007-06-20 23:10:28 +02003736 cmdline = "git rev-parse --symbolic "
3737 cmdline += " --remotes"
3738
3739 for line in read_pipe_lines(cmdline):
3740 line = line.strip()
3741
3742 if not line.startswith('p4/') or line == "p4/HEAD":
3743 continue
3744 branch = line
3745
3746 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
3747 settings = extractSettingsGitLog(log)
3748
3749 print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])
3750 return True
3751
Simon Hausmannb9847332007-03-20 20:54:23 +01003752class HelpFormatter(optparse.IndentedHelpFormatter):
3753 def __init__(self):
3754 optparse.IndentedHelpFormatter.__init__(self)
3755
3756 def format_description(self, description):
3757 if description:
3758 return description + "\n"
3759 else:
3760 return ""
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003761
Simon Hausmann86949ee2007-03-19 20:59:12 +01003762def printUsage(commands):
3763 print "usage: %s <command> [options]" % sys.argv[0]
3764 print ""
3765 print "valid commands: %s" % ", ".join(commands)
3766 print ""
3767 print "Try %s <command> --help for command specific help." % sys.argv[0]
3768 print ""
3769
3770commands = {
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003771 "debug" : P4Debug,
3772 "submit" : P4Submit,
Marius Storm-Olsena9834f52007-10-09 16:16:09 +02003773 "commit" : P4Submit,
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003774 "sync" : P4Sync,
3775 "rebase" : P4Rebase,
3776 "clone" : P4Clone,
Simon Hausmann09d89de2007-06-20 23:10:28 +02003777 "rollback" : P4RollBack,
3778 "branches" : P4Branches
Simon Hausmann86949ee2007-03-19 20:59:12 +01003779}
3780
Simon Hausmann86949ee2007-03-19 20:59:12 +01003781
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003782def main():
3783 if len(sys.argv[1:]) == 0:
3784 printUsage(commands.keys())
3785 sys.exit(2)
Simon Hausmann86949ee2007-03-19 20:59:12 +01003786
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003787 cmdName = sys.argv[1]
3788 try:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003789 klass = commands[cmdName]
3790 cmd = klass()
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003791 except KeyError:
3792 print "unknown command %s" % cmdName
3793 print ""
3794 printUsage(commands.keys())
3795 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003796
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003797 options = cmd.options
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003798 cmd.gitdir = os.environ.get("GIT_DIR", None)
Simon Hausmann86949ee2007-03-19 20:59:12 +01003799
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003800 args = sys.argv[2:]
Simon Hausmanne20a9e52007-03-26 00:13:51 +02003801
Pete Wyckoffb0ccc802012-09-09 16:16:10 -04003802 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003803 if cmd.needsGit:
3804 options.append(optparse.make_option("--git-dir", dest="gitdir"))
Simon Hausmanne20a9e52007-03-26 00:13:51 +02003805
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003806 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
3807 options,
3808 description = cmd.description,
3809 formatter = HelpFormatter())
Simon Hausmann86949ee2007-03-19 20:59:12 +01003810
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003811 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003812 global verbose
3813 verbose = cmd.verbose
3814 if cmd.needsGit:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003815 if cmd.gitdir == None:
3816 cmd.gitdir = os.path.abspath(".git")
3817 if not isValidGitDir(cmd.gitdir):
Luke Diamand378f7be2016-12-13 21:51:28 +00003818 # "rev-parse --git-dir" without arguments will try $PWD/.git
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003819 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
3820 if os.path.exists(cmd.gitdir):
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003821 cdup = read_pipe("git rev-parse --show-cdup").strip()
3822 if len(cdup) > 0:
Robert Blum053fd0c2008-08-01 12:50:03 -07003823 chdir(cdup);
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003824
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003825 if not isValidGitDir(cmd.gitdir):
3826 if isValidGitDir(cmd.gitdir + "/.git"):
3827 cmd.gitdir += "/.git"
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003828 else:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003829 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
Simon Hausmann8910ac02007-03-26 08:18:55 +02003830
Luke Diamand378f7be2016-12-13 21:51:28 +00003831 # so git commands invoked from the P4 workspace will succeed
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003832 os.environ["GIT_DIR"] = cmd.gitdir
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003833
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003834 if not cmd.run(args):
3835 parser.print_help()
Pete Wyckoff09fca772011-12-24 21:07:39 -05003836 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003837
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003838
3839if __name__ == '__main__':
3840 main()